These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / ata / ahci.h

diff --git a/kernel/drivers/ata/ahci.h b/kernel/drivers/ata/ahci.h
index 71262e0..45586c1 100644 (file)
--- a/kernel/drivers/ata/ahci.h
+++ b/kernel/drivers/ata/ahci.h
@@ -181,6 +181,8 @@ enum {
        PORT_CMD_ALPE           = (1 << 26), /* Aggressive Link PM enable */
        PORT_CMD_ATAPI          = (1 << 24), /* Device is ATAPI */
        PORT_CMD_FBSCP          = (1 << 22), /* FBS Capable Port */
+       PORT_CMD_ESP            = (1 << 21), /* External Sata Port */
+       PORT_CMD_HPCP           = (1 << 18), /* HotPlug Capable Port */
        PORT_CMD_PMP            = (1 << 17), /* PMP attached */
        PORT_CMD_LIST_ON        = (1 << 15), /* cmd list DMA engine running */
        PORT_CMD_FIS_ON         = (1 << 14), /* FIS DMA engine running */
@@ -238,6 +240,8 @@ enum {
        AHCI_HFLAG_MULTI_MSI            = (1 << 16), /* multiple PCI MSIs */
        AHCI_HFLAG_NO_DEVSLP            = (1 << 17), /* no device sleep */
        AHCI_HFLAG_NO_FBS               = (1 << 18), /* no FBS */
+       AHCI_HFLAG_EDGE_IRQ             = (1 << 19), /* HOST_IRQ_STAT behaves as
+                                                       Edge Triggered */
 
        /* ap->flags bits */
 
@@ -341,6 +345,7 @@ struct ahci_host_priv {
        struct phy              **phys;
        unsigned                nports;         /* Number of ports */
        void                    *plat_data;     /* Other platform data */
+       unsigned int            irq;            /* interrupt line */
        /*
         * Optional ahci_start_engine override, if not set this gets set to the
         * default ahci_start_engine during ahci_save_initial_config, this can
@@ -393,8 +398,7 @@ void ahci_set_em_messages(struct ahci_host_priv *hpriv,
                          struct ata_port_info *pi);
 int ahci_reset_em(struct ata_host *host);
 void ahci_print_info(struct ata_host *host, const char *scc_s);
-int ahci_host_activate(struct ata_host *host, int irq,
-                      struct scsi_host_template *sht);
+int ahci_host_activate(struct ata_host *host, struct scsi_host_template *sht);
 void ahci_error_handler(struct ata_port *ap);
 
 static inline void __iomem *__ahci_port_base(struct ata_host *host,