[tip:x86/mrst] x86: Add pcibios_fixup_irqs to x86_init

From: tip-bot for Thomas Gleixner
Date: Fri Feb 19 2010 - 20:28:42 EST


Commit-ID: 9325a28ce2fa7c597e5ed41455a06c30b82b5710
Gitweb: http://git.kernel.org/tip/9325a28ce2fa7c597e5ed41455a06c30b82b5710
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
AuthorDate: Sat, 29 Aug 2009 17:51:26 +0200
Committer: H. Peter Anvin <hpa@xxxxxxxxx>
CommitDate: Fri, 19 Feb 2010 16:12:39 -0800

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@xxxxxxxxxxxxx>
LKML-Reference: <43F901BD926A4E43B106BF17856F07559FB80D00@xxxxxxxxxxxxxxxxxxxxxxxxxxxx>
Acked-by: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx>
Signed-off-by: Jacob Pan <jacob.jun.pan@xxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx>
---
arch/x86/include/asm/pci_x86.h | 3 +++
arch/x86/include/asm/x86_init.h | 2 ++
arch/x86/kernel/x86_init.c | 2 ++
arch/x86/pci/irq.c | 4 ++--
4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/arch/x86/include/asm/pci_x86.h b/arch/x86/include/asm/pci_x86.h
index 46511c5..6e69edf 100644
--- a/arch/x86/include/asm/pci_x86.h
+++ b/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 */

@@ -188,7 +189,9 @@ static inline void mmio_config_writel(void __iomem *pos, u32 val)
# 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
diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
index 34f61cd..8ef56f2 100644
--- a/arch/x86/include/asm/x86_init.h
+++ b/arch/x86/include/asm/x86_init.h
@@ -102,10 +102,12 @@ struct x86_init_iommu {
* 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);
};

/**
diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
index 203f26f..1817cd7 100644
--- a/arch/x86/kernel/x86_init.c
+++ b/arch/x86/kernel/x86_init.c
@@ -4,6 +4,7 @@
* For licencing details see kernel-base/COPYING
*/
#include <linux/init.h>
+#include <linux/ioport.h>

#include <asm/bios_ebda.h>
#include <asm/paravirt.h>
@@ -75,6 +76,7 @@ struct x86_init_ops x86_init __initdata = {
.pci = {
.init = x86_default_pci_init,
.init_irq = x86_default_pci_init_irq,
+ .fixup_irqs = x86_default_pci_fixup_irqs,
},
};

diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
index 0f40ff2..a60deb6 100644
--- a/arch/x86/pci/irq.c
+++ b/arch/x86/pci/irq.c
@@ -1016,7 +1016,7 @@ static int pcibios_lookup_irq(struct pci_dev *dev, int assign)
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;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/