Skip to content

Misc QEMU fixes #839

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mkopec wants to merge 2 commits into
base: dasharo
Choose a base branch
from
Open

Misc QEMU fixes #839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e92d770
configs/config.emulation_qemu_x86_q35_uefi: Enable ReBAR and Above 4G…
mkopec Feb 3, 2026
f830a23
configs/config.emulation_qemu_x86_q35_uefi_all_menus: sync with base …
mkopec Feb 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions configs/config.emulation_qemu_x86_q35_uefi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@ CONFIG_LOCALVERSION="v0.2.1-rc1"
CONFIG_OPTION_BACKEND_NONE=y
CONFIG_BOARD_EMULATION_QEMU_X86_Q35=y
CONFIG_EDK2_BOOT_TIMEOUT=3
CONFIG_PCIEXP_DEFAULT_MAX_RESIZABLE_BAR_BITS=35
CONFIG_TPM_MEASURED_BOOT=y
CONFIG_EDK2_BOOTSPLASH_FILE="3rdparty/dasharo-blobs/dasharo/bootsplash.bmp"
CONFIG_CPU_QEMU_X86_TSEG_SMM=y
CONFIG_UDK_202005_BINDING=y
CONFIG_PCIEXP_SUPPORT_RESIZABLE_BARS=y
CONFIG_DRIVERS_EFI_VARIABLE_STORE=y
CONFIG_DRIVERS_EFI_FW_INFO=y
CONFIG_DRIVERS_EFI_MAIN_FW_GUID="20651b14-8653-4d9b-a75a-67fa76e0ada5"
Expand All @@ -20,6 +22,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
CONFIG_PAYLOAD_EDK2=y
CONFIG_EDK2_CBMEM_LOGGING=y
CONFIG_EDK2_SERIAL_SUPPORT=y
CONFIG_EDK2_CUSTOM_BUILD_PARAMS="-D ABOVE_4G_MEMORY=TRUE"
Copy link
Copy Markdown
Member

@SergiiDmytruk SergiiDmytruk Feb 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ABOVE_4G_MEMORY is enabled by default.

Copy link
Copy Markdown
Member Author

@mkopec mkopec Feb 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It wasn't enabled when I was testing. Actually the Kconfig option EDK2_ABOVE_4G_MEMORY is missing entirely from Kconfig files, so the Makefile will set it to False explicitly:

coreboot/payloads/external/edk2/Makefile

Lines 191 to 194 in c7bf17c

# ABOVE_4G_MEMORY = TRUE
ifneq ($(CONFIG_EDK2_ABOVE_4G_MEMORY),y)
BUILD_STR += -D ABOVE_4G_MEMORY=FALSE
endif

Copy link
Copy Markdown
Member

@SergiiDmytruk SergiiDmytruk Feb 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I meant that it's enabled in the DSC file and didn't expect CONFIG_EDK2_ABOVE_4G_MEMORY to be undefined. Apparently, it's a Dasharo-specific option which got broken at some point. Seems like we're always passing ABOVE_4G_MEMORY=FALSE to EDK? Not sure we've ever intended that.

CONFIG_BUILD_IPXE=y
CONFIG_IPXE_ADD_SCRIPT=y
CONFIG_IPXE_SCRIPT="3rdparty/dasharo-blobs/dasharo/dasharo.ipxe"
Expand All @@ -33,10 +36,26 @@ CONFIG_EDK2_SETUP_PASSWORD=y
CONFIG_EDK2_PERFORMANCE_MEASUREMENT_ENABLE=y
CONFIG_EDK2_DASHARO_SYSTEM_FEATURES=y
CONFIG_EDK2_DASHARO_SECURITY_OPTIONS=y
CONFIG_EDK2_SHOW_CAMERA_OPTION=y
CONFIG_EDK2_SHOW_WIFI_BT_OPTION=y
CONFIG_EDK2_DASHARO_INTEL_ME_OPTIONS=y
CONFIG_EDK2_DASHARO_USB_CONFIG=y
CONFIG_EDK2_DASHARO_NETWORK_CONFIG=y
CONFIG_EDK2_DASHARO_CHIPSET_CONFIG=y
CONFIG_EDK2_DASHARO_POWER_CONFIG=y
CONFIG_EDK2_SLEEP_TYPE_OPTION=y
CONFIG_EDK2_FAN_CURVE_OPTION=y
CONFIG_EDK2_BATTERY_CONFIG_OPTION=y
CONFIG_EDK2_CPU_THROTTLING_THRESHOLD_OPTION=y
CONFIG_EDK2_DASHARO_PCI_CONFIG=y
CONFIG_EDK2_DASHARO_MEMORY_CONFIG=y
CONFIG_EDK2_DASHARO_SPD_PROFILE_OPTION=y
Copy link
Copy Markdown
Member

@SergiiDmytruk SergiiDmytruk Feb 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All these options weren't enabled in this config because they don't actually work.

CONFIG_EDK2_DASHARO_SERIAL_REDIRECTION_DEFAULT_ENABLE=y
CONFIG_EDK2_HAVE_2ND_UART=y
CONFIG_EDK2_DASHARO_CPU_CONFIG=y
CONFIG_EDK2_CORE_DISABLE_OPTION=y
CONFIG_EDK2_HYPERTHREADING_OPTION=y
CONFIG_EDK2_BOOT_MENU_KEY=0x0017
CONFIG_EDK2_SETUP_MENU_KEY=0x000C
CONFIG_EDK2_RAM_DISK_ENABLE=y
CONFIG_EDK2_CREATE_PREINSTALLED_BOOT_OPTIONS=y
8 changes: 8 additions & 0 deletions configs/config.emulation_qemu_x86_q35_uefi_all_menus
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,18 @@ CONFIG_LOCALVERSION="v0.2.1-rc1"
CONFIG_OPTION_BACKEND_NONE=y
CONFIG_BOARD_EMULATION_QEMU_X86_Q35=y
CONFIG_EDK2_BOOT_TIMEOUT=3
CONFIG_PCIEXP_DEFAULT_MAX_RESIZABLE_BAR_BITS=35
CONFIG_TPM_MEASURED_BOOT=y
CONFIG_EDK2_BOOTSPLASH_FILE="3rdparty/dasharo-blobs/dasharo/bootsplash.bmp"
CONFIG_CPU_QEMU_X86_TSEG_SMM=y
CONFIG_UDK_202005_BINDING=y
CONFIG_PCIEXP_SUPPORT_RESIZABLE_BARS=y
CONFIG_DRIVERS_EFI_VARIABLE_STORE=y
CONFIG_DRIVERS_EFI_FW_INFO=y
CONFIG_DRIVERS_EFI_MAIN_FW_GUID="20651b14-8653-4d9b-a75a-67fa76e0ada5"
CONFIG_DRIVERS_EFI_MAIN_FW_VERSION=0x00020101
CONFIG_DRIVERS_EFI_MAIN_FW_LSV=0x00020101
CONFIG_DRIVERS_EFI_UPDATE_CAPSULES=y
Copy link
Copy Markdown
Member

@SergiiDmytruk SergiiDmytruk Feb 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The capsules weren't enabled because enabling ME menu results in EDK assuming ME is on, so the capsules don't work with this config.

CONFIG_TPM1=y
CONFIG_TPM2=y
CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
Expand All @@ -15,6 +22,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
CONFIG_PAYLOAD_EDK2=y
CONFIG_EDK2_CBMEM_LOGGING=y
CONFIG_EDK2_SERIAL_SUPPORT=y
CONFIG_EDK2_CUSTOM_BUILD_PARAMS="-D ABOVE_4G_MEMORY=TRUE"
CONFIG_BUILD_IPXE=y
CONFIG_IPXE_ADD_SCRIPT=y
CONFIG_IPXE_SCRIPT="3rdparty/dasharo-blobs/dasharo/dasharo.ipxe"
Expand Down
Loading