Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04a34113 authored by Kevin Hao's avatar Kevin Hao Committed by Benjamin Herrenschmidt
Browse files

powerpc/ppc32: Fix the bug in the init of non-base exception stack for UP 



We would allocate one specific exception stack for each kind of
non-base exceptions for every CPU. For ppc32 the CPU hard ID is
used as the subscript to get the specific exception stack for
one CPU. But for an UP kernel, there is only one element in the
each kind of exception stack array. We would get stuck if the
CPU hard ID is not equal to '0'. So in this case we should use the
subscript '0' no matter what the CPU hard ID is.

Signed-off-by: default avatarKevin Hao <haokexin@gmail.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent d2b496e5

arch/powerpc/kernel/irq.c

+5 −0
Original line number Diff line number Diff line
@@ -559,8 +559,13 @@ void exc_lvl_ctx_init(void) 
#ifdef CONFIG_PPC64

		cpu_nr = i;

#else

#ifdef CONFIG_SMP

		cpu_nr = get_hard_smp_processor_id(i);

#else

		cpu_nr = 0;

#endif

#endif



		memset((void *)critirq_ctx[cpu_nr], 0, THREAD_SIZE);

		tp = critirq_ctx[cpu_nr];

		tp->cpu = cpu_nr;

arch/powerpc/kernel/setup_32.c

+5 −0
Original line number Diff line number Diff line
@@ -247,7 +247,12 @@ static void __init exc_lvl_early_init(void) 
	/* interrupt stacks must be in lowmem, we get that for free on ppc32

	 * as the memblock is limited to lowmem by MEMBLOCK_REAL_LIMIT */

	for_each_possible_cpu(i) {

#ifdef CONFIG_SMP

		hw_cpu = get_hard_smp_processor_id(i);

#else

		hw_cpu = 0;

#endif



		critirq_ctx[hw_cpu] = (struct thread_info *)

			__va(memblock_alloc(THREAD_SIZE, THREAD_SIZE));

#ifdef CONFIG_BOOKE