From patchwork Sat Jun 27 08:19:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1318273 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=MdTqJxih; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49v6B13k3Tz9sRW for ; Sat, 27 Jun 2020 18:19:53 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B0DA081D20; Sat, 27 Jun 2020 10:19:48 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=gmx.de 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=gmx.net header.i=@gmx.net header.b="MdTqJxih"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7B85681D27; Sat, 27 Jun 2020 10:19:47 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B2E4C81658 for ; Sat, 27 Jun 2020 10:19:39 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=xypron.glpk@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1593245975; bh=KrdPS41ATvpneFRgu7b0CpenK/l6bHP8/KfnKVzhvu0=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=MdTqJxihfYrBf/clL/6t2KtB0eUmLUquV872kDNH2RWFdwIP0+jV2yNHo1gPhCu8X hkvPRyPsYr5nJ2q//OOXpO9lEqNDGM6Z1Y7CYltTVzH2o3qVWgVT0cdPjd3hydnabf uOLti/XsSdLVdLxwENR3ZWLpgUqsBrCl7T3KLof8= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from LT02.fritz.box ([88.152.145.75]) by mail.gmx.com (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MORAU-1jTkW92kqU-00Prgv; Sat, 27 Jun 2020 10:19:35 +0200 From: Heinrich Schuchardt To: Tom Rini Cc: Simon Glass , AKASHI Takahiro , Joe Hershberger , u-boot@lists.denx.de, Heinrich Schuchardt Subject: [PATCH 1/1] fs: error handling in do_load() Date: Sat, 27 Jun 2020 10:19:30 +0200 Message-Id: <20200627081930.18795-1-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:ZkgpK+Bn+ZNsRakpnvTJnyQiOoCAeMecwEcdh0qCAnKxmqTfSVT NkmpEzyn32kYZ4CYLolU+JeKwU4Oth5H+BDS50IpDZVKPPsVJqKwPT58en15CfNPvu/I2C9 aGV6Bj3pXkTmbyJrkn/OezDtwdei9O9NnDFdH9B5iBqHKMxQ5pg+YDJWyDFgWBH7EPEhmNz 3HeF8HHzYYRHYMLxwpT0Q== X-UI-Out-Filterresults: notjunk:1;V03:K0:tGci+ehqZPU=:/K4XpEkwLG5yiS45WUc3cp wkVx3MRvvHyUIi4zjQluXZn26cQSFGcmu92pSPeUD0FYlJDU/N4WaOBSndgOvnu0wCCuDQYv2 +MQJVZpBiOW5hzbJIf1OrH10xhFU1FJ9Moboc6WyPFiSUYZd4Jywl/cqCZdIs1GkRKaHt2xmE pOk/pAH+rdTj1Ie34nvILKhcuhojoiVUsArvbOB1H1AjEprERT1NygLVz5sUfmiGMGSbb2dr4 iHHDhYFCX8XciR+vJs7elu+Zk9hkwRyQvSHVtCxKRHCUQ0wMcLA5k9Nmlpzs4U9ANYLVaPYTS 1DZbH2NJ8MdfEtPGWyBssXrpwTVWutJzOV55mEmkKwibRVCvNXbiES91mrq2MeGupXLYQNWck jAWOMeUwwtjQCgMb3oUvegICChd9IEM1hr5yQZ/r8a/0BvcoSdu1hJsDN/m+3r0OWF74wcdo7 KQ62AIy/eu0IkXXHLMfNo8OCCWFIPp5U0+Tw8A2IGrcGqZ/fX4nYa797Jcl6bHZvYC53cQtz5 2RAAlIh/hMphKuFMgq7TGRF5Icyy8FmjW6/UvQ9Mm+V6aAcadXZX6+YJe8XNEK1su9RT/hWrL 1oCIA2zreHT05wIf5HunU1B3fUbNLWRrZ8qO6Wazg2WTHsy4wRfkrjWsydCmeF/qyUa7VwDKx If3+AbRtCb6XJ1EnsEXlOfrlRjlnaVVgfS9ghRHTq6lt04Ij6vDiDJOEKy+on4XF5xE1OnVgn 7vNc4rI7hM2guS8zKZNgUrve/WWdX8rFPeTzwHztlfaKhpUkSRLq1ghdZEiHTSdj+sKUACSv3 VMkWNsBT+DZkEHujLCFOP7RHsYArmThqJZGhn4KVZ7ZgDF/n5zysZpXYxO9UbnDAFnZmUZ2ZA +3Rjanrj8Ue0OqtH20OXNjA+3xWs/xsrdSqHDa/fHC/nouoEnyqRsnEADUXX7cbKxD+OELstp oRrbaOa+AJAwkWksgyJxPq+5gKr989ci+B59witRH5OlNFB5nlDx3fZ7RJDSfAHM0ldlecuNp Nq61fMugBFdTnuPHdFqCvH7ai2489CMkmAalhJCHgt0DvboB1m6E1oZdAvVZIbffpoDla0HZ1 WFNxieZnkWZ5LykfvTCCTPZr5WTTza8HkZDnV3TOQ7PmrN/sCswP3LkVQDF+8lO2n1Bb1NWNA 6LAjEA8IJGuy/Uvj/5b5ZzPlakwhTNnyhsT0JE8LUF5jffNjQbdbJs7SyZFdVxSi2A6uH+hH1 kQwZ+KeGS8gZocjwn0oA3NfKP1Na1UtZzVnowYA== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.102.2 at phobos.denx.de X-Virus-Status: Clean If a file cannot be loaded, show an error message. Set the EFI boot device only after successfully loading a file. Signed-off-by: Heinrich Schuchardt Reviewed-by: Simon Glass --- fs/fs.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) -- 2.27.0 diff --git a/fs/fs.c b/fs/fs.c index ad4caaeb1e..12fa5a6489 100644 --- a/fs/fs.c +++ b/fs/fs.c @@ -715,15 +715,18 @@ int do_load(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[], else pos = 0; -#ifdef CONFIG_CMD_BOOTEFI - efi_set_bootdev(argv[1], (argc > 2) ? argv[2] : "", - (argc > 4) ? argv[4] : ""); -#endif time = get_timer(0); ret = _fs_read(filename, addr, pos, bytes, 1, &len_read); time = get_timer(time); - if (ret < 0) + if (ret < 0) { + printf("Failed to load '%s'\n", filename); return 1; + } + +#ifdef CONFIG_CMD_BOOTEFI + efi_set_bootdev(argv[1], (argc > 2) ? argv[2] : "", + (argc > 4) ? argv[4] : ""); +#endif printf("%llu bytes read in %lu ms", len_read, time); if (time > 0) {