Merge tag 'acpi-5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

d276709c · Linus Torvalds <[email protected]> · 2019-03-06 13:33:11 -08:00

Pull ACPI updates from Rafael Wysocki:
 "These are ACPICA updates including ACPI 6.3 support among other
  things, APEI updates including the ARM Software Delegated Exception
  Interface (SDEI) support, ACPI EC driver fixes and cleanups and other
  assorted improvements.

  Specifics:

   - Update the ACPICA code in the kernel to upstream revision 20190215
     including ACPI 6.3 support and more:
      * New predefined methods: _NBS, _NCH, _NIC, _NIH, and _NIG (Erik
        Schmauss).
      * Update of the PCC Identifier structure in PDTT (Erik Schmauss).
      * Support for new Generic Affinity Structure subtable in SRAT
        (Erik Schmauss).
      * New PCC operation region support (Erik Schmauss).
      * Support for GICC statistical profiling for MADT (Erik Schmauss).
      * New Error Disconnect Recover notification support (Erik
        Schmauss).
      * New PPTT Processor Structure Flags fields support (Erik
        Schmauss).
      * ACPI 6.3 HMAT updates (Erik Schmauss).
      * GTDT Revision 3 support (Erik Schmauss).
      * Legacy module-level code (MLC) support removal (Erik Schmauss).
      * Update/clarification of messages for control method failures
        (Bob Moore).
      * Warning on creation of a zero-length opregion (Bob Moore).
      * acpiexec option to dump extra info for memory leaks (Bob Moore).
      * More ACPI error to firmware error conversions (Bob Moore).
      * Debugger fix (Bob Moore).
      * Copyrights update (Bob Moore)

   - Clean up sleep states support code in ACPICA (Christoph Hellwig)

   - Rework in_nmi() handling in the APEI code and add suppor for the
     ARM Software Delegated Exception Interface (SDEI) to it (James
     Morse)

   - Fix possible out-of-bounds accesses in BERT-related core (Ross
     Lagerwall)

   - Fix the APEI code parsing HEST that includes a Deferred Machine
     Check subtable (Yazen Ghannam)

   - Use DEFINE_DEBUGFS_ATTRIBUTE for APEI-related debugfs files
     (YueHaibing)

   - Switch the APEI ERST code to the new generic UUID API (Andy
     Shevchenko)

   - Update the MAINTAINERS entry for APEI (Borislav Petkov)

   - Fix and clean up the ACPI EC driver (Rafael Wysocki, Zhang Rui)

   - Fix DMI checks handling in the ACPI backlight driver and add the
     "Lunch Box" chassis-type check to it (Hans de Goede)

   - Add support for using ACPI table overrides included in built-in
     initrd images (Shunyong Yang)

   - Update ACPI device enumeration to treat the PWM2 device as "always
     present" on Lenovo Yoga Book (Yauhen Kharuzhy)

   - Fix up the enumeration of device objects with the PRP0001 device ID
     (Andy Shevchenko)

   - Clean up PPTT parsing error messages (John Garry)

   - Clean up debugfs files creation handling (Greg Kroah-Hartman,
     Rafael Wysocki)

   - Clean up the ACPI DPTF Makefile (Masahiro Yamada)"

* tag 'acpi-5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (65 commits)
  ACPI / bus: Respect PRP0001 when retrieving device match data
  ACPICA: Update version to 20190215
  ACPI/ACPICA: Trivial: fix spelling mistakes and fix whitespace formatting
  ACPICA: ACPI 6.3: add GTDT Revision 3 support
  ACPICA: ACPI 6.3: HMAT updates
  ACPICA: ACPI 6.3: PPTT add additional fields in Processor Structure Flags
  ACPICA: ACPI 6.3: add Error Disconnect Recover Notification value
  ACPICA: ACPI 6.3: MADT: add support for statistical profiling in GICC
  ACPICA: ACPI 6.3: add PCC operation region support for AML interpreter
  efi: cper: Fix possible out-of-bounds access
  ACPI: APEI: Fix possible out-of-bounds access to BERT region
  ACPICA: ACPI 6.3: SRAT: add Generic Affinity Structure subtable
  ACPICA: ACPI 6.3: Add Trigger order to PCC Identifier structure in PDTT
  ACPICA: ACPI 6.3: Adding predefined methods _NBS, _NCH, _NIC, _NIH, and _NIG
  ACPICA: Update/clarify messages for control method failures
  ACPICA: Debugger: Fix possible fault with the "test objects" command
  ACPICA: Interpreter: Emit warning for creation of a zero-length op region
  ACPICA: Remove legacy module-level code support
  ACPI / x86: Make PWM2 device always present at Lenovo Yoga Book
  ACPI / video: Extend chassis-type detection with a "Lunch Box" check
  ..

Commit: d276709ce6c90b9eceecdbd01a0c083ab04d3a52
Parents: ef800684 · 8167e00e

Merge commit. Changes below are compared with the first parent: ef800684.

Changes

227 files changed · +1437 −1321

File	Status	Add	Del	Content
Documentation/acpi/initrd_table_override.txt	modified	+4	−0	View file
MAINTAINERS	modified	+1	−0	View file
arch/arm/include/asm/kvm_ras.h	added	+14	−0	View file
arch/arm/include/asm/system_misc.h	modified	+0	−5	View file
arch/arm64/include/asm/acpi.h	modified	+3	−1	View file
arch/arm64/include/asm/daifflags.h	modified	+1	−0	View file
arch/arm64/include/asm/fixmap.h	modified	+5	−1	View file
arch/arm64/include/asm/kvm_ras.h	added	+25	−0	View file
arch/arm64/include/asm/system_misc.h	modified	+0	−2	View file
arch/arm64/kernel/acpi.c	modified	+31	−0	View file
arch/arm64/mm/fault.c	modified	+5	−19	View file
drivers/acpi/Kconfig	modified	+10	−0	View file
drivers/acpi/acpi_dbg.c	modified	+9	−21	View file
drivers/acpi/acpi_video.c	modified	+14	−6	View file
drivers/acpi/acpica/acapps.h	modified	+2	−2	View file
drivers/acpi/acpica/accommon.h	modified	+1	−1	View file
drivers/acpi/acpica/acconvert.h	modified	+1	−1	View file
drivers/acpi/acpica/acdebug.h	modified	+3	−2	View file
drivers/acpi/acpica/acdispat.h	modified	+1	−1	View file
drivers/acpi/acpica/acevents.h	modified	+1	−1	View file
drivers/acpi/acpica/acglobal.h	modified	+2	−1	View file
drivers/acpi/acpica/achware.h	modified	+1	−1	View file
drivers/acpi/acpica/acinterp.h	modified	+1	−1	View file
drivers/acpi/acpica/aclocal.h	modified	+2	−2	View file
drivers/acpi/acpica/acmacros.h	modified	+2	−2	View file
drivers/acpi/acpica/acnamesp.h	modified	+1	−1	View file
drivers/acpi/acpica/acobject.h	modified	+2	−1	View file
drivers/acpi/acpica/acopcode.h	modified	+1	−1	View file
drivers/acpi/acpica/acparser.h	modified	+1	−1	View file
drivers/acpi/acpica/acpredef.h	modified	+16	−1	View file
drivers/acpi/acpica/acresrc.h	modified	+1	−1	View file
drivers/acpi/acpica/acstruct.h	modified	+1	−1	View file
drivers/acpi/acpica/actables.h	modified	+1	−1	View file
drivers/acpi/acpica/acutils.h	modified	+1	−1	View file
drivers/acpi/acpica/amlcode.h	modified	+1	−1	View file
drivers/acpi/acpica/amlresrc.h	modified	+1	−1	View file
drivers/acpi/acpica/dbdisply.c	modified	+2	−2	View file
drivers/acpi/acpica/dbexec.c	modified	+2	−2	View file
drivers/acpi/acpica/dbhistry.c	modified	+1	−1	View file
drivers/acpi/acpica/dbnames.c	modified	+1	−1	View file
drivers/acpi/acpica/dbobject.c	modified	+1	−1	View file
drivers/acpi/acpica/dbtest.c	modified	+98	−66	View file
drivers/acpi/acpica/dsargs.c	modified	+1	−1	View file
drivers/acpi/acpica/dscontrol.c	modified	+1	−1	View file
drivers/acpi/acpica/dsdebug.c	modified	+1	−1	View file
drivers/acpi/acpica/dsfield.c	modified	+8	−1	View file
drivers/acpi/acpica/dsinit.c	modified	+1	−1	View file
drivers/acpi/acpica/dsmethod.c	modified	+1	−1	View file
drivers/acpi/acpica/dsobject.c	modified	+1	−1	View file
drivers/acpi/acpica/dsopcode.c	modified	+20	−8	View file
drivers/acpi/acpica/dspkginit.c	modified	+1	−1	View file
drivers/acpi/acpica/dswexec.c	modified	+1	−1	View file
drivers/acpi/acpica/dswload.c	modified	+1	−1	View file
drivers/acpi/acpica/dswload2.c	modified	+2	−2	View file
drivers/acpi/acpica/dswscope.c	modified	+1	−1	View file
drivers/acpi/acpica/dswstate.c	modified	+1	−1	View file
drivers/acpi/acpica/evevent.c	modified	+1	−1	View file
drivers/acpi/acpica/evglock.c	modified	+1	−1	View file
drivers/acpi/acpica/evgpe.c	modified	+2	−2	View file
drivers/acpi/acpica/evgpeblk.c	modified	+1	−1	View file
drivers/acpi/acpica/evgpeinit.c	modified	+1	−1	View file
drivers/acpi/acpica/evgpeutil.c	modified	+1	−1	View file
drivers/acpi/acpica/evhandler.c	modified	+1	−1	View file
drivers/acpi/acpica/evmisc.c	modified	+1	−1	View file
drivers/acpi/acpica/evregion.c	modified	+2	−2	View file
drivers/acpi/acpica/evrgnini.c	modified	+1	−20	View file
drivers/acpi/acpica/evxface.c	modified	+1	−1	View file
drivers/acpi/acpica/evxfevnt.c	modified	+1	−1	View file
drivers/acpi/acpica/evxfgpe.c	modified	+3	−3	View file
drivers/acpi/acpica/evxfregn.c	modified	+1	−1	View file
drivers/acpi/acpica/exconcat.c	modified	+1	−1	View file
drivers/acpi/acpica/exconfig.c	modified	+1	−1	View file
drivers/acpi/acpica/exconvrt.c	modified	+2	−2	View file
drivers/acpi/acpica/excreate.c	modified	+1	−1	View file
drivers/acpi/acpica/exdebug.c	modified	+1	−1	View file
drivers/acpi/acpica/exdump.c	modified	+1	−1	View file
drivers/acpi/acpica/exfield.c	modified	+70	−1	View file
drivers/acpi/acpica/exfldio.c	modified	+1	−1	View file
drivers/acpi/acpica/exmisc.c	modified	+1	−1	View file
drivers/acpi/acpica/exmutex.c	modified	+1	−1	View file
drivers/acpi/acpica/exnames.c	modified	+1	−1	View file
drivers/acpi/acpica/exoparg1.c	modified	+1	−1	View file
drivers/acpi/acpica/exoparg2.c	modified	+5	−5	View file
drivers/acpi/acpica/exoparg3.c	modified	+1	−1	View file
drivers/acpi/acpica/exoparg6.c	modified	+1	−1	View file
drivers/acpi/acpica/exprep.c	modified	+1	−1	View file
drivers/acpi/acpica/exregion.c	modified	+1	−1	View file
drivers/acpi/acpica/exresnte.c	modified	+1	−1	View file
drivers/acpi/acpica/exresolv.c	modified	+1	−1	View file
drivers/acpi/acpica/exresop.c	modified	+1	−1	View file
drivers/acpi/acpica/exserial.c	modified	+2	−2	View file
drivers/acpi/acpica/exstore.c	modified	+1	−1	View file
drivers/acpi/acpica/exstoren.c	modified	+1	−1	View file
drivers/acpi/acpica/exstorob.c	modified	+1	−1	View file
drivers/acpi/acpica/exsystem.c	modified	+1	−1	View file
drivers/acpi/acpica/extrace.c	modified	+1	−1	View file
drivers/acpi/acpica/exutils.c	modified	+2	−2	View file
drivers/acpi/acpica/hwacpi.c	modified	+1	−1	View file
drivers/acpi/acpica/hwesleep.c	modified	+1	−1	View file
drivers/acpi/acpica/hwgpe.c	modified	+1	−1	View file
drivers/acpi/acpica/hwsleep.c	modified	+1	−1	View file
drivers/acpi/acpica/hwtimer.c	modified	+1	−1	View file
drivers/acpi/acpica/hwvalid.c	modified	+1	−1	View file
drivers/acpi/acpica/hwxface.c	modified	+1	−1	View file
drivers/acpi/acpica/hwxfsleep.c	modified	+19	−79	View file
drivers/acpi/acpica/nsarguments.c	modified	+1	−1	View file
drivers/acpi/acpica/nsconvert.c	modified	+1	−1	View file
drivers/acpi/acpica/nsdump.c	modified	+1	−1	View file
drivers/acpi/acpica/nsdumpdv.c	modified	+1	−1	View file
drivers/acpi/acpica/nsinit.c	modified	+1	−1	View file
drivers/acpi/acpica/nsload.c	modified	+2	−2	View file
drivers/acpi/acpica/nsparse.c	modified	+13	−55	View file
drivers/acpi/acpica/nspredef.c	modified	+1	−1	View file
drivers/acpi/acpica/nsprepkg.c	modified	+1	−1	View file
drivers/acpi/acpica/nsrepair.c	modified	+1	−1	View file
drivers/acpi/acpica/nsrepair2.c	modified	+1	−1	View file
drivers/acpi/acpica/nsutils.c	modified	+2	−2	View file
drivers/acpi/acpica/nswalk.c	modified	+1	−1	View file
drivers/acpi/acpica/nsxfname.c	modified	+1	−1	View file
drivers/acpi/acpica/psargs.c	modified	+1	−1	View file
drivers/acpi/acpica/psloop.c	modified	+1	−194	View file
drivers/acpi/acpica/psobject.c	modified	+1	−1	View file
drivers/acpi/acpica/psopcode.c	modified	+1	−1	View file
drivers/acpi/acpica/psopinfo.c	modified	+1	−1	View file
drivers/acpi/acpica/psparse.c	modified	+5	−5	View file
drivers/acpi/acpica/psscope.c	modified	+1	−1	View file
drivers/acpi/acpica/pstree.c	modified	+1	−1	View file
drivers/acpi/acpica/psutils.c	modified	+1	−1	View file
drivers/acpi/acpica/pswalk.c	modified	+1	−1	View file
drivers/acpi/acpica/psxface.c	modified	+1	−1	View file
drivers/acpi/acpica/rsdumpinfo.c	modified	+7	−7	View file
drivers/acpi/acpica/rsirq.c	modified	+4	−4	View file
drivers/acpi/acpica/rsserial.c	modified	+5	−5	View file
drivers/acpi/acpica/tbdata.c	modified	+1	−1	View file
drivers/acpi/acpica/tbfadt.c	modified	+2	−2	View file
drivers/acpi/acpica/tbfind.c	modified	+1	−1	View file
drivers/acpi/acpica/tbinstal.c	modified	+1	−1	View file
drivers/acpi/acpica/tbprint.c	modified	+1	−1	View file
drivers/acpi/acpica/tbutils.c	modified	+1	−1	View file
drivers/acpi/acpica/tbxface.c	modified	+3	−3	View file
drivers/acpi/acpica/tbxfload.c	modified	+11	−16	View file
drivers/acpi/acpica/tbxfroot.c	modified	+1	−1	View file
drivers/acpi/acpica/utaddress.c	modified	+1	−1	View file
drivers/acpi/acpica/utalloc.c	modified	+1	−1	View file
drivers/acpi/acpica/utascii.c	modified	+1	−1	View file
drivers/acpi/acpica/utbuffer.c	modified	+1	−1	View file
drivers/acpi/acpica/utcache.c	modified	+1	−1	View file
drivers/acpi/acpica/utcopy.c	modified	+1	−1	View file
drivers/acpi/acpica/utdebug.c	modified	+1	−1	View file
drivers/acpi/acpica/utdecode.c	modified	+11	−9	View file
drivers/acpi/acpica/utdelete.c	modified	+4	−0	View file
drivers/acpi/acpica/uterror.c	modified	+5	−4	View file
drivers/acpi/acpica/uteval.c	modified	+1	−1	View file
drivers/acpi/acpica/utglobal.c	modified	+1	−1	View file
drivers/acpi/acpica/uthex.c	modified	+1	−1	View file
drivers/acpi/acpica/utids.c	modified	+1	−1	View file
drivers/acpi/acpica/utinit.c	modified	+1	−1	View file
drivers/acpi/acpica/utlock.c	modified	+1	−1	View file
drivers/acpi/acpica/utobject.c	modified	+1	−1	View file
drivers/acpi/acpica/utosi.c	modified	+1	−1	View file
drivers/acpi/acpica/utpredef.c	modified	+1	−1	View file
drivers/acpi/acpica/utprint.c	modified	+1	−1	View file
drivers/acpi/acpica/uttrack.c	modified	+13	−1	View file
drivers/acpi/acpica/utuuid.c	modified	+1	−1	View file
drivers/acpi/acpica/utxface.c	modified	+1	−1	View file
drivers/acpi/acpica/utxferror.c	modified	+44	−0	View file
drivers/acpi/acpica/utxfinit.c	modified	+1	−1	View file
drivers/acpi/apei/Kconfig	modified	+1	−11	View file
drivers/acpi/apei/bert.c	modified	+10	−13	View file
drivers/acpi/apei/einj.c	modified	+25	−68	View file
drivers/acpi/apei/erst.c	modified	+12	−15	View file
drivers/acpi/apei/ghes.c	modified	+371	−284	View file
drivers/acpi/apei/hest.c	modified	+15	−1	View file
drivers/acpi/bus.c	modified	+14	−0	View file
drivers/acpi/custom_method.c	modified	+0	−6	View file
drivers/acpi/dptf/Makefile	modified	+0	−2	View file
drivers/acpi/dptf/int340x_thermal.c	modified	+1	−1	View file
drivers/acpi/ec.c	modified	+112	−96	View file
drivers/acpi/ec_sys.c	modified	+8	−28	View file
drivers/acpi/internal.h	modified	+2	−2	View file
drivers/acpi/irq.c	modified	+2	−2	View file
drivers/acpi/pci_link.c	modified	+4	−4	View file
drivers/acpi/pptt.c	modified	+9	−4	View file
drivers/acpi/resource.c	modified	+2	−2	View file
drivers/acpi/tables.c	modified	+10	−2	View file
drivers/acpi/x86/utils.c	modified	+5	−0	View file
drivers/firmware/arm_sdei.c	modified	+68	−0	View file
drivers/firmware/efi/cper.c	modified	+9	−4	View file
drivers/gpio/gpiolib-acpi.c	modified	+1	−1	View file
drivers/platform/x86/sony-laptop.c	modified	+4	−4	View file
drivers/pnp/pnpacpi/rsparser.c	modified	+7	−7	View file
include/acpi/acbuffer.h	modified	+1	−1	View file
include/acpi/acconfig.h	modified	+2	−2	View file
include/acpi/acexcep.h	modified	+3	−2	View file
include/acpi/acnames.h	modified	+1	−1	View file
include/acpi/acoutput.h	modified	+3	−1	View file
include/acpi/acpi.h	modified	+1	−1	View file
include/acpi/acpiosxf.h	modified	+1	−1	View file
include/acpi/acpixf.h	modified	+8	−10	View file
include/acpi/acrestyp.h	modified	+8	−8	View file
include/acpi/actbl.h	modified	+1	−1	View file
include/acpi/actbl1.h	modified	+12	−7	View file
include/acpi/actbl2.h	modified	+11	−6	View file
include/acpi/actbl3.h	modified	+19	−2	View file
include/acpi/actypes.h	modified	+3	−11	View file
include/acpi/acuuid.h	modified	+1	−1	View file
include/acpi/ghes.h	modified	+2	−2	View file
include/acpi/platform/acenv.h	modified	+1	−1	View file
include/acpi/platform/acenvex.h	modified	+1	−1	View file
include/acpi/platform/acgcc.h	modified	+1	−1	View file
include/acpi/platform/acgccex.h	modified	+1	−1	View file
include/acpi/platform/acintel.h	modified	+1	−1	View file
include/acpi/platform/aclinux.h	modified	+1	−1	View file
include/acpi/platform/aclinuxex.h	modified	+1	−1	View file
include/linux/arm_sdei.h	modified	+9	−0	View file
include/linux/initrd.h	modified	+3	−0	View file
tools/power/acpi/common/cmfsize.c	modified	+1	−1	View file
tools/power/acpi/common/getopt.c	modified	+1	−1	View file
tools/power/acpi/os_specific/service_layers/oslinuxtbl.c	modified	+1	−1	View file
tools/power/acpi/os_specific/service_layers/osunixdir.c	modified	+1	−1	View file
tools/power/acpi/os_specific/service_layers/osunixmap.c	modified	+1	−1	View file
tools/power/acpi/os_specific/service_layers/osunixxf.c	modified	+1	−1	View file
tools/power/acpi/tools/acpidump/acpidump.h	modified	+1	−1	View file
tools/power/acpi/tools/acpidump/apdump.c	modified	+1	−1	View file
tools/power/acpi/tools/acpidump/apfiles.c	modified	+1	−1	View file
tools/power/acpi/tools/acpidump/apmain.c	modified	+1	−1	View file
virt/kvm/arm/mmu.c	modified	+2	−2	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/acpi/initrd_table_override.txt

View file

diff --git a/Documentation/acpi/initrd_table_override.txt b/Documentation/acpi/initrd_table_override.txt
index eb651a6..30437a6 100644
--- a/Documentation/acpi/initrd_table_override.txt
+++ b/Documentation/acpi/initrd_table_override.txt
@@ -14,6 +14,10 @@ upgrade the ACPI execution environment that is defined by the ACPI tables
 via upgrading the ACPI tables provided by the BIOS with an instrumented,
 modified, more recent version one, or installing brand new ACPI tables.
 
+When building initrd with kernel in a single image, option
+ACPI_TABLE_OVERRIDE_VIA_BUILTIN_INITRD should also be true for this
+feature to work.
+
 For a full list of ACPI tables that can be upgraded/installed, take a look
 at the char *table_sigs[MAX_ACPI_SIGNATURE]; definition in
 drivers/acpi/tables.c.

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index a3ccc41..a419aca 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -331,6 +331,7 @@ ACPI APEI
 M:	"Rafael J. Wysocki" <[email protected]>
 M:	Len Brown <[email protected]>
 L:	[email protected]
+R:	James Morse <[email protected]>
 R:	Tony Luck <[email protected]>
 R:	Borislav Petkov <[email protected]>
 F:	drivers/acpi/apei/

arch/arm/include/asm/kvm_ras.h

View file

diff --git a/arch/arm/include/asm/kvm_ras.h b/arch/arm/include/asm/kvm_ras.h
new file mode 100644
index 0000000..e957729
--- /dev/null
+++ b/arch/arm/include/asm/kvm_ras.h
@@ -0,0 +1,14 @@
+/* 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

View file

diff --git a/arch/arm/include/asm/system_misc.h b/arch/arm/include/asm/system_misc.h
index 8e76db8..66f6a3a 100644
--- a/arch/arm/include/asm/system_misc.h
+++ b/arch/arm/include/asm/system_misc.h
@@ -38,11 +38,6 @@ static inline void harden_branch_predictor(void)
 
 extern unsigned int user_debug;
 
-static inline int handle_guest_sea(phys_addr_t addr, unsigned int esr)
-{
-	return -1;
-}
-
 #endif /* !__ASSEMBLY__ */
 
 #endif /* __ASM_ARM_SYSTEM_MISC_H */

arch/arm64/include/asm/acpi.h

View file

diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h
index 2def77e..7628efb 100644
--- a/arch/arm64/include/asm/acpi.h
+++ b/arch/arm64/include/asm/acpi.h
@@ -18,6 +18,7 @@
 
 #include <asm/cputype.h>
 #include <asm/io.h>
+#include <asm/ptrace.h>
 #include <asm/smp_plat.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) { }
 void __init acpi_init_cpus(void);
-
+int apei_claim_sea(struct pt_regs *regs);
 #else
 static inline void acpi_init_cpus(void) { }
+static inline int apei_claim_sea(struct pt_regs *regs) { return -ENOENT; }
 #endif /* CONFIG_ACPI */
 
 #ifdef CONFIG_ARM64_ACPI_PARKING_PROTOCOL

arch/arm64/include/asm/daifflags.h

View file

diff --git a/arch/arm64/include/asm/daifflags.h b/arch/arm64/include/asm/daifflags.h
index 8d91f22..fa90779 100644
--- a/arch/arm64/include/asm/daifflags.h
+++ b/arch/arm64/include/asm/daifflags.h
@@ -20,6 +20,7 @@
 
 #define DAIF_PROCCTX		0
 #define DAIF_PROCCTX_NOIRQ	PSR_I_BIT
+#define DAIF_ERRCTX		(PSR_I_BIT | PSR_A_BIT)
 
 /* mask/save/unmask/restore all exceptions, including interrupts. */
 static inline void local_daif_mask(void)

arch/arm64/include/asm/fixmap.h

View file

diff --git a/arch/arm64/include/asm/fixmap.h b/arch/arm64/include/asm/fixmap.h
index ec1e6d6..f987b8a 100644
--- a/arch/arm64/include/asm/fixmap.h
+++ b/arch/arm64/include/asm/fixmap.h
@@ -55,7 +55,11 @@ enum fixed_addresses {
 #ifdef CONFIG_ACPI_APEI_GHES
 	/* Used for GHES mapping from assorted contexts */
 	FIX_APEI_GHES_IRQ,
-	FIX_APEI_GHES_NMI,
+	FIX_APEI_GHES_SEA,
+#ifdef CONFIG_ARM_SDE_INTERFACE
+	FIX_APEI_GHES_SDEI_NORMAL,
+	FIX_APEI_GHES_SDEI_CRITICAL,
+#endif
 #endif /* CONFIG_ACPI_APEI_GHES */
 
 #ifdef CONFIG_UNMAP_KERNEL_AT_EL0

arch/arm64/include/asm/kvm_ras.h

View file

diff --git a/arch/arm64/include/asm/kvm_ras.h b/arch/arm64/include/asm/kvm_ras.h
new file mode 100644
index 0000000..8ac6ee7
--- /dev/null
+++ b/arch/arm64/include/asm/kvm_ras.h
@@ -0,0 +1,25 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright (C) 2018 - Arm Ltd */
+
+#ifndef __ARM64_KVM_RAS_H__
+#define __ARM64_KVM_RAS_H__
+
+#include <linux/acpi.h>
+#include <linux/errno.h>
+#include <linux/types.h>
+
+#include <asm/acpi.h>
+
+/*
+ * Was this synchronous external abort a RAS notification?
+ * Returns '0' for errors handled by some RAS subsystem, or -ENOENT.
+ */
+static inline int kvm_handle_guest_sea(phys_addr_t addr, unsigned int esr)
+{
+	/* apei_claim_sea(NULL) expects to mask interrupts itself */
+	lockdep_assert_irqs_enabled();
+
+	return apei_claim_sea(NULL);
+}
+
+#endif /* __ARM64_KVM_RAS_H__ */

arch/arm64/include/asm/system_misc.h

View file

diff --git a/arch/arm64/include/asm/system_misc.h b/arch/arm64/include/asm/system_misc.h
index 0e2a0ec..32693f3 100644
--- a/arch/arm64/include/asm/system_misc.h
+++ b/arch/arm64/include/asm/system_misc.h
@@ -46,8 +46,6 @@ extern void __show_regs(struct pt_regs *);
 
 extern void (*arm_pm_restart)(enum reboot_mode reboot_mode, const char *cmd);
 
-int handle_guest_sea(phys_addr_t addr, unsigned int esr);
-
 #endif	/* __ASSEMBLY__ */
 
 #endif	/* __ASM_SYSTEM_MISC_H */

arch/arm64/kernel/acpi.c

View file

diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c
index 44e3c35..803f049 100644
--- a/arch/arm64/kernel/acpi.c
+++ b/arch/arm64/kernel/acpi.c
@@ -27,8 +27,10 @@
 #include <linux/smp.h>
 #include <linux/serial_core.h>
 
+#include <acpi/ghes.h>
 #include <asm/cputype.h>
 #include <asm/cpu_ops.h>
+#include <asm/daifflags.h>
 #include <asm/pgtable.h>
 #include <asm/smp_plat.h>
 
@@ -256,3 +258,32 @@ pgprot_t __acpi_get_mem_attribute(phys_addr_t addr)
 		return __pgprot(PROT_NORMAL_NC);
 	return __pgprot(PROT_DEVICE_nGnRnE);
 }
+
+/*
+ * Claim Synchronous External Aborts as a firmware first notification.
+ *
+ * Used by KVM and the arch do_sea handler.
+ * @regs may be NULL when called from process context.
+ */
+int apei_claim_sea(struct pt_regs *regs)
+{
+	int err = -ENOENT;
+	unsigned long current_flags;
+
+	if (!IS_ENABLED(CONFIG_ACPI_APEI_GHES))
+		return err;
+
+	current_flags = arch_local_save_flags();
+
+	/*
+	 * SEA can interrupt SError, mask it and describe this as an NMI so
+	 * that APEI defers the handling.
+	 */
+	local_daif_restore(DAIF_ERRCTX);
+	nmi_enter();
+	err = ghes_notify_sea();
+	nmi_exit();
+	local_daif_restore(current_flags);
+
+	return err;
+}

arch/arm64/mm/fault.c

View file

diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c
index efb7b2c..e1c84c2 100644
--- a/arch/arm64/mm/fault.c
+++ b/arch/arm64/mm/fault.c
@@ -18,6 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <linux/acpi.h>
 #include <linux/extable.h>
 #include <linux/signal.h>
 #include <linux/mm.h>
@@ -33,6 +34,7 @@
 #include <linux/preempt.h>
 #include <linux/hugetlb.h>
 
+#include <asm/acpi.h>
 #include <asm/bug.h>
 #include <asm/cmpxchg.h>
 #include <asm/cpufeature.h>
@@ -47,8 +49,6 @@
 #include <asm/tlbflush.h>
 #include <asm/traps.h>
 
-#include <acpi/ghes.h>
-
 struct fault_info {
 	int	(*fn)(unsigned long addr, unsigned int esr,
 		      struct pt_regs *regs);
@@ -643,19 +643,10 @@ static int do_sea(unsigned long addr, unsigned int esr, struct pt_regs *regs)
 	inf = esr_to_fault_info(esr);
 
 	/*
-	 * Synchronous aborts may interrupt code which had interrupts masked.
-	 * Before calling out into the wider kernel tell the interested
-	 * subsystems.
+	 * Return value ignored as we rely on signal merging.
+	 * Future patches will make this more robust.
 	 */
-	if (IS_ENABLED(CONFIG_ACPI_APEI_SEA)) {
-		if (interrupts_enabled(regs))
-			nmi_enter();
-
-		ghes_notify_sea();
-
-		if (interrupts_enabled(regs))
-			nmi_exit();
-	}
+	apei_claim_sea(regs);
 
 	if (esr & ESR_ELx_FnV)
 		siaddr = NULL;
@@ -733,11 +724,6 @@ static const struct fault_info fault_info[] = {
 	{ do_bad,		SIGKILL, SI_KERNEL,	"unknown 63"			},
 };
 
-int handle_guest_sea(phys_addr_t addr, unsigned int esr)
-{
-	return ghes_notify_sea();
-}
-
 asmlinkage void __exception do_mem_abort(unsigned long addr, unsigned int esr,
 					 struct pt_regs *regs)
 {

drivers/acpi/Kconfig

View file

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 90ff0a4..4e015c7 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -357,6 +357,16 @@ config ACPI_TABLE_UPGRADE
 	  initrd, therefore it's safe to say Y.
 	  See Documentation/acpi/initrd_table_override.txt for details
 
+config ACPI_TABLE_OVERRIDE_VIA_BUILTIN_INITRD
+	bool "Override ACPI tables from built-in initrd"
+	depends on ACPI_TABLE_UPGRADE
+	depends on INITRAMFS_SOURCE!="" && INITRAMFS_COMPRESSION=""
+	help
+	  This option provides functionality to override arbitrary ACPI tables
+	  from built-in uncompressed initrd.
+
+	  See Documentation/acpi/initrd_table_override.txt for details
+
 config ACPI_DEBUG
 	bool "Debug Statements"
 	help

drivers/acpi/acpi_dbg.c

View file

diff --git a/drivers/acpi/acpi_dbg.c b/drivers/acpi/acpi_dbg.c
index a2dcd62..4a434c2 100644
--- a/drivers/acpi/acpi_dbg.c
+++ b/drivers/acpi/acpi_dbg.c
@@ -750,48 +750,36 @@ static const struct acpi_debugger_ops acpi_aml_debugger = {
 
 int __init acpi_aml_init(void)
 {
-	int ret = 0;
-
-	if (!acpi_debugfs_dir) {
-		ret = -ENOENT;
-		goto err_exit;
-	}
+	int ret;
 
 	/* Initialize AML IO interface */
 	mutex_init(&acpi_aml_io.lock);
 	init_waitqueue_head(&acpi_aml_io.wait);
 	acpi_aml_io.out_crc.buf = acpi_aml_io.out_buf;
 	acpi_aml_io.in_crc.buf = acpi_aml_io.in_buf;
+
 	acpi_aml_dentry = debugfs_create_file("acpidbg",
 					      S_IFREG | S_IRUGO | S_IWUSR,
 					      acpi_debugfs_dir, NULL,
 					      &acpi_aml_operations);
-	if (acpi_aml_dentry == NULL) {
-		ret = -ENODEV;
-		goto err_exit;
-	}
-	ret = acpi_register_debugger(THIS_MODULE, &acpi_aml_debugger);
-	if (ret)
-		goto err_fs;
-	acpi_aml_initialized = true;
 
-err_fs:
+	ret = acpi_register_debugger(THIS_MODULE, &acpi_aml_debugger);
 	if (ret) {
 		debugfs_remove(acpi_aml_dentry);
 		acpi_aml_dentry = NULL;
+		return ret;
 	}
-err_exit:
-	return ret;
+
+	acpi_aml_initialized = true;
+	return 0;
 }
 
 void __exit acpi_aml_exit(void)
 {
 	if (acpi_aml_initialized) {
 		acpi_unregister_debugger(&acpi_aml_debugger);
-		if (acpi_aml_dentry) {
-			debugfs_remove(acpi_aml_dentry);
-			acpi_aml_dentry = NULL;
-		}
+		debugfs_remove(acpi_aml_dentry);
+		acpi_aml_dentry = NULL;
 		acpi_aml_initialized = false;
 	}
 }

drivers/acpi/acpi_video.c

View file

diff --git a/drivers/acpi/acpi_video.c b/drivers/acpi/acpi_video.c
index f0b5226..d73afb5 100644
--- a/drivers/acpi/acpi_video.c
+++ b/drivers/acpi/acpi_video.c
@@ -2124,21 +2124,29 @@ static int __init intel_opregion_present(void)
 	return opregion;
 }
 
+/* Check if the chassis-type indicates there is no builtin LCD panel */
 static bool dmi_is_desktop(void)
 {
 	const char *chassis_type;
+	unsigned long type;
 
 	chassis_type = dmi_get_system_info(DMI_CHASSIS_TYPE);
 	if (!chassis_type)
 		return false;
 
-	if (!strcmp(chassis_type, "3") || /*  3: Desktop */
-	    !strcmp(chassis_type, "4") || /*  4: Low Profile Desktop */
-	    !strcmp(chassis_type, "5") || /*  5: Pizza Box */
-	    !strcmp(chassis_type, "6") || /*  6: Mini Tower */
-	    !strcmp(chassis_type, "7") || /*  7: Tower */
-	    !strcmp(chassis_type, "11"))  /* 11: Main Server Chassis */
+	if (kstrtoul(chassis_type, 10, &type) != 0)
+		return false;
+
+	switch (type) {
+	case 0x03: /* Desktop */
+	case 0x04: /* Low Profile Desktop */
+	case 0x05: /* Pizza Box */
+	case 0x06: /* Mini Tower */
+	case 0x07: /* Tower */
+	case 0x10: /* Lunch Box */
+	case 0x11: /* Main Server Chassis */
 		return true;
+	}
 
 	return false;
 }

drivers/acpi/acpica/acapps.h

View file

diff --git a/drivers/acpi/acpica/acapps.h b/drivers/acpi/acpica/acapps.h
index 5a9c2fe..863ade9 100644
--- a/drivers/acpi/acpica/acapps.h
+++ b/drivers/acpi/acpica/acapps.h
@@ -3,7 +3,7 @@
  *
  * Module Name: acapps - common include for ACPI applications/tools
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
@@ -17,7 +17,7 @@
 /* Common info for tool signons */
 
 #define ACPICA_NAME                 "Intel ACPI Component Architecture"
-#define ACPICA_COPYRIGHT            "Copyright (c) 2000 - 2018 Intel Corporation"
+#define ACPICA_COPYRIGHT            "Copyright (c) 2000 - 2019 Intel Corporation"
 
 #if ACPI_MACHINE_WIDTH == 64
 #define ACPI_WIDTH          " (64-bit version)"

drivers/acpi/acpica/accommon.h

View file

diff --git a/drivers/acpi/acpica/accommon.h b/drivers/acpi/acpica/accommon.h
index 8bc9359..54f81ea 100644
--- a/drivers/acpi/acpica/accommon.h
+++ b/drivers/acpi/acpica/accommon.h
@@ -3,7 +3,7 @@
  *
  * Name: accommon.h - Common include files for generation of ACPICA source
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 

drivers/acpi/acpica/acconvert.h

View file

diff --git a/drivers/acpi/acpica/acconvert.h b/drivers/acpi/acpica/acconvert.h
index 4ebe188..d5478cd 100644
--- a/drivers/acpi/acpica/acconvert.h
+++ b/drivers/acpi/acpica/acconvert.h
@@ -3,7 +3,7 @@
  *
  * Module Name: acapps - common include for ACPI applications/tools
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 

drivers/acpi/acpica/acdebug.h

View file

diff --git a/drivers/acpi/acpica/acdebug.h b/drivers/acpi/acpica/acdebug.h
index 57d9495..32f2e38 100644
--- a/drivers/acpi/acpica/acdebug.h
+++ b/drivers/acpi/acpica/acdebug.h
@@ -3,7 +3,7 @@
  *
  * Name: acdebug.h - ACPI/AML debugger
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
@@ -16,7 +16,8 @@
 #include "acdisasm.h"
 #endif
 
-#define ACPI_DEBUG_BUFFER_SIZE  0x4000	/* 16K buffer for return objects */
+#define ACPI_DEBUG_BUFFER_SIZE      0x4000	/* 16K buffer for return objects */
+#define ACPI_DEBUG_LENGTH_FORMAT    " (%.4X bits, %.3X bytes)"
 
 struct acpi_db_command_info {
 	const char *name;	/* Command Name */

drivers/acpi/acpica/acdispat.h

View file

diff --git a/drivers/acpi/acpica/acdispat.h b/drivers/acpi/acpica/acdispat.h
index e577f3a..82f8150 100644
--- a/drivers/acpi/acpica/acdispat.h
+++ b/drivers/acpi/acpica/acdispat.h
@@ -3,7 +3,7 @@
  *
  * Name: acdispat.h - dispatcher (parser to interpreter interface)
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 

drivers/acpi/acpica/acevents.h

View file

diff --git a/drivers/acpi/acpica/acevents.h b/drivers/acpi/acpica/acevents.h
index b412aa9..8316601 100644
--- a/drivers/acpi/acpica/acevents.h
+++ b/drivers/acpi/acpica/acevents.h
@@ -3,7 +3,7 @@
  *
  * Name: acevents.h - Event subcomponent prototypes and defines
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 

drivers/acpi/acpica/acglobal.h

View file

diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h
index 87d6eb0..d056a18 100644
--- a/drivers/acpi/acpica/acglobal.h
+++ b/drivers/acpi/acpica/acglobal.h
@@ -3,7 +3,7 @@
  *
  * Name: acglobal.h - Declarations for global variables
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
@@ -164,6 +164,7 @@ ACPI_GLOBAL(struct acpi_memory_list *, acpi_gbl_global_list);
 ACPI_GLOBAL(struct acpi_memory_list *, acpi_gbl_ns_node_list);
 ACPI_GLOBAL(u8, acpi_gbl_display_final_mem_stats);
 ACPI_GLOBAL(u8, acpi_gbl_disable_mem_tracking);
+ACPI_GLOBAL(u8, acpi_gbl_verbose_leak_dump);
 #endif
 
 /*****************************************************************************

drivers/acpi/acpica/achware.h

View file

diff --git a/drivers/acpi/acpica/achware.h b/drivers/acpi/acpica/achware.h
index ef99e2f..bcf8f75 100644
--- a/drivers/acpi/acpica/achware.h
+++ b/drivers/acpi/acpica/achware.h
@@ -3,7 +3,7 @@
  *
  * Name: achware.h -- hardware specific interfaces
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 

drivers/acpi/acpica/acinterp.h

View file

diff --git a/drivers/acpi/acpica/acinterp.h b/drivers/acpi/acpica/acinterp.h
index c5b2be0..20706ad 100644
--- a/drivers/acpi/acpica/acinterp.h
+++ b/drivers/acpi/acpica/acinterp.h
@@ -3,7 +3,7 @@
  *
  * Name: acinterp.h - Interpreter subcomponent prototypes and defines
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 

drivers/acpi/acpica/aclocal.h

View file

diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h
index 99b0da8..a2dfbf6 100644
--- a/drivers/acpi/acpica/aclocal.h
+++ b/drivers/acpi/acpica/aclocal.h
@@ -3,7 +3,7 @@
  *
  * Name: aclocal.h - Internal data types used across the ACPI subsystem
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
@@ -802,7 +802,7 @@ struct acpi_comment_addr_node {
 
 /*
  * File node - used for "Include" operator file stack and
- * depdendency tree for the -ca option
+ * dependency tree for the -ca option
  */
 struct acpi_file_node {
 	void *file;

drivers/acpi/acpica/acmacros.h

View file

diff --git a/drivers/acpi/acpica/acmacros.h b/drivers/acpi/acpica/acmacros.h
index de52cd6..283614e 100644
--- a/drivers/acpi/acpica/acmacros.h
+++ b/drivers/acpi/acpica/acmacros.h
@@ -3,7 +3,7 @@
  *
  * Name: acmacros.h - C macros for the entire subsystem.
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 
@@ -462,7 +462,7 @@
 #define ACPI_IS_OCTAL_DIGIT(d)              (((char)(d) >= '0') && ((char)(d) <= '7'))
 
 /*
- * Macors used for the ASL-/ASL+ converter utility
+ * Macros used for the ASL-/ASL+ converter utility
  */
 #ifdef ACPI_ASL_COMPILER
 

drivers/acpi/acpica/acnamesp.h

View file

diff --git a/drivers/acpi/acpica/acnamesp.h b/drivers/acpi/acpica/acnamesp.h
index 9bd25f3..39812fc 100644
--- a/drivers/acpi/acpica/acnamesp.h
+++ b/drivers/acpi/acpica/acnamesp.h
@@ -3,7 +3,7 @@
  *
  * Name: acnamesp.h - Namespace subcomponent prototypes and defines
  *
- * Copyright (C) 2000 - 2018, Intel Corp.
+ * Copyright (C) 2000 - 2019, Intel Corp.
  *
  *****************************************************************************/
 

drivers/acpi/acpica/acobject.h

View file

diff --git a/drivers/acpi/acpica/acobject.h b/drivers/acpi/acpica/acobject.h
index ac992b6..b2ef703 100644
--- a/drivers/acpi/acpica/acobject.h
+++ b/drivers/acpi/acpica/acobject.h

This diff is incomplete. Download the complete patch.