stm32mp1: add hypervisor mode for bl33

This patch allows to execute bl33 in hypervisor mode
if BL33_HYP compilation flag is defined.

Change-Id: Icd0de8e9a8180f2ca67952bd6b98f38712e52716
Signed-off-by: Ludovic Barre <ludovic.barre@st.com>
Signed-off-by: Sebastien Pasdeloup <sebastien.pasdeloup-ext@st.com>
Reviewed-on: https://gerrit.st.com/c/mpu/oe/st/tf-a/+/187471


Reviewed-by: CITOOLS <smet-aci-reviews@lists.codex.cro.st.com>
Reviewed-by: CIBUILD <smet-aci-builds@lists.codex.cro.st.com>
Reviewed-by: Yann GAUTIER <yann.gautier@st.com>
Tested-by: Yann GAUTIER <yann.gautier@st.com>

plat/st/stm32mp1/plat_bl2_mem_params_desc.c

@@ -116,7 +116,11 @@ static bl_mem_params_node_t bl2_mem_params_descs[] = {
 				      VERSION_2, entry_point_info_t,
 				      NON_SECURE | EXECUTABLE),
 
+#if BL33_HYP
+		.ep_info.spsr = SPSR_MODE32(MODE32_hyp, SPSR_T_ARM,
+#else
 		.ep_info.spsr = SPSR_MODE32(MODE32_svc, SPSR_T_ARM,
+#endif
 					    SPSR_E_LITTLE,
 					    DISABLE_ALL_EXCEPTIONS),
 

plat/st/stm32mp1/plat_bl2_stm32_mem_params_desc.c

@@ -87,7 +87,12 @@ static bl_mem_params_node_t bl2_mem_params_descs[] = {
 				      NON_SECURE | EXECUTABLE),
 
 		.ep_info.pc = PLAT_STM32MP_NS_IMAGE_OFFSET,
+
+#if BL33_HYP
+		.ep_info.spsr = SPSR_MODE32(MODE32_hyp, SPSR_T_ARM,
+#else
 		.ep_info.spsr = SPSR_MODE32(MODE32_svc, SPSR_T_ARM,
+#endif
 					    SPSR_E_LITTLE,
 					    DISABLE_ALL_EXCEPTIONS),
 

plat/st/stm32mp1/platform.mk

@@ -78,6 +78,9 @@ STM32MP_SPI_NOR		?=	0
 STM32MP_USB_PROGRAMMER	?=	0
 STM32MP_UART_PROGRAMMER	?=	0
 
+# Hypervisor mode
+BL33_HYP			?= 0
+
 # Device tree
 DTB_FILE_NAME		?=	stm32mp157c-ev1.dtb
 ifeq ($(STM32MP_USE_STM32IMAGE),1)
@@ -161,6 +164,7 @@ $(eval $(call assert_booleans,\
 		STM32MP_USE_STM32IMAGE \
 		STM32MP_DDR_DUAL_AXI_PORT \
 		STM32MP_SSP \
+		BL33_HYP \
 )))
 
 $(eval $(call assert_numerics,\
@@ -186,6 +190,7 @@ $(eval $(call add_defines,\
 		STM32MP_USE_STM32IMAGE \
 		STM32MP_DDR_DUAL_AXI_PORT \
 		STM32MP_SSP \
+		BL33_HYP \
 )))
 
 # Include paths and source files