From: matt@masarand.com
To: bhelgaas@google.com
Cc: linux-pci@vger.kernel.org, Matthew Minter <matt@masarand.com>
Subject: [PATCH 12/18] Delayed mn10300 setup of PCI IRQs to bus scan time
Date: Thu, 2 Oct 2014 05:07:40 +0100 [thread overview]
Message-ID: <1412222866-21068-13-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>
PCI IRQs are being asigned during pcibios_irq_init currently, this causes
a problem by which hot-plug devices connected after boot will not recieve
an IRQ, this patch-set fixes this by registering the IRQ assignment
functions at boot, to then be called later by the device enable code.
Signed-off-by: Matthew Minter <matt@masarand.com>
---
arch/mn10300/unit-asb2305/pci-asb2305.h | 5 +----
arch/mn10300/unit-asb2305/pci-irq.c | 25 +++++--------------------
arch/mn10300/unit-asb2305/pci.c | 21 ++++++++-------------
3 files changed, 14 insertions(+), 37 deletions(-)
diff --git a/arch/mn10300/unit-asb2305/pci-asb2305.h b/arch/mn10300/unit-asb2305/pci-asb2305.h
index 9e17aca..fb520cf 100644
--- a/arch/mn10300/unit-asb2305/pci-asb2305.h
+++ b/arch/mn10300/unit-asb2305/pci-asb2305.h
@@ -67,9 +67,6 @@ struct irq_routing_table {
} __attribute__((packed));
extern unsigned int pcibios_irq_mask;
-
-extern void pcibios_irq_init(void);
-extern void pcibios_fixup_irqs(void);
-extern void pcibios_enable_irq(struct pci_dev *dev);
+extern int pci_map_irq(struct pci_dev *, u8 slot, u8 pin);
#endif /* PCI_ASB2305_H */
diff --git a/arch/mn10300/unit-asb2305/pci-irq.c b/arch/mn10300/unit-asb2305/pci-irq.c
index fcb28ce..5be6fea 100644
--- a/arch/mn10300/unit-asb2305/pci-irq.c
+++ b/arch/mn10300/unit-asb2305/pci-irq.c
@@ -20,27 +20,12 @@
#include <asm/smp.h>
#include "pci-asb2305.h"
-void __init pcibios_irq_init(void)
+int pci_map_irq(struct pci_dev *, u8 slot, u8 pin)
{
-}
-
-void __init pcibios_fixup_irqs(void)
-{
- struct pci_dev *dev = NULL;
- u8 line, pin;
+ u8 line;
- for_each_pci_dev(dev) {
- pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin);
- if (pin) {
- dev->irq = XIRQ1;
- pci_write_config_byte(dev, PCI_INTERRUPT_LINE,
- dev->irq);
- }
- pci_read_config_byte(dev, PCI_INTERRUPT_LINE, &line);
- }
-}
-
-void pcibios_enable_irq(struct pci_dev *dev)
-{
+ pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin);
+ dev->irq = XIRQ1;
pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq);
+ pci_read_config_byte(dev, PCI_INTERRUPT_LINE, &line);
}
diff --git a/arch/mn10300/unit-asb2305/pci.c b/arch/mn10300/unit-asb2305/pci.c
index 6b4339f..22f8786 100644
--- a/arch/mn10300/unit-asb2305/pci.c
+++ b/arch/mn10300/unit-asb2305/pci.c
@@ -377,13 +377,18 @@ static int __init pcibios_init(void)
pci_add_resource_offset(&resources, &pci_ioport_resource, io_offset);
pci_add_resource_offset(&resources, &pci_iomem_resource, mem_offset);
pci_scan_root_bus(NULL, 0, &pci_direct_ampci, NULL, &resources);
-
- pcibios_irq_init();
- pcibios_fixup_irqs();
pcibios_resource_survey();
return 0;
}
+int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge)
+{
+ bridge->swizzle_irq = NULL;
+ bridge->map_irq = pci_map_irq;
+ return 0;
+}
+
+
arch_initcall(pcibios_init);
char *__init pcibios_setup(char *str)
@@ -396,16 +401,6 @@ char *__init pcibios_setup(char *str)
return str;
}
-int pcibios_enable_device(struct pci_dev *dev, int mask)
-{
- int err;
-
- err = pci_enable_resources(dev, mask);
- if (err == 0)
- pcibios_enable_irq(dev);
- return err;
-}
-
/*
* disable the ethernet chipset
*/
--
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 ` matt [this message]
2014-10-14 18:46 ` [PATCH 12/18] Delayed mn10300 " 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 ` [PATCH 14/18] Delayed tile " matt
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 12/18] Delayed mn10300 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-13-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).