evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cnss2: Bypass SMMU stage-1 by default

Browse source 
Bypass SMMU stage-1 till it is fully supported by WLAN driver and
device.

Change-Id: I186345c20f9b71171bba6acc8c5eaa689e39b51c
CRs-fixed: 2071634
Signed-off-by: Yue Ma <yuem@codeaurora.org>
This commit is contained in:
Yue Ma 2017-02-01 14:22:09 -08:00
parent abb697f2a1
commit 243575bddb
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/net/wireless/cnss2/pci.c
View file

@ -222,6 +222,7 @@ static int cnss_pci_init_smmu(struct cnss_pci_data *pci_priv)
struct device *dev; struct device *dev;
struct dma_iommu_mapping *mapping; struct dma_iommu_mapping *mapping;
int atomic_ctx = 1; int atomic_ctx = 1;
int s1_bypass = 1;
dev = &pci_priv->pci_dev->dev; dev = &pci_priv->pci_dev->dev;
@ -243,6 +244,15 @@ static int cnss_pci_init_smmu(struct cnss_pci_data *pci_priv)
goto release_mapping; goto release_mapping;
} }
ret = iommu_domain_set_attr(mapping->domain,
DOMAIN_ATTR_S1_BYPASS,
&s1_bypass);
if (ret) {
pr_err("Failed to set SMMU s1_bypass attribute, err = %d\n",
ret);
goto release_mapping;
}
ret = arm_iommu_attach_device(dev, mapping); ret = arm_iommu_attach_device(dev, mapping);
if (ret) { if (ret) {
pr_err("Failed to attach SMMU device, err = %d\n", ret); pr_err("Failed to attach SMMU device, err = %d\n", ret);