From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 615C535DA49 for ; Fri, 29 May 2026 01:42:50 +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=1780018971; cv=none; b=P204nUdvT3yCmFqBrS2OtNzCPxmTf5FPr7Q1WHyS971Rw8bXTjyKEnDnhejfWxtyejIv4YBie7KN5AFgB3Ckd74X8c7az7IlXNeW7y2U1/CNNzWApxxsObZ15ukdwQwhWcb0uycuPPAPAOgpJ+gc34uA32OXFpG17lAGcbqArE0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780018971; c=relaxed/simple; bh=rvWqM5AJP4TslqeE4XcHc6YuFZk337vT0jJyKfXWZGA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=izK1kReQttqcW94XZj8sgJtAI74fOIpKMjh9g+6x3TkOYMoARS8q4xskzg+Xm+4S892oQjDEX309B07qcAKGQpMQxX6gF1zKy88ioZcSChnStRmfibrXxkWZYfhi3IRv4+lERRRfVrsqfzWQ/wK4FX762+xe0oZ/esoryd+bqa0= 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=s9VTD7W7; 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="s9VTD7W7" Received: from mrdev.corp.microsoft.com (unknown [40.86.183.173]) by linux.microsoft.com (Postfix) with ESMTPSA id 63D4A20B7167; Thu, 28 May 2026 18:42:38 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 63D4A20B7167 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1780018958; bh=5bqqEwLTEJDww2bV2cCS6/CLxtZa5fhnAGBKbAe3tCU=; h=From:To:Cc:Subject:Date:From; b=s9VTD7W7XQujNk+kDoBQUxEDgwXoJD+WtLhqFZ3VeX6uLV6DDFGECeVAvT33CG1sj 9+9QoZJfRHSnbjv7oeJksqB7aIjp7D1oboeytjlOnJLg/GFnwXJm7axIGqisGbuLe5 EIOOO+3Tj2MfYgCktqaLrq8I/fJLHtaSwdXxzATM= 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, mrathor@linux.microsoft.com Subject: [PATCH V1] iommu/hyperv: Create hyperv subdirectory under drivers/iommu Date: Thu, 28 May 2026 18:41:48 -0700 Message-ID: <20260529014148.297154-1-mrathor@linux.microsoft.com> X-Mailer: git-send-email 2.51.2.vfs.0.1 Precedence: bulk X-Mailing-List: iommu@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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, so rename to more appropriate hv-irq-remap.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 --- MAINTAINERS | 2 +- drivers/iommu/Kconfig | 9 --------- drivers/iommu/Makefile | 2 +- drivers/iommu/hyperv/Makefile | 2 ++ drivers/iommu/{hyperv-iommu.c => hyperv/hv-irq-remap.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.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 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 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) += 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 diff --git a/drivers/iommu/hyperv/Makefile b/drivers/iommu/hyperv/Makefile new file mode 100644 index 000000000000..0053e00e08e6 --- /dev/null +++ b/drivers/iommu/hyperv/Makefile @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-$(CONFIG_IRQ_REMAP) += hv-irq-remap.o diff --git a/drivers/iommu/hyperv-iommu.c b/drivers/iommu/hyperv/hv-irq-remap.c similarity index 99% rename from drivers/iommu/hyperv-iommu.c rename to drivers/iommu/hyperv/hv-irq-remap.c index 479103261ae6..b34ee9589190 100644 --- a/drivers/iommu/hyperv-iommu.c +++ b/drivers/iommu/hyperv/hv-irq-remap.c @@ -7,13 +7,11 @@ * * Author : Lan Tianyu */ - #include #include #include #include #include - #include #include #include @@ -22,9 +20,7 @@ #include #include -#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 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() == 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 -- 2.51.2.vfs.0.1