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

intel car: Unify postcodes 

Not all are matched, but this makes it easier to backport
MTRR changes from haswell.

Change-Id: Ida5943b1469fc0089a31ff3b18131fb82b0941c6
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/15760
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Kyösti Mälkki 2016-07-20 13:29:59 +03:00
parent eb61ea84f7
commit 8a2f167e7b
5 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/cpu/intel/car/cache_as_ram_ht.inc
View File

@ -237,14 +237,14 @@ sipi_complete:
movl $(~(CACHE_AS_RAM_SIZE - 1) | MTRR_PHYS_MASK_VALID), %eax movl $(~(CACHE_AS_RAM_SIZE - 1) | MTRR_PHYS_MASK_VALID), %eax
wrmsr wrmsr
post_code(0x2b)
/* Enable MTRR. */ /* Enable MTRR. */
movl $MTRR_DEF_TYPE_MSR, %ecx movl $MTRR_DEF_TYPE_MSR, %ecx
rdmsr rdmsr
orl $MTRR_DEF_TYPE_EN, %eax orl $MTRR_DEF_TYPE_EN, %eax
wrmsr wrmsr
post_code(0x2b)
/* Enable L2 cache Write-Back (WBINVD and FLUSH#). /* Enable L2 cache Write-Back (WBINVD and FLUSH#).
* *
* MSR is set when DisplayFamily_DisplayModel is one of: * MSR is set when DisplayFamily_DisplayModel is one of:
@ -295,13 +295,12 @@ no_msr_11e:
movl $(CACHE_AS_RAM_SIZE >> 2), %ecx movl $(CACHE_AS_RAM_SIZE >> 2), %ecx
rep stosl rep stosl
post_code(0x2d)
/* Enable Cache-as-RAM mode by disabling cache. */ /* Enable Cache-as-RAM mode by disabling cache. */
movl %cr0, %eax movl %cr0, %eax
orl $CR0_CacheDisable, %eax orl $CR0_CacheDisable, %eax
movl %eax, %cr0 movl %eax, %cr0
post_code(0x2d)
/* Enable cache for our code in Flash because we do XIP here */ /* Enable cache for our code in Flash because we do XIP here */
movl $MTRR_PHYS_BASE(1), %ecx movl $MTRR_PHYS_BASE(1), %ecx
xorl %edx, %edx xorl %edx, %edx
@ -319,13 +318,12 @@ no_msr_11e:
movl $(~(CONFIG_XIP_ROM_SIZE - 1) | MTRR_PHYS_MASK_VALID), %eax movl $(~(CONFIG_XIP_ROM_SIZE - 1) | MTRR_PHYS_MASK_VALID), %eax
wrmsr wrmsr
post_code(0x2e)
/* Enable cache. */ /* Enable cache. */
movl %cr0, %eax movl %cr0, %eax
andl $(~(CR0_CacheDisable | CR0_NoWriteThrough)), %eax andl $(~(CR0_CacheDisable | CR0_NoWriteThrough)), %eax
movl %eax, %cr0 movl %eax, %cr0
post_code(0x2e)
/* Set up the stack pointer. */ /* Set up the stack pointer. */
movl $(CACHE_AS_RAM_BASE + CACHE_AS_RAM_SIZE - 4), %esp movl $(CACHE_AS_RAM_BASE + CACHE_AS_RAM_SIZE - 4), %esp
@ -334,8 +332,8 @@ no_msr_11e:
movl %esp, %ebp movl %esp, %ebp
pushl %eax pushl %eax
before_romstage:
post_code(0x2f) post_code(0x2f)
/* Call romstage.c main function. */ /* Call romstage.c main function. */
call romstage_main call romstage_main
@ -351,7 +349,7 @@ no_msr_11e:
orl $CR0_CacheDisable, %eax orl $CR0_CacheDisable, %eax
movl %eax, %cr0 movl %eax, %cr0
post_code(0x34) post_code(0x31)
/* Disable MTRR. */ /* Disable MTRR. */
movl $MTRR_DEF_TYPE_MSR, %ecx movl $MTRR_DEF_TYPE_MSR, %ecx
@ -359,18 +357,18 @@ no_msr_11e:
andl $(~MTRR_DEF_TYPE_EN), %eax andl $(~MTRR_DEF_TYPE_EN), %eax
wrmsr wrmsr
post_code(0x35) post_code(0x32)
invd invd
post_code(0x36) post_code(0x33)
/* Enable cache. */ /* Enable cache. */
movl %cr0, %eax movl %cr0, %eax
andl $~(CR0_CacheDisable | CR0_NoWriteThrough), %eax andl $~(CR0_CacheDisable | CR0_NoWriteThrough), %eax
movl %eax, %cr0 movl %eax, %cr0
post_code(0x37) post_code(0x36)
/* Disable cache. */ /* Disable cache. */
movl %cr0, %eax movl %cr0, %eax

4
src/cpu/intel/haswell/cache_as_ram.inc
View File

@ -179,8 +179,6 @@ before_romstage:
* for setting up MTRRs. */ * for setting up MTRRs. */
movl %eax, %ebx movl %eax, %ebx
post_code(0x2f)
post_code(0x30) post_code(0x30)
/* Disable cache. */ /* Disable cache. */
@ -196,7 +194,7 @@ before_romstage:
andl $(~MTRR_DEF_TYPE_EN), %eax andl $(~MTRR_DEF_TYPE_EN), %eax
wrmsr wrmsr
post_code(0x31) post_code(0x32)
/* Disable the no eviction run state */ /* Disable the no eviction run state */
movl $NoEvictMod_MSR, %ecx movl $NoEvictMod_MSR, %ecx

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

@ -150,8 +150,6 @@ clear_var_mtrrs:
movl $(~(CONFIG_XIP_ROM_SIZE - 1) | MTRR_PHYS_MASK_VALID), %eax movl $(~(CONFIG_XIP_ROM_SIZE - 1) | MTRR_PHYS_MASK_VALID), %eax
wrmsr wrmsr
post_code(0x27)
post_code(0x28) post_code(0x28)
/* Enable cache. */ /* Enable cache. */
movl %cr0, %eax movl %cr0, %eax
@ -177,8 +175,6 @@ before_romstage:
*/ */
movl %eax, %ebx movl %eax, %ebx
post_code(0x2f)
post_code(0x30) post_code(0x30)
/* Disable cache. */ /* Disable cache. */
@ -194,7 +190,7 @@ before_romstage:
andl $(~MTRR_DEF_TYPE_EN), %eax andl $(~MTRR_DEF_TYPE_EN), %eax
wrmsr wrmsr
post_code(0x31) post_code(0x32)
/* Disable the no eviction run state */ /* Disable the no eviction run state */
movl $NoEvictMod_MSR, %ecx movl $NoEvictMod_MSR, %ecx

4
src/cpu/intel/model_206ax/cache_as_ram.inc
View File

@ -179,8 +179,6 @@ before_romstage:
*/ */
movl %eax, %ebx movl %eax, %ebx
post_code(0x2f)
post_code(0x30) post_code(0x30)
/* Disable cache. */ /* Disable cache. */
@ -196,7 +194,7 @@ before_romstage:
andl $(~MTRR_DEF_TYPE_EN), %eax andl $(~MTRR_DEF_TYPE_EN), %eax
wrmsr wrmsr
post_code(0x31) post_code(0x32)
/* Disable the no eviction run state */ /* Disable the no eviction run state */
movl $NoEvictMod_MSR, %ecx movl $NoEvictMod_MSR, %ecx

15
src/cpu/intel/model_6ex/cache_as_ram.inc
View File

@ -47,24 +47,29 @@ clear_mtrrs:
dec %edi dec %edi
jnz clear_mtrrs jnz clear_mtrrs
post_code(0x22)
/* Configure the default memory type to uncacheable. */ /* Configure the default memory type to uncacheable. */
movl $MTRR_DEF_TYPE_MSR, %ecx movl $MTRR_DEF_TYPE_MSR, %ecx
rdmsr rdmsr
andl $(~0x00000cff), %eax andl $(~0x00000cff), %eax
wrmsr wrmsr
post_code(0x23)
/* Set Cache-as-RAM base address. */ /* Set Cache-as-RAM base address. */
movl $(MTRR_PHYS_BASE(0)), %ecx movl $(MTRR_PHYS_BASE(0)), %ecx
movl $(CACHE_AS_RAM_BASE | MTRR_TYPE_WRBACK), %eax movl $(CACHE_AS_RAM_BASE | MTRR_TYPE_WRBACK), %eax
xorl %edx, %edx xorl %edx, %edx
wrmsr wrmsr
post_code(0x24)
/* Set Cache-as-RAM mask. */ /* Set Cache-as-RAM mask. */
movl $(MTRR_PHYS_MASK(0)), %ecx movl $(MTRR_PHYS_MASK(0)), %ecx
movl $(~(CACHE_AS_RAM_SIZE - 1) | MTRR_PHYS_MASK_VALID), %eax movl $(~(CACHE_AS_RAM_SIZE - 1) | MTRR_PHYS_MASK_VALID), %eax
movl $CPU_PHYSMASK_HI, %edx movl $CPU_PHYSMASK_HI, %edx
wrmsr wrmsr
post_code(0x25)
/* Enable MTRR. */ /* Enable MTRR. */
movl $MTRR_DEF_TYPE_MSR, %ecx movl $MTRR_DEF_TYPE_MSR, %ecx
rdmsr rdmsr
@ -91,6 +96,7 @@ clear_mtrrs:
xorl %eax, %eax xorl %eax, %eax
rep stosl rep stosl
post_code(0x26)
/* Enable Cache-as-RAM mode by disabling cache. */ /* Enable Cache-as-RAM mode by disabling cache. */
movl %cr0, %eax movl %cr0, %eax
orl $CR0_CacheDisable, %eax orl $CR0_CacheDisable, %eax
@ -113,6 +119,7 @@ clear_mtrrs:
movl $(~(CONFIG_XIP_ROM_SIZE - 1) | MTRR_PHYS_MASK_VALID), %eax movl $(~(CONFIG_XIP_ROM_SIZE - 1) | MTRR_PHYS_MASK_VALID), %eax
wrmsr wrmsr
post_code(0x28)
/* Enable cache. */ /* Enable cache. */
movl %cr0, %eax movl %cr0, %eax
andl $(~(CR0_CacheDisable | CR0_NoWriteThrough)), %eax andl $(~(CR0_CacheDisable | CR0_NoWriteThrough)), %eax
@ -127,8 +134,8 @@ clear_mtrrs:
movl %esp, %ebp movl %esp, %ebp
pushl %eax pushl %eax
post_code(0x23) before_romstage:
post_code(0x29)
/* Call romstage.c main function. */ /* Call romstage.c main function. */
call romstage_main call romstage_main
@ -137,8 +144,6 @@ clear_mtrrs:
*/ */
movl %eax, %ebx movl %eax, %ebx
post_code(0x2f)
post_code(0x30) post_code(0x30)
/* Disable cache. */ /* Disable cache. */
@ -154,7 +159,7 @@ clear_mtrrs:
andl $(~MTRR_DEF_TYPE_EN), %eax andl $(~MTRR_DEF_TYPE_EN), %eax
wrmsr wrmsr
post_code(0x31) post_code(0x32)
invd invd