mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-09-27 16:51:34 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

tools: kwboot: Check for return value of kwboot_tty_send() and tcflush()

Browse Source 
Failure of kwboot_tty_send() and tcflush() functions is fatal, it does not
make sense to continue. So return error back to the caller like in other
places where are called these functions.

Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Stefan Roese <sr@denx.de>
Tested-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Pali Rohár 2022-03-02 11:49:18 +01:00 committed by Stefan Roese
parent 0a6f0297c6
commit d8865f8677
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tools/kwboot.c
View File

@ -740,10 +740,8 @@ kwboot_bootmsg(int tty, void *msg)
for (count = 0; count < 128; count++) { for (count = 0; count < 128; count++) {
rc = kwboot_tty_send(tty, msg, 8, 0); rc = kwboot_tty_send(tty, msg, 8, 0);
if (rc) { if (rc)
usleep(msg_req_delay * 1000); break;
continue;
}
} }
rc = kwboot_tty_recv(tty, &c, 1, msg_rsp_timeo); rc = kwboot_tty_recv(tty, &c, 1, msg_rsp_timeo);
@ -772,11 +770,19 @@ kwboot_bootmsg(int tty, void *msg)
*/ */
/* flush output queue with remaining boot message patterns */ /* flush output queue with remaining boot message patterns */
tcflush(tty, TCOFLUSH); rc = tcflush(tty, TCOFLUSH);
if (rc) {
perror("Failed to flush output queue");
return rc;
}
/* send one xmodem packet with 0xff bytes to force BootROM to re-sync */ /* send one xmodem packet with 0xff bytes to force BootROM to re-sync */
memset(&block, 0xff, sizeof(block)); memset(&block, 0xff, sizeof(block));
kwboot_tty_send(tty, &block, sizeof(block), 0); rc = kwboot_tty_send(tty, &block, sizeof(block), 0);
if (rc) {
perror("Failed to send sync sequence");
return rc;
}
/* /*
* Sending 132 bytes via 115200B/8-N-1 takes 11.45 ms, reading 132 bytes * Sending 132 bytes via 115200B/8-N-1 takes 11.45 ms, reading 132 bytes
@ -785,7 +791,11 @@ kwboot_bootmsg(int tty, void *msg)
usleep(30 * 1000); usleep(30 * 1000);
/* flush remaining NAK replies from input queue */ /* flush remaining NAK replies from input queue */
tcflush(tty, TCIFLUSH); rc = tcflush(tty, TCIFLUSH);
if (rc) {
perror("Failed to flush input queue");
return rc;
}
return 0; return 0;
} }
@ -805,10 +815,8 @@ kwboot_debugmsg(int tty, void *msg)
break; break;
rc = kwboot_tty_send(tty, msg, 8, 0); rc = kwboot_tty_send(tty, msg, 8, 0);
if (rc) { if (rc)
usleep(msg_req_delay * 1000); break;
continue;
}
rc = kwboot_tty_recv(tty, buf, 16, msg_rsp_timeo); rc = kwboot_tty_recv(tty, buf, 16, msg_rsp_timeo);