disk: efi: unify code for finding a valid gpt
PATCH v2 1/2 disk: efi: unify code for finding a valid gpt
There were 3 copies of the same sequence, make it into a function.
Signed-off-by Urja Rannikko <[email protected]>
---
v2: Just a rebase.
-
disk/part_efi.c | 73 +++++++++++++++++++++++-------------------------- 1 file changed, 34 insertions(+), 39 deletions(-)
disk/part_efi.c +34 -39
@@ -51,6 +51,8 @@ static int is_gpt_valid(struct blk_desc *dev_desc, u64 lba,static gpt_entry *alloc_read_gpt_entries (struct blk_desc *dev_desc,gpt_header *pgpt_head);static int is_pte_valid (gpt_entry * pte); +static int find_valid_gpt (struct blk_desc *dev_desc,gpt_header *gpt_head, +gpt_entry **pgpt_pte);static char *print_efiname (gpt_entry *pte) {
@@ -192,19 +194,8 @@ int get_disk_guid(struct blk_desc * dev_desc, char *guid)unsigned char *guid_bin;/* This function validates AND fills in the GPT header and PTE */ -if (is_gpt_valid (dev_desc,GPT_PRIMARY_PARTITION_TABLE_LBA , - gpt_head, &gpt_pte) !=1 ) { -printf ("%s: *** ERROR: Invalid GPT ***\n" , __func__); -if (is_gpt_valid (dev_desc, dev_desc->lba -1 , - gpt_head, &gpt_pte) !=1 ) { -printf ("%s: *** ERROR: Invalid Backup GPT ***\n" , - __func__); -return -EINVAL ; - }else { -printf ("%s: *** Using Backup GPT ***\n" , - __func__); - } - } +if (find_valid_gpt (dev_desc, gpt_head, &gpt_pte) !=1 ) +return -EINVAL ; guid_bin = gpt_head->disk_guid.b;uuid_bin_to_str (guid_bin, guid,UUID_STR_FORMAT_GUID );
@@ -221,19 +212,8 @@ void part_print_efi(struct blk_desc *dev_desc)unsigned char *uuid_bin;/* This function validates AND fills in the GPT header and PTE */ -if (is_gpt_valid (dev_desc,GPT_PRIMARY_PARTITION_TABLE_LBA , - gpt_head, &gpt_pte) !=1 ) { -printf ("%s: *** ERROR: Invalid GPT ***\n" , __func__); -if (is_gpt_valid (dev_desc, (dev_desc->lba -1 ), - gpt_head, &gpt_pte) !=1 ) { -printf ("%s: *** ERROR: Invalid Backup GPT ***\n" , - __func__); -return ; - }else { -printf ("%s: *** Using Backup GPT ***\n" , - __func__); - } - } +if (find_valid_gpt (dev_desc, gpt_head, &gpt_pte) !=1 ) +return ;debug ("%s: gpt-entry at %p\n" , __func__, gpt_pte);
@@ -282,19 +262,8 @@ int part_get_info_efi(struct blk_desc *dev_desc, int part, }/* This function validates AND fills in the GPT header and PTE */ -if (is_gpt_valid (dev_desc,GPT_PRIMARY_PARTITION_TABLE_LBA , - gpt_head, &gpt_pte) !=1 ) { -printf ("%s: *** ERROR: Invalid GPT ***\n" , __func__); -if (is_gpt_valid (dev_desc, (dev_desc->lba -1 ), - gpt_head, &gpt_pte) !=1 ) { -printf ("%s: *** ERROR: Invalid Backup GPT ***\n" , - __func__); -return -1 ; - }else { -printf ("%s: *** Using Backup GPT ***\n" , - __func__); - } - } +if (find_valid_gpt (dev_desc, gpt_head, &gpt_pte) !=1 ) +return -1 ;if (part >le32_to_cpu (gpt_head->num_partition_entries) || !is_pte_valid (&gpt_pte[part -1 ])) {
@@ -981,6 +950,32 @@ static int is_gpt_valid(struct blk_desc *dev_desc, u64 lba,return 1 ; } +/** +* find_valid_gpt() - finds a valid GPT header and PTEs +* +* gpt is a GPT header ptr, filled on return. +* ptes is a PTEs ptr, filled on return. +* +* Description: returns 1 if found a valid gpt, 0 on error. +* If valid, returns pointers to PTEs. +*/ +static int find_valid_gpt (struct blk_desc *dev_desc,gpt_header *gpt_head, +gpt_entry **pgpt_pte) +{ +if (is_gpt_valid (dev_desc,GPT_PRIMARY_PARTITION_TABLE_LBA , + gpt_head, pgpt_pte) !=1 ) { +printf ("%s: *** ERROR: Invalid GPT ***\n" , __func__); +if (is_gpt_valid (dev_desc, (dev_desc->lba -1 ), + gpt_head, pgpt_pte) !=1 ) { +printf ("%s: *** ERROR: Invalid Backup GPT ***\n" , + __func__); +return 0 ; + } +printf ("%s: *** Using Backup GPT ***\n" , __func__); + } +return 1 ; +} +/** * alloc_read_gpt_entries(): reads partition entries from disk * @dev_desc
Signature · 1 line
2.21.0
PATCH v2 2/2 disk: efi: ignore 'IGNOREME' GPT header found on cros eMMCs
Some ChromeOS devices (atleast veyron speedy) have the first 8MiB of the eMMC write protected and equipped with a dummy 'IGNOREME' GPT header - instead of spewing error messages about it, just silently try the backup GPT.
Note: this does not touch the gpt cmd writing/verifying functions, those will still complain.
Signed-off-by Urja Rannikko <[email protected]>
---
v2: Just a rebase.
-
disk/part_efi.c | 28 +++++++++++++++++++++------- include/part_efi.h | 2 ++ 2 files changed, 23 insertions(+), 7 deletions(-)
disk/part_efi.c +21 -7
@@ -893,7 +893,7 @@ static int is_pmbr_valid(legacy_mbr * mbr)* gpt is a GPT header ptr, filled on return. * ptes is a PTEs ptr, filled on return. * -* Description: returns 1 if valid, 0 on error. +* Description: returns 1 if valid, 0 on error, 2 if ignored header * If valid, returns pointers to PTEs. */ static int is_gpt_valid(struct blk_desc *dev_desc, u64 lba,
@@ -919,6 +919,12 @@ static int is_gpt_valid(struct blk_desc *dev_desc, u64 lba,return 0 ; } +/* Invalid but nothing to yell about. */ +if (le64_to_cpu (pgpt_head->signature) ==GPT_HEADER_CHROMEOS_IGNORE ) { +debug ("ChromeOS 'IGNOREME' GPT header found and ignored\n" ); +return 2 ; + } +if (validate_gpt_header (pgpt_head, (lbaint_t )lba, dev_desc->lba))return 0 ;
@@ -962,16 +968,24 @@ static int is_gpt_valid(struct blk_desc *dev_desc, u64 lba,static int find_valid_gpt (struct blk_desc *dev_desc,gpt_header *gpt_head,gpt_entry **pgpt_pte) { -if (is_gpt_valid (dev_desc,GPT_PRIMARY_PARTITION_TABLE_LBA , - gpt_head, pgpt_pte) !=1 ) { -printf ("%s: *** ERROR: Invalid GPT ***\n" , __func__); -if (is_gpt_valid (dev_desc, (dev_desc->lba -1 ), - gpt_head, pgpt_pte) !=1 ) { +int r; + + r =is_gpt_valid (dev_desc,GPT_PRIMARY_PARTITION_TABLE_LBA , gpt_head, + pgpt_pte); + +if (r !=1 ) { +if (r !=2 ) +printf ("%s: *** ERROR: Invalid GPT ***\n" , __func__); + +if (is_gpt_valid (dev_desc, (dev_desc->lba -1 ), gpt_head, + pgpt_pte) !=1 ) {printf ("%s: *** ERROR: Invalid Backup GPT ***\n" , __func__);return 0 ; } -printf ("%s: *** Using Backup GPT ***\n" , __func__); +if (r !=2 ) +printf ("%s: *** Using Backup GPT ***\n" , + __func__); }return 1 ; }
include/part_efi.h +2 -0
@@ -25,6 +25,8 @@#define EFI_PMBR_OSTYPE_EFI_GPT 0xEE#define GPT_HEADER_SIGNATURE_UBOOT 0x5452415020494645ULL +#define GPT_HEADER_CHROMEOS_IGNORE 0x454d45524f4e4749ULL // 'IGNOREME' +#define GPT_HEADER_REVISION_V1 0x00010000#define GPT_PRIMARY_PARTITION_TABLE_LBA 1ULL#define GPT_ENTRY_NUMBERS CONFIG_EFI_PARTITION_ENTRIES_NUMBERS
Signature · 1 line
2.21.0