SeaBIOS

seabios@seabios.org

4 participants
3800 discussions

Re: [SeaBIOS] [PATCH] cpu hotplug issue
by Gleb Natapov 04 Aug '11

04 Aug '11

On Wed, Aug 03, 2011 at 06:25:07PM +0200, Vasilis Liaskovitis wrote: > On Wed, Aug 03, 2011 at 12:42:11PM +0200, Jan Kiszka wrote: > > >> Why can't Seabios read to true number online CPUs from the PIIX4 device? > > >> The information is there already, no need for addition PV here. > > >> > > > Where is it in PIIX4 device? > > > > PROC registers (or however they are called). > > In qemu-kvm, the cpus_sts bitmap array in PIIX4PMState/ACPIGPE has the true > number of online CPUS. This is accessed from the DSDT hotplug method in Seabios > as "OperationRegion SystemIO" with address 0xaf00. Is this i/o address in the > piix4 spec? How can it be accessed from the rest of SeaBIOS? It seems to reside > in ACPI_PM space. > 0xaf00 is not part of PIIX4. PIIX4 supports nor cpu host plug neither pci hot plug. I haven't found any PROC register in PIIX4 spec so far. -- Gleb.

2 1

Re: [SeaBIOS] SeaBIOS error with Juniper FreeBSD kernel
by Bjørn Mork 04 Aug '11

04 Aug '11

Brandon Bennett <bennetb(a)gmail.com> writes: >> Are all versions based on FreeBSD 4.11? >> Are newer versions still affected? > > Newer versions should be based on 6.1 but there are a lot of changes. > I haven't had a chance to test with something newer yet. Sorry for the delay due to vacation... I just confirmed the issue running "JUNOS 11.1R3.5 built 2011-06-25 00:17:21 UTC" which is as new as it officially gets at the moment. I don't think the FreeBSD version really matters. I believe the issue is related to the "platform_early_bootinit", whatever that is, which is Juniper specific code. I assume they are checking the SMBIOS for some data which is present on the real hardware, and this check triggers the crash. >From the 11.1R3.5 boot: Hit [Enter] to boot immediately, or space bar for command prompt. Booting [/kernel]... platform_early_bootinit: M/T Series Early Boot Initialization kernel trap 12 with interrupts disabled Fatal trap 12: page fault while in kernel mode fault virtual address = 0xbff3fffc fault code = supervisor write, page not present instruction pointer = 0x20:0xc0a22377 stac Fatal trap 30: reserved (unknown) fault while in kernel mode instruction pointer = 0x20:0xc09f4e66 stack pointer = 0x28:0xc1021a00 frame pointer = 0x28:0xc1021a10 code segment = base 0x0, limit 0xfffff, type 0x1b = DPL 0, pres 1, def32 1, gran 1 processor eflags = interrupt enabled, IOPL = 0 current process = 0 () trap number = 30 dog: ERROR - reset of uninitialized watchdog panic: reserved (unknown) fault (null)(c0c4f4a0,c0c4f4a0,c0be3672,c1021948,a) at 0xc0a14867 (null)(c0be3672,1e,c10219c0,1,1) at 0xc05a723e (null)(a,0,a,ffff7fff,ffffffff) at 0xc0a289dd (null)(c10219c0) at 0xc0a29921 (null)(0,c021b4b,3030000,c0c22a00,c0c54400) at 0xc0a15e7b (null)(c0c22a00,63,5,c1021bac,63) at 0xc09f50c2 (null)(63,10,1000000,1,c0bbe530) at 0xc05e66f3 (null)(63,c1021bac,c0be340e,3f8,1002580) at 0xc05c7ca5 (null)(c0bbe52c,c05c7c45,c1021bac,a,c1021bcc) at 0xc05c7df5 (null)(c0bbe52c,28,c1021cc4,c0be33fe,a) at 0xc05c8f73 (null)(c0c4d0a0,c1021c84,c1021c38,c05c8f73,c0bbe604) at 0xc0a287da (null)(c0bbe604,c,0,0,0) at 0xc0a28c2a (null)(c1021c84) at 0xc0a296e8 (null)(cffffef0,ffffef0,4,c00e0000,c00e0000) at 0xc0a15e7b (null)(0,c0bc71c6,4,10,0) at 0xc0a0f7df (null)(c0be5837,c1021d34,c1021d30,a,c1021d54) at 0xc0a0f8ed (null)(c0bc1e40,c0b6f924,c1021d84,c0a1e5a9,80) at 0xc0b3a694 (null)(80,c0a15ec0,f,3,20) at 0xc0b3ad7b (null)(1026000) at 0xc0a1e5a9 (null)() at 0xc04aa67d dog: ERROR - reset of uninitialized watchdog dog: ERROR - reset of uninitialized watchdog Uptime: 1s Also confirmed that 11.1R3.5 is working with SeaBIOS modified as follows: diff --git a/src/smbios.c b/src/smbios.c index 8df0f2d..c96deb5 100644 --- a/src/smbios.c +++ b/src/smbios.c @@ -17,7 +17,7 @@ smbios_entry_point_init(u16 max_structure_size, u16 number_of_structures) { struct smbios_entry_point *ep = malloc_fseg(sizeof(*ep)); - void *finaltable = malloc_high(structure_table_length); + void *finaltable = malloc_fseg(structure_table_length); if (!ep || !finaltable) { warn_noalloc(); free(ep); Bjørn

5 11

[PATCH 2/2] Allow allocation of SMBIOS table in f-segment if it is small.
by Kevin O'Connor 04 Aug '11

04 Aug '11

If the SMBIOS is small (less than 600 bytes) allow it to be allocated in the f-segment. This works around a bug in JunOS - it crashes on SMBIOS tables located in high memory. --- src/config.h | 2 ++ src/smbios.c | 11 +++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config.h b/src/config.h index f2fce89..d182b13 100644 --- a/src/config.h +++ b/src/config.h @@ -51,6 +51,8 @@ #define BUILD_SMM_ADDR 0xa8000 #define BUILD_SMM_SIZE 0x8000 +#define BUILD_MAX_SMBIOS_FSEG 600 + // Important real-mode segments #define SEG_IVT 0x0000 #define SEG_BDA 0x0040 diff --git a/src/smbios.c b/src/smbios.c index 8df0f2d..7db8cce 100644 --- a/src/smbios.c +++ b/src/smbios.c @@ -17,7 +17,13 @@ smbios_entry_point_init(u16 max_structure_size, u16 number_of_structures) { struct smbios_entry_point *ep = malloc_fseg(sizeof(*ep)); - void *finaltable = malloc_high(structure_table_length); + void *finaltable; + if (structure_table_length <= BUILD_MAX_SMBIOS_FSEG) + // Table is small enough for f-seg - allocate there. This + // works around a bug in JunOS (at least for small SMBIOS tables). + finaltable = malloc_fseg(structure_table_length); + else + finaltable = malloc_high(structure_table_length); if (!ep || !finaltable) { warn_noalloc(); free(ep); @@ -44,7 +50,8 @@ smbios_entry_point_init(u16 max_structure_size, ep->intermediate_checksum -= checksum((void*)ep + 0x10, ep->length - 0x10); - dprintf(1, "SMBIOS ptr=%p table=%p\n", ep, finaltable); + dprintf(1, "SMBIOS ptr=%p table=%p size=%d\n" + , ep, finaltable, structure_table_length); } #define load_str_field_with_default(type, field, def) \ -- 1.7.4.4

2 1

[PATCH 1/2] Allow free space in f-segment to be used by malloc_fseg().
by Kevin O'Connor 04 Aug '11

04 Aug '11

--- src/optionroms.c | 2 +- src/pmm.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/src/optionroms.c b/src/optionroms.c index be02f2a..2832eab 100644 --- a/src/optionroms.c +++ b/src/optionroms.c @@ -483,7 +483,7 @@ vga_setup(void) 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. struct pci_device *pci; diff --git a/src/pmm.c b/src/pmm.c index b812515..82a0b1d 100644 --- a/src/pmm.c +++ b/src/pmm.c @@ -216,6 +216,13 @@ malloc_fixupreloc(void) struct zone_s *zone = Zones[i]; zone->info->pprev = &zone->info; } + + // Add space free'd during relocation in f-segment to ZoneFSeg + extern u8 code32init_end[]; + if ((u32)code32init_end > BUILD_BIOS_ADDR) { + memset((void*)BUILD_BIOS_ADDR, 0, (u32)code32init_end - BUILD_BIOS_ADDR); + addSpace(&ZoneFSeg, (void*)BUILD_BIOS_ADDR, code32init_end); + } } void -- 1.7.4.4

1 0

usb boot issue
by Marc Jones 03 Aug '11

03 Aug '11

I'm having a problem with booting a usb flash key that worked previously in version 0.6.2. The USB device is identified but then gets a read error when booting from it. This is the Persimmon, sb800 platform. Any thoughts on what might have changed to cause this? Marc -- http://se-eng.com

1 0

Re: [SeaBIOS] [PATCH] cpu hotplug issue
by Jan Kiszka 03 Aug '11

03 Aug '11

On 2011-08-03 12:07, Vasilis Liaskovitis wrote: > When rebooting after a CPU hotplug in qemu-kvm, Seabios can get stuck in smp_probe(). > Normally cmos_smp_count is read from cmos and the smp_ap_boot_code is run on all cpus > except bootstrap. The expected result is CountCPUs == cmos_smp_count + 1. After a > cpu hotplug, more than cmos_smp_count cpus are active, so we get a situation where > CountCPUs > cmos_smp_count + 1 and Seabios keeps looping forever in smp_probe. In some > cases, the while loop exit condition is tested before CountCPUs gets larger (i.e. > before smp_ap_boot_code runs on all CPUs), so the hang is not always reproducible. > > This patch introduces a new fw_cfg variable called hotplugged_cpus that gets updated from > qemu-kvm hoplug code. Seabios reads this variable on each call to smp_probe() and adjusts > the expected number of online CPUs. > > The qemu-kvm part of this patch is against Jan Kiszka's cpu-hotplug tree: > git://git.kiszka.org/qemu-kvm.git queues/cpu-hotplug > tested with qemu-system-x86_64. > > An alternative to this patch would be to update the smp_cpus variable in qemu-kvm and > do a "cmos update" to 0x5f from the cpu-hotplug code. Access to the rtc_state (cmos device) > would be required in hw/acpi_piix4.c. This way no change to Seabios would be required. > ... > src/paravirt.c | 12 ++++++++++++ > src/paravirt.h | 2 ++ > src/smp.c | 6 ++++-- > 3 files changed, 18 insertions(+), 2 deletions(-) > > diff --git a/src/paravirt.c b/src/paravirt.c > index 9cf77de..3367609 100644 > --- a/src/paravirt.c > +++ b/src/paravirt.c > @@ -305,6 +305,18 @@ u16 qemu_cfg_get_max_cpus(void) > return cnt; > } > > +u16 qemu_cfg_get_hplug_cpus(void) > +{ > + u16 cnt; > + > + if (!qemu_cfg_present) > + return 0; > + > + qemu_cfg_read_entry(&cnt, QEMU_CFG_HPLUG_CPUS, sizeof(cnt)); Why can't Seabios read to true number online CPUs from the PIIX4 device? The information is there already, no need for addition PV here. Jan -- Siemens AG, Corporate Technology, CT T DE IT 1 Corporate Competence Center Embedded Linux

3 3

Re: [SeaBIOS] [PATCH] cpu hotplug issue
by Vasilis Liaskovitis 03 Aug '11

03 Aug '11

When rebooting after a CPU hotplug in qemu-kvm, Seabios can get stuck in smp_probe(). Normally cmos_smp_count is read from cmos and the smp_ap_boot_code is run on all cpus except bootstrap. The expected result is CountCPUs == cmos_smp_count + 1. After a cpu hotplug, more than cmos_smp_count cpus are active, so we get a situation where CountCPUs > cmos_smp_count + 1 and Seabios keeps looping forever in smp_probe. In some cases, the while loop exit condition is tested before CountCPUs gets larger (i.e. before smp_ap_boot_code runs on all CPUs), so the hang is not always reproducible. This patch introduces a new fw_cfg variable called hotplugged_cpus that gets updated from qemu-kvm hoplug code. Seabios reads this variable on each call to smp_probe() and adjusts the expected number of online CPUs. The qemu-kvm part of this patch is against Jan Kiszka's cpu-hotplug tree: git://git.kiszka.org/qemu-kvm.git queues/cpu-hotplug tested with qemu-system-x86_64. An alternative to this patch would be to update the smp_cpus variable in qemu-kvm and do a "cmos update" to 0x5f from the cpu-hotplug code. Access to the rtc_state (cmos device) would be required in hw/acpi_piix4.c. This way no change to Seabios would be required. --- hw/acpi_piix4.c | 6 ++++++ hw/fw_cfg.c | 14 ++++++++++++++ hw/fw_cfg.h | 2 ++ hw/loader.c | 2 +- sysemu.h | 1 + vl.c | 1 + 6 files changed, 25 insertions(+), 1 deletions(-) diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c index bbb9edd..54d98ae 100644 --- a/hw/acpi_piix4.c +++ b/hw/acpi_piix4.c @@ -24,6 +24,7 @@ #include "sysemu.h" #include "range.h" #include "ioport.h" +#include "fw_cfg.h" //#define DEBUG @@ -539,6 +540,7 @@ static void pcirmv_write(void *opaque, uint32_t addr, uint32_t val) } extern const char *global_cpu_model; +extern FWCfgState *fw_cfg; static int piix4_device_hotplug(DeviceState *qdev, PCIDevice *dev, PCIHotplugState state); @@ -580,6 +582,8 @@ static void enable_processor(PIIX4PMState *s, int cpu) *gpe->sts = *gpe->sts | PIIX4_CPU_HOTPLUG_STATUS; g->cpus_sts[cpu/8] |= (1 << (cpu%8)); + hotplugged_cpus++; + fw_cfg_update_i16(fw_cfg, FW_CFG_HPLUG_CPUS, (uint16_t)hotplugged_cpus); } static void disable_processor(PIIX4PMState *s, int cpu) @@ -589,6 +593,8 @@ static void disable_processor(PIIX4PMState *s, int cpu) *gpe->sts = *gpe->sts | PIIX4_CPU_HOTPLUG_STATUS; g->cpus_sts[cpu/8] &= ~(1 << (cpu%8)); + hotplugged_cpus--; + fw_cfg_update_i16(fw_cfg, FW_CFG_HPLUG_CPUS, (uint16_t)hotplugged_cpus); } void qemu_system_cpu_hot_add(int cpu, int state) diff --git a/hw/fw_cfg.c b/hw/fw_cfg.c index a29db90..228f517 100644 --- a/hw/fw_cfg.c +++ b/hw/fw_cfg.c @@ -395,6 +395,19 @@ int fw_cfg_add_i64(FWCfgState *s, uint16_t key, uint64_t value) return fw_cfg_add_bytes(s, key, (uint8_t *)copy, sizeof(value)); } +int fw_cfg_update_i16(FWCfgState *s, uint16_t key, uint16_t data) +{ + int arch = !!(key & FW_CFG_ARCH_LOCAL); + uint16_t *p; + + key &= FW_CFG_ENTRY_MASK; + + p = (uint16_t*)s->entries[arch][key].data; + *p = cpu_to_le16(data); + + return 1; +} + int fw_cfg_add_callback(FWCfgState *s, uint16_t key, FWCfgCallback callback, void *callback_opaque, uint8_t *data, size_t len) { @@ -489,6 +502,7 @@ FWCfgState *fw_cfg_init(uint32_t ctl_port, uint32_t data_port, fw_cfg_add_i16(s, FW_CFG_NOGRAPHIC, (uint16_t)(display_type == DT_NOGRAPHIC)); fw_cfg_add_i16(s, FW_CFG_NB_CPUS, (uint16_t)smp_cpus); fw_cfg_add_i16(s, FW_CFG_MAX_CPUS, (uint16_t)max_cpus); + fw_cfg_add_i16(s, FW_CFG_HPLUG_CPUS, (uint16_t)hotplugged_cpus); fw_cfg_add_i16(s, FW_CFG_BOOT_MENU, (uint16_t)boot_menu); fw_cfg_bootsplash(s); diff --git a/hw/fw_cfg.h b/hw/fw_cfg.h index 856bf91..95d74b4 100644 --- a/hw/fw_cfg.h +++ b/hw/fw_cfg.h @@ -27,6 +27,7 @@ #define FW_CFG_SETUP_SIZE 0x17 #define FW_CFG_SETUP_DATA 0x18 #define FW_CFG_FILE_DIR 0x19 +#define FW_CFG_HPLUG_CPUS 0x1a #define FW_CFG_FILE_FIRST 0x20 #define FW_CFG_FILE_SLOTS 0x10 @@ -56,6 +57,7 @@ typedef void (*FWCfgCallback)(void *opaque, uint8_t *data); typedef struct FWCfgState FWCfgState; int fw_cfg_add_bytes(FWCfgState *s, uint16_t key, uint8_t *data, uint32_t len); int fw_cfg_add_i16(FWCfgState *s, uint16_t key, uint16_t value); +int fw_cfg_update_i16(FWCfgState *s, uint16_t key, uint16_t data); int fw_cfg_add_i32(FWCfgState *s, uint16_t key, uint32_t value); int fw_cfg_add_i64(FWCfgState *s, uint16_t key, uint64_t value); int fw_cfg_add_callback(FWCfgState *s, uint16_t key, FWCfgCallback callback, diff --git a/hw/loader.c b/hw/loader.c index 35d792e..2a017d1 100644 --- a/hw/loader.c +++ b/hw/loader.c @@ -536,7 +536,7 @@ struct Rom { QTAILQ_ENTRY(Rom) next; }; -static FWCfgState *fw_cfg; +FWCfgState *fw_cfg; static QTAILQ_HEAD(, Rom) roms = QTAILQ_HEAD_INITIALIZER(roms); static void rom_insert(Rom *rom) diff --git a/sysemu.h b/sysemu.h index 59fae48..a0658fd 100644 --- a/sysemu.h +++ b/sysemu.h @@ -115,6 +115,7 @@ extern int ctrl_grab; extern int usb_enabled; extern int smp_cpus; extern int max_cpus; +extern int hotplugged_cpus; extern int cursor_hide; extern int graphic_rotate; extern int no_quit; diff --git a/vl.c b/vl.c index 3fa1711..4ab8c63 100644 --- a/vl.c +++ b/vl.c @@ -204,6 +204,7 @@ int rtc_td_hack = 0; int usb_enabled = 0; int singlestep = 0; int smp_cpus = 1; +int hotplugged_cpus = 0; int max_cpus = 0; int smp_cores = 1; int smp_threads = 1; src/paravirt.c | 12 ++++++++++++ src/paravirt.h | 2 ++ src/smp.c | 6 ++++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/paravirt.c b/src/paravirt.c index 9cf77de..3367609 100644 --- a/src/paravirt.c +++ b/src/paravirt.c @@ -305,6 +305,18 @@ u16 qemu_cfg_get_max_cpus(void) return cnt; } +u16 qemu_cfg_get_hplug_cpus(void) +{ + u16 cnt; + + if (!qemu_cfg_present) + return 0; + + qemu_cfg_read_entry(&cnt, QEMU_CFG_HPLUG_CPUS, sizeof(cnt)); + + return cnt; +} + static QemuCfgFile LastFile; static u32 diff --git a/src/paravirt.h b/src/paravirt.h index 4a370a0..1a3a914 100644 --- a/src/paravirt.h +++ b/src/paravirt.h @@ -33,6 +33,7 @@ static inline int kvm_para_available(void) #define QEMU_CFG_BOOT_MENU 0x0e #define QEMU_CFG_MAX_CPUS 0x0f #define QEMU_CFG_FILE_DIR 0x19 +#define QEMU_CFG_HPLUG_CPUS 0x1a #define QEMU_CFG_ARCH_LOCAL 0x8000 #define QEMU_CFG_ACPI_TABLES (QEMU_CFG_ARCH_LOCAL + 0) #define QEMU_CFG_SMBIOS_ENTRIES (QEMU_CFG_ARCH_LOCAL + 1) @@ -55,6 +56,7 @@ int qemu_cfg_smbios_load_external(int type, char **p, unsigned *nr_structs, int qemu_cfg_get_numa_nodes(void); void qemu_cfg_get_numa_data(u64 *data, int n); u16 qemu_cfg_get_max_cpus(void); +u16 qemu_cfg_get_hplug_cpus(void); typedef struct QemuCfgFile { u32 size; /* file size */ diff --git a/src/smp.c b/src/smp.c index 8c077a1..b035870 100644 --- a/src/smp.c +++ b/src/smp.c @@ -36,6 +36,7 @@ wrmsr_smp(u32 index, u64 val) u32 CountCPUs VAR16VISIBLE; u32 MaxCountCPUs VAR16VISIBLE; +u32 HotPlugCPUs VAR16VISIBLE; extern void smp_ap_boot_code(void); ASM16( " .global smp_ap_boot_code\n" @@ -114,8 +115,9 @@ smp_probe(void) if (CONFIG_COREBOOT) { msleep(10); } else { - u8 cmos_smp_count = inb_cmos(CMOS_BIOS_SMP_COUNT); - while (cmos_smp_count + 1 != readl(&CountCPUs)) + u32 cmos_smp_count = (u32)inb_cmos(CMOS_BIOS_SMP_COUNT); + HotPlugCPUs = qemu_cfg_get_hplug_cpus(); + while (cmos_smp_count + HotPlugCPUs + 1 != readl(&CountCPUs)) yield(); }

1 0

[PATCH] seabios: increase smp_mtrr array size
by Marcelo Tosatti 29 Jul '11

29 Jul '11

Windows Server 2008 checked build complains about lack of consistency between MTRR MSRs in SMP guests. Problem is the smp_mtrr array is not large enough to hold all MSRs (31 entries with current qemu/kvm implementations). Increase it to 32. Signed-off-by: Marcelo Tosatti <mtosatti(a)redhat.com> diff --git a/src/smp.c b/src/smp.c index 40f5451..2317d36 100644 --- a/src/smp.c +++ b/src/smp.c @@ -17,7 +17,7 @@ #define APIC_ENABLED 0x0100 -struct { u32 ecx, eax, edx; } smp_mtrr[16] VAR16VISIBLE; +struct { u32 ecx, eax, edx; } smp_mtrr[32] VAR16VISIBLE; u32 smp_mtrr_count VAR16VISIBLE; void

2 1

[PATCH] Ctrl-Break support (INT 1B, etc)
by Nikolay Nikolov 23 Jul '11

23 Jul '11

Hi, all, I made a patch for proper Ctrl-Break handling. This is useful for MS-DOS or compatible operating systems like FreeDOS. When Ctrl-Break is detected, it clears the keyboard buffer, sets the Ctrl-Break flag at [0040h:0071h], invokes int 1Bh and then adds 0000h to the keyboard buffer. If a non-enhanced keyboard is present, Ctrl-Scroll Lock works just like Ctrl-Break. This seems to be the "standard" BIOS behaviour, at least on the PCs I tested. The patch was tested with MS-DOS 6.22, running under qemu. I'm new to git (and this is my first SeaBIOS patch ever), so I'm not sure what's the preferred way to submit patches. I just did a "git diff" and attached the result. Sorry if that's not the best way :) Nikolay

3 5

Re: [SeaBIOS] shadow RAM requirement
by Kevin O'Connor 23 Jul '11

23 Jul '11

On Fri, Jul 22, 2011 at 03:06:02PM +0200, Łukasz Mielicki wrote: > Hi, > > I'm trying to run SeaBIOS in an environment where I have difficulties with > enabling a shadow RAM. > Is there a chance to w/a requirement for writable 0xF000 seg in SeaBIOS? > Could some of group members briefly estimate a scope of necessary changes? SeaBIOS stores global variables in the f-segment, and so it requires that the f-segment be writable. Requiring that the f-segment be writable was a significant code simplification - I don't see a way to remove that requirement without re-introducing the associated complexity. -Kevin

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS