From: Kyösti Mälkki <kyosti.malkki@gmail.com>
Date: Wed, 29 Feb 2012 19:17:18 +0000 (+0200)
Subject: Fix x86 cpu_phys_address_size
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;ds=sidebyside;h=730c0eec43a4be5d2b8d7b2450bd0fdebd4253a4;p=coreboot.git

Fix x86 cpu_phys_address_size

After CPUID, requested feature flag is in edx, not eax.

Change-Id: I9ce27c22186f17cc64986be342d7d1ac78a79898
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/688
Tested-by: build bot (Jenkins)
Reviewed-by: Sven Schnelle <svens@stackframe.org>
---

diff --git a/src/arch/x86/lib/cpu.c b/src/arch/x86/lib/cpu.c
index ada57e22f..8aacaac19 100644
--- a/src/arch/x86/lib/cpu.c
+++ b/src/arch/x86/lib/cpu.c
@@ -147,7 +147,7 @@ int cpu_phys_address_size(void)
 	if (cpu_cpuid_extended_level() >= 0x80000008)
 		return cpuid_eax(0x80000008) & 0xff;
 
-	if (cpuid_eax(1) & (CPUID_FEATURE_PAE | CPUID_FEATURE_PSE36))
+	if (cpuid_edx(1) & (CPUID_FEATURE_PAE | CPUID_FEATURE_PSE36))
 		return 36;
 	return 32;
 }