X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fnorthbridge%2Famd%2Famdht%2FAsPsDefs.h;h=ccee1fdff03c7e468d219af9a82f3e64fb0aa854;hb=5ff7c13e858a31addf1558731a12cf6c753b576d;hp=ef2e75e4b6b7409f89b6b12f151a1ae0a3c91d85;hpb=ce62350d8f5a619c9ce754caeb1e33224e0cce56;p=coreboot.git

diff --git a/src/northbridge/amd/amdht/AsPsDefs.h b/src/northbridge/amd/amdht/AsPsDefs.h
index ef2e75e4b..ccee1fdff 100644
--- a/src/northbridge/amd/amdht/AsPsDefs.h
+++ b/src/northbridge/amd/amdht/AsPsDefs.h
@@ -25,7 +25,7 @@
 #define APIC_BAR_BP 0x100		/* APIC_BAR BSP bit */
 
 #define PS_LIM_REG 0xC0010061		/* P-state Current Limit Register */
-#define PS_CUR_LIM_SHFT 4		/* P-state Current Limit shift position */
+#define PS_MAX_VAL_SHFT 4		/* P-state Maximum Value shift position */
 
 #define PS_CTL_REG 0xC0010062		/* P-state Control Register */
 #define PS_CMD_MASK_OFF 0xfffffff8	/* P-state Control Register CMD Mask OFF */
@@ -58,9 +58,10 @@
 #define PS_NB_VID_SHFT 25		/* P-state bit shift for NbVid */
 #define PS_BOTH_VID_OFF 0x01ff01ff	/* Mask NbVid & CpuVid */
 #define PS_CPU_NB_VID_SHFT 16		/* P-state bit shift from CpuVid to NbVid */
-#define PS_NB_VID_SHFT 25		/* P-state NBVID shift */
 #define PS_DIS 0x7fffffff		/* disable P-state reg */
 #define PS_EN 0x80000000		/* enable P-state reg */
+#define PS_CPU_FID_MASK 0x03f           /* MSRC001_00[68:64][CpuFid]
+					   Core Frequency Id */
 #define PS_CURDIV_SHFT 8		/* P-state Current Divisor shift position */
 #define PS_CPUDID_SHIFT 6		/* P-state CPU DID shift position */
 
@@ -109,7 +110,7 @@
 #define STC_PS_LMT_MASK 0x8fffffff	/* StcPstateLimit mask off */
 
 #define CPTC0 0x0d4			/* Clock Power/Timing Control0 Register*/
-#define CPTC0_MASK 0x000c0fff		/* Reset mask for this register */
+#define CPTC0_MASK 0x000cffff		/* Reset mask for this register */
 #define CPTC0_NBFID_MASK 0xffffffe0	/* NbFid mask off for this register */
 #define CPTC0_NBFID_MON 0x1f		/* NbFid mask on for this register */
 #define NB_FID_EN 0x20			/* NbFidEn bit ON */
@@ -202,6 +203,8 @@
 
 #define CPB_MASK 0x00000020             /* core performance
 					   boost. CPUID Fn8000 0007 edx */
+#define NC_MASK 0x000000FF              /* number of cores - 1. CPUID
+					   Fn8000 0008 ecx */
 #define PW_CTL_MISC 0x0a0		/* Power Control Miscellaneous Register */
 #define COF_VID_PROG_BIT 0x80000000	/* CofVidProg bit. 0= unfused part */
 #define DUAL_VDD_BIT 0x40000000	/* DualVdd bit. */
@@ -287,6 +290,9 @@
 
 #define TSC_MSR 0x10
 #define CUR_PSTATE_MSR 0xc0010063
+#define TSC_FREQ_SEL_SHIFT 24
+
+#define TSC_FREQ_SEL_MASK (1 << TSC_FREQ_SEL_SHIFT)
 
 #define  WAIT_PSTATE_TIMEOUT 80000000  /* 0.1 s , unit : 1.25 ns */