[SCSI] small cleanups

[safe/jmp/linux-2.6] / drivers / scsi / libsas / sas_discover.c

diff --git a/drivers/scsi/libsas/sas_discover.c b/drivers/scsi/libsas/sas_discover.c
index b6ba0e0..328a78a 100644 (file)
--- a/drivers/scsi/libsas/sas_discover.c
+++ b/drivers/scsi/libsas/sas_discover.c
@@ -110,6 +110,13 @@ static int sas_execute_task(struct sas_task *task, void *buffer, int size,
        task->total_xfer_len = size;
        task->data_dir = pci_dma_dir;
        task->task_done = sas_disc_task_done;
+       if (pci_dma_dir != PCI_DMA_NONE &&
+           sas_protocol_ata(task->task_proto)) {
+               task->num_scatter = pci_map_sg(task->dev->port->ha->pcidev,
+                                              task->scatter,
+                                              task->num_scatter,
+                                              task->data_dir);
+       }
 
        for (retries = 0; retries < 5; retries++) {
                task->task_state_flags = SAS_TASK_STATE_PENDING;
@@ -192,8 +199,13 @@ static int sas_execute_task(struct sas_task *task, void *buffer, int size,
                }
        }
 ex_err:
-       if (pci_dma_dir != PCI_DMA_NONE)
+       if (pci_dma_dir != PCI_DMA_NONE) {
+               if (sas_protocol_ata(task->task_proto))
+                       pci_unmap_sg(task->dev->port->ha->pcidev,
+                                    task->scatter, task->num_scatter,
+                                    task->data_dir);
                kfree(scatter);
+       }
 out:
        return res;
 }
@@ -255,6 +267,7 @@ static int sas_get_port_device(struct asd_sas_port *port)
 
        switch (dev->dev_type) {
        case SAS_END_DEV:
+       case SATA_DEV:
                rphy = sas_end_device_alloc(port->port);
                break;
        case EDGE_DEV:
@@ -265,7 +278,6 @@ static int sas_get_port_device(struct asd_sas_port *port)
                rphy = sas_expander_alloc(port->port,
                                          SAS_FANOUT_EXPANDER_DEVICE);
                break;
-       case SATA_DEV:
        default:
                printk("ERROR: Unidentified device type %d\n", dev->dev_type);
                rphy = NULL;
@@ -292,9 +304,9 @@ static int sas_get_port_device(struct asd_sas_port *port)
        port->disc.max_level = 0;
 
        dev->rphy = rphy;
-       spin_lock(&port->dev_list_lock);
+       spin_lock_irq(&port->dev_list_lock);
        list_add_tail(&dev->dev_list_node, &port->dev_list);
-       spin_unlock(&port->dev_list_lock);
+       spin_unlock_irq(&port->dev_list_lock);
 
        return 0;
 }
@@ -371,6 +383,7 @@ static int sas_issue_ata_cmd(struct domain_device *dev, u8 command,
 
        task->dev = dev;
 
+       task->ata_task.fis.fis_type = 0x27;
        task->ata_task.fis.command = command;
        task->ata_task.fis.features = features;
        task->ata_task.fis.device = d2h_fis->device;
@@ -480,6 +493,9 @@ cont1:
           present.
        sas_satl_register_dev(dev);
        */
+
+       sas_fill_in_rphy(dev, dev->rphy);
+
        return 0;
 out_err:
        dev->sata_dev.identify_packet_device = NULL;
@@ -548,7 +564,7 @@ int sas_discover_sata(struct domain_device *dev)
 
        res = sas_notify_lldd_dev_found(dev);
        if (res)
-               goto out_err2;
+               return res;
 
        switch (dev->dev_type) {
        case SATA_DEV:
@@ -560,25 +576,12 @@ int sas_discover_sata(struct domain_device *dev)
        default:
                break;
        }
-       if (res)
-               goto out_err;
-
        sas_notify_lldd_dev_gone(dev);
-       res = sas_notify_lldd_dev_found(dev);
-       if (res)
-               goto out_err2;
-
-       res = sas_rphy_add(dev->rphy);
-       if (res)
-               goto out_err;
-
-       return res;
+       if (!res) {
+               sas_notify_lldd_dev_found(dev);
+               res = sas_rphy_add(dev->rphy);
+       }
 
-out_err:
-       sas_notify_lldd_dev_gone(dev);
-out_err2:
-       sas_rphy_free(dev->rphy);
-       dev->rphy = NULL;
        return res;
 }
 
@@ -600,24 +603,11 @@ int sas_discover_end_dev(struct domain_device *dev)
        if (res)
                goto out_err;
 
-       /* do this to get the end device port attributes which will have
-        * been scanned in sas_rphy_add */
-       sas_notify_lldd_dev_gone(dev);
-       res = sas_notify_lldd_dev_found(dev);
-       if (res)
-               goto out_err3;
-
        return 0;
 
 out_err:
        sas_notify_lldd_dev_gone(dev);
 out_err2:
-       sas_rphy_free(dev->rphy);
-       dev->rphy = NULL;
-       return res;
-out_err3:
-       sas_rphy_delete(dev->rphy);
-       dev->rphy = NULL;
        return res;
 }
 
@@ -672,6 +662,7 @@ void sas_unregister_domain_devices(struct asd_sas_port *port)
  */
 static void sas_discover_domain(struct work_struct *work)
 {
+       struct domain_device *dev;
        int error = 0;
        struct sas_discovery_event *ev =
                container_of(work, struct sas_discovery_event, work);
@@ -681,39 +672,42 @@ static void sas_discover_domain(struct work_struct *work)
                        &port->disc.pending);
 
        if (port->port_dev)
-               return ;
-       else {
-               error = sas_get_port_device(port);
-               if (error)
-                       return;
-       }
+               return;
+
+       error = sas_get_port_device(port);
+       if (error)
+               return;
+       dev = port->port_dev;
 
        SAS_DPRINTK("DOING DISCOVERY on port %d, pid:%d\n", port->id,
                    current->pid);
 
-       switch (port->port_dev->dev_type) {
+       switch (dev->dev_type) {
        case SAS_END_DEV:
-               error = sas_discover_end_dev(port->port_dev);
+               error = sas_discover_end_dev(dev);
                break;
        case EDGE_DEV:
        case FANOUT_DEV:
-               error = sas_discover_root_expander(port->port_dev);
+               error = sas_discover_root_expander(dev);
                break;
        case SATA_DEV:
        case SATA_PM:
-               error = sas_discover_sata(port->port_dev);
+               error = sas_discover_sata(dev);
                break;
        default:
-               SAS_DPRINTK("unhandled device %d\n", port->port_dev->dev_type);
+               SAS_DPRINTK("unhandled device %d\n", dev->dev_type);
                break;
        }
 
        if (error) {
-               spin_lock(&port->dev_list_lock);
-               list_del_init(&port->port_dev->dev_list_node);
-               spin_unlock(&port->dev_list_lock);
+               sas_rphy_free(dev->rphy);
+               dev->rphy = NULL;
+
+               spin_lock_irq(&port->dev_list_lock);
+               list_del_init(&dev->dev_list_node);
+               spin_unlock_irq(&port->dev_list_lock);
 
-               kfree(port->port_dev); /* not kobject_register-ed yet */
+               kfree(dev); /* not kobject_register-ed yet */
                port->port_dev = NULL;
        }