]> git.sur5r.net Git - u-boot/blobdiff - disk/part_efi.c
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
[u-boot] / disk / part_efi.c
index 20d33ef275ffe7618277b33dde051e1a7671bf08..2945892a24d225d910e16720295e88dd01b8666e 100644 (file)
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2008 RuggedCom, Inc.
  * Richard Retanubun <RichardRetanubun@RuggedCom.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /*
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#ifdef HAVE_BLOCK_DEVICE
+/*
+ * GUID for basic data partions.
+ */
+static const efi_guid_t partition_basic_data_guid = PARTITION_BASIC_DATA_GUID;
+
+#ifdef CONFIG_HAVE_BLOCK_DEVICE
 /**
  * efi_crc32() - EFI version of crc32 function
  * @buf: buffer to calculate crc32 of
@@ -178,6 +182,37 @@ static void prepare_backup_gpt_header(gpt_header *gpt_h)
  * Public Functions (include/part.h)
  */
 
+/*
+ * UUID is displayed as 32 hexadecimal digits, in 5 groups,
+ * separated by hyphens, in the form 8-4-4-4-12 for a total of 36 characters
+ */
+int get_disk_guid(struct blk_desc * dev_desc, char *guid)
+{
+       ALLOC_CACHE_ALIGN_BUFFER_PAD(gpt_header, gpt_head, 1, dev_desc->blksz);
+       gpt_entry *gpt_pte = NULL;
+       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__);
+               }
+       }
+
+       guid_bin = gpt_head->disk_guid.b;
+       uuid_bin_to_str(guid_bin, guid, UUID_STR_FORMAT_GUID);
+
+       return 0;
+}
+
 void part_print_efi(struct blk_desc *dev_desc)
 {
        ALLOC_CACHE_ALIGN_BUFFER_PAD(gpt_header, gpt_head, 1, dev_desc->blksz);
@@ -319,9 +354,7 @@ static int part_test_efi(struct blk_desc *dev_desc)
 static int set_protective_mbr(struct blk_desc *dev_desc)
 {
        /* Setup the Protective MBR */
-       ALLOC_CACHE_ALIGN_BUFFER(legacy_mbr, p_mbr, 1);
-       memset(p_mbr, 0, sizeof(*p_mbr));
-
+       ALLOC_CACHE_ALIGN_BUFFER_PAD(legacy_mbr, p_mbr, 1, dev_desc->blksz);
        if (p_mbr == NULL) {
                printf("%s: calloc failed!\n", __func__);
                return -1;
@@ -329,10 +362,14 @@ static int set_protective_mbr(struct blk_desc *dev_desc)
 
        /* Read MBR to backup boot code if it exists */
        if (blk_dread(dev_desc, 0, 1, p_mbr) != 1) {
-               error("** Can't read from device %d **\n", dev_desc->devnum);
+               pr_err("** Can't read from device %d **\n", dev_desc->devnum);
                return -1;
        }
 
+       /* Clear all data in MBR except of backed up boot code */
+       memset((char *)p_mbr + MSDOS_MBR_BOOT_CODE_SIZE, 0, sizeof(*p_mbr) -
+                       MSDOS_MBR_BOOT_CODE_SIZE);
+
        /* Append signature */
        p_mbr->signature = MSDOS_MBR_SIGNATURE;
        p_mbr->partition_record[0].sys_ind = EFI_PMBR_OSTYPE_EFI_GPT;
@@ -397,11 +434,11 @@ int write_gpt_table(struct blk_desc *dev_desc,
        return -1;
 }
 
-int gpt_fill_pte(gpt_header *gpt_h, gpt_entry *gpt_e,
-               disk_partition_t *partitions, int parts)
+int gpt_fill_pte(struct blk_desc *dev_desc,
+                gpt_header *gpt_h, gpt_entry *gpt_e,
+                disk_partition_t *partitions, int parts)
 {
        lbaint_t offset = (lbaint_t)le64_to_cpu(gpt_h->first_usable_lba);
-       lbaint_t start;
        lbaint_t last_usable_lba = (lbaint_t)
                        le64_to_cpu(gpt_h->last_usable_lba);
        int i, k;
@@ -414,27 +451,44 @@ int gpt_fill_pte(gpt_header *gpt_h, gpt_entry *gpt_e,
        char *str_type_guid;
        unsigned char *bin_type_guid;
 #endif
+       size_t hdr_start = gpt_h->my_lba;
+       size_t hdr_end = hdr_start + 1;
+
+       size_t pte_start = gpt_h->partition_entry_lba;
+       size_t pte_end = pte_start +
+               gpt_h->num_partition_entries * gpt_h->sizeof_partition_entry /
+               dev_desc->blksz;
 
        for (i = 0; i < parts; i++) {
                /* partition starting lba */
-               start = partitions[i].start;
-               if (start && (start < offset)) {
-                       printf("Partition overlap\n");
-                       return -1;
-               }
+               lbaint_t start = partitions[i].start;
+               lbaint_t size = partitions[i].size;
+
                if (start) {
-                       gpt_e[i].starting_lba = cpu_to_le64(start);
-                       offset = start + partitions[i].size;
+                       offset = start + size;
                } else {
-                       gpt_e[i].starting_lba = cpu_to_le64(offset);
-                       offset += partitions[i].size;
+                       start = offset;
+                       offset += size;
+               }
+
+               /*
+                * If our partition overlaps with either the GPT
+                * header, or the partition entry, reject it.
+                */
+               if (((start < hdr_end && hdr_start < (start + size)) ||
+                    (start < pte_end && pte_start < (start + size)))) {
+                       printf("Partition overlap\n");
+                       return -1;
                }
+
+               gpt_e[i].starting_lba = cpu_to_le64(start);
+
                if (offset > (last_usable_lba + 1)) {
                        printf("Partitions layout exceds disk size\n");
                        return -1;
                }
                /* partition ending lba */
-               if ((i == parts - 1) && (partitions[i].size == 0))
+               if ((i == parts - 1) && (size == 0))
                        /* extend the last partition to maximuim */
                        gpt_e[i].ending_lba = gpt_h->last_usable_lba;
                else
@@ -453,12 +507,12 @@ int gpt_fill_pte(gpt_header *gpt_h, gpt_entry *gpt_e,
                } else {
                        /* default partition type GUID */
                        memcpy(bin_type_guid,
-                              &PARTITION_BASIC_DATA_GUID, 16);
+                              &partition_basic_data_guid, 16);
                }
 #else
                /* partition type GUID */
                memcpy(gpt_e[i].partition_type_guid.b,
-                       &PARTITION_BASIC_DATA_GUID, 16);
+                       &partition_basic_data_guid, 16);
 #endif
 
 #if CONFIG_IS_ENABLED(PARTITION_UUIDS)
@@ -494,7 +548,7 @@ int gpt_fill_pte(gpt_header *gpt_h, gpt_entry *gpt_e,
                debug("%s: name: %s offset[%d]: 0x" LBAF
                      " size[%d]: 0x" LBAF "\n",
                      __func__, partitions[i].name, i,
-                     offset, i, partitions[i].size);
+                     offset, i, size);
        }
 
        return 0;
@@ -503,6 +557,7 @@ int gpt_fill_pte(gpt_header *gpt_h, gpt_entry *gpt_e,
 static uint32_t partition_entries_offset(struct blk_desc *dev_desc)
 {
        uint32_t offset_blks = 2;
+       uint32_t __maybe_unused offset_bytes;
        int __maybe_unused config_offset;
 
 #if defined(CONFIG_EFI_PARTITION_ENTRIES_OFF)
@@ -514,8 +569,9 @@ static uint32_t partition_entries_offset(struct blk_desc *dev_desc)
         * the disk) for the entries can be set in
         * CONFIG_EFI_PARTITION_ENTRIES_OFF.
         */
-       offset_blks =
+       offset_bytes =
                PAD_TO_BLOCKSIZE(CONFIG_EFI_PARTITION_ENTRIES_OFF, dev_desc);
+       offset_blks = offset_bytes / dev_desc->blksz;
 #endif
 
 #if defined(CONFIG_OF_CONTROL)
@@ -527,8 +583,10 @@ static uint32_t partition_entries_offset(struct blk_desc *dev_desc)
        config_offset = fdtdec_get_config_int(gd->fdt_blob,
                                              "u-boot,efi-partition-entries-offset",
                                              -EINVAL);
-       if (config_offset != -EINVAL)
-               offset_blks = PAD_TO_BLOCKSIZE(config_offset, dev_desc);
+       if (config_offset != -EINVAL) {
+               offset_bytes = PAD_TO_BLOCKSIZE(config_offset, dev_desc);
+               offset_blks = offset_bytes / dev_desc->blksz;
+       }
 #endif
 
        debug("efi: partition entries offset (in blocks): %d\n", offset_blks);
@@ -570,25 +628,27 @@ int gpt_fill_header(struct blk_desc *dev_desc, gpt_header *gpt_h,
 int gpt_restore(struct blk_desc *dev_desc, char *str_disk_guid,
                disk_partition_t *partitions, int parts_count)
 {
-       int ret;
-
-       gpt_header *gpt_h = calloc(1, PAD_TO_BLOCKSIZE(sizeof(gpt_header),
-                                                      dev_desc));
+       gpt_header *gpt_h;
        gpt_entry *gpt_e;
+       int ret, size;
 
+       size = PAD_TO_BLOCKSIZE(sizeof(gpt_header), dev_desc);
+       gpt_h = malloc_cache_aligned(size);
        if (gpt_h == NULL) {
                printf("%s: calloc failed!\n", __func__);
                return -1;
        }
+       memset(gpt_h, 0, size);
 
-       gpt_e = calloc(1, PAD_TO_BLOCKSIZE(GPT_ENTRY_NUMBERS
-                                              * sizeof(gpt_entry),
-                                              dev_desc));
+       size = PAD_TO_BLOCKSIZE(GPT_ENTRY_NUMBERS * sizeof(gpt_entry),
+                               dev_desc);
+       gpt_e = malloc_cache_aligned(size);
        if (gpt_e == NULL) {
                printf("%s: calloc failed!\n", __func__);
                free(gpt_h);
                return -1;
        }
+       memset(gpt_e, 0, size);
 
        /* Generate Primary GPT header (LBA1) */
        ret = gpt_fill_header(dev_desc, gpt_h, str_disk_guid, parts_count);
@@ -596,7 +656,7 @@ int gpt_restore(struct blk_desc *dev_desc, char *str_disk_guid,
                goto err;
 
        /* Generate partition entries */
-       ret = gpt_fill_pte(gpt_h, gpt_e, partitions, parts_count);
+       ret = gpt_fill_pte(dev_desc, gpt_h, gpt_e, partitions, parts_count);
        if (ret)
                goto err;
 
@@ -664,7 +724,7 @@ int gpt_verify_partitions(struct blk_desc *dev_desc,
 
        for (i = 0; i < parts; i++) {
                if (i == gpt_head->num_partition_entries) {
-                       error("More partitions than allowed!\n");
+                       pr_err("More partitions than allowed!\n");
                        return -1;
                }
 
@@ -677,7 +737,7 @@ int gpt_verify_partitions(struct blk_desc *dev_desc,
 
                if (strncmp(efi_str, (char *)partitions[i].name,
                            sizeof(partitions->name))) {
-                       error("Partition name: %s does not match %s!\n",
+                       pr_err("Partition name: %s does not match %s!\n",
                              efi_str, (char *)partitions[i].name);
                        return -1;
                }
@@ -694,7 +754,7 @@ int gpt_verify_partitions(struct blk_desc *dev_desc,
                        if ((i == parts - 1) && (partitions[i].size == 0))
                                continue;
 
-                       error("Partition %s size: %llu does not match %llu!\n",
+                       pr_err("Partition %s size: %llu does not match %llu!\n",
                              efi_str, (unsigned long long)gpt_part_size,
                              (unsigned long long)partitions[i].size);
                        return -1;
@@ -715,7 +775,7 @@ int gpt_verify_partitions(struct blk_desc *dev_desc,
                      (unsigned long long)partitions[i].start);
 
                if (le64_to_cpu(gpt_e[i].starting_lba) != partitions[i].start) {
-                       error("Partition %s start: %llu does not match %llu!\n",
+                       pr_err("Partition %s start: %llu does not match %llu!\n",
                              efi_str, le64_to_cpu(gpt_e[i].starting_lba),
                              (unsigned long long)partitions[i].start);
                        return -1;
@@ -871,11 +931,20 @@ static int is_pmbr_valid(legacy_mbr * mbr)
 static int is_gpt_valid(struct blk_desc *dev_desc, u64 lba,
                        gpt_header *pgpt_head, gpt_entry **pgpt_pte)
 {
+       /* Confirm valid arguments prior to allocation. */
        if (!dev_desc || !pgpt_head) {
                printf("%s: Invalid Argument(s)\n", __func__);
                return 0;
        }
 
+       ALLOC_CACHE_ALIGN_BUFFER_PAD(legacy_mbr, mbr, 1, dev_desc->blksz);
+
+       /* Read MBR Header from device */
+       if (blk_dread(dev_desc, 0, 1, (ulong *)mbr) != 1) {
+               printf("*** ERROR: Can't read MBR header ***\n");
+               return 0;
+       }
+
        /* Read GPT Header from device */
        if (blk_dread(dev_desc, (lbaint_t)lba, 1, pgpt_head) != 1) {
                printf("*** ERROR: Can't read GPT header ***\n");
@@ -885,6 +954,18 @@ static int is_gpt_valid(struct blk_desc *dev_desc, u64 lba,
        if (validate_gpt_header(pgpt_head, (lbaint_t)lba, dev_desc->lba))
                return 0;
 
+       if (dev_desc->sig_type == SIG_TYPE_NONE) {
+               efi_guid_t empty = {};
+               if (memcmp(&pgpt_head->disk_guid, &empty, sizeof(empty))) {
+                       dev_desc->sig_type = SIG_TYPE_GUID;
+                       memcpy(&dev_desc->guid_sig, &pgpt_head->disk_guid,
+                             sizeof(empty));
+               } else if (mbr->unique_mbr_signature != 0) {
+                       dev_desc->sig_type = SIG_TYPE_MBR;
+                       dev_desc->mbr_sig = mbr->unique_mbr_signature;
+               }
+       }
+
        /* Read and allocate Partition Table Entries */
        *pgpt_pte = alloc_read_gpt_entries(dev_desc, pgpt_head);
        if (*pgpt_pte == NULL) {