Commit dcaed592 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpi-apei' 

* acpi-apei: (29 commits)
  efi: cper: Fix possible out-of-bounds access
  ACPI: APEI: Fix possible out-of-bounds access to BERT region
  MAINTAINERS: Add James Morse to the list of APEI reviewers
  ACPI / APEI: Add support for the SDEI GHES Notification type
  firmware: arm_sdei: Add ACPI GHES registration helper
  ACPI / APEI: Use separate fixmap pages for arm64 NMI-like notifications
  ACPI / APEI: Only use queued estatus entry during in_nmi_queue_one_entry()
  ACPI / APEI: Split ghes_read_estatus() to allow a peek at the CPER length
  ACPI / APEI: Make GHES estatus header validation more user friendly
  ACPI / APEI: Pass ghes and estatus separately to avoid a later copy
  ACPI / APEI: Let the notification helper specify the fixmap slot
  ACPI / APEI: Move locking to the notification helper
  arm64: KVM/mm: Move SEA handling behind a single 'claim' interface
  KVM: arm/arm64: Add kvm_ras.h to collect kvm specific RAS plumbing
  ACPI / APEI: Switch NOTIFY_SEA to use the estatus queue
  ACPI / APEI: Move NOTIFY_SEA between the estatus-queue and NOTIFY_NMI
  ACPI / APEI: Don't allow ghes_ack_error() to mask earlier errors
  ACPI / APEI: Generalise the estatus queue's notify code
  ACPI / APEI: Don't update struct ghes' flags in read/clear estatus
  ACPI / APEI: Remove spurious GHES_TO_CLEAR check
  ...
parents 511514f1 45b14a4f

MAINTAINERS

+1 −0
Original line number Original line Diff line number Diff line
@@ -331,6 +331,7 @@ ACPI APEI 
M:	"Rafael J. Wysocki" <rjw@rjwysocki.net>

M:	"Rafael J. Wysocki" <rjw@rjwysocki.net>

M:	Len Brown <lenb@kernel.org>

M:	Len Brown <lenb@kernel.org>

L:	linux-acpi@vger.kernel.org

L:	linux-acpi@vger.kernel.org

R:	James Morse <james.morse@arm.com>

R:	Tony Luck <tony.luck@intel.com>

R:	Tony Luck <tony.luck@intel.com>

R:	Borislav Petkov <bp@alien8.de>

R:	Borislav Petkov <bp@alien8.de>

F:	drivers/acpi/apei/

F:	drivers/acpi/apei/

arch/arm/include/asm/kvm_ras.h

0 → 100644
+14 −0
Original line number Original line Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/* Copyright (C) 2018 - Arm Ltd */



#ifndef __ARM_KVM_RAS_H__

#define __ARM_KVM_RAS_H__



#include <linux/types.h>



static inline int kvm_handle_guest_sea(phys_addr_t addr, unsigned int esr)

{

	return -1;

}



#endif /* __ARM_KVM_RAS_H__ */

arch/arm/include/asm/system_misc.h

+0 −5
Original line number Original line Diff line number Diff line
@@ -38,11 +38,6 @@ static inline void harden_branch_predictor(void) 




extern unsigned int user_debug;

extern unsigned int user_debug;





static inline int handle_guest_sea(phys_addr_t addr, unsigned int esr)

{

	return -1;

}



#endif /* !__ASSEMBLY__ */

#endif /* !__ASSEMBLY__ */





#endif /* __ASM_ARM_SYSTEM_MISC_H */
 
#endif /* __ASM_ARM_SYSTEM_MISC_H */

arch/arm64/include/asm/acpi.h

+3 −1
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ 




#include <asm/cputype.h>

#include <asm/cputype.h>

#include <asm/io.h>

#include <asm/io.h>

#include <asm/ptrace.h>

#include <asm/smp_plat.h>

#include <asm/smp_plat.h>

#include <asm/tlbflush.h>

#include <asm/tlbflush.h>
@@ -110,9 +111,10 @@ static inline u32 get_acpi_id_for_cpu(unsigned int cpu) 




static inline void arch_fix_phys_package_id(int num, u32 slot) { }

static inline void arch_fix_phys_package_id(int num, u32 slot) { }

void __init acpi_init_cpus(void);

void __init acpi_init_cpus(void);



int apei_claim_sea(struct pt_regs *regs);

#else

#else

static inline void acpi_init_cpus(void) { }

static inline void acpi_init_cpus(void) { }

static inline int apei_claim_sea(struct pt_regs *regs) { return -ENOENT; }

#endif /* CONFIG_ACPI */

#endif /* CONFIG_ACPI */





#ifdef CONFIG_ARM64_ACPI_PARKING_PROTOCOL

#ifdef CONFIG_ARM64_ACPI_PARKING_PROTOCOL

arch/arm64/include/asm/daifflags.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ 




#define DAIF_PROCCTX		0

#define DAIF_PROCCTX		0

#define DAIF_PROCCTX_NOIRQ	PSR_I_BIT

#define DAIF_PROCCTX_NOIRQ	PSR_I_BIT

#define DAIF_ERRCTX		(PSR_I_BIT | PSR_A_BIT)





/* mask/save/unmask/restore all exceptions, including interrupts. */

/* mask/save/unmask/restore all exceptions, including interrupts. */

static inline void local_daif_mask(void)

static inline void local_daif_mask(void)

CRA Git | Maintained and supported by SUSTech CRA and CCSE