coreboot-gerrit November 2015

coreboot-gerrit@coreboot.org

1 participants
1544 discussions

Patch merged into coreboot/master: northbridge/amd/amdmct/mct_ddr3: Add additional debug trace statements
by gerrit＠coreboot.org 14 Nov '15

14 Nov '15

the following patch was just integrated into master: commit 0d0375b3c6c032759aac23d893dae53242c315e2 Author: Timothy Pearson <tpearson(a)raptorengineeringinc.com> Date: Fri Jun 26 00:17:10 2015 -0500 northbridge/amd/amdmct/mct_ddr3: Add additional debug trace statements Change-Id: Iacd789b3572dc8ee85e76d56c46685e6df31d1a6 Signed-off-by: Timothy Pearson <tpearson(a)raptorengineeringinc.com> Reviewed-on: http://review.coreboot.org/12008 Tested-by: Raptor Engineering Automated Test Stand <noreply(a)raptorengineeringinc.com> Reviewed-by: Patrick Georgi <pgeorgi(a)google.com> Tested-by: build bot (Jenkins) See http://review.coreboot.org/12008 for details. -gerrit

1 0

Patch merged into coreboot/master: cpu/x86/lapic: Add stack overrun detection
by gerrit＠coreboot.org 14 Nov '15

14 Nov '15

the following patch was just integrated into master: commit 6b6c653ce7313d137c4f4f86e2e7678f2c19862d Author: Timothy Pearson <tpearson(a)raptorengineeringinc.com> Date: Sat Sep 5 19:31:20 2015 -0500 cpu/x86/lapic: Add stack overrun detection Change-Id: I03e43f38e0d2e51141208ebb169ad8deba77ab78 Signed-off-by: Timothy Pearson <tpearson(a)raptorengineeringinc.com> Reviewed-on: http://review.coreboot.org/11963 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich(a)gmail.com> See http://review.coreboot.org/11963 for details. -gerrit

1 0

Patch merged into coreboot/master: northbridge/amd/amdfam10: Properly indicate node and channel in SMBIOS tables
by gerrit＠coreboot.org 14 Nov '15

14 Nov '15

the following patch was just integrated into master: commit 0e545c66a3d1b0a18e9cd0a1bdc34d89e82e0667 Author: Timothy Pearson <tpearson(a)raptorengineeringinc.com> Date: Thu Jun 25 15:28:23 2015 -0500 northbridge/amd/amdfam10: Properly indicate node and channel in SMBIOS tables Change-Id: Ie7278745358daf0c78cdb9c579db5291a1a2a0cb Signed-off-by: Timothy Pearson <tpearson(a)raptorengineeringinc.com> Reviewed-on: http://review.coreboot.org/12004 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> See http://review.coreboot.org/12004 for details. -gerrit

1 0

Patch merged into coreboot/master: sconfig: remove warning about root_complex
by gerrit＠coreboot.org 14 Nov '15

14 Nov '15

the following patch was just integrated into master: commit 92bcaa2226ff8fe16f2144358b3ba310da555a2c Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Fri Nov 13 09:39:22 2015 +0100 sconfig: remove warning about root_complex It's not deprecated if it's still in active use. The code layout is just "funny" (and could warrant a chipset-side cleanup, but not today) Change-Id: I5f7776ceba0134f20364a0c4a1ca51382e9877e2 Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> Reviewed-on: http://review.coreboot.org/12429 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth <martinroth(a)google.com> See http://review.coreboot.org/12429 for details. -gerrit

1 0

Patch set updated for coreboot: coreinfo: Hide blinking cursor
by Yasha Cherikovsky 14 Nov '15

14 Nov '15

Yasha Cherikovsky (yasha.che3(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/12437 -gerrit commit 76bc74af7d33b9f49e821a21089d2872ff928239 Author: Yasha Cherikovsky <yasha.che3(a)gmail.com> Date: Sat Nov 14 19:16:58 2015 +0200 coreinfo: Hide blinking cursor Change-Id: I6297fc178203dcfbd0b2a4c78dd83359e7804933 Signed-off-by: Yasha Cherikovsky <yasha.che3(a)gmail.com> --- payloads/coreinfo/coreinfo.c | 1 + 1 file changed, 1 insertion(+) diff --git a/payloads/coreinfo/coreinfo.c b/payloads/coreinfo/coreinfo.c index beda918..5137ce6 100644 --- a/payloads/coreinfo/coreinfo.c +++ b/payloads/coreinfo/coreinfo.c @@ -294,6 +294,7 @@ int main(void) noecho(); /* don't let curses echo keyboard chars */ keypad(stdscr, TRUE); /* allow KEY_F(n) keys to be seen */ + curs_set(0); /* Hide blinking cursor */ loop();

1 0

Patch set updated for coreboot: coreinfo: Fix off-by-one in displayed month of year
by Yasha Cherikovsky 14 Nov '15

14 Nov '15

Yasha Cherikovsky (yasha.che3(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/12438 -gerrit commit bbb55074a6c39a757ffa9af7178dcf05065d7e2b Author: Yasha Cherikovsky <yasha.che3(a)gmail.com> Date: Sat Nov 14 19:16:58 2015 +0200 coreinfo: Fix off-by-one in displayed month of year According to C documentation, the range of tm_mon in struct tm is [0, 11]. Before the patch, the displayed month was indeed incorrect. Change-Id: I9f95f1e978c45b3635e2edfe1ec496d7b0dec00a Signed-off-by: Yasha Cherikovsky <yasha.che3(a)gmail.com> --- payloads/coreinfo/coreinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payloads/coreinfo/coreinfo.c b/payloads/coreinfo/coreinfo.c index 5137ce6..a383330 100644 --- a/payloads/coreinfo/coreinfo.c +++ b/payloads/coreinfo/coreinfo.c @@ -128,7 +128,7 @@ static void print_time_and_date(void) rtc_read_clock(&tm); mvwprintw(menuwin, 0, 57, "%02d/%02d/%04d - %02d:%02d:%02d", - tm.tm_mon, tm.tm_mday, 1900 + tm.tm_year, tm.tm_hour, + tm.tm_mon + 1, tm.tm_mday, 1900 + tm.tm_year, tm.tm_hour, tm.tm_min, tm.tm_sec); } #endif

1 0

Patch set updated for coreboot: coreinfo: Move screen dimensions to header
by Yasha Cherikovsky 14 Nov '15

14 Nov '15

Yasha Cherikovsky (yasha.che3(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/12439 -gerrit commit 7478bbe45ae3c31bab36d682b750f91abd08da21 Author: Yasha Cherikovsky <yasha.che3(a)gmail.com> Date: Sat Nov 14 19:16:58 2015 +0200 coreinfo: Move screen dimensions to header The screen dimensions need to be known in other files. Change-Id: Idf6f02e4cadbece78096ccd464296ecec405574d Signed-off-by: Yasha Cherikovsky <yasha.che3(a)gmail.com> --- payloads/coreinfo/coreinfo.c | 3 --- payloads/coreinfo/coreinfo.h | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/payloads/coreinfo/coreinfo.c b/payloads/coreinfo/coreinfo.c index a383330..41b5f12 100644 --- a/payloads/coreinfo/coreinfo.c +++ b/payloads/coreinfo/coreinfo.c @@ -15,9 +15,6 @@ #include "coreinfo.h" -#define SCREEN_Y 25 -#define SCREEN_X 80 - #define KEY_ESC 27 extern struct coreinfo_module cpuinfo_module; diff --git a/payloads/coreinfo/coreinfo.h b/payloads/coreinfo/coreinfo.h index b1f91aa..073c5f9 100644 --- a/payloads/coreinfo/coreinfo.h +++ b/payloads/coreinfo/coreinfo.h @@ -32,4 +32,7 @@ extern void docpuid(int, unsigned long *, unsigned long *, unsigned long *, void print_module_title(WINDOW *win, const char *title); +#define SCREEN_Y 25 +#define SCREEN_X 80 + #endif

1 0

Patch set updated for coreboot: coreinfo: Rewrite bootlog_module
by Yasha Cherikovsky 14 Nov '15

14 Nov '15

Yasha Cherikovsky (yasha.che3(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/12440 -gerrit commit 780e8275afee86584d8a994157a96f56369332f9 Author: Yasha Cherikovsky <yasha.che3(a)gmail.com> Date: Sat Nov 14 19:16:58 2015 +0200 coreinfo: Rewrite bootlog_module The old bootlog_module implementation was completely broken: - It assumed that the console buffer is located at address 0x90000, and of size 64K. It is not correct nowadays. - It displayed the buffer in a very hacky way, the code was riddled with TODOs and FIXMEs. Scrolling had sometimes unexpected behavior. The new implementation: - Uses the cbmem console as the source of data. It takes the console information from lib_sysinfo of libpayload, which is constructed from the coreboot tables (no more hardcoded adressess). - Properly sanitizes the console buffer for display, which makes scolling and display much easier to implement. Change-Id: I3f87ec920631da2acfd3f52273228703f22f469f Signed-off-by: Yasha Cherikovsky <yasha.che3(a)gmail.com> --- payloads/coreinfo/bootlog_module.c | 209 +++++++++++++++++++++++++------------ 1 file changed, 142 insertions(+), 67 deletions(-) diff --git a/payloads/coreinfo/bootlog_module.c b/payloads/coreinfo/bootlog_module.c index 27653d3..9e72e70 100644 --- a/payloads/coreinfo/bootlog_module.c +++ b/payloads/coreinfo/bootlog_module.c @@ -17,33 +17,130 @@ #if IS_ENABLED(CONFIG_MODULE_BOOTLOG) -#define CONFIG_COREBOOT_PRINTK_BUFFER_ADDR 0x90000 -#define CONFIG_COREBOOT_PRINTK_BUFFER_SIZE 65536 +#define LINES_SHOWN 19 +#define TAB_WIDTH 2 -static char *buf; -static s32 cursor = 0; -static s32 cursor_max; -static int bootlog_module_init(void) -{ - int i; - volatile unsigned long *ptr = - (void *)(CONFIG_COREBOOT_PRINTK_BUFFER_ADDR + 16); /* FIXME */ +/* Globals that are used for tracking screen state */ +static char *g_buf = NULL; +static s32 g_line = 0; +static s32 g_lines_count = 0; +static s32 g_max_cursor_line = 0; + + +/* Copied from libpayload/drivers/cbmem_console.c */ +struct cbmem_console { + uint32_t size; + uint32_t cursor; + uint8_t body[0]; +} __attribute__ ((__packed__)); + + +static u32 char_width(char c, u32 cursor, u32 screen_width) { + if (c == '\n') { + return screen_width - (cursor % screen_width); + } else if (c == '\t') { + return TAB_WIDTH; + } else if (isprint(c)) { + return 1; + } + + return 0; +} + +static u32 calculate_chars_count(char *str, u32 str_len, u32 screen_width, u32 screen_height) { + u32 i, count = 0; + + for (i = 0; i < str_len; i++) { + count += char_width(str[i], count, screen_width); + } + + /* Ensure that 'count' can occupy at least the whole screen */ + if (count < screen_width * screen_height) { + count = screen_width * screen_height; + } + + /* Pad to line end */ + if (count % screen_width != 0) { + count += screen_width - (count % screen_width); + } + + return count; +} + +/* + * This method takes an input buffer and sanitizes it for display, which means: + * - '\n' is converted to spaces until end of line + * - Tabs are converted to spaces of size TAB_WIDTH + * - Only printable characters are preserved + */ +static int sanitize_buffer_for_display(char *str, u32 str_len, char *out, u32 out_len, u32 screen_width) { + u32 cursor = 0; + u32 i; + + for (i = 0; i < str_len && cursor < out_len; i++) { + u32 width = char_width(str[i], cursor, screen_width); + if (width == 1) { + out[cursor++] = str[i]; + } else if (width > 1) { + while (width-- && cursor < out_len) { + out[cursor++] = ' '; + } + } + } - buf = malloc(CONFIG_COREBOOT_PRINTK_BUFFER_SIZE); - if (!buf) { - /* TODO */ + /* Fill the rest of the out buffer with spaces */ + while (cursor < out_len) { + out[cursor++] = ' '; } - memcpy(buf, (char *)ptr, CONFIG_COREBOOT_PRINTK_BUFFER_SIZE); + return 0; +} + +static int bootlog_module_init(void) { + /* Make sure that lib_sysinfo is initialized */ + int ret = lib_get_sysinfo(); + if (ret) { + return -1; + } + + struct cbmem_console *console = lib_sysinfo.cbmem_cons; + if (console == NULL) { + return -1; + } + /* Extract console information */ + char *buffer = (char *)(&(console->body)); + u32 buffer_size = console->size; + u32 cursor = console->cursor; + + /* The cursor may be bigger than buffer size when the buffer is full */ + if (cursor >= buffer_size) { + cursor = buffer_size - 1; + } + + /* Calculate how much characters will be displayed on screen */ + u32 chars_count = calculate_chars_count(buffer, cursor + 1, SCREEN_X, LINES_SHOWN); + + /* Sanity check, chars_count must be padded to full line */ + if (chars_count % SCREEN_X != 0) { + return -2; + } + + g_lines_count = chars_count / SCREEN_X; + g_max_cursor_line = MAX(g_lines_count - 1 - LINES_SHOWN, 0); - cursor_max = CONFIG_COREBOOT_PRINTK_BUFFER_SIZE; - for (i = 0; i < 20; i++) { - do { - cursor_max--; - } while (*(buf + cursor_max) != '\n'); + g_buf = malloc(chars_count); + if (!g_buf) { + return -3; + } + + if (sanitize_buffer_for_display(buffer, cursor + 1, + g_buf, chars_count, + SCREEN_X) < 0) { + free(g_buf); + g_buf = NULL; + return -4; } - cursor_max++; /* Stay _behind_ the newline. */ /* TODO: Maybe a _cleanup hook where we call free()? */ @@ -52,74 +149,52 @@ static int bootlog_module_init(void) static int bootlog_module_redraw(WINDOW *win) { - int x = 0, y = 0; - char *tmp = buf + cursor; - print_module_title(win, "Coreboot Bootlog"); - /* FIXME: Handle lines longer than 80 characters. */ - while (y <= 18) { - mvwaddch(win, y + 2, x, isprint(*tmp) ? *tmp : ' '); - x++; - tmp++; - if (*tmp == '\n') { - y++; - x = 0; - tmp++; /* Skip the newline. */ + if (!g_buf) { + return -1; + } + + int x = 0, y = 0; + char *tmp = g_buf + g_line * SCREEN_X; + + for (y = 0; y < LINES_SHOWN; y++) { + for (x = 0; x < SCREEN_X; x++) { + mvwaddch(win, y + 2, x, *tmp); + tmp++; } + } return 0; } -/* TODO: Simplify code. */ static int bootlog_module_handle(int key) { - int i; + if (!g_buf) { + return 0; + } switch (key) { case KEY_DOWN: - if (cursor == cursor_max) - return 0; - while (*(buf + cursor) != '\n') - cursor++; - cursor++; /* Skip the newline. */ + g_line++; break; case KEY_UP: - if (cursor == 0) - return 0; - cursor--; /* Skip the newline. */ - do { - cursor--; - } while (*(buf + cursor) != '\n'); - cursor++; /* Stay _behind_ the newline. */ + g_line--; break; - case KEY_NPAGE: - if (cursor == cursor_max) - return 0; - for (i = 0; i < 20; i++) { - while (*(buf + cursor) != '\n') - cursor++; - cursor++; /* Skip the newline. */ - } + case KEY_NPAGE: /* Page up */ + g_line -= LINES_SHOWN; break; - case KEY_PPAGE: - if (cursor == 0) - return 0; - for (i = 0; i < 20; i++) { - do { - cursor--; - } while (*(buf + cursor) != '\n'); - } - cursor++; /* Stay _behind_ the newline. */ + case KEY_PPAGE: /* Page down */ + g_line += LINES_SHOWN; break; } - if (cursor > cursor_max) - cursor = cursor_max; + if (g_line < 0) + g_line = 0; - if (cursor < 0) - cursor = 0; + if (g_line > g_max_cursor_line) + g_line = g_max_cursor_line; return 1; }

1 0

Patch set updated for coreboot: nb/intel/sandybridge: Fix PEG disablement
by Patrick Rudolph 14 Nov '15

14 Nov '15

Patrick Rudolph (siro(a)das-labor.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/12112 -gerrit commit 4192a4b35b4a49f57011d06f309ee1e748d32c3a Author: Patrick Rudolph <siro(a)das-labor.org> Date: Wed Oct 21 18:05:01 2015 +0200 nb/intel/sandybridge: Fix PEG disablement Fix regression introduced by: 3660c0fc658e4e20ef079f762dfc7ad05c83544c "northbridge/intel/sandybridge: Enable PEG clock-gating on demand" Issue observed: GNU/Linux kernel crashes in earlyinit on systems without PEG devices. The crash occurs on every boot in different functions. There's no problem on systems with PEG enabled. Test system: * Lenovo T530 * Intel Core i5-3320M CPU * Fedora GNU/Linux 4.1 * PEG disabled in devicetree Problem description: Tests shows that modifing PEG chicken bit or device enable bits after setting BIOS_RESET_CPL causes random crashes in GNU/Linux. Problem solution: Disable PEG devices before setting BIOS_RESET_CPL. Final testing results: No more random kernel crashes. Change-Id: I4a967c2d00d7d1e4426cf5abdd5f616c21557da7 Signed-off-by: Patrick Rudolph <siro(a)das-labor.org> --- src/northbridge/intel/sandybridge/northbridge.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/northbridge/intel/sandybridge/northbridge.c b/src/northbridge/intel/sandybridge/northbridge.c index 09830de..656a0e8 100644 --- a/src/northbridge/intel/sandybridge/northbridge.c +++ b/src/northbridge/intel/sandybridge/northbridge.c @@ -427,6 +427,11 @@ static void northbridge_init(struct device *dev) } MCHBAR32(0x5f10) = bridge_type; + /* Turn off unused devices. Has to be done before + * setting BIOS_RESET_CPL. + */ + disable_peg(); + /* * Set bit 0 of BIOS_RESET_CPL to indicate to the CPU * that BIOS has initialized memory and power management @@ -452,9 +457,6 @@ static void northbridge_init(struct device *dev) /* Set here before graphics PM init */ MCHBAR32(0x5500) = 0x00100001; - - /* Turn off unused devices */ - disable_peg(); } static void northbridge_enable(device_t dev)

1 0

New patch to review for coreboot: coreinfo: Rewrite bootlog_module
by Yasha Cherikovsky 14 Nov '15

14 Nov '15

Yasha Cherikovsky (yasha.che3(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/12440 -gerrit commit 6d55fd59fe680f795380982ccea32d0d7f465ec0 Author: Yasha Cherikovsky <yasha.cherikovsky(a)gmail.com> Date: Sat Nov 14 18:52:35 2015 +0200 coreinfo: Rewrite bootlog_module The old bootlog_module implementation was completely broken: - It assumed that the console buffer is located at address 0x90000, and of size 64K. It is not correct nowadays. - It displayed the buffer in a very hacky way, the code was riddled with TODOs and FIXMEs. Scrolling had sometimes unexpected behavior. The new implementation: - Uses the cbmem console as the source of data. It takes the console information from lib_sysinfo of libpayload, which is constructed from the coreboot tables (no more hardcoded adressess). - Properly sanitizes the console buffer for display, which makes scolling and display much easier to implement. Change-Id: I3f87ec920631da2acfd3f52273228703f22f469f Signed-off-by: Yasha Cherikovsky <yasha.che3(a)gmail.com> --- payloads/coreinfo/bootlog_module.c | 209 +++++++++++++++++++++++++------------ 1 file changed, 142 insertions(+), 67 deletions(-) diff --git a/payloads/coreinfo/bootlog_module.c b/payloads/coreinfo/bootlog_module.c index 27653d3..9e72e70 100644 --- a/payloads/coreinfo/bootlog_module.c +++ b/payloads/coreinfo/bootlog_module.c @@ -17,33 +17,130 @@ #if IS_ENABLED(CONFIG_MODULE_BOOTLOG) -#define CONFIG_COREBOOT_PRINTK_BUFFER_ADDR 0x90000 -#define CONFIG_COREBOOT_PRINTK_BUFFER_SIZE 65536 +#define LINES_SHOWN 19 +#define TAB_WIDTH 2 -static char *buf; -static s32 cursor = 0; -static s32 cursor_max; -static int bootlog_module_init(void) -{ - int i; - volatile unsigned long *ptr = - (void *)(CONFIG_COREBOOT_PRINTK_BUFFER_ADDR + 16); /* FIXME */ +/* Globals that are used for tracking screen state */ +static char *g_buf = NULL; +static s32 g_line = 0; +static s32 g_lines_count = 0; +static s32 g_max_cursor_line = 0; + + +/* Copied from libpayload/drivers/cbmem_console.c */ +struct cbmem_console { + uint32_t size; + uint32_t cursor; + uint8_t body[0]; +} __attribute__ ((__packed__)); + + +static u32 char_width(char c, u32 cursor, u32 screen_width) { + if (c == '\n') { + return screen_width - (cursor % screen_width); + } else if (c == '\t') { + return TAB_WIDTH; + } else if (isprint(c)) { + return 1; + } + + return 0; +} + +static u32 calculate_chars_count(char *str, u32 str_len, u32 screen_width, u32 screen_height) { + u32 i, count = 0; + + for (i = 0; i < str_len; i++) { + count += char_width(str[i], count, screen_width); + } + + /* Ensure that 'count' can occupy at least the whole screen */ + if (count < screen_width * screen_height) { + count = screen_width * screen_height; + } + + /* Pad to line end */ + if (count % screen_width != 0) { + count += screen_width - (count % screen_width); + } + + return count; +} + +/* + * This method takes an input buffer and sanitizes it for display, which means: + * - '\n' is converted to spaces until end of line + * - Tabs are converted to spaces of size TAB_WIDTH + * - Only printable characters are preserved + */ +static int sanitize_buffer_for_display(char *str, u32 str_len, char *out, u32 out_len, u32 screen_width) { + u32 cursor = 0; + u32 i; + + for (i = 0; i < str_len && cursor < out_len; i++) { + u32 width = char_width(str[i], cursor, screen_width); + if (width == 1) { + out[cursor++] = str[i]; + } else if (width > 1) { + while (width-- && cursor < out_len) { + out[cursor++] = ' '; + } + } + } - buf = malloc(CONFIG_COREBOOT_PRINTK_BUFFER_SIZE); - if (!buf) { - /* TODO */ + /* Fill the rest of the out buffer with spaces */ + while (cursor < out_len) { + out[cursor++] = ' '; } - memcpy(buf, (char *)ptr, CONFIG_COREBOOT_PRINTK_BUFFER_SIZE); + return 0; +} + +static int bootlog_module_init(void) { + /* Make sure that lib_sysinfo is initialized */ + int ret = lib_get_sysinfo(); + if (ret) { + return -1; + } + + struct cbmem_console *console = lib_sysinfo.cbmem_cons; + if (console == NULL) { + return -1; + } + /* Extract console information */ + char *buffer = (char *)(&(console->body)); + u32 buffer_size = console->size; + u32 cursor = console->cursor; + + /* The cursor may be bigger than buffer size when the buffer is full */ + if (cursor >= buffer_size) { + cursor = buffer_size - 1; + } + + /* Calculate how much characters will be displayed on screen */ + u32 chars_count = calculate_chars_count(buffer, cursor + 1, SCREEN_X, LINES_SHOWN); + + /* Sanity check, chars_count must be padded to full line */ + if (chars_count % SCREEN_X != 0) { + return -2; + } + + g_lines_count = chars_count / SCREEN_X; + g_max_cursor_line = MAX(g_lines_count - 1 - LINES_SHOWN, 0); - cursor_max = CONFIG_COREBOOT_PRINTK_BUFFER_SIZE; - for (i = 0; i < 20; i++) { - do { - cursor_max--; - } while (*(buf + cursor_max) != '\n'); + g_buf = malloc(chars_count); + if (!g_buf) { + return -3; + } + + if (sanitize_buffer_for_display(buffer, cursor + 1, + g_buf, chars_count, + SCREEN_X) < 0) { + free(g_buf); + g_buf = NULL; + return -4; } - cursor_max++; /* Stay _behind_ the newline. */ /* TODO: Maybe a _cleanup hook where we call free()? */ @@ -52,74 +149,52 @@ static int bootlog_module_init(void) static int bootlog_module_redraw(WINDOW *win) { - int x = 0, y = 0; - char *tmp = buf + cursor; - print_module_title(win, "Coreboot Bootlog"); - /* FIXME: Handle lines longer than 80 characters. */ - while (y <= 18) { - mvwaddch(win, y + 2, x, isprint(*tmp) ? *tmp : ' '); - x++; - tmp++; - if (*tmp == '\n') { - y++; - x = 0; - tmp++; /* Skip the newline. */ + if (!g_buf) { + return -1; + } + + int x = 0, y = 0; + char *tmp = g_buf + g_line * SCREEN_X; + + for (y = 0; y < LINES_SHOWN; y++) { + for (x = 0; x < SCREEN_X; x++) { + mvwaddch(win, y + 2, x, *tmp); + tmp++; } + } return 0; } -/* TODO: Simplify code. */ static int bootlog_module_handle(int key) { - int i; + if (!g_buf) { + return 0; + } switch (key) { case KEY_DOWN: - if (cursor == cursor_max) - return 0; - while (*(buf + cursor) != '\n') - cursor++; - cursor++; /* Skip the newline. */ + g_line++; break; case KEY_UP: - if (cursor == 0) - return 0; - cursor--; /* Skip the newline. */ - do { - cursor--; - } while (*(buf + cursor) != '\n'); - cursor++; /* Stay _behind_ the newline. */ + g_line--; break; - case KEY_NPAGE: - if (cursor == cursor_max) - return 0; - for (i = 0; i < 20; i++) { - while (*(buf + cursor) != '\n') - cursor++; - cursor++; /* Skip the newline. */ - } + case KEY_NPAGE: /* Page up */ + g_line -= LINES_SHOWN; break; - case KEY_PPAGE: - if (cursor == 0) - return 0; - for (i = 0; i < 20; i++) { - do { - cursor--; - } while (*(buf + cursor) != '\n'); - } - cursor++; /* Stay _behind_ the newline. */ + case KEY_PPAGE: /* Page down */ + g_line += LINES_SHOWN; break; } - if (cursor > cursor_max) - cursor = cursor_max; + if (g_line < 0) + g_line = 0; - if (cursor < 0) - cursor = 0; + if (g_line > g_max_cursor_line) + g_line = g_max_cursor_line; return 1; }

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit November 2015