From nobody Mon Jun 8 09:48:08 2026 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 946484DA554 for ; Wed, 3 Jun 2026 22:50:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=13.77.154.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780527039; cv=none; b=Ui4mD4dyh9Kw7mrtRWySmnV7Cxg5ESCmJdcLhUzIhSUXkY7RK2/gIEt2sVR49SbZDRcLkKAqMJIWsQt8MDr0pQxw/E396K+oXdaWIgwZJpeInufVQKjyoevzSfKKlyhhD0FKHnfLGrFgw7QM3poUQd7Z2DfLYF8Cws0SlvA5HIo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780527039; c=relaxed/simple; bh=dPClAJ7bQrMHWz9e1VgHw+Oi4pN1KEPH8SsmyjoU01Q=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=UbwPCY1zvTUIUc9SijBqGVFC37JqlWpoXhdnoq3/YnlbDqmSDBVygCEvg7sWcJvuypfJIUvxxf+THzVbR7E2vuDDaZGMM+Fpq9eLvbvfH8RhtuJa+80KCqBIwwsoqifM4qG08D9/TAxmbmSAiOmWKLm7KAKpY4xUNa7oHHXZDXk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com; spf=pass smtp.mailfrom=linux.microsoft.com; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b=U4uoATHV; arc=none smtp.client-ip=13.77.154.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.microsoft.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b="U4uoATHV" Received: from mrdev.corp.microsoft.com (192-184-212-33.fiber.dynamic.sonic.net [192.184.212.33]) by linux.microsoft.com (Postfix) with ESMTPSA id B4F2F20B7168; Wed, 3 Jun 2026 15:50:15 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com B4F2F20B7168 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1780527015; bh=RMiaE7oR+D/CfvUkePMEhFg25b4TTde633hXyQ/6gTo=; h=From:To:Cc:Subject:Date:From; b=U4uoATHVQv5pjHQq9mdW52K3h/7+FJXi3BhXaG2gFrc+E3G1Vm/aBZIp1KshMXJhs pbTgDoNwt3Lxu3+Gx3kqrHr2Q5KzhWLS5AupziHqWJsFADU30TWBXN7LUIrlGwXxfv azG3fIdkaljXXwF01SlfOHyS9cNF44d2Uj+Aq7Uw= From: Mukesh R To: linux-kernel@vger.kernel.org, iommu@lists.linux.dev Cc: mhklinux@outlook.com, wei.liu@kernel.org, zhangyu1@linux.microsoft.com, jacob.pan@linux.microsoft.com, schakrabarti@linux.microsoft.com Subject: [PATCH V2] iommu/hyperv: Create hyperv subdirectory under drivers/iommu Date: Wed, 3 Jun 2026 15:50:10 -0700 Message-ID: <20260603225010.1347623-1-mrathor@linux.microsoft.com> X-Mailer: git-send-email 2.51.2.vfs.0.1 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" 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. Signed-off-by: Mukesh R Reviewed-by: Jacob Pan --- 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 =3D> 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 =3D> hyperv/hv-irq-remap-x86.c} (99%) diff --git a/MAINTAINERS b/MAINTAINERS index b539be153f6a..93a7105e9cef 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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 diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig index f86262b11416..1becc0f20222 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig @@ -351,15 +351,6 @@ config MTK_IOMMU_V1 =20 if unsure, say N here. =20 -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 diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile index 0275821f4ef9..d9683422aecb 100644 --- a/drivers/iommu/Makefile +++ b/drivers/iommu/Makefile @@ -4,6 +4,7 @@ obj-$(CONFIG_AMD_IOMMU) +=3D amd/ obj-$(CONFIG_INTEL_IOMMU) +=3D intel/ obj-$(CONFIG_RISCV_IOMMU) +=3D riscv/ obj-$(CONFIG_GENERIC_PT) +=3D generic_pt/fmt/ +obj-$(CONFIG_HYPERV) +=3D hyperv/ obj-$(CONFIG_IOMMU_API) +=3D iommu.o obj-$(CONFIG_IOMMU_SUPPORT) +=3D iommu-pages.o obj-$(CONFIG_IOMMU_API) +=3D iommu-traces.o @@ -30,7 +31,6 @@ obj-$(CONFIG_TEGRA_IOMMU_SMMU) +=3D tegra-smmu.o obj-$(CONFIG_EXYNOS_IOMMU) +=3D exynos-iommu.o obj-$(CONFIG_FSL_PAMU) +=3D fsl_pamu.o fsl_pamu_domain.o obj-$(CONFIG_S390_IOMMU) +=3D s390-iommu.o -obj-$(CONFIG_HYPERV_IOMMU) +=3D hyperv-iommu.o obj-$(CONFIG_VIRTIO_IOMMU) +=3D virtio-iommu.o obj-$(CONFIG_IOMMU_SVA) +=3D iommu-sva.o obj-$(CONFIG_IOMMU_IOPF) +=3D io-pgfault.o diff --git a/drivers/iommu/hyperv/Makefile b/drivers/iommu/hyperv/Makefile new file mode 100644 index 000000000000..6ef0ef97f3dd --- /dev/null +++ b/drivers/iommu/hyperv/Makefile @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-$(CONFIG_IRQ_REMAP) +=3D hv-irq-remap-x86.o diff --git a/drivers/iommu/hyperv-iommu.c b/drivers/iommu/hyperv/hv-irq-rem= ap-x86.c similarity index 99% rename from drivers/iommu/hyperv-iommu.c rename to drivers/iommu/hyperv/hv-irq-remap-x86.c index 479103261ae6..b34ee9589190 100644 --- a/drivers/iommu/hyperv-iommu.c +++ b/drivers/iommu/hyperv/hv-irq-remap-x86.c @@ -7,13 +7,11 @@ * * Author : Lan Tianyu */ - #include #include #include #include #include - #include #include #include @@ -22,9 +20,7 @@ #include #include =20 -#include "irq_remapping.h" - -#ifdef CONFIG_IRQ_REMAP +#include "../irq_remapping.h" =20 /* * 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_domai= n_ops =3D { .alloc =3D hyperv_root_irq_remapping_alloc, .free =3D hyperv_root_irq_remapping_free, }; - -#endif diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c index c2443659812a..41bf65e4ea88 100644 --- a/drivers/iommu/irq_remapping.c +++ b/drivers/iommu/irq_remapping.c @@ -108,7 +108,7 @@ int __init irq_remapping_prepare(void) else if (IS_ENABLED(CONFIG_AMD_IOMMU) && amd_iommu_irq_ops.prepare() =3D=3D 0) remap_ops =3D &amd_iommu_irq_ops; - else if (IS_ENABLED(CONFIG_HYPERV_IOMMU) && + else if (IS_ENABLED(CONFIG_HYPERV) && hyperv_irq_remap_ops.prepare() =3D=3D 0) remap_ops =3D &hyperv_irq_remap_ops; else --=20 2.51.2.vfs.0.1