Commit cf0e371d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents 678074f1 99da5bf3

drivers/firmware/efi/Kconfig

+4 −3
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;