Skip to contentSkip to conversation

PCI: OLPC configuration cleanup

PATCH In review Daniel Drake 3 participants 4 messages Sep 22, 2010 – Sep 23, 2010

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

PATCH 2/3 PCI: OLPC configuration cleanup

An OLPC system isn't usable without PCI, so we can simplify the configuration here.

Also updated the code to be clearer that this is only for XO-1, and fixed an issue where the XO-1 PCI configuration override was being applied for XO-1.5 laptops.

Based on earlier work by Deepak Saxena.

---
 arch/x86/Kconfig       |   12 +++---------
 arch/x86/kernel/olpc.c |    4 +---
 arch/x86/pci/Makefile  |    2 +-
 arch/x86/pci/olpc.c    |    4 ++--
 4 files changed, 7 insertions(+), 15 deletions(-)
arch/x86/Kconfig +3 -9
index cea0cd9..708ee0d 100644
@@ -1899,10 +1899,6 @@ config PCI_GOMMCONFIG
 config PCI_GODIRECT
 	bool "Direct"
 
-config PCI_GOOLPC
-	bool "OLPC"
-	depends on OLPC
-
 config PCI_GOANY
 	bool "Any"
 
@@ -1915,16 +1911,12 @@ config PCI_BIOS
 # x86-64 doesn't support PCI BIOS access from long mode so always go direct.
 config PCI_DIRECT
 	def_bool y
-	depends on PCI && (X86_64 || (PCI_GODIRECT || PCI_GOANY || PCI_GOOLPC))
+	depends on PCI && (X86_64 || (PCI_GODIRECT || PCI_GOANY))
 
 config PCI_MMCONFIG
 	def_bool y
 	depends on X86_32 && PCI && (ACPI || SFI) && (PCI_GOMMCONFIG || PCI_GOANY)
 
-config PCI_OLPC
-	def_bool y
-	depends on PCI && OLPC && (PCI_GOOLPC || PCI_GOANY)
-
 config PCI_DOMAINS
 	def_bool y
 	depends on PCI
@@ -2060,6 +2052,8 @@ config SCx200HR_TIMER
 
 config OLPC
 	bool "One Laptop Per Child support"
+	select PCI
+	select PCI_GOANY
 	select GPIOLIB
 	---help---
 	  Add support for detecting the unique features of the OLPC
arch/x86/kernel/olpc.c +1 -3
index 0e0cdde..10b4dce 100644
@@ -241,11 +241,9 @@ static int __init olpc_init(void)
 	olpc_ec_cmd(EC_FIRMWARE_REV, NULL, 0,
 			(unsigned char *) &olpc_platform_info.ecver, 1);
 
-#ifdef CONFIG_PCI_OLPC
 	/* If the VSA exists let it emulate PCI, if not emulate in kernel */
-	if (!cs5535_has_vsa2())
+	if (machine_is_olpc_xo_1() && !cs5535_has_vsa2())
 		x86_init.pci.arch_init = pci_olpc_init;
-#endif
 
 	printk(KERN_INFO "OLPC board revision %s%X (EC=%x)\n",
 			((olpc_platform_info.boardrev & 0xf) < 8) ? "pre" : "",
arch/x86/pci/Makefile +1 -1
index a0207a7..b0f2712 100644
@@ -3,7 +3,7 @@ obj-y				:= i386.o init.o
 obj-$(CONFIG_PCI_BIOS)		+= pcbios.o
 obj-$(CONFIG_PCI_MMCONFIG)	+= mmconfig_$(BITS).o direct.o mmconfig-shared.o
 obj-$(CONFIG_PCI_DIRECT)	+= direct.o
-obj-$(CONFIG_PCI_OLPC)		+= olpc.o
+obj-$(CONFIG_OLPC)		+= olpc.o
 
 obj-y				+= fixup.o
 obj-$(CONFIG_ACPI)		+= acpi.o
arch/x86/pci/olpc.c +2 -2
index b348154..fa5ba7b 100644
@@ -1,5 +1,5 @@
 /*
- * Low-level PCI config space access for OLPC systems who lack the VSA
+ * Low-level PCI config space access for OLPC XO-1 systems who lack the VSA
  * PCI virtualization software.
  *
  * Copyright © 2006  Advanced Micro Devices, Inc.
@@ -304,7 +304,7 @@ static struct pci_raw_ops pci_olpc_conf = {
 
 int __init pci_olpc_init(void)
 {
-	printk(KERN_INFO "PCI: Using configuration type OLPC\n");
+	printk(KERN_INFO "PCI: Using configuration type OLPC XO-1\n");
 	raw_pci_ops = &pci_olpc_conf;
 	is_lx = is_geode_lx();
 	return 0;
Signature · 1 line
1.7.2.2
#1 lore raw
Quoted 2 lines · On Wed, 22 Sep 2010 17:44:02 +0100 (BST) Daniel Drake wrote:

An OLPC system isn't usable without PCI, so we can simplify the configuration here.

preferably by using "depends on" instead of "select".

Quoted 48 lines

Also updated the code to be clearer that this is only for XO-1, and fixed an issue where the XO-1 PCI configuration override was being applied for XO-1.5 laptops.

Based on earlier work by Deepak Saxena.

---
 arch/x86/Kconfig       |   12 +++---------
 arch/x86/kernel/olpc.c |    4 +---
 arch/x86/pci/Makefile  |    2 +-
 arch/x86/pci/olpc.c    |    4 ++--
 4 files changed, 7 insertions(+), 15 deletions(-)
arch/x86/Kconfig +1 -9
index cea0cd9..708ee0d 100644
@@ -1899,10 +1899,6 @@ config PCI_GOMMCONFIG
 config PCI_GODIRECT
 	bool "Direct"
 
-config PCI_GOOLPC
-	bool "OLPC"
-	depends on OLPC
-
 config PCI_GOANY
 	bool "Any"
 
@@ -1915,16 +1911,12 @@ config PCI_BIOS
 # x86-64 doesn't support PCI BIOS access from long mode so always go direct.
 config PCI_DIRECT
 	def_bool y
-	depends on PCI && (X86_64 || (PCI_GODIRECT || PCI_GOANY || PCI_GOOLPC))
+	depends on PCI && (X86_64 || (PCI_GODIRECT || PCI_GOANY))
 
 config PCI_MMCONFIG
 	def_bool y
 	depends on X86_32 && PCI && (ACPI || SFI) && (PCI_GOMMCONFIG || PCI_GOANY)
 
-config PCI_OLPC
-	def_bool y
-	depends on PCI && OLPC && (PCI_GOOLPC || PCI_GOANY)
-
 config PCI_DOMAINS
 	def_bool y
 	depends on PCI

arch/x86/Kconfig config SCx200HR_TIMER · line 2059

Quoted 8 lines
arch/x86/Kconfig +2 -0
@@ -2060,6 +2052,8 @@ config SCx200HR_TIMER
 
 config OLPC
 	bool "One Laptop Per Child support"
+	select PCI
+	select PCI_GOANY
 	select GPIOLIB
 	---help---
 	  Add support for detecting the unique features of the OLPC

---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

#2 lore raw
In reply to Daniel Drake
Quoted 2 lines · On Wed, 22 Sep 2010 17:44:02 +0100 (BST) Daniel Drake <[email protected]> wrote:

An OLPC system isn't usable without PCI, so we can simplify the configuration here.

Hm, I think I'm opposed to tying it into CONFIG_OLPC like that. Future plans call for an ARM-based OLPC which will presumably not have a PCI bus.

..However, I'm also failing to come up w/ a good alternative right now.

Quoted 111 lines

Also updated the code to be clearer that this is only for XO-1, and fixed an issue where the XO-1 PCI configuration override was being applied for XO-1.5 laptops.

Based on earlier work by Deepak Saxena.

---
 arch/x86/Kconfig       |   12 +++---------
 arch/x86/kernel/olpc.c |    4 +---
 arch/x86/pci/Makefile  |    2 +-
 arch/x86/pci/olpc.c    |    4 ++--
 4 files changed, 7 insertions(+), 15 deletions(-)
arch/x86/Kconfig +0 -4
index cea0cd9..708ee0d 100644
@@ -1899,10 +1899,6 @@ config PCI_GOMMCONFIG
 config PCI_GODIRECT
 	bool "Direct"
 
-config PCI_GOOLPC
-	bool "OLPC"
-	depends on OLPC
-
 config PCI_GOANY
 	bool "Any"
 
@@ -1915,16 +1911,12 @@ config PCI_BIOS
 # x86-64 doesn't support PCI BIOS access from long mode so always go

direct. config PCI_DIRECT

arch/x86/Kconfig +0 -1
 	def_bool y
-	depends on PCI && (X86_64 || (PCI_GODIRECT || PCI_GOANY ||

PCI_GOOLPC))

arch/x86/Kconfig +1 -0
+	depends on PCI && (X86_64 || (PCI_GODIRECT || PCI_GOANY))
 
 config PCI_MMCONFIG
 	def_bool y
 	depends on X86_32 && PCI && (ACPI || SFI) && (PCI_GOMMCONFIG

|| PCI_GOANY)

arch/x86/Kconfig +2 -4
-config PCI_OLPC
-	def_bool y
-	depends on PCI && OLPC && (PCI_GOOLPC || PCI_GOANY)
-
 config PCI_DOMAINS
 	def_bool y
 	depends on PCI
@@ -2060,6 +2052,8 @@ config SCx200HR_TIMER
 
 config OLPC
 	bool "One Laptop Per Child support"
+	select PCI
+	select PCI_GOANY
 	select GPIOLIB
 	---help---
 	  Add support for detecting the unique features of the OLPC
arch/x86/kernel/olpc.c +0 -1
index 0e0cdde..10b4dce 100644
@@ -241,11 +241,9 @@ static int __init olpc_init(void)
 	olpc_ec_cmd(EC_FIRMWARE_REV, NULL, 0,
 			(unsigned char *) &olpc_platform_info.ecver,
 1); 
-#ifdef CONFIG_PCI_OLPC
 	/* If the VSA exists let it emulate PCI, if not emulate in

kernel */

arch/x86/kernel/olpc.c +1 -2
-	if (!cs5535_has_vsa2())
+	if (machine_is_olpc_xo_1() && !cs5535_has_vsa2())
 		x86_init.pci.arch_init = pci_olpc_init;
-#endif
 
 	printk(KERN_INFO "OLPC board revision %s%X (EC=%x)\n",
 			((olpc_platform_info.boardrev & 0xf) < 8) ?

"pre" : "", diff --git a/arch/x86/pci/Makefile b/arch/x86/pci/Makefile index a0207a7..b0f2712 100644

arch/x86/pci/Makefile +0 -0
@@ -3,7 +3,7 @@ obj-y				:= i386.o init.o
 obj-$(CONFIG_PCI_BIOS)		+= pcbios.o
 obj-$(CONFIG_PCI_MMCONFIG)	+= mmconfig_$(BITS).o direct.o

mmconfig-shared.o obj-$(CONFIG_PCI_DIRECT) += direct.o

arch/x86/pci/Makefile +1 -1
-obj-$(CONFIG_PCI_OLPC)		+= olpc.o
+obj-$(CONFIG_OLPC)		+= olpc.o
 
 obj-y				+= fixup.o
 obj-$(CONFIG_ACPI)		+= acpi.o
arch/x86/pci/olpc.c +0 -1
index b348154..fa5ba7b 100644
@@ -1,5 +1,5 @@
 /*
- * Low-level PCI config space access for OLPC systems who lack the

VSA
+ * Low-level PCI config space access for OLPC XO-1 systems who lack the VSA
* PCI virtualization software.
*
* Copyright © 2006 Advanced Micro Devices, Inc.

arch/x86/pci/olpc.c +1 -1
@@ -304,7 +304,7 @@ static struct pci_raw_ops pci_olpc_conf = {
 
 int __init pci_olpc_init(void)
 {
-	printk(KERN_INFO "PCI: Using configuration type OLPC\n");
+	printk(KERN_INFO "PCI: Using configuration type OLPC
 XO-1\n"); raw_pci_ops = &pci_olpc_conf;
 	is_lx = is_geode_lx();
 	return 0;
#3 lore raw
Quoted 9 lines · Andres Salomon
Quoted 2 lines · On Wed, 22 Sep 2010 17:44:02 +0100 (BST) Daniel Drake <[email protected]> wrote:

An OLPC system isn't usable without PCI, so we can simplify the configuration here.

Hm, I think I'm opposed to tying it into CONFIG_OLPC like that.  Future plans call for an ARM-based OLPC which will presumably not have a PCI bus.

Good point. We should save cleanups in this area until it's clearer how the ARM-based XO-1.75 will fit into everything.

Quoted 2 lines

..However, I'm also failing to come up w/ a good alternative right now.

It's only a cleanup, so can be dropped without worry.

I'll send the important bit (board revision check for XO-1 special pci config) as a separate patch.
This patch can be dropped.

Daniel