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

iommu/vt-d: Remove pdev from iommu_no_mapping()

Browse source 
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
David Woodhouse 2014-03-09 16:29:55 -07:00
parent 5913c9bf0e
commit ecb509ec2b
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2902,10 +2902,9 @@ static int iommu_dummy(struct device *dev)
return dev->archdata.iommu == DUMMY_DEVICE_DOMAIN_INFO; return dev->archdata.iommu == DUMMY_DEVICE_DOMAIN_INFO;
} }
/* Check if the pdev needs to go through non-identity map and unmap process.*/ /* Check if the dev needs to go through non-identity map and unmap process.*/
static int iommu_no_mapping(struct device *dev) static int iommu_no_mapping(struct device *dev)
{ {
struct pci_dev *pdev;
int found; int found;
if (unlikely(!dev_is_pci(dev))) if (unlikely(!dev_is_pci(dev)))
@ -2917,10 +2916,9 @@ static int iommu_no_mapping(struct device *dev)
if (!iommu_identity_mapping) if (!iommu_identity_mapping)
return 0; return 0;
pdev = to_pci_dev(dev);
found = identity_mapping(dev); found = identity_mapping(dev);
if (found) { if (found) {
if (iommu_should_identity_map(&pdev->dev, 0)) if (iommu_should_identity_map(dev, 0))
return 1; return 1;
else { else {
/* /*
@ -2929,7 +2927,7 @@ static int iommu_no_mapping(struct device *dev)
*/ */
domain_remove_one_dev_info(si_domain, dev); domain_remove_one_dev_info(si_domain, dev);
printk(KERN_INFO "32bit %s uses non-identity mapping\n", printk(KERN_INFO "32bit %s uses non-identity mapping\n",
pci_name(pdev)); dev_name(dev));
return 0; return 0;
} }
} else { } else {
@ -2937,7 +2935,7 @@ static int iommu_no_mapping(struct device *dev)
* In case of a detached 64 bit DMA device from vm, the device * In case of a detached 64 bit DMA device from vm, the device
* is put into si_domain for identity mapping. * is put into si_domain for identity mapping.
*/ */
if (iommu_should_identity_map(&pdev->dev, 0)) { if (iommu_should_identity_map(dev, 0)) {
int ret; int ret;
ret = domain_add_dev_info(si_domain, dev, ret = domain_add_dev_info(si_domain, dev,
hw_pass_through ? hw_pass_through ?
@ -2945,7 +2943,7 @@ static int iommu_no_mapping(struct device *dev)
CONTEXT_TT_MULTI_LEVEL); CONTEXT_TT_MULTI_LEVEL);
if (!ret) { if (!ret) {
printk(KERN_INFO "64bit %s uses identity mapping\n", printk(KERN_INFO "64bit %s uses identity mapping\n",
pci_name(pdev)); dev_name(dev));
return 1; return 1;
} }
} }