From: matt@masarand.com
To: bhelgaas@google.com
Cc: linux-pci@vger.kernel.org, Vality <matt@masarand.com>
Subject: [PATCH 06/18] Delayed alpha setup of PCI IRQs to bus scan time
Date: Thu, 2 Oct 2014 04:50:25 +0100 [thread overview]
Message-ID: <1412221837-17452-7-git-send-email-matt@masarand.com> (raw)
In-Reply-To: <1412221837-17452-1-git-send-email-matt@masarand.com>
From: Vality <matt@masarand.com>
PCI IRQ initialisation is currently run during the boot code on alpha,
this has the issue that firstly an extra pass over the PCI bus is
required and second hot-plugged devices which are added after boot have
no way to be assigned an IRQ. This patch set fixes this by defering the
assignment of PCI IRQs untill device enable time which should solve
both of these issues.
---
arch/alpha/kernel/pci.c | 16 ++++++++++------
arch/alpha/kernel/sys_nautilus.c | 1 -
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c
index 076c35c..338537c 100644
--- a/arch/alpha/kernel/pci.c
+++ b/arch/alpha/kernel/pci.c
@@ -28,7 +28,7 @@
/*
- * Some string constants used by the various core logics.
+ * Some string constants used by the various core logics.
*/
const char *const pci_io_names[] = {
@@ -247,7 +247,7 @@ void pcibios_fixup_bus(struct pci_bus *bus)
if (pci_has_flag(PCI_PROBE_ONLY) && dev &&
(dev->class >> 8) == PCI_CLASS_BRIDGE_PCI) {
pci_read_bridge_bases(bus);
- }
+ }
list_for_each_entry(dev, &bus->devices, bus_list) {
pdev_save_srm_config(dev);
@@ -338,7 +338,7 @@ common_init_pci(void)
hose->need_domain_info = need_domain_info;
next_busno = bus->busn_res.end + 1;
/* Don't allow 8-bit bus number overflow inside the hose -
- reserve some space for bridges. */
+ reserve some space for bridges. */
if (next_busno > 224) {
next_busno = 0;
need_domain_info = 1;
@@ -346,11 +346,15 @@ common_init_pci(void)
}
pcibios_claim_console_setup();
-
pci_assign_unassigned_resources();
- pci_fixup_irqs(alpha_mv.pci_swizzle, alpha_mv.pci_map_irq);
}
+int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge)
+{
+ bridge->swizzle_irq = alpha_mv.pci_swizzle;
+ bridge->map_irq = alpha_mv.pci_map_irq;
+ return 0;
+}
struct pci_controller * __init
alloc_pci_controller(void)
@@ -387,7 +391,7 @@ sys_pciconfig_iobase(long which, unsigned long bus, unsigned long dfn)
/* from hose or from bus.devfn */
if (which & IOBASE_FROM_HOSE) {
- for(hose = hose_head; hose; hose = hose->next)
+ for(hose = hose_head; hose; hose = hose->next)
if (hose->index == bus) break;
if (!hose) return -ENODEV;
} else {
diff --git a/arch/alpha/kernel/sys_nautilus.c b/arch/alpha/kernel/sys_nautilus.c
index 837c0fa..7fb4d51 100644
--- a/arch/alpha/kernel/sys_nautilus.c
+++ b/arch/alpha/kernel/sys_nautilus.c
@@ -252,7 +252,6 @@ nautilus_init_pci(void)
/* pci_common_swizzle() relies on bus->self being NULL
for the root bus, so just clear it. */
bus->self = NULL;
- pci_fixup_irqs(alpha_mv.pci_swizzle, alpha_mv.pci_map_irq);
}
/*
--
2.1.0
next prev parent reply other threads:[~2014-10-02 3:59 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-02 3:50 [PATCH V3] Delay allocation of PCI device IRQs from boot time until bus scan time to fix PCI hotplugging matt
2014-10-02 3:50 ` [PATCH 01/18] Added way to register deferred PCI IRQ assignment handlers matt
2014-10-02 3:50 ` [PATCH 02/18] Delayed x86 setup of PCI IRQs to bus scan time matt
2014-10-02 3:50 ` [PATCH 03/18] Delayed arm " matt
2014-10-02 3:50 ` [PATCH 04/18] Delayed powerpc " matt
2014-10-02 3:50 ` [PATCH 05/18] Delayed sh " matt
2014-10-02 3:50 ` matt [this message]
2014-10-02 3:50 ` [PATCH 07/18] Delayed cris " matt
2014-10-02 3:50 ` [PATCH 08/18] Delayed frv " matt
2014-10-02 3:50 ` [PATCH 09/18] Delayed m68k " matt
2014-10-02 3:50 ` [PATCH 10/18] Delayed microblaze " matt
2014-10-02 3:50 ` [PATCH 11/18] Delayed mips " matt
2014-10-02 3:50 ` [PATCH 12/18] Delayed mn10300 " matt
2014-10-02 3:50 ` [PATCH 13/18] Delayed sparc " matt
2014-10-02 3:50 ` [PATCH 14/18] Delayed tile " matt
2014-10-02 3:50 ` [PATCH 15/18] Delayed unicore32 " matt
2014-10-02 3:50 ` [PATCH 16/18] Disabled bus scan time PCI IRQ assignment on ia64 matt
2014-10-02 3:50 ` [PATCH 17/18] Disabled bus scan time PCI IRQ assignment on parisc matt
2014-10-02 3:50 ` [PATCH 18/18] Disabled bus scan time PCI IRQ assignment on s390 matt
2014-10-02 4:07 [PATCH V3] Delay allocation of PCI device IRQs from boot time until bus scan time to fix PCI hotplugging matt
2014-10-02 4:07 ` [PATCH 06/18] Delayed alpha setup of PCI IRQs to bus scan time matt
2014-10-14 18:27 ` Bjorn Helgaas
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=1412221837-17452-7-git-send-email-matt@masarand.com \
--to=matt@masarand.com \
--cc=bhelgaas@google.com \
--cc=linux-pci@vger.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).