OPTEE-OS-STM32MP: update to 3.12.0-stm32mp-r2

Change-Id: I1d89f5a83206c113324d6b0805a0ea80fdb0d586
Signed-off-by: Romuald JEANNE <romuald.jeanne@st.com>

recipes-security/optee/optee-os/0002-3.12.0-stm32mp-r1.1-rc1.patch

@@ -0,0 +1,61 @@
+From 4a99b2016fd0a2e207395da314a3c903c2e65c08 Mon Sep 17 00:00:00 2001
+From: Romuald JEANNE <romuald.jeanne@st.com>
+Date: Wed, 2 Jun 2021 16:53:20 +0200
+Subject: [PATCH 2/3] 3.12.0-stm32mp-r1.1-rc1
+
+---
+ core/arch/arm/plat-stm32mp1/remoteproc_pta.c | 9 +++------
+ core/drivers/clk/clk-stm32mp15.c             | 2 +-
+ core/drivers/stm32_bsec.c                    | 2 +-
+ 3 files changed, 5 insertions(+), 8 deletions(-)
+
+diff --git a/core/arch/arm/plat-stm32mp1/remoteproc_pta.c b/core/arch/arm/plat-stm32mp1/remoteproc_pta.c
+index 27b0dfa07..8f3360122 100644
+--- a/core/arch/arm/plat-stm32mp1/remoteproc_pta.c
++++ b/core/arch/arm/plat-stm32mp1/remoteproc_pta.c
+@@ -492,13 +492,10 @@ static TEE_Result
+ 			       TEE_Param params[TEE_NUM_PARAMS] __unused,
+ 			       void **sess_ctx __unused)
+ {
+-	struct tee_ta_session *s = tee_ta_get_calling_session();
++	struct ts_session *s = ts_get_calling_session();
+ 
+-	/* Check that we're called from a user TA */
+-	if (!s)
+-		return TEE_ERROR_ACCESS_DENIED;
+-
+-	if (!is_user_ta_ctx(s->ctx))
++	/* TODO: check that we're called the remove proc TA (check UUID) */
++	if (!s || !is_user_ta_ctx(s->ctx))
+ 		return TEE_ERROR_ACCESS_DENIED;
+ 
+ 	return TEE_SUCCESS;
+diff --git a/core/drivers/clk/clk-stm32mp15.c b/core/drivers/clk/clk-stm32mp15.c
+index 794fd5e75..6bbab8902 100644
+--- a/core/drivers/clk/clk-stm32mp15.c
++++ b/core/drivers/clk/clk-stm32mp15.c
+@@ -962,7 +962,7 @@ static unsigned long __clk_get_parent_rate(enum stm32mp1_parent_id p)
+ 	unsigned long clock = 0;
+ 	vaddr_t rcc_base = stm32_rcc_base();
+ 
+-	switch (p) {
++	switch ((unsigned int)p) {
+ 	case _CK_MPU:
+ 	/* MPU sub system */
+ 		reg = io_read32(rcc_base + RCC_MPCKSELR);
+diff --git a/core/drivers/stm32_bsec.c b/core/drivers/stm32_bsec.c
+index 7d389a061..a8eba5f7d 100644
+--- a/core/drivers/stm32_bsec.c
++++ b/core/drivers/stm32_bsec.c
+@@ -646,7 +646,7 @@ static void bsec_dt_otp_nsec_access(void *fdt, int bsec_node)
+ 
+ 		size = length / sizeof(uint32_t);
+ 
+-		if (otp_id + size > STM32MP1_OTP_MAX_ID)
++		if (otp_id + size > OTP_MAX_SIZE)
+ 			panic("OTP range oversized");
+ 
+ 		for (i = otp_id; i < otp_id + size; i++)
+-- 
+2.17.1
+