diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2024-02-19 09:31:32 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2024-02-20 11:46:30 +0100 |
| commit | 081561b017ddadbef973acb3b34b9589f4f1e12d (patch) | |
| tree | 6844f34b1b5cda9192a3763ab8a205e74a65b6ae /common/partitions | |
| parent | 57392a862d40a31ac463ad0bd8c158e23a0d6b4a (diff) | |
| download | barebox-081561b017ddadbef973acb3b34b9589f4f1e12d.tar.gz barebox-081561b017ddadbef973acb3b34b9589f4f1e12d.tar.xz | |
partition: efi: keep raw data
Keep raw data for later partition write support.
Link: https://lore.barebox.org/20240219083140.2713047-5-s.hauer@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'common/partitions')
| -rw-r--r-- | common/partitions/efi.c | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/common/partitions/efi.c b/common/partitions/efi.c index 5612f6261b..84d55e6491 100644 --- a/common/partitions/efi.c +++ b/common/partitions/efi.c @@ -22,6 +22,16 @@ #include <efi/partition.h> #include "parser.h" +struct efi_partition_desc { + struct partition_desc pd; /* must be first */ + gpt_header gpt; +}; + +struct efi_partition { + struct partition part; /* must be first */ + gpt_entry pte; +}; + static const int force_gpt = IS_ENABLED(CONFIG_PARTITION_DISK_EFI_GPT_NO_FORCE); /** @@ -437,8 +447,9 @@ static struct partition_desc *efi_partition(void *buf, struct block_device *blk) gpt_entry *ptes = NULL; int i = 0; int nb_part; + struct efi_partition *epart; struct partition *pentry; - struct partition_desc *pd = NULL; + struct efi_partition_desc *epd = NULL; if (!find_valid_gpt(buf, blk, &gpt, &ptes) || !gpt || !ptes) goto out; @@ -456,8 +467,9 @@ static struct partition_desc *efi_partition(void *buf, struct block_device *blk) nb_part = MAX_PARTITION; } - pd = xzalloc(sizeof(*pd)); - INIT_LIST_HEAD(&pd->partitions); + epd = xzalloc(sizeof(*epd)); + INIT_LIST_HEAD(&epd->pd.partitions); + epd->gpt = *gpt; for (i = 0; i < nb_part; i++) { if (!is_pte_valid(&ptes[i], last_lba(blk))) { @@ -465,7 +477,8 @@ static struct partition_desc *efi_partition(void *buf, struct block_device *blk) continue; } - pentry = xzalloc(sizeof(*pentry)); + epart = xzalloc(sizeof(*epart)); + pentry = &epart->part; pentry->first_sec = le64_to_cpu(ptes[i].starting_lba); pentry->size = le64_to_cpu(ptes[i].ending_lba) - pentry->first_sec; pentry->size++; @@ -473,13 +486,13 @@ static struct partition_desc *efi_partition(void *buf, struct block_device *blk) snprintf(pentry->partuuid, sizeof(pentry->partuuid), "%pUl", &ptes[i].unique_partition_guid); pentry->typeuuid = ptes[i].partition_type_guid; pentry->num = i; - list_add_tail(&pentry->list, &pd->partitions); + list_add_tail(&pentry->list, &epd->pd.partitions); } out: kfree(gpt); kfree(ptes); - return pd; + return &epd->pd; } static void efi_partition_free(struct partition_desc *pd) |