| Message ID | 4408c92fbc8f2f2a81054b9f2ac38331562e658a.1399594544.git.geoff@infradead.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Geoff, On Fri, May 09, 2014 at 01:48:17AM +0100, Geoff Levand wrote: > Kexec uses the cpu_die method of struct cpu_operations, so add > defined(CONFIG_KEXEC) to the preprocessor conditional that enables cpu_die. Why not make kexec depend on !CONFIG_SMP || CONFIG_HOTPLUG_CPU instead? From the POV of the PSCI code in the kernel, it's hotplugging a CPU. Why it's performing the hotplug operation shouldn't matter. > > Signed-off-by: Geoff Levand <geoff@infradead.org> > --- > arch/arm64/kernel/psci.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm64/kernel/psci.c b/arch/arm64/kernel/psci.c > index ea4828a..0e5fa69 100644 > --- a/arch/arm64/kernel/psci.c > +++ b/arch/arm64/kernel/psci.c > @@ -253,7 +253,7 @@ static int cpu_psci_cpu_boot(unsigned int cpu) > return err; > } > > -#ifdef CONFIG_HOTPLUG_CPU > +#if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_KEXEC) > static int cpu_psci_cpu_disable(unsigned int cpu) > { > /* Fail early if we don't have CPU_OFF support */ > @@ -284,7 +284,7 @@ const struct cpu_operations cpu_psci_ops = { > .cpu_init = cpu_psci_cpu_init, > .cpu_prepare = cpu_psci_cpu_prepare, > .cpu_boot = cpu_psci_cpu_boot, > -#ifdef CONFIG_HOTPLUG_CPU > +#if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_KEXEC) > .cpu_disable = cpu_psci_cpu_disable, > .cpu_die = cpu_psci_cpu_die, > #endif Doesn't his cause the build to fail when KEXEC && !HOTPLUG_CPU? I didn't see cpu_ops.h updated similarly. Thanks, Mark.
On Fri, 2014-05-09 at 09:24 +0100, Mark Rutland wrote: > Hi Geoff, > > On Fri, May 09, 2014 at 01:48:17AM +0100, Geoff Levand wrote: > > Kexec uses the cpu_die method of struct cpu_operations, so add > > defined(CONFIG_KEXEC) to the preprocessor conditional that enables cpu_die. > > Why not make kexec depend on !CONFIG_SMP || CONFIG_HOTPLUG_CPU instead? > > From the POV of the PSCI code in the kernel, it's hotplugging a CPU. Why > it's performing the hotplug operation shouldn't matter. Sure. > > @@ -284,7 +284,7 @@ const struct cpu_operations cpu_psci_ops = { > > .cpu_init = cpu_psci_cpu_init, > > .cpu_prepare = cpu_psci_cpu_prepare, > > .cpu_boot = cpu_psci_cpu_boot, > > -#ifdef CONFIG_HOTPLUG_CPU > > +#if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_KEXEC) > > .cpu_disable = cpu_psci_cpu_disable, > > .cpu_die = cpu_psci_cpu_die, > > #endif > > Doesn't his cause the build to fail when KEXEC && !HOTPLUG_CPU? I didn't > see cpu_ops.h updated similarly. Sorry, that part got lost when rebasing patches. I added back in on my for-arm-kexec-2 and master branches. -Geoff
diff --git a/arch/arm64/kernel/psci.c b/arch/arm64/kernel/psci.c index ea4828a..0e5fa69 100644 --- a/arch/arm64/kernel/psci.c +++ b/arch/arm64/kernel/psci.c @@ -253,7 +253,7 @@ static int cpu_psci_cpu_boot(unsigned int cpu) return err; } -#ifdef CONFIG_HOTPLUG_CPU +#if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_KEXEC) static int cpu_psci_cpu_disable(unsigned int cpu) { /* Fail early if we don't have CPU_OFF support */ @@ -284,7 +284,7 @@ const struct cpu_operations cpu_psci_ops = { .cpu_init = cpu_psci_cpu_init, .cpu_prepare = cpu_psci_cpu_prepare, .cpu_boot = cpu_psci_cpu_boot, -#ifdef CONFIG_HOTPLUG_CPU +#if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_KEXEC) .cpu_disable = cpu_psci_cpu_disable, .cpu_die = cpu_psci_cpu_die, #endif
Kexec uses the cpu_die method of struct cpu_operations, so add defined(CONFIG_KEXEC) to the preprocessor conditional that enables cpu_die. Signed-off-by: Geoff Levand <geoff@infradead.org> --- arch/arm64/kernel/psci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)