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

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

[Daniel Drake]

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

Signed-off-by: Daniel Drake <dsd@laptop.org>
---

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(-)

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index cea0cd9..0ed4c9b 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1900,7 +1900,7 @@ config PCI_GODIRECT
 	bool "Direct"
 
 config PCI_GOOLPC
-	bool "OLPC"
+	bool "OLPC XO-1"
 	depends on OLPC
 
 config PCI_GOANY
diff --git a/arch/x86/kernel/olpc.c b/arch/x86/kernel/olpc.c
index 0e0cdde..635888c 100644
--- a/arch/x86/kernel/olpc.c
+++ b/arch/x86/kernel/olpc.c
@@ -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
 
diff --git a/arch/x86/pci/olpc.c b/arch/x86/pci/olpc.c
index b348154..13700ec 100644
--- a/arch/x86/pci/olpc.c
+++ b/arch/x86/pci/olpc.c
@@ -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;
-- 
1.7.2.2

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

[tip-bot for Daniel Drake]

Commit-ID:  76fb657017588a0912f0d1d140cb807446e4ef05
Gitweb:     http://git.kernel.org/tip/76fb657017588a0912f0d1d140cb807446e4ef05
Author:     Daniel Drake <dsd@laptop.org>
AuthorDate: Thu, 23 Sep 2010 17:28:04 +0100
Committer:  H. Peter Anvin <hpa@linux.intel.com>
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.

Signed-off-by: Daniel Drake <dsd@laptop.org>
LKML-Reference: <20100923162805.0F6549D401B@zog.reactivated.net>
Cc: Andres Solomon <dilinger@queued.net>
Cc: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
---
 arch/x86/Kconfig       |    2 +-
 arch/x86/kernel/olpc.c |    6 ++++--
 arch/x86/pci/olpc.c    |    2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index cea0cd9..0ed4c9b 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1900,7 +1900,7 @@ config PCI_GODIRECT
 	bool "Direct"
 
 config PCI_GOOLPC
-	bool "OLPC"
+	bool "OLPC XO-1"
 	depends on OLPC
 
 config PCI_GOANY
diff --git a/arch/x86/kernel/olpc.c b/arch/x86/kernel/olpc.c
index 0e0cdde..635888c 100644
--- a/arch/x86/kernel/olpc.c
+++ b/arch/x86/kernel/olpc.c
@@ -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
 
diff --git a/arch/x86/pci/olpc.c b/arch/x86/pci/olpc.c
index b348154..13700ec 100644
--- a/arch/x86/pci/olpc.c
+++ b/arch/x86/pci/olpc.c
@@ -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;

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

[Andres Salomon]

Looks good to me!

Acked-by: Andres Salomon <dilinger@queued.net>


On Thu, 23 Sep 2010
17:28:04 +0100 (BST) Daniel Drake <dsd@laptop.org> wrote:

> This configuration type override is for XO-1 only and must not happen
> on XO-1.5.
> 
> Signed-off-by: Daniel Drake <dsd@laptop.org>
> ---
> 
> 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(-)
> 
> diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
> index cea0cd9..0ed4c9b 100644
> --- a/arch/x86/Kconfig
> +++ b/arch/x86/Kconfig
> @@ -1900,7 +1900,7 @@ config PCI_GODIRECT
>  	bool "Direct"
>  
>  config PCI_GOOLPC
> -	bool "OLPC"
> +	bool "OLPC XO-1"
>  	depends on OLPC
>  
>  config PCI_GOANY
> diff --git a/arch/x86/kernel/olpc.c b/arch/x86/kernel/olpc.c
> index 0e0cdde..635888c 100644
> --- a/arch/x86/kernel/olpc.c
> +++ b/arch/x86/kernel/olpc.c
> @@ -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
>  
> diff --git a/arch/x86/pci/olpc.c b/arch/x86/pci/olpc.c
> index b348154..13700ec 100644
> --- a/arch/x86/pci/olpc.c
> +++ b/arch/x86/pci/olpc.c
> @@ -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;

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

[Jesse Barnes]

On Thu, 23 Sep 2010 17:28:04 +0100 (BST)
Daniel Drake <dsd@laptop.org> wrote:

> This configuration type override is for XO-1 only and must not happen
> on XO-1.5.
> 
> Signed-off-by: Daniel Drake <dsd@laptop.org>
> ---
> 
> 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).

Applied to linux-next, thanks.

-- 
Jesse Barnes, Intel Open Source Technology Center

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

[H. Peter Anvin]

On 09/24/2010 11:03 AM, Jesse Barnes wrote:
> On Thu, 23 Sep 2010 17:28:04 +0100 (BST)
> Daniel Drake <dsd@laptop.org> wrote:
> 
>> This configuration type override is for XO-1 only and must not happen
>> on XO-1.5.
>>
>> Signed-off-by: Daniel Drake <dsd@laptop.org>
>> ---
>>
>> 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).
> 
> Applied to linux-next, thanks.
> 

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

	-hpa