Cosmetics, whitespace and coding-style fixes for Intel CAR (trivial).

This is abuild-tested.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5901 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

1 files changed, 69 insertions, 70 deletions

diff --git a/src/cpu/intel/model_6ex/cache_as_ram.inc b/src/cpu/intel/model_6ex/cache_as_ram.inc
index 1f22ad0f97..dbc7cdc583 100644
--- a/src/cpu/intel/model_6ex/cache_as_ram.inc
+++ b/src/cpu/intel/model_6ex/cache_as_ram.inc
@@ -18,140 +18,140 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#define CACHE_AS_RAM_SIZE CONFIG_DCACHE_RAM_SIZE
-#define CACHE_AS_RAM_BASE CONFIG_DCACHE_RAM_BASE
-
 #include <cpu/x86/stack.h>
 #include <cpu/x86/mtrr.h>
 
-	/* Save the BIST result */
-	movl    %eax, %ebp
+#define CACHE_AS_RAM_SIZE CONFIG_DCACHE_RAM_SIZE
+#define CACHE_AS_RAM_BASE CONFIG_DCACHE_RAM_BASE
+
+	/* Save the BIST result. */
+	movl	%eax, %ebp
 
 cache_as_ram:
 	post_code(0x20)
 
-	/* Send INIT IPI to all excluding ourself */
-        movl	$0x000C4500, %eax
-        movl	$0xFEE00300, %esi
-        movl	%eax, (%esi)
+	/* Send INIT IPI to all excluding ourself. */
+	movl	$0x000C4500, %eax
+	movl	$0xFEE00300, %esi
+	movl	%eax, (%esi)
 
-	/* Zero out all Fixed Range and Variable Range MTRRs */
+	/* Zero out all fixed range and variable range MTRRs. */
 	movl	$mtrr_table, %esi
-	movl	$( (mtrr_table_end - mtrr_table) / 2), %edi
-	xorl    %eax, %eax
-	xorl    %edx, %edx
+	movl	$((mtrr_table_end - mtrr_table) / 2), %edi
+	xorl	%eax, %eax
+	xorl	%edx, %edx
 clear_mtrrs:
-	movw    (%esi), %bx
-	movzx   %bx, %ecx
+	movw	(%esi), %bx
+	movzx	%bx, %ecx
 	wrmsr
 	add	$2, %esi
 	dec	%edi
 	jnz	clear_mtrrs
 
-	/* Configure the default memory type to uncacheable */
+	/* Configure the default memory type to uncacheable. */
 	movl	$MTRRdefType_MSR, %ecx
 	rdmsr
 	andl	$(~0x00000cff), %eax
 	wrmsr
 
-	/* Set cache as ram base address */
+	/* Set Cache-as-RAM base address. */
 	movl	$(MTRRphysBase_MSR(0)), %ecx
 	movl	$(CACHE_AS_RAM_BASE | MTRR_TYPE_WRBACK), %eax
 	xorl	%edx, %edx
 	wrmsr
 
-	/* Set cache as ram mask */
+	/* Set Cache-as-RAM mask. */
 	movl	$(MTRRphysMask_MSR(0)), %ecx
-	movl	$(~((CACHE_AS_RAM_SIZE-1)) | (1 << 11)), %eax
+	movl	$(~((CACHE_AS_RAM_SIZE - 1)) | (1 << 11)), %eax
 	movl	$0x0000000f, %edx
 	wrmsr
 
-	/* Enable MTRR */
+	/* Enable MTRR. */
 	movl	$MTRRdefType_MSR, %ecx
 	rdmsr
 	orl	$(1 << 11), %eax
 	wrmsr
 
-	/* Enable L2 Cache */
+	/* Enable L2 cache. */
 	movl	$0x11e, %ecx
 	rdmsr
 	orl	$(1 << 8), %eax
 	wrmsr
 
-	/* CR0.CD = 0, CR0.NW = 0 */
+	/* Enable cache (CR0.CD = 0, CR0.NW = 0). */
         movl	%cr0, %eax
-	andl	$( ~( (1 << 30) | (1 << 29) ) ), %eax
+	andl	$(~((1 << 30) | (1 << 29))), %eax
 	invd
 	movl	%eax, %cr0
 
-	/* Clear the cache memory reagion */
+	/* Clear the cache memory reagion. */
 	movl	$CACHE_AS_RAM_BASE, %esi
 	movl	%esi, %edi
 	movl	$(CACHE_AS_RAM_SIZE / 4), %ecx
-	//movl	$0x23322332, %eax
+	// movl	$0x23322332, %eax
 	xorl	%eax, %eax
 	rep	stosl
 
-	/* Enable Cache As RAM mode by disabling cache */
+	/* Enable Cache-as-RAM mode by disabling cache. */
 	movl	%cr0, %eax
 	orl	$(1 << 30), %eax
 	movl	%eax, %cr0
 
 #if defined(CONFIG_XIP_ROM_SIZE) && defined(CONFIG_XIP_ROM_BASE)
 	/* Enable cache for our code in Flash because we do XIP here */
-        movl    $MTRRphysBase_MSR(1), %ecx
-        xorl    %edx, %edx
+	movl	$MTRRphysBase_MSR(1), %ecx
+	xorl	%edx, %edx
 #if defined(CONFIG_TINY_BOOTBLOCK) && CONFIG_TINY_BOOTBLOCK
 #define REAL_XIP_ROM_BASE AUTO_XIP_ROM_BASE
 #else
 #define REAL_XIP_ROM_BASE CONFIG_XIP_ROM_BASE
 #endif
-        movl    $REAL_XIP_ROM_BASE, %eax
-        orl     $MTRR_TYPE_WRBACK, %eax
-        wrmsr
-
-        movl    $MTRRphysMask_MSR(1), %ecx
-        movl    $0x0000000f, %edx
-        movl    $(~(CONFIG_XIP_ROM_SIZE - 1) | 0x800), %eax
-        wrmsr
+	movl	$REAL_XIP_ROM_BASE, %eax
+	orl	$MTRR_TYPE_WRBACK, %eax
+	wrmsr
+
+	movl	$MTRRphysMask_MSR(1), %ecx
+	movl	$0x0000000f, %edx
+	movl	$(~(CONFIG_XIP_ROM_SIZE - 1) | 0x800), %eax
+	wrmsr
 #endif /* CONFIG_XIP_ROM_SIZE && CONFIG_XIP_ROM_BASE */
 
-        /* enable cache */
-        movl	%cr0, %eax
-	andl	$( ~( (1 << 30) | (1 << 29) ) ), %eax
+	/* Enable cache. */
+	movl	%cr0, %eax
+	andl	$(~((1 << 30) | (1 << 29))), %eax
 	movl	%eax, %cr0
 
-	/* Set up stack pointer */
+	/* Set up the stack pointer. */
 #if defined(CONFIG_USBDEBUG) && (CONFIG_USBDEBUG == 1)
-	/* leave some space for the struct ehci_debug_info */
+	/* Leave some space for the struct ehci_debug_info. */
 	movl	$(CACHE_AS_RAM_BASE + CACHE_AS_RAM_SIZE - 4 - 128), %eax
 #else
 	movl	$(CACHE_AS_RAM_BASE + CACHE_AS_RAM_SIZE - 4), %eax
 #endif
 	movl	%eax, %esp
 
-	/* Restore the BIST result */
+	/* Restore the BIST result. */
 	movl	%ebp, %eax
 	movl	%esp, %ebp
 	pushl	%eax
 
 	post_code(0x23)
 
-	/* Call romstage.c main function */
+	/* Call romstage.c main function. */
 	call	main
 
 	post_code(0x2f)
 
 	post_code(0x30)
 
-	/* Disable Cache */
+	/* Disable cache. */
 	movl	%cr0, %eax
-	orl    $(1 << 30), %eax
+	orl	$(1 << 30), %eax
 	movl	%eax, %cr0
 
 	post_code(0x31)
 
-	/* Disable MTRR */
+	/* Disable MTRR. */
 	movl	$MTRRdefType_MSR, %ecx
 	rdmsr
 	andl	$(~(1 << 11)), %eax
@@ -175,41 +175,40 @@ clear_mtrrs:
 
 	post_code(0x33)
 
-	/* Enable Cache */
+	/* Enable cache. */
 	movl	%cr0, %eax
-	andl    $~( (1 << 30) | (1 << 29) ), %eax
+	andl	$~((1 << 30) | (1 << 29)), %eax
 	movl	%eax, %cr0
 
-
 	post_code(0x36)
 
-	/* Disable Cache */
+	/* Disable cache. */
 	movl	%cr0, %eax
-	orl    $(1 << 30), %eax
+	orl	$(1 << 30), %eax
 	movl	%eax, %cr0
 
 	post_code(0x38)
 
-	/* Enable Write Back and Speculative Reads for the first 1MB */
+	/* Enable Write Back and Speculative Reads for the first 1MB. */
 	movl	$MTRRphysBase_MSR(0), %ecx
 	movl	$(0x00000000 | MTRR_TYPE_WRBACK), %eax
 	xorl	%edx, %edx
 	wrmsr
 	movl	$MTRRphysMask_MSR(0), %ecx
-	movl	$(~(1024*1024 -1) | (1 << 11)), %eax
+	movl	$(~(1024 * 1024 - 1) | (1 << 11)), %eax
 	movl	$0x0000000f, %edx	// 36bit address space
 	wrmsr
 
 	post_code(0x39)
 
-	/* And Enable Cache again after setting MTRRs */
+	/* And enable cache again after setting MTRRs. */
 	movl	%cr0, %eax
-	andl    $~( (1 << 30) | (1 << 29) ), %eax
+	andl	$~((1 << 30) | (1 << 29)), %eax
 	movl	%eax, %cr0
 
 	post_code(0x3a)
 
-	/* Enable MTRR */
+	/* Enable MTRR. */
 	movl	$MTRRdefType_MSR, %ecx
 	rdmsr
 	orl	$(1 << 11), %eax
@@ -217,23 +216,23 @@ clear_mtrrs:
 
 	post_code(0x3b)
 
-	/* Invalidate the cache again */
+	/* Invalidate the cache again. */
 	invd
 
 	post_code(0x3c)
 
-	/* clear boot_complete flag */
+	/* Clear boot_complete flag. */
 	xorl	%ebp, %ebp
 __main:
 	post_code(0x11)
-	cld			/* clear direction flag */
+	cld			/* Clear direction flag. */
 
 	movl	%ebp, %esi
 
-	movl $ROMSTAGE_STACK, %esp
+	movl	$ROMSTAGE_STACK, %esp
 	movl	%esp, %ebp
-	pushl %esi
-	call copy_and_run
+	pushl	%esi
+	call	copy_and_run
 
 .Lhlt:
 	post_code(0xee)
@@ -242,14 +241,14 @@ __main:
 
 mtrr_table:
 	/* Fixed MTRRs */
-        .word 0x250, 0x258, 0x259
-        .word 0x268, 0x269, 0x26A
-        .word 0x26B, 0x26C, 0x26D
-        .word 0x26E, 0x26F
+	.word 0x250, 0x258, 0x259
+	.word 0x268, 0x269, 0x26A
+	.word 0x26B, 0x26C, 0x26D
+	.word 0x26E, 0x26F
 	/* Variable MTRRs */
-        .word 0x200, 0x201, 0x202, 0x203
-        .word 0x204, 0x205, 0x206, 0x207
-        .word 0x208, 0x209, 0x20A, 0x20B
-        .word 0x20C, 0x20D, 0x20E, 0x20F
+	.word 0x200, 0x201, 0x202, 0x203
+	.word 0x204, 0x205, 0x206, 0x207
+	.word 0x208, 0x209, 0x20A, 0x20B
+	.word 0x20C, 0x20D, 0x20E, 0x20F
 mtrr_table_end: