Skip to contentSkip to conversation

Fix printk levels in intel-rng

PATCH Dave Jones 2 participants 3 messages Sep 21, 2007 Hardware random number generator core

lore
Share & tools
lore

Dave Jones

author
#0 lore raw

intel_rng has extraneous printk levels which cause some odd looking output during boot.

[   41.250634] intel_rng: Firmware space is locked read-only. <4>intel_rng: If you can't or
[   41.250638]  don't want to <4>intel_rng: disable this in firmware setup, and <4>intel_rng: if
[   41.250639]  you are certain that your <4>intel_rng: system has a functional
[   41.250641]  RNG, try<4>intel_rng: using the 'no_fwh_detect' option.
[   41.250706] agpgart: AGP aperture is 128M @ 0xe8000000
drivers/char/hw_random/intel-rng.c +3 -3
index 753f460..45b43b8 100644
@@ -297,9 +297,9 @@ static int __init intel_init_hw_struct(struct intel_rng_hw *intel_rng_hw,
 	    == BIOS_CNTL_LOCK_ENABLE_MASK) {
 		static __initdata /*const*/ char warning[] =
 			KERN_WARNING PFX "Firmware space is locked read-only. If you can't or\n"
-			KERN_WARNING PFX "don't want to disable this in firmware setup, and if\n"
-			KERN_WARNING PFX "you are certain that your system has a functional\n"
-			KERN_WARNING PFX "RNG, try using the 'no_fwh_detect' option.\n";
+			PFX "don't want to disable this in firmware setup, and if\n"
+			PFX "you are certain that your system has a functional\n"
+			PFX "RNG, try using the 'no_fwh_detect' option.\n";
 
 		if (no_fwh_detect)
 			return -ENODEV;
Signature · 1 line
http://www.codemonkey.org.uk
#1 lore raw

drivers/char/hw_random/intel-rng.c static int __init intel_init_hw_struct(struct intel_rng_hw *intel_rng_hw, · line 302

Quoted 13 lines
[   41.250634] intel_rng: Firmware space is locked read-only. <4>intel_rng: If you can't or
[   41.250638]  don't want to <4>intel_rng: disable this in firmware setup, and <4>intel_rng: if
[   41.250639]  you are certain that your <4>intel_rng: system has a functional
[   41.250641]  RNG, try<4>intel_rng: using the 'no_fwh_detect' option.
[   41.250706] agpgart: AGP aperture is 128M @ 0xe8000000
drivers/char/hw_random/intel-rng.c +3 -3
 			KERN_WARNING PFX "Firmware space is locked read-only. If you can't or\n"
-			KERN_WARNING PFX "don't want to disable this in firmware setup, and if\n"
-			KERN_WARNING PFX "you are certain that your system has a functional\n"
-			KERN_WARNING PFX "RNG, try using the 'no_fwh_detect' option.\n";
+			PFX "don't want to disable this in firmware setup, and if\n"
+			PFX "you are certain that your system has a functional\n"
+			PFX "RNG, try using the 'no_fwh_detect' option.\n";

I think Alan already fixed this in f3dc8c18 -- notice that your screwed-up message has the <4> after eg read-only, and the current code doesn't line-wrap there.

- R.

author
#2 lore raw
Quoted 6 lines · Roland Dreier
Quoted 5 lines
[   41.250634] intel_rng: Firmware space is locked read-only. <4>intel_rng: If you can't or
[   41.250638]  don't want to <4>intel_rng: disable this in firmware setup, and <4>intel_rng: if
[   41.250639]  you are certain that your <4>intel_rng: system has a functional
[   41.250641]  RNG, try<4>intel_rng: using the 'no_fwh_detect' option.
[   41.250706] agpgart: AGP aperture is 128M @ 0xe8000000
Quoted 11 lines

drivers/char/hw_random/intel-rng.c static int __init intel_init_hw_struct(struct intel_rng_hw *intel_rng_hw, · line 302

Quoted 7 lines
drivers/char/hw_random/intel-rng.c +3 -3
 			KERN_WARNING PFX "Firmware space is locked read-only. If you can't or\n"
-			KERN_WARNING PFX "don't want to disable this in firmware setup, and if\n"
-			KERN_WARNING PFX "you are certain that your system has a functional\n"
-			KERN_WARNING PFX "RNG, try using the 'no_fwh_detect' option.\n";
+			PFX "don't want to disable this in firmware setup, and if\n"
+			PFX "you are certain that your system has a functional\n"
+			PFX "RNG, try using the 'no_fwh_detect' option.\n";

I think Alan already fixed this in f3dc8c18 -- notice that your screwed-up message has the <4> after eg read-only, and the current code doesn't line-wrap there.

Ah, was looking at a dmesg from an older kernel. Good catch.

Thanks,

Dave

Signature · 1 line
http://www.codemonkey.org.uk