Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 17 Jul 2012 03:02:11 +0000 (UTC)
From:      Marcel Moolenaar <marcel@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r238544 - projects/altix2/sys/dev/mpt
Message-ID:  <201207170302.q6H32BH8009524@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: marcel
Date: Tue Jul 17 03:02:11 2012
New Revision: 238544
URL: http://svn.freebsd.org/changeset/base/238544

Log:
  Convert to the busdma_sync API, previously missed.

Modified:
  projects/altix2/sys/dev/mpt/mpt.c
  projects/altix2/sys/dev/mpt/mpt_user.c

Modified: projects/altix2/sys/dev/mpt/mpt.c
==============================================================================
--- projects/altix2/sys/dev/mpt/mpt.c	Tue Jul 17 02:36:59 2012	(r238543)
+++ projects/altix2/sys/dev/mpt/mpt.c	Tue Jul 17 03:02:11 2012	(r238544)
@@ -731,8 +731,8 @@ mpt_intr(void *arg)
 			 */
 			reply_baddr = MPT_REPLY_BADDR(reply_desc);
 			offset = reply_baddr - (mpt->reply_phys & 0xFFFFFFFF);
-			busdma_sync_range(mpt->reply_md, reply_baddr,
-			    MPT_REPLY_SIZE, BUS_DMASYNC_POSTREAD);
+			busdma_sync_range(mpt->reply_md, BUSDMA_SYNC_POSTREAD,
+			    reply_baddr, MPT_REPLY_SIZE);
 			reply_frame = MPT_REPLY_OTOV(mpt, offset);
 			ctxt_idx = le32toh(reply_frame->MsgContext);
 		} else {
@@ -809,13 +809,13 @@ mpt_intr(void *arg)
 		}
 
 		busdma_sync(mpt->request_md,
-		    BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
+		    BUSDMA_SYNC_POSTREAD | BUSDMA_SYNC_POSTWRITE);
 		free_rf = mpt_reply_handlers[cb_index](mpt, req,
 		    reply_desc, reply_frame);
 
 		if (reply_frame != NULL && free_rf) {
-			busdma_sync_range(mpt->reply_md, reply_baddr,
-			    MPT_REPLY_SIZE, BUS_DMASYNC_PREREAD);
+			busdma_sync_range(mpt->reply_md, BUSDMA_SYNC_PREREAD,
+			    reply_baddr, MPT_REPLY_SIZE);
 			mpt_free_reply(mpt, reply_baddr);
 		}
 
@@ -849,7 +849,7 @@ mpt_complete_request_chain(struct mpt_so
 		u_int		    cb_index;
 
 		busdma_sync(mpt->request_md,
-		    BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
+		    BUSDMA_SYNC_POSTREAD | BUSDMA_SYNC_POSTWRITE);
 		msg_hdr = (MSG_REQUEST_HEADER *)req->req_vbuf;
 		ioc_status_frame.Function = msg_hdr->Function;
 		ioc_status_frame.MsgContext = msg_hdr->MsgContext;
@@ -1237,8 +1237,8 @@ mpt_free_request(struct mpt_softc *mpt, 
 	mpt_send_event_ack(mpt, req, &record->reply, record->context);
 	offset = (uint32_t)((uint8_t *)record - mpt->reply);
 	reply_baddr = offset + (mpt->reply_phys & 0xFFFFFFFF);
-	busdma_sync_range(mpt->reply_md, offset, MPT_REPLY_SIZE,
-	    BUS_DMASYNC_PREREAD);
+	busdma_sync_range(mpt->reply_md, BUSDMA_SYNC_PREREAD, offset,
+	    MPT_REPLY_SIZE);
 	mpt_free_reply(mpt, reply_baddr);
 }
 
@@ -1279,7 +1279,7 @@ mpt_send_cmd(struct mpt_softc *mpt, requ
 		mpt_dump_request(mpt, req);
 	}
 	busdma_sync(mpt->request_md,
-	    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
+	    BUSDMA_SYNC_PREREAD | BUSDMA_SYNC_PREWRITE);
 	req->state |= REQ_STATE_QUEUED;
 	KASSERT(mpt_req_on_free_list(mpt, req) == 0,
 	    ("req %p:%u func %x on freelist list in mpt_send_cmd",
@@ -2406,12 +2406,12 @@ mpt_upload_fw(struct mpt_softc *mpt)
 	flags <<= MPI_SGE_FLAGS_SHIFT;
 	sge->FlagsLength = htole32(flags | mpt->fw_image_size);
 	sge->Address = htole32(mpt->fw_phys);
-	busdma_sync(mpt->fw_md, BUS_DMASYNC_PREREAD);
+	busdma_sync(mpt->fw_md, BUSDMA_SYNC_PREREAD);
 	error = mpt_send_handshake_cmd(mpt, sizeof(fw_req_buf), &fw_req_buf);
 	if (error)
 		return(error);
 	error = mpt_recv_handshake_reply(mpt, sizeof(fw_reply), &fw_reply);
-	busdma_sync(mpt->fw_md, BUS_DMASYNC_POSTREAD);
+	busdma_sync(mpt->fw_md, BUSDMA_SYNC_POSTREAD);
 	return (error);
 }
 
@@ -2461,10 +2461,10 @@ mpt_download_fw(struct mpt_softc *mpt)
 		  MPI_DIAG_RW_ENABLE|MPI_DIAG_DISABLE_ARM);
 
 	fw_hdr = (MpiFwHeader_t *)mpt->fw_image;
-	busdma_sync(mpt->fw_md, BUS_DMASYNC_PREWRITE);
+	busdma_sync(mpt->fw_md, BUSDMA_SYNC_PREWRITE);
 	mpt_diag_outsl(mpt, fw_hdr->LoadStartAddress, (uint32_t*)fw_hdr,
 		       fw_hdr->ImageSize);
-	busdma_sync(mpt->fw_md, BUS_DMASYNC_POSTWRITE);
+	busdma_sync(mpt->fw_md, BUSDMA_SYNC_POSTWRITE);
 
 	ext_offset = fw_hdr->NextImageHeaderOffset;
 	while (ext_offset != 0) {
@@ -2472,10 +2472,10 @@ mpt_download_fw(struct mpt_softc *mpt)
 
 		ext = (MpiExtImageHeader_t *)((uintptr_t)fw_hdr + ext_offset);
 		ext_offset = ext->NextImageHeaderOffset;
-		busdma_sync(mpt->fw_md, BUS_DMASYNC_PREWRITE);
+		busdma_sync(mpt->fw_md, BUSDMA_SYNC_PREWRITE);
 		mpt_diag_outsl(mpt, ext->LoadStartAddress, (uint32_t*)ext,
 			       ext->ImageSize);
-		busdma_sync(mpt->fw_md, BUS_DMASYNC_POSTWRITE);
+		busdma_sync(mpt->fw_md, BUSDMA_SYNC_POSTWRITE);
 	}
 
 	if (mpt->is_sas) {

Modified: projects/altix2/sys/dev/mpt/mpt_user.c
==============================================================================
--- projects/altix2/sys/dev/mpt/mpt_user.c	Tue Jul 17 02:36:59 2012	(r238543)
+++ projects/altix2/sys/dev/mpt/mpt_user.c	Tue Jul 17 03:02:11 2012	(r238544)
@@ -292,7 +292,7 @@ mpt_user_read_cfg_page(struct mpt_softc 
 	params.PageType = hdr->PageType & MPI_CONFIG_PAGETYPE_MASK;
 	params.PageAddress = le32toh(page_req->page_address);
 	busdma_sync(mpt_page->map,
-	    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
+	    BUSDMA_SYNC_PREREAD | BUSDMA_SYNC_PREWRITE);
 	error = mpt_issue_cfg_req(mpt, req, &params, mpt_page->paddr,
 	    le32toh(page_req->len), TRUE, 5000);
 	if (error != 0) {
@@ -303,7 +303,7 @@ mpt_user_read_cfg_page(struct mpt_softc 
 	page_req->ioc_status = htole16(req->IOCStatus);
 	if ((req->IOCStatus & MPI_IOCSTATUS_MASK) == MPI_IOCSTATUS_SUCCESS)
 		busdma_sync(mpt_page->map,
-		    BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
+		    BUSDMA_SYNC_POSTREAD | BUSDMA_SYNC_POSTWRITE);
 	mpt_free_request(mpt, req);
 	return (0);
 }
@@ -382,7 +382,7 @@ mpt_user_read_extcfg_page(struct mpt_sof
 	params.ExtPageType = hdr->ExtPageType;
 	params.ExtPageLength = hdr->ExtPageLength;
 	busdma_sync(mpt_page->map,
-	    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
+	    BUSDMA_SYNC_PREREAD | BUSDMA_SYNC_PREWRITE);
 	error = mpt_issue_cfg_req(mpt, req, &params, mpt_page->paddr,
 	    le32toh(ext_page_req->len), TRUE, 5000);
 	if (error != 0) {
@@ -393,7 +393,7 @@ mpt_user_read_extcfg_page(struct mpt_sof
 	ext_page_req->ioc_status = htole16(req->IOCStatus);
 	if ((req->IOCStatus & MPI_IOCSTATUS_MASK) == MPI_IOCSTATUS_SUCCESS)
 		busdma_sync(mpt_page->map,
-		    BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
+		    BUSDMA_SYNC_POSTREAD | BUSDMA_SYNC_POSTWRITE);
 	mpt_free_request(mpt, req);
 	return (0);
 }
@@ -428,8 +428,8 @@ mpt_user_write_cfg_page(struct mpt_softc
 	if (req == NULL)
 		return (ENOMEM);
 
-	busdma_sync(mpt_page->map, BUS_DMASYNC_PREREAD |
-	    BUS_DMASYNC_PREWRITE);
+	busdma_sync(mpt_page->map, BUSDMA_SYNC_PREREAD |
+	    BUSDMA_SYNC_PREWRITE);
 
 	/*
 	 * There isn't any point in restoring stripped out attributes
@@ -456,8 +456,8 @@ mpt_user_write_cfg_page(struct mpt_softc
 	}
 
 	page_req->ioc_status = htole16(req->IOCStatus);
-	busdma_sync(mpt_page->map, BUS_DMASYNC_POSTREAD |
-	    BUS_DMASYNC_POSTWRITE);
+	busdma_sync(mpt_page->map, BUSDMA_SYNC_POSTREAD |
+	    BUSDMA_SYNC_POSTWRITE);
 	mpt_free_request(mpt, req);
 	return (0);
 }
@@ -529,7 +529,7 @@ mpt_user_raid_action(struct mpt_softc *m
 	se = (SGE_SIMPLE32 *)&rap->ActionDataSGE;
 	if (mpt_page->vaddr != NULL && raid_act->len != 0) {
 		busdma_sync(mpt_page->map,
-		    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
+		    BUSDMA_SYNC_PREREAD | BUSDMA_SYNC_PREWRITE);
 		se->Address = htole32(mpt_page->paddr);
 		MPI_pSGE_SET_LENGTH(se, le32toh(raid_act->len));
 		MPI_pSGE_SET_FLAGS(se, (MPI_SGE_FLAGS_SIMPLE_ELEMENT |
@@ -568,7 +568,7 @@ mpt_user_raid_action(struct mpt_softc *m
 	    sizeof(res->action_data));
 	if (mpt_page->vaddr != NULL)
 		busdma_sync(mpt_page->map,
-		    BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
+		    BUSDMA_SYNC_POSTREAD | BUSDMA_SYNC_POSTWRITE);
 	mpt_free_request(mpt, req);
 	return (0);
 }

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207170302.q6H32BH8009524>