From: Bjorn Helgaas <helgaas@kernel.org>
To: linux-pci@vger.kernel.org, Joerg Roedel <joro@8bytes.org>,
Will Deacon <will@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>,
Kevin Tian <kevin.tian@intel.com>, Marc Zyngier <maz@kernel.org>,
Reinette Chatre <reinette.chatre@intel.com>,
Jason Gunthorpe <jgg@nvidia.com>,
Alex Williamson <alex.williamson@redhat.com>,
Dave Jiang <dave.jiang@intel.com>,
Megha Dey <megha.dey@intel.com>,
Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>,
Robin Murphy <robin.murphy@arm.com>,
David Woodhouse <dwmw2@infradead.org>,
Lu Baolu <baolu.lu@linux.intel.com>,
iommu@lists.linux.dev, linux-kernel@vger.kernel.org,
Bjorn Helgaas <bhelgaas@google.com>
Subject: [PATCH v2 5/7] Revert "iommu/vt-d: Enable PCI/IMS"
Date: Wed, 10 Apr 2024 17:13:05 -0500 [thread overview]
Message-ID: <20240410221307.2162676-6-helgaas@kernel.org> (raw)
In-Reply-To: <20240410221307.2162676-1-helgaas@kernel.org>
From: Bjorn Helgaas <bhelgaas@google.com>
This reverts commit 810531a1af5393f010d6508b1cb48e6650fc5e8f.
IMS (Interrupt Message Store) support appeared in v6.2, but there are no
users yet.
Remove it for now. We can add it back when a user comes along.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/iommu/intel/irq_remapping.c | 19 +++----------------
1 file changed, 3 insertions(+), 16 deletions(-)
diff --git a/drivers/iommu/intel/irq_remapping.c b/drivers/iommu/intel/irq_remapping.c
index 566297bc87dd..0f64fa72ac4f 100644
--- a/drivers/iommu/intel/irq_remapping.c
+++ b/drivers/iommu/intel/irq_remapping.c
@@ -82,7 +82,7 @@ static const struct irq_domain_ops intel_ir_domain_ops;
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, virt_dmar_msi_parent_ops;
+static const struct msi_parent_ops dmar_msi_parent_ops;
static bool ir_pre_enabled(struct intel_iommu *iommu)
{
@@ -567,11 +567,7 @@ static int intel_setup_irq_remapping(struct intel_iommu *iommu)
irq_domain_update_bus_token(iommu->ir_domain, DOMAIN_BUS_DMAR);
iommu->ir_domain->flags |= IRQ_DOMAIN_FLAG_MSI_PARENT |
IRQ_DOMAIN_FLAG_ISOLATED_MSI;
-
- if (cap_caching_mode(iommu->cap))
- iommu->ir_domain->msi_parent_ops = &virt_dmar_msi_parent_ops;
- else
- iommu->ir_domain->msi_parent_ops = &dmar_msi_parent_ops;
+ iommu->ir_domain->msi_parent_ops = &dmar_msi_parent_ops;
ir_table->base = page_address(pages);
ir_table->bitmap = bitmap;
@@ -1421,20 +1417,11 @@ static const struct irq_domain_ops intel_ir_domain_ops = {
};
static const struct msi_parent_ops dmar_msi_parent_ops = {
- .supported_flags = X86_VECTOR_MSI_FLAGS_SUPPORTED |
- MSI_FLAG_MULTI_PCI_MSI |
- MSI_FLAG_PCI_IMS,
+ .supported_flags = X86_VECTOR_MSI_FLAGS_SUPPORTED | MSI_FLAG_MULTI_PCI_MSI,
.prefix = "IR-",
.init_dev_msi_info = msi_parent_init_dev_msi_info,
};
-static const struct msi_parent_ops virt_dmar_msi_parent_ops = {
- .supported_flags = X86_VECTOR_MSI_FLAGS_SUPPORTED |
- MSI_FLAG_MULTI_PCI_MSI,
- .prefix = "vIR-",
- .init_dev_msi_info = msi_parent_init_dev_msi_info,
-};
-
/*
* Support of Interrupt Remapping Unit Hotplug
*/
--
2.34.1
next prev parent reply other threads:[~2024-04-10 22:13 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-10 22:13 [PATCH v2 0/7] PCI/MSI: Remove IMS (Interrupt Message Store) support for now Bjorn Helgaas
2024-04-10 22:13 ` [PATCH v2 1/7] Revert "PCI/MSI: Provide stubs for IMS functions" Bjorn Helgaas
2024-04-10 22:13 ` [PATCH v2 2/7] Revert "PCI/MSI: Provide pci_ims_alloc/free_irq()" Bjorn Helgaas
2024-04-10 22:13 ` [PATCH v2 3/7] Revert "PCI/MSI: Provide IMS (Interrupt Message Store) support" Bjorn Helgaas
2024-04-10 22:13 ` [PATCH v2 4/7] Revert "iommu/amd: Enable PCI/IMS" Bjorn Helgaas
2024-04-11 5:12 ` Tian, Kevin
2024-04-10 22:13 ` Bjorn Helgaas [this message]
2024-04-11 5:13 ` [PATCH v2 5/7] Revert "iommu/vt-d: " Tian, Kevin
2024-04-10 22:13 ` [PATCH v2 6/7] Revert "x86/apic/msi: " Bjorn Helgaas
2024-04-11 5:13 ` Tian, Kevin
2024-04-10 22:13 ` [PATCH v2 7/7] Revert "genirq/msi: Provide constants for PCI/IMS support" Bjorn Helgaas
2024-04-11 5:14 ` Tian, Kevin
2024-04-10 22:45 ` [PATCH v2 0/7] PCI/MSI: Remove IMS (Interrupt Message Store) support for now Thomas Gleixner
2024-04-10 22:46 ` Jason Gunthorpe
2024-04-12 21:31 ` Bjorn Helgaas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240410221307.2162676-6-helgaas@kernel.org \
--to=helgaas@kernel.org \
--cc=alex.williamson@redhat.com \
--cc=baolu.lu@linux.intel.com \
--cc=bhelgaas@google.com \
--cc=dave.jiang@intel.com \
--cc=dwmw2@infradead.org \
--cc=iommu@lists.linux.dev \
--cc=jgg@nvidia.com \
--cc=joro@8bytes.org \
--cc=kevin.tian@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=maz@kernel.org \
--cc=megha.dey@intel.com \
--cc=reinette.chatre@intel.com \
--cc=robin.murphy@arm.com \
--cc=suravee.suthikulpanit@amd.com \
--cc=tglx@linutronix.de \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).