github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-28 00:53:34 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

s390/boot: Add length modifiers to boot_printk()

Browse Source 
Add support for the 'l', 'h', 'hh', and 'z' length modifiers.

Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Acked-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
This commit is contained in:
Vasily Gorbik 2024-11-20 16:10:55 +01:00 committed by Alexander Gordeev
parent dccac2b22b
commit 9291d572fe
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
arch/s390/boot/printk.c
View File

@ -80,6 +80,13 @@ static noinline char *strsym(void *ip)
return buf;
}
#define va_arg_len_type(args, lenmod, typemod) \
((lenmod == 'l') ? va_arg(args, typemod long) : \
(lenmod == 'h') ? (typemod short)va_arg(args, typemod int) : \
(lenmod == 'H') ? (typemod char)va_arg(args, typemod int) : \
(lenmod == 'z') ? va_arg(args, typemod long) : \
va_arg(args, typemod int))
void boot_printk(const char *fmt, ...)
{
char buf[1024] = { 0 };
@ -87,6 +94,7 @@ void boot_printk(const char *fmt, ...)
unsigned long pad;
char *p = buf;
va_list args;
char lenmod;
va_start(args, fmt);
for (; p < end && *fmt; fmt++) {
@ -99,24 +107,26 @@ void boot_printk(const char *fmt, ...)
continue;
}
pad = isdigit(*fmt) ? simple_strtol(fmt, (char **)&fmt, 10) : 0;
lenmod = (*fmt == 'h' || *fmt == 'l' || *fmt == 'z') ? *fmt++ : 0;
if (lenmod == 'h' && *fmt == 'h') {
lenmod = 'H';
fmt++;
}
switch (*fmt) {
case 's':
if (lenmod)
goto out;
p = buf + strlcat(buf, va_arg(args, char *), sizeof(buf));
break;
case 'p':
if (*++fmt != 'S')
if (*++fmt != 'S' || lenmod)
goto out;
p = buf + strlcat(buf, strsym(va_arg(args, void *)), sizeof(buf));
break;
case 'l':
if (*++fmt != 'x' || end - p <= max(sizeof(long) * 2, pad))
goto out;
p = as_hex(p, va_arg(args, unsigned long), pad);
break;
case 'x':
if (end - p <= max(sizeof(int) * 2, pad))
if (end - p <= max(sizeof(long) * 2, pad))
goto out;
p = as_hex(p, va_arg(args, unsigned int), pad);
p = as_hex(p, va_arg_len_type(args, lenmod, unsigned), pad);
break;
default:
goto out;