diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/devices/device.c | 3 | ||||
| -rw-r--r-- | src/devices/emulator/pcbios/pcibios.c | 2 | ||||
| -rw-r--r-- | src/devices/pci_rom.c | 31 | ||||
| -rw-r--r-- | src/devices/root_device.c | 2 | ||||
| -rw-r--r-- | src/drivers/generic/debug/debug_dev.c | 4 | ||||
| -rw-r--r-- | src/include/device/pci_rom.h | 2 |
6 files changed, 30 insertions, 14 deletions
diff --git a/src/devices/device.c b/src/devices/device.c index 8ad489b11a..ba4a2f4901 100644 --- a/src/devices/device.c +++ b/src/devices/device.c @@ -613,10 +613,13 @@ void dev_initialize(void) struct device *dev; printk_info("Initializing devices...\n"); + for (dev = all_devices; dev; dev = dev->next) { if (dev->enabled && !dev->initialized && dev->ops && dev->ops->init) { + if(dev->path.type == DEVICE_PATH_I2C) + printk_debug("smbus: %s[%d]->", dev_path(dev->bus->dev), dev->bus->link ); printk_debug("%s init\n", dev_path(dev)); dev->initialized = 1; dev->ops->init(dev); diff --git a/src/devices/emulator/pcbios/pcibios.c b/src/devices/emulator/pcbios/pcibios.c index 1517d2a7fb..be5c91a0f1 100644 --- a/src/devices/emulator/pcbios/pcibios.c +++ b/src/devices/emulator/pcbios/pcibios.c @@ -16,7 +16,7 @@ int pcibios_handler() case PCI_BIOS_PRESENT: X86_AH = 0x00; /* no config space/special cycle support */ X86_AL = 0x01; /* config mechanism 1 */ - X86_EDX = 'P' | 'C' << 8 | 'I' | ' ' << 24; + X86_EDX = 'P' | 'C' << 8 | 'I' << 16 | ' ' << 24; X86_EBX = 0x0210; /* Version 2.10 */ X86_ECX = 0xFF00; /* FixME: Max bus number */ X86_EFLAGS &= ~FB_CF; /* clear carry flag */ diff --git a/src/devices/pci_rom.c b/src/devices/pci_rom.c index 557553ab5a..e0a7138464 100644 --- a/src/devices/pci_rom.c +++ b/src/devices/pci_rom.c @@ -10,15 +10,15 @@ struct rom_header * pci_rom_probe(struct device *dev) 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) { - if (dev->on_mainboard && (dev->rom_address!=0) ) { - // in case some device PCI_ROM_ADDRESS can not be set - rom_address = dev->rom_address; - } else { - return NULL; - } + return NULL; } printk_debug("rom address for %s = %x\n", dev_path(dev), rom_address); @@ -71,16 +71,25 @@ struct rom_header *pci_rom_load(struct device *dev, struct rom_header *rom_heade 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; + + 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 (dev != vga_pri) return NULL; // only one VGA supported - printk_spew("%s, copying VGA ROM Image from %x to %x, %x bytes\n", - __func__, rom_header, PCI_VGA_RAM_IMAGE_START, rom_size); + printk_debug("copying VGA ROM Image from %x to %x, %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); diff --git a/src/devices/root_device.c b/src/devices/root_device.c index 2c641a2260..91c706e4b6 100644 --- a/src/devices/root_device.c +++ b/src/devices/root_device.c @@ -89,6 +89,8 @@ unsigned int scan_static_bus(device_t root, unsigned int max) if (child->ops && child->ops->enable) { child->ops->enable(child); } + if (child->path.type == DEVICE_PATH_I2C) + printk_debug("smbus: %s[%d]->", dev_path(child->bus->dev), child->bus->link ); printk_debug("%s %s\n", dev_path(child), child->enabled?"enabled": "disabled"); } diff --git a/src/drivers/generic/debug/debug_dev.c b/src/drivers/generic/debug/debug_dev.c index 8454051602..600b1fcf60 100644 --- a/src/drivers/generic/debug/debug_dev.c +++ b/src/drivers/generic/debug/debug_dev.c @@ -35,9 +35,9 @@ static void print_mem(void) static void print_pci_regs_all(void) { struct device *dev; - unsigned char bus, device, function; + unsigned bus, device, function; - for(bus=0; bus<=256; bus++) { + for(bus=0; bus<256; bus++) { for(device=0; device<=0x1f; device++) { for (function=0; function<=7; function++){ unsigned devfn; diff --git a/src/include/device/pci_rom.h b/src/include/device/pci_rom.h index 3236254697..e0cbf40806 100644 --- a/src/include/device/pci_rom.h +++ b/src/include/device/pci_rom.h @@ -36,4 +36,6 @@ struct pci_data { extern struct rom_header * pci_rom_probe(struct device *dev); extern struct rom_header *pci_rom_load(struct device *dev, struct rom_header *rom_header); +extern void pci_dev_init(struct device *dev); + #endif |