Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-31 23:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

iommu/amd: Use iommu_attach_group()

Browse Source 
Since the conversion to default domains the
iommu_attach_device function only works for devices with
their own group. But this isn't always true for current
IOMMUv2 capable devices, so use iommu_attach_group instead.

Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
Joerg Roedel 2015-07-28 16:58:47 +02:00
parent cbfe8fa6cd
commit 55c99a4dc5
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/iommu/amd_iommu_v2.c
View File

@ -132,11 +132,19 @@ static struct device_state *get_device_state(u16 devid)
static void free_device_state(struct device_state *dev_state) static void free_device_state(struct device_state *dev_state)
{ {
struct iommu_group *group;
/* /*
* First detach device from domain - No more PRI requests will arrive * First detach device from domain - No more PRI requests will arrive
* from that device after it is unbound from the IOMMUv2 domain. * from that device after it is unbound from the IOMMUv2 domain.
*/ */
iommu_detach_device(dev_state->domain, &dev_state->pdev->dev); group = iommu_group_get(&dev_state->pdev->dev);
if (WARN_ON(!group))
return;
iommu_detach_group(dev_state->domain, group);
iommu_group_put(group);
/* Everything is down now, free the IOMMUv2 domain */ /* Everything is down now, free the IOMMUv2 domain */
iommu_domain_free(dev_state->domain); iommu_domain_free(dev_state->domain);
@ -731,6 +739,7 @@ EXPORT_SYMBOL(amd_iommu_unbind_pasid);
int amd_iommu_init_device(struct pci_dev *pdev, int pasids) int amd_iommu_init_device(struct pci_dev *pdev, int pasids)
{ {
struct device_state *dev_state; struct device_state *dev_state;
struct iommu_group *group;
unsigned long flags; unsigned long flags;
int ret, tmp; int ret, tmp;
u16 devid; u16 devid;
@ -776,10 +785,16 @@ int amd_iommu_init_device(struct pci_dev *pdev, int pasids)
if (ret) if (ret)
goto out_free_domain; goto out_free_domain;
ret = iommu_attach_device(dev_state->domain, &pdev->dev); group = iommu_group_get(&pdev->dev);
if (ret != 0) if (!group)
goto out_free_domain; goto out_free_domain;
ret = iommu_attach_group(dev_state->domain, group);
if (ret != 0)
goto out_drop_group;
iommu_group_put(group);
spin_lock_irqsave(&state_lock, flags); spin_lock_irqsave(&state_lock, flags);
if (__get_device_state(devid) != NULL) { if (__get_device_state(devid) != NULL) {
@ -794,6 +809,9 @@ int amd_iommu_init_device(struct pci_dev *pdev, int pasids)
return 0; return 0;
out_drop_group:
iommu_group_put(group);
out_free_domain: out_free_domain:
iommu_domain_free(dev_state->domain); iommu_domain_free(dev_state->domain);