From a206d2ead74694730f247721fde78db8958a81e9 Mon Sep 17 00:00:00 2001 From: Zhaoyang Liu Date: Thu, 24 Sep 2020 17:37:48 +0800 Subject: [PATCH 1/2] ARM: dts: msm: configure iommu for pci wlan This change is to configure iommu for wlan. Mark iommu dma attribution as bypass. Change-Id: I6aa3c8b201d481fae25e6c51658d14875feedd8a --- qcom/sa8155-vm.dtsi | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/qcom/sa8155-vm.dtsi b/qcom/sa8155-vm.dtsi index bec54a3fb29c..7ac17c043afc 100644 --- a/qcom/sa8155-vm.dtsi +++ b/qcom/sa8155-vm.dtsi @@ -858,3 +858,21 @@ /delete-property/ qcom,msm-bus,num-paths; /delete-property/ qcom,msm-bus,vectors-bus-ids; }; + +&pcie_rc0 { + cnss_pci: cnss_pci { + reg = <0 0 0 0 0>; + qcom,iommu-group = <&cnss_pci_iommu_group>; + + #address-cells = <1>; + #size-cells = <1>; + + cnss_pci_iommu_group: cnss_pci_iommu_group { + qcom,iommu-dma-addr-pool = <0xa0000000 0x10000000>; + qcom,iommu-dma = "bypass"; + qcom,iommu-pagetable = "coherent"; + qcom,iommu-faults = "stall-disable", "no-CFRE", + "non-fatal"; + }; + }; +}; From ac65c7d162f89a6ba8ea608863bbe14bddb4d187 Mon Sep 17 00:00:00 2001 From: Zhaoyang Liu Date: Thu, 5 Nov 2020 18:59:23 +0800 Subject: [PATCH 2/2] ARM: dts: msm: enable smmu s1 for wlan on sa8155 vm Set iommu flag fastmap to enable SMMU S1 for wlan. Remove coherent definition for iommu pagetable. Change-Id: Ib6269e6dddec349aef49329d2889a32c756fce27 --- qcom/sa8155-vm.dtsi | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/qcom/sa8155-vm.dtsi b/qcom/sa8155-vm.dtsi index 7ac17c043afc..ad26a37eb609 100644 --- a/qcom/sa8155-vm.dtsi +++ b/qcom/sa8155-vm.dtsi @@ -869,8 +869,7 @@ cnss_pci_iommu_group: cnss_pci_iommu_group { qcom,iommu-dma-addr-pool = <0xa0000000 0x10000000>; - qcom,iommu-dma = "bypass"; - qcom,iommu-pagetable = "coherent"; + qcom,iommu-dma = "fastmap"; qcom,iommu-faults = "stall-disable", "no-CFRE", "non-fatal"; };