Commit a6624e8b authored by Joerg Roedel's avatar Joerg Roedel Committed by Ben Hutchings

iommu/amd: Fix hotplug with iommu=pt

commit 2c9195e9 upstream.

This did not work because devices are not put into the
pt_domain. Fix this.
Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
[bwh: Backported to 3.2: do not use iommu_dev_data::passthrough]
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent bac92b49
...@@ -1865,6 +1865,11 @@ static int device_change_notifier(struct notifier_block *nb, ...@@ -1865,6 +1865,11 @@ static int device_change_notifier(struct notifier_block *nb,
iommu_init_device(dev); iommu_init_device(dev);
if (iommu_pass_through) {
attach_device(dev, pt_domain);
break;
}
domain = domain_for_device(dev); domain = domain_for_device(dev);
/* allocate a protection domain if a device is added */ /* allocate a protection domain if a device is added */
...@@ -1880,10 +1885,7 @@ static int device_change_notifier(struct notifier_block *nb, ...@@ -1880,10 +1885,7 @@ static int device_change_notifier(struct notifier_block *nb,
list_add_tail(&dma_domain->list, &iommu_pd_list); list_add_tail(&dma_domain->list, &iommu_pd_list);
spin_unlock_irqrestore(&iommu_pd_list_lock, flags); spin_unlock_irqrestore(&iommu_pd_list_lock, flags);
if (!iommu_pass_through) dev->archdata.dma_ops = &amd_iommu_dma_ops;
dev->archdata.dma_ops = &amd_iommu_dma_ops;
else
dev->archdata.dma_ops = &nommu_dma_ops;
break; break;
case BUS_NOTIFY_DEL_DEVICE: case BUS_NOTIFY_DEL_DEVICE:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment