arm64: ls1012ardb: Add distro secure boot support
PATCH v2 1/1 arm64: ls1012ardb: Add distro secure boot support
From: Vinitha Pillai-B57223 <[email protected]>
Enable validation of boot.scr script prior to its execution dependent on "secureboot" flag in environment. Enable fall back option to qspi boot in case of secure boot.
---
Changes in v2:
Rebased to top of master
configs/ls1012ardb_qspi_SECURE_BOOT_defconfig | 14 +++++++------- include/configs/ls1012ardb.h | 20 ++++++++++++++++++-- 2 files changed, 25 insertions(+), 9 deletions(-)
configs/ls1012ardb_qspi_SECURE_BOOT_defconfig +7 -7
@@ -2,7 +2,9 @@ CONFIG_ARM=y CONFIG_TARGET_LS1012ARDB=y CONFIG_SECURE_BOOT=y CONFIG_FSL_LS_PPA=y +CONFIG_QSPI_AHB_INIT=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1012a-rdb" +CONFIG_DISTRO_DEFAULTS=y # CONFIG_SYS_MALLOC_F is not set CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y
@@ -12,7 +14,7 @@ CONFIG_QSPI_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 quiet lpj=250000" -CONFIG_HUSH_PARSER=y +# CONFIG_DISPLAY_BOARDINFO is not set CONFIG_CMD_GREPENV=y CONFIG_CMD_GPT=y CONFIG_CMD_I2C=y
@@ -20,16 +22,13 @@ CONFIG_CMD_MMC=y CONFIG_CMD_PCI=y CONFIG_CMD_SF=y CONFIG_CMD_USB=y -# CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_FAT=y CONFIG_OF_CONTROL=y +CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y +# CONFIG_BLK is not set +CONFIG_DM_MMC=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_NETDEVICES=y
@@ -42,6 +41,7 @@ CONFIG_SYS_NS16550=y CONFIG_DM_SPI=y CONFIG_FSL_DSPI=y CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y
include/configs/ls1012ardb.h +18 -2
@@ -72,16 +72,20 @@"initrd_high=0xffffffffffffffff\0" \"fdt_addr=0x00f00000\0" \"kernel_addr=0x01000000\0" \ +"kernelheader_addr=0x800000\0" \"scriptaddr=0x80000000\0" \ +"scripthdraddr=0x80080000\0" \"fdtheader_addr_r=0x80100000\0" \"kernelheader_addr_r=0x80200000\0" \"kernel_addr_r=0x81000000\0" \"fdt_addr_r=0x90000000\0" \"load_addr=0xa0000000\0" \"kernel_size=0x2800000\0" \ +"kernelheader_size=0x40000\0" \"console=ttyS0,115200\0" \BOOTENV \"boot_scripts=ls1012ardb_boot.scr\0" \ +"boot_script_hdr=hdr_ls1012ardb_bs.out\0" \"scan_dev_for_boot_part=" \"part list ${devtype} ${devnum} devplist; " \"env exists devplist || setenv devplist 1; " \
@@ -99,15 +103,27 @@"run scan_dev_for_scripts; " \"done;" \"\0" \ +"boot_a_script=" \ +"load ${devtype} ${devnum}:${distro_bootpart} " \ +"${scriptaddr} ${prefix}${script}; " \ +"env exists secureboot && load ${devtype} " \ +"${devnum}:${distro_bootpart} " \ +"${scripthdraddr} ${prefix}${boot_script_hdr} " \ +"&& esbc_validate ${scripthdraddr};" \ +"source ${scriptaddr}\0" \"installer=load mmc 0:2 $load_addr " \"/flex_installer_arm64.itb; " \"bootm $load_addr#$board\0" \"qspi_bootcmd=echo Trying load from qspi..;" \"sf probe && sf read $load_addr " \ - "$kernel_addr $kernel_size && bootm $load_addr#$board\0" +"$kernel_addr $kernel_size; env exists secureboot " \ +"&& sf read $kernelheader_addr_r $kernelheader_addr " \ +"$kernelheader_size && esbc_validate ${kernelheader_addr_r}; " \ + "bootm $load_addr#$board\0"#undef CONFIG_BOOTCOMMAND -#define CONFIG_BOOTCOMMAND "run distro_bootcmd;run qspi_bootcmd" +#define CONFIG_BOOTCOMMAND "run distro_bootcmd; run qspi_bootcmd; " \ + "env exists secureboot && esbc_halt;"#include <asm/fsl_secure_boot.h>
Signature · 1 line
1.9.1
PATCH v2 1/1 arm64: ls1012ardb: Add distro secure boot support
Quoted 61 lines · Sumit Garg
From: Vinitha Pillai-B57223 <[email protected]>
Enable validation of boot.scr script prior to its execution dependent on "secureboot" flag in environment. Enable fall back option to qspi boot in case of secure boot.
Signed-off-by Sumit Garg <[email protected]>Signed-off-by Vinitha Pillai <[email protected]>---
Changes in v2:
Rebased to top of masterconfigs/ls1012ardb_qspi_SECURE_BOOT_defconfig | 14 +++++++------- include/configs/ls1012ardb.h | 20 ++++++++++++++++++-- 2 files changed, 25 insertions(+), 9 deletions(-)configs/ls1012ardb_qspi_SECURE_BOOT_defconfig +6
-7@@ -2,7 +2,9 @@ CONFIG_ARM=y CONFIG_TARGET_LS1012ARDB=y CONFIG_SECURE_BOOT=y CONFIG_FSL_LS_PPA=y +CONFIG_QSPI_AHB_INIT=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1012a-rdb" +CONFIG_DISTRO_DEFAULTS=y # CONFIG_SYS_MALLOC_F is not set CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y@@ -12,7 +14,7 @@ CONFIG_QSPI_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 quiet lpj=250000" -CONFIG_HUSH_PARSER=y +# CONFIG_DISPLAY_BOARDINFO is not set CONFIG_CMD_GREPENV=y CONFIG_CMD_GPT=y CONFIG_CMD_I2C=y@@ -20,16 +22,13 @@ CONFIG_CMD_MMC=y CONFIG_CMD_PCI=y CONFIG_CMD_SF=y CONFIG_CMD_USB=y -# CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_FAT=y CONFIG_OF_CONTROL=y +CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y +# CONFIG_BLK is not set +CONFIG_DM_MMC=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_NETDEVICES=y
configs/ls1012ardb_qspi_SECURE_BOOT_defconfig CONFIG_SYS_NS16550=y · line 47
Quoted 7 lines
configs/ls1012ardb_qspi_SECURE_BOOT_defconfig +1
-0@@ -42,6 +41,7 @@ CONFIG_SYS_NS16550=y CONFIG_DM_SPI=y CONFIG_FSL_DSPI=y CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y
Why do you change other config options in this patch?
York
PATCH v2 1/1 arm64: ls1012ardb: Add distro secure boot support
Quoted 75 lines
From: York Sun
Sent: Monday, January 15, 2018 10:59 PMQuoted 33 lines · Sumit Garg
From: Vinitha Pillai-B57223 <[email protected]>
Enable validation of boot.scr script prior to its execution dependent on "secureboot" flag in environment. Enable fall back option to qspi boot in case of secure boot.
Signed-off-by Sumit Garg <[email protected]>Signed-off-by Vinitha Pillai <[email protected]>---
Changes in v2:
Rebased to top of masterconfigs/ls1012ardb_qspi_SECURE_BOOT_defconfig | 14 +++++++------- include/configs/ls1012ardb.h | 20 ++++++++++++++++++-- 2 files changed, 25 insertions(+), 9 deletions(-)configs/ls1012ardb_qspi_SECURE_BOOT_defconfig +2
-0@@ -2,7 +2,9 @@ CONFIG_ARM=y CONFIG_TARGET_LS1012ARDB=y CONFIG_SECURE_BOOT=y CONFIG_FSL_LS_PPA=y +CONFIG_QSPI_AHB_INIT=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1012a-rdb" +CONFIG_DISTRO_DEFAULTS=y # CONFIG_SYS_MALLOC_F is not set CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=yconfigs/ls1012ardb_qspi_SECURE_BOOT_defconfig CONFIG_QSPI_BOOT=y · line 16
Quoted 3 lines
configs/ls1012ardb_qspi_SECURE_BOOT_defconfig +0
-0@@ -12,7 +14,7 @@ CONFIG_QSPI_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0earlycon=uart8250,mmio,0x21c0500 quiet lpj=250000"
Quoted 26 lines
configs/ls1012ardb_qspi_SECURE_BOOT_defconfig +4
-7-CONFIG_HUSH_PARSER=y +# CONFIG_DISPLAY_BOARDINFO is not set CONFIG_CMD_GREPENV=y CONFIG_CMD_GPT=y CONFIG_CMD_I2C=y@@ -20,16 +22,13 @@ CONFIG_CMD_MMC=y CONFIG_CMD_PCI=y CONFIG_CMD_SF=y CONFIG_CMD_USB=y -# CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_FAT=y CONFIG_OF_CONTROL=y +CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y +# CONFIG_BLK is not set +CONFIG_DM_MMC=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_NETDEVICES=y@@ -42,6 +41,7 @@ CONFIG_SYS_NS16550=y CONFIG_DM_SPI=yQuoted 5 lines
CONFIG_FSL_DSPI=yCONFIG_USB=y
+CONFIG_DM_USB=y
CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y
CONFIG_USB_STORAGE=yWhy do you change other config options in this patch?
Quoted 1 line
York
This is done to align with non-secure boot deconfig. Actually IP owners update only non-secure boot defconfig, so we need to take care of alignment.
-Sumit
PATCH v2 1/1 arm64: ls1012ardb: Add distro secure boot support
Quoted 51 lines · Sumit Garg
Quoted 51 lines
From: York Sun
Sent: Monday, January 15, 2018 10:59 PMQuoted 33 lines · Sumit Garg
From: Vinitha Pillai-B57223 <[email protected]>
Enable validation of boot.scr script prior to its execution dependent on "secureboot" flag in environment. Enable fall back option to qspi boot in case of secure boot.
Signed-off-by Sumit Garg <[email protected]>Signed-off-by Vinitha Pillai <[email protected]>---
Changes in v2:
Rebased to top of masterconfigs/ls1012ardb_qspi_SECURE_BOOT_defconfig | 14 +++++++------- include/configs/ls1012ardb.h | 20 ++++++++++++++++++-- 2 files changed, 25 insertions(+), 9 deletions(-)configs/ls1012ardb_qspi_SECURE_BOOT_defconfig +2
-0@@ -2,7 +2,9 @@ CONFIG_ARM=y CONFIG_TARGET_LS1012ARDB=y CONFIG_SECURE_BOOT=y CONFIG_FSL_LS_PPA=y +CONFIG_QSPI_AHB_INIT=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1012a-rdb" +CONFIG_DISTRO_DEFAULTS=y # CONFIG_SYS_MALLOC_F is not set CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=yconfigs/ls1012ardb_qspi_SECURE_BOOT_defconfig CONFIG_QSPI_BOOT=y · line 16
Quoted 3 lines
configs/ls1012ardb_qspi_SECURE_BOOT_defconfig +0
-0@@ -12,7 +14,7 @@ CONFIG_QSPI_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0earlycon=uart8250,mmio,0x21c0500 quiet lpj=250000"
Quoted 10 lines
configs/ls1012ardb_qspi_SECURE_BOOT_defconfig +1
-2-CONFIG_HUSH_PARSER=y +# CONFIG_DISPLAY_BOARDINFO is not set CONFIG_CMD_GREPENV=y CONFIG_CMD_GPT=y CONFIG_CMD_I2C=y@@ -20,16 +22,13 @@ CONFIG_CMD_MMC=y CONFIG_CMD_PCI=y CONFIG_CMD_SF=y CONFIG_CMD_USB=y -# CONFIG_CMD_SETEXPR is not set
Quoted 8 lines
Quoted 8 lines
configs/ls1012ardb_qspi_SECURE_BOOT_defconfig CONFIG_CMD_MMC=y · line 27
Quoted 8 lines
configs/ls1012ardb_qspi_SECURE_BOOT_defconfig +1
-5-CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_FAT=y CONFIG_OF_CONTROL=y +CONFIG_ENV_IS_IN_SPI_FLASH=y
This is wrong. You shouldn't have ENV for secure boot. Please double check.
York
PATCH v2 1/1 arm64: ls1012ardb: Add distro secure boot support
Quoted 58 lines
-----Original Message-----
From: York Sun
Sent: Tuesday, January 30, 2018 2:57 AM
To: Sumit Garg <[email protected]>; u-boot at lists.denx.de
Cc: Ruchika Gupta <[email protected]>; Prabhakar Kushwaha <[email protected]>; Vini Pillai <[email protected]>
Subject: Re: [PATCH v2] arm64: ls1012ardb: Add distro secure boot supportQuoted 41 lines · Sumit Garg
Quoted 41 lines
From: York Sun
Sent: Monday, January 15, 2018 10:59 PMQuoted 33 lines · Sumit Garg
From: Vinitha Pillai-B57223 <[email protected]>
Enable validation of boot.scr script prior to its execution dependent on "secureboot" flag in environment. Enable fall back option to qspi boot in case of secure boot.
Signed-off-by Sumit Garg <[email protected]>Signed-off-by Vinitha Pillai <[email protected]>---
Changes in v2:
Rebased to top of masterconfigs/ls1012ardb_qspi_SECURE_BOOT_defconfig | 14 +++++++------- include/configs/ls1012ardb.h | 20 ++++++++++++++++++-- 2 files changed, 25 insertions(+), 9 deletions(-)configs/ls1012ardb_qspi_SECURE_BOOT_defconfig +2
-0@@ -2,7 +2,9 @@ CONFIG_ARM=y CONFIG_TARGET_LS1012ARDB=y CONFIG_SECURE_BOOT=y CONFIG_FSL_LS_PPA=y +CONFIG_QSPI_AHB_INIT=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1012a-rdb" +CONFIG_DISTRO_DEFAULTS=y # CONFIG_SYS_MALLOC_F is not set CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=yconfigs/ls1012ardb_qspi_SECURE_BOOT_defconfig CONFIG_QSPI_BOOT=y · line 16
Quoted 3 lines
configs/ls1012ardb_qspi_SECURE_BOOT_defconfig +0
-0@@ -12,7 +14,7 @@ CONFIG_QSPI_BOOT=y CONFIG_BOOTDELAY=10 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0earlycon=uart8250,mmio,0x21c0500 quiet lpj=250000"
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
configs/ls1012ardb_qspi_SECURE_BOOT_defconfig +1
-1-CONFIG_HUSH_PARSER=y +# CONFIG_DISPLAY_BOARDINFO is not set CONFIG_CMD_GREPENV=y CONFIG_CMD_GPT=y CONFIG_CMD_I2C=y@@ -20,16 +22,13 @@ CONFIG_CMD_MMC=y CONFIG_CMD_PCI=y
CONFIG_CMD_SF=yCONFIG_CMD_USB=y-#CONFIG_CMD_SETEXPRisnot set
Quoted 8 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
-CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y
CONFIG_CMD_CACHE=y-CONFIG_CMD_EXT2=y -CONFIG_CMD_FAT=yCONFIG_OF_CONTROL=y+CONFIG_ENV_IS_IN_SPI_FLASH=yThis is wrong. You shouldn't have ENV for secure boot. Please double check.
York
Yes you are correct. We should drop this from defconfig. Shall I send next version or could you drop it while applying the patch?
BTW we select ENV_IS_NOWHERE in case of Secure boot.
Sumit
York Sun
AppliedPATCH v2 1/1 arm64: ls1012ardb: Add distro secure boot support
Quoted 30 lines · Sumit Garg
Quoted 30 lines
-----Original Message-----
From: York Sun
Sent: Tuesday, January 30, 2018 2:57 AM
To: Sumit Garg <[email protected]>; u-boot at lists.denx.de
Cc: Ruchika Gupta <[email protected]>; Prabhakar Kushwaha <[email protected]>; Vini Pillai <[email protected]>
Subject: Re: [PATCH v2] arm64: ls1012ardb: Add distro secure boot supportQuoted 21 lines · Sumit Garg
Quoted 21 lines
From: York Sun
Sent: Monday, January 15, 2018 10:59 PMQuoted 17 lines · Sumit Garg
From: Vinitha Pillai-B57223 <[email protected]>
Enable validation of boot.scr script prior to its execution dependent on "secureboot" flag in environment. Enable fall back option to qspi boot in case of secure boot.
Signed-off-by Sumit Garg <[email protected]>Signed-off-by Vinitha Pillai <[email protected]>---
Changes in v2:
Rebased to top of masterconfigs/ls1012ardb_qspi_SECURE_BOOT_defconfig | 14 +++++++------- include/configs/ls1012ardb.h | 20 ++++++++++++++++++-- 2 files changed, 25 insertions(+), 9 deletions(-)
<snip>
Quoted 8 lines
Quoted 5 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
+CONFIG_ENV_IS_IN_SPI_FLASH=y
This is wrong. You shouldn't have ENV for secure boot. Please double check.
York
Yes you are correct. We should drop this from defconfig. Shall I send next version or could you drop it while applying the patch?
Applied to fsl-qoriq master, awaiting upstream. Thanks.
York