| Message ID | 20180213150824.27689-8-npiggin@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | c0abd0c745bdabe027a8f013a866f385fba717b1 |
| Headers | show |
| Series | numa aware allocation for pacas, stacks, pagetables | expand |
Nicholas Piggin <npiggin@gmail.com> writes: > Move this into the early setup code, and don't iterate over CPU masks. > We don't want to call into sysfs so early from setup, and a future patch > won't initialize CPU masks by the time this is called. > --- > arch/powerpc/kernel/paca.c | 3 +++ > arch/powerpc/kernel/setup.h | 9 +++------ > arch/powerpc/kernel/setup_64.c | 8 ++++++++ > arch/powerpc/kernel/sysfs.c | 18 +++++++----------- > 4 files changed, 21 insertions(+), 17 deletions(-) This patch, and 8, 9, 10, aren't signed-off by you. I'll assume you just forgot and add it. cheers
On Tue, 13 Mar 2018 23:25:05 +1100 Michael Ellerman <mpe@ellerman.id.au> wrote: > Nicholas Piggin <npiggin@gmail.com> writes: > > > Move this into the early setup code, and don't iterate over CPU masks. > > We don't want to call into sysfs so early from setup, and a future patch > > won't initialize CPU masks by the time this is called. > > --- > > arch/powerpc/kernel/paca.c | 3 +++ > > arch/powerpc/kernel/setup.h | 9 +++------ > > arch/powerpc/kernel/setup_64.c | 8 ++++++++ > > arch/powerpc/kernel/sysfs.c | 18 +++++++----------- > > 4 files changed, 21 insertions(+), 17 deletions(-) > > This patch, and 8, 9, 10, aren't signed-off by you. > > I'll assume you just forgot and add it. Yes I did. Thanks, Nick
On Tue, 13 Mar 2018 23:25:05 +1100 Michael Ellerman <mpe@ellerman.id.au> wrote: > Nicholas Piggin <npiggin@gmail.com> writes: > > > Move this into the early setup code, and don't iterate over CPU masks. > > We don't want to call into sysfs so early from setup, and a future patch > > won't initialize CPU masks by the time this is called. > > --- > > arch/powerpc/kernel/paca.c | 3 +++ > > arch/powerpc/kernel/setup.h | 9 +++------ > > arch/powerpc/kernel/setup_64.c | 8 ++++++++ > > arch/powerpc/kernel/sysfs.c | 18 +++++++----------- > > 4 files changed, 21 insertions(+), 17 deletions(-) > > This patch, and 8, 9, 10, aren't signed-off by you. > > I'll assume you just forgot and add it. Can I give you an incremental fix for this patch? dscr_default is zero at this point, so set it from spr_default_dscr before setting pacas. Remove the assignment from initialise_paca -- this happens too early and gets overwritten anyway. --- arch/powerpc/kernel/paca.c | 3 --- arch/powerpc/kernel/sysfs.c | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/kernel/paca.c b/arch/powerpc/kernel/paca.c index 2f3187501a36..7736188c764f 100644 --- a/arch/powerpc/kernel/paca.c +++ b/arch/powerpc/kernel/paca.c @@ -133,9 +133,6 @@ void __init initialise_paca(struct paca_struct *new_paca, int cpu) new_paca->kexec_state = KEXEC_STATE_NONE; new_paca->__current = &init_task; new_paca->data_offset = 0xfeeeeeeeeeeeeeeeULL; -#ifdef CONFIG_PPC64 - new_paca->dscr_default = spr_default_dscr; -#endif #ifdef CONFIG_PPC_BOOK3S_64 new_paca->slb_shadow_ptr = NULL; #endif diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c index aaab582a640c..755dc98a57ae 100644 --- a/arch/powerpc/kernel/sysfs.c +++ b/arch/powerpc/kernel/sysfs.c @@ -20,6 +20,7 @@ #include <asm/firmware.h> #include "cacheinfo.h" +#include "setup.h" #ifdef CONFIG_PPC64 #include <asm/paca.h> @@ -592,6 +593,7 @@ static void sysfs_create_dscr_default(void) int err = 0; int cpu; + dscr_default = spr_default_dscr; for_each_possible_cpu(cpu) paca_ptrs[cpu]->dscr_default = dscr_default;
diff --git a/arch/powerpc/kernel/paca.c b/arch/powerpc/kernel/paca.c index 2699f9009286..e560072f122b 100644 --- a/arch/powerpc/kernel/paca.c +++ b/arch/powerpc/kernel/paca.c @@ -133,6 +133,9 @@ void __init initialise_paca(struct paca_struct *new_paca, int cpu) new_paca->kexec_state = KEXEC_STATE_NONE; new_paca->__current = &init_task; new_paca->data_offset = 0xfeeeeeeeeeeeeeeeULL; +#ifdef CONFIG_PPC64 + new_paca->dscr_default = spr_default_dscr; +#endif #ifdef CONFIG_PPC_BOOK3S_64 new_paca->slb_shadow_ptr = NULL; #endif diff --git a/arch/powerpc/kernel/setup.h b/arch/powerpc/kernel/setup.h index 3fc11e30308f..d144df54ad40 100644 --- a/arch/powerpc/kernel/setup.h +++ b/arch/powerpc/kernel/setup.h @@ -45,14 +45,11 @@ void emergency_stack_init(void); static inline void emergency_stack_init(void) { }; #endif -#ifdef CONFIG_PPC64 -void record_spr_defaults(void); -#else -static inline void record_spr_defaults(void) { }; -#endif - #ifdef CONFIG_PPC64 u64 ppc64_bolted_size(void); + +/* Default SPR values from firmware/kexec */ +extern unsigned long spr_default_dscr; #endif /* diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c index 3ce12af4906f..dde34d35d1e7 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c @@ -254,6 +254,14 @@ static void cpu_ready_for_interrupts(void) get_paca()->kernel_msr = MSR_KERNEL; } +unsigned long spr_default_dscr = 0; + +void __init record_spr_defaults(void) +{ + if (early_cpu_has_feature(CPU_FTR_DSCR)) + spr_default_dscr = mfspr(SPRN_DSCR); +} + /* * Early initialization entry point. This is called by head.S * with MMU translation disabled. We rely on the "feature" of diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c index 1f9d94dac3a6..ab4eb61fe659 100644 --- a/arch/powerpc/kernel/sysfs.c +++ b/arch/powerpc/kernel/sysfs.c @@ -588,21 +588,17 @@ static DEVICE_ATTR(dscr_default, 0600, static void sysfs_create_dscr_default(void) { - int err = 0; - if (cpu_has_feature(CPU_FTR_DSCR)) - err = device_create_file(cpu_subsys.dev_root, &dev_attr_dscr_default); -} - -void __init record_spr_defaults(void) -{ - int cpu; - if (cpu_has_feature(CPU_FTR_DSCR)) { - dscr_default = mfspr(SPRN_DSCR); - for (cpu = 0; cpu < nr_cpu_ids; cpu++) + int err = 0; + int cpu; + + for_each_possible_cpu(cpu) paca_ptrs[cpu]->dscr_default = dscr_default; + + err = device_create_file(cpu_subsys.dev_root, &dev_attr_dscr_default); } } + #endif /* CONFIG_PPC64 */ #ifdef HAS_PPC_PMC_PA6T