mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-09-19 22:08:32 +00:00
128 lines
4.6 KiB
Diff
128 lines
4.6 KiB
Diff
From c7519e150cc378ecda57ecaf65e0eb6170138991 Mon Sep 17 00:00:00 2001
|
|
From: Victor Gu <xigu@marvell.com>
|
|
Date: Fri, 8 Sep 2017 11:53:45 +0200
|
|
Subject: [PATCH 09/11] PCI: aardvark: use isr1 instead of isr0 interrupt in
|
|
legacy irq mode
|
|
|
|
The Aardvark has two interrupts sets:
|
|
|
|
- first set is bit[23:16] of PCIe ISR 0 register(RD0074840h)
|
|
|
|
- second set is bit[11:8] of PCIe ISR 1 register(RD0074848h)
|
|
|
|
Only one set should be used, while another set should be masked.
|
|
|
|
The second set, ISR1, is more advanced, the Legacy INT_X status bit is
|
|
asserted once Assert_INTX message is received, and de-asserted after
|
|
Deassert_INTX message is received. Therefore, it matches what the
|
|
driver is currently doing in the ->irq_mask() and ->irq_unmask()
|
|
functions. The ISR0 requires additional work to deassert the
|
|
interrupt, which the driver doesn't do currently.
|
|
|
|
This commit resolves a number of issues with legacy interrupts.
|
|
|
|
This is part of fixing bug
|
|
https://bugzilla.kernel.org/show_bug.cgi?id=196339, this commit was
|
|
reported as the user to be important to get a Intel 7260 mini-PCIe
|
|
WiFi card working.
|
|
|
|
Fixes: 8c39d710363c1 ("PCI: aardvark: Add Aardvark PCI host controller driver")
|
|
Signed-off-by: Victor Gu <xigu@marvell.com>
|
|
Reviewed-by: Evan Wang <xswang@marvell.com>
|
|
Reviewed-by: Nadav Haklai <nadavh@marvell.com>
|
|
[Thomas: tweak commit log.]
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
---
|
|
drivers/pci/host/pci-aardvark.c | 41 ++++++++++++++++++++++++-----------------
|
|
1 file changed, 24 insertions(+), 17 deletions(-)
|
|
|
|
diff --git a/drivers/pci/host/pci-aardvark.c b/drivers/pci/host/pci-aardvark.c
|
|
index f74834d8667d..d5c2819e17fa 100644
|
|
--- a/drivers/pci/host/pci-aardvark.c
|
|
+++ b/drivers/pci/host/pci-aardvark.c
|
|
@@ -105,7 +105,8 @@
|
|
#define PCIE_ISR1_MASK_REG (CONTROL_BASE_ADDR + 0x4C)
|
|
#define PCIE_ISR1_POWER_STATE_CHANGE BIT(4)
|
|
#define PCIE_ISR1_FLUSH BIT(5)
|
|
-#define PCIE_ISR1_ALL_MASK GENMASK(5, 4)
|
|
+#define PCIE_ISR1_INTX_ASSERT(val) BIT(8 + (val))
|
|
+#define PCIE_ISR1_ALL_MASK GENMASK(11, 4)
|
|
#define PCIE_MSI_ADDR_LOW_REG (CONTROL_BASE_ADDR + 0x50)
|
|
#define PCIE_MSI_ADDR_HIGH_REG (CONTROL_BASE_ADDR + 0x54)
|
|
#define PCIE_MSI_STATUS_REG (CONTROL_BASE_ADDR + 0x58)
|
|
@@ -616,9 +617,9 @@ static void advk_pcie_irq_mask(struct irq_data *d)
|
|
irq_hw_number_t hwirq = irqd_to_hwirq(d);
|
|
u32 mask;
|
|
|
|
- mask = advk_readl(pcie, PCIE_ISR0_MASK_REG);
|
|
- mask |= PCIE_ISR0_INTX_ASSERT(hwirq);
|
|
- advk_writel(pcie, mask, PCIE_ISR0_MASK_REG);
|
|
+ mask = advk_readl(pcie, PCIE_ISR1_MASK_REG);
|
|
+ mask |= PCIE_ISR1_INTX_ASSERT(hwirq);
|
|
+ advk_writel(pcie, mask, PCIE_ISR1_MASK_REG);
|
|
}
|
|
|
|
static void advk_pcie_irq_unmask(struct irq_data *d)
|
|
@@ -627,9 +628,9 @@ static void advk_pcie_irq_unmask(struct irq_data *d)
|
|
irq_hw_number_t hwirq = irqd_to_hwirq(d);
|
|
u32 mask;
|
|
|
|
- mask = advk_readl(pcie, PCIE_ISR0_MASK_REG);
|
|
- mask &= ~PCIE_ISR0_INTX_ASSERT(hwirq);
|
|
- advk_writel(pcie, mask, PCIE_ISR0_MASK_REG);
|
|
+ mask = advk_readl(pcie, PCIE_ISR1_MASK_REG);
|
|
+ mask &= ~PCIE_ISR1_INTX_ASSERT(hwirq);
|
|
+ advk_writel(pcie, mask, PCIE_ISR1_MASK_REG);
|
|
}
|
|
|
|
static int advk_pcie_irq_map(struct irq_domain *h,
|
|
@@ -772,29 +773,35 @@ static void advk_pcie_handle_msi(struct advk_pcie *pcie)
|
|
|
|
static void advk_pcie_handle_int(struct advk_pcie *pcie)
|
|
{
|
|
- u32 val, mask, status;
|
|
+ u32 isr0_val, isr0_mask, isr0_status;
|
|
+ u32 isr1_val, isr1_mask, isr1_status;
|
|
int i, virq;
|
|
|
|
- val = advk_readl(pcie, PCIE_ISR0_REG);
|
|
- mask = advk_readl(pcie, PCIE_ISR0_MASK_REG);
|
|
- status = val & ((~mask) & PCIE_ISR0_ALL_MASK);
|
|
+ isr0_val = advk_readl(pcie, PCIE_ISR0_REG);
|
|
+ isr0_mask = advk_readl(pcie, PCIE_ISR0_MASK_REG);
|
|
+ isr0_status = isr0_val & ((~isr0_mask) & PCIE_ISR0_ALL_MASK);
|
|
|
|
- if (!status) {
|
|
- advk_writel(pcie, val, PCIE_ISR0_REG);
|
|
+ isr1_val = advk_readl(pcie, PCIE_ISR1_REG);
|
|
+ isr1_mask = advk_readl(pcie, PCIE_ISR1_MASK_REG);
|
|
+ isr1_status = isr1_val & ((~isr1_mask) & PCIE_ISR1_ALL_MASK);
|
|
+
|
|
+ if (!isr0_status && !isr1_status) {
|
|
+ advk_writel(pcie, isr0_val, PCIE_ISR0_REG);
|
|
+ advk_writel(pcie, isr1_val, PCIE_ISR1_REG);
|
|
return;
|
|
}
|
|
|
|
/* Process MSI interrupts */
|
|
- if (status & PCIE_ISR0_MSI_INT_PENDING)
|
|
+ if (isr0_status & PCIE_ISR0_MSI_INT_PENDING)
|
|
advk_pcie_handle_msi(pcie);
|
|
|
|
/* Process legacy interrupts */
|
|
for (i = 0; i < LEGACY_IRQ_NUM; i++) {
|
|
- if (!(status & PCIE_ISR0_INTX_ASSERT(i)))
|
|
+ if (!(isr1_status & PCIE_ISR1_INTX_ASSERT(i)))
|
|
continue;
|
|
|
|
- advk_writel(pcie, PCIE_ISR0_INTX_ASSERT(i),
|
|
- PCIE_ISR0_REG);
|
|
+ advk_writel(pcie, PCIE_ISR1_INTX_ASSERT(i),
|
|
+ PCIE_ISR1_REG);
|
|
|
|
virq = irq_find_mapping(pcie->irq_domain, i);
|
|
generic_handle_irq(virq);
|
|
--
|
|
2.14.2
|
|
|