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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D3669C433EF for ; Fri, 24 Sep 2021 21:11:35 +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 60EB160F4C for ; Fri, 24 Sep 2021 21:11:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 60EB160F4C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org 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 73ED883549; Fri, 24 Sep 2021 23:10:35 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="H/5tJorT"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 974B883502; Fri, 24 Sep 2021 23:08:33 +0200 (CEST) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) (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 6EC9E834D0 for ; Fri, 24 Sep 2021 23:07:55 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=kabel@kernel.org Received: by mail.kernel.org (Postfix) with ESMTPSA id 93D116135F; Fri, 24 Sep 2021 21:07:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1632517674; bh=55BiHxfURboakxHvD9Cb9oT+GYXQ+yTujSq8z5KO1U4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=H/5tJorTkaMLGpNV+6t5mEDt+KIhrTWXOJjP2nC5nxChvLFf/5lDzRwCXnYke5OyT I9xhX4MPYYrd6L7d5p3EqcRneiq/xJCxFFMjraEfjotT1x66XWPg3l8JIGant4AJdL KEua/3O2S9fFmq7o5dk/XuNfxGUNj0Lv8sNzFLUxz7tclXkuaakd6uVZaehLtEcRJr kEwXvCMsATcY10lklYZKxskssrc92WaxIpBxXUllPRpZ53tgONWSFmFoFEk4c/j8Ek hAXqFg0EeXZSyUAqKLlm8B5kfMckFgDi4xWc/gxNApZuYSkvVfaJ1DE1aJR9CY6jzi GS/kAlpfuaxsw== 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 v3 17/39] tools: kwboot: Properly finish xmodem transfer Date: Fri, 24 Sep 2021 23:06:54 +0200 Message-Id: <20210924210716.29752-18-kabel@kernel.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210924210716.29752-1-kabel@kernel.org> References: <20210924210716.29752-1-kabel@kernel.org> 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 | 62 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 45 insertions(+), 17 deletions(-) diff --git a/tools/kwboot.c b/tools/kwboot.c index 8c11dca5ed..ad91afd075 100644 --- a/tools/kwboot.c +++ b/tools/kwboot.c @@ -403,6 +403,29 @@ _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 int kwboot_xm_recv_reply(int fd, char *c, int allow_non_xm, int *non_xm_print) { @@ -483,24 +506,29 @@ kwboot_xm_sendblock(int fd, struct kwboot_block *block, int allow_non_xm, if (non_xm_print) kwboot_printv("\n"); - 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 fd) +{ + int rc, retries; + char c; - return rc; + kwboot_printv("Finishing transfer\n"); + + retries = 16; + do { + rc = kwboot_tty_send_char(fd, EOT); + if (rc) + return rc; + + rc = kwboot_xm_recv_reply(fd, &c, 0, NULL); + if (rc) + return rc; + } while (c == NAK && retries-- > 0); + + return _xm_reply_to_error(c); } static int @@ -577,7 +605,7 @@ kwboot_xmodem(int tty, const void *_img, size_t size) if (rc) return rc; - return kwboot_tty_send_char(tty, EOT); + return kwboot_xm_finish(tty); } static int -- 2.32.0