From: Lucas Weaver <l-wea...@ti.com>
Confine the memory map changes into a separate rtos-memory-map.dts
which describes the common memory map for all RTOS remoteprocs.
vision-apps.dtbo uses this and also disables capture and display
related peripherals from Linux so that it can be used by RTOS.
edgeai-apps.dtbo expects these devices to be owned by linux, so
it uses the rtos-memory-map customization only.
Signed-off-by: Nikhil Devshatwar <nikhil...@ti.com>
[Xulin: picked from ti-processor-sdk-linux-adas-j721e-evm-10_00_00_08]
Signed-off-by: Xulin Sun <xulin....@windriver.com>
---
arch/arm64/boot/dts/ti/Makefile | 3 +
.../boot/dts/ti/k3-j721e-edgeai-apps.dtso | 11 +
.../boot/dts/ti/k3-j721e-rtos-memory-map.dtsi | 267 ++++++++++++++++++
.../boot/dts/ti/k3-j721e-vision-apps.dtso | 49 ++++
k3-j722s-rtos-memory-map.dtsi | 166 +++++++++++
5 files changed, 496 insertions(+)
create mode 100644 arch/arm64/boot/dts/ti/k3-j721e-edgeai-apps.dtso
create mode 100644 arch/arm64/boot/dts/ti/k3-j721e-rtos-memory-map.dtsi
create mode 100644 arch/arm64/boot/dts/ti/k3-j721e-vision-apps.dtso
create mode 100644 k3-j722s-rtos-memory-map.dtsi
diff --git a/arch/arm64/boot/dts/ti/Makefile b/arch/arm64/boot/dts/ti/Makefile
index 649b338fee0e..a55b395fe3e9 100644
--- a/arch/arm64/boot/dts/ti/Makefile
+++ b/arch/arm64/boot/dts/ti/Makefile
@@ -124,6 +124,8 @@ dtb-$(CONFIG_ARCH_K3) += k3-j721e-sk-csi2-ov5640.dtbo
dtb-$(CONFIG_ARCH_K3) += k3-j721e-sk-csi2-dual-imx219.dtbo
dtb-$(CONFIG_ARCH_K3) += k3-j721e-sk-fpdlink-fusion.dtbo
dtb-$(CONFIG_ARCH_K3) += k3-j721e-sk-rpi-hdr-ehrpwm.dtbo
+dtb-$(CONFIG_ARCH_K3) += k3-j721e-edgeai-apps.dtbo
+dtb-$(CONFIG_ARCH_K3) += k3-j721e-vision-apps.dtbo
# Boards with J721s2 SoC
dtb-$(CONFIG_ARCH_K3) += k3-am68-sk-base-board.dtb
@@ -357,6 +359,7 @@ dtb-$(CONFIG_ARCH_K3) += k3-v3link-imx219-0-0.dtbo \
k3-v3link-imx219-0-3.dtbo
# Enable support for device-tree overlays
+DTC_FLAGS_k3-j721e-evm-ethfw += -@
DTC_FLAGS_k3-am625-beagleplay += -@
DTC_FLAGS_k3-am625-sk += -@
DTC_FLAGS_k3-am62-lp-sk += -@
diff --git a/arch/arm64/boot/dts/ti/k3-j721e-edgeai-apps.dtso
b/arch/arm64/boot/dts/ti/k3-j721e-edgeai-apps.dtso
new file mode 100644
index 000000000000..adcd2ed6b987
--- /dev/null
+++ b/arch/arm64/boot/dts/ti/k3-j721e-edgeai-apps.dtso
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * edgeai-apps: device-tree overlay
+ *
+ * Copyright (C) 2019 - 2021 Texas Instruments Incorporated -
http://www.ti.com/
+ */
+
+/dts-v1/;
+/plugin/;
+
+#include "k3-j721e-rtos-memory-map.dtsi"
diff --git a/arch/arm64/boot/dts/ti/k3-j721e-rtos-memory-map.dtsi
b/arch/arm64/boot/dts/ti/k3-j721e-rtos-memory-map.dtsi
new file mode 100644
index 000000000000..a059ff6678c2
--- /dev/null
+++ b/arch/arm64/boot/dts/ti/k3-j721e-rtos-memory-map.dtsi
@@ -0,0 +1,267 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Vision-apps: device-tree overlay
+ *
+ * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/
+ */
+
+#include <dt-bindings/soc/ti,sci_pm_domain.h>
+
+&{/} {
+ dma_buf_phys {
+ compatible = "ti,dma-buf-phys";
+ };
+};
+
+&mcu_r5fss0_core0_memory_region {
+ status = "disabled";
+};
+
+&mcu_r5fss0_core0_dma_memory_region {
+ status = "disabled";
+};
+
+&mcu_r5fss0_core1_dma_memory_region {
+ status = "disabled";
+};
+
+&mcu_r5fss0_core1_memory_region {
+ status = "disabled";
+};
+
+&main_r5fss0_core0_dma_memory_region {
+ status = "disabled";
+};
+
+&main_r5fss0_core0_memory_region {
+ status = "disabled";
+};
+
+&main_r5fss0_core1_dma_memory_region {
+ status = "disabled";
+};
+
+&main_r5fss0_core1_memory_region {
+ status = "disabled";
+};
+
+&main_r5fss1_core0_dma_memory_region {
+ status = "disabled";
+};
+
+&main_r5fss1_core0_memory_region {
+ status = "disabled";
+};
+
+&main_r5fss1_core1_dma_memory_region {
+ status = "disabled";
+};
+
+&main_r5fss1_core1_memory_region {
+ status = "disabled";
+};
+
+&c66_0_dma_memory_region {
+ status = "disabled";
+};
+
+&c66_0_memory_region {
+ status = "disabled";
+};
+
+&c66_1_dma_memory_region {
+ status = "disabled";
+};
+
+&c66_1_memory_region {
+ status = "disabled";
+};
+
+&c71_0_dma_memory_region {
+ status = "disabled";
+};
+
+&c71_0_memory_region {
+ status = "disabled";
+};
+
+&rtos_ipc_memory_region {
+ status = "disabled";
+};
+
+&reserved_memory {
+ #address-cells = <2>;
+ #size-cells = <2>;
+
+ vision_apps_mcu_r5fss0_core0_dma_memory_region:
vision-apps-r5f-dma-memory@a0000000 {
+ compatible = "shared-dma-pool";
+ reg = <0x00 0xa0000000 0x00 0x00100000>;
+ no-map;
+ };
+ vision_apps_mcu_r5fss0_core0_memory_region:
vision-apps-r5f-memory@a0100000 {
+ compatible = "shared-dma-pool";
+ reg = <0x00 0xa0100000 0x00 0x00f00000>;
+ no-map;
+ };
+ vision_apps_mcu_r5fss0_core1_dma_memory_region:
vision-apps-r5f-dma-memory@a1000000 {
+ compatible = "shared-dma-pool";
+ reg = <0x00 0xa1000000 0x00 0x00100000>;
+ no-map;
+ };
+ vision_apps_mcu_r5fss0_core1_memory_region:
vision-apps-r5f-memory@a1100000 {
+ compatible = "shared-dma-pool";
+ reg = <0x00 0xa1100000 0x00 0x00f00000>;
+ no-map;
+ };
+ vision_apps_main_r5fss0_core0_dma_memory_region:
vision-apps-r5f-dma-memory@a2000000 {
+ compatible = "shared-dma-pool";
+ reg = <0x00 0xa2000000 0x00 0x00100000>;
+ no-map;
+ };
+ vision_apps_main_r5fss0_core0_memory_region:
vision-apps-r5f-memory@a2100000 {
+ compatible = "shared-dma-pool";
+ reg = <0x00 0xa2100000 0x00 0x01f00000>;
+ no-map;
+ };
+ vision_apps_main_r5fss0_core1_dma_memory_region:
vision-apps-r5f-dma-memory@a4000000 {
+ compatible = "shared-dma-pool";
+ reg = <0x00 0xa4000000 0x00 0x00100000>;
+ no-map;
+ };
+ vision_apps_main_r5fss0_core1_memory_region:
vision-apps-r5f-memory@a4100000 {
+ compatible = "shared-dma-pool";
+ reg = <0x00 0xa4100000 0x00 0x01f00000>;
+ no-map;
+ };
+ vision_apps_main_r5fss1_core0_dma_memory_region:
vision-apps-r5f-dma-memory@a6000000 {
+ compatible = "shared-dma-pool";
+ reg = <0x00 0xa6000000 0x00 0x00100000>;
+ no-map;
+ };
+ vision_apps_main_r5fss1_core0_memory_region:
vision-apps-r5f-memory@a6100000 {
+ compatible = "shared-dma-pool";
+ reg = <0x00 0xa6100000 0x00 0x00f00000>;
+ no-map;
+ };
+ vision_apps_main_r5fss1_core1_dma_memory_region:
vision-apps-r5f-dma-memory@a7000000 {
+ compatible = "shared-dma-pool";
+ reg = <0x00 0xa7000000 0x00 0x00100000>;
+ no-map;
+ };
+ vision_apps_main_r5fss1_core1_memory_region:
vision-apps-r5f-memory@a7100000 {
+ compatible = "shared-dma-pool";
+ reg = <0x00 0xa7100000 0x00 0x00f00000>;
+ no-map;
+ };
+ vision_apps_c66_1_dma_memory_region:
vision-apps-c66-dma-memory@a8000000 {
+ compatible = "shared-dma-pool";
+ reg = <0x00 0xa8000000 0x00 0x00100000>;
+ no-map;
+ };
+ vision_apps_c66_0_memory_region: vision-apps-c66-memory@a8100000 {
+ compatible = "shared-dma-pool";
+ reg = <0x00 0xa8100000 0x00 0x00f00000>;
+ no-map;
+ };
+ vision_apps_c66_0_dma_memory_region:
vision-apps-c66-dma-memory@a9000000 {
+ compatible = "shared-dma-pool";
+ reg = <0x00 0xa9000000 0x00 0x00100000>;
+ no-map;
+ };
+ vision_apps_c66_1_memory_region: vision-apps-c66-memory@a9100000 {
+ compatible = "shared-dma-pool";
+ reg = <0x00 0xa9100000 0x00 0x00f00000>;
+ no-map;
+ };
+ vision_apps_rtos_ipc_memory_region: vision-apps-rtos-ipc-memory-region {
+ reg = <0x00 0xaa000000 0x00 0x02000000>;
+ alignment = <0x1000>;
+ no-map;
+ };
+ vision_apps_memory_region: vision-apps-dma-memory@ac000000 {
+ compatible = "shared-dma-pool";
+ reg = <0x00 0xac000000 0x00 0x06000000>;
+ no-map;
+ };
+ vision_apps_c71_0_dma_memory_region:
vision-apps-c71-dma-memory@b2000000 {
+ compatible = "shared-dma-pool";
+ reg = <0x00 0xb2000000 0x00 0x00100000>;
+ no-map;
+ };
+ vision_apps_c71_0_memory_region: vision-apps-c71-memory@b2100000 {
+ compatible = "shared-dma-pool";
+ reg = <0x00 0xb2100000 0x00 0x05f00000>;
+ no-map;
+ };
+ vision_apps_shared_region: vision_apps_shared-memories {
+ compatible = "dma-heap-carveout";
+ reg = <0x00 0xb8000000 0x00 0x20000000>;
+ };
+ vision_apps_core_heaps_lo: vision-apps-core-heap-memory-lo@d8000000 {
+ compatible = "shared-dma-pool";
+ reg = <0x00 0xd8000000 0x00 0x0c000000>;
+ no-map;
+ };
+ vision_apps_main_r5fss0_core0_shared_memory_queue_region:
vision-apps-r5f-virtual-eth-queues@e4000000 {
+ compatible = "shared-dma-pool";
+ reg = <0x00 0xe4000000 0x00 0x00800000>;
+ no-map;
+ };
+ vision_apps_main_r5fss0_core0_shared_memory_bufpool_region:
vision-apps-r5f-virtual-eth-buffers@e4800000 {
+ compatible = "shared-dma-pool";
+ reg = <0x00 0xe4800000 0x00 0x01800000>;
+ no-map;
+ };
+ vision_apps_core_heaps_hi: vision-apps-core-heap-memory-hi@880000000 {
+ compatible = "shared-dma-pool";
+ reg = <0x08 0x80000000 0x00 0x27000000>;
+ no-map;
+ };
+};
+
+&mcu_r5fss0_core0 {
+ memory-region = <&vision_apps_mcu_r5fss0_core0_dma_memory_region>,
+ <&vision_apps_mcu_r5fss0_core0_memory_region>;
+};
+
+&mcu_r5fss0_core1 {
+ memory-region = <&vision_apps_mcu_r5fss0_core1_dma_memory_region>,
+ <&vision_apps_mcu_r5fss0_core1_memory_region>;
+};
+
+&main_r5fss0_core0 {
+ memory-region = <&vision_apps_main_r5fss0_core0_dma_memory_region>,
+ <&vision_apps_main_r5fss0_core0_memory_region>,
+
<&vision_apps_main_r5fss0_core0_shared_memory_queue_region>,
+
<&vision_apps_main_r5fss0_core0_shared_memory_bufpool_region>;
+};
+
+&main_r5fss0_core1 {
+ memory-region = <&vision_apps_main_r5fss0_core1_dma_memory_region>,
+ <&vision_apps_main_r5fss0_core1_memory_region>;
+};
+
+&main_r5fss1_core0 {
+ memory-region = <&vision_apps_main_r5fss1_core0_dma_memory_region>,
+ <&vision_apps_main_r5fss1_core0_memory_region>;
+};
+
+&main_r5fss1_core1 {
+ memory-region = <&vision_apps_main_r5fss1_core1_dma_memory_region>,
+ <&vision_apps_main_r5fss1_core1_memory_region>;
+};
+
+&c66_0 {
+ memory-region = <&vision_apps_c66_0_dma_memory_region>,
+ <&vision_apps_c66_0_memory_region>;
+};
+
+&c66_1 {
+ memory-region = <&vision_apps_c66_1_dma_memory_region>,
+ <&vision_apps_c66_1_memory_region>;
+};
+
+&c71_0 {
+ memory-region = <&vision_apps_c71_0_dma_memory_region>,
+ <&vision_apps_c71_0_memory_region>;
+};
diff --git a/arch/arm64/boot/dts/ti/k3-j721e-vision-apps.dtso
b/arch/arm64/boot/dts/ti/k3-j721e-vision-apps.dtso
new file mode 100644
index 000000000000..bcedbe6c6bdc
--- /dev/null
+++ b/arch/arm64/boot/dts/ti/k3-j721e-vision-apps.dtso
@@ -0,0 +1,49 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * vision-apps: device-tree overlay
+ *
+ * Copyright (C) 2019 - 2021 Texas Instruments Incorporated -
http://www.ti.com/
+ */
+
+/dts-v1/;
+/plugin/;
+
+#include <dt-bindings/mux/ti-serdes.h>
+
+&main_r5fss0_core0_shared_memory_queue_region {
+ status = "disabled";
+};
+
+&main_r5fss0_core0_shared_memory_bufpool_region {
+ status = "disabled";
+};
+
+#include "k3-j721e-rtos-memory-map.dtsi"
+
+&main_i2c6 {
+ status = "disabled";
+};
+
+&serdes_wiz4 {
+ status = "disabled";
+};
+
+&mhdp {
+ status = "disabled";
+};
+
+&dss {
+ status = "disabled";
+};
+
+&main_i2c1 {
+ status = "disabled";
+};
+
+&ti_csi2rx0 {
+ status = "disabled";
+};
+
+&ti_csi2rx1 {
+ status = "disabled";
+};
diff --git a/k3-j722s-rtos-memory-map.dtsi b/k3-j722s-rtos-memory-map.dtsi
new file mode 100644
index 000000000000..77760dfe4393
--- /dev/null
+++ b/k3-j722s-rtos-memory-map.dtsi
@@ -0,0 +1,166 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Vision-apps: device-tree overlay
+ *
+ * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/
+ */
+
+#include <dt-bindings/soc/ti,sci_pm_domain.h>
+
+/dts-v1/;
+/plugin/;
+
+&{/} {
+ dma_buf_phys {
+ compatible = "ti,dma-buf-phys";
+ };
+};
+
+&wkup_r5fss0_core0_memory_region {
+ status = "disabled";
+};
+
+&wkup_r5fss0_core0_dma_memory_region {
+ status = "disabled";
+};
+
+&mcu_r5fss0_core0_memory_region {
+ status = "disabled";
+};
+
+&mcu_r5fss0_core0_dma_memory_region {
+ status = "disabled";
+};
+
+&main_r5fss0_core0_dma_memory_region {
+ status = "disabled";
+};
+
+&main_r5fss0_core0_memory_region {
+ status = "disabled";
+};
+
+&c7x_0_dma_memory_region {
+ status = "disabled";
+};
+
+&c7x_0_memory_region {
+ status = "disabled";
+};
+
+&c7x_1_dma_memory_region {
+ status = "disabled";
+};
+
+&c7x_1_memory_region {
+ status = "disabled";
+};
+
+&rtos_ipc_memory_region {
+ status = "disabled";
+};
+
+&reserved_memory {
+ #address-cells = <2>;
+ #size-cells = <2>;
+
+ vision_apps_wkup_r5fss0_core0_dma_memory_region:
vision-apps-r5f-dma-memory@a0000000 {
+ compatible = "shared-dma-pool";
+ reg = <0x00 0xa0000000 0x00 0x00100000>;
+ no-map;
+ };
+ vision_apps_wkup_r5fss0_core0_memory_region:
vision-apps-r5f-memory@a0100000 {
+ compatible = "shared-dma-pool";
+ reg = <0x00 0xa0100000 0x00 0x00f00000>;
+ no-map;
+ };
+ vision_apps_mcu_r5fss0_core0_dma_memory_region:
vision-apps-r5f-dma-memory@a1000000 {
+ compatible = "shared-dma-pool";
+ reg = <0x00 0xa1000000 0x00 0x00100000>;
+ no-map;
+ };
+ vision_apps_mcu_r5fss0_core0_memory_region:
vision-apps-r5f-memory@a1100000 {
+ compatible = "shared-dma-pool";
+ reg = <0x00 0xa1100000 0x00 0x00f00000>;
+ no-map;
+ };
+ vision_apps_main_r5fss0_core0_dma_memory_region:
vision-apps-r5f-dma-memory@a2000000 {
+ compatible = "shared-dma-pool";
+ reg = <0x00 0xa2000000 0x00 0x00100000>;
+ no-map;
+ };
+ vision_apps_main_r5fss0_core0_memory_region:
vision-apps-r5f-memory@a2100000 {
+ compatible = "shared-dma-pool";
+ reg = <0x00 0xa2100000 0x00 0x01f00000>;
+ no-map;
+ };
+ vision_apps_rtos_ipc_memory_region:
vision-apps-rtos-ipc-memory-region@a5000000 {
+ compatible = "shared-dma-pool";
+ reg = <0x00 0xa5000000 0x00 0x02000000>;
+ no-map;
+ };
+ vision_apps_memory_region: vision-apps-dma-memory@a7000000 {
+ compatible = "shared-dma-pool";
+ reg = <0x00 0xa7000000 0x00 0x06000000>;
+ no-map;
+ };
+ vision_apps_c71_0_dma_memory_region:
vision-apps-c71-dma-memory@ad000000 {
+ compatible = "shared-dma-pool";
+ reg = <0x00 0xad000000 0x00 0x00100000>;
+ no-map;
+ };
+ vision_apps_c71_0_memory_region: vision-apps-c71_0-memory@ad100000 {
+ compatible = "shared-dma-pool";
+ reg = <0x00 0xad100000 0x00 0x03f00000>;
+ no-map;
+ };
+ vision_apps_c71_1_dma_memory_region:
vision-apps-c71_1-dma-memory@b1000000 {
+ compatible = "shared-dma-pool";
+ reg = <0x00 0xb1000000 0x00 0x00100000>;
+ no-map;
+ };
+ vision_apps_c71_1_memory_region: vision-apps-c71_1-memory1b1100000 {
+ compatible = "shared-dma-pool";
+ reg = <0x00 0xb1100000 0x00 0x03f00000>;
+ no-map;
+ };
+ vision_apps_core_heaps_lo: vision-apps-core-heap-memory-lo@b5000000 {
+ compatible = "shared-dma-pool";
+ reg = <0x00 0xb5000000 0x00 0x02800000>;
+ no-map;
+ };
+ vision_apps_core_heaps_hi: vision-apps-core-heap-memory-hi@880000000 {
+ compatible = "shared-dma-pool";
+ reg = <0x08 0x80000000 0x00 0x20000000>;
+ no-map;
+ };
+ vision_apps_shared_region: vision_apps_shared-memories {
+ compatible = "dma-heap-carveout";
+ reg = <0x00 0xC0000000 0x00 0x20000000>;
+ };
+};
+
+&wkup_r5fss0_core0 {
+ memory-region = <&vision_apps_wkup_r5fss0_core0_dma_memory_region>,
+ <&vision_apps_wkup_r5fss0_core0_memory_region>;
+};
+
+&mcu_r5fss0_core0 {
+ memory-region = <&vision_apps_mcu_r5fss0_core0_dma_memory_region>,
+ <&vision_apps_mcu_r5fss0_core0_memory_region>;
+};
+
+&main_r5fss0_core0 {
+ memory-region = <&vision_apps_main_r5fss0_core0_dma_memory_region>,
+ <&vision_apps_main_r5fss0_core0_memory_region>;
+};
+
+&c7x_0 {
+ memory-region = <&vision_apps_c71_0_dma_memory_region>,
+ <&vision_apps_c71_0_memory_region>;
+};
+
+&c7x_1 {
+ memory-region = <&vision_apps_c71_1_dma_memory_region>,
+ <&vision_apps_c71_1_memory_region>;
+};
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#14338):
https://lists.yoctoproject.org/g/linux-yocto/message/14338
Mute This Topic: https://lists.yoctoproject.org/mt/108138860/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
