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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <tip-76fb657017588a0912f0d1d140cb807446e4ef05@git.kernel.org>
Date:	Thu, 23 Sep 2010 20:04:57 GMT
From:	tip-bot for Daniel Drake <dsd@...top.org>
To:	linux-tip-commits@...r.kernel.org
Cc:	grant.likely@...retlab.ca, linux-kernel@...r.kernel.org,
	hpa@...or.com, mingo@...hat.com, dsd@...top.org,
	dilinger@...ued.net, tglx@...utronix.de, hpa@...ux.intel.com
Subject: [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 <dsd@...top.org>
AuthorDate: Thu, 23 Sep 2010 17:28:04 +0100
Committer:  H. Peter Anvin <hpa@...ux.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@...top.org>
LKML-Reference: <20100923162805.0F6549D401B@....reactivated.net>
Cc: Andres Solomon <dilinger@...ued.net>
Cc: Grant Likely <grant.likely@...retlab.ca>
Signed-off-by: H. Peter Anvin <hpa@...ux.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;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/