allocating resource for legacy VGA frame buffer, it is not 100%

correct but it works anyway.


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

src/boot/hardwaremain.c

@@ -37,6 +37,15 @@ it with the version available from LANL.
 #include <part/init_timer.h>
 #include <boot/elf.h>
 
+/**
+ * @brief Main function of the DRAM part of LinuxBIOS.
+ *
+ * LinuxBIOS is divided into Pre-DRAM part and DRAM part. 
+ *
+ * 
+ * Device Enumeration:
+ *	In the dev_enumerate() phase, 
+ */
 void hardwaremain(int boot_complete)
 {
 	struct lb_memory *lb_mem;

src/devices/device.c

@@ -56,10 +56,12 @@ device_t alloc_dev(struct bus *parent, struct device_path *path)
 	int link;
 
 	spin_lock(&dev_lock);	
+
 	/* Find the last child of our parent */
 	for (child = parent->children; child && child->sibling; ) {
 		child = child->sibling;
 	}
+
 	dev = malloc(sizeof(*dev));
 	if (dev == 0) {
 		die("DEV: out of memory.\n");
@@ -67,7 +69,6 @@ device_t alloc_dev(struct bus *parent, struct device_path *path)
 	memset(dev, 0, sizeof(*dev));
 	memcpy(&dev->path, path, sizeof(*path));
 
-
 	/* Initialize the back pointers in the link fields */
 	for (link = 0; link < MAX_LINKS; link++) {
 		dev->link[link].dev  = dev;
@@ -262,7 +263,6 @@ void compute_allocate_resource(
 		    (bridge->flags & IORESOURCE_PREFETCH)? "prefmem" : "mem",
 		    base, bridge->size, bridge->align, bridge->gran);
 
-
 	/* We want different minimum alignments for different kinds of
 	 * resources.  These minimums are not device type specific
 	 * but resource type specific.
@@ -290,7 +290,6 @@ void compute_allocate_resource(
 		 * return them.   Some resources must be set even when they have
 		 * no size.  PCI bridge resources are a good example of this.
 		 */
-
 		/* Propogate the resource alignment to the bridge register  */
 		if (resource->align > bridge->align) {
 			bridge->align = resource->align;
@@ -339,8 +338,7 @@ void compute_allocate_resource(
 			resource->flags &= ~IORESOURCE_STORED;
 			base += size;
 			
-			printk_spew(
+			printk_spew("%s %02x *  [0x%08Lx - 0x%08Lx] %s\n",
-				"%s %02x *  [0x%08Lx - 0x%08Lx] %s\n",
 				    dev_path(dev),
 				    resource->index, 
 				    resource->base, 
@@ -380,10 +378,6 @@ static void allocate_vga_resource(void)
 		if (((dev->class >> 16) == PCI_BASE_CLASS_DISPLAY) &&
 		    ((dev->class >> 8) != PCI_CLASS_DISPLAY_OTHER)) {
 			if (!vga) {
-				printk_debug("Allocating VGA resource %s\n",
-					     dev_path(dev));
-				printk_debug("parent of the vga device %s\n",
-					     dev_path(dev->bus->dev));
 				vga = dev;
 			}
 			if (vga == dev) {
@@ -400,8 +394,6 @@ static void allocate_vga_resource(void)
 	}
 	/* Now walk up the bridges setting the VGA enable */
 	while (bus) {
-		printk_info("Enabling VGA forward on bus connect to %s\n",
-			    dev_path(bus->dev));
 		bus->bridge_ctrl |= PCI_BRIDGE_CTL_VGA;
 		bus = (bus == bus->dev->bus)? 0 : bus->dev->bus;
 	} 
@@ -545,7 +537,7 @@ void dev_configure(void)
 
 	printk_info("Reading resources...\n");
 	root->ops->read_resources(root);
-	printk_info("Done\n");
+	printk_info("Done reading resources.\n");
 
 	/* Get the resources */
 	io  = &root->resource[0];
@@ -567,13 +559,13 @@ void dev_configure(void)
 	/* Store the computed resource allocations into device registers ... */
 	printk_info("Setting resources...\n");
 	root->ops->set_resources(root);
-	printk_info("Done\n");
+	printk_info("Done setting resources.\n");
 #if 0
 	mem->flags |= IORESOURCE_STORED;
 	report_resource_stored(root, mem, "");
 #endif
 
-	printk_info("done.\n");
+	printk_info("Done allocating resources.\n");
 }
 
 /**

src/devices/pci_device.c

@@ -611,13 +611,14 @@ static void set_pci_ops(struct device *dev)
  * @brief See if we have already allocated a device structure for a given devfn.
  *
  * Given a linked list of PCI device structures and a devfn number, find the
- * device structure correspond to the devfn, if present.
+ * device structure correspond to the devfn, if present. This function also
+ * removes the device structure from the linked list.
  *
  * @param list the device structure list
  * @param devfn a device/function number
  *
- * @return pointer to the device structure found or null of we have not allocated
+ * @return pointer to the device structure found or null of we have not
- *         a device for this devfn yet.
+ *	   allocated a device for this devfn yet.
  */
 static struct device *pci_scan_get_dev(struct device **list, unsigned int devfn)
 {
@@ -637,10 +638,10 @@ static struct device *pci_scan_get_dev(struct device **list, unsigned int devfn)
 			break;
 		}
 	}
-	/* Just like alloc_dev add the device to the 
+	/* Just like alloc_dev add the device to the list of device on the bus.
-	 * list of device on the bus.  When the list of devices was formed
+	 * When the list of devices was formed we removed all of the parents
-	 * we removed all of the parents children, and now we are interleaving
+	 * children, and now we are interleaving static and dynamic devices in
-	 * static and dynamic devices in order on the bus.
+	 * order on the bus.
 	 */
 	if (dev) {
 		device_t child;
@@ -854,6 +855,8 @@ unsigned int pci_scan_bridge(struct device *dev, unsigned int max)
 	uint32_t buses;
 	uint16_t cr;
 
+	printk_spew("%s for %s\n", __func__, dev_path(dev));
+
 	bus = &dev->link[0];
 	bus->dev = dev;
 	dev->links = 1;

src/devices/root_device.c

@@ -89,8 +89,7 @@ unsigned int scan_static_bus(device_t root, unsigned int max)
 			if (child->ops && child->ops->enable) {
 				child->ops->enable(child);
 			}
-			printk_debug("%s %s\n",
+			printk_debug("%s %s\n", dev_path(child),
-				dev_path(child),
 				     child->enabled?"enabled": "disabled");
 		}
 	}

src/northbridge/amd/amdk8/northbridge.c

@@ -103,7 +103,8 @@ static unsigned int amdk8_scan_chains(device_t dev, unsigned int max)
 		if (!(link_type & NonCoherent)) {
 			continue;
 		}
-		/* See if there is an available configuration space mapping register in function 1. */
+		/* See if there is an available configuration space mapping
+		 * register in function 1. */
 		free_reg = 0;
 		for (config_reg = 0xe0; config_reg <= 0xec; config_reg += 4) {
 			uint32_t config;
@@ -121,14 +122,15 @@ static unsigned int amdk8_scan_chains(device_t dev, unsigned int max)
 		if (free_reg && (config_reg > 0xec)) {
 			config_reg = free_reg;
 		}
-		/* If we can't find an available configuration space mapping register skip this bus */
+		/* If we can't find an available configuration space mapping
+		 * register skip this bus */
 		if (config_reg > 0xec) {
 			continue;
 		}
 
-		/* Set up the primary, secondary and subordinate bus numbers.  We have
+		/* Set up the primary, secondary and subordinate bus numbers.
-		 * no idea how many busses are behind this bridge yet, so we set the subordinate
+		 * We have no idea how many busses are behind this bridge yet,
-		 * bus number to 0xff for the moment.
+		 * so we set the subordinate bus number to 0xff for the moment.
 		 */
 		dev->link[link].secondary = ++max;
 		dev->link[link].subordinate = 0xff;
@@ -140,8 +142,8 @@ static unsigned int amdk8_scan_chains(device_t dev, unsigned int max)
 		config_busses = f1_read_config32(config_reg);
 
 		/* Configure the bus numbers for this bridge: the configuration
-		 * transactions will not be propagates by the bridge if it is not
+		 * transactions will not be propagates by the bridge if it is
-		 * correctly configured
+		 * not correctly configured
 		 */
 		busses &= 0xff000000;
 		busses |= (((unsigned int)(dev->bus->secondary) << 0) |
@@ -162,7 +164,8 @@ static unsigned int amdk8_scan_chains(device_t dev, unsigned int max)
 		printk_debug("%s Hyper transport scan link: %d max: %d\n", 
 			dev_path(dev), link, max);
 #endif
-		/* Now we can scan all of the subordinate busses i.e. the chain on the hypertranport link */
+		/* 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 0
@@ -170,15 +173,16 @@ static unsigned int amdk8_scan_chains(device_t dev, unsigned int max)
 			dev_path(dev), link, max);
 #endif
 
-		/* We know the number of busses behind this bridge.  Set the subordinate
+		/* We know the number of busses behind this bridge.  Set the
-		 * bus number to it's real value
+		 * subordinate bus number to it's real value
 		 */
 		dev->link[link].subordinate = max;
 		busses = (busses & 0xff00ffff) |
 			((unsigned int) (dev->link[link].subordinate) << 16);
 		pci_write_config32(dev, dev->link[link].cap + 0x14, busses);
 
-		config_busses = (config_busses & 0x00ffffff) | (dev->link[link].subordinate << 24);
+		config_busses = (config_busses & 0x00ffffff) |
+			(dev->link[link].subordinate << 24);
 		f1_write_config32(config_reg, config_busses);
 #if 0
 		printk_debug("%s Hypertransport scan link: %d done\n",
@@ -224,7 +228,6 @@ static int reg_useable(unsigned reg,
 	return result;
 }
 
-
 static struct resource *amdk8_find_iopair(device_t dev, unsigned nodeid, unsigned link)
 {
 	struct resource *resource;
@@ -278,6 +281,7 @@ static struct resource *amdk8_find_mempair(device_t dev, unsigned nodeid, unsign
 	}
 	return resource;
 }
+
 static void amdk8_link_read_bases(device_t dev, unsigned nodeid, unsigned link)
 {
 	struct resource *resource;
@@ -416,6 +420,26 @@ static void amdk8_set_resource(device_t dev, struct resource *resource, unsigned
 	report_resource_stored(dev, resource, buf);
 }
 
+static void amdk8_create_vga_resource(device_t dev, unsigned nodeid)
+{
+	struct resource *resource;
+	unsigned link;
+	for (link = 0; link < dev->links; link++) {
+		if (dev->link[link].bridge_ctrl & PCI_BRIDGE_CTL_VGA) {
+			printk_info("%s: bridge on link %d has VGA device\n",
+				    dev_path(dev), link);
+			printk_info("creating MEM pair for VGA memory\n");
+			/* Initialize the io space constraints on the current bus */
+			resource =  amdk8_find_mempair(dev, nodeid, link);
+			printk_info("MEM pair register %x\n", resource->index - 0x100);
+			resource->base = 0xa0000;
+			resource->size = 0x00000;
+			resource->gran = 16;
+			resource->align = 16;
+			resource->flags = IORESOURCE_PREFETCH | IORESOURCE_MEM | IORESOURCE_FIXED | IORESOURCE_ASSIGNED;
+		}
+	}
+}
 static void amdk8_set_resources(device_t dev)
 {
 	unsigned nodeid, link;
@@ -424,6 +448,8 @@ static void amdk8_set_resources(device_t dev)
 	/* Find the nodeid */
 	nodeid = amdk8_nodeid(dev);	
 
+	amdk8_create_vga_resource(dev, nodeid);
+	
 	/* Set each resource we have found */
 	for (i = 0; i < dev->resources; i++) {
 		amdk8_set_resource(dev, &dev->resource[i], nodeid);

src/southbridge/amd/amd8111/amd8111_lpc.c

@@ -176,15 +176,16 @@ static void amd8111_lpc_enable_resources(device_t dev)
 	enable_childrens_resources(dev);
 }
 
-
 static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device)
 {
 	pci_write_config32(dev, 0x70, 
 			   ((device & 0xffff) << 16) | (vendor & 0xffff));
 }
+
 static struct pci_operations lops_pci = {
 	.set_subsystem = lpci_set_subsystem,
 };
+
 static struct device_operations lpc_ops  = {
 	.read_resources   = amd8111_lpc_read_resources,
 	.set_resources    = pci_dev_set_resources,