redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

[POWERPC] iSeries: Call iSeries_pcibios_init from setup_arch 

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
wifi-calibration
Stephen Rothwell 2007-12-07 02:00:45 +11:00 committed by Paul Mackerras
parent e60516e3d0
commit cb99302909
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/powerpc/kernel/pci_64.c
View File

@ -519,9 +519,6 @@ static int __init pcibios_init(void)
*/
ppc_md.phys_mem_access_prot = pci_phys_mem_access_prot;
if (firmware_has_feature(FW_FEATURE_ISERIES))
iSeries_pcibios_init();
printk(KERN_DEBUG "PCI: Probing PCI hardware\n");
/* Scan all of the recorded PCI controllers. */

4
arch/powerpc/platforms/iseries/pci.h
View File

@ -50,9 +50,11 @@ struct pci_dev; /* For Forward Reference */
extern void iSeries_Device_Information(struct pci_dev *PciDev, int count,
u16 bus, HvSubBusNumber subbus);
#ifdef CONFIG_PCI
extern void iSeries_pcibios_init(void);
extern void iSeries_pci_final_fixup(void);
#else
static void iSeries_pci_final_fixup(void) { }
static inline void iSeries_pcibios_init(void) { }
static inline void iSeries_pci_final_fixup(void) { }
#endif
#endif /* _PLATFORMS_ISERIES_PCI_H */

2
arch/powerpc/platforms/iseries/setup.c
View File

@ -495,6 +495,8 @@ static void __init iSeries_setup_arch(void)
itVpdAreas.xSlicMaxLogicalProcs);
printk("Max physical processors = %d\n",
itVpdAreas.xSlicMaxPhysicalProcs);
iSeries_pcibios_init();
}
static void iSeries_show_cpuinfo(struct seq_file *m)

3
include/asm-powerpc/ppc-pci.h
View File

@ -46,9 +46,6 @@ extern void init_pci_config_tokens (void);
extern unsigned long get_phb_buid (struct device_node *);
extern int rtas_setup_phb(struct pci_controller *phb);
/* From iSeries PCI */
extern void iSeries_pcibios_init(void);
extern unsigned long pci_probe_only;
/* ---- EEH internal-use-only related routines ---- */