#include "farptr.h" // FLATPTR_TO_SEG
#include "config.h" // CONFIG_*
#include "util.h" // dprintf
-#include "pci.h" // pci_find_class
+#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_*
/****************************************************************
u16 staticresource;
} PACKED;
-#define OPTION_ROM_START 0xc0000
#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
-// Next available position for an option rom.
-static u32 next_rom;
+// The end of the last deployed rom.
+u32 RomEnd;
/****************************************************************
struct bregs br;
memset(&br, 0, sizeof(br));
+ br.flags = F_IF;
br.ax = bdf;
br.bx = 0xffff;
br.dx = 0xffff;
br.es = SEG_BIOS;
br.di = get_pnp_offset();
- br.cs = seg;
- br.ip = offset;
+ br.code = SEGOFF(seg, offset);
+ start_preempt();
call16big(&br);
+ finish_preempt();
debug_serial_setup();
}
return pci;
}
+// Return the memory position up to which roms may be located.
+static inline u32
+max_rom(void)
+{
+ extern u8 code32flat_start[];
+ if ((u32)code32flat_start > BUILD_BIOS_ADDR)
+ return BUILD_BIOS_ADDR;
+ return (u32)code32flat_start;
+}
+
// Copy a rom to its permanent location below 1MiB
static struct rom_header *
copy_rom(struct rom_header *rom)
{
u32 romsize = rom->size * 512;
- if (next_rom + romsize > BUILD_BIOS_ADDR) {
+ if (RomEnd + romsize > max_rom()) {
// Option rom doesn't fit.
- dprintf(1, "Option rom %p doesn't fit.\n", rom);
+ warn_noalloc();
return NULL;
}
dprintf(4, "Copying option rom (size %d) from %p to %x\n"
- , romsize, rom, next_rom);
- memcpy((void*)next_rom, rom, romsize);
- return (void*)next_rom;
+ , romsize, rom, RomEnd);
+ iomemcpy((void*)RomEnd, rom, romsize);
+ return (void*)RomEnd;
}
// Run rom init code and note rom size.
// Only init vga and PnP roms here.
callrom(rom, bdf);
- next_rom = (u32)rom + ALIGN(rom->size * 512, OPTION_ROM_ALIGN);
+ RomEnd = (u32)rom + ALIGN(rom->size * 512, OPTION_ROM_ALIGN);
return 0;
}
&& ((OPTIONROM_VENDEV_2 >> 16)
| ((OPTIONROM_VENDEV_2 & 0xffff)) << 16) == vendev)
return copy_rom((void*)OPTIONROM_MEM_2);
- int ret = cbfs_copy_optionrom((void*)next_rom, BUILD_BIOS_ADDR - next_rom
- , vendev);
- if (ret < 0)
+ char fname[17];
+ snprintf(fname, sizeof(fname), "pci%04x,%04x.rom"
+ , pci_vd_to_ven(vendev), pci_vd_to_dev(vendev));
+ int ret = romfile_copy(romfile_find(fname), (void*)RomEnd
+ , max_rom() - RomEnd);
+ if (ret <= 0)
return NULL;
- return (void*)next_rom;
+ return (void*)RomEnd;
}
// Run all roms in a given CBFS directory.
static void
-run_cbfs_roms(const char *prefix, int isvga)
+run_file_roms(const char *prefix, int isvga)
{
- struct cbfs_file *tmp = NULL;
+ u32 file = 0;
for (;;) {
- tmp = cbfs_copyfile_prefix(
- (void*)next_rom, BUILD_BIOS_ADDR - next_rom, prefix, tmp);
- if (!tmp)
+ file = romfile_findprefix(prefix, file);
+ if (!file)
break;
- init_optionrom((void*)next_rom, 0, isvga);
+ int ret = romfile_copy(file, (void*)RomEnd, max_rom() - RomEnd);
+ if (ret > 0)
+ init_optionrom((void*)RomEnd, 0, isvga);
}
}
struct rom_header *rom = (void*)orig;
for (;;) {
- dprintf(5, "Inspecting possible rom at %p (dv=%x bdf=%x)\n"
- , rom, vendev, bdf);
+ 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)
+ , 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;
goto fail;
}
- u32 vd = (pci->device << 16) | pci->vendor;
+ u32 vd = pci_vd(pci->vendor, pci->device);
if (vd == vendev && pci->type == PCIROM_CODETYPE_X86)
// A match
break;
- dprintf(6, "Didn't match dev/ven (got %x) or type (got %d)\n"
+ dprintf(6, "Didn't match dev/ven (got %08x) or type (got %d)\n"
, vd, pci->type);
if (pci->indicator & 0x80) {
dprintf(6, "No more images left\n");
init_pcirom(u16 bdf, int isvga)
{
u32 vendev = pci_config_readl(bdf, PCI_VENDOR_ID);
- dprintf(4, "Attempting to init PCI bdf %02x:%02x.%x (dev/ven %x)\n"
+ 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)
- , vendev);
+ , pci_vd_to_ven(vendev), pci_vd_to_dev(vendev));
struct rom_header *rom = lookup_hardcode(vendev);
if (! rom)
rom = map_pcirom(bdf, vendev);
****************************************************************/
void
-optionrom_setup()
+optionrom_setup(void)
{
if (! CONFIG_OPTIONROMS)
return;
dprintf(1, "Scan for option roms\n");
- u32 post_vga = next_rom;
+ u32 post_vga = RomEnd;
if (CONFIG_OPTIONROMS_DEPLOYED) {
// Option roms are already deployed on the system.
- u32 pos = next_rom;
- while (pos < BUILD_BIOS_ADDR) {
+ u32 pos = RomEnd;
+ while (pos < max_rom()) {
int ret = init_optionrom((void*)pos, 0, 0);
if (ret)
pos += OPTION_ROM_ALIGN;
else
- pos = next_rom;
+ pos = RomEnd;
}
} else {
// Find and deploy PCI roms.
}
// Find and deploy CBFS roms not associated with a device.
- run_cbfs_roms("genroms/", 0);
+ run_file_roms("genroms/", 0);
}
// All option roms found and deployed - now build BEV/BCV vectors.
u32 pos = post_vga;
- while (pos < next_rom) {
+ while (pos < RomEnd) {
struct rom_header *rom = (void*)pos;
if (! is_valid_rom(rom)) {
pos += OPTION_ROM_ALIGN;
// Call into vga code to turn on console.
void
-vga_setup()
+vga_setup(void)
{
+ VGAbdf = -1;
+ RomEnd = BUILD_ROM_START;
+
if (! CONFIG_OPTIONROMS)
return;
dprintf(1, "Scan for VGA option rom\n");
- next_rom = OPTION_ROM_START;
if (CONFIG_OPTIONROMS_DEPLOYED) {
// Option roms are already deployed on the system.
- init_optionrom((void*)OPTION_ROM_START, 0, 1);
+ init_optionrom((void*)BUILD_ROM_START, 0, 1);
} else {
// Find and deploy PCI VGA rom.
- int bdf = pci_find_class(PCI_CLASS_DISPLAY_VGA);
+ int bdf = VGAbdf = pci_find_vga();
if (bdf >= 0)
init_pcirom(bdf, 1);
// Find and deploy CBFS vga-style roms not associated with a device.
- run_cbfs_roms("vgaroms/", 1);
+ run_file_roms("vgaroms/", 1);
}
- if (next_rom == OPTION_ROM_START) {
+ if (RomEnd == BUILD_ROM_START) {
// No VGA rom found
- next_rom += OPTION_ROM_ALIGN;
+ RomEnd += OPTION_ROM_ALIGN;
return;
}
- dprintf(1, "Turning on vga console\n");
- struct bregs br;
- memset(&br, 0, sizeof(br));
- br.ax = 0x0003;
- call16_int(0x10, &br);
-
- // Write to screen.
- printf("Starting SeaBIOS\n\n");
+ enable_vga_console();
}
void
-s3_resume_vga_init()
+s3_resume_vga_init(void)
{
if (!CONFIG_S3_RESUME_VGA_INIT)
return;
- struct rom_header *rom = (void*)OPTION_ROM_START;
+ struct rom_header *rom = (void*)BUILD_ROM_START;
if (! is_valid_rom(rom))
return;
callrom(rom, 0);
projects / seabios.git / blobdiff