From 3d5d9f5aa87b3468fb931562f46c93e4840da8c1 Mon Sep 17 00:00:00 2001 From: Jerome Forissier Date: Mon, 4 May 2015 09:40:03 +0200 Subject: [PATCH 1/2] hikey: configure the top 16MB of DRAM as secure DRAM region 0x3f000000 - 0x3fffffff is reserved for OP-TEE and should therefore be accessible only from secure world. Signed-off-by: Jerome Forissier Signed-off-by: Peter Griffin Acked-by: Victor Chong --- plat/hisilicon/hikey/hikey_bl2_setup.c | 1 + plat/hisilicon/hikey/hikey_private.h | 1 + plat/hisilicon/hikey/hikey_security.c | 100 +++++++++++++++++++++++++ plat/hisilicon/hikey/platform.mk | 1 + 4 files changed, 103 insertions(+) create mode 100644 plat/hisilicon/hikey/hikey_security.c diff --git a/plat/hisilicon/hikey/hikey_bl2_setup.c b/plat/hisilicon/hikey/hikey_bl2_setup.c index 13dc6c9b8..6c9fe51c3 100644 --- a/plat/hisilicon/hikey/hikey_bl2_setup.c +++ b/plat/hisilicon/hikey/hikey_bl2_setup.c @@ -347,4 +347,5 @@ void bl2_plat_arch_setup(void) void bl2_platform_setup(void) { + hikey_security_setup(); } diff --git a/plat/hisilicon/hikey/hikey_private.h b/plat/hisilicon/hikey/hikey_private.h index a7709b26c..da9873495 100644 --- a/plat/hisilicon/hikey/hikey_private.h +++ b/plat/hisilicon/hikey/hikey_private.h @@ -44,6 +44,7 @@ int hikey_erase(const char *arg); int hikey_flash(const char *arg); int hikey_oem(const char *arg); int hikey_reboot(const char *arg); +void hikey_security_setup(void); const char *hikey_init_serialno(void); int hikey_read_serialno(struct random_serial_num *serialno); diff --git a/plat/hisilicon/hikey/hikey_security.c b/plat/hisilicon/hikey/hikey_security.c new file mode 100644 index 000000000..2a784e77e --- /dev/null +++ b/plat/hisilicon/hikey/hikey_security.c @@ -0,0 +1,100 @@ +/* + * Copyright (c) 2018, ARM Limited and Contributors. All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include +#include +#include +#include +#include +#include +#include "hikey_private.h" + +#define PORTNUM_MAX 5 + +#define MDDRC_SECURITY_BASE 0xF7121000 + +struct int_en_reg { + unsigned in_en:1; + unsigned reserved:31; +}; + +struct rgn_map_reg { + unsigned rgn_base_addr:24; + unsigned rgn_size:6; + unsigned reserved:1; + unsigned rgn_en:1; +}; + +struct rgn_attr_reg { + unsigned sp:4; + unsigned security_inv:1; + unsigned reserved_0:3; + unsigned mid_en:1; + unsigned mid_inv:1; + unsigned reserved_1:6; + unsigned rgn_en:1; + unsigned subrgn_disable:16; +}; + +static volatile struct int_en_reg *get_int_en_reg(uint32_t base) +{ + uint64_t addr = base + 0x20; + return (struct int_en_reg *)addr; +} + +static volatile struct rgn_map_reg *get_rgn_map_reg(uint32_t base, int region, int port) +{ + uint64_t addr = base + 0x100 + 0x10 * region + 0x400 * (uint64_t)port; + return (struct rgn_map_reg *)addr; +} + +static volatile struct rgn_attr_reg *get_rgn_attr_reg(uint32_t base, int region, + int port) +{ + uint64_t addr = base + 0x104 + 0x10 * region + 0x400 * (uint64_t)port; + return (struct rgn_attr_reg *)addr; +} + +/* + * Configure secure memory region + * region_size must be a power of 2 and at least 64KB + * region_base must be region_size aligned + */ +static void sec_protect(uint32_t region_base, uint32_t region_size) +{ + volatile struct int_en_reg *int_en; + volatile struct rgn_map_reg *rgn_map; + volatile struct rgn_attr_reg *rgn_attr; + uint32_t i = 0; + + assert(!IS_POWER_OF_TWO(region_size) || region_size < 0x10000); + /* ensure secure region_base is aligned to region_size */ + assert((region_base & (region_size - 1))); + + INFO("BL2: TrustZone: protecting %u bytes of memory at 0x%x\n", region_size, + region_base); + + int_en = get_int_en_reg(MDDRC_SECURITY_BASE); + int_en->in_en = 0x1; + + for (i = 0; i < PORTNUM_MAX; i++) { + rgn_map = get_rgn_map_reg(MDDRC_SECURITY_BASE, 1, i); + rgn_attr = get_rgn_attr_reg(MDDRC_SECURITY_BASE, 1, i); + rgn_map->rgn_base_addr = region_base >> 16; + rgn_attr->subrgn_disable = 0x0; + rgn_attr->sp = (i == 3) ? 0xC : 0x0; + rgn_map->rgn_size = __builtin_ffs(region_size) - 2; + rgn_map->rgn_en = 0x1; + } +} + +/******************************************************************************* + * Initialize the secure environment. + ******************************************************************************/ +void hikey_security_setup(void) +{ + sec_protect(DDR_SEC_BASE, DDR_SEC_SIZE); +} diff --git a/plat/hisilicon/hikey/platform.mk b/plat/hisilicon/hikey/platform.mk index 8da399880..b7fb6ddda 100644 --- a/plat/hisilicon/hikey/platform.mk +++ b/plat/hisilicon/hikey/platform.mk @@ -65,6 +65,7 @@ BL2_SOURCES += drivers/arm/sp804/sp804_delay_timer.c \ drivers/synopsys/emmc/dw_mmc.c \ plat/hisilicon/hikey/aarch64/hikey_helpers.S \ plat/hisilicon/hikey/hikey_bl2_setup.c \ + plat/hisilicon/hikey/hikey_security.c \ plat/hisilicon/hikey/hikey_ddr.c \ plat/hisilicon/hikey/hikey_io_storage.c \ plat/hisilicon/hikey/hisi_dvfs.c \ From 52988b38c0165c3765e578b0584fdaea7774f94f Mon Sep 17 00:00:00 2001 From: Peter Griffin Date: Thu, 21 Dec 2017 18:03:46 +0000 Subject: [PATCH 2/2] hikey: configure 4 MB of secure DRAM for OP-TEE Secure Data Path Update the memory firewall configuration to reserve 4 MB of secure RAM for use by the kernel and OP-TEE as the Secure Data Path pool. Note that this address range (0x3E800000 - 0x3EC00000) falls in the range already set aside by UEFI (which reserves the upper 32 MB of the 1GB DRAM for OP-TEE [1]) and was previously unused. [1] https://github.com/96boards-hikey/edk2/blob/hikey/HisiPkg/HiKeyPkg/Library/HiKeyLib/HiKeyMem.c#L44 Signed-off-by: Jerome Forissier Signed-off-by: Peter Griffin Acked-by: Victor Chong --- plat/hisilicon/hikey/hikey_security.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/plat/hisilicon/hikey/hikey_security.c b/plat/hisilicon/hikey/hikey_security.c index 2a784e77e..be8c39f45 100644 --- a/plat/hisilicon/hikey/hikey_security.c +++ b/plat/hisilicon/hikey/hikey_security.c @@ -63,13 +63,15 @@ static volatile struct rgn_attr_reg *get_rgn_attr_reg(uint32_t base, int region, * region_size must be a power of 2 and at least 64KB * region_base must be region_size aligned */ -static void sec_protect(uint32_t region_base, uint32_t region_size) +static void sec_protect(uint32_t region_base, uint32_t region_size, + int region) { volatile struct int_en_reg *int_en; volatile struct rgn_map_reg *rgn_map; volatile struct rgn_attr_reg *rgn_attr; uint32_t i = 0; + assert(region < 1 || region > 15); assert(!IS_POWER_OF_TWO(region_size) || region_size < 0x10000); /* ensure secure region_base is aligned to region_size */ assert((region_base & (region_size - 1))); @@ -81,8 +83,8 @@ static void sec_protect(uint32_t region_base, uint32_t region_size) int_en->in_en = 0x1; for (i = 0; i < PORTNUM_MAX; i++) { - rgn_map = get_rgn_map_reg(MDDRC_SECURITY_BASE, 1, i); - rgn_attr = get_rgn_attr_reg(MDDRC_SECURITY_BASE, 1, i); + rgn_map = get_rgn_map_reg(MDDRC_SECURITY_BASE, region, i); + rgn_attr = get_rgn_attr_reg(MDDRC_SECURITY_BASE, region, i); rgn_map->rgn_base_addr = region_base >> 16; rgn_attr->subrgn_disable = 0x0; rgn_attr->sp = (i == 3) ? 0xC : 0x0; @@ -96,5 +98,6 @@ static void sec_protect(uint32_t region_base, uint32_t region_size) ******************************************************************************/ void hikey_security_setup(void) { - sec_protect(DDR_SEC_BASE, DDR_SEC_SIZE); + sec_protect(DDR_SEC_BASE, DDR_SEC_SIZE, 1); + sec_protect(DDR_SDP_BASE, DDR_SDP_SIZE, 2); }