Skip to contentSkip to conversation

PCI fixes

GIT PULL Jesse Barnes 2 participants 3 messages Jun 6, 2008

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Please pull a few more fixes for 2.6.26:
git pull git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git for-linus

There's nothing big or critical here, just a couple of things that would be nice to see in 2.6.26: a fix for OLPC and a new quirk for VIA bridges.

Thanks,
Jesse

Andres Salomon (1):
PCI/x86: fix up PCI stuff so that PCI_GOANY supports OLPC

Bertram Felgenhauer (1):
x86/PCI: add workaround for bug in ASUS A7V600 BIOS (rev 1005)

 arch/x86/Kconfig    |   11 +++++------
 arch/x86/pci/init.c |    3 ++-
 arch/x86/pci/irq.c  |    7 +++++++
 arch/x86/pci/olpc.c |    5 +++--
 arch/x86/pci/pci.h  |    2 +-
 5 files changed, 18 insertions(+), 10 deletions(-)
#1 lore raw
Quoted 15 lines · Jesse Barnes

Please pull a few more fixes for 2.6.26:
git pull git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git for-linus

There's nothing big or critical here, just a couple of things that would be nice to see in 2.6.26: a fix for OLPC and a new quirk for VIA bridges.

Thanks,
Jesse

Andres Salomon (1):
PCI/x86: fix up PCI stuff so that PCI_GOANY supports OLPC

Bertram Felgenhauer (1):
x86/PCI: add workaround for bug in ASUS A7V600 BIOS (rev 1005)

Quoted 6 lines
 arch/x86/Kconfig    |   11 +++++------
 arch/x86/pci/init.c |    3 ++-
 arch/x86/pci/irq.c  |    7 +++++++
 arch/x86/pci/olpc.c |    5 +++--
 arch/x86/pci/pci.h  |    2 +-
 5 files changed, 18 insertions(+), 10 deletions(-)

Even though these patches have made a previous appearance on the list, any chance you could be talked into including a summary patch, when you push upstream? It's nice to be able to give the push one last look.

Jeff

#2 lore raw
Quoted 25 lines · Jeff Garzik
Quoted 17 lines · Jesse Barnes

Please pull a few more fixes for 2.6.26:
git pull
git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git
for-linus

There's nothing big or critical here, just a couple of things that would be nice to see in 2.6.26: a fix for OLPC and a new quirk for VIA bridges.

Thanks,
Jesse

Andres Salomon (1):
PCI/x86: fix up PCI stuff so that PCI_GOANY supports OLPC

Bertram Felgenhauer (1):
x86/PCI: add workaround for bug in ASUS A7V600 BIOS (rev 1005)

Quoted 6 lines
 arch/x86/Kconfig    |   11 +++++------
 arch/x86/pci/init.c |    3 ++-
 arch/x86/pci/irq.c  |    7 +++++++
 arch/x86/pci/olpc.c |    5 +++--
 arch/x86/pci/pci.h  |    2 +-
 5 files changed, 18 insertions(+), 10 deletions(-)
Quoted 3 lines

Even though these patches have made a previous appearance on the list, any chance you could be talked into including a summary patch, when you push upstream? It's nice to be able to give the push one last look.

Sure, that's a good idea. Especially for post-merge window pull requests like this. Here's this one for reference (note that I don't really think some of this OLPC code being patched should exist in its current form at all, but I don't think this patch makes things any worse).

Jesse

arch/x86/Kconfig +5 -6
index dcbec34..52e18e6 100644
@@ -1508,13 +1508,13 @@ config PCI_GOMMCONFIG
 config PCI_GODIRECT
 	bool "Direct"
 
-config PCI_GOANY
-	bool "Any"
-
 config PCI_GOOLPC
 	bool "OLPC"
 	depends on OLPC
 
+config PCI_GOANY
+	bool "Any"
+
 endchoice
 
 config PCI_BIOS
@@ -1531,9 +1531,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
arch/x86/pci/init.c +2 -1
index e70b9c5..b821f44 100644
@@ -15,7 +15,8 @@ static __init int pci_access_init(void)
 	pci_mmcfg_early_init();
 
 #ifdef CONFIG_PCI_OLPC
-	pci_olpc_init();
+	if (!pci_olpc_init())
+		return 0;	/* skip additional checks if it's an XO */
 #endif
 #ifdef CONFIG_PCI_BIOS
 	pci_pcbios_init();
arch/x86/pci/irq.c +7 -0
index 0908fca..ca8df9c 100644
@@ -621,6 +621,13 @@ static __init int via_router_probe(struct irq_router *r,
 			 */
 			device = PCI_DEVICE_ID_VIA_8235;
 			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
index 5e76365..e11e9e8 100644
@@ -302,12 +302,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;
 }
arch/x86/pci/pci.h +1 -1
index f3972b1..720c4c5 100644
@@ -101,7 +101,7 @@ extern struct pci_raw_ops pci_direct_conf1;
 extern int pci_direct_probe(void);
 extern void pci_direct_init(int type);
 extern void pci_pcbios_init(void);
-extern void pci_olpc_init(void);
+extern int pci_olpc_init(void);
 
 /* pci-mmconfig.c */