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

[SCSI] mptfusion - mapping fixs required support for transport layers. 



This utilizes the hostdata area that is hung off of scsi_target and
scsi_device for saving unique firmware mapping. This will be required
for supporting new Fibre and SPI transport support.

This also fixs problems in error handling error code for SAS
controllers, in which the incorrect mapping was passed to the
firmware.

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

drivers/message/fusion/mptbase.h

+12 −16
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ typedef struct _SYSIF_REGS 
 *	Dynamic Multi-Pathing specific stuff...

 */



/* VirtDevice negoFlags field */

/* VirtTarget negoFlags field */

#define MPT_TARGET_NO_NEGO_WIDE		0x01

#define MPT_TARGET_NO_NEGO_SYNC		0x02

#define MPT_TARGET_NO_NEGO_QAS		0x04
@@ -330,8 +330,7 @@ typedef struct _SYSIF_REGS 
/*

 *	VirtDevice - FC LUN device or SCSI target device

 */

typedef struct _VirtDevice {

	struct scsi_device	*device;

typedef struct _VirtTarget {

	u8			 tflags;

	u8			 ioc_id;

	u8			 target_id;
@@ -342,21 +341,18 @@ typedef struct _VirtDevice { 
	u8			 negoFlags;	/* bit field, see above */

	u8			 raidVolume;	/* set, if RAID Volume */

	u8			 type;		/* byte 0 of Inquiry data */

	u8			 cflags;	/* controller flags */

	u8			 rsvd1raid;

	u16			 fc_phys_lun;

	u16			 fc_xlat_lun;

	u32			 num_luns;

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

	u8			 pad[4];

	u8			 inq_data[8];

		/* IEEE Registered Extended Identifier

		   obtained via INQUIRY VPD page 0x83 */

		/* NOTE: Do not separate uniq_prepad and uniq_data

		   as they are treateed as a single entity in the code */

	u8			 uniq_prepad[8];

	u8			 uniq_data[20];

	u8			 pad2[4];

} VirtTarget;



typedef struct _VirtDevice {

	VirtTarget	 	*vtarget;

	u8			 ioc_id;

	u8			 bus_id;

	u8			 target_id;

	u8			 configured_lun;

	u32			 lun;

} VirtDevice;



/*
@@ -912,7 +908,7 @@ typedef struct _MPT_SCSI_HOST { 
	int			  port;

	u32			  pad0;

	struct scsi_cmnd	**ScsiLookup;

	VirtDevice		**Targets;

	VirtTarget		**Targets;

	MPT_LOCAL_REPLY		 *pLocal;		/* used for internal commands */

	struct timer_list	  timer;

		/* Pool of memory for holding SCpnts before doing

drivers/message/fusion/mptctl.c

+2 −2
Original line number Diff line number Diff line
@@ -1245,7 +1245,7 @@ mptctl_gettargetinfo (unsigned long arg) 
	MPT_ADAPTER		*ioc;

	struct Scsi_Host	*sh;

	MPT_SCSI_HOST		*hd;

	VirtDevice		*vdev;

	VirtTarget		*vdev;

	char			*pmem;

	int			*pdata;

	IOCPage2_t		*pIoc2;
@@ -1822,7 +1822,7 @@ mptctl_do_mpt_command (struct mpt_ioctl_command karg, void __user *mfPtr) 
	case MPI_FUNCTION_SCSI_IO_REQUEST:

		if (ioc->sh) {

			SCSIIORequest_t *pScsiReq = (SCSIIORequest_t *) mf;

			VirtDevice	*pTarget = NULL;

			VirtTarget	*pTarget = NULL;

			MPT_SCSI_HOST	*hd = NULL;

			int qtag = MPI_SCSIIO_CONTROL_UNTAGGED;

			int scsidir = 0;

drivers/message/fusion/mptfc.c

+4 −2
Original line number Diff line number Diff line
@@ -90,8 +90,10 @@ static struct scsi_host_template mptfc_driver_template = { 
	.name				= "MPT FC Host",

	.info				= mptscsih_info,

	.queuecommand			= mptscsih_qcmd,

	.target_alloc			= mptscsih_target_alloc,

	.slave_alloc			= mptscsih_slave_alloc,

	.slave_configure		= mptscsih_slave_configure,

	.target_destroy			= mptscsih_target_destroy,

	.slave_destroy			= mptscsih_slave_destroy,

	.change_queue_depth 		= mptscsih_change_queue_depth,

	.eh_abort_handler		= mptscsih_abort,
@@ -292,10 +294,10 @@ mptfc_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	}



	memset(mem, 0, sz);

	hd->Targets = (VirtDevice **) mem;

	hd->Targets = (VirtTarget **) mem;



	dprintk((KERN_INFO

	  "  Targets @ %p, sz=%d\n", hd->Targets, sz));

	  "  vdev @ %p, sz=%d\n", hd->Targets, sz));



	/* Clear the TM flags

	 */

drivers/message/fusion/mptsas.c

+22 −15
Original line number Diff line number Diff line
@@ -228,31 +228,35 @@ static void mptsas_print_expander_pg1(SasExpanderPage1_t *pg1) 
 * implement ->target_alloc.

 */

static int

mptsas_slave_alloc(struct scsi_device *device)

mptsas_slave_alloc(struct scsi_device *sdev)

{

	struct Scsi_Host	*host = device->host;

	struct Scsi_Host	*host = sdev->host;

	MPT_SCSI_HOST		*hd = (MPT_SCSI_HOST *)host->hostdata;

	struct sas_rphy		*rphy;

	struct mptsas_portinfo	*p;

	VirtTarget		*vtarget;

	VirtDevice		*vdev;

	uint			target = device->id;

	struct scsi_target 	*starget;

	int i;



	if ((vdev = hd->Targets[target]) != NULL)

		goto out;



	vdev = kmalloc(sizeof(VirtDevice), GFP_KERNEL);

	if (!vdev) {

		printk(MYIOC_s_ERR_FMT "slave_alloc kmalloc(%zd) FAILED!\n",

				hd->ioc->name, sizeof(VirtDevice));

		return -ENOMEM;

	}



	memset(vdev, 0, sizeof(VirtDevice));

	vdev->tflags = MPT_TARGET_FLAGS_Q_YES|MPT_TARGET_FLAGS_VALID_INQUIRY;

	vdev->ioc_id = hd->ioc->id;

	sdev->hostdata = vdev;

	starget = scsi_target(sdev);

	vtarget = starget->hostdata;

	vdev->vtarget = vtarget;

	if (vtarget->num_luns == 0) {

		vtarget->tflags = MPT_TARGET_FLAGS_Q_YES|MPT_TARGET_FLAGS_VALID_INQUIRY;

		hd->Targets[sdev->id] = vtarget;

	}



	rphy = dev_to_rphy(device->sdev_target->dev.parent);

	rphy = dev_to_rphy(sdev->sdev_target->dev.parent);

	list_for_each_entry(p, &hd->ioc->sas_topology, list) {

		for (i = 0; i < p->num_phys; i++) {

			if (p->phy_info[i].attached.sas_address ==
@@ -260,7 +264,7 @@ mptsas_slave_alloc(struct scsi_device *device) 
				vdev->target_id =

					p->phy_info[i].attached.target;

				vdev->bus_id = p->phy_info[i].attached.bus;

				hd->Targets[device->id] = vdev;

				vdev->lun = sdev->lun;

				goto out;

			}

		}
@@ -271,8 +275,10 @@ mptsas_slave_alloc(struct scsi_device *device) 
	return -ENODEV;



 out:

	vdev->num_luns++;

	device->hostdata = vdev;

	vtarget->ioc_id = vdev->ioc_id;

	vtarget->target_id = vdev->target_id;

	vtarget->bus_id = vdev->bus_id;

	vtarget->num_luns++;

	return 0;

}
@@ -283,8 +289,10 @@ static struct scsi_host_template mptsas_driver_template = { 
	.name				= "MPT SPI Host",

	.info				= mptscsih_info,

	.queuecommand			= mptscsih_qcmd,

	.target_alloc			= mptscsih_target_alloc,

	.slave_alloc			= mptsas_slave_alloc,

	.slave_configure		= mptscsih_slave_configure,

	.target_destroy			= mptscsih_target_destroy,

	.slave_destroy			= mptscsih_slave_destroy,

	.change_queue_depth 		= mptscsih_change_queue_depth,

	.eh_abort_handler		= mptscsih_abort,
@@ -987,7 +995,6 @@ mptsas_probe_hba_phys(MPT_ADAPTER *ioc, int *index) 
		goto out_free_port_info;



	list_add_tail(&port_info->list, &ioc->sas_topology);



	for (i = 0; i < port_info->num_phys; i++) {

		mptsas_sas_phy_pg0(ioc, &port_info->phy_info[i],

			(MPI_SAS_PHY_PGAD_FORM_PHY_NUMBER <<
@@ -1263,10 +1270,10 @@ mptsas_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	}



	memset(mem, 0, sz);

	hd->Targets = (VirtDevice **) mem;

	hd->Targets = (VirtTarget **) mem;



	dprintk((KERN_INFO

	  "  Targets @ %p, sz=%d\n", hd->Targets, sz));

	  "  vtarget @ %p, sz=%d\n", hd->Targets, sz));



	/* Clear the TM flags

	 */

drivers/message/fusion/mptscsih.c

+365 −380

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE