[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: Eric Moore <Eric.Moore@lsil.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 22 insertions, 15 deletions

diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
index 282fb5ebbadf..17e9757e728b 100644
--- a/drivers/message/fusion/mptsas.c
+++ b/drivers/message/fusion/mptsas.c
@@ -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
          */