2 files changed, 8 insertions, 0 deletions

diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h
index b1750007c8dc..feb127ef4e4e 100644
--- a/drivers/ata/ahci.h
+++ b/drivers/ata/ahci.h
@@ -210,6 +210,9 @@ enum {
         AHCI_HFLAG_NO_SNTF              = (1 << 12), /* no sntf */
         AHCI_HFLAG_NO_FPDMA_AA          = (1 << 13), /* no FPDMA AA */
         AHCI_HFLAG_YES_FBS              = (1 << 14), /* force FBS cap on */
+        AHCI_HFLAG_DELAY_ENGINE         = (1 << 15), /* do not start engine on
+                                                        port start (wait until
+                                                        error-handling stage) */
 
         /* ap->flags bits */
 
diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
index a72bfd0ecfee..f9eaa82311a9 100644
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
@@ -737,6 +737,7 @@ static void ahci_power_down(struct ata_port *ap)
 
 static void ahci_start_port(struct ata_port *ap)
 {
+        struct ahci_host_priv *hpriv = ap->host->private_data;
         struct ahci_port_priv *pp = ap->private_data;
         struct ata_link *link;
         struct ahci_em_priv *emp;
@@ -746,6 +747,10 @@ static void ahci_start_port(struct ata_port *ap)
         /* enable FIS reception */
         ahci_start_fis_rx(ap);
 
+        /* enable DMA */
+        if (!(hpriv->flags & AHCI_HFLAG_DELAY_ENGINE))
+                ahci_start_engine(ap);
+
         /* turn on LEDs */
         if (ap->flags & ATA_FLAG_EM) {
                 ata_for_each_link(link, ap, EDGE) {