Received-SPF: pass (google.com: domain of linux-kernel+bounces-122786-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Thu, 28 Mar 2024 11:36:54 +0100
From: Pavel Machek <pavel@denx.de>
To: Sasha Levin <sashal@kernel.org>
Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org,
	Bert Karwatzki <spasswolf@web.de>,
	Lu Baolu <baolu.lu@linux.intel.com>, Joerg Roedel <jroedel@suse.de>
Subject: Re: [PATCH 6.1 212/451] iommu: Fix compilation without
 CONFIG_IOMMU_INTEL
Message-ID: <ZgVIRpCkWtJvEWnf@duo.ucw.cz>
References: <20240324231207.1351418-1-sashal@kernel.org>
 <20240324231207.1351418-213-sashal@kernel.org>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="vZ6/CY6IfejnIZqG"
Content-Disposition: inline
In-Reply-To: <20240324231207.1351418-213-sashal@kernel.org>


--vZ6/CY6IfejnIZqG
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi!

> [ Upstream commit 70bad345e622c23bb530016925c936ab04a646ac ]
>=20
> 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.

We don't have commit def054b01a8678 in -stable, so we should not need
this.

Best regards,
								Pavel

> +++ b/drivers/iommu/Kconfig
> @@ -192,7 +192,7 @@ source "drivers/iommu/intel/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 7af3b8a4f2a00..29d26a4371327 100644
> --- 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 83314b9d8f38b..ee59647c20501 100644
> --- 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;
> =20
> -	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)

--=20
DENX Software Engineering GmbH,        Managing Director: Erika Unter
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

--vZ6/CY6IfejnIZqG
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRPfPO7r0eAhk010v0w5/Bqldv68gUCZgVIRgAKCRAw5/Bqldv6
8gZYAJ0dAltTpDHidc4ImFcKiK5HNSKFhgCcCqMLqo5lIL5+3AZeO+JDJB4mEjE=
=FF3G
-----END PGP SIGNATURE-----

--vZ6/CY6IfejnIZqG--