hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

powerpc/prom: Fix %u/%llx usage since prom_printf() change 

In commit eae5f709a4 ("powerpc: Add __printf verification to
prom_printf") __printf attribute was added to prom_printf(), which
means GCC started warning about type/format mismatches. As part of
that commit we changed some "%lx" formats to "%llx" where the type is
actually unsigned long long.

Unfortunately prom_printf() doesn't know how to print "%llx", it just
prints a literal "lx", eg:

  reserved memory map:
    lx - lx
    lx - lx

prom_printf() also doesn't know how to print "%u" (only "%lu"), it
just prints a literal "u", eg:

  Max number of cores passed to firmware: u (NR_CPUS = 2048)

Instead of:

  Max number of cores passed to firmware: 2048 (NR_CPUS = 2048)

This commit adds support for the missing formatters.

Fixes: eae5f709a4 ("powerpc: Add __printf verification to prom_printf")
Reported-by: Michael Ellerman <mpe@ellerman.id.au>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Mathieu Malaterre <malat@debian.org>
Tested-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Mathieu Malaterre 2018-05-29 21:20:01 +02:00 committed by Michael Ellerman
parent 9a6d2022ba
commit 8af1da4066
1 changed files with 49 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
arch/powerpc/kernel/prom_init.c
View File

@ -301,6 +301,10 @@ static void __init prom_print(const char *msg)
} }
/*
* Both prom_print_hex & prom_print_dec takes an unsigned long as input so that
* we do not need __udivdi3 or __umoddi3 on 32bits.
*/
static void __init prom_print_hex(unsigned long val) static void __init prom_print_hex(unsigned long val)
{ {
int i, nibbles = sizeof(val)*2; int i, nibbles = sizeof(val)*2;
@ -341,6 +345,7 @@ static void __init prom_printf(const char *format, ...)
va_list args; va_list args;
unsigned long v; unsigned long v;
long vs; long vs;
int n = 0;
va_start(args, format); va_start(args, format);
for (p = format; *p != 0; p = q) { for (p = format; *p != 0; p = q) {
@ -359,6 +364,10 @@ static void __init prom_printf(const char *format, ...)
++q; ++q;
if (*q == 0) if (*q == 0)
break; break;
while (*q == 'l') {
++q;
++n;
}
switch (*q) { switch (*q) {
case 's': case 's':
++q; ++q;
@ -367,40 +376,56 @@ static void __init prom_printf(const char *format, ...)
break; break;
case 'x': case 'x':
++q; ++q;
v = va_arg(args, unsigned long); switch (n) {
case 0:
v = va_arg(args, unsigned int);
break;
case 1:
v = va_arg(args, unsigned long);
break;
case 2:
default:
v = va_arg(args, unsigned long long);
break;
}
prom_print_hex(v); prom_print_hex(v);
break; break;
case 'u':
++q;
switch (n) {
case 0:
v = va_arg(args, unsigned int);
break;
case 1:
v = va_arg(args, unsigned long);
break;
case 2:
default:
v = va_arg(args, unsigned long long);
break;
}
prom_print_dec(v);
break;
case 'd': case 'd':
++q; ++q;
vs = va_arg(args, int); switch (n) {
case 0:
vs = va_arg(args, int);
break;
case 1:
vs = va_arg(args, long);
break;
case 2:
default:
vs = va_arg(args, long long);
break;
}
if (vs < 0) { if (vs < 0) {
prom_print("-"); prom_print("-");
vs = -vs; vs = -vs;
} }
prom_print_dec(vs); prom_print_dec(vs);
break; break;
case 'l':
++q;
if (*q == 0)
break;
else if (*q == 'x') {
++q;
v = va_arg(args, unsigned long);
prom_print_hex(v);
} else if (*q == 'u') { /* '%lu' */
++q;
v = va_arg(args, unsigned long);
prom_print_dec(v);
} else if (*q == 'd') { /* %ld */
++q;
vs = va_arg(args, long);
if (vs < 0) {
prom_print("-");
vs = -vs;
}
prom_print_dec(vs);
}
break;
} }
} }
va_end(args); va_end(args);