Revert r5902 to make code more readable again. At least three people like to
have this go away again. Signed-off-by: Stefan Reinauer <stepan@coresystems.de> Acked-by: Rudolf Marek <r.marek@assembler.cz> Acked-by: Kevin O'Connor <kevin@koconnor.net> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6273 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
parent
5bb9fd6e4d
commit
7b0500c24c
|
@ -18,7 +18,6 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <cpu/x86/car.h>
|
|
||||||
#include <cpu/x86/mtrr.h>
|
#include <cpu/x86/mtrr.h>
|
||||||
#include <cpu/amd/mtrr.h>
|
#include <cpu/amd/mtrr.h>
|
||||||
|
|
||||||
|
@ -46,7 +45,8 @@
|
||||||
* xmm3: Backup EBX
|
* xmm3: Backup EBX
|
||||||
*/
|
*/
|
||||||
|
|
||||||
save_bist_result()
|
/* Save the BIST result. */
|
||||||
|
movl %eax, %ebp
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* For normal part %ebx already contain cpu_init_detected
|
* For normal part %ebx already contain cpu_init_detected
|
||||||
|
@ -56,7 +56,10 @@
|
||||||
cache_as_ram_setup:
|
cache_as_ram_setup:
|
||||||
post_code(0xa0)
|
post_code(0xa0)
|
||||||
|
|
||||||
enable_sse()
|
/* Enable SSE. */
|
||||||
|
movl %cr4, %eax
|
||||||
|
orl $(3 << 9), %eax
|
||||||
|
movl %eax, %cr4
|
||||||
|
|
||||||
/* Figure out the CPU family. */
|
/* Figure out the CPU family. */
|
||||||
cvtsi2sd %ebx, %xmm3
|
cvtsi2sd %ebx, %xmm3
|
||||||
|
@ -321,7 +324,10 @@ wbcache_post_fam10_setup:
|
||||||
|
|
||||||
post_code(0xa1)
|
post_code(0xa1)
|
||||||
|
|
||||||
enable_cache()
|
/* Enable cache. */
|
||||||
|
movl %cr0, %eax
|
||||||
|
andl $(~((1 << 30) | (1 << 29))), %eax
|
||||||
|
movl %eax, %cr0
|
||||||
|
|
||||||
jmp_if_k8(fam10_end_part1)
|
jmp_if_k8(fam10_end_part1)
|
||||||
|
|
||||||
|
@ -403,9 +409,13 @@ CAR_FAM10_ap_out:
|
||||||
|
|
||||||
post_code(0xa5)
|
post_code(0xa5)
|
||||||
|
|
||||||
disable_sse()
|
/* Disable SSE. */
|
||||||
|
movl %cr4, %eax
|
||||||
|
andl $~(3 << 9), %eax
|
||||||
|
movl %eax, %cr4
|
||||||
|
|
||||||
restore_bist_result()
|
/* Restore the BIST result. */
|
||||||
|
movl %ebp, %eax
|
||||||
|
|
||||||
/* We need to set EBP? No need. */
|
/* We need to set EBP? No need. */
|
||||||
movl %esp, %ebp
|
movl %esp, %ebp
|
||||||
|
|
|
@ -21,7 +21,6 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <cpu/x86/car.h>
|
|
||||||
#include <cpu/x86/stack.h>
|
#include <cpu/x86/stack.h>
|
||||||
#include <cpu/x86/mtrr.h>
|
#include <cpu/x86/mtrr.h>
|
||||||
#include <cpu/x86/lapic_def.h>
|
#include <cpu/x86/lapic_def.h>
|
||||||
|
@ -29,7 +28,8 @@
|
||||||
#define CacheSize CONFIG_DCACHE_RAM_SIZE
|
#define CacheSize CONFIG_DCACHE_RAM_SIZE
|
||||||
#define CacheBase (0xd0000 - CacheSize)
|
#define CacheBase (0xd0000 - CacheSize)
|
||||||
|
|
||||||
save_bist_result()
|
/* Save the BIST result. */
|
||||||
|
movl %eax, %ebp
|
||||||
|
|
||||||
CacheAsRam:
|
CacheAsRam:
|
||||||
/* Check whether the processor has HT capability. */
|
/* Check whether the processor has HT capability. */
|
||||||
|
@ -257,7 +257,10 @@ clear_fixed_var_mtrr_out:
|
||||||
wrmsr
|
wrmsr
|
||||||
#endif /* CONFIG_XIP_ROM_SIZE && CONFIG_XIP_ROM_BASE */
|
#endif /* CONFIG_XIP_ROM_SIZE && CONFIG_XIP_ROM_BASE */
|
||||||
|
|
||||||
enable_cache()
|
/* Enable cache. */
|
||||||
|
movl %cr0, %eax
|
||||||
|
andl $(~((1 << 30) | (1 << 29))), %eax
|
||||||
|
movl %eax, %cr0
|
||||||
|
|
||||||
/* Read the range with lodsl. */
|
/* Read the range with lodsl. */
|
||||||
movl $CacheBase, %esi
|
movl $CacheBase, %esi
|
||||||
|
@ -318,7 +321,8 @@ clear_fixed_var_mtrr_out:
|
||||||
movl $(CacheBase + CacheSize - 4), %eax
|
movl $(CacheBase + CacheSize - 4), %eax
|
||||||
movl %eax, %esp
|
movl %eax, %esp
|
||||||
lout:
|
lout:
|
||||||
restore_bist_result()
|
/* Restore the BIST result. */
|
||||||
|
movl %ebp, %eax
|
||||||
|
|
||||||
/* We need to set EBP? No need. */
|
/* We need to set EBP? No need. */
|
||||||
movl %esp, %ebp
|
movl %esp, %ebp
|
||||||
|
@ -327,7 +331,10 @@ lout:
|
||||||
|
|
||||||
/* We don't need CAR from now on. */
|
/* We don't need CAR from now on. */
|
||||||
|
|
||||||
disable_cache()
|
/* Disable cache. */
|
||||||
|
movl %cr0, %eax
|
||||||
|
orl $(1 << 30), %eax
|
||||||
|
movl %eax, %cr0
|
||||||
|
|
||||||
/* Clear sth. */
|
/* Clear sth. */
|
||||||
movl $MTRRfix4K_C8000_MSR, %ecx
|
movl $MTRRfix4K_C8000_MSR, %ecx
|
||||||
|
@ -349,7 +356,10 @@ lout:
|
||||||
movl $0x00000800, %eax /* Enable variable and disable fixed MTRRs. */
|
movl $0x00000800, %eax /* Enable variable and disable fixed MTRRs. */
|
||||||
wrmsr
|
wrmsr
|
||||||
|
|
||||||
enable_cache();
|
/* Enable cache. */
|
||||||
|
movl %cr0, %eax
|
||||||
|
andl $(~((1 << 30) | (1 << 29))), %eax
|
||||||
|
movl %eax, %cr0
|
||||||
|
|
||||||
/* Clear boot_complete flag. */
|
/* Clear boot_complete flag. */
|
||||||
xorl %ebp, %ebp
|
xorl %ebp, %ebp
|
||||||
|
|
|
@ -18,14 +18,14 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <cpu/x86/car.h>
|
|
||||||
#include <cpu/x86/stack.h>
|
#include <cpu/x86/stack.h>
|
||||||
#include <cpu/x86/mtrr.h>
|
#include <cpu/x86/mtrr.h>
|
||||||
|
|
||||||
#define CACHE_AS_RAM_SIZE CONFIG_DCACHE_RAM_SIZE
|
#define CACHE_AS_RAM_SIZE CONFIG_DCACHE_RAM_SIZE
|
||||||
#define CACHE_AS_RAM_BASE CONFIG_DCACHE_RAM_BASE
|
#define CACHE_AS_RAM_BASE CONFIG_DCACHE_RAM_BASE
|
||||||
|
|
||||||
save_bist_result()
|
/* Save the BIST result. */
|
||||||
|
movl %eax, %ebp
|
||||||
|
|
||||||
cache_as_ram:
|
cache_as_ram:
|
||||||
post_code(0x20)
|
post_code(0x20)
|
||||||
|
@ -66,12 +66,19 @@ clear_mtrrs:
|
||||||
xorl %edx, %edx
|
xorl %edx, %edx
|
||||||
wrmsr
|
wrmsr
|
||||||
|
|
||||||
enable_mtrr()
|
/* Enable MTRR. */
|
||||||
|
movl $MTRRdefType_MSR, %ecx
|
||||||
|
rdmsr
|
||||||
|
orl $(1 << 11), %eax
|
||||||
|
wrmsr
|
||||||
|
|
||||||
enable_l2_cache()
|
/* Enable L2 cache. */
|
||||||
|
movl $0x11e, %ecx
|
||||||
|
rdmsr
|
||||||
|
orl $(1 << 8), %eax
|
||||||
|
wrmsr
|
||||||
|
|
||||||
/* Enable cache (CR0.CD = 0, CR0.NW = 0). */
|
/* Enable cache (CR0.CD = 0, CR0.NW = 0). */
|
||||||
/* TODO: enable_cache()? But that doesn't have "invd". */
|
|
||||||
movl %cr0, %eax
|
movl %cr0, %eax
|
||||||
andl $(~((1 << 30) | (1 << 29))), %eax
|
andl $(~((1 << 30) | (1 << 29))), %eax
|
||||||
invd
|
invd
|
||||||
|
@ -86,7 +93,9 @@ clear_mtrrs:
|
||||||
rep stosl
|
rep stosl
|
||||||
|
|
||||||
/* Enable Cache-as-RAM mode by disabling cache. */
|
/* Enable Cache-as-RAM mode by disabling cache. */
|
||||||
disable_cache()
|
movl %cr0, %eax
|
||||||
|
orl $(1 << 30), %eax
|
||||||
|
movl %eax, %cr0
|
||||||
|
|
||||||
#if defined(CONFIG_XIP_ROM_SIZE) && defined(CONFIG_XIP_ROM_BASE)
|
#if defined(CONFIG_XIP_ROM_SIZE) && defined(CONFIG_XIP_ROM_BASE)
|
||||||
/* Enable cache for our code in Flash because we do XIP here */
|
/* Enable cache for our code in Flash because we do XIP here */
|
||||||
|
@ -112,7 +121,10 @@ clear_mtrrs:
|
||||||
wrmsr
|
wrmsr
|
||||||
#endif /* CONFIG_XIP_ROM_SIZE && CONFIG_XIP_ROM_BASE */
|
#endif /* CONFIG_XIP_ROM_SIZE && CONFIG_XIP_ROM_BASE */
|
||||||
|
|
||||||
enable_cache()
|
/* Enable cache. */
|
||||||
|
movl %cr0, %eax
|
||||||
|
andl $(~((1 << 30) | (1 << 29))), %eax
|
||||||
|
movl %eax, %cr0
|
||||||
|
|
||||||
/* Set up the stack pointer. */
|
/* Set up the stack pointer. */
|
||||||
#if defined(CONFIG_USBDEBUG) && (CONFIG_USBDEBUG == 1)
|
#if defined(CONFIG_USBDEBUG) && (CONFIG_USBDEBUG == 1)
|
||||||
|
@ -123,8 +135,8 @@ clear_mtrrs:
|
||||||
#endif
|
#endif
|
||||||
movl %eax, %esp
|
movl %eax, %esp
|
||||||
|
|
||||||
restore_bist_result()
|
/* Restore the BIST result. */
|
||||||
|
movl %ebp, %eax
|
||||||
movl %esp, %ebp
|
movl %esp, %ebp
|
||||||
pushl %eax
|
pushl %eax
|
||||||
|
|
||||||
|
@ -137,11 +149,18 @@ clear_mtrrs:
|
||||||
|
|
||||||
post_code(0x30)
|
post_code(0x30)
|
||||||
|
|
||||||
disable_cache()
|
/* Disable cache. */
|
||||||
|
movl %cr0, %eax
|
||||||
|
orl $(1 << 30), %eax
|
||||||
|
movl %eax, %cr0
|
||||||
|
|
||||||
post_code(0x31)
|
post_code(0x31)
|
||||||
|
|
||||||
disable_mtrr()
|
/* Disable MTRR. */
|
||||||
|
movl $MTRRdefType_MSR, %ecx
|
||||||
|
rdmsr
|
||||||
|
andl $(~(1 << 11)), %eax
|
||||||
|
wrmsr
|
||||||
|
|
||||||
post_code(0x31)
|
post_code(0x31)
|
||||||
|
|
||||||
|
@ -161,11 +180,17 @@ clear_mtrrs:
|
||||||
|
|
||||||
post_code(0x33)
|
post_code(0x33)
|
||||||
|
|
||||||
enable_cache()
|
/* Enable cache. */
|
||||||
|
movl %cr0, %eax
|
||||||
|
andl $~((1 << 30) | (1 << 29)), %eax
|
||||||
|
movl %eax, %cr0
|
||||||
|
|
||||||
post_code(0x36)
|
post_code(0x36)
|
||||||
|
|
||||||
disable_cache()
|
/* Disable cache. */
|
||||||
|
movl %cr0, %eax
|
||||||
|
orl $(1 << 30), %eax
|
||||||
|
movl %eax, %cr0
|
||||||
|
|
||||||
post_code(0x38)
|
post_code(0x38)
|
||||||
|
|
||||||
|
@ -182,11 +207,17 @@ clear_mtrrs:
|
||||||
post_code(0x39)
|
post_code(0x39)
|
||||||
|
|
||||||
/* And enable cache again after setting MTRRs. */
|
/* And enable cache again after setting MTRRs. */
|
||||||
enable_cache()
|
movl %cr0, %eax
|
||||||
|
andl $~((1 << 30) | (1 << 29)), %eax
|
||||||
|
movl %eax, %cr0
|
||||||
|
|
||||||
post_code(0x3a)
|
post_code(0x3a)
|
||||||
|
|
||||||
enable_mtrr()
|
/* Enable MTRR. */
|
||||||
|
movl $MTRRdefType_MSR, %ecx
|
||||||
|
rdmsr
|
||||||
|
orl $(1 << 11), %eax
|
||||||
|
wrmsr
|
||||||
|
|
||||||
post_code(0x3b)
|
post_code(0x3b)
|
||||||
|
|
||||||
|
|
|
@ -18,14 +18,14 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <cpu/x86/car.h>
|
|
||||||
#include <cpu/x86/stack.h>
|
#include <cpu/x86/stack.h>
|
||||||
#include <cpu/x86/mtrr.h>
|
#include <cpu/x86/mtrr.h>
|
||||||
|
|
||||||
#define CACHE_AS_RAM_SIZE CONFIG_DCACHE_RAM_SIZE
|
#define CACHE_AS_RAM_SIZE CONFIG_DCACHE_RAM_SIZE
|
||||||
#define CACHE_AS_RAM_BASE CONFIG_DCACHE_RAM_BASE
|
#define CACHE_AS_RAM_BASE CONFIG_DCACHE_RAM_BASE
|
||||||
|
|
||||||
save_bist_result()
|
/* Save the BIST result. */
|
||||||
|
movl %eax, %ebp
|
||||||
|
|
||||||
cache_as_ram:
|
cache_as_ram:
|
||||||
post_code(0x20)
|
post_code(0x20)
|
||||||
|
@ -66,12 +66,19 @@ clear_mtrrs:
|
||||||
movl $0x0000000f, %edx
|
movl $0x0000000f, %edx
|
||||||
wrmsr
|
wrmsr
|
||||||
|
|
||||||
enable_mtrr()
|
/* Enable MTRR. */
|
||||||
|
movl $MTRRdefType_MSR, %ecx
|
||||||
|
rdmsr
|
||||||
|
orl $(1 << 11), %eax
|
||||||
|
wrmsr
|
||||||
|
|
||||||
enable_l2_cache()
|
/* Enable L2 cache. */
|
||||||
|
movl $0x11e, %ecx
|
||||||
|
rdmsr
|
||||||
|
orl $(1 << 8), %eax
|
||||||
|
wrmsr
|
||||||
|
|
||||||
/* Enable cache (CR0.CD = 0, CR0.NW = 0). */
|
/* Enable cache (CR0.CD = 0, CR0.NW = 0). */
|
||||||
/* TODO: enable_cache()? But that doesn't have "invd". */
|
|
||||||
movl %cr0, %eax
|
movl %cr0, %eax
|
||||||
andl $(~((1 << 30) | (1 << 29))), %eax
|
andl $(~((1 << 30) | (1 << 29))), %eax
|
||||||
invd
|
invd
|
||||||
|
@ -86,7 +93,9 @@ clear_mtrrs:
|
||||||
rep stosl
|
rep stosl
|
||||||
|
|
||||||
/* Enable Cache-as-RAM mode by disabling cache. */
|
/* Enable Cache-as-RAM mode by disabling cache. */
|
||||||
disable_cache()
|
movl %cr0, %eax
|
||||||
|
orl $(1 << 30), %eax
|
||||||
|
movl %eax, %cr0
|
||||||
|
|
||||||
#if defined(CONFIG_XIP_ROM_SIZE) && defined(CONFIG_XIP_ROM_BASE)
|
#if defined(CONFIG_XIP_ROM_SIZE) && defined(CONFIG_XIP_ROM_BASE)
|
||||||
/* Enable cache for our code in Flash because we do XIP here */
|
/* Enable cache for our code in Flash because we do XIP here */
|
||||||
|
@ -112,7 +121,10 @@ clear_mtrrs:
|
||||||
wrmsr
|
wrmsr
|
||||||
#endif /* CONFIG_XIP_ROM_SIZE && CONFIG_XIP_ROM_BASE */
|
#endif /* CONFIG_XIP_ROM_SIZE && CONFIG_XIP_ROM_BASE */
|
||||||
|
|
||||||
enable_cache()
|
/* Enable cache. */
|
||||||
|
movl %cr0, %eax
|
||||||
|
andl $(~((1 << 30) | (1 << 29))), %eax
|
||||||
|
movl %eax, %cr0
|
||||||
|
|
||||||
/* Set up the stack pointer. */
|
/* Set up the stack pointer. */
|
||||||
#if defined(CONFIG_USBDEBUG) && (CONFIG_USBDEBUG == 1)
|
#if defined(CONFIG_USBDEBUG) && (CONFIG_USBDEBUG == 1)
|
||||||
|
@ -123,8 +135,8 @@ clear_mtrrs:
|
||||||
#endif
|
#endif
|
||||||
movl %eax, %esp
|
movl %eax, %esp
|
||||||
|
|
||||||
restore_bist_result()
|
/* Restore the BIST result. */
|
||||||
|
movl %ebp, %eax
|
||||||
movl %esp, %ebp
|
movl %esp, %ebp
|
||||||
pushl %eax
|
pushl %eax
|
||||||
|
|
||||||
|
@ -137,11 +149,18 @@ clear_mtrrs:
|
||||||
|
|
||||||
post_code(0x30)
|
post_code(0x30)
|
||||||
|
|
||||||
disable_cache()
|
/* Disable cache. */
|
||||||
|
movl %cr0, %eax
|
||||||
|
orl $(1 << 30), %eax
|
||||||
|
movl %eax, %cr0
|
||||||
|
|
||||||
post_code(0x31)
|
post_code(0x31)
|
||||||
|
|
||||||
disable_mtrr()
|
/* Disable MTRR. */
|
||||||
|
movl $MTRRdefType_MSR, %ecx
|
||||||
|
rdmsr
|
||||||
|
andl $(~(1 << 11)), %eax
|
||||||
|
wrmsr
|
||||||
|
|
||||||
post_code(0x31)
|
post_code(0x31)
|
||||||
|
|
||||||
|
@ -161,11 +180,17 @@ clear_mtrrs:
|
||||||
|
|
||||||
post_code(0x33)
|
post_code(0x33)
|
||||||
|
|
||||||
enable_cache()
|
/* Enable cache. */
|
||||||
|
movl %cr0, %eax
|
||||||
|
andl $~((1 << 30) | (1 << 29)), %eax
|
||||||
|
movl %eax, %cr0
|
||||||
|
|
||||||
post_code(0x36)
|
post_code(0x36)
|
||||||
|
|
||||||
disable_cache()
|
/* Disable cache. */
|
||||||
|
movl %cr0, %eax
|
||||||
|
orl $(1 << 30), %eax
|
||||||
|
movl %eax, %cr0
|
||||||
|
|
||||||
post_code(0x38)
|
post_code(0x38)
|
||||||
|
|
||||||
|
@ -182,11 +207,17 @@ clear_mtrrs:
|
||||||
post_code(0x39)
|
post_code(0x39)
|
||||||
|
|
||||||
/* And enable cache again after setting MTRRs. */
|
/* And enable cache again after setting MTRRs. */
|
||||||
enable_cache()
|
movl %cr0, %eax
|
||||||
|
andl $~((1 << 30) | (1 << 29)), %eax
|
||||||
|
movl %eax, %cr0
|
||||||
|
|
||||||
post_code(0x3a)
|
post_code(0x3a)
|
||||||
|
|
||||||
enable_mtrr()
|
/* Enable MTRR. */
|
||||||
|
movl $MTRRdefType_MSR, %ecx
|
||||||
|
rdmsr
|
||||||
|
orl $(1 << 11), %eax
|
||||||
|
wrmsr
|
||||||
|
|
||||||
post_code(0x3b)
|
post_code(0x3b)
|
||||||
|
|
||||||
|
|
|
@ -18,14 +18,14 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <cpu/x86/car.h>
|
|
||||||
#include <cpu/x86/stack.h>
|
#include <cpu/x86/stack.h>
|
||||||
#include <cpu/x86/mtrr.h>
|
#include <cpu/x86/mtrr.h>
|
||||||
|
|
||||||
#define CACHE_AS_RAM_SIZE CONFIG_DCACHE_RAM_SIZE
|
#define CACHE_AS_RAM_SIZE CONFIG_DCACHE_RAM_SIZE
|
||||||
#define CACHE_AS_RAM_BASE CONFIG_DCACHE_RAM_BASE
|
#define CACHE_AS_RAM_BASE CONFIG_DCACHE_RAM_BASE
|
||||||
|
|
||||||
save_bist_result()
|
/* Save the BIST result. */
|
||||||
|
movl %eax, %ebp
|
||||||
|
|
||||||
cache_as_ram:
|
cache_as_ram:
|
||||||
post_code(0x20)
|
post_code(0x20)
|
||||||
|
@ -73,12 +73,19 @@ clear_mtrrs:
|
||||||
movl $0x0000000f, %edx
|
movl $0x0000000f, %edx
|
||||||
wrmsr
|
wrmsr
|
||||||
|
|
||||||
enable_mtrr()
|
/* Enable MTRR. */
|
||||||
|
movl $MTRRdefType_MSR, %ecx
|
||||||
|
rdmsr
|
||||||
|
orl $(1 << 11), %eax
|
||||||
|
wrmsr
|
||||||
|
|
||||||
enable_l2_cache()
|
/* Enable L2 cache. */
|
||||||
|
movl $0x11e, %ecx
|
||||||
|
rdmsr
|
||||||
|
orl $(1 << 8), %eax
|
||||||
|
wrmsr
|
||||||
|
|
||||||
/* Enable cache (CR0.CD = 0, CR0.NW = 0). */
|
/* Enable cache (CR0.CD = 0, CR0.NW = 0). */
|
||||||
/* TODO: enable_cache()? But that doesn't have "invd". */
|
|
||||||
movl %cr0, %eax
|
movl %cr0, %eax
|
||||||
andl $(~((1 << 30) | (1 << 29))), %eax
|
andl $(~((1 << 30) | (1 << 29))), %eax
|
||||||
invd
|
invd
|
||||||
|
@ -93,7 +100,9 @@ clear_mtrrs:
|
||||||
rep stosl
|
rep stosl
|
||||||
|
|
||||||
/* Enable Cache-as-RAM mode by disabling cache. */
|
/* Enable Cache-as-RAM mode by disabling cache. */
|
||||||
disable_cache()
|
movl %cr0, %eax
|
||||||
|
orl $(1 << 30), %eax
|
||||||
|
movl %eax, %cr0
|
||||||
|
|
||||||
#if defined(CONFIG_XIP_ROM_SIZE) && defined(CONFIG_XIP_ROM_BASE)
|
#if defined(CONFIG_XIP_ROM_SIZE) && defined(CONFIG_XIP_ROM_BASE)
|
||||||
/* Enable cache for our code in Flash because we do XIP here */
|
/* Enable cache for our code in Flash because we do XIP here */
|
||||||
|
@ -119,7 +128,10 @@ clear_mtrrs:
|
||||||
wrmsr
|
wrmsr
|
||||||
#endif /* CONFIG_XIP_ROM_SIZE && CONFIG_XIP_ROM_BASE */
|
#endif /* CONFIG_XIP_ROM_SIZE && CONFIG_XIP_ROM_BASE */
|
||||||
|
|
||||||
enable_cache()
|
/* Enable cache. */
|
||||||
|
movl %cr0, %eax
|
||||||
|
andl $(~((1 << 30) | (1 << 29))), %eax
|
||||||
|
movl %eax, %cr0
|
||||||
|
|
||||||
/* Set up the stack pointer. */
|
/* Set up the stack pointer. */
|
||||||
#if defined(CONFIG_USBDEBUG) && (CONFIG_USBDEBUG == 1)
|
#if defined(CONFIG_USBDEBUG) && (CONFIG_USBDEBUG == 1)
|
||||||
|
@ -130,8 +142,8 @@ clear_mtrrs:
|
||||||
#endif
|
#endif
|
||||||
movl %eax, %esp
|
movl %eax, %esp
|
||||||
|
|
||||||
restore_bist_result()
|
/* Restore the BIST result. */
|
||||||
|
movl %ebp, %eax
|
||||||
movl %esp, %ebp
|
movl %esp, %ebp
|
||||||
pushl %eax
|
pushl %eax
|
||||||
|
|
||||||
|
@ -144,11 +156,18 @@ clear_mtrrs:
|
||||||
|
|
||||||
post_code(0x30)
|
post_code(0x30)
|
||||||
|
|
||||||
disable_cache()
|
/* Disable cache. */
|
||||||
|
movl %cr0, %eax
|
||||||
|
orl $(1 << 30), %eax
|
||||||
|
movl %eax, %cr0
|
||||||
|
|
||||||
post_code(0x31)
|
post_code(0x31)
|
||||||
|
|
||||||
disable_mtrr()
|
/* Disable MTRR. */
|
||||||
|
movl $MTRRdefType_MSR, %ecx
|
||||||
|
rdmsr
|
||||||
|
andl $(~(1 << 11)), %eax
|
||||||
|
wrmsr
|
||||||
|
|
||||||
post_code(0x31)
|
post_code(0x31)
|
||||||
|
|
||||||
|
@ -168,11 +187,17 @@ clear_mtrrs:
|
||||||
|
|
||||||
post_code(0x33)
|
post_code(0x33)
|
||||||
|
|
||||||
enable_cache()
|
/* Enable cache. */
|
||||||
|
movl %cr0, %eax
|
||||||
|
andl $~((1 << 30) | (1 << 29)), %eax
|
||||||
|
movl %eax, %cr0
|
||||||
|
|
||||||
post_code(0x36)
|
post_code(0x36)
|
||||||
|
|
||||||
disable_cache()
|
/* Disable cache. */
|
||||||
|
movl %cr0, %eax
|
||||||
|
orl $(1 << 30), %eax
|
||||||
|
movl %eax, %cr0
|
||||||
|
|
||||||
post_code(0x38)
|
post_code(0x38)
|
||||||
|
|
||||||
|
@ -189,11 +214,17 @@ clear_mtrrs:
|
||||||
post_code(0x39)
|
post_code(0x39)
|
||||||
|
|
||||||
/* And enable cache again after setting MTRRs. */
|
/* And enable cache again after setting MTRRs. */
|
||||||
enable_cache()
|
movl %cr0, %eax
|
||||||
|
andl $~((1 << 30) | (1 << 29)), %eax
|
||||||
|
movl %eax, %cr0
|
||||||
|
|
||||||
post_code(0x3a)
|
post_code(0x3a)
|
||||||
|
|
||||||
enable_mtrr()
|
/* Enable MTRR. */
|
||||||
|
movl $MTRRdefType_MSR, %ecx
|
||||||
|
rdmsr
|
||||||
|
orl $(1 << 11), %eax
|
||||||
|
wrmsr
|
||||||
|
|
||||||
post_code(0x3b)
|
post_code(0x3b)
|
||||||
|
|
||||||
|
|
|
@ -25,18 +25,21 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <cpu/x86/car.h>
|
|
||||||
#include <cpu/x86/stack.h>
|
#include <cpu/x86/stack.h>
|
||||||
#include <cpu/x86/mtrr.h>
|
#include <cpu/x86/mtrr.h>
|
||||||
|
|
||||||
#define CacheSize CONFIG_DCACHE_RAM_SIZE
|
#define CacheSize CONFIG_DCACHE_RAM_SIZE
|
||||||
#define CacheBase CONFIG_DCACHE_RAM_BASE
|
#define CacheBase CONFIG_DCACHE_RAM_BASE
|
||||||
|
|
||||||
save_bist_result()
|
/* Save the BIST result. */
|
||||||
|
movl %eax, %ebp
|
||||||
|
|
||||||
CacheAsRam:
|
CacheAsRam:
|
||||||
|
|
||||||
disable_cache()
|
/* Disable cache. */
|
||||||
|
movl %cr0, %eax
|
||||||
|
orl $(1 << 30), %eax
|
||||||
|
movl %eax, %cr0
|
||||||
invd
|
invd
|
||||||
|
|
||||||
/* Set the default memory type and enable fixed and variable MTRRs. */
|
/* Set the default memory type and enable fixed and variable MTRRs. */
|
||||||
|
@ -139,7 +142,10 @@ clear_fixed_var_mtrr_out:
|
||||||
movl $(MTRRdefTypeEn), %eax
|
movl $(MTRRdefTypeEn), %eax
|
||||||
wrmsr
|
wrmsr
|
||||||
|
|
||||||
enable_cache()
|
/* Enable cache. */
|
||||||
|
movl %cr0, %eax
|
||||||
|
andl $(~((1 << 30) | (1 << 29))), %eax
|
||||||
|
movl %eax, %cr0
|
||||||
|
|
||||||
/* Read the range with lodsl. */
|
/* Read the range with lodsl. */
|
||||||
cld
|
cld
|
||||||
|
@ -195,7 +201,8 @@ testok:
|
||||||
jne stackerr
|
jne stackerr
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
restore_bist_result()
|
/* Restore the BIST result. */
|
||||||
|
movl %ebp, %eax
|
||||||
|
|
||||||
/* We need to set EBP? No need. */
|
/* We need to set EBP? No need. */
|
||||||
movl %esp, %ebp
|
movl %esp, %ebp
|
||||||
|
@ -210,7 +217,10 @@ testok:
|
||||||
|
|
||||||
/* We don't need CAR from now on. */
|
/* We don't need CAR from now on. */
|
||||||
|
|
||||||
disable_cache()
|
/* Disable cache. */
|
||||||
|
movl %cr0, %eax
|
||||||
|
orl $(1 << 30), %eax
|
||||||
|
movl %eax, %cr0
|
||||||
|
|
||||||
/* Set the default memory type and enable variable MTRRs. */
|
/* Set the default memory type and enable variable MTRRs. */
|
||||||
/* TODO: Or also enable fixed MTRRs? Bug in the code? */
|
/* TODO: Or also enable fixed MTRRs? Bug in the code? */
|
||||||
|
@ -242,7 +252,10 @@ testok:
|
||||||
movl $(~(CONFIG_XIP_ROM_SIZE - 1) | MTRRphysMaskValid), %eax
|
movl $(~(CONFIG_XIP_ROM_SIZE - 1) | MTRRphysMaskValid), %eax
|
||||||
wrmsr
|
wrmsr
|
||||||
|
|
||||||
enable_cache()
|
/* Enable cache. */
|
||||||
|
movl %cr0, %eax
|
||||||
|
andl $(~((1 << 30) | (1 << 29))), %eax
|
||||||
|
movl %eax, %cr0
|
||||||
invd
|
invd
|
||||||
|
|
||||||
/* Clear boot_complete flag. */
|
/* Clear boot_complete flag. */
|
||||||
|
|
|
@ -1,75 +0,0 @@
|
||||||
/*
|
|
||||||
* This file is part of the coreboot project.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2000,2007 Ronald G. Minnich <rminnich@gmail.com>
|
|
||||||
* Copyright (C) 2007-2008 coresystems GmbH
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation; version 2 of the License.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <cpu/x86/mtrr.h>
|
|
||||||
|
|
||||||
/* Save the BIST result. */
|
|
||||||
#define save_bist_result() \
|
|
||||||
movl %eax, %ebp
|
|
||||||
|
|
||||||
/* Restore the BIST result. */
|
|
||||||
#define restore_bist_result() \
|
|
||||||
movl %ebp, %eax
|
|
||||||
|
|
||||||
/* Enable cache. */
|
|
||||||
#define enable_cache() \
|
|
||||||
movl %cr0, %eax; \
|
|
||||||
andl $(~((1 << 30) | (1 << 29))), %eax; \
|
|
||||||
movl %eax, %cr0
|
|
||||||
|
|
||||||
/* Disable cache. */
|
|
||||||
#define disable_cache() \
|
|
||||||
movl %cr0, %eax; \
|
|
||||||
orl $(1 << 30), %eax; \
|
|
||||||
movl %eax, %cr0
|
|
||||||
|
|
||||||
/* Enable MTRR. */
|
|
||||||
#define enable_mtrr() \
|
|
||||||
movl $MTRRdefType_MSR, %ecx; \
|
|
||||||
rdmsr; \
|
|
||||||
orl $(1 << 11), %eax; \
|
|
||||||
wrmsr
|
|
||||||
|
|
||||||
/* Disable MTRR. */
|
|
||||||
#define disable_mtrr() \
|
|
||||||
movl $MTRRdefType_MSR, %ecx; \
|
|
||||||
rdmsr; \
|
|
||||||
andl $(~(1 << 11)), %eax; \
|
|
||||||
wrmsr
|
|
||||||
|
|
||||||
/* Enable L2 cache. */
|
|
||||||
#define enable_l2_cache() \
|
|
||||||
movl $0x11e, %ecx; \
|
|
||||||
rdmsr; \
|
|
||||||
orl $(1 << 8), %eax; \
|
|
||||||
wrmsr
|
|
||||||
|
|
||||||
/* Enable SSE. */
|
|
||||||
#define enable_sse() \
|
|
||||||
movl %cr4, %eax; \
|
|
||||||
orl $(3 << 9), %eax; \
|
|
||||||
movl %eax, %cr4
|
|
||||||
|
|
||||||
/* Disable SSE. */
|
|
||||||
#define disable_sse() \
|
|
||||||
movl %cr4, %eax; \
|
|
||||||
andl $~(3 << 9), %eax; \
|
|
||||||
movl %eax, %cr4
|
|
||||||
|
|
Loading…
Reference in New Issue