redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

iommu/vt-d: Make dmar_insert_dev_info() take struct device instead of struct pci_dev

Browse source 
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
David Woodhouse 2014-03-06 16:19:30 +00:00
parent 3d89194a94
commit 1525a29a7d
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
drivers/iommu/intel-iommu.c
View file

@ -2113,15 +2113,14 @@ static void domain_remove_dev_info(struct dmar_domain *domain)
/* /*
* find_domain * find_domain
* Note: we use struct pci_dev->dev.archdata.iommu stores the info * Note: we use struct device->archdata.iommu stores the info
*/ */
static struct dmar_domain * static struct dmar_domain *find_domain(struct device *dev)
find_domain(struct pci_dev *pdev)
{ {
struct device_domain_info *info; struct device_domain_info *info;
/* No lock here, assumes no domain exit in normal case */ /* No lock here, assumes no domain exit in normal case */
info = pdev->dev.archdata.iommu; info = dev->archdata.iommu;
if (info) if (info)
return info->domain; return info->domain;
return NULL; return NULL;
@ -2161,7 +2160,7 @@ static int dmar_insert_dev_info(int segment, int bus, int devfn,
spin_lock_irqsave(&device_domain_lock, flags); spin_lock_irqsave(&device_domain_lock, flags);
if (dev) if (dev)
found = find_domain(dev); found = find_domain(&dev->dev);
else else
found = dmar_search_domain_by_dev_info(segment, bus, devfn); found = dmar_search_domain_by_dev_info(segment, bus, devfn);
if (found) { if (found) {
@ -2193,7 +2192,7 @@ static struct dmar_domain *get_domain_for_dev(struct pci_dev *pdev, int gaw)
int bus = 0, devfn = 0; int bus = 0, devfn = 0;
int segment; int segment;
domain = find_domain(pdev); domain = find_domain(&pdev->dev);
if (domain) if (domain)
return domain; return domain;
@ -2252,7 +2251,7 @@ error:
if (free) if (free)
domain_exit(free); domain_exit(free);
/* recheck it here, maybe others set it */ /* recheck it here, maybe others set it */
return find_domain(pdev); return find_domain(&pdev->dev);
} }
static int iommu_identity_mapping; static int iommu_identity_mapping;
@ -3108,7 +3107,7 @@ static void intel_unmap_page(struct device *dev, dma_addr_t dev_addr,
if (iommu_no_mapping(dev)) if (iommu_no_mapping(dev))
return; return;
domain = find_domain(pdev); domain = find_domain(dev);
BUG_ON(!domain); BUG_ON(!domain);
iommu = domain_get_iommu(domain); iommu = domain_get_iommu(domain);
@ -3200,7 +3199,7 @@ static void intel_unmap_sg(struct device *hwdev, struct scatterlist *sglist,
if (iommu_no_mapping(hwdev)) if (iommu_no_mapping(hwdev))
return; return;
domain = find_domain(pdev); domain = find_domain(hwdev);
BUG_ON(!domain); BUG_ON(!domain);
iommu = domain_get_iommu(domain); iommu = domain_get_iommu(domain);
@ -3808,7 +3807,7 @@ static int device_notifier(struct notifier_block *nb,
action != BUS_NOTIFY_DEL_DEVICE) action != BUS_NOTIFY_DEL_DEVICE)
return 0; return 0;
domain = find_domain(pdev); domain = find_domain(dev);
if (!domain) if (!domain)
return 0; return 0;
@ -4147,7 +4146,7 @@ static int intel_iommu_attach_device(struct iommu_domain *domain,
if (unlikely(domain_context_mapped(pdev))) { if (unlikely(domain_context_mapped(pdev))) {
struct dmar_domain *old_domain; struct dmar_domain *old_domain;
old_domain = find_domain(pdev); old_domain = find_domain(dev);
if (old_domain) { if (old_domain) {
if (dmar_domain->flags & DOMAIN_FLAG_VIRTUAL_MACHINE || if (dmar_domain->flags & DOMAIN_FLAG_VIRTUAL_MACHINE ||
dmar_domain->flags & DOMAIN_FLAG_STATIC_IDENTITY) dmar_domain->flags & DOMAIN_FLAG_STATIC_IDENTITY)