New subject: [PATCH] v3: read option roms from lar instead of hard coded address

5 Apr 2008

Signed-off-by: Stefan Reinauer stepan@coreboot.org
-- 
coresystems GmbH • Brahmsstr. 16 • D-79104 Freiburg i. Br.
      Tel.: +49 761 7668825 • Fax: +49 761 7664613
Email: info@coresystems.de  • http://www.coresystems.de/
Registergericht: Amtsgericht Freiburg • HRB 7656
Geschäftsführer: Stefan Reinauer • Ust-IdNr.: DE245674866


Index: device/pci_rom.c
===================================================================

--- device/pci_rom.c	(revision 643)
+++ device/pci_rom.c	(working copy)
@@ -27,6 +27,7 @@
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <string.h>
+#include <lar.h>

 struct rom_header *pci_rom_probe(struct device *dev)
 {
@@ -35,12 +36,30 @@
    struct pci_data *rom_data;
    unsigned int i;
    unsigned char sum = 0, *rom_bytes;
+	struct mem_file archive, result;

    if (dev->on_mainboard) {
+		int ret;
+		char pcifile[] = "pci0000,0000.rom";
    	/* In case some device PCI_ROM_ADDRESS can not be set
    	 * or readonly.
    	 */
-		rom_address = dev->rom_address;
+		init_archive(&archive);
+		sprintf(pcifile, "pci%04x,%04x.rom", dev->id.u.pci.vendor,
+				dev->id.u.pci.device);
+
+		//rom_address = (unsigned long)load_file(&archive, pcifile);
+		ret = find_file(&archive, pcifile, &result);
+		if (ret) {
+			printk(BIOS_INFO, "No option rom for onboard device.\n");
+			return NULL;
+		}
+
+		// FIXME hardcode to 0xc0000 for now because we can only init
+		// vga anyways.
+		process_file(&result, (void *)0xc0000);
+		rom_address = 0xc0000;
+
    } else {
    	rom_address = pci_read_config32(dev, PCI_ROM_ADDRESS);
    }

    