From patchwork Mon Jun 29 18:08:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1318964 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=kIaztl9T; 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 49wb9B29Ngz9sQx for ; Tue, 30 Jun 2020 04:09:16 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BC4E181578; Mon, 29 Jun 2020 20:09:05 +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="kIaztl9T"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D32E781777; Mon, 29 Jun 2020 20:09:01 +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.15.18]) (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 85A68814E1 for ; Mon, 29 Jun 2020 20:08:58 +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=1593454134; bh=j7138PftJz+X1t7oinvHQgkTSHQIQAS+hB7EdTsQ09g=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=kIaztl9TQ5Hzn0xoNPndmy3HiJY3/OtezKQuSYrmDq7+fdgO2ZWyUxbeLZYSSUlOG 7V38dv4cocDdU05+DXgmgyLLtE+oMqiZu3Yp28xz5W1dqWFPDnDkFUh7z2fLyOmH+r DQpXTZ7GuX3lAPRgis00zxP57YGJlgG7dyuuXBIU= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from workstation5.fritz.box ([88.152.145.75]) by mail.gmx.com (mrgmx005 [212.227.17.184]) with ESMTPSA (Nemesis) id 1MpUZ4-1j2a5a07VU-00pu2o; Mon, 29 Jun 2020 20:08:54 +0200 From: Heinrich Schuchardt To: Tom Rini Cc: Simon Glass , AKASHI Takahiro , Joe Hershberger , U-Boot Mailing List , Heinrich Schuchardt Subject: [PATCH v2 1/1] fs: error handling in do_load() Date: Mon, 29 Jun 2020 20:08:49 +0200 Message-Id: <20200629180849.51888-1-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:9sxsEl4wKukee9l74fAS7Qy4zZqo+trbOaILGwjbCjYOenK+1AK j0Ql4Fd/3EjViKIEVWM4EDuKQUVVfqx4fabwj0xqjAQnhqdnVBAFyL85yuAR9YIEbA3y3It uKmIRpJkj3GHKAnvgV7m0dhAxNI4BK9j/vFuYYb9dKbEZ4sKub249UhRL7jGnDlsWY5+J/b 7W767DkSPaqHYCKtVWIqA== X-UI-Out-Filterresults: notjunk:1;V03:K0:bu89ATzFVWM=:3sMI+ROcORP7/hrSKnwibm cWEoWpbRQ8/NtSQyVXlISwwZRIgsmI07dInqpVFVOmiGazgHRlcOqRxLROFjCgE5/Le6vvFEp 0xnaJ4jA19A9+2OYlyOj0yoBLqadipvADoTlIYu92U/aqdTLEphZcfd/xR+RZn4GbvgOffIaU gUVrBeiZ/lAM4RGsXU6EAmoh84Bg0SiYs7ui+2M5jJZ21kUYzlKQixGhu4bpKbh9Lj4qRNcMq INLAHE4OcyI9VZ3awfz9GByuj5Tl0ZmM216lMIfpb9Bmz/YO34Dg8cmPq2pA0A/Qh/BN6PNlp qW8AMkb3nUhGQ8B7Pi7MkfTqmF9XEBdAedjmu17KyjO3EDpqX/au5Y8NYxHEiSjdACdh2qAES f5bCHbkuZabxO1dXxVVMq3VDTd0vSvKXGCI8BnFjdy7TGMmPW0uhkOEAuU9706PCn7C+OY/7r ESET7aa4SsOfgbl59jJT/ZJHYOE4FaisBOJEHZAaIO1dykhyOfmcKIc4lmv49GiXwlP2mUe+I 1vqB8UufYB96oQO5aOO/lSCzCg9i4RnEqjz78zA+VF0F0aLlgfsVnGeg1bpCrcZRYdb7Y2gdH NAN8ylpKTjBVkYStXlyo1TwC+DgXUBj8b+0srqi5fSouxepRs5+rCiTscLbmOP/UtFOjVX8Su SOdWWs5VHYi8h4JHxklQMEZGD1Zf9B9NxzHnl92rUjnCm+ia3SzE+08fOMi2gquSxLxRXXP6r WTIpbBsHKBWz7HRwF3AAEShCzEXJIrBwOKmiUak2vEwtP0UoZZz80Lt5VYMeFezizQ8h9A4dJ QUaP04vZfhtFbjFiId6dh7DUR/AZX8JYqP4XClKtjzf30+YV8MxK2WBBP+nMFWUNIrMWpzIz6 vIPXswM/pV5wJ4AqSYZhlZ6f+gPPEzE/T9ApeQv8Yyjl7KhDDb6Gm0lH9R3ylkTavcZ/ExaqH WJUlrVe7+txIAi/Ty0QWhlHDBX0XEt1yRKRGXU5iAngFu8fmyYBj47Zqo1weI3Ncx/BsyqY3t rN7GX0BN6l9NnB+R7MAzeW6axOjRs5Ie3dApcFym3cZ4dxbCf54q+IdTLR+ANX2ZmtKBv4HP9 nwTOjqo4mtGDwjpgRh5s9MPivWiGlBevEEbGH/H2GAyOwoYUq/Qo/5CinBtVsX7C8pZCGNIwh H1ygX15JqxRwaDPdPwG7BRCcNvz5C1y7m6vV7h7QSmU8+9+K7ceP/4qhtj1ZGQqqo4LJ5Tpug Tk65d0d7J8Vt1N9lT 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 --- v2: use if() instead of #ifdef --- fs/fs.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) -- 2.27.0 diff --git a/fs/fs.c b/fs/fs.c index ad4caaeb1e..7268ec87aa 100644 --- a/fs/fs.c +++ b/fs/fs.c @@ -715,15 +715,17 @@ 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; + } + + if (IS_ENABLED(CONFIG_CMD_BOOTEFI)) + efi_set_bootdev(argv[1], (argc > 2) ? argv[2] : "", + (argc > 4) ? argv[4] : ""); printf("%llu bytes read in %lu ms", len_read, time); if (time > 0) {