{"id":2219913,"url":"http://patchwork.ozlabs.org/api/patches/2219913/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/20260405113436.1849007-1-sjg@chromium.org/","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":"<20260405113436.1849007-1-sjg@chromium.org>","list_archive_url":null,"date":"2026-04-05T11:34:32","name":"[v2] bootstd: efi: Handle prior-stage FDT in network path","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"916e03b81089113d1edea2faae7b7c40cdf1b58d","submitter":{"id":6170,"url":"http://patchwork.ozlabs.org/api/people/6170/?format=json","name":"Simon Glass","email":"sjg@chromium.org"},"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/20260405113436.1849007-1-sjg@chromium.org/mbox/","series":[{"id":498775,"url":"http://patchwork.ozlabs.org/api/series/498775/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/list/?series=498775","date":"2026-04-05T11:34:32","name":"[v2] bootstd: efi: Handle prior-stage FDT in network path","version":2,"mbox":"http://patchwork.ozlabs.org/series/498775/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2219913/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2219913/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 (1024-bit key;\n unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256\n header.s=google header.b=gspXCxeI;\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=none dis=none) header.from=chromium.org","phobos.denx.de;\n spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de","phobos.denx.de;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=chromium.org header.i=@chromium.org\n header.b=\"gspXCxeI\";\n\tdkim-atps=neutral","phobos.denx.de;\n dmarc=pass (p=none dis=none) header.from=chromium.org","phobos.denx.de;\n spf=pass smtp.mailfrom=sjg@chromium.org"],"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 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fpVk250gHz1y2d\n\tfor ; Sun, 05 Apr 2026 21:34:50 +1000 (AEST)","from h2850616.stratoserver.net (localhost [IPv6:::1])\n\tby phobos.denx.de (Postfix) with ESMTP id A877183C14;\n\tSun, 5 Apr 2026 13:34:47 +0200 (CEST)","by phobos.denx.de (Postfix, from userid 109)\n id BB57983C5E; Sun, 5 Apr 2026 13:34:46 +0200 (CEST)","from mail-ot1-x332.google.com (mail-ot1-x332.google.com\n [IPv6:2607:f8b0:4864:20::332])\n (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits))\n (No client certificate requested)\n by phobos.denx.de (Postfix) with ESMTPS id 8484C8394E\n for ; Sun, 5 Apr 2026 13:34:44 +0200 (CEST)","by mail-ot1-x332.google.com with SMTP id\n 46e09a7af769-7d4c383f2fcso2716377a34.0\n for ; Sun, 05 Apr 2026 04:34:44 -0700 (PDT)","from chromium.org ([73.34.74.121]) by smtp.gmail.com with ESMTPSA id\n 46e09a7af769-7dba7159fd9sm8114027a34.7.2026.04.05.04.34.40\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Sun, 05 Apr 2026 04:34:41 -0700 (PDT)"],"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,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;\n d=chromium.org; s=google; t=1775388882; x=1775993682; darn=lists.denx.de;\n h=content-transfer-encoding:mime-version:message-id:date:subject:cc\n :to:from:from:to:cc:subject:date:message-id:reply-to;\n bh=DQ2YPiicZEiGfq1gGw1TCUGe8aDcQ0nNtxSZ32ZlZ4Y=;\n b=gspXCxeIZtFTkGXq9d1g9bA/kLhOVUZopZRN04shSznjRFSAPpPfc2gtyusBWdScxA\n xpDHxmyeF6sx/7Lxb0snejpLmRZf2pXNej+lDutjM124Prw5CVHrQv6NzeZRSRzzD4Ps\n LHpnSWhlUguFv5NnueCBkPIHrenm2QiLHxgUw=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1775388882; x=1775993682;\n h=content-transfer-encoding:mime-version:message-id:date:subject:cc\n :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date\n :message-id:reply-to;\n bh=DQ2YPiicZEiGfq1gGw1TCUGe8aDcQ0nNtxSZ32ZlZ4Y=;\n b=CfASLkrPIvQ9tQ7Bvx77c2kxj/LND+DreC96Yijz5gktQ8rXyqnNwj+HW9dQ6S139D\n KM1S2Xd86iG3Dq+IgjK7CKTvCSqokzsvOHHL2te/zWF1tqQUgw1FQZW5yxY1MO7yYp5a\n /tLuV1NcWrVqGrgTE19DZo+kYMeWmRh9n4WlOfna4dVqHI9HjHEb9upF+mIWMW0nhbmV\n LyWenO70BLBw6iMKetTkXZS/2fJYxz13AZqUuv4abtOBn5sCl6sNc989+cUtQB73K6uv\n LxFFLLEEfsDNL++1w9qwZr34sxf+wJh+d3zBztpFp38zfy3f4msMqlx/VQ1RYU3hxQ/y\n 1LLg==","X-Gm-Message-State":"AOJu0Yy81f5oeWR1Ot5vt1/2XjfEKYi6oX6DsLbqR4FTNrOToeSVJbAR\n MpVzDwqT/RUHekF0bTcoe2KWFdtDPda3nHshEgvKv/Uk19rYZnCgw8CZt6er2vJRo0Y3XNP6KZk\n tCuuRyw==","X-Gm-Gg":"AeBDietViZSo3hDlgnOzZGiGNtvt7sR3LB1CAS5okstu9ocZT1i2m9LfLIM+OA0AyD6\n JXEsIvdm5m+poLckoMlgRFSdrQ1sPuRcMhXrkLxMZWuaOBR29JIony/LnnfJMraM99arDPgCT/B\n 4mmWd3ZVCfCGKOYkmnTfcBDcOj6Cbt40ha5NC0PLL62vG/9KkTjz8ltsqVDbaIY/+DLkPrt55CR\n /tgS0IZd3R5db0fe7gLyo1MCIZoyujeBeHST+kNMz0BjpGC50Bpq5Ttxwk4dIAEZghc1dDF5WXv\n EIttvHSWQA3xa4bxJ5XDrs+roRuubUmk9oOOxignu6mf+ToiCHX/foAmScC/52/XPAo/P12ZPG3\n xvuDtpoF1vvKRXSSRHQVCF9XrlElIaUui/2fWtE18DfQ4EnLzSaSDc90bbUEdjgIgA6nnaQKkIt\n 4+lIMOl+mrzXfV6luoNg==","X-Received":"by 2002:a05:6830:63ca:b0:7d7:ecda:cc3f with SMTP id\n 46e09a7af769-7dbb6f3d283mr6102794a34.0.1775388882512;\n Sun, 05 Apr 2026 04:34:42 -0700 (PDT)","From":"Simon Glass ","To":"u-boot@lists.denx.de","Cc":"=?utf-8?q?Ryan_Pers=C3=A9e?= ,\n Simon Glass ,\n Ilias Apalodimas ,\n \"Kory Maincent (TI.com)\" ,\n Martyn Welch , Tom Rini ,\n Wolfgang Wallner ","Subject":"[PATCH v2] bootstd: efi: Handle prior-stage FDT in network path","Date":"Sun, 5 Apr 2026 05:34:32 -0600","Message-ID":"<20260405113436.1849007-1-sjg@chromium.org>","X-Mailer":"git-send-email 2.43.0","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.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":"When CONFIG_OF_HAS_PRIOR_STAGE is enabled and fdtfile is not set,\nefi_get_distro_fdt_name() returns -EALREADY to indicate the prior-stage\nFDT should be used. The block-device EFI path handles this by setting\nBOOTFLOWF_USE_PRIOR_FDT, but the network path treats it as an error,\ncausing the bootflow to stay in 'base' state with a -EALREADY error.\n\nThis also means fdt_addr_r is required even when no FDT download is\nneeded, giving a spurious -EINVAL error.\n\nFix this by calling efi_get_distro_fdt_name() before checking\nfdt_addr_r, and handling -EALREADY by setting BOOTFLOWF_USE_PRIOR_FDT\nto skip the FDT download, matching the block-device behaviour.\n\nTHere is no test for this at present, since sandbox does not enable\nCONFIG_OF_HAS_PRIOR_STAGE and lacks infra for network-based EFI boot.\n\nSigned-off-by: Simon Glass \n---\n\nChanges in v2:\n- Return early in the -EALREADY case instead of using a big else block\n\n boot/bootmeth_efi.c | 15 ++++++++++-----\n 1 file changed, 10 insertions(+), 5 deletions(-)","diff":"diff --git a/boot/bootmeth_efi.c b/boot/bootmeth_efi.c\nindex f592fec07f6..e187dc39912 100644\n--- a/boot/bootmeth_efi.c\n+++ b/boot/bootmeth_efi.c\n@@ -269,17 +269,22 @@ static int distro_efi_read_bootflow_net(struct bootflow *bflow)\n \t\treturn log_msg_ret(\"fi0\", -ENOMEM);\n \n \t/* read the DT file also */\n+\tret = efi_get_distro_fdt_name(fname, sizeof(fname), 0);\n+\tif (ret == -EALREADY) {\n+\t\t/* Prior-stage FDT is used, no download needed */\n+\t\tbflow->flags |= BOOTFLOWF_USE_PRIOR_FDT;\n+\t\tbflow->state = BOOTFLOWST_READY;\n+\t\treturn 0;\n+\t} else if (ret) {\n+\t\treturn log_msg_ret(\"nam\", ret);\n+\t}\n+\n \tfdt_addr_str = env_get(\"fdt_addr_r\");\n \tif (!fdt_addr_str)\n \t\treturn log_msg_ret(\"fdt\", -EINVAL);\n \tfdt_addr = hextoul(fdt_addr_str, NULL);\n \tsprintf(file_addr, \"%lx\", fdt_addr);\n \n-\t/* We only allow the first prefix with PXE */\n-\tret = efi_get_distro_fdt_name(fname, sizeof(fname), 0);\n-\tif (ret)\n-\t\treturn log_msg_ret(\"nam\", ret);\n-\n \tbflow->fdt_fname = strdup(fname);\n \tif (!bflow->fdt_fname)\n \t\treturn log_msg_ret(\"fil\", -ENOMEM);\n","prefixes":["v2"]}