From nobody Thu Sep 18 14:13:56 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 29077C4332F for ; Mon, 5 Dec 2022 18:26:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233332AbiLES0l (ORCPT ); Mon, 5 Dec 2022 13:26:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39564 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232414AbiLESZT (ORCPT ); Mon, 5 Dec 2022 13:25:19 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5902A20BDA; Mon, 5 Dec 2022 10:25:17 -0800 (PST) Date: Mon, 05 Dec 2022 18:25:14 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1670264714; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dxYZp75+n1m4oe1u+WV4gWWwd8DXVGrrB+Ur6R0YEuE=; b=r5nIwLiVBKUAjyg0jHg2agw+DMH9AgTE4aB06Y/90NNLvk9yJK6biooHAeuFnPenEDN9Hl EzXxI5AmpUbHB1dmkyxmip4qqlFw6S43VcRLHNUUonO7FwGIgjV4Vk4sUOQ7BhujhHjNmC MoDmk94svRWJeia+PVJ4dFsT/sQ7CcVvQ2JD3txNlRLyEf3GbHaYMdazQY/NXbQZpjFep7 McaUdP9xD45XgXolr3UGNQeYsqCCth/0i/vRPpoJ/GQPFTGgUp90QU59nNDE0d5Spid+NX RFGBGenOiYblRZDUY4kELVTYkRhm7rhxar9lwyXWvbpLAfBc3WkEsbCZhCs8qA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1670264714; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dxYZp75+n1m4oe1u+WV4gWWwd8DXVGrrB+Ur6R0YEuE=; b=ydJVw5THFSeNDIqf1+NtGtbK28BkA+eWLfbj0EuFSrf/OCDIco9cGFN9tVOepHnGqV2bsH EMX9Y8O1IVAW29BQ== From: "tip-bot2 for Thomas Gleixner" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: irq/core] iommu/vt-d: Switch to MSI parent domains Cc: Thomas Gleixner , Kevin Tian , Marc Zyngier , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20221124232326.151226317@linutronix.de> References: <20221124232326.151226317@linutronix.de> MIME-Version: 1.0 Message-ID: <167026471406.4906.5560609467786500456.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the irq/core branch of tip: Commit-ID: 01290527cfe8bb5aa8bb6c29ba5f3493d75652ca Gitweb: https://git.kernel.org/tip/01290527cfe8bb5aa8bb6c29ba5f3493d= 75652ca Author: Thomas Gleixner AuthorDate: Fri, 25 Nov 2022 00:26:08 +01:00 Committer: Thomas Gleixner CommitterDate: Mon, 05 Dec 2022 19:21:02 +01:00 iommu/vt-d: Switch to MSI parent domains Remove the global PCI/MSI irqdomain implementation and provide the required MSI parent ops so the PCI/MSI code can detect the new parent and setup per device domains. Signed-off-by: Thomas Gleixner Reviewed-by: Kevin Tian Acked-by: Marc Zyngier Link: https://lore.kernel.org/r/20221124232326.151226317@linutronix.de --- arch/x86/kernel/apic/msi.c | 2 ++ drivers/iommu/intel/iommu.h | 1 - drivers/iommu/intel/irq_remapping.c | 27 ++++++++++++--------------- include/linux/irqdomain_defs.h | 1 + 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/arch/x86/kernel/apic/msi.c b/arch/x86/kernel/apic/msi.c index db96bfc..a8dccb0 100644 --- a/arch/x86/kernel/apic/msi.c +++ b/arch/x86/kernel/apic/msi.c @@ -217,6 +217,8 @@ static bool x86_init_dev_msi_info(struct device *dev, s= truct irq_domain *domain, /* See msi_set_affinity() for the gory details */ info->flags |=3D MSI_FLAG_NOMASK_QUIRK; break; + case DOMAIN_BUS_DMAR: + break; default: WARN_ON_ONCE(1); return false; diff --git a/drivers/iommu/intel/iommu.h b/drivers/iommu/intel/iommu.h index 92023df..6eadb86 100644 --- a/drivers/iommu/intel/iommu.h +++ b/drivers/iommu/intel/iommu.h @@ -600,7 +600,6 @@ struct intel_iommu { #ifdef CONFIG_IRQ_REMAP struct ir_table *ir_table; /* Interrupt remapping info */ struct irq_domain *ir_domain; - struct irq_domain *ir_msi_domain; #endif struct iommu_device iommu; /* IOMMU core code handle */ int node; diff --git a/drivers/iommu/intel/irq_remapping.c b/drivers/iommu/intel/irq_= remapping.c index 08bbf08..6fab407 100644 --- a/drivers/iommu/intel/irq_remapping.c +++ b/drivers/iommu/intel/irq_remapping.c @@ -82,6 +82,7 @@ static const struct irq_domain_ops intel_ir_domain_ops; =20 static void iommu_disable_irq_remapping(struct intel_iommu *iommu); static int __init parse_ioapics_under_ir(void); +static const struct msi_parent_ops dmar_msi_parent_ops; =20 static bool ir_pre_enabled(struct intel_iommu *iommu) { @@ -230,7 +231,7 @@ static struct irq_domain *map_dev_to_ir(struct pci_dev = *dev) { struct dmar_drhd_unit *drhd =3D dmar_find_matched_drhd_unit(dev); =20 - return drhd ? drhd->iommu->ir_msi_domain : NULL; + return drhd ? drhd->iommu->ir_domain : NULL; } =20 static int clear_entries(struct irq_2_iommu *irq_iommu) @@ -573,10 +574,10 @@ static int intel_setup_irq_remapping(struct intel_iom= mu *iommu) pr_err("IR%d: failed to allocate irqdomain\n", iommu->seq_id); goto out_free_fwnode; } - iommu->ir_msi_domain =3D - arch_create_remap_msi_irq_domain(iommu->ir_domain, - "INTEL-IR-MSI", - iommu->seq_id); + + irq_domain_update_bus_token(iommu->ir_domain, DOMAIN_BUS_DMAR); + iommu->ir_domain->flags |=3D IRQ_DOMAIN_FLAG_MSI_PARENT; + iommu->ir_domain->msi_parent_ops =3D &dmar_msi_parent_ops; =20 ir_table->base =3D page_address(pages); ir_table->bitmap =3D bitmap; @@ -620,9 +621,6 @@ static int intel_setup_irq_remapping(struct intel_iommu= *iommu) return 0; =20 out_free_ir_domain: - if (iommu->ir_msi_domain) - irq_domain_remove(iommu->ir_msi_domain); - iommu->ir_msi_domain =3D NULL; irq_domain_remove(iommu->ir_domain); iommu->ir_domain =3D NULL; out_free_fwnode: @@ -644,13 +642,6 @@ static void intel_teardown_irq_remapping(struct intel_= iommu *iommu) struct fwnode_handle *fn; =20 if (iommu && iommu->ir_table) { - if (iommu->ir_msi_domain) { - fn =3D iommu->ir_msi_domain->fwnode; - - irq_domain_remove(iommu->ir_msi_domain); - irq_domain_free_fwnode(fn); - iommu->ir_msi_domain =3D NULL; - } if (iommu->ir_domain) { fn =3D iommu->ir_domain->fwnode; =20 @@ -1437,6 +1428,12 @@ static const struct irq_domain_ops intel_ir_domain_o= ps =3D { .deactivate =3D intel_irq_remapping_deactivate, }; =20 +static const struct msi_parent_ops dmar_msi_parent_ops =3D { + .supported_flags =3D X86_VECTOR_MSI_FLAGS_SUPPORTED | MSI_FLAG_MULTI_PCI_= MSI, + .prefix =3D "IR-", + .init_dev_msi_info =3D msi_parent_init_dev_msi_info, +}; + /* * Support of Interrupt Remapping Unit Hotplug */ diff --git a/include/linux/irqdomain_defs.h b/include/linux/irqdomain_defs.h index b3f4b7e..3a09396 100644 --- a/include/linux/irqdomain_defs.h +++ b/include/linux/irqdomain_defs.h @@ -23,6 +23,7 @@ enum irq_domain_bus_token { DOMAIN_BUS_VMD_MSI, DOMAIN_BUS_PCI_DEVICE_MSI, DOMAIN_BUS_PCI_DEVICE_MSIX, + DOMAIN_BUS_DMAR, }; =20 #endif /* _LINUX_IRQDOMAIN_DEFS_H */