diff options
| author | Andres Salomon <dilinger@queued.net> | 2008-06-05 14:14:41 -0700 |
|---|---|---|
| committer | Andres Salomon <dilinger@debian.org> | 2008-09-16 20:23:24 -0400 |
| commit | 658c681b23bec459726d81af5b795a1b15d0eef4 (patch) | |
| tree | 45b638a41a4414befc5aa765ea77091a720416ef | |
| parent | abe7a66b36f344a822a5fa17f87c49a25aa05790 (diff) | |
| download | lwn-658c681b23bec459726d81af5b795a1b15d0eef4.tar.gz lwn-658c681b23bec459726d81af5b795a1b15d0eef4.zip | |
PCI/x86: fix up PCI stuff so that PCI_GOANY supports OLPC
Previously, one would have to specifically choose CONFIG_OLPC and
CONFIG_PCI_GOOLPC in order to enable PCI_OLPC. That doesn't really work
for distro kernels, so this patch allows one to choose CONFIG_OLPC and
CONFIG_PCI_GOANY in order to build in OLPC support in a generic kernel (as
requested by Robert Millan).
This also moves GOOLPC before GOANY in the menuconfig list.
Finally, make pci_access_init return early if we detect OLPC hardware.
There's no need to continue probing stuff, and pci_pcbios_init
specifically trashes our settings (we didn't run into that before because
PCI_GOANY wasn't supported).
Signed-off-by: Andres Salomon <dilinger@debian.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
| -rw-r--r-- | arch/x86/Kconfig | 11 | ||||
| -rw-r--r-- | arch/x86/pci/init.c | 3 | ||||
| -rw-r--r-- | arch/x86/pci/olpc.c | 5 | ||||
| -rw-r--r-- | arch/x86/pci/pci.h | 2 |
4 files changed, 11 insertions, 10 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index d729e1450ac0..fd3fc255d18a 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1420,12 +1420,12 @@ config PCI_GOMMCONFIG config PCI_GODIRECT bool "Direct" -config PCI_GOANY - bool "Any" - config PCI_GOOLPC bool "OLPC" +config PCI_GOANY + bool "Any" + endchoice config PCI_BIOS @@ -1442,9 +1442,8 @@ config PCI_MMCONFIG depends on X86_32 && PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY) config PCI_OLPC - bool - depends on PCI && PCI_GOOLPC - default y + def_bool y + depends on PCI && OLPC && (PCI_GOOLPC || PCI_GOANY) config PCI_DOMAINS def_bool y diff --git a/arch/x86/pci/init.c b/arch/x86/pci/init.c index 89f2b00aa5ed..b51b7e4766d1 100644 --- a/arch/x86/pci/init.c +++ b/arch/x86/pci/init.c @@ -15,7 +15,8 @@ static __init int pci_access_init(void) pci_mmcfg_init(type); #endif #ifdef CONFIG_PCI_OLPC - pci_olpc_init(); + if (!pci_olpc_init()) + return 0; /* skip additional checks if it's an XO */ #endif if (raw_pci_ops) return 0; diff --git a/arch/x86/pci/olpc.c b/arch/x86/pci/olpc.c index 12d74db9e84f..8e6c099267f3 100644 --- a/arch/x86/pci/olpc.c +++ b/arch/x86/pci/olpc.c @@ -287,12 +287,13 @@ static struct pci_raw_ops pci_olpc_conf = { .write = pci_olpc_write, }; -void __init pci_olpc_init(void) +int __init pci_olpc_init(void) { if (!machine_is_olpc() || olpc_has_vsa()) - return; + return -ENODEV; printk(KERN_INFO "PCI: Using configuration type OLPC\n"); raw_pci_ops = &pci_olpc_conf; is_lx = is_geode_lx(); + return 0; } diff --git a/arch/x86/pci/pci.h b/arch/x86/pci/pci.h index c9ca1f91daf2..10e3e5057bd7 100644 --- a/arch/x86/pci/pci.h +++ b/arch/x86/pci/pci.h @@ -104,7 +104,7 @@ extern void pci_direct_init(int type); extern void pci_pcbios_init(void); extern void pci_mmcfg_init(int type); extern void pcibios_sort(void); -extern void pci_olpc_init(void); +extern int pci_olpc_init(void); /* pci-mmconfig.c */ |