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

Merge "iommu/arm-smmu: Don't group PCI devices"

Browse source
This commit is contained in:
Linux Build Service Account 2016-08-01 21:56:46 -07:00 • committed by Gerrit - the friendly Code Review server
commit 6bdacafee4
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/iommu/arm-smmu.c
View file

@ -2848,10 +2848,16 @@ static struct iommu_group *arm_smmu_device_group(struct device *dev)
struct iommu_group *group;
int ret;
if (dev_is_pci(dev))
group = pci_device_group(dev);
else
group = generic_device_group(dev);
/*
* We used to call pci_device_group here for dev_is_pci(dev)
* devices. However, that causes the root complex device to be
* placed in the same group as endpoint devices (and probably puts
* all endpoint devices in the same group as well), which makes
* things tricky in the DMA layer since we don't actually want to
* attach *everybody* in the group when one client calls attach.
* Instead, we'll just allocate a new group for everybody here.
*/
group = generic_device_group(dev);
if (IS_ERR(group))
return group;