6 files changed, 228 insertions, 40 deletions

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index e08d322d01d7..4cfb7200260d 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -14,7 +14,7 @@ menuconfig ATA
         tristate "Serial ATA and Parallel ATA drivers"
         depends on HAS_IOMEM
         depends on BLOCK
-        depends on !(M32R || M68K) || BROKEN
+        depends on !(M32R || M68K || S390) || BROKEN
         select SCSI
         ---help---
           If you want to use a ATA hard disk, ATA tape drive, ATA CD-ROM or
@@ -163,7 +163,7 @@ config SATA_QSTOR
 
 config SATA_SX4
         tristate "Promise SATA SX4 support (Experimental)"
-        depends on PCI && EXPERIMENTAL
+        depends on PCI
         help
           This option enables support for Promise Serial ATA SX4.
 
@@ -390,7 +390,7 @@ config PATA_CS5530
 
 config PATA_CS5535
         tristate "CS5535 PATA support (Experimental)"
-        depends on PCI && X86 && !X86_64 && EXPERIMENTAL
+        depends on PCI && X86 && !X86_64
         help
           This option enables support for the NatSemi/AMD CS5535
           companion chip used with the Geode processor family.
@@ -408,7 +408,7 @@ config PATA_CS5536
 
 config PATA_CYPRESS
         tristate "Cypress CY82C693 PATA support (Very Experimental)"
-        depends on PCI && EXPERIMENTAL
+        depends on PCI
         help
           This option enables support for the Cypress/Contaq CY82C693
           chipset found in some Alpha systems
@@ -496,7 +496,7 @@ config PATA_IMX
 
 config PATA_IT8213
         tristate "IT8213 PATA support (Experimental)"
-        depends on PCI && EXPERIMENTAL
+        depends on PCI
         help
           This option enables support for the ITE 821 PATA
           controllers via the new ATA layer.
@@ -589,7 +589,7 @@ config PATA_OLDPIIX
 
 config PATA_OPTIDMA
         tristate "OPTI FireStar PATA support (Very Experimental)"
-        depends on PCI && EXPERIMENTAL
+        depends on PCI
         help
           This option enables DMA/PIO support for the later OPTi
           controllers found on some old motherboards and in some
@@ -616,7 +616,7 @@ config PATA_PDC_OLD
 
 config PATA_RADISYS
         tristate "RADISYS 82600 PATA support (Experimental)"
-        depends on PCI && EXPERIMENTAL
+        depends on PCI
         help
           This option enables support for the RADISYS 82600
           PATA controllers via the new ATA layer
@@ -687,7 +687,7 @@ config PATA_SIS
 
 config PATA_TOSHIBA
         tristate "Toshiba Piccolo support (Experimental)"
-        depends on PCI && EXPERIMENTAL
+        depends on PCI
         help
           Support for the Toshiba Piccolo controllers. Currently only the
           primary channel is supported by this driver.
@@ -738,7 +738,7 @@ comment "PIO-only SFF controllers"
 
 config PATA_AT32
         tristate "Atmel AVR32 PATA support (Experimental)"
-        depends on AVR32 && PLATFORM_AT32AP && EXPERIMENTAL
+        depends on AVR32 && PLATFORM_AT32AP
         help
           This option enables support for the IDE devices on the
           Atmel AT32AP platform.
@@ -755,7 +755,7 @@ config PATA_AT91
 
 config PATA_CMD640_PCI
         tristate "CMD640 PCI PATA support (Experimental)"
-        depends on PCI && EXPERIMENTAL
+        depends on PCI
         help
           This option enables support for the CMD640 PCI IDE
           interface chip. Only the primary channel is currently
@@ -801,7 +801,7 @@ config PATA_NS87410
 
 config PATA_OPTI
         tristate "OPTI621/6215 PATA support (Very Experimental)"
-        depends on PCI && EXPERIMENTAL
+        depends on PCI
         help
           This option enables full PIO support for the early Opti ATA
           controllers found on some old motherboards.
@@ -881,7 +881,7 @@ config PATA_SAMSUNG_CF
 
 config PATA_WINBOND_VLB
         tristate "Winbond W83759A VLB PATA support (Experimental)"
-        depends on ISA && EXPERIMENTAL
+        depends on ISA
         select PATA_LEGACY
         help
           Support for the Winbond W83759A controller on Vesa Local Bus
@@ -909,7 +909,7 @@ config ATA_GENERIC
 
 config PATA_LEGACY
         tristate "Legacy ISA PATA support (Experimental)"
-        depends on (ISA || PCI) && EXPERIMENTAL
+        depends on (ISA || PCI)
         help
           This option enables support for ISA/VLB/PCI bus legacy PATA
           ports and allows them to be accessed via the new ATA layer.
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 497912732566..495aeed26779 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -1061,6 +1061,86 @@ static inline void ahci_gtf_filter_workaround(struct ata_host *host)
 {}
 #endif
 
+int ahci_init_interrupts(struct pci_dev *pdev, struct ahci_host_priv *hpriv)
+{
+        int rc;
+        unsigned int maxvec;
+
+        if (!(hpriv->flags & AHCI_HFLAG_NO_MSI)) {
+                rc = pci_enable_msi_block_auto(pdev, &maxvec);
+                if (rc > 0) {
+                        if ((rc == maxvec) || (rc == 1))
+                                return rc;
+                        /*
+                         * Assume that advantage of multipe MSIs is negated,
+                         * so fallback to single MSI mode to save resources
+                         */
+                        pci_disable_msi(pdev);
+                        if (!pci_enable_msi(pdev))
+                                return 1;
+                }
+        }
+
+        pci_intx(pdev, 1);
+        return 0;
+}
+
+/**
+ *      ahci_host_activate - start AHCI host, request IRQs and register it
+ *      @host: target ATA host
+ *      @irq: base IRQ number to request
+ *      @n_msis: number of MSIs allocated for this host
+ *      @irq_handler: irq_handler used when requesting IRQs
+ *      @irq_flags: irq_flags used when requesting IRQs
+ *
+ *      Similar to ata_host_activate, but requests IRQs according to AHCI-1.1
+ *      when multiple MSIs were allocated. That is one MSI per port, starting
+ *      from @irq.
+ *
+ *      LOCKING:
+ *      Inherited from calling layer (may sleep).
+ *
+ *      RETURNS:
+ *      0 on success, -errno otherwise.
+ */
+int ahci_host_activate(struct ata_host *host, int irq, unsigned int n_msis)
+{
+        int i, rc;
+
+        /* Sharing Last Message among several ports is not supported */
+        if (n_msis < host->n_ports)
+                return -EINVAL;
+
+        rc = ata_host_start(host);
+        if (rc)
+                return rc;
+
+        for (i = 0; i < host->n_ports; i++) {
+                rc = devm_request_threaded_irq(host->dev,
+                        irq + i, ahci_hw_interrupt, ahci_thread_fn, IRQF_SHARED,
+                        dev_driver_string(host->dev), host->ports[i]);
+                if (rc)
+                        goto out_free_irqs;
+        }
+
+        for (i = 0; i < host->n_ports; i++)
+                ata_port_desc(host->ports[i], "irq %d", irq + i);
+
+        rc = ata_host_register(host, &ahci_sht);
+        if (rc)
+                goto out_free_all_irqs;
+
+        return 0;
+
+out_free_all_irqs:
+        i = host->n_ports;
+out_free_irqs:
+        for (i--; i >= 0; i--)
+                devm_free_irq(host->dev, irq + i, host->ports[i]);
+
+        return rc;
+}
+
 static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
         unsigned int board_id = ent->driver_data;
@@ -1069,7 +1149,7 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         struct device *dev = &pdev->dev;
         struct ahci_host_priv *hpriv;
         struct ata_host *host;
-        int n_ports, i, rc;
+        int n_ports, n_msis, i, rc;
         int ahci_pci_bar = AHCI_PCI_BAR_STANDARD;
 
         VPRINTK("ENTER\n");
@@ -1156,11 +1236,12 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         if (ahci_sb600_enable_64bit(pdev))
                 hpriv->flags &= ~AHCI_HFLAG_32BIT_ONLY;
 
-        if ((hpriv->flags & AHCI_HFLAG_NO_MSI) || pci_enable_msi(pdev))
-                pci_intx(pdev, 1);
-
         hpriv->mmio = pcim_iomap_table(pdev)[ahci_pci_bar];
 
+        n_msis = ahci_init_interrupts(pdev, hpriv);
+        if (n_msis > 1)
+                hpriv->flags |= AHCI_HFLAG_MULTI_MSI;
+
         /* save initial config */
         ahci_pci_save_initial_config(pdev, hpriv);
 
@@ -1256,6 +1337,10 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         ahci_pci_print_info(host);
 
         pci_set_master(pdev);
+
+        if (hpriv->flags & AHCI_HFLAG_MULTI_MSI)
+                return ahci_host_activate(host, pdev->irq, n_msis);
+
         return ata_host_activate(host, pdev->irq, ahci_interrupt, IRQF_SHARED,
                                  &ahci_sht);
 }
diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h
index 9be471200a07..b830e6c9fe49 100644
--- a/drivers/ata/ahci.h
+++ b/drivers/ata/ahci.h
@@ -231,6 +231,7 @@ enum {
         AHCI_HFLAG_DELAY_ENGINE         = (1 << 15), /* do not start engine on
                                                         port start (wait until
                                                         error-handling stage) */
+        AHCI_HFLAG_MULTI_MSI            = (1 << 16), /* multiple PCI MSIs */
 
         /* ap->flags bits */
 
@@ -297,6 +298,8 @@ struct ahci_port_priv {
         unsigned int            ncq_saw_d2h:1;
         unsigned int            ncq_saw_dmas:1;
         unsigned int            ncq_saw_sdb:1;
+        u32                     intr_status;    /* interrupts to handle */
+        spinlock_t              lock;           /* protects parent ata_port */
         u32                     intr_mask;      /* interrupts to enable */
         bool                    fbs_supported;  /* set iff FBS is supported */
         bool                    fbs_enabled;    /* set iff FBS is enabled */
@@ -359,7 +362,10 @@ void ahci_set_em_messages(struct ahci_host_priv *hpriv,
                           struct ata_port_info *pi);
 int ahci_reset_em(struct ata_host *host);
 irqreturn_t ahci_interrupt(int irq, void *dev_instance);
+irqreturn_t ahci_hw_interrupt(int irq, void *dev_instance);
+irqreturn_t ahci_thread_fn(int irq, void *dev_instance);
 void ahci_print_info(struct ata_host *host, const char *scc_s);
+int ahci_host_activate(struct ata_host *host, int irq, unsigned int n_msis);
 
 static inline void __iomem *__ahci_port_base(struct ata_host *host,
                                              unsigned int port_no)
diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
index 6cd7805e47ca..34c82167b962 100644
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
@@ -1655,19 +1655,16 @@ static void ahci_error_intr(struct ata_port *ap, u32 irq_stat)
                 ata_port_abort(ap);
 }
 
-static void ahci_port_intr(struct ata_port *ap)
+static void ahci_handle_port_interrupt(struct ata_port *ap,
+                                       void __iomem *port_mmio, u32 status)
 {
-        void __iomem *port_mmio = ahci_port_base(ap);
         struct ata_eh_info *ehi = &ap->link.eh_info;
         struct ahci_port_priv *pp = ap->private_data;
         struct ahci_host_priv *hpriv = ap->host->private_data;
         int resetting = !!(ap->pflags & ATA_PFLAG_RESETTING);
-        u32 status, qc_active = 0;
+        u32 qc_active = 0;
         int rc;
 
-        status = readl(port_mmio + PORT_IRQ_STAT);
-        writel(status, port_mmio + PORT_IRQ_STAT);
-
         /* ignore BAD_PMP while resetting */
         if (unlikely(resetting))
                 status &= ~PORT_IRQ_BAD_PMP;
@@ -1743,6 +1740,107 @@ static void ahci_port_intr(struct ata_port *ap)
         }
 }
 
+void ahci_port_intr(struct ata_port *ap)
+{
+        void __iomem *port_mmio = ahci_port_base(ap);
+        u32 status;
+
+        status = readl(port_mmio + PORT_IRQ_STAT);
+        writel(status, port_mmio + PORT_IRQ_STAT);
+
+        ahci_handle_port_interrupt(ap, port_mmio, status);
+}
+
+irqreturn_t ahci_thread_fn(int irq, void *dev_instance)
+{
+        struct ata_port *ap = dev_instance;
+        struct ahci_port_priv *pp = ap->private_data;
+        void __iomem *port_mmio = ahci_port_base(ap);
+        unsigned long flags;
+        u32 status;
+
+        spin_lock_irqsave(&ap->host->lock, flags);
+        status = pp->intr_status;
+        if (status)
+                pp->intr_status = 0;
+        spin_unlock_irqrestore(&ap->host->lock, flags);
+
+        spin_lock_bh(ap->lock);
+        ahci_handle_port_interrupt(ap, port_mmio, status);
+        spin_unlock_bh(ap->lock);
+
+        return IRQ_HANDLED;
+}
+EXPORT_SYMBOL_GPL(ahci_thread_fn);
+
+void ahci_hw_port_interrupt(struct ata_port *ap)
+{
+        void __iomem *port_mmio = ahci_port_base(ap);
+        struct ahci_port_priv *pp = ap->private_data;
+        u32 status;
+
+        status = readl(port_mmio + PORT_IRQ_STAT);
+        writel(status, port_mmio + PORT_IRQ_STAT);
+
+        pp->intr_status |= status;
+}
+
+irqreturn_t ahci_hw_interrupt(int irq, void *dev_instance)
+{
+        struct ata_port *ap_this = dev_instance;
+        struct ahci_port_priv *pp = ap_this->private_data;
+        struct ata_host *host = ap_this->host;
+        struct ahci_host_priv *hpriv = host->private_data;
+        void __iomem *mmio = hpriv->mmio;
+        unsigned int i;
+        u32 irq_stat, irq_masked;
+
+        VPRINTK("ENTER\n");
+
+        spin_lock(&host->lock);
+
+        irq_stat = readl(mmio + HOST_IRQ_STAT);
+
+        if (!irq_stat) {
+                u32 status = pp->intr_status;
+
+                spin_unlock(&host->lock);
+
+                VPRINTK("EXIT\n");
+
+                return status ? IRQ_WAKE_THREAD : IRQ_NONE;
+        }
+
+        irq_masked = irq_stat & hpriv->port_map;
+
+        for (i = 0; i < host->n_ports; i++) {
+                struct ata_port *ap;
+
+                if (!(irq_masked & (1 << i)))
+                        continue;
+
+                ap = host->ports[i];
+                if (ap) {
+                        ahci_hw_port_interrupt(ap);
+                        VPRINTK("port %u\n", i);
+                } else {
+                        VPRINTK("port %u (no irq)\n", i);
+                        if (ata_ratelimit())
+                                dev_warn(host->dev,
+                                         "interrupt on disabled port %u\n", i);
+                }
+        }
+
+        writel(irq_stat, mmio + HOST_IRQ_STAT);
+
+        spin_unlock(&host->lock);
+
+        VPRINTK("EXIT\n");
+
+        return IRQ_WAKE_THREAD;
+}
+EXPORT_SYMBOL_GPL(ahci_hw_interrupt);
+
 irqreturn_t ahci_interrupt(int irq, void *dev_instance)
 {
         struct ata_host *host = dev_instance;
@@ -2196,6 +2294,14 @@ static int ahci_port_start(struct ata_port *ap)
          */
         pp->intr_mask = DEF_PORT_IRQ;
 
+        /*
+         * Switch to per-port locking in case each port has its own MSI vector.
+         */
+        if ((hpriv->flags & AHCI_HFLAG_MULTI_MSI)) {
+                spin_lock_init(&pp->lock);
+                ap->lock = &pp->lock;
+        }
+
         ap->private_data = pp;
 
         /* engage engines, captain */
diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
index ef01ac07502e..6fc67f7efb22 100644
--- a/drivers/ata/libata-acpi.c
+++ b/drivers/ata/libata-acpi.c
@@ -1029,30 +1029,20 @@ static void ata_acpi_register_power_resource(struct ata_device *dev)
 {
         struct scsi_device *sdev = dev->sdev;
         acpi_handle handle;
-        struct device *device;
 
         handle = ata_dev_acpi_handle(dev);
-        if (!handle)
-                return;
-
-        device = &sdev->sdev_gendev;
-
-        acpi_power_resource_register_device(device, handle);
+        if (handle)
+                acpi_dev_pm_remove_dependent(handle, &sdev->sdev_gendev);
 }
 
 static void ata_acpi_unregister_power_resource(struct ata_device *dev)
 {
         struct scsi_device *sdev = dev->sdev;
         acpi_handle handle;
-        struct device *device;
 
         handle = ata_dev_acpi_handle(dev);
-        if (!handle)
-                return;
-
-        device = &sdev->sdev_gendev;
-
-        acpi_power_resource_unregister_device(device, handle);
+        if (handle)
+                acpi_dev_pm_remove_dependent(handle, &sdev->sdev_gendev);
 }
 
 void ata_acpi_bind(struct ata_device *dev)
diff --git a/drivers/ata/pata_ep93xx.c b/drivers/ata/pata_ep93xx.c
index 556222f04731..c1bfaf43d109 100644
--- a/drivers/ata/pata_ep93xx.c
+++ b/drivers/ata/pata_ep93xx.c
@@ -31,6 +31,7 @@
  *   Copyright (C) 2006 Tower Technologies
  */
 
+#include <linux/err.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -937,9 +938,9 @@ static int ep93xx_pata_probe(struct platform_device *pdev)
                 goto err_rel_gpio;
         }
 
-        ide_base = devm_request_and_ioremap(&pdev->dev, mem_res);
-        if (!ide_base) {
-                err = -ENXIO;
+        ide_base = devm_ioremap_resource(&pdev->dev, mem_res);
+        if (IS_ERR(ide_base)) {
+                err = PTR_ERR(ide_base);
                 goto err_rel_gpio;
         }