White space and comment fixes for cache_as_ram.inc files so it's easier to spot

differences.  Trivial.

Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Myles Watson <mylesgw@gmail.com>


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

1 files changed, 193 insertions, 194 deletions

diff --git a/src/cpu/x86/car/cache_as_ram.inc b/src/cpu/x86/car/cache_as_ram.inc
index 4f1ae86af0..5c616c52fa 100644
--- a/src/cpu/x86/car/cache_as_ram.inc
+++ b/src/cpu/x86/car/cache_as_ram.inc
@@ -1,6 +1,6 @@
-/* 
+/*
  * This file is part of the coreboot project.
- * 
+ *
  * Copyright (C) 2000,2007 Ronald G. Minnich <rminnich@gmail.com>
  * Copyright (C) 2005 Eswar Nallusamy, LANL
  * Copyright (C) 2005 Tyan
@@ -8,16 +8,16 @@
  * Copyright (C) 2007 coresystems GmbH
  * (Written by Stefan Reinauer <stepan@coresystems.de> for coresystems GmbH)
  * Copyright (C) 2007 Carl-Daniel Hailfinger
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; version 2 of the License.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
@@ -28,107 +28,107 @@
 /* other's is the same as AMD except remove amd specific msr */
 
 #define CacheSize CONFIG_DCACHE_RAM_SIZE
-#define CacheBase (0xd0000 - CacheSize) 
+#define CacheBase (0xd0000 - CacheSize)
 
 #include <cpu/x86/mtrr.h>
 
 	/* Save the BIST result */
-	movl    %eax, %ebp
+	movl	%eax, %ebp
 
 CacheAsRam:
 	/* hope we can skip the double set for normal part */
 #if CONFIG_USE_FALLBACK_IMAGE == 1
 
-        // Check whether the processor has HT capability
-        movl    $01, %eax
-        cpuid
-        btl     $28, %edx
-        jnc     NotHtProcessor
-        bswapl  %ebx
-        cmpb    $01, %bh
-        jbe     NotHtProcessor
-
-        // It is a HT processor; Send SIPI to the other logical processor
-        // within this processor so that the CAR related common system registers
-        // are programmed accordingly
-
-        // Use some register that is common to both logical processors
-        // as semaphore. Refer Appendix B, Vol.3
-        xorl    %eax, %eax
-        xorl    %edx, %edx
-        movl    $0x250, %ecx
-        wrmsr
-
-        // Figure out the logical AP's APIC ID; the following logic will work
-        // only for processors with 2 threads
-        // Refer to Vol 3. Table 7-1 for details about this logic
-        movl    $0xFEE00020, %esi
-        movl    (%esi), %ebx
-        andl    $0xFF000000, %ebx
-        bswapl  %ebx
-        btl     $0, %ebx
-        jnc     LogicalAP0
-        andb    $0xFE, %bl
-        jmp     Send_SIPI
+	// Check whether the processor has HT capability
+	movl	$01, %eax
+	cpuid
+	btl	$28, %edx
+	jnc	NotHtProcessor
+	bswapl	%ebx
+	cmpb	$01, %bh
+	jbe	NotHtProcessor
+
+	// It is a HT processor; Send SIPI to the other logical processor
+	// within this processor so that the CAR related common system registers
+	// are programmed accordingly
+
+	// Use some register that is common to both logical processors
+	// as semaphore. Refer Appendix B, Vol.3
+	xorl	%eax, %eax
+	xorl	%edx, %edx
+	movl	$0x250, %ecx
+	wrmsr
+
+	// Figure out the logical AP's APIC ID; the following logic will work
+	// only for processors with 2 threads
+	// Refer to Vol 3. Table 7-1 for details about this logic
+	movl	$0xFEE00020, %esi
+	movl	(%esi), %ebx
+	andl	$0xFF000000, %ebx
+	bswapl	%ebx
+	btl	$0, %ebx
+	jnc	LogicalAP0
+	andb	$0xFE, %bl
+	jmp	Send_SIPI
 LogicalAP0:
-        orb     $0x01, %bl
+	orb	$0x01, %bl
 Send_SIPI:
-        bswapl  %ebx  // ebx - logical AP's APIC ID
+	bswapl	%ebx  // ebx - logical AP's APIC ID
 
-        // Fill up the IPI command registers in the Local APIC mapped to default address
-        // and issue SIPI to the other logical processor within this processor die.
+	// Fill up the IPI command registers in the Local APIC mapped to default address
+	// and issue SIPI to the other logical processor within this processor die.
 Retry_SIPI:
-        movl    %ebx, %eax
-        movl    $0xFEE00310, %esi
-        movl    %eax, (%esi)
+	movl	%ebx, %eax
+	movl	$0xFEE00310, %esi
+	movl	%eax, (%esi)
 
-        // SIPI vector - F900:0000
-        movl    $0x000006F9, %eax
-        movl    $0xFEE00300, %esi
-        movl    %eax, (%esi)
+	// SIPI vector - F900:0000
+	movl	$0x000006F9, %eax
+	movl	$0xFEE00300, %esi
+	movl	%eax, (%esi)
 
-        movl    $0x30, %ecx
+	movl	$0x30, %ecx
 SIPI_Delay:
-        pause
-        decl    %ecx
-        jnz     SIPI_Delay
+	pause
+	decl	%ecx
+	jnz	SIPI_Delay
 
-        movl    (%esi), %eax
-        andl    $0x00001000, %eax
-        jnz     Retry_SIPI
+	movl	(%esi), %eax
+	andl	$0x00001000, %eax
+	jnz	Retry_SIPI
 
-        // Wait for the Logical AP to complete initialization
+	// Wait for the Logical AP to complete initialization
 LogicalAP_SIPINotdone:
-        movl    $0x250, %ecx
-        rdmsr
-        orl     %eax, %eax
-        jz      LogicalAP_SIPINotdone
+	movl	$0x250, %ecx
+	rdmsr
+	orl	%eax, %eax
+	jz	LogicalAP_SIPINotdone
 
 NotHtProcessor:
 
 #if 1
-        /* Set the default memory type and enable fixed and variable MTRRs */
-        movl    $MTRRdefType_MSR, %ecx
-        xorl    %edx, %edx
-        /* Enable Variable and Fixed MTRRs */
-        movl    $0x00000c00, %eax
-        wrmsr
+	/* Set the default memory type and enable fixed and variable MTRRs */
+	movl	$MTRRdefType_MSR, %ecx
+	xorl	%edx, %edx
+	/* Enable Variable and Fixed MTRRs */
+	movl	$0x00000c00, %eax
+	wrmsr
 #endif
 
-	/*Clear all MTRRs */
+	/* Clear all MTRRs */
+	xorl	%edx, %edx
+	movl	$fixed_mtrr_msr, %esi
 
-	xorl    %edx, %edx
-	movl    $fixed_mtrr_msr, %esi
 clear_fixed_var_mtrr:
-        lodsl   (%esi), %eax
-        testl   %eax, %eax
-        jz      clear_fixed_var_mtrr_out
+	lodsl	(%esi), %eax
+	testl	%eax, %eax
+	jz	clear_fixed_var_mtrr_out
 
-        movl    %eax, %ecx
-        xorl    %eax, %eax
-        wrmsr   
+	movl	%eax, %ecx
+	xorl	%eax, %eax
+	wrmsr
 
-        jmp     clear_fixed_var_mtrr
+	jmp	clear_fixed_var_mtrr
 clear_fixed_var_mtrr_out:
 
 /* 0x06 is the WB IO type for a given 4k segment.
@@ -144,13 +144,13 @@ clear_fixed_var_mtrr_out:
 	 */
 	xorl \reg, \reg
 .elseif \segs == 1
-	movl $0x06000000, \reg
+	movl $0x06000000, \reg /* WB IO type */
 .elseif \segs == 2
-	movl $0x06060000, \reg
+	movl $0x06060000, \reg /* WB IO type */
 .elseif \segs == 3
-	movl $0x06060600, \reg
+	movl $0x06060600, \reg /* WB IO type */
 .elseif \segs >= 4
-	movl $0x06060606, \reg
+	movl $0x06060606, \reg /* WB IO type */
 .endif
 .endm
 
@@ -179,170 +179,169 @@ clear_fixed_var_mtrr_out:
 #error Invalid CAR size, is not a multiple of 4k. This is a processor limitation.
 #endif
 
-#if CacheSize > 0x8000 
-        /* enable caching for 32K-64K using fixed mtrr */
-        movl    $0x268, %ecx  /* fix4k_c0000*/
+#if CacheSize > 0x8000
+	/* enable caching for 32K-64K using fixed mtrr */
+	movl	$0x268, %ecx  /* fix4k_c0000*/
 	simplemask CacheSize, 0x8000
-        wrmsr
+	wrmsr
 #endif
 
-        /* enable caching for 0-32K using fixed mtrr */
-        movl    $0x269, %ecx  /* fix4k_c8000*/
+	/* enable caching for 0-32K using fixed mtrr */
+	movl	$0x269, %ecx  /* fix4k_c8000*/
 	simplemask CacheSize, 0
 	wrmsr
 
 #else
-        /* disable cache */
-        movl    %cr0, %eax
-        orl    $(0x1<<30),%eax
-        movl    %eax, %cr0
+	/* disable cache */
+	movl	%cr0, %eax
+	orl	$(0x1 << 30), %eax
+	movl	%eax, %cr0
 
 #endif /*  CONFIG_USE_FALLBACK_IMAGE == 1*/
 
 #if defined(CONFIG_XIP_ROM_SIZE) && defined(CONFIG_XIP_ROM_BASE)
-        /* enable write base caching so we can do execute in place
-         * on the flash rom.
-         */
-        movl    $0x202, %ecx
-        xorl    %edx, %edx
-        movl    $(CONFIG_XIP_ROM_BASE | MTRR_TYPE_WRBACK), %eax
-        wrmsr
-
-        movl    $0x203, %ecx
-        movl    $0x0000000f, %edx
-        movl    $(~(CONFIG_XIP_ROM_SIZE - 1) | 0x800), %eax
-        wrmsr
+	/* enable write base caching so we can do execute in place
+	 * on the flash rom.
+	 */
+	movl	$0x202, %ecx
+	xorl	%edx, %edx
+	movl	$(CONFIG_XIP_ROM_BASE | MTRR_TYPE_WRBACK), %eax
+	wrmsr
+
+	movl	$0x203, %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    $0x9fffffff,%eax
-        movl    %eax, %cr0
+	/* enable cache */
+	movl	%cr0, %eax
+	andl	$0x9fffffff, %eax
+	movl	%eax, %cr0
 
 #if CONFIG_USE_FALLBACK_IMAGE == 1
 
 	/* Read the range with lodsl*/
-        movl    $CacheBase, %esi
+	movl	$CacheBase, %esi
 	cld
-        movl    $(CacheSize>>2), %ecx
-        rep     lodsl
+	movl	$(CacheSize >> 2), %ecx
+	rep	lodsl
 
 	/* Clear the range */
-        movl    $CacheBase, %edi
-        movl    $(CacheSize>>2), %ecx
-        xorl    %eax, %eax
-        rep     stosl
+	movl	$CacheBase, %edi
+	movl	$(CacheSize >> 2), %ecx
+	xorl	%eax, %eax
+	rep	stosl
 
 
 #if 0
 	/* check the cache as ram */
-        movl  $CacheBase, %esi
-        movl    $(CacheSize>>2), %ecx
-.xin1:  
-        movl  %esi, %eax
-        movl  %eax, (%esi)
-        decl  %ecx
-        je      .xout1
-        add     $4, %esi
-        jmp     .xin1
-.xout1: 
-
-        movl  $CacheBase, %esi
+	movl	$CacheBase, %esi
+	movl	$(CacheSize>>2), %ecx
+.xin1:
+	movl	%esi, %eax
+	movl	%eax, (%esi)
+	decl	%ecx
+	je	.xout1
+	add	$4, %esi
+	jmp	.xin1
+.xout1:
+
+	movl	$CacheBase, %esi
 //        movl    $(CacheSize>>2), %ecx
 	movl $4, %ecx
 .xin1x:
-        movl  %esi, %eax
-
-        movl    $0x4000, %edx
-        movb    %ah, %al 
-.testx1:  
-        outb %al, $0x80
-        decl    %edx
-        jnz .testx1
-        
-        movl  (%esi), %eax
-        cmpb 0xff, %al
-        je .xin2  /* dont show */
-
-        movl    $0x4000, %edx
+	movl	%esi, %eax
+
+	movl	$0x4000, %edx
+	movb	%ah, %al
+.testx1:
+	outb %al, $0x80
+	decl	%edx
+	jnz .testx1
+
+	movl	(%esi), %eax
+	cmpb 0xff, %al
+	je .xin2  /* dont show */
+
+	movl	$0x4000, %edx
 .testx2:
-        outb %al, $0x80
-        decl    %edx
-        jnz .testx2
-        
+	outb %al, $0x80
+	decl	%edx
+	jnz .testx2
+
 .xin2:  decl     %ecx
-        je      .xout1x
-        add     $4, %esi
-        jmp     .xin1x
+	je	.xout1x
+	add	$4, %esi
+	jmp	.xin1x
 .xout1x:
 
 #endif
 #endif /*CONFIG_USE_FALLBACK_IMAGE == 1*/
 
 
-	movl	$(CacheBase+CacheSize-4), %eax
-	movl    %eax, %esp
+	movl	$(CacheBase + CacheSize - 4), %eax
+	movl	%eax, %esp
 
 	/* Load a different set of data segments */
 #if CONFIG_USE_INIT
-	movw    $CACHE_RAM_DATA_SEG, %ax
-	movw    %ax, %ds
-	movw    %ax, %es
-	movw    %ax, %ss
+	movw	$CACHE_RAM_DATA_SEG, %ax
+	movw	%ax, %ds
+	movw	%ax, %es
+	movw	%ax, %ss
 #endif
 
 lout:
-
 	/* Restore the BIST result */
 	movl	%ebp, %eax
+
 	/* We need to set ebp ? No need */
 	movl	%esp, %ebp
-	pushl 	%eax  /* bist */
-	call    amd64_main
+	pushl	%eax  /* bist */
+	call	amd64_main
 	/* We will not go back */
 
-
-fixed_mtrr_msr: 
-        .long   0x250, 0x258, 0x259
-        .long   0x268, 0x269, 0x26A
-        .long   0x26B, 0x26C, 0x26D
-        .long   0x26E, 0x26F
-var_mtrr_msr:   
-        .long   0x200, 0x201, 0x202, 0x203
-        .long   0x204, 0x205, 0x206, 0x207
-        .long   0x208, 0x209, 0x20A, 0x20B
-        .long   0x20C, 0x20D, 0x20E, 0x20F
-        .long   0x000 /* NULL, end of table */
+fixed_mtrr_msr:
+	.long	0x250, 0x258, 0x259
+	.long	0x268, 0x269, 0x26A
+	.long	0x26B, 0x26C, 0x26D
+	.long	0x26E, 0x26F
+var_mtrr_msr:
+	.long	0x200, 0x201, 0x202, 0x203
+	.long	0x204, 0x205, 0x206, 0x207
+	.long	0x208, 0x209, 0x20A, 0x20B
+	.long	0x20C, 0x20D, 0x20E, 0x20F
+	.long	0x000 /* NULL, end of table */
 
 #if CONFIG_USE_FALLBACK_IMAGE == 1
-        .align 0x1000
-        .code16
+	.align 0x1000
+	.code16
 .global LogicalAP_SIPI
 LogicalAP_SIPI:
-        // cr0 register is shared among the logical processors; 
-        // so clear CD & NW bits so that the BSP's cr0 register 
-        // controls the cache behavior
-        // Note: The cache behavior is determined by "OR" result 
-        // of the cr0 registers of the logical processors
-
-        movl    %cr0, %eax
-        andl    $0x9FFFFFFF, %eax
-        movl    %eax, %cr0
-
-        finit
-
-        // Set the semaphore to indicate the Logical AP is done
-        // with CAR specific initialization
-        movl    $0x250, %ecx
-        movl    $0x06, %eax
-        xorl    %edx, %edx
-        wrmsr
-
-        // Halt this AP
-        cli
+	// cr0 register is shared among the logical processors;
+	// so clear CD & NW bits so that the BSP's cr0 register
+	// controls the cache behavior
+	// Note: The cache behavior is determined by "OR" result
+	// of the cr0 registers of the logical processors
+
+	movl	%cr0, %eax
+	andl	$0x9FFFFFFF, %eax
+	movl	%eax, %cr0
+
+	finit
+
+	// Set the semaphore to indicate the Logical AP is done
+	// with CAR specific initialization
+	movl	$0x250, %ecx
+	movl	$0x06, %eax
+	xorl	%edx, %edx
+	wrmsr
+
+	// Halt this AP
+	cli
 Halt_LogicalAP:
-        hlt
-        jmp     Halt_LogicalAP
-        .code32
+	hlt
+	jmp	Halt_LogicalAP
+	.code32
 #endif /*CONFIG_USE_FALLBACK_IMAGE == 1*/
 .CacheAsRam_out: