struct rom_header *rom_header;
struct pci_data *rom_data;
- rom_address = pci_read_config32(dev, PCI_ROM_ADDRESS);
+ if (dev->on_mainboard) {
+ // in case some device PCI_ROM_ADDRESS can not be set or readonly
+ rom_address = dev->rom_address;
+ } else {
+ rom_address = pci_read_config32(dev, PCI_ROM_ADDRESS);
+ }
+
if (rom_address == 0x00000000 || rom_address == 0xffffffff) {
return NULL;
}
- printk_spew("%s, rom address for %s = %x\n",
- __func__, dev_path(dev), rom_address);
-
- /* enable expansion ROM address decoding */
- pci_write_config32(dev, PCI_ROM_ADDRESS, rom_address|PCI_ROM_ADDRESS_ENABLE);
+ printk_debug("rom address for %s = %x\n", dev_path(dev), rom_address);
+
+ if(!dev->on_mainboard) {
+ /* enable expansion ROM address decoding */
+ pci_write_config32(dev, PCI_ROM_ADDRESS,
+ rom_address|PCI_ROM_ADDRESS_ENABLE);
+ }
- rom_header = rom_address;
- printk_spew("%s, PCI Expansion ROM, signature 0x%04x, \n\t"
- "INIT size 0x%04x, data ptr 0x%04x\n",
- __func__, le32_to_cpu(rom_header->signature),
+ 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));
if (le32_to_cpu(rom_header->signature) != PCI_ROM_HDR) {
- printk_err("%s, Incorrect Expansion ROM Header Signature %04x\n",
- __func__, le32_to_cpu(rom_header->signature));
+ printk_err("Incorrect Expansion ROM Header Signature %04x\n",
+ le32_to_cpu(rom_header->signature));
return NULL;
}
rom_data = (unsigned char *) rom_header + le32_to_cpu(rom_header->data);
- printk_spew("%s, PCI ROM Image, Vendor %04x, Device %04x,\n",
- __func__, rom_data->vendor, rom_data->device);
+ 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("%s, Device or Vendor ID mismatch\n");
+ printk_err("Device or Vendor ID mismatch Vendor %04x, Device %04x\n",
+ rom_data->vendor, rom_data->device);
return NULL;
}
- printk_spew("%s, PCI ROM Image, Class Code %02x%04x, Code Type %02x\n",
- __func__, rom_data->class_hi, rom_data->class_lo,
+ printk_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 >> 8) != (rom_data->class_hi << 16 | rom_data->class_lo)) {
- printk_err("%s, Class Code mismatch %x\n",
- __func__, dev->class);
- return NULL;
+ 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;
}
return rom_header;
}
-static void *pci_ram_image_start = PCI_RAM_IMAGE_START;
+static void *pci_ram_image_start = (void *)PCI_RAM_IMAGE_START;
+
+#if CONFIG_CONSOLE_VGA == 1
+extern int vga_inited; // defined in vga_console.c
+#if CONFIG_CONSOLE_VGA_MULTI == 0
+extern device_t vga_pri; // the primary vga device, defined in device.c
+#endif
+#endif
+
struct rom_header *pci_rom_load(struct device *dev, struct rom_header *rom_header)
{
struct pci_data * rom_data;
unsigned long rom_address;
unsigned int rom_size;
+ unsigned int image_size=0;
rom_address = pci_read_config32(dev, PCI_ROM_ADDRESS);
- rom_data = (unsigned char *) rom_header + le32_to_cpu(rom_header->data);
- rom_size = rom_header->size*512;
- if (PCI_CLASS_DISPLAY_VGA == (rom_data->class_hi << 16 | rom_data->class_lo)) {
- printk_spew("%s, copying VGA ROM Image from %x to %x, %x bytes\n",
- __func__, rom_header, PCI_VGA_RAM_IMAGE_START, rom_size);
+ do {
+ rom_header = (unsigned char *) rom_header + image_size; // get next image
+ rom_data = (unsigned char *) 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) {
+#if CONFIG_CONSOLE_VGA == 1
+ #if CONFIG_CONSOLE_VGA_MULTI == 0
+ if (dev != vga_pri) return NULL; // only one VGA supported
+ #endif
+ printk_debug("copying VGA ROM Image from 0x%x to 0x%x, 0x%x bytes\n",
+ rom_header, PCI_VGA_RAM_IMAGE_START, rom_size);
memcpy(PCI_VGA_RAM_IMAGE_START, rom_header, rom_size);
+ vga_inited = 1;
return (struct rom_header *) (PCI_VGA_RAM_IMAGE_START);
+#endif
} else {
- printk_spew("%s, copying non-VGA ROM Image from %x to %x, %x bytes\n",
- __func__, rom_header, pci_ram_image_start, rom_size);
+ printk_debug("copying non-VGA ROM Image from 0x%x to 0x%x, 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;
- return (struct rom_header *) pci_ram_image_start;
+ return (struct rom_header *) (pci_ram_image_start-rom_size);
}
/* disable expansion ROM address decoding */
pci_write_config32(dev, PCI_ROM_ADDRESS, rom_address & ~PCI_ROM_ADDRESS_ENABLE);
+
+ return NULL;
}
projects / coreboot.git / blobdiff