spl: mmc: Factor out eMMC boot partition selection code
Subsystems (3)
PATCH 1/2 spl: mmc: Factor out eMMC boot partition selection code
Factor out eMMC boot partition selection code into default_spl_mmc_emmc_boot_partition() function and implement weak spl_mmc_emmc_boot_partition(), so that architecture or board code can override the eMMC boot partition selection.
--- common/spl/spl_mmc.c | 37 ++++++++++++++++++++++++------------- include/spl.h | 25 +++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 13 deletions(-)
common/spl/spl_mmc.c +24 -13
@@ -324,6 +324,29 @@ unsigned long __weak spl_mmc_get_uboot_raw_sector(struct mmc *mmc,return raw_sect; } +int default_spl_mmc_emmc_boot_partition (struct mmc *mmc) +{ +int part; +#ifdef CONFIG_SYS_MMCSD_RAW_MODE_EMMC_BOOT_PARTITION + part =CONFIG_SYS_MMCSD_RAW_MODE_EMMC_BOOT_PARTITION ; +#else +/* +* We need to check what the partition is configured to. +* 1 and 2 match up to boot0 / boot1 and 7 is user data +* which is the first physical partition (0). +*/ + part = (mmc->part_config >>3 ) &PART_ACCESS_MASK ; +if (part ==7 ) + part =0 ; +#endif +return part; +} + +int __weak spl_mmc_emmc_boot_partition (struct mmc *mmc) +{ +return default_spl_mmc_emmc_boot_partition (mmc); +} + int spl_mmc_load(struct spl_image_info *spl_image, struct spl_boot_device *bootdev, const char *filename,
@@ -355,19 +378,7 @@ int spl_mmc_load(struct spl_image_info *spl_image, err = -EINVAL ;switch (boot_mode) {case MMCSD_MODE_EMMCBOOT : -#ifdef CONFIG_SYS_MMCSD_RAW_MODE_EMMC_BOOT_PARTITION - part =CONFIG_SYS_MMCSD_RAW_MODE_EMMC_BOOT_PARTITION ; -#else -/* -* We need to check what the partition is configured to. -* 1 and 2 match up to boot0 / boot1 and 7 is user data -* which is the first physical partition (0). -*/ - part = (mmc->part_config >>3 ) &PART_ACCESS_MASK ; - -if (part ==7 ) - part =0 ; -#endif + part =spl_mmc_emmc_boot_partition (mmc);if (CONFIG_IS_ENABLED (MMC_TINY )) err =mmc_switch_part (mmc, part);
include/spl.h +25 -0
@@ -357,6 +357,31 @@ u32 spl_mmc_boot_mode(const u32 boot_device);* If not overridden, it is weakly defined in common/spl/spl_mmc.c. */ int spl_mmc_boot_partition (const u32 boot_device); + +struct mmc ; +/** +* default_spl_mmc_emmc_boot_partition() - eMMC boot partition to load U-Boot from. +* @boot_device: ID of the device which the MMC driver wants to load +* U-Boot from. +* +* This function should return the eMMC boot partition number which +* the SPL should load U-Boot from (on the given boot_device). +*/ +int default_spl_mmc_emmc_boot_partition (struct mmc *mmc); + +/** +* spl_mmc_emmc_boot_partition() - eMMC boot partition to load U-Boot from. +* @boot_device: ID of the device which the MMC driver wants to load +* U-Boot from. +* +* This function should return the eMMC boot partition number which +* the SPL should load U-Boot from (on the given boot_device). +* +* If not overridden, it is weakly defined in common/spl/spl_mmc.c +* and calls default_spl_mmc_emmc_boot_partition(); +*/ +int spl_mmc_emmc_boot_partition (struct mmc *mmc); +void spl_set_bd (void );/**
Signature · 1 line
2.30.2
PATCH 2/2 ARM: imx: Pick correct eMMC boot partition from ROM log
In case the iMX8M boot from eMMC boot partition and the primary image is corrupted, the BootROM is capable of starting a secondary image in the other eMMC boot partition as a fallback.
However, the BootROM leaves the eMMC BOOT_PARTITION_ENABLE setting as it was, i.e. pointing to the boot partition containing the corrupted image, and the BootROM does not provide any indication that this sort of fallback occured.
According to AN12853 i.MX ROMs Log Events, Rev. 0, May 2020, it is possible to determine whether fallback event occurred by parsing the ROM event log. In case ROM event ID 0x51 is present, fallback event did occur.
This patch implements ROM event log parsing and search for event ID 0x51 for all iMX8M SoCs, and based on that corrects the eMMC boot partition selection. This way, the SPL loads the remaining boot components from the same eMMC boot partition from which it was started, even in case of the fallback.
--- arch/arm/mach-imx/imx8m/soc.c | 61 +++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+)
arch/arm/mach-imx/imx8m/soc.c +61 -0
@@ -571,6 +571,67 @@ enum boot_device get_boot_device(void) }#endif +#if defined(CONFIG_IMX8M ) +#include <spl.h> +int spl_mmc_emmc_boot_partition (struct mmc *mmc) +{ +u32 *rom_log_addr = (u32 *)0x9e0 ; +u32 *rom_log; +u8 event_id; +int i, part; + + part =default_spl_mmc_emmc_boot_partition (mmc); + +/* If the ROM event log pointer is not valid. */ +if (*rom_log_addr <0x900000 || *rom_log_addr >=0xb00000 || + *rom_log_addr &0x3 ) +return part; + +/* Parse the ROM event ID version 2 log */ + rom_log = (u32 *)(uintptr_t )(*rom_log_addr); +for (i =0 ; i <128 ; i++) { + event_id = rom_log[i] >>24 ; +switch (event_id) { +case 0x00 :/* End of list */ +break ; +/* Log entries with 1 parameter, skip 1 */ +case 0x80 :/* Start to perform the device initialization */ +case 0x81 :/* The boot device initialization completes */ +case 0x8f :/* The boot device initialization fails */ +case 0x90 :/* Start to read data from boot device */ +case 0x91 :/* Reading data from boot device completes */ +case 0x9f :/* Reading data from boot device fails */ + i +=1 ; +continue ; +/* Log entries with 2 parameters, skip 2 */ +case 0xa0 :/* Image authentication result */ +case 0xc0 :/* Jump to the boot image soon */ + i +=2 ; +continue ; +/* Boot from the secondary boot image */ +case 0x51 : +/* +* Swap the eMMC boot partitions in case there was a +* fallback event (i.e. primary image was corrupted +* and that corruption was recognized by the BootROM), +* so the SPL loads the rest of the U-Boot from the +* correct eMMC boot partition, since the BootROM +* leaves the boot partition set to the corrupted one. +*/ +if (part ==1 ) + part =2 ; +else if (part ==2 ) + part =1 ; +continue ; +default : +continue ; + } + } + +return part; +} +#endif +bool is_usb_boot (void ) {return get_boot_device () ==USB_BOOT ;
Signature · 1 line
2.30.2
Re: [PATCH 2/2] ARM: imx: Pick correct eMMC boot partition from ROM log
Hello Marek,
Am Donnerstag, den 01.07.2021, 01:08 +0200 schrieb Marek Vasut:
Quoted 3 lines
In case the iMX8M boot from eMMC boot partition and the primary image is corrupted, the BootROM is capable of starting a secondary image in the other eMMC boot partition as a fallback.
I would like to ask a more general question. As I could not find information about that. What are the criteria for the BootROM to consider a image as corrupted?
I remember on other platforms with NAND where it was a erased page or too many bitflips. What is it here with eMMC?
Thanks,
Teresa
Quoted 113 lines
However, the BootROM leaves the eMMC
BOOT_PARTITION_ENABLEsetting as it was, i.e. pointing to the boot partition containing the corrupted image, and the BootROM does not provide any indication that this sort of fallback occured.According to AN12853 i.MX ROMs Log Events, Rev. 0, May 2020, it is possible to determine whether fallback event occurred by parsing the ROM event log. In case ROM event ID
0x51is present, fallback event did occur.This patch implements ROM event log parsing and search for event ID
0x51for all iMX8M SoCs, and based on that corrects the eMMC boot partition selection. This way, the SPL loads the remaining boot components from the same eMMC boot partition from which it was started, even in case of the fallback.Signed-off-by Marek Vasut <[email protected]>Cc Faiz Abbas <[email protected]>Cc Harald Seiler <[email protected]>Cc Lokesh Vutla <[email protected]>Cc Simon Glass <[email protected]>Cc Fabio Estevam <[email protected]>Cc Peng Fan <[email protected]>Cc Stefano Babic <[email protected]>Cc Ye Li <[email protected]>--- arch/arm/mach-imx/imx8m/soc.c | 61 +++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+)arch/arm/mach- renamed from arch/arm/mach-imx/imx8m/soc.c +0
-0
imx/imx8m/soc.c
index0c44022a6dc..92a71b6ba29100644arch/arm/mach-imx/imx8m/soc.c +25
-0@@ -571,6 +571,67 @@ enum boot_device get_boot_device(void) }#endif +#if defined(CONFIG_IMX8M ) +#include <spl.h> +int spl_mmc_emmc_boot_partition (struct mmc *mmc) +{ +u32 *rom_log_addr = (u32 *)0x9e0 ; +u32 *rom_log; +u8 event_id; +int i, part; + + part =default_spl_mmc_emmc_boot_partition (mmc); + +/* If the ROM event log pointer is not valid. */ +if (*rom_log_addr <0x900000 || *rom_log_addr >=0xb00000 || + *rom_log_addr &0x3 ) +return part; + +/* Parse the ROM event ID version 2 log */ + rom_log = (u32 *)(uintptr_t )(*rom_log_addr); +for (i =0 ; i <128 ; i++) { + event_id = rom_log[i] >>24 ; +switch (event_id) { +case 0x00 :/* End of list */ +break ; +/* Log entries with 1 parameter, skip 1 */ +case 0x80 :/* Start to perform the device initialization */
arch/arm/mach-imx/imx8m/soc.c +1
-0+case 0x81 :/* The boot device initialization completes */
arch/arm/mach-imx/imx8m/soc.c +3
-0+case 0x8f :/* The boot device initialization fails */ +case 0x90 :/* Start to read data from boot device */ +case 0x91 :/* Reading data from boot device completes */
arch/arm/mach-imx/imx8m/soc.c +12
-0+case 0x9f :/* Reading data from boot device fails */ + i +=1 ; +continue ; +/* Log entries with 2 parameters, skip 2 */ +case 0xa0 :/* Image authentication result */ +case 0xc0 :/* Jump to the boot image soon */ + i +=2 ; +continue ; +/* Boot from the secondary boot image */ +case 0x51 : +/* +* Swap the eMMC boot partitions in case there was a
arch/arm/mach-imx/imx8m/soc.c +1
-0+* fallback event (i.e. primary image was corrupted
arch/arm/mach-imx/imx8m/soc.c +1
-0+* and that corruption was recognized by the BootROM),
arch/arm/mach-imx/imx8m/soc.c +1
-0+* so the SPL loads the rest of the U-Boot from the
arch/arm/mach-imx/imx8m/soc.c +1
-0+* correct eMMC boot partition, since the BootROM
arch/arm/mach-imx/imx8m/soc.c +1
-0+* leaves the boot partition set to the corrupted one.
arch/arm/mach-imx/imx8m/soc.c +15
-0+*/ +if (part ==1 ) + part =2 ; +else if (part ==2 ) + part =1 ; +continue ; +default : + continue; + } + } + +return part; +} +#endif +bool is_usb_boot (void ) {return get_boot_device () ==USB_BOOT ;
Re: [PATCH 2/2] ARM: imx: Pick correct eMMC boot partition from ROM log
On 7/1/21 12:07 PM, Teresa Remmet wrote:
Hi
[...]
Quoted 10 lines
Am Donnerstag, den 01.07.2021, 01:08 +0200 schrieb Marek Vasut:
Quoted 3 lines
In case the iMX8M boot from eMMC boot partition and the primary image is corrupted, the BootROM is capable of starting a secondary image in the other eMMC boot partition as a fallback.
I would like to ask a more general question. As I could not find information about that. What are the criteria for the BootROM to consider a image as corrupted?
I remember on other platforms with NAND where it was a erased page or too many bitflips. What is it here with eMMC?
I didn't find much information on the unsigned images, so there I suspect it is just that parsing the IVT header fails, the DCD tag is missing, something along those lines. There is no checksum, so if there is a bitflip in the image itself, I can imagine it would go undetected. At least in the SPL part of flash.bin, the rest is fitImage and that has checksum.
For signed images, if there is a bitflip, the signature would no longer be valid, so this could be used to detect image corruption.
Maybe Peng (on CC) can clarify this better ?
[...]
Re: [PATCH 2/2] ARM: imx: Pick correct eMMC boot partition from ROM log
In reply to Marek VasutHi,
Quoted 55 lines · Marek Vasut
In case the iMX8M boot from eMMC boot partition and the primary image is corrupted, the BootROM is capable of starting a secondary image in the other eMMC boot partition as a fallback.
However, the BootROM leaves the eMMC
BOOT_PARTITION_ENABLEsetting as it was, i.e. pointing to the boot partition containing the corrupted image, and the BootROM does not provide any indication that this sort of fallback occured.According to AN12853 i.MX ROMs Log Events, Rev. 0, May 2020, it is possible to determine whether fallback event occurred by parsing the ROM event log. In case ROM event ID
0x51is present, fallback event did occur.This patch implements ROM event log parsing and search for event ID
0x51for all iMX8M SoCs, and based on that corrects the eMMC boot partition selection. This way, the SPL loads the remaining boot components from the same eMMC boot partition from which it was started, even in case of the fallback.Signed-off-by Marek Vasut <[email protected]>Cc Faiz Abbas <[email protected]>Cc Harald Seiler <[email protected]>Cc Lokesh Vutla <[email protected]>Cc Simon Glass <[email protected]>Cc Fabio Estevam <[email protected]>Cc Peng Fan <[email protected]>Cc Stefano Babic <[email protected]>Cc Ye Li <[email protected]>---
arch/arm/mach-imx/imx8m/soc.c | 61 +++++++++++++++++++++++++++++++++++1 file changed, 61 insertions(+)arch/arm/mach-imx/imx8m/soc.c +0
-0@@ -571,6 +571,67 @@ enum boot_device get_boot_device(void) } #endifarch/arm/mach-imx/imx8m/soc.c +13
-0+#if defined(CONFIG_IMX8M ) +#include <spl.h> +int spl_mmc_emmc_boot_partition (struct mmc *mmc) +{ +u32 *rom_log_addr = (u32 *)0x9e0 ; +u32 *rom_log; +u8 event_id; +int i, part; + + part =default_spl_mmc_emmc_boot_partition (mmc); + +/* If the ROM event log pointer is not valid. */ + if (*rom_log_addr < 0x900000 || *rom_log_addr >= 0xb00000 ||
arch/arm/mach-imx/imx8m/soc.c enum boot_device get_boot_device(void) · line 596
Quoted 10 lines
arch/arm/mach-imx/imx8m/soc.c +10
-0+ *rom_log_addr & 0x3) +return part; + +/* Parse the ROM event ID version 2 log */ + rom_log = (u32 *)(uintptr_t )(*rom_log_addr); +for (i =0 ; i <128 ; i++) { + event_id = rom_log[i] >>24 ; +switch (event_id) { +case 0x00 :/* End of list */ +break ;
I assume your intention here is to break from the for loop? This break will only exit the switch statement, so the loop will continue running on the data following the "End of list". Or is this behavior intentional? In that case I'd find the use of continue in the other branches a bit odd, as continue and break do the same thing in this situation.
Signature · 1 line
Harald
Quoted 41 lines
arch/arm/mach-imx/imx8m/soc.c +38
-0+/* Log entries with 1 parameter, skip 1 */ +case 0x80 :/* Start to perform the device initialization */ +case 0x81 :/* The boot device initialization completes */ +case 0x8f :/* The boot device initialization fails */ +case 0x90 :/* Start to read data from boot device */ +case 0x91 :/* Reading data from boot device completes */ +case 0x9f :/* Reading data from boot device fails */ + i +=1 ; +continue ; +/* Log entries with 2 parameters, skip 2 */ +case 0xa0 :/* Image authentication result */ +case 0xc0 :/* Jump to the boot image soon */ + i +=2 ; +continue ; +/* Boot from the secondary boot image */ +case 0x51 : +/* +* Swap the eMMC boot partitions in case there was a +* fallback event (i.e. primary image was corrupted +* and that corruption was recognized by the BootROM), +* so the SPL loads the rest of the U-Boot from the +* correct eMMC boot partition, since the BootROM +* leaves the boot partition set to the corrupted one. +*/ +if (part ==1 ) + part =2 ; +else if (part ==2 ) + part =1 ; +continue ; +default : + continue; + } + } + +return part; +} +#endif +bool
is_usb_boot(void)
{
returnget_boot_device()==USB_BOOT;
Re: [PATCH 2/2] ARM: imx: Pick correct eMMC boot partition from ROM log
On 7/1/21 1:22 PM, Harald Seiler wrote:
[...]
Quoted 5 lines
Quoted 5 lines
arch/arm/mach-imx/imx8m/soc.c +5
-0+/* Parse the ROM event ID version 2 log */ + rom_log = (u32 *)(uintptr_t )(*rom_log_addr); +for (i =0 ; i <128 ; i++) { + event_id = rom_log[i] >>24 ; +switch (event_id) {
Quoted 8 lines
arch/arm/mach-imx/imx8m/soc.c enum boot_device get_boot_device(void) · line 596
Quoted 2 lines
arch/arm/mach-imx/imx8m/soc.c +2
-0+case 0x00 :/* End of list */ +break ;I assume your intention here is to break from the for loop? This
breakwill only exit the switch statement, so the loop will continue running on the data following the "End of list". Or is this behavior intentional? In that case I'd find the use ofcontinuein the other branches a bit odd, ascontinueandbreakdo the same thing in this situation.
Nope, that should indeed be 'return part' here.
Hi Marek,
Quoted 79 lines · Marek Vasut
Factor out eMMC boot partition selection code into
default_spl_mmc_emmc_boot_partition()function and implement weakspl_mmc_emmc_boot_partition(), so that architecture or board code can override the eMMC boot partition selection.Signed-off-by Marek Vasut <[email protected]>Cc Faiz Abbas <[email protected]>Cc Harald Seiler <[email protected]>Cc Lokesh Vutla <[email protected]>Cc Simon Glass <[email protected]>Cc Fabio Estevam <[email protected]>Cc Peng Fan <[email protected]>Cc Stefano Babic <[email protected]>Cc Ye Li <[email protected]>--- common/spl/spl_mmc.c | 37 ++++++++++++++++++++++++------------- include/spl.h | 25 +++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 13 deletions(-)common/spl/spl_mmc.c +24
-13@@ -324,6 +324,29 @@ unsigned long __weak spl_mmc_get_uboot_raw_sector(struct mmc *mmc,return raw_sect; } +int default_spl_mmc_emmc_boot_partition (struct mmc *mmc) +{ +int part; +#ifdef CONFIG_SYS_MMCSD_RAW_MODE_EMMC_BOOT_PARTITION + part =CONFIG_SYS_MMCSD_RAW_MODE_EMMC_BOOT_PARTITION ; +#else +/* +* We need to check what the partition is configured to. +* 1 and 2 match up to boot0 / boot1 and 7 is user data +* which is the first physical partition (0). +*/ + part = (mmc->part_config >>3 ) &PART_ACCESS_MASK ; +if (part ==7 ) + part =0 ; +#endif +return part; +} + +int __weak spl_mmc_emmc_boot_partition (struct mmc *mmc) +{ +return default_spl_mmc_emmc_boot_partition (mmc); +} + int spl_mmc_load(struct spl_image_info *spl_image, struct spl_boot_device *bootdev, const char *filename,@@ -355,19 +378,7 @@ int spl_mmc_load(struct spl_image_info *spl_image, err = -EINVAL ;switch (boot_mode) {case MMCSD_MODE_EMMCBOOT : -#ifdef CONFIG_SYS_MMCSD_RAW_MODE_EMMC_BOOT_PARTITION - part =CONFIG_SYS_MMCSD_RAW_MODE_EMMC_BOOT_PARTITION ; -#else -/* -* We need to check what the partition is configured to. -* 1 and 2 match up to boot0 / boot1 and 7 is user data -* which is the first physical partition (0). -*/ - part = (mmc->part_config >>3 ) &PART_ACCESS_MASK ; - -if (part ==7 ) - part =0 ; -#endif + part =spl_mmc_emmc_boot_partition (mmc);if (CONFIG_IS_ENABLED (MMC_TINY )) err =mmc_switch_part (mmc, part);include/spl.h +0
-0
include/spl.h u32 spl_mmc_boot_mode(const u32 boot_device); · line 365
Quoted 9 lines
include/spl.h +6
-0@@ -357,6 +357,31 @@ u32 spl_mmc_boot_mode(const u32 boot_device);* If not overridden, it is weakly defined in common/spl/spl_mmc.c. */ int spl_mmc_boot_partition (const u32 boot_device); + +struct mmc ; +/** +* default_spl_mmc_emmc_boot_partition() - eMMC boot partition to load U-Boot from. +* @boot_device: ID of the device which the MMC driver wants to load +* U-Boot from.
Is "@boot_device" right? Argument is mmc.
include/spl.h u32 spl_mmc_boot_mode(const u32 boot_device); · line 375
Quoted 10 lines
include/spl.h +10
-0+* +* This function should return the eMMC boot partition number which +* the SPL should load U-Boot from (on the given boot_device). +*/ +int default_spl_mmc_emmc_boot_partition (struct mmc *mmc); + +/** +* spl_mmc_emmc_boot_partition() - eMMC boot partition to load U-Boot from. +* @boot_device: ID of the device which the MMC driver wants to load +* U-Boot from.
Ditto.
Best Regards,
Jaehoon Chung
Quoted 13 lines
include/spl.h +9
-0+* +* This function should return the eMMC boot partition number which +* the SPL should load U-Boot from (on the given boot_device). +* +* If not overridden, it is weakly defined in common/spl/spl_mmc.c +* and calls default_spl_mmc_emmc_boot_partition(); +*/ +int spl_mmc_emmc_boot_partition (struct mmc *mmc); +void spl_set_bd (void );/**