iommu/hyperv: Create hyperv subdirectory under drivers/iommu
Subsystems (2)
PATCH v2 1/1 iommu/hyperv: Create hyperv subdirectory under drivers/iommu
Create hyperv subdirectory under drivers/iommu in anticipation of more hyperv related files from upcoming PCI passthru and pv-IOMMU patches. Also, the current file hyperv-iommu.c actually implements irq remapping on x86, so rename to more appropriate hv-irq-remap-x86.c and move it under the new hyperv subdirectory. Since this file implements irq_remap_ops exposed by drivers/iommu/irq_remapping.h, it cannot be relocated to the irq directory. This is in sync with other backend directories like amd and intel there.
Lastly, this file should not be tied to CONFIG_HYPERV_IOMMU, but to CONFIG_HYPERV and CONFIG_IRQ_REMAP.
---
V2: rename hv-irq-remap.c to hv-irq-remap-x86.c
---
MAINTAINERS | 2 +-
drivers/iommu/Kconfig | 9 ---------
drivers/iommu/Makefile | 2 +-
drivers/iommu/hyperv/Makefile | 2 ++
.../iommu/{hyperv-iommu.c => hyperv/hv-irq-remap-x86.c} | 8 +-------
drivers/iommu/irq_remapping.c | 2 +-
6 files changed, 6 insertions(+), 19 deletions(-)
create mode 100644 drivers/iommu/hyperv/Makefile
rename drivers/iommu/{hyperv-iommu.c => hyperv/hv-irq-remap-x86.c} (99%)MAINTAINERS +1 -1
@@ -11988,7 +11988,7 @@ F: drivers/clocksource/hyperv_timer.c F: drivers/hid/hid-hyperv.c F: drivers/hv/ F: drivers/input/serio/hyperv-keyboard.c -F: drivers/iommu/hyperv-iommu.c +F: drivers/iommu/hyperv/ F: drivers/net/ethernet/microsoft/ F: drivers/net/hyperv/ F: drivers/pci/controller/pci-hyperv-intf.c
drivers/iommu/Kconfig +0 -9
@@ -351,15 +351,6 @@ config MTK_IOMMU_V1 if unsure, say N here. -config HYPERV_IOMMU - bool "Hyper-V IRQ Handling" - depends on HYPERV && X86 - select IOMMU_API - default HYPERV - help - Stub IOMMU driver to handle IRQs to support Hyper-V Linux - guest and root partitions. - config VIRTIO_IOMMU tristate "Virtio IOMMU driver" depends on VIRTIO
drivers/iommu/Makefile +1 -1
@@ -4,6 +4,7 @@ obj-$(CONFIG_AMD_IOMMU) += amd/ obj-$(CONFIG_INTEL_IOMMU) += intel/ obj-$(CONFIG_RISCV_IOMMU) += riscv/ obj-$(CONFIG_GENERIC_PT) += generic_pt/fmt/ +obj-$(CONFIG_HYPERV) += hyperv/ obj-$(CONFIG_IOMMU_API) += iommu.o obj-$(CONFIG_IOMMU_SUPPORT) += iommu-pages.o obj-$(CONFIG_IOMMU_API) += iommu-traces.o
@@ -30,7 +31,6 @@ obj-$(CONFIG_TEGRA_IOMMU_SMMU) += tegra-smmu.o obj-$(CONFIG_EXYNOS_IOMMU) += exynos-iommu.o obj-$(CONFIG_FSL_PAMU) += fsl_pamu.o fsl_pamu_domain.o obj-$(CONFIG_S390_IOMMU) += s390-iommu.o -obj-$(CONFIG_HYPERV_IOMMU) += hyperv-iommu.o obj-$(CONFIG_VIRTIO_IOMMU) += virtio-iommu.o obj-$(CONFIG_IOMMU_SVA) += iommu-sva.o obj-$(CONFIG_IOMMU_IOPF) += io-pgfault.o
drivers/iommu/hyperv/Makefile new file +2 -0
@@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-$(CONFIG_IRQ_REMAP) += hv-irq-remap-x86.o
drivers/iommu/hyperv/hv-irq-remap-x86.c renamed from drivers/iommu/hyperv-iommu.c +1 -7
@@ -7,13 +7,11 @@* * Author : Lan Tianyu <[email protected]> */ -#include <linux/types.h> #include <linux/interrupt.h> #include <linux/irq.h> #include <linux/iommu.h> #include <linux/module.h> -#include <asm/apic.h> #include <asm/cpu.h> #include <asm/hw_irq.h>
@@ -22,9 +20,7 @@#include <asm/hypervisor.h> #include <asm/mshyperv.h> -#include "irq_remapping.h" - -#ifdef CONFIG_IRQ_REMAP +#include "../irq_remapping.h" /* * According 82093AA IO-APIC spec , IO APIC has a 24-entry Interrupt
@@ -330,5 +326,3 @@ static const struct irq_domain_ops hyperv_root_ir_domain_ops = { .alloc = hyperv_root_irq_remapping_alloc, .free = hyperv_root_irq_remapping_free, }; - -#endif
drivers/iommu/irq_remapping.c +1 -1
@@ -108,7 +108,7 @@ int __init irq_remapping_prepare(void)else if (IS_ENABLED (CONFIG_AMD_IOMMU ) && amd_iommu_irq_ops.prepare () ==0 ) remap_ops = &amd_iommu_irq_ops; -else if (IS_ENABLED (CONFIG_HYPERV_IOMMU ) && +else if (IS_ENABLED (CONFIG_HYPERV ) && hyperv_irq_remap_ops.prepare () ==0 ) remap_ops = &hyperv_irq_remap_ops;else
Signature · 1 line
2.51.2.vfs.0.1
Hi Mukesh,
Quoted 96 lines · On Wed, 3 Jun 2026 15:50:10 -0700 Mukesh R <[email protected]> wrote:
Create hyperv subdirectory under
drivers/iommuin anticipation of more hyperv related files from upcoming PCI passthru and pv-IOMMU patches. Also, the current filehyperv-iommu.cactually implements irq remapping on x86, so rename to more appropriatehv-irq-remap-x86.cand move it under the new hyperv subdirectory. Since this file implementsirq_remap_opsexposed bydrivers/iommu/irq_remapping.h, it cannot be relocated to the irq directory. This is in sync with other backend directories like amd and intel there.Lastly, this file should not be tied to
CONFIG_HYPERV_IOMMU, but toCONFIG_HYPERVandCONFIG_IRQ_REMAP.Signed-off-by Mukesh R <[email protected]>---
V2: renamehv-irq-remap.ctohv-irq-remap-x86.c--- MAINTAINERS | 2 +- drivers/iommu/Kconfig | 9 --------- drivers/iommu/Makefile | 2 +- drivers/iommu/hyperv/Makefile | 2 ++ .../iommu/{hyperv-iommu.c => hyperv/hv-irq-remap-x86.c} | 8 +------- drivers/iommu/irq_remapping.c | 2 +- 6 files changed, 6 insertions(+), 19 deletions(-) create mode 100644 drivers/iommu/hyperv/Makefile rename drivers/iommu/{hyperv-iommu.c => hyperv/hv-irq-remap-x86.c}(99%)
MAINTAINERS +1
-1@@ -11988,7 +11988,7 @@ F: drivers/clocksource/hyperv_timer.c F: drivers/hid/hid-hyperv.c F: drivers/hv/ F: drivers/input/serio/hyperv-keyboard.c -F: drivers/iommu/hyperv-iommu.c +F: drivers/iommu/hyperv/ F: drivers/net/ethernet/microsoft/ F: drivers/net/hyperv/ F: drivers/pci/controller/pci-hyperv-intf.cdrivers/iommu/Kconfig +0
-9@@ -351,15 +351,6 @@ config MTK_IOMMU_V1 if unsure, say N here. -config HYPERV_IOMMU - bool "Hyper-V IRQ Handling" - depends on HYPERV && X86 - select IOMMU_API - default HYPERV - help - Stub IOMMU driver to handle IRQs to support Hyper-V Linux - guest and root partitions. - config VIRTIO_IOMMU tristate "Virtio IOMMU driver" depends on VIRTIOdrivers/iommu/Makefile +1
-1@@ -4,6 +4,7 @@ obj-$(CONFIG_AMD_IOMMU) += amd/ obj-$(CONFIG_INTEL_IOMMU) += intel/ obj-$(CONFIG_RISCV_IOMMU) += riscv/ obj-$(CONFIG_GENERIC_PT) += generic_pt/fmt/ +obj-$(CONFIG_HYPERV) += hyperv/ obj-$(CONFIG_IOMMU_API) += iommu.o obj-$(CONFIG_IOMMU_SUPPORT) += iommu-pages.o obj-$(CONFIG_IOMMU_API) += iommu-traces.o@@ -30,7 +31,6 @@ obj-$(CONFIG_TEGRA_IOMMU_SMMU) += tegra-smmu.o obj-$(CONFIG_EXYNOS_IOMMU) += exynos-iommu.o obj-$(CONFIG_FSL_PAMU) += fsl_pamu.o fsl_pamu_domain.o obj-$(CONFIG_S390_IOMMU) += s390-iommu.o -obj-$(CONFIG_HYPERV_IOMMU) += hyperv-iommu.o obj-$(CONFIG_VIRTIO_IOMMU) += virtio-iommu.o obj-$(CONFIG_IOMMU_SVA) += iommu-sva.o obj-$(CONFIG_IOMMU_IOPF) += io-pgfault.o(quoted diff) +0
-0b/drivers/iommu/hyperv/Makefile new file mode 100644 index 000000000000..6ef0ef97f3dd
drivers/iommu/hyperv/Makefile new file +2
-0@@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-$(CONFIG_IRQ_REMAP) += hv-irq-remap-x86.o(quoted diff) +0
-0
b/drivers/iommu/hyperv/hv-irq-remap-x86.csimilarity index 99% rename fromdrivers/iommu/hyperv-iommu.c
rename todrivers/iommu/hyperv/hv-irq-remap-x86.cindex479103261ae6..b34ee9589190100644
drivers/iommu/hyperv/hv-irq-remap-x86.c line 10
Quoted 4 lines
drivers/iommu/hyperv/hv-irq-remap-x86.c renamed from drivers/iommu/hyperv-iommu.c +0
-1@@ -7,13 +7,11 @@* * Author : Lan Tianyu <[email protected]> */ -
nit: we can avoid unrelated whitespace churn.
drivers/iommu/hyperv/hv-irq-remap-x86.c line 16
Quoted 6 lines
drivers/iommu/hyperv/hv-irq-remap-x86.c renamed from drivers/iommu/hyperv-iommu.c +0
-1#include <linux/types.h> #include <linux/interrupt.h> #include <linux/irq.h> #include <linux/iommu.h> #include <linux/module.h> -
ditto
Quoted 25 lines
drivers/iommu/hyperv/hv-irq-remap-x86.c renamed from drivers/iommu/hyperv-iommu.c +1
-3#include <asm/apic.h> #include <asm/cpu.h> #include <asm/hw_irq.h> @@ -22,9 +20,7 @@#include <asm/hypervisor.h> #include <asm/mshyperv.h> -#include "irq_remapping.h" - -#ifdef CONFIG_IRQ_REMAP +#include "../irq_remapping.h" /* * According 82093AA IO-APIC spec , IO APIC has a 24-entry Interrupt @@ -330,5 +326,3 @@ static const struct irq_domain_ops
hyperv_root_ir_domain_ops= { .alloc =hyperv_root_irq_remapping_alloc, .free =hyperv_root_irq_remapping_free, };drivers/iommu/hyperv/hv-irq-remap-x86.c renamed from drivers/iommu/hyperv-iommu.c +0
-2- -#endif (quoted diff) +0
-0
b/drivers/iommu/irq_remapping.cindexc2443659812a..41bf65e4ea88100644 ---a/drivers/iommu/irq_remapping.c
+++b/drivers/iommu/irq_remapping.c
drivers/iommu/irq_remapping.c int __init irq_remapping_prepare(void) · line 114
Quoted 8 lines
drivers/iommu/irq_remapping.c +1
-1@@ -108,7 +108,7 @@ int __init irq_remapping_prepare(void)else if (IS_ENABLED (CONFIG_AMD_IOMMU ) && amd_iommu_irq_ops.prepare () ==0 ) remap_ops = &amd_iommu_irq_ops; -else if (IS_ENABLED (CONFIG_HYPERV_IOMMU ) && +else if (IS_ENABLED (CONFIG_HYPERV ) && hyperv_irq_remap_ops.prepare () ==0 ) remap_ops = &hyperv_irq_remap_ops;else
Other than the above nits, feel free to add:
Wei Liu
maintainerQuoted 21 lines · Jacob Pan
Hi Mukesh,
Quoted 16 lines · On Wed, 3 Jun 2026 15:50:10 -0700 Mukesh R <[email protected]> wrote:
Create hyperv subdirectory under
drivers/iommuin anticipation of more hyperv related files from upcoming PCI passthru and pv-IOMMU patches. Also, the current filehyperv-iommu.cactually implements irq remapping on x86, so rename to more appropriatehv-irq-remap-x86.cand move it under the new hyperv subdirectory. Since this file implementsirq_remap_opsexposed bydrivers/iommu/irq_remapping.h, it cannot be relocated to the irq directory. This is in sync with other backend directories like amd and intel there.Lastly, this file should not be tied to
CONFIG_HYPERV_IOMMU, but toCONFIG_HYPERVandCONFIG_IRQ_REMAP.Signed-off-by Mukesh R <[email protected]>---
V2: renamehv-irq-remap.ctohv-irq-remap-x86.c
---
[...]
Quoted 2 lines
Other than the above nits, feel free to add:
Reviewed-by Jacob Pan <[email protected]>
I massaged the commit message, dropped the spurious white space changes, and committed this patch.
Wei
Quoted 15 lines · Mukesh R
Create hyperv subdirectory under
drivers/iommuin anticipation of more hyperv related files from upcoming PCI passthru and pv-IOMMU patches. Also, the current filehyperv-iommu.cactually implements irq remapping on x86, so rename to more appropriatehv-irq-remap-x86.cand move it under the new hyperv subdirectory. Since this file implementsirq_remap_opsexposed bydrivers/iommu/irq_remapping.h, it cannot be relocated to the irq directory. This is in sync with other backend directories like amd and intel there.Lastly, this file should not be tied to
CONFIG_HYPERV_IOMMU, but toCONFIG_HYPERVandCONFIG_IRQ_REMAP.Signed-off-by Mukesh R <[email protected]>---
V2: renamehv-irq-remap.ctohv-irq-remap-x86.c
Quoted 10 lines
---
MAINTAINERS | 2 +-
drivers/iommu/Kconfig | 9 ---------
drivers/iommu/Makefile | 2 +-
drivers/iommu/hyperv/Makefile | 2 ++
.../iommu/{hyperv-iommu.c => hyperv/hv-irq-remap-x86.c} | 8 +-------
drivers/iommu/irq_remapping.c | 2 +-
6 files changed, 6 insertions(+), 19 deletions(-)
create mode 100644 drivers/iommu/hyperv/Makefile
rename drivers/iommu/{hyperv-iommu.c => hyperv/hv-irq-remap-x86.c} (99%)