SeaBIOS March 2015

seabios@seabios.org

29 participants
51 discussions

[Qemu-devel] [PATCH v5 for-2.3 00/28] hw/pc: implement multiple primary busses for pc machines
by Marcel Apfelbaum 16 Mar '15

16 Mar '15

Notes: - Sorry for the late submission, I was waiting for dynamic ACPI series to get merged in order to submit - my bad. - The prev version (v2) was wrongfully tagged by me as RFC, it was actually ready but not rebased. V3 only rebases with no actual functionality changed. - This series is not that big, patches 1-8 are really small and can be submitted separately, however I preferred to keep them here to get the whole picture. The series is fully functional. - Limitations: - Pxb's bus does not support hotplug. It will be addressed on top of this series because is already getting to big. - Depends on: - [SeaBIOS] [PATCH V3 0/2] fw/pci: better support for multiple host bridges - It was already reviewed/accepted by the maintainers, it will be merged after this series gets accepted. - You are more than welcome to try using: -device pxb-device,id=pxb,bus_nr=4,numa_node=1 -device e1000,bus=pxb,addr=0x1 -bios <patched with the above series> v4->v5: - Rebased on pci branch, tree: git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git - Added PXB documentation (patch 28/28) - Addressed Gerd Hoffmann's review: - fix PXB behaviour if used with unsupported BIOS (patch 27/28) - Addressed Michael S. Tsirkin's review: - Removed assert in aml_index (patch 5/28) - Renamed pci_ functions to crs_ (patch 12/28) - used uint64_t variables instead of signed ones (patch 12/28) - Emit MEM/IO AML only for PXBs and i440fx (patch 26/28) - Addressed Shannon Zhao's review: - Changed build_append_int to build_append_byte in aml_or (patch 2/25) - Thanks to Igor and Kevin for reviews v3->v4: - Addressed Michael S. Tsirkin's review: - refactored build_prt method (patch 11/25) hw/apci: add _PRT method for extra PCI root busses - Addressed Igor Mammedov's reiew - add assert to aml_index (patch 5/25) - Fixed aml_equal implementation (patch 1/25) v2->v3: - Rebased on Michael S. Tsirkin's pci branch (that includes now all the dependencies) - Refactored acpi terms patch into multiple patches to match Igor's design. v1->v2: - Add support for multiple pxb devices. - Attach pxb's bus to specific NUMA node. - Got rid of the hacks from prev version. - Tested also for Win7 and Fedora 20, and for virtio blk devices. - Several bug-fixes resulting in a stable version ready for submission. Reasoning: We need multiple primary busess for a few reasons, the most important one is to be able to associate a pass-trough device with a guest NUMA node. The OS-es are able to associate a NUMA node only to a primary bus, not to a specific PCI device or a pci-2-pci bridge. PC machines support multiple NUMA nodes for CPUs and memory, however the IO was not yet supported. patch 1-9 adds the necessary acpi constructs based on Igor's series patch 10-13 implements acpi code needed to expose the pxb's primary bus to guests patch 14 separates the pci_bus code into a designated file patch 15-19 handles the implicit assumptions in code that only one primary bus can exist patch 20 handles the actual implementation of the PXB devices patch 21-22 enables the device patch 23 implements PXB map_irq function, (can be squashed into the actual PXB) patch 24-25 adds NUMA support patch 26 Emit MEM/IO AML only for PXBs and i440fx patch 27 Backward compatibility with SeaBIOS patch 28 PXB Documentation Marcel Apfelbaum (28): acpi: fix aml_equal term implementation acpi: add aml_or() term acpi: add aml_add() term acpi: add aml_lless() term acpi: add aml_index() term acpi: add aml_shiftleft() term acpi: add aml_shiftright() term acpi: add aml_increment() term acpi: add aml_while() term hw/acpi: add support for multiple root busses hw/apci: add _PRT method for extra PCI root busses hw/acpi: add _CRS method for extra root busses hw/acpi: remove from root bus 0 the crs resources used by other busses. hw/pci: move pci bus related code to separate files hw/pci: made pci_bus_is_root a PCIBusClass method hw/pci: made pci_bus_num a PCIBusClass method hw/pci: introduce TYPE_PCI_MAIN_HOST_BRIDGE interface hw/pci: removed 'rootbus nr is 0' assumption from qmp_pci_query hw/pci: implement iteration over multiple host bridges hw/pci: introduce PCI Expander Bridge (PXB) hw/pci: inform bios if the system has more than one pci bridge hw/pci: piix - suport multiple host bridges hw/pxb: add map_irq func hw/pci_bus: add support for NUMA nodes hw/pxb: add numa_node parameter acpi: restrict the aml emission to PXB host bridges apci: fix PXB behaviour if used with unsupported BIOS docs: Add PXB documentation arch_init.c | 1 + docs/pci_expander_bridge.txt | 52 ++++ hw/acpi/aml-build.c | 76 +++++- hw/alpha/typhoon.c | 1 + hw/i386/acpi-build.c | 367 ++++++++++++++++++++++++- hw/i386/kvm/pci-assign.c | 1 + hw/i386/pc.c | 13 + hw/mips/gt64xxx_pci.c | 1 + hw/pci-bridge/Makefile.objs | 1 + hw/pci-bridge/pci_expander_bridge.c | 207 +++++++++++++++ hw/pci-host/bonito.c | 1 + hw/pci-host/grackle.c | 1 + hw/pci-host/piix.c | 63 ++++- hw/pci-host/ppce500.c | 1 + hw/pci-host/q35.c | 5 + hw/pci-host/uninorth.c | 1 + hw/pci/Makefile.objs | 2 +- hw/pci/pci.c | 501 +--------------------------------- hw/pci/pci_bus.c | 517 ++++++++++++++++++++++++++++++++++++ hw/pci/pci_host.c | 6 + hw/ppc/ppc4xx_pci.c | 1 + hw/scsi/megasas.c | 1 + hw/sh4/r2d.c | 1 + hw/sh4/sh_pci.c | 1 + hw/vfio/pci.c | 1 + hw/xen/xen_pt.c | 1 + include/hw/acpi/aml-build.h | 8 + include/hw/pci/pci.h | 6 +- include/hw/pci/pci_bus.h | 35 +++ include/hw/pci/pci_host.h | 13 + include/sysemu/sysemu.h | 1 + 31 files changed, 1377 insertions(+), 510 deletions(-) create mode 100644 docs/pci_expander_bridge.txt create mode 100644 hw/pci-bridge/pci_expander_bridge.c create mode 100644 hw/pci/pci_bus.c -- 2.1.0

4 57

[PATCH v4 0/2] boot: switch default menu key to ESC
by Paolo Bonzini 16 Mar '15

16 Mar '15

Patch 1 applies a small improvement to user experience, as suggested by Matt DeVillier. Then patch 2 makes the switch. v3->v4: also update docs/Runtime_config.md. Paolo Bonzini (2): boot.c: delay exiting boot if menu key is ESC boot: switch default menu key to ESC docs/Runtime_config.md | 4 ++-- src/boot.c | 12 +++++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) -- 2.3.0

2 3

seabios stable release
by Gerd Hoffmann 16 Mar '15

16 Mar '15

Hi, Looks like we need a stable release branch for 1.8 and roll out a 1.8.1 release with some fixes for qemu. Issue #1: support for multiple pci roots. Issue #2: There is a (not-yet fixed) emulation failure with newer intel processors, apparently triggered by seabios commit 0673b7870063a3affbad9046fb6d385a4e734c19 Thread starts here: https://lists.gnu.org/archive/html/qemu-devel/2015-03/msg01140.html Other known issues in 1.8 which should be addressed in 1.8.1? cheers, Gerd

2 3

Re: [SeaBIOS] error in write and read from usb hid device
by Kevin O'Connor 16 Mar '15

16 Mar '15

On Mon, Mar 16, 2015 at 08:47:13AM +0330, Navid Movahedi wrote: > Hi > Is there a mechanism to save log messages at boot time? See http://seabios.org/Debugging > I tested again and found that ehci_wait_td function timeouts in all > execution of for loop including first. > which registers you want to know? > i got these information from log messages: > > pipe->qh.current = 0x1eff8d80 > pipe->qh.token = 0x00400141 > pipe->qh.qtd_next = 0x1efff140 > td->token = 0x00400c80 > pipe->qh.info1 = 0x00400202 > pipe->qh.info2 = 0x00400202 I need to see a copy of the full log in order to help. > for uhci i used vmware workstation and it works perfectly and i can send > and receive data from hid device, but my real hardware does not have uhci > controller , instead it has 2 EHCI controller with rate matching hub, so i > should use ehci driver for this kind of controller. So, you are using coreboot+seabios on vmware and coreboot+seabios on real hardware as well? -Kevin

2 1

Re: [SeaBIOS] error in write and read from usb hid device
by Kevin O'Connor 16 Mar '15

16 Mar '15

On Sun, Mar 15, 2015 at 12:32:04PM +0330, Navid Movahedi wrote: > Hi > I have a usb 1 HID device with 2 endpoints, 1 in, 1 out, and i want to > enumerate this usb device with seabios at boot time, so i hacked > seabios hid source code and add needed codes for this device. now > device is full functional with uhci driver in vmware and i have no > problem with read and write to device . the problem is for machines > with ehci controllers that don't have companion uhci controller and > uses rate matching hub to connect to this usb 1 device. The currewnt > status for this kind of controller is that the device is detected and > configured and 2 endpoints and corresponding 2 interrupt pipes are > allocated and initialized but when i use usb_send_pipe function to > write to device , error occurs . error is Timeout in ehci_wait_td > function in this section of code: > > for (i=0, td=tds; i<STACKQTDS; i++, td++) { > ret = ehci_wait_td(pipe, td, end); > if (ret) > return -1; > } > > timeout occurs for second td. i called usb_send_pipe function in this way: > > usb_send_pipe(out_pipe, USB_DIR_OUT , NULL , data, 64); > > is it correct? > > How can i solve this problem? We'd need to see the full seabios log in order to help. When the EHCI controller complains, it should also print out some ehci registers which give further information on what the controller was doing at the time of the error. Was this second ehci setup also on vmware or on some other emulator/real hardware? -Kevin

2 1

error in write and read from usb hid device
by Navid Movahedi 15 Mar '15

15 Mar '15

Hi I have a usb 1 HID device with 2 endpoints, 1 in, 1 out, and i want to enumerate this usb device with seabios at boot time, so i hacked seabios hid source code and add needed codes for this device. now device is full functional with uhci driver in vmware and i have no problem with read and write to device . the problem is for machines with ehci controllers that don't have companion uhci controller and uses rate matching hub to connect to this usb 1 device. The currewnt status for this kind of controller is that the device is detected and configured and 2 endpoints and corresponding 2 interrupt pipes are allocated and initialized but when i use usb_send_pipe function to write to device , error occurs . error is Timeout in ehci_wait_td function in this section of code: for (i=0, td=tds; i<STACKQTDS; i++, td++) { ret = ehci_wait_td(pipe, td, end); if (ret) return -1; } timeout occurs for second td. i called usb_send_pipe function in this way: usb_send_pipe(out_pipe, USB_DIR_OUT , NULL , data, 64); is it correct? How can i solve this problem? thanks

1 0

Re: [SeaBIOS] [PATCH v3 1/2] boot.c: delay exiting boot if menu key is ESC
by Timothy Pearson 12 Mar '15

12 Mar '15

On 03/12/2015 12:38 PM, Paolo Bonzini wrote: > > > On 12/03/2015 18:23, Timothy Pearson wrote: >> Any chance SeaBIOS could emit a short chirp when it receives the ESC to >> boot menu request? That would solve the "hammering blindly at the keys" >> problem while the video is initialising, at least on systems with a PC >> speaker/buzzer still installed. > > Sure. You can send a patch and I'll review it. > > Paolo I was merely offering a suggestion for UX design, The only coreboot-compatible board I have (and by extension SeaBIOS-compatible) does not properly initialize the PC speaker until some time after Linux starts, so I am currently unable to produce/test such a patch; normally I'd be happy to send something in. -- Timothy Pearson Raptor Engineering +1 (415) 727-8645 http://www.raptorengineeringinc.com

2 1

[PATCH v3 0/2] boot: switch default menu key to ESC
by Paolo Bonzini 12 Mar '15

12 Mar '15

Patch 1 applies a small improvement to user experience, as suggested by Matt DeVillier. Then patch 2 makes the switch. Paolo Bonzini (2): boot: delay exiting boot if menu key is ESC boot: switch default menu key to ESC src/boot.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) -- 2.3.0 >From e1d58cf75b466a4d84246b974cac63392a3ca1f4 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini <pbonzini(a)redhat.com> Date: Thu, 12 Mar 2015 15:30:12 +0100 Subject: [PATCH v3 1/2] boot.c: delay exiting boot if menu key is ESC If the menu key is ESC, do not restart boot unless 1.5 seconds have passed. Otherwise users (trained by years of repeatedly hitting keys to enter the BIOS) will end up hitting ESC multiple times and immediately booting the primary boot device. Suggested-by: Matt DeVillier <matt.devillier(a)gmail.com> Signed-off-by: Paolo Bonzini <pbonzini(a)redhat.com> --- src/boot.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/boot.c b/src/boot.c index f23e9e1..3aab8d4 100644 --- a/src/boot.c +++ b/src/boot.c @@ -486,9 +486,15 @@ interactive_bootmenu(void) , strtcpy(desc, pos->description, ARRAY_SIZE(desc))); } - // Get key press + // Get key press. If the menu key is ESC, do not restart boot unless + // 1.5 seconds have passed. Otherwise users (trained by years of + // repeatedly hitting keys to enter the BIOS) will end up hitting ESC + // multiple times and immediately booting the primary boot device. + int esc_accepted_time = irqtimer_calc(menukey == 1 ? 1500 : 0); for (;;) { scan_code = get_keystroke(1000); + if (scan_code == 1 && !irqtimer_check(esc_accepted_time)) + continue; if (scan_code >= 1 && scan_code <= maxmenu+1) break; } -- 2.3.0 >From ece1e87f2eb89cc0d352d1e02454cb2bcb8da62e Mon Sep 17 00:00:00 2001 From: Paolo Bonzini <pbonzini(a)redhat.com> Date: Thu, 12 Mar 2015 15:31:17 +0100 Subject: [PATCH v3 2/2] boot: switch default menu key to ESC On some platforms, F12 may be hard to access; for example, on OS X machines F9-F12 have been intercepted by the OS for a long time, and on newer OS X releases function keys are basically gone for good. Which keys are and are not available depends on the client, not on the server, but only function keys are usually trapped by terminals. Hence, using ESC for the boot menu avoids the problems associated with F12. Suggested-by: Kevin O'Connor <kevin(a)koconnor.net> Signed-off-by: Paolo Bonzini <pbonzini(a)redhat.com> --- src/boot.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/boot.c b/src/boot.c index 3aab8d4..d6b1fb7 100644 --- a/src/boot.c +++ b/src/boot.c @@ -459,8 +459,8 @@ interactive_bootmenu(void) ; char *bootmsg = romfile_loadfile("etc/boot-menu-message", NULL); - int menukey = romfile_loadint("etc/boot-menu-key", 0x86); - printf("%s", bootmsg ?: "\nPress F12 for boot menu.\n\n"); + int menukey = romfile_loadint("etc/boot-menu-key", 1); + printf("%s", bootmsg ?: "\nPress ESC for boot menu.\n\n"); free(bootmsg); u32 menutime = romfile_loadint("etc/boot-menu-wait", DEFAULT_BOOTMENU_WAIT); -- 2.3.0

4 6

[PATCH] smp: Fix smp race introduced in 0673b787
by Kevin O'Connor 12 Mar '15

12 Mar '15

In 0673b787 the QEMU SMP init code was changed to run in 32bit mode. Unfortunately, the transition32 assembler function is not multi-processor safe, because it modifies the global RTC index register. This race condition led to sporadic failures when emulating machines with a large number of processors. This patch changes the entry_smp code to use a variant of transition32 that does not touch the RTC registers. Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net> --- src/romlayout.S | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/romlayout.S b/src/romlayout.S index 6b3aabd..93b6874 100644 --- a/src/romlayout.S +++ b/src/romlayout.S @@ -22,7 +22,8 @@ // %edx = return location (in 32bit mode) // Clobbers: ecx, flags, segment registers, cr0, idt/gdt DECLFUNC transition32 -transition32_for_smi: +transition32_nmi_off: + // transition32 when NMI and A20 are already initialized movl %eax, %ecx jmp 1f transition32: @@ -205,7 +206,7 @@ __farcall16: entry_smi: // Transition to 32bit mode. movl $1f + BUILD_BIOS_ADDR, %edx - jmp transition32_for_smi + jmp transition32_nmi_off .code32 1: movl $BUILD_SMM_ADDR + 0x8000, %esp calll _cfunc32flat_handle_smi - BUILD_BIOS_ADDR @@ -216,8 +217,10 @@ entry_smi: DECLFUNC entry_smp entry_smp: // Transition to 32bit mode. + cli + cld movl $2f + BUILD_BIOS_ADDR, %edx - jmp transition32 + jmp transition32_nmi_off .code32 // Acquire lock and take ownership of shared stack 1: rep ; nop -- 1.9.3

1 1

[PATCH] boot: add serial-friendly alternatives for invoking the boot menu
by Paolo Bonzini 12 Mar '15

12 Mar '15

F11 and F12 are trapped by some terminal emulators, and sgabios does not always recognize function keys very well. Real-world machines often provide replacements for function keys for use on the serial console: ESC+1...ESC+0 for F1...F10, ESC+SHIFT+1 and ESC+SHIFT+2 for F11...F12. Accept all of them, which can be useful in case the user has set boot-menu-key. Signed-off-by: Paolo Bonzini <pbonzini(a)redhat.com> --- src/boot.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 47 insertions(+), 5 deletions(-) diff --git a/src/boot.c b/src/boot.c index f23e9e1..3f1ea4a 100644 --- a/src/boot.c +++ b/src/boot.c @@ -422,7 +422,21 @@ get_raw_keystroke(void) memset(&br, 0, sizeof(br)); br.flags = F_IF; call16_int(0x16, &br); - return br.ah; + return br.ax; +} + +// Read a keystroke - waiting up to 'msec' milliseconds. +static int +get_keystroke_ascii(int msec) +{ + u32 end = irqtimer_calc(msec); + for (;;) { + if (check_for_keystroke()) + return get_raw_keystroke() & 255; + if (irqtimer_check(end)) + return -1; + yield_toirq(); + } } // Read a keystroke - waiting up to 'msec' milliseconds. @@ -432,7 +446,7 @@ get_keystroke(int msec) u32 end = irqtimer_calc(msec); for (;;) { if (check_for_keystroke()) - return get_raw_keystroke(); + return get_raw_keystroke() >> 8; if (irqtimer_check(end)) return -1; yield_toirq(); @@ -446,6 +460,35 @@ get_keystroke(int msec) #define DEFAULT_BOOTMENU_WAIT 2500 +static int +get_bootmenu_keystroke(void) +{ + u32 menutime = romfile_loadint("etc/boot-menu-wait", DEFAULT_BOOTMENU_WAIT); + int scan_code = get_keystroke(menutime); + if (scan_code == 0x01) { + while (get_keystroke(0) >= 0) + ; + int ascii = get_keystroke_ascii(menutime * 2); + switch (ascii) { + case '1' ... '9': + scan_code = 0x3a + ascii - '0'; + break; + case '0': + scan_code = 0x3a + 10; + break; + case '!': + scan_code = 0x85; + break; + case '@': + scan_code = 0x86; + break; + default: + break; + } + } + return scan_code; +} + // Show IPL option menu. void interactive_bootmenu(void) @@ -460,12 +503,11 @@ interactive_bootmenu(void) char *bootmsg = romfile_loadfile("etc/boot-menu-message", NULL); int menukey = romfile_loadint("etc/boot-menu-key", 0x86); - printf("%s", bootmsg ?: "\nPress F12 for boot menu.\n\n"); + printf("%s", bootmsg ?: "\nPress ESC+@ or F12 for boot menu.\n\n"); free(bootmsg); - u32 menutime = romfile_loadint("etc/boot-menu-wait", DEFAULT_BOOTMENU_WAIT); enable_bootsplash(); - int scan_code = get_keystroke(menutime); + int scan_code = get_bootmenu_keystroke(); disable_bootsplash(); if (scan_code != menukey) return; -- 2.3.0

4 10

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS March 2015