summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorDavid Woodhouse <David.Woodhouse@intel.com>2014-03-28 15:28:40 +0400
committerDavid Woodhouse <David.Woodhouse@intel.com>2014-03-28 15:28:40 +0400
commit63b4262478ee6384c7efb5279be54236e5d6361b (patch)
treeb76a1d8c045dd81b65d6b64463b9c4ecbbe42231 /drivers
parent11f1a7768cb9179b1f1ce6b8027df7531e0704e7 (diff)
downloadlinux-63b4262478ee6384c7efb5279be54236e5d6361b.tar.xz
iommu/vt-d: Only call dmar_acpi_dev_scope_init() if DRHD units present
As pointed out by Jörg and fixed in commit 11f1a7768 ("iommu/vt-d: Check for NULL pointer in dmar_acpi_dev_scope_init(), this code path can bizarrely get exercised even on AMD IOMMU systems with IRQ remapping enabled. In addition to the defensive check for NULL which Jörg added, let's also just avoid calling the function at all if there aren't an Intel IOMMU units in the system. Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/iommu/dmar.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c
index e531a2b07207..142650e82979 100644
--- a/drivers/iommu/dmar.c
+++ b/drivers/iommu/dmar.c
@@ -698,13 +698,13 @@ int __init dmar_dev_scope_init(void)
if (dmar_dev_scope_status != 1)
return dmar_dev_scope_status;
- dmar_acpi_dev_scope_init();
-
if (list_empty(&dmar_drhd_units)) {
dmar_dev_scope_status = -ENODEV;
} else {
dmar_dev_scope_status = 0;
+ dmar_acpi_dev_scope_init();
+
for_each_pci_dev(dev) {
if (dev->is_virtfn)
continue;