Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / drivers / ata / ahci.h

diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h
index b1750007c8dc5603b23259c12d0b1b5639d07d48..c2594ddf25b00f54d22b51c66f23db5d54d47222 100644 (file)
--- a/drivers/ata/ahci.h
+++ b/drivers/ata/ahci.h
@@ -195,6 +195,9 @@ enum {
        PORT_FBS_EN             = (1 << 0), /* Enable FBS */
 
        /* hpriv->flags bits */
+
+#define AHCI_HFLAGS(flags)             .private_data   = (void *)(flags)
+
        AHCI_HFLAG_NO_NCQ               = (1 << 0),
        AHCI_HFLAG_IGN_IRQ_IF_ERR       = (1 << 1), /* ignore IRQ_IF_ERR */
        AHCI_HFLAG_IGN_SERR_INTERNAL    = (1 << 2), /* ignore SERR_INTERNAL */
@@ -210,6 +213,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 */