Merge branch 'for-4.5-fixes' into for-4.6

4 files changed, 61 insertions, 4 deletions

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 196f0287cba1..1fe592009c2e 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -372,15 +372,21 @@ static const struct pci_device_id ahci_pci_tbl[] = {
         { PCI_VDEVICE(INTEL, 0xa107), board_ahci }, /* Sunrise Point-H RAID */
         { PCI_VDEVICE(INTEL, 0xa10f), board_ahci }, /* Sunrise Point-H RAID */
         { PCI_VDEVICE(INTEL, 0x2822), board_ahci }, /* Lewisburg RAID*/
+        { PCI_VDEVICE(INTEL, 0x2823), board_ahci }, /* Lewisburg AHCI*/
         { PCI_VDEVICE(INTEL, 0x2826), board_ahci }, /* Lewisburg RAID*/
+        { PCI_VDEVICE(INTEL, 0x2827), board_ahci }, /* Lewisburg RAID*/
         { PCI_VDEVICE(INTEL, 0xa182), board_ahci }, /* Lewisburg AHCI*/
         { PCI_VDEVICE(INTEL, 0xa184), board_ahci }, /* Lewisburg RAID*/
         { PCI_VDEVICE(INTEL, 0xa186), board_ahci }, /* Lewisburg RAID*/
         { PCI_VDEVICE(INTEL, 0xa18e), board_ahci }, /* Lewisburg RAID*/
+        { PCI_VDEVICE(INTEL, 0xa1d2), board_ahci }, /* Lewisburg RAID*/
+        { PCI_VDEVICE(INTEL, 0xa1d6), board_ahci }, /* Lewisburg RAID*/
         { PCI_VDEVICE(INTEL, 0xa202), board_ahci }, /* Lewisburg AHCI*/
         { PCI_VDEVICE(INTEL, 0xa204), board_ahci }, /* Lewisburg RAID*/
         { PCI_VDEVICE(INTEL, 0xa206), board_ahci }, /* Lewisburg RAID*/
         { PCI_VDEVICE(INTEL, 0xa20e), board_ahci }, /* Lewisburg RAID*/
+        { PCI_VDEVICE(INTEL, 0xa252), board_ahci }, /* Lewisburg RAID*/
+        { PCI_VDEVICE(INTEL, 0xa256), board_ahci }, /* Lewisburg RAID*/
 
         /* JMicron 360/1/3/5/6, match class to avoid IDE function */
         { PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
@@ -1360,6 +1366,44 @@ static inline void ahci_gtf_filter_workaround(struct ata_host *host)
 {}
 #endif
 
+#ifdef CONFIG_ARM64
+/*
+ * Due to ERRATA#22536, ThunderX needs to handle HOST_IRQ_STAT differently.
+ * Workaround is to make sure all pending IRQs are served before leaving
+ * handler.
+ */
+static irqreturn_t ahci_thunderx_irq_handler(int irq, void *dev_instance)
+{
+        struct ata_host *host = dev_instance;
+        struct ahci_host_priv *hpriv;
+        unsigned int rc = 0;
+        void __iomem *mmio;
+        u32 irq_stat, irq_masked;
+        unsigned int handled = 1;
+
+        VPRINTK("ENTER\n");
+        hpriv = host->private_data;
+        mmio = hpriv->mmio;
+        irq_stat = readl(mmio + HOST_IRQ_STAT);
+        if (!irq_stat)
+                return IRQ_NONE;
+
+        do {
+                irq_masked = irq_stat & hpriv->port_map;
+                spin_lock(&host->lock);
+                rc = ahci_handle_port_intr(host, irq_masked);
+                if (!rc)
+                        handled = 0;
+                writel(irq_stat, mmio + HOST_IRQ_STAT);
+                irq_stat = readl(mmio + HOST_IRQ_STAT);
+                spin_unlock(&host->lock);
+        } while (irq_stat);
+        VPRINTK("EXIT\n");
+
+        return IRQ_RETVAL(handled);
+}
+#endif
+
 /*
  * ahci_init_msix() - optionally enable per-port MSI-X otherwise defer
  * to single msi.
@@ -1595,6 +1639,11 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         if (ahci_broken_devslp(pdev))
                 hpriv->flags |= AHCI_HFLAG_NO_DEVSLP;
 
+#ifdef CONFIG_ARM64
+        if (pdev->vendor == 0x177d && pdev->device == 0xa01c)
+                hpriv->irq_handler = ahci_thunderx_irq_handler;
+#endif
+
         /* save initial config */
         ahci_pci_save_initial_config(pdev, hpriv);
 
diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
index 2d21b46db714..3982054060b8 100644
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
@@ -1211,8 +1211,7 @@ static void ahci_port_init(struct device *dev, struct ata_port *ap,
 
         /* mark esata ports */
         tmp = readl(port_mmio + PORT_CMD);
-        if ((tmp & PORT_CMD_HPCP) ||
-            ((tmp & PORT_CMD_ESP) && (hpriv->cap & HOST_CAP_SXS)))
+        if ((tmp & PORT_CMD_ESP) && (hpriv->cap & HOST_CAP_SXS))
                 ap->pflags |= ATA_PFLAG_EXTERNAL;
 }
 
diff --git a/drivers/ata/pata_rb532_cf.c b/drivers/ata/pata_rb532_cf.c
index 12fe0f3bb7e9..c8b6a780a290 100644
--- a/drivers/ata/pata_rb532_cf.c
+++ b/drivers/ata/pata_rb532_cf.c
@@ -32,6 +32,8 @@
 #include <linux/libata.h>
 #include <scsi/scsi_host.h>
 
+#include <asm/mach-rc32434/rb.h>
+
 #define DRV_NAME        "pata-rb532-cf"
 #define DRV_VERSION     "0.1.0"
 #define DRV_DESC        "PATA driver for RouterBOARD 532 Compact Flash"
@@ -107,6 +109,7 @@ static int rb532_pata_driver_probe(struct platform_device *pdev)
         int gpio;
         struct resource *res;
         struct ata_host *ah;
+        struct cf_device *pdata;
         struct rb532_cf_info *info;
         int ret;
 
@@ -122,7 +125,13 @@ static int rb532_pata_driver_probe(struct platform_device *pdev)
                 return -ENOENT;
         }
 
-        gpio = irq_to_gpio(irq);
+        pdata = dev_get_platdata(&pdev->dev);
+        if (!pdata) {
+                dev_err(&pdev->dev, "no platform data specified\n");
+                return -EINVAL;
+        }
+
+        gpio = pdata->gpio_pin;
         if (gpio < 0) {
                 dev_err(&pdev->dev, "no GPIO found for irq%d\n", irq);
                 return -ENOENT;
diff --git a/include/linux/libata.h b/include/linux/libata.h
index bec2abbd7ab2..2c4ebef79d0c 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -720,7 +720,7 @@ struct ata_device {
         union {
                 u16             id[ATA_ID_WORDS]; /* IDENTIFY xxx DEVICE data */
                 u32             gscr[SATA_PMP_GSCR_DWORDS]; /* PMP GSCR block */
-        };
+        } ____cacheline_aligned;
 
         /* DEVSLP Timing Variables from Identify Device Data Log */
         u8                      devslp_timing[ATA_LOG_DEVSLP_SIZE];