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

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

x86, olpc: Use pci subarch init for OLPC 



Replace the #ifdef'ed OLPC-specific init functions by a conditional
x86_init function.  If the function returns 0 we leave pci_arch_init,
otherwise we continue.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: Andres Salomon <dilinger@collabora.co.uk>
LKML-Reference: <43F901BD926A4E43B106BF17856F0755A318CE89@orsmsx508.amr.corp.intel.com>
Signed-off-by: default avatarJacob Pan <jacob.jun.pan@intel.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 4fb6088a

arch/x86/include/asm/olpc.h

+2 −18
Original line number Original line Diff line number Diff line
@@ -13,7 +13,6 @@ struct olpc_platform_t { 




#define OLPC_F_PRESENT		0x01

#define OLPC_F_PRESENT		0x01

#define OLPC_F_DCON		0x02

#define OLPC_F_DCON		0x02

#define OLPC_F_VSA		0x04





#ifdef CONFIG_OLPC

#ifdef CONFIG_OLPC
@@ -50,18 +49,6 @@ static inline int olpc_has_dcon(void) 
	return (olpc_platform_info.flags & OLPC_F_DCON) ? 1 : 0;

	return (olpc_platform_info.flags & OLPC_F_DCON) ? 1 : 0;

}

}





/*

 * The VSA is software from AMD that typical Geode bioses will include.

 * It is used to emulate the PCI bus, VGA, etc.  OLPC's Open Firmware does

 * not include the VSA; instead, PCI is emulated by the kernel.

 *

 * The VSA is described further in arch/x86/pci/olpc.c.

 */

static inline int olpc_has_vsa(void)

{

	return (olpc_platform_info.flags & OLPC_F_VSA) ? 1 : 0;

}



/*

/*

 * The "Mass Production" version of OLPC's XO is identified as being model

 * The "Mass Production" version of OLPC's XO is identified as being model

 * C2.  During the prototype phase, the following models (in chronological

 * C2.  During the prototype phase, the following models (in chronological
@@ -87,13 +74,10 @@ static inline int olpc_has_dcon(void) 
	return 0;

	return 0;

}

}





static inline int olpc_has_vsa(void)

{

	return 0;

}



#endif

#endif





extern int pci_olpc_init(void);



/* EC related functions */

/* EC related functions */





extern int olpc_ec_cmd(unsigned char cmd, unsigned char *inbuf, size_t inlen,

extern int olpc_ec_cmd(unsigned char cmd, unsigned char *inbuf, size_t inlen,

arch/x86/include/asm/pci_x86.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -104,7 +104,6 @@ extern bool port_cf9_safe; 
extern int pci_direct_probe(void);

extern int pci_direct_probe(void);

extern void pci_direct_init(int type);

extern void pci_direct_init(int type);

extern void pci_pcbios_init(void);

extern void pci_pcbios_init(void);

extern int pci_olpc_init(void);

extern void __init dmi_check_pciprobe(void);

extern void __init dmi_check_pciprobe(void);

extern void __init dmi_check_skip_isa_align(void);

extern void __init dmi_check_skip_isa_align(void);

arch/x86/kernel/olpc.c

+7 −3
Original line number Original line Diff line number Diff line
@@ -17,7 +17,9 @@ 
#include <linux/spinlock.h>

#include <linux/spinlock.h>

#include <linux/io.h>

#include <linux/io.h>

#include <linux/string.h>

#include <linux/string.h>



#include <asm/geode.h>

#include <asm/geode.h>

#include <asm/setup.h>

#include <asm/olpc.h>

#include <asm/olpc.h>





#ifdef CONFIG_OPEN_FIRMWARE

#ifdef CONFIG_OPEN_FIRMWARE
@@ -243,9 +245,11 @@ static int __init olpc_init(void) 
	olpc_ec_cmd(EC_FIRMWARE_REV, NULL, 0,

	olpc_ec_cmd(EC_FIRMWARE_REV, NULL, 0,

			(unsigned char *) &olpc_platform_info.ecver, 1);

			(unsigned char *) &olpc_platform_info.ecver, 1);





	/* check to see if the VSA exists */

#ifdef CONFIG_PCI_OLPC

	if (cs5535_has_vsa2())

	/* If the VSA exists let it emulate PCI, if not emulate in kernel */

		olpc_platform_info.flags |= OLPC_F_VSA;

	if (!cs5535_has_vsa2())

		x86_init.pci.arch_init = pci_olpc_init;

#endif





	printk(KERN_INFO "OLPC board revision %s%X (EC=%x)\n",

	printk(KERN_INFO "OLPC board revision %s%X (EC=%x)\n",

			((olpc_platform_info.boardrev & 0xf) < 8) ? "pre" : "",

			((olpc_platform_info.boardrev & 0xf) < 8) ? "pre" : "",

arch/x86/pci/init.c

+4 −4
Original line number Original line Diff line number Diff line 
#include <linux/pci.h>

#include <linux/pci.h>

#include <linux/init.h>

#include <linux/init.h>

#include <asm/pci_x86.h>

#include <asm/pci_x86.h>

#include <asm/x86_init.h>





/* arch_initcall has too random ordering, so call the initializers

/* arch_initcall has too random ordering, so call the initializers

   in the right sequence from here. */

   in the right sequence from here. */
@@ -15,10 +16,9 @@ static __init int pci_arch_init(void) 
	if (!(pci_probe & PCI_PROBE_NOEARLY))

	if (!(pci_probe & PCI_PROBE_NOEARLY))

		pci_mmcfg_early_init();

		pci_mmcfg_early_init();





#ifdef CONFIG_PCI_OLPC

	if (x86_init.pci.arch_init && !x86_init.pci.arch_init())

	if (!pci_olpc_init())

		return 0;

		return 0;	/* skip additional checks if it's an XO */



#endif

#ifdef CONFIG_PCI_BIOS

#ifdef CONFIG_PCI_BIOS

	pci_pcbios_init();

	pci_pcbios_init();

#endif

#endif

arch/x86/pci/olpc.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -304,9 +304,6 @@ static struct pci_raw_ops pci_olpc_conf = { 




int __init pci_olpc_init(void)

int __init pci_olpc_init(void)

{

{

	if (!machine_is_olpc() || olpc_has_vsa())

		return -ENODEV;



	printk(KERN_INFO "PCI: Using configuration type OLPC\n");

	printk(KERN_INFO "PCI: Using configuration type OLPC\n");

	raw_pci_ops = &pci_olpc_conf;

	raw_pci_ops = &pci_olpc_conf;

	is_lx = is_geode_lx();

	is_lx = is_geode_lx();