SeaBIOS

seabios@seabios.org

5 participants
3802 discussions

[PATCH v4] apm: fix shutdown
by Gerd Hoffmann 12 Aug '13

12 Aug '13

Qemu commit 9ee59f3 removed the bochs bios apm interface emulation at port 0x8900. That broke poweroff via APM. Fix it by powering off the machine using the acpi pm control register. Old code is left in, so seabios wil try both poweroff methods. Cleaning that eventually up is left for another patch, after checking it isn't needed. Qemu never implemented "Standby" and "Suspend", only "Shutdown", so it looks like there might be non-qemu use cases (bochs probably). Easiest way to test this is the syslinux poweroff module; modern linux distros usually have CONFIG_APM turned off. Reported-by: Sebastian Herbszt <herbszt(a)gmx.de> Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com> --- src/acpi.c | 5 +++++ src/acpi.h | 1 + src/apm.c | 5 +++++ src/pciinit.c | 3 +++ 4 files changed, 14 insertions(+) diff --git a/src/acpi.c b/src/acpi.c index 3699898..1994838 100644 --- a/src/acpi.c +++ b/src/acpi.c @@ -18,6 +18,8 @@ #include "acpi-dsdt.hex" +u32 acpi_pm1a_cnt VARFSEG; + static void build_header(struct acpi_table_header *h, u32 sig, int len, u8 rev) { @@ -730,9 +732,12 @@ find_acpi_features(void) if (!fadt) return; u32 pm_tmr = le32_to_cpu(fadt->pm_tmr_blk); + u32 pm1a_cnt = le32_to_cpu(fadt->pm1a_cnt_blk); dprintf(4, "pm_tmr_blk=%x\n", pm_tmr); if (pm_tmr) pmtimer_setup(pm_tmr, 3579); + if (pm1a_cnt) + acpi_pm1a_cnt = pm1a_cnt; // Theoretically we should check the 'reset_reg_sup' flag, but Windows // doesn't and thus nobody seems to *set* it. If the table is large enough diff --git a/src/acpi.h b/src/acpi.h index 5d1e104..f0d24d4 100644 --- a/src/acpi.h +++ b/src/acpi.h @@ -36,6 +36,7 @@ struct rsdp_descriptor { /* Root System Descriptor Pointer */ }; extern struct rsdp_descriptor *RsdpAddr; +extern u32 acpi_pm1a_cnt; /* Table structure from Linux kernel (the ACPI tables are under the BSD license) */ diff --git a/src/apm.c b/src/apm.c index b2eac6d..de6bd99 100644 --- a/src/apm.c +++ b/src/apm.c @@ -12,6 +12,7 @@ #include "config.h" // CONFIG_* #include "biosvar.h" // GET_GLOBAL #include "paravirt.h" // runningOnQEMU +#include "acpi.h" // acpi_pm_ctl static void out_str(const char *str_cs) @@ -108,7 +109,11 @@ handle_155306(struct bregs *regs) void apm_shutdown(void) { + u16 pm1a_cnt = GET_GLOBAL(acpi_pm1a_cnt); + irq_disable(); + if (pm1a_cnt) + outw(0x2000, pm1a_cnt); out_str("Shutdown"); for (;;) hlt(); diff --git a/src/pciinit.c b/src/pciinit.c index 8370b96..0c6b0cb 100644 --- a/src/pciinit.c +++ b/src/pciinit.c @@ -15,6 +15,7 @@ #include "paravirt.h" // RamSize #include "dev-q35.h" // Q35_HOST_BRIDGE_PCIEXBAR_ADDR #include "list.h" // struct hlist_node +#include "acpi.h" // acpi_pm1a_cnt /* PM Timer ticks per second (HZ) */ #define PM_TIMER_FREQUENCY 3579545 @@ -194,6 +195,7 @@ void mch_isa_bridge_setup(struct pci_device *dev, void *arg) /* acpi enable, SCI: IRQ9 000b = irq9*/ pci_config_writeb(bdf, ICH9_LPC_ACPI_CTRL, ICH9_LPC_ACPI_CTRL_ACPI_EN); + acpi_pm1a_cnt = PORT_ACPI_PM_BASE + 0x04; pmtimer_setup(PORT_ACPI_PM_BASE + 0x08, PM_TIMER_FREQUENCY / 1000); } @@ -238,6 +240,7 @@ static void piix4_pm_setup(struct pci_device *pci, void *arg) pci_config_writel(bdf, 0x90, PORT_SMB_BASE | 1); pci_config_writeb(bdf, 0xd2, 0x09); /* enable SMBus io space */ + acpi_pm1a_cnt = PORT_ACPI_PM_BASE + 0x04; pmtimer_setup(PORT_ACPI_PM_BASE + 0x08, PM_TIMER_FREQUENCY / 1000); } -- 1.7.9.7

3 2

seabios 1.7.3.1 released
by Gerd Hoffmann 12 Aug '13

12 Aug '13

Hi, The seabios 1.7.3.1 bugfix release is out of the door. Here is the shortlog: Kevin O'Connor (2): Fix USB EHCI detection that was broken in hlist conversion of PCIDevices. Fix bug in CBFS file walking with compressed files. Michael S. Tsirkin (1): acpi: sync FADT flags from PIIX4 to Q35 cheers, Gerd

1 0

[PATCH] don't expose pvpanic device in the UI
by Hu Tao 12 Aug '13

12 Aug '13

pvpanic device is an internal default device in qemu. It may cause problem when upgrading qemu from a version without pvpanic. for example: in Windows(let's say XP) the Device manager will open a "new device" wizard and the device will appear as an unrecognized device. On a cluster with hundreds of such VMs, If that cluster has a health monitoring service it may show all the VMs in a "not healthy" state. This patch is a workaround to not show pvpanic in UI to avoid the problem in Windows. Cc: Marcel Apfelbaum <marcel.a(a)redhat.com> Cc: "Michael S. Tsirkin" <mst(a)redhat.com> Cc: Paolo Bonzini <pbonzini(a)redhat.com> Cc: Gerd Hoffmann <kraxel(a)redhat.com> Cc: Eric Blake <eblake(a)redhat.com> Cc: "Daniel P. Berrange" <berrange(a)redhat.com> Cc: Andreas Färber <afaerber(a)suse.de> Signed-off-by: Hu Tao <hutao(a)cn.fujitsu.com> --- See discussion at: http://lists.nongnu.org/archive/html/qemu-devel/2013-08/msg00036.html and follow-ups. src/ssdt-misc.dsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ssdt-misc.dsl b/src/ssdt-misc.dsl index acc850e..19a2058 100644 --- a/src/ssdt-misc.dsl +++ b/src/ssdt-misc.dsl @@ -75,7 +75,7 @@ DefinitionBlock ("ssdt-misc.aml", "SSDT", 0x01, "BXPC", "BXSSDTSUSP", 0x1) If (LEqual(Local0, Zero)) { Return (0x00) } Else { - Return (0x0F) + Return (0x0B) } } -- 1.8.1.4

11 73

Re: [SeaBIOS] Fwd: seabios bug
by Kevin O'Connor 10 Aug '13

10 Aug '13

On Thu, Aug 08, 2013 at 12:20:48PM +0200, Mario wrote: > ---------- Forwarded message ---------- > From: Mario <marietto2008(a)gmail.com> > Date: Thu, 8 Aug 2013 12:18:58 +0200 > Subject: Re: [SeaBIOS] seabios bug > To: Kevin O'Connor <kevin(a)koconnor.net> > > Yesterday I tried with Ubuntu 64 bit installed on the MAC MINI,today I > tried with this : (but I've got the same error. And no,I haven't used > the patch of gabriel & Co) : What version of Ubuntu are you using? Can you also publish the out/code16.o.objdump file as well? -Kevin

1 0

Re: [SeaBIOS] Fwd: seabios bug
by Paolo Bonzini 10 Aug '13

10 Aug '13

Il 08/08/2013 12:20, Mario ha scritto: > > root@mario-ThinkCentre-XXXX:/home/marietto/Scrivania# git clone > git://git.seabios.org/seabios.git > Cloning into 'seabios'... > remote: Counting objects: 9725, done. > remote: Compressing objects: 100% (4284/4284), done. > remote: Total 9725 (delta 7736), reused 6760 (delta 5435) > Ricezione degli oggetti: 100% (9725/9725), 2.17 MiB | 209 KiB/s, done. > Risoluzione dei delta: 100% (7736/7736), done. > root@mario-ThinkCentre-XXXX:/home/marietto/Scrivania# cd seabios > root@mario-ThinkCentre-XXXX:/home/marietto/Scrivania/seabios# make > Build default config There is a known bug building SeaBIOS with non-English messages. Use "LC_ALL=C make". Paolo

2 1

Re: [SeaBIOS] Fwd: seabios bug
by Mario 09 Aug '13

09 Aug '13

Paolo,cosa faccio ? ripristino la situazione precedente ? era meglio quando qemu non era oscurato e si vedevano i messaggi,anche se cmq mac os x non partiva perche' andava in panico. Comunque saprei come ripristinare quella situazione. Il punto e' : quale delle due situazioni puo' essere usata per far funzionare l'emulazione ? Paolo,cosa faccio ? ripristino la situazione precedente ? >> 2013/8/9, Paolo Bonzini <pbonzini(a)redhat.com>: >>> Il 09/08/2013 17:25, Mario ha scritto: >>>> QEMU 1.5.50 monitor - type 'help' for more information >>>> (qemu) VNC server running on `127.0.0.1:5900' >>> >>> Ah ok, niente di interessante purtroppo. >>> >>> Paolo >>> >> >> >> -- >> Mario. >> > > > -- > Mario. > -- Mario.

1 0

Re: [SeaBIOS] Fwd: seabios bug
by Paolo Bonzini 09 Aug '13

09 Aug '13

Il 09/08/2013 16:33, Mario ha scritto: > hello to everyone. The Paolo's solution worked for me,but it's not > good for the goal that I want to achieve. I would like to virtualize > Mac OS X with KVM on the mac mini but I see that this solution has > created a situation worse than than before. Check the difference from > the screenshot attached. What is QEMU saying in the partially obscured terminal window? Paolo

1 0

Re: [SeaBIOS] seabios bug unfixed
by Laszlo Ersek 09 Aug '13

09 Aug '13

On 08/09/13 12:05, Mario wrote: > Yesterday I tried with Ubuntu 64 bit installed on the MAC MINI,today I > tried with this : (but I've got the same error. And no,I haven't used > the patch of gabriel : > > root@mario-ThinkCentre-XXXX:/home/marietto/Scrivania/seabios# uname -a > > Linux mario-ThinkCentre-XXXX 3.5.0-21-generic #32-Ubuntu SMP Tue Dec > 11 18:52:46 UTC 2012 i686 athlon i686 GNU/Linux > > root@mario-ThinkCentre-XXXX:/home/marietto/Scrivania/seabios# gcc --version > gcc (Ubuntu/Linaro 4.7.3-1ubuntu1) 4.7.3 > > root@mario-ThinkCentre-XXXX:/home/marietto/Scrivania/seabios# ld --version > ld di GNU (GNU Binutils for Ubuntu) 2.23.2 > > root@mario-ThinkCentre-XXXX:/home/marietto/Scrivania# git clone > git://git.seabios.org/seabios.git > Cloning into 'seabios'... > remote: Counting objects: 9725, done. > remote: Compressing objects: 100% (4284/4284), done. > remote: Total 9725 (delta 7736), reused 6760 (delta 5435) > Ricezione degli oggetti: 100% (9725/9725), 2.17 MiB | 209 KiB/s, done. > Risoluzione dei delta: 100% (7736/7736), done. > root@mario-ThinkCentre-XXXX:/home/marietto/Scrivania# cd seabios > root@mario-ThinkCentre-XXXX:/home/marietto/Scrivania/seabios# make > Build default config > # > # configuration written to /home/marietto/Scrivania/seabios/.config > # > Build Kconfig config file > Compile checking out/misc.o > Compile checking out/stacks.o > Compile checking out/output.o > Compile checking out/util.o > Compile checking out/block.o > Compile checking out/floppy.o > Compile checking out/ata.o > Compile checking out/mouse.o > Compile checking out/kbd.o > Compile checking out/pci.o > Compile checking out/serial.o > Compile checking out/timer.o > Compile checking out/clock.o > Compile checking out/pic.o > Compile checking out/cdrom.o > Compile checking out/ps2port.o > Compile checking out/smp.o > Compile checking out/resume.o > Compile checking out/pnpbios.o > Compile checking out/vgahooks.o > Compile checking out/ramdisk.o > Compile checking out/pcibios.o > Compile checking out/blockcmd.o > Compile checking out/usb.o > Compile checking out/usb-uhci.o > Compile checking out/usb-ohci.o > Compile checking out/usb-ehci.o > Compile checking out/usb-hid.o > Compile checking out/usb-msc.o > Compile checking out/virtio-ring.o > Compile checking out/virtio-pci.o > Compile checking out/virtio-blk.o > Compile checking out/virtio-scsi.o > Compile checking out/apm.o > Compile checking out/ahci.o > Compile checking out/usb-uas.o > Compile checking out/lsi-scsi.o > Compile checking out/esp-scsi.o > Compile checking out/megasas.o > Compile checking out/post.o > Compile checking out/shadow.o > Compile checking out/memmap.o > Compile checking out/pmm.o > Compile checking out/coreboot.o > Compile checking out/boot.o > Compiling IASL out/acpi-dsdt.hex > ASL Input: out/acpi-dsdt.dsl.i - 476 lines, 19181 bytes, 316 keywords > AML Output: out/acpi-dsdt.aml - 4407 bytes, 159 named objects, 157 > executable opcodes > > Compilation complete. 0 Errors, 0 Warnings, 0 Remarks, 246 Optimizations > Compiling IASL out/ssdt-proc.hex > ASL Input: out/ssdt-proc.dsl.i - 36 lines, 762 bytes, 8 keywords > AML Output: out/ssdt-proc.aml - 120 bytes, 6 named objects, 2 executable opcodes > > Compilation complete. 0 Errors, 0 Warnings, 0 Remarks, 0 Optimizations > Compiling IASL out/ssdt-pcihp.hex > ASL Input: out/ssdt-pcihp.dsl.i - 37 lines, 767 bytes, 6 keywords > AML Output: out/ssdt-pcihp.aml - 88 bytes, 5 named objects, 1 executable opcodes > > Compilation complete. 0 Errors, 0 Warnings, 0 Remarks, 0 Optimizations > Compiling IASL out/ssdt-misc.hex > ASL Input: out/ssdt-misc.dsl.i - 102 lines, 2567 bytes, 35 keywords > AML Output: out/ssdt-misc.aml - 354 bytes, 24 named objects, 11 > executable opcodes > > Compilation complete. 0 Errors, 0 Warnings, 0 Remarks, 2 Optimizations > Compiling IASL out/q35-acpi-dsdt.hex > ASL Input: out/q35-acpi-dsdt.dsl.i - 515 lines, 28287 bytes, 413 keywords > AML Output: out/q35-acpi-dsdt.aml - 7344 bytes, 239 named objects, 174 > executable opcodes > > Compilation complete. 0 Errors, 0 Warnings, 0 Remarks, 445 Optimizations > Compile checking out/acpi.o > Compile checking out/smm.o > Compile checking out/mptable.o > Compile checking out/pirtable.o > Compile checking out/smbios.o > Compile checking out/pciinit.o > Compile checking out/optionroms.o > Compile checking out/mtrr.o > Compile checking out/lzmadecode.o > Compile checking out/bootsplash.o > Compile checking out/jpeg.o > Compile checking out/usb-hub.o > Compile checking out/paravirt.o > Compile checking out/biostables.o > Compile checking out/xen.o > Compile checking out/bmp.o > Compile checking out/romfile.o > Compile checking out/csm.o > Compiling whole program out/ccode32flat.o > Compiling whole program out/code32seg.o > Compile checking out/system.o > Compile checking out/disk.o > Compile checking out/font.o > Compiling whole program out/ccode16.o > Compiling to assembler out/asm-offsets.s > Generating offset file out/asm-offsets.h > Compiling (16bit) out/romlayout.o > Building ld scripts > Version: rel-1.7.3-22-g5b63109-20130808_120454-mario-ThinkCentre-XXXX > Traceback (most recent call last): > File "./tools/layoutrom.py", line 669, in <module> > main() > File "./tools/layoutrom.py", line 633, in main > info16 = parseObjDump(infile16, '16') > File "./tools/layoutrom.py", line 564, in parseObjDump > relocsection = sectionmap[sectionname] > KeyError: '.text.asm./home/marietto/Scrivania/seabios/src/smp.c.75' > make: *** [out/romlayout16.lds] Errore 1 > root@mario-ThinkCentre-XXXX:/home/marietto/Scrivania/seabios# > (1) Can you attach "out/code16.o.objdump" when this happens? As far as I understand, the python script should first find this section and insert it in the section map. Then when a referring relocation record is found, the script should be able to retrieve the section from the section map. (2) Can you try a pristine build with: unset LANG export LC_ALL=POSIX make ? Thanks Laszlo

1 0

seabios bug unfixed
by Mario 09 Aug '13

09 Aug '13

Yesterday I tried with Ubuntu 64 bit installed on the MAC MINI,today I tried with this : (but I've got the same error. And no,I haven't used the patch of gabriel : root@mario-ThinkCentre-XXXX:/home/marietto/Scrivania/seabios# uname -a Linux mario-ThinkCentre-XXXX 3.5.0-21-generic #32-Ubuntu SMP Tue Dec 11 18:52:46 UTC 2012 i686 athlon i686 GNU/Linux root@mario-ThinkCentre-XXXX:/home/marietto/Scrivania/seabios# gcc --version gcc (Ubuntu/Linaro 4.7.3-1ubuntu1) 4.7.3 root@mario-ThinkCentre-XXXX:/home/marietto/Scrivania/seabios# ld --version ld di GNU (GNU Binutils for Ubuntu) 2.23.2 root@mario-ThinkCentre-XXXX:/home/marietto/Scrivania# git clone git://git.seabios.org/seabios.git Cloning into 'seabios'... remote: Counting objects: 9725, done. remote: Compressing objects: 100% (4284/4284), done. remote: Total 9725 (delta 7736), reused 6760 (delta 5435) Ricezione degli oggetti: 100% (9725/9725), 2.17 MiB | 209 KiB/s, done. Risoluzione dei delta: 100% (7736/7736), done. root@mario-ThinkCentre-XXXX:/home/marietto/Scrivania# cd seabios root@mario-ThinkCentre-XXXX:/home/marietto/Scrivania/seabios# make Build default config # # configuration written to /home/marietto/Scrivania/seabios/.config # Build Kconfig config file Compile checking out/misc.o Compile checking out/stacks.o Compile checking out/output.o Compile checking out/util.o Compile checking out/block.o Compile checking out/floppy.o Compile checking out/ata.o Compile checking out/mouse.o Compile checking out/kbd.o Compile checking out/pci.o Compile checking out/serial.o Compile checking out/timer.o Compile checking out/clock.o Compile checking out/pic.o Compile checking out/cdrom.o Compile checking out/ps2port.o Compile checking out/smp.o Compile checking out/resume.o Compile checking out/pnpbios.o Compile checking out/vgahooks.o Compile checking out/ramdisk.o Compile checking out/pcibios.o Compile checking out/blockcmd.o Compile checking out/usb.o Compile checking out/usb-uhci.o Compile checking out/usb-ohci.o Compile checking out/usb-ehci.o Compile checking out/usb-hid.o Compile checking out/usb-msc.o Compile checking out/virtio-ring.o Compile checking out/virtio-pci.o Compile checking out/virtio-blk.o Compile checking out/virtio-scsi.o Compile checking out/apm.o Compile checking out/ahci.o Compile checking out/usb-uas.o Compile checking out/lsi-scsi.o Compile checking out/esp-scsi.o Compile checking out/megasas.o Compile checking out/post.o Compile checking out/shadow.o Compile checking out/memmap.o Compile checking out/pmm.o Compile checking out/coreboot.o Compile checking out/boot.o Compiling IASL out/acpi-dsdt.hex ASL Input: out/acpi-dsdt.dsl.i - 476 lines, 19181 bytes, 316 keywords AML Output: out/acpi-dsdt.aml - 4407 bytes, 159 named objects, 157 executable opcodes Compilation complete. 0 Errors, 0 Warnings, 0 Remarks, 246 Optimizations Compiling IASL out/ssdt-proc.hex ASL Input: out/ssdt-proc.dsl.i - 36 lines, 762 bytes, 8 keywords AML Output: out/ssdt-proc.aml - 120 bytes, 6 named objects, 2 executable opcodes Compilation complete. 0 Errors, 0 Warnings, 0 Remarks, 0 Optimizations Compiling IASL out/ssdt-pcihp.hex ASL Input: out/ssdt-pcihp.dsl.i - 37 lines, 767 bytes, 6 keywords AML Output: out/ssdt-pcihp.aml - 88 bytes, 5 named objects, 1 executable opcodes Compilation complete. 0 Errors, 0 Warnings, 0 Remarks, 0 Optimizations Compiling IASL out/ssdt-misc.hex ASL Input: out/ssdt-misc.dsl.i - 102 lines, 2567 bytes, 35 keywords AML Output: out/ssdt-misc.aml - 354 bytes, 24 named objects, 11 executable opcodes Compilation complete. 0 Errors, 0 Warnings, 0 Remarks, 2 Optimizations Compiling IASL out/q35-acpi-dsdt.hex ASL Input: out/q35-acpi-dsdt.dsl.i - 515 lines, 28287 bytes, 413 keywords AML Output: out/q35-acpi-dsdt.aml - 7344 bytes, 239 named objects, 174 executable opcodes Compilation complete. 0 Errors, 0 Warnings, 0 Remarks, 445 Optimizations Compile checking out/acpi.o Compile checking out/smm.o Compile checking out/mptable.o Compile checking out/pirtable.o Compile checking out/smbios.o Compile checking out/pciinit.o Compile checking out/optionroms.o Compile checking out/mtrr.o Compile checking out/lzmadecode.o Compile checking out/bootsplash.o Compile checking out/jpeg.o Compile checking out/usb-hub.o Compile checking out/paravirt.o Compile checking out/biostables.o Compile checking out/xen.o Compile checking out/bmp.o Compile checking out/romfile.o Compile checking out/csm.o Compiling whole program out/ccode32flat.o Compiling whole program out/code32seg.o Compile checking out/system.o Compile checking out/disk.o Compile checking out/font.o Compiling whole program out/ccode16.o Compiling to assembler out/asm-offsets.s Generating offset file out/asm-offsets.h Compiling (16bit) out/romlayout.o Building ld scripts Version: rel-1.7.3-22-g5b63109-20130808_120454-mario-ThinkCentre-XXXX Traceback (most recent call last): File "./tools/layoutrom.py", line 669, in <module> main() File "./tools/layoutrom.py", line 633, in main info16 = parseObjDump(infile16, '16') File "./tools/layoutrom.py", line 564, in parseObjDump relocsection = sectionmap[sectionname] KeyError: '.text.asm./home/marietto/Scrivania/seabios/src/smp.c.75' make: *** [out/romlayout16.lds] Errore 1 root@mario-ThinkCentre-XXXX:/home/marietto/Scrivania/seabios# -- Mario.

1 0

1.7.3.1 release planned
by Gerd Hoffmann 09 Aug '13

09 Aug '13

Hi, I've just created a 1.7.3-stable branch. It has a single commit right now, which is 2a9aeabdfb34374ecac25e7a8d21c9e368618cd4 from master cherry-picked (Fix USB EHCI detection that was broken in hlist conversion of PCIDevices). My plan is to tag 1.7.3.1 next monday, so the update can be included in qemu 1.6-rc3 planned for next monday. Are there more patches which should go into the 1.7.3.1 bugfix release? Commit ed88f6515c18d9520efa4a41ccb70038dfbe43f9 (acpi: sync FADT flags from PIIX4 to Q35vga) looks like a candidate to me. Michael? Also commit 1a113e1144113348e04cbe39fa81a448049e82a0 (Fix bug in CBFS file walking with compressed files). Kevin? cheers, Gerd

3 2

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS