Commit 74fb2a59 authored by Michael Ellerman's avatar Michael Ellerman Committed by Sasha Levin

powerpc/cell: Fix crash in iic_setup_cpu() after per_cpu changes

[ Upstream commit b0dd00ad ]

The conversion from __get_cpu_var() to this_cpu_ptr() in iic_setup_cpu()
is wrong. It causes an oops at boot.

We need the per-cpu address of struct cpu_iic, not cpu_iic.regs->prio.

Sparse noticed this, because we pass a non-iomem pointer to out_be64(),
but we obviously don't check the sparse results often enough.

Fixes: 69111bac ("powerpc: Replace __get_cpu_var uses")
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent 55b47182
...@@ -163,7 +163,7 @@ static unsigned int iic_get_irq(void) ...@@ -163,7 +163,7 @@ static unsigned int iic_get_irq(void)
void iic_setup_cpu(void) void iic_setup_cpu(void)
{ {
out_be64(&__get_cpu_var(cpu_iic).regs->prio, 0xff); out_be64(&this_cpu_ptr(&cpu_iic)->regs->prio, 0xff);
} }
u8 iic_get_target_id(int cpu) u8 iic_get_target_id(int cpu)
......
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