spl: mmc: Pass eMMC HW partition and SW partition to spl_mmc_get_uboot_raw_sector()
Subsystems (4)
PATCH v2 1/2 spl: mmc: Pass eMMC HW partition and SW partition to spl_mmc_get_uboot_raw_sector()
Pass both eMMC HW partition and software partition numbers to spl_mmc_get_uboot_raw_sector() so the function can better decide which offset within the partition to load payload from.
---
Cc: Jaehoon Chung <[email protected]>
Cc: Peng Fan <[email protected]>
---
V2: No change
--- arch/arm/mach-imx/image-container.c | 2 ++ arch/arm/mach-sunxi/board.c | 2 ++ common/spl/spl_mmc.c | 15 +++++++++------ 3 files changed, 13 insertions(+), 6 deletions(-)
arch/arm/mach-imx/image-container.c +2 -0
@@ -215,6 +215,8 @@ unsigned long spl_spi_get_uboot_offs(struct spi_flash *flash)#ifdef CONFIG_SPL_MMC unsigned long spl_mmc_get_uboot_raw_sector (struct mmc *mmc, +unsigned long hw_part, +unsigned long raw_part,unsigned long raw_sect) {int end;
arch/arm/mach-sunxi/board.c +2 -0
@@ -324,6 +324,8 @@ uint32_t sunxi_get_spl_size(void)* immediately follow the SPL if that is bigger than that. */ unsigned long spl_mmc_get_uboot_raw_sector (struct mmc *mmc, +unsigned long hw_part, +unsigned long raw_part,unsigned long raw_sect) {unsigned long spl_size =sunxi_get_spl_size ();
common/spl/spl_mmc.c +9 -6
@@ -370,6 +370,8 @@ int __weak spl_mmc_boot_partition(const u32 boot_device)#endif unsigned long __weak spl_mmc_get_uboot_raw_sector (struct mmc *mmc, +unsigned long hw_part, +unsigned long raw_part,unsigned long raw_sect) {return raw_sect;
@@ -418,7 +420,7 @@ int spl_mmc_load(struct spl_image_info *spl_image,static struct mmc *mmc;u32 boot_mode;int err =0 ; -__maybe_unused int part =0 ; +__maybe_unused int hw_part =0 ;int mmc_dev;/* Perform peripheral init only once for an mmc device */
@@ -442,12 +444,12 @@ int spl_mmc_load(struct spl_image_info *spl_image, err = -EINVAL ;switch (boot_mode) {case MMCSD_MODE_EMMCBOOT : - part =spl_mmc_emmc_boot_partition (mmc); + hw_part =spl_mmc_emmc_boot_partition (mmc);if (CONFIG_IS_ENABLED (MMC_TINY )) - err =mmc_switch_part (mmc, part); + err =mmc_switch_part (mmc, hw_part);else - err =blk_dselect_hwpart (mmc_get_blk_desc (mmc), part); + err =blk_dselect_hwpart (mmc_get_blk_desc (mmc), hw_part);if (err) {#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
@@ -465,7 +467,8 @@ int spl_mmc_load(struct spl_image_info *spl_image,return err; } - raw_sect =spl_mmc_get_uboot_raw_sector (mmc, raw_sect); + raw_sect =spl_mmc_get_uboot_raw_sector (mmc, hw_part, + raw_part, raw_sect);#ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION err = mmc_load_image_raw_partition(spl_image, bootdev,
@@ -476,7 +479,7 @@ int spl_mmc_load(struct spl_image_info *spl_image,#endif #ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR err =mmc_load_image_raw_sector (spl_image, bootdev, mmc, - raw_sect +spl_mmc_raw_uboot_offset (part)); + raw_sect +spl_mmc_raw_uboot_offset (hw_part));if (!err)return err;#endif
Signature · 1 line
2.39.2
PATCH v2 2/2 spl: mmc: Pass eMMC HW partition 7 through
The eMMC HW partition 0 and 7 both mean USER HW partition. Use this as a mean of propagating A/B copy selection within USER HW partition. The spl_mmc_get_uboot_raw_sector() can detect that a USER HW partition is in use and based on whether it is 0 or 7, select appropriate sector to load from.
---
Cc: Jaehoon Chung <[email protected]>
Cc: Peng Fan <[email protected]>
---
V2: Initialize the part variable, else it is passed uninitialized to
mmc_load_image_raw_sector(..raw_sect + spl_mmc_raw_uboot_offset(part)); and that prevents pine64 from booting. Interestingly enough, there is no warning emitted, which sounds like a compiler bug.
--- common/spl/spl_mmc.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
common/spl/spl_mmc.c +5 -4
@@ -420,7 +420,7 @@ int spl_mmc_load(struct spl_image_info *spl_image,static struct mmc *mmc;u32 boot_mode;int err =0 ; -__maybe_unused int hw_part =0 ; +__maybe_unused int part =0 , hw_part =0 ;int mmc_dev;/* Perform peripheral init only once for an mmc device */
@@ -445,11 +445,12 @@ int spl_mmc_load(struct spl_image_info *spl_image,switch (boot_mode) {case MMCSD_MODE_EMMCBOOT : hw_part =spl_mmc_emmc_boot_partition (mmc); + part = hw_part ==7 ?0 : hw_part;if (CONFIG_IS_ENABLED (MMC_TINY )) - err =mmc_switch_part (mmc, hw_part); + err =mmc_switch_part (mmc, part);else - err =blk_dselect_hwpart (mmc_get_blk_desc (mmc), hw_part); + err =blk_dselect_hwpart (mmc_get_blk_desc (mmc), part);if (err) {#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
@@ -479,7 +480,7 @@ int spl_mmc_load(struct spl_image_info *spl_image,#endif #ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR err =mmc_load_image_raw_sector (spl_image, bootdev, mmc, - raw_sect +spl_mmc_raw_uboot_offset (hw_part)); + raw_sect +spl_mmc_raw_uboot_offset (part));if (!err)return err;#endif
Signature · 1 line
2.39.2