From 1b0cf025ed92cdbda45502e239185d04011d8aad Mon Sep 17 00:00:00 2001 From: Patan Saddam Date: Thu, 28 Nov 2024 19:41:05 +0530 Subject: [PATCH] arm64: dts: msm: Enable compilation of trusted-vm dt project for kera and tuna Enable compilation of trusted-vm dt files in opensource dsp-devicetree. Change-Id: I41929b0ac907efb3610bc1c4da91dc95b73bee4a Signed-off-by: Patan Saddam --- Kbuild | 8 -------- kera/kera-dsp-trustedvm.dts | 15 --------------- kera/kera-dsp-trustedvm.dtsi | 37 ------------------------------------ sun/sun-dsp-trustedvm.dts | 3 ++- tuna/tuna-dsp-trustedvm.dts | 15 --------------- tuna/tuna-dsp-trustedvm.dtsi | 37 ------------------------------------ 6 files changed, 2 insertions(+), 113 deletions(-) delete mode 100644 kera/kera-dsp-trustedvm.dts delete mode 100644 kera/kera-dsp-trustedvm.dtsi delete mode 100644 tuna/tuna-dsp-trustedvm.dts delete mode 100644 tuna/tuna-dsp-trustedvm.dtsi diff --git a/Kbuild b/Kbuild index 29f9fa35..feca9c76 100755 --- a/Kbuild +++ b/Kbuild @@ -19,20 +19,12 @@ endif endif ifeq ($(CONFIG_ARCH_TUNA), y) -ifeq ($(CONFIG_ARCH_QTI_VM), y) -dtbo-y += tuna/tuna-dsp-trustedvm.dtbo -else dtbo-y += tuna/tuna-dsp.dtbo endif -endif ifeq ($(CONFIG_ARCH_KERA), y) -ifeq ($(CONFIG_ARCH_QTI_VM), y) -dtbo-y += kera/kera-dsp-trustedvm.dtbo -else dtbo-y += kera/kera-dsp.dtbo endif -endif ifeq ($(CONFIG_ARCH_MONACO), y) dtbo-y += monaco/monaco-dsp.dtbo diff --git a/kera/kera-dsp-trustedvm.dts b/kera/kera-dsp-trustedvm.dts deleted file mode 100644 index 2f3bbc0b..00000000 --- a/kera/kera-dsp-trustedvm.dts +++ /dev/null @@ -1,15 +0,0 @@ -// SPDX-License-Identifier: BSD-3-Clause -/* - * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. - */ - -/dts-v1/; -/plugin/; - -#include "kera-dsp-trustedvm.dtsi" - -/ { - model = "Qualcomm Technologies, Inc. Kera - TrustedVM"; - compatible = "qcom,kera"; - qcom,msm-id = <659 0x10000>; -}; diff --git a/kera/kera-dsp-trustedvm.dtsi b/kera/kera-dsp-trustedvm.dtsi deleted file mode 100644 index 3bcb133b..00000000 --- a/kera/kera-dsp-trustedvm.dtsi +++ /dev/null @@ -1,37 +0,0 @@ -// SPDX-License-Identifier: BSD-3-Clause -/* - * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. - */ - -#include -#include - -&soc { - fastrpc_gen_pool_region: fastrpc_gen_pool_region { - iommu-addresses = <&fastrpc_compute_cb1 0x8000 0x11000>; - }; - - fastrpc_compute_cb1: compute-cb@13 { - compatible = "qcom,fastrpc-compute-cb"; - reg = <11>; - iommus = <&apps_smmu 0xC0B 0x0>; - memory-region = <&fastrpc_gen_pool_region>; - qcom,iommu-faults = "stall-disable", "HUPCF"; - dma-coherent; - qcom,iova-best-fit; - qcom,iova-max-align-shift = <9>; /* Set MAX alignment to 2 MB*/ - qrtr-gen-pool = <&fastrpc_compute_cb1>; - frpc-gen-addr-pool = <0x8000 0x9000>; - pd-type = <4>; /* SECURE_STATICPD */ - }; - - qrtr-genpool { - compatible = "qcom,qrtr-genpool"; - gen-pool = <&fastrpc_compute_cb1>; - interrupt-parent = <&ipcc_mproc_ns1>; - interrupts = , - ; - mboxes = <&ipcc_mproc_ns1 IPCC_CLIENT_CDSP 0>, - <&ipcc_mproc_ns1 IPCC_CLIENT_CDSP 1>; - }; -}; diff --git a/sun/sun-dsp-trustedvm.dts b/sun/sun-dsp-trustedvm.dts index 06901008..6b35c0ea 100644 --- a/sun/sun-dsp-trustedvm.dts +++ b/sun/sun-dsp-trustedvm.dts @@ -13,5 +13,6 @@ compatible = "qcom,sun"; qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, <0x100026a 0x10000>, <0x100026a 0x20000>, - <0x100027f 0x10000>, <0x100027f 0x20000>; + <0x100027f 0x10000>, <0x100027f 0x20000>, <655 0x10000>, + <681 0x10000>, <694 0x10000>,<659 0x10000>, <686 0x10000>; }; diff --git a/tuna/tuna-dsp-trustedvm.dts b/tuna/tuna-dsp-trustedvm.dts deleted file mode 100644 index e94e4c31..00000000 --- a/tuna/tuna-dsp-trustedvm.dts +++ /dev/null @@ -1,15 +0,0 @@ -// SPDX-License-Identifier: BSD-3-Clause -/* - * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. - */ - -/dts-v1/; -/plugin/; - -#include "tuna-dsp-trustedvm.dtsi" - -/ { - model = "Qualcomm Technologies, Inc. Tuna - TrustedVM"; - compatible = "qcom,tuna"; - qcom,msm-id = <655 0x10000>; -}; diff --git a/tuna/tuna-dsp-trustedvm.dtsi b/tuna/tuna-dsp-trustedvm.dtsi deleted file mode 100644 index 3bcb133b..00000000 --- a/tuna/tuna-dsp-trustedvm.dtsi +++ /dev/null @@ -1,37 +0,0 @@ -// SPDX-License-Identifier: BSD-3-Clause -/* - * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. - */ - -#include -#include - -&soc { - fastrpc_gen_pool_region: fastrpc_gen_pool_region { - iommu-addresses = <&fastrpc_compute_cb1 0x8000 0x11000>; - }; - - fastrpc_compute_cb1: compute-cb@13 { - compatible = "qcom,fastrpc-compute-cb"; - reg = <11>; - iommus = <&apps_smmu 0xC0B 0x0>; - memory-region = <&fastrpc_gen_pool_region>; - qcom,iommu-faults = "stall-disable", "HUPCF"; - dma-coherent; - qcom,iova-best-fit; - qcom,iova-max-align-shift = <9>; /* Set MAX alignment to 2 MB*/ - qrtr-gen-pool = <&fastrpc_compute_cb1>; - frpc-gen-addr-pool = <0x8000 0x9000>; - pd-type = <4>; /* SECURE_STATICPD */ - }; - - qrtr-genpool { - compatible = "qcom,qrtr-genpool"; - gen-pool = <&fastrpc_compute_cb1>; - interrupt-parent = <&ipcc_mproc_ns1>; - interrupts = , - ; - mboxes = <&ipcc_mproc_ns1 IPCC_CLIENT_CDSP 0>, - <&ipcc_mproc_ns1 IPCC_CLIENT_CDSP 1>; - }; -};