Commit 466544d8 authored by Moore, Eric Dean's avatar Moore, Eric Dean Committed by James Bottomley
Browse files

[SCSI] fusion SAS support (mptsas driver) updates 



Summary of Changes:
* splitting mpt_interrupt per Christophs suggestion
about a month ago
* rename ScsiCfgData to SpiCfgData structure,
then move all the raid related info into
new structure called RaidCfgData.  This is
done because SAS supports RAID, as well as SPI,
so the raid stuff should be seperate.
* incorrect timeout calculation for cntdn
inside WaitForDoorbellAck and WaitForDoortbellInt
* add support for interpreting SAS Log Info
* Increase Event Log Size from 0xA to 0x32
* Fix bug in mptsas/mptfc/mptspi - when controller
has Initiator Mode Disabled, and only running in
TargetMode, the mptctl would panic when loading.
The fix is to return 0, instead of -ENODEV, in
SCSI LLD respective probe routines
* Fix bug in mptlan.c - driver will panic if
there is host reset, due to dev being set to
zero in mpt_lan_ioc_reset
* Fix's for SPI - Echo Buffer
* Several fix's in mptscsih_io_done - FCP Response
info, RESIDUAL_MISMATCH, Data Underrun, etc.
* Cleanup Error Handling - EH handlers,
mptscsih_flush_cmds, and zeroing out ScsiLookup
from mptscsih_qcmd
* Cleanup asyn event handling from
mptscsih -> mptscsih_event_process.  Also
added support for SAS Persistent Table Full,
an asyn event

Signed-off-by: default avatarEric Moore <Eric.Moore@lsil.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 0c33b27d

drivers/message/fusion/mptbase.c

+282 −167
Original line number Diff line number Diff line
@@ -135,7 +135,6 @@ static void mpt_adapter_dispose(MPT_ADAPTER *ioc); 


static void	MptDisplayIocCapabilities(MPT_ADAPTER *ioc);

static int	MakeIocReady(MPT_ADAPTER *ioc, int force, int sleepFlag);

//static u32	mpt_GetIocState(MPT_ADAPTER *ioc, int cooked);

static int	GetIocFacts(MPT_ADAPTER *ioc, int sleepFlag, int reason);

static int	GetPortFacts(MPT_ADAPTER *ioc, int portnum, int sleepFlag);

static int	SendIocInit(MPT_ADAPTER *ioc, int sleepFlag);
@@ -178,6 +177,7 @@ static int ProcessEventNotification(MPT_ADAPTER *ioc, EventNotificationReply_t * 
static void	mpt_sp_ioc_info(MPT_ADAPTER *ioc, u32 ioc_status, MPT_FRAME_HDR *mf);

static void	mpt_fc_log_info(MPT_ADAPTER *ioc, u32 log_info);

static void	mpt_sp_log_info(MPT_ADAPTER *ioc, u32 log_info);

static void	mpt_sas_log_info(MPT_ADAPTER *ioc, u32 log_info);



/* module entry point */

static int  __init    fusion_init  (void);
@@ -209,58 +209,79 @@ pci_enable_io_access(struct pci_dev *pdev) 
	pci_write_config_word(pdev, PCI_COMMAND, command_reg);

}



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

/*

 *	mpt_interrupt - MPT adapter (IOC) specific interrupt handler.

 *	@irq: irq number (not used)

 *	@bus_id: bus identifier cookie == pointer to MPT_ADAPTER structure

 *	@r: pt_regs pointer (not used)

 *

 *	This routine is registered via the request_irq() kernel API call,

 *	and handles all interrupts generated from a specific MPT adapter

 *	(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.

 *

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

 *	dispatches (calls) a protocol-specific callback routine to handle

 *	the protocol-specific details of the MPT request completion.

 *  Process turbo (context) reply...

 */

static irqreturn_t

mpt_interrupt(int irq, void *bus_id, struct pt_regs *r)

static void

mpt_turbo_reply(MPT_ADAPTER *ioc, u32 pa)

{

	MPT_ADAPTER	*ioc;

	MPT_FRAME_HDR	*mf;

	MPT_FRAME_HDR	*mr;

	u32		 pa;

	int		 req_idx;

	MPT_FRAME_HDR *mf = NULL;

	MPT_FRAME_HDR *mr = NULL;

	int req_idx = 0;

	int cb_idx;

	int		 type;

	int		 freeme;



	ioc = (MPT_ADAPTER *)bus_id;

	dmfprintk((MYIOC_s_INFO_FMT "Got TURBO reply req_idx=%08x\n",

				ioc->name, pa));



	switch (pa >> MPI_CONTEXT_REPLY_TYPE_SHIFT) {

	case MPI_CONTEXT_REPLY_TYPE_SCSI_INIT:

		req_idx = pa & 0x0000FFFF;

		cb_idx = (pa & 0x00FF0000) >> 16;

		mf = MPT_INDEX_2_MFPTR(ioc, req_idx);

		break;

	case MPI_CONTEXT_REPLY_TYPE_LAN:

		cb_idx = mpt_lan_index;

		/*

	 *  Drain the reply FIFO!

	 *

	 * NOTES: I've seen up to 10 replies processed in this loop, so far...

	 * Update: I've seen up to 9182 replies processed in this loop! ??

	 * Update: Limit ourselves to processing max of N replies

	 *	(bottom of loop).

		 *  Blind set of mf to NULL here was fatal

		 *  after lan_reply says "freeme"

		 *  Fix sort of combined with an optimization here;

		 *  added explicit check for case where lan_reply

		 *  was just returning 1 and doing nothing else.

		 *  For this case skip the callback, but set up

		 *  proper mf value first here:-)

		 */

	while (1) {

		if ((pa & 0x58000000) == 0x58000000) {

			req_idx = pa & 0x0000FFFF;

			mf = MPT_INDEX_2_MFPTR(ioc, req_idx);

			mpt_free_msg_frame(ioc, mf);

			mb();

			return;

			break;

		}

		mr = (MPT_FRAME_HDR *) CAST_U32_TO_PTR(pa);

		break;

	case MPI_CONTEXT_REPLY_TYPE_SCSI_TARGET:

		cb_idx = mpt_stm_index;

		mr = (MPT_FRAME_HDR *) CAST_U32_TO_PTR(pa);

		break;

	default:

		cb_idx = 0;

		BUG();

	}



		if ((pa = CHIPREG_READ32_dmasync(&ioc->chip->ReplyFifo)) == 0xFFFFFFFF)

			return IRQ_HANDLED;

	/*  Check for (valid) IO callback!  */

	if (cb_idx < 1 || cb_idx >= MPT_MAX_PROTOCOL_DRIVERS ||

			MptCallbacks[cb_idx] == NULL) {

		printk(MYIOC_s_WARN_FMT "%s: Invalid cb_idx (%d)!\n",

				__FUNCTION__, ioc->name, cb_idx);

		goto out;

	}



		cb_idx = 0;

		freeme = 0;

	if (MptCallbacks[cb_idx](ioc, mf, mr))

		mpt_free_msg_frame(ioc, mf);

 out:

	mb();

}



static void

mpt_reply(MPT_ADAPTER *ioc, u32 pa)

{

	MPT_FRAME_HDR	*mf;

	MPT_FRAME_HDR	*mr;

	int		 req_idx;

	int		 cb_idx;

	int		 freeme;



		/*

		 *  Check for non-TURBO reply!

		 */

		if (pa & MPI_ADDRESS_REPLY_A_BIT) {

	u32 reply_dma_low;

	u16 ioc_stat;
@@ -273,7 +294,8 @@ mpt_interrupt(int irq, void *bus_id, struct pt_regs *r) 
	 * pa is 32 bits - but the dma address may be 32 or 64 bits

	 * get offset based only only the low addresses

	 */

			reply_dma_low = (pa = (pa << 1));



	reply_dma_low = (pa <<= 1);

	mr = (MPT_FRAME_HDR *)((u8 *)ioc->reply_frames +

			 (reply_dma_low - ioc->reply_frames_low_dma));
@@ -294,100 +316,73 @@ mpt_interrupt(int irq, void *bus_id, struct pt_regs *r) 
			mpt_fc_log_info(ioc, log_info);

		else if (ioc->bus_type == SCSI)

			mpt_sp_log_info(ioc, log_info);

		else if (ioc->bus_type == SAS)

			mpt_sas_log_info(ioc, log_info);

	}

	if (ioc_stat & MPI_IOCSTATUS_MASK) {

				if (ioc->bus_type == SCSI)

		if (ioc->bus_type == SCSI &&

		    cb_idx != mpt_stm_index &&

		    cb_idx != mpt_lan_index)

			mpt_sp_ioc_info(ioc, (u32)ioc_stat, mf);

	}

		} else {

			/*

			 *  Process turbo (context) reply...

			 */

			dmfprintk((MYIOC_s_INFO_FMT "Got TURBO reply req_idx=%08x\n", ioc->name, pa));

			type = (pa >> MPI_CONTEXT_REPLY_TYPE_SHIFT);

			if (type == MPI_CONTEXT_REPLY_TYPE_SCSI_TARGET) {

				cb_idx = mpt_stm_index;

				mf = NULL;

				mr = (MPT_FRAME_HDR *) CAST_U32_TO_PTR(pa);

			} else if (type == MPI_CONTEXT_REPLY_TYPE_LAN) {

				cb_idx = mpt_lan_index;

				 /*  Blind set of mf to NULL here was fatal

				 *  after lan_reply says "freeme"

				 *  Fix sort of combined with an optimization here;

				 *  added explicit check for case where lan_reply

				 *  was just returning 1 and doing nothing else.

				 *  For this case skip the callback, but set up

				 *  proper mf value first here:-)

				 */

				if ((pa & 0x58000000) == 0x58000000) {

					req_idx = pa & 0x0000FFFF;

					mf = MPT_INDEX_2_MFPTR(ioc, req_idx);

					freeme = 1;

					/*

					 *  IMPORTANT!  Invalidate the callback!

					 */

					cb_idx = 0;

				} else {

					mf = NULL;

				}

				mr = (MPT_FRAME_HDR *) CAST_U32_TO_PTR(pa);

			} else {

				req_idx = pa & 0x0000FFFF;

				cb_idx = (pa & 0x00FF0000) >> 16;

				mf = MPT_INDEX_2_MFPTR(ioc, req_idx);

				mr = NULL;

			}

			pa = 0;					/* No reply flush! */

		}



#ifdef MPT_DEBUG_IRQ

		if (ioc->bus_type == SCSI) {

			/* Verify mf, mr are reasonable.

			 */

			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)!\n", ioc->name, (void *)mf);

				cb_idx = 0;

				pa = 0;

				freeme = 0;

			}

			if ((pa) && (mr) && ((mr >= MPT_INDEX_2_RFPTR(ioc, ioc->req_depth))

				|| (mr < ioc->reply_frames)) ) {

				printk(MYIOC_s_WARN_FMT

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

				cb_idx = 0;

				pa = 0;

				freeme = 0;

			}

			if (cb_idx > (MPT_MAX_PROTOCOL_DRIVERS-1)) {

				printk(MYIOC_s_WARN_FMT

					"mpt_interrupt: Invalid cb_idx (%d)!\n", ioc->name, cb_idx);

				cb_idx = 0;

				pa = 0;

				freeme = 0;

			}

		}

#endif



	/*  Check for (valid) IO callback!  */

		if (cb_idx) {

			/*  Do the callback!  */

			freeme = (*(MptCallbacks[cb_idx]))(ioc, mf, mr);

	if (cb_idx < 1 || cb_idx >= MPT_MAX_PROTOCOL_DRIVERS ||

			MptCallbacks[cb_idx] == NULL) {

		printk(MYIOC_s_WARN_FMT "%s: Invalid cb_idx (%d)!\n",

				__FUNCTION__, ioc->name, cb_idx);

		freeme = 0;

		goto out;

	}



		if (pa) {

	freeme = MptCallbacks[cb_idx](ioc, mf, mr);



 out:

	/*  Flush (non-TURBO) reply with a WRITE!  */

	CHIPREG_WRITE32(&ioc->chip->ReplyFifo, pa);

		}



		if (freeme) {

			/*  Put Request back on FreeQ!  */

	if (freeme)

		mpt_free_msg_frame(ioc, mf);

	mb();

}



		mb();

	}	/* drain reply FIFO */

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

/*

 *	mpt_interrupt - MPT adapter (IOC) specific interrupt handler.

 *	@irq: irq number (not used)

 *	@bus_id: bus identifier cookie == pointer to MPT_ADAPTER structure

 *	@r: pt_regs pointer (not used)

 *

 *	This routine is registered via the request_irq() kernel API call,

 *	and handles all interrupts generated from a specific MPT adapter

 *	(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.

 *

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

 *	dispatches (calls) a protocol-specific callback routine to handle

 *	the protocol-specific details of the MPT request completion.

 */

static irqreturn_t

mpt_interrupt(int irq, void *bus_id, struct pt_regs *r)

{

	MPT_ADAPTER *ioc = bus_id;

	u32 pa;



	/*

	 *  Drain the reply FIFO!

	 */

	while (1) {

		pa = CHIPREG_READ32_dmasync(&ioc->chip->ReplyFifo);

		if (pa == 0xFFFFFFFF)

			return IRQ_HANDLED;

		else if (pa & MPI_ADDRESS_REPLY_A_BIT)

			mpt_reply(ioc, pa);

		else

			mpt_turbo_reply(ioc, pa);

	}



	return IRQ_HANDLED;

}
@@ -1065,7 +1060,7 @@ mpt_host_page_alloc(MPT_ADAPTER *ioc, pIOCInit_t ioc_init) 
				    ioc->name,

				    ioc->HostPageBuffer,

				    ioc->HostPageBuffer_dma,

				    hst_page_buffer_sz));

				    host_page_buffer_sz));

				ioc->alloc_total += host_page_buffer_sz;

				ioc->HostPageBuffer_sz = host_page_buffer_sz;

				break;
@@ -1208,7 +1203,7 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id) 


	/* Initilize SCSI Config Data structure

	 */

	memset(&ioc->spi_data, 0, sizeof(ScsiCfgData));

	memset(&ioc->spi_data, 0, sizeof(SpiCfgData));



	/* Initialize the running configQ head.

	 */
@@ -1755,8 +1750,23 @@ mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u32 reason, int sleepFlag) 
			 */

			if (ret == 0) {

				rc = mpt_do_upload(ioc, sleepFlag);

				if (rc != 0)

				if (rc == 0) {

					if (ioc->alt_ioc && ioc->alt_ioc->cached_fw) {

						/*

						 * Maintain only one pointer to FW memory

						 * so there will not be two attempt to

						 * downloadboot onboard dual function

						 * chips (mpt_adapter_disable,

						 * mpt_diag_reset)

						 */

						ioc->cached_fw = NULL;

						ddlprintk((MYIOC_s_INFO_FMT ": mpt_upload:  alt_%s has cached_fw=%p \n",

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

					}

				} else {

					printk(KERN_WARNING MYNAM ": firmware upload failure!\n");

					ret = -5;

				}

			}

		}

	}
@@ -1997,9 +2007,9 @@ mpt_adapter_disable(MPT_ADAPTER *ioc) 
	}



	kfree(ioc->spi_data.nvram);

	kfree(ioc->spi_data.pIocPg3);

	kfree(ioc->raid_data.pIocPg3);

	ioc->spi_data.nvram = NULL;

	ioc->spi_data.pIocPg3 = NULL;

	ioc->raid_data.pIocPg3 = NULL;



	if (ioc->spi_data.pIocPg4 != NULL) {

		sz = ioc->spi_data.IocPg4Sz;
@@ -3852,7 +3862,7 @@ WaitForDoorbellAck(MPT_ADAPTER *ioc, int howlong, int sleepFlag) 
	int count = 0;

	u32 intstat=0;



	cntdn = ((sleepFlag == CAN_SLEEP) ? HZ : 1000) * howlong;

	cntdn = 1000 * howlong;



	if (sleepFlag == CAN_SLEEP) {

		while (--cntdn) {
@@ -3902,7 +3912,7 @@ WaitForDoorbellInt(MPT_ADAPTER *ioc, int howlong, int sleepFlag) 
	int count = 0;

	u32 intstat=0;



	cntdn = ((sleepFlag == CAN_SLEEP) ? HZ : 1000) * howlong;

	cntdn = 1000 * howlong;

	if (sleepFlag == CAN_SLEEP) {

		while (--cntdn) {

			intstat = CHIPREG_READ32(&ioc->chip->IntStatus);
@@ -4634,10 +4644,10 @@ mpt_findImVolumes(MPT_ADAPTER *ioc) 
	if (mpt_config(ioc, &cfg) != 0)

		goto done_and_free;



	if ( (mem = (u8 *)ioc->spi_data.pIocPg2) == NULL ) {

	if ( (mem = (u8 *)ioc->raid_data.pIocPg2) == NULL ) {

		mem = kmalloc(iocpage2sz, GFP_ATOMIC);

		if (mem) {

			ioc->spi_data.pIocPg2 = (IOCPage2_t *) mem;

			ioc->raid_data.pIocPg2 = (IOCPage2_t *) mem;

		} else {

			goto done_and_free;

		}
@@ -4654,7 +4664,7 @@ mpt_findImVolumes(MPT_ADAPTER *ioc) 
		/* At least 1 RAID Volume

		 */

		pIocRv = pIoc2->RaidVolume;

		ioc->spi_data.isRaid = 0;

		ioc->raid_data.isRaid = 0;

		for (jj = 0; jj < nVols; jj++, pIocRv++) {

			vid = pIocRv->VolumeID;

			vbus = pIocRv->VolumeBus;
@@ -4663,7 +4673,7 @@ mpt_findImVolumes(MPT_ADAPTER *ioc) 
			/* find the match

			 */

			if (vbus == 0) {

				ioc->spi_data.isRaid |= (1 << vid);

				ioc->raid_data.isRaid |= (1 << vid);

			} else {

				/* Error! Always bus 0

				 */
@@ -4698,8 +4708,8 @@ mpt_read_ioc_pg_3(MPT_ADAPTER *ioc) 


	/* Free the old page

	 */

	kfree(ioc->spi_data.pIocPg3);

	ioc->spi_data.pIocPg3 = NULL;

	kfree(ioc->raid_data.pIocPg3);

	ioc->raid_data.pIocPg3 = NULL;



	/* There is at least one physical disk.

	 * Read and save IOC Page 3
@@ -4736,7 +4746,7 @@ mpt_read_ioc_pg_3(MPT_ADAPTER *ioc) 
		mem = kmalloc(iocpage3sz, GFP_ATOMIC);

		if (mem) {

			memcpy(mem, (u8 *)pIoc3, iocpage3sz);

			ioc->spi_data.pIocPg3 = (IOCPage3_t *) mem;

			ioc->raid_data.pIocPg3 = (IOCPage3_t *) mem;

		}

	}
@@ -6022,6 +6032,111 @@ mpt_sp_log_info(MPT_ADAPTER *ioc, u32 log_info) 
	printk(MYIOC_s_INFO_FMT "LogInfo(0x%08x): F/W: %s\n", ioc->name, log_info, desc);

}



/* strings for sas loginfo */

	static char *originator_str[] = {

		"IOP",						/* 00h */

		"PL",						/* 01h */

		"IR"						/* 02h */

	};

	static char *iop_code_str[] = {

		NULL,						/* 00h */

		"Invalid SAS Address",				/* 01h */

		NULL,						/* 02h */

		"Invalid Page",					/* 03h */

		NULL,						/* 04h */

		"Task Terminated"				/* 05h */

	};

	static char *pl_code_str[] = {

		NULL,						/* 00h */

		"Open Failure",					/* 01h */

		"Invalid Scatter Gather List",			/* 02h */

		"Wrong Relative Offset or Frame Length",	/* 03h */

		"Frame Transfer Error",				/* 04h */

		"Transmit Frame Connected Low",			/* 05h */

		"SATA Non-NCQ RW Error Bit Set",		/* 06h */

		"SATA Read Log Receive Data Error",		/* 07h */

		"SATA NCQ Fail All Commands After Error",	/* 08h */

		"SATA Error in Receive Set Device Bit FIS",	/* 09h */

		"Receive Frame Invalid Message",		/* 0Ah */

		"Receive Context Message Valid Error",		/* 0Bh */

		"Receive Frame Current Frame Error",		/* 0Ch */

		"SATA Link Down",				/* 0Dh */

		"Discovery SATA Init W IOS",			/* 0Eh */

		"Config Invalid Page",				/* 0Fh */

		"Discovery SATA Init Timeout",			/* 10h */

		"Reset",					/* 11h */

		"Abort",					/* 12h */

		"IO Not Yet Executed",				/* 13h */

		"IO Executed",					/* 14h */

		NULL,						/* 15h */

		NULL,						/* 16h */

		NULL,						/* 17h */

		NULL,						/* 18h */

		NULL,						/* 19h */

		NULL,						/* 1Ah */

		NULL,						/* 1Bh */

		NULL,						/* 1Ch */

		NULL,						/* 1Dh */

		NULL,						/* 1Eh */

		NULL,						/* 1Fh */

		"Enclosure Management"				/* 20h */

	};



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

/*

 *	mpt_sas_log_info - Log information returned from SAS IOC.

 *	@ioc: Pointer to MPT_ADAPTER structure

 *	@log_info: U32 LogInfo reply word from the IOC

 *

 *	Refer to lsi/mpi_log_sas.h.

 */

static void

mpt_sas_log_info(MPT_ADAPTER *ioc, u32 log_info)

{

union loginfo_type {

	u32	loginfo;

	struct {

		u32	subcode:16;

		u32	code:8;

		u32	originator:4;

		u32	bus_type:4;

	}dw;

};

	union loginfo_type sas_loginfo;

	char *code_desc = NULL;



	sas_loginfo.loginfo = log_info;

	if ((sas_loginfo.dw.bus_type != 3 /*SAS*/) &&

	    (sas_loginfo.dw.originator < sizeof(originator_str)/sizeof(char*)))

		return;

	if ((sas_loginfo.dw.originator == 0 /*IOP*/) &&

	    (sas_loginfo.dw.code < sizeof(iop_code_str)/sizeof(char*))) {

		code_desc = iop_code_str[sas_loginfo.dw.code];

	}else if ((sas_loginfo.dw.originator == 1 /*PL*/) &&

	    (sas_loginfo.dw.code < sizeof(pl_code_str)/sizeof(char*) )) {

		code_desc = pl_code_str[sas_loginfo.dw.code];

	}



	if (code_desc != NULL)

		printk(MYIOC_s_INFO_FMT

			"LogInfo(0x%08x): Originator={%s}, Code={%s},"

			" SubCode(0x%04x)\n",

			ioc->name,

			log_info,

			originator_str[sas_loginfo.dw.originator],

			code_desc,

			sas_loginfo.dw.subcode);

	else

		printk(MYIOC_s_INFO_FMT

			"LogInfo(0x%08x): Originator={%s}, Code=(0x%02x),"

			" SubCode(0x%04x)\n",

			ioc->name,

			log_info,

			originator_str[sas_loginfo.dw.originator],

			sas_loginfo.dw.code,

			sas_loginfo.dw.subcode);

}



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

/*

 *	mpt_sp_ioc_info - IOC information returned from SCSI Parallel IOC.

drivers/message/fusion/mptbase.h

+18 −10
Original line number Diff line number Diff line
@@ -77,8 +77,8 @@ 
#define COPYRIGHT	"Copyright (c) 1999-2005 " MODULEAUTHOR

#endif



#define MPT_LINUX_VERSION_COMMON	"3.03.02"

#define MPT_LINUX_PACKAGE_NAME		"@(#)mptlinux-3.03.02"

#define MPT_LINUX_VERSION_COMMON	"3.03.03"

#define MPT_LINUX_PACKAGE_NAME		"@(#)mptlinux-3.03.03"

#define WHAT_MAGIC_STRING		"@" "(" "#" ")"



#define show_mptmod_ver(s,ver)  \
@@ -424,7 +424,7 @@ typedef struct _MPT_IOCTL { 
/*

 *  Event Structure and define

 */

#define MPTCTL_EVENT_LOG_SIZE		(0x0000000A)

#define MPTCTL_EVENT_LOG_SIZE		(0x000000032)

typedef struct _mpt_ioctl_events {

	u32	event;		/* Specified by define above */

	u32	eventContext;	/* Index or counter */
@@ -452,16 +452,13 @@ typedef struct _mpt_ioctl_events { 
#define MPT_SCSICFG_ALL_IDS		0x02	/* WriteSDP1 to all IDS */

/* #define MPT_SCSICFG_BLK_NEGO		0x10	   WriteSDP1 with WDTR and SDTR disabled */



typedef	struct _ScsiCfgData {

typedef	struct _SpiCfgData {

	u32		 PortFlags;

	int		*nvram;			/* table of device NVRAM values */

	IOCPage2_t	*pIocPg2;		/* table of Raid Volumes */

	IOCPage3_t	*pIocPg3;		/* table of physical disks */

	IOCPage4_t	*pIocPg4;		/* SEP devices addressing */

	dma_addr_t	 IocPg4_dma;		/* Phys Addr of IOCPage4 data */

	int		 IocPg4Sz;		/* IOCPage4 size */

	u8		 dvStatus[MPT_MAX_SCSI_DEVICES];

	int		 isRaid;		/* bit field, 1 if RAID */

	u8		 minSyncFactor;		/* 0xFF if async */

	u8		 maxSyncOffset;		/* 0 if async */

	u8		 maxBusWidth;		/* 0 if narrow, 1 if wide */
@@ -473,10 +470,14 @@ typedef struct _ScsiCfgData { 
	u8		 dvScheduled;		/* 1 if scheduled */

	u8		 forceDv;		/* 1 to force DV scheduling */

	u8		 noQas;			/* Disable QAS for this adapter */

	u8		 Saf_Te;		/* 1 to force all Processors as SAF-TE if Inquiry data length is too short to check for SAF-TE */

	u8		 Saf_Te;		/* 1 to force all Processors as

						 * SAF-TE if Inquiry data length

						 * is too short to check for SAF-TE

						 */

	u8		 mpt_dv;		/* command line option: enhanced=1, basic=0 */

	u8		 bus_reset;		/* 1 to allow bus reset */

	u8		 rsvd[1];

} ScsiCfgData;

}SpiCfgData;



typedef	struct _SasCfgData {

	u8		 ptClear;		/* 1 to automatically clear the
@@ -486,6 +487,12 @@ typedef struct _SasCfgData { 
						 */

}SasCfgData;



typedef	struct _RaidCfgData {

	IOCPage2_t	*pIocPg2;		/* table of Raid Volumes */

	IOCPage3_t	*pIocPg3;		/* table of physical disks */

	int		 isRaid;		/* bit field, 1 if RAID */

}RaidCfgData;



/*

 *  Adapter Structure - pci_dev specific. Maximum: MPT_MAX_ADAPTERS

 */
@@ -546,7 +553,8 @@ typedef struct _MPT_ADAPTER 
	struct pci_dev		*pcidev;	/* struct pci_dev pointer */

	u8			__iomem *memmap;	/* mmap address */

	struct Scsi_Host	*sh;		/* Scsi Host pointer */

	ScsiCfgData		spi_data;	/* Scsi config. data */

	SpiCfgData		spi_data;	/* Scsi config. data */

	RaidCfgData		raid_data;	/* Raid config. data */

	SasCfgData		sas_data;	/* Sas config. data */

	MPT_IOCTL		*ioctl;		/* ioctl data pointer */

	struct proc_dir_entry	*ioc_dentry;

drivers/message/fusion/mptctl.c

+2 −2
Original line number Diff line number Diff line
@@ -1326,7 +1326,7 @@ mptctl_gettargetinfo (unsigned long arg) 
		 */

		if (hd && hd->Targets) {

			mpt_findImVolumes(ioc);

			pIoc2 = ioc->spi_data.pIocPg2;

			pIoc2 = ioc->raid_data.pIocPg2;

			for ( id = 0; id <= max_id; ) {

				if ( pIoc2 && pIoc2->NumActiveVolumes ) {

					if ( id == pIoc2->RaidVolume[0].VolumeID ) {
@@ -1348,7 +1348,7 @@ mptctl_gettargetinfo (unsigned long arg) 
						--maxWordsLeft;

						goto next_id;

					} else {

						pIoc3 = ioc->spi_data.pIocPg3;

						pIoc3 = ioc->raid_data.pIocPg3;

            					for ( jj = 0; jj < pIoc3->NumPhysDisks; jj++ ) {

                    					if ( pIoc3->PhysDisk[jj].PhysDiskID == id )

								goto next_id;

drivers/message/fusion/mptfc.c

+1 −1
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ mptfc_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
		printk(MYIOC_s_WARN_FMT

			"Skipping ioc=%p because SCSI Initiator mode is NOT enabled!\n",

			ioc->name, ioc);

		return -ENODEV;

		return 0;

	}



	sh = scsi_host_alloc(&mptfc_driver_template, sizeof(MPT_SCSI_HOST));

drivers/message/fusion/mptlan.c

+6 −1
Original line number Diff line number Diff line
@@ -312,7 +312,12 @@ static int 
mpt_lan_ioc_reset(MPT_ADAPTER *ioc, int reset_phase)

{

	struct net_device *dev = ioc->netdev;

	struct mpt_lan_priv *priv = netdev_priv(dev);

	struct mpt_lan_priv *priv;



	if (dev == NULL)

		return(1);

	else

		priv = netdev_priv(dev);



	dlprintk((KERN_INFO MYNAM ": IOC %s_reset routed to LAN driver!\n",

			reset_phase==MPT_IOC_SETUP_RESET ? "setup" : (

CRA Git | Maintained and supported by SUSTech CRA and CCSE