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>,
Thomas Gleixner <tglx@linutronix.de>,
"Thierry Reding" <thierry.reding@gmail.com>,
Thomas Petazzoni <thomas.petazzoni@free-electrons.com>,
Yijing Wang <wangyijing@huawei.com>
Subject: [PATCH 02/10] PCI/MSI: Introduce weak pcibios_msi_controller()
Date: Mon, 27 Oct 2014 15:48:39 +0800 [thread overview]
Message-ID: <1414396127-30023-3-git-send-email-wangyijing@huawei.com> (raw)
In-Reply-To: <1414396127-30023-1-git-send-email-wangyijing@huawei.com>
Introduce a new weak pcibios_msi_controller() to
get the associate msi_chip for PCI bus. This is
preparation for save msi_chip in arch PCI sysdata.
This weak function will be removed after we save
msi_chip in generic pci_host_bridge.
Suggested-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Yijing Wang <wangyijing@huawei.com>
---
drivers/pci/msi.c | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 1c7ca4a..f085f7f 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -30,9 +30,24 @@ int pci_msi_ignore_mask;
/* Arch hooks */
+struct msi_controller * __weak pcibios_msi_controller(struct pci_bus *bus)
+{
+ return NULL;
+}
+
+struct msi_controller *pci_msi_controller(struct pci_bus *bus)
+{
+ struct msi_controller *ctrl = bus->msi;
+
+ if (ctrl)
+ return ctrl;
+
+ return pcibios_msi_controller(bus);
+}
+
int __weak arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc)
{
- struct msi_controller *ctrl = dev->bus->msi;
+ struct msi_controller *ctrl = pci_msi_controller(dev->bus);
int err;
if (!ctrl || !ctrl->setup_irq)
@@ -48,7 +63,7 @@ int __weak arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc)
void __weak arch_teardown_msi_irq(unsigned int irq)
{
struct msi_desc *entry = irq_get_msi_desc(irq);
- struct msi_controller *ctrl = entry->dev->bus->msi;
+ struct msi_controller *ctrl = pci_msi_controller(entry->dev->bus);
if (!ctrl || !ctrl->teardown_irq)
return;
--
1.7.1
next prev parent reply other threads:[~2014-10-27 7:08 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-27 7:48 [PATCH 00/10] Save MSI chip in pci_sys_data Yijing Wang
2014-10-27 7:48 ` [PATCH 01/10] MSI: Rename msi_chip to msi_controller for better readability Yijing Wang
2014-10-27 7:48 ` Yijing Wang [this message]
2014-10-27 7:48 ` [PATCH 03/10] arm/MSI: Save MSI controller in pci_sys_data Yijing Wang
2014-10-27 7:48 ` [PATCH 04/10] PCI: tegra: " Yijing Wang
2014-10-27 7:48 ` [PATCH 05/10] PCI: designware: " Yijing Wang
2014-10-27 7:48 ` [PATCH 06/10] PCI: rcar: " Yijing Wang
2014-10-27 7:48 ` [PATCH 07/10] PCI: mvebu: " Yijing Wang
2014-10-27 7:48 ` [PATCH 08/10] PCI: xilinx: " Yijing Wang
2014-10-27 7:48 ` [PATCH 09/10] arm/PCI: Clean unused pcibios_add_bus() and pcibios_remove_bus() Yijing Wang
2014-10-27 7:48 ` [PATCH 10/10] PCI/MSI: Remove useless bus->msi assignment Yijing Wang
2014-11-12 4:24 ` Bjorn Helgaas
2014-11-12 5:54 ` Yijing Wang
2014-11-12 4:23 ` [PATCH 00/10] Save MSI chip in pci_sys_data Bjorn Helgaas
2014-11-17 2:59 ` Bjorn Helgaas
2014-11-17 9:38 ` Thomas Gleixner
2014-11-17 16:54 ` Bjorn Helgaas
2014-11-17 21:02 ` Thomas Gleixner
2014-11-17 21:27 ` Bjorn Helgaas
2014-11-17 21:31 ` Thomas Gleixner
2014-11-18 17:53 ` Marc Zyngier
2014-11-21 17:20 ` Bjorn Helgaas
2014-11-22 2:58 ` 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=1414396127-30023-3-git-send-email-wangyijing@huawei.com \
--to=wangyijing@huawei.com \
--cc=bhelgaas@google.com \
--cc=huxinwei@huawei.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=tglx@linutronix.de \
--cc=thierry.reding@gmail.com \
--cc=thomas.petazzoni@free-electrons.com \
--cc=wuyun.wu@huawei.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
all inboxes | Powered by JetHome®