Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-22 12:34:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

hikey: configure 4 MB of secure DRAM for OP-TEE Secure Data Path

Browse source 
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 <jerome.forissier@linaro.org>
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Acked-by: Victor Chong <victor.chong@linaro.org>
This commit is contained in:
Peter Griffin 2017-12-21 18:03:46 +00:00
parent 3d5d9f5aa8
commit 52988b38c0
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
plat/hisilicon/hikey/hikey_security.c
View file

@ -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_size must be a power of 2 and at least 64KB
* region_base must be region_size aligned * 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 int_en_reg *int_en;
volatile struct rgn_map_reg *rgn_map; volatile struct rgn_map_reg *rgn_map;
volatile struct rgn_attr_reg *rgn_attr; volatile struct rgn_attr_reg *rgn_attr;
uint32_t i = 0; uint32_t i = 0;
assert(region < 1 || region > 15);
assert(!IS_POWER_OF_TWO(region_size) || region_size < 0x10000); assert(!IS_POWER_OF_TWO(region_size) || region_size < 0x10000);
/* ensure secure region_base is aligned to region_size */ /* ensure secure region_base is aligned to region_size */
assert((region_base & (region_size - 1))); 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; int_en->in_en = 0x1;
for (i = 0; i < PORTNUM_MAX; i++) { for (i = 0; i < PORTNUM_MAX; i++) {
rgn_map = get_rgn_map_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, 1, i); rgn_attr = get_rgn_attr_reg(MDDRC_SECURITY_BASE, region, i);
rgn_map->rgn_base_addr = region_base >> 16; rgn_map->rgn_base_addr = region_base >> 16;
rgn_attr->subrgn_disable = 0x0; rgn_attr->subrgn_disable = 0x0;
rgn_attr->sp = (i == 3) ? 0xC : 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) 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);
} }