openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-26 22:52:34 +02:00
Code Issues Releases Wiki Activity

serial: Fix sp_flush_incoming for serprog TCP connections

Browse Source 
During the development of an esp32 serprog-compatible SPI programmer,
and implementation of the TCP over Wi-Fi for serprog,
I discovered that sp_flush_incoming() silently fails
if the underlying sp_fd descriptor is a TCP socket.

This patch adds a check for this case - tcflush returns ENOTTY,
meaning tcflush is not supported for not terminal objects,
in this case a fallback serialport_read_nonblock loop is used.

TESTED=esp32-serprog, TCP-over-WiFi mode, ~90% connection attempts fail to synchronize without patch; no synchronization issues with patch applied.

Signed-off-by: Stanislav Ponomarev <me@stasponomarev.com>

Change-Id: I9724a2fcd4a41dede2c15f83877efa6c3b0b7fae
Reviewed-on: https://review.coreboot.org/c/flashrom/+/79112
Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Stanislav Ponomarev 2023-11-17 18:15:07 +04:00 committed by Anastasia Klimchuk
parent abd9a1e9e8
commit bda8361453
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
serial.c
View File

@ -377,10 +377,26 @@ void sp_flush_incoming(void)
#if IS_WINDOWS #if IS_WINDOWS
PurgeComm(sp_fd, PURGE_RXCLEAR); PurgeComm(sp_fd, PURGE_RXCLEAR);
#else #else
/* FIXME: error handling */ if (!tcflush(sp_fd, TCIFLUSH))
tcflush(sp_fd, TCIFLUSH); return;
if (errno == ENOTTY) { // TCP socket case: sp_fd is not a terminal descriptor - tcflush is not supported
unsigned char c;
int ret;
do {
ret = serialport_read_nonblock(&c, 1, 1, NULL);
} while (ret == 0);
// positive error code indicates no data available immediately - similar to EAGAIN/EWOULDBLOCK
// i.e. all buffered data was read
// negative error code indicates a permanent error
if (ret < 0)
msg_perr("Could not flush serial port incoming buffer: read has failed");
} else { // any other errno indicates an unrecoverable sp_fd state
msg_perr_strerror("Could not flush serial port incoming buffer: ");
}
#endif #endif
return;
} }
int serialport_shutdown(void *data) int serialport_shutdown(void *data)