Skip to contentSkip to conversation

: wrap cpu_die() with CONFIG_HOTPLUG_CPU

PATCH In review Linas Vepstas 2 participants 4 messages Nov 15, 2006 – Nov 16, 2006 PowerPC

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 : wrap cpu_die() with CONFIG_HOTPLUG_CPU

Paul,

Please apply the janitorial patch below. Its not urgent. It replaces/obsoletes the previous Subject: [PATCH]:
PowerPC: make sure the rtas stop-self token is defined. patch.

--linas

Per email discussion, it appears that rtas_stop_self() and pSeries_mach_cpu_die() should not be compiled if CONFIG_HOTPLUG_CPU is not defined. This patch adds #ifdefs around these bits of code.

----

 arch/powerpc/kernel/rtas.c             |    5 +++--
 arch/powerpc/platforms/pseries/setup.c |    4 ++++
 include/asm-powerpc/rtas.h             |    4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)
arch/powerpc/kernel/rtas.c +3 -2
Index: linux-2.6.19-rc4-git3/arch/powerpc/kernel/rtas.c
===================================================================
@@ -810,9 +810,9 @@ asmlinkage int ppc_rtas(struct rtas_args
 	return 0;
 }
 
+#ifdef CONFIG_HOTPLUG_CPU
 /* This version can't take the spinlock, because it never returns */
-
-struct rtas_args rtas_stop_self_args = {
+static struct rtas_args rtas_stop_self_args = {
 	/* The token is initialized for real in setup_system() */
 	.token = RTAS_UNKNOWN_SERVICE,
 	.nargs = 0,
@@ -834,6 +834,7 @@ void rtas_stop_self(void)
 
 	panic("Alas, I survived.\n");
 }
+#endif
 
 /*
  * Call early during boot, before mem init or bootmem, to retrieve the RTAS
include/asm-powerpc/rtas.h +2 -2
Index: linux-2.6.19-rc4-git3/include/asm-powerpc/rtas.h
===================================================================
@@ -54,8 +54,6 @@ struct rtas_args {
 	rtas_arg_t *rets;     /* Pointer to return values in args[]. */
 };  
 
-extern struct rtas_args rtas_stop_self_args;
-
 struct rtas_t {
 	unsigned long entry;		/* physical address pointer */
 	unsigned long base;		/* physical address pointer */
@@ -223,7 +221,9 @@ extern int rtas_get_error_log_max(void);
 extern spinlock_t rtas_data_buf_lock;
 extern char rtas_data_buf[RTAS_DATA_BUF_SIZE];
 
+#ifdef CONFIG_HOTPLUG_CPU
 extern void rtas_stop_self(void);
+#endif
 
 /* RMO buffer reserved for user-space RTAS use */
 extern unsigned long rtas_rmo_buf;
arch/powerpc/platforms/pseries/setup.c +4 -0
Index: linux-2.6.19-rc4-git3/arch/powerpc/platforms/pseries/setup.c
===================================================================
@@ -347,6 +347,7 @@ static int __init pSeries_init_panel(voi
 }
 arch_initcall(pSeries_init_panel);
 
+#ifdef CONFIG_HOTPLUG_CPU
 static void pSeries_mach_cpu_die(void)
 {
 	local_irq_disable();
@@ -357,6 +358,7 @@ static void pSeries_mach_cpu_die(void)
 	BUG();
 	for(;;);
 }
+#endif
 
 static int pseries_set_dabr(unsigned long dabr)
 {
@@ -558,7 +560,9 @@ define_machine(pseries) {
 	.power_off		= rtas_power_off,
 	.halt			= rtas_halt,
 	.panic			= rtas_os_term,
+#ifdef CONFIG_HOTPLUG_CPU
 	.cpu_die		= pSeries_mach_cpu_die,
+#endif
 	.get_boot_time		= rtas_get_boot_time,
 	.get_rtc_time		= rtas_get_rtc_time,
 	.set_rtc_time		= rtas_set_rtc_time,
#1 lore raw
Quoted 8 lines · Linas Vepstas

Paul,

Please apply the janitorial patch below. Its not urgent. It replaces/obsoletes the previous Subject: [PATCH]:
PowerPC: make sure the rtas stop-self token is defined. patch.

Quoted 8 lines

--linas

Per email discussion, it appears that rtas_stop_self() and pSeries_mach_cpu_die() should not be compiled if CONFIG_HOTPLUG_CPU is not defined. This patch adds #ifdefs around these bits of code.

Thanks for writing it up as a patch. Couple of nit-picky comments below:

Quoted 14 lines

Index: linux-2.6.19-rc4-git3/include/asm-powerpc/rtas.h
===================================================================

include/asm-powerpc/rtas.h +0 -2
@@ -54,8 +54,6 @@ struct rtas_args {
 	rtas_arg_t *rets;     /* Pointer to return values in args[]. */
 };  
 
-extern struct rtas_args rtas_stop_self_args;
-
 struct rtas_t {
 	unsigned long entry;		/* physical address pointer */
 	unsigned long base;		/* physical address pointer */

include/asm-powerpc/rtas.h extern int rtas_get_error_log_max(void); · line 226

Quoted 6 lines
include/asm-powerpc/rtas.h +2 -0
@@ -223,7 +221,9 @@ extern int rtas_get_error_log_max(void);
 extern spinlock_t rtas_data_buf_lock;
 extern char rtas_data_buf[RTAS_DATA_BUF_SIZE];
 
+#ifdef CONFIG_HOTPLUG_CPU
 extern void rtas_stop_self(void);
+#endif

I think we usually don't bother with #ifdef'ing externs, unless you're providing a no-op implementation for the !CONFIG_FOO case.

Quoted 15 lines
include/asm-powerpc/rtas.h +0 -0
 /* RMO buffer reserved for user-space RTAS use */
 extern unsigned long rtas_rmo_buf;

Index: linux-2.6.19-rc4-git3/arch/powerpc/platforms/pseries/setup.c
===================================================================

arch/powerpc/platforms/pseries/setup.c +1 -0
@@ -347,6 +347,7 @@ static int __init pSeries_init_panel(voi
 }
 arch_initcall(pSeries_init_panel);
 
+#ifdef CONFIG_HOTPLUG_CPU
 static void pSeries_mach_cpu_die(void)
 {
 	local_irq_disable();

arch/powerpc/platforms/pseries/setup.c static void pSeries_mach_cpu_die(void) · line 360

Quoted 3 lines
arch/powerpc/platforms/pseries/setup.c +0 -0
@@ -357,6 +358,7 @@ static void pSeries_mach_cpu_die(void)
 	BUG();
 	for(;;);
 }

+#else
#define pSeries_mach_cpu_die NULL

arch/powerpc/platforms/pseries/setup.c static void pSeries_mach_cpu_die(void) · line 361

Quoted 1 line
arch/powerpc/platforms/pseries/setup.c +1 -0
+#endif

Not sure if that's a good idea, it would save the #ifdef around the structure assignment below.

arch/powerpc/platforms/pseries/setup.c define_machine(pseries) { · line 568

Quoted 12 lines
arch/powerpc/platforms/pseries/setup.c +2 -0
 static int pseries_set_dabr(unsigned long dabr)
 {
@@ -558,7 +560,9 @@ define_machine(pseries) {
 	.power_off		= rtas_power_off,
 	.halt			= rtas_halt,
 	.panic			= rtas_os_term,
+#ifdef CONFIG_HOTPLUG_CPU
 	.cpu_die		= pSeries_mach_cpu_die,
+#endif
 	.get_boot_time		= rtas_get_boot_time,
 	.get_rtc_time		= rtas_get_rtc_time,
 	.set_rtc_time		= rtas_set_rtc_time,

cheers

Signature · 8 lines
Michael Ellerman
OzLabs, IBM Australia Development Lab

wwweb: http://michael.ellerman.id.au
phone: +61 2 6212 1183 (tie line 70 21183)

We do not inherit the earth from our ancestors,
we borrow it from our children. - S.M.A.R.T Person
#2 lore raw

Paul,

Please apply; this is an updated patch per Michael Ellerman, below.

--linas

Quoted 2 lines · Michael Ellerman

Thanks for writing it up as a patch. Couple of nit-picky comments below:

Nitpicking's OK.

Quoted 6 lines

+#else
#define pSeries_mach_cpu_die NULL

Quoted 1 line

+#endif

Not sure if that's a good idea, it would save the #ifdef around the structure assignment below.

Hmm. Personally, I find the #ifdef in the structure to be more readable, in the sense that one is less likely to mis-read what the code is actually doing, when on is skimming quickly. But, not worth arguing over. The patch below incorporates your suggestions.

--linas

Subject: [PATCH]: wrap cpu_die() with CONFIG_HOTPLUG_CPU

Per email discussion, it appears that rtas_stop_self() and pSeries_mach_cpu_die() should not be compiled if CONFIG_HOTPLUG_CPU is not defined. This patch adds #ifdefs around these bits of code.

----

 arch/powerpc/kernel/rtas.c             |    5 +++--
 arch/powerpc/platforms/pseries/setup.c |    4 ++++
 include/asm-powerpc/rtas.h             |    2 --
 3 files changed, 7 insertions(+), 4 deletions(-)
arch/powerpc/kernel/rtas.c +3 -2
Index: linux-2.6.19-rc4-git3/arch/powerpc/kernel/rtas.c
===================================================================
@@ -810,9 +810,9 @@ asmlinkage int ppc_rtas(struct rtas_args
 	return 0;
 }
 
+#ifdef CONFIG_HOTPLUG_CPU
 /* This version can't take the spinlock, because it never returns */
-
-struct rtas_args rtas_stop_self_args = {
+static struct rtas_args rtas_stop_self_args = {
 	/* The token is initialized for real in setup_system() */
 	.token = RTAS_UNKNOWN_SERVICE,
 	.nargs = 0,
@@ -834,6 +834,7 @@ void rtas_stop_self(void)
 
 	panic("Alas, I survived.\n");
 }
+#endif
 
 /*
  * Call early during boot, before mem init or bootmem, to retrieve the RTAS
include/asm-powerpc/rtas.h +0 -2
Index: linux-2.6.19-rc4-git3/include/asm-powerpc/rtas.h
===================================================================
@@ -54,8 +54,6 @@ struct rtas_args {
 	rtas_arg_t *rets;     /* Pointer to return values in args[]. */
 };  
 
-extern struct rtas_args rtas_stop_self_args;
-
 struct rtas_t {
 	unsigned long entry;		/* physical address pointer */
 	unsigned long base;		/* physical address pointer */
arch/powerpc/platforms/pseries/setup.c +4 -0
Index: linux-2.6.19-rc4-git3/arch/powerpc/platforms/pseries/setup.c
===================================================================
@@ -347,6 +347,7 @@ static int __init pSeries_init_panel(voi
 }
 arch_initcall(pSeries_init_panel);
 
+#ifdef CONFIG_HOTPLUG_CPU
 static void pSeries_mach_cpu_die(void)
 {
 	local_irq_disable();
@@ -357,6 +358,9 @@ static void pSeries_mach_cpu_die(void)
 	BUG();
 	for(;;);
 }
+#else
+#define pSeries_mach_cpu_die NULL
+#endif
 
 static int pseries_set_dabr(unsigned long dabr)
 {
#3 lore raw
Quoted 17 lines · Linas Vepstas

Paul,

Please apply; this is an updated patch per Michael Ellerman, below.

--linas

Quoted 2 lines · Michael Ellerman

Thanks for writing it up as a patch. Couple of nit-picky comments below:

Nitpicking's OK.

Quoted 4 lines

+#else
#define pSeries_mach_cpu_die NULL

Quoted 1 line

+#endif

Quoted 8 lines
Quoted 2 lines

Not sure if that's a good idea, it would save the #ifdef around the structure assignment below.

Hmm. Personally, I find the #ifdef in the structure to be more readable, in the sense that one is less likely to mis-read what the code is actually doing, when on is skimming quickly. But, not worth arguing over. The patch below incorporates your suggestions.

Yeah, it's a trade off, I'm not 100% sure it's a good idea - but we'll see what others think :)

cheers

Signature · 8 lines
Michael Ellerman
OzLabs, IBM Australia Development Lab

wwweb: http://michael.ellerman.id.au
phone: +61 2 6212 1183 (tie line 70 21183)

We do not inherit the earth from our ancestors,
we borrow it from our children. - S.M.A.R.T Person