Skip to contentSkip to conversation

OLPC: Only enable PCI configuration type override on XO-1

PATCH Applied Daniel Drake 4 participants 5 messages Sep 23, 2010 – Sep 24, 2010

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

PATCH 1/2 OLPC: Only enable PCI configuration type override on XO-1

This configuration type override is for XO-1 only and must not happen on XO-1.5.

---

Replaces earlier patches:
[PATCH 1/3] OLPC: extended board revision detection [PATCH 2/3] PCI: OLPC configuration cleanup

Due to the fact that CONFIG_OLPC is associated with multiple laptop models (not only the XO-1), it makes sense to keep this as a separate configuration option.

We decided against adding functions to distinguish between XO-1/XO-1.5 as we don't want to encourage laptop checking in this way. There should only be one or two cases where this actually matters (here is one of them).

 arch/x86/Kconfig       |    2 +-
 arch/x86/kernel/olpc.c |    6 ++++--
 arch/x86/pci/olpc.c    |    2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)
arch/x86/Kconfig +1 -1
index cea0cd9..0ed4c9b 100644
@@ -1900,7 +1900,7 @@ config PCI_GODIRECT
 	bool "Direct"
 
 config PCI_GOOLPC
-	bool "OLPC"
+	bool "OLPC XO-1"
 	depends on OLPC
 
 config PCI_GOANY
arch/x86/kernel/olpc.c +4 -2
index 0e0cdde..635888c 100644
@@ -242,8 +242,10 @@ static int __init olpc_init(void)
 			(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 the VSA exists let it emulate PCI, if not emulate in kernel.
+	 * XO-1 only. */
+	if (olpc_platform_info.boardrev < olpc_board_pre(0xd0) &&
+			!cs5535_has_vsa2())
 		x86_init.pci.arch_init = pci_olpc_init;
 #endif
 
arch/x86/pci/olpc.c +1 -1
index b348154..13700ec 100644
@@ -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

[tip:x86/olpc] x86, olpc: Only enable PCI configuration type override on XO-1

Commit-ID:  76fb657017588a0912f0d1d140cb807446e4ef05
Gitweb:     http://git.kernel.org/tip/76fb657017588a0912f0d1d140cb807446e4ef05
Author:     Daniel Drake <[email protected]>
AuthorDate: Thu, 23 Sep 2010 17:28:04 +0100
Committer:  H. Peter Anvin <[email protected]>
CommitDate: Thu, 23 Sep 2010 11:14:18 -0700

x86, olpc: Only enable PCI configuration type override on XO-1

This configuration type override is for XO-1 only and must not happen on XO-1.5.

LKML-Reference: <[email protected]>

Cc Andres Solomon <[email protected]>
Cc Grant Likely <[email protected]>
---
 arch/x86/Kconfig       |    2 +-
 arch/x86/kernel/olpc.c |    6 ++++--
 arch/x86/pci/olpc.c    |    2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)
arch/x86/Kconfig +1 -1
index cea0cd9..0ed4c9b 100644
@@ -1900,7 +1900,7 @@ config PCI_GODIRECT
 	bool "Direct"
 
 config PCI_GOOLPC
-	bool "OLPC"
+	bool "OLPC XO-1"
 	depends on OLPC
 
 config PCI_GOANY
arch/x86/kernel/olpc.c +4 -2
index 0e0cdde..635888c 100644
@@ -242,8 +242,10 @@ static int __init olpc_init(void)
 			(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 the VSA exists let it emulate PCI, if not emulate in kernel.
+	 * XO-1 only. */
+	if (olpc_platform_info.boardrev < olpc_board_pre(0xd0) &&
+			!cs5535_has_vsa2())
 		x86_init.pci.arch_init = pci_olpc_init;
 #endif
 
arch/x86/pci/olpc.c +1 -1
index b348154..13700ec 100644
@@ -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;
Acked-by on v1 1/2
#2 lore raw
In reply to Daniel Drake

Looks good to me!

Quoted 69 lines · On Thu, 23 Sep 2010 17:28:04 +0100 (BST) Daniel Drake <[email protected]> wrote:

This configuration type override is for XO-1 only and must not happen on XO-1.5.

---

Replaces earlier patches:
[PATCH 1/3] OLPC: extended board revision detection [PATCH 2/3] PCI: OLPC configuration cleanup

Due to the fact that CONFIG_OLPC is associated with multiple laptop models (not only the XO-1), it makes sense to keep this as a separate configuration option.

We decided against adding functions to distinguish between XO-1/XO-1.5 as we don't want to encourage laptop checking in this way. There should only be one or two cases where this actually matters (here is one of them).

 arch/x86/Kconfig       |    2 +-
 arch/x86/kernel/olpc.c |    6 ++++--
 arch/x86/pci/olpc.c    |    2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)
arch/x86/Kconfig +1 -1
index cea0cd9..0ed4c9b 100644
@@ -1900,7 +1900,7 @@ config PCI_GODIRECT
 	bool "Direct"
 
 config PCI_GOOLPC
-	bool "OLPC"
+	bool "OLPC XO-1"
 	depends on OLPC
 
 config PCI_GOANY
arch/x86/kernel/olpc.c +0 -1
index 0e0cdde..635888c 100644
@@ -242,8 +242,10 @@ static int __init olpc_init(void)
 			(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 -1
-	if (!cs5535_has_vsa2())
+	/* If the VSA exists let it emulate PCI, if not emulate in

kernel.

arch/x86/kernel/olpc.c +3 -0
+	 * XO-1 only. */
+	if (olpc_platform_info.boardrev < olpc_board_pre(0xd0) &&
+			!cs5535_has_vsa2())
 		x86_init.pci.arch_init = pci_olpc_init;
 #endif
arch/x86/pci/olpc.c +1 -1
index b348154..13700ec 100644
@@ -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;
Applied
#3 lore raw
In reply to Daniel Drake
Quoted 10 lines · On Thu, 23 Sep 2010 17:28:04 +0100 (BST) Daniel Drake <[email protected]> wrote:

This configuration type override is for XO-1 only and must not happen on XO-1.5.

---

Replaces earlier patches:
[PATCH 1/3] OLPC: extended board revision detection [PATCH 2/3] PCI: OLPC configuration cleanup

Quoted 7 lines

Due to the fact that CONFIG_OLPC is associated with multiple laptop models (not only the XO-1), it makes sense to keep this as a separate configuration option.

We decided against adding functions to distinguish between XO-1/XO-1.5 as we don't want to encourage laptop checking in this way. There should only be one or two cases where this actually matters (here is one of them).

Applied to linux-next, thanks.

Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center
#4 lore raw
Quoted 17 lines · Jesse Barnes
Quoted 14 lines · On Thu, 23 Sep 2010 17:28:04 +0100 (BST) Daniel Drake <[email protected]> wrote:

This configuration type override is for XO-1 only and must not happen on XO-1.5.

---

Replaces earlier patches:
[PATCH 1/3] OLPC: extended board revision detection [PATCH 2/3] PCI: OLPC configuration cleanup

Due to the fact that CONFIG_OLPC is associated with multiple laptop models (not only the XO-1), it makes sense to keep this as a separate configuration option.

Quoted 6 lines
Quoted 3 lines

We decided against adding functions to distinguish between XO-1/XO-1.5 as we don't want to encourage laptop checking in this way. There should only be one or two cases where this actually matters (here is one of them).

Applied to linux-next, thanks.

I already put these two patches into -tip, which should get it into linux-next...

-hpa