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 12/16] arm/iop13xx/MSI: Use MSI controller framework to configure MSI/MSI-X irq
Date: Mon, 27 Oct 2014 21:22:18 +0800 [thread overview]
Message-ID: <1414416142-31239-13-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/arm/mach-iop13xx/include/mach/pci.h | 4 ++++
arch/arm/mach-iop13xx/iq81340mc.c | 3 +++
arch/arm/mach-iop13xx/iq81340sc.c | 5 ++++-
arch/arm/mach-iop13xx/msi.c | 11 +++++++++--
4 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-iop13xx/include/mach/pci.h b/arch/arm/mach-iop13xx/include/mach/pci.h
index 59f42b5..c8f5caf 100644
--- a/arch/arm/mach-iop13xx/include/mach/pci.h
+++ b/arch/arm/mach-iop13xx/include/mach/pci.h
@@ -11,6 +11,10 @@ void iop13xx_atu_select(struct hw_pci *plat_pci);
void iop13xx_pci_init(void);
void iop13xx_map_pci_memory(void);
+#ifdef CONFIG_PCI_MSI
+extern struct msi_controller iop13xx_msi_ctrl;
+#endif
+
#define IOP_PCI_STATUS_ERROR (PCI_STATUS_PARITY | \
PCI_STATUS_SIG_TARGET_ABORT | \
PCI_STATUS_REC_TARGET_ABORT | \
diff --git a/arch/arm/mach-iop13xx/iq81340mc.c b/arch/arm/mach-iop13xx/iq81340mc.c
index 9cd07d3..7b802f5 100644
--- a/arch/arm/mach-iop13xx/iq81340mc.c
+++ b/arch/arm/mach-iop13xx/iq81340mc.c
@@ -59,6 +59,9 @@ static struct hw_pci iq81340mc_pci __initdata = {
.map_irq = iq81340mc_pcix_map_irq,
.scan = iop13xx_scan_bus,
.preinit = iop13xx_pci_init,
+#ifdef CONFIG_PCI_MSI
+ .msi_ctrl = &iop13xx_msi_ctrl,
+#endif
};
static int __init iq81340mc_pci_init(void)
diff --git a/arch/arm/mach-iop13xx/iq81340sc.c b/arch/arm/mach-iop13xx/iq81340sc.c
index b3ec11c..934de2e 100644
--- a/arch/arm/mach-iop13xx/iq81340sc.c
+++ b/arch/arm/mach-iop13xx/iq81340sc.c
@@ -60,7 +60,10 @@ static struct hw_pci iq81340sc_pci __initdata = {
.setup = iop13xx_pci_setup,
.scan = iop13xx_scan_bus,
.map_irq = iq81340sc_atux_map_irq,
- .preinit = iop13xx_pci_init
+ .preinit = iop13xx_pci_init,
+#ifdef CONFIG_PCI_MSI
+ .msi_ctrl = &iop13xx_msi_ctrl,
+#endif
};
static int __init iq81340sc_pci_init(void)
diff --git a/arch/arm/mach-iop13xx/msi.c b/arch/arm/mach-iop13xx/msi.c
index e7730cf..07a512e 100644
--- a/arch/arm/mach-iop13xx/msi.c
+++ b/arch/arm/mach-iop13xx/msi.c
@@ -132,7 +132,8 @@ static struct irq_chip iop13xx_msi_chip = {
.irq_unmask = unmask_msi_irq,
};
-int arch_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc)
+static int iop13xx_setup_msi_irq(struct msi_controller *ctrl,
+ struct pci_dev *dev, struct msi_desc *desc)
{
int id, irq = irq_alloc_desc_from(IRQ_IOP13XX_MSI_0, -1);
struct msi_msg msg;
@@ -159,7 +160,13 @@ int arch_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc)
return 0;
}
-void arch_teardown_msi_irq(unsigned int irq)
+static void iop13xx_teardown_msi_irq(struct msi_controller *ctrl,
+ unsigned int irq)
{
irq_free_desc(irq);
}
+
+struct msi_controller iop13xx_msi_ctrl = {
+ .setup_irq = iop13xx_setup_msi_irq,
+ .teardown_irq = iop13xx_teardown_msi_irq,
+};
--
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 ` Yijing Wang [this message]
2014-10-27 13:22 ` [PATCH 13/16] IA64/MSI: " Yijing Wang
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-13-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).