From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 14 Apr 2025 08:32:49 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1u4DNB-000WyE-2m for lore@lore.pengutronix.de; Mon, 14 Apr 2025 08:32:49 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1u4DNA-0001NT-Py for lore@pengutronix.de; Mon, 14 Apr 2025 08:32:49 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=pbRmwEpBKVDHPURwK7nlKJ9h9AkhBPgsJHTsRQSapkk=; b=BJg4nAzXlbyKNF15Yh6ubCnynH 2jpBl12EO/aiu8qTn5i1EV7an9yaH+w0TmwjZv27lLKE1UH+G0WxMtLfnzDdYIweVRcj+aLhq/zMU wumyJEKkGMGA72ctoV6KWdsLL2CtVOZ5EQO5QhhytiP80Ltp3ffWARI60wRB8UcY6Hwb6R5q8YN1r 5IXv4IQdvyj4E9p9XmxxmuhclSm5CLX37QDxm5O58c4d1MBW7kQhhfXABQWGP0n9CzEtYDxJul9XM ARR0g7F8wvCOr0FKM3SdBv101TMd//eMf2g79eRWkbiidjkg2uo6KbjoagXqjhvXt5roJH2/eV3kc 0fExIHbg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1u4DMh-00000000nuT-1zEj; Mon, 14 Apr 2025 06:32:19 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1u4DMJ-00000000npk-0JqH for barebox@lists.infradead.org; Mon, 14 Apr 2025 06:31:57 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1u4DMH-0000lI-SF; Mon, 14 Apr 2025 08:31:53 +0200 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1u4DMH-000Chj-28; Mon, 14 Apr 2025 08:31:53 +0200 Received: from localhost ([::1] helo=dude05.red.stw.pengutronix.de) by dude05.red.stw.pengutronix.de with esmtp (Exim 4.96) (envelope-from ) id 1u4DMH-00BUi8-1o; Mon, 14 Apr 2025 08:31:53 +0200 From: Ahmad Fatoum To: barebox@lists.infradead.org Cc: Ahmad Fatoum Date: Mon, 14 Apr 2025 08:31:40 +0200 Message-Id: <20250414063152.2736649-7-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250414063152.2736649-1-a.fatoum@pengutronix.de> References: <20250414063152.2736649-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250413_233155_143224_093732C5 X-CRM114-Status: GOOD ( 16.76 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-5.2 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH 06/18] blspec: collect bootloader spec entries from ESP X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) The spec points out that spec entries should be collected from ESP, even when XBOOTLDR partitions exist, but at a lower priority. Implement this logic in barebox. As barebox as EFI payload systems have an ESP, but may have the bootloader spec files in a separate partition, we can't skip the walk through all partitions when we have an ESP like we do for XBOOTLDR partitions. Signed-off-by: Ahmad Fatoum --- common/blspec.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/common/blspec.c b/common/blspec.c index adc3fb2e2ea2..dd3bb1c167d7 100644 --- a/common/blspec.c +++ b/common/blspec.c @@ -504,6 +504,7 @@ static int blspec_scan_disk(struct bootscanner *scanner, { struct cdev *partcdev; int ret, err = 0, found = 0; + bool have_esp = false; for_each_cdev_partition(partcdev, cdev) { struct cdev *match = NULL; @@ -517,9 +518,13 @@ static int blspec_scan_disk(struct bootscanner *scanner, * - GPT disk label, and a partition with the GPT type GUID of * bc13c2ff-59e6-4262-a352-b275fd6f7172 already exists * + * - an EFI System Partition and none of the above + * * it should be used as $BOOT */ - if (cdev_is_mbr_partitioned(cdev)) { + if (partcdev->flags & DEVFS_PARTITION_BOOTABLE_ESP) + have_esp = true; + else if (cdev_is_mbr_partitioned(cdev)) { if (partcdev->dos_partition_type == 0xea) match = partcdev; } else if (cdev_is_gpt_partitioned(cdev)) { @@ -537,6 +542,25 @@ static int blspec_scan_disk(struct bootscanner *scanner, err = ret ?: -ENOENT; } + if (!have_esp) + goto out; + + for_each_cdev_partition(partcdev, cdev) { + if (!(partcdev->flags & DEVFS_PARTITION_BOOTABLE_ESP)) + continue; + + /* + * ESP is only a fallback. If we have an ESP, but no bootloader spec + * files inside, this is not an error. + */ + ret = boot_scan_cdev(scanner, bootentries, partcdev, true); + if (ret >= 0) + found += ret; + else + err = ret; + } + +out: return found ?: err; } -- 2.39.5