[PATCHv2 0/6] make vendor specific subdirectory inclusion conditional

public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed

* [PATCHv2 0/6] make vendor specific subdirectory inclusion conditional
@ 2025-03-20  9:01 Rolf Eike Beer
  2025-03-20  9:05 ` [PATCH 1/6] iommu: remove duplicate selection of DMAR_TABLE Rolf Eike Beer
                   ` (6 more replies)
  0 siblings, 7 replies; 16+ messages in thread
From: Rolf Eike Beer @ 2025-03-20  9:01 UTC (permalink / raw)
  To: Joerg Roedel, Will Deacon
  Cc: iommu, linux-kernel, Bert Karwatzki, Lu Baolu, Jerry Snitselaar,
	Suravee Suthikulpanit, Tomasz Jeznach, Nick Kossifidis,
	Sebastien Boeuf, Palmer Dabbelt, Paul Walmsley, Albert Ou,
	Alexandre Ghiti, Robin Murphy, linux-arm-kernel, Jason Gunthorpe,
	Kevin Tian

[-- Attachment #1: Type: text/plain, Size: 981 bytes --]

I found it strange that the vendor specific subdirectories were unconditionally 
added. Everything in these directories obviously depends on the specific Kconfig 
option. This series cleans this up by making the directory itself depend on 
the respective option which looks more natural to me.

I must confess that I am too lazy to find a good solution for the "arm/" 
directory, so I left it as is.

Regards,

Eike

---
Changes in v2:
- clean up subdirectory Makefiles to use obj-y now
- add arm/arm-smmu-v3 and iommufd patches
-- 
Rolf Eike Beer

emlix GmbH
Headquarters: Berliner Str. 12, 37073 Göttingen, Germany
Phone +49 (0)551 30664-0, e-mail info@emlix.com
District Court of Göttingen, 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

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 313 bytes --]

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [PATCH 1/6] iommu: remove duplicate selection of DMAR_TABLE
  2025-03-20  9:01 [PATCHv2 0/6] make vendor specific subdirectory inclusion conditional Rolf Eike Beer
@ 2025-03-20  9:05 ` Rolf Eike Beer
  2025-03-21  1:56   ` Baolu Lu
  2025-03-20  9:07 ` [PATCH 2/6] iommu: make inclusion of intel directory conditional Rolf Eike Beer
                   ` (5 subsequent siblings)
  6 siblings, 1 reply; 16+ messages in thread
From: Rolf Eike Beer @ 2025-03-20  9:05 UTC (permalink / raw)
  To: Joerg Roedel, Will Deacon; +Cc: iommu, linux-kernel, Bert Karwatzki, Lu Baolu

This is already done in intel/Kconfig.

Fixes: 70bad345e622 ("iommu: Fix compilation without CONFIG_IOMMU_INTEL")
Signed-off-by: Rolf Eike Beer <eb@emlix.com>
---
 drivers/iommu/Kconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index ec1b5e32b972..fceea41b7f58 100644
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -200,7 +200,6 @@ source "drivers/iommu/riscv/Kconfig"
 config IRQ_REMAP
 	bool "Support for Interrupt Remapping"
 	depends on X86_64 && X86_IO_APIC && PCI_MSI && ACPI
-	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
-- 
2.49.0

-- 
Rolf Eike Beer

emlix GmbH
Headquarters: Berliner Str. 12, 37073 Göttingen, Germany
Phone +49 (0)551 30664-0, e-mail info@emlix.com
District Court of Göttingen, 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




^ permalink raw reply related	[flat|nested] 16+ messages in thread

* Re: [PATCH 1/6] iommu: remove duplicate selection of DMAR_TABLE
  2025-03-20  9:05 ` [PATCH 1/6] iommu: remove duplicate selection of DMAR_TABLE Rolf Eike Beer
@ 2025-03-21  1:56   ` Baolu Lu
  0 siblings, 0 replies; 16+ messages in thread
From: Baolu Lu @ 2025-03-21  1:56 UTC (permalink / raw)
  To: Rolf Eike Beer, Joerg Roedel, Will Deacon
  Cc: iommu, linux-kernel, Bert Karwatzki

On 3/20/25 17:05, Rolf Eike Beer wrote:
> This is already done in intel/Kconfig.
> 
> Fixes: 70bad345e622 ("iommu: Fix compilation without CONFIG_IOMMU_INTEL")
> Signed-off-by: Rolf Eike Beer<eb@emlix.com>

Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com>

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [PATCH 2/6] iommu: make inclusion of intel directory conditional
  2025-03-20  9:01 [PATCHv2 0/6] make vendor specific subdirectory inclusion conditional Rolf Eike Beer
  2025-03-20  9:05 ` [PATCH 1/6] iommu: remove duplicate selection of DMAR_TABLE Rolf Eike Beer
@ 2025-03-20  9:07 ` Rolf Eike Beer
  2025-03-21  2:04   ` Baolu Lu
  2025-03-20  9:14 ` [PATCH 3/6] iommu: make inclusion of amd " Rolf Eike Beer
                   ` (4 subsequent siblings)
  6 siblings, 1 reply; 16+ messages in thread
From: Rolf Eike Beer @ 2025-03-20  9:07 UTC (permalink / raw)
  To: Joerg Roedel, Will Deacon, Lu Baolu; +Cc: iommu, linux-kernel, Jerry Snitselaar

Nothing in there is active if CONFIG_INTEL_IOMMU is not enabled, so the whole
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 <eb@emlix.com>
---
 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 5e5a83c6c2aa..ed673c8fd056 100644
--- a/drivers/iommu/Makefile
+++ b/drivers/iommu/Makefile
@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
-obj-y += amd/ intel/ arm/ iommufd/ riscv/
+obj-y += amd/ arm/ iommufd/ riscv/
+obj-$(CONFIG_INTEL_IOMMU) += intel/
 obj-$(CONFIG_IOMMU_API) += iommu.o
 obj-$(CONFIG_IOMMU_API) += iommu-traces.o
 obj-$(CONFIG_IOMMU_API) += iommu-sysfs.o
diff --git a/drivers/iommu/intel/Makefile b/drivers/iommu/intel/Makefile
index 6c7528130cf9..ada651c4a01b 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) += dmar.o
-obj-$(CONFIG_INTEL_IOMMU) += iommu.o pasid.o nested.o cache.o prq.o
-obj-$(CONFIG_DMAR_TABLE) += trace.o
+obj-y += iommu.o pasid.o nested.o cache.o prq.o
+obj-$(CONFIG_DMAR_TABLE) += dmar.o trace.o
 obj-$(CONFIG_DMAR_PERF) += perf.o
 obj-$(CONFIG_INTEL_IOMMU_DEBUGFS) += debugfs.o
 obj-$(CONFIG_INTEL_IOMMU_SVM) += svm.o
-ifdef CONFIG_INTEL_IOMMU
 obj-$(CONFIG_IRQ_REMAP) += irq_remapping.o
-endif
 obj-$(CONFIG_INTEL_IOMMU_PERF_EVENTS) += perfmon.o
-- 
2.49.0

-- 
Rolf Eike Beer

emlix GmbH
Headquarters: Berliner Str. 12, 37073 Göttingen, Germany
Phone +49 (0)551 30664-0, e-mail info@emlix.com
District Court of Göttingen, 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




^ permalink raw reply related	[flat|nested] 16+ messages in thread

* Re: [PATCH 2/6] iommu: make inclusion of intel directory conditional
  2025-03-20  9:07 ` [PATCH 2/6] iommu: make inclusion of intel directory conditional Rolf Eike Beer
@ 2025-03-21  2:04   ` Baolu Lu
  0 siblings, 0 replies; 16+ messages in thread
From: Baolu Lu @ 2025-03-21  2:04 UTC (permalink / raw)
  To: Rolf Eike Beer, Joerg Roedel, Will Deacon
  Cc: iommu, linux-kernel, Jerry Snitselaar

On 3/20/25 17:07, Rolf Eike Beer wrote:
> Nothing in there is active if CONFIG_INTEL_IOMMU is not enabled, so the whole
> 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<eb@emlix.com>

Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com>

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [PATCH 3/6] iommu: make inclusion of amd directory conditional
  2025-03-20  9:01 [PATCHv2 0/6] make vendor specific subdirectory inclusion conditional Rolf Eike Beer
  2025-03-20  9:05 ` [PATCH 1/6] iommu: remove duplicate selection of DMAR_TABLE Rolf Eike Beer
  2025-03-20  9:07 ` [PATCH 2/6] iommu: make inclusion of intel directory conditional Rolf Eike Beer
@ 2025-03-20  9:14 ` Rolf Eike Beer
  2025-03-21  2:06   ` Baolu Lu
  2025-03-20  9:16 ` [PATCH 4/6] iommu: make inclusion of riscv " Rolf Eike Beer
                   ` (3 subsequent siblings)
  6 siblings, 1 reply; 16+ messages in thread
From: Rolf Eike Beer @ 2025-03-20  9:14 UTC (permalink / raw)
  To: Joerg Roedel, Will Deacon, Jerry Snitselaar
  Cc: iommu, linux-kernel, Suravee Suthikulpanit

Nothing in there is active if CONFIG_AMD_IOMMU is not enabled, so the whole
directory can depend on that switch as well.

Fixes: cbe94c6e1a7d ("iommu/amd: Move Kconfig and Makefile bits down into amd directory")
Signed-off-by: Rolf Eike Beer <eb@emlix.com>
---
 drivers/iommu/Makefile     | 3 ++-
 drivers/iommu/amd/Makefile | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile
index ed673c8fd056..41b00cdc8621 100644
--- a/drivers/iommu/Makefile
+++ b/drivers/iommu/Makefile
@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
-obj-y += amd/ arm/ iommufd/ riscv/
+obj-y += arm/ iommufd/ riscv/
+obj-$(CONFIG_AMD_IOMMU) += amd/
 obj-$(CONFIG_INTEL_IOMMU) += intel/
 obj-$(CONFIG_IOMMU_API) += iommu.o
 obj-$(CONFIG_IOMMU_API) += iommu-traces.o
diff --git a/drivers/iommu/amd/Makefile b/drivers/iommu/amd/Makefile
index 9de33b2d42f5..59c04a67f398 100644
--- a/drivers/iommu/amd/Makefile
+++ b/drivers/iommu/amd/Makefile
@@ -1,3 +1,3 @@
 # SPDX-License-Identifier: GPL-2.0-only
-obj-$(CONFIG_AMD_IOMMU) += iommu.o init.o quirks.o io_pgtable.o io_pgtable_v2.o ppr.o pasid.o
+obj-y += iommu.o init.o quirks.o io_pgtable.o io_pgtable_v2.o ppr.o pasid.o
 obj-$(CONFIG_AMD_IOMMU_DEBUGFS) += debugfs.o
-- 
2.49.0


-- 
Rolf Eike Beer

emlix GmbH
Headquarters: Berliner Str. 12, 37073 Göttingen, Germany
Phone +49 (0)551 30664-0, e-mail info@emlix.com
District Court of Göttingen, 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




^ permalink raw reply related	[flat|nested] 16+ messages in thread

* Re: [PATCH 3/6] iommu: make inclusion of amd directory conditional
  2025-03-20  9:14 ` [PATCH 3/6] iommu: make inclusion of amd " Rolf Eike Beer
@ 2025-03-21  2:06   ` Baolu Lu
  0 siblings, 0 replies; 16+ messages in thread
From: Baolu Lu @ 2025-03-21  2:06 UTC (permalink / raw)
  To: Rolf Eike Beer, Joerg Roedel, Will Deacon, Jerry Snitselaar
  Cc: iommu, linux-kernel, Suravee Suthikulpanit

On 3/20/25 17:14, Rolf Eike Beer wrote:
> Nothing in there is active if CONFIG_AMD_IOMMU is not enabled, so the whole
> directory can depend on that switch as well.
> 
> Fixes: cbe94c6e1a7d ("iommu/amd: Move Kconfig and Makefile bits down into amd directory")
> Signed-off-by: Rolf Eike Beer<eb@emlix.com>

Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com>

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [PATCH 4/6] iommu: make inclusion of riscv directory conditional
  2025-03-20  9:01 [PATCHv2 0/6] make vendor specific subdirectory inclusion conditional Rolf Eike Beer
                   ` (2 preceding siblings ...)
  2025-03-20  9:14 ` [PATCH 3/6] iommu: make inclusion of amd " Rolf Eike Beer
@ 2025-03-20  9:16 ` Rolf Eike Beer
  2025-03-21  2:08   ` Baolu Lu
  2025-03-20  9:19 ` [PATCH 5/6] iommu: make inclusion of arm/arm-smmu-v3 " Rolf Eike Beer
                   ` (2 subsequent siblings)
  6 siblings, 1 reply; 16+ messages in thread
From: Rolf Eike Beer @ 2025-03-20  9:16 UTC (permalink / raw)
  To: Joerg Roedel, Will Deacon
  Cc: iommu, linux-kernel, Bert Karwatzki, Lu Baolu, Jerry Snitselaar,
	Suravee Suthikulpanit, Tomasz Jeznach, Nick Kossifidis,
	Sebastien Boeuf, Palmer Dabbelt, Paul Walmsley, Albert Ou,
	Alexandre Ghiti

Nothing in there is active if CONFIG_RISCV_IOMMU is not enabled, so the whole
directory can depend on that switch as well.

Fixes: 5c0ebbd3c6c6 ("iommu/riscv: Add RISC-V IOMMU platform device driver")
Signed-off-by: Rolf Eike Beer <eb@emlix.com>
---
 drivers/iommu/Makefile       | 3 ++-
 drivers/iommu/riscv/Makefile | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile
index 41b00cdc8621..17133876f777 100644
--- a/drivers/iommu/Makefile
+++ b/drivers/iommu/Makefile
@@ -1,7 +1,8 @@
 # SPDX-License-Identifier: GPL-2.0
-obj-y += arm/ iommufd/ riscv/
+obj-y += arm/ iommufd/
 obj-$(CONFIG_AMD_IOMMU) += amd/
 obj-$(CONFIG_INTEL_IOMMU) += intel/
+obj-$(CONFIG_RISCV_IOMMU) += riscv/
 obj-$(CONFIG_IOMMU_API) += iommu.o
 obj-$(CONFIG_IOMMU_API) += iommu-traces.o
 obj-$(CONFIG_IOMMU_API) += iommu-sysfs.o
diff --git a/drivers/iommu/riscv/Makefile b/drivers/iommu/riscv/Makefile
index f54c9ed17d41..b5929f9f23e6 100644
--- a/drivers/iommu/riscv/Makefile
+++ b/drivers/iommu/riscv/Makefile
@@ -1,3 +1,3 @@
 # SPDX-License-Identifier: GPL-2.0-only
-obj-$(CONFIG_RISCV_IOMMU) += iommu.o iommu-platform.o
+obj-y += iommu.o iommu-platform.o
 obj-$(CONFIG_RISCV_IOMMU_PCI) += iommu-pci.o
-- 
2.49.0

-- 
Rolf Eike Beer

emlix GmbH
Headquarters: Berliner Str. 12, 37073 Göttingen, Germany
Phone +49 (0)551 30664-0, e-mail info@emlix.com
District Court of Göttingen, 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




^ permalink raw reply related	[flat|nested] 16+ messages in thread

* Re: [PATCH 4/6] iommu: make inclusion of riscv directory conditional
  2025-03-20  9:16 ` [PATCH 4/6] iommu: make inclusion of riscv " Rolf Eike Beer
@ 2025-03-21  2:08   ` Baolu Lu
  0 siblings, 0 replies; 16+ messages in thread
From: Baolu Lu @ 2025-03-21  2:08 UTC (permalink / raw)
  To: Rolf Eike Beer, Joerg Roedel, Will Deacon
  Cc: iommu, linux-kernel, Bert Karwatzki, Jerry Snitselaar,
	Suravee Suthikulpanit, Tomasz Jeznach, Nick Kossifidis,
	Sebastien Boeuf, Palmer Dabbelt, Paul Walmsley, Albert Ou,
	Alexandre Ghiti

On 3/20/25 17:16, Rolf Eike Beer wrote:
> Nothing in there is active if CONFIG_RISCV_IOMMU is not enabled, so the whole
> directory can depend on that switch as well.
> 
> Fixes: 5c0ebbd3c6c6 ("iommu/riscv: Add RISC-V IOMMU platform device driver")
> Signed-off-by: Rolf Eike Beer<eb@emlix.com>

Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com>

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [PATCH 5/6] iommu: make inclusion of arm/arm-smmu-v3 directory conditional
  2025-03-20  9:01 [PATCHv2 0/6] make vendor specific subdirectory inclusion conditional Rolf Eike Beer
                   ` (3 preceding siblings ...)
  2025-03-20  9:16 ` [PATCH 4/6] iommu: make inclusion of riscv " Rolf Eike Beer
@ 2025-03-20  9:19 ` Rolf Eike Beer
  2025-03-21  2:11   ` Baolu Lu
  2025-03-20  9:22 ` [PATCH 6/6] iommu: make inclusion of iommufd " Rolf Eike Beer
  2025-04-17 14:32 ` [PATCHv2 0/6] make vendor specific subdirectory inclusion conditional Joerg Roedel
  6 siblings, 1 reply; 16+ messages in thread
From: Rolf Eike Beer @ 2025-03-20  9:19 UTC (permalink / raw)
  To: Joerg Roedel, Will Deacon
  Cc: iommu, linux-kernel, Robin Murphy, linux-arm-kernel

Nothing in there is active if CONFIG_ARM_SMMU_V3 is not enabled, so the whole
directory can depend on that switch as well.

Fixes: e86d1aa8b60f ("iommu/arm-smmu: Move Arm SMMU drivers into their own subdirectory")
Signed-off-by: Rolf Eike Beer <eb@emlix.com>
---
 drivers/iommu/arm/Makefile             | 3 ++-
 drivers/iommu/arm/arm-smmu-v3/Makefile | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/iommu/arm/Makefile b/drivers/iommu/arm/Makefile
index 0f9efeab709f..35a7e13eef34 100644
--- a/drivers/iommu/arm/Makefile
+++ b/drivers/iommu/arm/Makefile
@@ -1,2 +1,3 @@
 # SPDX-License-Identifier: GPL-2.0
-obj-y += arm-smmu/ arm-smmu-v3/
+obj-y += arm-smmu/
+obj-$(CONFIG_ARM_SMMU_V3) += arm-smmu-v3/
diff --git a/drivers/iommu/arm/arm-smmu-v3/Makefile b/drivers/iommu/arm/arm-smmu-v3/Makefile
index 493a659cc66b..6cc7c8557b9e 100644
--- a/drivers/iommu/arm/arm-smmu-v3/Makefile
+++ b/drivers/iommu/arm/arm-smmu-v3/Makefile
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0
-obj-$(CONFIG_ARM_SMMU_V3) += arm_smmu_v3.o
+obj-y += arm_smmu_v3.o
 arm_smmu_v3-y := arm-smmu-v3.o
 arm_smmu_v3-$(CONFIG_ARM_SMMU_V3_IOMMUFD) += arm-smmu-v3-iommufd.o
 arm_smmu_v3-$(CONFIG_ARM_SMMU_V3_SVA) += arm-smmu-v3-sva.o
-- 
2.49.0



-- 
Rolf Eike Beer

emlix GmbH
Headquarters: Berliner Str. 12, 37073 Göttingen, Germany
Phone +49 (0)551 30664-0, e-mail info@emlix.com
District Court of Göttingen, 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



^ permalink raw reply related	[flat|nested] 16+ messages in thread

* Re: [PATCH 5/6] iommu: make inclusion of arm/arm-smmu-v3 directory conditional
  2025-03-20  9:19 ` [PATCH 5/6] iommu: make inclusion of arm/arm-smmu-v3 " Rolf Eike Beer
@ 2025-03-21  2:11   ` Baolu Lu
  0 siblings, 0 replies; 16+ messages in thread
From: Baolu Lu @ 2025-03-21  2:11 UTC (permalink / raw)
  To: Rolf Eike Beer, Joerg Roedel, Will Deacon
  Cc: iommu, linux-kernel, Robin Murphy, linux-arm-kernel

On 3/20/25 17:19, Rolf Eike Beer wrote:
> Nothing in there is active if CONFIG_ARM_SMMU_V3 is not enabled, so the whole
> directory can depend on that switch as well.
> 
> Fixes: e86d1aa8b60f ("iommu/arm-smmu: Move Arm SMMU drivers into their own subdirectory")
> Signed-off-by: Rolf Eike Beer<eb@emlix.com>

Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com>

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [PATCH 6/6] iommu: make inclusion of iommufd directory conditional
  2025-03-20  9:01 [PATCHv2 0/6] make vendor specific subdirectory inclusion conditional Rolf Eike Beer
                   ` (4 preceding siblings ...)
  2025-03-20  9:19 ` [PATCH 5/6] iommu: make inclusion of arm/arm-smmu-v3 " Rolf Eike Beer
@ 2025-03-20  9:22 ` Rolf Eike Beer
  2025-03-21  2:14   ` Baolu Lu
  2025-04-17 14:32 ` [PATCHv2 0/6] make vendor specific subdirectory inclusion conditional Joerg Roedel
  6 siblings, 1 reply; 16+ messages in thread
From: Rolf Eike Beer @ 2025-03-20  9:22 UTC (permalink / raw)
  To: Joerg Roedel, Will Deacon
  Cc: iommu, linux-kernel, Robin Murphy, Jason Gunthorpe, Kevin Tian

Nothing in there is active if CONFIG_IOMMUFD is not enabled, so the whole
directory can depend on that switch as well.

Fixes: 2ff4bed7fee7 ("iommufd: File descriptor, context, kconfig and makefiles")
Signed-off-by: Rolf Eike Beer <eb@emlix.com>
---
 drivers/iommu/Makefile         | 3 ++-
 drivers/iommu/iommufd/Makefile | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile
index 17133876f777..38ee96607acf 100644
--- a/drivers/iommu/Makefile
+++ b/drivers/iommu/Makefile
@@ -1,8 +1,9 @@
 # SPDX-License-Identifier: GPL-2.0
-obj-y += arm/ iommufd/
+obj-y += arm/
 obj-$(CONFIG_AMD_IOMMU) += amd/
 obj-$(CONFIG_INTEL_IOMMU) += intel/
 obj-$(CONFIG_RISCV_IOMMU) += riscv/
+obj-$(CONFIG_IOMMUFD) += iommufd/
 obj-$(CONFIG_IOMMU_API) += iommu.o
 obj-$(CONFIG_IOMMU_API) += iommu-traces.o
 obj-$(CONFIG_IOMMU_API) += iommu-sysfs.o
diff --git a/drivers/iommu/iommufd/Makefile b/drivers/iommu/iommufd/Makefile
index cb784da6cddc..071f2a504167 100644
--- a/drivers/iommu/iommufd/Makefile
+++ b/drivers/iommu/iommufd/Makefile
@@ -12,7 +12,7 @@ iommufd-y := \
 
 iommufd-$(CONFIG_IOMMUFD_TEST) += selftest.o
 
-obj-$(CONFIG_IOMMUFD) += iommufd.o
+obj-y += iommufd.o
 obj-$(CONFIG_IOMMUFD_DRIVER) += iova_bitmap.o
 
 iommufd_driver-y := driver.o
-- 
2.49.0


-- 
Rolf Eike Beer

emlix GmbH
Headquarters: Berliner Str. 12, 37073 Göttingen, Germany
Phone +49 (0)551 30664-0, e-mail info@emlix.com
District Court of Göttingen, 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



^ permalink raw reply related	[flat|nested] 16+ messages in thread

* Re: [PATCH 6/6] iommu: make inclusion of iommufd directory conditional
  2025-03-20  9:22 ` [PATCH 6/6] iommu: make inclusion of iommufd " Rolf Eike Beer
@ 2025-03-21  2:14   ` Baolu Lu
  0 siblings, 0 replies; 16+ messages in thread
From: Baolu Lu @ 2025-03-21  2:14 UTC (permalink / raw)
  To: Rolf Eike Beer, Joerg Roedel, Will Deacon
  Cc: iommu, linux-kernel, Robin Murphy, Jason Gunthorpe, Kevin Tian

On 3/20/25 17:22, Rolf Eike Beer wrote:
> Nothing in there is active if CONFIG_IOMMUFD is not enabled, so the whole
> directory can depend on that switch as well.
> 
> Fixes: 2ff4bed7fee7 ("iommufd: File descriptor, context, kconfig and makefiles")
> Signed-off-by: Rolf Eike Beer<eb@emlix.com>

Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com>

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCHv2 0/6] make vendor specific subdirectory inclusion conditional
  2025-03-20  9:01 [PATCHv2 0/6] make vendor specific subdirectory inclusion conditional Rolf Eike Beer
                   ` (5 preceding siblings ...)
  2025-03-20  9:22 ` [PATCH 6/6] iommu: make inclusion of iommufd " Rolf Eike Beer
@ 2025-04-17 14:32 ` Joerg Roedel
  2025-04-22  6:35   ` Rolf Eike Beer
  6 siblings, 1 reply; 16+ messages in thread
From: Joerg Roedel @ 2025-04-17 14:32 UTC (permalink / raw)
  To: Rolf Eike Beer
  Cc: Will Deacon, iommu, linux-kernel, Bert Karwatzki, Lu Baolu,
	Jerry Snitselaar, Suravee Suthikulpanit, Tomasz Jeznach,
	Nick Kossifidis, Sebastien Boeuf, Palmer Dabbelt, Paul Walmsley,
	Albert Ou, Alexandre Ghiti, Robin Murphy, linux-arm-kernel,
	Jason Gunthorpe, Kevin Tian

On Thu, Mar 20, 2025 at 10:01:45AM +0100, Rolf Eike Beer wrote:
> Changes in v2:
> - clean up subdirectory Makefiles to use obj-y now
> - add arm/arm-smmu-v3 and iommufd patches

This conflicts with the core branch, can you please rebase once I pushed
the updated tree?

Thanks,

	Joerg

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCHv2 0/6] make vendor specific subdirectory inclusion conditional
  2025-04-17 14:32 ` [PATCHv2 0/6] make vendor specific subdirectory inclusion conditional Joerg Roedel
@ 2025-04-22  6:35   ` Rolf Eike Beer
  0 siblings, 0 replies; 16+ messages in thread
From: Rolf Eike Beer @ 2025-04-22  6:35 UTC (permalink / raw)
  To: Joerg Roedel
  Cc: Will Deacon, iommu, linux-kernel, Bert Karwatzki, Lu Baolu,
	Jerry Snitselaar, Suravee Suthikulpanit, Tomasz Jeznach,
	Nick Kossifidis, Sebastien Boeuf, Palmer Dabbelt, Paul Walmsley,
	Albert Ou, Alexandre Ghiti, Robin Murphy, linux-arm-kernel,
	Jason Gunthorpe, Kevin Tian

[-- Attachment #1: Type: text/plain, Size: 828 bytes --]

On Donnerstag, 17. April 2025 16:32:53 Mitteleuropäische Sommerzeit Joerg 
Roedel wrote:
> On Thu, Mar 20, 2025 at 10:01:45AM +0100, Rolf Eike Beer wrote:
> > Changes in v2:
> > - clean up subdirectory Makefiles to use obj-y now
> > - add arm/arm-smmu-v3 and iommufd patches
> 
> This conflicts with the core branch, can you please rebase once I pushed
> the updated tree?

Sure.
-- 
Rolf Eike Beer

emlix GmbH
Headquarters: Berliner Str. 12, 37073 Göttingen, Germany
Phone +49 (0)551 30664-0, e-mail info@emlix.com
District Court of Göttingen, 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

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 313 bytes --]

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [PATCHv3 0/6] make vendor specific subdirectory inclusion conditional
@ 2025-05-12 13:07 Rolf Eike Beer
  2025-05-12 13:12 ` [PATCH 3/6] iommu: make inclusion of amd directory conditional Rolf Eike Beer
  0 siblings, 1 reply; 16+ messages in thread
From: Rolf Eike Beer @ 2025-05-12 13:07 UTC (permalink / raw)
  To: Joerg Roedel, Will Deacon
  Cc: iommu, linux-kernel, Bert Karwatzki, Lu Baolu, Jerry Snitselaar,
	Suravee Suthikulpanit, Tomasz Jeznach, Nick Kossifidis,
	Sebastien Boeuf, Palmer Dabbelt, Paul Walmsley, Albert Ou,
	Alexandre Ghiti, Robin Murphy, linux-arm-kernel, Jason Gunthorpe,
	Kevin Tian

[-- Attachment #1: Type: text/plain, Size: 1119 bytes --]

I found it strange that the vendor specific subdirectories were unconditionally 
added. Everything in these directories obviously depends on the specific Kconfig 
option. This series cleans this up by making the directory itself depend on 
the respective option which looks more natural to me.

I must confess that I am too lazy to find a good solution for the "arm/" 
directory, so I left it as is.

Regards,

Eike

---
Changes in v3:
- added Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com>
- rebased on top of 2e9b2ee2ba403cbe270a8256b8794ef5ad19b38d

Changes in v2:
- clean up subdirectory Makefiles to use obj-y now
- add arm/arm-smmu-v3 and iommufd patches
-- 
Rolf Eike Beer

emlix GmbH
Headquarters: Berliner Str. 12, 37073 Göttingen, Germany
Phone +49 (0)551 30664-0, e-mail info@emlix.com
District Court of Göttingen, 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

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 313 bytes --]

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [PATCH 3/6] iommu: make inclusion of amd directory conditional
  2025-05-12 13:07 [PATCHv3 " Rolf Eike Beer
@ 2025-05-12 13:12 ` Rolf Eike Beer
  0 siblings, 0 replies; 16+ messages in thread
From: Rolf Eike Beer @ 2025-05-12 13:12 UTC (permalink / raw)
  To: Joerg Roedel, Will Deacon, Jerry Snitselaar
  Cc: iommu, linux-kernel, Suravee Suthikulpanit

Nothing in there is active if CONFIG_AMD_IOMMU is not enabled, so the whole
directory can depend on that switch as well.

Fixes: cbe94c6e1a7d ("iommu/amd: Move Kconfig and Makefile bits down into amd directory")
Signed-off-by: Rolf Eike Beer <eb@emlix.com>
Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com>
---
 drivers/iommu/Makefile     | 3 ++-
 drivers/iommu/amd/Makefile | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile
index 53f8000753985..a486032d3e079 100644
--- a/drivers/iommu/Makefile
+++ b/drivers/iommu/Makefile
@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
-obj-y += amd/ arm/ iommufd/ riscv/
+obj-y += arm/ iommufd/ riscv/
+obj-$(CONFIG_AMD_IOMMU) += amd/
 obj-$(CONFIG_INTEL_IOMMU) += intel/
 obj-$(CONFIG_IOMMU_API) += iommu.o
 obj-$(CONFIG_IOMMU_SUPPORT) += iommu-pages.o
diff --git a/drivers/iommu/amd/Makefile b/drivers/iommu/amd/Makefile
index 9de33b2d42f52..59c04a67f3982 100644
--- a/drivers/iommu/amd/Makefile
+++ b/drivers/iommu/amd/Makefile
@@ -1,3 +1,3 @@
 # SPDX-License-Identifier: GPL-2.0-only
-obj-$(CONFIG_AMD_IOMMU) += iommu.o init.o quirks.o io_pgtable.o io_pgtable_v2.o ppr.o pasid.o
+obj-y += iommu.o init.o quirks.o io_pgtable.o io_pgtable_v2.o ppr.o pasid.o
 obj-$(CONFIG_AMD_IOMMU_DEBUGFS) += debugfs.o
-- 
2.49.0


-- 
Rolf Eike Beer

emlix GmbH
Headquarters: Berliner Str. 12, 37073 Göttingen, Germany
Phone +49 (0)551 30664-0, e-mail info@emlix.com
District Court of Göttingen, 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



^ permalink raw reply related	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2025-05-12 13:16 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-20  9:01 [PATCHv2 0/6] make vendor specific subdirectory inclusion conditional Rolf Eike Beer
2025-03-20  9:05 ` [PATCH 1/6] iommu: remove duplicate selection of DMAR_TABLE Rolf Eike Beer
2025-03-21  1:56   ` Baolu Lu
2025-03-20  9:07 ` [PATCH 2/6] iommu: make inclusion of intel directory conditional Rolf Eike Beer
2025-03-21  2:04   ` Baolu Lu
2025-03-20  9:14 ` [PATCH 3/6] iommu: make inclusion of amd " Rolf Eike Beer
2025-03-21  2:06   ` Baolu Lu
2025-03-20  9:16 ` [PATCH 4/6] iommu: make inclusion of riscv " Rolf Eike Beer
2025-03-21  2:08   ` Baolu Lu
2025-03-20  9:19 ` [PATCH 5/6] iommu: make inclusion of arm/arm-smmu-v3 " Rolf Eike Beer
2025-03-21  2:11   ` Baolu Lu
2025-03-20  9:22 ` [PATCH 6/6] iommu: make inclusion of iommufd " Rolf Eike Beer
2025-03-21  2:14   ` Baolu Lu
2025-04-17 14:32 ` [PATCHv2 0/6] make vendor specific subdirectory inclusion conditional Joerg Roedel
2025-04-22  6:35   ` Rolf Eike Beer
  -- strict thread matches above, loose matches on Subject: below --
2025-05-12 13:07 [PATCHv3 " Rolf Eike Beer
2025-05-12 13:12 ` [PATCH 3/6] iommu: make inclusion of amd directory conditional Rolf Eike Beer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox