Closed gratian closed 2 years ago
I've dropped our out-of-tree commit 87e635c01011b499290e1572996d26dc817aa755 ("drivers/firmware/efi/Kconfig: Add EFI_RUNTIME") in favor of upstream commit a031651ff2144a3d81d4916856c093bc1ea0a413 ("efi: Allow to enable EFI runtime services by default on RT"). This was done in the previous 5.19-rt upgrade PR: https://github.com/ni/linux/pull/72
The logic is reversed, i.e. in order to have EFI vars support we do want:
# CONFIG_EFI_DISABLE_RUNTIME is not set
CONFIG_EFI_VARS was removed upstream by commit 0f5b2c69a4cbe4166ca24b76d5ada98ed2867741 ("efi: vars: Remove deprecated 'efivars' sysfs interface"). I believe the replacement is CONFIG_EFIVAR_FS which is enabled in our config:
admin@NI-PXIe-8880-03095FC1:~# uname -a
Linux NI-PXIe-8880-03095FC1 6.0.0-rc6-rt9-00084-g145e8921120b #1 SMP PREEMPT_RT Mon Sep 19 17:49:12 CDT 2022 x86_64 x86_64 x86_64 GNU/Linux
admin@NI-PXIe-8880-03095FC1:~# zcat /proc/config.gz | grep -E "EFIVAR|EFI_VARS"
CONFIG_EFI_VARS_PSTORE=y
# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
CONFIG_EFIVAR_FS=y
Changes since V1:
in nati_x86_64_defconfig based on '.config' audit.
Submitted as nilrt/master/6.0.
This is a rebase of our commits from nilrt/master/5.19 to the latest devel-rt/linux-6.0.y-rt branch.
During the rebase the following commits were resolved in place:
Additional fixes:
Additional clean-up:
Testing:
[procedural note: We will want to complete this pull request outside the github UI to create the proper nilrt/master/6.0 branch]