x86, boot: add hex output for debugging
PATCH 1/1 x86, boot: add hex output for debugging
This is useful for reporting various addresses or other values while debugging early boot.
--- arch/x86/boot/compressed/misc.c | 19 +++++++++++++++++++ arch/x86/boot/compressed/misc.h | 5 +++++ 2 files changed, 24 insertions(+)
arch/x86/boot/compressed/misc.c +19 -0
@@ -220,6 +220,25 @@ void __putstr(const char *s)outb (0xff & (pos >>1 ), vidport+1 ); } +void __puthex (unsigned long value) +{ +char alpha[2 ] ="0" ; +int bits; +unsigned char byte; + +__putstr ("0x" ); +for (bits =sizeof (value) *8 -4 ; bits >=0 ; bits -=4 ) { +unsigned long digit = (value >> bits) &0xf ; + +if (digit <0xA ) + alpha[0 ] ='0' + digit; +else + alpha[0 ] ='a' + (digit -0xA ); + +__putstr (alpha); + } +} +static void error (char *x) {error_putstr ("\n\n" );
arch/x86/boot/compressed/misc.h +5 -0
@@ -34,16 +34,21 @@ extern memptr free_mem_ptr;extern memptr free_mem_end_ptr;extern struct boot_params *real_mode;/* Pointer to real-mode data */ void __putstr (const char *s); +void __puthex (unsigned long value);#define error_putstr (__x) __putstr(__x) +#define error_puthex (__x) __puthex(__x)#ifdef CONFIG_X86_VERBOSE_BOOTUP #define debug_putstr (__x) __putstr(__x) +#define debug_puthex (__x) __puthex(__x)#else static inline void debug_putstr (const char *s) { } +static inline void debug_puthex (const char *s) +{ }#endif
Signature · 6 lines
1.9.1 -- Kees Cook Chrome OS Security
Quoted 14 lines · Kees Cook
This is useful for reporting various addresses or other values while debugging early boot.
Signed-off-by Kees Cook <[email protected]>--- arch/x86/boot/compressed/misc.c | 19 +++++++++++++++++++ arch/x86/boot/compressed/misc.h | 5 +++++ 2 files changed, 24 insertions(+)arch/x86/boot/compressed/misc.c +0
-0
arch/x86/boot/compressed/misc.c void __putstr(const char *s) · line 227
Quoted 8 lines
arch/x86/boot/compressed/misc.c +5
-0@@ -220,6 +220,25 @@ void __putstr(const char *s)outb (0xff & (pos >>1 ), vidport+1 ); } +void __puthex (unsigned long value) +{ +char alpha[2 ] ="0" ; +int bits; +unsigned char byte;
what is 'byte' for? (unused)
Quoted 44 lines
arch/x86/boot/compressed/misc.c +14
-0+ +__putstr ("0x" ); +for (bits =sizeof (value) *8 -4 ; bits >=0 ; bits -=4 ) { +unsigned long digit = (value >> bits) &0xf ; + +if (digit <0xA ) + alpha[0 ] ='0' + digit; +else + alpha[0 ] ='a' + (digit -0xA ); + +__putstr (alpha); + } +} +static void error (char *x) {error_putstr ("\n\n" );arch/x86/boot/compressed/misc.h +5
-0@@ -34,16 +34,21 @@ extern memptr free_mem_ptr;extern memptr free_mem_end_ptr;extern struct boot_params *real_mode;/* Pointer to real-mode data */ void __putstr (const char *s); +void __puthex (unsigned long value);#define error_putstr (__x) __putstr(__x) +#define error_puthex (__x) __puthex(__x)#ifdef CONFIG_X86_VERBOSE_BOOTUP #define debug_putstr (__x) __putstr(__x) +#define debug_puthex (__x) __puthex(__x)#else static inline void debug_putstr (const char *s) { } +static inline void debug_puthex (const char *s) +{ }#endif
Signature · 1 line
~Randy
Quoted 7 lines
arch/x86/boot/compressed/misc.c void __putstr(const char *s) · line 227
Quoted 5 lines
arch/x86/boot/compressed/misc.c +5
-0+void __puthex (unsigned long value) +{ +char alpha[2 ] ="0" ; +int bits; +unsigned char byte;what is 'byte' for? (unused)
Well the whole function is unused. We don't normally add unused functions to the code because they bitrot too easily.
If you need it please just patch it in yourself.
-Andi
Quoted 10 lines · Andi Kleen
Quoted 7 lines
arch/x86/boot/compressed/misc.c void __putstr(const char *s) · line 227
Quoted 5 lines
arch/x86/boot/compressed/misc.c +5
-0+void __puthex (unsigned long value) +{ +char alpha[2 ] ="0" ; +int bits; +unsigned char byte;what is 'byte' for? (unused)
Well the whole function is unused. We don't normally add unused functions to the code because they bitrot too easily.
I think this is useful. I had to write similar code for printing out values during early boot.
May be we can print some values if CONFIG_X86_VERBOSE_BOOTUP=y. That way it will not be an unused code and others can reuse it easily to print additional data during debugging.
Thanks
Vivek
H. Peter Anvin
reviewerQuoted 12 lines · Vivek Goyal
Quoted 10 lines · Andi Kleen
Quoted 7 lines
arch/x86/boot/compressed/misc.c void __putstr(const char *s) · line 227
Quoted 5 lines
arch/x86/boot/compressed/misc.c +5
-0+void __puthex (unsigned long value) +{ +char alpha[2 ] ="0" ; +int bits; +unsigned char byte;what is 'byte' for? (unused)
Well the whole function is unused. We don't normally add unused functions to the code because they bitrot too easily.
Quoted 7 lines
I think this is useful. I had to write similar code for printing out values during early boot.
May be we can print some values if
CONFIG_X86_VERBOSE_BOOTUP=y. That way it will not be an unused code and others can reuse it easily to print additional data during debugging.
The various addresses involved in decompression (load address, relocated address, etc.) might be good ideas.
-hpa
Quoted 4 lines · Kees Cook
This is useful for reporting various addresses or other values while debugging early boot.
Signed-off-by Kees Cook <[email protected]>
You haven't provided any user of this function. I don't think this should get merged without a caller (nor should an artificial caller be added). What's your use case for adding this?
Also, while I realize __putstr already has this problem, ideally all the printing functions in this file should go in some separate source file that gets omitted when !CONFIG_PRINTK (or possibly !CONFIG_EARLY_PRINTK).
- Josh Triplett
Quoted 74 lines
arch/x86/boot/compressed/misc.c | 19 +++++++++++++++++++ arch/x86/boot/compressed/misc.h | 5 +++++ 2 files changed, 24 insertions(+)arch/x86/boot/compressed/misc.c +19
-0@@ -220,6 +220,25 @@ void __putstr(const char *s)outb (0xff & (pos >>1 ), vidport+1 ); } +void __puthex (unsigned long value) +{ +char alpha[2 ] ="0" ; +int bits; +unsigned char byte; + +__putstr ("0x" ); +for (bits =sizeof (value) *8 -4 ; bits >=0 ; bits -=4 ) { +unsigned long digit = (value >> bits) &0xf ; + +if (digit <0xA ) + alpha[0 ] ='0' + digit; +else + alpha[0 ] ='a' + (digit -0xA ); + +__putstr (alpha); + } +} +static void error (char *x) {error_putstr ("\n\n" );arch/x86/boot/compressed/misc.h +5
-0@@ -34,16 +34,21 @@ extern memptr free_mem_ptr;extern memptr free_mem_end_ptr;extern struct boot_params *real_mode;/* Pointer to real-mode data */ void __putstr (const char *s); +void __puthex (unsigned long value);#define error_putstr (__x) __putstr(__x) +#define error_puthex (__x) __puthex(__x)#ifdef CONFIG_X86_VERBOSE_BOOTUP #define debug_putstr (__x) __putstr(__x) +#define debug_puthex (__x) __puthex(__x)#else static inline void debug_putstr (const char *s) { } +static inline void debug_puthex (const char *s) +{ }#endif Signature · 11 lines
1.9.1 -- Kees Cook Chrome OS Security -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Quoted 9 lines · On Fri, Oct 31, 2014 at 1:33 PM, <[email protected]> wrote:
Quoted 4 lines · Kees Cook
This is useful for reporting various addresses or other values while debugging early boot.
Signed-off-by Kees Cook <[email protected]>You haven't provided any user of this function. I don't think this should get merged without a caller (nor should an artificial caller be added). What's your use case for adding this?
I'll fix that.
Quoted 4 lines
Also, while I realize
__putstralready has this problem, ideally all the printing functions in this file should go in some separate source file that gets omitted when !CONFIG_PRINTK (or possibly !CONFIG_EARLY_PRINTK).
Hm, I don't agree: we need error_putstr, not just debug_putstr, and early_printk is just for serial console, where as __putstr works against the boot block's defined video area too, IIUC.
-Kees
Signature · 2 lines
Kees Cook Chrome OS Security
Quoted 5 lines · Kees Cook
Quoted 4 lines · On Fri, Oct 31, 2014 at 1:33 PM, <[email protected]> wrote:
Quoted 3 lines · Kees Cook
This is useful for reporting various addresses or other values while debugging early boot.
Quoted 7 lines
Quoted 5 lines
Quoted 1 line
Signed-off-by Kees Cook <[email protected]>You haven't provided any user of this function. I don't think this should get merged without a caller (nor should an artificial caller be added). What's your use case for adding this?
I'll fix that.
Thanks.
Quoted 8 lines
Quoted 4 lines
Also, while I realize
__putstralready has this problem, ideally all the printing functions in this file should go in some separate source file that gets omitted when !CONFIG_PRINTK (or possibly !CONFIG_EARLY_PRINTK).Hm, I don't agree: we need
error_putstr, not justdebug_putstr, andearly_printkis just for serial console, where as__putstrworks against the boot block's defined video area too, IIUC.
OK, that seems like a good argument that it shouldn't go under EARLY_PRINTK. However, for size-constrained systems that have nowhere for the output to go at all, it still makes sense to compile all of the printing infrastructure out of the decompression stub, especially since that code itself does not get compressed and thus has a higher impact than code in vmlinux.
- Josh Triplett