Commit d5d5595a authored by Victor Chong's avatar Victor Chong
Browse files

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: default avatarVictor Chong <victor.chong@linaro.org>
Tested-by: default avatarVictor Chong <victor.chong@linaro.org>
parent 5df27780
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment