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

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

arch/x86/include/asm/numaq.h

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 


extern int found_numaq;

extern int get_memcfg_numaq(void);

extern int pci_numaq_init(void);



extern void *xquad_portio;

arch/x86/include/asm/pci.h

+8 −1
Original line number Diff line number Diff line
@@ -45,8 +45,15 @@ static inline int pci_proc_domain(struct pci_bus *bus) 


#ifdef CONFIG_PCI

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

# define pcibios_assign_all_busses()	0

# define x86_default_pci_init		NULL

#endif



extern unsigned long pci_mem_start;

arch/x86/include/asm/pci_x86.h

+11 −3
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ struct irq_routing_table { 


extern unsigned int pcibios_irq_mask;



extern int pcibios_scanned;

extern spinlock_t pci_config_lock;



extern int (*pcibios_enable_irq)(struct pci_dev *dev);
@@ -112,9 +111,8 @@ extern void __init dmi_check_skip_isa_align(void); 
/* some common used subsys_initcalls */

extern int __init pci_acpi_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 pci_legacy_init(void);



/* pci-mmconfig.c */
@@ -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");

}



#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

arch/x86/include/asm/setup.h

+0 −2
Original line number Diff line number Diff line
@@ -37,10 +37,8 @@ void setup_bios_corruption_check(void); 


#ifdef CONFIG_X86_VISWS

extern void visws_early_detect(void);

extern int is_visws_box(void);

#else

static inline void visws_early_detect(void) { }

static inline int is_visws_box(void) { return 0; }

#endif



extern unsigned long saved_video_mode;

arch/x86/include/asm/visws/cobalt.h

+2 −0
Original line number Diff line number Diff line
@@ -122,4 +122,6 @@ extern char visws_board_type; 


extern char visws_board_rev;



extern int pci_visws_init(void);



#endif /* _ASM_X86_VISWS_COBALT_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE