[PATCH 2/5] partitions: Start partitions at 8MiB offset

[Sascha Hauer]

There are many SoCs that store the bootloader on the raw eMMC/SD device
outside of partitions. Examples are all i.MX SoCs and Rockchip SoCs.
Until now the first partition starts at offset 1MiB and with this we
risk conflicting with the bootloader.

It's cumbersome to sort out all SoCs that have this problem. With
nowadays eMMC/SD card sizes it doesn't really matter anymore, so change
the 1MiB offset to 8MiB which is still only a small fraction of the
card size, but leaves enough space for putting the bootloader into.

Note the change in the GPT partition handling introduced with this
change. The layout previously was:

LBA0: MBR
LBA1: GPT header
LBA2-33: GPT partition entries

which now becomes:

LBA0: MBR
LBA1: GPT header
LBA16352-16383: GPT partition entries

This means the GPT partition entries moved from LBA2 to just below the
8MiB boundary and LBA2-16351 are now free for the bootloader. This helps
with with older SoCs on which the bootloader overlaps with the normal
location of the GPT partition entries, like i.MX7 and earlier.

Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
---
 common/partitions.c     | 9 +++++++++
 common/partitions/efi.c | 8 ++++++--
 include/partitions.h    | 6 ++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/common/partitions.c b/common/partitions.c
index 25d5f15721fc5980c927863b2745c23d7149da92..b3129ddd5f203c906908adb422e4b8a6dfac25b2 100644
--- a/common/partitions.c
+++ b/common/partitions.c
@@ -186,6 +186,9 @@ int partition_find_free_space(struct partition_desc *pdesc, uint64_t sectors, ui
 	struct partition *p;
 	uint64_t min_sec = PARTITION_ALIGN_SECTORS;
 
+	if (min_sec < partition_first_usable_lba())
+		min_sec = partition_first_usable_lba();
+
 	min_sec = ALIGN(min_sec, PARTITION_ALIGN_SECTORS);
 
 	if (partition_is_free(pdesc, min_sec, sectors)) {
@@ -223,6 +226,12 @@ int partition_create(struct partition_desc *pdesc, const char *name,
 		return -EINVAL;
 	}
 
+	if (lba_start < partition_first_usable_lba()) {
+		pr_err("partition starts before first usable lba: %llu < %llu\n",
+		       lba_start, partition_first_usable_lba());
+		return -EINVAL;
+	}
+
 	list_for_each_entry(part, &pdesc->partitions, list) {
 		if (region_overlap_end(part->first_sec,
 				       part->first_sec + part->size - 1,
diff --git a/common/partitions/efi.c b/common/partitions/efi.c
index 92868e4a77e5688d547ee3f2cac3ab9534a4ebdb..d237f734df50987b2d8ae41f83edc3e744fcf604 100644
--- a/common/partitions/efi.c
+++ b/common/partitions/efi.c
@@ -585,7 +585,7 @@ static __maybe_unused struct partition_desc *efi_partition_create_table(struct b
 	gpt_header *gpt;
 	unsigned int num_partition_entries = 128;
 	unsigned int gpt_size = (sizeof(gpt_entry) * num_partition_entries) / SECTOR_SIZE;
-	unsigned int first_usable_lba = gpt_size + 2;
+	unsigned int first_usable_lba = partition_first_usable_lba();
 
 	partition_desc_init(&epd->pd, blk);
 
@@ -719,7 +719,11 @@ static int efi_protective_mbr(struct block_device *blk)
 		return PTR_ERR(pdesc);
 	}
 
-	ret = partition_create(pdesc, "primary", "0xee", 1, last_lba(blk));
+	/*
+	 * For the protective MBR call directly into the mkpart hook. partition_create()
+	 * does not allow us to create a partition starting at LBA1
+	 */
+	ret = pdesc->parser->mkpart(pdesc, "primary", "0xee", 1, last_lba(blk));
 	if (ret) {
 		pr_err("Cannot create partition: %pe\n", ERR_PTR(ret));
 		goto out;
diff --git a/include/partitions.h b/include/partitions.h
index dd3e631c5aa337d752312cd94be5e7dbb4f527a5..6d97af824845eaf8c73a39e42bd4e9ed88a8e367 100644
--- a/include/partitions.h
+++ b/include/partitions.h
@@ -8,6 +8,7 @@
 #define __PARTITIONS_PARSER_H__
 
 #include <block.h>
+#include <disks.h>
 #include <filetype.h>
 #include <linux/uuid.h>
 #include <linux/list.h>
@@ -71,4 +72,9 @@ void partition_table_free(struct partition_desc *pdesc);
 bool partition_is_free(struct partition_desc *pdesc, uint64_t start, uint64_t size);
 int partition_find_free_space(struct partition_desc *pdesc, uint64_t sectors, uint64_t *start);
 
+static inline uint64_t partition_first_usable_lba(void)
+{
+	return SZ_8M / SECTOR_SIZE;
+}
+
 #endif /* __PARTITIONS_PARSER_H__ */

-- 
2.39.5