3 files changed, 17 insertions, 8 deletions

diff --git a/drivers/scsi/aic94xx/aic94xx_dev.c b/drivers/scsi/aic94xx/aic94xx_dev.c
index c520e5b41fb5..3dce618bf414 100644
--- a/drivers/scsi/aic94xx/aic94xx_dev.c
+++ b/drivers/scsi/aic94xx/aic94xx_dev.c
@@ -126,7 +126,7 @@ static inline int asd_init_sata(struct domain_device *dev)
                 if (w76 & 0x100) /* NCQ? */
                         qdepth = (w75 & 0x1F) + 1;
                 asd_ddbsite_write_dword(asd_ha, ddb, SATA_TAG_ALLOC_MASK,
-                                        (1<<qdepth)-1);
+                                        (1ULL<<qdepth)-1);
                 asd_ddbsite_write_byte(asd_ha, ddb, NUM_SATA_TAGS, qdepth);
         }
         if (dev->dev_type == SATA_DEV || dev->dev_type == SATA_PM ||
diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c
index b8c6810090d5..ab00aecc5466 100644
--- a/drivers/scsi/aic94xx/aic94xx_init.c
+++ b/drivers/scsi/aic94xx/aic94xx_init.c
@@ -81,6 +81,9 @@ static struct scsi_host_template aic94xx_sht = {
         .use_clustering         = ENABLE_CLUSTERING,
         .eh_device_reset_handler        = sas_eh_device_reset_handler,
         .eh_bus_reset_handler   = sas_eh_bus_reset_handler,
+        .slave_alloc            = sas_slave_alloc,
+        .target_destroy         = sas_target_destroy,
+        .ioctl                  = sas_ioctl,
 };
 
 static int __devinit asd_map_memio(struct asd_ha_struct *asd_ha)
diff --git a/drivers/scsi/aic94xx/aic94xx_task.c b/drivers/scsi/aic94xx/aic94xx_task.c
index e2ad5bed9403..d5d8caba3560 100644
--- a/drivers/scsi/aic94xx/aic94xx_task.c
+++ b/drivers/scsi/aic94xx/aic94xx_task.c
@@ -74,8 +74,13 @@ static inline int asd_map_scatterlist(struct sas_task *task,
                 return 0;
         }
 
-        num_sg = pci_map_sg(asd_ha->pcidev, task->scatter, task->num_scatter,
-                            task->data_dir);
+        /* STP tasks come from libata which has already mapped
+         * the SG list */
+        if (sas_protocol_ata(task->task_proto))
+                num_sg = task->num_scatter;
+        else
+                num_sg = pci_map_sg(asd_ha->pcidev, task->scatter,
+                                    task->num_scatter, task->data_dir);
         if (num_sg == 0)
                 return -ENOMEM;
 
@@ -120,8 +125,9 @@ static inline int asd_map_scatterlist(struct sas_task *task,
 
         return 0;
 err_unmap:
-        pci_unmap_sg(asd_ha->pcidev, task->scatter, task->num_scatter,
-                     task->data_dir);
+        if (sas_protocol_ata(task->task_proto))
+                pci_unmap_sg(asd_ha->pcidev, task->scatter, task->num_scatter,
+                             task->data_dir);
         return res;
 }
 
@@ -142,8 +148,9 @@ static inline void asd_unmap_scatterlist(struct asd_ascb *ascb)
         }
 
         asd_free_coherent(asd_ha, ascb->sg_arr);
-        pci_unmap_sg(asd_ha->pcidev, task->scatter, task->num_scatter,
-                     task->data_dir);
+        if (task->task_proto != SAS_PROTOCOL_STP)
+                pci_unmap_sg(asd_ha->pcidev, task->scatter, task->num_scatter,
+                             task->data_dir);
 }
 
 /* ---------- Task complete tasklet ---------- */
@@ -391,7 +398,6 @@ static int asd_build_ata_ascb(struct asd_ascb *ascb, struct sas_task *task,
 
         scb->ata_task.total_xfer_len = cpu_to_le32(task->total_xfer_len);
         scb->ata_task.fis = task->ata_task.fis;
-        scb->ata_task.fis.fis_type = 0x27;
         if (likely(!task->ata_task.device_control_reg_update))
                 scb->ata_task.fis.flags |= 0x80; /* C=1: update ATA cmd reg */
         scb->ata_task.fis.flags &= 0xF0; /* PM_PORT field shall be 0 */