X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Framtest.c;h=b35c36d5621943d885b192ce2c4771edcb8dfd48;hb=f28dbe0c5d299297029afe01bb7329c6c18ae3db;hp=6268aaa6cd516e319b792f3916a1288ab70a3106;hpb=a7acc515bd10f24d400b3aa3a3c807076cac4f95;p=coreboot.git

diff --git a/src/lib/ramtest.c b/src/lib/ramtest.c
index 6268aaa6c..b35c36d56 100644
--- a/src/lib/ramtest.c
+++ b/src/lib/ramtest.c
@@ -1,4 +1,8 @@
-static void write_phys(unsigned long addr, unsigned long value)
+#include <stdint.h>
+#include <lib.h> /* Prototypes */
+#include <console/console.h>
+
+static void write_phys(unsigned long addr, u32 value)
 {
 	// Assembler in lib/ is very ugly. But we properly guarded
 	// it so let's obey this one for now
@@ -7,7 +11,7 @@ static void write_phys(unsigned long addr, unsigned long value)
 		"movnti %1, (%0)"
 		: /* outputs */
 		: "r" (addr), "r" (value) /* inputs */
-#ifndef __GNUC__
+#ifndef __GNUC__ /* GCC does not like empty clobbers? */
 		: /* clobbers */
 #endif
 		);
@@ -18,50 +22,64 @@ static void write_phys(unsigned long addr, unsigned long value)
 #endif
 }
 
-static unsigned long read_phys(unsigned long addr)
+static u32 read_phys(unsigned long addr)
 {
 	volatile unsigned long *ptr;
 	ptr = (void *)addr;
 	return *ptr;
 }
 
+static void phys_memory_barrier(void)
+{
+#if CONFIG_SSE2
+	// Needed for movnti
+	asm volatile (
+		"sfence"
+		::
+#ifdef __GNUC__ /* ROMCC does not like memory clobbers */
+		: "memory"
+#endif
+	);
+#else
+#ifdef __GNUC__ /* ROMCC does not like empty asm statements */
+	asm volatile ("" ::: "memory");
+#endif
+#endif
+}
+
 static void ram_fill(unsigned long start, unsigned long stop)
 {
 	unsigned long addr;
-	/* 
+	/*
 	 * Fill.
 	 */
-#if CONFIG_USE_PRINTK_IN_CAR
-	printk_debug("DRAM fill: 0x%08lx-0x%08lx\r\n", start, stop);
+#if !defined(__ROMCC__)
+	printk(BIOS_DEBUG, "DRAM fill: 0x%08lx-0x%08lx\n", start, stop);
 #else
 	print_debug("DRAM fill: ");
 	print_debug_hex32(start);
 	print_debug("-");
 	print_debug_hex32(stop);
-	print_debug("\r\n");
+	print_debug("\n");
 #endif
 	for(addr = start; addr < stop ; addr += 4) {
 		/* Display address being filled */
 		if (!(addr & 0xfffff)) {
-#if CONFIG_USE_PRINTK_IN_CAR
-			printk_debug("%08lx \r", addr);
+#if !defined(__ROMCC__)
+			printk(BIOS_DEBUG, "%08lx \r", addr);
 #else
 			print_debug_hex32(addr);
 			print_debug(" \r");
 #endif
 		}
-		write_phys(addr, addr);
+		write_phys(addr, (u32)addr);
 	};
-#if CONFIG_SSE2
-	// Needed for movnti
-	asm volatile ("sfence" ::: "memory");
-#endif
 	/* Display final address */
-#if CONFIG_USE_PRINTK_IN_CAR
-	printk_debug("%08lx\r\nDRAM filled\r\n", addr);
+#if !defined(__ROMCC__)
+	printk(BIOS_DEBUG, "%08lx\nDRAM filled\n", addr);
 #else
 	print_debug_hex32(addr);
-	print_debug("\r\nDRAM filled\r\n");
+	print_debug("\nDRAM filled\n");
 #endif
 }
 
@@ -69,24 +87,24 @@ static void ram_verify(unsigned long start, unsigned long stop)
 {
 	unsigned long addr;
 	int i = 0;
-	/* 
+	/*
 	 * Verify.
 	 */
-#if CONFIG_USE_PRINTK_IN_CAR
-	printk_debug("DRAM verify: 0x%08lx-0x%08lx\r\n", start, stop);
+#if !defined(__ROMCC__)
+	printk(BIOS_DEBUG, "DRAM verify: 0x%08lx-0x%08lx\n", start, stop);
 #else
 	print_debug("DRAM verify: ");
 	print_debug_hex32(start);
 	print_debug_char('-');
 	print_debug_hex32(stop);
-	print_debug("\r\n");
+	print_debug("\n");
 #endif
 	for(addr = start; addr < stop ; addr += 4) {
 		unsigned long value;
 		/* Display address being tested */
 		if (!(addr & 0xfffff)) {
-#if CONFIG_USE_PRINTK_IN_CAR
-			printk_debug("%08lx \r", addr);
+#if !defined(__ROMCC__)
+			printk(BIOS_DEBUG, "%08lx \r", addr);
 #else
 			print_debug_hex32(addr);
 			print_debug(" \r");
@@ -95,46 +113,46 @@ static void ram_verify(unsigned long start, unsigned long stop)
 		value = read_phys(addr);
 		if (value != addr) {
 			/* Display address with error */
-#if CONFIG_USE_PRINTK_IN_CAR
-			printk_err("Fail: @0x%08lx Read value=0x%08lx\r\n", addr, value);
+#if !defined(__ROMCC__)
+			printk(BIOS_ERR, "Fail: @0x%08lx Read value=0x%08lx\n", addr, value);
 #else
 			print_err("Fail: @0x");
 			print_err_hex32(addr);
 			print_err(" Read value=0x");
 			print_err_hex32(value);
-			print_err("\r\n");
+			print_err("\n");
 #endif
 			i++;
 			if(i>256) {
-#if CONFIG_USE_PRINTK_IN_CAR
-				printk_debug("Aborting.\n\r");
+#if !defined(__ROMCC__)
+				printk(BIOS_DEBUG, "Aborting.\n");
 #else
-				print_debug("Aborting.\n\r");
+				print_debug("Aborting.\n");
 #endif
 				break;
 			}
 		}
 	}
 	/* Display final address */
-#if CONFIG_USE_PRINTK_IN_CAR
-	printk_debug("%08lx", addr);
+#if !defined(__ROMCC__)
+	printk(BIOS_DEBUG, "%08lx", addr);
 #else
 	print_debug_hex32(addr);
 #endif
 
 	if (i) {
-#if CONFIG_USE_PRINTK_IN_CAR
-		printk_debug("\r\nDRAM did _NOT_ verify!\r\n");
+#if !defined(__ROMCC__)
+		printk(BIOS_DEBUG, "\nDRAM did _NOT_ verify!\n");
 #else
-		print_debug("\r\nDRAM did _NOT_ verify!\r\n");
+		print_debug("\nDRAM did _NOT_ verify!\n");
 #endif
 		die("DRAM ERROR");
 	}
 	else {
-#if CONFIG_USE_PRINTK_IN_CAR
-		printk_debug("\r\nDRAM range verified.\r\n");
+#if !defined(__ROMCC__)
+		printk(BIOS_DEBUG, "\nDRAM range verified.\n");
 #else
-		print_debug("\r\nDRAM range verified.\r\n");
+		print_debug("\nDRAM range verified.\n");
 #endif
 	}
 }
@@ -147,21 +165,53 @@ void ram_check(unsigned long start, unsigned long stop)
 	 * test than a "Is my DRAM faulty?" test.  Not all bits
 	 * are tested.   -Tyson
 	 */
-#if CONFIG_USE_PRINTK_IN_CAR
-	printk_debug("Testing DRAM : %08lx - %08lx\r\n", start, stop);
+#if !defined(__ROMCC__)
+	printk(BIOS_DEBUG, "Testing DRAM : %08lx - %08lx\n", start, stop);
 #else
 	print_debug("Testing DRAM : ");
 	print_debug_hex32(start);
-	print_debug("-");	
+	print_debug("-");
 	print_debug_hex32(stop);
-	print_debug("\r\n");
+	print_debug("\n");
 #endif
 	ram_fill(start, stop);
+	/* Make sure we don't read before we wrote */
+	phys_memory_barrier();
 	ram_verify(start, stop);
-#if CONFIG_USE_PRINTK_IN_CAR
-	printk_debug("Done.\r\n");
+#if !defined(__ROMCC__)
+	printk(BIOS_DEBUG, "Done.\n");
 #else
-	print_debug("Done.\r\n");
+	print_debug("Done.\n");
 #endif
 }
 
+void quick_ram_check(void)
+{
+	int fail = 0;
+	u32 backup;
+	backup = read_phys(CONFIG_RAMBASE);
+	write_phys(CONFIG_RAMBASE, 0x55555555);
+	phys_memory_barrier();
+	if (read_phys(CONFIG_RAMBASE) != 0x55555555)
+		fail=1;
+	write_phys(CONFIG_RAMBASE, 0xaaaaaaaa);
+	phys_memory_barrier();
+	if (read_phys(CONFIG_RAMBASE) != 0xaaaaaaaa)
+		fail=1;
+	write_phys(CONFIG_RAMBASE, 0x00000000);
+	phys_memory_barrier();
+	if (read_phys(CONFIG_RAMBASE) != 0x00000000)
+		fail=1;
+	write_phys(CONFIG_RAMBASE, 0xffffffff);
+	phys_memory_barrier();
+	if (read_phys(CONFIG_RAMBASE) != 0xffffffff)
+		fail=1;
+
+	write_phys(CONFIG_RAMBASE, backup);
+	if (fail) {
+		post_code(0xea);
+		die("RAM INIT FAILURE!\n");
+	}
+	phys_memory_barrier();
+}
+