diff options
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/boot/printk.c | 20 | ||||
| -rw-r--r-- | arch/s390/include/asm/boot_data.h | 13 |
2 files changed, 32 insertions, 1 deletions
diff --git a/arch/s390/boot/printk.c b/arch/s390/boot/printk.c index 7eeb43821cd0..e49a9be6d555 100644 --- a/arch/s390/boot/printk.c +++ b/arch/s390/boot/printk.c @@ -13,6 +13,20 @@ int boot_console_loglevel = CONFIG_CONSOLE_LOGLEVEL_DEFAULT; bool boot_ignore_loglevel; +char boot_rb[PAGE_SIZE * 2]; +size_t boot_rb_off; + +static void boot_rb_add(const char *str, size_t len) +{ + /* leave double '\0' in the end */ + size_t avail = sizeof(boot_rb) - boot_rb_off - 1; + + /* store strings separated by '\0' */ + if (len + 1 > avail) + boot_rb_off = 0; + strcpy(boot_rb + boot_rb_off, str); + boot_rb_off += len + 1; +} const char hex_asc[] = "0123456789abcdef"; @@ -229,5 +243,9 @@ void boot_printk(const char *fmt, ...) } out: va_end(args); - boot_console_earlyprintk(buf); + len = strlen(buf); + if (len) { + boot_rb_add(buf, len); + boot_console_earlyprintk(buf); + } } diff --git a/arch/s390/include/asm/boot_data.h b/arch/s390/include/asm/boot_data.h index f7eed27b3220..2cc35e968ff5 100644 --- a/arch/s390/include/asm/boot_data.h +++ b/arch/s390/include/asm/boot_data.h @@ -15,4 +15,17 @@ extern unsigned long ipl_cert_list_size; extern unsigned long early_ipl_comp_list_addr; extern unsigned long early_ipl_comp_list_size; +extern char boot_rb[PAGE_SIZE * 2]; +extern size_t boot_rb_off; + +#define boot_rb_foreach(cb) \ + do { \ + size_t off = boot_rb_off + strlen(boot_rb + boot_rb_off) + 1; \ + size_t len; \ + for (; off < sizeof(boot_rb) && (len = strlen(boot_rb + off)); off += len + 1) \ + cb(boot_rb + off); \ + for (off = 0; off < boot_rb_off && (len = strlen(boot_rb + off)); off += len + 1) \ + cb(boot_rb + off); \ + } while (0) + #endif /* _ASM_S390_BOOT_DATA_H */ |