From 4ae1ae18331e54470999920f734e07ca28ce3541 Mon Sep 17 00:00:00 2001 From: Amir Levy Date: Wed, 16 Dec 2020 11:25:57 +0200 Subject: [PATCH] ARM: dts: msm: enable more SIDs Enable SIDs for eth/eth1/wlan1. Add max number of CB parameter. Change-Id: Ib1b1eb5d95cf5f407dc1d8229f52b631f54a94c9 --- bindings/platform/msm/ipa.txt | 7 +++++++ qcom/sdxlemur.dtsi | 20 ++++++++++++++++---- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/bindings/platform/msm/ipa.txt b/bindings/platform/msm/ipa.txt index 9b8bc6cead21..8a083792725c 100644 --- a/bindings/platform/msm/ipa.txt +++ b/bindings/platform/msm/ipa.txt @@ -46,6 +46,12 @@ Optional: compatible "qcom,ipa-smmu-uc-cb" - ipa_smmu_11ad: 11AD SMMU device compatible "qcom,ipa-smmu-11ad-cb" +- ipa_smmu_wlan1: WDI (PINE) SMMU device + compatible "qcom,ipa-smmu-wlan1-cb" +- ipa_smmu_eth: ETH (AQC/RTK/NTN) SMMU device + compatible "qcom,ipa-smmu-eth-cb" +- ipa_smmu_eth1: ETH1 (WAN/CV2X) SMMU device + compatible "qcom,ipa-smmu-eth1-cb" - qcom,use-a2-service: determine if A2 service will be used - qcom,use-ipa-tethering-bridge: determine if tethering bridge will be used - qcom,use-ipa-in-mhi-mode: Boolean context flag to indicate whether @@ -127,6 +133,7 @@ memory allocation over a PCIe bridge 2 (override scm call as though it returned false) - qcom,ipa-gpi-event-rp-ddr: Boolean context flag to control whether GPI and GCI event rings read pointer should be read from the ddr. +- qcom,max_num_smmu_cb: number of active smmu context banks for target. IPA pipe sub nodes (A2 static pipes configurations): diff --git a/qcom/sdxlemur.dtsi b/qcom/sdxlemur.dtsi index 60d1be464806..d2590e07ba3b 100644 --- a/qcom/sdxlemur.dtsi +++ b/qcom/sdxlemur.dtsi @@ -1087,6 +1087,7 @@ clocks = <&rpmhcc RPMH_IPA_CLK>; qcom,interconnect,num-cases = <5>; qcom,interconnect,num-paths = <4>; + qcom,max_num_smmu_cb = <6>; interconnects = <&system_noc MASTER_IPA &mem_noc SLAVE_LLCC>, <&mc_virt MASTER_LLCC &mc_virt SLAVE_EBI1>, <&system_noc MASTER_IPA &system_noc SLAVE_IMEM>, @@ -1142,11 +1143,22 @@ qcom,iommu-dma = "atomic"; }; - ipa_smmu_11ad: ipa_smmu_11ad { - compatible = "qcom,ipa-smmu-11ad-cb"; + ipa_smmu_eth: ipa_smmu_eth { + compatible = "qcom,ipa-smmu-eth-cb"; iommus = <&apps_smmu 0x5E3 0x0>; - qcom,shared-cb; - qcom,iommu-group = <>; + qcom,iommu-dma = "atomic"; + }; + + ipa_smmu_eth1: ipa_smmu_eth1 { + compatible = "qcom,ipa-smmu-eth1-cb"; + iommus = <&apps_smmu 0x5E4 0x0>; + qcom,iommu-dma = "atomic"; + }; + + ipa_smmu_wlan1: ipa_smmu_wlan1 { + compatible = "qcom,ipa-smmu-wlan1-cb"; + iommus = <&apps_smmu 0x5E5 0x0>; + qcom,iommu-dma = "atomic"; }; /* smp2p information */