Messages in this thread Patch in this message | | | Subject | Re: [PATCH next] iommu: intel: make DMAR_TABLE select IOMMU_API | From | Lu Baolu <> | Date | Tue, 13 Oct 2020 09:27:04 +0800 |
| |
Hi,
On 10/12/20 8:31 PM, Bartosz Golaszewski wrote: > From: Bartosz Golaszewski <bgolaszewski@baylibre.com> > > Since commit c40aaaac1018 ("iommu/vt-d: Gracefully handle DMAR units > with no supported address widths") dmar.c needs struct iommu_device to > be defined. We need to unconditionally select IOMMU_API when DMAR_TABLE > is selected. 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) {
Thanks!
How about making it symmetric with the registration code?
if (intel_iommu_enabled && !iommu->drhd->ignored)
Best regards, baolu
> ^ > > Fixes: c40aaaac1018 ("iommu/vt-d: Gracefully handle DMAR units with no supported address widths") > Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> > --- > drivers/iommu/intel/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/iommu/intel/Kconfig b/drivers/iommu/intel/Kconfig > index 5337ee1584b0..f814b7585ba8 100644 > --- a/drivers/iommu/intel/Kconfig > +++ b/drivers/iommu/intel/Kconfig > @@ -1,13 +1,13 @@ > # SPDX-License-Identifier: GPL-2.0-only > # Intel IOMMU support > config DMAR_TABLE > + select IOMMU_API > bool > > config INTEL_IOMMU > bool "Support for Intel IOMMU using DMA Remapping Devices" > depends on PCI_MSI && ACPI && (X86 || IA64) > select DMA_OPS > - select IOMMU_API > select IOMMU_IOVA > select NEED_DMA_MAP_STATE > select DMAR_TABLE >
| |