Re: [PATCH 1/2] MIPS: Malta: Fix i8259 irqchip setup

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Ralf,


On 31/03/17 13:49, Ralf Baechle wrote:
On Fri, Mar 31, 2017 at 12:05:31PM +0100, Matt Redfearn wrote:

diff --git a/arch/mips/mti-malta/malta-int.c b/arch/mips/mti-malta/malta-int.c
index cb675ec6f283..474b372e0dd9 100644
--- a/arch/mips/mti-malta/malta-int.c
+++ b/arch/mips/mti-malta/malta-int.c
@@ -232,6 +232,19 @@ void __init arch_init_irq(void)
  {
  	int corehi_irq;
+#ifdef CONFIG_I8259
+	/*
+	 * Preallocate the i8259's expected virq's here. Since irqchip_init()
+	 * will probe the irqchips in hierarchial order, i8259 is probed last.
+	 * If anything allocates a virq before the i8259 is probed, it will
+	 * be given one of the i8259's expected range and consequently setup
+	 * of the i8259 will fail.
+	 */
+	WARN(irq_alloc_descs(I8259A_IRQ_BASE, I8259A_IRQ_BASE,
+			    16, numa_node_id()) < 0,
+		"Cannot reserve i8259 virqs at IRQ%d\n", I8259A_IRQ_BASE);
+#endif /* CONFIG_I8259 */
+
  	i8259_set_poll(mips_pcibios_iack);
CONFIG_I8259 is always defined on Malta so the #ifdef is pointless.

   Ralf

Ah, true. I was looking at arch/mips/include/asm/mach-generic/irq.h where I8259A_IRQ_BASE is defined, it's wrapped in that CONFIG so I kept it here, but you're right of course that Malta always defines it. Would you like a v2 with that removed?

Thanks,
Matt




[Index of Archives]     [Linux MIPS Home]     [LKML Archive]     [Linux ARM Kernel]     [Linux ARM]     [Linux]     [Git]     [Yosemite News]     [Linux SCSI]     [Linux Hams]

  Powered by Linux