Skip to contentSkip to conversation

EFI fixes for v6.1 (#2)

GIT PULL Merged Ard Biesheuvel 2 participants 2 messages Nov 4, 2022 EFI

lore
Share & tools
lore

Ard Biesheuvel

author maintainer
#0 lore raw

Hello Linus,

Please pull the EFI fixes below.

The arm64 exception recovery is not a real fix, but it will be useful to have in v6.1 going forward, so I've incorporated it here. I hope that's alright.

The following changes since commit 37926f96302d8b6c2bc97990d33e316a3ed6d67f:

efi: runtime: Don't assume virtual mappings are missing if VA == PA == 0 (2022-10-21 11:09:41 +0200)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git tags/efi-fixes-for-v6.1-2

for you to fetch changes up to 23715a26c8d812912a70c6ac1ce67af649b95914:

arm64: efi: Recover from synchronous exceptions occurring in firmware (2022-11-03 18:01:15 +0100)

----------------------------------------------------------------
Second batch of EFI fixes for v6.1

- A pair of tweaks to the EFI random seed code so that externally provided version of this config table are handled more robustly
- Another fix for the v6.0 EFI variable refactor that turned out to break Apple machines which don't provide QueryVariableInfo()
- Add some guard rails to the EFI runtime service call wrapper so we can recover from synchronous exceptions caused by firmware

----------------------------------------------------------------
Ard Biesheuvel (4):
efi: random: reduce seed size to 32 bytes
efi: random: Use 'ACPI reclaim' memory for random seed
efi: efivars: Fix variable writes with unsupported query_variable_store()
arm64: efi: Recover from synchronous exceptions occurring in firmware

Jerry Snitselaar (1):
efi/tpm: Pass correct address to memblock_reserve

 arch/arm64/include/asm/efi.h          |  8 +++++
 arch/arm64/kernel/efi-rt-wrapper.S    | 33 +++++++++++++++--
 arch/arm64/kernel/efi.c               | 26 ++++++++++++++
 arch/arm64/mm/fault.c                 |  4 +++
 drivers/firmware/efi/efi.c            |  2 +-
 drivers/firmware/efi/libstub/random.c |  7 +++-
 drivers/firmware/efi/tpm.c            |  2 +-
 drivers/firmware/efi/vars.c           | 68 +++++++++++------------------------
 include/linux/efi.h                   |  2 +-
 9 files changed, 98 insertions(+), 54 deletions(-)
merge bot Merged
#1 lore raw
The pull request you sent on Fri, 4 Nov 2022 17:51:49 +0100:

The pull request you sent on Fri, 4 Nov 2022 17:51:49 +0100:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git tags/efi-fixes-for-v6.1-2

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/1caa2f182afb59de9d6d5ba64b340df011a0b653

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html