{"id":2224797,"url":"http://patchwork.ozlabs.org/api/patches/2224797/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/20260418175814.5731-3-heinrich.schuchardt@canonical.com/","project":{"id":18,"url":"http://patchwork.ozlabs.org/api/projects/18/?format=json","name":"U-Boot","link_name":"uboot","list_id":"u-boot.lists.denx.de","list_email":"u-boot@lists.denx.de","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20260418175814.5731-3-heinrich.schuchardt@canonical.com>","list_archive_url":null,"date":"2026-04-18T17:58:14","name":"[2/2] efi_loader: centralize messaging for efi_init_obj_list","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"be9c5a8024080c4448dd15b462176f3cf1557791","submitter":{"id":82181,"url":"http://patchwork.ozlabs.org/api/people/82181/?format=json","name":"Heinrich Schuchardt","email":"heinrich.schuchardt@canonical.com"},"delegate":{"id":68728,"url":"http://patchwork.ozlabs.org/api/users/68728/?format=json","username":"xypron","first_name":"Heinrich","last_name":"Schuchardt","email":"xypron.glpk@gmx.de"},"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/20260418175814.5731-3-heinrich.schuchardt@canonical.com/mbox/","series":[{"id":500458,"url":"http://patchwork.ozlabs.org/api/series/500458/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/list/?series=500458","date":"2026-04-18T17:58:12","name":"efi_loader: centralize messaging for efi_init_obj_list","version":1,"mbox":"http://patchwork.ozlabs.org/series/500458/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2224797/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2224797/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (4096-bit key;\n unprotected) header.d=canonical.com header.i=@canonical.com\n header.a=rsa-sha256 header.s=20251003 header.b=J3NG8zlw;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de\n (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de;\n envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org)","phobos.denx.de;\n dmarc=pass (p=reject dis=none) header.from=canonical.com","phobos.denx.de;\n spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de","phobos.denx.de;\n\tdkim=pass (4096-bit key;\n unprotected) header.d=canonical.com header.i=@canonical.com\n header.b=\"J3NG8zlw\";\n\tdkim-atps=neutral","phobos.denx.de; dmarc=pass (p=reject dis=none)\n header.from=canonical.com","phobos.denx.de; spf=pass\n smtp.mailfrom=heinrich.schuchardt@canonical.com"],"Received":["from phobos.denx.de (phobos.denx.de\n [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fyfcs3vXPz1yDF\n\tfor ; Sun, 19 Apr 2026 03:58:37 +1000 (AEST)","from h2850616.stratoserver.net (localhost [IPv6:::1])\n\tby phobos.denx.de (Postfix) with ESMTP id 95B158405A;\n\tSat, 18 Apr 2026 19:58:23 +0200 (CEST)","by phobos.denx.de (Postfix, from userid 109)\n id DF7F184258; Sat, 18 Apr 2026 19:58:20 +0200 (CEST)","from smtp-relay-canonical-0.canonical.com\n (smtp-relay-canonical-0.canonical.com [185.125.188.120])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))\n (No client certificate requested)\n by phobos.denx.de (Postfix) with ESMTPS id 189508405A\n for ; Sat, 18 Apr 2026 19:58:18 +0200 (CEST)","from LT03.fritz.box (ip-176-199-115-125.um44.pools.vodafone-ip.de\n [176.199.115.125])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest\n SHA256)\n (No client certificate requested)\n by smtp-relay-canonical-0.canonical.com (Postfix) with ESMTPSA id 36D8F40D6F;\n Sat, 18 Apr 2026 17:58:17 +0000 (UTC)"],"X-Spam-Checker-Version":"SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de","X-Spam-Level":"","X-Spam-Status":"No, score=-2.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,\n DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,\n RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,\n RCVD_IN_VALIDITY_RPBL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham\n autolearn_force=no version=3.4.2","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com;\n s=20251003; t=1776535097;\n bh=rVbQ5gHt+VpXCHkT15t8IsoEym/DPMZsg2drAI5wNBU=;\n h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:\n MIME-Version;\n b=J3NG8zlwFgVdYOFY52S+z7KMqb39dMxMAxUro3fe154mmKV5n4kbIM6k5Qbd4X73H\n X1757gxj9iq/2HErcBiHz1BX6oNJKRCNp7uUQONNqM010pAAEyYbilooki9ZQrZvIa\n +aRlu0TVRd1vPaRzqiRJnM2rv+0RgkZux5fcFbHZHO7aSkhUbvkhWyZI+4b0sCoUEn\n iYqtPWWh/neKQBhJVFdijh1Y2RExVP4gasWocDfMay1kMW3rYHpcI40t1Sy1gJcZLW\n 77ojhMYRlwhQ3fgv7E5pgYGbT5XLkqrgbcDUYGK7QDOq2547VeX8H85i5jvWYCC9/W\n 76gDFWXkruUytb9TmmE3t8funla+FH5asH+SXeuEkLPN+gjpJXCFPVJDNLS0LDZFmG\n XAKsbKBb8I1iAHC3cNQftKstWMpUsReVNOo37DH21ir5HDhQ4Qw0TPME+L6Gpz5b59\n 62JqC217b2ZahoR2jTtM+wVyfGMQ01Eg9XVNSM2m+zz7vwTquMG2jbE0qsnZRvG4RN\n ygAKT9LFWLTW5Sizvm+z8/qK9LZGNxWgO/Ty3hUpAzskJjyfkqhBqHYfBVRRNygAxv\n PJ93eCm8DNwQVsCP1mDAeQQv1IWOyT2NpXO+Jw/oUrLRNsbKMxYl281j55ef6QQ0lf\n jqOE6rc9/PqTzUWx+x73GsoY=","From":"Heinrich Schuchardt ","To":"Ilias Apalodimas ","Cc":"Simon Glass , Tom Rini ,\n Mark Kettenis ,\n Patrice Chotard , Peng Fan ,\n Christian Marangi ,\n Sughosh Ganu ,\n Casey Connolly ,\n =?utf-8?q?Vincent_Stehl=C3=A9?= ,\n Adriano Cordova , Javier Tia ,\n Jerome Forissier ,\n Ying-Chun Liu , u-boot@lists.denx.de,\n Heinrich Schuchardt ","Subject":"[PATCH 2/2] efi_loader: centralize messaging for efi_init_obj_list","Date":"Sat, 18 Apr 2026 19:58:14 +0200","Message-ID":"<20260418175814.5731-3-heinrich.schuchardt@canonical.com>","X-Mailer":"git-send-email 2.53.0","In-Reply-To":"<20260418175814.5731-1-heinrich.schuchardt@canonical.com>","References":"<20260418175814.5731-1-heinrich.schuchardt@canonical.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-BeenThere":"u-boot@lists.denx.de","X-Mailman-Version":"2.1.39","Precedence":"list","List-Id":"U-Boot discussion ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"u-boot-bounces@lists.denx.de","Sender":"\"U-Boot\" ","X-Virus-Scanned":"clamav-milter 0.103.8 at phobos.denx.de","X-Virus-Status":"Clean"},"content":"If efi_init_obj_list() fails we cannot use the UEFI sub-system.\n\n* Instead of having messages for this everywhere write an error message\n in efi_init_obj_list().\n* Always use (ret =! EFI_SUCCESS) when checking the return value of\n efi_init_obj_list().\n* Remove the return code from the error message as it does not help\n users to understand which initialization went wrong.\n\nSigned-off-by: Heinrich Schuchardt \n---\n boot/bootmeth_efi_mgr.c | 4 ++--\n cmd/bootefi.c | 5 +----\n cmd/bootmenu.c | 6 +-----\n cmd/eficonfig.c | 6 +-----\n cmd/efidebug.c | 5 +----\n cmd/nvedit_efi.c | 10 ++--------\n lib/efi_loader/efi_bootbin.c | 5 +----\n lib/efi_loader/efi_bootmgr.c | 5 +----\n lib/efi_loader/efi_setup.c | 2 ++\n 9 files changed, 12 insertions(+), 36 deletions(-)","diff":"diff --git a/boot/bootmeth_efi_mgr.c b/boot/bootmeth_efi_mgr.c\nindex 05fc35d01a9..6e70c36ad99 100644\n--- a/boot/bootmeth_efi_mgr.c\n+++ b/boot/bootmeth_efi_mgr.c\n@@ -58,8 +58,8 @@ static int efi_mgr_read_bootflow(struct udevice *dev, struct bootflow *bflow)\n \t}\n \n \tret = efi_init_obj_list();\n-\tif (ret)\n-\t\treturn log_msg_ret(\"init\", ret);\n+\tif (ret != EFI_SUCCESS)\n+\t\treturn ret;\n \n \t/* Enable this method if the \"BootOrder\" UEFI exists. */\n \tbootorder = efi_get_var(u\"BootOrder\", &efi_global_variable_guid,\ndiff --git a/cmd/bootefi.c b/cmd/bootefi.c\nindex 6dab709e507..37165f1a7fd 100644\n--- a/cmd/bootefi.c\n+++ b/cmd/bootefi.c\n@@ -144,11 +144,8 @@ static int do_bootefi(struct cmd_tbl *cmdtp, int flag, int argc,\n \n \t/* Initialize EFI drivers */\n \tret = efi_init_obj_list();\n-\tif (ret != EFI_SUCCESS) {\n-\t\tlog_err(\"Error: Cannot initialize UEFI sub-system, r = %lu\\n\",\n-\t\t\tret & ~EFI_ERROR_MASK);\n+\tif (ret != EFI_SUCCESS)\n \t\treturn CMD_RET_FAILURE;\n-\t}\n \n \tif (argc > 2) {\n \t\tulong rd_addr = 0;\ndiff --git a/cmd/bootmenu.c b/cmd/bootmenu.c\nindex d3108778c6f..528afd221d0 100644\n--- a/cmd/bootmenu.c\n+++ b/cmd/bootmenu.c\n@@ -505,12 +505,8 @@ static void handle_uefi_bootnext(void)\n \n \t/* Initialize EFI drivers */\n \tret = efi_init_obj_list();\n-\tif (ret != EFI_SUCCESS) {\n-\t\tlog_err(\"Error: Cannot initialize UEFI sub-system, r = %lu\\n\",\n-\t\t\tret & ~EFI_ERROR_MASK);\n-\n+\tif (ret != EFI_SUCCESS)\n \t\treturn;\n-\t}\n \n \t/* If UEFI BootNext variable is set, boot the BootNext load option */\n \tsize = sizeof(u16);\ndiff --git a/cmd/eficonfig.c b/cmd/eficonfig.c\nindex d8d946c87ac..570d788cd5c 100644\n--- a/cmd/eficonfig.c\n+++ b/cmd/eficonfig.c\n@@ -2466,12 +2466,8 @@ static int do_eficonfig(struct cmd_tbl *cmdtp, int flag, int argc, char *const a\n \t\treturn CMD_RET_USAGE;\n \n \tret = efi_init_obj_list();\n-\tif (ret != EFI_SUCCESS) {\n-\t\tlog_err(\"Error: Cannot initialize UEFI sub-system, r = %lu\\n\",\n-\t\t\tret & ~EFI_ERROR_MASK);\n-\n+\tif (ret != EFI_SUCCESS)\n \t\treturn CMD_RET_FAILURE;\n-\t}\n \n \tret = eficonfig_init();\n \tif (ret != EFI_SUCCESS)\ndiff --git a/cmd/efidebug.c b/cmd/efidebug.c\nindex 7b733119c82..a6faa36b500 100644\n--- a/cmd/efidebug.c\n+++ b/cmd/efidebug.c\n@@ -1669,11 +1669,8 @@ static int do_efidebug(struct cmd_tbl *cmdtp, int flag,\n \n \t/* Initialize UEFI drivers */\n \tr = efi_init_obj_list();\n-\tif (r != EFI_SUCCESS) {\n-\t\tprintf(\"Error: Cannot initialize UEFI sub-system, r = %lu\\n\",\n-\t\t r & ~EFI_ERROR_MASK);\n+\tif (r != EFI_SUCCESS)\n \t\treturn CMD_RET_FAILURE;\n-\t}\n \n \tcp = find_cmd_tbl(argv[0], cmd_efidebug_sub,\n \t\t\t ARRAY_SIZE(cmd_efidebug_sub));\ndiff --git a/cmd/nvedit_efi.c b/cmd/nvedit_efi.c\nindex 351ae47e870..3a36f94775b 100644\n--- a/cmd/nvedit_efi.c\n+++ b/cmd/nvedit_efi.c\n@@ -213,11 +213,8 @@ int do_env_print_efi(struct cmd_tbl *cmdtp, int flag, int argc,\n \n \t/* Initialize EFI drivers */\n \tret = efi_init_obj_list();\n-\tif (ret != EFI_SUCCESS) {\n-\t\tprintf(\"Error: Cannot initialize UEFI sub-system, r = %lu\\n\",\n-\t\t ret & ~EFI_ERROR_MASK);\n+\tif (ret != EFI_SUCCESS)\n \t\treturn CMD_RET_FAILURE;\n-\t}\n \n \tfor (argc--, argv++; argc > 0 && argv[0][0] == '-'; argc--, argv++) {\n \t\tif (!strcmp(argv[0], \"-guid\")) {\n@@ -389,11 +386,8 @@ int do_env_set_efi(struct cmd_tbl *cmdtp, int flag, int argc,\n \n \t/* Initialize EFI drivers */\n \tret = efi_init_obj_list();\n-\tif (ret != EFI_SUCCESS) {\n-\t\tprintf(\"Error: Cannot initialize UEFI sub-system, r = %lu\\n\",\n-\t\t ret & ~EFI_ERROR_MASK);\n+\tif (ret != EFI_SUCCESS)\n \t\treturn CMD_RET_FAILURE;\n-\t}\n \n \t/*\n \t * attributes = EFI_VARIABLE_BOOTSERVICE_ACCESS |\ndiff --git a/lib/efi_loader/efi_bootbin.c b/lib/efi_loader/efi_bootbin.c\nindex b394f0d60ce..5f3c50ffae2 100644\n--- a/lib/efi_loader/efi_bootbin.c\n+++ b/lib/efi_loader/efi_bootbin.c\n@@ -224,11 +224,8 @@ static efi_status_t efi_binary_run_dp(void *image, size_t size, void *fdt,\n \n \t/* Initialize EFI drivers */\n \tret = efi_init_obj_list();\n-\tif (ret != EFI_SUCCESS) {\n-\t\tlog_err(\"Error: Cannot initialize UEFI sub-system, r = %lu\\n\",\n-\t\t\tret & ~EFI_ERROR_MASK);\n+\tif (ret != EFI_SUCCESS)\n \t\treturn -1;\n-\t}\n \n \tret = efi_install_fdt(fdt);\n \tif (ret != EFI_SUCCESS)\ndiff --git a/lib/efi_loader/efi_bootmgr.c b/lib/efi_loader/efi_bootmgr.c\nindex a687f4d8e85..4dda996d78e 100644\n--- a/lib/efi_loader/efi_bootmgr.c\n+++ b/lib/efi_loader/efi_bootmgr.c\n@@ -1310,11 +1310,8 @@ efi_status_t efi_bootmgr_run(void *fdt)\n \n \t/* Initialize EFI drivers */\n \tret = efi_init_obj_list();\n-\tif (ret != EFI_SUCCESS) {\n-\t\tlog_err(\"Error: Cannot initialize UEFI sub-system, r = %lu\\n\",\n-\t\t\tret & ~EFI_ERROR_MASK);\n+\tif (ret != EFI_SUCCESS)\n \t\treturn CMD_RET_FAILURE;\n-\t}\n \n \tret = efi_bootmgr_load(&handle, &load_options);\n \tif (ret != EFI_SUCCESS) {\ndiff --git a/lib/efi_loader/efi_setup.c b/lib/efi_loader/efi_setup.c\nindex f06cf49e443..f302bb62ab9 100644\n--- a/lib/efi_loader/efi_setup.c\n+++ b/lib/efi_loader/efi_setup.c\n@@ -392,5 +392,7 @@ efi_status_t efi_init_obj_list(void)\n \tret = efi_start_obj_list();\n out:\n \tefi_obj_list_initialized = ret;\n+\tif (ret != EFI_SUCCESS)\n+\t\tlog_err(\"Cannot initialize UEFI sub-system\\n\");\n \treturn ret;\n }\n","prefixes":["2/2"]}