Skip to contentSkip to conversation

make loglevel related commandline to early_param

PATCH In review Yinghai Lu 3 participants 6 messages Feb 1, 2008

lore
Share & tools
lore

Yinghai Lu

author
#0 lore raw

PATCH 1/1 make loglevel related commandline to early_param

[PATCH] make loglevel related command_line to early_param

so we can use them for early console like console=uart8250 or earlycon=uart8250 or early_printk

init/main.c +3 -7
index cb81ed1..a774a93 100644
@@ -232,22 +232,18 @@ EXPORT_SYMBOL(loops_per_jiffy);
 
 static int __init debug_kernel(char *str)
 {
-	if (*str)
-		return 0;
 	console_loglevel = 10;
 	return 1;
 }
 
 static int __init quiet_kernel(char *str)
 {
-	if (*str)
-		return 0;
 	console_loglevel = 4;
 	return 1;
 }
 
-__setup("debug", debug_kernel);
-__setup("quiet", quiet_kernel);
+early_param("debug", debug_kernel);
+early_param("quiet", quiet_kernel);
 
 static int __init loglevel(char *str)
 {
@@ -255,7 +251,7 @@ static int __init loglevel(char *str)
 	return 1;
 }
 
-__setup("loglevel=", loglevel);
+early_param("loglevel", loglevel);
 
 /*
  * Unknown boot options get handed to init, unless they look like
kernel/printk.c +1 -1
index 58bbec6..8c25e37 100644
@@ -458,7 +458,7 @@ static int __init ignore_loglevel_setup(char *str)
 	return 1;
 }
 
-__setup("ignore_loglevel", ignore_loglevel_setup);
+early_param("ignore_loglevel", ignore_loglevel_setup);
 
 /*
  * Write out chars from start to end - 1 inclusive
#1 lore raw

init/main.c EXPORT_SYMBOL(loops_per_jiffy); · line 236

Quoted 12 lines · Yinghai Lu
init/main.c +0 -2
index cb81ed1..a774a93 100644
@@ -232,22 +232,18 @@ EXPORT_SYMBOL(loops_per_jiffy);
 
 static int __init debug_kernel(char *str)
 {
-	if (*str)
-		return 0;
 	console_loglevel = 10;
 	return 1;

The return semantics changes with early_param so you need to change that in all cases to return 0 (and negative value for errors)

-Andi

author
#2 lore raw
Quoted 8 lines · Andi Kleen
Quoted 6 lines · Yinghai Lu
init/main.c +0 -0
index cb81ed1..a774a93 100644
@@ -232,22 +232,18 @@ EXPORT_SYMBOL(loops_per_jiffy);
 
Quoted 10 lines

init/main.c EXPORT_SYMBOL(loops_per_jiffy); · line 236

Quoted 6 lines
init/main.c +0 -2
 static int __init debug_kernel(char *str)
 {
-	if (*str)
-		return 0;
 	console_loglevel = 10;
 	return 1;

The return semantics changes with early_param so you need to change that in all cases to return 0 (and negative value for errors)

thanks. I will send another one.

YH

author
#3 lore raw

PATCH 1/1 make loglevel related commandline to early_param v2

In reply to Andi Kleen

[PATCH] make loglevel related commandline to early_param v2

so we can use them for early console like
console=uart8250,io,0x3f8,115200n8
earlycon=uart8250,io,0x3f8,115200n8
early_printk

otherwise printk(KERN_DEBUG "debug msg") will not print out to console even "debug" command line is used.

andi point out early_param need to return 0 instead 1.

Ingo had another patch in x86.git to process ignore_loglevel

init/main.c +6 -10
index cb81ed1..3741bda 100644
@@ -232,30 +232,26 @@ EXPORT_SYMBOL(loops_per_jiffy);
 
 static int __init debug_kernel(char *str)
 {
-	if (*str)
-		return 0;
 	console_loglevel = 10;
-	return 1;
+	return 0;
 }
 
 static int __init quiet_kernel(char *str)
 {
-	if (*str)
-		return 0;
 	console_loglevel = 4;
-	return 1;
+	return 0;
 }
 
-__setup("debug", debug_kernel);
-__setup("quiet", quiet_kernel);
+early_param("debug", debug_kernel);
+early_param("quiet", quiet_kernel);
 
 static int __init loglevel(char *str)
 {
 	get_option(&str, &console_loglevel);
-	return 1;
+	return 0;
 }
 
-__setup("loglevel=", loglevel);
+early_param("loglevel", loglevel);
 
 /*
  * Unknown boot options get handed to init, unless they look like
#4 lore raw

Re: [PATCH] make loglevel related commandline to early_param v2

Quoted 47 lines · On Fri, 01 Feb 2008 11:35:35 -0800 Yinghai Lu <[email protected]> wrote:

[PATCH] make loglevel related commandline to early_param v2

so we can use them for early console like
console=uart8250,io,0x3f8,115200n8
earlycon=uart8250,io,0x3f8,115200n8
early_printk

otherwise printk(KERN_DEBUG "debug msg") will not print out to console even "debug" command line is used.

andi point out early_param need to return 0 instead 1.

Ingo had another patch in x86.git to process ignore_loglevel

init/main.c +4 -8
index cb81ed1..3741bda 100644
@@ -232,30 +232,26 @@ EXPORT_SYMBOL(loops_per_jiffy);
 
 static int __init debug_kernel(char *str)
 {
-	if (*str)
-		return 0;
 	console_loglevel = 10;
-	return 1;
+	return 0;
 }
 
 static int __init quiet_kernel(char *str)
 {
-	if (*str)
-		return 0;
 	console_loglevel = 4;
-	return 1;
+	return 0;
 }
 
-__setup("debug", debug_kernel);
-__setup("quiet", quiet_kernel);
+early_param("debug", debug_kernel);
+early_param("quiet", quiet_kernel);
 
 static int __init loglevel(char *str)
 {

init/main.c EXPORT_SYMBOL(loops_per_jiffy); · line 257

Quoted 10 lines
init/main.c +2 -2
 	get_option(&str, &console_loglevel);
-	return 1;
+	return 0;
 }
 
-__setup("loglevel=", loglevel);
+early_param("loglevel", loglevel);
 
 /*
  * Unknown boot options get handed to init, unless they look like

Your earlier patch converted ignore_loglevel but this one no longer does so. Was that deliberate?

Below is the patch whcih I presently have queued. Is it OK?

 init/main.c     |   14 +++++---------
 kernel/printk.c |    5 ++---
 2 files changed, 7 insertions(+), 12 deletions(-)
init/main.c renamed from init/main.c~convert-loglevel-related-kernel-boot-parameters-to-early_param +5 -9
diff -puN init/main.c~convert-loglevel-related-kernel-boot-parameters-to-early_param init/main.c
@@ -232,22 +232,18 @@ EXPORT_SYMBOL(loops_per_jiffy);
 
 static int __init debug_kernel(char *str)
 {
-	if (*str)
-		return 0;
 	console_loglevel = 10;
-	return 1;
+	return 0;
 }
 
 static int __init quiet_kernel(char *str)
 {
-	if (*str)
-		return 0;
 	console_loglevel = 4;
-	return 1;
+	return 0;
 }
 
-__setup("debug", debug_kernel);
-__setup("quiet", quiet_kernel);
+early_param("debug", debug_kernel);
+early_param("quiet", quiet_kernel);
 
 static int __init loglevel(char *str)
 {
@@ -255,7 +251,7 @@ static int __init loglevel(char *str)
 	return 1;
 }
 
-__setup("loglevel=", loglevel);
+early_param("loglevel", loglevel);
 
 /*
  * Unknown boot options get handed to init, unless they look like
kernel/printk.c renamed from kernel/printk.c~convert-loglevel-related-kernel-boot-parameters-to-early_param +2 -3
diff -puN kernel/printk.c~convert-loglevel-related-kernel-boot-parameters-to-early_param kernel/printk.c
@@ -447,11 +447,10 @@ static int __init ignore_loglevel_setup(
 {
 	ignore_loglevel = 1;
 	printk(KERN_INFO "debug: ignoring loglevel setting.\n");
-
-	return 1;
+	return 0;
 }
 
-__setup("ignore_loglevel", ignore_loglevel_setup);
+early_param("ignore_loglevel", ignore_loglevel_setup);
 
 /*
  * Write out chars from start to end - 1 inclusive

_

author
#5 lore raw

Re: [PATCH] make loglevel related commandline to early_param v2

Quoted 17 lines · Andrew Morton
Quoted 14 lines · On Fri, 01 Feb 2008 11:35:35 -0800 Yinghai Lu <[email protected]> wrote:

[PATCH] make loglevel related commandline to early_param v2

so we can use them for early console like
console=uart8250,io,0x3f8,115200n8
earlycon=uart8250,io,0x3f8,115200n8
early_printk

otherwise printk(KERN_DEBUG "debug msg") will not print out to console even "debug" command line is used.

andi point out early_param need to return 0 instead 1.

Ingo had another patch in x86.git to process ignore_loglevel

...

Quoted 3 lines

Your earlier patch converted ignore_loglevel but this one no longer does so. Was that deliberate?

Ingo put one process "ingore_logleve" in x86.git last night.

YH