Add Vendor Authorized Boot (VAB) support
v2 cover Add Vendor Authorized Boot (VAB) support
This is the 2nd version of patchset to add Vendor Authorized Boot (VAB) support for Intel Agilex SoC device.
Vendor Authorized Boot is a security feature for authenticating the images such as U-Boot, ARM trusted Firmware, Linux kernel, device tree blob and etc loaded from FIT. After those images are loaded from FIT, the VAB certificate and signature block appended at the end of each image are sent to Secure Device Manager (SDM) for authentication. U-Boot will validate the SHA384 of the image against the SHA384 hash stored in the VAB certificate before sending the image to SDM for authentication.
Patch status:
Have changes: Patch 1, 2, 5, 6
Other patches unchanged.
Detail changelog can find in commit message.
v1->v2:
--------
Patch 1:
- Create common macro TARGET_SOCFPGA_SOC64 for Stratix10 and Agilex. This is new patch in 2nd version of VAB series. This is code clean up without functionality change.
Patch 2:
- Renamed CONFIG_SECURE_VAB_AUTH* to CONFIG_SOCFPGA_SECURE_VAB_AUTH*
- Changes in secure_vab.c
- Changed to use SZ_1K for 1024
- Updated comment in secure_vab.c of "... the certificate for T"
- The code will report error before end of the function if reach maximum retry.
- In board_prep_linux function, only execute linux_qspi_enable command if it exists in enviroment variable. It is optional.
Patch 5:
- Move CONFIG_BOOTCOMMAND to defconfig.
This is new patch in 2nd version of VAB series. This is code clean up without functionality change.
Patch 6:
- Renamed CONFIG_SECURE_VAB_AUTH to CONFIG_SOCFPGA_SECURE_VAB_AUTH
- Add CONFIG_BOOTCOMMAND in defconfig
History:
--------
[v1]: https://patchwork.ozlabs.org/project/uboot/cover/20201110070505.26935-1-elly.siew.chin.lim at intel.com/
These patchsets have dependency on:
--------
Enable ARM Trusted Firmware for U-Boot
https://patchwork.ozlabs.org/project/uboot/cover/20201224102113.32972-1-elly.siew.chin.lim at intel.com/
Siew Chin Lim (6):
arm: socfpga: Move Stratix10 and Agilex to use TARGET_SOCFPGA_SOC64
arm: socfpga: soc64: Support Vendor Authorized Boot (VAB)
arm: socfpga: cmd: Support 'vab' command
arm: socfpga: dts: soc64: Update filename in binman node of FIT image
with VAB support
configs: socfpga: soc64: Move CONFIG_BOOTCOMMAND to defconfig
configs: socfpga: Add defconfig for Agilex with VAB support
arch/arm/Kconfig | 6 +-
arch/arm/dts/socfpga_soc64_fit-u-boot.dtsi | 22 +++
arch/arm/mach-socfpga/Kconfig | 20 +++
arch/arm/mach-socfpga/Makefile | 3 +
arch/arm/mach-socfpga/include/mach/mailbox_s10.h | 1 +
arch/arm/mach-socfpga/include/mach/reset_manager.h | 3 +-
arch/arm/mach-socfpga/include/mach/secure_vab.h | 63 +++++++
.../arm/mach-socfpga/include/mach/system_manager.h | 3 +-
arch/arm/mach-socfpga/secure_vab.c | 193 +++++++++++++++++++++
arch/arm/mach-socfpga/vab.c | 37 ++++
common/Kconfig.boot | 2 +-
configs/socfpga_agilex_atf_defconfig | 2 +
configs/socfpga_agilex_defconfig | 2 +
..._atf_defconfig => socfpga_agilex_vab_defconfig} | 5 +-
configs/socfpga_stratix10_atf_defconfig | 2 +
configs/socfpga_stratix10_defconfig | 2 +
drivers/ddr/altera/Kconfig | 6 +-
drivers/fpga/Kconfig | 2 +-
drivers/sysreset/Kconfig | 2 +-
include/configs/socfpga_soc64_common.h | 9 +-
20 files changed, 363 insertions(+), 22 deletions(-)
create mode 100644 arch/arm/mach-socfpga/include/mach/secure_vab.h
create mode 100644 arch/arm/mach-socfpga/secure_vab.c
create mode 100644 arch/arm/mach-socfpga/vab.c
copy configs/{socfpga_agilex_atf_defconfig => socfpga_agilex_vab_defconfig} (91%)Signature · 1 line
2.13.0
PATCH v2 1/6 arm: socfpga: Move Stratix10 and Agilex to use TARGET_SOCFPGA_SOC64
Create common macro TARGET_SOCFPGA_SOC64 for Stratix10 and Agilex.
---
v2
---
- This is new patch in 2nd version of VAB series. This is code clean up without functional change.
--- arch/arm/Kconfig | 6 +++--- arch/arm/mach-socfpga/Kconfig | 5 +++++ arch/arm/mach-socfpga/include/mach/reset_manager.h | 3 +-- arch/arm/mach-socfpga/include/mach/system_manager.h | 3 +-- drivers/ddr/altera/Kconfig | 6 +++--- drivers/fpga/Kconfig | 2 +- drivers/sysreset/Kconfig | 2 +- 7 files changed, 15 insertions(+), 12 deletions(-)
arch/arm/Kconfig +3 -3
@@ -974,7 +974,7 @@ config ARCH_SOCFPGA bool "Altera SOCFPGA family" select ARCH_EARLY_INIT_R select ARCH_MISC_INIT if !TARGET_SOCFPGA_ARRIA10 - select ARM64 if TARGET_SOCFPGA_STRATIX10 || TARGET_SOCFPGA_AGILEX + select ARM64 if TARGET_SOCFPGA_SOC64 select CPU_V7A if TARGET_SOCFPGA_GEN5 || TARGET_SOCFPGA_ARRIA10 select DM select DM_SERIAL
@@ -986,7 +986,7 @@ config ARCH_SOCFPGA select SPL_LIBGENERIC_SUPPORT select SPL_NAND_SUPPORT if SPL_NAND_DENALI select SPL_OF_CONTROL - select SPL_SEPARATE_BSS if TARGET_SOCFPGA_STRATIX10 || TARGET_SOCFPGA_AGILEX + select SPL_SEPARATE_BSS if TARGET_SOCFPGA_SOC64 select SPL_SERIAL_SUPPORT select SPL_SYSRESET select SPL_WATCHDOG_SUPPORT
@@ -995,7 +995,7 @@ config ARCH_SOCFPGA select SYS_THUMB_BUILD if TARGET_SOCFPGA_GEN5 || TARGET_SOCFPGA_ARRIA10 select SYSRESET select SYSRESET_SOCFPGA if TARGET_SOCFPGA_GEN5 || TARGET_SOCFPGA_ARRIA10 - select SYSRESET_SOCFPGA_SOC64 if TARGET_SOCFPGA_STRATIX10 || TARGET_SOCFPGA_AGILEX + select SYSRESET_SOCFPGA_SOC64 if TARGET_SOCFPGA_SOC64 imply CMD_DM imply CMD_MTDPARTS imply CRC32_VERIFY
arch/arm/mach-socfpga/Kconfig +5 -0
@@ -38,6 +38,7 @@ config TARGET_SOCFPGA_AGILEX select FPGA_INTEL_SDM_MAILBOX select NCORE_CACHE select SPL_CLK if SPL + select TARGET_SOCFPGA_SOC64 config TARGET_SOCFPGA_ARRIA5 bool
@@ -75,12 +76,16 @@ config TARGET_SOCFPGA_GEN5 imply SPL_SYS_MALLOC_SIMPLE imply SPL_USE_TINY_PRINTF +config TARGET_SOCFPGA_SOC64 + bool + config TARGET_SOCFPGA_STRATIX10 bool select ARMV8_MULTIENTRY select ARMV8_SET_SMPEN select BINMAN if SPL_ATF select FPGA_INTEL_SDM_MAILBOX + select TARGET_SOCFPGA_SOC64 choice prompt "Altera SOCFPGA board select"
arch/arm/mach-socfpga/include/mach/reset_manager.h +1 -2
@@ -43,8 +43,7 @@ void socfpga_per_reset_all(void);#include <asm/arch/reset_manager_gen5.h> #elif defined(CONFIG_TARGET_SOCFPGA_ARRIA10 )#include <asm/arch/reset_manager_arria10.h> -#elif defined(CONFIG_TARGET_SOCFPGA_STRATIX10 ) || \ - defined(CONFIG_TARGET_SOCFPGA_AGILEX ) +#elif defined(CONFIG_TARGET_SOCFPGA_SOC64 )#include <asm/arch/reset_manager_soc64.h> #endif
arch/arm/mach-socfpga/include/mach/system_manager.h +1 -2
@@ -8,8 +8,7 @@phys_addr_t socfpga_get_sysmgr_addr (void ); -#if defined(CONFIG_TARGET_SOCFPGA_STRATIX10 ) || \ - defined(CONFIG_TARGET_SOCFPGA_AGILEX ) +#if defined(CONFIG_TARGET_SOCFPGA_SOC64 )#include <asm/arch/system_manager_soc64.h> #else #define SYSMGR_ROMCODEGRP_CTRL_WARMRSTCFGPINMUX BIT(0)
drivers/ddr/altera/Kconfig +3 -3
@@ -1,8 +1,8 @@ config SPL_ALTERA_SDRAM bool "SoCFPGA DDR SDRAM driver in SPL" depends on SPL - depends on TARGET_SOCFPGA_GEN5 || TARGET_SOCFPGA_ARRIA10 || TARGET_SOCFPGA_STRATIX10 || TARGET_SOCFPGA_AGILEX - select RAM if TARGET_SOCFPGA_GEN5 || TARGET_SOCFPGA_STRATIX10 || TARGET_SOCFPGA_AGILEX - select SPL_RAM if TARGET_SOCFPGA_GEN5 || TARGET_SOCFPGA_STRATIX10 || TARGET_SOCFPGA_AGILEX + depends on TARGET_SOCFPGA_GEN5 || TARGET_SOCFPGA_ARRIA10 || TARGET_SOCFPGA_SOC64 + select RAM if TARGET_SOCFPGA_GEN5 || TARGET_SOCFPGA_SOC64 + select SPL_RAM if TARGET_SOCFPGA_GEN5 || TARGET_SOCFPGA_SOC64 help Enable DDR SDRAM controller for the SoCFPGA devices.
drivers/fpga/Kconfig +1 -1
@@ -33,7 +33,7 @@ config FPGA_CYCLON2 config FPGA_INTEL_SDM_MAILBOX bool "Enable Intel FPGA Full Reconfiguration SDM Mailbox driver" - depends on TARGET_SOCFPGA_STRATIX10 || TARGET_SOCFPGA_AGILEX + depends on TARGET_SOCFPGA_SOC64 select FPGA_ALTERA help Say Y here to enable the Intel FPGA Full Reconfig SDM Mailbox driver
drivers/sysreset/Kconfig +1 -1
@@ -88,7 +88,7 @@ config SYSRESET_SOCFPGA config SYSRESET_SOCFPGA_SOC64 bool "Enable support for Intel SOCFPGA SoC64 family (Stratix10/Agilex)" - depends on ARCH_SOCFPGA && (TARGET_SOCFPGA_STRATIX10 || TARGET_SOCFPGA_AGILEX) + depends on ARCH_SOCFPGA && TARGET_SOCFPGA_SOC64 help This enables the system reset driver support for Intel SOCFPGA SoC64 SoCs.
Signature · 1 line
2.13.0
Tan
PATCH v2 1/6 arm: socfpga: Move Stratix10 and Agilex to use TARGET_SOCFPGA_SOC64
Quoted 16 lines
-----Original Message-----
From: Lim, Elly Siew Chin <[email protected]>
Sent: Thursday, January 7, 2021 6:04 PM
To: u-boot at lists.denx.de
Cc: Marek Vasut <[email protected]>; Tan, Ley Foon <[email protected]>; See, Chin Liang <[email protected]>; Simon Goldschmidt <[email protected]>; Chee, Tien Fong <[email protected]>; Westergreen, Dalon <[email protected]>; Simon Glass <[email protected]>; Gan, Yau Wai <[email protected]>; Lim, Elly Siew Chin <[email protected]>
Subject: [v2 1/6] arm: socfpga: Move Stratix10 and Agilex to useTARGET_SOCFPGA_SOC64
Quoted 4 lines
Create common macro
TARGET_SOCFPGA_SOC64for Stratix10 and Agilex.Signed-off-by Siew Chin Lim <[email protected]>
Regards
Ley Foon
PATCH v2 2/6 arm: socfpga: soc64: Support Vendor Authorized Boot (VAB)
In reply to Siew Chin LimVendor Authorized Boot is a security feature for authenticating the images such as U-Boot, ARM trusted Firmware, Linux kernel, device tree blob and etc loaded from FIT. After those images are loaded from FIT, the VAB certificate and signature block appended at the end of each image are sent to Secure Device Manager (SDM) for authentication. U-Boot will validate the SHA384 of the image against the SHA384 hash stored in the VAB certificate before sending the image to SDM for authentication.
---
v2
---
- Renamed SECURE_VAB_AUTH* to SOCFPGA_SECURE_VAB_AUTH*
- Changes in secure_vab.c
- Changed to use SZ_1K for 1024
- Updated comment in secure_vab.c of "... the certificate for T"
- The code will report error before end of the function if reach maximum retry.
- In board_prep_linux function, only execute linux_qspi_enable command if it exists in enviroment variable. It is optional.
--- arch/arm/mach-socfpga/Kconfig | 15 ++ arch/arm/mach-socfpga/Makefile | 2 + arch/arm/mach-socfpga/include/mach/mailbox_s10.h | 1 + arch/arm/mach-socfpga/include/mach/secure_vab.h | 63 ++++++++ arch/arm/mach-socfpga/secure_vab.c | 193 +++++++++++++++++++++++ common/Kconfig.boot | 2 +- 6 files changed, 275 insertions(+), 1 deletion(-) create mode 100644 arch/arm/mach-socfpga/include/mach/secure_vab.h create mode 100644 arch/arm/mach-socfpga/secure_vab.c
arch/arm/mach-socfpga/Kconfig +15 -0
@@ -6,6 +6,21 @@ config ERR_PTR_OFFSET config NR_DRAM_BANKS default 1 +config SOCFPGA_SECURE_VAB_AUTH + bool "Enable boot image authentication with Secure Device Manager" + depends on TARGET_SOCFPGA_AGILEX + select FIT_IMAGE_POST_PROCESS + select SHA384 + select SHA512_ALGO + select SPL_FIT_IMAGE_POST_PROCESS + help + All images loaded from FIT will be authenticated by Secure Device + Manager. + +config SOCFPGA_SECURE_VAB_AUTH_ALLOW_NON_FIT_IMAGE + bool "Allow non-FIT VAB signed images" + depends on SOCFPGA_SECURE_VAB_AUTH + config SPL_SIZE_LIMIT default 0x10000 if TARGET_SOCFPGA_GEN5
arch/arm/mach-socfpga/Makefile +2 -0
@@ -4,6 +4,7 @@ # Wolfgang Denk, DENX Software Engineering, wd at denx.de. # # Copyright (C) 2012-2017 Altera Corporation <www.altera.com> +# Copyright (C) 2017-2020 Intel Corporation <www.intel.com> obj-y += board.o obj-y += clock_manager.o
@@ -47,6 +48,7 @@ obj-y += mailbox_s10.o obj-y += misc_s10.o obj-y += mmu-arm64_s10.o obj-y += reset_manager_s10.o +obj-$(CONFIG_SOCFPGA_SECURE_VAB_AUTH) += secure_vab.o obj-y += system_manager_s10.o obj-y += timer_s10.o obj-y += wrap_pinmux_config_s10.o
arch/arm/mach-socfpga/include/mach/mailbox_s10.h +1 -0
@@ -118,6 +118,7 @@ enum ALT_SDM_MBOX_RESP_CODE {#define MBOX_RECONFIG_MSEL 7#define MBOX_RECONFIG_DATA 8#define MBOX_RECONFIG_STATUS 9 +#define MBOX_VAB_SRC_CERT 11#define MBOX_QSPI_OPEN 50#define MBOX_QSPI_CLOSE 51#define MBOX_QSPI_DIRECT 59
arch/arm/mach-socfpga/include/mach/secure_vab.h new file +63 -0
63 lines not on this page · raw message
arch/arm/mach-socfpga/secure_vab.c new file +193 -0
193 lines not on this page · raw message
common/Kconfig.boot +1 -1
@@ -128,7 +128,7 @@ config FIT_BEST_MATCH config FIT_IMAGE_POST_PROCESS bool "Enable post-processing of FIT artifacts after loading by U-Boot" - depends on TI_SECURE_DEVICE + depends on TI_SECURE_DEVICE || SOCFPGA_SECURE_VAB_AUTH help Allows doing any sort of manipulation to blobs after they got extracted from FIT images like stripping off headers or modifying the size of the
Signature · 1 line
2.13.0
PATCH v2 2/6 arm: socfpga: soc64: Support Vendor Authorized Boot (VAB)
Quoted 23 lines · Siew Chin Lim
Vendor Authorized Boot is a security feature for authenticating the images such as U-Boot, ARM trusted Firmware, Linux kernel, device tree blob and etc loaded from FIT. After those images are loaded from FIT, the VAB certificate and signature block appended at the end of each image are sent to Secure Device Manager (SDM) for authentication. U-Boot will validate the SHA384 of the image against the SHA384 hash stored in the VAB certificate before sending the image to SDM for authentication.
Signed-off-by Siew Chin Lim <[email protected]>---
v2
---
- Renamed SECURE_VAB_AUTH* to SOCFPGA_SECURE_VAB_AUTH*
- Changes insecure_vab.c
- Changed to useSZ_1Kfor 1024
- Updated comment insecure_vab.cof "... the certificate for T"
- The code will report error before end of the function if reach maximum retry.
- Inboard_prep_linuxfunction, only executelinux_qspi_enablecommand if it exists in enviroment variable. It is optional.
Quoted 10 lines
--- arch/arm/mach-socfpga/Kconfig | 15 ++ arch/arm/mach-socfpga/Makefile | 2 + arch/arm/mach-socfpga/include/mach/mailbox_s10.h | 1 + arch/arm/mach-socfpga/include/mach/secure_vab.h | 63 ++++++++ arch/arm/mach-socfpga/secure_vab.c | 193 +++++++++++++++++++++++ common/Kconfig.boot | 2 +- 6 files changed, 275 insertions(+), 1 deletion(-) create mode 100644 arch/arm/mach-socfpga/include/mach/secure_vab.h create mode 100644 arch/arm/mach-socfpga/secure_vab.c
I think this could use a few more function comments. Also try to use if() instead of #if
Regards,
Simon
Lim
PATCH v2 2/6 arm: socfpga: soc64: Support Vendor Authorized Boot (VAB)
Hi Simon,
Quoted 44 lines
-----Original Message-----
From: Simon Glass <[email protected]>
Sent: Thursday, January 7, 2021 8:36 PM
To: Lim, Elly Siew Chin <[email protected]>
Cc: U-Boot Mailing List <[email protected]>; Marek Vasut <[email protected]>; Tan, Ley Foon <[email protected]>; See, Chin Liang <[email protected]>; Simon Goldschmidt <[email protected]>; Chee, Tien Fong <[email protected]>; Westergreen, Dalon <[email protected]>; Gan, Yau Wai <[email protected]>
Subject: Re: [v2 2/6] arm: socfpga: soc64: Support Vendor Authorized Boot (VAB)Quoted 23 lines · Siew Chin Lim
Vendor Authorized Boot is a security feature for authenticating the images such as U-Boot, ARM trusted Firmware, Linux kernel, device tree blob and etc loaded from FIT. After those images are loaded from FIT, the VAB certificate and signature block appended at the end of each image are sent to Secure Device Manager (SDM) for authentication. U-Boot will validate the SHA384 of the image against the SHA384 hash stored in the VAB certificate before sending the image to SDM for authentication.
Signed-off-by Siew Chin Lim <[email protected]>---
v2
---
- Renamed SECURE_VAB_AUTH* to SOCFPGA_SECURE_VAB_AUTH*
- Changes insecure_vab.c
- Changed to useSZ_1Kfor 1024
- Updated comment insecure_vab.cof "... the certificate for T"
- The code will report error before end of the function if reach maximum retry.
- Inboard_prep_linuxfunction, only executelinux_qspi_enablecommand if it exists in enviroment variable. It is optional.Quoted 6 lines
--- arch/arm/mach-socfpga/Kconfig | 15 ++ arch/arm/mach-socfpga/Makefile | 2 + arch/arm/mach-socfpga/include/mach/mailbox_s10.h | 1 + arch/arm/mach-socfpga/include/mach/secure_vab.h | 63 ++++++++ arch/arm/mach-socfpga/secure_vab.c | 193
Quoted 8 lines
+++++++++++++++++++++++
Quoted 4 lines
common/Kconfig.boot | 2 +- 6 files changed, 275 insertions(+), 1 deletion(-) create mode 100644 arch/arm/mach-socfpga/include/mach/secure_vab.h create mode 100644 arch/arm/mach-socfpga/secure_vab.cI think this could use a few more function comments. Also try to use
if()instead of #if
Noted. I will change #if in *.c to " if (IS_ENABLED(CONFIG...))".
Besides, can you please help to elaborate more about "I think this could use a few more function comments."?
Thanks,
Siew Chin
Quoted 3 lines
Regards,
Simon
PATCH v2 2/6 arm: socfpga: soc64: Support Vendor Authorized Boot (VAB)
Hi,
Quoted 53 lines · Elly Siew Chin
Hi Simon,
Quoted 50 lines
-----Original Message-----
From: Simon Glass <[email protected]>
Sent: Thursday, January 7, 2021 8:36 PM
To: Lim, Elly Siew Chin <[email protected]>
Cc: U-Boot Mailing List <[email protected]>; Marek Vasut <[email protected]>; Tan, Ley Foon <[email protected]>; See, Chin Liang <[email protected]>; Simon Goldschmidt <[email protected]>; Chee, Tien Fong <[email protected]>; Westergreen, Dalon <[email protected]>; Gan, Yau Wai <[email protected]>
Subject: Re: [v2 2/6] arm: socfpga: soc64: Support Vendor Authorized Boot (VAB)Quoted 23 lines · Siew Chin Lim
Vendor Authorized Boot is a security feature for authenticating the images such as U-Boot, ARM trusted Firmware, Linux kernel, device tree blob and etc loaded from FIT. After those images are loaded from FIT, the VAB certificate and signature block appended at the end of each image are sent to Secure Device Manager (SDM) for authentication. U-Boot will validate the SHA384 of the image against the SHA384 hash stored in the VAB certificate before sending the image to SDM for authentication.
Signed-off-by Siew Chin Lim <[email protected]>---
v2
---
- Renamed SECURE_VAB_AUTH* to SOCFPGA_SECURE_VAB_AUTH*
- Changes insecure_vab.c
- Changed to useSZ_1Kfor 1024
- Updated comment insecure_vab.cof "... the certificate for T"
- The code will report error before end of the function if reach maximum retry.
- Inboard_prep_linuxfunction, only executelinux_qspi_enablecommand if it exists in enviroment variable. It is optional.Quoted 6 lines
--- arch/arm/mach-socfpga/Kconfig | 15 ++ arch/arm/mach-socfpga/Makefile | 2 + arch/arm/mach-socfpga/include/mach/mailbox_s10.h | 1 + arch/arm/mach-socfpga/include/mach/secure_vab.h | 63 ++++++++ arch/arm/mach-socfpga/secure_vab.c | 193+++++++++++++++++++++++
Quoted 4 lines
common/Kconfig.boot | 2 +- 6 files changed, 275 insertions(+), 1 deletion(-) create mode 100644 arch/arm/mach-socfpga/include/mach/secure_vab.h create mode 100644 arch/arm/mach-socfpga/secure_vab.c
Quoted 6 lines
Quoted 2 lines
I think this could use a few more function comments. Also try to use
if()instead of #ifNoted. I will change #if in *.c to " if (
IS_ENABLED(CONFIG...))".Besides, can you please help to elaborate more about "I think this could use a few more function comments."?
Non-trivial functions should have a comment in the standard style that explains their purpose/action and documents input and output args and return value.
Regards,
Simon
Lim
PATCH v2 2/6 arm: socfpga: soc64: Support Vendor Authorized Boot (VAB)
Hi Simon,
Quoted 73 lines
-----Original Message-----
From: Simon Glass <[email protected]>
Sent: Friday, January 8, 2021 11:24 AM
To: Lim, Elly Siew Chin <[email protected]>
Cc: U-Boot Mailing List <[email protected]>; Marek Vasut <[email protected]>; Tan, Ley Foon <[email protected]>; See, Chin Liang <[email protected]>; Simon Goldschmidt <[email protected]>; Chee, Tien Fong <[email protected]>; Westergreen, Dalon <[email protected]>; Gan, Yau Wai <[email protected]>
Subject: Re: [v2 2/6] arm: socfpga: soc64: Support Vendor Authorized Boot (VAB)Hi,
Quoted 26 lines · Elly Siew Chin
Hi Simon,
Quoted 23 lines
-----Original Message-----
From: Simon Glass <[email protected]>
Sent: Thursday, January 7, 2021 8:36 PM
To: Lim, Elly Siew Chin <[email protected]>
Cc: U-Boot Mailing List <[email protected]>; Marek Vasut <[email protected]>; Tan, Ley Foon <[email protected]>; See, Chin Liang <[email protected]>; Simon Goldschmidt <[email protected]>; Chee, Tien Fong <[email protected]>; Westergreen, Dalon <[email protected]>; Gan, Yau Wai <[email protected]>
Subject: Re: [v2 2/6] arm: socfpga: soc64: Support Vendor Authorized Boot
(VAB)Quoted 6 lines · Siew Chin Lim
Vendor Authorized Boot is a security feature for authenticating the images such as U-Boot, ARM trusted Firmware, Linux kernel, device tree blob and etc loaded from FIT. After those images are loaded from FIT, the VAB certificate and signature block appended at the end of each image are sent to Secure Device Manager (SDM) for
authentication.
Quoted 29 lines
Quoted 29 lines
Quoted 17 lines
U-Boot will validate the SHA384 of the image against the SHA384 hash stored in the VAB certificate before sending the image to SDM for authentication.
Signed-off-by Siew Chin Lim <[email protected]>---
v2
---
- Renamed SECURE_VAB_AUTH* to SOCFPGA_SECURE_VAB_AUTH*
- Changes insecure_vab.c
- Changed to useSZ_1Kfor 1024
- Updated comment insecure_vab.cof "... the certificate for T"
- The code will report error before end of the function if reach maximum retry.
- Inboard_prep_linuxfunction, only executelinux_qspi_enablecommand if it exists in enviroment variable. It is optional.Quoted 6 lines
--- arch/arm/mach-socfpga/Kconfig | 15 ++ arch/arm/mach-socfpga/Makefile | 2 + arch/arm/mach-socfpga/include/mach/mailbox_s10.h | 1 + arch/arm/mach-socfpga/include/mach/secure_vab.h | 63 ++++++++ arch/arm/mach-socfpga/secure_vab.c | 193+++++++++++++++++++++++
Quoted 4 lines
common/Kconfig.boot | 2 +- 6 files changed, 275 insertions(+), 1 deletion(-) create mode 100644 arch/arm/mach-socfpga/include/mach/secure_vab.h create mode 100644 arch/arm/mach-socfpga/secure_vab.c
Quoted 7 lines
Quoted 6 lines
Quoted 2 lines
I think this could use a few more function comments. Also try to use
if()instead of #ifNoted. I will change #if in *.c to " if (
IS_ENABLED(CONFIG...))".Besides, can you please help to elaborate more about "I think this could use a
few more function comments."?
Noted, I will review this. Thanks.
Quoted 6 lines
Non-trivial functions should have a comment in the standard style that explains their purpose/action and documents input and output args and return value.
Regards,
Simon
Tan
PATCH v2 2/6 arm: socfpga: soc64: Support Vendor Authorized Boot (VAB)
In reply to Siew Chin LimQuoted 185 lines
-----Original Message-----
From: Lim, Elly Siew Chin <[email protected]>
Sent: Thursday, January 7, 2021 6:04 PM
To: u-boot at lists.denx.de
Cc: Marek Vasut <[email protected]>; Tan, Ley Foon <[email protected]>; See, Chin Liang <[email protected]>; Simon Goldschmidt <[email protected]>; Chee, Tien Fong <[email protected]>; Westergreen, Dalon <[email protected]>; Simon Glass <[email protected]>; Gan, Yau Wai <[email protected]>; Lim, Elly Siew Chin <[email protected]>
Subject: [v2 2/6] arm: socfpga: soc64: Support Vendor Authorized Boot (VAB)Vendor Authorized Boot is a security feature for authenticating the images such as U-Boot, ARM trusted Firmware, Linux kernel, device tree blob and etc loaded from FIT. After those images are loaded from FIT, the VAB certificate and signature block appended at the end of each image are sent to Secure Device Manager (SDM) for authentication. U-Boot will validate the SHA384 of the image against the SHA384 hash stored in the VAB certificate before sending the image to SDM for authentication.
Signed-off-by Siew Chin Lim <[email protected]>---
v2
---
- Renamed SECURE_VAB_AUTH* to SOCFPGA_SECURE_VAB_AUTH*
- Changes insecure_vab.c
- Changed to useSZ_1Kfor 1024
- Updated comment insecure_vab.cof "... the certificate for T"
- The code will report error before end of the function if reach maximum retry.
- Inboard_prep_linuxfunction, only executelinux_qspi_enablecommand if it exists in enviroment variable. It is optional.--- arch/arm/mach-socfpga/Kconfig | 15 ++ arch/arm/mach-socfpga/Makefile | 2 + arch/arm/mach-socfpga/include/mach/mailbox_s10.h | 1 + arch/arm/mach-socfpga/include/mach/secure_vab.h | 63 ++++++++ arch/arm/mach-socfpga/secure_vab.c | 193 +++++++++++++++++++++++ common/Kconfig.boot | 2 +- 6 files changed, 275 insertions(+), 1 deletion(-) create mode 100644 arch/arm/mach-socfpga/include/mach/secure_vab.h create mode 100644 arch/arm/mach-socfpga/secure_vab.carch/arm/mach- renamed from arch/arm/mach-socfpga/Kconfig +0
-0socfpga/Kconfig index
9b1abdaabd..0c35406232100644arch/arm/mach-socfpga/Kconfig +2
-0@@ -6,6 +6,21 @@ config ERR_PTR_OFFSET config NR_DRAM_BANKS default 1 +config SOCFPGA_SECURE_VAB_AUTH + bool "Enable boot image authentication with Secure DeviceManager"
arch/arm/mach-socfpga/Kconfig +13
-0+ depends on TARGET_SOCFPGA_AGILEX + select FIT_IMAGE_POST_PROCESS + select SHA384 + select SHA512_ALGO + select SPL_FIT_IMAGE_POST_PROCESS + help + All images loaded from FIT will be authenticated by Secure Device + Manager. + +config SOCFPGA_SECURE_VAB_AUTH_ALLOW_NON_FIT_IMAGE + bool "Allow non-FIT VAB signed images" + depends on SOCFPGA_SECURE_VAB_AUTH + config SPL_SIZE_LIMIT default 0x10000 if TARGET_SOCFPGA_GEN5arch/arm/mach- renamed from arch/arm/mach-socfpga/Makefile +0
-0socfpga/Makefile index
82b681d870..1f1e21766d100644arch/arm/mach-socfpga/Makefile +2
-0@@ -4,6 +4,7 @@ # Wolfgang Denk, DENX Software Engineering, wd at denx.de. # # Copyright (C) 2012-2017 Altera Corporation <www.altera.com> +# Copyright (C) 2017-2020 Intel Corporation <www.intel.com> obj-y += board.o obj-y += clock_manager.o@@ -47,6 +48,7 @@ obj-y += mailbox_s10.o obj-y += misc_s10.o obj-y += mmu-arm64_s10.o obj-y += reset_manager_s10.o +obj-$(CONFIG_SOCFPGA_SECURE_VAB_AUTH) += secure_vab.o obj-y += system_manager_s10.o obj-y += timer_s10.o obj-y += wrap_pinmux_config_s10.oarch/arm/mach-socfpga/include/mach/mailbox_s10.h +1
-0@@ -118,6 +118,7 @@ enum ALT_SDM_MBOX_RESP_CODE {#define MBOX_RECONFIG_MSEL 7#define MBOX_RECONFIG_DATA 8#define MBOX_RECONFIG_STATUS 9 +#define MBOX_VAB_SRC_CERT 11#define MBOX_QSPI_OPEN 50#define MBOX_QSPI_CLOSE 51#define MBOX_QSPI_DIRECT 59arch/arm/mach-socfpga/include/mach/secure_vab.h new file +52
-0@@ -0,0 +1,63 @@ +/* SPDX-License-Identifier: GPL-2.0 +* +* Copyright (C) 2020 Intel Corporation <www.intel.com> +* +*/ + +#ifndef _SECURE_VAB_H_ +#define _SECURE_VAB_H_ + +#include <linux/sizes.h> +#include <linux/stddef.h> +#include <u-boot/sha512.h> + +#define VAB_DATA_SZ 64 + +#define SDM_CERT_MAGIC_NUM 0x25D04E7F +#define FCS_HPS_VAB_MAGIC_NUM 0xD0564142 + +#define MAX_CERT_SIZE (SZ_4K) + +/* +* struct fcs_hps_vab_certificate_data +* @vab_cert_magic_num: VAB Certificate Magic Word (0xD0564142) +* @flags: TBD +* @fcs_data: Data words being certificate signed. +* @cert_sign_keychain: Certificate Signing Keychain */ struct +fcs_hps_vab_certificate_data { +u32 vab_cert_magic_num;/* offset 0x10 */ +u32 flags; +u8 rsvd0_1[8 ]; +u8 fcs_sha384[SHA384_SUM_LEN ];/* offset 0x20 */ +}; + +/* +* struct fcs_hps_vab_certificate_header +* @cert_magic_num: Certificate Magic Word (0x25D04E7F) +* @cert_data_sz: size of this certificate header (0x80) +* Includes magic number all the way to the certificate +* signing keychain (excludes cert. signing keychain) +* @cert_ver: Certificate Version +* @cert_type: Certificate Type +* @data: VAB HPS Image Certificate data */ struct +fcs_hps_vab_certificate_header { +u32 cert_magic_num;/* offset 0 */ +u32 cert_data_sz; +u32 cert_ver; +u32 cert_type; +struct fcs_hps_vab_certificate_data d;/* offset 0x10 */ +/* keychain starts at offset 0x50 */ +}; + +#define VAB_CERT_HEADER_SIZE sizeof(struct
fcs_hps_vab_certificate_header)arch/arm/mach-socfpga/include/mach/secure_vab.h new file +4
-0+#define VAB_CERT_MAGIC_OFFSET offsetof \ + (struct fcs_hps_vab_certificate_header, d) +#define VAB_CERT_FIT_SHA384_OFFSET offsetof \ + (struct fcs_hps_vab_certificate_data,\
arch/arm/mach-socfpga/include/mach/secure_vab.h new file +5
-0+ fcs_sha384[0]) + +int socfpga_vendor_authentication (void **p_image,size_t *p_size); + +#endif /* _SECURE_VAB_H_ */ arch/arm/mach- renamed from arch/arm/mach-socfpga/secure_vab.c +0
-0
socfpga/secure_vab.c
new file mode 100644
index 0000000000..ea1109611a
arch/arm/mach-socfpga/secure_vab.c line 7
Quoted 7 lines
arch/arm/mach-socfpga/secure_vab.c new file +7
-0@@ -0,0 +1,193 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (C) 2020 Intel Corporation <www.intel.com> +* +*/ + +#include <common.h>
Sort alphanumerically.
Quoted 13 lines
arch/arm/mach-socfpga/secure_vab.c new file +13
-0+#include <asm/arch/mailbox_s10.h> +#include <asm/arch/secure_vab.h> +#include <asm/arch/smc_api.h> +#include <asm/unaligned.h> +#include <exports.h> +#include <hang.h> +#include <image.h> +#include <linux/errno.h> +#include <linux/intel-smc.h> +#include <log.h> + +/* +* Compare the SHA384 found in certificate against the SHA384
arch/arm/mach-socfpga/secure_vab.c line 88
Quoted 10 lines
arch/arm/mach-socfpga/secure_vab.c new file +10
-0+* calculated from image +*/ +if (memcmp (hash384, cert_hash_ptr,SHA384_SUM_LEN )) { +puts ("SHA384 not match!\n" ); +return -EKEYREJECTED ; + } + + mbox_data_addr = img_addr + img_sz -sizeof (u32); +/* Size in word (32bits) */ + mbox_data_sz = (ALIGN (*p_size - img_sz,4 )) >>2 ;
Change 4 to sizeof().
[...]
Quoted 12 lines
arch/arm/mach-socfpga/secure_vab.c new file +11
-0+ +debug ("ret = 0x%08x, resp = 0x%08x, resp_len = %d\n" , ret, resp, + resp_len); + + if (ret) { + /* + * Unsupported mailbox command or device not in the + * owned/secure state + */ + if (ret == MBOX_RESP_UNKNOWN || + ret ==
MBOX_RESP_NOT_ALLOWED_UNDER_SECURITY_SETTINGS) {
arch/arm/mach-socfpga/secure_vab.c line 144
Quoted 6 lines
arch/arm/mach-socfpga/secure_vab.c new file +6
-0+/* SDM bypass authentication */ +printf ("%s 0x%016llx (%ld bytes)\n" , +"Image Authentication bypassed at address" , + img_addr, img_sz); +return 0 ; + }
Should we continue boot if MBOX_RESP_UNKNOWN? That mean user can bypass authentication when mailbox error?
Regards
Ley Foon
Lim
PATCH v2 2/6 arm: socfpga: soc64: Support Vendor Authorized Boot (VAB)
Hi Ley Foon,
Quoted 245 lines
-----Original Message-----
From: Tan, Ley Foon <[email protected]>
Sent: Monday, January 18, 2021 3:29 PM
To: Lim, Elly Siew Chin <[email protected]>; u-boot at lists.denx.de
Cc: Marek Vasut <[email protected]>; See, Chin Liang <[email protected]>; Simon Goldschmidt <[email protected]>; Chee, Tien Fong <[email protected]>; Westergreen, Dalon <[email protected]>; Simon Glass <[email protected]>; Gan, Yau Wai <[email protected]>
Subject: RE: [v2 2/6] arm: socfpga: soc64: Support Vendor Authorized Boot (VAB)Quoted 181 lines
-----Original Message-----
From: Lim, Elly Siew Chin <[email protected]>
Sent: Thursday, January 7, 2021 6:04 PM
To: u-boot at lists.denx.de
Cc: Marek Vasut <[email protected]>; Tan, Ley Foon <[email protected]>; See, Chin Liang <[email protected]>; Simon Goldschmidt <[email protected]>; Chee, Tien Fong <[email protected]>; Westergreen, Dalon <[email protected]>; Simon Glass <[email protected]>; Gan, Yau Wai <[email protected]>; Lim, Elly Siew Chin <[email protected]>
Subject: [v2 2/6] arm: socfpga: soc64: Support Vendor Authorized Boot (VAB)Vendor Authorized Boot is a security feature for authenticating the images such as U-Boot, ARM trusted Firmware, Linux kernel, device tree blob and etc loaded from FIT. After those images are loaded from FIT, the VAB certificate and signature block appended at the end of each image are sent to Secure Device Manager (SDM) for authentication. U-Boot will validate the
SHA384 of the image against the SHA384 hash stored in the VAB certificate before sending the image to SDM for authentication.Signed-off-by Siew Chin Lim <[email protected]>---
v2
---
- Renamed SECURE_VAB_AUTH* to SOCFPGA_SECURE_VAB_AUTH*
- Changes insecure_vab.c
- Changed to useSZ_1Kfor 1024
- Updated comment insecure_vab.cof "... the certificate for T"
- The code will report error before end of the function if reach maximum retry.
- Inboard_prep_linuxfunction, only executelinux_qspi_enablecommand if it exists in enviroment variable. It is optional.--- arch/arm/mach-socfpga/Kconfig | 15 ++ arch/arm/mach-socfpga/Makefile | 2 + arch/arm/mach-socfpga/include/mach/mailbox_s10.h | 1 + arch/arm/mach-socfpga/include/mach/secure_vab.h | 63 ++++++++ arch/arm/mach-socfpga/secure_vab.c | 193 +++++++++++++++++++++++ common/Kconfig.boot | 2 +- 6 files changed, 275 insertions(+), 1 deletion(-) create mode 100644 arch/arm/mach-socfpga/include/mach/secure_vab.h create mode 100644 arch/arm/mach-socfpga/secure_vab.carch/arm/mach- renamed from arch/arm/mach-socfpga/Kconfig +0
-0socfpga/Kconfig index
9b1abdaabd..0c35406232100644arch/arm/mach-socfpga/Kconfig +2
-0@@ -6,6 +6,21 @@ config ERR_PTR_OFFSET config NR_DRAM_BANKS default 1 +config SOCFPGA_SECURE_VAB_AUTH + bool "Enable boot image authentication with Secure DeviceManager"
arch/arm/mach-socfpga/Kconfig +13
-0+ depends on TARGET_SOCFPGA_AGILEX + select FIT_IMAGE_POST_PROCESS + select SHA384 + select SHA512_ALGO + select SPL_FIT_IMAGE_POST_PROCESS + help + All images loaded from FIT will be authenticated by Secure Device + Manager. + +config SOCFPGA_SECURE_VAB_AUTH_ALLOW_NON_FIT_IMAGE + bool "Allow non-FIT VAB signed images" + depends on SOCFPGA_SECURE_VAB_AUTH + config SPL_SIZE_LIMIT default 0x10000 if TARGET_SOCFPGA_GEN5arch/arm/mach- renamed from arch/arm/mach-socfpga/Makefile +0
-0socfpga/Makefile index
82b681d870..1f1e21766d100644arch/arm/mach-socfpga/Makefile +2
-0@@ -4,6 +4,7 @@ # Wolfgang Denk, DENX Software Engineering, wd at denx.de. # # Copyright (C) 2012-2017 Altera Corporation <www.altera.com> +# Copyright (C) 2017-2020 Intel Corporation <www.intel.com> obj-y += board.o obj-y += clock_manager.o@@ -47,6 +48,7 @@ obj-y += mailbox_s10.o obj-y += misc_s10.o obj-y += mmu-arm64_s10.o obj-y += reset_manager_s10.o +obj-$(CONFIG_SOCFPGA_SECURE_VAB_AUTH) += secure_vab.o obj-y += system_manager_s10.o obj-y += timer_s10.o obj-y += wrap_pinmux_config_s10.oarch/arm/mach-socfpga/include/mach/mailbox_s10.h +1
-0@@ -118,6 +118,7 @@ enum ALT_SDM_MBOX_RESP_CODE {#define MBOX_RECONFIG_MSEL 7#define MBOX_RECONFIG_DATA 8#define MBOX_RECONFIG_STATUS 9 +#define MBOX_VAB_SRC_CERT 11#define MBOX_QSPI_OPEN 50#define MBOX_QSPI_CLOSE 51#define MBOX_QSPI_DIRECT 59arch/arm/mach-socfpga/include/mach/secure_vab.h new file +51
-0@@ -0,0 +1,63 @@ +/* SPDX-License-Identifier: GPL-2.0 +* +* Copyright (C) 2020 Intel Corporation <www.intel.com> +* +*/ + +#ifndef _SECURE_VAB_H_ +#define _SECURE_VAB_H_ + +#include <linux/sizes.h> +#include <linux/stddef.h> +#include <u-boot/sha512.h> + +#define VAB_DATA_SZ 64 + +#define SDM_CERT_MAGIC_NUM 0x25D04E7F +#define FCS_HPS_VAB_MAGIC_NUM 0xD0564142 + +#define MAX_CERT_SIZE (SZ_4K) + +/* +* struct fcs_hps_vab_certificate_data +* @vab_cert_magic_num: VAB Certificate Magic Word (0xD0564142) +* @flags: TBD +* @fcs_data: Data words being certificate signed. +* @cert_sign_keychain: Certificate Signing Keychain */ struct +fcs_hps_vab_certificate_data { +u32 vab_cert_magic_num;/* offset 0x10 */ +u32 flags; +u8 rsvd0_1[8 ]; +u8 fcs_sha384[SHA384_SUM_LEN ];/* offset 0x20 */ +}; + +/* +* struct fcs_hps_vab_certificate_header +* @cert_magic_num: Certificate Magic Word (0x25D04E7F) +* @cert_data_sz: size of this certificate header (0x80) +* Includes magic number all the way to the certificate +* signing keychain (excludes cert. signing keychain) +* @cert_ver: Certificate Version +* @cert_type: Certificate Type +* @data: VAB HPS Image Certificate data */ struct +fcs_hps_vab_certificate_header { +u32 cert_magic_num;/* offset 0 */ +u32 cert_data_sz; +u32 cert_ver; +u32 cert_type; +struct fcs_hps_vab_certificate_data d;/* offset 0x10 */ +/* keychain starts at offset 0x50 */ }; + +#define VAB_CERT_HEADER_SIZE sizeof(struct
fcs_hps_vab_certificate_header)arch/arm/mach-socfpga/include/mach/secure_vab.h new file +4
-0+#define VAB_CERT_MAGIC_OFFSET offsetof \ + (struct fcs_hps_vab_certificate_header, d) +#define VAB_CERT_FIT_SHA384_OFFSET offsetof \ + (struct fcs_hps_vab_certificate_data,\
arch/arm/mach-socfpga/include/mach/secure_vab.h new file +5
-0+ fcs_sha384[0]) + +int socfpga_vendor_authentication (void **p_image,size_t *p_size); + +#endif /* _SECURE_VAB_H_ */ arch/arm/mach- renamed from arch/arm/mach-socfpga/secure_vab.c +0
-0
socfpga/secure_vab.cnew file mode 100644 index 0000000000..ea1109611aarch/arm/mach-socfpga/secure_vab.c line 7
Quoted 7 lines
arch/arm/mach-socfpga/secure_vab.c new file +7
-0@@ -0,0 +1,193 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (C) 2020 Intel Corporation <www.intel.com> +* +*/ + +#include <common.h> Sort alphanumerically.
Quoted 13 lines
arch/arm/mach-socfpga/secure_vab.c new file +13
-0+#include <asm/arch/mailbox_s10.h> +#include <asm/arch/secure_vab.h> +#include <asm/arch/smc_api.h> +#include <asm/unaligned.h> +#include <exports.h> +#include <hang.h> +#include <image.h> +#include <linux/errno.h> +#include <linux/intel-smc.h> +#include <log.h> + +/* +* Compare the SHA384 found in certificate against the SHA384 arch/arm/mach-socfpga/secure_vab.c line 88
Quoted 10 lines
arch/arm/mach-socfpga/secure_vab.c new file +10
-0+* calculated from image +*/ +if (memcmp (hash384, cert_hash_ptr,SHA384_SUM_LEN )) { +puts ("SHA384 not match!\n" ); +return -EKEYREJECTED ; + } + + mbox_data_addr = img_addr + img_sz -sizeof (u32); +/* Size in word (32bits) */ + mbox_data_sz = (ALIGN (*p_size - img_sz,4 )) >>2 ;Change 4 to
sizeof().[...]
Quoted 12 lines
arch/arm/mach-socfpga/secure_vab.c new file +11
-0+ +debug ("ret = 0x%08x, resp = 0x%08x, resp_len = %d\n" , ret, resp, + resp_len); + + if (ret) { + /* + * Unsupported mailbox command or device not in the + * owned/secure state + */ + if (ret == MBOX_RESP_UNKNOWN || + ret ==
MBOX_RESP_NOT_ALLOWED_UNDER_SECURITY_SETTINGS) {
Quoted 9 lines
arch/arm/mach-socfpga/secure_vab.c line 144
Quoted 6 lines
arch/arm/mach-socfpga/secure_vab.c new file +6
-0+/* SDM bypass authentication */ +printf ("%s 0x%016llx (%ld bytes)\n" , +"Image Authentication bypassed at address" , + img_addr, img_sz); +return 0 ; + }Should we continue boot if
MBOX_RESP_UNKNOWN? That mean user can bypass authentication when mailbox error?
Yes, per my understand from Jeremy before, we should allow HPS to boot if the FW is old version which does not support VAB.
Quoted 3 lines
Regards
Ley Foon
Tan
PATCH v2 2/6 arm: socfpga: soc64: Support Vendor Authorized Boot (VAB)
Quoted 278 lines
-----Original Message-----
From: Lim, Elly Siew Chin <[email protected]>
Sent: Monday, January 18, 2021 4:03 PM
To: Tan, Ley Foon <[email protected]>; u-boot at lists.denx.de
Cc: Marek Vasut <[email protected]>; See, Chin Liang <[email protected]>; Simon Goldschmidt <[email protected]>; Chee, Tien Fong <[email protected]>; Westergreen, Dalon <[email protected]>; Simon Glass <[email protected]>; Gan, Yau Wai <[email protected]>
Subject: RE: [v2 2/6] arm: socfpga: soc64: Support Vendor Authorized Boot (VAB)Hi Ley Foon,
Quoted 6 lines
-----Original Message-----
From: Tan, Ley Foon <[email protected]>
Sent: Monday, January 18, 2021 3:29 PM
To: Lim, Elly Siew Chin <[email protected]>; u-boot at lists.denx.de
Cc: Marek Vasut <[email protected]>; See, Chin LiangQuoted 32 lines
<[email protected]>; Simon Goldschmidt <[email protected]>; Chee, Tien Fong <[email protected]>; Westergreen, Dalon <[email protected]>; Simon Glass <[email protected]>; Gan, Yau Wai <[email protected]>
Subject: RE: [v2 2/6] arm: socfpga: soc64: Support Vendor Authorized Boot
(VAB)Quoted 21 lines
-----Original Message-----
From: Lim, Elly Siew Chin <[email protected]>
Sent: Thursday, January 7, 2021 6:04 PM
To: u-boot at lists.denx.de
Cc: Marek Vasut <[email protected]>; Tan, Ley Foon <[email protected]>; See, Chin Liang <[email protected]>; Simon Goldschmidt <[email protected]>; Chee, Tien Fong <[email protected]>; Westergreen, Dalon <[email protected]>; Simon Glass <[email protected]>; Gan, Yau Wai <[email protected]>; Lim, Elly Siew Chin <[email protected]>
Subject: [v2 2/6] arm: socfpga: soc64: Support Vendor Authorized Boot
(VAB)Vendor Authorized Boot is a security feature for authenticating the images such as U-Boot, ARM trusted Firmware, Linux kernel, device tree blob and etc loaded from FIT. After those images are loaded from FIT, the VAB certificate and signature block appended at the end of each image are sent to Secure Device Manager (SDM) for
authentication.
Quoted 212 lines
Quoted 163 lines
U-Boot will validate the
SHA384 of the image against the SHA384 hash stored in the VAB certificate before sending the image to SDM for authentication.Signed-off-by Siew Chin Lim <[email protected]>---
v2
---
- Renamed SECURE_VAB_AUTH* to SOCFPGA_SECURE_VAB_AUTH*
- Changes insecure_vab.c
- Changed to useSZ_1Kfor 1024
- Updated comment insecure_vab.cof "... the certificate for T"
- The code will report error before end of the function if reach maximum retry.
- Inboard_prep_linuxfunction, only executelinux_qspi_enablecommand if it exists in enviroment variable. It is optional.--- arch/arm/mach-socfpga/Kconfig | 15 ++ arch/arm/mach-socfpga/Makefile | 2 + arch/arm/mach-socfpga/include/mach/mailbox_s10.h | 1 + arch/arm/mach-socfpga/include/mach/secure_vab.h | 63 ++++++++ arch/arm/mach-socfpga/secure_vab.c | 193 +++++++++++++++++++++++ common/Kconfig.boot | 2 +- 6 files changed, 275 insertions(+), 1 deletion(-) create mode 100644 arch/arm/mach-socfpga/include/mach/secure_vab.h create mode 100644 arch/arm/mach-socfpga/secure_vab.carch/arm/mach- renamed from arch/arm/mach-socfpga/Kconfig +0
-0socfpga/Kconfig index
9b1abdaabd..0c35406232100644arch/arm/mach-socfpga/Kconfig +2
-0@@ -6,6 +6,21 @@ config ERR_PTR_OFFSET config NR_DRAM_BANKS default 1 +config SOCFPGA_SECURE_VAB_AUTH + bool "Enable boot image authentication with Secure DeviceManager"
arch/arm/mach-socfpga/Kconfig +13
-0+ depends on TARGET_SOCFPGA_AGILEX + select FIT_IMAGE_POST_PROCESS + select SHA384 + select SHA512_ALGO + select SPL_FIT_IMAGE_POST_PROCESS + help + All images loaded from FIT will be authenticated by Secure Device + Manager. + +config SOCFPGA_SECURE_VAB_AUTH_ALLOW_NON_FIT_IMAGE + bool "Allow non-FIT VAB signed images" + depends on SOCFPGA_SECURE_VAB_AUTH + config SPL_SIZE_LIMIT default 0x10000 if TARGET_SOCFPGA_GEN5arch/arm/mach- renamed from arch/arm/mach-socfpga/Makefile +0
-0socfpga/Makefile index
82b681d870..1f1e21766d100644arch/arm/mach-socfpga/Makefile +2
-0@@ -4,6 +4,7 @@ # Wolfgang Denk, DENX Software Engineering, wd at denx.de. # # Copyright (C) 2012-2017 Altera Corporation <www.altera.com> +# Copyright (C) 2017-2020 Intel Corporation <www.intel.com> obj-y += board.o obj-y += clock_manager.o@@ -47,6 +48,7 @@ obj-y += mailbox_s10.o obj-y += misc_s10.o obj-y += mmu-arm64_s10.o obj-y += reset_manager_s10.o +obj-$(CONFIG_SOCFPGA_SECURE_VAB_AUTH) += secure_vab.o obj-y += system_manager_s10.o obj-y += timer_s10.o obj-y += wrap_pinmux_config_s10.oarch/arm/mach-socfpga/include/mach/mailbox_s10.h +1
-0@@ -118,6 +118,7 @@ enum ALT_SDM_MBOX_RESP_CODE {#define MBOX_RECONFIG_MSEL 7#define MBOX_RECONFIG_DATA 8#define MBOX_RECONFIG_STATUS 9 +#define MBOX_VAB_SRC_CERT 11#define MBOX_QSPI_OPEN 50#define MBOX_QSPI_CLOSE 51#define MBOX_QSPI_DIRECT 59arch/arm/mach-socfpga/include/mach/secure_vab.h new file +51
-0@@ -0,0 +1,63 @@ +/* SPDX-License-Identifier: GPL-2.0 +* +* Copyright (C) 2020 Intel Corporation <www.intel.com> +* +*/ + +#ifndef _SECURE_VAB_H_ +#define _SECURE_VAB_H_ + +#include <linux/sizes.h> +#include <linux/stddef.h> +#include <u-boot/sha512.h> + +#define VAB_DATA_SZ 64 + +#define SDM_CERT_MAGIC_NUM 0x25D04E7F +#define FCS_HPS_VAB_MAGIC_NUM 0xD0564142 + +#define MAX_CERT_SIZE (SZ_4K) + +/* +* struct fcs_hps_vab_certificate_data +* @vab_cert_magic_num: VAB Certificate Magic Word (0xD0564142) +* @flags: TBD +* @fcs_data: Data words being certificate signed. +* @cert_sign_keychain: Certificate Signing Keychain */ struct +fcs_hps_vab_certificate_data { +u32 vab_cert_magic_num;/* offset 0x10 */ +u32 flags; +u8 rsvd0_1[8 ]; +u8 fcs_sha384[SHA384_SUM_LEN ];/* offset 0x20 */ +}; + +/* +* struct fcs_hps_vab_certificate_header +* @cert_magic_num: Certificate Magic Word (0x25D04E7F) +* @cert_data_sz: size of this certificate header (0x80) +* Includes magic number all the way to the certificate +* signing keychain (excludes cert. signing keychain) +* @cert_ver: Certificate Version +* @cert_type: Certificate Type +* @data: VAB HPS Image Certificate data */ struct +fcs_hps_vab_certificate_header { +u32 cert_magic_num;/* offset 0 */ +u32 cert_data_sz; +u32 cert_ver; +u32 cert_type; +struct fcs_hps_vab_certificate_data d;/* offset 0x10 */ +/* keychain starts at offset 0x50 */ }; + +#define VAB_CERT_HEADER_SIZE sizeof(struct
fcs_hps_vab_certificate_header)arch/arm/mach-socfpga/include/mach/secure_vab.h new file +4
-0+#define VAB_CERT_MAGIC_OFFSET offsetof \ + (struct fcs_hps_vab_certificate_header, d) +#define VAB_CERT_FIT_SHA384_OFFSET offsetof \ + (struct fcs_hps_vab_certificate_data,\
arch/arm/mach-socfpga/include/mach/secure_vab.h new file +5
-0+ fcs_sha384[0]) + +int socfpga_vendor_authentication (void **p_image,size_t *p_size); + +#endif /* _SECURE_VAB_H_ */ arch/arm/mach- renamed from arch/arm/mach-socfpga/secure_vab.c +0
-0
socfpga/secure_vab.cnew file mode 100644 index
0000000000..ea1109611aarch/arm/mach-socfpga/secure_vab.c line 7
Quoted 7 lines
arch/arm/mach-socfpga/secure_vab.c new file +7
-0@@ -0,0 +1,193 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (C) 2020 Intel Corporation <www.intel.com> +* +*/ + +#include <common.h> Sort alphanumerically.
Quoted 13 lines
arch/arm/mach-socfpga/secure_vab.c new file +13
-0+#include <asm/arch/mailbox_s10.h> +#include <asm/arch/secure_vab.h> +#include <asm/arch/smc_api.h> +#include <asm/unaligned.h> +#include <exports.h> +#include <hang.h> +#include <image.h> +#include <linux/errno.h> +#include <linux/intel-smc.h> +#include <log.h> + +/* +* Compare the SHA384 found in certificate against the SHA384 arch/arm/mach-socfpga/secure_vab.c line 88
Quoted 10 lines
arch/arm/mach-socfpga/secure_vab.c new file +10
-0+* calculated from image +*/ +if (memcmp (hash384, cert_hash_ptr,SHA384_SUM_LEN )) { +puts ("SHA384 not match!\n" ); +return -EKEYREJECTED ; + } + + mbox_data_addr = img_addr + img_sz -sizeof (u32); +/* Size in word (32bits) */ + mbox_data_sz = (ALIGN (*p_size - img_sz,4 )) >>2 ;Change 4 to
sizeof().[...]
Quoted 12 lines
arch/arm/mach-socfpga/secure_vab.c new file +11
-0+ +debug ("ret = 0x%08x, resp = 0x%08x, resp_len = %d\n" , ret, resp, + resp_len); + + if (ret) { + /* + * Unsupported mailbox command or device not in the + * owned/secure state + */ + if (ret == MBOX_RESP_UNKNOWN || + ret ==
MBOX_RESP_NOT_ALLOWED_UNDER_SECURITY_SETTINGS) {Quoted 9 lines
arch/arm/mach-socfpga/secure_vab.c line 144
Quoted 6 lines
arch/arm/mach-socfpga/secure_vab.c new file +6
-0+/* SDM bypass authentication */ +printf ("%s 0x%016llx (%ld bytes)\n" , +"Image Authentication bypassed at address" , + img_addr, img_sz); +return 0 ; + }Should we continue boot if
MBOX_RESP_UNKNOWN? That mean user can bypass authentication when mailbox error?
Quoted 3 lines
Yes, per my understand from Jeremy before, we should allow HPS to boot if the FW is old version which does not support VAB.
That mean people can purposely use old FW to bypass authentication? I think we need rethink if want support this case.
Regards
Ley Foon
PATCH v2 3/6 arm: socfpga: cmd: Support 'vab' command
In reply to Siew Chin LimSupport 'vab' command to perform vendor authentication.
Command format: vab addr len
Authorize 'len' bytes starting at 'addr' via vendor public key
--- arch/arm/mach-socfpga/Makefile | 1 + arch/arm/mach-socfpga/vab.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 arch/arm/mach-socfpga/vab.c
arch/arm/mach-socfpga/Makefile +1 -0
@@ -51,6 +51,7 @@ obj-y += reset_manager_s10.o obj-$(CONFIG_SOCFPGA_SECURE_VAB_AUTH) += secure_vab.o obj-y += system_manager_s10.o obj-y += timer_s10.o +obj-$(CONFIG_SOCFPGA_SECURE_VAB_AUTH) += vab.o obj-y += wrap_pinmux_config_s10.o obj-y += wrap_pll_config_s10.o endif
arch/arm/mach-socfpga/vab.c new file +37 -0
@@ -0,0 +1,37 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (C) 2020 Intel Corporation <www.intel.com> +* +*/ + +#include <asm/arch/secure_vab.h> +#include <command.h> +#include <common.h> +#include <linux/ctype.h> + +static int do_vab (struct cmd_tbl *cmdtp,int flag,int argc, +char *const argv[]) +{ +unsigned long addr, len; + +if (argc <3 ) +return CMD_RET_USAGE ; + + addr =simple_strtoul (argv[1 ],NULL ,16 ); + len =simple_strtoul (argv[2 ],NULL ,16 ); + +if (socfpga_vendor_authentication ((void *)&addr, (size_t *)&len) ==0 ) +printf ("%s 0x%016lx (%ld bytes)\n" , +"Image Authentication passed@address" , addr, len); +else +return CMD_RET_FAILURE ; + +return 0 ; +} + +U_BOOT_CMD ( + vab,3 ,2 , do_vab, +"perform vendor authorization" , +"addr len - authorize 'len' bytes starting at\n" +" 'addr' via vendor public key" +);
Signature · 1 line
2.13.0
PATCH v2 3/6 arm: socfpga: cmd: Support 'vab' command
Quoted 6 lines · Siew Chin Lim
Support 'vab' command to perform vendor authentication.
Command format: vab addr len
Authorize 'len' bytes starting at 'addr' via vendor public key
Quoted 6 lines
Signed-off-by Siew Chin Lim <[email protected]>--- arch/arm/mach-socfpga/Makefile | 1 + arch/arm/mach-socfpga/vab.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 arch/arm/mach-socfpga/vab.c
This feature needs some documentation somewhere, or at least a pointer to it.
PATCH v2 4/6 arm: socfpga: dts: soc64: Update filename in binman node of FIT image with VAB support
In reply to Siew Chin LimFIT image of Vendor Authentication Coot (VAB) contains signed images.
--- arch/arm/dts/socfpga_soc64_fit-u-boot.dtsi | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
arch/arm/dts/socfpga_soc64_fit-u-boot.dtsi +22 -0
@@ -117,4 +117,26 @@ }; }; +#if defined(CONFIG_SOCFPGA_SECURE_VAB_AUTH) +&uboot_blob { + filename = "signed-u-boot-nodtb.bin"; +}; + +&atf_blob { + filename = "signed-bl31.bin"; +}; + +&uboot_fdt_blob { + filename = "signed-u-boot.dtb"; +}; + +&kernel_blob { + filename = "signed-Image"; +}; + +&kernel_fdt_blob { + filename = "signed-linux.dtb"; +}; +#endif + #endif
Signature · 1 line
2.13.0
PATCH v2 4/6 arm: socfpga: dts: soc64: Update filename in binman node of FIT image with VAB support
Quoted 8 lines · Siew Chin Lim
FIT image of Vendor Authentication Coot (VAB) contains signed images.
Signed-off-by Siew Chin Lim <[email protected]>--- arch/arm/dts/socfpga_soc64_fit-u-boot.dtsi | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
I'm not quite sure what is happening here, but consider using two separate files rather than what looks like a patch over an existing one.
Quoted 34 lines
arch/arm/dts/socfpga_soc64_fit-u-boot.dtsi +22
-1@@ -117,4 +117,26 @@ }; }; +#if defined(CONFIG_SOCFPGA_SECURE_VAB_AUTH) +&uboot_blob { + filename = "signed-u-boot-nodtb.bin"; +}; + +&atf_blob { + filename = "signed-bl31.bin"; +}; + +&uboot_fdt_blob { + filename = "signed-u-boot.dtb"; +}; + +&kernel_blob { + filename = "signed-Image"; +}; + +&kernel_fdt_blob { + filename = "signed-linux.dtb"; +}; +#endif + #endif --2.13.0
Lim
PATCH v2 4/6 arm: socfpga: dts: soc64: Update filename in binman node of FIT image with VAB support
Hi Simon,
Quoted 25 lines
-----Original Message-----
From: Simon Glass <[email protected]>
Sent: Thursday, January 7, 2021 8:37 PM
To: Lim, Elly Siew Chin <[email protected]>
Cc: U-Boot Mailing List <[email protected]>; Marek Vasut <[email protected]>; Tan, Ley Foon <[email protected]>; See, Chin Liang <[email protected]>; Simon Goldschmidt <[email protected]>; Chee, Tien Fong <[email protected]>; Westergreen, Dalon <[email protected]>; Gan, Yau Wai <[email protected]>
Subject: Re: [v2 4/6] arm: socfpga: dts: soc64: Update filename in binman node of FIT image with VAB supportQuoted 9 lines · Siew Chin Lim
FIT image of Vendor Authentication Coot (VAB) contains signed images.
Signed-off-by Siew Chin Lim <[email protected]>--- arch/arm/dts/socfpga_soc64_fit-u-boot.dtsi | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
Quoted 3 lines
I'm not quite sure what is happening here, but consider using two separate files rather than what looks like a patch over an existing one.
There are two boot flow will use binman (socfpga_soc64_fit-u-boot.dtsi) to generate u-boot.fit and kernel.fit:
1. socfpga_agilex_atf_defconfig (boot via ATF)
2. socfpga_agilex_vab_defconfig (boot via ATF with VAB enabled, support authentication on bl31, u-boot, Linux images)
The binman node settings are the same for both flows. With VAB enabled, all inputs file need to be signed before generate FIT image. We would like to use different input file name to remind user that they need to sign all bl31, u-boot, Linux images when using binman to generate FIT image.
Due to the binman node settings are identical and only the file name need to be different, so we prefer to share the same socfpga_soc64_fit-u-boot.dtsi for both flows.
Thanks,
Siew Chin
Quoted 33 lines
Quoted 33 lines
arch/arm/dts/socfpga_soc64_fit-u-boot.dtsi +18
-1@@ -117,4 +117,26 @@ }; }; +#if defined(CONFIG_SOCFPGA_SECURE_VAB_AUTH) +&uboot_blob { + filename = "signed-u-boot-nodtb.bin"; }; + +&atf_blob { + filename = "signed-bl31.bin"; +}; + +&uboot_fdt_blob { + filename = "signed-u-boot.dtb"; }; + +&kernel_blob { + filename = "signed-Image"; +}; + +&kernel_fdt_blob { + filename = "signed-linux.dtb"; }; #endif + #endif --2.13.0
PATCH v2 4/6 arm: socfpga: dts: soc64: Update filename in binman node of FIT image with VAB support
Hi Siew Chin,
Quoted 32 lines · Elly Siew Chin
Hi Simon,
Quoted 25 lines
-----Original Message-----
From: Simon Glass <[email protected]>
Sent: Thursday, January 7, 2021 8:37 PM
To: Lim, Elly Siew Chin <[email protected]>
Cc: U-Boot Mailing List <[email protected]>; Marek Vasut <[email protected]>; Tan, Ley Foon <[email protected]>; See, Chin Liang <[email protected]>; Simon Goldschmidt <[email protected]>; Chee, Tien Fong <[email protected]>; Westergreen, Dalon <[email protected]>; Gan, Yau Wai <[email protected]>
Subject: Re: [v2 4/6] arm: socfpga: dts: soc64: Update filename in binman node of FIT image with VAB supportQuoted 9 lines · Siew Chin Lim
FIT image of Vendor Authentication Coot (VAB) contains signed images.
Signed-off-by Siew Chin Lim <[email protected]>--- arch/arm/dts/socfpga_soc64_fit-u-boot.dtsi | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)Quoted 3 lines
I'm not quite sure what is happening here, but consider using two separate files rather than what looks like a patch over an existing one.
Quoted 7 lines
There are two boot flow will use binman (
socfpga_soc64_fit-u-boot.dtsi) to generate u-boot.fit and kernel.fit:
1.socfpga_agilex_atf_defconfig(boot via ATF)
2.socfpga_agilex_vab_defconfig(boot via ATF with VAB enabled, support authentication on bl31, u-boot, Linux images)The binman node settings are the same for both flows. With VAB enabled, all inputs file need to be signed before generate FIT image. We would like to use different input file name to remind user that they need to sign all bl31, u-boot, Linux images when using binman to generate FIT image.
Due to the binman node settings are identical and only the file name need to be different, so we prefer to share the same
socfpga_soc64_fit-u-boot.dtsifor both flows.
OK I see.
Who does the signing of the inputs? Is that something binman could/should do?
Regards,
Simon
Lim
PATCH v2 4/6 arm: socfpga: dts: soc64: Update filename in binman node of FIT image with VAB support
Hi Simon,
Quoted 62 lines
-----Original Message-----
From: Simon Glass <[email protected]>
Sent: Friday, January 8, 2021 12:22 AM
To: Lim, Elly Siew Chin <[email protected]>
Cc: U-Boot Mailing List <[email protected]>; Marek Vasut <[email protected]>; Tan, Ley Foon <[email protected]>; See, Chin Liang <[email protected]>; Simon Goldschmidt <[email protected]>; Chee, Tien Fong <[email protected]>; Westergreen, Dalon <[email protected]>; Gan, Yau Wai <[email protected]>
Subject: Re: [v2 4/6] arm: socfpga: dts: soc64: Update filename in binman node of FIT image with VAB supportHi Siew Chin,
Quoted 29 lines · Elly Siew Chin
Hi Simon,
Quoted 26 lines
-----Original Message-----
From: Simon Glass <[email protected]>
Sent: Thursday, January 7, 2021 8:37 PM
To: Lim, Elly Siew Chin <[email protected]>
Cc: U-Boot Mailing List <[email protected]>; Marek Vasut <[email protected]>; Tan, Ley Foon <[email protected]>; See, Chin Liang <[email protected]>; Simon Goldschmidt <[email protected]>; Chee, Tien Fong <[email protected]>; Westergreen, Dalon <[email protected]>; Gan, Yau Wai <[email protected]>
Subject: Re: [v2 4/6] arm: socfpga: dts: soc64: Update filename in binman node of FIT image with VAB supportQuoted 9 lines · Siew Chin Lim
FIT image of Vendor Authentication Coot (VAB) contains signed images.
Signed-off-by Siew Chin Lim <[email protected]>--- arch/arm/dts/socfpga_soc64_fit-u-boot.dtsi | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)Quoted 5 lines
Quoted 3 lines
I'm not quite sure what is happening here, but consider using two separate files rather than what looks like a patch over an existing one.
There are two boot flow will use binman (
socfpga_soc64_fit-u-boot.dtsi) togenerate u-boot.fit and kernel.fit:
Quoted 5 lines
1.
socfpga_agilex_atf_defconfig(boot via ATF)
2.socfpga_agilex_vab_defconfig(boot via ATF with VAB enabled,
support authentication on bl31, u-boot, Linux images)The binman node settings are the same for both flows. With VAB enabled, all
inputs file need to be signed before generate FIT image. We would like to use different input file name to remind user that they need to sign all bl31, u-boot, Linux images when using binman to generate FIT image.
Quoted 2 lines
Due to the binman node settings are identical and only the file name need to
Quoted 8 lines
be different, so we prefer to share the same
socfpga_soc64_fit-u-boot.dtsifor both flows.Reviewed-by Simon Glass <[email protected]>OK I see.
Who does the signing of the inputs? Is that something binman could/should do?
In our case, we will provide user Intel proprietary tools to sign the image, and we have our signature format. User need to follow the steps and sign the Images, and call binman to convert into FIT image. I think maybe it is not suitable to incorporate any external proprietary tools into binman.
Thanks,
Siew Chin
Quoted 3 lines
Regards,
Simon
PATCH v2 4/6 arm: socfpga: dts: soc64: Update filename in binman node of FIT image with VAB support
Hi Slew Elly,
Quoted 70 lines · Elly Siew Chin
Hi Simon,
Quoted 67 lines
-----Original Message-----
From: Simon Glass <[email protected]>
Sent: Friday, January 8, 2021 12:22 AM
To: Lim, Elly Siew Chin <[email protected]>
Cc: U-Boot Mailing List <[email protected]>; Marek Vasut <[email protected]>; Tan, Ley Foon <[email protected]>; See, Chin Liang <[email protected]>; Simon Goldschmidt <[email protected]>; Chee, Tien Fong <[email protected]>; Westergreen, Dalon <[email protected]>; Gan, Yau Wai <[email protected]>
Subject: Re: [v2 4/6] arm: socfpga: dts: soc64: Update filename in binman node of FIT image with VAB supportHi Siew Chin,
Quoted 29 lines · Elly Siew Chin
Hi Simon,
Quoted 26 lines
-----Original Message-----
From: Simon Glass <[email protected]>
Sent: Thursday, January 7, 2021 8:37 PM
To: Lim, Elly Siew Chin <[email protected]>
Cc: U-Boot Mailing List <[email protected]>; Marek Vasut <[email protected]>; Tan, Ley Foon <[email protected]>; See, Chin Liang <[email protected]>; Simon Goldschmidt <[email protected]>; Chee, Tien Fong <[email protected]>; Westergreen, Dalon <[email protected]>; Gan, Yau Wai <[email protected]>
Subject: Re: [v2 4/6] arm: socfpga: dts: soc64: Update filename in binman node of FIT image with VAB supportQuoted 9 lines · Siew Chin Lim
FIT image of Vendor Authentication Coot (VAB) contains signed images.
Signed-off-by Siew Chin Lim <[email protected]>--- arch/arm/dts/socfpga_soc64_fit-u-boot.dtsi | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)Quoted 5 lines
Quoted 3 lines
I'm not quite sure what is happening here, but consider using two separate files rather than what looks like a patch over an existing one.
There are two boot flow will use binman (
socfpga_soc64_fit-u-boot.dtsi) togenerate u-boot.fit and kernel.fit:
Quoted 5 lines
1.
socfpga_agilex_atf_defconfig(boot via ATF)
2.socfpga_agilex_vab_defconfig(boot via ATF with VAB enabled,
support authentication on bl31, u-boot, Linux images)The binman node settings are the same for both flows. With VAB enabled, all
inputs file need to be signed before generate FIT image. We would like to use different input file name to remind user that they need to sign all bl31, u-boot, Linux images when using binman to generate FIT image.
Quoted 2 lines
Due to the binman node settings are identical and only the file name need to
be different, so we prefer to share the same
socfpga_soc64_fit-u-boot.dtsifor both flows.Reviewed-by Simon Glass <[email protected]>
Quoted 7 lines
Quoted 3 lines
OK I see.
Who does the signing of the inputs? Is that something binman could/should do?
In our case, we will provide user Intel proprietary tools to sign the image, and we have our signature format. User need to follow the steps and sign the Images, and call binman to convert into FIT image. I think maybe it is not suitable to incorporate any external proprietary tools into binman.
Possibly, although we already have quite a few. Is the tool secret or can it be downloaded from somewhere? If the latter, see how cbfstool is handled.
Regards,
Simon
Lim
PATCH v2 4/6 arm: socfpga: dts: soc64: Update filename in binman node of FIT image with VAB support
Hi Simon,
Quoted 100 lines
-----Original Message-----
From: Simon Glass <[email protected]>
Sent: Friday, January 8, 2021 11:24 AM
To: Lim, Elly Siew Chin <[email protected]>
Cc: U-Boot Mailing List <[email protected]>; Marek Vasut <[email protected]>; Tan, Ley Foon <[email protected]>; See, Chin Liang <[email protected]>; Simon Goldschmidt <[email protected]>; Chee, Tien Fong <[email protected]>; Westergreen, Dalon <[email protected]>; Gan, Yau Wai <[email protected]>
Subject: Re: [v2 4/6] arm: socfpga: dts: soc64: Update filename in binman node of FIT image with VAB supportHi Slew Elly,
Quoted 53 lines · Elly Siew Chin
Hi Simon,
Quoted 50 lines
-----Original Message-----
From: Simon Glass <[email protected]>
Sent: Friday, January 8, 2021 12:22 AM
To: Lim, Elly Siew Chin <[email protected]>
Cc: U-Boot Mailing List <[email protected]>; Marek Vasut <[email protected]>; Tan, Ley Foon <[email protected]>; See, Chin Liang <[email protected]>; Simon Goldschmidt <[email protected]>; Chee, Tien Fong <[email protected]>; Westergreen, Dalon <[email protected]>; Gan, Yau Wai <[email protected]>
Subject: Re: [v2 4/6] arm: socfpga: dts: soc64: Update filename in binman node of FIT image with VAB supportHi Siew Chin,
Quoted 32 lines · Elly Siew Chin
Hi Simon,
Quoted 29 lines
-----Original Message-----
From: Simon Glass <[email protected]>
Sent: Thursday, January 7, 2021 8:37 PM
To: Lim, Elly Siew Chin <[email protected]>
Cc: U-Boot Mailing List <[email protected]>; Marek Vasut <[email protected]>; Tan, Ley Foon <[email protected]>; See, Chin Liang <[email protected]>; Simon Goldschmidt <[email protected]>; Chee, Tien Fong <[email protected]>; Westergreen, Dalon <[email protected]>; Gan, Yau Wai <[email protected]>
Subject: Re: [v2 4/6] arm: socfpga: dts: soc64: Update filename in binman node of FIT image with VAB supportQuoted 9 lines · Siew Chin Lim
FIT image of Vendor Authentication Coot (VAB) contains signed images.
Signed-off-by Siew Chin Lim <[email protected]>--- arch/arm/dts/socfpga_soc64_fit-u-boot.dtsi | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)I'm not quite sure what is happening here, but consider using two separate files rather than what looks like a patch over an existing
one.
Quoted 9 lines
Quoted 9 lines
Quoted 4 lines
Quoted 1 line
There are two boot flow will use binman
(socfpga_soc64_fit-u-boot.dtsi) togenerate u-boot.fit and kernel.fit:
Quoted 4 lines
1.
socfpga_agilex_atf_defconfig(boot via ATF)
2.socfpga_agilex_vab_defconfig(boot via ATF with VAB
enabled, support authentication on bl31, u-boot, Linux images)Quoted 5 lines
Quoted 5 lines
Quoted 2 lines
The binman node settings are the same for both flows. With VAB enabled, all
inputs file need to be signed before generate FIT image. We would like to use different input file name to remind user that they need to sign all bl31, u-boot, Linux images when using binman to generate FIT
image.
Quoted 11 lines
Quoted 11 lines
Quoted 3 lines
Due to the binman node settings are identical and only the file name need to
be different, so we prefer to share the same
socfpga_soc64_fit-u-boot.dtsifor both flows.Reviewed-by Simon Glass <[email protected]>OK I see.
Who does the signing of the inputs? Is that something binman could/should
do?
Quoted 2 lines
In our case, we will provide user Intel proprietary tools to sign the image, and
Quoted 8 lines
we have our signature format.
Quoted 1 line
User need to follow the steps and sign the Images, and call binman to convert
into FIT image.
Quoted 1 line
I think maybe it is not suitable to incorporate any external proprietary tools
into binman.
Possibly, although we already have quite a few. Is the tool secret or can it be downloaded from somewhere? If the latter, see how cbfstool is handled.
It is licensed software.
Quoted 3 lines
Regards,
Simon
PATCH v2 4/6 arm: socfpga: dts: soc64: Update filename in binman node of FIT image with VAB support
Hi Siew Chin,
Quoted 105 lines · Elly Siew Chin
Hi Simon,
Quoted 102 lines
-----Original Message-----
From: Simon Glass <[email protected]>
Sent: Friday, January 8, 2021 11:24 AM
To: Lim, Elly Siew Chin <[email protected]>
Cc: U-Boot Mailing List <[email protected]>; Marek Vasut <[email protected]>; Tan, Ley Foon <[email protected]>; See, Chin Liang <[email protected]>; Simon Goldschmidt <[email protected]>; Chee, Tien Fong <[email protected]>; Westergreen, Dalon <[email protected]>; Gan, Yau Wai <[email protected]>
Subject: Re: [v2 4/6] arm: socfpga: dts: soc64: Update filename in binman node of FIT image with VAB supportHi Slew Elly,
Quoted 53 lines · Elly Siew Chin
Hi Simon,
Quoted 50 lines
-----Original Message-----
From: Simon Glass <[email protected]>
Sent: Friday, January 8, 2021 12:22 AM
To: Lim, Elly Siew Chin <[email protected]>
Cc: U-Boot Mailing List <[email protected]>; Marek Vasut <[email protected]>; Tan, Ley Foon <[email protected]>; See, Chin Liang <[email protected]>; Simon Goldschmidt <[email protected]>; Chee, Tien Fong <[email protected]>; Westergreen, Dalon <[email protected]>; Gan, Yau Wai <[email protected]>
Subject: Re: [v2 4/6] arm: socfpga: dts: soc64: Update filename in binman node of FIT image with VAB supportHi Siew Chin,
Quoted 32 lines · Elly Siew Chin
Hi Simon,
Quoted 29 lines
-----Original Message-----
From: Simon Glass <[email protected]>
Sent: Thursday, January 7, 2021 8:37 PM
To: Lim, Elly Siew Chin <[email protected]>
Cc: U-Boot Mailing List <[email protected]>; Marek Vasut <[email protected]>; Tan, Ley Foon <[email protected]>; See, Chin Liang <[email protected]>; Simon Goldschmidt <[email protected]>; Chee, Tien Fong <[email protected]>; Westergreen, Dalon <[email protected]>; Gan, Yau Wai <[email protected]>
Subject: Re: [v2 4/6] arm: socfpga: dts: soc64: Update filename in binman node of FIT image with VAB supportQuoted 9 lines · Siew Chin Lim
FIT image of Vendor Authentication Coot (VAB) contains signed images.
Signed-off-by Siew Chin Lim <[email protected]>--- arch/arm/dts/socfpga_soc64_fit-u-boot.dtsi | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)I'm not quite sure what is happening here, but consider using two separate files rather than what looks like a patch over an existing
one.
Quoted 9 lines
Quoted 9 lines
Quoted 4 lines
Quoted 1 line
There are two boot flow will use binman
(socfpga_soc64_fit-u-boot.dtsi) togenerate u-boot.fit and kernel.fit:
Quoted 4 lines
1.
socfpga_agilex_atf_defconfig(boot via ATF)
2.socfpga_agilex_vab_defconfig(boot via ATF with VAB
enabled, support authentication on bl31, u-boot, Linux images)Quoted 5 lines
Quoted 5 lines
Quoted 2 lines
The binman node settings are the same for both flows. With VAB enabled, all
inputs file need to be signed before generate FIT image. We would like to use different input file name to remind user that they need to sign all bl31, u-boot, Linux images when using binman to generate FIT
image.
Quoted 11 lines
Quoted 11 lines
Quoted 3 lines
Due to the binman node settings are identical and only the file name need to
be different, so we prefer to share the same
socfpga_soc64_fit-u-boot.dtsifor both flows.Reviewed-by Simon Glass <[email protected]>OK I see.
Who does the signing of the inputs? Is that something binman could/should
do?
Quoted 2 lines
In our case, we will provide user Intel proprietary tools to sign the image, and
we have our signature format.
Quoted 1 line
User need to follow the steps and sign the Images, and call binman to convert
Quoted 8 lines
Quoted 6 lines
into FIT image.
Quoted 1 line
I think maybe it is not suitable to incorporate any external proprietary tools
into binman.
Possibly, although we already have quite a few. Is the tool secret or can it be downloaded from somewhere? If the latter, see how cbfstool is handled.
It is licensed software.
I suggest releasing an open-source, command-line tool as has happened with various other Intel innovations. It is hard for people to include private binary tools in their automated build flow. If it is required to actually boot on the device, then it will be hard for people to incorporate the hardware in test labs.
Regards,
Simon
PATCH v2 5/6 configs: socfpga: soc64: Move CONFIG_BOOTCOMMAND to defconfig
In reply to Siew Chin LimCONFIG_BOOTCOMMAND have been moved to Kconfig.boot. This patch move the CONFIG_BOOTCOMMAND macro from socfpga_soc64_common.h to *_defconfig file for both Stratix 10 and Agilex.
---
v2
---
- This is new patch in 2nd version of VAB series. This is code clean up without functionality change.
--- configs/socfpga_agilex_atf_defconfig | 2 ++ configs/socfpga_agilex_defconfig | 2 ++ configs/socfpga_stratix10_atf_defconfig | 2 ++ configs/socfpga_stratix10_defconfig | 2 ++ include/configs/socfpga_soc64_common.h | 9 +-------- 5 files changed, 9 insertions(+), 8 deletions(-)
configs/socfpga_agilex_atf_defconfig +2 -0
@@ -19,6 +19,8 @@ CONFIG_SPL_LOAD_FIT_ADDRESS=0x02000000 CONFIG_BOOTDELAY=5 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="earlycon" +CONFIG_USE_BOOTCOMMAND=y +CONFIG_BOOTCOMMAND="run fatscript; run mmcfitload; run linux_qspi_enable; run mmcfitboot" CONFIG_SPL_CACHE=y CONFIG_SPL_SPI_LOAD=y CONFIG_SYS_SPI_U_BOOT_OFFS=0x02000000
configs/socfpga_agilex_defconfig +2 -0
@@ -18,6 +18,8 @@ CONFIG_DEFAULT_DEVICE_TREE="socfpga_agilex_socdk" CONFIG_BOOTDELAY=5 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="earlycon" +CONFIG_USE_BOOTCOMMAND=y +CONFIG_BOOTCOMMAND="run fatscript; run mmcload; run linux_qspi_enable; run mmcboot" CONFIG_SPL_CACHE=y CONFIG_SPL_SPI_LOAD=y CONFIG_HUSH_PARSER=y
configs/socfpga_stratix10_atf_defconfig +2 -0
@@ -19,6 +19,8 @@ CONFIG_SPL_LOAD_FIT_ADDRESS=0x02000000 CONFIG_BOOTDELAY=5 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="earlycon" +CONFIG_USE_BOOTCOMMAND=y +CONFIG_BOOTCOMMAND="run fatscript; run mmcfitload; run linux_qspi_enable; run mmcfitboot" CONFIG_SPL_SPI_LOAD=y CONFIG_SYS_SPI_U_BOOT_OFFS=0x02000000 CONFIG_SPL_ATF=y
configs/socfpga_stratix10_defconfig +2 -0
@@ -20,6 +20,8 @@ CONFIG_SPL_OPTIMIZE_INLINING=y CONFIG_BOOTDELAY=5 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="earlycon" +CONFIG_USE_BOOTCOMMAND=y +CONFIG_BOOTCOMMAND="run fatscript; run mmcload; run linux_qspi_enable; run mmcboot" CONFIG_SPL_SPI_LOAD=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="SOCFPGA_STRATIX10 # "
include/configs/socfpga_soc64_common.h +1 -8
@@ -79,19 +79,12 @@ unsigned int cm_get_qspi_controller_clk_hz(void);#endif /* CONFIG_CADENCE_QSPI */ /* -* Boot arguments passed to the boot command. The value of -* CONFIG_BOOTARGS goes into the environment value "bootargs". -* Do note the value will override also the chosen node in FDT blob. +* Enviroment variable */ -#ifdef CONFIG_FIT #define CONFIG_BOOTFILE "kernel.itb" -#define CONFIG_BOOTCOMMAND "run fatscript; run mmcfitload;run linux_qspi_enable;" \ - "run mmcfitboot"#else #define CONFIG_BOOTFILE "Image" -#define CONFIG_BOOTCOMMAND "run fatscript; run mmcload;run linux_qspi_enable;" \ - "run mmcboot"#endif #define CONFIG_EXTRA_ENV_SETTINGS \
Signature · 1 line
2.13.0
Tan
PATCH v2 5/6 configs: socfpga: soc64: Move CONFIG_BOOTCOMMAND to defconfig
Quoted 16 lines
-----Original Message-----
From: Lim, Elly Siew Chin <[email protected]>
Sent: Thursday, January 7, 2021 6:04 PM
To: u-boot at lists.denx.de
Cc: Marek Vasut <[email protected]>; Tan, Ley Foon <[email protected]>; See, Chin Liang <[email protected]>; Simon Goldschmidt <[email protected]>; Chee, Tien Fong <[email protected]>; Westergreen, Dalon <[email protected]>; Simon Glass <[email protected]>; Gan, Yau Wai <[email protected]>; Lim, Elly Siew Chin <[email protected]>
Subject: [v2 5/6] configs: socfpga: soc64: MoveCONFIG_BOOTCOMMANDto defconfig
Quoted 6 lines
CONFIG_BOOTCOMMANDhave been moved toKconfig.boot. This patch move theCONFIG_BOOTCOMMANDmacro fromsocfpga_soc64_common.hto*_defconfigfile for both Stratix 10 and Agilex.Signed-off-by Siew Chin Lim <[email protected]>
PATCH v2 6/6 configs: socfpga: Add defconfig for Agilex with VAB support
In reply to Siew Chin LimBooting Agilex with Vendor Authorized Boot.
---
v2
---
- Renamed CONFIG_SECURE_VAB_AUTH to CONFIG_SOCFPGA_SECURE_VAB_AUTH
- Add BOOTCOMMAND macro in defconfig
---
.../{socfpga_agilex_atf_defconfig => socfpga_agilex_vab_defconfig} | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
copy configs/{socfpga_agilex_atf_defconfig => socfpga_agilex_vab_defconfig} (92%)configs/socfpga_agilex_vab_defconfig renamed from configs/socfpga_agilex_atf_defconfig +3 -2
@@ -1,5 +1,4 @@ CONFIG_ARM=y -CONFIG_ARM_SMCCC=y CONFIG_SPL_LDSCRIPT="arch/arm/mach-socfpga/u-boot-spl-soc64.lds" CONFIG_ARCH_SOCFPGA=y CONFIG_SYS_TEXT_BASE=0x200000
@@ -8,6 +7,7 @@ CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0x200 CONFIG_DM_GPIO=y CONFIG_NR_DRAM_BANKS=2 +CONFIG_SOCFPGA_SECURE_VAB_AUTH=y CONFIG_TARGET_SOCFPGA_AGILEX_SOCDK=y CONFIG_IDENT_STRING="socfpga_agilex" CONFIG_SPL_FS_FAT=y
@@ -15,12 +15,13 @@ CONFIG_SPL_TEXT_BASE=0xFFE00000 CONFIG_FIT=y CONFIG_SPL_LOAD_FIT=y CONFIG_SPL_LOAD_FIT_ADDRESS=0x02000000 +# CONFIG_LEGACY_IMAGE_FORMAT is not set # CONFIG_USE_SPL_FIT_GENERATOR is not set CONFIG_BOOTDELAY=5 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="earlycon" CONFIG_USE_BOOTCOMMAND=y -CONFIG_BOOTCOMMAND="run fatscript; run mmcfitload; run linux_qspi_enable; run mmcfitboot" +CONFIG_BOOTCOMMAND="run fatscript; run mmcfitload; run mmcfitboot" CONFIG_SPL_CACHE=y CONFIG_SPL_SPI_LOAD=y CONFIG_SYS_SPI_U_BOOT_OFFS=0x02000000
Signature · 1 line
2.13.0
Tan
PATCH v2 6/6 configs: socfpga: Add defconfig for Agilex with VAB support
Quoted 64 lines
-----Original Message-----
From: Lim, Elly Siew Chin <[email protected]>
Sent: Thursday, January 7, 2021 6:04 PM
To: u-boot at lists.denx.de
Cc: Marek Vasut <[email protected]>; Tan, Ley Foon <[email protected]>; See, Chin Liang <[email protected]>; Simon Goldschmidt <[email protected]>; Chee, Tien Fong <[email protected]>; Westergreen, Dalon <[email protected]>; Simon Glass <[email protected]>; Gan, Yau Wai <[email protected]>; Lim, Elly Siew Chin <[email protected]>
Subject: [v2 6/6] configs: socfpga: Add defconfig for Agilex with VAB supportBooting Agilex with Vendor Authorized Boot.
Signed-off-by Siew Chin Lim <[email protected]>---
v2
---
- RenamedCONFIG_SECURE_VAB_AUTHtoCONFIG_SOCFPGA_SECURE_VAB_AUTH
- Add BOOTCOMMAND macro in defconfig--- .../{socfpga_agilex_atf_defconfig => socfpga_agilex_vab_defconfig} | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) copyconfigs/{socfpga_agilex_atf_defconfig =>
socfpga_agilex_vab_defconfig} (92%)configs/socfpga_agilex_vab_defconfig renamed from configs/socfpga_agilex_atf_defconfig +1
-1@@ -1,5 +1,4 @@ CONFIG_ARM=y -CONFIG_ARM_SMCCC=y CONFIG_SPL_LDSCRIPT="arch/arm/mach-socfpga/u-boot-spl-soc64.lds" CONFIG_ARCH_SOCFPGA=y CONFIG_SYS_TEXT_BASE=0x200000@@ -8,6 +7,7 @@ CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0x200 CONFIG_DM_GPIO=y CONFIG_NR_DRAM_BANKS=2 +CONFIG_SOCFPGA_SECURE_VAB_AUTH=y CONFIG_TARGET_SOCFPGA_AGILEX_SOCDK=y CONFIG_IDENT_STRING="socfpga_agilex" CONFIG_SPL_FS_FAT=y@@ -15,12 +15,13 @@ CONFIG_SPL_TEXT_BASE=0xFFE00000
CONFIG_FIT=yCONFIG_SPL_LOAD_FIT=y
CONFIG_SPL_LOAD_FIT_ADDRESS=0x02000000configs/socfpga_agilex_vab_defconfig renamed from configs/socfpga_agilex_atf_defconfig +1
-1+# CONFIG_LEGACY_IMAGE_FORMAT is not set # CONFIG_USE_SPL_FIT_GENERATOR is not set CONFIG_BOOTDELAY=5 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="earlycon" CONFIG_USE_BOOTCOMMAND=y -CONFIG_BOOTCOMMAND="run fatscript; run mmcfitload; run
Quoted 2 lines
linux_qspi_enable; run mmcfitboot" +CONFIG_BOOTCOMMAND="run fatscript; run mmcfitload; run mmcfitboot"
Don't need "run linux_qspi_enable"?
Regards
Ley Foon
Lim
PATCH v2 6/6 configs: socfpga: Add defconfig for Agilex with VAB support
Hi Ley Foon,
Quoted 74 lines
-----Original Message-----
From: Tan, Ley Foon <[email protected]>
Sent: Monday, January 18, 2021 3:34 PM
To: Lim, Elly Siew Chin <[email protected]>; u-boot at lists.denx.de
Cc: Marek Vasut <[email protected]>; See, Chin Liang <[email protected]>; Simon Goldschmidt <[email protected]>; Chee, Tien Fong <[email protected]>; Westergreen, Dalon <[email protected]>; Simon Glass <[email protected]>; Gan, Yau Wai <[email protected]>
Subject: RE: [v2 6/6] configs: socfpga: Add defconfig for Agilex with VAB supportQuoted 59 lines
-----Original Message-----
From: Lim, Elly Siew Chin <[email protected]>
Sent: Thursday, January 7, 2021 6:04 PM
To: u-boot at lists.denx.de
Cc: Marek Vasut <[email protected]>; Tan, Ley Foon <[email protected]>; See, Chin Liang <[email protected]>; Simon Goldschmidt <[email protected]>; Chee, Tien Fong <[email protected]>; Westergreen, Dalon <[email protected]>; Simon Glass <[email protected]>; Gan, Yau Wai <[email protected]>; Lim, Elly Siew Chin <[email protected]>
Subject: [v2 6/6] configs: socfpga: Add defconfig for Agilex with VAB supportBooting Agilex with Vendor Authorized Boot.
Signed-off-by Siew Chin Lim <[email protected]>---
v2
---
- RenamedCONFIG_SECURE_VAB_AUTHtoCONFIG_SOCFPGA_SECURE_VAB_AUTH
- Add BOOTCOMMAND macro in defconfig--- .../{socfpga_agilex_atf_defconfig => socfpga_agilex_vab_defconfig} | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) copyconfigs/{socfpga_agilex_atf_defconfig =>
socfpga_agilex_vab_defconfig} (92%)configs/socfpga_agilex_vab_defconfig renamed from configs/socfpga_agilex_atf_defconfig +1
-1@@ -1,5 +1,4 @@ CONFIG_ARM=y -CONFIG_ARM_SMCCC=y CONFIG_SPL_LDSCRIPT="arch/arm/mach-socfpga/u-boot-spl-soc64.lds" CONFIG_ARCH_SOCFPGA=y CONFIG_SYS_TEXT_BASE=0x200000@@ -8,6 +7,7 @@ CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0x200 CONFIG_DM_GPIO=y CONFIG_NR_DRAM_BANKS=2 +CONFIG_SOCFPGA_SECURE_VAB_AUTH=y CONFIG_TARGET_SOCFPGA_AGILEX_SOCDK=y CONFIG_IDENT_STRING="socfpga_agilex" CONFIG_SPL_FS_FAT=y@@ -15,12 +15,13 @@ CONFIG_SPL_TEXT_BASE=0xFFE00000 CONFIG_FIT=y
CONFIG_SPL_LOAD_FIT=y
CONFIG_SPL_LOAD_FIT_ADDRESS=0x02000000
+#CONFIG_LEGACY_IMAGE_FORMATis not set
#CONFIG_USE_SPL_FIT_GENERATORis not set
CONFIG_BOOTDELAY=5
Quoted 8 lines
Quoted 6 lines
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="earlycon"
CONFIG_USE_BOOTCOMMAND=y
-CONFIG_BOOTCOMMAND="run fatscript; run mmcfitload; runlinux_qspi_enable; run mmcfitboot" +CONFIG_BOOTCOMMAND="run fatscript; run mmcfitload; run mmcfitboot"Don't need "run
linux_qspi_enable"?
In VAB flow, " linux_qspi_enable" will be handled in board_prep_linux function.
+#ifdef CONFIG_CADENCE_QSPI
+ if (env_get("linux_qspi_enable"))
+ run_command(env_get("linux_qspi_enable"), 0);
+#endif
Quoted 3 lines
Regards
Ley Foon
Tan
PATCH v2 6/6 configs: socfpga: Add defconfig for Agilex with VAB support
Quoted 110 lines
-----Original Message-----
From: Lim, Elly Siew Chin <[email protected]>
Sent: Monday, January 18, 2021 4:07 PM
To: Tan, Ley Foon <[email protected]>; u-boot at lists.denx.de
Cc: Marek Vasut <[email protected]>; See, Chin Liang <[email protected]>; Simon Goldschmidt <[email protected]>; Chee, Tien Fong <[email protected]>; Westergreen, Dalon <[email protected]>; Simon Glass <[email protected]>; Gan, Yau Wai <[email protected]>
Subject: RE: [v2 6/6] configs: socfpga: Add defconfig for Agilex with VAB supportHi Ley Foon,
Quoted 5 lines
-----Original Message-----
From: Tan, Ley Foon <[email protected]>
Sent: Monday, January 18, 2021 3:34 PM
To: Lim, Elly Siew Chin <[email protected]>; u-boot at lists.denx.deQuoted 38 lines
Cc: Marek Vasut <[email protected]>; See, Chin Liang <[email protected]>; Simon Goldschmidt <[email protected]>; Chee, Tien Fong <[email protected]>; Westergreen, Dalon <[email protected]>; Simon Glass <[email protected]>; Gan, Yau Wai <[email protected]>
Subject: RE: [v2 6/6] configs: socfpga: Add defconfig for Agilex with VAB supportQuoted 27 lines
-----Original Message-----
From: Lim, Elly Siew Chin <[email protected]>
Sent: Thursday, January 7, 2021 6:04 PM
To: u-boot at lists.denx.de
Cc: Marek Vasut <[email protected]>; Tan, Ley Foon <[email protected]>; See, Chin Liang <[email protected]>; Simon Goldschmidt <[email protected]>; Chee, Tien Fong <[email protected]>; Westergreen, Dalon <[email protected]>; Simon Glass <[email protected]>; Gan, Yau Wai <[email protected]>; Lim, Elly Siew Chin <[email protected]>
Subject: [v2 6/6] configs: socfpga: Add defconfig for Agilex with VAB supportBooting Agilex with Vendor Authorized Boot.
Signed-off-by Siew Chin Lim <[email protected]>---
v2
---
- RenamedCONFIG_SECURE_VAB_AUTHtoCONFIG_SOCFPGA_SECURE_VAB_AUTH
- Add BOOTCOMMAND macro in defconfig
---
.../{socfpga_agilex_atf_defconfig =>socfpga_agilex_vab_defconfig} |5
Quoted 21 lines
Quoted 21 lines
+++--
1 file changed, 3 insertions(+), 2 deletions(-) copyconfigs/{socfpga_agilex_atf_defconfig =>
socfpga_agilex_vab_defconfig}
(92%)configs/socfpga_agilex_vab_defconfig renamed from configs/socfpga_agilex_atf_defconfig +0
-1@@ -1,5 +1,4 @@ CONFIG_ARM=y -CONFIG_ARM_SMCCC=y CONFIG_SPL_LDSCRIPT="arch/arm/mach-socfpga/u-boot-spl-soc64.lds" CONFIG_ARCH_SOCFPGA=y CONFIG_SYS_TEXT_BASE=0x200000@@ -8,6 +7,7 @@ CONFIG_ENV_SIZE=0x1000Quoted 8 lines
configs/socfpga_agilex_vab_defconfig CONFIG_SPL_TEXT_BASE=0xFFE00000
Quoted 8 lines
configs/socfpga_agilex_vab_defconfig renamed from configs/socfpga_agilex_atf_defconfig +1
-0CONFIG_ENV_OFFSET=0x200 CONFIG_DM_GPIO=y CONFIG_NR_DRAM_BANKS=2 +CONFIG_SOCFPGA_SECURE_VAB_AUTH=y CONFIG_TARGET_SOCFPGA_AGILEX_SOCDK=y CONFIG_IDENT_STRING="socfpga_agilex" CONFIG_SPL_FS_FAT=y@@ -15,12 +15,13 @@ CONFIG_SPL_TEXT_BASE=0xFFE00000
CONFIG_FIT=yQuoted 11 lines
Quoted 11 lines
CONFIG_SPL_LOAD_FIT=y
CONFIG_SPL_LOAD_FIT_ADDRESS=0x02000000configs/socfpga_agilex_vab_defconfig renamed from configs/socfpga_agilex_atf_defconfig +1
-1+# CONFIG_LEGACY_IMAGE_FORMAT is not set # CONFIG_USE_SPL_FIT_GENERATOR is not set CONFIG_BOOTDELAY=5 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="earlycon" CONFIG_USE_BOOTCOMMAND=y -CONFIG_BOOTCOMMAND="run fatscript; run mmcfitload; run
linux_qspi_enable; run mmcfitboot" +CONFIG_BOOTCOMMAND="run fatscript; run mmcfitload; runmmcfitboot"
Quoted 2 lines
Don't need "run
linux_qspi_enable"?In VAB flow, "
linux_qspi_enable" will be handled inboard_prep_linuxfunction.
Review
Quoted 3 lines
(quoted diff) +3
-0+#ifdef CONFIG_CADENCE_QSPI + if (env_get("linux_qspi_enable")) + run_command(env_get("linux_qspi_enable"), 0); #endif
Okay.
Regards
Ley Foon