From: Masahiro Yamada Date: Thu, 1 Feb 2018 04:17:29 +0000 (+0900) Subject: misc_helpers: fix zero_normalmem() for BL2_AT_EL3 X-Git-Tag: baikal/aarch64/sdk5.9~2682^2 X-Git-Url: https://git.baikalelectronics.ru/?a=commitdiff_plain;h=79c7e72829115117d0cdca50c0e1a789623d8ee9;p=arm-tf.git misc_helpers: fix zero_normalmem() for BL2_AT_EL3 The assertion in zero_normalmem() fails for BL2_AT_EL3. This mode is executed in EL3, so it should check sctlr_el3 instead of sctlr_el1. Signed-off-by: Masahiro Yamada --- diff --git a/lib/aarch64/misc_helpers.S b/lib/aarch64/misc_helpers.S index 9dfe46a2f..3c64d3caa 100644 --- a/lib/aarch64/misc_helpers.S +++ b/lib/aarch64/misc_helpers.S @@ -198,7 +198,7 @@ func zeromem_dczva * Check for M bit (MMU enabled) of the current SCTLR_EL(1|3) * register value and panic if the MMU is disabled. */ -#if defined(IMAGE_BL1) || defined(IMAGE_BL31) +#if defined(IMAGE_BL1) || defined(IMAGE_BL31) || (defined(IMAGE_BL2) && BL2_AT_EL3) mrs tmp1, sctlr_el3 #else mrs tmp1, sctlr_el1