ata: Remove the AHCI_HFLAG_EDGE_IRQ support from libahci.

The flexibility to override the irq handles in the LLD's are already
present, so controllers implementing a edge trigger latch can
implement their own interrupt handler inside the driver.  This patch
removes the AHCI_HFLAG_EDGE_IRQ support from libahci and moves edge
irq handling to ahci_xgene.

tj: Minor update to description.

Signed-off-by: Suman Tripathi <stripathi@apm.com>
Signed-off-by: Tejun Heo <tj@kenrel.org>

1 files changed, 39 insertions, 1 deletions

diff --git a/drivers/ata/ahci_xgene.c b/drivers/ata/ahci_xgene.c
index e2c6d9e0c5ac..8b8ccb6434e2 100644
--- a/drivers/ata/ahci_xgene.c
+++ b/drivers/ata/ahci_xgene.c
@@ -548,6 +548,43 @@ softreset_retry:
         return rc;
 }
 
+static irqreturn_t xgene_ahci_irq_intr(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;
+
+        VPRINTK("ENTER\n");
+
+        hpriv = host->private_data;
+        mmio = hpriv->mmio;
+
+        /* sigh.  0xffffffff is a valid return from h/w */
+        irq_stat = readl(mmio + HOST_IRQ_STAT);
+        if (!irq_stat)
+                return IRQ_NONE;
+
+        irq_masked = irq_stat & hpriv->port_map;
+
+        spin_lock(&host->lock);
+
+        /*
+         * HOST_IRQ_STAT behaves as edge triggered latch meaning that
+         * it should be cleared before all the port events are cleared.
+         */
+        writel(irq_stat, mmio + HOST_IRQ_STAT);
+
+        rc = ahci_handle_port_intr(host, irq_masked);
+
+        spin_unlock(&host->lock);
+
+        VPRINTK("EXIT\n");
+
+        return IRQ_RETVAL(rc);
+}
+
 static struct ata_port_operations xgene_ahci_v1_ops = {
         .inherits = &ahci_ops,
         .host_stop = xgene_ahci_host_stop,
@@ -779,7 +816,8 @@ skip_clk_phy:
                 hpriv->flags = AHCI_HFLAG_NO_NCQ;
                 break;
         case XGENE_AHCI_V2:
-                hpriv->flags |= AHCI_HFLAG_YES_FBS | AHCI_HFLAG_EDGE_IRQ;
+                hpriv->flags |= AHCI_HFLAG_YES_FBS;
+                hpriv->irq_handler = xgene_ahci_irq_intr;
                 break;
         default:
                 break;