From 3a8ce19f879aeae42a5a33103eb8b87b42fcea22 Mon Sep 17 00:00:00 2001
From: "Ronald G. Minnich" <rminnich@gmail.com>
Date: Thu, 12 Apr 2001 18:36:53 +0000
Subject: [PATCH] we need cache_enable and disable visible.

failed attempts to get the acer northbridge to size ram
CV:S ----------------------------------------------------------------------
---
 src/cpu/p6/l2_cache.c                    |  4 +--
 src/northbridge/acer/m1631/northbridge.c | 40 +++++++++++++++++++++---
 2 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/src/cpu/p6/l2_cache.c b/src/cpu/p6/l2_cache.c
index c682155d89..caf5d7a38c 100644
--- a/src/cpu/p6/l2_cache.c
+++ b/src/cpu/p6/l2_cache.c
@@ -56,7 +56,7 @@ static int calculate_l2_cache_size(void);
 static int calculate_l2_physical_address_range(void);
 static int calculate_l2_ecc(void);
 
-static void cache_disable(void)
+void cache_disable(void)
 {
 	unsigned int tmp;
 
@@ -72,7 +72,7 @@ static void cache_disable(void)
 		      : "=r" (tmp) : : "memory");
 }
 
-static void cache_enable(void)
+void cache_enable(void)
 {
 	unsigned int tmp;
 
diff --git a/src/northbridge/acer/m1631/northbridge.c b/src/northbridge/acer/m1631/northbridge.c
index b61c6e6001..e944c8211a 100644
--- a/src/northbridge/acer/m1631/northbridge.c
+++ b/src/northbridge/acer/m1631/northbridge.c
@@ -1,6 +1,29 @@
 #include <pci.h>
 #include <printk.h>
 
+static 
+void refresh_set(int turn_it_on)
+{
+        struct pci_dev *pcidev;
+	u32 ref;
+
+	pcidev = pci_find_slot(0, PCI_DEVFN(0,0));
+
+	if (! pcidev) // won't happen but ...
+		return;
+
+	pci_read_config_dword(pcidev, 0x7c, &ref);
+	printk(KERN_INFO __FUNCTION__ "refresh was 0x%lx onoff is %d\n", 
+		ref, turn_it_on);
+	if (turn_it_on)
+		ref |= (1 << 19);
+	else
+		ref &= ~(1 << 19);
+			
+	pci_write_config_dword(pcidev, 0x7c, ref);
+	pci_read_config_dword(pcidev, 0x7c, &ref);
+	printk(KERN_INFO __FUNCTION__ "refresh is now 0x%lx\n", ref);
+}
 // FIX ME!
 unsigned long sizeram()
 {
@@ -8,6 +31,7 @@ unsigned long sizeram()
 	int i;
         struct pci_dev *pcidev;
 	volatile unsigned char *cp; 
+	char c;
 	u32 ram;
 	unsigned long size;
 	pcidev = pci_find_slot(0, PCI_DEVFN(0,0));
@@ -17,35 +41,43 @@ unsigned long sizeram()
 	printk("Acer sizeram pcidev %p\n", pcidev);
 
 	/* now read and print registers for ram ...*/
-	for(i = 0x6c; i < 0x78; i++) {
+	for(i = 0x6c; i < 0x78; i += 4) {
 
 		pci_read_config_dword(pcidev, i, &ram);
 		size = (1 << (((ram >> 20) & 0x7))) * (0x400000);
 		printk("0x%x 0x%x, size 0x%x\n", i, ram, size);
 	}
 	printk("so is the first one double-sided? \n");
-	cache_disable();
 	pci_read_config_dword(pcidev, 0x6c, &ram);
 	size = (1 << (((ram >> 20) & 0x7))) * (0x400000);
 	printk("set cp to 0x%x\n", size);
 	cp = (char *) size;
 	printk("cp is now %p\n", cp);
+	cache_disable();
+	refresh_set(0);
+	// you now have about 15 microseconds
 	*cp = 0x55;
 	// how odd. 
 	// what happens is if there is a 2nd row, then it will 
 	// read back REGARDLESS of the settings of the bits in the
 	// register! We verified this with the arium ...
 	// RGM 4/10/01
+	//printk("*cp is 0x%x\n", *cp);
+	c = *cp;
+	refresh_set(1);
+	printk("*cp is 0x%x\n", c);
 	if (*cp == 0x55) {
 		ram |= 0x1800000;		
-		printk("Jam 0x%x into 0x6c\n", ram);
+		printk("two side: Jam 0x%x into 0x6c\n", ram);
 		pci_write_config_dword(pcidev, 0x6c, ram);
 		printk("@ cp now is 0x%x\n", *cp);
 		// set the base address for the next dram slot 
 		// (if there is any ... )
 		cp += size;
-	}
+	} else printk("One sided\n");
+	
 	printk("cp now is 0x%x\n", cp);
+	return 0;
 	// now do the other two banks. 
 #define INIT_MCR 0xf663f83c
 	for(i = 0x70; i < 0x78; i += 4) {