From nobody Thu Dec 18 19:42:53 2025 Received: from mx1.emlix.com (mx1.emlix.com [178.63.209.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B6ECB2951BE for ; Mon, 12 May 2025 13:16:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=178.63.209.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747055809; cv=none; b=hgijDVN/Q42W3100n0m5s8i6G3etBRqAJsrcXekUCEFNIetIaY8jbeNftXf3oXrCPx3wmtcpLnkpIpdq+LuBCuX5GCsfdy7W5FxC4sJ3zog8I6Owd0kUhguZAoxRu+JdmKI89gVyHnwf6ZS/iYjT0CXiNLVdhLCMduWP523UwAQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747055809; c=relaxed/simple; bh=MYbPtDblzJC/s5G3ktAfGJUokPDmzrPKFuBcbmY/dY8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=K7+koG2aVmxnk/qPtqrUJCmulsg5Gieqm0IGY6XrR+AZsIY09634lXGEonwPMkxO2pPTf/kVqJHkiqZYMGvBteD27p6/o1bco99junGfmu/fImwEY8k6Scipouqliq55cZsa3O5GBHZgOxQyYPbuzqj8NHwZcxqU3GlOpoYkCQ0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=emlix.com; spf=pass smtp.mailfrom=emlix.com; arc=none smtp.client-ip=178.63.209.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=emlix.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=emlix.com Received: from mailer.emlix.com (p5098be52.dip0.t-ipconnect.de [80.152.190.82]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.emlix.com (Postfix) with ESMTPS id 38DCE5FAFA; Mon, 12 May 2025 15:16:16 +0200 (CEST) From: Rolf Eike Beer To: Joerg Roedel , Will Deacon , Lu Baolu Cc: iommu@lists.linux.dev, linux-kernel@vger.kernel.org, Jerry Snitselaar Subject: [PATCH 2/6] iommu: make inclusion of intel directory conditional Date: Mon, 12 May 2025 15:11:51 +0200 Message-ID: <3818749.MHq7AAxBmi@devpool92.emlix.com> Organization: emlix GmbH In-Reply-To: <1926170.CQOukoFCf9@devpool92.emlix.com> References: <1926170.CQOukoFCf9@devpool92.emlix.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Nothing in there is active if CONFIG_INTEL_IOMMU is not enabled, so the who= le directory can depend on that switch as well. Fixes: ab65ba57e3ac ("iommu/vt-d: Move Kconfig and Makefile bits down into = intel directory") Signed-off-by: Rolf Eike Beer Reviewed-by: Lu Baolu --- drivers/iommu/Makefile | 3 ++- drivers/iommu/intel/Makefile | 7 ++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile index fe91d770abe16..53f8000753985 100644 --- a/drivers/iommu/Makefile +++ b/drivers/iommu/Makefile @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 -obj-y +=3D amd/ intel/ arm/ iommufd/ riscv/ +obj-y +=3D amd/ arm/ iommufd/ riscv/ +obj-$(CONFIG_INTEL_IOMMU) +=3D intel/ obj-$(CONFIG_IOMMU_API) +=3D iommu.o obj-$(CONFIG_IOMMU_SUPPORT) +=3D iommu-pages.o obj-$(CONFIG_IOMMU_API) +=3D iommu-traces.o diff --git a/drivers/iommu/intel/Makefile b/drivers/iommu/intel/Makefile index 6c7528130cf9d..ada651c4a01b2 100644 --- a/drivers/iommu/intel/Makefile +++ b/drivers/iommu/intel/Makefile @@ -1,11 +1,8 @@ # SPDX-License-Identifier: GPL-2.0 -obj-$(CONFIG_DMAR_TABLE) +=3D dmar.o -obj-$(CONFIG_INTEL_IOMMU) +=3D iommu.o pasid.o nested.o cache.o prq.o -obj-$(CONFIG_DMAR_TABLE) +=3D trace.o +obj-y +=3D iommu.o pasid.o nested.o cache.o prq.o +obj-$(CONFIG_DMAR_TABLE) +=3D dmar.o trace.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 --=20 2.49.0 --=20 Rolf Eike Beer emlix GmbH Headquarters: Berliner Str. 12, 37073 G=C3=B6ttingen, Germany Phone +49 (0)551 30664-0, e-mail info@emlix.com District Court of G=C3=B6ttingen, Registry Number HR B 3160 Managing Directors: Heike Jordan, Dr. Uwe Kracke VAT ID No. DE 205 198 055 Office Berlin: Panoramastr. 1, 10178 Berlin, Germany Office Bonn: Bachstr. 6, 53115 Bonn, Germany http://www.emlix.com emlix - your embedded Linux partner