[PATCH] ARM: dts: stm32mp: alignment with v6.0-rc3

[Patrice CHOTARD]

Hi Patrick

On 9/21/22 09:53, Patrick DELAUNAY wrote:
> Hi,
> 
> On 9/7/22 13:42, Patrick Delaunay wrote:
>> Device tree alignment with Linux kernel v6.0-rc3:
>> - ARM: dts: stm32: add support for USB2514B onboard hub on stm32mp15xx-dkx
>> - ARM: dts: stm32: Add alternate pinmux for RCC pin
>> - ARM: dts: stm32: Add alternate pinmux for DCMI pins
>> - ARM: dts: stm32: Add alternate pinmux for SPI2 pins
>> - ARM: dts: stm32: Fix SPI2 pinmux pin comments on stm32mp15
>> - ARM: dts: stm32: add optee reserved memory on stm32mp135f-dk
>> - ARM: dts: stm32: enable optee firmware and SCMI support on STM32MP13
>> - ARM: dts: stm32: remove the IPCC "wakeup" IRQ on stm32mp151
>>
>> Signed-off-by: Patrick Delaunay <patrick.delaunay at foss.st.com>
>> ---
>>
>>   arch/arm/dts/stm32mp13-u-boot.dtsi  | 10 +++--
>>   arch/arm/dts/stm32mp131.dtsi        | 28 ++++++-------
>>   arch/arm/dts/stm32mp135f-dk.dts     |  4 +-
>>   arch/arm/dts/stm32mp15-pinctrl.dtsi | 64 ++++++++++++++++++++++++++---
>>   arch/arm/dts/stm32mp151.dtsi        |  7 ++--
>>   arch/arm/dts/stm32mp15xx-dkx.dtsi   |  8 ++++
>>   6 files changed, 91 insertions(+), 30 deletions(-)
>>
> 
> ...
> 
> For information this patch cause a trace during boot for a miss alignment of the size of the
> 
> reserved memory for OP-TEE in the kernel device tree(now 0x3000000 to prepare the secure UI support)
> 
> and the node added dynamically by OP-TEE in master branch (0x2000000), with :
> 
> 
>> diff --git a/arch/arm/dts/stm32mp135f-dk.dts b/arch/arm/dts/stm32mp135f-dk.dts
>> index f436ffab998..e6b8ffd332c 100644
>> --- a/arch/arm/dts/stm32mp135f-dk.dts
>> +++ b/arch/arm/dts/stm32mp135f-dk.dts
>> @@ -31,8 +31,8 @@
>>           #size-cells = <1>;
>>           ranges;
>>   -        optee at de000000 {
>> -            reg = <0xde000000 0x2000000>;
>> +        optee at dd000000 {
>> +            reg = <0xdd000000 0x3000000>;
>>               no-map;
>>           };
>>       };
> 
> ...
> 
> 
> These 2 different memory nodes in U-Boot DT cause overlap and the 2 ERROR traces from lmb:
> 
> reserving fdt memory region failed (addr=dd000000 size=3000000 flags=4)
> 
> ----------------------------------------------------------------------------
> U-Boot 2022.10-rc4-00011-g35133ee9ca0 (Sep 07 2022 - 14:06:52 +0200)
> 
> CPU: STM32MP135C Rev.Z
> Model: STMicroelectronics STM32MP135F-DK Discovery Board
> Board: stm32mp1 in trusted mode (st,stm32mp135f-dk)
> DRAM:  ERROR: reserving fdt memory region failed (addr=dd000000 size=3000000 flags=4)
> 512 MiB
> ERROR: reserving fdt memory region failed (addr=dd000000 size=3000000 flags=4)
> Core:  53 devices, 23 uclasses, devicetree: board
> MMC:   STM32 SD/MMC: 0
> Loading Environment from MMC... OK
> In:    serial at 40010000
> Out:   serial at 40010000
> Err:   serial at 40010000
> Net:   No ethernet found.
> Hit any key to stop autoboot:  0
> 
> ------------------------------------------------------------------------
> 
> The LMB don't generate error when 2 regions are identical (same address and size).
> 
> 
> A pending OP-TEE patch allow to avoid the U-Boot device tee modification and remove this trace:
> 
> https://github.com/OP-TEE/optee_os/pull/5527
> 
> 
> Regards
> 
> Patrick
> 
> 
Reviewed-by: Patrice Chotard <patrice.chotard at foss.st.com>

Thanks
Patrice