MIPS: smp-mt,smp-cmp: Enable all HW IRQs on secondary CPUs
Commit18743d2781
("irqchip: mips-gic: Stop using per-platform mapping tables") in v3.19-rc1 changed the routing of IPIs through the GIC to go to the HW0 IRQ pin along with the rest of the GIC interrupts, rather than to HW1 and HW2 pins. This breaks SMP boot using the CMP or MT SMP implementations because HW0 doesn't get unmasked when secondary CPUs are initialised so the IPIs will never interrupt secondary CPUs (nor any other interrupts routed through the GIC). Commitff1e29ade4
("MIPS: smp-cps: Enable all hardware interrupts on secondary CPUs") fixed this in advance for the CPS SMP implementation by unmasking all hardware interrupt lines for secondary CPUs, so lets do the same for the CMP and MT implementations. Fixes:18743d2781
("irqchip: mips-gic: Stop using per-platform mapping tables") Signed-off-by: James Hogan <james.hogan@imgtec.com> Cc: Andrew Bresticker <abrestic@chromium.org> Cc: Qais Yousef <qais.yousef@imgtec.com> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/9025/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
parent
e967ef022e
commit
c3f134fb39
2 changed files with 4 additions and 3 deletions
|
@ -44,8 +44,8 @@ static void cmp_init_secondary(void)
|
|||
struct cpuinfo_mips *c __maybe_unused = ¤t_cpu_data;
|
||||
|
||||
/* Assume GIC is present */
|
||||
change_c0_status(ST0_IM, STATUSF_IP3 | STATUSF_IP4 | STATUSF_IP6 |
|
||||
STATUSF_IP7);
|
||||
change_c0_status(ST0_IM, STATUSF_IP2 | STATUSF_IP3 | STATUSF_IP4 |
|
||||
STATUSF_IP5 | STATUSF_IP6 | STATUSF_IP7);
|
||||
|
||||
/* Enable per-cpu interrupts: platform specific */
|
||||
|
||||
|
|
|
@ -161,7 +161,8 @@ static void vsmp_init_secondary(void)
|
|||
#ifdef CONFIG_MIPS_GIC
|
||||
/* This is Malta specific: IPI,performance and timer interrupts */
|
||||
if (gic_present)
|
||||
change_c0_status(ST0_IM, STATUSF_IP3 | STATUSF_IP4 |
|
||||
change_c0_status(ST0_IM, STATUSF_IP2 | STATUSF_IP3 |
|
||||
STATUSF_IP4 | STATUSF_IP5 |
|
||||
STATUSF_IP6 | STATUSF_IP7);
|
||||
else
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue