SeaBIOS June 2011

seabios@seabios.org

22 participants
40 discussions

[PATCH 03/10] Remove support for compiling in OPTIONROM_VENDEV_1/2.

by Kevin O'Connor

Passing in rom locations via absolute memory addresses hasn't been needed since coreboot adopted CBFS support (which as several years ago). --- src/config.h | 7 ------- src/optionroms.c | 8 -------- 2 files changed, 0 insertions(+), 15 deletions(-) diff --git a/src/config.h b/src/config.h index 5b40488..e6e07c9 100644 --- a/src/config.h +++ b/src/config.h @@ -14,13 +14,6 @@ #define CONFIG_APPNAME6 "BOCHS " #define CONFIG_APPNAME4 "BXPC" -// When option roms are not pre-deployed, SeaBIOS can copy an optionrom -// from flash for up to 2 devices. -#define OPTIONROM_VENDEV_1 0x00000000 -#define OPTIONROM_MEM_1 0x00000000 -#define OPTIONROM_VENDEV_2 0x00000000 -#define OPTIONROM_MEM_2 0x00000000 - // Maximum number of map entries in the e820 map #define CONFIG_MAX_E820 32 // Space to reserve in f-segment for dynamic allocations diff --git a/src/optionroms.c b/src/optionroms.c index ff74c4f..a612f3c 100644 --- a/src/optionroms.c +++ b/src/optionroms.c @@ -240,14 +240,6 @@ getRomPriority(u64 *sources, struct rom_header *rom, int instance) static struct rom_header * lookup_hardcode(u32 vendev) { - 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)); -- 1.7.4.4

9 years, 8 months

[PATCH 02/10] Find all pci devices at startup and cache them for future use.

by Kevin O'Connor

This adds 'struct pci_device' and pci_probe() which will locate and store all found PCI devices in the system at startup. --- src/pci.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/pci.h | 20 ++++++++++++++++++++ src/post.c | 1 + 3 files changed, 81 insertions(+), 0 deletions(-) diff --git a/src/pci.c b/src/pci.c index c95baca..f0953e9 100644 --- a/src/pci.c +++ b/src/pci.c @@ -103,6 +103,66 @@ pci_next(int bdf, int *pmax) return bdf; } +struct pci_device *PCIDevices; +int MaxPCIBus; + +void +pci_probe(void) +{ + int rootbuses = 0; + struct pci_device *busdevs[256]; + memset(busdevs, 0, sizeof(busdevs)); + + struct pci_device **pprev = &PCIDevices; + u8 lastbus = 0; + int bdf, max; + foreachbdf(bdf, max) { + // Create new pci_device struct and add to list. + struct pci_device *dev = malloc_tmp(sizeof(*dev)); + if (!dev) { + warn_noalloc(); + return; + } + memset(dev, 0, sizeof(*dev)); + *pprev = dev; + pprev = &dev->next; + + // Find parent device. + u8 bus = pci_bdf_to_bus(bdf), rootbus; + struct pci_device *parent = busdevs[bus]; + if (!parent) { + if (bus != lastbus) + rootbuses++; + lastbus = bus; + rootbus = rootbuses; + } else { + rootbus = parent->rootbus; + } + if (bus > MaxPCIBus) + MaxPCIBus = bus; + + // Populate pci_device info. + dev->bdf = bdf; + dev->parent = parent; + dev->rootbus = rootbus; + u32 vendev = pci_config_readl(bdf, PCI_VENDOR_ID); + dev->vendor = vendev & 0xffff; + dev->device = vendev >> 16; + u32 classrev = pci_config_readl(bdf, PCI_CLASS_REVISION); + dev->class = classrev >> 16; + dev->prog_if = classrev >> 8; + dev->revision = classrev & 0xff; + dev->header_type = pci_config_readb(bdf, PCI_HEADER_TYPE); + u8 v = dev->header_type & 0x7f; + if (v == PCI_HEADER_TYPE_BRIDGE || v == PCI_HEADER_TYPE_CARDBUS) { + u8 secbus = pci_config_readb(bdf, PCI_SECONDARY_BUS); + dev->secondary_bus = secbus; + if (secbus > bus && !busdevs[secbus]) + busdevs[secbus] = dev; + } + } +} + // Find a vga device with legacy address decoding enabled. int pci_find_vga(void) diff --git a/src/pci.h b/src/pci.h index 6e9cbf0..f1d84ed 100644 --- a/src/pci.h +++ b/src/pci.h @@ -47,6 +47,26 @@ int pci_find_vga(void); int pci_find_device(u16 vendid, u16 devid); int pci_find_class(u16 classid); +struct pci_device { + u16 bdf; + u8 rootbus; + struct pci_device *next; + struct pci_device *parent; + + // Configuration space device information + u16 vendor, device; + u16 class; + u8 prog_if, revision; + u8 header_type; + u8 secondary_bus; +}; +extern struct pci_device *PCIDevices; +extern int MaxPCIBus; +void pci_probe(void); + +#define foreachpci(PCI) \ + for (PCI=PCIDevices; PCI; PCI=PCI->next) + #define PP_ROOT (1<<17) #define PP_PCIBRIDGE (1<<18) extern int *PCIpaths; diff --git a/src/post.c b/src/post.c index 70d98a6..d8f4acf 100644 --- a/src/post.c +++ b/src/post.c @@ -224,6 +224,7 @@ maininit(void) // Initialize pci pci_setup(); + pci_probe(); pci_path_setup(); smm_init(); -- 1.7.4.4

9 years, 8 months

[PATCH 00/10] Add PCI device cache

by Kevin O'Connor

This patch series adds code to probe the PCI devices during startup and cache the results for future scans. Doing so has a few advantages: storing the list of pci devices reduces PCI config accesses which can reduce boot time, the lack of a cache results in complex code to do bus tracking (vga / pcipath), and it's likely PCI init on emulators could take advantage of this structure during PCI setup. This is the start of conversion to the 'struct pci_device' system - other users could also be converted. In particular, the pci_setup() code has not been converted. -Kevin Kevin O'Connor (10): Rename foreachpci macro to foreachbdf. Find all pci devices at startup and cache them for future use. Remove support for compiling in OPTIONROM_VENDEV_1/2. Convert option rom scan to use struct pci_device. Convert ATA detection code to use struct pci_device. Convert mptable code to use struct pci_device. Convert virtio detection to use struct pci_device. Convert AHCI detection code to use struct pci_device. Convert USB detection code to use struct pci_device. Replace PCIPaths code with struct pci_device. src/ahci.c | 10 ++-- src/ata.c | 17 +++---- src/boot.c | 39 +++++++++------ src/config.h | 7 --- src/mptable.c | 10 ++-- src/optionroms.c | 92 +++++++++++++++++++++--------------- src/pci.c | 137 ++++++++++++++++++++++-------------------------------- src/pci.h | 41 +++++++++------- src/pcibios.c | 6 +- src/pciinit.c | 8 ++-- src/post.c | 2 +- src/usb.c | 39 +++++++--------- src/virtio-blk.c | 11 ++-- 13 files changed, 207 insertions(+), 212 deletions(-) -- 1.7.4.4

9 years, 8 months

[PATCH 0/2] Support white-listing of AHCI controllers in legacy ATA mode

by Kevin O'Connor

This patch series enables the ATA code to support using select AHCI controllers in legacy ATA mode when SeaBIOS isn't compiled with the AHCI driver. I've only registered the device id of the controller on my e350m1 board, but it's easy to add more device ids. Kevin O'Connor (2): Convert ATA pci scan to use pci_device_id table. Add support for white-listing AHCI controllers as ATA compatible. src/ata.c | 120 ++++++++++++++++++++++++++++++++++++------------------------ 1 files changed, 72 insertions(+), 48 deletions(-) -- 1.7.4.4

9 years, 8 months

[PATCH] Remove dev-i440fx.c/h - move code closer to its callers.

by Kevin O'Connor

It's easier to understand the code when it is in the same file as its callers. --- Makefile | 2 +- src/acpi.c | 15 ++++++- src/dev-i440fx.c | 116 ------------------------------------------------------ src/dev-i440fx.h | 14 ------ src/pciinit.c | 43 +++++++++++++++++++- src/shadow.c | 29 +++++++++---- src/smm.c | 36 +++++++++++++++- src/util.h | 7 --- 8 files changed, 109 insertions(+), 153 deletions(-) delete mode 100644 src/dev-i440fx.c delete mode 100644 src/dev-i440fx.h diff --git a/Makefile b/Makefile index 05bcee3..a96c89d 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ SRCBOTH=misc.c pmm.c stacks.c output.c util.c block.c floppy.c ata.c mouse.c \ SRC16=$(SRCBOTH) system.c disk.c font.c SRC32FLAT=$(SRCBOTH) post.c shadow.c memmap.c coreboot.c boot.c \ acpi.c smm.c mptable.c smbios.c pciinit.c optionroms.c mtrr.c \ - lzmadecode.c bootsplash.c jpeg.c usb-hub.c paravirt.c dev-i440fx.c \ + lzmadecode.c bootsplash.c jpeg.c usb-hub.c paravirt.c \ pci_region.c biostables.c xen.c SRC32SEG=util.c output.c pci.c pcibios.c apm.c stacks.c diff --git a/src/acpi.c b/src/acpi.c index 6428d9c..584e557 100644 --- a/src/acpi.c +++ b/src/acpi.c @@ -12,7 +12,6 @@ #include "pci_ids.h" // PCI_VENDOR_ID_INTEL #include "pci_regs.h" // PCI_INTERRUPT_LINE #include "paravirt.h" -#include "dev-i440fx.h" // piix4_fadt_init /****************************************************/ /* ACPI tables init */ @@ -213,6 +212,20 @@ build_header(struct acpi_table_header *h, u32 sig, int len, u8 rev) h->checksum -= checksum(h, len); } +#define PIIX4_ACPI_ENABLE 0xf1 +#define PIIX4_ACPI_DISABLE 0xf0 +#define PIIX4_GPE0_BLK 0xafe0 +#define PIIX4_GPE0_BLK_LEN 4 + +static void piix4_fadt_init(u16 bdf, void *arg) +{ + struct fadt_descriptor_rev1 *fadt = arg; + fadt->acpi_enable = PIIX4_ACPI_ENABLE; + fadt->acpi_disable = PIIX4_ACPI_DISABLE; + fadt->gpe0_blk = cpu_to_le32(PIIX4_GPE0_BLK); + fadt->gpe0_blk_len = PIIX4_GPE0_BLK_LEN; +} + static const struct pci_device_id fadt_init_tbl[] = { /* PIIX4 Power Management device (for ACPI) */ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371AB_3, diff --git a/src/dev-i440fx.c b/src/dev-i440fx.c deleted file mode 100644 index 346f6d0..0000000 --- a/src/dev-i440fx.c +++ /dev/null @@ -1,116 +0,0 @@ -// initialization function which are specific to i440fx chipset -// -// Copyright (C) 2008 Kevin O'Connor <kevin(a)koconnor.net> -// Copyright (C) 2006 Fabrice Bellard -// -// Copyright (C) 2010 Isaku Yamahata <yamahata at valinux co jp> -// Split out from pciinit.c -// -// This file may be distributed under the terms of the GNU LGPLv3 license. -// - -#include "config.h" // CONFIG_DEBUG_LEVEL -#include "util.h" // dprintf -#include "ioport.h" // outb -#include "pci.h" // pci_config_writeb -#include "pci_ids.h" -#include "pci_regs.h" // PCI_INTERRUPT_LINE -#include "acpi.h" -#include "dev-i440fx.h" - -#define I440FX_PAM0 0x59 - -void i440fx_bios_make_writable(u16 bdf, void *arg) -{ - make_bios_writable_intel(bdf, I440FX_PAM0); -} - -void i440fx_bios_make_readonly(u16 bdf, void *arg) -{ - make_bios_readonly_intel(bdf, I440FX_PAM0); -} - -/* PIIX3/PIIX4 PCI to ISA bridge */ -void piix_isa_bridge_init(u16 bdf, void *arg) -{ - int i, irq; - u8 elcr[2]; - - elcr[0] = 0x00; - elcr[1] = 0x00; - for (i = 0; i < 4; i++) { - irq = pci_irqs[i]; - /* set to trigger level */ - elcr[irq >> 3] |= (1 << (irq & 7)); - /* activate irq remapping in PIIX */ - pci_config_writeb(bdf, 0x60 + i, irq); - } - outb(elcr[0], 0x4d0); - outb(elcr[1], 0x4d1); - dprintf(1, "PIIX3/PIIX4 init: elcr=%02x %02x\n", elcr[0], elcr[1]); -} - -/* PIIX3/PIIX4 IDE */ -void piix_ide_init(u16 bdf, void *arg) -{ - pci_config_writew(bdf, 0x40, 0x8000); // enable IDE0 - pci_config_writew(bdf, 0x42, 0x8000); // enable IDE1 - pci_bios_allocate_regions(bdf, NULL); -} - -/* PIIX4 Power Management device (for ACPI) */ -void piix4_pm_init(u16 bdf, void *arg) -{ - // acpi sci is hardwired to 9 - pci_config_writeb(bdf, PCI_INTERRUPT_LINE, 9); - - pci_config_writel(bdf, 0x40, PORT_ACPI_PM_BASE | 1); - pci_config_writeb(bdf, 0x80, 0x01); /* enable PM io space */ - pci_config_writel(bdf, 0x90, PORT_SMB_BASE | 1); - pci_config_writeb(bdf, 0xd2, 0x09); /* enable SMBus io space */ -} - -#define PIIX4_ACPI_ENABLE 0xf1 -#define PIIX4_ACPI_DISABLE 0xf0 -#define PIIX4_GPE0_BLK 0xafe0 -#define PIIX4_GPE0_BLK_LEN 4 - -void piix4_fadt_init(u16 bdf, void *arg) -{ - struct fadt_descriptor_rev1 *fadt = arg; - fadt->acpi_enable = PIIX4_ACPI_ENABLE; - fadt->acpi_disable = PIIX4_ACPI_DISABLE; - fadt->gpe0_blk = cpu_to_le32(PIIX4_GPE0_BLK); - fadt->gpe0_blk_len = PIIX4_GPE0_BLK_LEN; -} - -#define I440FX_SMRAM 0x72 -#define PIIX_DEVACTB 0x58 -#define PIIX_APMC_EN (1 << 25) - -// This code is hardcoded for PIIX4 Power Management device. -void piix4_apmc_smm_init(u16 bdf, void *arg) -{ - int i440_bdf = pci_find_device(PCI_VENDOR_ID_INTEL - , PCI_DEVICE_ID_INTEL_82441); - if (i440_bdf < 0) - return; - - /* check if SMM init is already done */ - u32 value = pci_config_readl(bdf, PIIX_DEVACTB); - if (value & PIIX_APMC_EN) - return; - - /* enable the SMM memory window */ - pci_config_writeb(i440_bdf, I440FX_SMRAM, 0x02 | 0x48); - - smm_save_and_copy(); - - /* enable SMI generation when writing to the APMC register */ - pci_config_writel(bdf, PIIX_DEVACTB, value | PIIX_APMC_EN); - - smm_relocate_and_restore(); - - /* close the SMM memory window and enable normal SMM */ - pci_config_writeb(i440_bdf, I440FX_SMRAM, 0x02 | 0x08); -} diff --git a/src/dev-i440fx.h b/src/dev-i440fx.h deleted file mode 100644 index ab5a4d1..0000000 --- a/src/dev-i440fx.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef __I440FX_H -#define __I440FX_H - -#include "types.h" // u16 - -void i440fx_bios_make_writable(u16 bdf, void *arg); -void i440fx_bios_make_readonly(u16 bdf, void *arg); -void piix_isa_bridge_init(u16 bdf, void *arg); -void piix_ide_init(u16 bdf, void *arg); -void piix4_pm_init(u16 bdf, void *arg); -void piix4_fadt_init(u16 bdf, void *arg); -void piix4_apmc_smm_init(u16 bdf, void *arg); - -#endif // __I440FX_H diff --git a/src/pciinit.c b/src/pciinit.c index 0bd9b72..ca0d182 100644 --- a/src/pciinit.c +++ b/src/pciinit.c @@ -10,7 +10,6 @@ #include "biosvar.h" // GET_EBDA #include "pci_ids.h" // PCI_VENDOR_ID_INTEL #include "pci_regs.h" // PCI_COMMAND -#include "dev-i440fx.h" #include "xen.h" // usingXen #define PCI_ROM_SLOT 6 @@ -115,7 +114,7 @@ static int pci_bios_allocate_region(u16 bdf, int region_num) return is_64bit; } -void pci_bios_allocate_regions(u16 bdf, void *arg) +static void pci_bios_allocate_regions(u16 bdf, void *arg) { int i; for (i = 0; i < PCI_NUM_REGIONS; i++) { @@ -135,6 +134,26 @@ static int pci_slot_get_pirq(u16 bdf, int irq_num) return (irq_num + slot_addend) & 3; } +/* PIIX3/PIIX4 PCI to ISA bridge */ +static void piix_isa_bridge_init(u16 bdf, void *arg) +{ + int i, irq; + u8 elcr[2]; + + elcr[0] = 0x00; + elcr[1] = 0x00; + for (i = 0; i < 4; i++) { + irq = pci_irqs[i]; + /* set to trigger level */ + elcr[irq >> 3] |= (1 << (irq & 7)); + /* activate irq remapping in PIIX */ + pci_config_writeb(bdf, 0x60 + i, irq); + } + outb(elcr[0], 0x4d0); + outb(elcr[1], 0x4d1); + dprintf(1, "PIIX3/PIIX4 init: elcr=%02x %02x\n", elcr[0], elcr[1]); +} + static const struct pci_device_id pci_isa_bridge_tbl[] = { /* PIIX3/PIIX4 PCI to ISA bridge */ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371SB_0, @@ -245,6 +264,14 @@ static void storage_ide_init(u16 bdf, void *arg) pci_set_io_region_addr(bdf, 3, PORT_ATA2_CTRL_BASE); } +/* PIIX3/PIIX4 IDE */ +static void piix_ide_init(u16 bdf, void *arg) +{ + pci_config_writew(bdf, 0x40, 0x8000); // enable IDE0 + pci_config_writew(bdf, 0x42, 0x8000); // enable IDE1 + pci_bios_allocate_regions(bdf, NULL); +} + static void pic_ibm_init(u16 bdf, void *arg) { /* PIC, IBM, MPIC & MPIC2 */ @@ -286,6 +313,18 @@ static const struct pci_device_id pci_class_tbl[] = { PCI_DEVICE_END, }; +/* PIIX4 Power Management device (for ACPI) */ +static void piix4_pm_init(u16 bdf, void *arg) +{ + // acpi sci is hardwired to 9 + pci_config_writeb(bdf, PCI_INTERRUPT_LINE, 9); + + pci_config_writel(bdf, 0x40, PORT_ACPI_PM_BASE | 1); + pci_config_writeb(bdf, 0x80, 0x01); /* enable PM io space */ + pci_config_writel(bdf, 0x90, PORT_SMB_BASE | 1); + pci_config_writeb(bdf, 0xd2, 0x09); /* enable SMBus io space */ +} + static const struct pci_device_id pci_device_tbl[] = { /* PIIX4 Power Management device (for ACPI) */ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371AB_3, diff --git a/src/shadow.c b/src/shadow.c index cb39ddf..169decf 100644 --- a/src/shadow.c +++ b/src/shadow.c @@ -9,12 +9,13 @@ #include "pci.h" // pci_config_writeb #include "config.h" // CONFIG_* #include "pci_ids.h" // PCI_VENDOR_ID_INTEL -#include "dev-i440fx.h" #include "xen.h" // usingXen // On the emulators, the bios at 0xf0000 is also at 0xffff0000 #define BIOS_SRC_OFFSET 0xfff00000 +#define I440FX_PAM0 0x59 + // Enable shadowing and copy bios. static void __make_bios_writable_intel(u16 bdf, u32 pam0) @@ -52,7 +53,7 @@ __make_bios_writable_intel(u16 bdf, u32 pam0) , code32flat_end - code32flat_start); } -void +static void make_bios_writable_intel(u16 bdf, u32 pam0) { int reg = pci_config_readb(bdf, pam0); @@ -70,7 +71,7 @@ make_bios_writable_intel(u16 bdf, u32 pam0) __make_bios_writable_intel(bdf, pam0); } -void +static void make_bios_readonly_intel(u16 bdf, u32 pam0) { // Flush any pending writes before locking memory. @@ -93,12 +94,28 @@ make_bios_readonly_intel(u16 bdf, u32 pam0) pci_config_writeb(bdf, pam0, 0x10); } +static void i440fx_bios_make_writable(u16 bdf, void *arg) +{ + make_bios_writable_intel(bdf, I440FX_PAM0); +} + +static void i440fx_bios_make_readonly(u16 bdf, void *arg) +{ + make_bios_readonly_intel(bdf, I440FX_PAM0); +} + static const struct pci_device_id dram_controller_make_writable_tbl[] = { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82441, i440fx_bios_make_writable), PCI_DEVICE_END }; +static const struct pci_device_id dram_controller_make_readonly_tbl[] = { + PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82441, + i440fx_bios_make_readonly), + PCI_DEVICE_END +}; + // Make the 0xc0000-0x100000 area read/writable. void make_bios_writable(void) @@ -118,12 +135,6 @@ make_bios_writable(void) } } -static const struct pci_device_id dram_controller_make_readonly_tbl[] = { - PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82441, - i440fx_bios_make_readonly), - PCI_DEVICE_END -}; - // Make the BIOS code segment area (0xf0000) read-only. void make_bios_readonly(void) diff --git a/src/smm.c b/src/smm.c index 7e52892..9db02d7 100644 --- a/src/smm.c +++ b/src/smm.c @@ -10,7 +10,6 @@ #include "config.h" // CONFIG_* #include "ioport.h" // outb #include "pci_ids.h" // PCI_VENDOR_ID_INTEL -#include "dev-i440fx.h" ASM32FLAT( ".global smm_relocation_start\n" @@ -73,7 +72,7 @@ ASM32FLAT( extern u8 smm_relocation_start, smm_relocation_end; extern u8 smm_code_start, smm_code_end; -void +static void smm_save_and_copy(void) { /* save original memory content */ @@ -84,7 +83,7 @@ smm_save_and_copy(void) &smm_relocation_end - &smm_relocation_start); } -void +static void smm_relocate_and_restore(void) { /* init APM status port */ @@ -106,6 +105,37 @@ smm_relocate_and_restore(void) wbinvd(); } +#define I440FX_SMRAM 0x72 +#define PIIX_DEVACTB 0x58 +#define PIIX_APMC_EN (1 << 25) + +// This code is hardcoded for PIIX4 Power Management device. +static void piix4_apmc_smm_init(u16 bdf, void *arg) +{ + int i440_bdf = pci_find_device(PCI_VENDOR_ID_INTEL + , PCI_DEVICE_ID_INTEL_82441); + if (i440_bdf < 0) + return; + + /* check if SMM init is already done */ + u32 value = pci_config_readl(bdf, PIIX_DEVACTB); + if (value & PIIX_APMC_EN) + return; + + /* enable the SMM memory window */ + pci_config_writeb(i440_bdf, I440FX_SMRAM, 0x02 | 0x48); + + smm_save_and_copy(); + + /* enable SMI generation when writing to the APMC register */ + pci_config_writel(bdf, PIIX_DEVACTB, value | PIIX_APMC_EN); + + smm_relocate_and_restore(); + + /* close the SMM memory window and enable normal SMM */ + pci_config_writeb(i440_bdf, I440FX_SMRAM, 0x02 | 0x08); +} + static const struct pci_device_id smm_init_tbl[] = { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371AB_3, piix4_apmc_smm_init), diff --git a/src/util.h b/src/util.h index 00433e2..7034d43 100644 --- a/src/util.h +++ b/src/util.h @@ -342,14 +342,8 @@ void bios32_setup(void); // shadow.c void make_bios_writable(void); void make_bios_readonly(void); -void make_bios_writable_intel(u16 bdf, u32 pam0); -void make_bios_readonly_intel(u16 bdf, u32 pam0); void qemu_prep_reset(void); -// smm.c -void smm_save_and_copy(void); -void smm_relocate_and_restore(void); - // pci_region.c // region allocator. pci region allocates the requested region // sequentially with overflow check. @@ -381,7 +375,6 @@ u32 pci_region_size(const struct pci_region *r); // pciinit.c extern const u8 pci_irqs[4]; -void pci_bios_allocate_regions(u16 bdf, void *arg); void pci_setup(void); // smm.c -- 1.7.4.4

9 years, 8 months

[PATCH] support piix PAM registers in KVM

by Gleb Natapov

Without this BIOS fails to remap 0xf0000 memory from ROM to RAM so writes to F-segment modify ROM content instead of memory copy. Since QEMU does not reloads ROMs during reset on next boot modified copy of BIOS is used. Signed-off-by: Gleb Natapov <gleb(a)redhat.com> diff --git a/hw/piix_pci.c b/hw/piix_pci.c index 933ad86..0bf435d 100644 --- a/hw/piix_pci.c +++ b/hw/piix_pci.c @@ -99,10 +99,6 @@ static void i440fx_update_memory_mappings(PCII440FXState *d) int i, r; uint32_t smram, addr; - if (kvm_enabled()) { - /* FIXME: Support remappings and protection changes. */ - return; - } update_pam(d, 0xf0000, 0x100000, (d->dev.config[I440FX_PAM] >> 4) & 3); for(i = 0; i < 12; i++) { r = (d->dev.config[(i >> 1) + (I440FX_PAM + 1)] >> ((i & 1) * 4)) & 3; -- Gleb.

9 years, 8 months

[PATCH] Enhance seabios splash picture showing ability

by Wayne Xia

Signed-off-by: Wayne Xia <xiawenc(a)linux.vnet.ibm.com> --- Makefile | 4 +- src/bmp.c | 71 +++++++++++++++++++++++++++++++++ src/bmp.h | 55 ++++++++++++++++++++++++++ src/boot.c | 43 ++++++++++++++++++-- src/bootsplash.c | 114 ++++++++++++++++++++++++++++++++++++++++++------------ 5 files changed, 255 insertions(+), 32 deletions(-) create mode 100644 src/bmp.c create mode 100644 src/bmp.h diff --git a/Makefile b/Makefile index d17f85a..214fe80 100644 --- a/Makefile +++ b/Makefile @@ -15,12 +15,12 @@ SRCBOTH=misc.c pmm.c stacks.c output.c util.c block.c floppy.c ata.c mouse.c \ kbd.c pci.c serial.c clock.c pic.c cdrom.c ps2port.c smp.c resume.c \ pnpbios.c pirtable.c vgahooks.c ramdisk.c pcibios.c blockcmd.c \ usb.c usb-uhci.c usb-ohci.c usb-ehci.c usb-hid.c usb-msc.c \ - virtio-ring.c virtio-pci.c virtio-blk.c apm.c ahci.c + virtio-ring.c virtio-pci.c virtio-blk.c apm.c ahci.c bmp.c SRC16=$(SRCBOTH) system.c disk.c font.c SRC32FLAT=$(SRCBOTH) post.c shadow.c memmap.c coreboot.c boot.c \ acpi.c smm.c mptable.c smbios.c pciinit.c optionroms.c mtrr.c \ lzmadecode.c bootsplash.c jpeg.c usb-hub.c paravirt.c dev-i440fx.c \ - pci_region.c + pci_region.c bmp.c SRC32SEG=util.c output.c pci.c pcibios.c apm.c stacks.c cc-option = $(shell if test -z "`$(1) $(2) -S -o /dev/null -xc \ diff --git a/src/bmp.c b/src/bmp.c new file mode 100644 index 0000000..db91dbe --- /dev/null +++ b/src/bmp.c @@ -0,0 +1,71 @@ +/* +* Basic BMP data process functions. +* Could used to adjust pixel data format, get infomation, etc. +* +* Copyright (C) 2011 Wayne Xia <xiawenc(a)cn.ibm.com> +* +* This work is licensed under the terms of the GNU GPL, version 2 or later. +*/ + +#include "bmp.h" + +void bmp_data_format_proc_24bpp(u8 *src, u8 *dest, int width, int height, + int bytes_per_line_src, int bytes_per_line_dest, u8 switch_flag) +{ + int cy = height; + u8 *pd, *ps, *pd_valid, *ps_lastline; + u8 t; + u8 rgb_switch_flag = switch_flag & SWITCH_RGB; + u8 line_switch_flag = switch_flag & SWITCH_LINE; + while (cy > 0) { + ps = bytes_per_line_src*cy + src - 1; + if (line_switch_flag) { + pd = bytes_per_line_dest * (height - cy + 1) + dest - 1; + } else { + pd = bytes_per_line_dest * cy + dest - 1; + } + ps_lastline = ps-bytes_per_line_src; + pd_valid = pd - (bytes_per_line_dest - bytes_per_line_src); + while (pd > pd_valid) { + *pd = 0; + pd--; + } + while (ps > ps_lastline) { + if (rgb_switch_flag) { + t = *ps; + *ps = *(ps-2); + *(ps-2) = t; + } + *(pd--) = *(ps--); + *(pd--) = *(ps--); + *(pd--) = *(ps--); + } + cy--; + } +} + +int bmp_get_info(u8 *data, int data_size, int *width_p, int *height_p, + int *bpp_p, int *offset_p) +{ + if (data_size < 54) { + return 1; + } + + u16 bmp_filehead = bmp_load2byte(data + 0); + if (bmp_filehead != 0x4d42) { + return 2; + } + u32 bmp_recordsize = bmp_load4byte(data + 2); + if (bmp_recordsize != data_size) { + return 3; + } + u32 bmp_dataoffset = bmp_load4byte(data + 10); + u32 bmp_width = bmp_load4byte(data + 18); + u32 bmp_height = bmp_load4byte(data + 22); + u32 bmp_bpp = bmp_load2byte(data + 28); + *width_p = bmp_width; + *height_p = bmp_height; + *bpp_p = bmp_bpp; + *offset_p = bmp_dataoffset; + return 0; +} diff --git a/src/bmp.h b/src/bmp.h new file mode 100644 index 0000000..ea0258b --- /dev/null +++ b/src/bmp.h @@ -0,0 +1,55 @@ +#ifndef BMP_H +#define BMP_H +#include "types.h" + +#define WIDTHBYTES(bits) (((bits)+31)/32*4) + +typedef u8 BYTE; +typedef u32 BYTE4; + + +typedef struct tagBITMAPFILEHEADER { +BYTE bfType[2]; +BYTE bfSize[4]; +BYTE bfReserved1[2]; +BYTE bfReserved2[2]; +BYTE bfOffBits[4]; +} BITMAPFILEHEADER, tagBITMAPFILEHEADER; + +typedef struct tagBITMAPINFOHEADER { +BYTE biSize[4]; +BYTE biWidth[4]; +BYTE biHeight[4]; +BYTE biPlanes[2]; +BYTE biBitCount[2]; +BYTE biCompression[4]; +BYTE biSizeImage[4]; +BYTE biXPelsPerMeter[4]; +BYTE biYPelsPerMeter[4]; +BYTE biClrUsed[4]; +BYTE biClrImportant[4]; +} BITMAPINFOHEADER, tagBITMAPINFOHEADER; + +typedef struct tagRGBQUAD { +BYTE rgbBlue; +BYTE rgbGreen; +BYTE rgbRed; +BYTE rgbReserved; +} RGBQUAD, tagRGBQUAD; + +#define bmp_load4byte(addr) ((addr)[0] + ((addr)[1]<<8) \ + + ((addr)[2]<<16) + ((addr)[3]<<24)) +#define bmp_load2byte(addr) ((addr)[0] + ((addr)[1]<<8)) + +#define SWITCH_RGB 0x01 +#define SWITCH_LINE 0x02 + +/* src can be equal to dest, if not need to switch the lines from bottom to top, +bytes_per_line_src must be less or eqaul than bytes_per_line_dest */ +void bmp_data_format_proc_24bpp(u8 *src, u8 *dest, int width, int height, + int bytes_per_line_src, int bytes_per_line_dest, u8 switch_flag); + +/* retrieve basic infomation of bmp file */ +int bmp_get_info(u8 *data, int data_size, int *width_p, int *height_p, + int *bpp_p, int *offset_p); +#endif diff --git a/src/boot.c b/src/boot.c index 9a67916..e1e3db4 100644 --- a/src/boot.c +++ b/src/boot.c @@ -372,23 +372,56 @@ boot_add_cbfs(void *data, const char *desc, int prio) static void interactive_bootmenu(void) { - if (! CONFIG_BOOTMENU || ! qemu_cfg_show_boot_menu()) + int filecfg_size; + u8 *filecfg_p = romfile_loadfile("bootsplash.cfg", &filecfg_size); + u8 showflag_normal; + u16 splash_time; + + if (filecfg_p != NULL && filecfg_size >= 4) { + showflag_normal = *filecfg_p; + splash_time = *(filecfg_p+2)+(*(filecfg_p+3)<<8); /* little endian */ + free(filecfg_p); + } else { + showflag_normal = 0; + splash_time = CONFIG_BOOTMENU_WAIT; + } + + /* the user do not want to show the menu, so normally bootup */ + if (!qemu_cfg_show_boot_menu()) { + if (showflag_normal) { + while (get_keystroke(0) >= 0) { + ; + } + enable_bootsplash(); + get_keystroke(splash_time); + disable_bootsplash(); + } return; + } else { + /* user want to show menu, check the if the bios config allow it */ + if (!CONFIG_BOOTMENU) { + return; + } + } + - while (get_keystroke(0) >= 0) + while (get_keystroke(0) >= 0) { ; + } printf("Press F12 for boot menu.\n\n"); enable_bootsplash(); - int scan_code = get_keystroke(CONFIG_BOOTMENU_WAIT); + int scan_code = get_keystroke(splash_time); disable_bootsplash(); - if (scan_code != 0x86) + if (scan_code != 0x86) { /* not F12 */ return; + } - while (get_keystroke(0) >= 0) + while (get_keystroke(0) >= 0) { ; + } printf("Select boot device:\n\n"); wait_threads(); diff --git a/src/bootsplash.c b/src/bootsplash.c index cf1a603..05f88c1 100644 --- a/src/bootsplash.c +++ b/src/bootsplash.c @@ -12,7 +12,7 @@ #include "jpeg.h" // splash #include "biosvar.h" // SET_EBDA #include "paravirt.h" // romfile_find - +#include "bmp.h" /**************************************************************** * VESA structures @@ -109,7 +109,7 @@ enable_vga_console(void) static int find_videomode(struct vesa_info *vesa_info, struct vesa_mode_info *mode_info - , int width, int height) + , int width, int height, int bpp_req) { dprintf(3, "Finding vesa mode with dimensions %d/%d\n", width, height); u16 *videomodes = SEGOFF_TO_FLATPTR(vesa_info->video_mode_ptr); @@ -135,8 +135,15 @@ find_videomode(struct vesa_info *vesa_info, struct vesa_mode_info *mode_info || mode_info->y_resolution != height) continue; u8 depth = mode_info->bits_per_pixel; - if (depth != 16 && depth != 24 && depth != 32) - continue; + if (bpp_req == 0) { + if (depth != 16 && depth != 24 && depth != 32) { + continue; + } + } else { + if (depth != bpp_req) { + continue; + } + } return videomode; } } @@ -146,15 +153,24 @@ static int BootsplashActive; void enable_bootsplash(void) { - if (!CONFIG_BOOTSPLASH) + if (!CONFIG_BOOTSPLASH) { return; + } dprintf(3, "Checking for bootsplash\n"); + u8 type = 0; /* 0 means jpg, 1 means bmp, default is 0=jpg */ int filesize; u8 *filedata = romfile_loadfile("bootsplash.jpg", &filesize); - if (!filedata) - return; + if (!filedata) { + filedata = romfile_loadfile("bootsplash.bmp", &filesize); + if (!filedata) { + return; + } + type = 1; + } + dprintf(3, "start showing bootsplash\n"); - u8 *picture = NULL; + u8 *picture = NULL; /* data buff used to be flushded to the video buff */ + u8 *picture_post = NULL; /* another buff, used to do some post process */ struct vesa_info *vesa_info = malloc_tmplow(sizeof(*vesa_info)); struct vesa_mode_info *mode_info = malloc_tmplow(sizeof(*mode_info)); struct jpeg_decdata *jpeg = jpeg_alloc(); @@ -184,20 +200,45 @@ enable_bootsplash(void) vesa_info->vesa_version>>8, vesa_info->vesa_version&0xff, vendor, product); - // Parse jpeg and get image size. - dprintf(5, "Decoding bootsplash.jpg\n"); - int ret = jpeg_decode(jpeg, filedata); - if (ret) { - dprintf(1, "jpeg_decode failed with return code %d...\n", ret); - goto done; + int ret, width, height; + int bpp_require = 0; + int data_offset = 0; + u8 post_flag = 0; + if (type == 0) { + /* Parse jpeg and get image size. */ + dprintf(5, "Decoding bootsplash.jpg\n"); + ret = jpeg_decode(jpeg, filedata); + if (ret) { + dprintf(1, "jpeg_decode failed with return code %d...\n", ret); + goto done; + } + jpeg_get_size(jpeg, &width, &height); + bpp_require = 24;/* for better vision effect, use 24 bpp mode */ + } else { + /* Parse jpeg and get image size. */ + dprintf(5, "retrieve information of bootsplash.bmp file\n"); + int bpp_src; + ret = bmp_get_info(filedata, filesize, &width, &height, + &bpp_src, &data_offset); + if (ret) { + dprintf(1, "retrieve bmp info failed with ret code %d...\n", ret); + goto done; + } + if (bpp_src != 24) { + dprintf(1, "only support 24bpp, now the bpp is %d...\n", bpp_src); + goto done; + } + bpp_require = 24; } - int width, height; - jpeg_get_size(jpeg, &width, &height); // Try to find a graphics mode with the corresponding dimensions. - int videomode = find_videomode(vesa_info, mode_info, width, height); - if (videomode < 0) + int videomode = find_videomode(vesa_info, mode_info, width, height, + bpp_require); + if (videomode < 0) { + dprintf(1, "failed to find a videomode with %dx%d %dbpp (0=any).\n", + width, height, bpp_require); goto done; + } void *framebuffer = mode_info->phys_base_ptr; int depth = mode_info->bits_per_pixel; dprintf(3, "mode: %04x\n", videomode); @@ -206,17 +247,40 @@ enable_bootsplash(void) dprintf(3, "bits per pixel: %d\n", depth); // Allocate space for image and decompress it. - int imagesize = width * height * (depth / 8); + int imagesize = height * mode_info->bytes_per_scanline; picture = malloc_tmphigh(imagesize); if (!picture) { warn_noalloc(); goto done; } - dprintf(5, "Decompressing bootsplash.jpg\n"); - ret = jpeg_show(jpeg, picture, width, height, depth); - if (ret) { - dprintf(1, "jpeg_show failed with return code %d...\n", ret); - goto done; + + if (type == 0) { + dprintf(5, "Decompressing bootsplash.data\n"); + ret = jpeg_show(jpeg, picture, width, height, depth); + if (ret) { + dprintf(1, "jpeg_show failed with return code %d...\n", ret); + goto done; + } + picture_post = picture; + post_flag |= SWITCH_RGB; + if (depth == 24 && mode_info->bytes_per_scanline >= width * 24 / 8) { + bmp_data_format_proc_24bpp(picture_post, picture, width, height, + width * 24 / 8, mode_info->bytes_per_scanline, post_flag); + } + } else { + picture_post = malloc_tmphigh(imagesize); + if (!picture_post) { + warn_noalloc(); + goto done; + } + + memcpy(picture_post, filedata+data_offset, filesize-data_offset); + post_flag |= SWITCH_LINE; + if (depth == 24 && mode_info->bytes_per_scanline >= width * 24 / 8) { + bmp_data_format_proc_24bpp(picture_post, picture, width, height, + width * 24 / 8, mode_info->bytes_per_scanline, post_flag); + } + free(picture_post); } /* Switch to graphics mode */ @@ -231,7 +295,7 @@ enable_bootsplash(void) } /* Show the picture */ - dprintf(5, "Showing bootsplash.jpg\n"); + dprintf(5, "Showing bootsplash picture\n"); iomemcpy(framebuffer, picture, imagesize); dprintf(5, "Bootsplash copy complete\n"); BootsplashActive = 1; -- 1.7.6-rc1

9 years, 8 months

introduce a patch to enhance seabios splash picture showing ability

by Wayne Xia

Hello, guys, Sorry to take u time again. I made a patch for sea-bios, want to let the bios show a logo picture when KVM start. The reason and details for this patch is described below, which was sent in a mail a few days before: Patch description: ****************************************************** There is suggestion to let KVM be able to show a logo when it start up. Although the sea-bios already included a mechanism to show "bootsplash.jpg" when it was configured with "menu=on" option, it would not show it when the system was normally boot up, so I would like do some modification in the sea-bios code to let the bios showing it without "menu" option, also make this function configurable by the emulator. I tried the tiny jpeg decoder originally included, it seems there will be some observable visual quality lose and if the VESA is in 24BPP mode, the picture data would not be copied correctly for the reason that the byte number per line of that mode is not equal to 3*width, So I would like add some function to fix this, and also added some function to show 24bpp BMP file instead of JPEG as an option to get better visual effect. Following is what I did in details: 1 in the "boot.c", function "interactive_bootmenu", add codes to "romfile_loadfile" the "bootsplash.cfg" file. From it, the seabios get two configuration data : first is whether it should show the picture without menu enabled, second is how long it should show it. if this file loading failed, the sea-bios would act as before. 2 in the "bootsplash.c", function "enable_bootsplash(void)", add codes to try "romfile_loadfile" the "bootsplash.bmp", besides "bootsplash.jpg". Add a function to fix the problem when Bytes per line of VESA mode is not equal to picture width * 3. Also add additional code to show the BMP file instead of JPEG. 3 ADD "bmp.c" and "bmp.h" to support above code. ***************************************************** I didn't found the maintainer of seabios, could anyone help review about it, or help notice the maintainer? Many thanks. -- Best Regards Wayne Xia mail:xiawenc@cn.ibm.com tel:86-010-82450803

9 years, 8 months

[PATCH] Boot up with a splash picture configurable by qemu

by Wayne Xia

From: Wayne Xia <xiawenc(a)cn.ibm.com> --- Makefile | 4 +- src/bmp.c | 69 ++++++++++++++++++++++++++++++++++ src/bmp.h | 51 +++++++++++++++++++++++++ src/boot.c | 37 ++++++++++++++++-- src/bootsplash.c | 109 +++++++++++++++++++++++++++++++++++++++++------------ 5 files changed, 239 insertions(+), 31 deletions(-) create mode 100644 src/bmp.c create mode 100644 src/bmp.h diff --git a/Makefile b/Makefile index d17f85a..214fe80 100644 --- a/Makefile +++ b/Makefile @@ -15,12 +15,12 @@ SRCBOTH=misc.c pmm.c stacks.c output.c util.c block.c floppy.c ata.c mouse.c \ kbd.c pci.c serial.c clock.c pic.c cdrom.c ps2port.c smp.c resume.c \ pnpbios.c pirtable.c vgahooks.c ramdisk.c pcibios.c blockcmd.c \ usb.c usb-uhci.c usb-ohci.c usb-ehci.c usb-hid.c usb-msc.c \ - virtio-ring.c virtio-pci.c virtio-blk.c apm.c ahci.c + virtio-ring.c virtio-pci.c virtio-blk.c apm.c ahci.c bmp.c SRC16=$(SRCBOTH) system.c disk.c font.c SRC32FLAT=$(SRCBOTH) post.c shadow.c memmap.c coreboot.c boot.c \ acpi.c smm.c mptable.c smbios.c pciinit.c optionroms.c mtrr.c \ lzmadecode.c bootsplash.c jpeg.c usb-hub.c paravirt.c dev-i440fx.c \ - pci_region.c + pci_region.c bmp.c SRC32SEG=util.c output.c pci.c pcibios.c apm.c stacks.c cc-option = $(shell if test -z "`$(1) $(2) -S -o /dev/null -xc \ diff --git a/src/bmp.c b/src/bmp.c new file mode 100644 index 0000000..b2a2333 --- /dev/null +++ b/src/bmp.c @@ -0,0 +1,69 @@ +//BMP data process and raw graphic data process functions +#include "bmp.h" + +void bmp_data_format_proc_24bpp(u8* src, u8* dest, int width,int height,int bytes_per_line_src, int bytes_per_line_dest ,u8 switch_flag) +{ + int cy=height; + u8 *pd,*ps,*pd_valid,*ps_lastline; + u8 t; + u8 rgb_switch_flag = switch_flag & SWITCH_RGB; + u8 line_switch_flag = switch_flag & SWITCH_LINE; + while (cy>0) + { + ps=bytes_per_line_src*cy+src-1; + if (line_switch_flag) { + pd=bytes_per_line_dest*(height-cy+1)+dest-1; + } + else { + pd=bytes_per_line_dest*cy+dest-1; + } + ps_lastline=ps-bytes_per_line_src; + pd_valid=pd-(bytes_per_line_dest-bytes_per_line_src); + while (pd>pd_valid) + { + *pd=0; + pd--; + } + while (ps>ps_lastline) + { + if (rgb_switch_flag) + { + t=*ps; + *ps=*(ps-2); + *(ps-2)=t; + } + *(pd--)=*(ps--); + *(pd--)=*(ps--); + *(pd--)=*(ps--); + } + cy--; + } +} + +int bmp_get_info(u8* data, int data_size, int* width_p, int* height_p, int* bpp_p, int* offset_p) +{ + if (data_size<54) + { + return 1; + } + + u16 bmp_filehead =bmp_load2byte(data+0); + if (bmp_filehead != 0x4d42) + { + return 2; + } + u32 bmp_recordsize =bmp_load4byte(data+2); + if (bmp_recordsize != data_size) + { + return 3; + } + u32 bmp_dataoffset =bmp_load4byte(data+10); + u32 bmp_width =bmp_load4byte(data+18); + u32 bmp_height =bmp_load4byte(data+22); + u32 bmp_bpp =bmp_load2byte(data+28); + *width_p =bmp_width; + *height_p =bmp_height; + *bpp_p =bmp_bpp; + *offset_p =bmp_dataoffset; + return 0; +} diff --git a/src/bmp.h b/src/bmp.h new file mode 100644 index 0000000..60045f9 --- /dev/null +++ b/src/bmp.h @@ -0,0 +1,51 @@ +#ifndef BMP_H +#define BMP_H +#include "types.h" + +#define WIDTHBYTES(bits) (((bits)+31)/32*4) + +typedef u8 BYTE; +typedef u32 BYTE4; + + +typedef struct tagBITMAPFILEHEADER { +BYTE bfType[2]; +BYTE bfSize[4]; +BYTE bfReserved1[2]; +BYTE bfReserved2[2]; +BYTE bfOffBits[4]; +} BITMAPFILEHEADER,tagBITMAPFILEHEADER; + +typedef struct tagBITMAPINFOHEADER{ +BYTE biSize[4]; +BYTE biWidth[4]; +BYTE biHeight[4]; +BYTE biPlanes[2]; +BYTE biBitCount[2]; +BYTE biCompression[4]; +BYTE biSizeImage[4]; +BYTE biXPelsPerMeter[4]; +BYTE biYPelsPerMeter[4]; +BYTE biClrUsed[4]; +BYTE biClrImportant[4]; +} BITMAPINFOHEADER,tagBITMAPINFOHEADER; + +typedef struct tagRGBQUAD { +BYTE rgbBlue; +BYTE rgbGreen; +BYTE rgbRed; +BYTE rgbReserved; +} RGBQUAD,tagRGBQUAD; + +#define bmp_load4byte(addr) (addr)[0]+((addr)[1]<<8)+((addr)[2]<<16)+((addr)[3]<<24) +#define bmp_load2byte(addr) (addr)[0]+((addr)[1]<<8) + +#define SWITCH_RGB 0x01 +#define SWITCH_LINE 0x02 + +//src can be equal to dest, if do not need to switch the lines from bottom to top +//bytes_per_line_src must be less or eqaul than bytes_per_line_dest +void bmp_data_format_proc_24bpp(u8* src, u8* dest, int width,int height,int bytes_per_line_src, int bytes_per_line_dest ,u8 switch_flag); + +int bmp_get_info(u8* data, int data_size, int* width_p, int* height_p, int* bpp_p, int* offset_p); +#endif diff --git a/src/boot.c b/src/boot.c index 9a67916..676c522 100644 --- a/src/boot.c +++ b/src/boot.c @@ -372,16 +372,45 @@ boot_add_cbfs(void *data, const char *desc, int prio) static void interactive_bootmenu(void) { - if (! CONFIG_BOOTMENU || ! qemu_cfg_show_boot_menu()) - return; + int filecfg_size; + u8 *filecfg_p = romfile_loadfile("bootsplash.cfg", &filecfg_size); + u8 showflag_normal; + u16 splash_time; + + if (filecfg_p != NULL && filecfg_size>=4) { + showflag_normal =*filecfg_p; + splash_time =*(filecfg_p+2)+(*(filecfg_p+3)<<8); //little endian + free (filecfg_p); + } + else { + showflag_normal =0; + splash_time =CONFIG_BOOTMENU_WAIT; + } + + if (! qemu_cfg_show_boot_menu()) { //the user do not want to show the menu, so normally bootup + if (showflag_normal) { + while (get_keystroke(0) >= 0) + ; + enable_bootsplash(); + get_keystroke(splash_time); + disable_bootsplash(); + + } + return; + } + else { + if (! CONFIG_BOOTMENU) //user want to show menu, check the if the bios config allow it + return; + } + while (get_keystroke(0) >= 0) - ; + ; printf("Press F12 for boot menu.\n\n"); enable_bootsplash(); - int scan_code = get_keystroke(CONFIG_BOOTMENU_WAIT); + int scan_code = get_keystroke(splash_time); disable_bootsplash(); if (scan_code != 0x86) /* not F12 */ diff --git a/src/bootsplash.c b/src/bootsplash.c index cf1a603..0adef01 100644 --- a/src/bootsplash.c +++ b/src/bootsplash.c @@ -12,7 +12,7 @@ #include "jpeg.h" // splash #include "biosvar.h" // SET_EBDA #include "paravirt.h" // romfile_find - +#include "bmp.h" /**************************************************************** * VESA structures @@ -109,7 +109,7 @@ enable_vga_console(void) static int find_videomode(struct vesa_info *vesa_info, struct vesa_mode_info *mode_info - , int width, int height) + , int width, int height, int bpp_req) { dprintf(3, "Finding vesa mode with dimensions %d/%d\n", width, height); u16 *videomodes = SEGOFF_TO_FLATPTR(vesa_info->video_mode_ptr); @@ -135,8 +135,14 @@ find_videomode(struct vesa_info *vesa_info, struct vesa_mode_info *mode_info || mode_info->y_resolution != height) continue; u8 depth = mode_info->bits_per_pixel; - if (depth != 16 && depth != 24 && depth != 32) - continue; + if (bpp_req == 0) { + if (depth != 16 && depth != 24 && depth != 32) + continue; + } + else { + if (depth != bpp_req) + continue; + } return videomode; } } @@ -149,12 +155,20 @@ enable_bootsplash(void) if (!CONFIG_BOOTSPLASH) return; dprintf(3, "Checking for bootsplash\n"); + u8 type=0;//0 means jpg, 1 means bmp, default is 0=jpg int filesize; u8 *filedata = romfile_loadfile("bootsplash.jpg", &filesize); - if (!filedata) - return; + if (!filedata) { + filedata = romfile_loadfile("bootsplash.bmp", &filesize); + if (!filedata) { + return; + } + type =1; + } + //dprintf(3, "start showing bootsplash\n"); - u8 *picture = NULL; + u8 *picture = NULL; //data buff used to be flushded to the video buff + u8 *picture_post = NULL; //another buff, used to do some post process, such as line sequence reverse struct vesa_info *vesa_info = malloc_tmplow(sizeof(*vesa_info)); struct vesa_mode_info *mode_info = malloc_tmplow(sizeof(*mode_info)); struct jpeg_decdata *jpeg = jpeg_alloc(); @@ -184,20 +198,43 @@ enable_bootsplash(void) vesa_info->vesa_version>>8, vesa_info->vesa_version&0xff, vendor, product); - // Parse jpeg and get image size. - dprintf(5, "Decoding bootsplash.jpg\n"); - int ret = jpeg_decode(jpeg, filedata); - if (ret) { - dprintf(1, "jpeg_decode failed with return code %d...\n", ret); - goto done; + int ret, width, height; + int bpp_require=0; + int data_offset=0; + u8 post_flag=0; + if (type == 0) { + // Parse jpeg and get image size. + dprintf(5, "Decoding bootsplash.jpg\n"); + ret = jpeg_decode(jpeg, filedata); + if (ret) { + dprintf(1, "jpeg_decode failed with return code %d...\n", ret); + goto done; + } + jpeg_get_size(jpeg, &width, &height); + bpp_require =24;//for better vision effect, although there are 16 bpp mode exist + } + else { + // Parse jpeg and get image size. + dprintf(5, "retrieve information of bootsplash.bmp file\n"); + int bpp_src; + ret=bmp_get_info(filedata, filesize, &width, &height, &bpp_src, &data_offset); + if (ret) { + dprintf(1, "retrieve information from bmp file failed with return code %d...\n", ret); + goto done; + } + if (bpp_src != 24) { + dprintf(1, "only support 24bpp color, now the bmp file's bpp is %d...\n", bpp_src); + goto done; + } + bpp_require =24; } - int width, height; - jpeg_get_size(jpeg, &width, &height); // Try to find a graphics mode with the corresponding dimensions. - int videomode = find_videomode(vesa_info, mode_info, width, height); - if (videomode < 0) - goto done; + int videomode = find_videomode(vesa_info, mode_info, width, height, bpp_require); + if (videomode < 0) { + dprintf(1, "failed to find a videomode with %dx%d %dbpp (0 means any).\n", width, height, bpp_require); + goto done; + } void *framebuffer = mode_info->phys_base_ptr; int depth = mode_info->bits_per_pixel; dprintf(3, "mode: %04x\n", videomode); @@ -206,17 +243,39 @@ enable_bootsplash(void) dprintf(3, "bits per pixel: %d\n", depth); // Allocate space for image and decompress it. - int imagesize = width * height * (depth / 8); + int imagesize = height * mode_info->bytes_per_scanline; picture = malloc_tmphigh(imagesize); if (!picture) { warn_noalloc(); goto done; } - dprintf(5, "Decompressing bootsplash.jpg\n"); - ret = jpeg_show(jpeg, picture, width, height, depth); - if (ret) { - dprintf(1, "jpeg_show failed with return code %d...\n", ret); - goto done; + + if (type == 0) { + dprintf(5, "Decompressing bootsplash.data\n"); + ret = jpeg_show(jpeg, picture, width, height, depth); + if (ret) { + dprintf(1, "jpeg_show failed with return code %d...\n", ret); + goto done; + } + picture_post=picture; + post_flag |= SWITCH_RGB; + if ( depth==24 && mode_info->bytes_per_scanline >= width * 24 /8){ + bmp_data_format_proc_24bpp(picture_post, picture, width, height, width * 24 /8, mode_info->bytes_per_scanline, post_flag); + } + } + else { + picture_post = malloc_tmphigh(imagesize); + if (!picture_post) { + warn_noalloc(); + goto done; + } + + memcpy(picture_post, filedata+data_offset,filesize-data_offset); + post_flag |= SWITCH_LINE; + if ( depth==24 && mode_info->bytes_per_scanline >= width * 24 /8){ + bmp_data_format_proc_24bpp(picture_post, picture, width, height, width * 24 /8, mode_info->bytes_per_scanline, post_flag); + } + free(picture_post); } /* Switch to graphics mode */ @@ -231,7 +290,7 @@ enable_bootsplash(void) } /* Show the picture */ - dprintf(5, "Showing bootsplash.jpg\n"); + dprintf(5, "Showing bootsplash picture\n"); iomemcpy(framebuffer, picture, imagesize); dprintf(5, "Bootsplash copy complete\n"); BootsplashActive = 1; -- 1.7.1

9 years, 8 months

Want to introduce a feature to let SeaBios Show a bootflash picture when system start up normally

by wayne

Hello all, There is suggestion to let KVM be able to show a logo when it start up. Although the sea-bios already included a mechanism to try show "bootsplash.jpg" when it was configured with "menu=on" option, but it would not show it when the system was normally boot up, so I would like do some modification in the sea-bios code to let the bios showing the picture when the system boot up. I tried the tiny jpeg decoder originally included, it seems there will be some observable visual quality lose and if the VESA is in 24BPP mode, the picture data would not be copied correctly for the reason that the byte number per line of that mode is not equal to 3*width, So I want to add some function to fix this, and also added some function to show 24bpp BMP file instead of JPEG as an option to get better visual effect. Following is what I want to do: 1 in the "boot.c", function "interactive_bootmenu", add codes to "romfile_loadfile" the "bootsplash.cfg" file. From it, the seabios get two configuration data : first is should it show the picture without menu enabled, second is how long it should show it. if load file failed, the sea-bios would act as before. 2 in the "bootsplash.c", function "enable_bootsplash(void)", add codes to try "romfile_loadfile" the "bootsplash.bmp", besides "bootsplash.jpg". Add a function to fix the problem when Bytes per line of VESA mode is not equal to picture width * 3. Also add additional code to show the BMP file instead of JPEG. 3 ADD "bmp.c" and "bmp.h" to support above code. Could this be acceptable? -- Best Regards Wayne Xia mail:xiawenc@cn.ibm.com tel:86-010-82450803

9 years, 8 months

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS June 2011