X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fdevices%2Fpci_rom.c;h=1ae79e137dd315339af8142bdea74801f192ac91;hb=e4870474b9026ad6b2ccabe59a8623e28722007f;hp=f188bc7d1e64d28cc5d23cdb2d705f5c3abcad74;hpb=a88db7bb870c8a6884da30e827e886cd26355e96;p=coreboot.git

diff --git a/src/devices/pci_rom.c b/src/devices/pci_rom.c
index f188bc7d1..1ae79e137 100644
--- a/src/devices/pci_rom.c
+++ b/src/devices/pci_rom.c
@@ -29,74 +29,71 @@
 #include <string.h>
 #include <cbfs.h>
 
-struct rom_header * pci_rom_probe(struct device *dev)
+struct rom_header *pci_rom_probe(struct device *dev)
 {
-	unsigned long rom_address = 0;
 	struct rom_header *rom_header;
 	struct pci_data *rom_data;
 
-	if (CONFIG_CBFS) {
-		void *v;
-		/* if it's in FLASH, then it's as if dev->on_mainboard was true */
-		v = cbfs_load_optionrom(dev->vendor, dev->device, NULL);
-		printk_debug("In cbfs, rom address for %s = %p\n", 
-				dev_path(dev), v);
-		if (v) {
-			dev->rom_address = (u32)v;
-			dev->on_mainboard = 1;
-		}
-	} 
-
-	if (dev->on_mainboard) {
-		/* this is here as a legacy path. We hope it goes away soon. Users should not have to 
-		 * compute the ROM address at build time!
-		 */
-                // in case some device PCI_ROM_ADDRESS can not be set or readonly 
-		rom_address = dev->rom_address;
-		printk_debug("On mainboard, rom address for %s = %lx\n", 
-			dev_path(dev), rom_address);
+	/* If it's in FLASH, then don't check device for ROM. */
+	rom_header = cbfs_load_optionrom(dev->vendor, dev->device, NULL);
+
+	if (rom_header) {
+		printk(BIOS_DEBUG, "In CBFS, ROM address for %s = %p\n",
+		       dev_path(dev), rom_header);
 	} else {
+		u32 rom_address;
+
 		rom_address = pci_read_config32(dev, PCI_ROM_ADDRESS);
-		printk_debug("On card, rom address for %s = %lx\n", 
-				dev_path(dev), rom_address);
-	}
 
-	if (rom_address == 0x00000000 || rom_address == 0xffffffff) {
-		return NULL;
-	}
+		if (rom_address == 0x00000000 || rom_address == 0xffffffff) {
+#if defined(CONFIG_BOARD_EMULATION_QEMU_X86) && CONFIG_BOARD_EMULATION_QEMU_X86
+			if ((dev->class >> 8) == PCI_CLASS_DISPLAY_VGA)
+				rom_address = 0xc0000;
+			else
+#endif
+				return NULL;
+		} else {
+			/* Enable expansion ROM address decoding. */
+			pci_write_config32(dev, PCI_ROM_ADDRESS,
+					   rom_address|PCI_ROM_ADDRESS_ENABLE);
+		}
 
-	if(!dev->on_mainboard) {
-		/* enable expansion ROM address decoding */
-		pci_write_config32(dev, PCI_ROM_ADDRESS,
-				   rom_address|PCI_ROM_ADDRESS_ENABLE);
+		printk(BIOS_DEBUG, "On card, ROM address for %s = %lx\n",
+		       dev_path(dev), (unsigned long)rom_address);
+		rom_header = (struct rom_header *)rom_address;
 	}
 
-	rom_header = (struct rom_header *)rom_address;
-	printk_spew("PCI Expansion ROM, signature 0x%04x, INIT size 0x%04x, data ptr 0x%04x\n",
-		    le32_to_cpu(rom_header->signature),
-		    rom_header->size * 512, le32_to_cpu(rom_header->data));
+	printk(BIOS_SPEW, "PCI expansion ROM, signature 0x%04x, "
+	       "INIT size 0x%04x, data ptr 0x%04x\n",
+	       le32_to_cpu(rom_header->signature),
+	       rom_header->size * 512, le32_to_cpu(rom_header->data));
+
 	if (le32_to_cpu(rom_header->signature) != PCI_ROM_HDR) {
-		printk_err("Incorrect Expansion ROM Header Signature %04x\n",
-			   le32_to_cpu(rom_header->signature));
+		printk(BIOS_ERR, "Incorrect expansion ROM header "
+		       "signature %04x\n", le32_to_cpu(rom_header->signature));
 		return NULL;
 	}
 
-	rom_data = (struct pci_data *) ((void *)rom_header + le32_to_cpu(rom_header->data));
-	printk_spew("PCI ROM Image, Vendor %04x, Device %04x,\n",
-		    rom_data->vendor, rom_data->device);
-	if (dev->vendor != rom_data->vendor || dev->device != rom_data->device) {
-		printk_err("Device or Vendor ID mismatch Vendor %04x, Device %04x\n",
-			   rom_data->vendor, rom_data->device);
+	rom_data = (((void *)rom_header) + le32_to_cpu(rom_header->data));
+
+	printk(BIOS_SPEW, "PCI ROM image, vendor ID %04x, device ID %04x,\n",
+	       rom_data->vendor, rom_data->device);
+	if (dev->vendor != rom_data->vendor
+	    || dev->device != rom_data->device) {
+		printk(BIOS_ERR, "ID mismatch: vendor ID %04x, "
+		       "device ID %04x\n", rom_data->vendor, rom_data->device);
 		return NULL;
 	}
 
-	printk_spew("PCI ROM Image,  Class Code %04x%02x, Code Type %02x\n",
-		    rom_data->class_hi, rom_data->class_lo,
-		    rom_data->type);
+	printk(BIOS_SPEW, "PCI ROM image, Class Code %04x%02x, "
+	       "Code Type %02x\n", rom_data->class_hi, rom_data->class_lo,
+	       rom_data->type);
+
 	if (dev->class != ((rom_data->class_hi << 8) | rom_data->class_lo)) {
-		printk_debug("Class Code mismatch ROM %08x, dev %08x\n", 
-			    (rom_data->class_hi << 8) | rom_data->class_lo, dev->class);
-		//return NULL;
+		printk(BIOS_DEBUG, "Class Code mismatch ROM %08x, dev %08x\n",
+		       (rom_data->class_hi << 8) | rom_data->class_lo,
+		       dev->class);
+		// return NULL;
 	}
 
 	return rom_header;
@@ -104,38 +101,51 @@ struct rom_header * pci_rom_probe(struct device *dev)
 
 static void *pci_ram_image_start = (void *)PCI_RAM_IMAGE_START;
 
-struct rom_header *pci_rom_load(struct device *dev, struct rom_header *rom_header)
+struct rom_header *pci_rom_load(struct device *dev,
+				struct rom_header *rom_header)
 {
 	struct pci_data * rom_data;
 	unsigned int rom_size;
 	unsigned int image_size=0;
 
 	do {
-		rom_header = (struct rom_header *)((void *) rom_header + image_size); // get next image
-	        rom_data = (struct pci_data *)((void *) rom_header + le32_to_cpu(rom_header->data));
-        	image_size = le32_to_cpu(rom_data->ilen) * 512;
-	} while ((rom_data->type!=0) && (rom_data->indicator!=0));  // make sure we got x86 version
+		/* Get next image. */
+		rom_header = (struct rom_header *)((void *) rom_header
+							    + image_size);
+
+		rom_data = (struct pci_data *)((void *) rom_header
+				+ le32_to_cpu(rom_header->data));
+
+		image_size = le32_to_cpu(rom_data->ilen) * 512;
+	} while ((rom_data->type != 0) && (rom_data->indicator != 0)); // make sure we got x86 version
 
 	if (rom_data->type != 0)
 		return NULL;
 
 	rom_size = rom_header->size * 512;
 
-	if (PCI_CLASS_DISPLAY_VGA == rom_data->class_hi) {
+	/*
+	 * We check to see if the device thinks it is a VGA device not
+	 * whether the ROM image is for a VGA device because some
+	 * devices have a mismatch between the hardware and the ROM.
+	 */
+ 	if (PCI_CLASS_DISPLAY_VGA == (dev->class >> 8)) {
 #if CONFIG_CONSOLE_VGA == 1 && CONFIG_CONSOLE_VGA_MULTI == 0
-		extern device_t vga_pri;	// the primary vga device, defined in device.c
-		if (dev != vga_pri) return NULL; // only one VGA supported
+		extern device_t vga_pri; /* Primary VGA device (device.c). */
+		if (dev != vga_pri) return NULL; /* Only one VGA supported. */
 #endif
 		if ((void *)PCI_VGA_RAM_IMAGE_START != rom_header) {
-			printk_debug("copying VGA ROM Image from %p to 0x%x, 0x%x bytes\n",
-			    rom_header, PCI_VGA_RAM_IMAGE_START, rom_size);
-			memcpy((void *)PCI_VGA_RAM_IMAGE_START, rom_header, rom_size);
+			printk(BIOS_DEBUG, "Copying VGA ROM Image from %p to "
+			       "0x%x, 0x%x bytes\n", rom_header,
+			       PCI_VGA_RAM_IMAGE_START, rom_size);
+			memcpy((void *)PCI_VGA_RAM_IMAGE_START, rom_header,
+			       rom_size);
 		}
 		return (struct rom_header *) (PCI_VGA_RAM_IMAGE_START);
 	}
 
-	printk_debug("copying non-VGA ROM Image from %p to %p, 0x%x bytes\n",
-		    rom_header, pci_ram_image_start, rom_size);
+	printk(BIOS_DEBUG, "Copying non-VGA ROM image from %p to %p, 0x%x "
+	       "bytes\n", rom_header, pci_ram_image_start, rom_size);
 
 	memcpy(pci_ram_image_start, rom_header, rom_size);
 	pci_ram_image_start += rom_size;