X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Foptionroms.c;h=27cfffd82a79e0e8e72b29f58949d4f8ed67c0a9;hb=refs%2Fheads%2Fcoreboot;hp=ff74c4fdc54dfbfb84419409d5a2fcd9580174f0;hpb=baac6b6e1a3fc2d5e662e685a6bbe196292c2522;p=seabios.git diff --git a/src/optionroms.c b/src/optionroms.c index ff74c4f..27cfffd 100644 --- a/src/optionroms.c +++ b/src/optionroms.c @@ -9,68 +9,17 @@ #include "farptr.h" // FLATPTR_TO_SEG #include "config.h" // CONFIG_* #include "util.h" // dprintf -#include "pci.h" // foreachbdf +#include "pci.h" // foreachpci #include "pci_regs.h" // PCI_ROM_ADDRESS #include "pci_ids.h" // PCI_CLASS_DISPLAY_VGA #include "boot.h" // IPL #include "paravirt.h" // qemu_cfg_* - +#include "optionroms.h" // struct rom_header /**************************************************************** * Definitions ****************************************************************/ -struct rom_header { - u16 signature; - u8 size; - u8 initVector[4]; - u8 reserved[17]; - u16 pcioffset; - u16 pnpoffset; -} PACKED; - -struct pci_data { - u32 signature; - u16 vendor; - u16 device; - u16 vitaldata; - u16 dlen; - u8 drevision; - u8 class_lo; - u16 class_hi; - u16 ilen; - u16 irevision; - u8 type; - u8 indicator; - u16 reserved; -} PACKED; - -struct pnp_data { - u32 signature; - u8 revision; - u8 len; - u16 nextoffset; - u8 reserved_08; - u8 checksum; - u32 devid; - u16 manufacturer; - u16 productname; - u8 type_lo; - u16 type_hi; - u8 dev_flags; - u16 bcv; - u16 dv; - u16 bev; - u16 reserved_1c; - u16 staticresource; -} PACKED; - -#define OPTION_ROM_SIGNATURE 0xaa55 -#define OPTION_ROM_ALIGN 2048 -#define OPTION_ROM_INITVECTOR offsetof(struct rom_header, initVector[0]) -#define PCI_ROM_SIGNATURE 0x52494350 // PCIR -#define PCIROM_CODETYPE_X86 0 - // The end of the last deployed rom. u32 RomEnd = BUILD_ROM_START; @@ -116,6 +65,8 @@ call_bcv(u16 seg, u16 ip) __callrom(MAKE_FLATPTR(seg, 0), ip, 0); } +static int EnforceChecksum; + // Verify that an option rom looks valid static int is_valid_rom(struct rom_header *rom) @@ -131,7 +82,7 @@ is_valid_rom(struct rom_header *rom) if (sum != 0) { dprintf(1, "Found option rom with bad checksum: loc=%p len=%d sum=%x\n" , rom, len, sum); - if (CONFIG_OPTIONROMS_CHECKSUM) + if (EnforceChecksum) return 0; } return 1; @@ -163,10 +114,10 @@ get_pnp_next(struct rom_header *rom, struct pnp_data *pnp) static struct pci_data * get_pci_rom(struct rom_header *rom) { - struct pci_data *pci = (void*)((u32)rom + rom->pcioffset); - if (pci->signature != PCI_ROM_SIGNATURE) + struct pci_data *pd = (void*)((u32)rom + rom->pcioffset); + if (pd->signature != PCI_ROM_SIGNATURE) return NULL; - return pci; + return pd; } // Return start of code in 0xc0000-0xf0000 space. @@ -228,29 +179,22 @@ getRomPriority(u64 *sources, struct rom_header *rom, int instance) if (!source) return -1; if (source & RS_PCIROM) - return bootprio_find_pci_rom(source, instance); + return bootprio_find_pci_rom((void*)(u32)source, instance); return bootprio_find_named_rom(romfile_name(source), instance); } + /**************************************************************** * Roms in CBFS ****************************************************************/ // Check if an option rom is at a hardcoded location or in CBFS. static struct rom_header * -lookup_hardcode(u32 vendev) +lookup_hardcode(struct pci_device *pci) { - if (OPTIONROM_VENDEV_1 - && ((OPTIONROM_VENDEV_1 >> 16) - | ((OPTIONROM_VENDEV_1 & 0xffff)) << 16) == vendev) - return copy_rom((void*)OPTIONROM_MEM_1); - if (OPTIONROM_VENDEV_2 - && ((OPTIONROM_VENDEV_2 >> 16) - | ((OPTIONROM_VENDEV_2 & 0xffff)) << 16) == vendev) - return copy_rom((void*)OPTIONROM_MEM_2); char fname[17]; snprintf(fname, sizeof(fname), "pci%04x,%04x.rom" - , pci_vd_to_ven(vendev), pci_vd_to_dev(vendev)); + , pci->vendor, pci->device); int ret = romfile_copy(romfile_find(fname), (void*)RomEnd , max_rom() - RomEnd); if (ret <= 0) @@ -281,16 +225,35 @@ run_file_roms(const char *prefix, int isvga, u64 *sources) * PCI roms ****************************************************************/ +// Verify device is a vga device with legacy address decoding enabled. +static int +is_pci_vga(struct pci_device *pci) +{ + if (pci->class != PCI_CLASS_DISPLAY_VGA) + return 0; + u16 cmd = pci_config_readw(pci->bdf, PCI_COMMAND); + if (!(cmd & PCI_COMMAND_IO && cmd & PCI_COMMAND_MEMORY)) + return 0; + while (pci->parent) { + pci = pci->parent; + u32 ctrl = pci_config_readb(pci->bdf, PCI_BRIDGE_CONTROL); + if (!(ctrl & PCI_BRIDGE_CTL_VGA)) + return 0; + } + return 1; +} + // Map the option rom of a given PCI device. static struct rom_header * -map_pcirom(u16 bdf, u32 vendev) +map_pcirom(struct pci_device *pci) { + u16 bdf = pci->bdf; dprintf(6, "Attempting to map option rom on dev %02x:%02x.%x\n" , pci_bdf_to_bus(bdf), pci_bdf_to_dev(bdf), pci_bdf_to_fn(bdf)); - u8 htype = pci_config_readb(bdf, PCI_HEADER_TYPE); - if ((htype & 0x7f) != PCI_HEADER_TYPE_NORMAL) { - dprintf(6, "Skipping non-normal pci device (type=%x)\n", htype); + if ((pci->header_type & 0x7f) != PCI_HEADER_TYPE_NORMAL) { + dprintf(6, "Skipping non-normal pci device (type=%x)\n" + , pci->header_type); return NULL; } @@ -317,29 +280,29 @@ map_pcirom(u16 bdf, u32 vendev) for (;;) { dprintf(5, "Inspecting possible rom at %p (vd=%04x:%04x" " bdf=%02x:%02x.%x)\n" - , rom, pci_vd_to_ven(vendev), pci_vd_to_dev(vendev) + , rom, pci->vendor, pci->device , pci_bdf_to_bus(bdf), pci_bdf_to_dev(bdf), pci_bdf_to_fn(bdf)); if (rom->signature != OPTION_ROM_SIGNATURE) { dprintf(6, "No option rom signature (got %x)\n", rom->signature); goto fail; } - struct pci_data *pci = get_pci_rom(rom); - if (! pci) { + struct pci_data *pd = get_pci_rom(rom); + if (! pd) { dprintf(6, "No valid pci signature found\n"); goto fail; } - u32 vd = pci_vd(pci->vendor, pci->device); - if (vd == vendev && pci->type == PCIROM_CODETYPE_X86) + if (pd->vendor == pci->vendor && pd->device == pci->device + && pd->type == PCIROM_CODETYPE_X86) // A match break; - dprintf(6, "Didn't match dev/ven (got %08x) or type (got %d)\n" - , vd, pci->type); - if (pci->indicator & 0x80) { + dprintf(6, "Didn't match dev/ven (got %04x:%04x) or type (got %d)\n" + , pd->vendor, pd->device, pd->type); + if (pd->indicator & 0x80) { dprintf(6, "No more images left\n"); goto fail; } - rom = (void*)((u32)rom + pci->ilen * 512); + rom = (void*)((u32)rom + pd->ilen * 512); } rom = copy_rom(rom); @@ -353,19 +316,19 @@ fail: // Attempt to map and initialize the option rom on a given PCI device. static int -init_pcirom(u16 bdf, int isvga, u64 *sources) +init_pcirom(struct pci_device *pci, int isvga, u64 *sources) { - u32 vendev = pci_config_readl(bdf, PCI_VENDOR_ID); + u16 bdf = pci->bdf; dprintf(4, "Attempting to init PCI bdf %02x:%02x.%x (vd %04x:%04x)\n" , pci_bdf_to_bus(bdf), pci_bdf_to_dev(bdf), pci_bdf_to_fn(bdf) - , pci_vd_to_ven(vendev), pci_vd_to_dev(vendev)); - struct rom_header *rom = lookup_hardcode(vendev); + , pci->vendor, pci->device); + struct rom_header *rom = lookup_hardcode(pci); if (! rom) - rom = map_pcirom(bdf, vendev); + rom = map_pcirom(pci); if (! rom) // No ROM present. return -1; - setRomSource(sources, rom, RS_PCIROM | bdf); + setRomSource(sources, rom, RS_PCIROM | (u32)pci); return init_optionrom(rom, bdf, isvga); } @@ -397,13 +360,11 @@ optionrom_setup(void) } } else { // Find and deploy PCI roms. - int bdf, max; - foreachbdf(bdf, max) { - u16 v = pci_config_readw(bdf, PCI_CLASS_DEVICE); - if (v == 0x0000 || v == 0xffff || v == PCI_CLASS_DISPLAY_VGA - || (CONFIG_ATA && v == PCI_CLASS_STORAGE_IDE)) + struct pci_device *pci; + foreachpci(pci) { + if (pci->class == PCI_CLASS_DISPLAY_VGA || pci->have_driver) continue; - init_pcirom(bdf, 0, sources); + init_pcirom(pci, 0, sources); } // Find and deploy CBFS roms not associated with a device. @@ -427,19 +388,18 @@ optionrom_setup(void) , getRomPriority(sources, rom, 0)); continue; } - // PnP rom. - if (pnp->bev) { - // Can boot system - add to IPL list. - boot_add_bev(FLATPTR_TO_SEG(rom), pnp->bev, pnp->productname - , getRomPriority(sources, rom, 0)); - } else { - // Check for BCV (there may be multiple). - int instance = 0; - while (pnp && pnp->bcv) { + // PnP rom - check for BEV and BCV boot capabilities. + int instance = 0; + while (pnp) { + if (pnp->bev) + boot_add_bev(FLATPTR_TO_SEG(rom), pnp->bev, pnp->productname + , getRomPriority(sources, rom, instance++)); + else if (pnp->bcv) boot_add_bcv(FLATPTR_TO_SEG(rom), pnp->bcv, pnp->productname , getRomPriority(sources, rom, instance++)); - pnp = get_pnp_next(rom, pnp); - } + else + break; + pnp = get_pnp_next(rom, pnp); } } } @@ -449,6 +409,9 @@ optionrom_setup(void) * VGA init ****************************************************************/ +static int S3ResumeVgaInit; +int ScreenAndDebug; + // Call into vga code to turn on console. void vga_setup(void) @@ -458,17 +421,27 @@ vga_setup(void) dprintf(1, "Scan for VGA option rom\n"); + // Load some config settings that impact VGA. + EnforceChecksum = romfile_loadint("etc/optionroms-checksum", 1); + S3ResumeVgaInit = romfile_loadint("etc/s3-resume-vga-init", 0); + ScreenAndDebug = romfile_loadint("etc/screen-and-debug", 1); + if (CONFIG_OPTIONROMS_DEPLOYED) { // Option roms are already deployed on the system. init_optionrom((void*)BUILD_ROM_START, 0, 1); } else { // Clear option rom memory - memset((void*)RomEnd, 0, _max_rom() - RomEnd); + memset((void*)RomEnd, 0, max_rom() - RomEnd); // Find and deploy PCI VGA rom. - int bdf = VGAbdf = pci_find_vga(); - if (bdf >= 0) - init_pcirom(bdf, 1, NULL); + struct pci_device *pci; + foreachpci(pci) { + if (!is_pci_vga(pci)) + continue; + vgahook_setup(pci); + init_pcirom(pci, 1, NULL); + break; + } // Find and deploy CBFS vga-style roms not associated with a device. run_file_roms("vgaroms/", 1, NULL); @@ -486,7 +459,7 @@ vga_setup(void) void s3_resume_vga_init(void) { - if (!CONFIG_S3_RESUME_VGA_INIT) + if (!S3ResumeVgaInit) return; struct rom_header *rom = (void*)BUILD_ROM_START; if (! is_valid_rom(rom))