Skip to content

Commit

Permalink
PCI: designware: Make MSI ISR shared IRQ aware
Browse files Browse the repository at this point in the history
On i.MX6 the host controller MSI IRQ is shared with PCI legacy INTD.  Make
sure we don't bail too early from the IRQ handler.

The issue is fairly theoretical as it would require a system setup with a
PCIe switch where one connected device is using legacy INTD and another one
using MSI, but better fix it now.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Richard Zhu <r65037@freescale.com>
  • Loading branch information
Lucas Stach authored and Bjorn Helgaas committed May 30, 2014
1 parent 5c40eea commit 7f4f16e
Showing 3 changed files with 7 additions and 5 deletions.
4 changes: 1 addition & 3 deletions drivers/pci/host/pci-exynos.c
Original file line number Diff line number Diff line change
@@ -415,9 +415,7 @@ static irqreturn_t exynos_pcie_msi_irq_handler(int irq, void *arg)
{
struct pcie_port *pp = arg;

dw_handle_msi_irq(pp);

return IRQ_HANDLED;
return dw_handle_msi_irq(pp);
}

static void exynos_pcie_msi_init(struct pcie_port *pp)
6 changes: 5 additions & 1 deletion drivers/pci/host/pcie-designware.c
Original file line number Diff line number Diff line change
@@ -155,15 +155,17 @@ static struct irq_chip dw_msi_irq_chip = {
};

/* MSI int handler */
void dw_handle_msi_irq(struct pcie_port *pp)
irqreturn_t dw_handle_msi_irq(struct pcie_port *pp)
{
unsigned long val;
int i, pos, irq;
irqreturn_t ret = IRQ_NONE;

for (i = 0; i < MAX_MSI_CTRLS; i++) {
dw_pcie_rd_own_conf(pp, PCIE_MSI_INTR0_STATUS + i * 12, 4,
(u32 *)&val);
if (val) {
ret = IRQ_HANDLED;
pos = 0;
while ((pos = find_next_bit(&val, 32, pos)) != 32) {
irq = irq_find_mapping(pp->irq_domain,
@@ -176,6 +178,8 @@ void dw_handle_msi_irq(struct pcie_port *pp)
}
}
}

return ret;
}

void dw_pcie_msi_init(struct pcie_port *pp)
2 changes: 1 addition & 1 deletion drivers/pci/host/pcie-designware.h
Original file line number Diff line number Diff line change
@@ -68,7 +68,7 @@ struct pcie_host_ops {

int dw_pcie_cfg_read(void __iomem *addr, int where, int size, u32 *val);
int dw_pcie_cfg_write(void __iomem *addr, int where, int size, u32 val);
void dw_handle_msi_irq(struct pcie_port *pp);
irqreturn_t dw_handle_msi_irq(struct pcie_port *pp);
void dw_pcie_msi_init(struct pcie_port *pp);
int dw_pcie_link_up(struct pcie_port *pp);
void dw_pcie_setup_rc(struct pcie_port *pp);

0 comments on commit 7f4f16e

Please sign in to comment.