summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNils Jacobs <njacobs8@hetnet.nl>2010-11-03 13:21:41 +0000
committerUwe Hermann <uwe@hermann-uwe.de>2010-11-03 13:21:41 +0000
commite98db798c9cbf30dd982fdacbaf0b860c1e42a48 (patch)
treed0f4db72b49b01f83981d5057ced9d9b5cc31ce6
parent5beac7f996633733d45df28479c20b7574aa60de (diff)
Clean up some more comments and white space in model_gx2/cpureginit.c.
This is Abuild and boot tested. Signed-off-by: Nils Jacobs <njacobs8@hetnet.nl> Acked-by: Uwe Hermann <uwe@hermann-uwe.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6015 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
-rw-r--r--src/cpu/amd/model_gx2/cpureginit.c123
1 files changed, 52 insertions, 71 deletions
diff --git a/src/cpu/amd/model_gx2/cpureginit.c b/src/cpu/amd/model_gx2/cpureginit.c
index 609147c6c1..bd4dc00d9e 100644
--- a/src/cpu/amd/model_gx2/cpureginit.c
+++ b/src/cpu/amd/model_gx2/cpureginit.c
@@ -1,134 +1,120 @@
-/* ***************************************************************************/
-/* * cpuRegInit*/
-/* ***************************************************************************/
+/* cpuRegInit */
void cpuRegInit (void)
{
int msrnum;
msr_t msr;
- /* Turn on BTM for early debug based on setup. */
- /*if (getnvram( TOKEN_BTM_DIAG_MODE) & 3) {*/
- /*
- * The following is only for diagnostics mode; do not use for OLPC
- */
+ /* Turn on BTM for early debug based on setup. */
+ /* if (getnvram( TOKEN_BTM_DIAG_MODE) & 3) { */
+ /* The following is only for diagnostics mode; do not use for OLPC */
if (0) {
- /* Set Diagnostic Mode */
+ /* Set Diagnostic Mode */
msrnum = CPU_GLD_MSR_DIAG;
msr.hi = 0;
msr.lo = DIAG_SEL1_SET | DIAG_SET0_SET;
wrmsr(msrnum, msr);
- /* Set up GLCP to grab BTM data.*/
- msrnum = 0x04C00000C; /* GLCP_DBGOUT MSR*/
+ /* Set up GLCP to grab BTM data. */
+ msrnum = 0x04C00000C; /* GLCP_DBGOUT MSR */
msr.hi = 0x0;
- msr.lo = 0x08; /* reset value (SCOPE_SEL = 0) causes FIFO toshift out,*/
- wrmsr(msrnum, msr); /* exchange it to anything else to prevent this*/
+ msr.lo = 0x08; /* reset value (SCOPE_SEL = 0) causes FIFO toshift out, */
+ wrmsr(msrnum, msr); /* exchange it to anything else to prevent this */
- /* ;Turn off debug clock*/
+ /* Turn off debug clock */
msrnum = 0x04C000016; /* DBG_CLK_CTL*/
msr.lo = 0x00; /* No clock*/
msr.hi = 0x00;
wrmsr(msrnum, msr);
- /* ;Set debug clock to CPU*/
- msrnum = 0x04C000016; /* DBG_CLK_CTL*/
- msr.lo = 0x01; /* CPU CLOCK*/
+ /* Set debug clock to CPU */
+ msrnum = 0x04C000016; /* DBG_CLK_CTL */
+ msr.lo = 0x01; /* CPU CLOCK */
msr.hi = 0x00;
wrmsr(msrnum, msr);
- /* ;Set fifo ctl to BTM bits wide*/
- msrnum = 0x04C00005E; /* FIFO_CTL*/
- msr.lo = 0x003880000; /* Bit [25:24] are size (11=BTM, 10 = 64 bit, 01= 32 bit, 00 = 16bit)*/
- wrmsr(msrnum, msr); /* Bit [23:21] are position (100 = CPU downto0)*/
- /* Bit [19] sets it up in slow data mode.*/
-
- /* ;enable fifo loading - BTM sizing will constrain*/
- /* ; only valid BTM packets to load - this action should always be on*/
+ /* Set fifo ctl to BTM bits wide */
+ msrnum = 0x04C00005E; /* FIFO_CTL */
+ msr.lo = 0x003880000; /* Bit [25:24] are size (11=BTM, 10 = 64 bit, 01= 32 bit, 00 = 16bit) */
+ wrmsr(msrnum, msr); /* Bit [23:21] are position (100 = CPU downto0) */
+ /* Bit [19] sets it up in slow data mode. */
- msrnum = 0x04C00006F; /* GLCP ACTION7 - load fifo*/
- msr.lo = 0x00000F000; /* Any nibble all 1's will always trigger*/
- msr.hi = 0x000000000; /* */
+ /* enable fifo loading - BTM sizing will constrain */
+ /* only valid BTM packets to load - this action should always be on */
+ msrnum = 0x04C00006F; /* GLCP ACTION7 - load fifo */
+ msr.lo = 0x00000F000; /* Any nibble all 1's will always trigger */
+ msr.hi = 0x000000000;
wrmsr(msrnum, msr);
- /* ;start storing diag data in the fifo*/
- msrnum = 0x04C00005F; /* DIAG CTL*/
- msr.lo = 0x080000000; /* enable actions*/
+ /* start storing diag data in the fifo */
+ msrnum = 0x04C00005F; /* DIAG CTL */
+ msr.lo = 0x080000000; /* enable actions */
msr.hi = 0x000000000;
wrmsr(msrnum, msr);
- /* Set up delay on data lines, so that the hold time*/
- /* is 1 ns.*/
- msrnum = 0x04C00000D ; /* GLCP IO DELAY CONTROLS*/
+ /* Set up delay on data lines, so that the hold time */
+ /* is 1 ns. */
+ msrnum = 0x04C00000D ; /* GLCP IO DELAY CONTROLS */
msr.lo = 0x082b5ad68;
- msr.hi = 0x080ad6b57; /* RGB delay = 0x07*/
+ msr.hi = 0x080ad6b57; /* RGB delay = 0x07 */
wrmsr(msrnum, msr);
- /* Set up DF to output diag information on DF pins.*/
+ /* Set up DF to output diag information on DF pins. */
msrnum = DF_GLD_MSR_MASTER_CONF;
msr.lo = 0x0220;
msr.hi = 0;
wrmsr(msrnum, msr);
- msrnum = 0x04C00000C ; /* GLCP_DBGOUT MSR*/
+ msrnum = 0x04C00000C ; /* GLCP_DBGOUT MSR */
msr.hi = 0x0;
- msr.lo = 0x0; /* reset value (SCOPE_SEL = 0) causes FIFO to shift out,*/
+ msr.lo = 0x0; /* reset value (SCOPE_SEL = 0) causes FIFO to shift out, */
wrmsr(msrnum, msr);
/* end of code for BTM */
}
- /* Enable Suspend on Halt*/
+ /* Enable Suspend on Halt */
msrnum = CPU_XC_CONFIG;
msr = rdmsr(msrnum);
msr.lo |= XC_CONFIG_SUSP_ON_HLT;
wrmsr(msrnum, msr);
- /* ENable SUSP and allow TSC to run in Suspend */
- /* to keep speed detection happy*/
+ /* ENable SUSP and allow TSC to run in Suspend */
+ /* to keep speed detection happy */
msrnum = CPU_BC_CONF_0;
msr = rdmsr(msrnum);
msr.lo |= TSC_SUSP_SET | SUSP_EN_SET;
wrmsr(msrnum, msr);
- /* Setup throttling to proper mode if it is ever enabled.*/
+ /* Setup throttling to proper mode if it is ever enabled. */
msrnum = 0x04C00001E;
msr.hi = 0x000000000;
msr.lo = 0x00000603C;
wrmsr(msrnum, msr);
-
-/* Only do this if we are building for 5535*/
-/* */
-/* FooGlue Setup*/
-/* */
+/* Only do this if we are building for 5535 */
+/* FooGlue Setup */
#if 1
- /* Enable CIS mode B in FooGlue*/
+ /* Enable CIS mode B in FooGlue */
msrnum = MSR_FG + 0x10;
msr = rdmsr(msrnum);
msr.lo &= ~3;
- msr.lo |= 2; /* ModeB*/
+ msr.lo |= 2; /* ModeB */
wrmsr(msrnum, msr);
#endif
-/* */
-/* Disable DOT PLL. Graphics init will enable it if needed.*/
-/* */
+/* Disable DOT PLL. Graphics init will enable it if needed. */
msrnum = GLCP_DOTPLL;
msr = rdmsr(msrnum);
msr.lo |= DOTPPL_LOWER_PD_SET;
wrmsr(msrnum, msr);
-/* */
-/* Enable RSDC*/
-/* */
+/* Enable RSDC */
msrnum = 0x1301 ;
msr = rdmsr(msrnum);
msr.lo |= 0x08;
wrmsr(msrnum, msr);
-/* */
-/* Enable BTB*/
-/* */
- /* I hate to put this check here but it doesn't really work in cpubug.asm*/
+/* Enable BTB */
+ /* I hate to put this check here but it doesn't really work in cpubug.asm */
msrnum = MSR_GLCP+0x17;
msr = rdmsr(msrnum);
if (msr.lo >= CPU_REV_2_1){
@@ -138,10 +124,8 @@ void cpuRegInit (void)
wrmsr(msrnum, msr);
}
-/* */
-/* FPU impercise exceptions bit*/
-/* */
- /*if (getnvram( TOKEN_FPU_IE_ENABLE) != TVALUE_DISABLE) {*/
+/* FPU impercise exceptions bit */
+ /* if (getnvram( TOKEN_FPU_IE_ENABLE) != TVALUE_DISABLE) { */
{
msrnum = CPU_FPU_MSR_MODE;
msr = rdmsr(msrnum);
@@ -150,16 +134,13 @@ void cpuRegInit (void)
}
#if 0
- /* */
- /* Cache Overides*/
- /* */
+ /* Cache Overides */
/* This code disables the data cache. Don't execute this
* unless you're testing something.
*/
- /* Allow NVRam to override DM Setup*/
- /*if (getnvram( TOKEN_CACHE_DM_MODE) != 1) {*/
+ /* Allow NVRam to override DM Setup */
+ /* if (getnvram( TOKEN_CACHE_DM_MODE) != 1) { */
{
-
msrnum = CPU_DM_CONFIG0;
msr = rdmsr(msrnum);
msr.lo |= DM_CONFIG0_LOWER_DCDIS_SET;
@@ -168,8 +149,8 @@ void cpuRegInit (void)
/* This code disables the instruction cache. Don't execute
* this unless you're testing something.
*/
- /* Allow NVRam to override IM Setup*/
- /*if (getnvram( TOKEN_CACHE_IM_MODE) ==1) {*/
+ /* Allow NVRam to override IM Setup */
+ /* if (getnvram( TOKEN_CACHE_IM_MODE) ==1) { */
{
msrnum = CPU_IM_CONFIG;
msr = rdmsr(msrnum);