From patchwork Fri Jan 9 23:11:41 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1428 Return-Path: X-Original-To: u-boot-concept@u-boot.org Delivered-To: u-boot-concept@u-boot.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1768000473; bh=rR2PVtin5BOSa6qtpqFhph2tbwRBIj5IOAvEQ3enxtw=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=EzCQVuahCoh2GfGBxUVR4ADu7rKmpsEt/aKqGSJTNXIfDYtj1TQ+rFftxgg+8X+Y7 ZZqM8vjfR54miviUOH1SpqPm4sM+JEo1RzeQvjTLv7KdAq+MsHgkBwvlL/AcGKJvPd QQvxFHnae5iivCJ4oj0f0JmNz9PT4q9TvYgaNYIjjTRYIhYt8xceGDo11x8kNDPFSF BrDft24pwIC6Yh+sDmMh2P7BC6wcrlP5vbRVgaJoXJJynuEnFQsIVlevSWH8uBULMp bk3868gxfbL4VJ+nSqmanuJmIv4qUNwZYT5O1scJlQujudqUjb71ec7osX8FR4tE3d yrFpI9xCrwl0Q== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 8A2D869252 for ; Fri, 9 Jan 2026 16:14:33 -0700 (MST) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id wfqs_biL6vG2 for ; Fri, 9 Jan 2026 16:14:33 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1768000473; bh=rR2PVtin5BOSa6qtpqFhph2tbwRBIj5IOAvEQ3enxtw=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=EzCQVuahCoh2GfGBxUVR4ADu7rKmpsEt/aKqGSJTNXIfDYtj1TQ+rFftxgg+8X+Y7 ZZqM8vjfR54miviUOH1SpqPm4sM+JEo1RzeQvjTLv7KdAq+MsHgkBwvlL/AcGKJvPd QQvxFHnae5iivCJ4oj0f0JmNz9PT4q9TvYgaNYIjjTRYIhYt8xceGDo11x8kNDPFSF BrDft24pwIC6Yh+sDmMh2P7BC6wcrlP5vbRVgaJoXJJynuEnFQsIVlevSWH8uBULMp bk3868gxfbL4VJ+nSqmanuJmIv4qUNwZYT5O1scJlQujudqUjb71ec7osX8FR4tE3d yrFpI9xCrwl0Q== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 7A6A269241 for ; Fri, 9 Jan 2026 16:14:33 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1768000472; bh=tZ3n0vEyFKpX9ezB4fB4Xg3bZfEV6MKiulXRY/9BnDQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vHLLXovACzjne/fg1XSyOMPg3pM3X9ClwvbLH7ekLf4JeqUuS+hyJi6G4kwBdTOzl B6ENDICWcWpzI3HGYGHmi39pyjrKw1ZCpEa7iAAw7H36lTZAbGW0ybdOg/V/qFX+28 8eTutyXbTFbgExz3jvN7sM4zZUvsvEpRYNHYxB5vHXbiaiOJZ5I5HpNfEOVxw+KmRU /Q8EFoU7GFgmy+zW5zLA9LYl4K4BpfYDCOHE9eNXM2oSKncpBZZXLNZ4X3bh2x6BEM oCB/bD0bSiDh+bftfxWW7aODL07Zxxm7wimTLTWTp2vIh0yJuR1sNqXK1v9o9uzw4+ JUUS65jFut2kw== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 25C9369218; Fri, 9 Jan 2026 16:14:32 -0700 (MST) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10026) with ESMTP id PFcdtBOSLdNZ; Fri, 9 Jan 2026 16:14:32 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1768000468; bh=XkGfRudhNd2FCewd8c/I3eMqUrgV1VE1G5PYiAii5so=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Vei7O0OoK0h+Ys60P1HZG+C0k3AkRnZ+1l1BHP00UrChiC/E8fNy8af6LnDTiU03C QY5GSeOURwqMKLqgMdqheitWIMJDYuHSzEeuBwxml1E0AfcGVO6P+ezp4Ri0Wa7Cva o9dVqEj4VYSdsP+NCvsRTtm+Feq9kifi9z4Vo7oHNv9DlIgnrRjQ2v1Y9v3cqpNyia GiIcBSLf8wtormpZmNsdCpwqG1PEyQMcAR7/waO2QLvhivCekFrnf9Se+xaYBdbycD Hi/hfiZjc5kdnY7rzTA/eFefXydyrXUYeP9sEJTK2W+BsCypUCIuCVJkEMH08KhQcf eqY+mlC6OZ4jQ== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id B7F4469221; Fri, 9 Jan 2026 16:14:27 -0700 (MST) From: Simon Glass To: U-Boot Concept Date: Fri, 9 Jan 2026 16:11:41 -0700 Message-ID: <20260109231151.4056804-33-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260109231151.4056804-1-sjg@u-boot.org> References: <20260109231151.4056804-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: Z2RQEXB2I32FJVVIGQBYD4JEJC443JP3 X-Message-ID-Hash: Z2RQEXB2I32FJVVIGQBYD4JEJC443JP3 X-MailFrom: sjg@u-boot.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Heinrich Schuchardt , Simon Glass , "Claude Opus 4 . 5" X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 32/32] boot: pxe: Extract boot preparation into separate function List-Id: Discussion and patches related to U-Boot Concept Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Simon Glass Move the localboot handling and file loading code from label_boot() into a new helper function label_boot_prep(). This function: - Handles localboot directive if present - Falls back to generate_localboot() if needed - Loads files via pxe_load_label() The pxe_setup_label() call remains in label_boot() to set up boot parameters after files are loaded. Returns: - 0 to continue with boot - 1 to skip this label (negative localboot_val) - negative error code on failure This improves code organisation and makes the main boot flow clearer. Co-developed-by: Claude Opus 4.5 Signed-off-by: Simon Glass --- boot/pxe_utils.c | 66 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 46 insertions(+), 20 deletions(-) diff --git a/boot/pxe_utils.c b/boot/pxe_utils.c index 49934d626ee..52032d683c3 100644 --- a/boot/pxe_utils.c +++ b/boot/pxe_utils.c @@ -818,11 +818,50 @@ int pxe_setup_label(struct pxe_context *ctx, struct pxe_label *label) return 0; } +/** + * label_boot_prep() - Prepare a label for booting + * + * Handles localboot directive if present and loads all files needed for boot + * (kernel, initrd, FDT, overlays). For positive localboot_val, attempts + * localboot and falls back to generate_localboot() if needed. For negative + * localboot_val, indicates the label should be skipped. + * + * @ctx: PXE context + * @label: Label to process + * Return: 0 to continue booting, 1 to skip this label, -ve on error + */ +static int label_boot_prep(struct pxe_context *ctx, struct pxe_label *label) +{ + int ret; + + if (label->localboot) { + if (label->localboot_val >= 0) { + ret = label_localboot(label); + + if (IS_ENABLED(CONFIG_BOOTMETH_EXTLINUX_LOCALBOOT) && + ret == -ENOENT) + ret = generate_localboot(label); + if (ret) + return ret; + } else { + return 1; /* skip this label */ + } + } + + /* Load files if not already done */ + if (!ctx->label) { + ret = pxe_load_label(ctx, label); + if (ret) + return 1; + } + + return 0; +} + /** * label_boot() - Boot according to the contents of a pxe_label * - * If we can't boot for any reason, we return. A successful boot never - * returns. + * If we can't boot for any reason, we return. A successful boot never returns. * * The kernel will be stored in the location given by the 'kernel_addr_r' * environment variable. @@ -835,7 +874,7 @@ int pxe_setup_label(struct pxe_context *ctx, struct pxe_label *label) * * @ctx: PXE context * @label: Label to process - * Returns does not return on success, otherwise returns 0 if a localboot + * Return: does not return on success, otherwise returns 0 if a localboot * label was processed, or 1 on error */ static int label_boot(struct pxe_context *ctx, struct pxe_label *label) @@ -851,25 +890,12 @@ static int label_boot(struct pxe_context *ctx, struct pxe_label *label) label->attempted = 1; - if (label->localboot) { - if (label->localboot_val >= 0) { - ret = label_localboot(label); - - if (IS_ENABLED(CONFIG_BOOTMETH_EXTLINUX_LOCALBOOT) && - ret == -ENOENT) - ret = generate_localboot(label); - if (ret) - return ret; - } else { - return 0; - } - } + ret = label_boot_prep(ctx, label); + if (ret) + return ret > 0 ? 0 : ret; - /* Load files and set up boot params if not already done */ + /* Set up boot params if not already done */ if (!ctx->label) { - ret = pxe_load_label(ctx, label); - if (ret) - return 1; ret = pxe_setup_label(ctx, label); if (ret) return 1;