Merge branch 'upstream'

5 files changed, 13 insertions, 5 deletions

diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c
index 0c5f0c844d21..ff48066d4c4f 100644
--- a/drivers/scsi/ahci.c
+++ b/drivers/scsi/ahci.c
@@ -549,6 +549,12 @@ static int ahci_softreset(struct ata_port *ap, int verbose, unsigned int *class)
 
         DPRINTK("ENTER\n");
 
+        if (!sata_dev_present(ap)) {
+                DPRINTK("PHY reports no device\n");
+                *class = ATA_DEV_NONE;
+                return 0;
+        }
+
         /* prepare for SRST (AHCI-1.1 10.4.1) */
         rc = ahci_stop_engine(ap);
         if (rc) {
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index 57b3240ee867..2b2feb6462a9 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -76,6 +76,10 @@ int atapi_enabled = 1;
 module_param(atapi_enabled, int, 0444);
 MODULE_PARM_DESC(atapi_enabled, "Enable discovery of ATAPI devices (0=off, 1=on)");
 
+int atapi_dmadir = 0;
+module_param(atapi_dmadir, int, 0444);
+MODULE_PARM_DESC(atapi_dmadir, "Enable ATAPI DMADIR bridge support (0=off, 1=on)");
+
 int libata_fua = 0;
 module_param_named(fua, libata_fua, int, 0444);
 MODULE_PARM_DESC(fua, "FUA support (0=off, 1=on)");
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c
index 745fc263feeb..c9c001490293 100644
--- a/drivers/scsi/libata-scsi.c
+++ b/drivers/scsi/libata-scsi.c
@@ -2163,11 +2163,9 @@ static unsigned int atapi_xlat(struct ata_queued_cmd *qc, const u8 *scsicmd)
                 qc->tf.protocol = ATA_PROT_ATAPI_DMA;
                 qc->tf.feature |= ATAPI_PKT_DMA;
 
-#ifdef ATAPI_ENABLE_DMADIR
-                /* some SATA bridges need us to indicate data xfer direction */
-                if (cmd->sc_data_direction != DMA_TO_DEVICE)
+                if (atapi_dmadir && (cmd->sc_data_direction != DMA_TO_DEVICE))
+                        /* some SATA bridges need us to indicate data xfer direction */
                         qc->tf.feature |= ATAPI_DMADIR;
-#endif
         }
 
         qc->nbytes = cmd->bufflen;
diff --git a/drivers/scsi/libata.h b/drivers/scsi/libata.h
index e3bd1ddb5387..652c08e3808e 100644
--- a/drivers/scsi/libata.h
+++ b/drivers/scsi/libata.h
@@ -41,6 +41,7 @@ struct ata_scsi_args {
 
 /* libata-core.c */
 extern int atapi_enabled;
+extern int atapi_dmadir;
 extern int libata_fua;
 extern struct ata_queued_cmd *ata_qc_new_init(struct ata_port *ap,
                                       struct ata_device *dev);
diff --git a/include/linux/libata.h b/include/linux/libata.h
index cc6cc08e8010..44d074ff7789 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -44,7 +44,6 @@
 #undef ATA_NDEBUG               /* define to disable quick runtime checks */
 #undef ATA_ENABLE_PATA          /* define to enable PATA support in some
                                  * low-level drivers */
-#undef ATAPI_ENABLE_DMADIR      /* enables ATAPI DMADIR bridge support */
 
 
 /* note: prints function name for you */