From: matt@masarand.com
To: bhelgaas@google.com
Cc: linux-pci@vger.kernel.org, Matthew Minter <matt@masarand.com>
Subject: [PATCH 14/18] Delayed tile setup of PCI IRQs to bus scan time
Date: Thu, 2 Oct 2014 05:07:42 +0100 [thread overview]
Message-ID: <1412222866-21068-15-git-send-email-matt@masarand.com> (raw)
In-Reply-To: <1412222866-21068-1-git-send-email-matt@masarand.com>
From: Matthew Minter <matt@masarand.com>
Currently pcibios_init is running pci_fixup_irqs in order to assign
IRQs to PCI devices, this is only done once at boot-time and causes
devices hot-plugged after boot time to not be allocated an IRQ.
This is fixed in this patch-set by delaying the allocation untill
device enable time by registering the function to be called later.
Signed-off-by: Matthew Minter <matt@masarand.com>
---
arch/tile/kernel/pci.c | 10 +++++++---
arch/tile/kernel/pci_gx.c | 10 +++++++---
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/arch/tile/kernel/pci.c b/arch/tile/kernel/pci.c
index 1f80a88..6dc0bd8 100644
--- a/arch/tile/kernel/pci.c
+++ b/arch/tile/kernel/pci.c
@@ -313,9 +313,6 @@ int __init pcibios_init(void)
}
}
- /* Do machine dependent PCI interrupt routing */
- pci_fixup_irqs(pci_common_swizzle, tile_map_irq);
-
/*
* This comes from the generic Linux PCI driver.
*
@@ -367,6 +364,13 @@ int __init pcibios_init(void)
}
subsys_initcall(pcibios_init);
+int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge)
+{
+ bridge->swizzle_irq = pci_common_swizzle;
+ bridge->map_irq = tile_map_irq;
+ return 0;
+}
+
/*
* No bus fixups needed.
*/
diff --git a/arch/tile/kernel/pci_gx.c b/arch/tile/kernel/pci_gx.c
index e39f9c5..7d1b5bf 100644
--- a/arch/tile/kernel/pci_gx.c
+++ b/arch/tile/kernel/pci_gx.c
@@ -893,9 +893,6 @@ int __init pcibios_init(void)
next_busno = bus->busn_res.end + 1;
}
- /* Do machine dependent PCI interrupt routing */
- pci_fixup_irqs(pci_common_swizzle, tile_map_irq);
-
/*
* This comes from the generic Linux PCI driver.
*
@@ -1048,6 +1045,13 @@ alloc_mem_map_failed:
}
subsys_initcall(pcibios_init);
+int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge)
+{
+ bridge->swizzle_irq = pci_common_swizzle;
+ bridge->map_irq = tile_map_irq;
+ return 0;
+}
+
/* No bus fixups needed. */
void pcibios_fixup_bus(struct pci_bus *bus)
{
--
2.1.0
next prev parent reply other threads:[~2014-10-02 4:08 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
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 01/18] Added way to register deferred PCI IRQ assignment handlers matt
2014-10-02 10:33 ` Liviu Dudau
2014-10-14 23:25 ` Bjorn Helgaas
2014-10-14 17:15 ` Bjorn Helgaas
2014-10-02 4:07 ` [PATCH 02/18] Delayed x86 setup of PCI IRQs to bus scan time matt
2014-10-02 10:51 ` Liviu Dudau
2014-10-14 18:11 ` Bjorn Helgaas
2014-10-02 4:07 ` [PATCH 03/18] Delayed arm " matt
2014-10-14 18:14 ` Bjorn Helgaas
2014-10-02 4:07 ` [PATCH 04/18] Delayed powerpc " matt
2014-10-14 18:20 ` Bjorn Helgaas
2014-10-02 4:07 ` [PATCH 05/18] Delayed sh " matt
2014-10-14 18:25 ` Bjorn Helgaas
2014-10-02 4:07 ` [PATCH 06/18] Delayed alpha " matt
2014-10-14 18:27 ` Bjorn Helgaas
2014-10-02 4:07 ` [PATCH 07/18] Delayed cris " matt
2014-10-14 18:34 ` Bjorn Helgaas
2014-10-02 4:07 ` [PATCH 08/18] Delayed frv " matt
2014-10-14 18:37 ` Bjorn Helgaas
2014-10-02 4:07 ` [PATCH 09/18] Delayed m68k " matt
2014-10-14 18:38 ` Bjorn Helgaas
2014-10-02 4:07 ` [PATCH 10/18] Delayed microblaze " matt
2014-10-02 4:07 ` [PATCH 11/18] Delayed mips " matt
2014-10-02 4:07 ` [PATCH 12/18] Delayed mn10300 " matt
2014-10-14 18:46 ` Bjorn Helgaas
2014-10-02 4:07 ` [PATCH 13/18] Delayed sparc " matt
2014-10-14 18:51 ` Bjorn Helgaas
2014-10-02 4:07 ` matt [this message]
2014-10-02 4:07 ` [PATCH 15/18] Delayed unicore32 " matt
2014-10-02 4:07 ` [PATCH 16/18] Disabled bus scan time PCI IRQ assignment on ia64 matt
2014-10-14 18:53 ` Bjorn Helgaas
2014-10-02 4:07 ` [PATCH 17/18] Disabled bus scan time PCI IRQ assignment on parisc matt
2014-10-02 4:07 ` [PATCH 18/18] Disabled bus scan time PCI IRQ assignment on s390 matt
2015-01-31 14:56 ` [PATCH V3] Delay allocation of PCI device IRQs from boot time until bus scan time to fix PCI hotplugging Bjorn Helgaas
-- strict thread matches above, loose matches on Subject: below --
2014-10-02 3:50 matt
2014-10-02 3:50 ` [PATCH 14/18] Delayed tile setup of PCI IRQs to bus scan time matt
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=1412222866-21068-15-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).