Patrick Georgi submitted this change.

View Change

Approvals: build bot (Jenkins): Verified Arthur Heymans: Looks good to me, approved
cpu/intel/car/core2/cache_as_ram: Add x86_64 support

Tested on Lenovo T500 with additional patches.

Change-Id: I27cdec5f112588b219f51112279b2dfbb05b6c97
Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/45823
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
---
M src/cpu/intel/car/cache_as_ram_symbols.inc
M src/cpu/intel/car/core2/cache_as_ram.S
2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/cpu/intel/car/cache_as_ram_symbols.inc b/src/cpu/intel/car/cache_as_ram_symbols.inc
index 2d2f4bd..0e5fdc3 100644
--- a/src/cpu/intel/car/cache_as_ram_symbols.inc
+++ b/src/cpu/intel/car/cache_as_ram_symbols.inc
@@ -16,6 +16,9 @@
car_mtrr_mask:
.uintptr_t _car_mtrr_mask

+car_mtrr_size:
+.uintptr_t _car_mtrr_size
+
car_mtrr_start:
.uintptr_t _car_mtrr_start

diff --git a/src/cpu/intel/car/core2/cache_as_ram.S b/src/cpu/intel/car/core2/cache_as_ram.S
index 2c67207..f47ba5f 100644
--- a/src/cpu/intel/car/core2/cache_as_ram.S
+++ b/src/cpu/intel/car/core2/cache_as_ram.S
@@ -7,6 +7,8 @@
.section .init
.global bootblock_pre_c_entry

+#include <cpu/intel/car/cache_as_ram_symbols.inc>
+
.code32
_cache_as_ram_setup:

@@ -92,7 +94,7 @@
/* Set Cache-as-RAM mask. */
movl $(MTRR_PHYS_MASK(0)), %ecx
rdmsr
- movl $_car_mtrr_mask, %eax
+ movl car_mtrr_mask, %eax
orl $MTRR_PHYS_MASK_VALID, %eax
wrmsr

@@ -119,8 +121,8 @@
/* Clear the cache memory region. This will also fill up the cache. */
cld
xorl %eax, %eax
- movl $_car_mtrr_start, %edi
- movl $_car_mtrr_size, %ecx
+ movl car_mtrr_start, %edi
+ movl car_mtrr_size, %ecx
shr $2, %ecx
rep stosl

@@ -134,12 +136,12 @@
movl $MTRR_PHYS_BASE(1), %ecx
xorl %edx, %edx
movl $_program, %eax
- andl $_xip_mtrr_mask, %eax
+ andl xip_mtrr_mask, %eax
orl $MTRR_TYPE_WRPROT, %eax
wrmsr
movl $MTRR_PHYS_MASK(1), %ecx
rdmsr
- movl $_xip_mtrr_mask, %eax
+ movl xip_mtrr_mask, %eax
orl $MTRR_PHYS_MASK_VALID, %eax
wrmsr

@@ -157,6 +159,16 @@
andl $0xfffffff0, %esp
subl $4, %esp

+#if ENV_X86_64
+
+ #include <cpu/x86/64bit/entry64.inc>
+
+ movd %mm2, %rdi
+ shlq $32, %rdi
+ movd %mm1, %rsi
+ or %rsi, %rdi
+ movd %mm0, %rsi
+#else
/* push TSC and BIST to stack */
movd %mm0, %eax
pushl %eax /* BIST */
@@ -164,6 +176,7 @@
pushl %eax /* tsc[63:32] */
movd %mm1, %eax
pushl %eax /* tsc[31:0] */
+#endif

before_c_entry:
post_code(0x29)

To view, visit change 45823. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I27cdec5f112588b219f51112279b2dfbb05b6c97
Gerrit-Change-Number: 45823
Gerrit-PatchSet: 4
Gerrit-Owner: Patrick Rudolph <patrick.rudolph@9elements.com>
Gerrit-Reviewer: Angel Pons <th3fanbus@gmail.com>
Gerrit-Reviewer: Arthur Heymans <arthur@aheymans.xyz>
Gerrit-Reviewer: Martin Roth <martinroth@google.com>
Gerrit-Reviewer: Patrick Georgi <pgeorgi@google.com>
Gerrit-Reviewer: Patrick Rudolph <siro@das-labor.org>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-MessageType: merged