Skip to content

Commit 16acae7

Browse files
murzinvJason Cooper
authored and
Jason Cooper
committed
irqchip: gicv3-its: Fix ITS CPU init
We skip initialisation of ITS in case the device-tree has no corresponding description, but we are still accessing to ITS bits while setting CPU interface what leads to the kernel panic: ITS: No ITS available, not enabling LPIs CPU0: found redistributor 0 region 0:0x000000002f100000 Unable to handle kernel NULL pointer dereference at virtual address 00000000 pgd = ffffffc0007fb000 [00000000] *pgd=00000000fc407003, *pud=00000000fc407003, *pmd=00000000fc408003, *pte=006000002f000707 Internal error: Oops: 96000005 [#1] PREEMPT SMP Modules linked in: CPU: 0 PID: 0 Comm: swapper/0 Not tainted 3.19.0-rc2+ raspberrypi#318 Hardware name: FVP Base (DT) task: ffffffc00077edb0 ti: ffffffc00076c000 task.ti: ffffffc00076c000 PC is at its_cpu_init+0x2c/0x320 LR is at gic_cpu_init+0x168/0x1bc It happens in gic_rdists_supports_plpis() because gic_rdists is NULL. The gic_rdists is set to non-NULL only when ITS node is presented in the device-tree. Fix this by moving the call to gic_rdists_supports_plpis() inside the !list_empty(&its_nodes) block, because it is that list that guards the validity of the rest of the information in this driver. Acked-by: Marc Zyngier <[email protected]> Signed-off-by: Vladimir Murzin <[email protected]> Signed-off-by: Marc Zyngier <[email protected]> Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Jason Cooper <[email protected]>
1 parent c517d83 commit 16acae7

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

drivers/irqchip/irq-gic-v3-its.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1382,12 +1382,11 @@ static bool gic_rdists_supports_plpis(void)
13821382

13831383
int its_cpu_init(void)
13841384
{
1385-
if (!gic_rdists_supports_plpis()) {
1386-
pr_info("CPU%d: LPIs not supported\n", smp_processor_id());
1387-
return -ENXIO;
1388-
}
1389-
13901385
if (!list_empty(&its_nodes)) {
1386+
if (!gic_rdists_supports_plpis()) {
1387+
pr_info("CPU%d: LPIs not supported\n", smp_processor_id());
1388+
return -ENXIO;
1389+
}
13911390
its_cpu_init_lpis();
13921391
its_cpu_init_collection();
13931392
}

0 commit comments

Comments
 (0)