From: Yijing Wang <wangyijing@huawei.com>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: <linux-pci@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
Xinwei Hu <huxinwei@huawei.com>, Wuyun <wuyun.wu@huawei.com>,
<linux-arm-kernel@lists.infradead.org>,
Russell King <linux@arm.linux.org.uk>, <x86@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
<xen-devel@lists.xenproject.org>, Joerg Roedel <joro@8bytes.org>,
<iommu@lists.linux-foundation.org>, <linux-mips@linux-mips.org>,
"Benjamin Herrenschmidt" <benh@kernel.crashing.org>,
<linuxppc-dev@lists.ozlabs.org>, <linux-s390@vger.kernel.org>,
Sebastian Ott <sebott@linux.vnet.ibm.com>,
"Tony Luck" <tony.luck@intel.com>, <linux-ia64@vger.kernel.org>,
"David S. Miller" <davem@davemloft.net>,
<sparclinux@vger.kernel.org>, Chris Metcalf <cmetcalf@tilera.com>,
Ralf Baechle <ralf@linux-mips.org>,
Lucas Stach <l.stach@pengutronix.de>,
David Vrabel <david.vrabel@citrix.com>,
"Sergei Shtylyov" <sergei.shtylyov@cogentembedded.com>,
Michael Ellerman <mpe@ellerman.id.au>,
Thierry Reding <thierry.reding@gmail.com>,
"Thomas Petazzoni" <thomas.petazzoni@free-electrons.com>,
Yijing Wang <wangyijing@huawei.com>
Subject: [PATCH 13/16] IA64/MSI: Use MSI controller framework to configure MSI/MSI-X irq
Date: Mon, 27 Oct 2014 21:22:19 +0800 [thread overview]
Message-ID: <1414416142-31239-14-git-send-email-wangyijing@huawei.com> (raw)
In-Reply-To: <1414416142-31239-1-git-send-email-wangyijing@huawei.com>
Use MSI controller framework instead of arch MSI functions to configure
MSI/MSI-X irq. So we can manage MSI/MSI-X irq in a unified framework.
Signed-off-by: Yijing Wang <wangyijing@huawei.com>
---
arch/ia64/include/asm/pci.h | 3 ++-
arch/ia64/kernel/msi_ia64.c | 24 ++++++++++++++++++------
arch/ia64/pci/pci.c | 1 +
3 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/arch/ia64/include/asm/pci.h b/arch/ia64/include/asm/pci.h
index 52af5ed..805bbc3 100644
--- a/arch/ia64/include/asm/pci.h
+++ b/arch/ia64/include/asm/pci.h
@@ -93,7 +93,7 @@ struct pci_controller {
void *iommu;
int segment;
int node; /* nearest node with memory or NUMA_NO_NODE for global allocation */
-
+ struct msi_controller *msi_ctrl;
void *platform_data;
};
@@ -101,6 +101,7 @@ struct pci_controller {
#define PCI_CONTROLLER(busdev) ((struct pci_controller *) busdev->sysdata)
#define pci_domain_nr(busdev) (PCI_CONTROLLER(busdev)->segment)
+extern struct msi_controller ia64_msi_ctrl;
extern struct pci_ops pci_root_ops;
static inline int pci_proc_domain(struct pci_bus *bus)
diff --git a/arch/ia64/kernel/msi_ia64.c b/arch/ia64/kernel/msi_ia64.c
index 8c3730c..b92b8e2 100644
--- a/arch/ia64/kernel/msi_ia64.c
+++ b/arch/ia64/kernel/msi_ia64.c
@@ -42,7 +42,7 @@ static int ia64_set_msi_irq_affinity(struct irq_data *idata,
}
#endif /* CONFIG_SMP */
-int ia64_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc)
+int __ia64_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc)
{
struct msi_msg msg;
unsigned long dest_phys_id;
@@ -77,7 +77,7 @@ int ia64_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc)
return 0;
}
-void ia64_teardown_msi_irq(unsigned int irq)
+void __ia64_teardown_msi_irq(unsigned int irq)
{
destroy_irq(irq);
}
@@ -111,23 +111,35 @@ static struct irq_chip ia64_msi_chip = {
.irq_retrigger = ia64_msi_retrigger_irq,
};
+struct msi_controller *pcibios_msi_controller(struct pci_bus *bus)
+{
+ struct pci_controller *ctrl = bus->sysdata;
+
+ return ctrl->msi_ctrl;
+}
-int arch_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc)
+static int ia64_setup_msi_irq(struct msi_controller *ctrl,
+ struct pci_dev *pdev, struct msi_desc *desc)
{
if (platform_setup_msi_irq)
return platform_setup_msi_irq(pdev, desc);
- return ia64_setup_msi_irq(pdev, desc);
+ return __ia64_setup_msi_irq(pdev, desc);
}
-void arch_teardown_msi_irq(unsigned int irq)
+static void ia64_teardown_msi_irq(struct msi_controller *ctrl, unsigned int irq)
{
if (platform_teardown_msi_irq)
return platform_teardown_msi_irq(irq);
- return ia64_teardown_msi_irq(irq);
+ return __ia64_teardown_msi_irq(irq);
}
+struct msi_controller ia64_msi_ctrl = {
+ .setup_irq = ia64_setup_msi_irq,
+ .teardown_irq = ia64_teardown_msi_irq,
+};
+
#ifdef CONFIG_INTEL_IOMMU
#ifdef CONFIG_SMP
static int dmar_msi_set_affinity(struct irq_data *data,
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index 291a582..875f46a 100644
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -437,6 +437,7 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
controller->companion = device;
controller->node = acpi_get_node(device->handle);
+ controller->msi_ctrl = &ia64_msi_ctrl;
info = kzalloc(sizeof(*info), GFP_KERNEL);
if (!info) {
--
1.7.1
next prev parent reply other threads:[~2014-10-27 13:22 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-27 13:22 [PATCH 00/16] Use MSI controller framework to configure MSI/MSI-X Yijing Wang
2014-10-27 13:22 ` [PATCH 01/16] PCI/MSI: Refactor MSI controller to make it become more common Yijing Wang
2014-10-27 13:22 ` [PATCH 02/16] x86/MSI: Use MSI controller framework to configure MSI/MSI-X irq Yijing Wang
2014-10-27 13:22 ` [PATCH 03/16] x86/xen/MSI: " Yijing Wang
2014-10-27 13:08 ` [Xen-devel] " David Vrabel
2014-10-27 13:22 ` [PATCH 04/16] Irq_remapping/MSI: " Yijing Wang
2014-10-27 13:22 ` [PATCH 05/16] x86/MSI: Remove unused MSI weak arch functions Yijing Wang
2014-10-27 13:22 ` [PATCH 06/16] Mips/MSI: Save MSI controller in pci sysdata Yijing Wang
2014-10-27 13:22 ` [PATCH 07/16] MIPS/Octeon/MSI: Use MSI controller framework to configure MSI/MSI-X irq Yijing Wang
2014-10-27 13:22 ` [PATCH 08/16] MIPS/Xlp/MSI: " Yijing Wang
2014-10-27 13:22 ` [PATCH 09/16] MIPS/Xlr/MSI: " Yijing Wang
2014-10-27 13:22 ` [PATCH 10/16] Powerpc/MSI: " Yijing Wang
2014-10-27 13:22 ` [PATCH 11/16] s390/MSI: " Yijing Wang
2014-10-27 13:22 ` [PATCH 12/16] arm/iop13xx/MSI: " Yijing Wang
2014-10-27 13:22 ` Yijing Wang [this message]
2014-10-27 13:22 ` [PATCH 14/16] Sparc/MSI: " Yijing Wang
2014-10-27 13:22 ` [PATCH 15/16] tile/MSI: " Yijing Wang
2014-10-27 13:22 ` [PATCH 16/16] PCI/MSI: Clean up unused MSI arch functions Yijing Wang
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=1414416142-31239-14-git-send-email-wangyijing@huawei.com \
--to=wangyijing@huawei.com \
--cc=benh@kernel.crashing.org \
--cc=bhelgaas@google.com \
--cc=cmetcalf@tilera.com \
--cc=davem@davemloft.net \
--cc=david.vrabel@citrix.com \
--cc=huxinwei@huawei.com \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=konrad.wilk@oracle.com \
--cc=l.stach@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=ralf@linux-mips.org \
--cc=sebott@linux.vnet.ibm.com \
--cc=sergei.shtylyov@cogentembedded.com \
--cc=sparclinux@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=thierry.reding@gmail.com \
--cc=thomas.petazzoni@free-electrons.com \
--cc=tony.luck@intel.com \
--cc=wuyun.wu@huawei.com \
--cc=x86@kernel.org \
--cc=xen-devel@lists.xenproject.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).