Patchwork Geode GX2 comment cleanup 2

login
register
about
Submitter Nils
Date 2010-11-02 21:32:59
Message ID <201011022232.59237.njacobs8@hetnet.nl>
Download mbox | patch
Permalink /patch/2228/
State Accepted
Commit r6015
Headers show

Comments

Nils - 2010-11-02 21:32:59
This patch  cleans up some more comments and white space in 
model_gx2/cpureginit.c .

Signed-off-by: Nils Jacobs <njacobs8@hetnet.nl>

This is Abuild and boot tested.

Thanks, Nils.
Uwe Hermann - 2010-11-03 13:23:36
On Tue, Nov 02, 2010 at 10:32:59PM +0100, Nils wrote:
> This patch  cleans up some more comments and white space in 
> model_gx2/cpureginit.c .
> 
> Signed-off-by: Nils Jacobs <njacobs8@hetnet.nl>

Thanks, r6015. Minor request, please drop the "This patch ..." from the
patch descriptions, just say directly what it does (as we usually use
the description as commit message).

"Clean up stuff" looks better than "This patch cleans up stuff" in svn logs.


Uwe.
Nils - 2010-11-03 20:56:06
Hi Uwe,
Op woensdag 3 november 2010 14:23:36 schreef u:
>Thanks, r6015
Thanks for the fast review and commit.

> "Clean up stuff" looks better than "This patch cleans up stuff" in svn
> logs.
OK will do better next time.

Thanks, Nils.

Patch

Index: src/cpu/amd/model_gx2/cpureginit.c
===================================================================
--- src/cpu/amd/model_gx2/cpureginit.c	(revision 6011)
+++ src/cpu/amd/model_gx2/cpureginit.c	(working copy)
@@ -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.*/
+		/* 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*/
-
-		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 @@ 
 		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 @@ 
 	}
 
 #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 @@ 
 	/* 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);