feat(plat/arm): add GPT initialization code for Arm platforms
When RME is enabled, during configuration of the TrustZone controller,
Root regions are initially configured as Secure regions, and Realm
regions as Non-secure regions. Then later these regions are configured
as Root and Realm regions respectively in the GPT. According to the RME
architecture reference manual, Root firmware must ensure that Granule
Protection Check is enabled before enabling any stage of translation.
Therefore initializations are done as follows when RME is enabled :
Initialize/enable the TrustZone controller (plat_arm_security_setup) -->
Initialize/enable GPC (arm_bl2_plat_gpt_setup) -->
enable MMU (enable_mmu_el3)
Signed-off-by: Zelalem Aweke <zelalem.aweke@arm.com>
Change-Id: I91094e8259079437bee02de1f65edb9ad51e43cf
diff --git a/plat/arm/common/arm_bl31_setup.c b/plat/arm/common/arm_bl31_setup.c
index d2bacd3..d760312 100644
--- a/plat/arm/common/arm_bl31_setup.c
+++ b/plat/arm/common/arm_bl31_setup.c
@@ -13,8 +13,10 @@
#include <drivers/console.h>
#include <lib/debugfs.h>
#include <lib/extensions/ras.h>
+#include <lib/gpt/gpt.h>
#include <lib/mmio.h>
#include <lib/xlat_tables/xlat_tables_compat.h>
+#include <plat/arm/common/arm_pas_def.h>
#include <plat/arm/common/plat_arm.h>
#include <plat/common/platform.h>
#include <platform_def.h>
@@ -229,6 +231,28 @@
*/
bl33_image_ep_info.args.arg0 = (u_register_t)ARM_DRAM1_BASE;
#endif
+
+#if ENABLE_RME
+ /*
+ * Initialise Granule Protection library and enable GPC
+ * for the primary processor. The tables were initialised
+ * in BL2, so there is no need to provide any PAS here.
+ */
+ gpt_init_params_t gpt_params = {
+ PLATFORM_PGS,
+ PLATFORM_PPS,
+ PLATFORM_L0GPTSZ,
+ NULL,
+ 0U,
+ ARM_L0_GPT_ADDR_BASE, ARM_L0_GPT_SIZE,
+ ARM_L1_GPT_ADDR_BASE, ARM_L1_GPT_SIZE
+ };
+
+ /* Initialise the global granule tables. */
+ if (gpt_init(&gpt_params) < 0) {
+ panic();
+ }
+#endif /* ENABLE_RME */
}
void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,