From db44be9405ae4b62b525fb7dad80e20c499cc07b Mon Sep 17 00:00:00 2001 From: "Ronald G. Minnich" Date: Mon, 20 Mar 2006 20:49:34 +0000 Subject: added definitions. added cpubug support. added object. Commented out msr set in northbridge that conflicted with the cpubug support. git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2218 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/cpu/amd/model_gx2/Config.lb | 1 + src/cpu/amd/model_gx2/cpubug.c | 364 ++++++++++++++++++++++++++++++++++ src/include/cpu/amd/gx2def.h | 262 ++++++++++++++++++++++++ src/northbridge/amd/gx2/northbridge.c | 3 +- 4 files changed, 629 insertions(+), 1 deletion(-) create mode 100644 src/cpu/amd/model_gx2/cpubug.c diff --git a/src/cpu/amd/model_gx2/Config.lb b/src/cpu/amd/model_gx2/Config.lb index b643d778eb..8fe6dda21d 100644 --- a/src/cpu/amd/model_gx2/Config.lb +++ b/src/cpu/amd/model_gx2/Config.lb @@ -4,3 +4,4 @@ dir /cpu/x86/mmx dir /cpu/x86/lapic dir /cpu/x86/cache driver model_gx2_init.o +object cpubug.o diff --git a/src/cpu/amd/model_gx2/cpubug.c b/src/cpu/amd/model_gx2/cpubug.c new file mode 100644 index 0000000000..02fce1a0b6 --- /dev/null +++ b/src/cpu/amd/model_gx2/cpubug.c @@ -0,0 +1,364 @@ +#include + +void +cpubug(void){ + msr_t msr; + int rev; + + msr = rdmsr(GLCP_CHIP_REVID); + + rev = msr.lo & 0xff; + if (rev < 0x20) { + printk_error("%s: rev < 0x20! bailing!\n"); + return; + } + + switch(rev) + { + case 0x20: + pcideadlock(); + eng1398(); + bug752(); + break; + case 0x22: + pcideadlock(); + eng1398(); + eng2900(); + bug 118339(); + break; + case 0x22: + case 0x30: + break; + default: + printk_error("unknown rev %x, bailing\n", rev); + return; + } + bug784(); + bug118253(); + disablememoryreadorder(); +} + +#if 0 +void +bug645(void){ + msr_t msr; + rdmsr(CPU_ID_CONFIG); + msr.whatever |= ID_CONFIG_SERIAL_SET; + wrmsr(msr); +} + +void +bug573(void){ + msr_t msr; + + msr = rdmsr(MC_GLD_MSR_PM); + msr.eax &= 0xfff3; + wrmsr(MC_GLD_MSR_PM); +} + +static void +pcideadlock(void){ + msr_t msr; + + msr = rdmsr(CPU_DM_CONFIG0); + msr.hi &= ~(7< 26 -> 23 -> 20...... When making a SB address uses this shift.*/ + + +/**/ +/*GeodeLink Interface Unit 0 (GLIU0) port0*/ +/**/ + +#define GLIU0_GLD_MSR_CAP MSR_GLIU0 + 2000h +#define GLIU0_GLD_MSR_PM MSR_GLIU0 + 2004h + +#define GLIU0_DESC_BASE MSR_GLIU0 + 20h +#define GLIU0_CAP MSR_GLIU0 + 86h +#define GLIU0_GLD_MSR_COH MSR_GLIU0 + 80h + + +/**/ +/* Memory Controller GLIU0 port 1*/ +/**/ +#define MC_GLD_MSR_CAP MSR_MC + 2000h +#define MC_GLD_MSR_PM MSR_MC + 2004h + +#define MC_CF07_DATA MSR_MC + 18h + +#define CF07_UPPER_D1_SZ_SHIFT 28 +#define CF07_UPPER_D1_MB_SHIFT 24 +#define CF07_UPPER_D1_CB_SHIFT 20 +#define CF07_UPPER_D1_PSZ_SHIFT 16 +#define CF07_UPPER_D0_SZ_SHIFT 12 +#define CF07_UPPER_D0_MB_SHIFT 8 +#define CF07_UPPER_D0_CB_SHIFT 4 +#define CF07_UPPER_D0_PSZ_SHIFT 0 + +#define CF07_LOWER_REF_INT_SHIFT 8 +#define CF07_LOWER_LOAD_MODE_DDR_SET 01 << 28 +#define CF07_LOWER_LOAD_MODE_DLL_RESET 01 << 27 +#define CF07_LOWER_EMR_QFC_SET 01 << 26 +#define CF07_LOWER_EMR_DRV_SET 01 << 25 +#define CF07_LOWER_REF_TEST_SET 1 << 3 +#define CF07_LOWER_PROG_DRAM_SET 1 << 0 + + +#define MC_CF8F_DATA MSR_MC + 19h + +#define CF8F_UPPER_XOR_BS_SHIFT 19 +#define CF8F_UPPER_XOR_MB0_SHIFT 18 +#define CF8F_UPPER_XOR_BA1_SHIFT 17 +#define CF8F_UPPER_XOR_BA0_SHIFT 16 +#define CF8F_UPPER_REORDER_DIS_SET 1 << 8 +#define CF8F_UPPER_REG_DIMM_SHIFT 4 +#define CF8F_LOWER_CAS_LAT_SHIFT 28 +#define CF8F_LOWER_REF2ACT_SHIFT 24 +#define CF8F_LOWER_ACT2PRE_SHIFT 20 +#define CF8F_LOWER_PRE2ACT_SHIFT 16 +#define CF8F_LOWER_ACT2CMD_SHIFT 12 +#define CF8F_LOWER_ACT2ACT_SHIFT 8 +#define CF8F_UPPER_32BIT_SET 1 << 5 +#define CF8F_UPPER_HOI_LOI_SET 1 << 1 + +#define MC_CF1017_DATA MSR_MC + 1Ah + +#define CF1017_LOWER_PM1_UP_DLY_SET 1 << 8 +#define CF1017_LOWER_WR2DAT_SHIFT 0 + +#define MC_CFCLK_DBUG MSR_MC + 1Dh + +#define CFCLK_UPPER_MTST_B2B_DIS_SET 1 << 2 +#define CFCLK_UPPER_MTST_DQS_EN_SET 1 << 1 +#define CFCLK_UPPER_MTEST_EN_SET 1 << 0 + +#define CFCLK_LOWER_MASK_CKE_SET1 1 << 9 +#define CFCLK_LOWER_MASK_CKE_SET0 1 << 8 +#define CFCLK_LOWER_SDCLK_SET 0Fh << 0 + +#define MC_CF_RDSYNC MSR_MC + 1Fh + + +/**/ +/* GLIU1 GLIU0 port2*/ +/**/ +#define GLIU1_GLD_MSR_CAP MSR_GLIU1 + 2000h +#define GLIU1_GLD_MSR_PM MSR_GLIU1 + 2004h + +#define GLIU1_GLD_MSR_COH MSR_GLIU1 + 80h + + +/**/ +/* CPU ; does not need routing instructions since we are executing there.*/ +/**/ +#define CPU_GLD_MSR_CAP 2000h +#define CPU_GLD_MSR_CONFIG 2001h +#define CPU_GLD_MSR_PM 2004h + +#define CPU_GLD_MSR_DIAG 2005h +#define DIAG_SEL1_MODE_SHIFT 16 +#define DIAG_SEL1_SET 1 << 31 +#define DIAG_SEL0__MODE_SHIFT 0 +#define DIAG_SET0_SET 1 << 15 + +#define CPU_PF_BTB_CONF 1100h +#define BTB_ENABLE_SET 1 << 0 +#define RETURN_STACK_ENABLE_SET 1 << 4 +#define CPU_PF_BTBRMA_BIST 110Ch + +#define CPU_XC_CONFIG 1210h +#define XC_CONFIG_SUSP_ON_HLT 1 << 0 +#define CPU_ID_CONFIG 1250h +#define ID_CONFIG_SERIAL_SET 1 << 0 + +#define CPU_AC_MSR 1301h +#define CPU_EX_BIST 1428h + +/*IM*/ +#define CPU_IM_CONFIG 1700h +#define IM_CONFIG_LOWER_ICD_SET 1 << 8 +#define IM_CONFIG_LOWER_QWT_SET 1 << 20 +#define CPU_IC_INDEX 1710h +#define CPU_IC_DATA 1711h +#define CPU_IC_TAG 1712h +#define CPU_IC_TAG_I 1713h +#define CPU_ITB_INDEX 1720h +#define CPU_ITB_LRU 1721h +#define CPU_ITB_ENTRY 1722h +#define CPU_ITB_ENTRY_I 1723h +#define CPU_IM_BIST_TAG 1730h +#define CPU_IM_BIST_DATA 1731h + + +/* various CPU MSRs */ +#define CPU_DM_CONFIG0 0x1800 +#define DM_CONFIG0_UPPER_WSREQ_SHIFT 12 +#define DM_CONFIG0_LOWER_DCDIS_SET (1<<8) +#define DM_CONFIG0_LOWER_WBINVD_SET (1<<5) +#define DM_CONFIG0_LOWER_MISSER_SET (1<<1) +/* configuration MSRs */ +#define CPU_RCONF_DEFAULT 0x1808 +#define RCONF_DEFAULT_UPPER_ROMRC_SHIFT 24 +#define RCONF_DEFAULT_UPPER_ROMBASE_SHIFT 4 +#define RCONF_DEFAULT_UPPER_DEVRC_HI_SHIFT 0 +#define RCONF_DEFAULT_LOWER_DEVRC_LOW_SHIFT 28 +#define RCONF_DEFAULT_LOWER_SYSTOP_SHIFT 8 +#define RCONF_DEFAULT_LOWER_SYSRC_SHIFT 0 + +#define CPU_RCONF_BYPASS 0x180A +#define CPU_RCONF_A0_BF 0x180B +#define CPU_RCONF_C0_DF 0x180C +#define CPU_RCONF_E0_FF 0x180D + +#define CPU_RCONF_SMM 0x180E +#define RCONF_SMM_UPPER_SMMTOP_SHIFT 12 +#define RCONF_SMM_UPPER_RCSMM_SHIFT 0 +#define RCONF_SMM_LOWER_SMMBASE_SHIFT 12 +#define RCONF_SMM_LOWER_RCNORM_SHIFT 0 +#define RCONF_SMM_LOWER_EN_SET (1<<8) + +#define CPU_RCONF_DMM 0x180F +#define RCONF_DMM_UPPER_DMMTOP_SHIFT 12 +#define RCONF_DMM_UPPER_RCDMM_SHIFT 0 +#define RCONF_DMM_LOWER_DMMBASE_SHIFT 12 +#define RCONF_DMM_LOWER_RCNORM_SHIFT 0 +#define RCONF_DMM_LOWER_EN_SET (1<<8) + +#define CPU_RCONF0 0x1810 +#define CPU_RCONF1 0x1811 +#define CPU_RCONF2 0x1812 +#define CPU_RCONF3 0x1813 +#define CPU_RCONF4 0x1814 +#define CPU_RCONF5 0x1815 +#define CPU_RCONF6 0x1816 +#define CPU_RCONF7 0x1817 +#define CPU_CR1_MSR 0x1881 +#define CPU_CR2_MSR 0x1882 +#define CPU_CR3_MSR 0x1883 +#define CPU_CR4_MSR 0x1884 +#define CPU_DC_INDEX 0x1890 +#define CPU_DC_DATA 0x1891 +#define CPU_DC_TAG 0x1892 +#define CPU_DC_TAG_I 0x1893 +#define CPU_SNOOP 0x1894 +#define CPU_DTB_INDEX 0x1898 +#define CPU_DTB_LRU 0x1899 +#define CPU_DTB_ENTRY 0x189A +#define CPU_DTB_ENTRY_I 0x189B +#define CPU_L2TB_INDEX 0x189C +#define CPU_L2TB_LRU 0x189D +#define CPU_L2TB_ENTRY 0x189E +#define CPU_L2TB_ENTRY_I 0x189F +#define CPU_DM_BIST 0x18C0 + /* SMM*/ +#define CPU_AC_SMM_CTL 0x1301 +#define SMM_NMI_EN_SET (1<<0) +#define SMM_SUSP_EN_SET (1<<1) +#define NEST_SMI_EN_SET (1<<2) +#define SMM_INST_EN_SET (1<<3) +#define INTL_SMI_EN_SET (1<<4) +#define EXTL_SMI_EN_SET (1<<5) + +#define CPU_FPU_MSR_MODE 0x1A00 +#define FPU_IE_SET (1<<0) + +#define CPU_FP_UROM_BIST 0x1A03 + +#define CPU_BC_CONF_0 0x1900 +#define TSC_SUSP_SET (1<<5) +#define SUSP_EN_SET (1<<1)2 + + /**/ + /* VG GLIU0 port4*/ + /**/ + +#define VG_GLD_MSR_CAP MSR_VG + 0x2000 +#define VG_GLD_MSR_CONFIG MSR_VG + 0x2001 +#define VG_GLD_MSR_PM MSR_VG + 0x2004 /* Upper 32 bits */ #define GLCP_SYS_RSTPLL_MDIV_SHIFT 9 diff --git a/src/northbridge/amd/gx2/northbridge.c b/src/northbridge/amd/gx2/northbridge.c index 40aaa44a62..d2e52c4f32 100644 --- a/src/northbridge/amd/gx2/northbridge.c +++ b/src/northbridge/amd/gx2/northbridge.c @@ -96,7 +96,8 @@ struct msr_defaults { /* for 180a, for now, we assume VSM will configure it */ /* 180b is left at reset value,a0000-bffff is non-cacheable */ /* 180c, c0000-dffff is set to write serialize and non-cachable */ - {0x180c, {.hi = MSR_WS_CD_DEFAULT, .lo = MSR_WS_CD_DEFAULT}}, + /* oops, 180c will be set by cpu bug handling in cpubug.c */ + //{0x180c, {.hi = MSR_WS_CD_DEFAULT, .lo = MSR_WS_CD_DEFAULT}}, /* 180d is left at default, e0000-fffff is non-cached */ /* we will assume 180e, the ssm region configuration, is left at default or set by VSM */ -- cgit v1.2.3