iommu: intel: make DMAR_TABLE select IOMMU_API
Subsystems (2)
PATCH 1/1 iommu: intel: make DMAR_TABLE select IOMMU_API
From: Bartosz Golaszewski <[email protected]>
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) {
^--- drivers/iommu/intel/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iommu/intel/Kconfig +1 -1
@@ -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
Signature · 1 line
2.28.0
Lu Baolu
maintainerHi,
Quoted 11 lines · Bartosz Golaszewski
From: Bartosz Golaszewski <[email protected]>
Since commit
c40aaaac1018("iommu/vt-d: Gracefully handle DMAR units with no supported address widths")dmar.cneeds structiommu_deviceto be defined. We need to unconditionally selectIOMMU_APIwhenDMAR_TABLEis selected. This fixes the following build error whenIOMMU_APIis 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
Quoted 18 lines
^Fixes c40aaaac1018 ("iommu/vt-d: Gracefully handle DMAR units with no supported address widths")Signed-off-by Bartosz Golaszewski <[email protected]>--- drivers/iommu/intel/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/iommu/intel/Kconfig +1
-0@@ -1,13 +1,13 @@ # SPDX-License-Identifier: GPL-2.0-only # Intel IOMMU support config DMAR_TABLE + select IOMMU_API
drivers/iommu/intel/Kconfig line 13
Quoted 10 lines
drivers/iommu/intel/Kconfig +0
-1bool 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
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Quoted 16 lines · Lu Baolu
Hi,
Quoted 11 lines · Bartosz Golaszewski
From: Bartosz Golaszewski <[email protected]>
Since commit
c40aaaac1018("iommu/vt-d: Gracefully handle DMAR units with no supported address widths")dmar.cneeds structiommu_deviceto be defined. We need to unconditionally selectIOMMU_APIwhenDMAR_TABLEis selected. This fixes the following build error whenIOMMU_APIis 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) {
Quoted 9 lines
Thanks!
How about making it symmetric with the registration code?
if (intel_iommu_enabled && !iommu->drhd->ignored)Best regards,
baolu
Sounds good, just sent out a patch.
Bartosz