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

Commit d3dc0168 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge tag 'efi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into efi/core 

Pull EFI changes for v5.4 from Ard:

 - Some refactoring of the EFI config table handling across architectures.
 - Add support for the Dell EMC OEM config table.
 - Include AER diagnostic output to CPER handling of fatal PCIe errors.
parents 5f9e832c b194a77f

Documentation/ABI/testing/sysfs-firmware-efi

+8 −0
Original line number Diff line number Diff line
@@ -28,3 +28,11 @@ Description: Displays the physical addresses of all EFI Configuration 
		versions are always printed first, i.e. ACPI20 comes

		before ACPI.

Users:		dmidecode



What:		/sys/firmware/efi/tables/rci2

Date:		July 2019

Contact:	Narendra K <Narendra.K@dell.com>, linux-bugs@dell.com

Description:	Displays the content of the Runtime Configuration Interface

		Table version 2 on Dell EMC PowerEdge systems in binary format

Users:		It is used by Dell EMC OpenManage Server Administrator tool to

		populate BIOS setup page.

arch/ia64/include/asm/sal.h

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
#include <asm/pal.h>

#include <asm/fpu.h>



extern unsigned long sal_systab_phys;

extern spinlock_t sal_lock;



/* SAL spec _requires_ eight args for each call. */

arch/ia64/include/asm/sn/sn_sal.h

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ 
static inline u32

sn_sal_rev(void)

{

	struct ia64_sal_systab *systab = __va(efi.sal_systab);

	struct ia64_sal_systab *systab = __va(sal_systab_phys);



	return (u32)(systab->sal_b_rev_major << 8 | systab->sal_b_rev_minor);

}

arch/ia64/kernel/efi.c

+3 −0
Original line number Diff line number Diff line
@@ -47,8 +47,11 @@ 


static __initdata unsigned long palo_phys;



unsigned long sal_systab_phys = EFI_INVALID_TABLE_ADDR;



static __initdata efi_config_table_type_t arch_tables[] = {

	{PROCESSOR_ABSTRACTION_LAYER_OVERWRITE_GUID, "PALO", &palo_phys},

	{SAL_SYSTEM_TABLE_GUID, "SALsystab", &sal_systab_phys},

	{NULL_GUID, NULL, 0},

};

arch/ia64/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -572,7 +572,7 @@ setup_arch (char **cmdline_p) 
	find_memory();



	/* process SAL system table: */

	ia64_sal_init(__va(efi.sal_systab));

	ia64_sal_init(__va(sal_systab_phys));



#ifdef CONFIG_ITANIUM

	ia64_patch_rse((u64) __start___rse_patchlist, (u64) __end___rse_patchlist);