Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 (e0ae2355) · Commits · 戴 / test

Documentation/scsi/ChangeLog.megaraid_sas

0 → 100644

+24 −0

Original line number	Diff line number	Diff line
		1 Release Date : Mon Jan 23 14:09:01 PST 2006 - Sumant Patro <Sumant.Patro@lsil.com>
		2 Current Version : 00.00.02.02
		3 Older Version : 00.00.02.01

		i. New template defined to represent each family of controllers (identified by processor used).
		The template will have defintions that will be initialised to appropritae values for a specific family of controllers. The template definition has four function pointers. During driver initialisation the function pointers will be set based on the controller family type. This change is done to support new controllers that has different processors and thus different register set.

		-Sumant Patro <Sumant.Patro@lsil.com>

		1 Release Date : Mon Dec 19 14:36:26 PST 2005 - Sumant Patro <Sumant.Patro@lsil.com>
		2 Current Version : 00.00.02.00-rc4
		3 Older Version : 00.00.02.01

		i. Code reorganized to remove code duplication in megasas_build_cmd.

		"There's a lot of duplicate code megasas_build_cmd. Move that out of the different codepathes and merge the reminder of megasas_build_cmd into megasas_queue_command"

		- Christoph Hellwig <hch@lst.de>

		ii. Defined MEGASAS_IOC_FIRMWARE32 for code paths that handles 32 bit applications in 64 bit systems.

		"MEGASAS_IOC_FIRMWARE can't be redefined if CONFIG_COMPAT is set, we need to define a MEGASAS_IOC_FIRMWARE32 define so native binaries continue to work"

		- Christoph Hellwig <hch@lst.de>

Documentation/scsi/aic79xx.txt

+37 −56

Original line number	Diff line number	Diff line
		====================================================================
		= Adaptec Ultra320 Family Manager Set v1.3.11 =
		= Adaptec Ultra320 Family Manager Set =
		= =
		= README for =
		= The Linux Operating System =
		@@ -63,6 +63,11 @@ The following information is available in this file:
		68-pin)
		2. Version History

		3.0 (December 1st, 2005)
		- Updated driver to use SCSI transport class infrastructure
		- Upported sequencer and core fixes from adaptec released
		version 2.0.15 of the driver.

		1.3.11 (July 11, 2003)
		- Fix several deadlock issues.
		- Add 29320ALP and 39320B Id's.
		@@ -411,7 +416,7 @@ The following information is available in this file:
		http://www.adaptec.com.


		5. Contacting Adaptec
		5. Adaptec Customer Support

		A Technical Support Identification (TSID) Number is required for
		Adaptec technical support.
		@@ -419,69 +424,45 @@ The following information is available in this file:
		included inside the box with your product. The TSID helps us
		provide more efficient service by accurately identifying your
		product and support status.

		Support Options
		- Search the Adaptec Support Knowledgebase (ASK) at
		http://ask.adaptec.com for articles, troubleshooting tips, and
		frequently asked questions for your product.
		frequently asked questions about your product.
		- For support via Email, submit your question to Adaptec's
		Technical Support Specialists at http://ask.adaptec.com.
		Technical Support Specialists at http://ask.adaptec.com/.

		North America
		- Visit our Web site at http://www.adaptec.com.
		- To speak with a Fibre Channel/RAID/External Storage Technical
		Support Specialist, call 1-321-207-2000,
		Hours: Monday-Friday, 3:00 A.M. to 5:00 P.M., PST.
		(Not open on holidays)
		- For Technical Support in all other technologies including
		SCSI, call 1-408-934-7274,
		Hours: Monday-Friday, 6:00 A.M. to 5:00 P.M., PST.
		(Not open on holidays)
		- For after hours support, call 1-800-416-8066 ($99/call,
		$149/call on holidays)
		- To order Adaptec products including software and cables, call
		1-800-442-7274 or 1-408-957-7274. You can also visit our
		online store at http://www.adaptecstore.com
		- Visit our Web site at http://www.adaptec.com/.
		- For information about Adaptec's support options, call
		408-957-2550, 24 hours a day, 7 days a week.
		- To speak with a Technical Support Specialist,
		* For hardware products, call 408-934-7274,
		Monday to Friday, 3:00 am to 5:00 pm, PDT.
		* For RAID and Fibre Channel products, call 321-207-2000,
		Monday to Friday, 3:00 am to 5:00 pm, PDT.
		To expedite your service, have your computer with you.
		- To order Adaptec products, including accessories and cables,
		call 408-957-7274. To order cables online go to
		http://www.adaptec.com/buy-cables/.

		Europe
		- Visit our Web site at http://www.adaptec-europe.com.
		- English and French: To speak with a Technical Support
		Specialist, call one of the following numbers:
		- English: +32-2-352-3470
		- French: +32-2-352-3460
		Hours: Monday-Thursday, 10:00 to 12:30, 13:30 to 17:30 CET
		Friday, 10:00 to 12:30, 13:30 to 16:30 CET
		- German: To speak with a Technical Support Specialist,
		call +49-89-456-40660
		Hours: Monday-Thursday, 09:30 to 12:30, 13:30 to 16:30 CET
		Friday, 09:30 to 12:30, 13:30 to 15:00 CET
		- To order Adaptec products, including accessories and cables:
		- UK: +0800-96-65-26 or fax +0800-731-02-95
		- Other European countries: +32-11-300-379

		Australia and New Zealand
		- Visit our Web site at http://www.adaptec.com.au.
		- To speak with a Technical Support Specialist, call
		+612-9416-0698
		Hours: Monday-Friday, 10:00 A.M. to 4:30 P.M., EAT
		(Not open on holidays)
		- Visit our Web site at http://www.adaptec-europe.com/.
		- To speak with a Technical Support Specialist, call, or email,
		* German: +49 89 4366 5522, Monday-Friday, 9:00-17:00 CET,
		http://ask-de.adaptec.com/.
		* French: +49 89 4366 5533, Monday-Friday, 9:00-17:00 CET,
		http://ask-fr.adaptec.com/.
		* English: +49 89 4366 5544, Monday-Friday, 9:00-17:00 GMT,
		http://ask.adaptec.com/.
		- You can order Adaptec cables online at
		http://www.adaptec.com/buy-cables/.

		Japan
		- Visit our web site at http://www.adaptec.co.jp/.
		- To speak with a Technical Support Specialist, call
		+81-3-5308-6120
		Hours: Monday-Friday, 9:00 a.m. to 12:00 p.m., 1:00 p.m. to
		6:00 p.m. TSC

		Hong Kong and China
		- To speak with a Technical Support Specialist, call
		+852-2869-7200
		Hours: Monday-Friday, 10:00 to 17:00.
		- Fax Technical Support at +852-2869-7100.

		Singapore
		- To speak with a Technical Support Specialist, call
		+65-245-7470
		Hours: Monday-Friday, 10:00 to 17:00.
		- Fax Technical Support at +852-2869-7100
		+81 3 5308 6120, Monday-Friday, 9:00 a.m. to 12:00 p.m.,
		1:00 p.m. to 6:00 p.m.

		-------------------------------------------------------------------
		/*

Documentation/scsi/aic7xxx.txt

+31 −55

Original line number	Diff line number	Diff line
		@@ -309,11 +309,11 @@ The following information is available in this file:
		-----------------------------------------------------------------

		Example:
		'options aic7xxx aic7xxx=verbose,no_probe,tag_info:{{},{,,10}},seltime:1"
		'options aic7xxx aic7xxx=verbose,no_probe,tag_info:{{},{,,10}},seltime:1'
		enables verbose logging, Disable EISA/VLB probing,
		and set tag depth on Controller 1/Target 2 to 10 tags.

		3. Contacting Adaptec
		4. Adaptec Customer Support

		A Technical Support Identification (TSID) Number is required for
		Adaptec technical support.
		@@ -321,69 +321,45 @@ The following information is available in this file:
		included inside the box with your product. The TSID helps us
		provide more efficient service by accurately identifying your
		product and support status.

		Support Options
		- Search the Adaptec Support Knowledgebase (ASK) at
		http://ask.adaptec.com for articles, troubleshooting tips, and
		frequently asked questions for your product.
		frequently asked questions about your product.
		- For support via Email, submit your question to Adaptec's
		Technical Support Specialists at http://ask.adaptec.com.
		Technical Support Specialists at http://ask.adaptec.com/.

		North America
		- Visit our Web site at http://www.adaptec.com.
		- To speak with a Fibre Channel/RAID/External Storage Technical
		Support Specialist, call 1-321-207-2000,
		Hours: Monday-Friday, 3:00 A.M. to 5:00 P.M., PST.
		(Not open on holidays)
		- For Technical Support in all other technologies including
		SCSI, call 1-408-934-7274,
		Hours: Monday-Friday, 6:00 A.M. to 5:00 P.M., PST.
		(Not open on holidays)
		- For after hours support, call 1-800-416-8066 ($99/call,
		$149/call on holidays)
		- To order Adaptec products including software and cables, call
		1-800-442-7274 or 1-408-957-7274. You can also visit our
		online store at http://www.adaptecstore.com
		- Visit our Web site at http://www.adaptec.com/.
		- For information about Adaptec's support options, call
		408-957-2550, 24 hours a day, 7 days a week.
		- To speak with a Technical Support Specialist,
		* For hardware products, call 408-934-7274,
		Monday to Friday, 3:00 am to 5:00 pm, PDT.
		* For RAID and Fibre Channel products, call 321-207-2000,
		Monday to Friday, 3:00 am to 5:00 pm, PDT.
		To expedite your service, have your computer with you.
		- To order Adaptec products, including accessories and cables,
		call 408-957-7274. To order cables online go to
		http://www.adaptec.com/buy-cables/.

		Europe
		- Visit our Web site at http://www.adaptec-europe.com.
		- English and French: To speak with a Technical Support
		Specialist, call one of the following numbers:
		- English: +32-2-352-3470
		- French: +32-2-352-3460
		Hours: Monday-Thursday, 10:00 to 12:30, 13:30 to 17:30 CET
		Friday, 10:00 to 12:30, 13:30 to 16:30 CET
		- German: To speak with a Technical Support Specialist,
		call +49-89-456-40660
		Hours: Monday-Thursday, 09:30 to 12:30, 13:30 to 16:30 CET
		Friday, 09:30 to 12:30, 13:30 to 15:00 CET
		- To order Adaptec products, including accessories and cables:
		- UK: +0800-96-65-26 or fax +0800-731-02-95
		- Other European countries: +32-11-300-379

		Australia and New Zealand
		- Visit our Web site at http://www.adaptec.com.au.
		- To speak with a Technical Support Specialist, call
		+612-9416-0698
		Hours: Monday-Friday, 10:00 A.M. to 4:30 P.M., EAT
		(Not open on holidays)
		- Visit our Web site at http://www.adaptec-europe.com/.
		- To speak with a Technical Support Specialist, call, or email,
		* German: +49 89 4366 5522, Monday-Friday, 9:00-17:00 CET,
		http://ask-de.adaptec.com/.
		* French: +49 89 4366 5533, Monday-Friday, 9:00-17:00 CET,
		http://ask-fr.adaptec.com/.
		* English: +49 89 4366 5544, Monday-Friday, 9:00-17:00 GMT,
		http://ask.adaptec.com/.
		- You can order Adaptec cables online at
		http://www.adaptec.com/buy-cables/.

		Japan
		- Visit our web site at http://www.adaptec.co.jp/.
		- To speak with a Technical Support Specialist, call
		+81-3-5308-6120
		Hours: Monday-Friday, 9:00 a.m. to 12:00 p.m., 1:00 p.m. to
		6:00 p.m. TSC

		Hong Kong and China
		- To speak with a Technical Support Specialist, call
		+852-2869-7200
		Hours: Monday-Friday, 10:00 to 17:00.
		- Fax Technical Support at +852-2869-7100.

		Singapore
		- To speak with a Technical Support Specialist, call
		+65-245-7470
		Hours: Monday-Friday, 10:00 to 17:00.
		- Fax Technical Support at +852-2869-7100
		+81 3 5308 6120, Monday-Friday, 9:00 a.m. to 12:00 p.m.,
		1:00 p.m. to 6:00 p.m.

		-------------------------------------------------------------------
		/*

drivers/message/fusion/Makefile

+2 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,8 @@
		# For mptctl:
		#CFLAGS_mptctl.o += -DMPT_DEBUG_IOCTL
		#
		# For mptfc:
		#CFLAGS_mptfc.o += -DMPT_DEBUG_FC

		#=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-} LSI_LOGIC

drivers/message/fusion/mptbase.c

+174 −10

Original line number	Diff line number	Diff line
		@@ -81,6 +81,10 @@ MODULE_LICENSE("GPL");
		/*
		* cmd line parameters
		*/
		static int mpt_msi_enable;
		module_param(mpt_msi_enable, int, 0);
		MODULE_PARM_DESC(mpt_msi_enable, " MSI Support Enable (default=0)");

		#ifdef MFCNT
		static int mfcounter = 0;
		#define PRINT_MF_COUNT 20000
		@@ -174,7 +178,7 @@ static void mpt_get_fw_exp_ver(char buf, MPT_ADAPTER ioc);
		static int ProcessEventNotification(MPT_ADAPTER ioc, EventNotificationReply_t evReply, int *evHandlers);
		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_spi_log_info(MPT_ADAPTER *ioc, u32 log_info);
		static void mpt_sas_log_info(MPT_ADAPTER *ioc, u32 log_info);

		/* module entry point */
		@@ -313,7 +317,7 @@ mpt_reply(MPT_ADAPTER *ioc, u32 pa)
		if (ioc->bus_type == FC)
		mpt_fc_log_info(ioc, log_info);
		else if (ioc->bus_type == SPI)
		mpt_sp_log_info(ioc, log_info);
		mpt_spi_log_info(ioc, log_info);
		else if (ioc->bus_type == SAS)
		mpt_sas_log_info(ioc, log_info);
		}
		@@ -1444,6 +1448,9 @@ mpt_attach(struct pci_dev pdev, const struct pci_device_id id)

		ioc->pci_irq = -1;
		if (pdev->irq) {
		if (mpt_msi_enable && !pci_enable_msi(pdev))
		printk(MYIOC_s_INFO_FMT "PCI-MSI enabled\n", ioc->name);

		r = request_irq(pdev->irq, mpt_interrupt, SA_SHIRQ, ioc->name, ioc);

		if (r < 0) {
		@@ -1483,6 +1490,10 @@ mpt_attach(struct pci_dev pdev, const struct pci_device_id id)

		list_del(&ioc->list);
		free_irq(ioc->pci_irq, ioc);
		if (mpt_msi_enable)
		pci_disable_msi(pdev);
		if (ioc->alt_ioc)
		ioc->alt_ioc->alt_ioc = NULL;
		iounmap(mem);
		kfree(ioc);
		pci_set_drvdata(pdev, NULL);
		@@ -2136,6 +2147,8 @@ mpt_adapter_dispose(MPT_ADAPTER *ioc)

		if (ioc->pci_irq != -1) {
		free_irq(ioc->pci_irq, ioc);
		if (mpt_msi_enable)
		pci_disable_msi(ioc->pcidev);
		ioc->pci_irq = -1;
		}

		@@ -2157,6 +2170,10 @@ mpt_adapter_dispose(MPT_ADAPTER *ioc)
		sz_last = ioc->alloc_total;
		dprintk((KERN_INFO MYNAM ": %s: free'd %d of %d bytes\n",
		ioc->name, sz_first-sz_last+(int)sizeof(*ioc), sz_first));

		if (ioc->alt_ioc)
		ioc->alt_ioc->alt_ioc = NULL;

		kfree(ioc);
		}

		@@ -2770,13 +2787,16 @@ SendPortEnable(MPT_ADAPTER *ioc, int portnum, int sleepFlag)

		/* RAID FW may take a long time to enable
		*/
		if ( (ioc->facts.ProductID & MPI_FW_HEADER_PID_PROD_MASK)
		> MPI_FW_HEADER_PID_PROD_TARGET_SCSI ) {
		rc = mpt_handshake_req_reply_wait(ioc, req_sz, (u32*)&port_enable,
		reply_sz, (u16)&reply_buf, 300 /seconds*/, sleepFlag);
		if (((ioc->facts.ProductID & MPI_FW_HEADER_PID_PROD_MASK)
		> MPI_FW_HEADER_PID_PROD_TARGET_SCSI) \|\|
		(ioc->bus_type == SAS)) {
		rc = mpt_handshake_req_reply_wait(ioc, req_sz,
		(u32)&port_enable, reply_sz, (u16)&reply_buf,
		300 /seconds/, sleepFlag);
		} else {
		rc = mpt_handshake_req_reply_wait(ioc, req_sz, (u32*)&port_enable,
		reply_sz, (u16)&reply_buf, 30 /seconds*/, sleepFlag);
		rc = mpt_handshake_req_reply_wait(ioc, req_sz,
		(u32)&port_enable, reply_sz, (u16)&reply_buf,
		30 /seconds/, sleepFlag);
		}
		return rc;
		}
		@@ -4386,6 +4406,138 @@ mptbase_sas_persist_operation(MPT_ADAPTER *ioc, u8 persist_opcode)
		return 0;
		}

		/=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=/

		static void
		mptbase_raid_process_event_data(MPT_ADAPTER *ioc,
		MpiEventDataRaid_t * pRaidEventData)
		{
		int volume;
		int reason;
		int disk;
		int status;
		int flags;
		int state;

		volume = pRaidEventData->VolumeID;
		reason = pRaidEventData->ReasonCode;
		disk = pRaidEventData->PhysDiskNum;
		status = le32_to_cpu(pRaidEventData->SettingsStatus);
		flags = (status >> 0) & 0xff;
		state = (status >> 8) & 0xff;

		if (reason == MPI_EVENT_RAID_RC_DOMAIN_VAL_NEEDED) {
		return;
		}

		if ((reason >= MPI_EVENT_RAID_RC_PHYSDISK_CREATED &&
		reason <= MPI_EVENT_RAID_RC_PHYSDISK_STATUS_CHANGED) \|\|
		(reason == MPI_EVENT_RAID_RC_SMART_DATA)) {
		printk(MYIOC_s_INFO_FMT "RAID STATUS CHANGE for PhysDisk %d\n",
		ioc->name, disk);
		} else {
		printk(MYIOC_s_INFO_FMT "RAID STATUS CHANGE for VolumeID %d\n",
		ioc->name, volume);
		}

		switch(reason) {
		case MPI_EVENT_RAID_RC_VOLUME_CREATED:
		printk(MYIOC_s_INFO_FMT " volume has been created\n",
		ioc->name);
		break;

		case MPI_EVENT_RAID_RC_VOLUME_DELETED:

		printk(MYIOC_s_INFO_FMT " volume has been deleted\n",
		ioc->name);
		break;

		case MPI_EVENT_RAID_RC_VOLUME_SETTINGS_CHANGED:
		printk(MYIOC_s_INFO_FMT " volume settings have been changed\n",
		ioc->name);
		break;

		case MPI_EVENT_RAID_RC_VOLUME_STATUS_CHANGED:
		printk(MYIOC_s_INFO_FMT " volume is now %s%s%s%s\n",
		ioc->name,
		state == MPI_RAIDVOL0_STATUS_STATE_OPTIMAL
		? "optimal"
		: state == MPI_RAIDVOL0_STATUS_STATE_DEGRADED
		? "degraded"
		: state == MPI_RAIDVOL0_STATUS_STATE_FAILED
		? "failed"
		: "state unknown",
		flags & MPI_RAIDVOL0_STATUS_FLAG_ENABLED
		? ", enabled" : "",
		flags & MPI_RAIDVOL0_STATUS_FLAG_QUIESCED
		? ", quiesced" : "",
		flags & MPI_RAIDVOL0_STATUS_FLAG_RESYNC_IN_PROGRESS
		? ", resync in progress" : "" );
		break;

		case MPI_EVENT_RAID_RC_VOLUME_PHYSDISK_CHANGED:
		printk(MYIOC_s_INFO_FMT " volume membership of PhysDisk %d has changed\n",
		ioc->name, disk);
		break;

		case MPI_EVENT_RAID_RC_PHYSDISK_CREATED:
		printk(MYIOC_s_INFO_FMT " PhysDisk has been created\n",
		ioc->name);
		break;

		case MPI_EVENT_RAID_RC_PHYSDISK_DELETED:
		printk(MYIOC_s_INFO_FMT " PhysDisk has been deleted\n",
		ioc->name);
		break;

		case MPI_EVENT_RAID_RC_PHYSDISK_SETTINGS_CHANGED:
		printk(MYIOC_s_INFO_FMT " PhysDisk settings have been changed\n",
		ioc->name);
		break;

		case MPI_EVENT_RAID_RC_PHYSDISK_STATUS_CHANGED:
		printk(MYIOC_s_INFO_FMT " PhysDisk is now %s%s%s\n",
		ioc->name,
		state == MPI_PHYSDISK0_STATUS_ONLINE
		? "online"
		: state == MPI_PHYSDISK0_STATUS_MISSING
		? "missing"
		: state == MPI_PHYSDISK0_STATUS_NOT_COMPATIBLE
		? "not compatible"
		: state == MPI_PHYSDISK0_STATUS_FAILED
		? "failed"
		: state == MPI_PHYSDISK0_STATUS_INITIALIZING
		? "initializing"
		: state == MPI_PHYSDISK0_STATUS_OFFLINE_REQUESTED
		? "offline requested"
		: state == MPI_PHYSDISK0_STATUS_FAILED_REQUESTED
		? "failed requested"
		: state == MPI_PHYSDISK0_STATUS_OTHER_OFFLINE
		? "offline"
		: "state unknown",
		flags & MPI_PHYSDISK0_STATUS_FLAG_OUT_OF_SYNC
		? ", out of sync" : "",
		flags & MPI_PHYSDISK0_STATUS_FLAG_QUIESCED
		? ", quiesced" : "" );
		break;

		case MPI_EVENT_RAID_RC_DOMAIN_VAL_NEEDED:
		printk(MYIOC_s_INFO_FMT " Domain Validation needed for PhysDisk %d\n",
		ioc->name, disk);
		break;

		case MPI_EVENT_RAID_RC_SMART_DATA:
		printk(MYIOC_s_INFO_FMT " SMART data received, ASC/ASCQ = %02xh/%02xh\n",
		ioc->name, pRaidEventData->ASC, pRaidEventData->ASCQ);
		break;

		case MPI_EVENT_RAID_RC_REPLACE_ACTION_STARTED:
		printk(MYIOC_s_INFO_FMT " replacement of PhysDisk %d has started\n",
		ioc->name, disk);
		break;
		}
		}

		/=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=/
		/*
		* GetIoUnitPage2 - Retrieve BIOS version and boot order information.
		@@ -4598,6 +4750,14 @@ mpt_GetScsiPortSettings(MPT_ADAPTER *ioc, int portnum)
		SCSIPortPage2_t pPP2 = (SCSIPortPage2_t ) pbuf;
		MpiDeviceInfo_t *pdevice = NULL;

		/*
		* Save "Set to Avoid SCSI Bus Resets" flag
		*/
		ioc->spi_data.bus_reset =
		(le32_to_cpu(pPP2->PortFlags) &
		MPI_SCSIPORTPAGE2_PORT_FLAGS_AVOID_SCSI_RESET) ?
		0 : 1 ;

		/* Save the Port Page 2 data
		* (reformat into a 32bit quantity)
		*/
		@@ -5967,6 +6127,10 @@ ProcessEventNotification(MPT_ADAPTER ioc, EventNotificationReply_t pEventReply
		}
		}
		break;
		case MPI_EVENT_INTEGRATED_RAID:
		mptbase_raid_process_event_data(ioc,
		(MpiEventDataRaid_t *)pEventReply->Data);
		break;
		default:
		break;
		}
		@@ -6046,7 +6210,7 @@ mpt_fc_log_info(MPT_ADAPTER *ioc, u32 log_info)

		/=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=/
		/*
		* mpt_sp_log_info - Log information returned from SCSI Parallel IOC.
		* mpt_spi_log_info - Log information returned from SCSI Parallel IOC.
		* @ioc: Pointer to MPT_ADAPTER structure
		* @mr: Pointer to MPT reply frame
		* @log_info: U32 LogInfo word from the IOC
		@@ -6054,7 +6218,7 @@ mpt_fc_log_info(MPT_ADAPTER *ioc, u32 log_info)
		* Refer to lsi/sp_log.h.
		*/
		static void
		mpt_sp_log_info(MPT_ADAPTER *ioc, u32 log_info)
		mpt_spi_log_info(MPT_ADAPTER *ioc, u32 log_info)
		{
		u32 info = log_info & 0x00FF0000;
		char *desc = "unknown";

Admin message