andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hikey: fix assert in sec_protect() 

`assert(e)` was used in place of `if (e) ERROR()` when sec_protect()
was ported from hikey fork so the logic should have been reversed.

Fixes: 3d5d9f5a ("hikey: configure the top 16MB of DRAM as secure")
Fixes: 52988b38 ("hikey: configure 4 MB of secure DRAM for OP-TEE
Secure Data Path")
Signed-off-by: Victor Chong <victor.chong@linaro.org>
Tested-by: Victor Chong <victor.chong@linaro.org>
This commit is contained in:
Victor Chong 2018-01-27 21:36:12 +09:00
parent 5df277800f
commit d5d5595ab1
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plat/hisilicon/hikey/hikey_security.c
View File

@ -71,10 +71,12 @@ static void sec_protect(uint32_t region_base, uint32_t region_size,
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)));
/* ensure secure region number is between 1-15 */
assert(region > 0 && region < 16);
/* ensure secure region size is a power of 2 >= 64KB */
assert(IS_POWER_OF_TWO(region_size) && region_size >= 0x10000);
/* ensure secure region address 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);