summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/cpu/amd/model_gx2/Config.lb1
-rw-r--r--src/cpu/amd/model_gx2/cpubug.c364
-rw-r--r--src/include/cpu/amd/gx2def.h262
-rw-r--r--src/northbridge/amd/gx2/northbridge.c3
4 files changed, 629 insertions, 1 deletions
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 <cpu/amd/model_gx2/gx2def.h>
+
+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<<DM_CONFIG0_UPPER_WSREQ_SHIFT);
+ msr.hi |= (2<<DM_CONFIG0_UPPER_WSREQ_SHIFT);
+ msr.lo |= DM_CONFIG0_LOWER_MISSER_SET;
+ wrmsr(CPU_DM_CONFIG0, msr);
+
+
+
+ msr = rdmsr(CPU_IM_CONFIG);
+ msr.lo |= IM_CONFIG_LOWER_QWT_SET; /* interlock instruction fetches to WS regions with data accesses.
+ * This prevents in instruction fetch from going out to PCI if the
+ * data side is about to make a request.
+ */
+ wrmsr(CPU_IM_CONFIG, msr);
+ /* write serialize memory hole to PCI. Need to to unWS when something is shadowed regardless of cachablility.*/
+
+ msr.lo = 0x021212121;
+ msr.hi = 0x021212121
+ wrmsr( CPU_RCONF_A0_BF, msr);
+ wrmsr( CPU_RCONF_C0_DF, msr);
+ wrmsr( CPU_RCONF_E0_FF, msr);
+}
+
+;**************************************************************************
+;*
+;* CPUbug784
+;*
+;* Bugtool #784 + #792
+;*
+;* Fix CPUID instructions for < 3.0 CPUs
+;*
+;* Entry:
+;* Exit:
+;* Modified:
+;*
+;**************************************************************************
+
+void cpubug784(void){
+ static char *name = "Geode by NSC";
+
+ /* we'll do this the stupid way, for now, but that's the string they want. NO ONE KNOWS why you
+ * would do this -- the OS can figure this type of stuff out!
+ */
+ msr = rdmsr(0x3006);
+ msr.hi = 0x646f6547;
+ wrmsr(0x3006, msr);
+
+ msr = rdmsr(0x3007);
+ msr.hi = 0x79622065;
+ msr.lo = 0x43534e20;
+ wrmsr(0x3007, msr);
+
+ msr = rdmsr(0x3002);
+ wrmsr(*0x3008, msr);
+
+; More CPUID to match AMD better. #792
+ msr = rdmsr(0x3009);
+ msr.hi = 0x0C0C0A13D;
+ msr.lo = 0x00000000;
+ wrmsr(0x3009, msr);
+}
+
+/* cpubug 1398: enable MC if we KNOW we have DDR*/
+void
+eng1398(void){
+ msr_t msr;
+
+ msr = rdmsr(MSR_GLCP+0x17);
+ if ((msr.lo & 0xff) < CPU_REV_2_0) {
+ msr = rdmsr(GLCP_SYS_RSTPLL);
+ i if (msr.lo & (1<<RSTPPL_LOWER_SDRMODE_SHIFT))
+ return;
+ }
+
+ /* no bios to check, we just go for it? */
+ msr = rdmsr(MC_GLD_MSR_PM);
+ msr.lo |= 3; /* enable MC clock gating.*/
+ wrmsr(MC_GLD_MSR_PM, msr);
+}
+
+void
+eng2900{void){
+ printk_err(" NOT DOING eng2900: only shown to be a windows problem\n");
+#if 0
+
+;**************************************************************************
+;*
+;* CPUbugIAENG2900
+;*
+;* Clear Quest IAENG00002900, VSS 118.150
+;*
+;* BTB issue causes blue screen in windows.
+;*
+;* Entry:
+;* Exit:
+;* Modified:
+;*
+;**************************************************************************
+CPUbugIAENG2900 PROC NEAR PUBLIC
+ pushad
+
+; Clear bit 43, disables the sysenter/sysexit in CPUID3
+ mov ecx, 3003h
+ RDMSR
+ and edx, 0FFFFF7FFh
+ WRMSR
+
+ mov cx, TOKEN_BTB_2900_SWAPSIF_ENABLE
+ NOSTACK bx, GetNVRAMValueBX
+ cmp ax, TVALUE_ENABLE
+ jne bug2900exit
+
+
+;Disable enable_actions in DIAGCTL while setting up GLCP
+ mov ecx, MSR_GLCP + 005fh
+ xor edx, edx
+ xor eax, eax
+ WRMSR
+
+;Changing DBGCLKCTL register to GeodeLink
+ mov ecx, MSR_GLCP + 0016h
+ xor edx, edx
+ xor eax, eax
+ WRMSR
+
+ mov ecx, MSR_GLCP + 0016h
+ xor edx, edx
+ mov eax, 02h
+ WRMSR
+
+;The code below sets up the RedCloud to stall for 4 GeodeLink clocks when CPU is snooped.
+;Because setting XSTATE to 0 overrides any other XSTATE action, the code will always
+;stall for 4 GeodeLink clocks after a snoop request goes away even if it occured a clock or two
+;later than a different snoop; the stall signal will never 'glitch high' for
+;only one or two CPU clocks with this code.
+
+;Send mb0 port 3 requests to upper GeodeLink diag bits [63:32]
+ mov ecx, MSR_GLIU0 + 2005h
+ xor edx, edx
+ mov eax, 80338041h
+ WRMSR
+
+;set5m watches request ready from mb0 to CPU (snoop)
+ mov ecx, MSR_GLCP + 0045h
+ mov edx, 5ad68000h
+ xor eax, eax
+ WRMSR
+
+;SET4M will be high when state is idle (XSTATE=11)
+ mov ecx, MSR_GLCP + 0044h
+ xor edx, edx
+ mov eax, 0140h
+ WRMSR
+
+;SET5n to watch for processor stalled state
+ mov ecx, MSR_GLCP + 004Dh
+ mov edx, 2000h
+ xor eax, eax
+ WRMSR
+
+;Writing action number 13: XSTATE=0 to occur when CPU is snooped unless we're stalled
+ mov ecx, MSR_GLCP + 0075h
+ xor edx, edx
+ mov eax, 00400000h
+ WRMSR
+
+;Writing action number 11: inc XSTATE every GeodeLink clock unless we're idle
+ mov ecx, MSR_GLCP + 0073h
+ xor edx, edx
+ mov eax, 30000h
+ WRMSR
+
+
+;Writing action number 5: STALL_CPU_PIPE when exitting idle state or not in idle state
+ mov ecx, MSR_GLCP + 006Dh
+ xor edx, edx
+ mov eax, 00430000h
+ WRMSR
+
+;Writing DIAGCTL Register to enable the stall action and to let set5m watch the upper GeodeLink diag bits.
+ mov ecx, MSR_GLCP + 005fh
+ xor edx, edx
+ mov eax, 80004000h
+ WRMSR
+
+
+bug2900exit:
+ popad
+ ret
+CPUbugIAENG2900 ENDP
+#endif
+}
+
+void eng118253(void){
+ msr_t msr;
+
+ msr = rdmsr(GLPCI_SPARE);
+ msr.lo &= ~GLPCI_SPARE_LOWER_PPC_SET;
+ wrmsr(GLPCI_SPARE, msr);
+}
+void
+bug118339(void) {
+ printk_err("This is OPTIONAL BIOS-ENABLED ... ignore for now\n");
+#if 0
+ PROC NEAR PUBLIC
+ pushad
+
+ mov cx, TOKEN_VGTEAR_118339_SWAPSIF_ENABLE
+ NOSTACK bx, GetNVRAMValueBX
+ cmp ax, TVALUE_ENABLE
+ jne bug118339exit
+
+;Disable enable_actions in DIAGCTL while setting up GLCP
+ mov ecx, MSR_GLCP + 005fh
+ xor edx, edx
+ xor eax, eax
+ WRMSR
+
+; SET2M fires if VG pri is odd (3, not 2) and Ystate=0
+ mov ecx, MSR_GLCP + 042h
+; mov edx, 2d6b8000h
+ mov edx, 596b8000h
+ mov eax, 00000a00h
+ WRMSR
+
+; SET3M fires if MBUS changed and VG pri is odd
+ mov ecx, MSR_GLCP + 043h
+ mov edx, 596b8040h
+ xor eax, eax
+ WRMSR
+
+; Put VG request data on lower diag bus
+ mov ecx, MSR_GLIU0 + 2005h
+ xor edx, edx
+ mov eax, 80338041h
+ WRMSR
+
+; Increment Y state if SET3M if true
+ mov ecx, MSR_GLCP + 074h
+ xor edx, edx
+ mov eax, 0000c000h
+ WRMSR
+
+; Set up MBUS action to PRI=3 read of MBIU
+ mov ecx, MSR_GLCP + 020h
+ mov edx, 0000d863h
+ mov eax, 20002000h
+ WRMSR
+
+; Trigger MBUS action if VG=pri3 and Y=0, this blocks most PCI
+ mov ecx, MSR_GLCP + 071h
+ xor edx, edx
+ mov eax, 00000c00h
+ WRMSR
+
+;Writing DIAGCTL
+ mov ecx, MSR_GLCP + 005fh
+ xor edx, edx
+ mov eax, 80004000h
+ WRMSR
+
+ ; Code to enable FS2 even when BTB and VGTEAR SWAPSiFs are enabled
+ ; As per Todd Roberts in PBz1094 and PBz1095
+ ; Moved from CPUREG to CPUBUG per Tom Sylla
+ mov ecx, 04C000042h ; GLCP SETMCTL Register
+ rdmsr
+ or edx, 8 ; Bit 35 = MCP_IN
+ wrmsr
+
+bug118339exit:
+ popad
+ ret
+CPUbug118339 ENDP
+#endif
+}
+
+
+
+/****************************************************************************/
+/***/
+/** DisableMemoryReorder*/
+/***/
+/** PBZ 3659:*/
+/** The MC reordered transactions incorrectly and breaks coherency.*/
+/** Disable reording and take a potential performance hit.*/
+/** This is safe to do here and not in MC init since there is nothing*/
+/** to maintain coherency with and the cache is not enabled yet.*/
+/***/
+/***/
+/** Entry:*/
+/** Exit:*/
+/** Modified:*/
+/***/
+/****************************************************************************/
+void
+DisableMemoryReorder(void) {
+ msr_t msr;
+ msr = rdmsr(MC_CF8F_DATA);
+
+ msr.hi |= CF8F_UPPER_REORDER_DIS_SET);
+ wrmsr(MC_CF8F_DATA, msr);
+}
diff --git a/src/include/cpu/amd/gx2def.h b/src/include/cpu/amd/gx2def.h
index a9fa8445bf..b7ff4c0c87 100644
--- a/src/include/cpu/amd/gx2def.h
+++ b/src/include/cpu/amd/gx2def.h
@@ -8,7 +8,269 @@
#define GLCP_SYS_RSTPLL 0x4c000014
#define GLCP_DOTPLL 0x4c000015
#define GLCP_CHIP_REVID 0x4c000017
+/* MSR routing as follows*/
+/* MSB = 1 means not for CPU*/
+/* next 3 bits 1st port*/
+/* next3 bits next port if through an GLIU*/
+/* etc...*/
+/*Redcloud as follows.*/
+/* GLIU0*/
+/* port0 - GLIU0*/
+/* port1 - MC*/
+/* port2 - GLIU1*/
+/* port3 - CPU*/
+/* port4 - VG*/
+/* port5 - GP*/
+/* port6 - DF*/
+
+/* GLIU1*/
+/* port1 - GLIU0*/
+/* port3 - GLCP*/
+/* port4 - PCI*/
+/* port5 - FG*/
+
+
+#define GL0_GLIU0 0
+#define GL0_MC 1
+#define GL0_GLIU1 2
+#define GL0_CPU 3
+#define GL0_VG 4
+#define GL0_GP 5
+#define GL0_DF 6
+
+#define GL1_GLIU0 1
+#define GL1_GLCP 3
+#define GL1_PCI 4
+#define GL1_FG 5
+
+
+#define MSR_GLIU0 (GL0_GLIU0 << 29) + 1 << 28 /* To get on GeodeLink one bit has to be set */
+#define MSR_MC GL0_MC << 29
+#define MSR_GLIU1 GL0_GLIU1 << 29
+#define MSR_CPU GL0_CPU << 29 /* this is not used for BIOS since code executing on CPU doesn't need to be routed*/
+#define MSR_VG GL0_VG << 29
+#define MSR_GP GL0_GP << 29
+#define MSR_DF GL0_DF << 29
+
+#define MSR_GLCP (GL1_GLCP << 26) + MSR_GLIU1
+#define MSR_PCI (GL1_PCI << 26) + MSR_GLIU1
+#define MSR_FG (GL1_FG << 26) + MSR_GLIU1
+
+/* South Bridge*/
+#define MSR_SB (SB_PORT << 23) + MSR_PCI /* address to the SouthBridge*/
+#define SB_SHIFT 20 /* 29 -> 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 */