| Message ID | 20210726162213.28719-1-s-anna@ti.com |
|---|---|
| State | Accepted |
| Commit | 31b3d7a01851552ca1b4e962db5922db66d3b883 |
| Delegated to: | Lokesh Vutla |
| Headers | show |
| Series | arm: dts: k3-am65: Fix up MCU R5FSS cluster mode back to Split-mode | expand |
On Mon, 26 Jul 2021 11:22:13 -0500, Suman Anna wrote: > The default U-Boot environment variables and design are all set up to > have the MCU R5FSS cluster to be in Split-mode. This is the setting > in v2021.01 U-Boot and the dt nodes are synched with the kernel binding > property names in commit 468ec2f3ef8f ("remoteproc: k3_r5: Sync to > upstreamed kernel DT property names") merged in v2021.04-rc2. > > The mode for the cluster got switched back to LockStep mode by mistake > in commit e49787634312 ("arm: dts: k3-am65: Sync Linux v5.11-rc6 dts > into U-Boot") also in v2021.04-rc2. This throws the following warning > messages when early-booting the cores using default env variables, > > [...] Applied to https://source.denx.de/u-boot/custodians/u-boot-ti.git for-rc, thanks! [1/1] arm: dts: k3-am65: Fix up MCU R5FSS cluster mode back to Split-mode https://source.denx.de/u-boot/custodians/u-boot-ti/-/commit/31b3d7a018 -- Thanks and Regards, Lokesh
diff --git a/arch/arm/dts/k3-am654-base-board-u-boot.dtsi b/arch/arm/dts/k3-am654-base-board-u-boot.dtsi index df850a2edb6e..0c1305df7e45 100644 --- a/arch/arm/dts/k3-am654-base-board-u-boot.dtsi +++ b/arch/arm/dts/k3-am654-base-board-u-boot.dtsi @@ -76,3 +76,7 @@ &tx_pru2_1 { remoteproc-name = "tx_pru2_1"; }; + +&mcu_r5fss0 { + ti,cluster-mode = <0>; +};
The default U-Boot environment variables and design are all set up to have the MCU R5FSS cluster to be in Split-mode. This is the setting in v2021.01 U-Boot and the dt nodes are synched with the kernel binding property names in commit 468ec2f3ef8f ("remoteproc: k3_r5: Sync to upstreamed kernel DT property names") merged in v2021.04-rc2. The mode for the cluster got switched back to LockStep mode by mistake in commit e49787634312 ("arm: dts: k3-am65: Sync Linux v5.11-rc6 dts into U-Boot") also in v2021.04-rc2. This throws the following warning messages when early-booting the cores using default env variables, k3_r5f_rproc r5f@41400000: Invalid op: Trying to start secondary core 2 in lockstep mode Load Remote Processor 1 with data@addr=0x82000000 65268 bytes: Failed! Fix this by switching back the cluster to the expected Split-mode. Make this mode change in the u-boot specific dtsi file to avoid such sync overrides in the future until the kernel dts is also switched to Split-mode by default. Fixes: e49787634312 ("arm: dts: k3-am65: Sync Linux v5.11-rc6 dts into U-Boot") Signed-off-by: Suman Anna <s-anna@ti.com> --- arch/arm/dts/k3-am654-base-board-u-boot.dtsi | 4 ++++ 1 file changed, 4 insertions(+)