Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04851772 authored by Matt Fleming's avatar Matt Fleming
Browse files

efivars: Move pstore code into the new EFI directory 



efivars.c has grown far too large and needs to be divided up. Create a
new directory and move the persistence storage code to efi-pstore.c now
that it uses the new efivar API. This helps us to greatly reduce the
size of efivars.c and paves the way for moving other code out of
efivars.c.

Note that because CONFIG_EFI_VARS can be built as a module efi-pstore
must also include support for building as a module.

Reviewed-by: default avatarTom Gundersen <teg@jklm.no>
Tested-by: default avatarTom Gundersen <teg@jklm.no>
Cc: Seiji Aguchi <seiji.aguchi@hds.com>
Cc: Anton Vorontsov <cbouatmailru@gmail.com>
Cc: Colin Cross <ccross@android.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Matthew Garrett <mjg59@srcf.ucam.org>
Cc: Tony Luck <tony.luck@intel.com>
Signed-off-by: default avatarMatt Fleming <matt.fleming@intel.com>
parent e14ab23d

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -6325,7 +6325,7 @@ S: Maintained 
T:	git git://git.infradead.org/users/cbou/linux-pstore.git

F:	fs/pstore/

F:	include/linux/pstore*

F:	drivers/firmware/efivars.c

F:	drivers/firmware/efi/efi-pstore.c

F:	drivers/acpi/apei/erst.c



PTP HARDWARE CLOCK SUPPORT

drivers/firmware/Kconfig

+1 −35
Original line number Diff line number Diff line
@@ -36,41 +36,6 @@ config FIRMWARE_MEMMAP 


      See also Documentation/ABI/testing/sysfs-firmware-memmap.



config EFI_VARS

	tristate "EFI Variable Support via sysfs"

	depends on EFI

	default n

	help

	  If you say Y here, you are able to get EFI (Extensible Firmware

	  Interface) variable information via sysfs.  You may read,

	  write, create, and destroy EFI variables through this interface.



	  Note that using this driver in concert with efibootmgr requires

	  at least test release version 0.5.0-test3 or later, which is

	  available from Matt Domsch's website located at:

	  <http://linux.dell.com/efibootmgr/testing/efibootmgr-0.5.0-test3.tar.gz>



	  Subsequent efibootmgr releases may be found at:

	  <http://linux.dell.com/efibootmgr>



config EFI_VARS_PSTORE

	bool "Register efivars backend for pstore"

	depends on EFI_VARS && PSTORE

	default y

	help

	  Say Y here to enable use efivars as a backend to pstore. This

	  will allow writing console messages, crash dumps, or anything

	  else supported by pstore to EFI variables.



config EFI_VARS_PSTORE_DEFAULT_DISABLE

	bool "Disable using efivars as a pstore backend by default"

	depends on EFI_VARS_PSTORE

	default n

	help

	  Saying Y here will disable the use of efivars as a storage

	  backend for pstore by default. This setting can be overridden

	  using the efivars module's pstore_disable parameter.



config EFI_PCDP

	bool "Console device selection via EFI PCDP or HCDP table"

	depends on ACPI && EFI && IA64
@@ -164,5 +129,6 @@ config ISCSI_IBFT 
	  Otherwise, say N.



source "drivers/firmware/google/Kconfig"

source "drivers/firmware/efi/Kconfig"



endmenu

drivers/firmware/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -14,3 +14,4 @@ obj-$(CONFIG_ISCSI_IBFT) += iscsi_ibft.o 
obj-$(CONFIG_FIRMWARE_MEMMAP)	+= memmap.o



obj-$(CONFIG_GOOGLE_FIRMWARE)	+= google/

obj-$(CONFIG_EFI)		+= efi/

drivers/firmware/efi/Kconfig

0 → 100644
+39 −0
Original line number Diff line number Diff line 
menu "EFI (Extensible Firmware Interface) Support"

	depends on EFI



config EFI_VARS

	tristate "EFI Variable Support via sysfs"

	depends on EFI

	default n

	help

	  If you say Y here, you are able to get EFI (Extensible Firmware

	  Interface) variable information via sysfs.  You may read,

	  write, create, and destroy EFI variables through this interface.



	  Note that using this driver in concert with efibootmgr requires

	  at least test release version 0.5.0-test3 or later, which is

	  available from Matt Domsch's website located at:

	  <http://linux.dell.com/efibootmgr/testing/efibootmgr-0.5.0-test3.tar.gz>



	  Subsequent efibootmgr releases may be found at:

	  <http://linux.dell.com/efibootmgr>



config EFI_VARS_PSTORE

	tristate "Register efivars backend for pstore"

	depends on EFI_VARS && PSTORE

	default y

	help

	  Say Y here to enable use efivars as a backend to pstore. This

	  will allow writing console messages, crash dumps, or anything

	  else supported by pstore to EFI variables.



config EFI_VARS_PSTORE_DEFAULT_DISABLE

	bool "Disable using efivars as a pstore backend by default"

	depends on EFI_VARS_PSTORE

	default n

	help

	  Saying Y here will disable the use of efivars as a storage

	  backend for pstore by default. This setting can be overridden

	  using the efivars module's pstore_disable parameter.



endmenu

drivers/firmware/efi/Makefile

0 → 100644
+4 −0
Original line number Diff line number Diff line 
#

# Makefile for linux kernel

#

obj-$(CONFIG_EFI_VARS_PSTORE)		+= efi-pstore.o