[commit] r6493 - in trunk/src/cpu: amd/car intel/car intel/model_6ex intel/model_6fx

[repository service]

Author: stepan
Date: Thu Apr 14 22:06:30 2011
New Revision: 6493
URL: https://tracker.coreboot.org/trac/coreboot/changeset/6493

Log:
Use symbolic names for some MTRR bits instead of numbers in CAR code

Signed-off-by: Stefan Reinauer 
Acked-by: Stefan Reinauer

Modified:
   trunk/src/cpu/amd/car/cache_as_ram.inc
   trunk/src/cpu/intel/car/cache_as_ram.inc
   trunk/src/cpu/intel/model_6ex/cache_as_ram.inc
   trunk/src/cpu/intel/model_6fx/cache_as_ram.inc

Modified: trunk/src/cpu/amd/car/cache_as_ram.inc
==============================================================================
--- trunk/src/cpu/amd/car/cache_as_ram.inc	Thu Apr 14 21:52:04 2011	(r6492)
+++ trunk/src/cpu/amd/car/cache_as_ram.inc	Thu Apr 14 22:06:30 2011	(r6493)
@@ -77,7 +77,7 @@
    /* Check if cpu_init_detected. */
    movl	$MTRRdefType_MSR, %ecx
    rdmsr
-	andl	$(1 << 11), %eax
+	andl	$MTRRdefTypeEn, %eax
    movl	%eax, %ebx	/* We store the status. */

jmp_if_k8(CAR_FAM10_out_post_errata)
@@ -306,7 +306,7 @@
    jmp_if_k8(wbcache_post_fam10_setup)
    movl	$0xffff, %edx /* (1 << (CONFIG_CPU_ADDR_BITS - 32)) - 1 for FAM10 (CONFIG_CPU_ADDR_BITS = 48) */
 wbcache_post_fam10_setup:
-	movl	$(~(CONFIG_XIP_ROM_SIZE - 1) | 0x800), %eax
+	movl	$(~(CONFIG_XIP_ROM_SIZE - 1) | MTRRphysMaskValid), %eax
    wrmsr
 #endif /* CONFIG_XIP_ROM_SIZE && CONFIG_XIP_ROM_BASE */

Modified: trunk/src/cpu/intel/car/cache_as_ram.inc
==============================================================================
--- trunk/src/cpu/intel/car/cache_as_ram.inc	Thu Apr 14 21:52:04 2011	(r6492)
+++ trunk/src/cpu/intel/car/cache_as_ram.inc	Thu Apr 14 22:06:30 2011	(r6493)
@@ -254,7 +254,7 @@

movl	$MTRRphysMask_MSR(1), %ecx
    movl	$0x0000000f, %edx
-	movl	$(~(CONFIG_XIP_ROM_SIZE - 1) | 0x800), %eax
+	movl	$(~(CONFIG_XIP_ROM_SIZE - 1) | MTRRphysMaskValid), %eax
    wrmsr
 #endif /* CONFIG_XIP_ROM_SIZE && CONFIG_XIP_ROM_BASE */

@@ -354,7 +354,7 @@
     */
    movl	$MTRRdefType_MSR, %ecx
    xorl	%edx, %edx
-	movl	$0x00000800, %eax /* Enable variable and disable fixed MTRRs. */
+	movl	$MTRRdefTypeEn, %eax /* Enable variable and disable fixed MTRRs. */
    wrmsr

/* Enable cache. */

Modified: trunk/src/cpu/intel/model_6ex/cache_as_ram.inc
==============================================================================
--- trunk/src/cpu/intel/model_6ex/cache_as_ram.inc	Thu Apr 14 21:52:04 2011	(r6492)
+++ trunk/src/cpu/intel/model_6ex/cache_as_ram.inc	Thu Apr 14 22:06:30 2011	(r6493)
@@ -63,14 +63,14 @@

/* 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) | MTRRphysMaskValid), %eax
    movl	$0x0000000f, %edx
    wrmsr

/* Enable MTRR. */
    movl	$MTRRdefType_MSR, %ecx
    rdmsr
-	orl	$(1 << 11), %eax
+	orl	$MTRRdefTypeEn, %eax
    wrmsr

/* Enable L2 cache. */
@@ -118,7 +118,7 @@

movl	$MTRRphysMask_MSR(1), %ecx
    movl	$0x0000000f, %edx
-	movl	$(~(CONFIG_XIP_ROM_SIZE - 1) | 0x800), %eax
+	movl	$(~(CONFIG_XIP_ROM_SIZE - 1) | MTRRphysMaskValid), %eax
    wrmsr
 #endif /* CONFIG_XIP_ROM_SIZE && CONFIG_XIP_ROM_BASE */

@@ -160,7 +160,7 @@
    /* Disable MTRR. */
    movl	$MTRRdefType_MSR, %ecx
    rdmsr
-	andl	$(~(1 << 11)), %eax
+	andl	$(~MTRRdefTypeEn), %eax
    wrmsr

post_code(0x31)
@@ -201,7 +201,7 @@
    xorl	%edx, %edx
    wrmsr
    movl	$MTRRphysMask_MSR(0), %ecx
-	movl	$(~(1024 * 1024 - 1) | (1 << 11)), %eax
+	movl	$(~(1024 * 1024 - 1) | MTRRphysMaskValid), %eax
    movl	$0x0000000f, %edx	// 36bit address space
    wrmsr

@@ -217,7 +217,7 @@
    /* Enable MTRR. */
    movl	$MTRRdefType_MSR, %ecx
    rdmsr
-	orl	$(1 << 11), %eax
+	orl	$MTRRdefTypeEn, %eax
    wrmsr

post_code(0x3b)

Modified: trunk/src/cpu/intel/model_6fx/cache_as_ram.inc
==============================================================================
--- trunk/src/cpu/intel/model_6fx/cache_as_ram.inc	Thu Apr 14 21:52:04 2011	(r6492)
+++ trunk/src/cpu/intel/model_6fx/cache_as_ram.inc	Thu Apr 14 22:06:30 2011	(r6493)
@@ -70,14 +70,14 @@

/* 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) | MTRRphysMaskValid), %eax
    movl	$0x0000000f, %edx
    wrmsr

/* Enable MTRR. */
    movl	$MTRRdefType_MSR, %ecx
    rdmsr
-	orl	$(1 << 11), %eax
+	orl	$MTRRdefTypeEn, %eax
    wrmsr

/* Enable L2 cache. */
@@ -125,7 +125,7 @@

movl	$MTRRphysMask_MSR(1), %ecx
    movl	$0x0000000f, %edx
-	movl	$(~(CONFIG_XIP_ROM_SIZE - 1) | 0x800), %eax
+	movl	$(~(CONFIG_XIP_ROM_SIZE - 1) | MTRRphysMaskValid), %eax
    wrmsr
 #endif /* CONFIG_XIP_ROM_SIZE && CONFIG_XIP_ROM_BASE */

@@ -167,7 +167,7 @@
    /* Disable MTRR. */
    movl	$MTRRdefType_MSR, %ecx
    rdmsr
-	andl	$(~(1 << 11)), %eax
+	andl	$(~MTRRdefTypeEn), %eax
    wrmsr

post_code(0x31)
@@ -208,7 +208,7 @@
    xorl	%edx, %edx
    wrmsr
    movl	$MTRRphysMask_MSR(0), %ecx
-	movl	$(~(1024 * 1024 - 1) | (1 << 11)), %eax
+	movl	$(~(1024 * 1024 - 1) | MTRRphysMaskValid), %eax
    movl	$0x0000000f, %edx	// 36bit address space
    wrmsr

@@ -224,7 +224,7 @@
    /* Enable MTRR. */
    movl	$MTRRdefType_MSR, %ecx
    rdmsr
-	orl	$(1 << 11), %eax
+	orl	$MTRRdefTypeEn, %eax
    wrmsr

post_code(0x3b)