From: Jiang Liu <jiang.liu@linux.intel.com>
To: Thomas Gleixner <tglx@linutronix.de>,
Bjorn Helgaas <bhelgaas@google.com>,
Arthur Marsh <arthur.marsh@internode.on.net>,
Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
x86@kernel.org
Cc: Jiang Liu <jiang.liu@linux.intel.com>,
linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org,
linux-scsi@vger.kernel.org
Subject: [Bugfix] PCI, x86: Correctly allocate IRQs for PCI devices managed by non-PCI drivers
Date: Tue, 8 Sep 2015 15:26:29 +0800 [thread overview]
Message-ID: <1441697190-27993-1-git-send-email-jiang.liu@linux.intel.com> (raw)
In-Reply-To: <55EE8106.6060100@internode.on.net>
Commit 991de2e59090 ("PCI, x86: Implement pcibios_alloc_irq() and
pcibios_free_irq()") changes the way to allocate PCI legacy IRQ
for PCI devices on x86 platforms. Instead of allocating PCI legacy
IRQs when pcibios_enable_device() gets called, now pcibios_alloc_irq()
will be called by pci_device_probe() to allocate PCI legacy IRQs
when binding PCI drivers to PCI devices.
But some device drivers, such as eata, directly access PCI devices
without implementing corresponding PCI drivers, so pcibios_alloc_irq()
won't be called for those PCI devices and wrong IRQ number may be
used to manage the PCI device.
So detect such a case in pcibios_enable_device() by checking
pci_dev->driver is NULL and call pcibios_alloc_irq() to allocate PCI
legacy IRQs.
Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
---
arch/x86/pci/common.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
index 09d3afc0a181..60b237783582 100644
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
@@ -685,6 +685,16 @@ void pcibios_free_irq(struct pci_dev *dev)
int pcibios_enable_device(struct pci_dev *dev, int mask)
{
+ /*
+ * By design, pcibios_alloc_irq() will be called by pci_device_probe()
+ * when binding a PCI device to a PCI driver. But some device drivers,
+ * such as eata, directly make use of PCI devices without implementing
+ * PCI device drivers, so pcibios_alloc_irq() won't be called for those
+ * PCI devices.
+ */
+ if (!dev->driver)
+ pcibios_alloc_irq(dev);
+
return pci_enable_resources(dev, mask);
}
--
1.7.10.4
next parent reply other threads:[~2015-09-08 7:23 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <55EE8106.6060100@internode.on.net>
2015-09-08 7:26 ` Jiang Liu [this message]
2015-09-08 9:03 ` [Bugfix] PCI, x86: Correctly allocate IRQs for PCI devices managed by non-PCI drivers Arthur Marsh
2015-09-08 9:44 ` Jiang Liu
2015-09-08 16:27 ` Bjorn Helgaas
2015-09-08 16:49 ` Jiang Liu
2015-09-09 19:11 ` Bjorn Helgaas
2015-09-10 8:58 ` Jiang Liu
2015-09-14 3:08 ` [Bugfix 0/3] Convert eata driver to a normal PCI device driver Jiang Liu
2015-09-14 3:08 ` [Bugfix 1/3] eata: Use IDA to manage eata board IDs Jiang Liu
2015-09-14 8:08 ` Hannes Reinecke
2015-09-14 3:08 ` [Bugfix 2/3] eata: Implement PCI driver to manage eata PCI devices Jiang Liu
2015-09-14 8:17 ` Hannes Reinecke
2015-09-14 8:31 ` Jiang Liu
2015-09-14 3:08 ` [Bugfix 3/3] eata: Enhance eata driver to support PCI device hot-removal Jiang Liu
2015-09-14 8:21 ` Hannes Reinecke
2015-09-14 8:31 ` Ballabio, Dario
2015-09-14 8:33 ` Jiang Liu
2015-09-16 13:42 ` Christoph Hellwig
2015-09-17 6:49 ` Jiang Liu
2015-09-18 15:08 ` Arthur Marsh
2015-09-22 7:30 ` [RFT v3] eata: Convert eata driver as normal PCI and platform device drivers Jiang Liu
2015-09-22 20:27 ` Hannes Reinecke
2015-09-22 22:25 ` Arthur Marsh
2015-09-22 22:45 ` James Bottomley
2015-09-22 23:36 ` Arthur Marsh
2015-09-23 5:24 ` Jiang Liu
2015-09-23 10:44 ` Arthur Marsh
2015-09-23 14:40 ` James Bottomley
2015-09-24 4:28 ` Jiang Liu
2015-09-24 5:56 ` Arthur Marsh
2015-09-26 6:27 ` Arthur Marsh
2015-10-03 8:11 ` Jiang Liu
2015-10-03 11:14 ` Arthur Marsh
2015-10-05 8:29 ` Arthur Marsh
2015-09-14 16:01 ` [Bugfix 0/3] Convert eata driver to a normal PCI device driver Arthur Marsh
2015-09-15 2:31 ` Jiang Liu
2015-09-15 7:19 ` Arthur Marsh
2015-09-16 5:07 ` Jiang Liu
2015-09-16 7:37 ` Arthur Marsh
2015-09-16 8:21 ` Jiang Liu
2015-09-16 11:29 ` Arthur Marsh
2015-09-09 19:04 ` [Bugfix] PCI, x86: Correctly allocate IRQs for PCI devices managed by non-PCI drivers Arthur Marsh
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=1441697190-27993-1-git-send-email-jiang.liu@linux.intel.com \
--to=jiang.liu@linux.intel.com \
--cc=arthur.marsh@internode.on.net \
--cc=bhelgaas@google.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=x86@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).