From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 145BAC4338F for ; Wed, 25 Aug 2021 13:54:52 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 939BD60EBC for ; Wed, 25 Aug 2021 13:54:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 939BD60EBC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nic.cz Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D0A3583201; Wed, 25 Aug 2021 15:54:46 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nic.cz Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; secure) header.d=nic.cz header.i=@nic.cz header.b="RWMJ7isw"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 86D448310F; Wed, 25 Aug 2021 15:54:40 +0200 (CEST) Received: from mail.nic.cz (mail.nic.cz [217.31.204.67]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id ADFF783123 for ; Wed, 25 Aug 2021 15:46:37 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nic.cz Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.behun@nic.cz Received: from dellmb.labs.office.nic.cz (unknown [IPv6:2001:1488:fffe:6:8747:7254:5571:3010]) by mail.nic.cz (Postfix) with ESMTPSA id 4ACD6140A6A; Wed, 25 Aug 2021 15:46:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nic.cz; s=default; t=1629899197; bh=uprXniHGgU0yDWkZjYNa58QlbDo7Fdvi14paDdVjU9Q=; h=From:To:Date; b=RWMJ7iswYIySDNSduw2FkbIzZ74ImbXOKEZ9MbMJSN9G36a9RrR3cyELJ/zl8iit/ uC9MW0ihrWc90Slaob17nhpnmU9mcWqjdmNSdjQRPcRhAC7GLSLuKoVaKJXvXq5qWL 60fgRjyZ2XkuP5kqccXkqJAbPuvdTpvCAFKnFuzA= From: =?UTF-8?q?Marek=20Beh=C3=BAn?= To: Stefan Roese Cc: u-boot@lists.denx.de, pali@kernel.org, Chris Packham , Baruch Siach , Dennis Gilmore , Mario Six , Jon Nettleton , =?UTF-8?q?Marek=20Beh=C3=BAn?= Subject: [PATCH u-boot-marvell 16/29] tools: kwboot: Properly finish xmodem transfer Date: Wed, 25 Aug 2021 15:46:21 +0200 Message-Id: <20210825134634.3959-17-marek.behun@nic.cz> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210825134634.3959-1-marek.behun@nic.cz> References: <20210825134634.3959-1-marek.behun@nic.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean From: Pali Rohár After kwboot sends EOT, BootROM sends back ACK. Add code for handling this and retry sending EOT on error. Signed-off-by: Pali Rohár [ refactored ] Signed-off-by: Marek Behún --- tools/kwboot.c | 65 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 48 insertions(+), 17 deletions(-) diff --git a/tools/kwboot.c b/tools/kwboot.c index 0e60cc8a70..6674a253ff 100644 --- a/tools/kwboot.c +++ b/tools/kwboot.c @@ -383,6 +383,28 @@ _is_xm_reply(char c) return c == ACK || c == NAK || c == CAN; } +static int +_xm_reply_to_error(int c) { + int rc = -1; + + switch (c) { + case ACK: + rc = 0; + break; + case NAK: + errno = EBADMSG; + break; + case CAN: + errno = ECANCELED; + break; + default: + errno = EPROTO; + break; + } + + return rc; +} + static uint64_t _now(void) { @@ -463,24 +485,32 @@ kwboot_xm_sendblock(int fd, struct kwboot_block *block, int allow_non_xm, return -1; } - rc = -1; + return _xm_reply_to_error(c); +} - switch (c) { - case ACK: - rc = 0; - break; - case NAK: - errno = EBADMSG; - break; - case CAN: - errno = ECANCELED; - break; - default: - errno = EPROTO; - break; - } +static int +kwboot_xm_finish(int tty) +{ + int rc, retries; + char c; - return rc; + retries = 16; + do { + rc = kwboot_tty_send_char(tty, EOT); + if (rc) + return rc; + + do { + rc = kwboot_tty_recv(tty, &c, 1, blk_rsp_timeo); + if (rc) { + if (errno != ETIMEDOUT) + return rc; + c = NAK; + } + } while (!_is_xm_reply(c) && retries-- > 0); + } while (c == NAK && retries-- > 0); + + return _xm_reply_to_error(c); } static int @@ -557,7 +587,8 @@ kwboot_xmodem(int tty, const void *_img, size_t size) if (rc) return rc; - return kwboot_tty_send_char(tty, EOT); + kwboot_printv("Finishing transfer\n"); + return kwboot_xm_finish(tty); } static int -- 2.31.1