Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit 546a073

Browse files
committed
powerpc/64: don't refer nr_cpu_ids in asm code when it's undefined
generic_secondary_common_init() calls LOAD_REG_ADDR(r7, nr_cpu_ids) conditionally on CONFIG_SMP. However, if 'NR_CPUS == 1', kernel doesn't use the nr_cpu_ids, and in C code, it's just: #if NR_CPUS == 1 #define nr_cpu_ids ... This series makes declaration of nr_cpu_ids conditional on NR_CPUS == 1, and that reveals the issue, because compiler can't link the LOAD_REG_ADDR(r7, nr_cpu_ids) against nonexisting symbol. Current code looks unsafe for those who build kernel with CONFIG_SMP=y and NR_CPUS == 1. This is weird configuration, but not disallowed. Fix the linker error by replacing LOAD_REG_ADDR() with LOAD_REG_IMMEDIATE() conditionally on NR_CPUS == 1. As the following patch adds CONFIG_FORCE_NR_CPUS option that has the similar effect on nr_cpu_ids, make the generic_secondary_common_init() conditional on it too. Reported-by: Stephen Rothwell <[email protected]> Signed-off-by: Yury Norov <[email protected]>
1 parent aa47a7c commit 546a073

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

arch/powerpc/kernel/head_64.S

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -400,8 +400,12 @@ generic_secondary_common_init:
400400
#else
401401
LOAD_REG_ADDR(r8, paca_ptrs) /* Load paca_ptrs pointe */
402402
ld r8,0(r8) /* Get base vaddr of array */
403+
#if (NR_CPUS == 1) || defined(CONFIG_FORCE_NR_CPUS)
404+
LOAD_REG_IMMEDIATE(r7, NR_CPUS)
405+
#else
403406
LOAD_REG_ADDR(r7, nr_cpu_ids) /* Load nr_cpu_ids address */
404407
lwz r7,0(r7) /* also the max paca allocated */
408+
#endif
405409
li r5,0 /* logical cpu id */
406410
1:
407411
sldi r9,r5,3 /* get paca_ptrs[] index from cpu id */

0 commit comments

Comments
 (0)