[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Date: Fri, 2 Feb 2024 03:51:43 +0000
From: NOMURA JUNICHI(野村 淳一)
<junichi.nomura@....com>
To: "x86@...nel.org" <x86@...nel.org>, "mingo@...hat.com" <mingo@...hat.com>,
"tglx@...utronix.de" <tglx@...utronix.de>, "bp@...en8.de" <bp@...en8.de>,
"dave.hansen@...ux.intel.com" <dave.hansen@...ux.intel.com>
CC: "hpa@...or.com" <hpa@...or.com>, "ardb@...nel.org" <ardb@...nel.org>,
"david@...hat.com" <david@...hat.com>, "debarbos@...hat.com"
<debarbos@...hat.com>, "dzickus@...hat.com" <dzickus@...hat.com>,
"jlelli@...hat.com" <jlelli@...hat.com>,
NOMURA JUNICHI(野村 淳一)
<junichi.nomura@....com>, "kirill.shutemov@...ux.intel.com"
<kirill.shutemov@...ux.intel.com>, "lgoncalv@...hat.com"
<lgoncalv@...hat.com>, "linux-kernel@...r.kernel.org"
<linux-kernel@...r.kernel.org>, "nikunj@....com" <nikunj@....com>,
"thomas.lendacky@....com" <thomas.lendacky@....com>
Subject: [PATCH 1/2] x86/boot: Add error_putdec() helper
From: "H. Peter Anvin" <hpa@...or.com>
Add a helper to print decimal numbers to early console.
Suggested-by: Borislav Petkov (AMD) <bp@...en8.de>
Signed-off-by: H. Peter Anvin (Intel) <hpa@...or.com>
Signed-off-by: Jun'ichi Nomura <junichi.nomura@....com>
Link: https://lore.kernel.org/lkml/20240123112624.GBZa-iYP1l9SSYtr-V@fat_crate.local/
diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
--- a/arch/x86/boot/compressed/misc.c
+++ b/arch/x86/boot/compressed/misc.c
@@ -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;
- for (bits = sizeof(value) * 8 - 4; bits >= 0; bits -= 4) {
- unsigned long digit = (value >> bits) & 0xf;
+ p = buf + sizeof(buf);
+ *--p = '\0';
- if (digit < 0xA)
- alpha[0] = '0' + digit;
- else
- alpha[0] = 'a' + (digit - 0xA);
+ while (mindig-- > 0 || value) {
+ unsigned char digit = value % base;
+ digit += (digit >= 10) ? ('a'-10) : '0';
+ *--p = digit;
- __putstr(alpha);
+ value /= base;
}
+
+ __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
diff --git a/arch/x86/boot/compressed/misc.h b/arch/x86/boot/compressed/misc.h
--- a/arch/x86/boot/compressed/misc.h
+++ b/arch/x86/boot/compressed/misc.h
@@ -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
Powered by blists - more mailing lists