linuxmsm/laptops-kernel
0
0 Fork 0
mirror of https://github.com/linux-msm/laptops-kernel.git synced 2026-08-13 14:19:53 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'efi-next-for-v6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi

Browse Source 
Pull EFI updates from Ard Biesheuvel:

 - Document what OVMF stands for (Open Virtual Machine Firmware)

 - Clear NX restrictions also from 'more reliable' type memory when
   using the DXE service API

* tag 'efi-next-for-v6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi:
  efi/x86: Memory protection on EfiGcdMemoryTypeMoreReliable
  efi: Explain OVMF acronym in OVMF_DEBUG_LOG help text
This commit is contained in:
Linus Torvalds committed 2025-10-05 12:08:14 -07:00
2 parents 678074f1a8 99da5bf3dd
commit cf0e371d2b
2 files changed
+10 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

drivers/firmware/efi/Kconfig
+4 -3
View File
@@ -267,9 +267,10 @@ config OVMF_DEBUG_LOG
bool "Expose OVMF firmware debug log via sysfs"
depends on EFI
help
Recent OVMF versions (edk2-stable202508 + newer) can write
their debug log to a memory buffer. This driver exposes the
log content via sysfs (/sys/firmware/efi/ovmf_debug_log).
Recent versions of the Open Virtual Machine Firmware
(edk2-stable202508 + newer) can write their debug log to a memory
buffer. This driver exposes the log content via sysfs
(/sys/firmware/efi/ovmf_debug_log).
config UNACCEPTED_MEMORY
bool
drivers/firmware/efi/libstub/x86-stub.c
+6 -4
View File
@@ -300,7 +300,7 @@ efi_status_t efi_adjust_memory_range_protection(unsigned long start,
return EFI_SUCCESS;
/*
* Don't modify memory region attributes, they are
* Don't modify memory region attributes, if they are
* already suitable, to lower the possibility to
* encounter firmware bugs.
*/
@@ -315,11 +315,13 @@ efi_status_t efi_adjust_memory_range_protection(unsigned long start,
next = desc.base_address + desc.length;
/*
* Only system memory is suitable for trampoline/kernel image placement,
* so only this type of memory needs its attributes to be modified.
* Only system memory and more reliable memory are suitable for
* trampoline/kernel image placement. So only those memory types
* may need to have attributes modified.
*/
if (desc.gcd_memory_type != EfiGcdMemoryTypeSystemMemory ||
if ((desc.gcd_memory_type != EfiGcdMemoryTypeSystemMemory &&
desc.gcd_memory_type != EfiGcdMemoryTypeMoreReliable) ||
(desc.attributes & (EFI_MEMORY_RO | EFI_MEMORY_XP)) == 0)
continue;