Commit-ID: 420aef8a3acfc3e75427107e23d5a9bafd17c477
Gitweb: http://git.kernel.org/tip/420aef8a3acfc3e75427107e23d5a9bafd17c477
Author: Joerg Roedel <joerg.roedel@xxxxxxx>
AuthorDate: Mon, 23 Nov 2009 16:14:57 +0100
Committer: Joerg Roedel <joerg.roedel@xxxxxxx>
CommitDate: Fri, 27 Nov 2009 14:16:30 +0100
x86/amd-iommu: Use check_device for amd_iommu_dma_supported
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@xxxxxxx>
---
arch/x86/kernel/amd_iommu.c | 35 +++++++++++++++++++----------------
1 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c
index 5ebd24e..ac27b1d 100644
--- a/arch/x86/kernel/amd_iommu.c
+++ b/arch/x86/kernel/amd_iommu.c
@@ -1375,9 +1375,27 @@ static struct notifier_block device_nb = {
*/
static bool check_device(struct device *dev)
{
+ u16 bdf;
+ struct pci_dev *pcidev;
+
if (!dev || !dev->dma_mask)
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;
}
@@ -2065,22 +2083,7 @@ free_mem:
*/
static int amd_iommu_dma_supported(struct device *dev, u64 mask)
{
- u16 bdf;
- 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;
+ return check_device(dev);
}
/*
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|