Commit 9def3b1a authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Joerg Roedel

iommu/vt-d: Don't dereference iommu_device if IOMMU_API is not built

Since commit c40aaaac ("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: c40aaaac ("iommu/vt-d: Gracefully handle DMAR units with no supported address widths")
Signed-off-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
Acked-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Acked-by: default avatarDavid Woodhouse <dwmw@amazon.co.uk>
Link: https://lore.kernel.org/r/20201013073055.11262-1-brgl@bgdev.plSigned-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 7e3c3883
...@@ -1133,7 +1133,7 @@ static int alloc_iommu(struct dmar_drhd_unit *drhd) ...@@ -1133,7 +1133,7 @@ static int alloc_iommu(struct dmar_drhd_unit *drhd)
static void free_iommu(struct intel_iommu *iommu) 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_unregister(&iommu->iommu);
iommu_device_sysfs_remove(&iommu->iommu); iommu_device_sysfs_remove(&iommu->iommu);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment