2023-07-05 15:58:32

by Patrick Delaunay

Subject: [PATCH 0/2] ARM: dts: sm32mp: remove shmem for scmi-optee

Remove the optional shared memory in SYSRAM and
use the OP-TEE native shared memory for SCMI-OPTEE to
- avoid boot issue with the latest OP-TEE version 3.22.0 for STM32MP15 SoC,
when CFG_STM32MP1_SCMI_SHM_SYSRAM is disabled
- prepare migration with the same configuration for STM32MP13 SoC



Patrick Delaunay (2):
ARM: dts: sm32mp: remove shmem for scmi-optee on stm32mp15
ARM: dts: sm32mp: remove shmem for scmi-optee on stm32mp13

arch/arm/boot/dts/st/stm32mp131.dtsi | 14 --------------
arch/arm/boot/dts/st/stm32mp15-scmi.dtsi | 16 ----------------
2 files changed, 30 deletions(-)

--
2.25.1

2023-07-05 16:16:28

by Patrick Delaunay

Subject: [PATCH 1/2] ARM: dts: sm32mp: remove shmem for scmi-optee on stm32mp15

Since the OP-TEE commit "plat-stm32mp1: scmi_server: default use OP-TEE
shared memory", integrated in OP-TEE 3.22.0-rc1, the default configuration
for STM32MP15x SoCs changes and CFG_STM32MP1_SCMI_SHM_SYSRAM is disabled
by default and the OP-TEE SMCI server uses OP-TEE native shared memory
registered by clients.

To be compatible with this configuration and the next OP-TEE versions,
this patch removes in the STM32MP15 SCMI device tree the SHMEM used by
OP-TEE SCMI and the associated reserved memory in the last 4KByte page
of SRAM.

Fixes: ea3414e1249e ("ARM: dts: stm32: move SCMI related nodes in a dedicated file for stm32mp15")
Signed-off-by: Patrick Delaunay <[email protected]>
---

arch/arm/boot/dts/st/stm32mp15-scmi.dtsi | 16 ----------------
1 file changed, 16 deletions(-)

diff --git a/arch/arm/boot/dts/st/stm32mp15-scmi.dtsi b/arch/arm/boot/dts/st/stm32mp15-scmi.dtsi
index 543f24c2f4f6..ad2584213d99 100644
--- a/arch/arm/boot/dts/st/stm32mp15-scmi.dtsi
+++ b/arch/arm/boot/dts/st/stm32mp15-scmi.dtsi
@@ -16,7 +16,6 @@ scmi: scmi {
#address-cells = <1>;
#size-cells = <0>;
linaro,optee-channel-id = <0>;
- shmem = <&scmi_shm>;

scmi_clk: protocol@14 {
reg = <0x14>;
@@ -60,21 +59,6 @@ scmi_usb33: usb33@2 {
};
};
};
-
- soc {
- scmi_sram: sram@2ffff000 {
- compatible = "mmio-sram";
- reg = <0x2ffff000 0x1000>;
- #address-cells = <1>;
- #size-cells = <1>;
- ranges = <0 0x2ffff000 0x1000>;
-
- scmi_shm: scmi-sram@0 {
- compatible = "arm,scmi-shmem";
- reg = <0 0x80>;
- };
- };
- };
};

&reg11 {
--
2.25.1

2023-07-10 15:37:55

by Alexandre TORGUE

Subject: Re: [PATCH 0/2] ARM: dts: sm32mp: remove shmem for scmi-optee

On 7/5/23 17:44, Patrick Delaunay wrote:
>
> Remove the optional shared memory in SYSRAM and
> use the OP-TEE native shared memory for SCMI-OPTEE to
> - avoid boot issue with the latest OP-TEE version 3.22.0 for STM32MP15 SoC,
> when CFG_STM32MP1_SCMI_SHM_SYSRAM is disabled
> - prepare migration with the same configuration for STM32MP13 SoC
>
>
>
> Patrick Delaunay (2):
> ARM: dts: sm32mp: remove shmem for scmi-optee on stm32mp15
> ARM: dts: sm32mp: remove shmem for scmi-optee on stm32mp13
>
> arch/arm/boot/dts/st/stm32mp131.dtsi | 14 --------------
> arch/arm/boot/dts/st/stm32mp15-scmi.dtsi | 16 ----------------
> 2 files changed, 30 deletions(-)
>

Applied to stm32-next. Will be send for fixes in this v6.5 cycle.

Thanks
Alex