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

cpu/x86/sipi_vector: use macros for CR0 flags 

Use the existing macros for CR0 to set the flags in the
SIPI vector code.

Change-Id: Iad231b7611b613512fd000a7013175e91542ac10
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://review.coreboot.org/20243
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Rudolph <siro@das-labor.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
This commit is contained in:
Aaron Durbin 2017-06-16 14:20:10 -05:00
parent 9e01a0be89
commit 154d209ac3
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/cpu/x86/sipi_vector.S
View File

@ -14,6 +14,8 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#include <cpu/x86/cr.h>
/* The SIPI vector is responsible for initializing the APs in the sytem. It /* The SIPI vector is responsible for initializing the APs in the sytem. It
* loads microcode, sets up MSRs, and enables caching before calling into * loads microcode, sets up MSRs, and enables caching before calling into
* C code. */ * C code. */
@ -50,6 +52,11 @@ c_handler:
ap_count: ap_count:
.long 0 .long 0
#define CR0_CLEAR_FLAGS_CACHE_ENABLE (CR0_CD | CR0_NW)
#define CR0_SET_FLAGS (CR0_CLEAR_FLAGS_CACHE_ENABLE | CR0_PE)
#define CR0_CLEAR_FLAGS \
(CR0_PG | CR0_AM | CR0_WP | CR0_NE | CR0_TS | CR0_EM | CR0_MP)
.text .text
.code16 .code16
.global _start .global _start
@ -75,8 +82,8 @@ _start:
data32 lgdt (%ebx) data32 lgdt (%ebx)
movl %cr0, %eax movl %cr0, %eax
andl $0x7FFAFFD1, %eax /* PG,AM,WP,NE,TS,EM,MP = 0 */ andl $~CR0_CLEAR_FLAGS, %eax
orl $0x60000001, %eax /* CD, NW, PE = 1 */ orl $CR0_SET_FLAGS, %eax
movl %eax, %cr0 movl %eax, %cr0
ljmpl $CODE_SEG, $1f ljmpl $CODE_SEG, $1f
@ -175,7 +182,7 @@ load_msr:
1: 1:
/* Enable caching. */ /* Enable caching. */
mov %cr0, %eax mov %cr0, %eax
and $0x9fffffff, %eax /* CD, NW = 0 */ and $~(CR0_CLEAR_FLAGS_CACHE_ENABLE), %eax
mov %eax, %cr0 mov %eax, %cr0
/* c_handler(cpu_num) */ /* c_handler(cpu_num) */