AM65x HS device support
Subsystems (3)
v2 cover AM65x HS device support
Hello all,
This series brings up HS device support on the AM65x platform. Support for HS on K3 family devices is a bit different than previous devices but for the most part all that has been abstracted into the SECDEV package, allowing for a rather straight forward implementation here.
Thanks,
Andrew
Changes from v1:
- Commented on use of .data section
- Use ti_sci_msg_hdr header directly when possible
- Rebase and add Reviewed-bys
- Will add makefile cleanup later as it also affects files unrelated to this series
Andrew F. Davis (7):
arm: K3: Avoid use of MCU_PSRAM0 before SYSFW is loaded
firmware: ti_sci: Add support for firewall management
firmware: ti_sci: Modify auth_boot TI-SCI API to match new version
arm: mach-k3: Add secure device support
arm: mach-k3: Add secure device build support
configs: Add a config for AM65x High Security EVM
doc: Update info on using K3 secure devices
MAINTAINERS | 4 + arch/arm/Kconfig | 2 +- arch/arm/mach-k3/Makefile | 1 + arch/arm/mach-k3/am6_init.c | 13 +- arch/arm/mach-k3/config.mk | 25 +++ arch/arm/mach-k3/config_secure.mk | 44 ++++ arch/arm/mach-k3/include/mach/am6_hardware.h | 3 - arch/arm/mach-k3/security.c | 63 ++++++ configs/am65x_hs_evm_a53_defconfig | 74 +++++++ configs/am65x_hs_evm_r5_defconfig | 90 +++++++++ doc/README.ti-secure | 20 +- drivers/firmware/ti_sci.c | 202 ++++++++++++++++++- drivers/firmware/ti_sci.h | 130 +++++++++++- include/linux/soc/ti/ti_sci_protocol.h | 68 ++++++- tools/k3_fit_atf.sh | 8 +- 15 files changed, 718 insertions(+), 29 deletions(-) create mode 100644 arch/arm/mach-k3/config_secure.mk create mode 100644 arch/arm/mach-k3/security.c create mode 100644 configs/am65x_hs_evm_a53_defconfig create mode 100644 configs/am65x_hs_evm_r5_defconfig
Signature · 1 line
2.19.1
PATCH v2 1/7 arm: K3: Avoid use of MCU_PSRAM0 before SYSFW is loaded
On HS devices the 512b region of reset isolated memory called MCU_PSRAM0 is firewalled by default. Until SYSFW is loaded we cannot use this memory. It is only used to store a single value left at the end of SRAM by ROM that will be needed later. Save that value to a global variable stored in the .data section. This section is used as .bss will be cleared between saving this value and using it.
--- arch/arm/mach-k3/am6_init.c | 13 ++++++++----- arch/arm/mach-k3/include/mach/am6_hardware.h | 3 --- 2 files changed, 8 insertions(+), 8 deletions(-)
arch/arm/mach-k3/am6_init.c +8 -5
@@ -49,11 +49,16 @@ static void ctrl_mmr_unlock(void)mmr_unlock (CTRL_MMR0_BASE ,7 ); } +/* +* This uninitialized global variable would normal end up in the .bss section, +* but the .bss is cleared between writing and reading this variable, so move +* it to the .data section. +*/ +u32 bootindex __attribute__((section(".data"))); +static void store_boot_index_from_rom (void ) { -u32 *boot_index = (u32 *)K3_BOOT_PARAM_TABLE_INDEX_VAL ; - - *boot_index = *(u32 *)(CONFIG_SYS_K3_BOOT_PARAM_TABLE_INDEX ); + bootindex = *(u32 *)(CONFIG_SYS_K3_BOOT_PARAM_TABLE_INDEX ); }void board_init_f (ulong dummy)
@@ -94,7 +99,6 @@ u32 spl_boot_mode(const u32 boot_device) {#if defined(CONFIG_SUPPORT_EMMC_BOOT )u32 devstat =readl (CTRLMMR_MAIN_DEVSTAT ); -u32 bootindex =readl (K3_BOOT_PARAM_TABLE_INDEX_VAL );u32 bootmode = (devstat &CTRLMMR_MAIN_DEVSTAT_BOOTMODE_MASK ) >>CTRLMMR_MAIN_DEVSTAT_BOOTMODE_SHIFT ;
@@ -170,7 +174,6 @@ static u32 __get_primary_bootmedia(u32 devstat)u32 spl_boot_device (void ) {u32 devstat =readl (CTRLMMR_MAIN_DEVSTAT ); -u32 bootindex =readl (K3_BOOT_PARAM_TABLE_INDEX_VAL );if (bootindex ==K3_PRIMARY_BOOTMODE )return __get_primary_bootmedia (devstat);
arch/arm/mach-k3/include/mach/am6_hardware.h +0 -3
@@ -44,7 +44,4 @@#define CTRLMMR_LOCK_KICK1 0x0100c#define CTRLMMR_LOCK_KICK1_UNLOCK_VAL 0xd172bc5a -/* MCU SCRATCHPAD usage */ -#define K3_BOOT_PARAM_TABLE_INDEX_VAL CONFIG_SYS_K3_MCU_SCRATCHPAD_BASE -#endif /* __ASM_ARCH_AM6_HARDWARE_H */
Signature · 1 line
2.19.1
PATCH v2 1/7 arm: K3: Avoid use of MCU_PSRAM0 before SYSFW is loaded
Quoted 11 lines · Andrew F. Davis
On HS devices the 512b region of reset isolated memory called
MCU_PSRAM0is firewalled by default. Until SYSFW is loaded we cannot use this memory. It is only used to store a single value left at the end of SRAM by ROM that will be needed later. Save that value to a global variable stored in the .data section. This section is used as .bss will be cleared between saving this value and using it.Signed-off-by Andrew F. Davis <[email protected]>Reviewed-by Andreas Dannenberg <[email protected]>Reviewed-by Lokesh Vutla <[email protected]>
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190221/a567b13b/attachment.sig>
PATCH v2 1/7 arm: K3: Avoid use of MCU_PSRAM0 before SYSFW is loaded
Quoted 10 lines · Tom Rini
Quoted 8 lines · Andrew F. Davis
On HS devices the 512b region of reset isolated memory called
MCU_PSRAM0is firewalled by default. Until SYSFW is loaded we cannot use this memory. It is only used to store a single value left at the end of SRAM by ROM that will be needed later. Save that value to a global variable stored in the .data section. This section is used as .bss will be cleared between saving this value and using it.
Quoted 6 lines
Quoted 3 lines
Signed-off-by Andrew F. Davis <[email protected]>Reviewed-by Andreas Dannenberg <[email protected]>Reviewed-by Lokesh Vutla <[email protected]>Reviewed-by Tom Rini <[email protected]>
Ping, these all still apply to latest master.
Andrew
PATCH v2 2/7 firmware: ti_sci: Add support for firewall management
In reply to Andrew F. DavisTI-SCI message protocol provides support for controlling the firewall configurations available in SoC.
Introduce support for the set of TI-SCI message protocol APIs that provide us with this capability of controlling firewalls.
--- drivers/firmware/ti_sci.c | 177 +++++++++++++++++++++++++ drivers/firmware/ti_sci.h | 121 +++++++++++++++++ include/linux/soc/ti/ti_sci_protocol.h | 64 +++++++++ 3 files changed, 362 insertions(+)
drivers/firmware/ti_sci.c +177 -0
@@ -1803,6 +1803,178 @@ static int ti_sci_cmd_get_proc_boot_status(const struct ti_sci_handle *handle,return ret; } +/** +* ti_sci_cmd_set_fwl_region() - Request for configuring a firewall region +* @handle: pointer to TI SCI handle +* @region: region configuration parameters +* +* Return: 0 if all went well, else returns appropriate error value. +*/ +static int ti_sci_cmd_set_fwl_region (const struct ti_sci_handle *handle, +const struct ti_sci_msg_fwl_region *region) +{ +struct ti_sci_msg_fwl_set_firewall_region_req req; +struct ti_sci_msg_hdr *resp; +struct ti_sci_info *info; +struct ti_sci_xfer *xfer; +int ret =0 ; + +if (IS_ERR (handle)) +return PTR_ERR (handle); +if (!handle) +return -EINVAL ; + + info =handle_to_ti_sci_info (handle); + + xfer =ti_sci_setup_one_xfer (info,TISCI_MSG_FWL_SET , +TI_SCI_FLAG_REQ_ACK_ON_PROCESSED , + (u32 *)&req,sizeof (req),sizeof (*resp)); +if (IS_ERR (xfer)) { + ret =PTR_ERR (xfer); +dev_err (info->dev,"Message alloc failed(%d)\n" , ret); +return ret; + } + + req.fwl_id = region->fwl_id; + req.region = region->region; + req.n_permission_regs = region->n_permission_regs; + req.control = region->control; + req.permissions[0 ] = region->permissions[0 ]; + req.permissions[1 ] = region->permissions[1 ]; + req.permissions[2 ] = region->permissions[2 ]; + req.start_address = region->start_address; + req.end_address = region->end_address; + + ret =ti_sci_do_xfer (info, xfer); +if (ret) { +dev_err (info->dev,"Mbox send fail %d\n" , ret); +return ret; + } + + resp = (struct ti_sci_msg_hdr *)xfer->tx_message.buf; + +if (!ti_sci_is_response_ack (resp)) +return -ENODEV ; + +return 0 ; +} + +/** +* ti_sci_cmd_get_fwl_region() - Request for getting a firewall region +* @handle: pointer to TI SCI handle +* @region: region configuration parameters +* +* Return: 0 if all went well, else returns appropriate error value. +*/ +static int ti_sci_cmd_get_fwl_region (const struct ti_sci_handle *handle, +struct ti_sci_msg_fwl_region *region) +{ +struct ti_sci_msg_fwl_get_firewall_region_req req; +struct ti_sci_msg_fwl_get_firewall_region_resp *resp; +struct ti_sci_info *info; +struct ti_sci_xfer *xfer; +int ret =0 ; + +if (IS_ERR (handle)) +return PTR_ERR (handle); +if (!handle) +return -EINVAL ; + + info =handle_to_ti_sci_info (handle); + + xfer =ti_sci_setup_one_xfer (info,TISCI_MSG_FWL_GET , +TI_SCI_FLAG_REQ_ACK_ON_PROCESSED , + (u32 *)&req,sizeof (req),sizeof (*resp)); +if (IS_ERR (xfer)) { + ret =PTR_ERR (xfer); +dev_err (info->dev,"Message alloc failed(%d)\n" , ret); +return ret; + } + + req.fwl_id = region->fwl_id; + req.region = region->region; + req.n_permission_regs = region->n_permission_regs; + + ret =ti_sci_do_xfer (info, xfer); +if (ret) { +dev_err (info->dev,"Mbox send fail %d\n" , ret); +return ret; + } + + resp = (struct ti_sci_msg_fwl_get_firewall_region_resp *)xfer->tx_message.buf; + +if (!ti_sci_is_response_ack (resp)) +return -ENODEV ; + + region->fwl_id = resp->fwl_id; + region->region = resp->region; + region->n_permission_regs = resp->n_permission_regs; + region->control = resp->control; + region->permissions[0 ] = resp->permissions[0 ]; + region->permissions[1 ] = resp->permissions[1 ]; + region->permissions[2 ] = resp->permissions[2 ]; + region->start_address = resp->start_address; + region->end_address = resp->end_address; + +return 0 ; +} + +/** +* ti_sci_cmd_change_fwl_owner() - Request for changing a firewall owner +* @handle: pointer to TI SCI handle +* @region: region configuration parameters +* +* Return: 0 if all went well, else returns appropriate error value. +*/ +static int ti_sci_cmd_change_fwl_owner (const struct ti_sci_handle *handle, +struct ti_sci_msg_fwl_owner *owner) +{ +struct ti_sci_msg_fwl_change_owner_info_req req; +struct ti_sci_msg_fwl_change_owner_info_resp *resp; +struct ti_sci_info *info; +struct ti_sci_xfer *xfer; +int ret =0 ; + +if (IS_ERR (handle)) +return PTR_ERR (handle); +if (!handle) +return -EINVAL ; + + info =handle_to_ti_sci_info (handle); + + xfer =ti_sci_setup_one_xfer (info,TISCI_MSG_FWL_GET , +TISCI_MSG_FWL_CHANGE_OWNER , + (u32 *)&req,sizeof (req),sizeof (*resp)); +if (IS_ERR (xfer)) { + ret =PTR_ERR (xfer); +dev_err (info->dev,"Message alloc failed(%d)\n" , ret); +return ret; + } + + req.fwl_id = owner->fwl_id; + req.region = owner->region; + req.owner_index = owner->owner_index; + + ret =ti_sci_do_xfer (info, xfer); +if (ret) { +dev_err (info->dev,"Mbox send fail %d\n" , ret); +return ret; + } + + resp = (struct ti_sci_msg_fwl_change_owner_info_resp *)xfer->tx_message.buf; + +if (!ti_sci_is_response_ack (resp)) +return -ENODEV ; + + owner->fwl_id = resp->fwl_id; + owner->region = resp->region; + owner->owner_index = resp->owner_index; + owner->owner_privid = resp->owner_privid; + owner->owner_permission_bits = resp->owner_permission_bits; + +return ret; +} +/* * ti_sci_setup_ops() - Setup the operations structures * @info: pointer to TISCI pointer
@@ -1815,6 +1987,7 @@ static void ti_sci_setup_ops(struct ti_sci_info *info)struct ti_sci_clk_ops *cops = &ops->clk_ops;struct ti_sci_core_ops *core_ops = &ops->core_ops;struct ti_sci_proc_ops *pops = &ops->proc_ops; +struct ti_sci_fwl_ops *fwl_ops = &ops->fwl_ops; bops->board_config = ti_sci_cmd_set_board_config; bops->board_config_rm = ti_sci_cmd_set_board_config_rm;
@@ -1857,6 +2030,10 @@ static void ti_sci_setup_ops(struct ti_sci_info *info) pops->set_proc_boot_ctrl = ti_sci_cmd_set_proc_boot_ctrl; pops->proc_auth_boot_image = ti_sci_cmd_proc_auth_boot_image; pops->get_proc_boot_status = ti_sci_cmd_get_proc_boot_status; + + fwl_ops->set_fwl_region = ti_sci_cmd_set_fwl_region; + fwl_ops->get_fwl_region = ti_sci_cmd_get_fwl_region; + fwl_ops->change_fwl_owner = ti_sci_cmd_change_fwl_owner; }/**
drivers/firmware/ti_sci.h +121 -0
131 lines not on this page · raw message
include/linux/soc/ti/ti_sci_protocol.h +64 -0
82 lines not on this page · raw message
Signature · 1 line
2.19.1
PATCH v2 3/7 firmware: ti_sci: Modify auth_boot TI-SCI API to match new version
In reply to Andrew F. DavisSYSFW version 2019.01 introduces a slightly modified version of this API, add support for it here.
--- drivers/firmware/ti_sci.c | 25 ++++++++++++++++--------- drivers/firmware/ti_sci.h | 9 +++++++-- include/linux/soc/ti/ti_sci_protocol.h | 4 ++-- 3 files changed, 25 insertions(+), 13 deletions(-)
drivers/firmware/ti_sci.c +16 -9
@@ -1700,16 +1700,19 @@ static int ti_sci_cmd_set_proc_boot_ctrl(const struct ti_sci_handle *handle,* ti_sci_cmd_proc_auth_boot_image() - Command to authenticate and load the * image and then set the processor configuration flags. * @handle: Pointer to TI SCI handle -* @proc_id: Processor ID this request is for -* @cert_addr: Memory address at which payload image certificate is located. +* @image_addr: Memory address at which payload image and certificate is +* located in memory, this is updated if the image data is +* moved during authentication. +* @image_size: This is updated with the final size of the image after +* authentication. * * Return: 0 if all went well, else returns appropriate error value. */ static int ti_sci_cmd_proc_auth_boot_image (const struct ti_sci_handle *handle, -u8 proc_id,u64 cert_addr) +u64 *image_addr,u32 *image_size) {struct ti_sci_msg_req_proc_auth_boot_image req; -struct ti_sci_msg_hdr *resp; +struct ti_sci_msg_resp_proc_auth_boot_image *resp;struct ti_sci_info *info;struct ti_sci_xfer *xfer;int ret =0 ;
@@ -1729,9 +1732,8 @@ static int ti_sci_cmd_proc_auth_boot_image(const struct ti_sci_handle *handle,dev_err (info->dev,"Message alloc failed(%d)\n" , ret);return ret; } - req.processor_id = proc_id; - req.cert_addr_low = cert_addr &TISCI_ADDR_LOW_MASK ; - req.cert_addr_high = (cert_addr &TISCI_ADDR_HIGH_MASK ) >> + req.cert_addr_low = *image_addr &TISCI_ADDR_LOW_MASK ; + req.cert_addr_high = (*image_addr &TISCI_ADDR_HIGH_MASK ) >>TISCI_ADDR_HIGH_SHIFT ; ret =ti_sci_do_xfer (info, xfer);
@@ -1740,10 +1742,15 @@ static int ti_sci_cmd_proc_auth_boot_image(const struct ti_sci_handle *handle,return ret; } - resp = (struct ti_sci_msg_hdr *)xfer->tx_message.buf; + resp = (struct ti_sci_msg_resp_proc_auth_boot_image *)xfer->tx_message.buf;if (!ti_sci_is_response_ack (resp)) - ret = -ENODEV ; +return -ENODEV ; + + *image_addr = (resp->image_addr_low &TISCI_ADDR_LOW_MASK ) | + (((u64 )resp->image_addr_high << +TISCI_ADDR_HIGH_SHIFT ) &TISCI_ADDR_HIGH_MASK ); + *image_size = resp->image_size;return ret; }
drivers/firmware/ti_sci.h +7 -2
@@ -622,7 +622,6 @@ struct ti_sci_msg_req_set_proc_boot_ctrl {/** * struct ti_sci_msg_req_proc_auth_start_image - Authenticate and start image * @hdr: Generic Header -* @processor_id: ID of processor * @cert_addr_low: Lower 32bit (Little Endian) of certificate * @cert_addr_high: Higher 32bit (Little Endian) of certificate *
@@ -631,11 +630,17 @@ struct ti_sci_msg_req_set_proc_boot_ctrl {*/ struct ti_sci_msg_req_proc_auth_boot_image {struct ti_sci_msg_hdr hdr; -u8 processor_id;u32 cert_addr_low;u32 cert_addr_high; } __packed; +struct ti_sci_msg_resp_proc_auth_boot_image { +struct ti_sci_msg_hdr hdr; +u32 image_addr_low; +u32 image_addr_high; +u32 image_size; +} __packed; +/** * struct ti_sci_msg_req_get_proc_boot_status - Get processor boot status * @hdr: Generic Header
include/linux/soc/ti/ti_sci_protocol.h +2 -2
@@ -250,8 +250,8 @@ struct ti_sci_proc_ops { u64 bv, u32 cfg_set, u32 cfg_clr);int (*set_proc_boot_ctrl)(const struct ti_sci_handle *handle,u8 pid,u32 ctrl_set,u32 ctrl_clr); -int (*proc_auth_boot_image)(const struct ti_sci_handle *handle,u8 pid, -u64 caddr); +int (*proc_auth_boot_image)(const struct ti_sci_handle *handle, +u64 *image_addr,u32 *image_size);int (*get_proc_boot_status)(const struct ti_sci_handle *handle,u8 pid,u64 *bv,u32 *cfg_flags,u32 *ctrl_flags,u32 *sts_flags);
Signature · 1 line
2.19.1
PATCH v2 4/7 arm: mach-k3: Add secure device support
In reply to Andrew F. DavisK3 devices have High Security (HS) variants along with the non-HS already supported. Like the previous generation devices (OMAP/Keystone2) K3 supports boot chain-of-trust by authenticating and optionally decrypting images as they are unpacked from FIT images. Add support for this here.
--- MAINTAINERS | 1 + arch/arm/Kconfig | 2 +- arch/arm/mach-k3/Makefile | 1 + arch/arm/mach-k3/security.c | 63 +++++++++++++++++++++++++++++++++++++ 4 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 arch/arm/mach-k3/security.c
MAINTAINERS +1 -0
@@ -716,6 +716,7 @@ S: Supported F: arch/arm/mach-omap2/omap5/sec_entry_cpu1.S F: arch/arm/mach-omap2/sec-common.c F: arch/arm/mach-omap2/config_secure.mk +F: arch/arm/mach-k3/security.c F: configs/am335x_hs_evm_defconfig F: configs/am335x_hs_evm_uart_defconfig F: configs/am43xx_hs_evm_defconfig
arch/arm/Kconfig +1 -1
@@ -1417,7 +1417,7 @@ endchoice config TI_SECURE_DEVICE bool "HS Device Type Support" - depends on ARCH_KEYSTONE || ARCH_OMAP2PLUS + depends on ARCH_KEYSTONE || ARCH_OMAP2PLUS || ARCH_K3 help If a high secure (HS) device type is being used, this config must be set. This option impacts various aspects of the
arch/arm/mach-k3/Makefile +1 -0
@@ -6,4 +6,5 @@ obj-$(CONFIG_SOC_K3_AM6) += am6_init.o obj-$(CONFIG_ARM64) += arm64-mmu.o obj-$(CONFIG_CPU_V7R) += r5_mpu.o lowlevel_init.o +obj-$(CONFIG_TI_SECURE_DEVICE) += security.o obj-y += common.o
arch/arm/mach-k3/security.c new file +63 -0
63 lines not on this page · raw message
Signature · 1 line
2.19.1
PATCH v2 5/7 arm: mach-k3: Add secure device build support
In reply to Andrew F. DavisK3 HS devices require signed binaries for boot, use the SECDEV tools to sign the boot artifacts during build.
--- MAINTAINERS | 1 + arch/arm/mach-k3/config.mk | 25 ++++++++++++++++++ arch/arm/mach-k3/config_secure.mk | 44 +++++++++++++++++++++++++++++++ tools/k3_fit_atf.sh | 8 ++++-- 4 files changed, 76 insertions(+), 2 deletions(-) create mode 100644 arch/arm/mach-k3/config_secure.mk
MAINTAINERS +1 -0
@@ -717,6 +717,7 @@ F: arch/arm/mach-omap2/omap5/sec_entry_cpu1.S F: arch/arm/mach-omap2/sec-common.c F: arch/arm/mach-omap2/config_secure.mk F: arch/arm/mach-k3/security.c +F: arch/arm/mach-k3/config_secure.mk F: configs/am335x_hs_evm_defconfig F: configs/am335x_hs_evm_uart_defconfig F: configs/am43xx_hs_evm_defconfig
arch/arm/mach-k3/config.mk +25 -0
@@ -36,6 +36,14 @@ cmd_gencert = cat $(srctree)/tools/k3_x509template.txt | sed $(SED_OPTS) > u-boo # If external key is not provided, generate key using openssl. ifeq ($(CONFIG_SYS_K3_KEY), "") KEY=u-boot-spl-eckey.pem +# On HS use real key or warn if not available +ifeq ($(CONFIG_TI_SECURE_DEVICE),y) +ifneq ($(wildcard $(TI_SECURE_DEV_PKG)/keys/custMpk.pem),) +KEY=$(TI_SECURE_DEV_PKG)/keys/custMpk.pem +else +$(warning "WARNING: signing key not found. Random key will NOT work on HS hardware!") +endif +endif else KEY=$(patsubst "%",$(srctree)/%,$(CONFIG_SYS_K3_KEY)) endif
@@ -65,6 +73,15 @@ ALL-y += tiboot3.bin endif ifdef CONFIG_ARM64 +ifeq ($(CONFIG_TI_SECURE_DEVICE),y) +SPL_ITS := u-boot-spl-k3_HS.its +$(SPL_ITS): FORCE + IS_HS=1 \ + $(srctree)/tools/k3_fit_atf.sh \ + $(patsubst %,$(obj)/dts/%.dtb,$(subst ",,$(CONFIG_SPL_OF_LIST))) > $@ + +ALL-y += tispl.bin_HS +else SPL_ITS := u-boot-spl-k3.its $(SPL_ITS): FORCE $(srctree)/tools/k3_fit_atf.sh \
@@ -72,7 +89,15 @@ $(SPL_ITS): FORCE ALL-y += tispl.bin endif +endif + +else +ifeq ($(CONFIG_TI_SECURE_DEVICE),y) +ALL-y += u-boot.img_HS else ALL-y += u-boot.img endif +endif + +include $(srctree)/arch/arm/mach-k3/config_secure.mk
arch/arm/mach-k3/config_secure.mk new file +44 -0
44 lines not on this page · raw message
tools/k3_fit_atf.sh +6 -2
@@ -21,6 +21,10 @@ if [ ! -f $TEE ]; then TEE=/dev/null fi +if [ ! -z "$IS_HS" ]; then + HS_APPEND=_HS +fi + cat << __HEADER_EOF /dts-v1/;
@@ -51,7 +55,7 @@ cat << __HEADER_EOF }; spl { description = "SPL (64-bit)"; - data = /incbin/("spl/u-boot-spl-nodtb.bin"); + data = /incbin/("spl/u-boot-spl-nodtb.bin$HS_APPEND"); type = "standalone"; os = "U-Boot"; arch = "arm64";
@@ -66,7 +70,7 @@ do cat << __FDT_IMAGE_EOF $(basename $dtname) { description = "$(basename $dtname .dtb)"; - data = /incbin/("$dtname"); + data = /incbin/("$dtname$HS_APPEND"); type = "flat_dt"; arch = "arm"; compression = "none";
Signature · 1 line
2.19.1
PATCH v2 6/7 configs: Add a config for AM65x High Security EVM
In reply to Andrew F. DavisAdd new defconfig files for the AM65x High Security EVM.
This defconfigs are the same as for the non-secure part, except for:
CONFIG_TI_SECURE_DEVICE option set to 'y' CONFIG_FIT_IMAGE_POST_PROCESS option set to 'y' CONFIG_SPL_FIT_IMAGE_POST_PROCESS option set to 'y'
--- MAINTAINERS | 2 + configs/am65x_hs_evm_a53_defconfig | 74 ++++++++++++++++++++++++ configs/am65x_hs_evm_r5_defconfig | 90 ++++++++++++++++++++++++++++++ 3 files changed, 166 insertions(+) create mode 100644 configs/am65x_hs_evm_a53_defconfig create mode 100644 configs/am65x_hs_evm_r5_defconfig
MAINTAINERS +2 -0
@@ -729,6 +729,8 @@ F: configs/k2hk_hs_evm_defconfig F: configs/k2e_hs_evm_defconfig F: configs/k2g_hs_evm_defconfig F: configs/k2l_hs_evm_defconfig +F: configs/am65x_hs_evm_r5_defconfig +F: configs/am65x_hs_evm_a53_defconfig TQ GROUP #M: Martin Krause <[email protected]>
configs/am65x_hs_evm_a53_defconfig new file +74 -0
74 lines not on this page · raw message
configs/am65x_hs_evm_r5_defconfig new file +90 -0
90 lines not on this page · raw message
Signature · 1 line
2.19.1
PATCH v2 7/7 doc: Update info on using K3 secure devices
In reply to Andrew F. Davis--- doc/README.ti-secure | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-)
doc/README.ti-secure +15 -5
@@ -138,7 +138,7 @@ Booting of U-Boot SPL <INPUT_FILE> Invoking the script for Keystone2 Secure Devices - ============================================= + ================================================ create-boot-image.sh \ <UNUSED> <INPUT_FILE> <OUTPUT_FILE> <UNUSED>
@@ -157,6 +157,18 @@ Booting of U-Boot SPL boot from all media. Secure boot from SPI NOR flash is not currently supported. + Invoking the script for K3 Secure Devices + ========================================= + + The signing steps required to produce a bootable SPL image on secure + K3 TI devices are the same as those performed on non-secure devices. + The only difference is the key is not checked on non-secure devices so + a dummy key is used when building U-Boot for those devices. For secure + K3 TI devices simply use the real hardware key for your device. This + real key can be set with the Kconfig option "K3_KEY". The environment + variable TI_SECURE_DEV_PKG is also searched for real keys when the + build targets secure devices. + Booting of Primary U-Boot (u-boot.img) ======================================
@@ -181,10 +193,8 @@ Booting of Primary U-Boot (u-boot.img) is enabled through the CONFIG_SPL_FIT_IMAGE_POST_PROCESS option which must be enabled for the secure boot scheme to work. In order to allow verifying proper operation of the secure boot chain in case of successful - authentication messages like "Authentication passed: CERT_U-BOOT-NOD" are - output by the SPL to the console for each blob that got extracted from the - FIT image. Note that the last part of this log message is the (truncated) - name of the signing certificate embedded into the blob that got processed. + authentication messages like "Authentication passed" are output by the + SPL to the console for each blob that got extracted from the FIT image. The exact details of the how the images are secured is handled by the SECDEV package. Within the SECDEV package exists a script to process
Signature · 1 line
2.19.1
v2 cover AM65x HS device support
In reply to Andrew F. DavisQuoted 17 lines · Andrew F. Davis
Hello all,
This series brings up HS device support on the AM65x platform. Support for HS on K3 family devices is a bit different than previous devices but for the most part all that has been abstracted into the SECDEV package, allowing for a rather straight forward implementation here.
Thanks,
AndrewChanges from v1:
- Commented on use of .data section
- Useti_sci_msg_hdrheader directly when possible
- Rebase and add Reviewed-bys
- Will add makefile cleanup later as it also affects files unrelated to this series
Quoted 8 lines
Andrew F. Davis (7):
arm: K3: Avoid use ofMCU_PSRAM0before SYSFW is loaded
firmware:ti_sci: Add support for firewall management
firmware:ti_sci: Modifyauth_bootTI-SCI API to match new version
arm: mach-k3: Add secure device support
arm: mach-k3: Add secure device build support
configs: Add a config for AM65x High Security EVM
doc: Update info on using K3 secure devices
Can you please rebase this on master and repost? Thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190412/3a5aa755/attachment.sig>
v2 cover AM65x HS device support
Quoted 28 lines · Tom Rini
Quoted 17 lines · Andrew F. Davis
Hello all,
This series brings up HS device support on the AM65x platform. Support for HS on K3 family devices is a bit different than previous devices but for the most part all that has been abstracted into the SECDEV package, allowing for a rather straight forward implementation here.
Thanks,
AndrewChanges from v1:
- Commented on use of .data section
- Useti_sci_msg_hdrheader directly when possible
- Rebase and add Reviewed-bys
- Will add makefile cleanup later as it also affects files unrelated to this seriesQuoted 8 lines
Andrew F. Davis (7):
arm: K3: Avoid use ofMCU_PSRAM0before SYSFW is loaded
firmware:ti_sci: Add support for firewall management
firmware:ti_sci: Modifyauth_bootTI-SCI API to match new version
arm: mach-k3: Add secure device support
arm: mach-k3: Add secure device build support
configs: Add a config for AM65x High Security EVM
doc: Update info on using K3 secure devices
Quoted 2 lines
Can you please rebase this on master and repost? Thanks!
Done and sent.
Thanks,
Andrew