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

Merge "Revert "arm64: dma-mapping: Attach IOMMUs as groups""

Browse source
This commit is contained in:
Linux Build Service Account 2016-08-03 21:12:51 -07:00 • committed by Gerrit - the friendly Code Review server
commit 4cffd9684d
1 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
arch/arm64/mm/dma-mapping.c
View file

@ -2115,19 +2115,12 @@ int arm_iommu_attach_device(struct device *dev,
{
int err;
int s1_bypass = 0, is_fast = 0;
struct iommu_group *group;
iommu_domain_get_attr(mapping->domain, DOMAIN_ATTR_FAST, &is_fast);
if (is_fast)
return fast_smmu_attach_device(dev, mapping);
group = iommu_group_get(dev);
if (!group) {
dev_err(dev, "Couldn't get group\n");
return -ENODEV;
}
err = iommu_attach_group(mapping->domain, group);
err = iommu_attach_device(mapping->domain, dev);
if (err)
return err;
@ -2155,7 +2148,6 @@ void arm_iommu_detach_device(struct device *dev)
{
struct dma_iommu_mapping *mapping;
int is_fast;
struct iommu_group *group;
mapping = to_dma_iommu_mapping(dev);
if (!mapping) {
@ -2169,13 +2161,7 @@ void arm_iommu_detach_device(struct device *dev)
return;
}
group = iommu_group_get(dev);
if (!group) {
dev_err(dev, "Couldn't get group\n");
return;
}
iommu_detach_group(mapping->domain, group);
iommu_detach_device(mapping->domain, dev);
kref_put(&mapping->kref, release_iommu_mapping);
dev->archdata.mapping = NULL;
set_dma_ops(dev, NULL);