From: Megha Dey <megha.dey@linux.intel.com>
To: bhelgaas@google.com, linux-pci@vger.kernel.org
Cc: ashok.raj@intel.com, jacob.jun.pan@linux.intel.com,
megha.dey@intel.com, Megha Dey <megha.dey@linux.intel.com>
Subject: [RFC V1 3/6] x86: Introduce the dynamic teardown function
Date: Wed, 19 Jun 2019 15:03:41 -0700 [thread overview]
Message-ID: <1560981824-3966-4-git-send-email-megha.dey@linux.intel.com> (raw)
In-Reply-To: <1560981824-3966-1-git-send-email-megha.dey@linux.intel.com>
This is a preparatory patch to introduce disabling of MSI-X vectors
belonging to a particular group. In this patch, we introduce a x86
specific mechanism to teardown the IRQ vectors belonging to a
particular group.
Cc: Jacob Pan <jacob.jun.pan@linux.intel.com>
Cc: Ashok Raj <ashok.raj@intel.com>
Signed-off-by: Megha Dey <megha.dey@linux.intel.com>
---
arch/x86/include/asm/x86_init.h | 1 +
arch/x86/kernel/x86_init.c | 6 ++++++
drivers/pci/msi.c | 18 ++++++++++++++++++
include/linux/msi.h | 2 ++
4 files changed, 27 insertions(+)
diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
index b85a7c5..50f26a0 100644
--- a/arch/x86/include/asm/x86_init.h
+++ b/arch/x86/include/asm/x86_init.h
@@ -283,6 +283,7 @@ struct pci_dev;
struct x86_msi_ops {
int (*setup_msi_irqs)(struct pci_dev *dev, int nvec, int type);
void (*teardown_msi_irq)(unsigned int irq);
+ void (*teardown_msi_irqs_grp)(struct pci_dev *dev, int group_id);
void (*teardown_msi_irqs)(struct pci_dev *dev);
void (*restore_msi_irqs)(struct pci_dev *dev);
};
diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
index 50a2b49..794e7d4 100644
--- a/arch/x86/kernel/x86_init.c
+++ b/arch/x86/kernel/x86_init.c
@@ -127,6 +127,7 @@ EXPORT_SYMBOL_GPL(x86_platform);
struct x86_msi_ops x86_msi __ro_after_init = {
.setup_msi_irqs = native_setup_msi_irqs,
.teardown_msi_irq = native_teardown_msi_irq,
+ .teardown_msi_irqs_grp = default_teardown_msi_irqs_grp,
.teardown_msi_irqs = default_teardown_msi_irqs,
.restore_msi_irqs = default_restore_msi_irqs,
};
@@ -142,6 +143,11 @@ void arch_teardown_msi_irqs(struct pci_dev *dev)
x86_msi.teardown_msi_irqs(dev);
}
+void arch_teardown_msi_irqs_grp(struct pci_dev *dev, int group_id)
+{
+ x86_msi.teardown_msi_irqs_grp(dev, group_id);
+}
+
void arch_teardown_msi_irq(unsigned int irq)
{
x86_msi.teardown_msi_irq(irq);
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 73ad9bf..fd7fa6e 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -133,6 +133,24 @@ void __weak arch_teardown_msi_irqs(struct pci_dev *dev)
return default_teardown_msi_irqs(dev);
}
+void default_teardown_msi_irqs_grp(struct pci_dev *dev, int group_id)
+{
+ int i;
+ struct msi_desc *entry;
+
+ for_each_pci_msi_entry(entry, dev) {
+ if (entry->group_id == group_id && entry->irq) {
+ for (i = 0; i < entry->nvec_used; i++)
+ arch_teardown_msi_irq(entry->irq + i);
+ }
+ }
+}
+
+void __weak arch_teardown_msi_irqs_grp(struct pci_dev *dev, int group_id)
+{
+ return default_teardown_msi_irqs_grp(dev, group_id);
+}
+
static void default_restore_msi_irq(struct pci_dev *dev, int irq)
{
struct msi_desc *entry;
diff --git a/include/linux/msi.h b/include/linux/msi.h
index 91273cd..e61ba24 100644
--- a/include/linux/msi.h
+++ b/include/linux/msi.h
@@ -202,9 +202,11 @@ int arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc);
void arch_teardown_msi_irq(unsigned int irq);
int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type);
void arch_teardown_msi_irqs(struct pci_dev *dev);
+void arch_teardown_msi_irqs_grp(struct pci_dev *dev, int group_id);
void arch_restore_msi_irqs(struct pci_dev *dev);
void default_teardown_msi_irqs(struct pci_dev *dev);
+void default_teardown_msi_irqs_grp(struct pci_dev *dev, int group_id);
void default_restore_msi_irqs(struct pci_dev *dev);
struct msi_controller {
--
2.7.4
next prev parent reply other threads:[~2019-06-19 21:41 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-19 22:03 [RFC V1 0/6] Introduce dynamic allocation/freeing of MSI-X vectors Megha Dey
2019-06-19 22:03 ` [RFC V1 1/6] PCI/MSI: New structures/macros for dynamic MSI-X allocation Megha Dey
2019-06-19 22:03 ` [RFC V1 2/6] PCI/MSI: Dynamic allocation of MSI-X vectors by group Megha Dey
2019-06-19 22:03 ` Megha Dey [this message]
2019-06-19 22:03 ` [RFC V1 4/6] PCI/MSI: Introduce new structure to manage MSI-x entries Megha Dey
2019-06-19 22:03 ` [RFC V1 5/6] PCI/MSI: Free MSI-X resources by group Megha Dey
2019-06-19 22:03 ` [RFC V1 6/6] Documentation: PCI/MSI: Document dynamic MSI-X infrastructure Megha Dey
2019-06-22 0:23 ` [RFC V1 0/6] Introduce dynamic allocation/freeing of MSI-X vectors Megha Dey
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=1560981824-3966-4-git-send-email-megha.dey@linux.intel.com \
--to=megha.dey@linux.intel.com \
--cc=ashok.raj@intel.com \
--cc=bhelgaas@google.com \
--cc=jacob.jun.pan@linux.intel.com \
--cc=linux-pci@vger.kernel.org \
--cc=megha.dey@intel.com \
/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).