SerialICE August 2012

serialice@serialice.com

1 participants
30 discussions

Patch merged into serialice/master: ca33e70 SerialICE: Unify IO and memory handling
by gerrit＠coreboot.org 20 Aug '12

20 Aug '12

the following patch was just integrated into master: commit ca33e70a15ec8a291fda10335044c2bd63f95870 Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Sun Aug 19 21:26:21 2012 +0300 SerialICE: Unify IO and memory handling There are no separate handlers for 8/16/32 bit memory access, make IO access work in similar fashion. Change-Id: I0407240a4495fbf723272b48b23e3863a97e7d1e Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Build-Tested: build bot (Jenkins) at Mon Aug 20 23:17:12 2012, giving +1 Reviewed-By: Anton Kochkov <anton.kochkov(a)gmail.com> at Mon Aug 20 23:56:04 2012, giving +2 See http://review.coreboot.org/1464 for details. -gerrit

1 0

Patch merged into serialice/master: 22bc2b1 SerialICE: Export MSRs for filter
by gerrit＠coreboot.org 20 Aug '12

20 Aug '12

the following patch was just integrated into master: commit 22bc2b1ca3468cf6469be778880815517833c131 Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Sat Aug 18 12:52:24 2012 +0300 SerialICE: Export MSRs for filter Required so that filter can access QEMU CPU's MSRs. Change-Id: I01a9f4725b5f037d0d9fb51b1f53ff50ef232662 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Build-Tested: build bot (Jenkins) at Sun Aug 19 20:55:53 2012, giving +1 Reviewed-By: Anton Kochkov <anton.kochkov(a)gmail.com> at Mon Aug 20 23:53:36 2012, giving +2 See http://review.coreboot.org/1459 for details. -gerrit

1 0

Patch merged into serialice/master: 5eea24b SerialICE: Export CPUIDs for filter
by gerrit＠coreboot.org 20 Aug '12

20 Aug '12

the following patch was just integrated into master: commit 5eea24b21720b9c8ace8bc9bf34ba99d821b4a39 Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Sat Aug 18 12:53:31 2012 +0300 SerialICE: Export CPUIDs for filter Required so that filter can access QEMU CPU's CPUID. Change-Id: I859fce6caf778fb32bbbe243b4b2f72ffbe02355 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Build-Tested: build bot (Jenkins) at Sun Aug 19 20:43:32 2012, giving +1 Reviewed-By: Anton Kochkov <anton.kochkov(a)gmail.com> at Mon Aug 20 23:50:14 2012, giving +2 See http://review.coreboot.org/1458 for details. -gerrit

1 0

Patch merged into serialice/master: 072f1bb SerialICE: Minor cleanups
by gerrit＠coreboot.org 20 Aug '12

20 Aug '12

the following patch was just integrated into master: commit 072f1bbbe4e8cc3fdcf7c3a7f68a1ff58935cca1 Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Sat Aug 18 16:28:51 2012 +0300 SerialICE: Minor cleanups Drop serial comm headers. Move VNC screen init. Fix unused exit function. Change-Id: Idc9b0d17e5d1bb3b2a88f93775653d9079cb2b46 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Build-Tested: build bot (Jenkins) at Sun Aug 19 20:30:30 2012, giving +1 Reviewed-By: Anton Kochkov <anton.kochkov(a)gmail.com> at Mon Aug 20 23:47:55 2012, giving +2 See http://review.coreboot.org/1457 for details. -gerrit

1 0

Patch merged into serialice/master: ec67d21 Move SerialICE LUA filter support to separate file
by gerrit＠coreboot.org 20 Aug '12

20 Aug '12

the following patch was just integrated into master: commit ec67d21540f1567bde5be08990184a80312710d1 Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Sun Jul 8 21:21:44 2012 +0300 Move SerialICE LUA filter support to separate file Isolate the existing LUA filtering. It does not meet my requirements for the modular filtering scripts, I will try to implement both in the same build side-by-side to maintain compatibility. Change-Id: I1ef1e6c5ef89f403cfa2a4070a174aa97f464a4d Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Build-Tested: build bot (Jenkins) at Sat Aug 18 00:17:22 2012, giving +1 Reviewed-By: Anton Kochkov <anton.kochkov(a)gmail.com> at Mon Aug 20 10:13:51 2012, giving +1 See http://review.coreboot.org/1456 for details. -gerrit

1 0

New patch to review for serialice: dfb7151 SerialICE: Move dumb screen init
by Kyösti Mälkki 20 Aug '12

20 Aug '12

Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1469 -gerrit commit dfb71513504e66b8eb4599a56ffbca9ddc5491e8 Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Mon Aug 20 23:53:23 2012 +0300 SerialICE: Move dumb screen init This is not really part of SerialICE session in anyway. Change-Id: Ie0fc0058208e720abd309b0145184f9054feb5a9 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- qemu-0.15.x/Makefile.target | 3 +++ qemu-0.15.x/console.h | 1 + qemu-0.15.x/serialice.c | 57 +-------------------------------------------- 3 files changed, 5 insertions(+), 56 deletions(-) diff --git a/qemu-0.15.x/Makefile.target b/qemu-0.15.x/Makefile.target index 445949d..e1efe50 100644 --- a/qemu-0.15.x/Makefile.target +++ b/qemu-0.15.x/Makefile.target @@ -239,6 +239,9 @@ obj-i386-y += pc_piix.o obj-i386-$(CONFIG_KVM) += kvmclock.o obj-i386-$(CONFIG_SPICE) += qxl.o qxl-logger.o qxl-render.o +# Dummy VNC output +obj-i386-y += dumb_screen.o + # shared objects obj-ppc-y = ppc.o obj-ppc-y += vga.o diff --git a/qemu-0.15.x/console.h b/qemu-0.15.x/console.h index 67d1373..3e34577 100644 --- a/qemu-0.15.x/console.h +++ b/qemu-0.15.x/console.h @@ -352,6 +352,7 @@ void vga_hw_invalidate(void); void vga_hw_screen_dump(const char *filename); void vga_hw_text_update(console_ch_t *chardata); +void dumb_screen(void); int is_graphic_console(void); int is_fixedsize_console(void); int text_console_init(QemuOpts *opts, CharDriverState **_chr); diff --git a/qemu-0.15.x/serialice.c b/qemu-0.15.x/serialice.c index 5fe5cfb..69568f0 100644 --- a/qemu-0.15.x/serialice.c +++ b/qemu-0.15.x/serialice.c @@ -42,11 +42,6 @@ #include "serialice.h" #include "sysemu.h" -#define SERIALICE_BANNER 1 -#if SERIALICE_BANNER -#include "serialice_banner.h" -#endif - #define DEFAULT_RAM_SIZE 128 #define BIOS_FILENAME "bios.bin" @@ -54,56 +49,6 @@ const SerialICE_target *target; int serialice_active = 0; -static DisplayState *ds; -static int screen_invalid = 1; - -static void serialice_refresh(void *opaque) -{ - uint8_t *dest; - int bpp, linesize; - - if (!screen_invalid) { - return; - } - - dest = ds_get_data(ds); - bpp = (ds_get_bits_per_pixel(ds) + 7) >> 3; - linesize = ds_get_linesize(ds); - - memset(dest, 0x00, linesize * ds_get_height(ds)); -#if SERIALICE_BANNER - int x, y; - if (bpp == 4) { - for (y = 0; y < 240; y++) { - for (x = 0; x < 320; x++) { - int doff = (y * linesize) + (x * bpp); - int soff = (y * (320 * 3)) + (x * 3); - dest[doff + 0] = serialice_banner[soff + 2]; // blue - dest[doff + 1] = serialice_banner[soff + 1]; // green - dest[doff + 2] = serialice_banner[soff + 0]; // red - } - } - } else { - printf("Banner enabled and BPP = %d (line size = %d)\n", bpp, linesize); - } -#endif - - dpy_update(ds, 0, 0, ds_get_width(ds), ds_get_height(ds)); - screen_invalid = 0; -} - -static void serialice_invalidate(void *opaque) -{ - screen_invalid = 1; -} - -static void serialice_screen(void) -{ - ds = graphic_console_init(serialice_refresh, serialice_invalidate, - NULL, NULL, ds); - qemu_console_resize(ds, 320, 240); -} - // ************************************************************************** // high level communication with the SerialICE shell @@ -269,7 +214,7 @@ void serialice_io_write(uint16_t port, unsigned int size, uint32 data) static void serialice_init(void) { - serialice_screen(); + dumb_screen(); printf("SerialICE: Open connection to target hardware...\n"); target = serialice_serial_init();

1 0

New patch to review for serialice: 9d5fcdd SerialICE: Create capsule for serial protocol
by Kyösti Mälkki 20 Aug '12

20 Aug '12

Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1468 -gerrit commit 9d5fcdd21c92f8918730448692eacb04439f22ca Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Mon Aug 20 16:21:33 2012 +0300 SerialICE: Create capsule for serial protocol Change makes it easier to make a more generic "multiplex" that chooses if operations are handled by Qemu or external target. Also it allows for the use of another communication channel in place of serial stream. Change-Id: I46e0abf8b1f4e1fa4dd30332778f5e73528a8dd4 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- qemu-0.15.x/serialice-com.c | 52 +++++++++++++++++++++++++++++++-------------- qemu-0.15.x/serialice.c | 20 ++++++++++------- qemu-0.15.x/serialice.h | 29 ++++++++++++------------- 3 files changed, 62 insertions(+), 39 deletions(-) diff --git a/qemu-0.15.x/serialice-com.c b/qemu-0.15.x/serialice-com.c index ef5fd84..ee539f4 100644 --- a/qemu-0.15.x/serialice-com.c +++ b/qemu-0.15.x/serialice-com.c @@ -52,12 +52,15 @@ typedef struct { } SerialICEState; static SerialICEState *s; +static const SerialICE_target serialice_protocol; const char *serialice_mainboard = NULL; #ifndef WIN32 static struct termios options; #endif +// ************************************************************************** +// low level communication with the SerialICE shell (serial communication) static int handshake_mode = 0; static void *mallocz(unsigned int size) @@ -157,7 +160,7 @@ static int serialice_wait_prompt(void) return 0; } -void serialice_serial_init(void) +const SerialICE_target *serialice_serial_init(void) { s = mallocz(sizeof(SerialICEState)); @@ -252,13 +255,17 @@ void serialice_serial_init(void) serialice_write(s, "@", 1); handshake_mode = 0; // from now on, warn about readback errors. + return &serialice_protocol; +} - serialice_get_version(); - - serialice_get_mainboard(); +void serialice_serial_exit(void) +{ + free(s->command); + free(s->buffer); + free(s); } -void serialice_command(const char *command, int reply_len) +static void serialice_command(const char *command, int reply_len) { #if SERIALICE_DEBUG > 5 int i; @@ -296,7 +303,10 @@ void serialice_command(const char *command, int reply_len) #endif } -void serialice_get_version(void) +// ************************************************************************** +// high level communication with the SerialICE shell + +static void msg_version(void) { int len = 0; printf("SerialICE: Version.....: "); @@ -313,7 +323,7 @@ void serialice_get_version(void) printf("%s\n", s->buffer); } -void serialice_get_mainboard(void) +static void msg_mainboard(void) { int len = 31; @@ -326,7 +336,7 @@ void serialice_get_mainboard(void) printf("%s\n", serialice_mainboard); } -uint32_t serialice_io_read_wrapper(uint16_t port, unsigned int size) +static uint32_t msg_io_read(uint16_t port, unsigned int size) { switch (size) { case 1: @@ -350,7 +360,7 @@ uint32_t serialice_io_read_wrapper(uint16_t port, unsigned int size) } } -void serialice_io_write_wrapper(uint16_t port, unsigned int size, uint32_t data) +static void msg_io_write(uint16_t port, unsigned int size, uint32_t data) { switch (size) { case 1: @@ -371,7 +381,7 @@ void serialice_io_write_wrapper(uint16_t port, unsigned int size, uint32_t data) return; } -uint32_t serialice_load_wrapper(uint32_t addr, unsigned int size) +static uint32_t msg_load(uint32_t addr, unsigned int size) { switch (size) { case 1: @@ -395,7 +405,7 @@ uint32_t serialice_load_wrapper(uint32_t addr, unsigned int size) return 0; } -void serialice_store_wrapper(uint32_t addr, unsigned int size, uint32_t data) +static void msg_store(uint32_t addr, unsigned int size, uint32_t data) { switch (size) { case 1: @@ -415,8 +425,7 @@ void serialice_store_wrapper(uint32_t addr, unsigned int size, uint32_t data) } } -void serialice_rdmsr_wrapper(uint32_t addr, uint32_t key, - uint32_t * hi, uint32_t * lo) +static void msg_rdmsr(uint32_t addr, uint32_t key, uint32_t * hi, uint32_t * lo) { sprintf(s->command, "*rc%08x.%08x", addr, key); // command read back: "\n00000000.00000000" (18 characters) @@ -426,14 +435,13 @@ void serialice_rdmsr_wrapper(uint32_t addr, uint32_t key, *lo = (uint32_t) strtoul(s->buffer + 10, (char **)NULL, 16); } -void serialice_wrmsr_wrapper(uint32_t addr, uint32_t key, - uint32_t hi, uint32_t lo) +static void msg_wrmsr(uint32_t addr, uint32_t key, uint32_t hi, uint32_t lo) { sprintf(s->command, "*wc%08x.%08x=%08x.%08x", addr, key, hi, lo); serialice_command(s->command, 0); } -void serialice_cpuid_wrapper(uint32_t eax, uint32_t ecx, cpuid_regs_t * ret) +static void msg_cpuid(uint32_t eax, uint32_t ecx, cpuid_regs_t * ret) { sprintf(s->command, "*ci%08x.%08x", eax, ecx); // command read back: "\n000006f2.00000000.00001234.12340324" @@ -447,3 +455,15 @@ void serialice_cpuid_wrapper(uint32_t eax, uint32_t ecx, cpuid_regs_t * ret) ret->ecx = (uint32_t) strtoul(s->buffer + 19, (char **)NULL, 16); ret->edx = (uint32_t) strtoul(s->buffer + 28, (char **)NULL, 16); } + +static const SerialICE_target serialice_protocol = { + .version = msg_version, + .mainboard = msg_mainboard, + .io_read = msg_io_read, + .io_write = msg_io_write, + .load = msg_load, + .store = msg_store, + .rdmsr = msg_rdmsr, + .wrmsr = msg_wrmsr, + .cpuid = msg_cpuid, +}; diff --git a/qemu-0.15.x/serialice.c b/qemu-0.15.x/serialice.c index 74aa9ff..5fe5cfb 100644 --- a/qemu-0.15.x/serialice.c +++ b/qemu-0.15.x/serialice.c @@ -50,6 +50,8 @@ #define DEFAULT_RAM_SIZE 128 #define BIOS_FILENAME "bios.bin" +const SerialICE_target *target; + int serialice_active = 0; static DisplayState *ds; @@ -113,7 +115,7 @@ uint64_t serialice_rdmsr(uint32_t addr, uint32_t key) filtered = serialice_rdmsr_filter(addr, &hi, &lo); if (!filtered) { - serialice_rdmsr_wrapper(addr, key, &hi, &lo); + target->rdmsr(addr, key, &hi, &lo); } ret = hi; @@ -136,7 +138,7 @@ void serialice_wrmsr(uint64_t data, uint32_t addr, uint32_t key) filtered = serialice_wrmsr_filter(addr, &hi, &lo); if (!filtered) { - serialice_wrmsr_wrapper(addr, key, hi, lo); + target->wrmsr(addr, key, hi, lo); } serialice_wrmsr_log(addr, hi, lo, filtered); @@ -147,7 +149,7 @@ cpuid_regs_t serialice_cpuid(uint32_t eax, uint32_t ecx) cpuid_regs_t ret; int filtered; - serialice_cpuid_wrapper(eax, ecx, &ret); + target->cpuid(eax, ecx, &ret); filtered = serialice_cpuid_filter(eax, ecx, &ret); @@ -182,7 +184,7 @@ int serialice_handle_load(uint32_t addr, uint32_t * result, source = serialice_memory_read_filter(addr, result, data_size); if (source & READ_FROM_SERIALICE) { - *result = serialice_load_wrapper(addr, data_size); + *result = target->load(addr, data_size); return 1; } @@ -222,7 +224,7 @@ int serialice_handle_store(uint32_t addr, uint32_t val, unsigned int data_size) serialice_log_store(write_to_target, addr, filtered_data, data_size); if (write_to_target) { - serialice_store_wrapper(addr, data_size, filtered_data); + target->store(addr, data_size, filtered_data); } return (write_to_qemu == 0); @@ -237,7 +239,7 @@ uint32_t serialice_io_read(uint16_t port, unsigned int size) filtered = serialice_io_read_filter(&data, port, size); if (!filtered) { - return serialice_io_read_wrapper(port, size); + return target->io_read(port, size); } data = mask_data(data, size); @@ -256,7 +258,7 @@ void serialice_io_write(uint16_t port, unsigned int size, uint32 data) data = mask_data(filtered_data, size); } else { data = mask_data(filtered_data, size); - serialice_io_write_wrapper(port, size, data); + target->io_write(port, size, data); } serialice_io_write_log(0, data, port, size); @@ -270,7 +272,9 @@ static void serialice_init(void) serialice_screen(); printf("SerialICE: Open connection to target hardware...\n"); - serialice_serial_init(); + target = serialice_serial_init(); + target->version(); + target->mainboard(); printf("SerialICE: LUA init...\n"); serialice_lua_init(); diff --git a/qemu-0.15.x/serialice.h b/qemu-0.15.x/serialice.h index 4624deb..3a12b53 100644 --- a/qemu-0.15.x/serialice.h +++ b/qemu-0.15.x/serialice.h @@ -44,12 +44,6 @@ extern int serialice_active; int serialice_lua_init(void); const char *serialice_lua_execute(const char *cmd); -void serialice_serial_init(void); -void serialice_command(const char *command, int reply_len); - -void serialice_get_version(void); -void serialice_get_mainboard(void); - uint32_t serialice_io_read(uint16_t port, unsigned int size); void serialice_io_write(uint16_t port, unsigned int size, uint32_t data); @@ -69,15 +63,20 @@ void serialice_log_load(int caught, uint32_t addr, uint32_t result, int serialice_handle_store(uint32_t addr, uint32_t val, unsigned int data_size); /* serialice protocol */ -uint32_t serialice_io_read_wrapper(uint16_t port, unsigned int size); -void serialice_io_write_wrapper(uint16_t port, unsigned int size, uint32_t data); - -uint32_t serialice_load_wrapper(uint32_t addr, unsigned int size); -void serialice_store_wrapper(uint32_t addr, unsigned int size, uint32_t data); - -void serialice_rdmsr_wrapper(uint32_t addr, uint32_t key, uint32_t *hi, uint32_t *lo); -void serialice_wrmsr_wrapper(uint32_t addr, uint32_t key, uint32_t hi, uint32_t lo); -void serialice_cpuid_wrapper(uint32_t eax, uint32_t ecx, cpuid_regs_t * ret); +typedef struct { + void (*version) (void); + void (*mainboard) (void); + uint32_t (*io_read) (uint16_t port, unsigned int size); + void (*io_write) (uint16_t port, unsigned int size, uint32_t data); + uint32_t (*load) (uint32_t addr, unsigned int size); + void (*store) (uint32_t addr, unsigned int size, uint32_t data); + void (*rdmsr) (uint32_t addr, uint32_t key, uint32_t * hi, uint32_t * lo); + void (*wrmsr) (uint32_t addr, uint32_t key, uint32_t hi, uint32_t lo); + void (*cpuid) (uint32_t eax, uint32_t ecx, cpuid_regs_t * ret); +} SerialICE_target; + +const SerialICE_target *serialice_serial_init(void); +void serialice_serial_exit(void); /* serialice LUA */ int serialice_io_read_filter(uint32_t * data, uint16_t port, int size);

1 0

New patch to review for serialice: 5433e16 SerialICE: Split IO and memory logging
by Kyösti Mälkki 20 Aug '12

20 Aug '12

Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1467 -gerrit commit 5433e1648148ef7504b2efee523288fb1f06c10b Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Sun Aug 19 23:38:01 2012 +0300 SerialICE: Split IO and memory logging Use of the flags parameter looked ugly and obscure to me. Change-Id: I9f79e2bd7e738862be2ff67b925d3ecf549b4d03 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- qemu-0.15.x/serialice-lua.c | 29 +++++++++++++++++++++++++++-- qemu-0.15.x/serialice.c | 18 ++++-------------- qemu-0.15.x/serialice.h | 14 ++++---------- 3 files changed, 35 insertions(+), 26 deletions(-) diff --git a/qemu-0.15.x/serialice-lua.c b/qemu-0.15.x/serialice-lua.c index ba6e01e..638f1d3 100644 --- a/qemu-0.15.x/serialice-lua.c +++ b/qemu-0.15.x/serialice-lua.c @@ -41,6 +41,10 @@ #include "serialice.h" #include "sysemu.h" +#define LOG_IO 1 +#define LOG_MEMORY 2 +#define LOG_TARGET 4 + static lua_State *L; extern const char *serialice_mainboard; @@ -436,7 +440,7 @@ int serialice_cpuid_filter(uint32_t eax, uint32_t ecx, /* SerialICE output loggers */ -void serialice_read_log(int flags, uint32_t data, uint32_t addr, int size) +static void __read_log(int flags, uint32_t data, uint32_t addr, int size) { int result; @@ -459,7 +463,7 @@ void serialice_read_log(int flags, uint32_t data, uint32_t addr, int size) } } -void serialice_write_log(int flags, uint32_t data, uint32_t addr, int size) +static void __write_log(int flags, uint32_t data, uint32_t addr, int size) { int result; @@ -482,6 +486,27 @@ void serialice_write_log(int flags, uint32_t data, uint32_t addr, int size) } } +void serialice_memory_read_log(int caught, uint32_t data, uint32_t addr, int size) +{ + __read_log(LOG_MEMORY | (caught ? LOG_TARGET : 0), data, addr, size); +} + +void serialice_memory_write_log(int caught, uint32_t data, uint32_t addr, int size) +{ + __write_log(LOG_MEMORY | (caught ? LOG_TARGET : 0), data, addr, size); +} + + +void serialice_io_read_log(int caught, uint32_t data, uint32_t addr, int size) +{ + __read_log(LOG_IO | (caught ? LOG_TARGET : 0), data, addr, size); +} + +void serialice_io_write_log(int caught, uint32_t data, uint32_t addr, int size) +{ + __write_log(LOG_IO | (caught ? LOG_TARGET : 0), data, addr, size); +} + void serialice_wrmsr_log(uint32_t addr, uint32_t hi, uint32_t lo, int filtered) { diff --git a/qemu-0.15.x/serialice.c b/qemu-0.15.x/serialice.c index 0e90a0d..74aa9ff 100644 --- a/qemu-0.15.x/serialice.c +++ b/qemu-0.15.x/serialice.c @@ -166,12 +166,7 @@ cpuid_regs_t serialice_cpuid(uint32_t eax, uint32_t ecx) void serialice_log_load(int caught, uint32_t addr, uint32_t result, unsigned int data_size) { - if (caught) { - serialice_read_log(LOG_MEMORY | LOG_TARGET, result, addr, - data_size); - } else { - serialice_read_log(LOG_MEMORY, result, addr, data_size); - } + serialice_memory_read_log(caught, result, addr, data_size); } /* This function can grab Qemu load ops and forward them to the SerialICE @@ -205,12 +200,7 @@ int serialice_handle_load(uint32_t addr, uint32_t * result, static void serialice_log_store(int caught, uint32_t addr, uint32_t val, unsigned int data_size) { - if (caught) { - serialice_write_log(LOG_MEMORY | LOG_TARGET, val, addr, - data_size); - } else { - serialice_write_log(LOG_MEMORY, val, addr, data_size); - } + serialice_memory_write_log(caught, val, addr, data_size); } /* This function can grab Qemu store ops and forward them to the SerialICE @@ -251,7 +241,7 @@ uint32_t serialice_io_read(uint16_t port, unsigned int size) } data = mask_data(data, size); - serialice_read_log(LOG_IO, data, port, size); + serialice_io_read_log(0, data, port, size); return data; } @@ -269,7 +259,7 @@ void serialice_io_write(uint16_t port, unsigned int size, uint32 data) serialice_io_write_wrapper(port, size, data); } - serialice_write_log(LOG_IO, data, port, size); + serialice_io_write_log(0, data, port, size); } // ************************************************************************** diff --git a/qemu-0.15.x/serialice.h b/qemu-0.15.x/serialice.h index c281981..4624deb 100644 --- a/qemu-0.15.x/serialice.h +++ b/qemu-0.15.x/serialice.h @@ -38,14 +38,6 @@ #define WRITE_TO_QEMU (1 << 0) #define WRITE_TO_SERIALICE (1 << 1) -#define LOG_IO 0 -#define LOG_MEMORY 1 -#define LOG_READ 0 -#define LOG_WRITE 2 -// these two are separate -#define LOG_QEMU 4 -#define LOG_TARGET 8 - extern const char *serialice_device; extern int serialice_active; @@ -96,8 +88,10 @@ int serialice_cpuid_filter(uint32_t eax, uint32_t ecx, cpuid_regs_t * regs); int serialice_rdmsr_filter(uint32_t addr, uint32_t * hi, uint32_t * lo); int serialice_wrmsr_filter(uint32_t addr, uint32_t * hi, uint32_t * lo); -void serialice_read_log(int flags, uint32_t data, uint32_t addr, int size); -void serialice_write_log(int flags, uint32_t data, uint32_t addr, int size); +void serialice_io_read_log(int caught, uint32_t data, uint32_t addr, int size); +void serialice_io_write_log(int caught, uint32_t data, uint32_t addr, int size); +void serialice_memory_read_log(int caught, uint32_t data, uint32_t addr, int size); +void serialice_memory_write_log(int caught, uint32_t data, uint32_t addr, int size); void serialice_rdmsr_log(uint32_t addr, uint32_t hi, uint32_t lo, int filtered); void serialice_wrmsr_log(uint32_t addr, uint32_t hi, uint32_t lo, int filtered); void serialice_cpuid_log(uint32_t eax, uint32_t ecx, cpuid_regs_t res, int filtered);

1 0

New patch to review for serialice: 1bbb7f5 SerialICE: Separate read and write loggers for IO and MEM
by Kyösti Mälkki 20 Aug '12

20 Aug '12

Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1466 -gerrit commit 1bbb7f5ad7819dc0a30d1cdb9653fed9bd3d0732 Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Sun Aug 19 13:52:39 2012 +0300 SerialICE: Separate read and write loggers for IO and MEM Use of the flags parameter looked ugly and obscure to me. Change-Id: I1f7fb952a74df19200efd1ec0b216846fc474cdf Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- qemu-0.15.x/serialice-lua.c | 38 ++++++++++++++++++++++++++++---------- qemu-0.15.x/serialice.c | 16 ++++++++-------- qemu-0.15.x/serialice.h | 3 ++- 3 files changed, 38 insertions(+), 19 deletions(-) diff --git a/qemu-0.15.x/serialice-lua.c b/qemu-0.15.x/serialice-lua.c index eecb866..ba6e01e 100644 --- a/qemu-0.15.x/serialice-lua.c +++ b/qemu-0.15.x/serialice-lua.c @@ -436,17 +436,13 @@ int serialice_cpuid_filter(uint32_t eax, uint32_t ecx, /* SerialICE output loggers */ -void serialice_log(int flags, uint32_t data, uint32_t addr, int size) +void serialice_read_log(int flags, uint32_t data, uint32_t addr, int size) { int result; - if ((flags & LOG_WRITE) && (flags & LOG_MEMORY)) { - lua_getglobal(L, "SerialICE_memory_write_log"); - } else if (!(flags & LOG_WRITE) && (flags & LOG_MEMORY)) { + if (flags & LOG_MEMORY) { lua_getglobal(L, "SerialICE_memory_read_log"); - } else if ((flags & LOG_WRITE) && !(flags & LOG_MEMORY)) { - lua_getglobal(L, "SerialICE_io_write_log"); - } else { // if (!(flags & LOG_WRITE) && !(flags & LOG_MEMORY)) + } else { lua_getglobal(L, "SerialICE_io_read_log"); } @@ -457,9 +453,31 @@ void serialice_log(int flags, uint32_t data, uint32_t addr, int size) result = lua_pcall(L, 4, 0, 0); if (result) { - fprintf(stderr, "Failed to run function SerialICE_%s_%s_log: %s\n", - (flags & LOG_MEMORY) ? "memory" : "io", - (flags & LOG_WRITE) ? "write" : "read", lua_tostring(L, -1)); + fprintf(stderr, "Failed to run function SerialICE_%s_read_log: %s\n", + (flags & LOG_MEMORY) ? "memory" : "io", lua_tostring(L, -1)); + exit(1); + } +} + +void serialice_write_log(int flags, uint32_t data, uint32_t addr, int size) +{ + int result; + + if (flags & LOG_MEMORY) { + lua_getglobal(L, "SerialICE_memory_write_log"); + } else { + lua_getglobal(L, "SerialICE_io_write_log"); + } + + lua_pushinteger(L, addr); // addr/port + lua_pushinteger(L, size); // datasize + lua_pushinteger(L, data); // data + lua_pushboolean(L, ((flags & LOG_TARGET) != 0)); + + result = lua_pcall(L, 4, 0, 0); + if (result) { + fprintf(stderr, "Failed to run function SerialICE_%s_write_log: %s\n", + (flags & LOG_MEMORY) ? "memory" : "io", lua_tostring(L, -1)); exit(1); } } diff --git a/qemu-0.15.x/serialice.c b/qemu-0.15.x/serialice.c index 32dc0ca..0e90a0d 100644 --- a/qemu-0.15.x/serialice.c +++ b/qemu-0.15.x/serialice.c @@ -167,10 +167,10 @@ void serialice_log_load(int caught, uint32_t addr, uint32_t result, unsigned int data_size) { if (caught) { - serialice_log(LOG_READ | LOG_MEMORY | LOG_TARGET, result, addr, + serialice_read_log(LOG_MEMORY | LOG_TARGET, result, addr, data_size); } else { - serialice_log(LOG_READ | LOG_MEMORY, result, addr, data_size); + serialice_read_log(LOG_MEMORY, result, addr, data_size); } } @@ -206,10 +206,10 @@ static void serialice_log_store(int caught, uint32_t addr, uint32_t val, unsigned int data_size) { if (caught) { - serialice_log(LOG_WRITE | LOG_MEMORY | LOG_TARGET, val, addr, + serialice_write_log(LOG_MEMORY | LOG_TARGET, val, addr, data_size); } else { - serialice_log(LOG_WRITE | LOG_MEMORY, val, addr, data_size); + serialice_write_log(LOG_MEMORY, val, addr, data_size); } } @@ -247,11 +247,11 @@ uint32_t serialice_io_read(uint16_t port, unsigned int size) filtered = serialice_io_read_filter(&data, port, size); if (!filtered) { - return serialice_io_read_wrapper(port, size); + return serialice_io_read_wrapper(port, size); } data = mask_data(data, size); - serialice_log(LOG_READ | LOG_IO, data, port, size); + serialice_read_log(LOG_IO, data, port, size); return data; } @@ -266,10 +266,10 @@ void serialice_io_write(uint16_t port, unsigned int size, uint32 data) data = mask_data(filtered_data, size); } else { data = mask_data(filtered_data, size); - serialice_io_write_wrapper(port, size, data); + serialice_io_write_wrapper(port, size, data); } - serialice_log(LOG_WRITE | LOG_IO, data, port, size); + serialice_write_log(LOG_IO, data, port, size); } // ************************************************************************** diff --git a/qemu-0.15.x/serialice.h b/qemu-0.15.x/serialice.h index 4a64284..c281981 100644 --- a/qemu-0.15.x/serialice.h +++ b/qemu-0.15.x/serialice.h @@ -96,7 +96,8 @@ int serialice_cpuid_filter(uint32_t eax, uint32_t ecx, cpuid_regs_t * regs); int serialice_rdmsr_filter(uint32_t addr, uint32_t * hi, uint32_t * lo); int serialice_wrmsr_filter(uint32_t addr, uint32_t * hi, uint32_t * lo); -void serialice_log(int flags, uint32_t data, uint32_t addr, int size); +void serialice_read_log(int flags, uint32_t data, uint32_t addr, int size); +void serialice_write_log(int flags, uint32_t data, uint32_t addr, int size); void serialice_rdmsr_log(uint32_t addr, uint32_t hi, uint32_t lo, int filtered); void serialice_wrmsr_log(uint32_t addr, uint32_t hi, uint32_t lo, int filtered); void serialice_cpuid_log(uint32_t eax, uint32_t ecx, cpuid_regs_t res, int filtered);

1 0

New patch to review for serialice: 0acf1bb SerialICE: Separate RDMSR and WRMSR
by Kyösti Mälkki 20 Aug '12

20 Aug '12

Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1465 -gerrit commit 0acf1bbe3acb803f2718a5335e53c6df22b6b180 Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Sun Aug 19 13:27:18 2012 +0300 SerialICE: Separate RDMSR and WRMSR Use of the flags parameter looked ugly and obscure to me. Change-Id: I1da5757187a8a2b808288d5f09466457d10aa8e9 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- qemu-0.15.x/serialice-lua.c | 65 ++++++++++++++++++++++++++++++++------------- qemu-0.15.x/serialice.c | 8 +++--- qemu-0.15.x/serialice.h | 9 +++---- 3 files changed, 55 insertions(+), 27 deletions(-) diff --git a/qemu-0.15.x/serialice-lua.c b/qemu-0.15.x/serialice-lua.c index 417510b..eecb866 100644 --- a/qemu-0.15.x/serialice-lua.c +++ b/qemu-0.15.x/serialice-lua.c @@ -350,26 +350,44 @@ int serialice_memory_write_filter(uint32_t addr, int size, return ret; } - -int serialice_msr_filter(int flags, uint32_t addr, uint32_t * hi, - uint32_t * lo) +int serialice_wrmsr_filter(uint32_t addr, uint32_t * hi, uint32_t * lo) { int ret, result; - if (flags & FILTER_WRITE) { - lua_getglobal(L, "SerialICE_msr_write_filter"); - } else { - lua_getglobal(L, "SerialICE_msr_read_filter"); + lua_getglobal(L, "SerialICE_msr_write_filter"); + lua_pushinteger(L, addr); // port + lua_pushinteger(L, *hi); // high + lua_pushinteger(L, *lo); // low + result = lua_pcall(L, 3, 3, 0); + if (result) { + fprintf(stderr, + "Failed to run function SerialICE_msr_write_filter: %s\n", + lua_tostring(L, -1)); + exit(1); } + ret = lua_toboolean(L, -3); + if (ret) { + *hi = lua_tointeger(L, -1); + *lo = lua_tointeger(L, -2); + } + lua_pop(L, 3); + + return ret; +} + +int serialice_rdmsr_filter(uint32_t addr, uint32_t * hi, uint32_t * lo) +{ + int ret, result; + lua_getglobal(L, "SerialICE_msr_read_filter"); lua_pushinteger(L, addr); // port lua_pushinteger(L, *hi); // high lua_pushinteger(L, *lo); // low result = lua_pcall(L, 3, 3, 0); if (result) { fprintf(stderr, - "Failed to run function SerialICE_msr_%s_filter: %s\n", - (flags & FILTER_WRITE) ? "write" : "read", lua_tostring(L, -1)); + "Failed to run function SerialICE_msr_read_filter: %s\n", + lua_tostring(L, -1)); exit(1); } ret = lua_toboolean(L, -3); @@ -446,25 +464,38 @@ void serialice_log(int flags, uint32_t data, uint32_t addr, int size) } } -void serialice_msr_log(int flags, uint32_t addr, uint32_t hi, +void serialice_wrmsr_log(uint32_t addr, uint32_t hi, uint32_t lo, int filtered) { int result; - if (flags & LOG_WRITE) { - lua_getglobal(L, "SerialICE_msr_write_log"); - } else { // if (!(flags & LOG_WRITE)) - lua_getglobal(L, "SerialICE_msr_read_log"); + lua_getglobal(L, "SerialICE_msr_write_log"); + lua_pushinteger(L, addr); // addr/port + lua_pushinteger(L, hi); // datasize + lua_pushinteger(L, lo); // data + lua_pushboolean(L, filtered); // data + result = lua_pcall(L, 4, 0, 0); + if (result) { + fprintf(stderr, "Failed to run function SerialICE_msr_write_log: %s\n", + lua_tostring(L, -1)); + exit(1); } +} + +void serialice_rdmsr_log(uint32_t addr, uint32_t hi, + uint32_t lo, int filtered) +{ + int result; + lua_getglobal(L, "SerialICE_msr_read_log"); lua_pushinteger(L, addr); // addr/port lua_pushinteger(L, hi); // datasize lua_pushinteger(L, lo); // data lua_pushboolean(L, filtered); // data result = lua_pcall(L, 4, 0, 0); if (result) { - fprintf(stderr, "Failed to run function SerialICE_msr_%s_log: %s\n", - (flags & LOG_WRITE) ? "write" : "read", lua_tostring(L, -1)); + fprintf(stderr, "Failed to run function SerialICE_msr_read_log: %s\n", + lua_tostring(L, -1)); exit(1); } } @@ -490,5 +521,3 @@ void serialice_cpuid_log(uint32_t eax, uint32_t ecx, cpuid_regs_t res, exit(1); } } - - diff --git a/qemu-0.15.x/serialice.c b/qemu-0.15.x/serialice.c index aaf69b0..32dc0ca 100644 --- a/qemu-0.15.x/serialice.c +++ b/qemu-0.15.x/serialice.c @@ -111,7 +111,7 @@ uint64_t serialice_rdmsr(uint32_t addr, uint32_t key) uint64_t ret; int filtered; - filtered = serialice_msr_filter(FILTER_READ, addr, &hi, &lo); + filtered = serialice_rdmsr_filter(addr, &hi, &lo); if (!filtered) { serialice_rdmsr_wrapper(addr, key, &hi, &lo); } @@ -120,7 +120,7 @@ uint64_t serialice_rdmsr(uint32_t addr, uint32_t key) ret <<= 32; ret |= lo; - serialice_msr_log(LOG_READ, addr, hi, lo, filtered); + serialice_rdmsr_log(addr, hi, lo, filtered); return ret; } @@ -133,13 +133,13 @@ void serialice_wrmsr(uint64_t data, uint32_t addr, uint32_t key) hi = (data >> 32); lo = (data & 0xffffffff); - filtered = serialice_msr_filter(FILTER_WRITE, addr, &hi, &lo); + filtered = serialice_wrmsr_filter(addr, &hi, &lo); if (!filtered) { serialice_wrmsr_wrapper(addr, key, hi, lo); } - serialice_msr_log(LOG_WRITE, addr, hi, lo, filtered); + serialice_wrmsr_log(addr, hi, lo, filtered); } cpuid_regs_t serialice_cpuid(uint32_t eax, uint32_t ecx) diff --git a/qemu-0.15.x/serialice.h b/qemu-0.15.x/serialice.h index e9558f8..4a64284 100644 --- a/qemu-0.15.x/serialice.h +++ b/qemu-0.15.x/serialice.h @@ -38,9 +38,6 @@ #define WRITE_TO_QEMU (1 << 0) #define WRITE_TO_SERIALICE (1 << 1) -#define FILTER_READ 0 -#define FILTER_WRITE 1 - #define LOG_IO 0 #define LOG_MEMORY 1 #define LOG_READ 0 @@ -95,11 +92,13 @@ int serialice_io_read_filter(uint32_t * data, uint16_t port, int size); int serialice_io_write_filter(uint32_t * data, uint16_t port, int size); int serialice_memory_read_filter(uint32_t addr, uint32_t * data, int size); int serialice_memory_write_filter(uint32_t addr, int size, uint32_t * data); -int serialice_msr_filter(int flags, uint32_t addr, uint32_t * hi, uint32_t * lo); int serialice_cpuid_filter(uint32_t eax, uint32_t ecx, cpuid_regs_t * regs); +int serialice_rdmsr_filter(uint32_t addr, uint32_t * hi, uint32_t * lo); +int serialice_wrmsr_filter(uint32_t addr, uint32_t * hi, uint32_t * lo); void serialice_log(int flags, uint32_t data, uint32_t addr, int size); -void serialice_msr_log(int flags, uint32_t addr, uint32_t hi, uint32_t lo, int filtered); +void serialice_rdmsr_log(uint32_t addr, uint32_t hi, uint32_t lo, int filtered); +void serialice_wrmsr_log(uint32_t addr, uint32_t hi, uint32_t lo, int filtered); void serialice_cpuid_log(uint32_t eax, uint32_t ecx, cpuid_regs_t res, int filtered); #endif

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SerialICE August 2012