Emulation/switch-coreboot
1
0
Fork 0
mirror of https://github.com/fail0verflow/switch-coreboot.git synced 2025-05-04 01:39:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

UPSTREAM: soc/intel/skylake: Do cache as ram and prepare for C entry

Browse source 
Enable cache-as-ram and prepare for c entry in bootblock.

BUG=chrome-os-partner:55357
BRANCH=none
TEST=Built and booted kunimitsu till POST code 0x2A

Change-Id: I4984842cffc5b52780ed52ebb8d88dfe86663a85
Credits-to: Aaron Durbin <adurbin@chromium.org>
Signed-off-by: Barnali Sarkar <barnali.sarkar@intel.com>
Signed-off-by: Rizwan Qureshi <rizwan.qureshi@intel.com>
Signed-off-by: Subrata Banik <subrata.banik@intel.com>
Reviewed-on: https://review.coreboot.org/15784
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/365225
Commit-Ready: Furquan Shaikh <furquan@chromium.org>
Tested-by: Furquan Shaikh <furquan@chromium.org>
This commit is contained in:
Subrata Banik 2016-07-18 14:13:52 +05:30 • committed by chrome-bot
parent 4d9e7ff905
commit 496d5d14f6
4 changed files with 161 additions and 139 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/soc/intel/skylake/Kconfig
View file

@ -15,6 +15,7 @@ config CPU_SPECIFIC_OPTIONS
select ACPI_NHLT select ACPI_NHLT
select CACHE_MRC_SETTINGS select CACHE_MRC_SETTINGS
select CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM if RELOCATABLE_RAMSTAGE select CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM if RELOCATABLE_RAMSTAGE
select C_ENVIRONMENT_BOOTBLOCK
select COLLECT_TIMESTAMPS select COLLECT_TIMESTAMPS
select CPU_INTEL_FIRMWARE_INTERFACE_TABLE select CPU_INTEL_FIRMWARE_INTERFACE_TABLE
select GENERIC_GPIO_LIB select GENERIC_GPIO_LIB
@ -49,7 +50,6 @@ config CPU_SPECIFIC_OPTIONS
select TSC_CONSTANT_RATE select TSC_CONSTANT_RATE
select TSC_SYNC_MFENCE select TSC_SYNC_MFENCE
select UDELAY_TSC select UDELAY_TSC
select USE_GENERIC_FSP_CAR_INC
config CHROMEOS config CHROMEOS
select CHROMEOS_RAMOOPS_DYNAMIC select CHROMEOS_RAMOOPS_DYNAMIC
@ -100,6 +100,17 @@ config DCACHE_RAM_SIZE
The size of the cache-as-ram region required during bootblock The size of the cache-as-ram region required during bootblock
and/or romstage. and/or romstage.
config DCACHE_BSP_STACK_SIZE
hex
default 0x4000
help
The amount of anticipated stack usage in CAR by bootblock and
other stages.
config C_ENV_BOOTBLOCK_SIZE
hex
default 0x8000
config EXCLUDE_NATIVE_SD_INTERFACE config EXCLUDE_NATIVE_SD_INTERFACE
bool bool
default n default n

3
src/soc/intel/skylake/Makefile.inc
View file

@ -9,6 +9,9 @@ subdirs-y += ../../../cpu/x86/mtrr
subdirs-y += ../../../cpu/x86/smm subdirs-y += ../../../cpu/x86/smm
subdirs-y += ../../../cpu/x86/tsc subdirs-y += ../../../cpu/x86/tsc
bootblock-y += bootblock/bootblock.c
bootblock-y += bootblock/cache_as_ram.S
verstage-y += gpio.c verstage-y += gpio.c
verstage-y += memmap.c verstage-y += memmap.c
verstage-y += monotonic_timer.c verstage-y += monotonic_timer.c

22
src/soc/intel/skylake/bootblock/bootblock.c Normal file
View file

@ -0,0 +1,22 @@
/*
* This file is part of the coreboot project.
*
* Copyright (C) 2016 Intel Corporation..
*
* 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.
*/
#include <bootblock_common.h>
void asmlinkage bootblock_c_entry(uint64_t base_timestamp)
{
/* Call lib/bootblock.c main */
bootblock_main_with_timestamp(base_timestamp);
}

262
src/soc/intel/skylake/include/soc/car_setup.S → src/soc/intel/skylake/bootblock/cache_as_ram.S
View file

@ -1,8 +1,7 @@
/* /*
* This file is part of the coreboot project. * This file is part of the coreboot project.
* *
* Copyright (C) 2013-2014 Sage Electronic Engineering, LLC. * Copyright (C) 2015-2016 Intel Corp.
* Copyright (C) 2016 Intel Corp.
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -15,56 +14,62 @@
* *
*/ */
#include <cpu/x86/mtrr.h>
#include <cpu/x86/cache.h> #include <cpu/x86/cache.h>
#include <cpu/x86/cr.h>
#include <cpu/x86/mtrr.h>
#include <cpu/x86/post_code.h> #include <cpu/x86/post_code.h>
#include <rules.h>
/* #define IA32_PQR_ASSOC 0x0c8f
* MTRR definitions #define IA32_L3_MASK_1 0x0c91
*/ #define IA32_L3_MASK_2 0x0c92
.equ IA32_MTRR_CAP, 0x00fe #define CACHE_INIT_VALUE 0
#define MSR_EVICT_CTL 0x2e0
.equ NO_EVICT_MODE, 0x02e0 .global bootblock_pre_c_entry
bootblock_pre_c_entry:
.equ IA32_PQR_ASSOC, 0x0c8f post_code(0x20)
.equ IA32_L3_MASK_1, 0x0c91
.equ IA32_L3_MASK_2, 0x0c92
.equ CACHE_INIT_VALUE, 0
/*
* See BWG - chapter "Determining Cacheable Code Region Base Addresses and Ranges".
*
*/
movl %edi, %ebp /* Put BIST value in a safe place */
/* /*
* Ensure that all variable-range MTRR valid flags are clear and * Use the MTRR default type MSR as a proxy for detecting INIT#.
* IA32_MTRR_DEF_TYPE MSR E flag is clear. Note: This is the default state * Reset the system if any known bits are set in that MSR. That is
* after hardware reset. * an indication of the CPU not being properly reset.
*
* Initialize all fixed-range and variable-range MTRR register fields to 0.
*/ */
mov $(MtrrByteCountFixed), %ebx /* EBX = size of Fixed MTRRs */ check_for_clean_reset:
mov $MTRR_DEF_TYPE_MSR, %ecx
xorl %eax, %eax /* Clear the low dword to write */ rdmsr
xorl %edx, %edx /* Clear the high dword to write */ and $(MTRR_DEF_TYPE_EN | MTRR_DEF_TYPE_FIX_EN), %eax
xorl %ecx, %ecx cmp $0, %eax
/* Clearing Fixed Range MTRRs */ jz no_reset
clear_mtrr_fixed: /* perform soft reset */
addl $(-2), %ebx /* need to check it */ movw $0xcf9, %dx
movw (MtrrInitTable)(%ebx), %cx /* cx <- address of mtrr to zero */ movb $0x06, %al
wrmsr outb %al, %dx
jnz clear_mtrr_fixed /* loop through the whole table */
no_reset:
post_code(0x21) post_code(0x21)
/* Clearing Variable Range MTRRs */ /* Clear/disable fixed MTRRs */
movl $MTRR_CAP_MSR, %ecx mov $fixed_mtrr_list_size, %ebx
xor %eax, %eax
xor %edx, %edx
clear_fixed_mtrr:
add $-2, %ebx
movzwl fixed_mtrr_list(%ebx), %ecx
wrmsr
jnz clear_fixed_mtrr
post_code(0x22)
/* Figure put how many MTRRs we have, and clear them out */
mov $MTRR_CAP_MSR, %ecx
rdmsr rdmsr
movzx %al, %ebx movzb %al, %ebx /* Number of variable MTRRs */
clr %eax mov $MTRR_PHYS_BASE(0), %ecx
clr %edx xor %eax, %eax
movl $MTRR_PHYS_BASE(0), %ecx xor %edx, %edx
clear_var_mtrr: clear_var_mtrr:
wrmsr wrmsr
inc %ecx inc %ecx
@ -73,16 +78,14 @@ clear_var_mtrr:
dec %ebx dec %ebx
jnz clear_var_mtrr jnz clear_var_mtrr
post_code(0x22) post_code(0x23)
/* /* Configure default memory type to uncacheable (UC) */
* Configure the default memory type to un-cacheable (UC) in the mov $MTRR_DEF_TYPE_MSR, %ecx
* IA32_MTRR_DEF_TYPE MSR.
*/
movl $MTRR_DEF_TYPE_MSR, %ecx /* Load the MTRR default type index */
rdmsr rdmsr
andl $0xFFFFF300, %eax /* Clear the enable bits and def type UC. */ /* Clear enable bits and set default type to UC. */
and $~(MTRR_DEF_TYPE_MASK | MTRR_DEF_TYPE_EN | \
MTRR_DEF_TYPE_FIX_EN), %eax
wrmsr wrmsr
/* Configure MTRR_PHYS_MASK_HIGH for proper addressing above 4GB /* Configure MTRR_PHYS_MASK_HIGH for proper addressing above 4GB
@ -102,72 +105,54 @@ clear_var_mtrr:
bts %eax, %esi bts %eax, %esi
dec %esi /* esi <- MTRR_PHYS_MASK_HIGH */ dec %esi /* esi <- MTRR_PHYS_MASK_HIGH */
/*
* Configure the DataStack region as write-back (WB) cacheable memory type
* using the variable range MTRRs.
*
*
* Set the base address of the DataStack cache range
*/
movl $CONFIG_DCACHE_RAM_BASE, %eax
orl $MTRR_TYPE_WRBACK, %eax /* Load the write-back cache value */
xorl %edx, %edx /* clear upper dword */
movl $MTRR_PHYS_BASE(0), %ecx /* Load the MTRR index */
wrmsr /* the value in MTRR_PHYS_BASE_0 */
/*
* Set the mask for the DataStack cache range
* Compute MTRR mask value: Mask = NOT (Size - 1)
*/
movl $CONFIG_DCACHE_RAM_SIZE_TOTAL, %eax
dec %eax
not %eax
orl $MTRR_PHYS_MASK_VALID, %eax /* turn on the Valid flag */
movl %esi, %edx /* edx <- MTRR_PHYS_MASK_HIGH */
inc %ecx
wrmsr /* the value in MTRR_PHYS_MASK_0 */
post_code(0x23)
/*
* Enable the MTRRs by setting the IA32_MTRR_DEF_TYPE MSR E flag.
*/
movl $MTRR_DEF_TYPE_MSR, %ecx /* Load the MTRR default type index */
rdmsr
orl $MTRR_DEF_TYPE_EN, %eax /* Enable variable range MTRRs */
wrmsr
post_code(0x24) post_code(0x24)
/* /* Configure CAR region as write-back (WB) */
* Enable the logical processor's (BSP) cache: execute INVD and set mov $MTRR_PHYS_BASE(0), %ecx
* CR0.CD = 0, CR0.NW = 0. mov $CONFIG_DCACHE_RAM_BASE, %eax
*/ or $MTRR_TYPE_WRBACK, %eax
movl %cr0, %eax xor %edx,%edx
and $(~(CR0_CD + CR0_NW)), %eax
invd
movl %eax, %cr0
/*
* Enable No-Eviction Mode Setup State by setting
* NO_EVICT_MODE MSR 2E0h bit [0] = '1'.
*/
movl $NO_EVICT_MODE, %ecx
rdmsr
orl $0x01, %eax
wrmsr wrmsr
/* Configure the MTRR mask for the size region */
mov $MTRR_PHYS_MASK(0), %ecx
mov $CONFIG_DCACHE_RAM_SIZE_TOTAL, %eax /* size mask */
dec %eax
not %eax
or $MTRR_PHYS_MASK_VALID, %eax
wrmsr
post_code(0x25)
/* Enable variable MTRRs */
mov $MTRR_DEF_TYPE_MSR, %ecx
rdmsr
or $MTRR_DEF_TYPE_EN, %eax
wrmsr
/* Enable caching */
mov %cr0, %eax
and $~(CR0_CD | CR0_NW), %eax
invd
mov %eax, %cr0
/* Disable cache eviction (setup stage) */
mov $MSR_EVICT_CTL, %ecx
rdmsr
or $0x1, %eax
wrmsr
post_code(0x26)
/* Create n-way set associativity of cache */ /* Create n-way set associativity of cache */
xorl %edi, %edi xorl %edi, %edi
Find_LLC_subleaf: find_llc_subleaf:
movl %edi, %ecx movl %edi, %ecx
movl $0x04, %eax movl $0x04, %eax
cpuid cpuid
inc %edi inc %edi
and $0xe0, %al /* EAX[7:5] = Cache Level */ and $0xe0, %al /* EAX[7:5] = Cache Level */
cmp $0x60, %al /* Check to see if it is LLC */ cmp $0x60, %al /* Check to see if it is LLC */
jnz Find_LLC_subleaf jnz find_llc_subleaf
/* /*
* Set MSR 0xC91 IA32_L3_MASK_! = 0xE/0xFE/0xFFE/0xFFFE * Set MSR 0xC91 IA32_L3_MASK_! = 0xE/0xFE/0xFFE/0xFFFE
@ -251,12 +236,12 @@ Find_LLC_subleaf:
* NO_EVICT_MODE MSR 2E0h bit [1] = '1'. * NO_EVICT_MODE MSR 2E0h bit [1] = '1'.
*/ */
movl $NO_EVICT_MODE, %ecx movl $MSR_EVICT_CTL, %ecx
rdmsr rdmsr
orl $0x02, %eax orl $0x02, %eax
wrmsr wrmsr
post_code(0x25) post_code(0x27)
/* /*
* Configure the BIOS code region as write-protected (WP) cacheable * Configure the BIOS code region as write-protected (WP) cacheable
* memory type using a single variable range MTRR. * memory type using a single variable range MTRR.
@ -267,19 +252,11 @@ Find_LLC_subleaf:
movl $(0xFFFFFFFF - CONFIG_ROM_SIZE + 1), %edi /* Code region base */ movl $(0xFFFFFFFF - CONFIG_ROM_SIZE + 1), %edi /* Code region base */
movl $CONFIG_ROM_SIZE, %eax /* Code region size */ movl $CONFIG_ROM_SIZE, %eax /* Code region size */
cmpl $0, %edi cmpl $0, %edi
jz InvalidParameter jz .halt_forever
cmpl $0, %eax cmpl $0, %eax
jz InvalidParameter jz .halt_forever
jmp CheckPass
InvalidParameter:
movl $0x80000002, %eax /* RETURN_INVALID_PARAMETER */
jmp .Lhlt
CheckPass:
post_code(0x26)
post_code(0x28)
/* /*
* Program base register * Program base register
*/ */
@ -304,31 +281,40 @@ CheckPass:
movl %esi, %edx /* edx <- MTRR_PHYS_MASK_HIGH */ movl %esi, %edx /* edx <- MTRR_PHYS_MASK_HIGH */
wrmsr wrmsr
post_code(0x27) car_init_done:
/* post_code(0x29)
* edi: BIST value
* mm0: low 32-bits of TSC value
* mm1: high 32-bits of TSC value
*/
movl %ebp, %edi /* Restore BIST value */
.section .rodata /* Setup bootblock stack */
mov $_car_stack_end, %esp
MtrrInitTable: /*push TSC value to stack*/
.word MTRR_DEF_TYPE_MSR movd %mm2, %eax
.word MTRR_FIX_64K_00000 pushl %eax /* tsc[63:32] */
.word MTRR_FIX_16K_80000 movd %mm1, %eax
.word MTRR_FIX_16K_A0000 pushl %eax /* tsc[31:0] */
.word MTRR_FIX_4K_C0000
.word MTRR_FIX_4K_C8000
.word MTRR_FIX_4K_D0000
.word MTRR_FIX_4K_D8000
.word MTRR_FIX_4K_E0000
.word MTRR_FIX_4K_E8000
.word MTRR_FIX_4K_F0000
.word MTRR_FIX_4K_F8000
.equ MtrrByteCountFixed, (.-MtrrInitTable) before_carstage:
post_code(0x2A)
.previous call bootblock_c_entry
/* Never reached */
.halt_forever:
post_code(POST_DEAD_CODE)
hlt
jmp .halt_forever
fixed_mtrr_list:
.word MTRR_FIX_64K_00000
.word MTRR_FIX_16K_80000
.word MTRR_FIX_16K_A0000
.word MTRR_FIX_4K_C0000
.word MTRR_FIX_4K_C8000
.word MTRR_FIX_4K_D0000
.word MTRR_FIX_4K_D8000
.word MTRR_FIX_4K_E0000
.word MTRR_FIX_4K_E8000
.word MTRR_FIX_4K_F0000
.word MTRR_FIX_4K_F8000
fixed_mtrr_list_size = . - fixed_mtrr_list