Commit 9ba8ec8e authored by H. Peter Anvin's avatar H. Peter Anvin Committed by Borislav Petkov (AMD)
Browse files

x86/boot: Add error_putdec() helper 



Add a helper to print decimal numbers to early console.

Suggested-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Signed-off-by: default avatarH. Peter Anvin (Intel) <hpa@zytor.com>
Signed-off-by: default avatarJun'ichi Nomura <junichi.nomura@nec.com>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/lkml/20240123112624.GBZa-iYP1l9SSYtr-V@fat_crate.local/
Link: https://lore.kernel.org/r/20240202035052.17963-1-junichi.nomura@nec.com
parent 15675706

arch/x86/boot/compressed/misc.c

+23 −10
Original line number Diff line number Diff line
@@ -164,21 +164,34 @@ void __putstr(const char *s) 
	outb(0xff & (pos >> 1), vidport+1);

}



void __puthex(unsigned long value)

static noinline void __putnum(unsigned long value, unsigned int base,

			      int mindig)

{

	char alpha[2] = "0";

	int bits;

	char buf[8*sizeof(value)+1];

	char *p;



	p = buf + sizeof(buf);

	*--p = '\0';



	for (bits = sizeof(value) * 8 - 4; bits >= 0; bits -= 4) {

		unsigned long digit = (value >> bits) & 0xf;

	while (mindig-- > 0 || value) {

		unsigned char digit = value % base;

		digit += (digit >= 10) ? ('a'-10) : '0';

		*--p = digit;



		if (digit < 0xA)

			alpha[0] = '0' + digit;

		else

			alpha[0] = 'a' + (digit - 0xA);

		value /= base;

	}



		__putstr(alpha);

	__putstr(p);

}



void __puthex(unsigned long value)

{

	__putnum(value, 16, sizeof(value)*2);

}



void __putdec(unsigned long value)

{

	__putnum(value, 10, 1);

}



#ifdef CONFIG_X86_NEED_RELOCS

arch/x86/boot/compressed/misc.h

+2 −0
Original line number Diff line number Diff line
@@ -63,8 +63,10 @@ void *malloc(int size); 
void free(void *where);

void __putstr(const char *s);

void __puthex(unsigned long value);

void __putdec(unsigned long value);

#define error_putstr(__x)  __putstr(__x)

#define error_puthex(__x)  __puthex(__x)

#define error_putdec(__x)  __putdec(__x)



#ifdef CONFIG_X86_VERBOSE_BOOTUP