korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-19 10:14:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

iommu/vt-d: Make domain_context_mapp{ed,ing}() take struct device

Browse Source 
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
David Woodhouse 2014-03-09 15:24:46 -07:00
parent 156baca8d3
commit e1f167f3fd
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/iommu/intel-iommu.c
View File

@ -1840,24 +1840,25 @@ static int domain_context_mapping_one(struct dmar_domain *domain,
} }
static int static int
domain_context_mapping(struct dmar_domain *domain, struct pci_dev *pdev, domain_context_mapping(struct dmar_domain *domain, struct device *dev,
int translation) int translation)
{ {
int ret; int ret;
struct pci_dev *tmp, *parent; struct pci_dev *pdev, *tmp, *parent;
struct intel_iommu *iommu; struct intel_iommu *iommu;
u8 bus, devfn; u8 bus, devfn;
iommu = device_to_iommu(&pdev->dev, &bus, &devfn); iommu = device_to_iommu(dev, &bus, &devfn);
if (!iommu) if (!iommu)
return -ENODEV; return -ENODEV;
ret = domain_context_mapping_one(domain, iommu, bus, devfn, ret = domain_context_mapping_one(domain, iommu, bus, devfn,
translation); translation);
if (ret) if (ret || !dev_is_pci(dev))
return ret; return ret;
/* dependent device mapping */ /* dependent device mapping */
pdev = to_pci_dev(dev);
tmp = pci_find_upstream_pcie_bridge(pdev); tmp = pci_find_upstream_pcie_bridge(pdev);
if (!tmp) if (!tmp)
return 0; return 0;
@ -1882,21 +1883,23 @@ domain_context_mapping(struct dmar_domain *domain, struct pci_dev *pdev,
translation); translation);
} }
static int domain_context_mapped(struct pci_dev *pdev) static int domain_context_mapped(struct device *dev)
{ {
int ret; int ret;
struct pci_dev *tmp, *parent; struct pci_dev *pdev, *tmp, *parent;
struct intel_iommu *iommu; struct intel_iommu *iommu;
u8 bus, devfn; u8 bus, devfn;
iommu = device_to_iommu(&pdev->dev, &bus, &devfn); iommu = device_to_iommu(dev, &bus, &devfn);
if (!iommu) if (!iommu)
return -ENODEV; return -ENODEV;
ret = device_context_mapped(iommu, bus, devfn); ret = device_context_mapped(iommu, bus, devfn);
if (!ret) if (!ret || !dev_is_pci(dev))
return ret; return ret;
/* dependent device mapping */ /* dependent device mapping */
pdev = to_pci_dev(dev);
tmp = pci_find_upstream_pcie_bridge(pdev); tmp = pci_find_upstream_pcie_bridge(pdev);
if (!tmp) if (!tmp)
return ret; return ret;
@ -2361,7 +2364,7 @@ static int iommu_prepare_identity_map(struct pci_dev *pdev,
goto error; goto error;
/* context entry init */ /* context entry init */
ret = domain_context_mapping(domain, pdev, CONTEXT_TT_MULTI_LEVEL); ret = domain_context_mapping(domain, &pdev->dev, CONTEXT_TT_MULTI_LEVEL);
if (ret) if (ret)
goto error; goto error;
@ -2485,7 +2488,7 @@ static int domain_add_dev_info(struct dmar_domain *domain,
if (ndomain != domain) if (ndomain != domain)
return -EBUSY; return -EBUSY;
ret = domain_context_mapping(domain, pdev, translation); ret = domain_context_mapping(domain, &pdev->dev, translation);
if (ret) { if (ret) {
domain_remove_one_dev_info(domain, pdev); domain_remove_one_dev_info(domain, pdev);
return ret; return ret;
@ -2870,8 +2873,8 @@ static struct dmar_domain *__get_valid_domain_for_dev(struct pci_dev *pdev)
} }
/* make sure context mapping is ok */ /* make sure context mapping is ok */
if (unlikely(!domain_context_mapped(pdev))) { if (unlikely(!domain_context_mapped(&pdev->dev))) {
ret = domain_context_mapping(domain, pdev, ret = domain_context_mapping(domain, &pdev->dev,
CONTEXT_TT_MULTI_LEVEL); CONTEXT_TT_MULTI_LEVEL);
if (ret) { if (ret) {
printk(KERN_ERR printk(KERN_ERR
@ -4159,7 +4162,7 @@ static int intel_iommu_attach_device(struct iommu_domain *domain,
u8 bus, devfn; u8 bus, devfn;
/* normally pdev is not mapped */ /* normally pdev is not mapped */
if (unlikely(domain_context_mapped(pdev))) { if (unlikely(domain_context_mapped(&pdev->dev))) {
struct dmar_domain *old_domain; struct dmar_domain *old_domain;
old_domain = find_domain(dev); old_domain = find_domain(dev);