Commit 3efca1d1 authored by Jason Cooper's avatar Jason Cooper
Browse files

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
parents 38dbfb59 c7f7bd4a

drivers/irqchip/irq-armada-370-xp.c

+2 −2
Original line number Diff line number Diff line
@@ -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 */