GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove MRC variables from 2065x CAR init. 

2065x boards don't use MRC. And the space in question isn't used either.

Read number of variable range MTRRs from MSR rather than hardcoding it.

2ff is still zeroed out as unless you zero-out undocumented bits as well
boot fails.

Tested on Lenovo X201.

Change-Id: Ic574193094e7d27c2d6a4d7d3e387d989578532e
Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
Reviewed-on: http://review.coreboot.org/4080
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Tested-by: build bot (Jenkins)
This commit is contained in:
Vladimir Serbinenko 2013-11-14 18:49:26 +01:00
parent 533ad10583
commit 75b90a1f50
1 changed files with 22 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/cpu/intel/model_2065x/cache_as_ram.inc
View File

@ -27,11 +27,6 @@
#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
/* Cache 4GB - MRC_SIZE_KB for MRC */
#define CACHE_MRC_BYTES ((CONFIG_CACHE_MRC_SIZE_KB << 10) - 1)
#define CACHE_MRC_BASE (0xFFFFFFFF - CACHE_MRC_BYTES)
#define CACHE_MRC_MASK (~CACHE_MRC_BYTES)
#define CPU_PHYSMASK_HI (1 << (CONFIG_CPU_ADDR_BITS - 32) - 1) #define CPU_PHYSMASK_HI (1 << (CONFIG_CPU_ADDR_BITS - 32) - 1)
#define NoEvictMod_MSR 0x2e0 #define NoEvictMod_MSR 0x2e0
@ -54,7 +49,14 @@ wait_for_sipi:
jc wait_for_sipi jc wait_for_sipi
post_code(0x21) post_code(0x21)
/* Zero out all fixed range and variable range MTRRs. */ /* Clean-up MTRRdefType_MSR. */
movl $MTRRdefType_MSR, %ecx
xorl %eax, %eax
xorl %edx, %edx
wrmsr
post_code(0x22)
/* Zero out all fixed range MTRRs. */
movl $mtrr_table, %esi movl $mtrr_table, %esi
movl $((mtrr_table_end - mtrr_table) / 2), %edi movl $((mtrr_table_end - mtrr_table) / 2), %edi
xorl %eax, %eax xorl %eax, %eax
@ -67,12 +69,20 @@ clear_mtrrs:
dec %edi dec %edi
jnz clear_mtrrs jnz clear_mtrrs
post_code(0x22) /* Zero out all variable range MTRRs. */
/* Configure the default memory type to uncacheable. */ movl $MTRRcap_MSR, %ecx
movl $MTRRdefType_MSR, %ecx
rdmsr rdmsr
andl $(~0x00000cff), %eax andl $0xff, %eax
shl $1, %eax
movl %eax, %edi
movl $0x200, %ecx
xorl %eax, %eax
xorl %edx, %edx
clear_var_mtrrs:
wrmsr wrmsr
add $1, %ecx
dec %edi
jnz clear_var_mtrrs
post_code(0x23) post_code(0x23)
/* Set Cache-as-RAM base address. */ /* Set Cache-as-RAM base address. */
@ -147,17 +157,6 @@ clear_mtrrs:
wrmsr wrmsr
post_code(0x27) post_code(0x27)
#if CONFIG_CACHE_MRC_BIN
/* Enable caching for ram init code to run faster */
movl $MTRRphysBase_MSR(2), %ecx
movl $(CACHE_MRC_BASE | MTRR_TYPE_WRPROT), %eax
xorl %edx, %edx
wrmsr
movl $MTRRphysMask_MSR(2), %ecx
movl $(CACHE_MRC_MASK | MTRRphysMaskValid), %eax
movl $CPU_PHYSMASK_HI, %edx
wrmsr
#endif
post_code(0x28) post_code(0x28)
/* Enable cache. */ /* Enable cache. */
@ -165,9 +164,8 @@ clear_mtrrs:
andl $(~(CR0_CacheDisable | CR0_NoWriteThrough)), %eax andl $(~(CR0_CacheDisable | CR0_NoWriteThrough)), %eax
movl %eax, %cr0 movl %eax, %cr0
/* Set up the stack pointer below MRC variable space. */ /* Set up the stack pointer below the end of CAR. */
movl $(CACHE_AS_RAM_SIZE + CACHE_AS_RAM_BASE - \ movl $(CACHE_AS_RAM_SIZE + CACHE_AS_RAM_BASE - 4), %eax
CONFIG_DCACHE_RAM_MRC_VAR_SIZE - 4 - 4096), %eax
movl %eax, %esp movl %eax, %esp
/* Restore the BIST result. */ /* Restore the BIST result. */
@ -212,16 +210,6 @@ before_romstage:
andl $~1, %eax andl $~1, %eax
wrmsr wrmsr
#if CONFIG_CACHE_MRC_BIN
/* Clear MTRR that was used to cache MRC */
xorl %eax, %eax
xorl %edx, %edx
movl $MTRRphysBase_MSR(2), %ecx
wrmsr
movl $MTRRphysMask_MSR(2), %ecx
wrmsr
#endif
post_code(0x33) post_code(0x33)
/* Enable cache. */ /* Enable cache. */
@ -321,18 +309,10 @@ __main:
jmp .Lhlt jmp .Lhlt
mtrr_table: mtrr_table:
.word 0x02FF
/* Fixed MTRRs */ /* Fixed MTRRs */
.word 0x250, 0x258, 0x259 .word 0x250, 0x258, 0x259
.word 0x268, 0x269, 0x26A .word 0x268, 0x269, 0x26A
.word 0x26B, 0x26C, 0x26D .word 0x26B, 0x26C, 0x26D
.word 0x26E, 0x26F .word 0x26E, 0x26F
/* Variable MTRRs */
.word 0x200, 0x201, 0x202, 0x203
.word 0x204, 0x205, 0x206, 0x207
.word 0x208, 0x209, 0x20A, 0x20B
.word 0x20C, 0x20D, 0x20E, 0x20F
mtrr_table_end: mtrr_table_end: