diff options
| author | Victor Chong <victor.chong@linaro.org> | 2018-01-27 21:36:12 +0900 |
|---|---|---|
| committer | Victor Chong <victor.chong@linaro.org> | 2018-01-28 00:07:07 +0900 |
| commit | d5d5595ab16d54d779108922d3b74f24c94c7eb7 (patch) | |
| tree | 7470688a74c37c47d2c3af11900c7b91cc361876 /plat/hisilicon | |
| parent | 5df277800f89754a3ee103d944ddb1490bf1b36d (diff) | |
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>
Diffstat (limited to 'plat/hisilicon')
| -rw-r--r-- | plat/hisilicon/hikey/hikey_security.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/plat/hisilicon/hikey/hikey_security.c b/plat/hisilicon/hikey/hikey_security.c index be8c39f4..863ad2b4 100644 --- a/plat/hisilicon/hikey/hikey_security.c +++ b/plat/hisilicon/hikey/hikey_security.c @@ -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); |