March 2020 - SeaBIOS - mail.coreboot.org

[PATCH] ps2port: adjust init routine to fix PS/2 keyboard issues
by Paul Menzel May 21, 2020

May 21, 2020

From: Matt DeVillier <matt.devillier(a)gmail.com> Date: Fri, 12 Aug 2016 14:21:58 -0500 PS/2 keyboards on Chromebooks with upstream coreboot + SeaBIOS often fail to init properly / register keystrokes. Modify ps2port init to match that of TianoCore, which doesn't have said issues. Signed-off-by: Matt DeVillier <matt.devillier(a)gmail.com> Signed-off-by: Paul Menzel <pmenzel(a)molgen.mpg.de> --- Upstream from https://github.com/MrChromebox/SeaBIOS/ src/hw/ps2port.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/hw/ps2port.c b/src/hw/ps2port.c index 88b1059..2c334c0 100644 --- a/src/hw/ps2port.c +++ b/src/hw/ps2port.c @@ -465,6 +465,14 @@ ps2_keyboard_setup(void *data) if (ret) return; + // Disable KB/mouse interfaces + ret = i8042_command(I8042_CMD_KBD_DISABLE, NULL); + if (ret) + return; + ret = i8042_command(I8042_CMD_AUX_DISABLE, NULL); + if (ret) + return; + // Controller self-test. u8 param[2]; ret = i8042_command(I8042_CMD_CTL_TEST, param); @@ -475,6 +483,11 @@ ps2_keyboard_setup(void *data) return; } + // KB write CMD + ret = i8042_command(I8042_CMD_CTL_WCTR, NULL); + if (ret) + return; + // Controller keyboard test. ret = i8042_command(I8042_CMD_KBD_TEST, param); if (ret) @@ -505,11 +518,6 @@ ps2_keyboard_setup(void *data) return; } - /* Disable keyboard */ - ret = ps2_kbd_command(ATKBD_CMD_RESET_DIS, NULL); - if (ret) - return; - // Set scancode command (mode 2) param[0] = 0x02; ret = ps2_kbd_command(ATKBD_CMD_SSCANSET, param); -- 2.25.1

4 8

[PATCH v2] build: use -fcf-protection=none when available
by Christian Ehrhardt May 15, 2020

May 15, 2020

Some hardened gcc v9 compilers (such as the one in Ubuntu) default this option which for seabios leads to emulation errors when running in KVM (does not trigger in TCG) on older intel chips of the Penryn generation (~2006-2008). The symptom appears as endbr32/endbr64 interpretation failures and in KVM it looks like: KVM internal error. Suberror: 1 emulation failure EAX=00000000 EBX=00000000 ECX=000086d4 EDX=00000000 ESI=00000000 EDI=00000000 EBP=000086d4 ESP=00006d7c EIP=00007acf EFL=00000002 [-------] CPL=0 II=0 A20=1 SMM=0 HLT=0 ES =0000 00000000 ffffffff 00809300 CS =f000 000f0000 ffffffff 00809b00 SS =0000 00000000 ffffffff 00809300 DS =0000 00000000 ffffffff 00809300 FS =0000 00000000 ffffffff 00809300 GS =0000 00000000 ffffffff 00809300 LDT=0000 00000000 0000ffff 00008200 TR =0000 00000000 0000ffff 00008b00 GDT= 000f6200 00000037 IDT= 00000000 000003ff CR0=00000010 CR2=00000000 CR3=00000000 CR4=00000000 DR0=0000000000000000 DR1=0000000000000000 DR2=0000000000000000 DR3=0000000000000000 DR6=00000000ffff0ff0 DR7=0000000000000400 EFER=0000000000000000 Code=b8 90 d9 00 00 66 e8 6b f7 ff ff 66 b8 0a 00 00 00 e9 61 f2 <f3> 0f 1e fb 66 57 66 56 66 53 66 53 66 89 c7 67 66 89 14 24 66 89 ce 66 e8 15 f8 ff ff 88 URL: https://bugs.launchpad.net/ubuntu/+source/qemu/+bug/1866870 Signed-off-by: Christian Ehrhardt <christian.ehrhardt(a)canonical.com> --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 5f7d5370..9e8188e5 100644 --- a/Makefile +++ b/Makefile @@ -69,6 +69,7 @@ COMMONCFLAGS += $(call cc-option,$(CC),-fno-stack-protector,) COMMONCFLAGS += $(call cc-option,$(CC),-fno-stack-protector-all,) COMMONCFLAGS += $(call cc-option,$(CC),-fstack-check=no,) COMMONCFLAGS += $(call cc-option,$(CC),-Wno-address-of-packed-member,) +COMMONCFLAGS += $(call cc-option,$(CC),-fcf-protection=none,) COMMA := , CFLAGS32FLAT := $(COMMONCFLAGS) -DMODE16=0 -DMODESEGMENT=0 -- 2.25.1

2 2

[PATCH] advanced_bootmenu: up to 35 entries (2 pages if >18), numpad support (console)
by Mike Banon April 25, 2020

April 25, 2020

Add support for up to 35 boot menu entries (2 pages if >18). To solve the ">10" problem currently experienced by SeaBIOS users (there are no 11, 12, etc. keys on a keyboard - so impossible to choose the last menu entries if you got >10 entries because of multiple hard drives / secondary payloads / floppies) - the boot menu has been extended to the letter keys. NOTE: TPM menu has been moved from T to M letter: it is at the end of keyboard's 3rd row of letters and "Trusted" is adjective while "Module" is a noun; alternatively could press '-'. Also, add support for a numpad. Small USB numpad could be really convenient for choosing the boot entries at coreboot boards used as (maybe headless) servers. '/' char on numpad could be used to open the boot menu or to exit it. If there are >10 boot menu entries - the numpad console interface will be enabled: press one or two digit keys and then ENTER to confirm your choice, or remove a digit by pressing the '.Del' key. Also you could call TPM with '-' key at any moment, or boot with a single key press of your fullsize keyboard. Signed-off-by: Mike Banon <mikebdp2 at gmail.com> (patch body is after the testing instructions below) This "advanced_bootmenu" patch is much more useful when used together with my "multiple_floppies" patch: [SeaBIOS] [PATCH v2] ramdisk: search for all available floppy images instead of one https://mail.coreboot.org/pipermail/seabios/2018-December/012670.html Sadly I haven't done the suggestions by Kevin (I have so many unfinished tasks) so the "multiple_floppies" patch is also not merged yet. But you could install both patches to your coreboot by executing this script while at ./coreboot dir: https://pastebin.com/raw/hv9sSuMU And here is a coreboot image for QEMU with these two patches applied and my collection of wonderful and useful floppies added to popular the entries list: https://github.com/mikebdp2/floparchive/blob/master/coreboot.rom?raw=true Descriptions of the most prominent floppies could be found here: http://dangerousprototypes.com/docs/Lenovo_G505S_hacking#Useful_floppies Run this coreboot.rom by executing this QEMU command: (some floppies are 64-bit) qemu-system-x86_64 -L . -m 768 -localtime -vga vmware -net nic,model=rtl8139 \ -net user -soundhw ac97 -bios ./coreboot.rom -boot menu=on -serial stdio Best regards, Mike Banon diff --git a/src/boot.c b/src/boot.c index 9f82f3c..f94dd27 100644 --- a/src/boot.c +++ b/src/boot.c @@ -463,6 +463,7 @@ get_keystroke(int msec) * Boot menu and BCV execution ****************************************************************/ +#define BOOTMENU_PAGE_SIZE 18 #define DEFAULT_BOOTMENU_WAIT 2500 // Show IPL option menu. @@ -478,59 +479,282 @@ interactive_bootmenu(void) ; char *bootmsg = romfile_loadfile("etc/boot-menu-message", NULL); - int menukey = romfile_loadint("etc/boot-menu-key", 1); - printf("%s", bootmsg ?: "\nPress ESC for boot menu.\n\n"); + int menukey = romfile_loadint("etc/boot-menu-key", 1); // custom menukey + printf("%s", bootmsg ?: "\nPress ESC or \\ / slash 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); disable_bootsplash(); - if (scan_code != menukey) + if (scan_code != menukey && // custom menukey + scan_code != 1 && // ESC + scan_code != 43 && // '\' char on keyboard + scan_code != 53 && // '/' char on keyboard + scan_code != 98) { // '/' char on numpad + if (scan_code == -1) + printf("No key pressed.\n"); + else + printf("Not a menukey pressed.\n"); return; + } while (get_keystroke(0) >= 0) ; - printf("Select boot device:\n\n"); wait_threads(); - // Show menu items + char keyboard_keys[35] = {'1','2','3','4','5','6','7','8','9','0', + 'q','w','e','r','t','y','u','i','o','p', + 'a','s','d','f','g','h','j','k','l', + 'z','x','c','v','b','n'}; /* m = TPM */ + int numpad_scancodes[10] = { 82, 79, 80, 81, 75, 76, 77, 71, 72, 73 }; + int numpi = 0; // Key index: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9. + int digits = 0; // Numerical length of a current choice number. + int decode = 0; // Decode the current choice number into a letter? + int entry_id = 0; + char desc[77]; + + printf("Select boot device"); + + // Show menu items after counting them and determining a number of pages. + // Only 35 boot menu items (36 if to count a TPM) are supported currently. + int maxmenu = 0; struct bootentry_s *pos; - hlist_for_each_entry(pos, &BootList, node) { - char desc[77]; + hlist_for_each_entry(pos, &BootList, node) maxmenu++; - printf("%d. %s\n", maxmenu + + if (maxmenu > 10) { + if (maxmenu > 35) + maxmenu = 35; + if (maxmenu > BOOTMENU_PAGE_SIZE) + printf(" - page 1 :"); + else + printf(": "); + printf(" // press ENTER after your numpad input"); + if (maxmenu > BOOTMENU_PAGE_SIZE) + printf(" - if any -\n " + " // - or to switch between the pages...\n"); + else + printf(" (if any)\n\n"); + } else { + printf(":\n\n"); + } + + hlist_for_each_entry(pos, &BootList, node) { + if (entry_id == BOOTMENU_PAGE_SIZE) // Show only the first page. + break; + printf("%c. %s\n", keyboard_keys[entry_id] , strtcpy(desc, pos->description, ARRAY_SIZE(desc))); + entry_id++; } + int tpm_cshm = 0; if (tpm_can_show_menu()) { - printf("\nt. TPM Configuration\n"); + tpm_cshm = 1; + printf("\nm-. TPM Configuration"); } - - // 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); + printf("\n> "); + + // Do not restart boot on menukey press, unless DEFAULT_BOOTMENU_WAIT msecs + // have passed. Otherwise users (trained by years of repeatedly hitting keys + // to enter the BIOS) will end up hitting menukey multiple times and + // immediately booting the primary boot device. + int esc_accepted_time = irqtimer_calc(DEFAULT_BOOTMENU_WAIT); + int choice = 0, kb_choice = 0; + int page_num = 1; + int enter = 0; + int backspace = 0; + int tpm_show_menu = 0; for (;;) { scan_code = get_keystroke(1000); - if (scan_code == 1 && !irqtimer_check(esc_accepted_time)) - continue; - if (tpm_can_show_menu() && scan_code == 20 /* t */) { + if (scan_code == menukey || // custom menukey + scan_code == 1 || // ESC + scan_code == 43 || // '\' char on keyboard + scan_code == 53 || // '/' char on keyboard + scan_code == 98) { // '/' char on numpad + if (!irqtimer_check(esc_accepted_time)) + continue; + if (digits == 2) // Remove the decoded "(*)" + printf(" \b\b\b"); + /* Remove the existing input before printing a message. */ + for (; digits > 0; digits--) + printf("\b \b"); + printf("Menukey pressed.\n"); + return; + } + kb_choice = 0; + /* 4 rows of keyboard_keys: 1 row with numbers, 3 rows with letters. + Use any of them to select a boot device (except the TPM 'm-' keys) */ + // 1st range: 1-9 and 0 (10) keys <==> 2-11 scan codes <==> 1-10 choice + if (scan_code >= 2 && scan_code <= 11) kb_choice = scan_code - 1; + // 2nd range: Q-P row of letters <==> 16-25 scan codes <==> 11-20 choice + if (scan_code >= 16 && scan_code <= 25) kb_choice = scan_code - 5; + // 3rd range: A-L row of letters <==> 30-38 scan codes <==> 21-29 choice + if (scan_code >= 30 && scan_code <= 38) kb_choice = scan_code - 9; + // 4th range: Z-N row of letters <==> 44-49 scan codes <==> 30-35 choice + if (scan_code >= 44 && scan_code <= 49) kb_choice = scan_code - 14; + // ENTER: (28) on keyboard, (96) on numpad. + if (scan_code == 28 || scan_code == 96) + enter = 1; + // BCKSPC: '<-'(14) and 'Delete'(111) on keyboard, '.Del'(83) on numpad. + if (scan_code == 14 || scan_code == 111 || scan_code == 83) + backspace = 1; + // TPM keys: 'm'(50) and '-'(12) chars on keyboard, '-'(74) on numpad. + if ((scan_code == 50 || scan_code == 12 || scan_code == 74) && tpm_cshm) + tpm_show_menu = 1; + + if (kb_choice != 0 || tpm_show_menu) { + if (kb_choice > maxmenu) { + if (!tpm_show_menu) + continue; + } else { + choice = kb_choice; + } + if (digits == 2) // Remove the decoded "(*)" + printf(" \b\b\b"); + /* Remove the existing input before printing a choice. */ + for (; digits > 0; digits--) + printf("\b \b"); + if (!tpm_show_menu) { + // Choice is any of the detected boot devices ==> lets boot! + break; + } + } else { + // Internal/USB Numpad console interface. + if (digits < 9) { + for (numpi = 0; numpi < 10; numpi++) { + if (scan_code == numpad_scancodes[numpi]) { + if (maxmenu <= 10) { // Console interface is not needed. + if ((numpi != 0 && numpi <= maxmenu) || + (numpi == 0 && 10 <= maxmenu)) { // 10(0) + choice = numpi; + enter = 1; // Fake ENTER to boot this entry now. + } else { // If no such an entry, don't try to boot. + break; + } + } else { + if (digits == 2) { + printf(" \b\b\b"); // Remove the decoded "(*)" + if (choice == 0) { + printf("\b\b \b\b"); // Remove "10". + digits = 0; + } + } + choice = 10 * choice + numpi; + } + if (choice > 0) { + printf("%d", numpi); // Print the entered digit. + digits++; + } else { + if (10 <= maxmenu) + printf("10(0)\b\b\b"); + else + printf("10(?)\b\b\b"); + digits = 2; + } + if (choice > 9 && digits == 2) // Decode into a letter. + decode = 1; + break; + } + } + } + if (backspace && digits > 0) { + backspace = 0; + choice = choice / 10; + if (digits == 2) { + printf(" \b\b\b"); // Remove the decoded "(*)" + // 0 turned into 10: one more Backspace is needed to remove. + if (choice == 0) { + printf("\b \b"); + digits--; + } + } + printf("\b \b"); // Remove the last entered digit. + digits--; + if (choice > 9 && digits == 2) // Decode into a letter. + decode = 1; + } + if (decode) { // Decode the current choice number into a letter. + decode = 0; + if (choice <= maxmenu) { + printf("(%c)", keyboard_keys[choice-1]); + } else { + if (tpm_cshm && choice == 36) + printf("(m)"); // For TPM. + else + printf("(?)"); // No matching letter found. + } + printf("\b\b\b"); // Move a cursor before the "(*)" + } + } + + if (enter) { + enter = 0; + if (choice == 0) { + if (digits == 2) { // for 0 that turned into 10 + if (10 <= maxmenu) + break; + else + continue; + } + // If there are two pages - switch between them. + if (maxmenu > BOOTMENU_PAGE_SIZE) { + entry_id = 0; + page_num = 3 - page_num; // 3 - 1 = 2; 3 - 2 = 1. + printf("\n\nSelect boot device - page %d :" + " // press ENTER after your numpad input" + " - if any -\n " + " // - or to switch between the pages...\n", + page_num); + hlist_for_each_entry(pos, &BootList, node) { + if ((page_num == 1 && entry_id == BOOTMENU_PAGE_SIZE) || + (page_num == 2 && entry_id == 35)) + break; + if (page_num == 1 || entry_id >= BOOTMENU_PAGE_SIZE) + printf("%c. %s\n", keyboard_keys[entry_id], + strtcpy(desc, pos->description, ARRAY_SIZE(desc))); + entry_id++; + } + if (tpm_cshm) + printf("\nm-. TPM Configuration"); + printf("\n> "); + } + } else { + if (choice > maxmenu) { + if (tpm_cshm && choice == 36) + tpm_show_menu = 1; + } else { + // Choice is any of the detected boot devices ==> lets boot! + break; + } + } + } + + if (tpm_show_menu) { + tpm_show_menu = 0; + choice = 0; + if (digits == 0) + printf("TPM key pressed."); + else + digits = 0; printf("\n"); tpm_menu(); + printf("> "); } - if (scan_code >= 1 && scan_code <= maxmenu+1) - break; + } + + if (choice == 0) // 10(0) + choice = 10; + + if (digits == 0 && choice < 36) { + printf("%c", keyboard_keys[choice-1]); + if (choice > 9) // Decode into a number. + printf("(%d)", choice); } printf("\n"); - if (scan_code == 0x01) - // ESC - return; // Find entry and make top priority. - int choice = scan_code - 1; hlist_for_each_entry(pos, &BootList, node) { if (! --choice) break; diff --git a/src/config.h b/src/config.h index 93c8dbc..f85cc14 100644 --- a/src/config.h +++ b/src/config.h @@ -19,7 +19,7 @@ // Space to reserve in high-memory for tables #define BUILD_MAX_HIGHTABLE (256*1024) // Largest supported externaly facing drive id -#define BUILD_MAX_EXTDRIVE 16 +#define BUILD_MAX_EXTDRIVE 36 // Number of bytes the smbios may be and still live in the f-segment #define BUILD_MAX_SMBIOS_FSEG 600 // Maximum number of bytes the mptable may be and still be copied to f-segment

2 2

[PATCH] Skip boot menu and timeout with only one boot device
by Paul Menzel April 21, 2020

April 21, 2020

From: Matt DeVillier <matt.devillier(a)gmail.com> Date: Fri, 13 Jun 2014 17:20:23 -0500 Signed-off-by: Matt DeVillier <matt.devillier(a)gmail.com> Signed-off-by: Paul Menzel <pmenzel(a)molgen.mpg.de> --- Upstream from https://github.com/MrChromebox/SeaBIOS/ src/boot.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/boot.c b/src/boot.c index afeb36a..ace3fa5 100644 --- a/src/boot.c +++ b/src/boot.c @@ -670,6 +670,12 @@ interactive_bootmenu(void) if (! CONFIG_BOOTMENU || !romfile_loadint("etc/show-boot-menu", 1)) return; + // skip menu if only one boot device and no TPM + if ((NULL == BootList.first->next) && !tpm_can_show_menu()) { + printf("\n"); + return; + } + while (get_keystroke(0) >= 0) ; -- 2.25.1

4 6

[PATCH v2 0/3] tpm: Somce tcgbios related fixes and updates
by Stefan Berger April 19, 2020

April 19, 2020

This series of patches modifies the logging of events so that only active PCR banks are logged. An active PCR bank is recognized by the pcrSelect[0] being != 0. The vendorInfoSize was assumed to be u32 but it is u8. Prepare the tcgbios for SHA3 hash algorithms that may be support by TPM2's some time in the future. Stefan v1->v2: - added missing check for !sizeOfSelect - added '+ sizeof(u8)' to pad to account for vendorInfoSize field - added Marc-Andre's R-b's Stefan Berger (3): tcgbios: Only write logs for PCRs that are in active PCR banks tcgbios: Fix the vendorInfoSize to be of type u8 tcgbios: Add support for SHA3 type of algorithms src/std/tcg.h | 9 +++++++++ src/tcgbios.c | 56 +++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 52 insertions(+), 13 deletions(-) -- 2.24.1

2 4

Custom-sized, large floppy images?
by Rafael Send April 4, 2020

April 4, 2020

Hi, I'm working on stuffing a bootable Linux distro into coreboot. In QEMU I already succeded by using coreboot's built-in kernel loading mechanism, but that's without SeaBIOS. I'd love to have it as a SeaBIOS payload so I can also boot other things, but I guess I'd have to create a custom-sized floppy image for this or figure out how to create an ELF payload out of a Linux kernel (I'm open to either, but I wasn't able to find any documentation on the ELF method). The guy who put Win 3.1 in coreboot attempted the floppy method, but according to his article he did not find success with this method due to unknown and complex issues in the floppy-side logic of SeaBIOS. So, I'm making the question explicit: What would it take to support custom-sized floppy images? In particular, I'm thinking of a 16MB device... Alternatively, would it be possible to create an ELF file out of a Linux kernel+initrd / bootable image? Cheers, Rafael

4 28

[PATCH 0/6] Add virtio-mmio support
by Gerd Hoffmann April 3, 2020

April 3, 2020

qemu got a new "microvm" machine type which has no pci support. virtio-mmio is used for devices instead. This series adds support for virtio-mmio devices to seabios to allow booting from block and scsi devices. Gerd Hoffmann (6): string: add strtol() implementation paravirt/qemu: virtio-mmio device discovery virtio-mmio: device probing and initialization. virtio-mmio: add support to vp_*() functions virtio-mmio: add support for scsi devices. virtio-mmio: add support for block devices. Makefile | 2 +- src/hw/virtio-blk.h | 1 + src/hw/virtio-mmio.h | 77 +++++++++++++++++++++++++++++++++++++++++ src/hw/virtio-pci.h | 1 + src/hw/virtio-scsi.h | 1 + src/string.h | 1 + src/util.h | 2 ++ src/block.c | 2 ++ src/boot.c | 19 +++++++++++ src/fw/paravirt.c | 24 +++++++++++++ src/hw/virtio-blk.c | 71 ++++++++++++++++++++++++++++++++++++++ src/hw/virtio-mmio.c | 81 ++++++++++++++++++++++++++++++++++++++++++++ src/hw/virtio-pci.c | 68 +++++++++++++++++++++++++++++++------ src/hw/virtio-scsi.c | 73 +++++++++++++++++++++++++++++++++------ src/string.c | 25 ++++++++++++++ 15 files changed, 425 insertions(+), 23 deletions(-) create mode 100644 src/hw/virtio-mmio.h create mode 100644 src/hw/virtio-mmio.c -- 2.18.2

3 17

[PATCH] acpi: add xsdt support
by Gerd Hoffmann March 31, 2020

March 31, 2020

In case a xsdt table is present (and located below 4G) prefer it over rsdt. Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com> --- src/std/acpi.h | 11 +++++++++++ src/fw/biostables.c | 40 ++++++++++++++++++++++++++++++---------- 2 files changed, 41 insertions(+), 10 deletions(-) diff --git a/src/std/acpi.h b/src/std/acpi.h index c01fa7be827c..81c22757f50e 100644 --- a/src/std/acpi.h +++ b/src/std/acpi.h @@ -132,6 +132,17 @@ struct rsdt_descriptor_rev1 /* ACPI tables */ } PACKED; +/* + * ACPI 2.0 eXtended System Description Table (XSDT) + */ +#define XSDT_SIGNATURE 0x54445358 // XSDT +struct xsdt_descriptor_rev2 +{ + ACPI_TABLE_HEADER_DEF /* ACPI common table header */ + u64 table_offset_entry[0]; /* Array of pointers to other */ + /* ACPI tables */ +} PACKED; + /* * ACPI 1.0 Firmware ACPI Control Structure (FACS) */ diff --git a/src/fw/biostables.c b/src/fw/biostables.c index fe8626efc05d..0d4fdb9c22e8 100644 --- a/src/fw/biostables.c +++ b/src/fw/biostables.c @@ -141,18 +141,38 @@ find_acpi_table(u32 signature) if (!RsdpAddr || RsdpAddr->signature != RSDP_SIGNATURE) return NULL; struct rsdt_descriptor_rev1 *rsdt = (void*)RsdpAddr->rsdt_physical_address; + struct xsdt_descriptor_rev2 *xsdt = + RsdpAddr->xsdt_physical_address >= 0x100000000 + ? NULL : (void*)(u32)(RsdpAddr->xsdt_physical_address); dprintf(4, "rsdt=%p\n", rsdt); - if (!rsdt || rsdt->signature != RSDT_SIGNATURE) - return NULL; - void *end = (void*)rsdt + rsdt->length; - int i; - for (i=0; (void*)&rsdt->table_offset_entry[i] < end; i++) { - struct acpi_table_header *tbl = (void*)rsdt->table_offset_entry[i]; - if (!tbl || tbl->signature != signature) - continue; - dprintf(4, "table(%x)=%p\n", signature, tbl); - return tbl; + dprintf(4, "xsdt=%p\n", xsdt); + + if (xsdt && xsdt->signature == XSDT_SIGNATURE) { + void *end = (void*)xsdt + xsdt->length; + int i; + for (i=0; (void*)&xsdt->table_offset_entry[i] < end; i++) { + if (xsdt->table_offset_entry[i] >= 0x100000000) + continue; /* above 4G */ + struct acpi_table_header *tbl = (void*)(u32)xsdt->table_offset_entry[i]; + if (!tbl || tbl->signature != signature) + continue; + dprintf(1, "table(%x)=%p (via xsdt)\n", signature, tbl); + return tbl; + } } + + if (rsdt && rsdt->signature == RSDT_SIGNATURE) { + void *end = (void*)rsdt + rsdt->length; + int i; + for (i=0; (void*)&rsdt->table_offset_entry[i] < end; i++) { + struct acpi_table_header *tbl = (void*)rsdt->table_offset_entry[i]; + if (!tbl || tbl->signature != signature) + continue; + dprintf(1, "table(%x)=%p (via rsdt)\n", signature, tbl); + return tbl; + } + } + dprintf(4, "no table %x found\n", signature); return NULL; } -- 2.18.2

2 2

[PATCH 0/3] Some tcgbios related fixes and updates
by Stefan Berger March 30, 2020

March 30, 2020

This series of patches modifies the logging of events so that only active PCR banks are logged. An active PCR bank is recognized by the pcrSelect[0] being != 0. The vendorInfoSize was assumed to be u32 but it is u8. Prepare the tcgbios for SHA3 hash algorithms that may be supported by TPM2's some time in the future. Stefan Stefan Berger (3): tcgbios: Only write logs for PCRs that are in active PCR banks tcgbios: Fix the vendorInfoSize to be of type u8 tcgbios: Add support for SHA3 type of algorithms src/std/tcg.h | 9 +++++++++ src/tcgbios.c | 56 +++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 52 insertions(+), 13 deletions(-) -- 2.24.1

4 8

[PATCH v2 0/2] pci: add mmconfig support
by Gerd Hoffmann March 27, 2020

March 27, 2020

Gerd Hoffmann (2): pci: factor out ioconfig_cmd() pci: add mmconfig support src/hw/pci.h | 1 + src/fw/pciinit.c | 1 + src/hw/pci.c | 69 +++++++++++++++++++++++++++++++++++++++--------- 3 files changed, 59 insertions(+), 12 deletions(-) -- 2.18.2

2 5