Received-SPF: pass (google.com: domain of linux-kernel+bounces-96125-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
From: Bert Karwatzki <spasswolf@web.de>
To: Lu Baolu <baolu.lu@linux.intel.com>
Cc: Bert Karwatzki <spasswolf@web.de>,
	haifeng.zhao@linux.intel.com,
	iommu@lists.linux.dev,
	jgg@ziepe.ca,
	jiaqing.huang@intel.com,
	joro@8bytes.org,
	kevin.tian@intel.com,
	linux-kernel@vger.kernel.org,
	robin.murphy@arm.com,
	will@kernel.org
Subject: [PATCH] iommu: fix compilation without CONFIG_IOMMU_INTEL
Date: Thu,  7 Mar 2024 20:44:19 +0100
Message-Id: <20240307194419.15801-1-spasswolf@web.de>
In-Reply-To: 20240220065939.121116-3-baolu.lu@linux.intel.com
References: 
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
UI-OutboundReport: notjunk:1;M01:P0:uYplgaJgDq4=;lgloB+JWZWvvLi7QdmHQOxfxNN3
 aS5Sla3GXqZfGR3FlPg6y2xlqCq6/8r+GJ0k/JKRy5GXsOBWXMcnw6rp4D3jcVjo3WAqy5Kjr
 zrV5le4MKHxYWjeoAyCHMsHCg8EfrpZlwZ25Mpj8GBqNpWbGVYaL1a0brYYMyHosh+3EAUN89
 x4cBxevhepngAE4317fPRzu2c+weMhaGwJNhxDczoSTJ5PVemrrIax8rxBLQIQPfCykCtikTm
 ZbK/eWEMXugl1fCzURsDX0neVkUS5MGRa4VLG7zvRSu+eax/68VOtp669qPuzq9ZlSY5T2oYF
 HTC+MN/M+HnoKi4mjH0dW+nJD9tOSclLvBULEVCed8m5s3yg/k/glavVOCtMPsGStwU0QTks7
 EFtwa68wSvsB79l2K/DhcM6XZm7shTHoRN240LUC3Alkz4HlTk8ITcS+K199CjV18uB6ysJ9Z
 jPy1K/7iEnxpCU8o72/Kcm850x3jNpw77vAxYSJDD2Fzf5mYT+sOwPeC03Whj4GfoIQkFpucS
 MhM0RxYqC/SSfMtxEBDge/Veubgwo7lVhKrKD6RPPVrtDcCKiO23OV2KXO+M/HaGt7TVBzqqP
 SF6hcYSGEFMWKJ47LdnI1SiNbCOb7ahjGlz8YmkULTujXV/Rd5lhuBrq/4fwSsCxcxTNKXnH4
 Hl3K9GSbD8/EgDz5oYqUmTGnft9E90pbibiWAVjgLkwlqNuXkTXf+akzsxJwJ60E/YRiLkBXZ
 QGnmJSvPWvQUFUB38QxAPmFlx5xPtWysFpyhktZ16DNp4KhsG29qd2mRcRXS2fRXHL9J6PLFh
 Yl/gDm4uLKMyHeWZ2yw0sMgpGGt/ed1g3r5G48D4iUzHs=

When the kernel is comiled with CONFIG_IRQ_REMAP=3Dy but without
CONFIG_IOMMU_INTEL compilation fails since commit def054b01a8678 with an
undefined reference to device_rbtree_find(). This patch makes sure that
intel specific code is only compiled with CONFIG_IOMMU_INTEL=3Dy.

Fixes: def054b01a8678 ("iommu/vt-d: Use device rbtree in iopf reporting pa=
th")

Signed-off-by: Bert Karwatzki <spasswolf@web.de>
=2D--
 drivers/iommu/Kconfig         | 2 +-
 drivers/iommu/intel/Makefile  | 2 ++
 drivers/iommu/irq_remapping.c | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index e0796fa84227..0af39bbbe3a3 100644
=2D-- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -199,7 +199,7 @@ source "drivers/iommu/iommufd/Kconfig"
 config IRQ_REMAP
 	bool "Support for Interrupt Remapping"
 	depends on X86_64 && X86_IO_APIC && PCI_MSI && ACPI
-	select DMAR_TABLE
+	select DMAR_TABLE if INTEL_IOMMU
 	help
 	  Supports Interrupt remapping for IO-APIC and MSI devices.
 	  To use x2apic mode in the CPU's which support x2APIC enhancements or
diff --git a/drivers/iommu/intel/Makefile b/drivers/iommu/intel/Makefile
index 5dabf081a779..5402b699a122 100644
=2D-- a/drivers/iommu/intel/Makefile
+++ b/drivers/iommu/intel/Makefile
@@ -5,5 +5,7 @@ obj-$(CONFIG_DMAR_TABLE) +=3D trace.o cap_audit.o
 obj-$(CONFIG_DMAR_PERF) +=3D perf.o
 obj-$(CONFIG_INTEL_IOMMU_DEBUGFS) +=3D debugfs.o
 obj-$(CONFIG_INTEL_IOMMU_SVM) +=3D svm.o
+ifdef CONFIG_INTEL_IOMMU
 obj-$(CONFIG_IRQ_REMAP) +=3D irq_remapping.o
+endif
 obj-$(CONFIG_INTEL_IOMMU_PERF_EVENTS) +=3D perfmon.o
diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c
index 83314b9d8f38..ee59647c2050 100644
=2D-- a/drivers/iommu/irq_remapping.c
+++ b/drivers/iommu/irq_remapping.c
@@ -99,7 +99,8 @@ int __init irq_remapping_prepare(void)
 	if (disable_irq_remap)
 		return -ENOSYS;

-	if (intel_irq_remap_ops.prepare() =3D=3D 0)
+	if (IS_ENABLED(CONFIG_INTEL_IOMMU) &&
+	    intel_irq_remap_ops.prepare() =3D=3D 0)
 		remap_ops =3D &intel_irq_remap_ops;
 	else if (IS_ENABLED(CONFIG_AMD_IOMMU) &&
 		 amd_iommu_irq_ops.prepare() =3D=3D 0)
=2D-
2.39.2

Since commit def054b01a8678 compilation fails on x86_64 without
CONFIG_IOMMU_INTEL=3Dy with an undefined reference to device_rbtree_find()
when linking drivers/iommu/intel/dmar.o. Even though this file is intel
specific it is compile because CONFIG_IRQ_REMAP unconditionally selects
CONFIG_DMAR_TABLE. This patch fixes this by only compiling intel
specific files when CONFIG_IOMMU_INTEL=3Dy.

Bert Karwatzki