mips: cpu: Use plain puts() in restart handler
Subsystems (5)
PATCH 1/6 mips: cpu: Use plain puts() in restart handler
This removes dependency on fprintf() , which is not available in SPL unless full printf support is enabled.
---
Cc: Daniel Schwierzeck <[email protected]>
Cc: Marek Vasut <[email protected]>
--- arch/mips/cpu/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/cpu/cpu.c +1 -1
@@ -15,7 +15,7 @@#if !CONFIG_IS_ENABLED (SYSRESET )void __weak _machine_restart (void ) { -fprintf (stderr,"*** reset failed ***\n" ); +puts ("*** reset failed ***\n" );while (1 )/* NOP */ ;
Signature · 1 line
2.40.1
PATCH 2/6 ARM: at91: Switch sama5d2_icp_mmc to simple malloc in SPL
To avoid SRAM overflow in the SPL build, use simple malloc implementation.
---
Cc: Eugen Hristev <[email protected]>
--- configs/sama5d2_icp_mmc_defconfig | 1 + 1 file changed, 1 insertion(+)
configs/sama5d2_icp_mmc_defconfig +1 -0
@@ -41,6 +41,7 @@ CONFIG_SPL_MAX_SIZE=0x10000 CONFIG_SPL_HAS_BSS_LINKER_SECTION=y CONFIG_SPL_BSS_START_ADDR=0x20000000 CONFIG_SPL_BSS_MAX_SIZE=0x80000 +CONFIG_SPL_SYS_MALLOC_SIMPLE=y # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set CONFIG_SYS_SPL_MALLOC=y CONFIG_SYS_SPL_MALLOC_SIZE=0x80000
Signature · 1 line
2.40.1
Re: [PATCH 2/6] ARM: at91: Switch sama5d2_icp_mmc to simple malloc in SPL
Quoted 14 lines · Marek Vasut
To avoid SRAM overflow in the SPL build, use simple malloc implementation.
Signed-off-by Marek Vasut <[email protected]>---
Cc: Eugen Hristev <[email protected]>--- configs/sama5d2_icp_mmc_defconfig | 1 + 1 file changed, 1 insertion(+)configs/sama5d2_icp_mmc_defconfig +0
-0
configs/sama5d2_icp_mmc_defconfig CONFIG_SPL_MAX_SIZE=0x10000 · line 47
Quoted 7 lines
configs/sama5d2_icp_mmc_defconfig +1
-0@@ -41,6 +41,7 @@ CONFIG_SPL_MAX_SIZE=0x10000 CONFIG_SPL_HAS_BSS_LINKER_SECTION=y CONFIG_SPL_BSS_START_ADDR=0x20000000 CONFIG_SPL_BSS_MAX_SIZE=0x80000 +CONFIG_SPL_SYS_MALLOC_SIMPLE=y # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set CONFIG_SYS_SPL_MALLOC=y CONFIG_SYS_SPL_MALLOC_SIZE=0x80000
why is the email patch arriving after patch was already applied? not to say that it was applied so fast and without going through at91 tree.
PATCH 3/6 ARM: imx: Add weak default reset_cpu()
In reply to Marek VasutAdd weak default reset_cpu() implementation needed by e.g. panic().
---
Cc: "NXP i.MX U-Boot Team" <[email protected]>
Cc: Fabio Estevam <[email protected]>
Cc: Stefano Babic <[email protected]>
--- arch/arm/mach-imx/cpu.c | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm/mach-imx/cpu.c +4 -0
@@ -510,3 +510,7 @@ char nxp_board_rev_string(void) return (*rev + nxp_board_rev() - 1); }#endif + +__weak void reset_cpu (void ) +{ +}
Signature · 1 line
2.40.1
Fabio Estevam
reviewerRe: [PATCH 3/6] ARM: imx: Add weak default reset_cpu()
Hi Marek,
Quoted 17 lines · Marek Vasut
Add weak default
reset_cpu()implementation needed by e.g.panic().Signed-off-by Marek Vasut <[email protected]>---
Cc: "NXP i.MX U-Boot Team" <[email protected]>
Cc: Fabio Estevam <[email protected]>
Cc: Stefano Babic <[email protected]>--- arch/arm/mach-imx/cpu.c | 4 ++++ 1 file changed, 4 insertions(+)arch/arm/mach-imx/cpu.c +0
-0
arch/arm/mach-imx/cpu.c char nxp_board_rev_string(void) · line 516
Quoted 7 lines
arch/arm/mach-imx/cpu.c +4
-0@@ -510,3 +510,7 @@ char nxp_board_rev_string(void) return (*rev + nxp_board_rev() - 1); }#endif + +__weak void reset_cpu (void ) +{ +}
This patch causes the 'reset' command to not reset the imx7d-sdb and smegw01 boards anymore.
If I do the change below, the board resets again:
drivers/watchdog/imx_watchdog.c +0 -0
@@ -44,7 +44,7 @@ static void imx_watchdog_expire_now(struct
watchdog_regs *wdog, bool ext_reset)
#if !defined(CONFIG_IMX_WATCHDOG) || \
(defined(CONFIG_IMX_WATCHDOG) && !CONFIG_IS_ENABLED(WDT))-void __attribute__((weak)) reset_cpu(void)
+void reset_cpu(void)
{
struct watchdog_regs *wdog = (struct watchdog_regs *)WDOG1_BASE_ADDR;
Is this a correct fix?
Thanks
Re: [PATCH 3/6] ARM: imx: Add weak default reset_cpu()
Quoted 47 lines · Fabio Estevam
Hi Marek,
Quoted 17 lines · Marek Vasut
Add weak default
reset_cpu()implementation needed by e.g.panic().Signed-off-by Marek Vasut <[email protected]>---
Cc: "NXP i.MX U-Boot Team" <[email protected]>
Cc: Fabio Estevam <[email protected]>
Cc: Stefano Babic <[email protected]>--- arch/arm/mach-imx/cpu.c | 4 ++++ 1 file changed, 4 insertions(+)arch/arm/mach-imx/cpu.c +0
-0arch/arm/mach-imx/cpu.c char nxp_board_rev_string(void) · line 516
Quoted 7 lines
arch/arm/mach-imx/cpu.c +4
-0@@ -510,3 +510,7 @@ char nxp_board_rev_string(void) return (*rev + nxp_board_rev() - 1); }#endif + +__weak void reset_cpu (void ) +{ +}This patch causes the 'reset' command to not reset the imx7d-sdb and smegw01 boards anymore.
If I do the change below, the board resets again:
drivers/watchdog/imx_watchdog.c +1
-1@@ -44,7 +44,7 @@ static void imx_watchdog_expire_now(struct watchdog_regs *wdog, bool ext_reset)#if !defined(CONFIG_IMX_WATCHDOG ) || \ (defined(CONFIG_IMX_WATCHDOG ) && !CONFIG_IS_ENABLED (WDT )) -void __attribute__((weak))reset_cpu (void ) +void reset_cpu (void ) {struct watchdog_regs *wdog = (struct watchdog_regs *)WDOG1_BASE_ADDR ;
Quoted 1 line
Is this a correct fix?
No, this will likely fail on other machines which will now define two "strong" reset_cpu() functions. Drivers should really not provide any reset_cpu() implementation at all (except maybe for sysreset drivers), all that reset_cpu() should be in arch/ .
I think the proper fix is to use drivers/sysreset/sysreset_watchdog.c to expire that imx watchdog and cause a reset.
PATCH 4/6 spl: spl_legacy: Add extra address checks
In reply to Marek VasutCheck whether the loaded image or entry point does not overlap SPL.
---
Cc: "NXP i.MX U-Boot Team" <[email protected]>
Cc: Fabio Estevam <[email protected]>
Cc: Heiko Schocher <[email protected]>
Cc: Heinrich Schuchardt <[email protected]>
Cc: Rasmus Villemoes <[email protected]>
Cc: Simon Glass <[email protected]>
Cc: Stefano Babic <[email protected]>
Cc: Tom Rini <[email protected]>
Cc: Ye Li <[email protected]>
---
V2: - Use _start instead of __image_copy_start and __bss_end for end
- Define SYS_BOOTM_LEN for LEGACY_IMAGE_FORMAT || SPL_LEGACY_IMAGE_FORMAT
--- cmd/Kconfig | 3 ++- common/spl/spl_legacy.c | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-)
cmd/Kconfig +2 -1
@@ -362,7 +362,8 @@ config BOOTM_VXWORKS config SYS_BOOTM_LEN hex "Maximum size of a decompresed OS image" - depends on CMD_BOOTM || CMD_BOOTI || CMD_BOOTZ + depends on CMD_BOOTM || CMD_BOOTI || CMD_BOOTZ || \ + LEGACY_IMAGE_FORMAT || SPL_LEGACY_IMAGE_FORMAT default 0x4000000 if PPC || ARM64 default 0x1000000 if X86 || ARCH_MX6 || ARCH_MX7 default 0x800000
common/spl/spl_legacy.c +20 -0
@@ -7,6 +7,7 @@#include <image.h> #include <log.h> #include <malloc.h> +#include <asm/sections.h> #include <spl.h> #include <lzma/LzmaTypes.h>
@@ -15,6 +16,22 @@#define LZMA_LEN (1 << 20) +static void spl_parse_legacy_validate (uintptr_t start,uintptr_t size) +{ +uintptr_t spl_start = (uintptr_t )_start; +uintptr_t spl_end = (uintptr_t )__bss_end; +uintptr_t end = start + size; + +if ((start >= spl_start && start < spl_end) || + (end > spl_start && end <= spl_end) || + (start < spl_start && end >= spl_end) || + (start > end && end > spl_start)) +panic ("SPL: Image overlaps SPL\n" ); + +if (size >CONFIG_SYS_BOOTM_LEN ) +panic ("SPL: Image too large\n" ); +} +int spl_parse_legacy_header (struct spl_image_info *spl_image,const struct legacy_img_hdr *header) {
@@ -58,6 +75,9 @@ int spl_parse_legacy_header(struct spl_image_info *spl_image,"payload image: %32s load addr: 0x%lx size: %d\n" , spl_image->name, spl_image->load_addr, spl_image->size); +spl_parse_legacy_validate (spl_image->load_addr, spl_image->size); +spl_parse_legacy_validate (spl_image->entry_point,0 ); +return 0 ; }
Signature · 1 line
2.40.1
PATCH 5/6 imx: hab: Fix a couple of build warnings with DEBUG enabled
In reply to Marek VasutIn case the DEBUG is enabled, these three lines warn about cast of pointer to integer of different size, add the missing casts to fix the warnings.
---
Cc: "NXP i.MX U-Boot Team" <[email protected]>
Cc: Fabio Estevam <[email protected]>
Cc: Heiko Schocher <[email protected]>
Cc: Heinrich Schuchardt <[email protected]>
Cc: Rasmus Villemoes <[email protected]>
Cc: Simon Glass <[email protected]>
Cc: Stefano Babic <[email protected]>
Cc: Tom Rini <[email protected]>
Cc: Ye Li <[email protected]>
---
V2: No change
--- arch/arm/mach-imx/hab.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-imx/hab.c +3 -3
@@ -932,10 +932,10 @@ int imx_hab_authenticate_image(uint32_t ddr_start, uint32_t image_size,printf ("ivt entry = 0x%08x, dcd = 0x%08x, csf = 0x%08x\n" , ivt->entry, ivt->dcd, ivt->csf);puts ("Dumping IVT\n" ); -print_buffer (ivt_addr, (void *)(ivt_addr),4 ,0x8 ,0 ); +print_buffer (ivt_addr, (void *)(uintptr_t )(ivt_addr),4 ,0x8 ,0 );puts ("Dumping CSF Header\n" ); -print_buffer (ivt->csf, (void *)(ivt->csf),4 ,0x10 ,0 ); +print_buffer (ivt->csf, (void *)(uintptr_t )(ivt->csf),4 ,0x10 ,0 );#if !defined(CONFIG_SPL_BUILD )get_hab_status ();
@@ -944,7 +944,7 @@ int imx_hab_authenticate_image(uint32_t ddr_start, uint32_t image_size,puts ("\nCalling authenticate_image in ROM\n" );printf ("\tivt_offset = 0x%x\n" , ivt_offset);printf ("\tstart = 0x%08lx\n" , start); -printf ("\tbytes = 0x%x\n" , bytes); +printf ("\tbytes = 0x%lx\n" , (ulong )bytes);#endif #ifndef CONFIG_ARM64
Signature · 1 line
2.40.1
PATCH 6/6 imx: hab: Simplify the mechanism
In reply to Marek VasutThe current mechanism is unnecessarily complex. Simplify the whole mechanism such that the entire fitImage is signed, IVT is placed at the end, followed by CSF, and this entire bundle is also authenticated. This makes the signing scripting far simpler.
---
Cc: "NXP i.MX U-Boot Team" <[email protected]>
Cc: Fabio Estevam <[email protected]>
Cc: Heiko Schocher <[email protected]>
Cc: Heinrich Schuchardt <[email protected]>
Cc: Rasmus Villemoes <[email protected]>
Cc: Simon Glass <[email protected]>
Cc: Stefano Babic <[email protected]>
Cc: Tom Rini <[email protected]>
Cc: Ye Li <[email protected]>
---
V2: Use CONFIG_TEXT_BASE + CONFIG_SYS_BOOTM_LEN if CONFIG_SPL_LOAD_FIT_ADDRESS
is not defined
--- arch/arm/dts/imx8mm-u-boot.dtsi | 2 + arch/arm/dts/imx8mn-u-boot.dtsi | 2 + arch/arm/dts/imx8mp-u-boot.dtsi | 2 + arch/arm/dts/imx8mq-u-boot.dtsi | 2 + arch/arm/mach-imx/spl.c | 67 ++++++----------- common/spl/spl_fit.c | 7 -- doc/imx/habv4/csf_examples/mx8m/csf.sh | 28 ++----- doc/imx/habv4/csf_examples/mx8m/csf_fit.txt | 10 +-- doc/imx/habv4/guides/mx8m_spl_secure_boot.txt | 74 ++++--------------- include/spl.h | 6 -- 10 files changed, 54 insertions(+), 146 deletions(-)
arch/arm/dts/imx8mm-u-boot.dtsi +2 -0
@@ -81,7 +81,9 @@ fit { description = "Configuration to load ATF before U-Boot"; +#ifndef CONFIG_IMX_HAB fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>; +#endif fit,fdt-list = "of-list"; #address-cells = <1>;
arch/arm/dts/imx8mn-u-boot.dtsi +2 -0
@@ -145,7 +145,9 @@ fit { description = "Configuration to load ATF before U-Boot"; +#ifndef CONFIG_IMX_HAB fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>; +#endif fit,fdt-list = "of-list"; #address-cells = <1>;
arch/arm/dts/imx8mp-u-boot.dtsi +2 -0
@@ -103,7 +103,9 @@ fit { description = "Configuration to load ATF before U-Boot"; +#ifndef CONFIG_IMX_HAB fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>; +#endif fit,fdt-list = "of-list"; #address-cells = <1>;
arch/arm/dts/imx8mq-u-boot.dtsi +2 -0
@@ -97,7 +97,9 @@ fit { description = "Configuration to load ATF before U-Boot"; +#ifndef CONFIG_IMX_HAB fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>; +#endif #address-cells = <1>; images {
arch/arm/mach-imx/spl.c +24 -43
100 lines not on this page · raw message
common/spl/spl_fit.c +0 -7
@@ -27,10 +27,6 @@ struct spl_fit_info {int conf_node;/* FDT offset to selected configuration node */ }; -__weak void board_spl_fit_post_load (const void *fit) -{ -} -__weak ulong board_spl_fit_size_align (ulong size) {return size;
@@ -829,8 +825,5 @@ int spl_load_simple_fit(struct spl_image_info *spl_image, spl_image->flags |=SPL_FIT_FOUND ; -if (IS_ENABLED (CONFIG_IMX_HAB )) -board_spl_fit_post_load (ctx.fit); -return 0 ; }
doc/imx/habv4/csf_examples/mx8m/csf.sh +5 -23
@@ -34,29 +34,11 @@ dd if=csf_spl.bin of=flash.bin bs=1 seek=${spl_dd_offset} conv=notrunc # 3) Sign u-boot.itb -# fitImage tree -fit_block_base=$(printf "0x%x" $(( $(sed -n "/CONFIG_TEXT_BASE=/ s@.*=@@p" .config) - $(sed -n "/CONFIG_FIT_EXTERNAL_OFFSET=/ s@.*=@@p" .config) - 0x200 - 0x40)) ) +# fitImage +fit_block_base=$(printf "0x%x" $(sed -n "/CONFIG_SPL_LOAD_FIT_ADDRESS=/ s@.*=@@p" .config) ) fit_block_offset=$(printf "0x%s" $(fdtget -t x u-boot.dtb /binman/imx-boot/uboot offset)) -fit_block_size=$(printf "0x%x" $(( ( ($(fdtdump u-boot.itb 2>/dev/null | sed -n "/^...totalsize:/ s@.*\(0x[0-9a-f]\+\).*@\1@p") + 0x1000 - 0x1 ) & ~(0x1000 - 0x1)) + 0x20 )) ) -sed -i "/Blocks = / s@.*@ Blocks = $fit_block_base $fit_block_offset $fit_block_size \"flash.bin\", \\\\@" csf_fit.tmp - -# U-Boot -uboot_block_base=$(printf "0x%s" $(fdtget -t x u-boot.itb /images/uboot load)) -uboot_block_offset=$(printf "0x%x" $(( $(printf "0x%s" $(fdtget -t x u-boot.itb /images/uboot data-position)) + ${fit_block_offset} ))) -uboot_block_size=$(printf "0x%s" $(fdtget -t x u-boot.itb /images/uboot data-size)) -sed -i "/0xuuuu/ s@.*@ $uboot_block_base $uboot_block_offset $uboot_block_size \"flash.bin\", \\\\@" csf_fit.tmp - -# ATF -atf_block_base=$(printf "0x%s" $(fdtget -t x u-boot.itb /images/atf load)) -atf_block_offset=$(printf "0x%x" $(( $(printf "0x%s" $(fdtget -t x u-boot.itb /images/atf data-position)) + ${fit_block_offset} ))) -atf_block_size=$(printf "0x%s" $(fdtget -t x u-boot.itb /images/atf data-size)) -sed -i "/0xaaaa/ s@.*@ $atf_block_base $atf_block_offset $atf_block_size \"flash.bin\", \\\\@" csf_fit.tmp - -# DTB -dtb_block_base=$(printf "0x%x" $(( ${uboot_block_base} + ${uboot_block_size} ))) -dtb_block_offset=$(printf "0x%x" $(( $(printf "0x%s" $(fdtget -t x u-boot.itb /images/fdt-1 data-position)) + ${fit_block_offset} ))) -dtb_block_size=$(printf "0x%s" $(fdtget -t x u-boot.itb /images/fdt-1 data-size)) -sed -i "/0xdddd/ s@.*@ $dtb_block_base $dtb_block_offset $dtb_block_size \"flash.bin\"@" csf_fit.tmp +fit_block_size=$(printf "0x%x" $(( ( ( $(stat -tc %s u-boot.itb) + 0x1000 - 0x1 ) & ~(0x1000 - 0x1)) + 0x20 )) ) +sed -i "/Blocks = / s@.*@ Blocks = $fit_block_base $fit_block_offset $fit_block_size \"flash.bin\"@" csf_fit.tmp # IVT ivt_ptr_base=$(printf "%08x" ${fit_block_base} | sed "s@\(..\)\(..\)\(..\)\(..\)@0x\4\3\2\1@")
@@ -65,7 +47,7 @@ csf_block_base=$(printf "%08x" $(( ${fit_block_base} + ${fit_block_size} )) | se ivt_block_offset=$((${fit_block_offset} + ${fit_block_size} - 0x20)) csf_block_offset=$((${ivt_block_offset} + 0x20)) -echo "0xd1002041 ${ivt_ptr_base} 0x00000000 0x00000000 0x00000000 ${ivt_block_base} ${csf_block_base} 0x00000000" | xxd -r -p > ivt.bin +echo "0xd1002041 ${ivt_block_base} 0x00000000 0x00000000 0x00000000 ${ivt_block_base} ${csf_block_base} 0x00000000" | xxd -r -p > ivt.bin dd if=ivt.bin of=flash.bin bs=1 seek=${ivt_block_offset} conv=notrunc # Generate CSF blob
doc/imx/habv4/csf_examples/mx8m/csf_fit.txt +2 -8
@@ -26,11 +26,5 @@ [Authenticate Data] Verification index = 2 # FIXME: - # Line 1 -- fitImage tree - # Line 2 -- U-Boot u-boot-nodtb.bin blob - # Line 3 -- ATF BL31 blob - # Line 4 -- DT blob - Blocks = 0x401fcdc0 0x57c00 0xffff "flash.bin", \ - 0x40200000 0x62c00 0xuuuu "flash.bin", \ - 0x920000 0x00000 0xaaaa "flash.bin", \ - 0x40200000 0x00000 0xdddd "flash.bin" + # Line 1 -- fitImage + Blocks = 0x401fcdc0 0x57c00 0xffff "flash.bin"
doc/imx/habv4/guides/mx8m_spl_secure_boot.txt +15 -59
104 lines not on this page · raw message
include/spl.h +0 -6
@@ -871,12 +871,6 @@ void spl_invoke_opensbi(struct spl_image_info *spl_image);int board_return_to_bootrom (struct spl_image_info *spl_image,struct spl_boot_device *bootdev); -/** -* board_spl_fit_post_load - allow process images after loading finished -* @fit: Pointer to a valid Flattened Image Tree blob -*/ -void board_spl_fit_post_load (const void *fit); -/** * board_spl_fit_size_align - specific size align before processing payload *
Signature · 1 line
2.40.1