From 9fed059d20d1360275e5c535ddea2f30e79ebd48 Mon Sep 17 00:00:00 2001 From: Chirag Rastogi Date: Wed, 20 Mar 2024 14:48:39 -0700 Subject: [PATCH 1/4] ARM: dts: msm: reduce IPA AB vote for SVS2 corner in Sun Make changes to reduce IPA AB vote for SVS2 corner as modem already votes for it. Change-Id: I491ae4951136b7968bc66dd3f9dd5498f1af24fe Signed-off-by: Chirag Rastogi --- sun-ipa.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sun-ipa.dtsi b/sun-ipa.dtsi index c27190e8..a5d09992 100644 --- a/sun-ipa.dtsi +++ b/sun-ipa.dtsi @@ -25,7 +25,7 @@ /* SVS2 */ qcom,svs2 = - <600000 0 600000 1300000 0 76800>; + <0 0 0 1300000 0 76800>; /* SVS */ qcom,svs = From 095039560863026f2db2be6d514d43d1913c50dc Mon Sep 17 00:00:00 2001 From: Abhishek Raghuvanshi Date: Thu, 21 Mar 2024 11:20:27 -0700 Subject: [PATCH 2/4] ARM: dts: msm: Add package ID to msm-IDs for Sun Add additional device trees and msm-IDs to support an additional package ID. Additional packages may support different hardware settings and can be configured in their package specific device trees. Change-Id: I9d98cfcf7736af36c655566fbc4794cc8216cfd2 Signed-off-by: Abhishek Raghuvanshi --- sun-ipa.dts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sun-ipa.dts b/sun-ipa.dts index 84afa7cd..cb55fc15 100644 --- a/sun-ipa.dts +++ b/sun-ipa.dts @@ -16,6 +16,7 @@ / { model = "Qualcomm Technologies, Inc. Sun SOC"; compatible = "qcom,sun"; - qcom,msm-id = <618 0x10000>, <618 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>; qcom,board-id = <0 0>; }; From 2c29ff68f67b0403a459eb7f21ca5a24eeee5be5 Mon Sep 17 00:00:00 2001 From: Chaitanya Pratapa Date: Tue, 26 Mar 2024 15:18:28 -0700 Subject: [PATCH 3/4] Revert "ARM: dts: msm: fix 64 bit addressing for ipa" This reverts commit d9446a3f6c6c9a6d6c7c92a705c83110adf16262. Reason for revert: IPA WLAN Crash Change-Id: I8d57ddde8dac2188dd5a4f90627fae72f8da137e --- sun-ipa.dtsi | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/sun-ipa.dtsi b/sun-ipa.dtsi index a5d09992..0b7624c2 100644 --- a/sun-ipa.dtsi +++ b/sun-ipa.dtsi @@ -44,19 +44,12 @@ /* Low Latency pipe alloc factor */ qcom,ipa-gen-rx-ll-pool-sz-factor = <1>; - #address-cells = <2>; - #size-cells = <2>; }; &soc { ipa_smmu_ap_partition: ipa_smmu_ap_partition { - iommu-addresses = <&ipa_smmu_ap 0x0 0x0 0x0 0x20000000>, - <&ipa_smmu_ap 0x0 0x40000000 0xFFFFFFFF 0xC0000000>; - }; - - ipa_smmu_uc_partition: ipa_smmu_uc_partition { - iommu-addresses = <&ipa_smmu_uc 0x0 0x0 0x0 0x20000000>, - <&ipa_smmu_uc 0x0 0x40000000 0xFFFFFFFF 0xC0000000>; + iommu-addresses = <&ipa_smmu_ap 0x0 0x20000000>, + <&ipa_smmu_ap 0x40000000 0xC0000000>; }; }; @@ -68,8 +61,3 @@ <0x14683000 0x14683000 0x2000>; qcom,ipa-q6-smem-size = <55296>; }; - -&ipa_smmu_uc { - /delete-property/ qcom,iommu-dma-addr-pool; - memory-region = <&ipa_smmu_uc_partition>; -}; From e7efed391da5a212ca0cded301af68a05354d635 Mon Sep 17 00:00:00 2001 From: Chaitanya Pratapa Date: Tue, 26 Mar 2024 15:18:53 -0700 Subject: [PATCH 4/4] Revert "ARM: dts: msm: iommu changes" This reverts commit e0d8f461df2a6e6ac0bbc3770c1cbc8824273c62. Reason for revert: IPA WLAN crash. Change-Id: I13bd66ec94be6a76fc00b36f2c01b7bac78113f6 Signed-off-by: Chaitanya Pratapa --- sun-ipa.dtsi | 9 --------- 1 file changed, 9 deletions(-) diff --git a/sun-ipa.dtsi b/sun-ipa.dtsi index 0b7624c2..862ef50f 100644 --- a/sun-ipa.dtsi +++ b/sun-ipa.dtsi @@ -46,16 +46,7 @@ qcom,ipa-gen-rx-ll-pool-sz-factor = <1>; }; -&soc { - ipa_smmu_ap_partition: ipa_smmu_ap_partition { - iommu-addresses = <&ipa_smmu_ap 0x0 0x20000000>, - <&ipa_smmu_ap 0x40000000 0xC0000000>; - }; -}; - &ipa_smmu_ap { - /delete-property/ qcom,iommu-dma-addr-pool; - memory-region = <&ipa_smmu_ap_partition>; qcom,additional-mapping = /* modem tables in IMEM */ <0x14683000 0x14683000 0x2000>;