Add Remoteproc Support for TI's J722S SoCs
Subsystems (2)
v5 cover Add Remoteproc Support for TI's J722S SoCs
Hello All,
The K3 J722S SoCs have one single-core Arm Cortex-R5F processor in each of the WAKEUP, MCU and MAIN voltage domain, and two C71x DSP subsystems in MAIN voltage domain. Thus, this series adds the DT Nodes for the remote processors to add support for IPC.
This series also enables IPC on the J722S-EVM platform based on the above SoC by adding the mailbox instances, shared memory carveouts and reserving the conflicting timer nodes (as they are used by remoteproc firmware).
v5: Changelog:
- Collected Reviewed-by tags from Udit and Andrew given in v4 version of patch ("arm64: dts: ti: k3-j722s-main: Add R5F and C7x remote processor nodes")
* Udit
1) Updated commit message to correctly reflect the host core name (A53 not A72) in patch "arm64: dts: ti: k3-j722s-evm: Enable Inter-Processor Communication"
2) Updated mbox DT node label and name to "mbox_wkup_r5_0" from "mbox_r5_0" for clarity in patch "arm64: dts: ti: k3-j722s-evm: Enable Inter-Processor Communication"
Link to v4:
https://lore.kernel.org/all/[email protected]/
v4: Changelog:
* Nishanth:
1) Fixed DT node properties order to put standard properties before vendor specific properties in patch "arm64: dts: ti: k3-j722s-main: Add R5F and C7x remote processor nodes"
2) Put "status" property at the end in extended DT nodes and preceded child nodes with a single blank line wherever applicable in patch "arm64: dts: ti: k3-j722s-evm: Enable Inter-Processor Communication" following kernel DTS coding style.
Link to v3:
https://lore.kernel.org/all/[email protected]/
v3: Changelog:
1) Reserved conflicting Timer Nodes in k3-j722s-evm.dts file to avoid remotecore boot failures.
Link to v2:
https://lore.kernel.org/all/[email protected]/
v2: Changelog:
1) Addressed Andrew's comments to refactor remotecore nodes into k3-j722s-main.dtsi file.
2) Squashed Patch 2 and 3 from V1 into Patch 2 in V2 as they were doing the same logical thing.
3) The DTBs check warnings from V1 are automatically fixed after a dt-binding patch[0] was merged in linux-next.
Link to v1:
https://lore.kernel.org/all/[email protected]/
[0]: https://lore.kernel.org/all/[email protected]/
Apurva Nandan (2):
arm64: dts: ti: k3-j722s-main: Add R5F and C7x remote processor nodes
arm64: dts: ti: k3-j722s-evm: Enable Inter-Processor Communication
arch/arm64/boot/dts/ti/k3-j722s-evm.dts | 157 ++++++++++++++++++++++ arch/arm64/boot/dts/ti/k3-j722s-main.dtsi | 61 +++++++++ 2 files changed, 218 insertions(+)
Signature · 1 line
2.34.1
PATCH v5 1/2 arm64: dts: ti: k3-j722s-main: Add R5F and C7x remote processor nodes
From: Apurva Nandan <[email protected]>
The K3 J722S SoCs have one single-core Arm Cortex-R5F processor in each of the WAKEUP, MCU and MAIN voltage domain, and two C71x DSP subsystems in MAIN voltage domain. Add the DT nodes to support Inter-Processor Communication.
---
v5: Changelog:
1) Collected Reviewed-by tags from Udit and Andrew given in v4 revision of this patch.
Link to v4:
https://lore.kernel.org/all/[email protected]/
v4: Changelog:
1) Put standard properties (resets, firmware-name) before vendor specific properties in added DT Nodes. (Nishanth)
Link to v3:
https://lore.kernel.org/all/[email protected]/
v3: Changelog:
1) None to this patch.
Link to v2:
https://lore.kernel.org/all/[email protected]/
v2: Changelog:
1) Refactored changes from k3-j722s.dtsi to k3-j722s-main.dtsi. (Andrew)
Link to v1:
https://lore.kernel.org/all/[email protected]/
arch/arm64/boot/dts/ti/k3-j722s-main.dtsi | 61 +++++++++++++++++++++++ 1 file changed, 61 insertions(+)
arch/arm64/boot/dts/ti/k3-j722s-main.dtsi +61 -0
@@ -153,6 +153,67 @@ usb1: usb@31200000{ dr_mode = "otg"; }; }; + + main_r5fss0: r5fss@78400000 { + compatible = "ti,am62-r5fss"; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x78400000 0x00 0x78400000 0x8000>, + <0x78500000 0x00 0x78500000 0x8000>; + power-domains = <&k3_pds 261 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; + + main_r5fss0_core0: r5f@78400000 { + compatible = "ti,am62-r5f"; + reg = <0x78400000 0x00008000>, + <0x78500000 0x00008000>; + reg-names = "atcm", "btcm"; + resets = <&k3_reset 262 1>; + firmware-name = "j722s-main-r5f0_0-fw"; + ti,sci = <&dmsc>; + ti,sci-dev-id = <262>; + ti,sci-proc-ids = <0x04 0xff>; + ti,atcm-enable = <1>; + ti,btcm-enable = <1>; + ti,loczrama = <1>; + }; + }; + + c7x_0: dsp@7e000000 { + compatible = "ti,am62a-c7xv-dsp"; + reg = <0x00 0x7e000000 0x00 0x00200000>; + reg-names = "l2sram"; + resets = <&k3_reset 208 1>; + firmware-name = "j722s-c71_0-fw"; + ti,sci = <&dmsc>; + ti,sci-dev-id = <208>; + ti,sci-proc-ids = <0x30 0xff>; + status = "disabled"; + }; + + c7x_1: dsp@7e200000 { + compatible = "ti,am62a-c7xv-dsp"; + reg = <0x00 0x7e200000 0x00 0x00200000>; + reg-names = "l2sram"; + resets = <&k3_reset 268 1>; + firmware-name = "j722s-c71_1-fw"; + ti,sci = <&dmsc>; + ti,sci-dev-id = <268>; + ti,sci-proc-ids = <0x31 0xff>; + status = "disabled"; + }; +}; + +/* MCU domain overrides */ + +&mcu_r5fss0_core0 { + firmware-name = "j722s-mcu-r5f0_0-fw"; +}; + +/* Wakeup domain overrides */ + +&wkup_r5fss0_core0 { + firmware-name = "j722s-wkup-r5f0_0-fw"; }; &main_conf {
Signature · 1 line
2.34.1
PATCH v5 2/2 arm64: dts: ti: k3-j722s-evm: Enable Inter-Processor Communication
In reply to Beleswar PadhiFrom: Apurva Nandan <[email protected]>
The K3 J722S-EVM platform is based on the J722S SoC which has one single-core Arm Cortex-R5F processor in each of the WAKEUP, MCU and MAIN voltage domain, and two C71x DSP subsystems in MAIN voltage domain.
The Inter-Processor communication between the A53 cores and these R5F and DSP remote cores is achieved through shared memory and Mailboxes. Thus, add the memory carveouts and enable the mailbox clusters required for communication.
Also, The remoteproc firmware like of R5F and DSPs in the MAIN voltage domain use timers. Therefore, change the status of the timer nodes to "reserved" to avoid any clash during booting of remotecores. Usage is described as below:
+===================+=============+ | Remoteproc Node | Timer Node | +===================+=============+ | main_r5fss0_core0 | main_timer0 | +-------------------+-------------+ | c7x_0 | main_timer1 | +-------------------+-------------+ | c7x_1 | main_timer2 | +-------------------+-------------+
---
v5: Changelog:
1) Updated commit message to correctly reflect the host core name (A53 not A72).
2) Updated mbox DT node label and name to "mbox_wkup_r5_0" from "mbox_r5_0" for clarity.
Link to v4:
https://lore.kernel.org/all/[email protected]/
v4: Changelog:
1) Moved "status" property to the end in all the extended DT nodes added in this patch.
2) Preceded child-nodes by a single blank line in the extended DT nodes added in this patch.
Link to v3:
https://lore.kernel.org/all/[email protected]/
v3: Changelog:
1) Reserved conflicting timer nodes with remoteproc firmware (reflected the same in commit message).
2) Simplified $subject to clarify that this patch enables IPC and transferred the details into commit message.
Link to v2:
https://lore.kernel.org/all/[email protected]/
v2: Changelog:
1) Squashed Patch 2 and 3 from V1 into Patch 2 in V2 as they were doing the same logical thing.
Links to v1:
https://lore.kernel.org/all/[email protected]/
https://lore.kernel.org/all/[email protected]/
arch/arm64/boot/dts/ti/k3-j722s-evm.dts | 157 ++++++++++++++++++++++++ 1 file changed, 157 insertions(+)
arch/arm64/boot/dts/ti/k3-j722s-evm.dts +157 -0
@@ -52,12 +52,71 @@ secure_ddr: optee@9e800000 { no-map; }; + wkup_r5fss0_core0_dma_memory_region: r5f-dma-memory@a0000000 { + compatible = "shared-dma-pool"; + reg = <0x00 0xa0000000 0x00 0x100000>; + no-map; + }; + wkup_r5fss0_core0_memory_region: r5f-memory@a0100000 { compatible = "shared-dma-pool"; reg = <0x00 0xa0100000 0x00 0xf00000>; no-map; }; + mcu_r5fss0_core0_dma_memory_region: mcu-r5fss-dma-memory-region@a1000000 { + compatible = "shared-dma-pool"; + reg = <0x00 0xa1000000 0x00 0x100000>; + no-map; + }; + + mcu_r5fss0_core0_memory_region: mcu-r5fss-memory-region@a1100000 { + compatible = "shared-dma-pool"; + reg = <0x00 0xa1100000 0x00 0xf00000>; + no-map; + }; + + main_r5fss0_core0_dma_memory_region: main-r5fss-dma-memory-region@a2000000 { + compatible = "shared-dma-pool"; + reg = <0x00 0xa2000000 0x00 0x100000>; + no-map; + }; + + main_r5fss0_core0_memory_region: main-r5fss-memory-region@a2100000 { + compatible = "shared-dma-pool"; + reg = <0x00 0xa2100000 0x00 0xf00000>; + no-map; + }; + + c7x_0_dma_memory_region: c7x-dma-memory@a3000000 { + compatible = "shared-dma-pool"; + reg = <0x00 0xa3000000 0x00 0x100000>; + no-map; + }; + + c7x_0_memory_region: c7x-memory@a3100000 { + compatible = "shared-dma-pool"; + reg = <0x00 0xa3100000 0x00 0xf00000>; + no-map; + }; + + c7x_1_dma_memory_region: c7x-dma-memory@a4000000 { + compatible = "shared-dma-pool"; + reg = <0x00 0xa4000000 0x00 0x100000>; + no-map; + }; + + c7x_1_memory_region: c7x-memory@a4100000 { + compatible = "shared-dma-pool"; + reg = <0x00 0xa4100000 0x00 0xf00000>; + no-map; + }; + + rtos_ipc_memory_region: ipc-memories@a5000000 { + reg = <0x00 0xa5000000 0x00 0x1c00000>; + alignment = <0x1000>; + no-map; + }; }; vmain_pd: regulator-0 {
@@ -558,6 +617,104 @@ &sdhci1 { bootph-all; }; +&mailbox0_cluster0 { + status = "okay"; + + mbox_wkup_r5_0: mbox-wkup-r5-0 { + ti,mbox-rx = <0 0 0>; + ti,mbox-tx = <1 0 0>; + }; +}; + +&mailbox0_cluster1 { + status = "okay"; + + mbox_mcu_r5_0: mbox-mcu-r5-0 { + ti,mbox-rx = <0 0 0>; + ti,mbox-tx = <1 0 0>; + }; +}; + +&mailbox0_cluster2 { + status = "okay"; + + mbox_c7x_0: mbox-c7x-0 { + ti,mbox-rx = <0 0 0>; + ti,mbox-tx = <1 0 0>; + }; +}; + +&mailbox0_cluster3 { + status = "okay"; + + mbox_main_r5_0: mbox-main-r5-0 { + ti,mbox-rx = <0 0 0>; + ti,mbox-tx = <1 0 0>; + }; + + mbox_c7x_1: mbox-c7x-1 { + ti,mbox-rx = <2 0 0>; + ti,mbox-tx = <3 0 0>; + }; +}; + +/* Timers are used by Remoteproc firmware */ +&main_timer0 { + status = "reserved"; +}; + +&main_timer1 { + status = "reserved"; +}; + +&main_timer2 { + status = "reserved"; +}; + +&wkup_r5fss0 { + status = "okay"; +}; + +&wkup_r5fss0_core0 { + mboxes = <&mailbox0_cluster0 &mbox_wkup_r5_0>; + memory-region = <&wkup_r5fss0_core0_dma_memory_region>, + <&wkup_r5fss0_core0_memory_region>; +}; + +&mcu_r5fss0 { + status = "okay"; +}; + +&mcu_r5fss0_core0 { + mboxes = <&mailbox0_cluster1 &mbox_mcu_r5_0>; + memory-region = <&mcu_r5fss0_core0_dma_memory_region>, + <&mcu_r5fss0_core0_memory_region>; +}; + +&main_r5fss0 { + status = "okay"; +}; + +&main_r5fss0_core0 { + mboxes = <&mailbox0_cluster3 &mbox_main_r5_0>; + memory-region = <&main_r5fss0_core0_dma_memory_region>, + <&main_r5fss0_core0_memory_region>; +}; + +&c7x_0 { + mboxes = <&mailbox0_cluster2 &mbox_c7x_0>; + memory-region = <&c7x_0_dma_memory_region>, + <&c7x_0_memory_region>; + status = "okay"; +}; + +&c7x_1 { + mboxes = <&mailbox0_cluster3 &mbox_c7x_1>; + memory-region = <&c7x_1_dma_memory_region>, + <&c7x_1_memory_region>; + status = "okay"; +}; + &serdes_ln_ctrl { idle-states = <J722S_SERDES0_LANE0_USB>, <J722S_SERDES1_LANE0_PCIE0_LANE0>;
Signature · 1 line
2.34.1
Re: [PATCH v5 2/2] arm64: dts: ti: k3-j722s-evm: Enable Inter-Processor Communication
Quoted 16 lines · Beleswar Padhi
From: Apurva Nandan <[email protected]>
The K3 J722S-EVM platform is based on the J722S SoC which has one single-core Arm Cortex-R5F processor in each of the WAKEUP, MCU and MAIN voltage domain, and two C71x DSP subsystems in MAIN voltage domain.
The Inter-Processor communication between the A53 cores and these R5F and DSP remote cores is achieved through shared memory and Mailboxes. Thus, add the memory carveouts and enable the mailbox clusters required for communication.
Also, The remoteproc firmware like of R5F and DSPs in the MAIN voltage domain use timers. Therefore, change the status of the timer nodes to "reserved" to avoid any clash during booting of remotecores. Usage is described as below:
Quoted 9 lines
+===================+=============+ | Remoteproc Node | Timer Node | +===================+=============+ | main_r5fss0_core0 | main_timer0 | +-------------------+-------------+ | c7x_0 | main_timer1 | +-------------------+-------------+ | c7x_1 | main_timer2 | +-------------------+-------------+
Quoted 11 lines
Signed-off-by Apurva Nandan <[email protected]>[ Enabled mailbox instances and Reserved timer nodes ]Signed-off-by Beleswar Padhi <[email protected]>---
v5: Changelog:
1) Updated commit message to correctly reflect the host core name (A53 not A72).
2) Updated mbox DT node label and name to "mbox_wkup_r5_0" from "mbox_r5_0" for clarity.[..]
Hi Beleswar Padhi,
Quoted 11 lines · Beleswar Padhi
The K3 J722S SoCs have one single-core Arm Cortex-R5F processor in each of the WAKEUP, MCU and MAIN voltage domain, and two C71x DSP subsystems in MAIN voltage domain. Thus, this series adds the DT Nodes for the remote processors to add support for IPC.
This series also enables IPC on the J722S-EVM platform based on the above SoC by adding the mailbox instances, shared memory carveouts and reserving the conflicting timer nodes (as they are used by remoteproc firmware).
[...]
I have applied the following to branch ti-k3-dts-next on [1]. Thank you!
[1/2] arm64: dts: ti: k3-j722s-main: Add R5F and C7x remote processor nodes
commit: 05b1653c4fc148189743e4b3cbef798e49db61f0
[2/2] arm64: dts: ti: k3-j722s-evm: Enable Inter-Processor Communication
commit: 5b035d14a508efd065895607ae7a6f913b26fef8All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent up the chain during the next merge window (or sooner if it is a relevant bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
[1] https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D