lkml.org 
[lkml]   [2009]   [Aug]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[RFC patch 3/4] x86: Add pcibios_fixup_irqs to x86_init
Platforms like Moorestown want to override the pcibios_fixup_irqs
default function. Add it to x86_init.pci

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
arch/x86/include/asm/pci_x86.h | 3 +++
arch/x86/include/asm/x86_init.h | 2 ++
arch/x86/kernel/x86_init.c | 1 +
arch/x86/pci/irq.c | 4 ++--
4 files changed, 8 insertions(+), 2 deletions(-)

Index: linux-2.6-tip/arch/x86/include/asm/pci_x86.h
===================================================================
--- linux-2.6-tip.orig/arch/x86/include/asm/pci_x86.h
+++ linux-2.6-tip/arch/x86/include/asm/pci_x86.h
@@ -113,6 +113,7 @@ extern int __init pci_acpi_init(void);
extern void __init pcibios_irq_init(void);
extern int __init pcibios_init(void);
extern int pci_legacy_init(void);
+extern void pcibios_fixup_irqs(void);

/* pci-mmconfig.c */

@@ -172,7 +173,9 @@ static inline void mmio_config_writel(vo
# define x86_default_pci_init pci_legacy_init
# endif
# define x86_default_pci_init_irq pcibios_irq_init
+# define x86_default_pci_fixup_irqs pcibios_fixup_irqs
#else
# define x86_default_pci_init NULL
# define x86_default_pci_init_irq NULL
+# define x86_default_pci_fixup_irqs NULL
#endif
Index: linux-2.6-tip/arch/x86/include/asm/x86_init.h
===================================================================
--- linux-2.6-tip.orig/arch/x86/include/asm/x86_init.h
+++ linux-2.6-tip/arch/x86/include/asm/x86_init.h
@@ -95,10 +95,12 @@ struct x86_init_timers {
* struct x86_init_pci - platform specific pci init functions
* @init: platform specific pci init
* @init_irq: platform specific pci irq init
+ * @fixup_irqs: platform specific pci irq fixup
*/
struct x86_init_pci {
int (*init)(void);
void (*init_irq)(void);
+ void (*fixup_irqs)(void);
};

/**
Index: linux-2.6-tip/arch/x86/kernel/x86_init.c
===================================================================
--- linux-2.6-tip.orig/arch/x86/kernel/x86_init.c
+++ linux-2.6-tip/arch/x86/kernel/x86_init.c
@@ -68,6 +68,7 @@ struct __initdata x86_init_ops x86_init
.pci = {
.init = x86_default_pci_init,
.init_irq = x86_default_pci_init_irq,
+ .fixup_irqs = x86_default_pci_fixup_irqs,
},
};

Index: linux-2.6-tip/arch/x86/pci/irq.c
===================================================================
--- linux-2.6-tip.orig/arch/x86/pci/irq.c
+++ linux-2.6-tip/arch/x86/pci/irq.c
@@ -1016,7 +1016,7 @@ static int pcibios_lookup_irq(struct pci
return 1;
}

-static void __init pcibios_fixup_irqs(void)
+void __init pcibios_fixup_irqs(void)
{
struct pci_dev *dev = NULL;
u8 pin;
@@ -1142,7 +1142,7 @@ void __init pcibios_irq_init(void)
pirq_table = NULL;
}

- pcibios_fixup_irqs();
+ x86_init.pci.fixup_irqs();

if (io_apic_assign_pci_irqs && pci_routeirq) {
struct pci_dev *dev = NULL;



\
 
 \ /
  Last update: 2009-08-30 15:09    [W:0.039 / U:0.012 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site