Commit 1b10b390 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull EFI updates from Ard Biesheuvel:
 "Only a handful of changes this cycle, consisting of cleanup work and a
  low-prio bugfix:

   - Additional cleanup by Tim for the efivarfs variable name length
     confusion

   - Avoid freeing a bogus pointer when virtual remapping is omitted in
     the EFI boot stub"

* tag 'efi-next-for-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi:
  efi: libstub: only free priv.runtime_map when allocated
  efi: Clear up misconceptions about a maximum variable name size
  efivarfs: Remove unused internal struct members
  Documentation: Mark the 'efivars' sysfs interface as removed
  efi: pstore: Request at most 512 bytes for variable names
parents 614da38e 4b2543f7

Documentation/ABI/removed/sysfs-firmware-efi-vars

0 → 100644
+12 −0
Original line number Diff line number Diff line 
What:		/sys/firmware/efi/vars

Date:		April 2004, removed March 2023

Description:

		This directory exposed interfaces for interacting with

		EFI variables.  For more information on EFI variables,

		see 'Variable Services' in the UEFI specification

		(section 7.2 in specification version 2.3 Errata D).



		The 'efivars' sysfs interface was removed in March of 2023,

		after being considered deprecated no later than September

		of 2020. Its functionality has been replaced by the

		'efivarfs' filesystem.

Documentation/ABI/stable/sysfs-firmware-efi-vars

deleted100644 → 0
+0 −79
Original line number Diff line number Diff line 
What:		/sys/firmware/efi/vars

Date:		April 2004

Contact:	Matt Domsch <Matt_Domsch@dell.com>

Description:

		This directory exposes interfaces for interactive with

		EFI variables.  For more information on EFI variables,

		see 'Variable Services' in the UEFI specification

		(section 7.2 in specification version 2.3 Errata D).



		In summary, EFI variables are named, and are classified

		into separate namespaces through the use of a vendor

		GUID.  They also have an arbitrary binary value

		associated with them.



		The efivars module enumerates these variables and

		creates a separate directory for each one found.  Each

		directory has a name of the form "<key>-<vendor guid>"

		and contains the following files:



		=============== ========================================

		attributes:	A read-only text file enumerating the

				EFI variable flags.  Potential values

				include:



				EFI_VARIABLE_NON_VOLATILE

				EFI_VARIABLE_BOOTSERVICE_ACCESS

				EFI_VARIABLE_RUNTIME_ACCESS

				EFI_VARIABLE_HARDWARE_ERROR_RECORD

				EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS



				See the EFI documentation for an

				explanation of each of these variables.



		data:		A read-only binary file that can be read

				to attain the value of the EFI variable



		guid:		The vendor GUID of the variable.  This

				should always match the GUID in the

				variable's name.



		raw_var:	A binary file that can be read to obtain

				a structure that contains everything

				there is to know about the variable.

				For structure definition see "struct

				efi_variable" in the kernel sources.



				This file can also be written to in

				order to update the value of a variable.

				For this to work however, all fields of

				the "struct efi_variable" passed must

				match byte for byte with the structure

				read out of the file, save for the value

				portion.



				**Note** the efi_variable structure

				read/written with this file contains a

				'long' type that may change widths

				depending on your underlying

				architecture.



		size:		As ASCII representation of the size of

				the variable's value.

		=============== ========================================





		In addition, two other magic binary files are provided

		in the top-level directory and are used for adding and

		removing variables:



		=============== ========================================

		new_var:	Takes a "struct efi_variable" and

				instructs the EFI firmware to create a

				new variable.



		del_var:	Takes a "struct efi_variable" and

				instructs the EFI firmware to remove any

				variable that has a matching vendor GUID

				and variable key name.

		=============== ========================================

Documentation/filesystems/efivarfs.rst

+1 −1
Original line number Diff line number Diff line
@@ -40,4 +40,4 @@ accidentally. 
*See also:*



- Documentation/admin-guide/acpi/ssdt-overlays.rst

- Documentation/ABI/stable/sysfs-firmware-efi-vars
 
- Documentation/ABI/removed/sysfs-firmware-efi-vars

drivers/firmware/efi/efi-pstore.c

+9 −1
Original line number Diff line number Diff line
@@ -162,7 +162,15 @@ static ssize_t efi_pstore_read(struct pstore_record *record) 
	efi_status_t status;



	for (;;) {

		varname_size = 1024;

		/*

		 * A small set of old UEFI implementations reject sizes

		 * above a certain threshold, the lowest seen in the wild

		 * is 512.

		 *

		 * TODO: Commonize with the iteration implementation in

		 *       fs/efivarfs to keep all the quirks in one place.

		 */

		varname_size = 512;



		/*

		 * If this is the first read() call in the pstore enumeration,

drivers/firmware/efi/libstub/fdt.c

+2 −2
Original line number Diff line number Diff line
@@ -335,7 +335,7 @@ efi_status_t allocate_new_fdt_and_exit_boot(void *handle, 


fail:

	efi_free(fdt_size, fdt_addr);



	if (!efi_novamap)

		efi_bs_call(free_pool, priv.runtime_map);



	return EFI_LOAD_ERROR;