diff options
| author | Bartosz Golaszewski <bgolaszewski@baylibre.com> | 2020-10-13 10:30:55 +0300 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2020-10-19 15:16:02 +0300 |
| commit | 9def3b1a07c41e21c68a0eb353e3e569fdd1d2b1 (patch) | |
| tree | 44402cd4e0eacb88b173d89301bc3c0fb09f6588 /drivers | |
| parent | 7e3c3883c381aeda903778d7e99fc4cd523be610 (diff) | |
| download | linux-9def3b1a07c41e21c68a0eb353e3e569fdd1d2b1.tar.xz | |
iommu/vt-d: Don't dereference iommu_device if IOMMU_API is not built
Since commit c40aaaac1018 ("iommu/vt-d: Gracefully handle DMAR units
with no supported address widths") dmar.c needs struct iommu_device to
be selected. We can drop this dependency by not dereferencing struct
iommu_device if IOMMU_API is not selected and by reusing the information
stored in iommu->drhd->ignored instead.
This fixes the following build error when IOMMU_API is not selected:
drivers/iommu/intel/dmar.c: In function ‘free_iommu’:
drivers/iommu/intel/dmar.c:1139:41: error: ‘struct iommu_device’ has no member named ‘ops’
1139 | if (intel_iommu_enabled && iommu->iommu.ops) {
^
Fixes: c40aaaac1018 ("iommu/vt-d: Gracefully handle DMAR units with no supported address widths")
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Acked-by: Lu Baolu <baolu.lu@linux.intel.com>
Acked-by: David Woodhouse <dwmw@amazon.co.uk>
Link: https://lore.kernel.org/r/20201013073055.11262-1-brgl@bgdev.pl
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/iommu/intel/dmar.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iommu/intel/dmar.c b/drivers/iommu/intel/dmar.c index 54d790f75824..f0b614122446 100644 --- a/drivers/iommu/intel/dmar.c +++ b/drivers/iommu/intel/dmar.c @@ -1133,7 +1133,7 @@ error: static void free_iommu(struct intel_iommu *iommu) { - if (intel_iommu_enabled && iommu->iommu.ops) { + if (intel_iommu_enabled && !iommu->drhd->ignored) { iommu_device_unregister(&iommu->iommu); iommu_device_sysfs_remove(&iommu->iommu); } |