ARM: stm32: Fix ECDSA authentication with Dcache enabled
Subsystems (3)
PATCH 1/4 ARM: stm32: Fix ECDSA authentication with Dcache enabled
In case Dcache is enabled while the ECDSA authentication function is called via BootROM ROM API, the CRYP DMA might pick stale version of data from DRAM. Disable Dcache around the BootROM call to avoid this issue.
---
Cc: Alexandru Gagniuc <[email protected]>
Cc: Patrice Chotard <[email protected]>
Cc: Patrick Delaunay <[email protected]>
--- arch/arm/mach-stm32mp/ecdsa_romapi.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
arch/arm/mach-stm32mp/ecdsa_romapi.c +14 -0
@@ -64,6 +64,7 @@ static int romapi_ecdsa_verify(struct udevice *dev, const void *signature, size_t sig_len) {struct ecdsa_rom_api rom; +bool reenable_dcache;uint8_t raw_key[64 ];uint32_t rom_ret;int algo;
@@ -81,8 +82,21 @@ static int romapi_ecdsa_verify(struct udevice *dev,memcpy (raw_key +32 , pubkey->y,32 );stm32mp_rom_get_ecdsa_functions (&rom); + +/* +* Disable D-cache before calling into BootROM, else CRYP DMA +* may fail to pick up the correct data. +*/ +if (dcache_status ()) { +dcache_disable (); + reenable_dcache = true; + } + rom_ret = rom.ecdsa_verify_signature (hash, raw_key, signature, algo); +if (reenable_dcache) +dcache_enable (); +return rom_ret ==ROM_API_SUCCESS ?0 : -EPERM ; }
Signature · 1 line
2.35.1
PATCH 2/4 ARM: stm32: Factor out save_boot_params
The STM32MP15xx platform currently comes with two incompatible implementations of save_boot_params() weak function override. Factor the save_boot_params() implementation into common cpu.c code and provide accessors to read out both ROM API table address and DT address from any place in the code instead.
---
Cc: Alexandru Gagniuc <[email protected]>
Cc: Patrice Chotard <[email protected]>
Cc: Patrick Delaunay <[email protected]>
--- arch/arm/mach-stm32mp/boot_params.c | 20 ++--------- arch/arm/mach-stm32mp/cpu.c | 35 +++++++++++++++++++ arch/arm/mach-stm32mp/ecdsa_romapi.c | 20 ++--------- .../arm/mach-stm32mp/include/mach/sys_proto.h | 3 ++ 4 files changed, 42 insertions(+), 36 deletions(-)
arch/arm/mach-stm32mp/boot_params.c +2 -18
@@ -11,30 +11,14 @@#include <asm/sections.h> #include <asm/system.h> -/* -* Force data-section, as .bss will not be valid -* when save_boot_params is invoked. -*/ -static unsigned long nt_fw_dtb __section(".data"); - -/* -* Save the FDT address provided by TF-A in r2 at boot time -* This function is called from start.S -*/ -void save_boot_params (unsigned long r0,unsigned long r1,unsigned long r2, -unsigned long r3) -{ - nt_fw_dtb = r2; - -save_boot_params_ret (); -} -/* * Use the saved FDT address provided by TF-A at boot time (NT_FW_CONFIG = * Non Trusted Firmware configuration file) when the pointer is valid */ void *board_fdt_blob_setup (int *err) { +unsigned long nt_fw_dtb =get_stm32mp_bl2_dtb (); +log_debug ("%s: nt_fw_dtb=%lx\n" , __func__, nt_fw_dtb); *err =0 ;
arch/arm/mach-stm32mp/cpu.c +35 -0
@@ -378,3 +378,38 @@ int arch_misc_init(void)return 0 ; } + +/* +* Without forcing the ".data" section, this would get saved in ".bss". BSS +* will be cleared soon after, so it's not suitable. +*/ +static uintptr_t rom_api_table __section(".data"); +static uintptr_t nt_fw_dtb __section(".data"); + +/* +* The ROM gives us the API location in r0 when starting. This is only available +* during SPL, as there isn't (yet) a mechanism to pass this on to u-boot. Save +* the FDT address provided by TF-A in r2 at boot time. This function is called +* from start.S +*/ +void save_boot_params (unsigned long r0,unsigned long r1,unsigned long r2, +unsigned long r3) +{ +#if IS_ENABLED (CONFIG_STM32_ECDSA_VERIFY ) + rom_api_table = r0; +#endif +#if IS_ENABLED (CONFIG_TFABOOT ) + nt_fw_dtb = r2; +#endif +save_boot_params_ret (); +} + +uintptr_t get_stm32mp_rom_api_table (void ) +{ +return rom_api_table; +} + +uintptr_t get_stm32mp_bl2_dtb (void ) +{ +return nt_fw_dtb; +}
arch/arm/mach-stm32mp/ecdsa_romapi.c +2 -18
@@ -24,26 +24,10 @@ struct ecdsa_rom_api { uint32_t ecc_algo); }; -/* -* Without forcing the ".data" section, this would get saved in ".bss". BSS -* will be cleared soon after, so it's not suitable. -*/ -static uintptr_t rom_api_loc __section(".data"); - -/* -* The ROM gives us the API location in r0 when starting. This is only available -* during SPL, as there isn't (yet) a mechanism to pass this on to u-boot. -*/ -void save_boot_params (unsigned long r0,unsigned long r1,unsigned long r2, -unsigned long r3) -{ - rom_api_loc = r0; -save_boot_params_ret (); -} -static void stm32mp_rom_get_ecdsa_functions (struct ecdsa_rom_api *rom) { -uintptr_t verify_ptr = rom_api_loc +ROM_API_OFFSET_ECDSA_VERIFY ; +uintptr_t verify_ptr =get_stm32mp_rom_api_table () + +ROM_API_OFFSET_ECDSA_VERIFY ; rom->ecdsa_verify_signature = *(void **)verify_ptr; }
arch/arm/mach-stm32mp/include/mach/sys_proto.h +3 -0
@@ -77,3 +77,6 @@ void stm32mp_misc_init(void);/* helper function: read data from OTP */ u32 get_otp (int index,int shift,int mask); + +uintptr_t get_stm32mp_rom_api_table (void ); +uintptr_t get_stm32mp_bl2_dtb (void );
Signature · 1 line
2.35.1
Re: [PATCH 2/4] ARM: stm32: Factor out save_boot_params
Quoted 136 lines · Marek Vasut
The STM32MP15xx platform currently comes with two incompatible implementations of
save_boot_params()weak function override. Factor thesave_boot_params()implementation into commoncpu.ccode and provide accessors to read out both ROM API table address and DT address from any place in the code instead.Signed-off-by Marek Vasut <[email protected]>---
Cc: Alexandru Gagniuc <[email protected]>
Cc: Patrice Chotard <[email protected]>
Cc: Patrick Delaunay <[email protected]>--- arch/arm/mach-stm32mp/boot_params.c | 20 ++--------- arch/arm/mach-stm32mp/cpu.c | 35 +++++++++++++++++++ arch/arm/mach-stm32mp/ecdsa_romapi.c | 20 ++--------- .../arm/mach-stm32mp/include/mach/sys_proto.h | 3 ++ 4 files changed, 42 insertions(+), 36 deletions(-)arch/arm/mach-stm32mp/boot_params.c +2
-18@@ -11,30 +11,14 @@#include <asm/sections.h> #include <asm/system.h> -/* -* Force data-section, as .bss will not be valid -* when save_boot_params is invoked. -*/ -static unsigned long nt_fw_dtb __section(".data"); - -/* -* Save the FDT address provided by TF-A in r2 at boot time -* This function is called from start.S -*/ -void save_boot_params (unsigned long r0,unsigned long r1,unsigned long r2, -unsigned long r3) -{ - nt_fw_dtb = r2; - -save_boot_params_ret (); -} -/* * Use the saved FDT address provided by TF-A at boot time (NT_FW_CONFIG = * Non Trusted Firmware configuration file) when the pointer is valid */ void *board_fdt_blob_setup (int *err) { +unsigned long nt_fw_dtb =get_stm32mp_bl2_dtb (); +log_debug ("%s: nt_fw_dtb=%lx\n" , __func__, nt_fw_dtb); *err =0 ;arch/arm/mach-stm32mp/cpu.c +35
-0@@ -378,3 +378,38 @@ int arch_misc_init(void)return 0 ; } + +/* +* Without forcing the ".data" section, this would get saved in ".bss". BSS +* will be cleared soon after, so it's not suitable. +*/ +static uintptr_t rom_api_table __section(".data"); +static uintptr_t nt_fw_dtb __section(".data"); + +/* +* The ROM gives us the API location in r0 when starting. This is only available +* during SPL, as there isn't (yet) a mechanism to pass this on to u-boot. Save +* the FDT address provided by TF-A in r2 at boot time. This function is called +* from start.S +*/ +void save_boot_params (unsigned long r0,unsigned long r1,unsigned long r2, +unsigned long r3) +{ +#if IS_ENABLED (CONFIG_STM32_ECDSA_VERIFY ) + rom_api_table = r0; +#endif +#if IS_ENABLED (CONFIG_TFABOOT ) + nt_fw_dtb = r2; +#endif +save_boot_params_ret (); +} + +uintptr_t get_stm32mp_rom_api_table (void ) +{ +return rom_api_table; +} + +uintptr_t get_stm32mp_bl2_dtb (void ) +{ +return nt_fw_dtb; +}arch/arm/mach-stm32mp/ecdsa_romapi.c +2
-18@@ -24,26 +24,10 @@ struct ecdsa_rom_api { uint32_t ecc_algo); }; -/* -* Without forcing the ".data" section, this would get saved in ".bss". BSS -* will be cleared soon after, so it's not suitable. -*/ -static uintptr_t rom_api_loc __section(".data"); - -/* -* The ROM gives us the API location in r0 when starting. This is only available -* during SPL, as there isn't (yet) a mechanism to pass this on to u-boot. -*/ -void save_boot_params (unsigned long r0,unsigned long r1,unsigned long r2, -unsigned long r3) -{ - rom_api_loc = r0; -save_boot_params_ret (); -} -static void stm32mp_rom_get_ecdsa_functions (struct ecdsa_rom_api *rom) { -uintptr_t verify_ptr = rom_api_loc +ROM_API_OFFSET_ECDSA_VERIFY ; +uintptr_t verify_ptr =get_stm32mp_rom_api_table () + +ROM_API_OFFSET_ECDSA_VERIFY ; rom->ecdsa_verify_signature = *(void **)verify_ptr; }arch/arm/mach-stm32mp/include/mach/sys_proto.h +0
-0
arch/arm/mach-stm32mp/include/mach/sys_proto.h void stm32mp_misc_init(void); · line 82
Quoted 6 lines
arch/arm/mach-stm32mp/include/mach/sys_proto.h +3
-0@@ -77,3 +77,6 @@ void stm32mp_misc_init(void);/* helper function: read data from OTP */ u32 get_otp (int index,int shift,int mask); + +uintptr_t get_stm32mp_rom_api_table (void ); +uintptr_t get_stm32mp_bl2_dtb (void );
Thanks
Patrice
Re: [PATCH 2/4] ARM: stm32: Factor out save_boot_params
In reply to Marek VasutHi Marek,
Quoted 5 lines · Marek Vasut
The STM32MP15xx platform currently comes with two incompatible implementations of
save_boot_params()weak function override. Factor thesave_boot_params()implementation into commoncpu.ccode and provide accessors to read out both ROM API table address and DT address from any place in the code instead.
good idea.
Quoted 71 lines
Signed-off-by Marek Vasut <[email protected]>---
Cc: Alexandru Gagniuc <[email protected]>
Cc: Patrice Chotard <[email protected]>
Cc: Patrick Delaunay <[email protected]>--- arch/arm/mach-stm32mp/boot_params.c | 20 ++--------- arch/arm/mach-stm32mp/cpu.c | 35 +++++++++++++++++++ arch/arm/mach-stm32mp/ecdsa_romapi.c | 20 ++--------- .../arm/mach-stm32mp/include/mach/sys_proto.h | 3 ++ 4 files changed, 42 insertions(+), 36 deletions(-)arch/arm/mach-stm32mp/boot_params.c +2
-18@@ -11,30 +11,14 @@#include <asm/sections.h> #include <asm/system.h> -/* -* Force data-section, as .bss will not be valid -* when save_boot_params is invoked. -*/ -static unsigned long nt_fw_dtb __section(".data"); - -/* -* Save the FDT address provided by TF-A in r2 at boot time -* This function is called from start.S -*/ -void save_boot_params (unsigned long r0,unsigned long r1,unsigned long r2, -unsigned long r3) -{ - nt_fw_dtb = r2; - -save_boot_params_ret (); -} -/* * Use the saved FDT address provided by TF-A at boot time (NT_FW_CONFIG = * Non Trusted Firmware configuration file) when the pointer is valid */ void *board_fdt_blob_setup (int *err) { +unsigned long nt_fw_dtb =get_stm32mp_bl2_dtb (); +log_debug ("%s: nt_fw_dtb=%lx\n" , __func__, nt_fw_dtb); *err =0 ;arch/arm/mach-stm32mp/cpu.c +13
-0@@ -378,3 +378,38 @@ int arch_misc_init(void)return 0 ; } + +/* +* Without forcing the ".data" section, this would get saved in ".bss". BSS +* will be cleared soon after, so it's not suitable. +*/ +static uintptr_t rom_api_table __section(".data"); +static uintptr_t nt_fw_dtb __section(".data"); + +/* +* The ROM gives us the API location in r0 when starting. This is only available +* during SPL, as there isn't (yet) a mechanism to pass this on to u-boot. Save +* the FDT address provided by TF-A in r2 at boot time. This function is called +* from start.S
arch/arm/mach-stm32mp/cpu.c int arch_misc_init(void) · line 403
Quoted 10 lines
arch/arm/mach-stm32mp/cpu.c +10
-0+*/ +void save_boot_params (unsigned long r0,unsigned long r1,unsigned long r2, +unsigned long r3) +{ +#if IS_ENABLED (CONFIG_STM32_ECDSA_VERIFY ) + rom_api_table = r0; +#endif +#if IS_ENABLED (CONFIG_TFABOOT ) + nt_fw_dtb = r2; +#endif
jut avoid #if when it is possible.
if (IS_ENABLED(CONFIG_STM32_ECDSA_VERIFY))
rom_api_table = r0;
if (IS_ENABLED(CONFIG_TFABOOT))
nt_fw_dtb = r2;
Quoted 50 lines
arch/arm/mach-stm32mp/cpu.c +12
-0+save_boot_params_ret (); +} + +uintptr_t get_stm32mp_rom_api_table (void ) +{ +return rom_api_table; +} + +uintptr_t get_stm32mp_bl2_dtb (void ) +{ +return nt_fw_dtb; +}arch/arm/mach-stm32mp/ecdsa_romapi.c +2
-18@@ -24,26 +24,10 @@ struct ecdsa_rom_api { uint32_t ecc_algo); }; -/* -* Without forcing the ".data" section, this would get saved in ".bss". BSS -* will be cleared soon after, so it's not suitable. -*/ -static uintptr_t rom_api_loc __section(".data"); - -/* -* The ROM gives us the API location in r0 when starting. This is only available -* during SPL, as there isn't (yet) a mechanism to pass this on to u-boot. -*/ -void save_boot_params (unsigned long r0,unsigned long r1,unsigned long r2, -unsigned long r3) -{ - rom_api_loc = r0; -save_boot_params_ret (); -} -static void stm32mp_rom_get_ecdsa_functions (struct ecdsa_rom_api *rom) { -uintptr_t verify_ptr = rom_api_loc +ROM_API_OFFSET_ECDSA_VERIFY ; +uintptr_t verify_ptr =get_stm32mp_rom_api_table () + +ROM_API_OFFSET_ECDSA_VERIFY ; rom->ecdsa_verify_signature = *(void **)verify_ptr; }arch/arm/mach-stm32mp/include/mach/sys_proto.h +0
-0
arch/arm/mach-stm32mp/include/mach/sys_proto.h void stm32mp_misc_init(void); · line 82
Quoted 6 lines
arch/arm/mach-stm32mp/include/mach/sys_proto.h +3
-0@@ -77,3 +77,6 @@ void stm32mp_misc_init(void);/* helper function: read data from OTP */ u32 get_otp (int index,int shift,int mask); + +uintptr_t get_stm32mp_rom_api_table (void ); +uintptr_t get_stm32mp_bl2_dtb (void );
regards
Patrick
PATCH 3/4 ARM: stm32: Pass ROM API table pointer to U-Boot proper
In reply to Marek VasutThe ROM API table pointer is no longer accessible from U-Boot, fix this by passing the ROM API pointer through. This makes it possible for U-Boot to call ROM API functions to authenticate payload like signed fitImages.
---
Cc: Alexandru Gagniuc <[email protected]>
Cc: Patrice Chotard <[email protected]>
Cc: Patrick Delaunay <[email protected]>
--- arch/arm/mach-stm32mp/cpu.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
arch/arm/mach-stm32mp/cpu.c +15 -0
@@ -22,6 +22,7 @@#include <dm/device.h> #include <dm/uclass.h> #include <linux/bitops.h> +#include <spl.h> /* * early TLB into the .data section so that it not get cleared
@@ -413,3 +414,17 @@ uintptr_t get_stm32mp_bl2_dtb(void) {return nt_fw_dtb; } + +#ifdef CONFIG_SPL_BUILD +void jump_to_image_no_args (struct spl_image_info *spl_image) +{ +typedef void __noreturn (*image_entry_noargs_t )(u32 romapi); +uintptr_t romapi =get_stm32mp_rom_api_table (); + +image_entry_noargs_t image_entry = + (image_entry_noargs_t )spl_image->entry_point; + +printf ("image entry point: 0x%lx\n" , spl_image->entry_point); +image_entry (romapi); +} +#endif
Signature · 1 line
2.35.1
Re: [PATCH 3/4] ARM: stm32: Pass ROM API table pointer to U-Boot proper
Quoted 34 lines · Marek Vasut
The ROM API table pointer is no longer accessible from U-Boot, fix this by passing the ROM API pointer through. This makes it possible for U-Boot to call ROM API functions to authenticate payload like signed fitImages.
Signed-off-by Marek Vasut <[email protected]>---
Cc: Alexandru Gagniuc <[email protected]>
Cc: Patrice Chotard <[email protected]>
Cc: Patrick Delaunay <[email protected]>--- arch/arm/mach-stm32mp/cpu.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)arch/arm/mach-stm32mp/cpu.c +5
-0@@ -22,6 +22,7 @@#include <dm/device.h> #include <dm/uclass.h> #include <linux/bitops.h> +#include <spl.h> /* * early TLB into the .data section so that it not get cleared @@ -413,3 +414,17 @@ uintptr_t get_stm32mp_bl2_dtb(void) {return nt_fw_dtb; } + +#ifdef CONFIG_SPL_BUILD +void jump_to_image_no_args (struct spl_image_info *spl_image) +{
arch/arm/mach-stm32mp/cpu.c uintptr_t get_stm32mp_bl2_dtb(void) · line 430
Quoted 10 lines
arch/arm/mach-stm32mp/cpu.c +10
-0+typedef void __noreturn (*image_entry_noargs_t )(u32 romapi); +uintptr_t romapi =get_stm32mp_rom_api_table (); + +image_entry_noargs_t image_entry = + (image_entry_noargs_t )spl_image->entry_point; + +printf ("image entry point: 0x%lx\n" , spl_image->entry_point); + image_entry(romapi); +} +#endif
Thanks
Patrice
Re: [PATCH 3/4] ARM: stm32: Pass ROM API table pointer to U-Boot proper
In reply to Marek VasutHi,
minor comment
Quoted 27 lines · Marek Vasut
The ROM API table pointer is no longer accessible from U-Boot, fix this by passing the ROM API pointer through. This makes it possible for U-Boot to call ROM API functions to authenticate payload like signed fitImages.
Signed-off-by Marek Vasut <[email protected]>---
Cc: Alexandru Gagniuc <[email protected]>
Cc: Patrice Chotard <[email protected]>
Cc: Patrick Delaunay <[email protected]>--- arch/arm/mach-stm32mp/cpu.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)arch/arm/mach-stm32mp/cpu.c +1
-0@@ -22,6 +22,7 @@#include <dm/device.h> #include <dm/uclass.h> #include <linux/bitops.h> +#include <spl.h> /* * early TLB into the .data section so that it not get cleared
arch/arm/mach-stm32mp/cpu.c uintptr_t get_stm32mp_bl2_dtb(void) · line 419
Quoted 6 lines
arch/arm/mach-stm32mp/cpu.c +3
-0@@ -413,3 +414,17 @@ uintptr_t get_stm32mp_bl2_dtb(void) {return nt_fw_dtb; } + +#ifdef CONFIG_SPL_BUILD +void jump_to_image_no_args (struct spl_image_info *spl_image)
missing "__noreturn" ?
void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image)
arch/arm/mach-stm32mp/cpu.c uintptr_t get_stm32mp_bl2_dtb(void) · line 421
Quoted 2 lines
arch/arm/mach-stm32mp/cpu.c +2
-0+{ +typedef void __noreturn (*image_entry_noargs_t )(u32 romapi);
really 'noargs' ?
I propose to replace to 'arg' => image_entry_arg_t
arch/powerpc/lib/spl.c:20
base on arch/arm/lib/spl.c:71
arch/microblaze/cpu/spl.c:37
typedef void __noreturn (*image_entry_noargs_t)(u32 romapi);
or with stm32:
typedef void __noreturn (*image_entry_stm32_t)(u32 romapi);
based on arch/riscv/lib/spl.c:40
arch/arm/mach-stm32mp/cpu.c uintptr_t get_stm32mp_bl2_dtb(void) · line 430
Quoted 9 lines
arch/arm/mach-stm32mp/cpu.c +9
-0+uintptr_t romapi =get_stm32mp_rom_api_table (); + +image_entry_noargs_t image_entry = + (image_entry_noargs_t )spl_image->entry_point; + +printf ("image entry point: 0x%lx\n" , spl_image->entry_point); + image_entry(romapi); +} +#endif
regards
Patrick
PATCH 4/4 ARM: stm32: Make ECDSA authentication available to U-Boot
In reply to Marek VasutWith U-Boot having access to ROM API call table, it is possible to use the ROM API call it authenticate e.g. signed kernel fitImages using the BootROM ECDSA support. Make this available by pulling the ECDSA BootROM call support from SPL-only guard.
---
Cc: Alexandru Gagniuc <[email protected]>
Cc: Patrice Chotard <[email protected]>
Cc: Patrick Delaunay <[email protected]>
--- arch/arm/mach-stm32mp/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-stm32mp/Makefile +1 -1
@@ -11,10 +11,10 @@ obj-y += bsec.o obj-$(CONFIG_STM32MP13x) += stm32mp13x.o obj-$(CONFIG_STM32MP15x) += stm32mp15x.o +obj-$(CONFIG_STM32_ECDSA_VERIFY) += ecdsa_romapi.o ifdef CONFIG_SPL_BUILD obj-y += spl.o obj-y += tzc400.o -obj-$(CONFIG_STM32_ECDSA_VERIFY) += ecdsa_romapi.o else obj-y += cmd_stm32prog/ obj-$(CONFIG_CMD_STM32KEY) += cmd_stm32key.o
Signature · 1 line
2.35.1
Re: [PATCH 4/4] ARM: stm32: Make ECDSA authentication available to U-Boot
Quoted 20 lines · Marek Vasut
With U-Boot having access to ROM API call table, it is possible to use the ROM API call it authenticate e.g. signed kernel fitImages using the BootROM ECDSA support. Make this available by pulling the ECDSA BootROM call support from SPL-only guard.
Signed-off-by Marek Vasut <[email protected]>---
Cc: Alexandru Gagniuc <[email protected]>
Cc: Patrice Chotard <[email protected]>
Cc: Patrick Delaunay <[email protected]>--- arch/arm/mach-stm32mp/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/arm/mach-stm32mp/Makefile +0
-0@@ -11,10 +11,10 @@ obj-y += bsec.o obj-$(CONFIG_STM32MP13x) += stm32mp13x.o
arch/arm/mach-stm32mp/Makefile obj-y += bsec.o · line 20
Quoted 10 lines
arch/arm/mach-stm32mp/Makefile +1
-1obj-$(CONFIG_STM32MP15x) += stm32mp15x.o +obj-$(CONFIG_STM32_ECDSA_VERIFY) += ecdsa_romapi.o ifdef CONFIG_SPL_BUILD obj-y += spl.o obj-y += tzc400.o -obj-$(CONFIG_STM32_ECDSA_VERIFY) += ecdsa_romapi.o else obj-y += cmd_stm32prog/ obj-$(CONFIG_CMD_STM32KEY) += cmd_stm32key.o
Thanks
Patrice
Re: [PATCH 4/4] ARM: stm32: Make ECDSA authentication available to U-Boot
In reply to Marek VasutHi,
Quoted 5 lines · Marek Vasut
With U-Boot having access to ROM API call table, it is possible to use the ROM API call it authenticate e.g. signed kernel fitImages using the BootROM ECDSA support. Make this available by pulling the ECDSA BootROM call support from SPL-only guard.
Quoted 9 lines
Signed-off-by Marek Vasut <[email protected]>---
Cc: Alexandru Gagniuc <[email protected]>
Cc: Patrice Chotard <[email protected]>
Cc: Patrick Delaunay <[email protected]>--- arch/arm/mach-stm32mp/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Thanks
Patrick
Quoted 38 lines · Marek Vasut
In case Dcache is enabled while the ECDSA authentication function is called via BootROM ROM API, the CRYP DMA might pick stale version of data from DRAM. Disable Dcache around the BootROM call to avoid this issue.
Signed-off-by Marek Vasut <[email protected]>---
Cc: Alexandru Gagniuc <[email protected]>
Cc: Patrice Chotard <[email protected]>
Cc: Patrick Delaunay <[email protected]>--- arch/arm/mach-stm32mp/ecdsa_romapi.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)arch/arm/mach-stm32mp/ecdsa_romapi.c +9
-0@@ -64,6 +64,7 @@ static int romapi_ecdsa_verify(struct udevice *dev, const void *signature, size_t sig_len) {struct ecdsa_rom_api rom; +bool reenable_dcache;uint8_t raw_key[64 ];uint32_t rom_ret;int algo;@@ -81,8 +82,21 @@ static int romapi_ecdsa_verify(struct udevice *dev,memcpy (raw_key +32 , pubkey->y,32 );stm32mp_rom_get_ecdsa_functions (&rom); + +/* +* Disable D-cache before calling into BootROM, else CRYP DMA +* may fail to pick up the correct data. +*/ +if (dcache_status ()) { +dcache_disable (); + reenable_dcache = true;
arch/arm/mach-stm32mp/ecdsa_romapi.c static int romapi_ecdsa_verify(struct udevice *dev, · line 102
Quoted 10 lines
arch/arm/mach-stm32mp/ecdsa_romapi.c +5
-0+ } + rom_ret = rom.ecdsa_verify_signature (hash, raw_key, signature, algo); +if (reenable_dcache) +dcache_enable (); +return rom_ret ==ROM_API_SUCCESS ?0 : -EPERM ; }
Thanks
Patrice
just one remark
Quoted 19 lines · Marek Vasut
In case Dcache is enabled while the ECDSA authentication function is called via BootROM ROM API, the CRYP DMA might pick stale version of data from DRAM. Disable Dcache around the BootROM call to avoid this issue.
Signed-off-by Marek Vasut <[email protected]>---
Cc: Alexandru Gagniuc <[email protected]>
Cc: Patrice Chotard <[email protected]>
Cc: Patrick Delaunay <[email protected]>--- arch/arm/mach-stm32mp/ecdsa_romapi.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)arch/arm/mach-stm32mp/ecdsa_romapi.c +0
-0
arch/arm/mach-stm32mp/ecdsa_romapi.c static int romapi_ecdsa_verify(struct udevice *dev, · line 67
Quoted 4 lines
arch/arm/mach-stm32mp/ecdsa_romapi.c +1
-0@@ -64,6 +64,7 @@ static int romapi_ecdsa_verify(struct udevice *dev, const void *signature, size_t sig_len) {struct ecdsa_rom_api rom; +bool reenable_dcache;
reenable_dcache is used without being initialized
Quoted 25 lines
arch/arm/mach-stm32mp/ecdsa_romapi.c +13
-0uint8_t raw_key[64 ];uint32_t rom_ret;int algo;@@ -81,8 +82,21 @@ static int romapi_ecdsa_verify(struct udevice *dev,memcpy (raw_key +32 , pubkey->y,32 );stm32mp_rom_get_ecdsa_functions (&rom); + +/* +* Disable D-cache before calling into BootROM, else CRYP DMA +* may fail to pick up the correct data. +*/ +if (dcache_status ()) { +dcache_disable (); + reenable_dcache = true; + } + rom_ret = rom.ecdsa_verify_signature (hash, raw_key, signature, algo); +if (reenable_dcache) +dcache_enable (); +return rom_ret ==ROM_API_SUCCESS ?0 : -EPERM ; }
Hi Marek,
Quoted 31 lines · Marek Vasut
In case Dcache is enabled while the ECDSA authentication function is called via BootROM ROM API, the CRYP DMA might pick stale version of data from DRAM. Disable Dcache around the BootROM call to avoid this issue.
Signed-off-by Marek Vasut <[email protected]>---
Cc: Alexandru Gagniuc <[email protected]>
Cc: Patrice Chotard <[email protected]>
Cc: Patrick Delaunay <[email protected]>--- arch/arm/mach-stm32mp/ecdsa_romapi.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)arch/arm/mach-stm32mp/ecdsa_romapi.c +2
-0@@ -64,6 +64,7 @@ static int romapi_ecdsa_verify(struct udevice *dev, const void *signature, size_t sig_len) {struct ecdsa_rom_api rom; +bool reenable_dcache;uint8_t raw_key[64 ];uint32_t rom_ret;int algo;@@ -81,8 +82,21 @@ static int romapi_ecdsa_verify(struct udevice *dev,memcpy (raw_key +32 , pubkey->y,32 );stm32mp_rom_get_ecdsa_functions (&rom); +
arch/arm/mach-stm32mp/ecdsa_romapi.c static int romapi_ecdsa_verify(struct udevice *dev, · line 95
Quoted 10 lines
arch/arm/mach-stm32mp/ecdsa_romapi.c +9
-0+/* +* Disable D-cache before calling into BootROM, else CRYP DMA +* may fail to pick up the correct data. +*/ +if (dcache_status ()) { +dcache_disable (); + reenable_dcache = true; + } + rom_ret = rom.ecdsa_verify_signature (hash, raw_key, signature, algo);
so the signature verification (the code execution) is done with dcache OFF....
flush the input data should be enought for DMA operation ?
=> call flush_dcache_all() or flush_dcache_range()
for example:
if (dcache_status())
flush_dcache_all();
arch/arm/mach-stm32mp/ecdsa_romapi.c static int romapi_ecdsa_verify(struct udevice *dev, · line 102
Quoted 7 lines
arch/arm/mach-stm32mp/ecdsa_romapi.c +3
-0+if (reenable_dcache) +dcache_enable (); +return rom_ret ==ROM_API_SUCCESS ?0 : -EPERM ; }
Regards
Patrick
Quoted 1 line · Patrick DELAUNAY
Hi Marek,
Hi,
[...]
Quoted 18 lines
Quoted 4 lines
arch/arm/mach-stm32mp/ecdsa_romapi.c +1
-0@@ -81,8 +82,21 @@ static int romapi_ecdsa_verify(struct udevice *dev, memcpy(raw_key + 32, pubkey->y, 32); stm32mp_rom_get_ecdsa_functions(&rom); +arch/arm/mach-stm32mp/ecdsa_romapi.c static int romapi_ecdsa_verify(struct udevice *dev, · line 94
Quoted 10 lines
arch/arm/mach-stm32mp/ecdsa_romapi.c +9
-0+ /* + * Disable D-cache before calling into BootROM, else CRYP DMA + * may fail to pick up the correct data. + */ + if (dcache_status()) { + dcache_disable(); + reenable_dcache = true; + } + rom_ret = rom.ecdsa_verify_signature(hash, raw_key, signature, algo);so the signature verification (the code execution) is done with dcache OFF....
Quoted 8 lines
flush the input data should be enought for DMA operation ?
=> call
flush_dcache_all()orflush_dcache_range()for example:
if (
dcache_status())
flush_dcache_all();
Wouldn't you then also need to invalidate the dcache after the BootROM call, so that the CPU with dcache enabled could read what the CRYP wrote to DRAM instead of pulling stale data from Dcache ?
That's very much what the enable/disable trick does for you.