SeaBIOS

seabios@seabios.org

4 participants
3801 discussions

Re: [SeaBIOS] [PATCH 3/6] Add runningOnQEMU() and runningOnXEN() ror runtime platform detection.
by Kevin O'Connor 11 Feb '13

11 Feb '13

On Sat, Feb 09, 2013 at 08:42:31PM +0100, Fred . wrote: > runningOnXEN() > > It is Xen not XEN. It is not capitalized. I've updated the Kconfig comments in my tree. > Also, hypercall_xen_version() has underscore, but runningOnXEN() has > camelcase. > Maybe runningOnXEN() should be named running_on_Xen() ? For better or worse, SeaBIOS has no standard wrt camelcase names. -Kevin

2 1

[PATCH] The mathcp setup touches the PIC and thus move to the "setup" phase.
by Kevin O'Connor 10 Feb '13

10 Feb '13

Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- src/misc.c | 2 +- src/post.c | 2 +- src/util.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/misc.c b/src/misc.c index 3b2ffc1..05d0cf5 100644 --- a/src/misc.c +++ b/src/misc.c @@ -63,7 +63,7 @@ handle_02(void) } void -mathcp_init(void) +mathcp_setup(void) { dprintf(3, "math cp init\n"); // 80x87 coprocessor installed diff --git a/src/post.c b/src/post.c index 1dfbb21..3af3638 100644 --- a/src/post.c +++ b/src/post.c @@ -116,7 +116,6 @@ interface_init(void) bda_init(); // Other interfaces - mathcp_init(); boot_init(); bios32_init(); pmm_init(); @@ -157,6 +156,7 @@ platform_hardware_setup(void) // Init base pc hardware. pic_setup(); + mathcp_setup(); timer_setup(); // Initialize pci diff --git a/src/util.h b/src/util.h index 04c5a9d..0659d24 100644 --- a/src/util.h +++ b/src/util.h @@ -449,7 +449,7 @@ u64 romfile_loadint(const char *name, u64 defval); void reset_vector(void) __noreturn; // misc.c -void mathcp_init(void); +void mathcp_setup(void); extern u32 RamSize; extern u64 RamSizeOver4G; extern u8 BiosChecksum; -- 1.7.11.7

1 0

[PATCH] Start device_hardware_setup in mainint even with CONFIG_THREAD_OPTIONROMS.
by Kevin O'Connor 10 Feb '13

10 Feb '13

There's no real gain to starting the device_hardware_setup in the middle of the platform setup. Always start it just prior to the VGA rom. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- src/post.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/post.c b/src/post.c index 2d5dd4f..1dfbb21 100644 --- a/src/post.c +++ b/src/post.c @@ -163,19 +163,13 @@ platform_hardware_setup(void) pci_setup(); smm_setup(); - // Initialize mtrr + // Initialize mtrr and smp mtrr_setup(); + smp_setup(); // Setup Xen hypercalls xen_hypercall_setup(); - // Start hardware initialization (if optionrom threading) - if (CONFIG_THREAD_OPTIONROMS) - device_hardware_setup(); - - // Find and initialize other cpus - smp_setup(); - // Setup external BIOS interface tables if (CONFIG_COREBOOT) coreboot_biostable_setup(); @@ -225,6 +219,10 @@ maininit(void) // Setup platform devices. platform_hardware_setup(); + // Start hardware initialization (if optionrom threading) + if (CONFIG_THREAD_OPTIONROMS) + device_hardware_setup(); + // Run vga option rom vgarom_setup(); -- 1.7.11.7

1 0

[PATCH] Only perform SMP setup on QEMU.
by Kevin O'Connor 10 Feb '13

10 Feb '13

The SMP setup initializes MTRRs on extra CPUs and populates the CountCPUs variable. On coreboot the CPUs should already be initialized and the CountCPUs variable isn't used anywhere. There have also been reports of the SIPI does not work on some real machines. So, it's best not to invoke one if it isn't needed. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- src/smp.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/src/smp.c b/src/smp.c index 1590d65..f971647 100644 --- a/src/smp.c +++ b/src/smp.c @@ -83,6 +83,9 @@ int apic_id_is_present(u8 apic_id) void smp_setup(void) { + if (!CONFIG_QEMU) + return; + ASSERT32FLAT(); u32 eax, ebx, ecx, cpuid_features; cpuid(1, &eax, &ebx, &ecx, &cpuid_features); @@ -112,13 +115,11 @@ smp_setup(void) u32 val = readl(APIC_SVR); writel(APIC_SVR, val | APIC_ENABLED); - if (CONFIG_QEMU) { - /* Set LINT0 as Ext_INT, level triggered */ - writel(APIC_LINT0, 0x8700); + /* Set LINT0 as Ext_INT, level triggered */ + writel(APIC_LINT0, 0x8700); - /* Set LINT1 as NMI, level triggered */ - writel(APIC_LINT1, 0x8400); - } + /* Set LINT1 as NMI, level triggered */ + writel(APIC_LINT1, 0x8400); // broadcast SIPI barrier(); @@ -127,13 +128,9 @@ smp_setup(void) writel(APIC_ICR_LOW, 0x000C4600 | sipi_vector); // Wait for other CPUs to process the SIPI. - if (CONFIG_QEMU) { - u8 cmos_smp_count = inb_cmos(CMOS_BIOS_SMP_COUNT); - while (cmos_smp_count + 1 != readl(&CountCPUs)) - yield(); - } else { - msleep(10); - } + u8 cmos_smp_count = inb_cmos(CMOS_BIOS_SMP_COUNT); + while (cmos_smp_count + 1 != readl(&CountCPUs)) + yield(); // Restore memory. *(u64*)BUILD_AP_BOOT_ADDR = old; -- 1.7.11.7

1 0

[PATCH 0/8] Convert legacy fw_cfg ports to romfile
by Kevin O'Connor 10 Feb '13

10 Feb '13

QEMU has multiple mechanisms for passing configuration information into SeaBIOS: cmos, fw_cfg ports, and fw_cfg "files". The preferred mechanism is the "file" interface which is internally accessed via a "romfile" interface. It's annoying to have to switch between the different interfaces. So, this patch series converts all the older fw_cfg ports (and some cmos info) to use romfile as well. I've lightly tested this series. I've also pushed it for testing to: https://github.com/KevinOConnor/seabios/branches/test-fwcfg-20130209 -Kevin Kevin O'Connor (8): Support skipping content when reading from QEMU fw_cfg romfile entries. Convert fw_cfg ACPI entries into romfile entries. Convert fw_cfg SMBIOS entries into romfile entries. Convert basic integer fw_cfg entries into romfile entries. Convert fw_cfg NUMA entries into a romfile entry. Process fw_cfg e820 entries during the fw_cfg setup stage. Integrate qemu_cfg_preinit() into qemu_romfile_init(). Convert some QEMU cmos config variables to the romfile interface. src/acpi.c | 50 ++++--- src/ata.c | 1 - src/boot.c | 2 +- src/clock.c | 5 +- src/cmos.h | 12 +- src/coreboot.c | 1 - src/floppy.c | 21 +-- src/mptable.c | 3 +- src/paravirt.c | 429 +++++++++++++++++++-------------------------------------- src/paravirt.h | 18 +-- src/post.c | 3 +- src/romfile.c | 1 + src/smbios.c | 119 +++++++++++----- src/smp.c | 3 +- 14 files changed, 272 insertions(+), 396 deletions(-) -- 1.7.11.7

1 8

Re: [SeaBIOS] [PATCH 3/6] Add runningOnQEMU() and runningOnXEN() ror runtime platform detection.
by Fred . 09 Feb '13

09 Feb '13

runningOnXEN() It is Xen not XEN. It is not capitalized. Also, hypercall_xen_version() has underscore, but runningOnXEN() has camelcase. Maybe runningOnXEN() should be named running_on_Xen() ? On Sat, Feb 9, 2013 at 8:08 PM, Kevin O'Connor <kevin(a)koconnor.net> wrote: > Introduce standard for performing and inspecting the run-time > detection of para-virtualized environments. > > Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> > --- > src/Kconfig | 14 +++++++++++--- > src/misc.c | 2 ++ > src/paravirt.c | 5 +++++ > src/paravirt.h | 20 ++++++++++++++++++-- > src/xen.c | 7 +++++-- > 5 files changed, 41 insertions(+), 7 deletions(-) > > diff --git a/src/Kconfig b/src/Kconfig > index bbcefe0..6fd45b4 100644 > --- a/src/Kconfig > +++ b/src/Kconfig > @@ -14,9 +14,10 @@ choice > Configure as a coreboot payload. > > config QEMU > - bool "Build for QEMU" > + bool "Build for QEMU/XEN/KVM/Bochs" > + select QEMU_HARDWARE > help > - Configure as QEMU bios. > + Configure for an emulated machine (QEMU, XEN, KVM, or Bochs). > > config CSM > bool "Build as Compatibilty Support Module for EFI BIOS" > @@ -26,9 +27,16 @@ choice > > endchoice > > + config QEMU_HARDWARE > + bool "Support hardware found on emulators (QEMU/XEN/KVM/Bochs)" > if !QEMU > + default n > + help > + Support virtual hardware when the code detects it is > + running on an emulator. > + > config XEN > depends on QEMU > - bool "Build for Xen HVM" > + bool "Support Xen HVM" > default y > help > Configure to be used by xen hvmloader, for a HVM guest. > diff --git a/src/misc.c b/src/misc.c > index bcc450a..3b2ffc1 100644 > --- a/src/misc.c > +++ b/src/misc.c > @@ -16,6 +16,8 @@ u32 RamSize VAR16VISIBLE; > u64 RamSizeOver4G; > // Space for bios tables built an run-time. > char BiosTableSpace[CONFIG_MAX_BIOSTABLE] __aligned(MALLOC_MIN_ALIGN) > VAR16VISIBLE; > +// Type of emulator platform. > +int PlatformRunningOn VAR16VISIBLE; > > > /**************************************************************** > diff --git a/src/paravirt.c b/src/paravirt.c > index 9022186..6e230ee 100644 > --- a/src/paravirt.c > +++ b/src/paravirt.c > @@ -24,6 +24,11 @@ int qemu_cfg_present; > void > qemu_ramsize_preinit(void) > { > + if (!CONFIG_QEMU) > + return; > + > + PlatformRunningOn = PF_QEMU; > + > // On emulators, get memory size from nvram. > u32 rs = ((inb_cmos(CMOS_MEM_EXTMEM2_LOW) << 16) > | (inb_cmos(CMOS_MEM_EXTMEM2_HIGH) << 24)); > diff --git a/src/paravirt.h b/src/paravirt.h > index 4f2d5b8..d32ca13 100644 > --- a/src/paravirt.h > +++ b/src/paravirt.h > @@ -1,8 +1,24 @@ > #ifndef __PV_H > #define __PV_H > > -#include "config.h" // CONFIG_COREBOOT > -#include "util.h" > +#include "config.h" // CONFIG_* > +#include "util.h" // memcpy > +#include "biosvar.h" // GET_GLOBAL > + > +// Types of paravirtualized platforms. > +#define PF_QEMU (1<<0) > +#define PF_XEN (1<<1) > + > +// misc.c > +extern int PlatformRunningOn; > + > +static inline int runningOnQEMU(void) { > + return CONFIG_QEMU || ( > + CONFIG_QEMU_HARDWARE && GET_GLOBAL(PlatformRunningOn) & PF_QEMU); > +} > +static inline int runningOnXen(void) { > + return CONFIG_XEN && GET_GLOBAL(PlatformRunningOn) & PF_XEN; > +} > > /* This CPUID returns the signature 'KVMKVMKVM' in ebx, ecx, and edx. It > * should be used to determine that a VM is running under KVM. > diff --git a/src/xen.c b/src/xen.c > index c9759f0..e075af2 100644 > --- a/src/xen.c > +++ b/src/xen.c > @@ -6,7 +6,7 @@ > > #include "config.h" > #include "xen.h" > - > +#include "paravirt.h" // PlatformRunningOn > #include "memmap.h" // add_e820 > #include "types.h" // ASM32FLAT > #include "util.h" // copy_acpi_rsdp > @@ -76,8 +76,11 @@ void xen_preinit(void) > break; > } > } > - if (!xen_cpuid_base) > + if (!xen_cpuid_base) { > dprintf(1, "No Xen hypervisor found.\n"); > + return; > + } > + PlatformRunningOn = PF_QEMU|PF_XEN; > } > > static int hypercall_xen_version( int cmd, void *arg) > -- > 1.7.11.7 > > > _______________________________________________ > SeaBIOS mailing list > SeaBIOS(a)seabios.org > http://www.seabios.org/mailman/listinfo/seabios >

1 0

Re: [SeaBIOS] [PATCH 2/5] Introduce framework for detecting what platform SeaBIOS is running on.
by Kevin O'Connor 09 Feb '13

09 Feb '13

On Fri, Feb 08, 2013 at 01:56:13PM +0100, Fred . wrote: > Maybe would be nice with a: > int get_platform(); > 0 = QEMU > 1 = Xen > 2 = Coreboot > 3 = CSM > > Then you have one get_platform() function, instead of four separate > startedOnQEMU(), startedOnCoreboot, startedOnCSM, etc functions. That's done on purpose so that the compiler can optimize away chunks of code depending on the various Kconfig settings. -Kevin

1 0

Re: [SeaBIOS] [PATCH 2/5] Introduce framework for detecting what platform SeaBIOS is running on.
by Fred . 08 Feb '13

08 Feb '13

I see functions named coreboot_preinit() with underscore. Then I see functions named runningOnCoreboot() with camelcase. This is inconsistent naming. Shouldn't you be sticking to some coding convention or naming guideline? On Fri, Feb 8, 2013 at 1:56 PM, Fred . <eldmannen(a)gmail.com> wrote: > Maybe would be nice with a: > int get_platform(); > 0 = QEMU > 1 = Xen > 2 = Coreboot > 3 = CSM > > Then you have one get_platform() function, instead of four separate > startedOnQEMU(), startedOnCoreboot, startedOnCSM, etc functions. > > > On Fri, Feb 8, 2013 at 6:07 AM, Kevin O'Connor <kevin(a)koconnor.net> wrote: > >> Introduce startedOnQEMU()/startedOnCoreboot()/etc. calls to enable >> code to determine what platform invoked the initial SeaBIOS startup. >> Also introduce runningOnQEMU()/etc. calls for cases where SeaBIOS can >> detect it is running on a platform even though it wasn't directly >> launched by that platform (eg, Xen may have started SeaBIOS, but Xen >> may be running under qemu). >> >> Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> >> --- >> src/coreboot.c | 3 ++ >> src/csm.c | 2 ++ >> src/paravirt.c | 10 +++++-- >> src/paravirt.h | 93 >> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- >> src/xen.c | 1 + >> 5 files changed, 104 insertions(+), 5 deletions(-) >> >> diff --git a/src/coreboot.c b/src/coreboot.c >> index 57c9737..40a7e72 100644 >> --- a/src/coreboot.c >> +++ b/src/coreboot.c >> @@ -12,6 +12,7 @@ >> #include "boot.h" // boot_add_cbfs >> #include "disk.h" // MAXDESCSIZE >> #include "config.h" // CONFIG_* >> +#include "paravirt.h" // PlatformStartedOn >> >> >> /**************************************************************** >> @@ -145,6 +146,8 @@ coreboot_preinit(void) >> if (!cbm) >> goto fail; >> >> + PlatformStartedOn = PlatformRunningOn = PF_COREBOOT; >> + >> u64 maxram = 0, maxram_over4G = 0; >> int i, count = MEM_RANGE_COUNT(cbm); >> for (i=0; i<count; i++) { >> diff --git a/src/csm.c b/src/csm.c >> index 169b608..c8069d2 100644 >> --- a/src/csm.c >> +++ b/src/csm.c >> @@ -17,6 +17,7 @@ >> #include "boot.h" >> #include "smbios.h" >> #include "pic.h" >> +#include "paravirt.h" // PlatformStartedOn >> >> struct rsdp_descriptor VAR32FLATVISIBLE __aligned(16) csm_rsdp; >> >> @@ -74,6 +75,7 @@ handle_csm_0000(struct bregs *regs) >> dprintf(3, "LoPmmMemory %08x\n", csm_init_table->LowPmmMemory); >> dprintf(3, "LoPmmMemorySize %08x\n", >> csm_init_table->LowPmmMemorySizeInBytes); >> >> + PlatformStartedOn = PlatformRunningOn = PF_CSM; >> csm_malloc_preinit(csm_init_table->LowPmmMemory, >> csm_init_table->LowPmmMemorySizeInBytes, >> csm_init_table->HiPmmMemory, >> diff --git a/src/paravirt.c b/src/paravirt.c >> index ebab256..35b7c11 100644 >> --- a/src/paravirt.c >> +++ b/src/paravirt.c >> @@ -19,6 +19,8 @@ >> #include "mptable.h" // mptable_setup >> #include "pci.h" // create_pirtable >> >> +int PlatformStartedOn, PlatformRunningOn; >> + >> int qemu_cfg_present; >> >> void >> @@ -27,6 +29,7 @@ qemu_preinit(void) >> if (!CONFIG_QEMU) >> return; >> >> + PlatformStartedOn = PlatformRunningOn = PF_QEMU; >> qemu_cfg_preinit(); >> >> // On emulators, get memory size from nvram. >> @@ -108,12 +111,13 @@ qemu_cfg_read_entry(void *buf, int e, int len) >> >> void qemu_cfg_preinit(void) >> { >> + if (!CONFIG_QEMU) >> + return; >> + PlatformRunningOn |= PF_QEMU; >> + >> char *sig = "QEMU"; >> int i; >> >> - if (CONFIG_COREBOOT) >> - return; >> - >> qemu_cfg_present = 1; >> >> qemu_cfg_select(QEMU_CFG_SIGNATURE); >> diff --git a/src/paravirt.h b/src/paravirt.h >> index 2448993..3b00697 100644 >> --- a/src/paravirt.h >> +++ b/src/paravirt.h >> @@ -1,8 +1,97 @@ >> #ifndef __PV_H >> #define __PV_H >> >> -#include "config.h" // CONFIG_COREBOOT >> -#include "util.h" >> +#include "config.h" // CONFIG_* >> +#include "util.h" // memcpy >> + >> + >> +/**************************************************************** >> + * Current platform detection >> + ****************************************************************/ >> + >> +#define PF_QEMU (1<<0) >> +#define PF_COREBOOT (1<<1) >> +#define PF_XEN (1<<2) >> +#define PF_CSM (1<<3) >> + >> +extern int PlatformStartedOn, PlatformRunningOn; >> + >> +static inline int startedOnQEMU(void) >> +{ >> + if (!CONFIG_QEMU) >> + return 0; >> + if (!CONFIG_COREBOOT && !CONFIG_XEN && !CONFIG_CSM) >> + return 1; >> + return PlatformStartedOn == PF_QEMU; >> +} >> + >> +static inline int startedOnCoreboot(void) >> +{ >> + if (!CONFIG_COREBOOT) >> + return 0; >> + if (!CONFIG_QEMU && !CONFIG_XEN && !CONFIG_CSM) >> + return 1; >> + return PlatformStartedOn == PF_COREBOOT; >> +} >> + >> +static inline int startedOnXen(void) >> +{ >> + if (!CONFIG_XEN) >> + return 0; >> + if (!CONFIG_QEMU && !CONFIG_COREBOOT && !CONFIG_CSM) >> + return 1; >> + return PlatformStartedOn == PF_XEN; >> +} >> + >> +static inline int startedOnCSM(void) >> +{ >> + if (!CONFIG_CSM) >> + return 0; >> + if (!CONFIG_QEMU && !CONFIG_COREBOOT && !CONFIG_XEN) >> + return 1; >> + return PlatformStartedOn == PF_CSM; >> +} >> + >> +static inline int runningOnQEMU(void) >> +{ >> + if (!CONFIG_QEMU) >> + return 0; >> + if (!CONFIG_COREBOOT && !CONFIG_XEN && !CONFIG_CSM) >> + return 1; >> + return PlatformRunningOn & PF_QEMU; >> +} >> + >> +static inline int runningOnCoreboot(void) >> +{ >> + if (!CONFIG_COREBOOT) >> + return 0; >> + if (!CONFIG_QEMU && !CONFIG_XEN && !CONFIG_CSM) >> + return 1; >> + return PlatformRunningOn & PF_COREBOOT; >> +} >> + >> +static inline int runningOnXen(void) >> +{ >> + if (!CONFIG_XEN) >> + return 0; >> + if (!CONFIG_QEMU && !CONFIG_COREBOOT && !CONFIG_CSM) >> + return 1; >> + return PlatformRunningOn & PF_XEN; >> +} >> + >> +static inline int runningOnCSM(void) >> +{ >> + if (!CONFIG_CSM) >> + return 0; >> + if (!CONFIG_QEMU && !CONFIG_COREBOOT && !CONFIG_XEN) >> + return 1; >> + return PlatformRunningOn & PF_CSM; >> +} >> + >> + >> +/**************************************************************** >> + * KVM/QEMU firmware >> + ****************************************************************/ >> >> /* This CPUID returns the signature 'KVMKVMKVM' in ebx, ecx, and edx. It >> * should be used to determine that a VM is running under KVM. >> diff --git a/src/xen.c b/src/xen.c >> index a506b42..5122a3c 100644 >> --- a/src/xen.c >> +++ b/src/xen.c >> @@ -81,6 +81,7 @@ void xen_preinit(void) >> return; >> } >> >> + PlatformStartedOn = PlatformRunningOn = PF_XEN; >> qemu_cfg_preinit(); >> >> u64 maxram = 0, maxram_over4G = 0; >> -- >> 1.7.11.7 >> >> >> _______________________________________________ >> SeaBIOS mailing list >> SeaBIOS(a)seabios.org >> http://www.seabios.org/mailman/listinfo/seabios >> > >

1 0

Re: [SeaBIOS] [PATCH 2/5] Introduce framework for detecting what platform SeaBIOS is running on.
by Fred . 08 Feb '13

08 Feb '13

Maybe would be nice with a: int get_platform(); 0 = QEMU 1 = Xen 2 = Coreboot 3 = CSM Then you have one get_platform() function, instead of four separate startedOnQEMU(), startedOnCoreboot, startedOnCSM, etc functions. On Fri, Feb 8, 2013 at 6:07 AM, Kevin O'Connor <kevin(a)koconnor.net> wrote: > Introduce startedOnQEMU()/startedOnCoreboot()/etc. calls to enable > code to determine what platform invoked the initial SeaBIOS startup. > Also introduce runningOnQEMU()/etc. calls for cases where SeaBIOS can > detect it is running on a platform even though it wasn't directly > launched by that platform (eg, Xen may have started SeaBIOS, but Xen > may be running under qemu). > > Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> > --- > src/coreboot.c | 3 ++ > src/csm.c | 2 ++ > src/paravirt.c | 10 +++++-- > src/paravirt.h | 93 > ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- > src/xen.c | 1 + > 5 files changed, 104 insertions(+), 5 deletions(-) > > diff --git a/src/coreboot.c b/src/coreboot.c > index 57c9737..40a7e72 100644 > --- a/src/coreboot.c > +++ b/src/coreboot.c > @@ -12,6 +12,7 @@ > #include "boot.h" // boot_add_cbfs > #include "disk.h" // MAXDESCSIZE > #include "config.h" // CONFIG_* > +#include "paravirt.h" // PlatformStartedOn > > > /**************************************************************** > @@ -145,6 +146,8 @@ coreboot_preinit(void) > if (!cbm) > goto fail; > > + PlatformStartedOn = PlatformRunningOn = PF_COREBOOT; > + > u64 maxram = 0, maxram_over4G = 0; > int i, count = MEM_RANGE_COUNT(cbm); > for (i=0; i<count; i++) { > diff --git a/src/csm.c b/src/csm.c > index 169b608..c8069d2 100644 > --- a/src/csm.c > +++ b/src/csm.c > @@ -17,6 +17,7 @@ > #include "boot.h" > #include "smbios.h" > #include "pic.h" > +#include "paravirt.h" // PlatformStartedOn > > struct rsdp_descriptor VAR32FLATVISIBLE __aligned(16) csm_rsdp; > > @@ -74,6 +75,7 @@ handle_csm_0000(struct bregs *regs) > dprintf(3, "LoPmmMemory %08x\n", csm_init_table->LowPmmMemory); > dprintf(3, "LoPmmMemorySize %08x\n", > csm_init_table->LowPmmMemorySizeInBytes); > > + PlatformStartedOn = PlatformRunningOn = PF_CSM; > csm_malloc_preinit(csm_init_table->LowPmmMemory, > csm_init_table->LowPmmMemorySizeInBytes, > csm_init_table->HiPmmMemory, > diff --git a/src/paravirt.c b/src/paravirt.c > index ebab256..35b7c11 100644 > --- a/src/paravirt.c > +++ b/src/paravirt.c > @@ -19,6 +19,8 @@ > #include "mptable.h" // mptable_setup > #include "pci.h" // create_pirtable > > +int PlatformStartedOn, PlatformRunningOn; > + > int qemu_cfg_present; > > void > @@ -27,6 +29,7 @@ qemu_preinit(void) > if (!CONFIG_QEMU) > return; > > + PlatformStartedOn = PlatformRunningOn = PF_QEMU; > qemu_cfg_preinit(); > > // On emulators, get memory size from nvram. > @@ -108,12 +111,13 @@ qemu_cfg_read_entry(void *buf, int e, int len) > > void qemu_cfg_preinit(void) > { > + if (!CONFIG_QEMU) > + return; > + PlatformRunningOn |= PF_QEMU; > + > char *sig = "QEMU"; > int i; > > - if (CONFIG_COREBOOT) > - return; > - > qemu_cfg_present = 1; > > qemu_cfg_select(QEMU_CFG_SIGNATURE); > diff --git a/src/paravirt.h b/src/paravirt.h > index 2448993..3b00697 100644 > --- a/src/paravirt.h > +++ b/src/paravirt.h > @@ -1,8 +1,97 @@ > #ifndef __PV_H > #define __PV_H > > -#include "config.h" // CONFIG_COREBOOT > -#include "util.h" > +#include "config.h" // CONFIG_* > +#include "util.h" // memcpy > + > + > +/**************************************************************** > + * Current platform detection > + ****************************************************************/ > + > +#define PF_QEMU (1<<0) > +#define PF_COREBOOT (1<<1) > +#define PF_XEN (1<<2) > +#define PF_CSM (1<<3) > + > +extern int PlatformStartedOn, PlatformRunningOn; > + > +static inline int startedOnQEMU(void) > +{ > + if (!CONFIG_QEMU) > + return 0; > + if (!CONFIG_COREBOOT && !CONFIG_XEN && !CONFIG_CSM) > + return 1; > + return PlatformStartedOn == PF_QEMU; > +} > + > +static inline int startedOnCoreboot(void) > +{ > + if (!CONFIG_COREBOOT) > + return 0; > + if (!CONFIG_QEMU && !CONFIG_XEN && !CONFIG_CSM) > + return 1; > + return PlatformStartedOn == PF_COREBOOT; > +} > + > +static inline int startedOnXen(void) > +{ > + if (!CONFIG_XEN) > + return 0; > + if (!CONFIG_QEMU && !CONFIG_COREBOOT && !CONFIG_CSM) > + return 1; > + return PlatformStartedOn == PF_XEN; > +} > + > +static inline int startedOnCSM(void) > +{ > + if (!CONFIG_CSM) > + return 0; > + if (!CONFIG_QEMU && !CONFIG_COREBOOT && !CONFIG_XEN) > + return 1; > + return PlatformStartedOn == PF_CSM; > +} > + > +static inline int runningOnQEMU(void) > +{ > + if (!CONFIG_QEMU) > + return 0; > + if (!CONFIG_COREBOOT && !CONFIG_XEN && !CONFIG_CSM) > + return 1; > + return PlatformRunningOn & PF_QEMU; > +} > + > +static inline int runningOnCoreboot(void) > +{ > + if (!CONFIG_COREBOOT) > + return 0; > + if (!CONFIG_QEMU && !CONFIG_XEN && !CONFIG_CSM) > + return 1; > + return PlatformRunningOn & PF_COREBOOT; > +} > + > +static inline int runningOnXen(void) > +{ > + if (!CONFIG_XEN) > + return 0; > + if (!CONFIG_QEMU && !CONFIG_COREBOOT && !CONFIG_CSM) > + return 1; > + return PlatformRunningOn & PF_XEN; > +} > + > +static inline int runningOnCSM(void) > +{ > + if (!CONFIG_CSM) > + return 0; > + if (!CONFIG_QEMU && !CONFIG_COREBOOT && !CONFIG_XEN) > + return 1; > + return PlatformRunningOn & PF_CSM; > +} > + > + > +/**************************************************************** > + * KVM/QEMU firmware > + ****************************************************************/ > > /* This CPUID returns the signature 'KVMKVMKVM' in ebx, ecx, and edx. It > * should be used to determine that a VM is running under KVM. > diff --git a/src/xen.c b/src/xen.c > index a506b42..5122a3c 100644 > --- a/src/xen.c > +++ b/src/xen.c > @@ -81,6 +81,7 @@ void xen_preinit(void) > return; > } > > + PlatformStartedOn = PlatformRunningOn = PF_XEN; > qemu_cfg_preinit(); > > u64 maxram = 0, maxram_over4G = 0; > -- > 1.7.11.7 > > > _______________________________________________ > SeaBIOS mailing list > SeaBIOS(a)seabios.org > http://www.seabios.org/mailman/listinfo/seabios >

1 0

[PATCH 00/13] SeaBIOS as Compatibility Support Module for UEFI/OVMF
by David Woodhouse 05 Feb '13

05 Feb '13

This patch series adds support for using SeaBIOS as a Compatibility Support Module (CSM) to provide "Legacy" BIOS services under UEFI/OVMF. With a version of OVMF suitably patched to stop it from marking our stack in the 0xE0000 segment as read-only (see README.CSM), it has been tested with various Linux systems, Windows 7, OpenBSD 5.2, FreeBSD 8/9, NetBSD, DragonflyBSD, Solaris 10/11. It also fixes issues with Windows 2008r2 which rather stupidly invokes INT 10h for video setup even when booted in EFI mode! I haven't quite finished going through the corporate bureaucracy for releasing this, so it's for review only. Git tree at git://git.infradead.org/users/dwmw2/seabios.git or gitweb at http://git.infradead.org/users/dwmw2/seabios.git -- David Woodhouse Open Source Technology Centre David.Woodhouse(a)intel.com Intel Corporation

3 23

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS