| Message ID | Y2rgVIbtuDsySzBr@makrotopia.org |
|---|---|
| State | New |
| Headers | show |
| Series | [v4,1/5] block: add new flag to add partitions read-only | expand |
On Tue, 08 Nov 2022, Daniel Golle wrote: >Add new GUID allowing to parse uImage.FIT stored in a GPT partition >and map filesystem sub-image as sub-partitions. > >Signed-off-by: Daniel Golle <daniel@makrotopia.org> >--- > block/partitions/efi.c | 9 +++++++++ > block/partitions/efi.h | 3 +++ > 2 files changed, 12 insertions(+) > >diff --git a/block/partitions/efi.c b/block/partitions/efi.c >index 5e9be13a56a8..bf87893eabe4 100644 >--- a/block/partitions/efi.c >+++ b/block/partitions/efi.c >@@ -716,6 +716,9 @@ int efi_partition(struct parsed_partitions *state) > gpt_entry *ptes = NULL; > u32 i; > unsigned ssz = queue_logical_block_size(state->disk->queue) / 512; >+#ifdef CONFIG_FIT_PARTITION >+ u32 extra_slot = 65; >+#endif You can move this in the branch below where you call parse_fit_partitions(). > > if (!find_valid_gpt(state, &gpt, &ptes) || !gpt || !ptes) { > kfree(gpt); >@@ -749,6 +752,12 @@ int efi_partition(struct parsed_partitions *state) > ARRAY_SIZE(ptes[i].partition_name)); > utf16_le_to_7bit(ptes[i].partition_name, label_max, info->volname); > state->parts[i + 1].has_info = true; >+ /* If this is a U-Boot FIT volume it may have subpartitions */ >+#ifdef CONFIG_FIT_PARTITION >+ if (!efi_guidcmp(ptes[i].partition_type_guid, PARTITION_LINUX_FIT_GUID)) >+ (void) parse_fit_partitions(state, start * ssz, size * ssz, >+ &extra_slot, 127, 1); >+#endif > } > kfree(ptes); > kfree(gpt); >diff --git a/block/partitions/efi.h b/block/partitions/efi.h >index 84b9f36b9e47..06c11f6ae398 100644 >--- a/block/partitions/efi.h >+++ b/block/partitions/efi.h >@@ -51,6 +51,9 @@ > #define PARTITION_LINUX_LVM_GUID \ > EFI_GUID( 0xe6d6d379, 0xf507, 0x44c2, \ > 0xa2, 0x3c, 0x23, 0x8f, 0x2a, 0x3d, 0xf9, 0x28) >+#define PARTITION_LINUX_FIT_GUID \ >+ EFI_GUID( 0xcae9be83, 0xb15f, 0x49cc, \ >+ 0x86, 0x3f, 0x08, 0x1b, 0x74, 0x4a, 0x2d, 0x93) > > typedef struct _gpt_header { > __le64 signature; >-- >2.38.1 >
diff --git a/block/partitions/efi.c b/block/partitions/efi.c index 5e9be13a56a8..bf87893eabe4 100644 --- a/block/partitions/efi.c +++ b/block/partitions/efi.c @@ -716,6 +716,9 @@ int efi_partition(struct parsed_partitions *state) gpt_entry *ptes = NULL; u32 i; unsigned ssz = queue_logical_block_size(state->disk->queue) / 512; +#ifdef CONFIG_FIT_PARTITION + u32 extra_slot = 65; +#endif if (!find_valid_gpt(state, &gpt, &ptes) || !gpt || !ptes) { kfree(gpt); @@ -749,6 +752,12 @@ int efi_partition(struct parsed_partitions *state) ARRAY_SIZE(ptes[i].partition_name)); utf16_le_to_7bit(ptes[i].partition_name, label_max, info->volname); state->parts[i + 1].has_info = true; + /* If this is a U-Boot FIT volume it may have subpartitions */ +#ifdef CONFIG_FIT_PARTITION + if (!efi_guidcmp(ptes[i].partition_type_guid, PARTITION_LINUX_FIT_GUID)) + (void) parse_fit_partitions(state, start * ssz, size * ssz, + &extra_slot, 127, 1); +#endif } kfree(ptes); kfree(gpt); diff --git a/block/partitions/efi.h b/block/partitions/efi.h index 84b9f36b9e47..06c11f6ae398 100644 --- a/block/partitions/efi.h +++ b/block/partitions/efi.h @@ -51,6 +51,9 @@ #define PARTITION_LINUX_LVM_GUID \ EFI_GUID( 0xe6d6d379, 0xf507, 0x44c2, \ 0xa2, 0x3c, 0x23, 0x8f, 0x2a, 0x3d, 0xf9, 0x28) +#define PARTITION_LINUX_FIT_GUID \ + EFI_GUID( 0xcae9be83, 0xb15f, 0x49cc, \ + 0x86, 0x3f, 0x08, 0x1b, 0x74, 0x4a, 0x2d, 0x93) typedef struct _gpt_header { __le64 signature;
Add new GUID allowing to parse uImage.FIT stored in a GPT partition and map filesystem sub-image as sub-partitions. Signed-off-by: Daniel Golle <daniel@makrotopia.org> --- block/partitions/efi.c | 9 +++++++++ block/partitions/efi.h | 3 +++ 2 files changed, 12 insertions(+)