From: "Uwe Kleine-König" <uwe@kleine-koenig.org>
To: barebox@lists.infradead.org
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Subject: [PATCH] scripts: kwboot: fix detection of timeout
Date: Tue, 11 Nov 2014 21:10:19 +0100 [thread overview]
Message-ID: <1415736619-26447-1-git-send-email-uwe@kleine-koenig.org> (raw)
In function kwboot_xm_sendblock() the loop that implements retrying to
send a boot block might be quit if kwboot_tty_send or kwboot_tty_recv
return a failure. In this case the value of the variable c that is
expected to hold the response byte is uninitialized and most likely
still holds an ACK from the previous call to kwboot_xm_sendblock().
So the right thing to do is not to clobber rc if it's already != 0.
The result of this patch in my current scenario is that kwboot dies with
xmodem: Connection timed out
when the SoC stops replying instead of continuing to try sending the
remaining blocks which results in select() blocking for one second for
each block.
Fixes: 0535713bbfa0 ("scripts: add kwboot tool")
Signed-off-by: Uwe Kleine-König <uwe@kleine-koenig.org>
--
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Gregory CLEMENT <gregory.clement@free-electrons.com>
Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
I also tried to increase the timeout, but without success :-(. Will test
a different USB-to-RS232 adapter ...
---
scripts/kwboot.c | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/scripts/kwboot.c b/scripts/kwboot.c
index e06866052ba9..46328d8ed006 100644
--- a/scripts/kwboot.c
+++ b/scripts/kwboot.c
@@ -376,21 +376,23 @@ kwboot_xm_sendblock(int fd, struct kwboot_block *block)
} while (c == NAK && retries-- > 0);
- rc = -1;
+ if (!rc) {
+ rc = -1;
- switch (c) {
- case ACK:
- rc = 0;
- break;
- case NAK:
- errno = EBADMSG;
- break;
- case CAN:
- errno = ECANCELED;
- break;
- default:
- errno = EPROTO;
- break;
+ switch (c) {
+ case ACK:
+ rc = 0;
+ break;
+ case NAK:
+ errno = EBADMSG;
+ break;
+ case CAN:
+ errno = ECANCELED;
+ break;
+ default:
+ errno = EPROTO;
+ break;
+ }
}
return rc;
--
2.1.3
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next reply other threads:[~2014-11-11 20:10 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-11 20:10 Uwe Kleine-König [this message]
2014-11-17 7:53 ` Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1415736619-26447-1-git-send-email-uwe@kleine-koenig.org \
--to=uwe@kleine-koenig.org \
--cc=barebox@lists.infradead.org \
--cc=thomas.petazzoni@free-electrons.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox