[SCSI] libsas, aic94xx: fix dma mapping cockups with ATA

This one was noticed by Gilbert Wu of Adaptec:

The libata core actually does the DMA mapping for you, so there has to
be an exception in the device drivers that *don't* do dma mapping for
ATA commands.  However, since we've already done this, libsas must now
dma map any ATA commands that it wishes to issue ... and yes, this is a
horrible mess.

Additionally, the test in aic94xx for ATA protocols isn't quite right.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 13 insertions, 1 deletions

diff --git a/drivers/scsi/libsas/sas_discover.c b/drivers/scsi/libsas/sas_discover.c
index a18c0f6d6668..4d768db1b567 100644
--- 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;
 }