added AGP support for AMD K8

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

6 files changed, 87 insertions, 43 deletions

diff --git a/src/cpu/k8/earlymtrr.c b/src/cpu/k8/earlymtrr.c
index 2138e3fefe..16cd809f97 100644
--- a/src/cpu/k8/earlymtrr.c
+++ b/src/cpu/k8/earlymtrr.c
@@ -30,7 +30,7 @@ static void early_mtrr_init(void)
 	/* Enable the access to AMD RdDram and WrDram extension bits */
 	msr = rdmsr(SYSCFG_MSR);
 	msr.lo |= SYSCFG_MSR_MtrrFixDramModEn;
-	wrmsr(msr);
+	wrmsr(SYSCFG_MSR, msr);
 
 	/* Inialize all of the relevant msrs to 0 */
 	msr.lo = 0;
@@ -43,7 +43,7 @@ static void early_mtrr_init(void)
 	/* Disable the access to AMD RdDram and WrDram extension bits */
 	msr = rdmsr(SYSCFG_MSR);
 	msr.lo &= ~SYSCFG_MSR_MtrrFixDramModEn;
-	wrmsr(msr);
+	wrmsr(SYSCFG_MSR, msr);
 
 	/* Enable memory access for 0 - 1MB using top_mem */
 	msr.hi = 0;
@@ -87,7 +87,7 @@ static void early_mtrr_init(void)
 	
 	/* Enale the MTRRs in SYSCFG */
 	msr = rdmsr(SYSCFG_MSR);
-	msr.lo |= SYSCFG_MSR_MtrrrVarDramEn;
+	msr.lo |= SYSCFG_MSR_MtrrVarDramEn;
 	wrmsr(SYSCFG_MSR, msr);
 
 	/* Enable the cache */
diff --git a/src/cpu/k8/earlymtrr.inc b/src/cpu/k8/earlymtrr.inc
index d5c754742b..81376bfb01 100644
--- a/src/cpu/k8/earlymtrr.inc
+++ b/src/cpu/k8/earlymtrr.inc
@@ -89,7 +89,7 @@ enable_mtrr:
 	/* Enable the MTRRs and IORRs in SYSCFG */
 	movl	$SYSCFG_MSR, %ecx
 	rdmsr
-	/* Don't enable SYSCFG_MSR_MtrrFixDramEn) untill we have done with VGA BIOS */
+	/* Don't enable SYSCFG_MSR_MtrrFixDramEn untill we have done with VGA BIOS */
 	orl	$(SYSCFG_MSR_MtrrVarDramEn), %eax
 	wrmsr
 
diff --git a/src/cpu/p6/mtrr.c b/src/cpu/p6/mtrr.c
index 89465c6209..36286608e8 100644
--- a/src/cpu/p6/mtrr.c
+++ b/src/cpu/p6/mtrr.c
@@ -300,6 +300,14 @@ void setup_mtrrs(struct mem_range *mem)
 	struct mem_range *memp;
 	unsigned long range_startk, range_sizek;
 	unsigned int reg;
+	msr_t msr;
+
+#if defined(k7) || defined(k8)
+	/* Enable the access to AMD RdDram and WrDram extension bits */
+	msr = rdmsr(SYSCFG_MSR);
+	msr.lo |= SYSCFG_MSR_MtrrFixDramModEn;
+	wrmsr(SYSCFG_MSR, msr);
+#endif
 
 	printk_debug("\n");
 	/* Initialized the fixed_mtrrs to uncached */
@@ -318,16 +326,31 @@ void setup_mtrrs(struct mem_range *mem)
 			break;
 		}
 
-#if defined(k7) || defined(k8)
-#warning "FIXME: dealing with RdMEM/WrMEM for Athlon/Opteron"
-#endif
-
 		printk_debug("Setting fixed MTRRs(%d-%d) type: WB\n",
 			     start_mtrr, last_mtrr);
-		set_fixed_mtrrs(start_mtrr, last_mtrr, MTRR_TYPE_WRBACK);
+
+
+#if defined(k7) || defined(k8)
+		set_fixed_mtrrs(start_mtrr, last_mtrr,
+				MTRR_TYPE_WRBACK | MTRR_READ_MEM| MTRR_WRITE_MEM);
+#else
+		set_fixed_mtrrs(start_mtrr, last_mtrr,
+				MTRR_TYPE_WRBACK);
+#endif
 	}
 	printk_debug("DONE fixed MTRRs\n");
 
+#if defined(k7) || defined(k8)
+	/* Disable the access to AMD RdDram and WrDram extension bits */
+	msr = rdmsr(SYSCFG_MSR);
+	msr.lo &= ~SYSCFG_MSR_MtrrFixDramModEn;
+	wrmsr(SYSCFG_MSR, msr);
+	/* Enale the RdMEM and WrMEM bits in SYSCFG */
+	msr = rdmsr(SYSCFG_MSR);
+	msr.lo |= SYSCFG_MSR_MtrrFixDramEn;
+	wrmsr(SYSCFG_MSR, msr);
+#endif
+
 	/* Cache as many memory areas as possible */
 	/* FIXME is there an algorithm for computing the optimal set of mtrrs? 
 	 * In some cases it is definitely possible to do better.
diff --git a/src/devices/pci_device.c b/src/devices/pci_device.c
index ec48e7f852..a185aae8d6 100644
--- a/src/devices/pci_device.c
+++ b/src/devices/pci_device.c
@@ -456,6 +456,17 @@ static void set_pci_ops(struct device *dev)
 		}
 	}
 
+#if 0
+	extern struct pci_driver generic_vga_driver;
+	/* TODO: Install generic VGA driver for VGA devices, base on the
+	 * class ID */
+	if ((dev->class >> 8)  == PCI_CLASS_DISPLAY_VGA) {
+		printk_debug("setting up generic VGA driver\n");
+		dev->ops = generic_vga_driver.ops;
+		return;
+	}
+#endif
+
 	/* If I don't have a specific driver use the default operations */
 	switch(dev->hdr_type & 0x7f) {	/* header type */
 	case PCI_HEADER_TYPE_NORMAL:	/* standard header */
diff --git a/src/mainboard/tyan/s2885/Config.lb b/src/mainboard/tyan/s2885/Config.lb
index 4916fad9a8..84df9b1ab9 100644
--- a/src/mainboard/tyan/s2885/Config.lb
+++ b/src/mainboard/tyan/s2885/Config.lb
@@ -39,6 +39,7 @@ driver mainboard.o
 #dir /drivers/si/3114
 #dir /drivers/intel/82551
 driver ti_firewire.o
+#dir /drivers/vga
 
 if HAVE_MP_TABLE object mptable.o end
 if HAVE_PIRQ_TABLE object irq_tables.o end
diff --git a/src/northbridge/amd/amdk8/northbridge.c b/src/northbridge/amd/amdk8/northbridge.c
index 8a252d0054..89a4092168 100644
--- a/src/northbridge/amd/amdk8/northbridge.c
+++ b/src/northbridge/amd/amdk8/northbridge.c
@@ -168,9 +168,7 @@ static unsigned int amdk8_scan_chains(device_t dev, unsigned int max)
 
 	nodeid = amdk8_nodeid(dev);
 
-#if 1
-	printk_debug("amdk8_scan_chains max: %d starting...\n", max);
-#endif
+	printk_spew("amdk8_scan_chains max: %d starting...\n", max);
 
 	for (link = 0; link < dev->links; link++) {
 		uint32_t link_type;
@@ -246,19 +244,15 @@ static unsigned int amdk8_scan_chains(device_t dev, unsigned int max)
 			((dev->link[link].subordinate) << 24);
 		f1_write_config32(config_reg, config_busses);
 
-#if 1
-		printk_debug("Hyper transport scan link: %d max: %d\n",
+		printk_spew("Hyper transport scan link: %d max: %d\n",
 			     link, max);
-#endif
 
 		/* Now we can scan all of the subordinate busses i.e. the
 		 * chain on the hypertranport link */
 		max = hypertransport_scan_chain(&dev->link[link], max);
 
-#if 1
-		printk_debug("Hyper transport scan link: %d new max: %d\n",
+		printk_spew("Hyper transport scan link: %d new max: %d\n",
 			     link, max);
-#endif		
 
 		/* We know the number of busses behind this bridge.  Set the
 		 * subordinate bus number to it's real value
@@ -271,13 +265,10 @@ static unsigned int amdk8_scan_chains(device_t dev, unsigned int max)
 		config_busses = (config_busses & 0x00ffffff) |
 			(dev->link[link].subordinate << 24);
 		f1_write_config32(config_reg, config_busses);
-#if 1
-		printk_debug("Hypertransport scan link done\n");
-#endif		
+		printk_spew("Hypertransport scan link done\n");
 	}
-#if 1
-	printk_debug("amdk8_scan_chains max: %d done\n", max);
-#endif
+
+	printk_spew("amdk8_scan_chains max: %d done\n", max);
 	return max;
 }
 
@@ -324,8 +315,8 @@ static unsigned amdk8_find_mempair(unsigned nodeid, unsigned link)
 		}
 		/* Do I have a match for this node and link? */
 		if (((base & 3) == 3) &&
-			((limit & 7) == nodeid) &&
-			(((limit >> 4) & 3) == link)) {
+		    ((limit & 7) == nodeid) &&
+		    (((limit >> 4) & 3) == link)) {
 			break;
 		}
 	}
@@ -438,7 +429,6 @@ static void amdk8_set_resource(device_t dev, struct resource *resource,
 		if (dev->link[link].bridge_ctrl & PCI_BRIDGE_CTL_NO_ISA) {
 			base |= PCI_IO_BASE_NO_ISA;
 		}
-		
 		f1_write_config32(reg + 0x4, limit);
 		f1_write_config32(reg, base);
 	} else if (resource->flags & IORESOURCE_MEM) {
@@ -494,7 +484,7 @@ static void amdk8_set_resources(device_t dev)
  * The root device in a AMD K8 system is not at Bus 0, Device 0, Fun 0
  * as other PCI based systems. The northbridge is at Bus 0, Device 0x18,
  * Fun 0. We have to call the pci_scan_bus() with PCI_DEVFN(0x18,0) as
- * the starting device instead of PCI_DEVFN(0x0, 0) as in the default
+ * the starting device instead of PCI_DEVFN(0x00, 0) as in the default
  * root_dev_scan_pci_bus().
  *
  * This function is set up as the default scan_bus() method for mainboards'
@@ -507,17 +497,17 @@ unsigned int amdk8_scan_root_bus(device_t root, unsigned int max)
 {
 	unsigned reg;
 
-	printk_debug("amdk8_scan_root_bus\n");
+	printk_spew("amdk8_scan_root_bus\n");
 
-	/* Unmap all of the HT chains */
+	/* Unmap all of the HT chains by clearing the Configuration
+	 * Map registers */
 	for (reg = 0xe0; reg <= 0xec; reg += 4) {
 		f1_write_config32(reg, 0);
 	}
 
-	printk_debug("amdk8_scan_root_bus: start scaning pci bus\n");
 	max = pci_scan_bus(&root->link[0], PCI_DEVFN(0x18, 0), 0xff, max);
 
-	printk_debug("amdk8_scan_root_bus: done\n");
+	printk_spew("amdk8_scan_root_bus: done\n");
 	return max;
 }
 
@@ -526,7 +516,7 @@ static void mcf0_control_init(struct device *dev)
 	uint32_t cmd;
 
 #if 1	
-	printk_debug("NB: Function 0 Misc Control.. ");
+	printk_spew("NB: Function 0 Misc Control.. ");
 	/* improve latency and bandwith on HT */
 	cmd = pci_read_config32(dev, 0x68);
 	cmd &= 0xffff80ff;
@@ -540,8 +530,9 @@ static void mcf0_control_init(struct device *dev)
 	cmd &= 0xfffff0ff;
 	cmd |= 0x00000600;
 	pci_write_config32(dev, 0xdc, cmd );
-#endif	
-	printk_debug("done.\n");
+#endif
+
+	printk_spew("done.\n");
 }
 
 
@@ -556,7 +547,15 @@ static void amdk8_enable_resources(struct device *dev)
 	printk_debug("%s bridge ctrl <- %04x\n", dev_path(dev), ctrl);
 	pci_write_config16(dev, PCI_BRIDGE_CONTROL, ctrl);
 
-#if 0
+#if 1
+	/* No, don;t do it here, we should create phantom PCI resource
+	 * for leagcy VGA resources in VGA device driver and use the
+	 * generic resource allocation/assignment code to do it
+	 *
+	 * TOO BAD, the generic resource allcation code refuses to do
+	 * abything with VGA and the AMDK8 resource code does want
+	 * more than one discontinous IO/MEM regions */
+
 	/* let's see what link VGA is on */
 	for (link = 0; link < dev->links; link++) {
 		device_t child;
@@ -566,22 +565,32 @@ static void amdk8_enable_resources(struct device *dev)
 			vgalink = link;
 	}
 
-	if (vgalink != 1) {
-		/* now find the IOPAIR that goes to vgalink and set the vga
-		 * enable in the base part (0x30) */
-		/* now allocate an MMIOPAIR and point it to the CPU0,
+	if (vgalink != -1) {
+		uint32_t base, limit;
+		unsigned reg;
+		/* now allocate an MMPAIR and point it to the CPU0,
 		 * LINK=vgalink */
-		/* now set IORR1 so it has a hole for the 0xa0000-0xcffff
-		 * region */
+		/* Set up mem pair
+		 * FIXME: add amdk8_find_free_mempair() */
+		//reg = amdk8_find_mempair(0, vgalink);
+		reg = 0x90;
+		/* Set base of 0xa0000 */
+		base = 0xa03;
+		limit = 0xd00 | (vgalink << 4);
+		printk_debug("setting MMIO routing for VGA reg:0x%x, base: 0x%x, limit 0x%x\n",
+			     reg, base, limit);
+		f1_write_config32(reg, base);
+		f1_write_config32(reg + 4, limit);
 	}
 #endif
+
 	pci_dev_enable_resources(dev);
 }
 
 static struct device_operations northbridge_operations = {
 	.read_resources   = amdk8_read_resources,
 	.set_resources    = amdk8_set_resources,
-	.enable_resources = pci_dev_enable_resources,
+	.enable_resources = amdk8_enable_resources,
 	.init             = mcf0_control_init,
 	.scan_bus         = amdk8_scan_chains,
 	.enable           = 0,