mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 19:51:31 -04:00
Merge branch 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull EFI updates from Ingo Molnar: - refactor 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 * 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: efi: cper: print AER info of PCIe fatal error efi: Export Runtime Configuration Interface table to sysfs efi: ia64: move SAL systab handling out of generic EFI code efi/x86: move UV_SYSTAB handling into arch/x86 efi: x86: move efi_is_table_address() into arch/x86
This commit is contained in:
commit
cc9b499a1f
15 changed files with 250 additions and 52 deletions
|
|
@ -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. */
|
||||
|
|
|
|||
|
|
@ -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},
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -586,7 +586,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);
|
||||
|
|
|
|||
Loading…
Reference in a new issue