Commit c6678e0c authored by Christoph Hellwig's avatar Christoph Hellwig Committed by James Bottomley
Browse files

[SCSI] fusion: whitespace fixes 



Acked by: Moore, Eric Dean <Eric.Moore@lsil.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 637fa99b

drivers/message/fusion/mptbase.c

+119 −106
Original line number Diff line number Diff line
@@ -218,8 +218,7 @@ pci_enable_io_access(struct pci_dev *pdev) 
 *	(also referred to as a IO Controller or IOC).

 *	This routine must clear the interrupt from the adapter and does

 *	so by reading the reply FIFO.  Multiple replies may be processed

 *	per single call to this routine; up to MPT_MAX_REPLIES_PER_ISR

 *	which is currently set to 32 in mptbase.h.

 *	per single call to this routine.

 *

 *	This routine handles register-level access of the adapter but

 *	dispatches (calls) a protocol-specific callback routine to handle
@@ -279,8 +278,8 @@ mpt_interrupt(int irq, void *bus_id, struct pt_regs *r) 
			cb_idx = mr->u.frame.hwhdr.msgctxu.fld.cb_idx;

			mf = MPT_INDEX_2_MFPTR(ioc, req_idx);



			dmfprintk((MYIOC_s_INFO_FMT "Got non-TURBO reply=%p req_idx=%x\n",

					ioc->name, mr, req_idx));

			dmfprintk((MYIOC_s_INFO_FMT "Got non-TURBO reply=%p req_idx=%x cb_idx=%x Function=%x\n",

					ioc->name, mr, req_idx, cb_idx, mr->u.hdr.Function));

			DBG_DUMP_REPLY_FRAME(mr)



			 /*  Check/log IOC log info
@@ -345,7 +344,7 @@ mpt_interrupt(int irq, void *bus_id, struct pt_regs *r) 
			if ((mf) && ((mf >= MPT_INDEX_2_MFPTR(ioc, ioc->req_depth))

				|| (mf < ioc->req_frames)) ) {

				printk(MYIOC_s_WARN_FMT

					"mpt_interrupt: Invalid mf (%p) req_idx (%d)!\n", ioc->name, (void *)mf, req_idx);

					"mpt_interrupt: Invalid mf (%p)!\n", ioc->name, (void *)mf);

				cb_idx = 0;

				pa = 0;

				freeme = 0;
@@ -408,28 +407,17 @@ mpt_base_reply(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *reply) 
	int freereq = 1;

	u8 func;



	dprintk((MYIOC_s_INFO_FMT "mpt_base_reply() called\n", ioc->name));



	if ((mf == NULL) ||

	    (mf >= MPT_INDEX_2_MFPTR(ioc, ioc->req_depth))) {

		printk(MYIOC_s_ERR_FMT "NULL or BAD request frame ptr! (=%p)\n",

				ioc->name, (void *)mf);

		return 1;

	}



	if (reply == NULL) {

		dprintk((MYIOC_s_ERR_FMT "Unexpected NULL Event (turbo?) reply!\n",

				ioc->name));

		return 1;

	}

	dmfprintk((MYIOC_s_INFO_FMT "mpt_base_reply() called\n", ioc->name));



#if defined(MPT_DEBUG_MSG_FRAME)

	if (!(reply->u.hdr.MsgFlags & MPI_MSGFLAGS_CONTINUATION_REPLY)) {

		dmfprintk((KERN_INFO MYNAM ": Original request frame (@%p) header\n", mf));

		DBG_DUMP_REQUEST_FRAME_HDR(mf)

	}

#endif



	func = reply->u.hdr.Function;

	dprintk((MYIOC_s_INFO_FMT "mpt_base_reply, Function=%02Xh\n",

	dmfprintk((MYIOC_s_INFO_FMT "mpt_base_reply, Function=%02Xh\n",

			ioc->name, func));



	if (func == MPI_FUNCTION_EVENT_NOTIFICATION) {
@@ -448,8 +436,14 @@ mpt_base_reply(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *reply) 
		 *	Hmmm...  It seems that EventNotificationReply is an exception

		 *	to the rule of one reply per request.

		 */

		if (pEvReply->MsgFlags & MPI_MSGFLAGS_CONTINUATION_REPLY)

		if (pEvReply->MsgFlags & MPI_MSGFLAGS_CONTINUATION_REPLY) {

			freereq = 0;

			devtprintk((MYIOC_s_WARN_FMT "EVENT_NOTIFICATION reply %p does not return Request frame\n",

				ioc->name, pEvReply));

		} else {

			devtprintk((MYIOC_s_WARN_FMT "EVENT_NOTIFICATION reply %p returns Request frame\n",

				ioc->name, pEvReply));

		}



#ifdef CONFIG_PROC_FS

//		LogEvent(ioc, pEvReply);
@@ -1154,7 +1148,7 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id) 
		ioc->prod_name = "LSIFC909";

		ioc->bus_type = FC;

	}

	if (pdev->device == MPI_MANUFACTPAGE_DEVICEID_FC929) {

	else if (pdev->device == MPI_MANUFACTPAGE_DEVICEID_FC929) {

		ioc->prod_name = "LSIFC929";

		ioc->bus_type = FC;

	}
@@ -1624,7 +1618,7 @@ mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u32 reason, int sleepFlag) 


	if (reset_alt_ioc_active && ioc->alt_ioc) {

		/* (re)Enable alt-IOC! (reply interrupt) */

		dprintk((KERN_INFO MYNAM ": alt-%s reply irq re-enabled\n",

		dinitprintk((KERN_INFO MYNAM ": alt-%s reply irq re-enabled\n",

				ioc->alt_ioc->name));

		CHIPREG_WRITE32(&ioc->alt_ioc->chip->IntMask, ~(MPI_HIM_RIM));

		ioc->alt_ioc->active = 1;
@@ -1681,7 +1675,7 @@ mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u32 reason, int sleepFlag) 


			/* Find IM volumes

			 */

			if (ioc->facts.MsgVersion >= 0x0102)

			if (ioc->facts.MsgVersion >= MPI_VERSION_01_02)

				mpt_findImVolumes(ioc);



			/* Check, and possibly reset, the coalescing value
@@ -1711,7 +1705,7 @@ mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u32 reason, int sleepFlag) 
			}



			if (alt_ioc_ready && MptResetHandlers[ii]) {

				dprintk((MYIOC_s_INFO_FMT "Calling alt-%s post_reset handler #%d\n",

				drsprintk((MYIOC_s_INFO_FMT "Calling alt-%s post_reset handler #%d\n",

						ioc->name, ioc->alt_ioc->name, ii));

				rc += (*(MptResetHandlers[ii]))(ioc->alt_ioc, MPT_IOC_POST_RESET);

				handlers++;
@@ -1744,8 +1738,8 @@ mpt_detect_bound_ports(MPT_ADAPTER *ioc, struct pci_dev *pdev) 


	dprintk((MYIOC_s_INFO_FMT "PCI device %s devfn=%x/%x,"

	    " searching for devfn match on %x or %x\n",

		ioc->name, pci_name(pdev), pdev->devfn,

		func-1, func+1));

		ioc->name, pci_name(pdev), pdev->bus->number,

		pdev->devfn, func-1, func+1));



	peer = pci_get_slot(pdev->bus, PCI_DEVFN(slot,func-1));

	if (!peer) {
@@ -1872,9 +1866,11 @@ mpt_adapter_disable(MPT_ADAPTER *ioc) 
static void

mpt_adapter_dispose(MPT_ADAPTER *ioc)

{

	if (ioc != NULL) {

	int sz_first, sz_last;



	if (ioc == NULL)

		return;



	sz_first = ioc->alloc_total;



	mpt_adapter_disable(ioc);
@@ -1884,8 +1880,10 @@ mpt_adapter_dispose(MPT_ADAPTER *ioc) 
		ioc->pci_irq = -1;

	}



		if (ioc->memmap != NULL)

	if (ioc->memmap != NULL) {

		iounmap(ioc->memmap);

		ioc->memmap = NULL;

	}



#if defined(CONFIG_MTRR) && 0

	if (ioc->mtrr_reg > 0) {
@@ -1902,7 +1900,6 @@ mpt_adapter_dispose(MPT_ADAPTER *ioc) 
			ioc->name, sz_first-sz_last+(int)sizeof(*ioc), sz_first));

	kfree(ioc);

}

}



/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/

/*
@@ -2006,7 +2003,7 @@ MakeIocReady(MPT_ADAPTER *ioc, int force, int sleepFlag) 
	 *	Hmmm...  Did it get left operational?

	 */

	if ((ioc_state & MPI_IOC_STATE_MASK) == MPI_IOC_STATE_OPERATIONAL) {

		dinitprintk((MYIOC_s_WARN_FMT "IOC operational unexpected\n",

		dinitprintk((MYIOC_s_INFO_FMT "IOC operational unexpected\n",

				ioc->name));



		/* Check WhoInit.
@@ -2015,8 +2012,8 @@ MakeIocReady(MPT_ADAPTER *ioc, int force, int sleepFlag) 
		 * Else, fall through to KickStart case

		 */

		whoinit = (ioc_state & MPI_DOORBELL_WHO_INIT_MASK) >> MPI_DOORBELL_WHO_INIT_SHIFT;

		dprintk((KERN_WARNING MYNAM

			": whoinit 0x%x\n statefault %d force %d\n",

		dinitprintk((KERN_INFO MYNAM

			": whoinit 0x%x statefault %d force %d\n",

			whoinit, statefault, force));

		if (whoinit == MPI_WHOINIT_PCI_PEER)

			return -4;
@@ -2425,8 +2422,10 @@ SendIocInit(MPT_ADAPTER *ioc, int sleepFlag) 
	dhsprintk((MYIOC_s_INFO_FMT "Sending PortEnable (req @ %p)\n",

			ioc->name, &ioc_init));



	if ((r = SendPortEnable(ioc, 0, sleepFlag)) != 0)

	if ((r = SendPortEnable(ioc, 0, sleepFlag)) != 0) {

		printk(MYIOC_s_ERR_FMT "Sending PortEnable failed(%d)!\n",ioc->name, r);

		return r;

	}



	/* YIKES!  SUPER IMPORTANT!!!

	 *  Poll IocState until _OPERATIONAL while IOC is doing
@@ -2451,7 +2450,7 @@ SendIocInit(MPT_ADAPTER *ioc, int sleepFlag) 
		state = mpt_GetIocState(ioc, 1);

		count++;

	}

	dhsprintk((MYIOC_s_INFO_FMT "INFO - Wait IOC_OPERATIONAL state (cnt=%d)\n",

	dinitprintk((MYIOC_s_INFO_FMT "INFO - Wait IOC_OPERATIONAL state (cnt=%d)\n",

			ioc->name, count));



	return r;
@@ -2540,7 +2539,7 @@ mpt_free_fw_memory(MPT_ADAPTER *ioc) 
	int sz;



	sz = ioc->facts.FWImageSize;

	dinitprintk((KERN_WARNING MYNAM "free_fw_memory: FW Image  @ %p[%p], sz=%d[%x] bytes\n",

	dinitprintk((KERN_INFO MYNAM "free_fw_memory: FW Image  @ %p[%p], sz=%d[%x] bytes\n",

		 ioc->cached_fw, (void *)(ulong)ioc->cached_fw_dma, sz, sz));

	pci_free_consistent(ioc->pcidev, sz,

			ioc->cached_fw, ioc->cached_fw_dma);
@@ -2584,7 +2583,7 @@ mpt_do_upload(MPT_ADAPTER *ioc, int sleepFlag) 


	mpt_alloc_fw_memory(ioc, sz);



	dinitprintk((KERN_WARNING MYNAM ": FW Image  @ %p[%p], sz=%d[%x] bytes\n",

	dinitprintk((KERN_INFO MYNAM ": FW Image  @ %p[%p], sz=%d[%x] bytes\n",

		 ioc->cached_fw, (void *)(ulong)ioc->cached_fw_dma, sz, sz));



	if (ioc->cached_fw == NULL) {
@@ -2616,14 +2615,14 @@ mpt_do_upload(MPT_ADAPTER *ioc, int sleepFlag) 
	mpt_add_sge(&request[sgeoffset], flagsLength, ioc->cached_fw_dma);



	sgeoffset += sizeof(u32) + sizeof(dma_addr_t);

	dinitprintk((KERN_WARNING MYNAM "Sending FW Upload (req @ %p) sgeoffset=%d \n",

	dinitprintk((KERN_INFO MYNAM ": Sending FW Upload (req @ %p) sgeoffset=%d \n",

			prequest, sgeoffset));

	DBG_DUMP_FW_REQUEST_FRAME(prequest)



	ii = mpt_handshake_req_reply_wait(ioc, sgeoffset, (u32*)prequest,

				reply_sz, (u16*)preply, 65 /*seconds*/, sleepFlag);



	dinitprintk((KERN_WARNING MYNAM "FW Upload completed rc=%x \n", ii));

	dinitprintk((KERN_INFO MYNAM ": FW Upload completed rc=%x \n", ii));



	cmdStatus = -EFAULT;

	if (ii == 0) {
@@ -2638,7 +2637,7 @@ mpt_do_upload(MPT_ADAPTER *ioc, int sleepFlag) 
				cmdStatus = 0;

		}

	}

	dinitprintk((MYIOC_s_INFO_FMT ": do_upload status %d \n",

	dinitprintk((MYIOC_s_INFO_FMT ": do_upload cmdStatus=%d \n",

			ioc->name, cmdStatus));
@@ -2772,8 +2771,8 @@ mpt_downloadboot(MPT_ADAPTER *ioc, int sleepFlag) 
		fwSize = (pExtImage->ImageSize + 3) >> 2;

		ptrFw = (u32 *)pExtImage;



		ddlprintk((MYIOC_s_INFO_FMT "Write Ext Image: 0x%x bytes @ %p load_addr=%x\n",

						ioc->name, fwSize*4, ptrFw, load_addr));

		ddlprintk((MYIOC_s_INFO_FMT "Write Ext Image: 0x%x (%d) bytes @ %p load_addr=%x\n",

						ioc->name, fwSize*4, fwSize*4, ptrFw, load_addr));

		CHIPREG_PIO_WRITE32(&ioc->pio_chip->DiagRwAddress, load_addr);



		while (fwSize--) {
@@ -3181,7 +3180,7 @@ SendIocReset(MPT_ADAPTER *ioc, u8 reset_type, int sleepFlag) 
	u32 state;

	int cntdn, count;



	drsprintk((KERN_WARNING MYNAM ": %s: Sending IOC reset(0x%02x)!\n",

	drsprintk((KERN_INFO MYNAM ": %s: Sending IOC reset(0x%02x)!\n",

			ioc->name, reset_type));

	CHIPREG_WRITE32(&ioc->chip->Doorbell, reset_type<<MPI_DOORBELL_FUNCTION_SHIFT);

	if ((r = WaitForDoorbellAck(ioc, 5, sleepFlag)) < 0)
@@ -3385,6 +3384,9 @@ PrimeIocFifos(MPT_ADAPTER *ioc) 
		ioc->reply_frames = (MPT_FRAME_HDR *) mem;

		ioc->reply_frames_low_dma = (u32) (alloc_dma & 0xFFFFFFFF);



		dinitprintk((KERN_INFO MYNAM ": %s ReplyBuffers @ %p[%p]\n",

	 		ioc->name, ioc->reply_frames, (void *)(ulong)alloc_dma));



		alloc_dma += reply_sz;

		mem += reply_sz;
@@ -3393,7 +3395,7 @@ PrimeIocFifos(MPT_ADAPTER *ioc) 
		ioc->req_frames = (MPT_FRAME_HDR *) mem;

		ioc->req_frames_dma = alloc_dma;



		dinitprintk((KERN_INFO MYNAM ": %s.RequestBuffers @ %p[%p]\n",

		dinitprintk((KERN_INFO MYNAM ": %s RequestBuffers @ %p[%p]\n",

			 	ioc->name, mem, (void *)(ulong)alloc_dma));



		ioc->req_frames_low_dma = (u32) (alloc_dma & 0xFFFFFFFF);
@@ -3419,7 +3421,7 @@ PrimeIocFifos(MPT_ADAPTER *ioc) 
		ioc->ChainBuffer = mem;

		ioc->ChainBufferDMA = alloc_dma;



		dinitprintk((KERN_INFO MYNAM " :%s.ChainBuffers @ %p(%p)\n",

		dinitprintk((KERN_INFO MYNAM " :%s ChainBuffers @ %p(%p)\n",

			ioc->name, ioc->ChainBuffer, (void *)(ulong)ioc->ChainBufferDMA));



		/* Initialize the free chain Q.
@@ -4133,6 +4135,8 @@ mpt_GetScsiPortSettings(MPT_ADAPTER *ioc, int portnum) 
				ioc->spi_data.minSyncFactor = MPT_ASYNC;

				ioc->spi_data.busType = MPT_HOST_BUS_UNKNOWN;

				rc = 1;

				ddvprintk((MYIOC_s_INFO_FMT "Unable to read PortPage0 minSyncFactor=%x\n",

					ioc->name, ioc->spi_data.minSyncFactor));

			} else {

				/* Save the Port Page 0 data

				 */
@@ -4142,7 +4146,7 @@ mpt_GetScsiPortSettings(MPT_ADAPTER *ioc, int portnum) 


				if ( (pPP0->Capabilities & MPI_SCSIPORTPAGE0_CAP_QAS) == 0 ) {

					ioc->spi_data.noQas |= MPT_TARGET_NO_NEGO_QAS;

					dinitprintk((KERN_INFO MYNAM " :%s noQas due to Capabilities=%x\n",

					ddvprintk((KERN_INFO MYNAM " :%s noQas due to Capabilities=%x\n",

						ioc->name, pPP0->Capabilities));

				}

				ioc->spi_data.maxBusWidth = pPP0->Capabilities & MPI_SCSIPORTPAGE0_CAP_WIDE ? 1 : 0;
@@ -4151,6 +4155,8 @@ mpt_GetScsiPortSettings(MPT_ADAPTER *ioc, int portnum) 
					ioc->spi_data.maxSyncOffset = (u8) (data >> 16);

					data = pPP0->Capabilities & MPI_SCSIPORTPAGE0_CAP_MIN_SYNC_PERIOD_MASK;

					ioc->spi_data.minSyncFactor = (u8) (data >> 8);

					ddvprintk((MYIOC_s_INFO_FMT "PortPage0 minSyncFactor=%x\n",

						ioc->name, ioc->spi_data.minSyncFactor));

				} else {

					ioc->spi_data.maxSyncOffset = 0;

					ioc->spi_data.minSyncFactor = MPT_ASYNC;
@@ -4163,8 +4169,11 @@ mpt_GetScsiPortSettings(MPT_ADAPTER *ioc, int portnum) 
				if ((ioc->spi_data.busType == MPI_SCSIPORTPAGE0_PHY_SIGNAL_HVD) ||

					(ioc->spi_data.busType == MPI_SCSIPORTPAGE0_PHY_SIGNAL_SE))  {



				if (ioc->spi_data.minSyncFactor < MPT_ULTRA)

					if (ioc->spi_data.minSyncFactor < MPT_ULTRA) {

						ioc->spi_data.minSyncFactor = MPT_ULTRA;

						ddvprintk((MYIOC_s_INFO_FMT "HVD or SE detected, minSyncFactor=%x\n",

							ioc->name, ioc->spi_data.minSyncFactor));

					}

				}

			}

			if (pbuf) {
@@ -4591,13 +4600,13 @@ SendEventNotification(MPT_ADAPTER *ioc, u8 EvSwitch) 


	evnp = (EventNotification_t *) mpt_get_msg_frame(mpt_base_index, ioc);

	if (evnp == NULL) {

		dprintk((MYIOC_s_WARN_FMT "Unable to allocate event request frame!\n",

		devtprintk((MYIOC_s_WARN_FMT "Unable to allocate event request frame!\n",

				ioc->name));

		return 0;

	}

	memset(evnp, 0, sizeof(*evnp));



	dprintk((MYIOC_s_INFO_FMT "Sending EventNotification(%d)\n", ioc->name, EvSwitch));

	devtprintk((MYIOC_s_INFO_FMT "Sending EventNotification (%d) request %p\n", ioc->name, EvSwitch, evnp));



	evnp->Function = MPI_FUNCTION_EVENT_NOTIFICATION;

	evnp->ChainOffset = 0;
@@ -4621,8 +4630,10 @@ SendEventAck(MPT_ADAPTER *ioc, EventNotificationReply_t *evnp) 
	EventAck_t	*pAck;



	if ((pAck = (EventAck_t *) mpt_get_msg_frame(mpt_base_index, ioc)) == NULL) {

		printk(MYIOC_s_WARN_FMT "Unable to allocate event ACK request frame!\n",

				ioc->name);

		printk(MYIOC_s_WARN_FMT "Unable to allocate event ACK "

			"request frame for Event=%x EventContext=%x EventData=%x!\n",

			ioc->name, evnp->Event, le32_to_cpu(evnp->EventContext),

			le32_to_cpu(evnp->Data[0]));

		return -1;

	}

	memset(pAck, 0, sizeof(*pAck));
@@ -5538,6 +5549,8 @@ ProcessEventNotification(MPT_ADAPTER *ioc, EventNotificationReply_t *pEventReply 
	 *  If needed, send (a single) EventAck.

	 */

	if (pEventReply->AckRequired == MPI_EVENT_NOTIFICATION_ACK_REQUIRED) {

		devtprintk((MYIOC_s_WARN_FMT

			"EventAck required\n",ioc->name));

		if ((ii = SendEventAck(ioc, pEventReply)) != 0) {

			devtprintk((MYIOC_s_WARN_FMT "SendEventAck returned %d\n",

					ioc->name, ii));

drivers/message/fusion/mptscsih.c

+52 −46
Original line number Diff line number Diff line
@@ -281,12 +281,12 @@ mptscsih_getFreeChainBuffer(MPT_ADAPTER *ioc, int *retIndex) 
		offset = (u8 *)chainBuf - (u8 *)ioc->ChainBuffer;

		chain_idx = offset / ioc->req_sz;

		rc = SUCCESS;

		dsgprintk((MYIOC_s_INFO_FMT "getFreeChainBuffer (index %d), got buf=%p\n",

			ioc->name, *retIndex, chainBuf));

		dsgprintk((MYIOC_s_ERR_FMT "getFreeChainBuffer chainBuf=%p ChainBuffer=%p offset=%d chain_idx=%d\n",

			ioc->name, chainBuf, ioc->ChainBuffer, offset, chain_idx));

	} else {

		rc = FAILED;

		chain_idx = MPT_HOST_NO_CHAIN;

		dfailprintk((MYIOC_s_ERR_FMT "getFreeChainBuffer failed\n",

		dfailprintk((MYIOC_s_INFO_FMT "getFreeChainBuffer failed\n",

			ioc->name));

	}

	spin_unlock_irqrestore(&ioc->FreeQlock, flags);
@@ -432,7 +432,7 @@ mptscsih_AddSGE(MPT_ADAPTER *ioc, struct scsi_cmnd *SCpnt, 
			 */

			pReq->ChainOffset = 0;

			RequestNB = (((sgeOffset - 1) >> ioc->NBShiftFactor)  + 1) & 0x03;

			dsgprintk((MYIOC_s_ERR_FMT 

			dsgprintk((MYIOC_s_INFO_FMT

			    "Single Buffer RequestNB=%x, sgeOffset=%d\n", ioc->name, RequestNB, sgeOffset));

			ioc->RequestNB[req_idx] = RequestNB;

		}
@@ -491,11 +491,12 @@ mptscsih_AddSGE(MPT_ADAPTER *ioc, struct scsi_cmnd *SCpnt, 
		/* NOTE: psge points to the beginning of the chain element

		 * in current buffer. Get a chain buffer.

		 */

		dsgprintk((MYIOC_s_INFO_FMT 

		    "calling getFreeChainBuffer SCSI cmd=%02x (%p)\n",

		if ((mptscsih_getFreeChainBuffer(ioc, &newIndex)) == FAILED) {

			dfailprintk((MYIOC_s_INFO_FMT

			    "getFreeChainBuffer FAILED SCSI cmd=%02x (%p)\n",

 			    ioc->name, pReq->CDB[0], SCpnt));

		if ((mptscsih_getFreeChainBuffer(ioc, &newIndex)) == FAILED)

			return FAILED;

		}



		/* Update the tracking arrays.

		 * If chainSge == NULL, update ReqToChain, else ChainToChain
@@ -577,14 +578,20 @@ mptscsih_io_done(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *mr) 
		return 1;

	}



	dmfprintk((MYIOC_s_INFO_FMT

		"ScsiDone (mf=%p,mr=%p,sc=%p,idx=%d)\n",

		ioc->name, mf, mr, sc, req_idx));



	sc->result = DID_OK << 16;		/* Set default reply as OK */

	pScsiReq = (SCSIIORequest_t *) mf;

	pScsiReply = (SCSIIOReply_t *) mr;



	if((ioc->facts.MsgVersion >= MPI_VERSION_01_05) && pScsiReply){

		dmfprintk((MYIOC_s_INFO_FMT

			"ScsiDone (mf=%p,mr=%p,sc=%p,idx=%d,task-tag=%d)\n",

			ioc->name, mf, mr, sc, req_idx, pScsiReply->TaskTag));

	}else{

		dmfprintk((MYIOC_s_INFO_FMT

			"ScsiDone (mf=%p,mr=%p,sc=%p,idx=%d)\n",

			ioc->name, mf, mr, sc, req_idx));

	}



	if (pScsiReply == NULL) {

		/* special context reply handling */

		;
@@ -668,7 +675,9 @@ mptscsih_io_done(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *mr) 
			} else {

				sc->result = DID_SOFT_ERROR << 16;

			}

			dreplyprintk((KERN_NOTICE "RESIDUAL_MISMATCH: result=%x on id=%d\n", sc->result, sc->target));

			dreplyprintk((KERN_NOTICE

			    "RESIDUAL_MISMATCH: result=%x on id=%d\n",

			    sc->result, sc->device->id));

			break;



		case MPI_IOCSTATUS_SCSI_DATA_UNDERRUN:		/* 0x0045 */
@@ -796,7 +805,6 @@ mptscsih_io_done(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *mr) 
	return 1;

}





/*

 *	mptscsih_flush_running_cmds - For each command found, search

 *		Scsi_Host instance taskQ and reply to OS.
@@ -1535,17 +1543,17 @@ mptscsih_TMHandler(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 target, u8 lun, in 
	 */

	if (mptscsih_tm_pending_wait(hd) == FAILED) {

		if (type == MPI_SCSITASKMGMT_TASKTYPE_ABORT_TASK) {

			dtmprintk((KERN_WARNING MYNAM ": %s: TMHandler abort: "

			dtmprintk((KERN_INFO MYNAM ": %s: TMHandler abort: "

			   "Timed out waiting for last TM (%d) to complete! \n",

			   hd->ioc->name, hd->tmPending));

			return FAILED;

		} else if (type == MPI_SCSITASKMGMT_TASKTYPE_TARGET_RESET) {

			dtmprintk((KERN_WARNING MYNAM ": %s: TMHandler target reset: "

			dtmprintk((KERN_INFO MYNAM ": %s: TMHandler target reset: "

			   "Timed out waiting for last TM (%d) to complete! \n",

			   hd->ioc->name, hd->tmPending));

			return FAILED;

		} else if (type == MPI_SCSITASKMGMT_TASKTYPE_RESET_BUS) {

			dtmprintk((KERN_WARNING MYNAM ": %s: TMHandler bus reset: "

			dtmprintk((KERN_INFO MYNAM ": %s: TMHandler bus reset: "

			   "Timed out waiting for last TM (%d) to complete! \n",

			   hd->ioc->name, hd->tmPending));

			if (hd->tmPending & (1 << MPI_SCSITASKMGMT_TASKTYPE_RESET_BUS))
@@ -1631,8 +1639,7 @@ mptscsih_IssueTaskMgmt(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 target, u8 lun 
	if ((mf = mpt_get_msg_frame(hd->ioc->TaskCtx, hd->ioc)) == NULL) {

		dfailprintk((MYIOC_s_ERR_FMT "IssueTaskMgmt, no msg frames!!\n",

				hd->ioc->name));

		//return FAILED;

		return -999;

		return FAILED;

	}

	dtmprintk((MYIOC_s_INFO_FMT "IssueTaskMgmt request @ %p\n",

			hd->ioc->name, mf));
@@ -1661,8 +1668,7 @@ mptscsih_IssueTaskMgmt(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 target, u8 lun 


	pScsiTm->TaskMsgContext = ctx2abort;



	dtmprintk((MYIOC_s_INFO_FMT

		"IssueTaskMgmt: ctx2abort (0x%08x) type=%d\n",

	dtmprintk((MYIOC_s_INFO_FMT "IssueTaskMgmt: ctx2abort (0x%08x) type=%d\n",

			hd->ioc->name, ctx2abort, type));



	DBG_DUMP_TM_REQUEST_FRAME((u32 *)pScsiTm);
@@ -1902,13 +1908,13 @@ mptscsih_host_reset(struct scsi_cmnd *SCpnt) 


	/*  If we can't locate the host to reset, then we failed. */

	if ((hd = (MPT_SCSI_HOST *) SCpnt->device->host->hostdata) == NULL){

		dtmprintk( ( KERN_WARNING MYNAM ": mptscsih_host_reset: "

		dtmprintk( ( KERN_INFO MYNAM ": mptscsih_host_reset: "

			     "Can't locate host! (sc=%p)\n",

			     SCpnt ) );

		return FAILED;

	}



	printk(KERN_WARNING MYNAM ": %s: >> Attempting host reset! (sc=%p)\n",

	printk(KERN_WARNING MYNAM ": %s: Attempting host reset! (sc=%p)\n",

	       hd->ioc->name, SCpnt);



	/*  If our attempts to reset the host failed, then return a failed
@@ -1924,7 +1930,7 @@ mptscsih_host_reset(struct scsi_cmnd *SCpnt) 
		hd->tmState = TM_STATE_NONE;

	}



	dtmprintk( ( KERN_WARNING MYNAM ": mptscsih_host_reset: "

	dtmprintk( ( KERN_INFO MYNAM ": mptscsih_host_reset: "

		     "Status = %s\n",

		     (status == SUCCESS) ? "SUCCESS" : "FAILED" ) );
@@ -1951,8 +1957,8 @@ mptscsih_tm_pending_wait(MPT_SCSI_HOST * hd) 
		if (hd->tmState == TM_STATE_NONE) {

			hd->tmState = TM_STATE_IN_PROGRESS;

			hd->tmPending = 1;

			status = SUCCESS;

			spin_unlock_irqrestore(&hd->ioc->FreeQlock, flags);

			status = SUCCESS;

			break;

		}

		spin_unlock_irqrestore(&hd->ioc->FreeQlock, flags);
@@ -3194,7 +3200,7 @@ mptscsih_writeSDP1(MPT_SCSI_HOST *hd, int portnum, int target_id, int flags) 
		/* Get a MF for this command.

		 */

		if ((mf = mpt_get_msg_frame(ioc->DoneCtx, ioc)) == NULL) {

			dprintk((MYIOC_s_WARN_FMT "write SDP1: no msg frames!\n",

			dfailprintk((MYIOC_s_WARN_FMT "write SDP1: no msg frames!\n",

				ioc->name));

			return -EAGAIN;

		}
@@ -3289,7 +3295,7 @@ mptscsih_writeIOCPage4(MPT_SCSI_HOST *hd, int target_id, int bus) 
	/* Get a MF for this command.

	 */

	if ((mf = mpt_get_msg_frame(ioc->DoneCtx, ioc)) == NULL) {

		dprintk((MYIOC_s_WARN_FMT "writeIOCPage4 : no msg frames!\n",

		dfailprintk((MYIOC_s_WARN_FMT "writeIOCPage4 : no msg frames!\n",

					ioc->name));

		return -EAGAIN;

	}

drivers/message/fusion/mptspi.c

+3 −3

File changed.

Contains only whitespace changes.