TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6

Browse Source 
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  x86/PCI: add workaround for bug in ASUS A7V600 BIOS (rev 1005)
  PCI/x86: fix up PCI stuff so that PCI_GOANY supports OLPC
This commit is contained in:
Linus Torvalds
2008-06-06 11:33:08 -07:00
parent 330bcd2f7b 9f67fd5db5
commit 256a13dd70
5 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/x86/Kconfig
+5 -6
View File
@@ -1508,13 +1508,13 @@ config PCI_GOMMCONFIG
config PCI_GODIRECT config PCI_GODIRECT
bool "Direct" bool "Direct"
config PCI_GOANY
bool "Any"
config PCI_GOOLPC config PCI_GOOLPC
bool "OLPC" bool "OLPC"
depends on OLPC depends on OLPC
config PCI_GOANY
bool "Any"
endchoice endchoice
config PCI_BIOS config PCI_BIOS
@@ -1531,9 +1531,8 @@ config PCI_MMCONFIG
depends on X86_32 && PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY) depends on X86_32 && PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY)
config PCI_OLPC config PCI_OLPC
bool def_bool y
depends on PCI && PCI_GOOLPC depends on PCI && OLPC && (PCI_GOOLPC || PCI_GOANY)
default y
config PCI_DOMAINS config PCI_DOMAINS
def_bool y def_bool y
arch/x86/pci/init.c
+2 -1
View File
@@ -15,7 +15,8 @@ static __init int pci_access_init(void)
pci_mmcfg_early_init(); pci_mmcfg_early_init();
#ifdef CONFIG_PCI_OLPC #ifdef CONFIG_PCI_OLPC
pci_olpc_init(); if (!pci_olpc_init())
return 0; /* skip additional checks if it's an XO */
#endif #endif
#ifdef CONFIG_PCI_BIOS #ifdef CONFIG_PCI_BIOS
pci_pcbios_init(); pci_pcbios_init();
arch/x86/pci/irq.c
+7
View File
@@ -621,6 +621,13 @@ static __init int via_router_probe(struct irq_router *r,
*/ */
device = PCI_DEVICE_ID_VIA_8235; device = PCI_DEVICE_ID_VIA_8235;
break; break;
case PCI_DEVICE_ID_VIA_8237:
/**
* Asus a7v600 bios wrongly reports 8237
* as 586-compatible
*/
device = PCI_DEVICE_ID_VIA_8237;
break;
} }
} }
arch/x86/pci/olpc.c
+3 -2
View File
@@ -302,12 +302,13 @@ static struct pci_raw_ops pci_olpc_conf = {
.write = pci_olpc_write, .write = pci_olpc_write,
}; };
void __init pci_olpc_init(void) int __init pci_olpc_init(void)
{ {
if (!machine_is_olpc() || olpc_has_vsa()) if (!machine_is_olpc() || olpc_has_vsa())
return; 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();
return 0;
} }
arch/x86/pci/pci.h
+1 -1
View File
@@ -101,7 +101,7 @@ extern struct pci_raw_ops pci_direct_conf1;
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 void pci_olpc_init(void); extern int pci_olpc_init(void);
/* pci-mmconfig.c */ /* pci-mmconfig.c */