November 2009 - SerialICE - mail.coreboot.org

an idea
by ron minnich Nov. 27, 2009

Nov. 27, 2009

serialice lets you get very far in the debug process. At some point, one needs to take the plunge and try "the real thing". But, on a board with soldered-on flash, this is a one-way trip. Or maybe not. What if we could do this: put serialice in the boot block, i.e. as the "fallback", and put a test bios in as the "normal". Serialice could have the capability to flash the "normal". Serialice could also be directed to start the "normal" bios for testing purposes. Then, I could on my 1580s do test bios images, secure in knowing that I can always fall back to serialice and recover. Possibly we could have serialice be an "external programmer" for flashrom! Comments? ron

5 9

r76 - trunk/qemu-0.11.0
by svn＠coresystems.de Nov. 27, 2009

Nov. 27, 2009

Author: stepan Date: 2009-11-27 15:11:42 +0100 (Fri, 27 Nov 2009) New Revision: 76 Modified: trunk/qemu-0.11.0/serialice.c trunk/qemu-0.11.0/serialice.h trunk/qemu-0.11.0/vl.c Log: Trying to get rid of the need for vgabios-cirrus.bin Doesn't work really well. Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/qemu-0.11.0/serialice.c =================================================================== --- trunk/qemu-0.11.0/serialice.c 2009-11-26 22:27:27 UTC (rev 75) +++ trunk/qemu-0.11.0/serialice.c 2009-11-27 14:11:42 UTC (rev 76) @@ -965,6 +965,15 @@ /* Let the rest of Qemu know we're alife */ serialice_active = 1; +#if SERIALICE_HIDES_VGA + /* Go to Qemu monitor immediately, don't try to open + * vgabios-cirrus.bin, because it's not needed anyways. + * + * This is disabled because the Qemu window is distorted + * until the first console change when this is active + */ + vga_interface_type = VGA_NONE; +#endif } void serialice_exit(void) Modified: trunk/qemu-0.11.0/serialice.h =================================================================== --- trunk/qemu-0.11.0/serialice.h 2009-11-26 22:27:27 UTC (rev 75) +++ trunk/qemu-0.11.0/serialice.h 2009-11-27 14:11:42 UTC (rev 76) @@ -64,4 +64,6 @@ void serialice_log_load(int caught, uint32_t addr, uint32_t result, unsigned int data_size); int serialice_handle_store(uint32_t addr, uint32_t val, unsigned int data_size); +#define SERIALICE_HIDES_VGA 0 + #endif Modified: trunk/qemu-0.11.0/vl.c =================================================================== --- trunk/qemu-0.11.0/vl.c 2009-11-26 22:27:27 UTC (rev 75) +++ trunk/qemu-0.11.0/vl.c 2009-11-27 14:11:42 UTC (rev 76) @@ -2756,6 +2756,13 @@ { DisplayState *ds = qemu_mallocz(sizeof(DisplayState)); ds->allocator = &default_allocator; +#ifdef CONFIG_SERIALICE +#if SERIALICE_HIDES_VGA + if (serialice_active) + ds->surface = qemu_create_displaysurface(ds, 640, 384); + else +#endif +#endif ds->surface = qemu_create_displaysurface(ds, 640, 480); register_displaystate(ds); }

1 0

r75 - trunk/qemu-0.11.0
by svn＠coresystems.de Nov. 26, 2009

Nov. 26, 2009

Author: stepan Date: 2009-11-26 23:27:27 +0100 (Thu, 26 Nov 2009) New Revision: 75 Modified: trunk/qemu-0.11.0/serialice.c Log: make global variable SerialICE_mainboard available in LUA. Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/qemu-0.11.0/serialice.c =================================================================== --- trunk/qemu-0.11.0/serialice.c 2009-11-26 21:59:48 UTC (rev 74) +++ trunk/qemu-0.11.0/serialice.c 2009-11-26 22:27:27 UTC (rev 75) @@ -108,6 +108,10 @@ /* Register C function callbacks */ lua_register(L, "SerialICE_register_physical", serialice_register_physical); + /* Set global variable SerialICE_mainboard */ + lua_pushstring(L, serialice_mainboard); + lua_setfield(L, LUA_GLOBALSINDEX, "SerialICE_mainboard"); + /* Load the script file */ status = luaL_loadfile(L, serialice_lua_script); if (status) {

1 0

r74 - trunk/qemu-0.11.0
by svn＠coresystems.de Nov. 26, 2009

Nov. 26, 2009

Author: stepan Date: 2009-11-26 22:59:48 +0100 (Thu, 26 Nov 2009) New Revision: 74 Modified: trunk/qemu-0.11.0/serialice.c Log: Make Qemu read version and mainboard type from SerialICE shell... Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/qemu-0.11.0/serialice.c =================================================================== --- trunk/qemu-0.11.0/serialice.c 2009-11-26 19:27:31 UTC (rev 73) +++ trunk/qemu-0.11.0/serialice.c 2009-11-26 21:59:48 UTC (rev 74) @@ -65,6 +65,8 @@ int serialice_active = 0; const char *serialice_lua_script="serialice.lua"; +const char *serialice_mainboard = NULL; + #ifndef WIN32 static struct termios options; #endif @@ -504,6 +506,35 @@ // ************************************************************************** // high level communication with the SerialICE shell +static void serialice_get_version(void) +{ + int len = 0; + printf("SerialICE: Version.....: "); + serialice_command("*vi", 0); + + memset(s->buffer, 0, BUFFER_SIZE); + serialice_read(s, s->buffer, 1); + serialice_read(s, s->buffer, 1); + while (s->buffer[len++] != '\n') + serialice_read(s, s->buffer+len, 1); + s->buffer[len-1]='\0'; + + printf("%s\n", s->buffer); +} + + +static void serialice_get_mainboard(void) +{ + int len = 31; + + printf("SerialICE: Mainboard...: "); + serialice_command("*mb", 32); + while (len && s->buffer[len] == ' ') + s->buffer[len--] = '\0'; + serialice_mainboard = strdup(s->buffer + 1); + printf("%s\n", serialice_mainboard); +} + uint8_t serialice_inb(uint16_t port) { uint8_t ret; @@ -921,6 +952,10 @@ */ serialice_write(s, "@", 1); + serialice_get_version(); + + serialice_get_mainboard(); + printf("SerialICE: LUA init...\n"); serialice_lua_init();

1 0

r73 - trunk/qemu-0.11.0
by svn＠coresystems.de Nov. 26, 2009

Nov. 26, 2009

Author: stepan Date: 2009-11-26 20:27:31 +0100 (Thu, 26 Nov 2009) New Revision: 73 Modified: trunk/qemu-0.11.0/monitor.c trunk/qemu-0.11.0/qemu-monitor.hx trunk/qemu-0.11.0/serialice.c trunk/qemu-0.11.0/serialice.h Log: initial version of "lua" command for qemu monitor. We should probably use a separate thread for this, but it seems to work so far. CTRL-ALT-2 QEMU 0.11.0 monitor - type 'help' for more information (qemu) lua (lua) printf "Hello\n" ---> output goes to "log" (lua) quit Exited LUA shell. (qemu) Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/qemu-0.11.0/monitor.c =================================================================== --- trunk/qemu-0.11.0/monitor.c 2009-11-26 15:52:41 UTC (rev 72) +++ trunk/qemu-0.11.0/monitor.c 2009-11-26 19:27:31 UTC (rev 73) @@ -38,6 +38,7 @@ #include "console.h" #include "block.h" #include "audio/audio.h" +#include "serialice.h" #include "disas.h" #include "balloon.h" #include "qemu-timer.h" @@ -1239,6 +1240,37 @@ qemu_system_powerdown_request(); } +#if defined(CONFIG_SERIALICE) +static void monitor_command_lua(Monitor *mon, const char *cmdline, void *opaque) +{ + const char *errmsg; + + if (!strncasecmp("quit", cmdline, 5)) { + monitor_printf(mon, "Exited LUA shell.\n"); + readline_start(mon->rs, "(qemu) ", 0, monitor_command_cb, NULL); + readline_show_prompt(mon->rs); + return; + } + + errmsg = serialice_lua_execute(cmdline); + if(errmsg) { + monitor_printf(mon, "Lua error: %s\n", errmsg); + free (errmsg); + } + + readline_show_prompt(mon->rs); +} + +static void do_lua(Monitor *mon) +{ + if (serialice_active) { + readline_start(mon->rs, "(lua) ", 0, monitor_command_lua, NULL); + } else { + monitor_printf(mon, "SerialICE is not active.\n"); + } +} +#endif + #if defined(TARGET_I386) static void print_pte(Monitor *mon, uint32_t addr, uint32_t pte, uint32_t mask) { Modified: trunk/qemu-0.11.0/qemu-monitor.hx =================================================================== --- trunk/qemu-0.11.0/qemu-monitor.hx 2009-11-26 15:52:41 UTC (rev 72) +++ trunk/qemu-0.11.0/qemu-monitor.hx 2009-11-26 19:27:31 UTC (rev 73) @@ -170,6 +170,16 @@ Activate logging of the specified items to @file{/tmp/qemu.log}. ETEXI +#ifdef CONFIG_SERIALICE + { "lua", "", do_lua, + "", "go to lua shell" }, +#endif +STEXI +@item lua + +go to lua shell. +ETEXI + { "savevm", "s?", do_savevm, "[tag|id]", "save a VM snapshot. If no tag or id are provided, a new snapshot is created" }, STEXI Modified: trunk/qemu-0.11.0/serialice.c =================================================================== --- trunk/qemu-0.11.0/serialice.c 2009-11-26 15:52:41 UTC (rev 72) +++ trunk/qemu-0.11.0/serialice.c 2009-11-26 19:27:31 UTC (rev 73) @@ -130,6 +130,20 @@ return 0; } +const char *serialice_lua_execute(const char *cmd) +{ + int error; + char *errstring = NULL; + error = luaL_loadbuffer(L, cmd, strlen(cmd), "line") || + lua_pcall(L, 0, 0, 0); + if (error) { + errstring = strdup(lua_tostring(L, -1)); + lua_pop(L, 1); + } + + return errstring; +} + static int serialice_io_read_filter(uint32_t *data, uint16_t port, int size) { int ret, result; Modified: trunk/qemu-0.11.0/serialice.h =================================================================== --- trunk/qemu-0.11.0/serialice.h 2009-11-26 15:52:41 UTC (rev 72) +++ trunk/qemu-0.11.0/serialice.h 2009-11-26 19:27:31 UTC (rev 73) @@ -32,6 +32,7 @@ void serialice_init(void); void serialice_exit(void); +const char *serialice_lua_execute(const char *cmd); uint8_t serialice_inb(uint16_t port); uint16_t serialice_inw(uint16_t port);

1 0

r72 - trunk/qemu-0.11.0
by svn＠coresystems.de Nov. 26, 2009

Nov. 26, 2009

Author: stepan Date: 2009-11-26 16:52:41 +0100 (Thu, 26 Nov 2009) New Revision: 72 Modified: trunk/qemu-0.11.0/qemu-options.hx Log: fix warning while building documentation and put -serialice into "Debug/Expert Options" Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/qemu-0.11.0/qemu-options.hx =================================================================== --- trunk/qemu-0.11.0/qemu-options.hx 2009-11-26 15:51:48 UTC (rev 71) +++ trunk/qemu-0.11.0/qemu-options.hx 2009-11-26 15:52:41 UTC (rev 72) @@ -1644,7 +1644,16 @@ to the specified user. ETEXI +#ifdef CONFIG_SERIALICE +DEF("serialice", HAS_ARG, QEMU_OPTION_serialice, \ + "-serialice dev Enable SerialICE debugging on serial device 'dev'\n") +#endif STEXI +@item -serialice @var{dev} +Enable SerialICE debugging on serial device @var{dev}. +ETEXI + +STEXI @end table ETEXI @@ -1661,14 +1670,3 @@ DEF("old-param", 0, QEMU_OPTION_old_param, "-old-param old param mode\n") #endif - -#ifdef CONFIG_SERIALICE -DEF("serialice", HAS_ARG, QEMU_OPTION_serialice, - "-serialice dev Enable SerialICE debugging on serial device 'dev'\n") -STEXI -@item -serialice @var{dev} -Enable SerialICE debugging on serial device @var{dev}. -ETEXI -#endif - -

1 0

r71 - trunk/qemu-0.11.0
by svn＠coresystems.de Nov. 26, 2009

Nov. 26, 2009

Author: stepan Date: 2009-11-26 16:51:48 +0100 (Thu, 26 Nov 2009) New Revision: 71 Modified: trunk/qemu-0.11.0/serialice.c Log: fix "Readback error" on first command (harmless) introduced by v1.5 Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/qemu-0.11.0/serialice.c =================================================================== --- trunk/qemu-0.11.0/serialice.c 2009-11-26 14:36:39 UTC (rev 70) +++ trunk/qemu-0.11.0/serialice.c 2009-11-26 15:51:48 UTC (rev 71) @@ -892,7 +892,7 @@ printf("SerialICE: Waiting for handshake with target... "); /* Trigger a prompt */ - serialice_write(s, "\n", 1); + serialice_write(s, "@", 1); /* ... and wait for it to appear */ if (serialice_wait_prompt() == 0) { @@ -905,7 +905,7 @@ /* Each serialice_command() waits for a prompt, so trigger one for the * first command, as we consumed the last one for the handshake */ - serialice_write(s, "\n", 1); + serialice_write(s, "@", 1); printf("SerialICE: LUA init...\n"); serialice_lua_init();

1 0

r70 - trunk/SerialICE
by svn＠coresystems.de Nov. 26, 2009

Nov. 26, 2009

Author: stepan Date: 2009-11-26 15:36:39 +0100 (Thu, 26 Nov 2009) New Revision: 70 Modified: trunk/SerialICE/serialice.c Log: fix *vi and *mb output. Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/SerialICE/serialice.c =================================================================== --- trunk/SerialICE/serialice.c 2009-11-26 13:39:54 UTC (rev 69) +++ trunk/SerialICE/serialice.c 2009-11-26 14:36:39 UTC (rev 70) @@ -188,6 +188,8 @@ static void serialice_mainboard(void) { + sio_putc('\r'); sio_putc('\n'); + /* must be defined in mainboard/<boardname>.c */ sio_putstring(boardname); } @@ -242,7 +244,8 @@ serialice_mainboard(); break; case (('v' << 8)|'i'): // Read version info *vi - serialice_mainboard(); + serialice_version(); + break; default: sio_putstring("ERROR\n"); break;

1 0

r69 - trunk/SerialICE/util
by svn＠coresystems.de Nov. 26, 2009

Nov. 26, 2009

Author: stepan Date: 2009-11-26 14:39:54 +0100 (Thu, 26 Nov 2009) New Revision: 69 Modified: trunk/SerialICE/util/romcc.c Log: Fix this warning: HOSTCC build/romcc SerialICE/util/romcc.c: In function 'scc_transform': SerialICE/util/romcc.c:21097: warning: format '%5ld' expects type 'long int', but argument 3 has type 'int' I hope it's the right fix. Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/SerialICE/util/romcc.c =================================================================== --- trunk/SerialICE/util/romcc.c 2009-11-26 12:14:48 UTC (rev 68) +++ trunk/SerialICE/util/romcc.c 2009-11-26 13:39:54 UTC (rev 69) @@ -21092,7 +21092,7 @@ if (state->compiler->debug & DEBUG_SCC_TRANSFORM) { fprintf(state->errout, "sedge: %5ld (%5d -> %5d)\n", - sedge - scc.ssa_edges, + (unsigned long)sedge - (unsigned long)scc.ssa_edges, sedge->src->def->id, sedge->dst->def->id); }

1 0

r68 - trunk/SerialICE
by svn＠coresystems.de Nov. 26, 2009

Nov. 26, 2009

Author: stepan Date: 2009-11-26 13:14:48 +0100 (Thu, 26 Nov 2009) New Revision: 68 Modified: trunk/SerialICE/README.SHELL Log: Update shell documentation for the two new commands. Modified: trunk/SerialICE/README.SHELL =================================================================== --- trunk/SerialICE/README.SHELL 2009-11-26 12:10:34 UTC (rev 67) +++ trunk/SerialICE/README.SHELL 2009-11-26 12:14:48 UTC (rev 68) @@ -125,4 +125,24 @@ 000006f2.00020800.0000e3bd.bfebfbff > +8. Mainboard Name + Syntax: + *mb + + Example: + > *mb + Kontron 986LCD-M + > + +9. Version Information + + Syntax: + *vi + + Example: + > *vi + SerialICE v1.5 (Nov 26 2009) + + > +

1 0