Commit c92f222e authored by James Bottomley's avatar James Bottomley Committed by James Bottomley
Browse files

[SCSI] mptspi: Add transport class Domain Validation 



This is the first half of a patch to add the generic domain validation
to mptspi.  It also creates a secondary "virtual" channel for raid
component devices since these are now exported with no_uld_attach.

What Eric and I would have really liked is to export all physical
components on channel 0 and all raid components on channel 1.
Unfortunately, this would result in device renumbering on platforms with
mixed RAID/Physical devices which was considered unacceptable for
userland stability reasons.

Still to be done is to plug back the extra parameter setting and DV
pieces on reset and hotplug.

Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 3ef0b47e

drivers/message/fusion/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ config FUSION_SPI 
	tristate "Fusion MPT ScsiHost drivers for SPI"

	depends on PCI && SCSI

	select FUSION

	select SCSI_SPI_ATTRS

	---help---

	  SCSI HOST support for a parallel SCSI host adapters.

drivers/message/fusion/mptbase.c

+2 −70
Original line number Diff line number Diff line
@@ -1120,65 +1120,6 @@ mpt_verify_adapter(int iocid, MPT_ADAPTER **iocpp) 
	return -1;

}



int

mpt_alt_ioc_wait(MPT_ADAPTER *ioc)

{

	int loop_count = 30 * 4;  /* Wait 30 seconds */

	int status = -1; /* -1 means failed to get board READY */



	do {

		spin_lock(&ioc->initializing_hba_lock);

		if (ioc->initializing_hba_lock_flag == 0) {

			ioc->initializing_hba_lock_flag=1;

			spin_unlock(&ioc->initializing_hba_lock);

			status = 0;

			break;

		}

		spin_unlock(&ioc->initializing_hba_lock);

		set_current_state(TASK_INTERRUPTIBLE);

		schedule_timeout(HZ/4);

	} while (--loop_count);



	return status;

}



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

/*

 *	mpt_bringup_adapter - This is a wrapper function for mpt_do_ioc_recovery

 *	@ioc: Pointer to MPT adapter structure

 *	@sleepFlag: Use schedule if CAN_SLEEP else use udelay.

 *

 *	This routine performs all the steps necessary to bring the IOC

 *	to a OPERATIONAL state.

 *

 *      Special Note: This function was added with spin lock's so as to allow

 *      the dv(domain validation) work thread to succeed on the other channel

 *      that maybe occuring at the same time when this function is called.

 *      Without this lock, the dv would fail when message frames were

 *      requested during hba bringup on the alternate ioc.

 */

static int

mpt_bringup_adapter(MPT_ADAPTER *ioc, int sleepFlag)

{

	int r;



	if(ioc->alt_ioc) {

		if((r=mpt_alt_ioc_wait(ioc->alt_ioc)!=0))

			return r;

	}



	r = mpt_do_ioc_recovery(ioc, MPT_HOSTEVENT_IOC_BRINGUP,

	    CAN_SLEEP);



	if(ioc->alt_ioc) {

		spin_lock(&ioc->alt_ioc->initializing_hba_lock);

		ioc->alt_ioc->initializing_hba_lock_flag=0;

		spin_unlock(&ioc->alt_ioc->initializing_hba_lock);

	}



return r;

}



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

/*

 *	mpt_attach - Install a PCI intelligent MPT adapter.
@@ -1482,7 +1423,8 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id) 
	 */

	mpt_detect_bound_ports(ioc, pdev);



	if ((r = mpt_bringup_adapter(ioc, CAN_SLEEP)) != 0){

	if ((r = mpt_do_ioc_recovery(ioc, MPT_HOSTEVENT_IOC_BRINGUP,

	    CAN_SLEEP)) != 0){

		printk(KERN_WARNING MYNAM

		  ": WARNING - %s did not initialize properly! (%d)\n",

		  ioc->name, r);
@@ -1629,7 +1571,6 @@ mpt_resume(struct pci_dev *pdev) 
	MPT_ADAPTER *ioc = pci_get_drvdata(pdev);

	u32 device_state = pdev->current_state;

	int recovery_state;

	int ii;



	printk(MYIOC_s_INFO_FMT

	"pci-resume: pdev=0x%p, slot=%s, Previous operating state [D%d]\n",
@@ -1643,14 +1584,6 @@ mpt_resume(struct pci_dev *pdev) 
	CHIPREG_WRITE32(&ioc->chip->IntMask, MPI_HIM_DIM);

	ioc->active = 1;



	/* F/W not running */

	if(!CHIPREG_READ32(&ioc->chip->Doorbell)) {

		/* enable domain validation flags */

		for (ii=0; ii < MPT_MAX_SCSI_DEVICES; ii++) {

			ioc->spi_data.dvStatus[ii] |= MPT_SCSICFG_NEED_DV;

		}

	}



	printk(MYIOC_s_INFO_FMT

		"pci-resume: ioc-state=0x%x,doorbell=0x%x\n",

		ioc->name,
@@ -6435,7 +6368,6 @@ EXPORT_SYMBOL(mpt_read_ioc_pg_3); 
EXPORT_SYMBOL(mpt_alloc_fw_memory);

EXPORT_SYMBOL(mpt_free_fw_memory);

EXPORT_SYMBOL(mptbase_sas_persist_operation);

EXPORT_SYMBOL(mpt_alt_ioc_wait);

EXPORT_SYMBOL(mptbase_GetFcPortPage0);

drivers/message/fusion/mptbase.h

+2 −12
Original line number Diff line number Diff line
@@ -331,6 +331,7 @@ typedef struct _SYSIF_REGS 
 *	VirtDevice - FC LUN device or SCSI target device

 */

typedef struct _VirtTarget {

	struct scsi_target	*starget;

	u8			 tflags;

	u8			 ioc_id;

	u8			 target_id;
@@ -343,7 +344,6 @@ typedef struct _VirtTarget { 
	u8			 type;		/* byte 0 of Inquiry data */

	u32			 num_luns;

	u32			 luns[8];		/* Max LUNs is 256 */

	u8			 inq_data[8];

} VirtTarget;



typedef struct _VirtDevice {
@@ -364,6 +364,7 @@ typedef struct _VirtDevice { 
#define MPT_TARGET_FLAGS_Q_YES		0x08

#define MPT_TARGET_FLAGS_VALID_56	0x10

#define MPT_TARGET_FLAGS_SAF_TE_ISSUED	0x20

#define MPT_TARGET_FLAGS_RAID_COMPONENT	0x40



/*

 *	/proc/mpt interface
@@ -447,13 +448,6 @@ typedef struct _mpt_ioctl_events { 
 *	Substructure to store SCSI specific configuration page data

 */

						/* dvStatus defines: */

#define MPT_SCSICFG_NEGOTIATE		0x01	/* Negotiate on next IO */

#define MPT_SCSICFG_NEED_DV		0x02	/* Schedule DV */

#define MPT_SCSICFG_DV_PENDING		0x04	/* DV on this physical id pending */

#define MPT_SCSICFG_DV_NOT_DONE		0x08	/* DV has not been performed */

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

#define MPT_SCSICFG_RELOAD_IOC_PG3	0x20	/* IOC Pg 3 data is obsolete */

						/* Args passed to writeSDP1: */

#define MPT_SCSICFG_USE_NVRAM		0x01	/* WriteSDP1 using NVRAM */

#define MPT_SCSICFG_ALL_IDS		0x02	/* WriteSDP1 to all IDS */

/* #define MPT_SCSICFG_BLK_NEGO		0x10	   WriteSDP1 with WDTR and SDTR disabled */
@@ -464,7 +458,6 @@ typedef struct _SpiCfgData { 
	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];

	u8		 minSyncFactor;		/* 0xFF if async */

	u8		 maxSyncOffset;		/* 0 if async */

	u8		 maxBusWidth;		/* 0 if narrow, 1 if wide */
@@ -474,13 +467,11 @@ typedef struct _SpiCfgData { 
	u8		 sdp0version;		/* SDP0 version */

	u8		 sdp0length;		/* SDP0 length  */

	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		 mpt_dv;		/* command line option: enhanced=1, basic=0 */

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

	u8		 rsvd[1];

}SpiCfgData;
@@ -1033,7 +1024,6 @@ extern int mpt_findImVolumes(MPT_ADAPTER *ioc); 
extern int	 mpt_read_ioc_pg_3(MPT_ADAPTER *ioc);

extern int	 mptbase_sas_persist_operation(MPT_ADAPTER *ioc, u8 persist_opcode);

extern int	 mptbase_GetFcPortPage0(MPT_ADAPTER *ioc, int portnum);

extern int	 mpt_alt_ioc_wait(MPT_ADAPTER *ioc);



/*

 *  Public data decl's...