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

Geode LX: this patch adds configuration/status/self-test MSR definitions 

for L2 cache and fixes wrong  P2D defines.
This also patch adds L2 cache initialization for Geode LX CPU.

Signed-off-by: Indrek Kruusa <indrek.kruusa@artecdesign.ee>
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2355 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Indrek Kruusa 2006-08-02 11:30:32 +00:00 committed by Stefan Reinauer
parent 4278e99383
commit f4c0b596a2
2 changed files with 49 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/cpu/amd/model_lx/model_lx_init.c
View File

@ -5,7 +5,7 @@
#include <cpu/cpu.h> #include <cpu/cpu.h>
#include <cpu/x86/lapic.h> #include <cpu/x86/lapic.h>
#include <cpu/x86/cache.h> #include <cpu/x86/cache.h>
#include <cpu/amd/lxdef.h>
static void vsm_end_post_smi(void) static void vsm_end_post_smi(void)
{ {
@ -19,9 +19,37 @@ static void vsm_end_post_smi(void)
static void model_lx_init(device_t dev) static void model_lx_init(device_t dev)
{ {
msr_t msr;
printk_debug("model_lx_init\n"); printk_debug("model_lx_init\n");
/* Turn on caching if we haven't already */ /* Turn on caching if we haven't already */
/* Instruction Memory Configuration register
* set EBE bit, required when L2 cache is enabled
*/
msr = rdmsr(CPU_IM_CONFIG);
msr.lo |= 0x400;
wrmsr(CPU_IM_CONFIG, msr);
/* Data Memory Subsystem Configuration register
* set EVCTONRPL bit, required when L2 cache is enabled in victim mode
*/
msr = rdmsr(CPU_DM_CONFIG0);
msr.lo |= 0x4000;
wrmsr(CPU_DM_CONFIG0, msr);
/* invalidate L2 cache */
msr.hi = 0x00;
msr.lo = 0x10;
wrmsr(L2_CONFIG_MSR, msr);
/* Enable L2 cache */
msr.hi = 0x00;
msr.lo = 0x0f;
wrmsr(L2_CONFIG_MSR, msr);
x86_enable_cache(); x86_enable_cache();
/* Enable the local cpu apics */ /* Enable the local cpu apics */

22
src/include/cpu/amd/lxdef.h
View File

@ -236,11 +236,17 @@
#define RCONF_DEFAULT_LOWER_SYSTOP_SHIFT 8 #define RCONF_DEFAULT_LOWER_SYSTOP_SHIFT 8
#define RCONF_DEFAULT_LOWER_SYSRC_SHIFT 0 #define RCONF_DEFAULT_LOWER_SYSRC_SHIFT 0
/* ----- GX3 OK ---- */
#define CPU_RCONF_BYPASS 0x180A #define CPU_RCONF_BYPASS 0x180A
#define CPU_RCONF_A0_BF 0x180B #define CPU_RCONF_A0_BF 0x180B
#define CPU_RCONF_C0_DF 0x180C #define CPU_RCONF_C0_DF 0x180C
#define CPU_RCONF_E0_FF 0x180D #define CPU_RCONF_E0_FF 0x180D
/* ------------------------ */
/* ----- GX3 OK ---- */
#define CPU_RCONF_SMM 0x180E #define CPU_RCONF_SMM 0x180E
#define RCONF_SMM_UPPER_SMMTOP_SHIFT 12 #define RCONF_SMM_UPPER_SMMTOP_SHIFT 12
#define RCONF_SMM_UPPER_RCSMM_SHIFT 0 #define RCONF_SMM_UPPER_RCSMM_SHIFT 0
@ -248,6 +254,9 @@
#define RCONF_SMM_LOWER_RCNORM_SHIFT 0 #define RCONF_SMM_LOWER_RCNORM_SHIFT 0
#define RCONF_SMM_LOWER_EN_SET (1<<8) #define RCONF_SMM_LOWER_EN_SET (1<<8)
/* ------------------------ */
#define CPU_RCONF_DMM 0x180F #define CPU_RCONF_DMM 0x180F
#define RCONF_DMM_UPPER_DMMTOP_SHIFT 12 #define RCONF_DMM_UPPER_DMMTOP_SHIFT 12
#define RCONF_DMM_UPPER_RCDMM_SHIFT 0 #define RCONF_DMM_UPPER_RCDMM_SHIFT 0
@ -299,6 +308,15 @@
#define TSC_SUSP_SET (1<<5) #define TSC_SUSP_SET (1<<5)
#define SUSP_EN_SET (1<<12) #define SUSP_EN_SET (1<<12)
/* L2 cache*/
#define L2_CONFIG_MSR 0x1920
#define L2_STATUS_MSR 0x1921
#define L2_BIST_MSR 0x1926
/**/ /**/
/* VG GLIU0 port4*/ /* VG GLIU0 port4*/
/**/ /**/
@ -481,8 +499,8 @@
#define MSR_GLIU1_BASE1 (MSR_GLIU1 + 0x20) /* BM*/ #define MSR_GLIU1_BASE1 (MSR_GLIU1 + 0x20) /* BM*/
#define MSR_GLIU1_BASE2 (MSR_GLIU1 + 0x21) /* BM*/ #define MSR_GLIU1_BASE2 (MSR_GLIU1 + 0x21) /* BM*/
#define MSR_GLIU1_SHADOW (MSR_GLIU1 + 0x2D) /* SCO should only be SC*/ #define MSR_GLIU1_SHADOW (MSR_GLIU1 + 0x2E) /* SCO should only be SC*/ // GX3 0x2D -> 0x2E
#define MSR_GLIU1_SYSMEM (MSR_GLIU1 + 0x29) /* RO should only be R*/ #define MSR_GLIU1_SYSMEM (MSR_GLIU1 + 0x2A) /* RO should only be R*/ // GX3 0x29 -> 0x2A
#define MSR_GLIU1_SMM (MSR_GLIU1 + 0x23) /* BM*/ #define MSR_GLIU1_SMM (MSR_GLIU1 + 0x23) /* BM*/
#define MSR_GLIU1_DMM (MSR_GLIU1 + 0x24) /* BM*/ #define MSR_GLIU1_DMM (MSR_GLIU1 + 0x24) /* BM*/
#define MSR_GLIU1_FPU_TRAP (MSR_GLIU1 + 0x0E3) /* FooGlue F0 for FPU*/ #define MSR_GLIU1_FPU_TRAP (MSR_GLIU1 + 0x0E3) /* FooGlue F0 for FPU*/