From 1885f7f7ae8d4cc47c51f161bd1bdc01f7bba54a Mon Sep 17 00:00:00 2001 From: Kartikey Arora Date: Wed, 4 Dec 2024 11:47:02 +0530 Subject: [PATCH 01/13] ARM: dts: msm: Update gpio config for kera-wcn7750 Update gpio config in kera-wcn7750 dtsi file Change-Id: Icdefbd0c1bad4dab593adb0d5617fe63a4ea47a2 CRs-Fixed: 3991373 --- kera-wcn7750.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kera-wcn7750.dtsi b/kera-wcn7750.dtsi index 4b9c7d2b..067d3e06 100644 --- a/kera-wcn7750.dtsi +++ b/kera-wcn7750.dtsi @@ -48,10 +48,10 @@ reg-names = "msi_addr", "smmu_iova_ipa"; qcom,rproc-handle = <&wpss_pas>; iommus = <&apps_smmu 0x1480 0x1>; - wlan-en-gpio =<35>; - host-sol-gpio =<132>; - dev-sol-gpio =<32>; - wlan-sw-ctrl-gpio =<80>; + wlan-en-gpio = <35>; + host-sol-gpio = <33>; + dev-sol-gpio = <32>; + wlan-sw-ctrl-gpio = <81>; interrupts = , , , From ac4f044344e0f77a0e0cab0c2d16a2888631322d Mon Sep 17 00:00:00 2001 From: Karthik Kantamneni Date: Thu, 5 Dec 2024 10:26:29 +0530 Subject: [PATCH 02/13] ARM: dts: msm: Add direct link dt node for tuna Add direct link dt node for tuna, this device will be used in direct-link use case and required for SID configuration and sharing IOMMU bank with wlan platform device. Change-Id: Ie8cff03866fe9f514f160ed02d0ddc72c4dc5b5d CRs-Fixed: 3992469 --- tuna-wcn7750.dtsi | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/tuna-wcn7750.dtsi b/tuna-wcn7750.dtsi index 92ed6a70..97d70346 100644 --- a/tuna-wcn7750.dtsi +++ b/tuna-wcn7750.dtsi @@ -37,6 +37,13 @@ }; }; + icnss2_direct_link_iommu_group0: icnss2_direct_link_iommu_group0 { + qcom,iommu-dma-addr-pool = <0xb0000000 0x10000000>; + qcom,iommu-geometry = <0xb0000000 0x10010000>; + qcom,iommu-dma = "fastmap"; + qcom,iommu-faults = "stall-disable", "HUPCF", "non-fatal"; + }; + icnss2: qcom,wcn7750 { compatible = "qcom,wcn7750"; reg = <0x17110040 0x0>, @@ -81,10 +88,7 @@ , ; - qcom,iommu-dma = "fastmap"; - qcom,iommu-faults = "stall-disable", "HUPCF", "non-fatal"; - qcom,iommu-dma-addr-pool = <0xb0000000 0x10000000>; - qcom,iommu-geometry = <0xb0000000 0x10010000>; + qcom,iommu-group = <&icnss2_direct_link_iommu_group0>; dma-coherent; qcom,fw-prefix; qcom,wlan; @@ -176,4 +180,11 @@ interrupt-names = "qcom,smp2p-soc-wake-ack"; }; }; + + wlan_direct_link: qcom,icnss-direct-link { + compatible = "qcom,icnss-direct-link"; + iommus = <&apps_smmu 0x100f 0x0>; + qcom,iommu-group = <&icnss2_direct_link_iommu_group0>; + dma-coherent; + }; }; From 640f3ccd8c74d157aca36d9747d9f1cc13826b99 Mon Sep 17 00:00:00 2001 From: Karthik Kantamneni Date: Thu, 28 Nov 2024 07:05:20 +0530 Subject: [PATCH 03/13] ARM: dts: msm: Add direct-link device node support Add support for direct-link device tree node, this device will be used for configuring LPASS SID iommu bank in direct-link use case. Change-Id: I31ce562bd8cbdd4692d6c721325fc15627a3f624 CRs-Fixed: 3990401 --- sun-peach-cnss-v8.dtsi | 14 ++++++++++++++ sun-peach-cnss.dtsi | 13 +++++++++++++ 2 files changed, 27 insertions(+) diff --git a/sun-peach-cnss-v8.dtsi b/sun-peach-cnss-v8.dtsi index 38350fc9..df47fc5a 100644 --- a/sun-peach-cnss-v8.dtsi +++ b/sun-peach-cnss-v8.dtsi @@ -199,6 +199,20 @@ */ wlan-txrx-intr-cpumask = <0x3 0x30>; }; + + wlan_direct_link: qcom,cnss-direct-link { + compatible = "qcom,cnss-direct-link"; + iommus = <&apps_smmu 0x100f 0x0>; + qcom,iommu-group = <&cnss_audio_iommu_group0>; + memory-region = <&direct_link_iommu_region_partition>; + dma-coherent; + + direct_link_iommu_region_partition: direct_link_iommu_region_partition { + iommu-addresses = <&wlan_direct_link 0x00000000 0x18000000>, + <&wlan_direct_link 0xb0000000 0x50000000>; + }; + + }; }; &pcie0_rp { diff --git a/sun-peach-cnss.dtsi b/sun-peach-cnss.dtsi index ef0efe81..c145ff69 100644 --- a/sun-peach-cnss.dtsi +++ b/sun-peach-cnss.dtsi @@ -198,6 +198,19 @@ */ wlan-txrx-intr-cpumask = <0x3 0x30>; }; + + wlan_direct_link: qcom,cnss-direct-link { + compatible = "qcom,cnss-direct-link"; + iommus = <&apps_smmu 0x100f 0x0>; + qcom,iommu-group = <&cnss_audio_iommu_group0>; + memory-region = <&direct_link_iommu_region_partition>; + dma-coherent; + + direct_link_iommu_region_partition: direct_link_iommu_region_partition { + iommu-addresses = <&wlan_direct_link 0x00000000 0x18000000>, + <&wlan_direct_link 0xb0000000 0x50000000>; + }; + }; }; &pcie0_rp { From e74c3e414383c2a0e9f3c3f24e52a7cec211aa28 Mon Sep 17 00:00:00 2001 From: Kartikey Arora Date: Mon, 2 Dec 2024 11:39:14 +0530 Subject: [PATCH 04/13] ARM: dts: msm: Update kera dtsi file This change updates the regulator config and pdc init table in kera dtsi files. Change-Id: I766d26f4505d4da717ca63e2b1bfd64de14bb79e CRs-Fixed: 3988811 --- kera-qca6750.dtsi | 7 +++++++ kera-wcn7750.dtsi | 14 +++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/kera-qca6750.dtsi b/kera-qca6750.dtsi index 9ae4e74b..8803075d 100644 --- a/kera-qca6750.dtsi +++ b/kera-qca6750.dtsi @@ -90,6 +90,13 @@ tsens = "sys-therm-3"; qcom,wlan-msa-fixed-region = <&wlan_msa_mem>; + vdd-cx-mx-supply = <&S3B>; + qcom,vdd-cx-mx-config = <920000 2736000 0 0 0>; + vdd-1.8-xo-supply = <&S1B>; + qcom,vdd-1.8-xo-config = <1856000 2044000 0 0 0>; + vdd-1.3-rfa-supply = <&S2B>; + qcom,vdd-1.3-rfa-config = <1256000 2092000 0 0 0>; + qcom,smem-states = <&smp2p_wlan_1_out 0>, <&smp2p_wlan_2_out 0>, <&smp2p_wlan_3_out 0>; diff --git a/kera-wcn7750.dtsi b/kera-wcn7750.dtsi index 067d3e06..2ab56f7f 100644 --- a/kera-wcn7750.dtsi +++ b/kera-wcn7750.dtsi @@ -96,11 +96,13 @@ qcom,wlan-msa-fixed-region = <&wlan_msa_mem>; vdd-cx-mx-supply = <&S3B>; - qcom,vdd-cx-mx-config = <880000 1040000 0 0 0>; + qcom,vdd-cx-mx-config = <880000 2736000 0 0 0>; vdd-1.8-xo-supply = <&S1B>; - qcom,vdd-1.8-xo-config = <1856000 2104000 0 0 0>; + qcom,vdd-1.8-xo-config = <1856000 2044000 0 0 0>; vdd-1.3-rfa-supply = <&S2B>; - qcom,vdd-1.3-rfa-config = <1256000 1408000 0 0 0>; + qcom,vdd-1.3-rfa-config = <1256000 2092000 0 0 0>; + vdd-1.8-io-supply = <&L11B>; + qcom,vdd-1.8-io-config = <1800000 1800000 0 0 0>; qcom,smem-states = <&smp2p_wlan_1_out 0>, <&smp2p_wlan_2_out 0>, @@ -108,6 +110,12 @@ qcom,smem-state-names = "wlan-smp2p-out", "wlan-soc-wake-smp2p-out", "wlan-ep-powersave-smp2p-out"; + qcom,pdc_init_table = + " {class: wlan_pdc, ss: rf, res: s3b.v, dwnval: 696}", + " {class: wlan_pdc, ss: rf, res: s1b.v, upval: 1864}", + " {class: wlan_pdc, ss: rf, res: s2b.v, upval: 1316}", + " {class: wlan_pdc, ss: rf, res: s4b.e, enable: 0}", + " {class: wlan_pdc, ss: rf, res: l4k.m, enable: 1}"; qcom,qmp = <&aoss_qmp>; qcom,vreg_ol_cpr ="s3b"; From 75342a51c8e3448ac19f861cdf328afc412a07ab Mon Sep 17 00:00:00 2001 From: Surabhi Vishnoi Date: Thu, 5 Dec 2024 22:28:13 +0530 Subject: [PATCH 05/13] ARM: dts: msm: Disable wpss pil memory region for volcano peach target Disable wpss PIL memory region for volcano peach target. Change-Id: I0787e4a8b9380b5daea7de560e636e4aa4ce315c CRs-Fixed: 3966034 --- volcano6i-peach-cnss.dtsi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/volcano6i-peach-cnss.dtsi b/volcano6i-peach-cnss.dtsi index 7ef1b8e5..01f1468f 100644 --- a/volcano6i-peach-cnss.dtsi +++ b/volcano6i-peach-cnss.dtsi @@ -167,6 +167,10 @@ status = "disabled"; }; +&wpss_mem { + status = "disabled"; +}; + &pcie0_rp { #address-cells = <5>; #size-cells = <0>; From f43fdbf5536e8a062733a151dc3eeae4cdad1f59 Mon Sep 17 00:00:00 2001 From: "Alan Z. Chen" Date: Wed, 27 Nov 2024 15:31:11 -0800 Subject: [PATCH 06/13] ARM: dts: msm: Add L3K regulator and pcie_rp support Add L3K regulator support and change pcie0_rp to pcie_rp. In addition, enable canoe dtsi compilation. Change-Id: I2771e43d559c5ae67d5fad04b45eac7060c94d72 CRs-Fixed: 3986494 --- Kbuild | 5 +++++ canoe-kiwi-cnss.dtsi | 4 +++- canoe-peach-cnss.dtsi | 4 +++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Kbuild b/Kbuild index f11d6541..99a54b00 100644 --- a/Kbuild +++ b/Kbuild @@ -1,3 +1,8 @@ +ifeq ($(CONFIG_ARCH_CANOE),y) +dtbo-y += canoe-kiwi-cnss.dtbo +dtbo-y += canoe-peach-cnss.dtbo +endif + ifeq ($(CONFIG_ARCH_SUN),y) dtbo-y += sun-kiwi-cnss.dtbo dtbo-y += sun-kiwi-cnss-v8.dtbo diff --git a/canoe-kiwi-cnss.dtsi b/canoe-kiwi-cnss.dtsi index e0dec929..db41bf97 100644 --- a/canoe-kiwi-cnss.dtsi +++ b/canoe-kiwi-cnss.dtsi @@ -103,6 +103,8 @@ qcom,vdd-wlan-rfa1-config = <1864000 2000000 0 0 1>; vdd-wlan-rfa2-supply = <&S7F>; qcom,vdd-wlan-rfa2-config = <1316000 1400000 0 0 1>; + vdd-wlan-ant-share-supply = <&L3K>; + qcom,vdd-wlan-ant-share-config = <1200000 1200000 0 0 1>; //TODO: extractor regulator is required or not // TODO PDC TABLE BUS BW // PDC MAP AND PMU Vreg Map @@ -114,7 +116,7 @@ }; }; -&pcie0_rp { +&pcie_rp { cnss_pci0: cnss_pci0 { reg = <0 0 0 0 0>; diff --git a/canoe-peach-cnss.dtsi b/canoe-peach-cnss.dtsi index 075db596..3de347e6 100644 --- a/canoe-peach-cnss.dtsi +++ b/canoe-peach-cnss.dtsi @@ -120,6 +120,8 @@ qcom,vdd-wlan-rfa1-config = <1876000 2000000 0 0 1>; vdd-wlan-rfa2-supply = <&S7F>; qcom,vdd-wlan-rfa2-config = <1328000 1340000 0 0 1>; + vdd-wlan-ant-share-supply = <&L3K>; + qcom,vdd-wlan-ant-share-config = <1200000 1200000 0 0 1>; qcom,vreg_pdc_map = "s1j", "bb", @@ -146,7 +148,7 @@ }; }; -&pcie0_rp { +&pcie_rp { cnss_pci0: cnss_pci0 { reg = <0 0 0 0 0>; qcom,iommu-group = <&cnss_audio_iommu_group0>; From fd93de97dea8265a076b950a939979200f5454df Mon Sep 17 00:00:00 2001 From: AMAN KUMAR Date: Tue, 3 Dec 2024 11:02:21 +0530 Subject: [PATCH 07/13] ARM: dts: msm: Add pdc cmd from latest tcs sheet Update regulator voting and add pdc cmd as per latest tcs sheet for canoe kiwi. Change-Id: Ideb2393238417f7f651d4585aa4f44d2260a4fb5 CRs-Fixed: 3992528 --- canoe-kiwi-cnss.dtsi | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/canoe-kiwi-cnss.dtsi b/canoe-kiwi-cnss.dtsi index db41bf97..a40fe5c0 100644 --- a/canoe-kiwi-cnss.dtsi +++ b/canoe-kiwi-cnss.dtsi @@ -96,18 +96,29 @@ vdd-wlan-io12-supply = <&L3G>; qcom,vdd-wlan-io12-config = <1200000 1200000 0 0 1>; vdd-wlan-cx-supply = <&S1J>; - qcom,vdd-wlan-cx-config = <932000 1000000 0 0 1>; + qcom,vdd-wlan-cx-config = <968000 1000000 0 0 1>; vdd-wlan-dig-supply = <&S2J>; - qcom,vdd-wlan-dig-config = <916000 1100000 0 0 1>; + qcom,vdd-wlan-dig-config = <1012000 1100000 0 0 1>; vdd-wlan-rfa1-supply = <&S8F>; - qcom,vdd-wlan-rfa1-config = <1864000 2000000 0 0 1>; + qcom,vdd-wlan-rfa1-config = <1900000 2000000 0 0 1>; vdd-wlan-rfa2-supply = <&S7F>; - qcom,vdd-wlan-rfa2-config = <1316000 1400000 0 0 1>; + qcom,vdd-wlan-rfa2-config = <1352000 1400000 0 0 1>; vdd-wlan-ant-share-supply = <&L3K>; qcom,vdd-wlan-ant-share-config = <1200000 1200000 0 0 1>; - //TODO: extractor regulator is required or not - // TODO PDC TABLE BUS BW - // PDC MAP AND PMU Vreg Map + vdd-wlan-supply = <&S7G>; + qcom,vdd-wlan-config = <952000 1100000 0 0 1>; + + qcom,pdc_init_table = + " {class: wlan_pdc, ss: rf, res: S8F0.v, upval: 1900}", + " {class: wlan_pdc, ss: rf, res: S8F0.v, dwnval: 1860}", + " {class: wlan_pdc, ss: rf, res: S7F0.v, upval: 1352}", + " {class: wlan_pdc, ss: rf, res: S7F0.v, dwnval: 988}", + " {class: wlan_pdc, ss: bb, res: S1J1.v, upval: 968}", + " {class: wlan_pdc, ss: bb, res: S1J1.v, dwnval: 460}", + " {class: wlan_pdc, ss: bb, res: S2J1.m, enable: 1}", + " {class: wlan_pdc, ss: bb, res: S2J1.v, enable: 1}", + " {class: wlan_pdc, ss: rf, res: S7G0.m, enable: 1}", + " {class: wlan_pdc, ss: rf, res: S7G0.v, enable: 1}"; /* cpu mask used for wlan tx rx interrupt affinity * From e5cf27c3defbd84095ad674df80d3b1fba4cd3c1 Mon Sep 17 00:00:00 2001 From: AMAN KUMAR Date: Wed, 11 Dec 2024 11:00:56 +0530 Subject: [PATCH 08/13] ARM: dts: msm: Update iommu-geometry properties Update size-cells and address-cells properties of iommu-geometry on Canoe kiwi device tree. Change-Id: I6dc06c037a7e9fc955dd9ac5be9e41713aa21a82 CRs-Fixed: 3998028 --- canoe-kiwi-cnss.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/canoe-kiwi-cnss.dtsi b/canoe-kiwi-cnss.dtsi index a40fe5c0..0722627e 100644 --- a/canoe-kiwi-cnss.dtsi +++ b/canoe-kiwi-cnss.dtsi @@ -145,7 +145,7 @@ cnss_pci_iommu_group0: cnss_pci_iommu_group0 { qcom,iommu-msi-size = <0x1000>; - qcom,iommu-geometry = <0x98000000 0x18010000>; + qcom,iommu-geometry = <0x0 0x98000000 0x0 0x18010000>; qcom,iommu-dma = "fastmap"; qcom,iommu-pagetable = "coherent"; qcom,iommu-faults = "stall-disable", "HUPCF", From 8cacdbf24b0470db6d29eb165608b8287bfd2fef Mon Sep 17 00:00:00 2001 From: Kartikey Arora Date: Fri, 13 Dec 2024 10:45:01 +0530 Subject: [PATCH 09/13] ARM: dts: msm: Update reg cfg and pdc cmd for Kera This change updates the regulator config and pdc init table in kera dtsi files. Change-Id: I74140414c061ffe16b41a1f40ad67cf5f3aabe65 CRs-Fixed: 4000320 --- kera-qca6750.dtsi | 6 +++--- kera-wcn7750.dtsi | 9 ++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/kera-qca6750.dtsi b/kera-qca6750.dtsi index 8803075d..30d254f0 100644 --- a/kera-qca6750.dtsi +++ b/kera-qca6750.dtsi @@ -91,11 +91,11 @@ qcom,wlan-msa-fixed-region = <&wlan_msa_mem>; vdd-cx-mx-supply = <&S3B>; - qcom,vdd-cx-mx-config = <920000 2736000 0 0 0>; + qcom,vdd-cx-mx-config = <920000 1040000 0 0 0>; vdd-1.8-xo-supply = <&S1B>; - qcom,vdd-1.8-xo-config = <1856000 2044000 0 0 0>; + qcom,vdd-1.8-xo-config = <1856000 2040000 0 0 0>; vdd-1.3-rfa-supply = <&S2B>; - qcom,vdd-1.3-rfa-config = <1256000 2092000 0 0 0>; + qcom,vdd-1.3-rfa-config = <1256000 1408000 0 0 0>; qcom,smem-states = <&smp2p_wlan_1_out 0>, <&smp2p_wlan_2_out 0>, diff --git a/kera-wcn7750.dtsi b/kera-wcn7750.dtsi index 2ab56f7f..3ec6e4f7 100644 --- a/kera-wcn7750.dtsi +++ b/kera-wcn7750.dtsi @@ -96,11 +96,11 @@ qcom,wlan-msa-fixed-region = <&wlan_msa_mem>; vdd-cx-mx-supply = <&S3B>; - qcom,vdd-cx-mx-config = <880000 2736000 0 0 0>; + qcom,vdd-cx-mx-config = <880000 1040000 0 0 0>; vdd-1.8-xo-supply = <&S1B>; - qcom,vdd-1.8-xo-config = <1856000 2044000 0 0 0>; + qcom,vdd-1.8-xo-config = <1856000 2040000 0 0 0>; vdd-1.3-rfa-supply = <&S2B>; - qcom,vdd-1.3-rfa-config = <1256000 2092000 0 0 0>; + qcom,vdd-1.3-rfa-config = <1256000 1408000 0 0 0>; vdd-1.8-io-supply = <&L11B>; qcom,vdd-1.8-io-config = <1800000 1800000 0 0 0>; @@ -114,8 +114,7 @@ " {class: wlan_pdc, ss: rf, res: s3b.v, dwnval: 696}", " {class: wlan_pdc, ss: rf, res: s1b.v, upval: 1864}", " {class: wlan_pdc, ss: rf, res: s2b.v, upval: 1316}", - " {class: wlan_pdc, ss: rf, res: s4b.e, enable: 0}", - " {class: wlan_pdc, ss: rf, res: l4k.m, enable: 1}"; + " {class: wlan_pdc, ss: rf, res: s4b.e, enable: 0}"; qcom,qmp = <&aoss_qmp>; qcom,vreg_ol_cpr ="s3b"; From c3b3a3eb1552e26af490ff858d07b4c9750d9634 Mon Sep 17 00:00:00 2001 From: Karthik Kantamneni Date: Fri, 13 Dec 2024 13:29:37 +0530 Subject: [PATCH 10/13] ARM: dts: msm: Add direct link node dtsi entry Add direct link node dtsi entry, this shares iommu domain with wlan device will be used in direct link use case. Change-Id: I9660bac1028087be02611ab7b9d16a09e3ad1323 CRs-Fixed: 4000587 --- kera-wcn7750.dtsi | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/kera-wcn7750.dtsi b/kera-wcn7750.dtsi index 2ab56f7f..2e0aa68b 100644 --- a/kera-wcn7750.dtsi +++ b/kera-wcn7750.dtsi @@ -41,6 +41,13 @@ firmware-name = "wcn7750/wpss.mdt"; }; + icnss2_direct_link_iommu_group0: icnss2_direct_link_iommu_group0 { + qcom,iommu-dma-addr-pool = <0xb0000000 0x10000000>; + qcom,iommu-geometry = <0xb0000000 0x10010000>; + qcom,iommu-dma = "fastmap"; + qcom,iommu-faults = "stall-disable", "HUPCF", "non-fatal"; + }; + icnss2: qcom,wcn7750 { compatible = "qcom,wcn7750"; reg = <0x17110040 0x0>, @@ -85,10 +92,7 @@ , ; - qcom,iommu-dma = "fastmap"; - qcom,iommu-faults = "stall-disable", "HUPCF", "non-fatal"; - qcom,iommu-dma-addr-pool = <0xb0000000 0x10000000>; - qcom,iommu-geometry = <0xb0000000 0x10010000>; + qcom,iommu-group = <&icnss2_direct_link_iommu_group0>; dma-coherent; qcom,fw-prefix; qcom,wlan; @@ -186,4 +190,11 @@ interrupt-names = "qcom,smp2p-soc-wake-ack"; }; }; + + wlan_direct_link: qcom,icnss-direct-link { + compatible = "qcom,icnss-direct-link"; + iommus = <&apps_smmu 0x100f 0x0>; + qcom,iommu-group = <&icnss2_direct_link_iommu_group0>; + dma-coherent; + }; }; From bb75f7e27b6a4df8089f6f29fd94e0882aff6681 Mon Sep 17 00:00:00 2001 From: Karthik Kantamneni Date: Mon, 16 Dec 2024 11:52:45 +0530 Subject: [PATCH 11/13] ARM: dts: msm: Add direct-link device node support for canoe Add direct-link device node support for canoe. This device node is used to program SID configuration by iommu driver. This device shares the iommu domain with normal wlan device. Change-Id: Ia54f3cea8b1bec4b9765413e562192ba22269b57 CRs-Fixed: 4001977 --- canoe-peach-cnss.dtsi | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/canoe-peach-cnss.dtsi b/canoe-peach-cnss.dtsi index 3de347e6..17f9d1db 100644 --- a/canoe-peach-cnss.dtsi +++ b/canoe-peach-cnss.dtsi @@ -146,6 +146,19 @@ */ wlan-txrx-intr-cpumask = <0x3 0x30>; }; + + wlan_direct_link: qcom,cnss-direct-link { + compatible = "qcom,cnss-direct-link"; + iommus = <&apps_smmu 0x100f 0x0>; + qcom,iommu-group = <&cnss_audio_iommu_group0>; + memory-region = <&direct_link_iommu_region_partition>; + dma-coherent; + + direct_link_iommu_region_partition: direct_link_iommu_region_partition { + iommu-addresses = <&wlan_direct_link 0x0 0x0 0x0 0x18000000>, + <&wlan_direct_link 0x0 0xb0000000 0x0 0x50000000>; + }; + }; }; &pcie_rp { From c7e6793e97b71f74a3215525edf8f01f7a352c05 Mon Sep 17 00:00:00 2001 From: Manikanta Pubbisetty Date: Thu, 12 Dec 2024 16:49:59 +0530 Subject: [PATCH 12/13] ARM: dts: msm: Update WLAN IB voting for tuna Currently the WLAN SNOC voting is set based on PCIe SN4 BCM width as 16.The PCIe port width has been updated to 8 for tuna. Hence, this change will bring in the corresponding WLAN SNOC voting to support the new width. Also, update the DDR voting accordingly. CRs-Fixed: 3999629 Change-Id: Iff5b87616f1f340257096826906ca77bdba4ce29 --- tuna-kiwi-cnss.dtsi | 30 +++++++++++++++--------------- tuna-wcn7750.dtsi | 30 +++++++++++++++--------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/tuna-kiwi-cnss.dtsi b/tuna-kiwi-cnss.dtsi index 1eed8a92..f0f48637 100644 --- a/tuna-kiwi-cnss.dtsi +++ b/tuna-kiwi-cnss.dtsi @@ -133,39 +133,39 @@ /** ICC Path 1 **/ <0 0>, /* no vote */ /* idle: 0-18 Mbps snoc/anoc: 100 Mhz */ - <2250 1200000>, + <2250 400000>, /* low: 18-60 Mbps snoc/anoc: 100 Mhz */ - <7500 1200000>, + <7500 400000>, /* medium: 60-240 Mbps snoc/anoc: 100 Mhz */ - <30000 1200000>, + <30000 400000>, /* high: 240-1200 Mbps snoc/anoc: 100 Mhz */ - <100000 1200000>, + <100000 400000>, /* very high: > 1200 Mbps snoc/anoc: 403 Mhz */ - <175000 3224000>, + <175000 1612000>, /* ultra high: DBS mode snoc/anoc: 403 Mhz */ - <312500 3224000>, + <312500 1612000>, /* super high: DBS mode snoc/anoc: 533 Mhz */ - <587500 4264000>, + <587500 2171000>, /* low (latency critical): 18-60 Mbps snoc/anoc: 200 Mhz */ - <7500 1600000>, + <7500 800000>, /** ICC Path 2 **/ <0 0>, - /* idle: 0-18 Mbps ddr: 451.2 MHz */ + /* idle: 0-18 Mbps ddr: 547 MHz */ <2250 2188800>, - /* low: 18-60 Mbps ddr: 451.2 MHz */ + /* low: 18-60 Mbps ddr: 547 MHz */ <7500 2188800>, - /* medium: 60-240 Mbps ddr: 451.2 MHz */ + /* medium: 60-240 Mbps ddr: 547 MHz */ <30000 2188800>, - /* high: 240-1200 Mbps ddr: 451.2 MHz */ + /* high: 240-1200 Mbps ddr: 547 MHz */ <100000 2188800>, /* very high: > 1200 Mbps ddr: 1555 MHz */ <175000 6220800>, /* ultra high: DBS mode ddr: 2092 MHz */ - <312500 8368000>, + <312500 8371200>, /* super high: DBS mode ddr: 3.2 GHz */ - <587500 12800000>, - /* low (latency critical): 18-60 Mbps ddr: 451.2 MHz */ + <587500 14745600>, + /* low (latency critical): 18-60 Mbps ddr: 547 MHz */ <7500 2188800>; qcom,pdc_init_table = diff --git a/tuna-wcn7750.dtsi b/tuna-wcn7750.dtsi index 97d70346..c0c276c3 100644 --- a/tuna-wcn7750.dtsi +++ b/tuna-wcn7750.dtsi @@ -125,39 +125,39 @@ /** ICC Path 1 **/ <0 0>, /* no vote */ /* idle: 0-18 Mbps snoc/anoc: 100 Mhz */ - <2250 1200000>, + <2250 400000>, /* low: 18-60 Mbps snoc/anoc: 100 Mhz */ - <7500 1200000>, + <7500 400000>, /* medium: 60-240 Mbps snoc/anoc: 100 Mhz */ - <30000 1200000>, + <30000 400000>, /* high: 240-1200 Mbps snoc/anoc: 100 Mhz */ - <100000 1200000>, + <100000 400000>, /* very high: > 1200 Mbps snoc/anoc: 403 Mhz */ - <175000 3224000>, + <175000 1612000>, /* ultra high: DBS mode snoc/anoc: 403 Mhz */ - <312500 3224000>, + <312500 1612000>, /* super high: DBS mode snoc/anoc: 533 Mhz */ - <587500 4264000>, + <587500 2171000>, /* low (latency critical): 18-60 Mbps snoc/anoc: 200 Mhz */ - <7500 1600000>, + <7500 800000>, /** ICC Path 2 **/ <0 0>, - /* idle: 0-18 Mbps ddr: 451.2 MHz */ + /* idle: 0-18 Mbps ddr: 547 MHz */ <2250 2188800>, - /* low: 18-60 Mbps ddr: 451.2 MHz */ + /* low: 18-60 Mbps ddr: 547 MHz */ <7500 2188800>, - /* medium: 60-240 Mbps ddr: 451.2 MHz */ + /* medium: 60-240 Mbps ddr: 547 MHz */ <30000 2188800>, - /* high: 240-1200 Mbps ddr: 451.2 MHz */ + /* high: 240-1200 Mbps ddr: 547 MHz */ <100000 2188800>, /* very high: > 1200 Mbps ddr: 1555 MHz */ <175000 6220800>, /* ultra high: DBS mode ddr: 2092 MHz */ - <312500 8368000>, + <312500 8371200>, /* super high: DBS mode ddr: 3.2 GHz */ - <587500 12800000>, - /* low (latency critical): 18-60 Mbps ddr: 451.2 MHz */ + <587500 14745600>, + /* low (latency critical): 18-60 Mbps ddr: 547 MHz */ <7500 2188800>; icnss_cdev_apss: qcom,icnss_cdev1 { From 34ecda8daf855e68ca1939f5b77d210338bb115b Mon Sep 17 00:00:00 2001 From: AMAN KUMAR Date: Tue, 10 Dec 2024 17:34:53 +0530 Subject: [PATCH 13/13] ARM: dts: msm: Enable Open Loop CPR feature for Kiwi Add config to enable regulator to PDC mapping and PMU to regulator mapping for canoe kiwi devicetree. Change-Id: I72dba4f6de2788aeb4860d35c83ae8540e6a9076 CRs-Fixed: 3998205 --- canoe-kiwi-cnss.dtsi | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/canoe-kiwi-cnss.dtsi b/canoe-kiwi-cnss.dtsi index a40fe5c0..d7a7ad27 100644 --- a/canoe-kiwi-cnss.dtsi +++ b/canoe-kiwi-cnss.dtsi @@ -108,6 +108,24 @@ vdd-wlan-supply = <&S7G>; qcom,vdd-wlan-config = <952000 1100000 0 0 1>; + qcom,vreg_pdc_map = + "S2J1", "bb", + "S1J1", "bb", + "S8F0", "rf", + "S7F0", "rf", + "S7G0", "rf"; + + qcom,pmu_vreg_map = + "VDD095_MX_PMU", "S2J1", + "VDD095_PMU", "S1J1", + "VDD_PMU_AON_I", "S7G0", + "VDD095_PMU_BT", "S7G0", + "VDD09_PMU_RFA_I", "S7G0", + "VDD13_PMU_PCIE_I", "S7F0", + "VDD13_PMU_RFA_I", "S7F0", + "VDD19_PMU_PCIE_I", "S8F0", + "VDD19_PMU_RFA_I", "S8F0"; + qcom,pdc_init_table = " {class: wlan_pdc, ss: rf, res: S8F0.v, upval: 1900}", " {class: wlan_pdc, ss: rf, res: S8F0.v, dwnval: 1860}",