Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb993029 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Paul Mackerras
Browse files

[POWERPC] iSeries: Call iSeries_pcibios_init from setup_arch 



Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent e60516e3

arch/powerpc/kernel/pci_64.c

+0 −3
Original line number Diff line number Diff line
@@ -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.  */

arch/powerpc/platforms/iseries/pci.h

+3 −1
Original line number Diff line number Diff line
@@ -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 */

arch/powerpc/platforms/iseries/setup.c

+2 −0
Original line number Diff line number Diff line
@@ -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)

include/asm-powerpc/ppc-pci.h

+0 −3
Original line number Diff line number Diff line
@@ -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 ---- */