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

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

Browse source 
This reverts commit commit 6a70911936 ("arm64: dma-mapping: Attach
IOMMUs as groups").  PCIe endpoint devices are no longer placed into
groups with the root complex device so we no longer need to attach as
groups in the DMA layer.

CRs-Fixed: 1036401
Change-Id: I953808314ed92e9da1ac15dc5be3d1d223fee188
Signed-off-by: Mitchel Humpherys <mitchelh@codeaurora.org>
This commit is contained in:
Mitchel Humpherys 2016-07-25 15:45:51 -07:00 • committed by Liam Mark
parent f1fa301f97
commit 805f58d1f5
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);