From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 31 May 2023 17:01:10 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1q4NK4-004O86-3Y for lore@lore.pengutronix.de; Wed, 31 May 2023 17:01:10 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1q4NJy-0000wb-QY for lore@pengutronix.de; Wed, 31 May 2023 17:01:09 +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=HJGcdfY0smL35t5fA3zItLB7PxdjlbZiuW8pRJIm6EA=; b=XLhja4MsDlxGGgMzRIaQHVGH9P RY0A1YW2+gBIvx1pIYgwzc9oI8Dj1LtlHDeL0TjYLH59ITvJtOyE7jyI8m7turTDDZgNOzLJTSRlS HoPgTb/2Po5DdT+VHO8xfANxL3Df6EmRfRQutIYbPjSxj8omLAMfRb+I9q6dTQTIqgqXi8xyRBnEd 381ZjC6fAHweg5tEIFIZgQ7vPSjnNrQmXF53PrHTvdCotwaF6nvPjKmbUnEzKIFrKAR/hgW1qUnNM vIj7lT4StyoIWi2PVz6/5X4l4m5w8Yiuggs4bMQfDTvlTG8dR+WaGq1ykPxjlzsjhhT1JSsJ3BGBb Qmu4DQEg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q4NIs-000C5r-0G; Wed, 31 May 2023 14:59:58 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q4NIb-000BsT-1g for barebox@lists.infradead.org; Wed, 31 May 2023 14:59:47 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1q4NIU-0008Eo-PC; Wed, 31 May 2023 16:59:34 +0200 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1q4NIU-0048He-3s; Wed, 31 May 2023 16:59:34 +0200 Received: from afa by dude05.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1q4NIQ-005sDW-AP; Wed, 31 May 2023 16:59:30 +0200 From: Ahmad Fatoum To: barebox@lists.infradead.org Cc: Ahmad Fatoum Date: Wed, 31 May 2023 16:59:26 +0200 Message-Id: <20230531145927.1399282-18-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230531145927.1399282-1-a.fatoum@pengutronix.de> References: <20230531145927.1399282-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-20230531_075941_700136_6BF7E9A1 X-CRM114-Status: GOOD ( 14.35 ) 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.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.9 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, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH 17/18] common: partitions: efi: record type UUID in cdev X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) We already record DOS partition type in cdev, so let's do the same for GPT Type UUID. This will be used in a later commit to identify barebox-state partitions. Signed-off-by: Ahmad Fatoum --- common/partitions.c | 2 +- common/partitions/efi.c | 1 + common/partitions/parser.h | 5 ++++- fs/fs.c | 2 ++ include/driver.h | 6 +++++- 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/common/partitions.c b/common/partitions.c index b579559672a0..e3e8a9f3044d 100644 --- a/common/partitions.c +++ b/common/partitions.c @@ -50,7 +50,7 @@ static int register_one_partition(struct block_device *blk, cdev->flags |= DEVFS_PARTITION_FROM_TABLE; - cdev->dos_partition_type = part->dos_partition_type; + cdev->typeuuid = part->typeuuid; strcpy(cdev->partuuid, part->partuuid); free(partition_name); diff --git a/common/partitions/efi.c b/common/partitions/efi.c index df63b82afe24..2756337ab284 100644 --- a/common/partitions/efi.c +++ b/common/partitions/efi.c @@ -471,6 +471,7 @@ static void efi_partition(void *buf, struct block_device *blk, pentry->size++; part_set_efi_name(&ptes[i], pentry->name); snprintf(pentry->partuuid, sizeof(pentry->partuuid), "%pUl", &ptes[i].unique_partition_guid); + pentry->typeuuid = ptes[i].partition_type_guid; pd->used_entries++; } } diff --git a/common/partitions/parser.h b/common/partitions/parser.h index f2f692f7903b..9cc41a7573fe 100644 --- a/common/partitions/parser.h +++ b/common/partitions/parser.h @@ -17,10 +17,13 @@ struct partition { char name[MAX_PARTITION_NAME]; - u8 dos_partition_type; char partuuid[MAX_UUID_STR]; uint64_t first_sec; uint64_t size; + union { + u8 dos_partition_type; + guid_t typeuuid; + }; }; struct partition_desc { diff --git a/fs/fs.c b/fs/fs.c index 9a92e6e251e5..16cc072adfaf 100644 --- a/fs/fs.c +++ b/fs/fs.c @@ -110,6 +110,8 @@ void cdev_print(const struct cdev *cdev) nbytes += printf("Filetype: %s\t", file_type_to_string(cdev->filetype)); if (cdev_is_mbr_partitioned(cdev->master)) nbytes += printf("DOS parttype: 0x%02x\t", cdev->dos_partition_type); + else if (cdev_is_gpt_partitioned(cdev->master)) + nbytes += printf("GPT typeuuid: %pUl\t", &cdev->typeuuid); if (*cdev->partuuid || *cdev->diskuuid) nbytes += printf("%sUUID: %s", cdev_is_partition(cdev) ? "PART" : "DISK", cdev_is_partition(cdev) ? cdev->partuuid : cdev->diskuuid); diff --git a/include/driver.h b/include/driver.h index 5f2eae65466f..6407f7d6ba36 100644 --- a/include/driver.h +++ b/include/driver.h @@ -8,6 +8,7 @@ #include #include +#include #include #include @@ -536,12 +537,15 @@ struct cdev { unsigned int flags; int open; struct mtd_info *mtd; - u8 dos_partition_type; struct cdev *link; struct list_head link_entry, links; struct list_head partition_entry, partitions; struct cdev *master; enum filetype filetype; + union { + u8 dos_partition_type; + guid_t typeuuid; + }; }; int devfs_create(struct cdev *); -- 2.39.2