diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2014-02-22 06:11:45 +0000 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2014-02-22 06:11:45 +0000 |
| commit | 3efca1d15656fe7e3f57c1f5f21e596967355200 (patch) | |
| tree | 6580d1b0476956b083721c114c1803f50d8acecd /drivers/irqchip/irq-armada-370-xp.c | |
| parent | 38dbfb59d1175ef458d006556061adeaa8751b72 (diff) | |
| parent | c7f7bd4a136e4b02dd2a66bf95aec545bd93e8db (diff) | |
| download | talos-op-linux-3efca1d15656fe7e3f57c1f5f21e596967355200.tar.gz talos-op-linux-3efca1d15656fe7e3f57c1f5f21e596967355200.zip | |
Merge tag 'tags/mvebu-irqchip-fixes-3.13' into mvebu/irqchip
mvebu irqchip fixes for v3.13
- armada-370-xp
- fix races is MSI and IPI
Diffstat (limited to 'drivers/irqchip/irq-armada-370-xp.c')
| -rw-r--r-- | drivers/irqchip/irq-armada-370-xp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c index 9300bc32784e..540956465ed2 100644 --- a/drivers/irqchip/irq-armada-370-xp.c +++ b/drivers/irqchip/irq-armada-370-xp.c @@ -381,7 +381,7 @@ armada_370_xp_handle_irq(struct pt_regs *regs) ARMADA_370_XP_IN_DRBEL_CAUSE_OFFS) & PCI_MSI_DOORBELL_MASK; - writel(~PCI_MSI_DOORBELL_MASK, per_cpu_int_base + + writel(~msimask, per_cpu_int_base + ARMADA_370_XP_IN_DRBEL_CAUSE_OFFS); for (msinr = PCI_MSI_DOORBELL_START; @@ -407,7 +407,7 @@ armada_370_xp_handle_irq(struct pt_regs *regs) ARMADA_370_XP_IN_DRBEL_CAUSE_OFFS) & IPI_DOORBELL_MASK; - writel(~IPI_DOORBELL_MASK, per_cpu_int_base + + writel(~ipimask, per_cpu_int_base + ARMADA_370_XP_IN_DRBEL_CAUSE_OFFS); /* Handle all pending doorbells */ |
