From 0470248d10717d3a9cd9b59916ea55f53b5b4e9f Mon Sep 17 00:00:00 2001 From: Edgar Flores Date: Wed, 27 Mar 2024 13:32:46 -0700 Subject: [PATCH 1/6] ARM: dts: qcom: Add new msm-ids for sun SoC Add new msm-ids for fastrpc dts to support different thermal profiles. Change-Id: I09dca4a363d70a35dd5d7860b6f4f5580184b4e1 --- sun/sun-dsp-trustedvm.dts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sun/sun-dsp-trustedvm.dts b/sun/sun-dsp-trustedvm.dts index 68cb4c5f..06901008 100644 --- a/sun/sun-dsp-trustedvm.dts +++ b/sun/sun-dsp-trustedvm.dts @@ -11,5 +11,7 @@ / { model = "Qualcomm Technologies, Inc. Sun - TrustedVM"; compatible = "qcom,sun"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 0x20000>; }; From 4fa97ee67b5f0316c7091334a17f91f898ee7e2e Mon Sep 17 00:00:00 2001 From: Edgar Flores Date: Thu, 28 Mar 2024 16:49:10 -0700 Subject: [PATCH 2/6] arm64: dts: msm: Fix sun's trusted dtsi compilation Update dtsi syntax to fix compilation. Change-Id: I18d2b4960dfdcdc325abf78b57f3f289b2b10ffe --- sun/sun-dsp-trustedvm.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sun/sun-dsp-trustedvm.dtsi b/sun/sun-dsp-trustedvm.dtsi index d0cc2ac7..e1c5db54 100644 --- a/sun/sun-dsp-trustedvm.dtsi +++ b/sun/sun-dsp-trustedvm.dtsi @@ -2,7 +2,7 @@ #include &soc { - fastrpc_gen_pool_region : fastrpc_gen_pool_region { + fastrpc_gen_pool_region: fastrpc_gen_pool_region { iommu-addresses = <&fastrpc_compute_cb1 0x8000 0x11000>; }; From b18a9fc602def14c3fc4d96fcd155e809dcbead4 Mon Sep 17 00:00:00 2001 From: Abhinav Parihar Date: Sun, 31 Mar 2024 15:47:00 +0530 Subject: [PATCH 3/6] ARM: dts: qcom: Add new msm-ids for niobe SoC Add new msm-ids for fastrpc dts to support different msm profiles. Change-Id: Iaadf6d39bc76fc685d42fb985de558501dae37d5 --- niobe/niobe-dsp.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/niobe/niobe-dsp.dts b/niobe/niobe-dsp.dts index 43e3be92..702b3ce0 100644 --- a/niobe/niobe-dsp.dts +++ b/niobe/niobe-dsp.dts @@ -6,6 +6,6 @@ / { model = "Qualcomm Technologies, Inc. Niobe SoC"; compatible = "qcom,niobe"; - qcom,msm-id = <629 0x10000>; + qcom,msm-id = <629 0x10000>, <652 0x10000>; qcom,board-id = <0 0>; }; From fbe37c58a9d1375a183d776f4c9937f0d559e7be Mon Sep 17 00:00:00 2001 From: Himateja Reddy Date: Tue, 2 Apr 2024 09:03:29 -0700 Subject: [PATCH 4/6] arm64: dts: msm: Add SOC info for sun targets Currently SOC info is not part of DT. Add SOC info to support sun targets Change-Id: I5f22bea964a9b9a561a4ddd1299d34c49f7d0954 Signed-off-by: Himateja Reddy --- sun/sun-dsp.dts | 1 + 1 file changed, 1 insertion(+) diff --git a/sun/sun-dsp.dts b/sun/sun-dsp.dts index 21b53118..37f20626 100644 --- a/sun/sun-dsp.dts +++ b/sun/sun-dsp.dts @@ -6,5 +6,6 @@ / { model = "Qualcomm Technologies, Inc. sun v1 SoC"; compatible = "qcom,sun"; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; qcom,board-id = <0 0>; }; From 6cbb8a3adf3ccbf23cffb3b0338c0df48fbab8ab Mon Sep 17 00:00:00 2001 From: Abhinav Parihar Date: Fri, 19 Apr 2024 16:43:50 +0530 Subject: [PATCH 5/6] arm64: dts: qcom: niobe: Disable niobe devicetree files This change removes niobe related dsp-devicetree files. As kernel devicetree is proprietary removing niobe devicetree from opensource. Change-Id: If7a080918924a99673b42532164742bfdf5c1d11 Signed-off-by: Abhinav Parihar --- Kbuild | 4 - niobe/niobe-dsp.dts | 11 --- niobe/niobe-dsp.dtsi | 224 ------------------------------------------- 3 files changed, 239 deletions(-) delete mode 100644 niobe/niobe-dsp.dts delete mode 100644 niobe/niobe-dsp.dtsi diff --git a/Kbuild b/Kbuild index 6efa2e2a..7d2ad2c1 100644 --- a/Kbuild +++ b/Kbuild @@ -18,10 +18,6 @@ dtbo-y += sun/sun-dsp.dtbo endif endif -ifeq ($(CONFIG_ARCH_NIOBE), y) -dtbo-y += niobe/niobe-dsp.dtbo -endif - always-y := $(dtb-y) $(dtbo-y) subdir-y := $(dts-dirs) clean-files := *.dtb *.dtbo diff --git a/niobe/niobe-dsp.dts b/niobe/niobe-dsp.dts deleted file mode 100644 index 702b3ce0..00000000 --- a/niobe/niobe-dsp.dts +++ /dev/null @@ -1,11 +0,0 @@ -/dts-v1/; -/plugin/; - -#include "niobe-dsp.dtsi" - -/ { - model = "Qualcomm Technologies, Inc. Niobe SoC"; - compatible = "qcom,niobe"; - qcom,msm-id = <629 0x10000>, <652 0x10000>; - qcom,board-id = <0 0>; -}; diff --git a/niobe/niobe-dsp.dtsi b/niobe/niobe-dsp.dtsi deleted file mode 100644 index f061ca4f..00000000 --- a/niobe/niobe-dsp.dtsi +++ /dev/null @@ -1,224 +0,0 @@ -&remoteproc_adsp_glink { - qcom,fastrpc { - compatible = "qcom,fastrpc"; - qcom,glink-channels = "fastrpcglink-apps-dsp"; - qcom,intents = <0x64 64>; - label = "adsp"; - memory-region = <&adsp_mem_heap>; - qcom,vmids = <22 37>; - - compute-cb@1 { - compatible = "qcom,fastrpc-compute-cb"; - reg = <3>; - iommus = <&apps_smmu 0x1003 0x0000>, - <&apps_smmu 0x1063 0x0000>; - qcom,iommu-dma-addr-pool = <0x10000000 0xF0000000>; - qcom,iommu-faults = "stall-disable", "HUPCF"; - dma-coherent; - pd-type = <1>; /* ROOT_PD */ - }; - - compute-cb@2 { - compatible = "qcom,fastrpc-compute-cb"; - reg = <4>; - iommus = <&apps_smmu 0x1004 0x0000>, - <&apps_smmu 0x1064 0x0000>; - qcom,iommu-dma-addr-pool = <0x10000000 0xF0000000>; - qcom,iommu-faults = "stall-disable", "HUPCF"; - dma-coherent; - pd-type = <2>; /* AUDIO_STATICPD */ - }; - - compute-cb@3 { - compatible = "qcom,fastrpc-compute-cb"; - reg = <5>; - iommus = <&apps_smmu 0x1005 0x0000>, - <&apps_smmu 0x1065 0x0000>; - qcom,iommu-dma-addr-pool = <0x10000000 0xF0000000>; - qcom,iommu-faults = "stall-disable", "HUPCF"; - qcom,nsessions = <8>; - dma-coherent; - pd-type = <3>; /* SENSORS_STATICPD */ - }; - - compute-cb@4 { - compatible = "qcom,fastrpc-compute-cb"; - reg = <6>; - iommus = <&apps_smmu 0x1006 0x0000>, - <&apps_smmu 0x1066 0x0000>; - qcom,iommu-dma-addr-pool = <0x10000000 0xF0000000>; - qcom,iommu-faults = "stall-disable", "HUPCF"; - dma-coherent; - pd-type = <7>; /* USERPD */ - }; - - compute-cb@5 { - compatible = "qcom,fastrpc-compute-cb"; - reg = <7>; - iommus = <&apps_smmu 0x1007 0x0000>, - <&apps_smmu 0x1067 0x0000>; - qcom,iommu-dma-addr-pool = <0x10000000 0xF0000000>; - qcom,iommu-faults = "stall-disable", "HUPCF"; - dma-coherent; - pd-type = <7>; /* USERPD */ - }; - }; -}; - -&remoteproc_cdsp_glink { - qcom,fastrpc { - compatible = "qcom,fastrpc"; - qcom,glink-channels = "fastrpcglink-apps-dsp"; - qcom,intents = <0x64 64>; - label = "cdsp"; - qcom,fastrpc-gids = <2908>; - qcom,rpc-latency-us = <235>; - - compute-cb@1 { - compatible = "qcom,fastrpc-compute-cb"; - reg = <1>; - iommus = <&apps_smmu 0x0C01 0x0040>, - <&apps_smmu 0x0C21 0x0000>, - <&apps_smmu 0x0C41 0x0040>; - qcom,iommu-dma-addr-pool = <0x10000000 0xF0000000>; - qcom,iommu-faults = "stall-disable", "HUPCF"; - dma-coherent; - pd-type = <1>; /* ROOT_PD */ - }; - - compute-cb@2 { - compatible = "qcom,fastrpc-compute-cb"; - reg = <2>; - iommus = <&apps_smmu 0x0C02 0x0040>, - <&apps_smmu 0x0C22 0x0000>, - <&apps_smmu 0x0C42 0x0040>; - qcom,iommu-dma-addr-pool = <0x10000000 0xF0000000>; - qcom,iommu-faults = "stall-disable", "HUPCF"; - dma-coherent; - pd-type = <7>; /* USERPD */ - }; - - compute-cb@3 { - compatible = "qcom,fastrpc-compute-cb"; - reg = <3>; - iommus = <&apps_smmu 0x0C03 0x0040>, - <&apps_smmu 0x0C23 0x0000>, - <&apps_smmu 0x0C43 0x0040>; - qcom,iommu-dma-addr-pool = <0x10000000 0xF0000000>; - qcom,iommu-faults = "stall-disable", "HUPCF"; - dma-coherent; - pd-type = <7>; /* USERPD */ - }; - - compute-cb@4 { - compatible = "qcom,fastrpc-compute-cb"; - reg = <4>; - iommus = <&apps_smmu 0x0C04 0x0040>, - <&apps_smmu 0x0C24 0x0000>, - <&apps_smmu 0x0C44 0x0040>; - qcom,iommu-dma-addr-pool = <0x10000000 0xF0000000>; - qcom,iommu-faults = "stall-disable", "HUPCF"; - dma-coherent; - pd-type = <7>; /* USERPD */ - }; - - compute-cb@5 { - compatible = "qcom,fastrpc-compute-cb"; - reg = <5>; - iommus = <&apps_smmu 0x0C05 0x0040>, - <&apps_smmu 0x0C25 0x0000>, - <&apps_smmu 0x0C45 0x0040>; - qcom,iommu-dma-addr-pool = <0x10000000 0xF0000000>; - qcom,iommu-faults = "stall-disable", "HUPCF"; - dma-coherent; - pd-type = <7>; /* USERPD */ - }; - - compute-cb@6 { - compatible = "qcom,fastrpc-compute-cb"; - reg = <6>; - iommus = <&apps_smmu 0x0C06 0x0040>, - <&apps_smmu 0x0C26 0x0000>, - <&apps_smmu 0x0C46 0x0040>; - qcom,iommu-dma-addr-pool = <0x10000000 0xF0000000>; - qcom,iommu-faults = "stall-disable", "HUPCF"; - dma-coherent; - pd-type = <7>; /* USERPD */ - }; - - compute-cb@7 { - compatible = "qcom,fastrpc-compute-cb"; - reg = <7>; - iommus = <&apps_smmu 0x0C07 0x0040>, - <&apps_smmu 0x0C27 0x0000>, - <&apps_smmu 0x0C47 0x0040>; - qcom,iommu-dma-addr-pool = <0x10000000 0xF0000000>; - qcom,iommu-faults = "stall-disable", "HUPCF"; - dma-coherent; - pd-type = <7>; /* USERPD */ - }; - - compute-cb@8 { - compatible = "qcom,fastrpc-compute-cb"; - reg = <8>; - iommus = <&apps_smmu 0x0C08 0x0040>, - <&apps_smmu 0x0C28 0x0000>, - <&apps_smmu 0x0C48 0x0040>; - qcom,iommu-dma-addr-pool = <0x10000000 0xF0000000>; - qcom,iommu-faults = "stall-disable", "HUPCF"; - dma-coherent; - pd-type = <7>; /* USERPD */ - }; - - compute-cb@9 { - compatible = "qcom,fastrpc-compute-cb"; - reg = <9>; - qcom,secure-context-bank; - iommus = <&apps_smmu 0x0C09 0x0040>, - <&apps_smmu 0x0C29 0x0000>, - <&apps_smmu 0x0C49 0x0040>; - qcom,iommu-dma-addr-pool = <0x10000000 0xF0000000>; - qcom,iommu-faults = "stall-disable", "HUPCF"; - qcom,iommu-vmid = <0xA>; /* VMID_CP_PIXEL */ - qcom,nsessions = <3>; - dma-coherent; - pd-type = <6>; /* CPZ_USERPD */ - }; - - compute-cb@10 { - compatible = "qcom,fastrpc-compute-cb"; - reg = <12>; - iommus = <&apps_smmu 0x0C0C 0x0040>, - <&apps_smmu 0x0C2C 0x0000>, - <&apps_smmu 0x0C4C 0x0040>; - qcom,iommu-dma-addr-pool = <0x10000000 0xF0000000>; - qcom,iommu-faults = "stall-disable", "HUPCF"; - dma-coherent; - pd-type = <7>; /* USERPD */ - }; - - compute-cb@11 { - compatible = "qcom,fastrpc-compute-cb"; - reg = <13>; - iommus = <&apps_smmu 0x0C0D 0x0040>, - <&apps_smmu 0x0C2D 0x0000>, - <&apps_smmu 0x0C4D 0x0040>; - qcom,iommu-dma-addr-pool = <0x10000000 0xF0000000>; - qcom,iommu-faults = "stall-disable", "HUPCF"; - dma-coherent; - pd-type = <7>; /* USERPD */ - }; - - compute-cb@12 { - compatible = "qcom,fastrpc-compute-cb"; - reg = <14>; - iommus = <&apps_smmu 0x0C0E 0x0040>, - <&apps_smmu 0x0C2E 0x0000>, - <&apps_smmu 0x0C4E 0x0040>; - qcom,iommu-dma-addr-pool = <0x10000000 0xF0000000>; - qcom,iommu-faults = "stall-disable", "HUPCF"; - dma-coherent; - pd-type = <7>; /* USERPD */ - }; - }; -}; \ No newline at end of file From c6c5a4d0004f72d083d8ce96967b1cbec599d119 Mon Sep 17 00:00:00 2001 From: Vivekanand Tryambake Date: Thu, 2 May 2024 14:19:42 -0700 Subject: [PATCH 6/6] ARM: dts: msm: new MSM-ID to support for different packagings Add new MSM-ID for SUN target Change-Id: I6690c1ee67e18e272b8eaba26dc8f37e95c4b1e5 --- sun/sun-dsp.dts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sun/sun-dsp.dts b/sun/sun-dsp.dts index 37f20626..9b4b8993 100644 --- a/sun/sun-dsp.dts +++ b/sun/sun-dsp.dts @@ -6,6 +6,8 @@ / { model = "Qualcomm Technologies, Inc. sun v1 SoC"; compatible = "qcom,sun"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 0x20000>; qcom,board-id = <0 0>; };