evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

x86/amd-iommu: Use check_device for amd_iommu_dma_supported

Browse source 
The check_device logic needs to include the dma_supported
checks to be really sure. Merge the dma_supported logic into
check_device and use it to implement dma_supported.

Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
This commit is contained in:
Joerg Roedel 2009-11-23 16:14:57 +01:00
parent 318afd41d2
commit 420aef8a3a
1 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
arch/x86/kernel/amd_iommu.c
View file

@ -1375,9 +1375,27 @@ static struct notifier_block device_nb = {
*/ */
static bool check_device(struct device *dev) static bool check_device(struct device *dev)
{ {
u16 bdf;
struct pci_dev *pcidev;
if (!dev || !dev->dma_mask) if (!dev || !dev->dma_mask)
return false; return false;
/* No device or no PCI device */
if (!dev || dev->bus != &pci_bus_type)
return false;
pcidev = to_pci_dev(dev);
bdf = calc_devid(pcidev->bus->number, pcidev->devfn);
/* Out of our scope? */
if (bdf > amd_iommu_last_bdf)
return false;
if (amd_iommu_rlookup_table[bdf] == NULL)
return false;
return true; return true;
} }
@ -2065,22 +2083,7 @@ free_mem:
*/ */
static int amd_iommu_dma_supported(struct device *dev, u64 mask) static int amd_iommu_dma_supported(struct device *dev, u64 mask)
{ {
u16 bdf; return check_device(dev);
struct pci_dev *pcidev;
/* No device or no PCI device */
if (!dev || dev->bus != &pci_bus_type)
return 0;
pcidev = to_pci_dev(dev);
bdf = calc_devid(pcidev->bus->number, pcidev->devfn);
/* Out of our scope? */
if (bdf > amd_iommu_last_bdf)
return 0;
return 1;
} }
/* /*