Commit b72d0db9 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by H. Peter Anvin

x86: Move pci init function to x86_init

The PCI initialization in pci_subsys_init() is a mess. pci_numaq_init,
pci_acpi_init, pci_visws_init and pci_legacy_init are called and each
implementation checks and eventually modifies the global variable
pcibios_scanned.

x86_init functions allow us to do this more elegant. The pci.init
function pointer is preset to pci_legacy_init. numaq, acpi and visws
can modify the pointer in their early setup functions. The functions
return 0 when they did the full initialization including bus scan. A
non zero return value indicates that pci_legacy_init needs to be
called either because the selected function failed or wants the
generic bus scan in pci_legacy_init to happen (e.g. visws).
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
LKML-Reference: <43F901BD926A4E43B106BF17856F07559FB80CFE@orsmsx508.amr.corp.intel.com>
Acked-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarJacob Pan <jacob.jun.pan@intel.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent cf4c43dd
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
extern int found_numaq; extern int found_numaq;
extern int get_memcfg_numaq(void); extern int get_memcfg_numaq(void);
extern int pci_numaq_init(void);
extern void *xquad_portio; extern void *xquad_portio;
......
...@@ -45,8 +45,15 @@ static inline int pci_proc_domain(struct pci_bus *bus) ...@@ -45,8 +45,15 @@ static inline int pci_proc_domain(struct pci_bus *bus)
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
extern unsigned int pcibios_assign_all_busses(void); extern unsigned int pcibios_assign_all_busses(void);
extern int pci_legacy_init(void);
# ifdef CONFIG_ACPI
# define x86_default_pci_init pci_acpi_init
# else
# define x86_default_pci_init pci_legacy_init
# endif
#else #else
#define pcibios_assign_all_busses() 0 # define pcibios_assign_all_busses() 0
# define x86_default_pci_init NULL
#endif #endif
extern unsigned long pci_mem_start; extern unsigned long pci_mem_start;
......
...@@ -82,7 +82,6 @@ struct irq_routing_table { ...@@ -82,7 +82,6 @@ struct irq_routing_table {
extern unsigned int pcibios_irq_mask; extern unsigned int pcibios_irq_mask;
extern int pcibios_scanned;
extern spinlock_t pci_config_lock; extern spinlock_t pci_config_lock;
extern int (*pcibios_enable_irq)(struct pci_dev *dev); extern int (*pcibios_enable_irq)(struct pci_dev *dev);
...@@ -112,9 +111,8 @@ extern void __init dmi_check_skip_isa_align(void); ...@@ -112,9 +111,8 @@ extern void __init dmi_check_skip_isa_align(void);
/* some common used subsys_initcalls */ /* some common used subsys_initcalls */
extern int __init pci_acpi_init(void); extern int __init pci_acpi_init(void);
extern int __init pcibios_irq_init(void); extern int __init pcibios_irq_init(void);
extern int __init pci_visws_init(void);
extern int __init pci_numaq_init(void);
extern int __init pcibios_init(void); extern int __init pcibios_init(void);
extern int pci_legacy_init(void);
/* pci-mmconfig.c */ /* pci-mmconfig.c */
...@@ -182,3 +180,13 @@ static inline void mmio_config_writel(void __iomem *pos, u32 val) ...@@ -182,3 +180,13 @@ static inline void mmio_config_writel(void __iomem *pos, u32 val)
{ {
asm volatile("movl %%eax,(%1)" : : "a" (val), "r" (pos) : "memory"); asm volatile("movl %%eax,(%1)" : : "a" (val), "r" (pos) : "memory");
} }
#ifdef CONFIG_PCI
# ifdef CONFIG_ACPI
# define x86_default_pci_init pci_acpi_init
# else
# define x86_default_pci_init pci_legacy_init
# endif
#else
# define x86_default_pci_init NULL
#endif
...@@ -37,10 +37,8 @@ void setup_bios_corruption_check(void); ...@@ -37,10 +37,8 @@ void setup_bios_corruption_check(void);
#ifdef CONFIG_X86_VISWS #ifdef CONFIG_X86_VISWS
extern void visws_early_detect(void); extern void visws_early_detect(void);
extern int is_visws_box(void);
#else #else
static inline void visws_early_detect(void) { } static inline void visws_early_detect(void) { }
static inline int is_visws_box(void) { return 0; }
#endif #endif
extern unsigned long saved_video_mode; extern unsigned long saved_video_mode;
......
...@@ -122,4 +122,6 @@ extern char visws_board_type; ...@@ -122,4 +122,6 @@ extern char visws_board_type;
extern char visws_board_rev; extern char visws_board_rev;
extern int pci_visws_init(void);
#endif /* _ASM_X86_VISWS_COBALT_H */ #endif /* _ASM_X86_VISWS_COBALT_H */
...@@ -98,6 +98,14 @@ struct x86_init_iommu { ...@@ -98,6 +98,14 @@ struct x86_init_iommu {
int (*iommu_init)(void); int (*iommu_init)(void);
}; };
/*
* struct x86_init_pci - platform specific pci init functions
* @init: platform specific pci init
*/
struct x86_init_pci {
int (*init)(void);
};
/** /**
* struct x86_init_ops - functions for platform specific setup * struct x86_init_ops - functions for platform specific setup
* *
...@@ -110,6 +118,7 @@ struct x86_init_ops { ...@@ -110,6 +118,7 @@ struct x86_init_ops {
struct x86_init_paging paging; struct x86_init_paging paging;
struct x86_init_timers timers; struct x86_init_timers timers;
struct x86_init_iommu iommu; struct x86_init_iommu iommu;
struct x86_init_pci pci;
}; };
/** /**
......
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#include <linux/ioport.h> #include <linux/ioport.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <asm/pci_x86.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/io_apic.h> #include <asm/io_apic.h>
#include <asm/apic.h> #include <asm/apic.h>
...@@ -1604,6 +1605,9 @@ int __init acpi_boot_init(void) ...@@ -1604,6 +1605,9 @@ int __init acpi_boot_init(void)
acpi_table_parse(ACPI_SIG_HPET, acpi_parse_hpet); acpi_table_parse(ACPI_SIG_HPET, acpi_parse_hpet);
if (!acpi_noirq)
x86_init.pci.init = pci_acpi_init;
return 0; return 0;
} }
......
...@@ -277,6 +277,7 @@ static __init void early_check_numaq(void) ...@@ -277,6 +277,7 @@ static __init void early_check_numaq(void)
x86_init.mpparse.mpc_oem_pci_bus = mpc_oem_pci_bus; x86_init.mpparse.mpc_oem_pci_bus = mpc_oem_pci_bus;
x86_init.mpparse.mpc_oem_bus_info = mpc_oem_bus_info; x86_init.mpparse.mpc_oem_bus_info = mpc_oem_bus_info;
x86_init.timers.tsc_pre_init = numaq_tsc_init; x86_init.timers.tsc_pre_init = numaq_tsc_init;
x86_init.pci.init = pci_numaq_init;
} }
} }
......
...@@ -49,11 +49,6 @@ extern int no_broadcast; ...@@ -49,11 +49,6 @@ extern int no_broadcast;
char visws_board_type = -1; char visws_board_type = -1;
char visws_board_rev = -1; char visws_board_rev = -1;
int is_visws_box(void)
{
return visws_board_type >= 0;
}
static void __init visws_time_init(void) static void __init visws_time_init(void)
{ {
printk(KERN_INFO "Starting Cobalt Timer system clock\n"); printk(KERN_INFO "Starting Cobalt Timer system clock\n");
...@@ -242,6 +237,7 @@ void __init visws_early_detect(void) ...@@ -242,6 +237,7 @@ void __init visws_early_detect(void)
x86_init.irqs.pre_vector_init = visws_pre_intr_init; x86_init.irqs.pre_vector_init = visws_pre_intr_init;
x86_init.irqs.trap_init = visws_trap_init; x86_init.irqs.trap_init = visws_trap_init;
x86_init.timers.timer_init = visws_time_init; x86_init.timers.timer_init = visws_time_init;
x86_init.pci.init = pci_visws_init;
/* /*
* Install reboot quirks: * Install reboot quirks:
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include <asm/bios_ebda.h> #include <asm/bios_ebda.h>
#include <asm/paravirt.h> #include <asm/paravirt.h>
#include <asm/pci_x86.h>
#include <asm/mpspec.h> #include <asm/mpspec.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/apic.h> #include <asm/apic.h>
...@@ -70,6 +71,10 @@ struct x86_init_ops x86_init __initdata = { ...@@ -70,6 +71,10 @@ struct x86_init_ops x86_init __initdata = {
.iommu = { .iommu = {
.iommu_init = iommu_init_noop, .iommu_init = iommu_init_noop,
}, },
.pci = {
.init = x86_default_pci_init,
},
}; };
struct x86_cpuinit_ops x86_cpuinit __cpuinitdata = { struct x86_cpuinit_ops x86_cpuinit __cpuinitdata = {
......
...@@ -282,15 +282,11 @@ int __init pci_acpi_init(void) ...@@ -282,15 +282,11 @@ int __init pci_acpi_init(void)
{ {
struct pci_dev *dev = NULL; struct pci_dev *dev = NULL;
if (pcibios_scanned)
return 0;
if (acpi_noirq) if (acpi_noirq)
return 0; return -ENODEV;
printk(KERN_INFO "PCI: Using ACPI for IRQ routing\n"); printk(KERN_INFO "PCI: Using ACPI for IRQ routing\n");
acpi_irq_penalty_init(); acpi_irq_penalty_init();
pcibios_scanned++;
pcibios_enable_irq = acpi_pci_irq_enable; pcibios_enable_irq = acpi_pci_irq_enable;
pcibios_disable_irq = acpi_pci_irq_disable; pcibios_disable_irq = acpi_pci_irq_disable;
......
...@@ -71,12 +71,6 @@ struct pci_ops pci_root_ops = { ...@@ -71,12 +71,6 @@ struct pci_ops pci_root_ops = {
.write = pci_write, .write = pci_write,
}; };
/*
* legacy, numa, and acpi all want to call pcibios_scan_root
* from their initcalls. This flag prevents that.
*/
int pcibios_scanned;
/* /*
* This interrupt-safe spinlock protects all accesses to PCI * This interrupt-safe spinlock protects all accesses to PCI
* configuration space. * configuration space.
......
...@@ -35,16 +35,13 @@ static void __devinit pcibios_fixup_peer_bridges(void) ...@@ -35,16 +35,13 @@ static void __devinit pcibios_fixup_peer_bridges(void)
} }
} }
static int __init pci_legacy_init(void) int __init pci_legacy_init(void)
{ {
if (!raw_pci_ops) { if (!raw_pci_ops) {
printk("PCI: System does not support PCI\n"); printk("PCI: System does not support PCI\n");
return 0; return 0;
} }
if (pcibios_scanned++)
return 0;
printk("PCI: Probing PCI hardware\n"); printk("PCI: Probing PCI hardware\n");
pci_root_bus = pcibios_scan_root(0); pci_root_bus = pcibios_scan_root(0);
if (pci_root_bus) if (pci_root_bus)
...@@ -55,16 +52,13 @@ static int __init pci_legacy_init(void) ...@@ -55,16 +52,13 @@ static int __init pci_legacy_init(void)
int __init pci_subsys_init(void) int __init pci_subsys_init(void)
{ {
#ifdef CONFIG_X86_NUMAQ /*
pci_numaq_init(); * The init function returns an non zero value when
#endif * pci_legacy_init should be invoked.
#ifdef CONFIG_ACPI */
pci_acpi_init(); if (x86_init.pci.init())
#endif pci_legacy_init();
#ifdef CONFIG_X86_VISWS
pci_visws_init();
#endif
pci_legacy_init();
pcibios_fixup_peer_bridges(); pcibios_fixup_peer_bridges();
pcibios_irq_init(); pcibios_irq_init();
pcibios_init(); pcibios_init();
......
...@@ -152,14 +152,8 @@ int __init pci_numaq_init(void) ...@@ -152,14 +152,8 @@ int __init pci_numaq_init(void)
{ {
int quad; int quad;
if (!found_numaq)
return 0;
raw_pci_ops = &pci_direct_conf1_mq; raw_pci_ops = &pci_direct_conf1_mq;
if (pcibios_scanned++)
return 0;
pci_root_bus = pcibios_scan_root(0); pci_root_bus = pcibios_scan_root(0);
if (pci_root_bus) if (pci_root_bus)
pci_bus_add_devices(pci_root_bus); pci_bus_add_devices(pci_root_bus);
......
...@@ -69,9 +69,6 @@ void __init pcibios_update_irq(struct pci_dev *dev, int irq) ...@@ -69,9 +69,6 @@ void __init pcibios_update_irq(struct pci_dev *dev, int irq)
int __init pci_visws_init(void) int __init pci_visws_init(void)
{ {
if (!is_visws_box())
return -1;
pcibios_enable_irq = &pci_visws_enable_irq; pcibios_enable_irq = &pci_visws_enable_irq;
pcibios_disable_irq = &pci_visws_disable_irq; pcibios_disable_irq = &pci_visws_disable_irq;
...@@ -90,5 +87,6 @@ int __init pci_visws_init(void) ...@@ -90,5 +87,6 @@ int __init pci_visws_init(void)
pci_scan_bus_with_sysdata(pci_bus1); pci_scan_bus_with_sysdata(pci_bus1);
pci_fixup_irqs(pci_common_swizzle, visws_map_irq); pci_fixup_irqs(pci_common_swizzle, visws_map_irq);
pcibios_resource_survey(); pcibios_resource_survey();
return 0; /* Request bus scan */
return 1;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment