SerialICE April 2016

serialice@serialice.com

1 participants
13 discussions

Patch set updated for serialice: qemu-0.15.x/serialice-com: Implement TCP serialice connection
by Patrick Rudolph 28 Apr '16

28 Apr '16

Patrick Rudolph (siro(a)das-labor.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14512 -gerrit commit 37bf6de3a26fa15303152d0e744847bc59fc1462 Author: Patrick Rudolph <siro(a)das-labor.org> Date: Mon Apr 25 12:26:12 2016 +0200 qemu-0.15.x/serialice-com: Implement TCP serialice connection Add support for TCP connections. Useful to connect to BeagleBone Black in EHCI Debug mode using ser2net daemon. Pass tcp:hostname:port instead of tty device path. Example: ./qemu -M serialice -serialice tcp:10.0.0.1:8888 The windows version hasn't been tested yet. Change-Id: Iee264dfd11375e11c02ea25b6887d32f3db887c5 Signed-off-by: Patrick Rudolph <siro(a)das-labor.org> --- SerialICE/README.QEMU | 7 ++ qemu-0.15.x/serialice-com.c | 177 ++++++++++++++++++++++++++++++++------------ 2 files changed, 138 insertions(+), 46 deletions(-) diff --git a/SerialICE/README.QEMU b/SerialICE/README.QEMU index 3af8c36..b9d2a96 100644 --- a/SerialICE/README.QEMU +++ b/SerialICE/README.QEMU @@ -47,6 +47,13 @@ $ i386-softmmu/qemu -M serialice -serialice \ The device /dev/ttyS0 is the name of the serial device connected to your target machine running the SerialICE shell. +Instead of a local serial device you can connect over TCP to a BeagleBone Black +running a ser2tcp server. +The command to connect to a remote host at 10.0.0.1 port 8080 is: + +$ i386-softmmu/qemu -M serialice -serialice \ + tcp:10.0.0.1:8080 -hda /dev/zero -L ./bios + For debugging hints see the file README.GDB ADAPTING THE CODE diff --git a/qemu-0.15.x/serialice-com.c b/qemu-0.15.x/serialice-com.c index 9211b6f..85172d0 100644 --- a/qemu-0.15.x/serialice-com.c +++ b/qemu-0.15.x/serialice-com.c @@ -34,6 +34,9 @@ #include <fcntl.h> #include <termios.h> #include <sys/ioctl.h> +#include <sys/socket.h> +#include <netinet/in.h> +#include <netdb.h> #endif #include <serialice.h> @@ -47,6 +50,7 @@ typedef struct { #else int fd; #endif + int tcp; char *buffer; char *command; } SerialICEState; @@ -114,6 +118,7 @@ static int serialice_write(SerialICEState * state, const void *buf, char *buffer = (char *)buf; char c; int i; + int err; for (i = 0; i < (int)nbyte; i++) { c = 0; @@ -207,6 +212,10 @@ static int serialice_wait_prompt(void) const SerialICE_target *serialice_serial_init(void) { + int len = 0; + int port = 0; + char *hostname = NULL; + s = mallocz(sizeof(SerialICEState)); if (!s) { @@ -217,69 +226,145 @@ const SerialICE_target *serialice_serial_init(void) printf("You need to specify a serial device to use SerialICE.\n"); exit(1); } + len = strlen(serialice_device); + if (len > 5) { + char *tmp = strstr(serialice_device, "tcp:"); + if (tmp && tmp == serialice_device) { + hostname = mallocz(len - 4 + 1); + /* copy hostname and port */ + memcpy(hostname, tmp + 4, len - 4); + /* search for port */ + tmp = strstr(hostname, ":"); + if (tmp) { + /* cut of port from hostname string */ + *tmp = 0; + /* read port */ + port = atoi(tmp + 1); + s->tcp = !!port; + } + } + } #ifdef WIN32 - s->fd = CreateFile(serialice_device, GENERIC_READ | GENERIC_WRITE, - 0, NULL, OPEN_EXISTING, 0, NULL); + if (s->tcp) { + int ret; + WSADATA wsaData = {0}; + ret = WSAStartup(MAKEWORD(2, 2), &wsaData); + if (ret) { + perror("WSAStartup failed: %d\n", ret); + exit(1); + } - if (s->fd == INVALID_HANDLE_VALUE) { - perror("SerialICE: Could not connect to target TTY"); - exit(1); - } + s->fd = WSASocket(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, 0); + if (s->fd == INVALID_SOCKET) { + perror("SerialICE: Could not create a TCP socket"); + exit(1); + } + } else { + s->fd = CreateFile(serialice_device, GENERIC_READ | GENERIC_WRITE, + 0, NULL, OPEN_EXISTING, 0, NULL); + if (s->fd == INVALID_HANDLE_VALUE) { + perror("SerialICE: Could not connect to target TTY"); + exit(1); + } - DCB dcb; - if (!GetCommState(s->fd, &dcb)) { - perror("SerialICE: Could not load config for target TTY"); - exit(1); - } + DCB dcb; + if (!GetCommState(s->fd, &dcb)) { + perror("SerialICE: Could not load config for target TTY"); + exit(1); + } - dcb.BaudRate = CBR_115200; - dcb.ByteSize = 8; - dcb.Parity = NOPARITY; - dcb.StopBits = ONESTOPBIT; + dcb.BaudRate = CBR_115200; + dcb.ByteSize = 8; + dcb.Parity = NOPARITY; + dcb.StopBits = ONESTOPBIT; - if (!SetCommState(s->fd, &dcb)) { - perror("SerialICE: Could not store config for target TTY"); - exit(1); + if (!SetCommState(s->fd, &dcb)) { + perror("SerialICE: Could not store config for target TTY"); + exit(1); + } } #else - s->fd = open(serialice_device, O_RDWR | O_NOCTTY | O_NONBLOCK); + if (s->tcp) { + struct timeval tv; + s->fd = socket(AF_INET, SOCK_STREAM, 0); + if (s->fd == -1) { + perror("SerialICE: Could not create a TCP socket"); + exit(1); + } - if (s->fd == -1) { - perror("SerialICE: Could not connect to target TTY"); - exit(1); - } + if (fcntl(s->fd, F_SETFL, 0) == -1) { + perror("SerialICE: Could not switch to blocking I/O"); + exit(1); + } - if (ioctl(s->fd, TIOCEXCL) == -1) { - perror("SerialICE: TTY not exclusively available"); - exit(1); - } + tv.tv_sec = 1; /* 1 second timeout */ + tv.tv_usec = 0; + setsockopt(s->fd, SOL_SOCKET, SO_RCVTIMEO, (char *)&tv, sizeof(struct timeval)); + } else { + s->fd = open(serialice_device, O_RDWR | O_NOCTTY | O_NONBLOCK); + if (s->fd == -1) { + perror("SerialICE: Could not connect to target TTY"); + exit(1); + } - if (fcntl(s->fd, F_SETFL, 0) == -1) { - perror("SerialICE: Could not switch to blocking I/O"); - exit(1); - } + if (ioctl(s->fd, TIOCEXCL) == -1) { + perror("SerialICE: TTY not exclusively available"); + exit(1); + } - if (tcgetattr(s->fd, &options) == -1) { - perror("SerialICE: Could not get TTY attributes"); - exit(1); - } + if (fcntl(s->fd, F_SETFL, 0) == -1) { + perror("SerialICE: Could not switch to blocking I/O"); + exit(1); + } - cfsetispeed(&options, B115200); - cfsetospeed(&options, B115200); + if (tcgetattr(s->fd, &options) == -1) { + perror("SerialICE: Could not get TTY attributes"); + exit(1); + } + + cfsetispeed(&options, B115200); + cfsetospeed(&options, B115200); - /* set raw input, 1 second timeout */ - options.c_cflag |= (CLOCAL | CREAD); - options.c_lflag &= ~(ICANON | ECHO | ECHOE | ISIG); - options.c_oflag &= ~OPOST; - options.c_iflag |= IGNCR; - options.c_cc[VMIN] = 0; - options.c_cc[VTIME] = 100; + /* set raw input, 1 second timeout */ + options.c_cflag |= (CLOCAL | CREAD); + options.c_lflag &= ~(ICANON | ECHO | ECHOE | ISIG); + options.c_oflag &= ~OPOST; + options.c_iflag |= IGNCR; + options.c_cc[VMIN] = 0; + options.c_cc[VTIME] = 100; - tcsetattr(s->fd, TCSANOW, &options); + tcsetattr(s->fd, TCSANOW, &options); - tcflush(s->fd, TCIOFLUSH); + tcflush(s->fd, TCIOFLUSH); + } #endif + if (s->tcp) { + struct hostent *server; + struct sockaddr_in serv_addr; + + server = gethostbyname(hostname); + if (server == NULL) { + perror("No such host.\n"); + exit(1); + } + + bzero((char *) &serv_addr, sizeof(serv_addr)); + serv_addr.sin_family = AF_INET; + bcopy((char *)server->h_addr, + (char *)&serv_addr.sin_addr.s_addr, + server->h_length); + serv_addr.sin_port = htons(port); + + printf("Connecting to tcp://%s:%d ...\n", hostname, port); + + if (connect(s->fd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) < 0) { + perror("ERROR connecting"); + exit(1); + } + printf("Connected to tcp://%s:%d .\n", hostname, port); + } + s->buffer = mallocz(BUFFER_SIZE); s->command = mallocz(BUFFER_SIZE); if (!s->buffer || !s->command) {

1 0

Patch set updated for serialice: serialice-lua: Don't hardcode rom_size
by Patrick Rudolph 28 Apr '16

28 Apr '16

Patrick Rudolph (siro(a)das-labor.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14513 -gerrit commit 88648a02736d136a99b71acd88a2c7c07b746a87 Author: Patrick Rudolph <siro(a)das-labor.org> Date: Mon Apr 25 17:16:13 2016 +0200 serialice-lua: Don't hardcode rom_size Read bios filesize and use it instead of hardcoding it to 4MiB. Change-Id: I0f7aa9e9ba5e2368d93dda59fb9ce6e9e470dc0c Signed-off-by: Patrick Rudolph <siro(a)das-labor.org> --- SerialICE/simba/replay.lua | 19 +++++++++++++++---- SerialICE/simba/user_env.lua | 4 ---- qemu-0.15.x/serialice-lua.c | 11 ++++++++++- qemu-0.15.x/serialice.c | 10 ++++++---- qemu-0.15.x/serialice.h | 2 +- 5 files changed, 32 insertions(+), 14 deletions(-) diff --git a/SerialICE/simba/replay.lua b/SerialICE/simba/replay.lua index e7a2868..7f3ac57 100644 --- a/SerialICE/simba/replay.lua +++ b/SerialICE/simba/replay.lua @@ -8,6 +8,8 @@ function SerialICE_system_reset() end SerialICE_mainboard = "undetected" +rom_size = 0 +rom_base = 0 regs = { eax, ebc, ecx, edx, cs=0, eip=0, ds, es, ss, gs, fs, } ids = { parent, this, flags} @@ -169,15 +171,24 @@ end function parse_headers() while true do - local found = false + local found_mb = false + local found_rom = false line = io.read("*line") - if not found then + if not found_mb then local board - found, _, board = string.find(line, "SerialICE: Mainboard...:%s+(.+)") - if found then + found_mb, _, board = string.find(line, "SerialICE: Mainboard...:%s+(.+)") + if found_mb then SerialICE_mainboard = board end end + if not found_rom then + local romsize + found_rom, _, romsize = string.find(line, "SerialICE: ROM size:%s+(.+)") + if found_rom then + rom_size = tonumber(romsize, 16) + rom_base = 0x100000000 - tonumber(romsize, 16) + end + end if string.find(line, "LUA script initialized.") then return end diff --git a/SerialICE/simba/user_env.lua b/SerialICE/simba/user_env.lua index ff9f64d..51da977 100644 --- a/SerialICE/simba/user_env.lua +++ b/SerialICE/simba/user_env.lua @@ -25,10 +25,6 @@ cache_nvram = false -- SMSC 0x07, Winbond 0x06 ? DEFAULT_SUPERIO_LDN_REGISTER = 0x07 --- FIXME: Use bios file image size here. -rom_size = 4 * 1024 * 1024 -rom_base = 0x100000000 - rom_size - -- We refrain from backing up most of memory in Qemu because Qemu would -- need lots of ram on the host and firmware usually does not intensively -- use high memory anyways. diff --git a/qemu-0.15.x/serialice-lua.c b/qemu-0.15.x/serialice-lua.c index f6c4c31..883690b 100644 --- a/qemu-0.15.x/serialice-lua.c +++ b/qemu-0.15.x/serialice-lua.c @@ -193,11 +193,12 @@ static int serialice_lua_registers(void) return 0; } -const SerialICE_filter * serialice_lua_init(const char *serialice_lua_script) +const SerialICE_filter * serialice_lua_init(const char *serialice_lua_script, int bios_size) { int status; printf("SerialICE: LUA init...\n"); + printf("SerialICE: ROM size: %x\n", bios_size); /* Create a LUA context and load LUA libraries */ L = luaL_newstate(); @@ -207,6 +208,14 @@ const SerialICE_filter * serialice_lua_init(const char *serialice_lua_script) lua_register(L, "SerialICE_register_physical", serialice_register_physical); lua_register(L, "SerialICE_system_reset", serialice_system_reset); + /* Set global variable rom_size */ + lua_pushinteger(L, bios_size); + lua_setglobal(L, "rom_size"); + + /* Set global variable rom_base */ + lua_pushinteger(L, 0x100000000ULL - bios_size); + lua_setglobal(L, "rom_base"); + /* Set global variable SerialICE_mainboard */ lua_pushstring(L, serialice_mainboard); lua_setglobal(L, "SerialICE_mainboard"); diff --git a/qemu-0.15.x/serialice.c b/qemu-0.15.x/serialice.c index 793951f..9062ca1 100644 --- a/qemu-0.15.x/serialice.c +++ b/qemu-0.15.x/serialice.c @@ -193,7 +193,7 @@ void serialice_io_write(uint16_t port, unsigned int size, uint32 data) // ************************************************************************** // initialization and exit -static void serialice_init(void) +static void serialice_init(int bios_size) { dumb_screen(); @@ -203,7 +203,7 @@ static void serialice_init(void) target->mainboard(); printf("SerialICE: LUA init...\n"); - filter = serialice_lua_init(SERIALICE_LUA_SCRIPT); + filter = serialice_lua_init(SERIALICE_LUA_SCRIPT, bios_size); /* Let the rest of Qemu know we're alive */ serialice_active = 1; @@ -254,8 +254,6 @@ static void pc_init_serialice(ram_addr_t ram_size, qemu_register_reset((QEMUResetHandler *) cpu_reset, env); } - /* Must not happen before CPUs are initialized */ - serialice_init(); /* BIOS load */ if (bios_name == NULL) @@ -269,6 +267,10 @@ static void pc_init_serialice(ram_addr_t ram_size, if (bios_size <= 0 || (bios_size % 65536) != 0) { goto bios_error; } + + /* Must not happen before CPUs are initialized */ + serialice_init(bios_size); + bios_offset = qemu_ram_alloc(NULL, "serialice_bios", bios_size); ret = load_image(filename, qemu_get_ram_ptr(bios_offset)); if (ret != bios_size) { diff --git a/qemu-0.15.x/serialice.h b/qemu-0.15.x/serialice.h index 23e3af6..7ff932f 100644 --- a/qemu-0.15.x/serialice.h +++ b/qemu-0.15.x/serialice.h @@ -96,7 +96,7 @@ typedef struct { void (*cpuid_post) (cpuid_regs_t * res); } SerialICE_filter; -const SerialICE_filter *serialice_lua_init(const char *serialice_lua_script); +const SerialICE_filter *serialice_lua_init(const char *serialice_lua_script, int bios_size); void serialice_lua_exit(void); const char *serialice_lua_execute(const char *cmd);

1 0

Patch set updated for serialice: qemu-0.15.x/serialice-com: Error on memory allocation failure
by Patrick Rudolph 28 Apr '16

28 Apr '16

Patrick Rudolph (siro(a)das-labor.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14511 -gerrit commit df9588057effcaa676dc2e803eceaa6f3ee6c964 Author: Patrick Rudolph <siro(a)das-labor.org> Date: Mon Apr 25 12:25:30 2016 +0200 qemu-0.15.x/serialice-com: Error on memory allocation failure Exit on memory allocation error. Change-Id: Ia72b12e974f84d157fcb64fd5c223d848b31521a Signed-off-by: Patrick Rudolph <siro(a)das-labor.org> --- qemu-0.15.x/serialice-com.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/qemu-0.15.x/serialice-com.c b/qemu-0.15.x/serialice-com.c index 2e59094..9211b6f 100644 --- a/qemu-0.15.x/serialice-com.c +++ b/qemu-0.15.x/serialice-com.c @@ -209,6 +209,10 @@ const SerialICE_target *serialice_serial_init(void) { s = mallocz(sizeof(SerialICEState)); + if (!s) { + printf("Out of memory.\n"); + exit(1); + } if (serialice_device == NULL) { printf("You need to specify a serial device to use SerialICE.\n"); exit(1); @@ -278,7 +282,10 @@ const SerialICE_target *serialice_serial_init(void) s->buffer = mallocz(BUFFER_SIZE); s->command = mallocz(BUFFER_SIZE); - + if (!s->buffer || !s->command) { + printf("Out of memory.\n"); + exit(1); + } printf("SerialICE: Waiting for handshake with target... "); handshake_mode = 1; // Readback errors are to be expected in this phase.

1 0

Patch set updated for serialice: qemu-0.15.x/serialice-com: Fix parsing of version string
by Patrick Rudolph 28 Apr '16

28 Apr '16

Patrick Rudolph (siro(a)das-labor.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14510 -gerrit commit 7618a741867826c664c46fb1d1405b54bf5184c5 Author: Patrick Rudolph <siro(a)das-labor.org> Date: Mon Apr 25 12:24:03 2016 +0200 qemu-0.15.x/serialice-com: Fix parsing of version string Check buffer contents after writing to it. Fixes version string wasn't parsed at all, as it starts with \r\n. Change-Id: Ia012434b3806f936971c8f9e99ed198f85171111 Signed-off-by: Patrick Rudolph <siro(a)das-labor.org> --- qemu-0.15.x/serialice-com.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qemu-0.15.x/serialice-com.c b/qemu-0.15.x/serialice-com.c index 1373f57..2e59094 100644 --- a/qemu-0.15.x/serialice-com.c +++ b/qemu-0.15.x/serialice-com.c @@ -360,9 +360,9 @@ static void msg_version(void) memset(s->buffer, 0, BUFFER_SIZE); serialice_read(s, s->buffer, 1); serialice_read(s, s->buffer, 1); - while (s->buffer[len++] != '\n') { + do { serialice_read(s, s->buffer + len, 1); - } + } while (s->buffer[len++] != '\n'); s->buffer[len - 1] = '\0'; printf("%s\n", s->buffer);

1 0

Patch set updated for serialice: qemu-0.15.x/serialice-com: Add ECHO_MODE define
by Patrick Rudolph 28 Apr '16

28 Apr '16

Patrick Rudolph (siro(a)das-labor.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14509 -gerrit commit 002002586c65945a6863f9305a309424bd583b5f Author: Patrick Rudolph <siro(a)das-labor.org> Date: Mon Apr 25 12:21:03 2016 +0200 qemu-0.15.x/serialice-com: Add ECHO_MODE define The serialice console has this define too. Make sure not to wait for remote echo if it never sends an echo character. Fixes a problem where qemu is waiting forever to receive an echo character. Change-Id: I8d8fce350c63b3e38ee02589cd1564aea95e50bd Signed-off-by: Patrick Rudolph <siro(a)das-labor.org> --- qemu-0.15.x/serialice-com.c | 51 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 47 insertions(+), 4 deletions(-) diff --git a/qemu-0.15.x/serialice-com.c b/qemu-0.15.x/serialice-com.c index c9a8e8b..1373f57 100644 --- a/qemu-0.15.x/serialice-com.c +++ b/qemu-0.15.x/serialice-com.c @@ -107,6 +107,7 @@ static int serialice_read(SerialICEState * state, void *buf, size_t nbyte) return bytes_read; } +#ifdef ECHO_MODE static int serialice_write(SerialICEState * state, const void *buf, size_t nbyte) { @@ -115,6 +116,7 @@ static int serialice_write(SerialICEState * state, const void *buf, int i; for (i = 0; i < (int)nbyte; i++) { + c = 0; #ifdef WIN32 int ret = 0; if (!WriteFile(state->fd, buffer + i, 1, &ret, NULL)) @@ -124,10 +126,22 @@ static int serialice_write(SerialICEState * state, const void *buf, if (!ReadFile(state->fd, &c, 1, &ret, NULL)) return -1; #else - if (write(state->fd, buffer + i, 1) != 1) - return -1; - if (read(state->fd, &c, 1) != 1) - return -1; + while ((ret = write(state->fd, buffer + i, 1)) != 1) { + if (ret == -1 && errno == EINTR) + continue; + + if (ret == -1) { + return -1; + } + } + while ((ret = read(state->fd, &c, 1)) != 1) { + if (ret == -1 && errno == EINTR) + continue; + + if (ret == -1) { + return -1; + } + } #endif if (c != buffer[i] && !handshake_mode) { printf("Readback error! %x/%x\n", c, buffer[i]); @@ -136,6 +150,35 @@ static int serialice_write(SerialICEState * state, const void *buf, return nbyte; } +#else +static int serialice_write(SerialICEState * state, const void *buf, + size_t nbyte) +{ + char *buffer = (char *)buf; + int ret = 0; + int bytes_written = 0; + + while (bytes_written < nbyte) { +#ifdef WIN32 + ret = 0; + if (!WriteFile(state->fd, buffer, nbyte - bytes_written, &ret, NULL)) + return -1; +#else + ret = write(state->fd, buffer, nbyte - bytes_written); + if (ret == -1 && errno == EINTR) + continue; + if (ret == -1) + return -1; +#endif + if (ret > 0) { + bytes_written += ret; + buffer += ret; + } + } + + return nbyte; +} +#endif static int serialice_wait_prompt(void) {

1 0

Patch set updated for serialice: qemu-0.15.x/serialice-com: Return I/O errors
by Patrick Rudolph 28 Apr '16

28 Apr '16

Patrick Rudolph (siro(a)das-labor.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14508 -gerrit commit b7996cdb2291af87a0b72de3a13afb924e152a67 Author: Patrick Rudolph <siro(a)das-labor.org> Date: Mon Apr 25 12:19:39 2016 +0200 qemu-0.15.x/serialice-com: Return I/O errors Return I/O erros to calling function. Return -1 in serialice_write and serialice_read. Change-Id: I168093eaad897f2998c055e46acd88fe6a263947 Signed-off-by: Patrick Rudolph <siro(a)das-labor.org> --- qemu-0.15.x/serialice-com.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/qemu-0.15.x/serialice-com.c b/qemu-0.15.x/serialice-com.c index ee539f4..c9a8e8b 100644 --- a/qemu-0.15.x/serialice-com.c +++ b/qemu-0.15.x/serialice-com.c @@ -79,7 +79,8 @@ static int serialice_read(SerialICEState * state, void *buf, size_t nbyte) while (1) { #ifdef WIN32 int ret = 0; - ReadFile(state->fd, buf, nbyte - bytes_read, &ret, NULL); + if (!ReadFile(state->fd, buf, nbyte - bytes_read, &ret, NULL)) + return -1; if (!ret) { break; } @@ -91,7 +92,7 @@ static int serialice_read(SerialICEState * state, void *buf, size_t nbyte) } if (ret == -1) { - break; + return -1; } #endif @@ -116,16 +117,17 @@ static int serialice_write(SerialICEState * state, const void *buf, for (i = 0; i < (int)nbyte; i++) { #ifdef WIN32 int ret = 0; - while (ret == 0) { - WriteFile(state->fd, buffer + i, 1, &ret, NULL); - } + if (!WriteFile(state->fd, buffer + i, 1, &ret, NULL)) + return -1; + ret = 0; - while (ret == 0) { - ReadFile(state->fd, &c, 1, &ret, NULL); - } + if (!ReadFile(state->fd, &c, 1, &ret, NULL)) + return -1; #else - while (write(state->fd, buffer + i, 1) != 1) ; - while (read(state->fd, &c, 1) != 1) ; + if (write(state->fd, buffer + i, 1) != 1) + return -1; + if (read(state->fd, &c, 1) != 1) + return -1; #endif if (c != buffer[i] && !handshake_mode) { printf("Readback error! %x/%x\n", c, buffer[i]);

1 0

New patch to review for serialice: serialice-lua: Don't hardcode rom_size
by Patrick Rudolph 25 Apr '16

25 Apr '16

Patrick Rudolph (siro(a)das-labor.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14513 -gerrit commit 97fbfa0298108a5fcb326de89b7070b2a9683287 Author: Patrick Rudolph <siro(a)das-labor.org> Date: Mon Apr 25 17:16:13 2016 +0200 serialice-lua: Don't hardcode rom_size Read bios filesize and use it instead of hardcoding it to 4MiB. Change-Id: I0f7aa9e9ba5e2368d93dda59fb9ce6e9e470dc0c Signed-off-by: Patrick Rudolph <siro(a)das-labor.org> --- SerialICE/simba/user_env.lua | 4 ---- qemu-0.15.x/serialice-lua.c | 10 +++++++++- qemu-0.15.x/serialice.c | 10 ++++++---- qemu-0.15.x/serialice.h | 2 +- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/SerialICE/simba/user_env.lua b/SerialICE/simba/user_env.lua index ff9f64d..51da977 100644 --- a/SerialICE/simba/user_env.lua +++ b/SerialICE/simba/user_env.lua @@ -25,10 +25,6 @@ cache_nvram = false -- SMSC 0x07, Winbond 0x06 ? DEFAULT_SUPERIO_LDN_REGISTER = 0x07 --- FIXME: Use bios file image size here. -rom_size = 4 * 1024 * 1024 -rom_base = 0x100000000 - rom_size - -- We refrain from backing up most of memory in Qemu because Qemu would -- need lots of ram on the host and firmware usually does not intensively -- use high memory anyways. diff --git a/qemu-0.15.x/serialice-lua.c b/qemu-0.15.x/serialice-lua.c index f6c4c31..58c74cd 100644 --- a/qemu-0.15.x/serialice-lua.c +++ b/qemu-0.15.x/serialice-lua.c @@ -193,7 +193,7 @@ static int serialice_lua_registers(void) return 0; } -const SerialICE_filter * serialice_lua_init(const char *serialice_lua_script) +const SerialICE_filter * serialice_lua_init(const char *serialice_lua_script, int bios_size) { int status; @@ -207,6 +207,14 @@ const SerialICE_filter * serialice_lua_init(const char *serialice_lua_script) lua_register(L, "SerialICE_register_physical", serialice_register_physical); lua_register(L, "SerialICE_system_reset", serialice_system_reset); + /* Set global variable rom_size */ + lua_pushinteger(L, bios_size); + lua_setglobal(L, "rom_size"); + + /* Set global variable rom_base */ + lua_pushinteger(L, 0x100000000ULL - bios_size); + lua_setglobal(L, "rom_base"); + /* Set global variable SerialICE_mainboard */ lua_pushstring(L, serialice_mainboard); lua_setglobal(L, "SerialICE_mainboard"); diff --git a/qemu-0.15.x/serialice.c b/qemu-0.15.x/serialice.c index 793951f..9062ca1 100644 --- a/qemu-0.15.x/serialice.c +++ b/qemu-0.15.x/serialice.c @@ -193,7 +193,7 @@ void serialice_io_write(uint16_t port, unsigned int size, uint32 data) // ************************************************************************** // initialization and exit -static void serialice_init(void) +static void serialice_init(int bios_size) { dumb_screen(); @@ -203,7 +203,7 @@ static void serialice_init(void) target->mainboard(); printf("SerialICE: LUA init...\n"); - filter = serialice_lua_init(SERIALICE_LUA_SCRIPT); + filter = serialice_lua_init(SERIALICE_LUA_SCRIPT, bios_size); /* Let the rest of Qemu know we're alive */ serialice_active = 1; @@ -254,8 +254,6 @@ static void pc_init_serialice(ram_addr_t ram_size, qemu_register_reset((QEMUResetHandler *) cpu_reset, env); } - /* Must not happen before CPUs are initialized */ - serialice_init(); /* BIOS load */ if (bios_name == NULL) @@ -269,6 +267,10 @@ static void pc_init_serialice(ram_addr_t ram_size, if (bios_size <= 0 || (bios_size % 65536) != 0) { goto bios_error; } + + /* Must not happen before CPUs are initialized */ + serialice_init(bios_size); + bios_offset = qemu_ram_alloc(NULL, "serialice_bios", bios_size); ret = load_image(filename, qemu_get_ram_ptr(bios_offset)); if (ret != bios_size) { diff --git a/qemu-0.15.x/serialice.h b/qemu-0.15.x/serialice.h index 23e3af6..7ff932f 100644 --- a/qemu-0.15.x/serialice.h +++ b/qemu-0.15.x/serialice.h @@ -96,7 +96,7 @@ typedef struct { void (*cpuid_post) (cpuid_regs_t * res); } SerialICE_filter; -const SerialICE_filter *serialice_lua_init(const char *serialice_lua_script); +const SerialICE_filter *serialice_lua_init(const char *serialice_lua_script, int bios_size); void serialice_lua_exit(void); const char *serialice_lua_execute(const char *cmd);

1 0

New patch to review for serialice: qemu-0.15.x/serialice-com: Implement TCP serialice connection
by Patrick Rudolph 25 Apr '16

25 Apr '16

Patrick Rudolph (siro(a)das-labor.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14512 -gerrit commit f4ac7545c289c59c307e297258bfc56db8585930 Author: Patrick Rudolph <siro(a)das-labor.org> Date: Mon Apr 25 12:26:12 2016 +0200 qemu-0.15.x/serialice-com: Implement TCP serialice connection Pass tcp:hostname:port instead of tty device path. Example: ./qemu -M serialice -serialice tcp:10.1.0.1:8888 Connects to the target using TCP socket (unix only). Useful to connect to BeagleBone Black in EHCI Debug mode using ser2net daemon on port 8888. Change-Id: Iee264dfd11375e11c02ea25b6887d32f3db887c5 Signed-off-by: Patrick Rudolph <siro(a)das-labor.org> --- qemu-0.15.x/serialice-com.c | 128 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 100 insertions(+), 28 deletions(-) diff --git a/qemu-0.15.x/serialice-com.c b/qemu-0.15.x/serialice-com.c index 25ccaf5..1fa95c2 100644 --- a/qemu-0.15.x/serialice-com.c +++ b/qemu-0.15.x/serialice-com.c @@ -34,6 +34,9 @@ #include <fcntl.h> #include <termios.h> #include <sys/ioctl.h> +#include <sys/socket.h> +#include <netinet/in.h> +#include <netdb.h> #endif #include <serialice.h> @@ -47,6 +50,7 @@ typedef struct { #else int fd; #endif + int tcp; char *buffer; char *command; } SerialICEState; @@ -113,6 +117,7 @@ static int serialice_write(SerialICEState * state, const void *buf, char *buffer = (char *)buf; char c; int i; + int err; for (i = 0; i < (int)nbyte; i++) { #ifdef WIN32 @@ -125,8 +130,14 @@ static int serialice_write(SerialICEState * state, const void *buf, ReadFile(state->fd, &c, 1, &ret, NULL); } #else - while (write(state->fd, buffer + i, 1) != 1) ; - while (read(state->fd, &c, 1) != 1) ; + while ((err = write(state->fd, buffer + i, 1)) != 1) { + if (err == -1) + return -1; + } + while ((err = read(state->fd, &c, 1)) != 1) { + if (err == -1) + return -1; + } #endif if (c != buffer[i] && !handshake_mode) { printf("Readback error! %x/%x\n", c, buffer[i]); @@ -193,6 +204,10 @@ static int serialice_wait_prompt(void) const SerialICE_target *serialice_serial_init(void) { + int len = 0; + int port = 0; + char *hostname = NULL; + s = mallocz(sizeof(SerialICEState)); if (!s) { @@ -203,6 +218,24 @@ const SerialICE_target *serialice_serial_init(void) printf("You need to specify a serial device to use SerialICE.\n"); exit(1); } + len = strlen(serialice_device); + if (len > 5) { + char *tmp = strstr(serialice_device, "tcp:"); + if (tmp) { + hostname = mallocz(len - 4 + 1); + /* copy hostname and port */ + memcpy(hostname, tmp + 4, len - 4); + /* search for port */ + tmp = strstr(hostname, ":"); + if (tmp) { + /* cut of port */ + *tmp = 0; + /* read port */ + port = atoi(tmp + 1); + s->tcp = !!port; + } + } + } #ifdef WIN32 s->fd = CreateFile(serialice_device, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); @@ -228,44 +261,83 @@ const SerialICE_target *serialice_serial_init(void) exit(1); } #else - s->fd = open(serialice_device, O_RDWR | O_NOCTTY | O_NONBLOCK); - + if (s->tcp) { + s->fd = socket(AF_INET, SOCK_STREAM, 0); + } else { + s->fd = open(serialice_device, O_RDWR | O_NOCTTY | O_NONBLOCK); + } if (s->fd == -1) { perror("SerialICE: Could not connect to target TTY"); exit(1); } - if (ioctl(s->fd, TIOCEXCL) == -1) { - perror("SerialICE: TTY not exclusively available"); - exit(1); - } + if (s->tcp) { + struct timeval tv; + struct hostent *server; + struct sockaddr_in serv_addr; - if (fcntl(s->fd, F_SETFL, 0) == -1) { - perror("SerialICE: Could not switch to blocking I/O"); - exit(1); - } + server = gethostbyname(hostname); + if (server == NULL) { + perror("No such host.\n"); + exit(1); + } - if (tcgetattr(s->fd, &options) == -1) { - perror("SerialICE: Could not get TTY attributes"); - exit(1); - } + bzero((char *) &serv_addr, sizeof(serv_addr)); + serv_addr.sin_family = AF_INET; + bcopy((char *)server->h_addr, + (char *)&serv_addr.sin_addr.s_addr, + server->h_length); + serv_addr.sin_port = htons(port); - cfsetispeed(&options, B115200); - cfsetospeed(&options, B115200); + printf("Connecting to tcp://%s:%d ...\n", hostname, port); - /* set raw input, 1 second timeout */ - options.c_cflag |= (CLOCAL | CREAD); - options.c_lflag &= ~(ICANON | ECHO | ECHOE | ISIG); - options.c_oflag &= ~OPOST; - options.c_iflag |= IGNCR; - options.c_cc[VMIN] = 0; - options.c_cc[VTIME] = 100; + if (connect(s->fd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) < 0) { + perror("ERROR connecting"); + exit(1); + } + printf("Connected to tcp://%s:%d .\n", hostname, port); - tcsetattr(s->fd, TCSANOW, &options); + if (fcntl(s->fd, F_SETFL, 0) == -1) { + perror("SerialICE: Could not switch to blocking I/O"); + exit(1); + } - tcflush(s->fd, TCIOFLUSH); -#endif + tv.tv_sec = 3; /* 1 Secs Timeout */ + tv.tv_usec = 0; + + setsockopt(s->fd, SOL_SOCKET, SO_RCVTIMEO, (char *)&tv, sizeof(struct timeval)); + } else { + if (ioctl(s->fd, TIOCEXCL) == -1) { + perror("SerialICE: TTY not exclusively available"); + exit(1); + } + + if (fcntl(s->fd, F_SETFL, 0) == -1) { + perror("SerialICE: Could not switch to blocking I/O"); + exit(1); + } + + if (tcgetattr(s->fd, &options) == -1) { + perror("SerialICE: Could not get TTY attributes"); + exit(1); + } + + cfsetispeed(&options, B115200); + cfsetospeed(&options, B115200); + /* set raw input, 1 second timeout */ + options.c_cflag |= (CLOCAL | CREAD); + options.c_lflag &= ~(ICANON | ECHO | ECHOE | ISIG); + options.c_oflag &= ~OPOST; + options.c_iflag |= IGNCR; + options.c_cc[VMIN] = 0; + options.c_cc[VTIME] = 100; + + tcsetattr(s->fd, TCSANOW, &options); + + tcflush(s->fd, TCIOFLUSH); + } +#endif s->buffer = mallocz(BUFFER_SIZE); s->command = mallocz(BUFFER_SIZE); if (!s->buffer || !s->command) {

1 0

New patch to review for serialice: qemu-0.15.x/serialice-com: Error on memory allocation failure
by Patrick Rudolph 25 Apr '16

25 Apr '16

Patrick Rudolph (siro(a)das-labor.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14511 -gerrit commit 1a14a31123ce6a2e76cd803fc7a5bc3e12370431 Author: Patrick Rudolph <siro(a)das-labor.org> Date: Mon Apr 25 12:25:30 2016 +0200 qemu-0.15.x/serialice-com: Error on memory allocation failure Exit on memory allocation error. Change-Id: Ia72b12e974f84d157fcb64fd5c223d848b31521a Signed-off-by: Patrick Rudolph <siro(a)das-labor.org> --- qemu-0.15.x/serialice-com.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/qemu-0.15.x/serialice-com.c b/qemu-0.15.x/serialice-com.c index cb3794c..25ccaf5 100644 --- a/qemu-0.15.x/serialice-com.c +++ b/qemu-0.15.x/serialice-com.c @@ -195,6 +195,10 @@ const SerialICE_target *serialice_serial_init(void) { s = mallocz(sizeof(SerialICEState)); + if (!s) { + printf("Out of memory.\n"); + exit(1); + } if (serialice_device == NULL) { printf("You need to specify a serial device to use SerialICE.\n"); exit(1); @@ -264,7 +268,10 @@ const SerialICE_target *serialice_serial_init(void) s->buffer = mallocz(BUFFER_SIZE); s->command = mallocz(BUFFER_SIZE); - + if (!s->buffer || !s->command) { + printf("Out of memory.\n"); + exit(1); + } printf("SerialICE: Waiting for handshake with target... "); handshake_mode = 1; // Readback errors are to be expected in this phase.

1 0

New patch to review for serialice: qemu-0.15.x/serialice-com: Fix parsing of version string
by Patrick Rudolph 25 Apr '16

25 Apr '16

Patrick Rudolph (siro(a)das-labor.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14510 -gerrit commit 9f9e54237af11e1f96c9737200f1627508fbf170 Author: Patrick Rudolph <siro(a)das-labor.org> Date: Mon Apr 25 12:24:03 2016 +0200 qemu-0.15.x/serialice-com: Fix parsing of version string Check buffer contents after writing to it. Fixes version string wasn't parsed at all, as it starts with \r\n. Change-Id: Ia012434b3806f936971c8f9e99ed198f85171111 Signed-off-by: Patrick Rudolph <siro(a)das-labor.org> --- qemu-0.15.x/serialice-com.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qemu-0.15.x/serialice-com.c b/qemu-0.15.x/serialice-com.c index 54f293b..cb3794c 100644 --- a/qemu-0.15.x/serialice-com.c +++ b/qemu-0.15.x/serialice-com.c @@ -346,9 +346,9 @@ static void msg_version(void) memset(s->buffer, 0, BUFFER_SIZE); serialice_read(s, s->buffer, 1); serialice_read(s, s->buffer, 1); - while (s->buffer[len++] != '\n') { + do { serialice_read(s, s->buffer + len, 1); - } + } while (s->buffer[len++] != '\n'); s->buffer[len - 1] = '\0'; printf("%s\n", s->buffer);

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SerialICE April 2016