From 526b2c429e41bbd177853169deb63c1bf00c70a9 Mon Sep 17 00:00:00 2001 From: "Ronald G. Minnich" Date: Mon, 10 Apr 2006 16:14:19 +0000 Subject: clean up gx2def.h a bit. Add cpureginit.c added called to cpureginit to model_gx2_init.c git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2248 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/include/cpu/amd/gx2def.h | 262 +++++++++++++++++++++---------------------- 1 file changed, 131 insertions(+), 131 deletions(-) (limited to 'src/include/cpu/amd') diff --git a/src/include/cpu/amd/gx2def.h b/src/include/cpu/amd/gx2def.h index dc4559ee60..9bb4f571f0 100644 --- a/src/include/cpu/amd/gx2def.h +++ b/src/include/cpu/amd/gx2def.h @@ -97,21 +97,21 @@ /*GeodeLink Interface Unit 0 (GLIU0) port0*/ /**/ -#define GLIU0_GLD_MSR_CAP MSR_GLIU0 + 0x2000 -#define GLIU0_GLD_MSR_PM MSR_GLIU0 + 0x2004 +#define GLIU0_GLD_MSR_CAP (MSR_GLIU0 + 0x2000) +#define GLIU0_GLD_MSR_PM (MSR_GLIU0 + 0x2004) -#define GLIU0_DESC_BASE MSR_GLIU0 + 0x20 -#define GLIU0_CAP MSR_GLIU0 + 0x86 -#define GLIU0_GLD_MSR_COH MSR_GLIU0 + 0x80 +#define GLIU0_DESC_BASE (MSR_GLIU0 + 0x20) +#define GLIU0_CAP (MSR_GLIU0 + 0x86) +#define GLIU0_GLD_MSR_COH (MSR_GLIU0 + 0x80) /**/ /* Memory Controller GLIU0 port 1*/ /**/ -#define MC_GLD_MSR_CAP MSR_MC + 0x2000 -#define MC_GLD_MSR_PM MSR_MC + 0x2004 +#define MC_GLD_MSR_CAP (MSR_MC + 0x2000) +#define MC_GLD_MSR_PM (MSR_MC + 0x2004) -#define MC_CF07_DATA MSR_MC + 0x18 +#define MC_CF07_DATA (MSR_MC + 0x18) #define CF07_UPPER_D1_SZ_SHIFT 28 #define CF07_UPPER_D1_MB_SHIFT 24 @@ -122,22 +122,22 @@ #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 (1 << 28) -#define CF07_LOWER_LOAD_MODE_DLL_RESET (1 << 27) +#define CF07_LOWER_REF_INT_SHIFT 8 +#define CF07_LOWER_LOAD_MODE_DDR_SET (1 << 28) +#define CF07_LOWER_LOAD_MODE_DLL_RESET (1 << 27) #define CF07_LOWER_EMR_QFC_SET (1 << 26) #define CF07_LOWER_EMR_DRV_SET (1 << 25) #define CF07_LOWER_REF_TEST_SET (1 << 3) #define CF07_LOWER_PROG_DRAM_SET (1 << 0) -#define MC_CF8F_DATA MSR_MC + 0x19 +#define MC_CF8F_DATA (MSR_MC + 0x19) #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_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 @@ -145,34 +145,34 @@ #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 CF8F_UPPER_32BIT_SET (1 << 5) +#define CF8F_UPPER_HOI_LOI_SET (1 << 1) -#define MC_CF1017_DATA MSR_MC + 0x1A +#define MC_CF1017_DATA (MSR_MC + 0x1A) -#define CF1017_LOWER_PM1_UP_DLY_SET 1 << 8 -#define CF1017_LOWER_WR2DAT_SHIFT 0 +#define CF1017_LOWER_PM1_UP_DLY_SET (1 << 8) +#define CF1017_LOWER_WR2DAT_SHIFT 0 -#define MC_CFCLK_DBUG MSR_MC + 0x1D +#define MC_CFCLK_DBUG (MSR_MC + 0x1D) -#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_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 0x0F << 0 +#define CFCLK_LOWER_MASK_CKE_SET1 (1 << 9) +#define CFCLK_LOWER_MASK_CKE_SET0 (1 << 8) +#define CFCLK_LOWER_SDCLK_SET (0x0F << 0) -#define MC_CF_RDSYNC MSR_MC + 0x1F +#define MC_CF_RDSYNC (MSR_MC + 0x1F) /**/ /* GLIU1 GLIU0 port2*/ /**/ -#define GLIU1_GLD_MSR_CAP MSR_GLIU1 + 0x2000 -#define GLIU1_GLD_MSR_PM MSR_GLIU1 + 0x2004 +#define GLIU1_GLD_MSR_CAP (MSR_GLIU1 + 0x2000) +#define GLIU1_GLD_MSR_PM (MSR_GLIU1 + 0x2004) -#define GLIU1_GLD_MSR_COH MSR_GLIU1 + 0x80 +#define GLIU1_GLD_MSR_COH (MSR_GLIU1 + 0x80) /**/ @@ -184,27 +184,27 @@ #define CPU_GLD_MSR_DIAG 0x2005 #define DIAG_SEL1_MODE_SHIFT 16 -#define DIAG_SEL1_SET 1 << 31 +#define DIAG_SEL1_SET (1 << 31) #define DIAG_SEL0__MODE_SHIFT 0 -#define DIAG_SET0_SET 1 << 15 +#define DIAG_SET0_SET (1 << 15) #define CPU_PF_BTB_CONF 0x1100 -#define BTB_ENABLE_SET 1 << 0 -#define RETURN_STACK_ENABLE_SET 1 << 4 +#define BTB_ENABLE_SET (1 << 0) +#define RETURN_STACK_ENABLE_SET (1 << 4) #define CPU_PF_BTBRMA_BIST 0x110C #define CPU_XC_CONFIG 0x1210 -#define XC_CONFIG_SUSP_ON_HLT 1 << 0 +#define XC_CONFIG_SUSP_ON_HLT (1 << 0) #define CPU_ID_CONFIG 0x1250 -#define ID_CONFIG_SERIAL_SET 1 << 0 +#define ID_CONFIG_SERIAL_SET (1 << 0) #define CPU_AC_MSR 0x1301 #define CPU_EX_BIST 0x1428 /*IM*/ #define CPU_IM_CONFIG 0x1700 -#define IM_CONFIG_LOWER_ICD_SET 1 << 8 -#define IM_CONFIG_LOWER_QWT_SET 1 << 20 +#define IM_CONFIG_LOWER_ICD_SET (1 << 8) +#define IM_CONFIG_LOWER_QWT_SET (1 << 20) #define CPU_IC_INDEX 0x1710 #define CPU_IC_DATA 0x1711 #define CPU_IC_TAG 0x1712 @@ -293,19 +293,19 @@ #define CPU_BC_CONF_0 0x1900 #define TSC_SUSP_SET (1<<5) -#define SUSP_EN_SET (1<<1)2 +#define SUSP_EN_SET (1<<12) /**/ /* 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 +#define VG_GLD_MSR_CAP (MSR_VG + 0x2000) +#define VG_GLD_MSR_CONFIG (MSR_VG + 0x2001) +#define VG_GLD_MSR_PM (MSR_VG + 0x2004) -#define GP_GLD_MSR_CAP MSR_GP + 0x2000 -#define GP_GLD_MSR_CONFIG MSR_GP + 0x2001 -#define GP_GLD_MSR_PM MSR_GP + 0x2004 +#define GP_GLD_MSR_CAP (MSR_GP + 0x2000) +#define GP_GLD_MSR_CONFIG (MSR_GP + 0x2001) +#define GP_GLD_MSR_PM (MSR_GP + 0x2004) @@ -313,29 +313,29 @@ /* DF GLIU0 port6*/ /**/ -#define DF_GLD_MSR_CAP MSR_DF + 0x2000 -#define DF_GLD_MSR_MASTER_CONF MSR_DF + 0x2001 +#define DF_GLD_MSR_CAP (MSR_DF + 0x2000) +#define DF_GLD_MSR_MASTER_CONF (MSR_DF + 0x2001) #define DF_LOWER_LCD_SHIFT 6 -#define DF_GLD_MSR_PM MSR_DF + 0x2004 +#define DF_GLD_MSR_PM (MSR_DF + 0x2004) /**/ /* GeodeLink Control Processor GLIU1 port3*/ /**/ -#define GLCP_GLD_MSR_CAP MSR_GLCP + 0x2000 -#define GLCP_GLD_MSR_CONF MSR_GLCP + 0x2001 -#define GLCP_GLD_MSR_PM MSR_GLCP + 0x2004 +#define GLCP_GLD_MSR_CAP (MSR_GLCP + 0x2000) +#define GLCP_GLD_MSR_CONF (MSR_GLCP + 0x2001) +#define GLCP_GLD_MSR_PM (MSR_GLCP + 0x2004) -#define GLCP_DELAY_CONTROLS MSR_GLCP + 0x0F +#define GLCP_DELAY_CONTROLS (MSR_GLCP + 0x0F) -#define GLCP_SYS_RSTPLL MSR_GLCP +0x14 /* R/W*/ +#define GLCP_SYS_RSTPLL (MSR_GLCP +0x14 /* R/W*/) #define RSTPLL_UPPER_MDIV_SHIFT 9 #define RSTPLL_UPPER_VDIV_SHIFT 6 #define RSTPLL_UPPER_FBDIV_SHIFT 0 #define RSTPLL_LOWER_SWFLAGS_SHIFT 26 -#define RSTPLL_LOWER_SWFLAGS_MASK (0x3F<