@@ -60,9 +60,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 */
@@ -20,27 +20,11 @@
#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)
-{
+ dev->irq = XIRQ1;
pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq);
+ pci_read_config_byte(dev, PCI_INTERRUPT_LINE, &line);
}
@@ -375,14 +375,17 @@ static int __init pcibios_init(void)
bus = pci_scan_root_bus(NULL, 0, &pci_direct_ampci, NULL, &resources);
if (!bus)
return 0;
-
- pcibios_irq_init();
- pcibios_fixup_irqs();
pcibios_resource_survey();
pci_bus_add_devices(bus);
return 0;
}
+int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge)
+{
+ bridge->map_irq = pci_map_irq;
+ return 0;
+}
+
arch_initcall(pcibios_init);
char *__init pcibios_setup(char *str)
@@ -400,8 +403,6 @@ 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;
}
PCI IRQs are being assigned 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 | 24 ++++-------------------- arch/mn10300/unit-asb2305/pci.c | 11 ++++++----- 3 files changed, 11 insertions(+), 29 deletions(-)