Commit 475ca391 authored by Kumar Gala's avatar Kumar Gala Committed by Paul Mackerras

[POWERPC] mpic: Deal with bogus NIRQ in Feature Reporting Register

Some chips (like the SoCs from Freescale) report the wrong value in NIRQ
and this causes issues if its doesn't match or exceed the value of
irq_count.

Add a flag that board code can set to just use irq_count instead of
FRR[NIRQ].  Eventually we'll add a device tree property with the number
of sources.
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 2ca7633d
...@@ -1144,9 +1144,12 @@ struct mpic * __init mpic_alloc(struct device_node *node, ...@@ -1144,9 +1144,12 @@ struct mpic * __init mpic_alloc(struct device_node *node,
mpic->num_cpus = ((greg_feature & MPIC_GREG_FEATURE_LAST_CPU_MASK) mpic->num_cpus = ((greg_feature & MPIC_GREG_FEATURE_LAST_CPU_MASK)
>> MPIC_GREG_FEATURE_LAST_CPU_SHIFT) + 1; >> MPIC_GREG_FEATURE_LAST_CPU_SHIFT) + 1;
if (isu_size == 0) if (isu_size == 0)
mpic->num_sources = if (flags & MPIC_BROKEN_FRR_NIRQS)
((greg_feature & MPIC_GREG_FEATURE_LAST_SRC_MASK) mpic->num_sources = mpic->irq_count;
>> MPIC_GREG_FEATURE_LAST_SRC_SHIFT) + 1; else
mpic->num_sources =
((greg_feature & MPIC_GREG_FEATURE_LAST_SRC_MASK)
>> MPIC_GREG_FEATURE_LAST_SRC_SHIFT) + 1;
/* Map the per-CPU registers */ /* Map the per-CPU registers */
for (i = 0; i < mpic->num_cpus; i++) { for (i = 0; i < mpic->num_cpus; i++) {
......
...@@ -353,6 +353,8 @@ struct mpic ...@@ -353,6 +353,8 @@ struct mpic
#define MPIC_ENABLE_MCK 0x00000200 #define MPIC_ENABLE_MCK 0x00000200
/* Disable bias among target selection, spread interrupts evenly */ /* Disable bias among target selection, spread interrupts evenly */
#define MPIC_NO_BIAS 0x00000400 #define MPIC_NO_BIAS 0x00000400
/* Ignore NIRQS as reported by FRR */
#define MPIC_BROKEN_FRR_NIRQS 0x00000800
/* MPIC HW modification ID */ /* MPIC HW modification ID */
#define MPIC_REGSET_MASK 0xf0000000 #define MPIC_REGSET_MASK 0xf0000000
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment