From 5c5a616a547f5d0a1173fa38b22e74693fff6149 Mon Sep 17 00:00:00 2001 From: Al Stone Date: Jan 10 2017 00:09:49 +0000 Subject: Update to 20161117 source from upstream. Signed-off-by: Al Stone --- diff --git a/.gitignore b/.gitignore index d100bb9..565785a 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,5 @@ /acpitests-unix-20160831.tar.gz /acpica-unix2-20160930.tar.gz /acpitests-unix-20160930.tar.gz +/acpica-unix2-20161117.tar.gz +/acpitests-unix-20161117.tar.gz diff --git a/OPT_LDFLAGS.patch b/OPT_LDFLAGS.patch index 90ac840..3c45f9e 100644 --- a/OPT_LDFLAGS.patch +++ b/OPT_LDFLAGS.patch @@ -1,7 +1,7 @@ -Index: acpica-unix2-20160422/generate/unix/Makefile.config +Index: acpica-unix2-20161117/generate/unix/Makefile.config =================================================================== ---- acpica-unix2-20160422.orig/generate/unix/Makefile.config -+++ acpica-unix2-20160422/generate/unix/Makefile.config +--- acpica-unix2-20161117.orig/generate/unix/Makefile.config ++++ acpica-unix2-20161117/generate/unix/Makefile.config @@ -23,6 +23,9 @@ # OPT_CFLAGS can be overridden on the make command line by # adding OPT_CFLAGS="..." to the invocation. diff --git a/acpica-tools.spec b/acpica-tools.spec index b22756b..a7f6c99 100644 --- a/acpica-tools.spec +++ b/acpica-tools.spec @@ -1,6 +1,6 @@ Name: acpica-tools -Version: 20160930 -Release: 3%{?dist} +Version: 20161117 +Release: 1%{?dist} Summary: ACPICA tools for the development and debug of ACPI tables Group: Development/Languages @@ -192,6 +192,10 @@ fi %changelog +* Mon Jan 9 2017 Al Stone - 20161117-1 +- Update to latest upstream. Closes BZ#1381017. +- Refresh patches. + * Mon Jan 9 2017 Al Stone - 20160930-3 - Restructure the repairs for big-endian support to simplify patching -- it is all combined into update-big-endian.patch now. (NB: this version may still diff --git a/asllookup-miscompare.patch b/asllookup-miscompare.patch index 0e48abb..5134850 100644 --- a/asllookup-miscompare.patch +++ b/asllookup-miscompare.patch @@ -7,10 +7,10 @@ From: Al Stone source/compiler/asllookup.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -Index: acpica-unix2-20160422/source/compiler/asllookup.c +Index: acpica-unix2-20161117/source/compiler/asllookup.c =================================================================== ---- acpica-unix2-20160422.orig/source/compiler/asllookup.c -+++ acpica-unix2-20160422/source/compiler/asllookup.c +--- acpica-unix2-20161117.orig/source/compiler/asllookup.c ++++ acpica-unix2-20161117/source/compiler/asllookup.c @@ -119,6 +119,7 @@ LkIsObjectUsed ( { ACPI_NAMESPACE_NODE *Node = ACPI_CAST_PTR (ACPI_NAMESPACE_NODE, ObjHandle); diff --git a/asllookup-ppc64.patch b/asllookup-ppc64.patch index a3039b4..18c0548 100644 --- a/asllookup-ppc64.patch +++ b/asllookup-ppc64.patch @@ -7,10 +7,10 @@ From: Al Stone source/compiler/asllookup.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -Index: acpica-unix2-20160422/source/compiler/asllookup.c +Index: acpica-unix2-20161117/source/compiler/asllookup.c =================================================================== ---- acpica-unix2-20160422.orig/source/compiler/asllookup.c -+++ acpica-unix2-20160422/source/compiler/asllookup.c +--- acpica-unix2-20161117.orig/source/compiler/asllookup.c ++++ acpica-unix2-20161117/source/compiler/asllookup.c @@ -176,7 +176,8 @@ LkIsObjectUsed ( * We ignore the predefined methods since often, not * all arguments are needed or used. diff --git a/debian-big_endian.patch b/debian-big_endian.patch index 61bd4a0..b3c74c5 100644 --- a/debian-big_endian.patch +++ b/debian-big_endian.patch @@ -18,10 +18,10 @@ support source/include/platform/aclinux.h | 8 ++ 12 files changed, 487 insertions(+), 283 deletions(-) -Index: acpica-unix-20160527/source/compiler/aslcodegen.c +Index: acpica-unix2-20161117/source/compiler/aslcodegen.c =================================================================== ---- acpica-unix-20160527.orig/source/compiler/aslcodegen.c -+++ acpica-unix-20160527/source/compiler/aslcodegen.c +--- acpica-unix2-20161117.orig/source/compiler/aslcodegen.c ++++ acpica-unix2-20161117/source/compiler/aslcodegen.c @@ -243,16 +243,12 @@ CgWriteAmlOpcode ( ACPI_PARSE_OBJECT *Op) { @@ -263,11 +263,11 @@ Index: acpica-unix-20160527/source/compiler/aslcodegen.c case AML_RAW_DATA_BUFFER: -Index: acpica-unix-20160527/source/compiler/aslopcodes.c +Index: acpica-unix2-20161117/source/compiler/aslopcodes.c =================================================================== ---- acpica-unix-20160527.orig/source/compiler/aslopcodes.c -+++ acpica-unix-20160527/source/compiler/aslopcodes.c -@@ -481,6 +481,7 @@ OpcDoUnicode ( +--- acpica-unix2-20161117.orig/source/compiler/aslopcodes.c ++++ acpica-unix2-20161117/source/compiler/aslopcodes.c +@@ -485,6 +485,7 @@ OpcDoUnicode ( UINT32 i; UINT8 *AsciiString; UINT16 *UnicodeString; @@ -275,7 +275,7 @@ Index: acpica-unix-20160527/source/compiler/aslopcodes.c ACPI_PARSE_OBJECT *BufferLengthOp; -@@ -507,7 +508,8 @@ OpcDoUnicode ( +@@ -511,7 +512,8 @@ OpcDoUnicode ( for (i = 0; i < Count; i++) { @@ -285,10 +285,10 @@ Index: acpica-unix-20160527/source/compiler/aslopcodes.c } /* -Index: acpica-unix-20160527/source/compiler/aslrestype1.c +Index: acpica-unix2-20161117/source/compiler/aslrestype1.c =================================================================== ---- acpica-unix-20160527.orig/source/compiler/aslrestype1.c -+++ acpica-unix-20160527/source/compiler/aslrestype1.c +--- acpica-unix2-20161117.orig/source/compiler/aslrestype1.c ++++ acpica-unix2-20161117/source/compiler/aslrestype1.c @@ -142,6 +142,11 @@ RsDoMemory24Descriptor ( ACPI_PARSE_OBJECT *LengthOp = NULL; ASL_RESOURCE_NODE *Rnode; @@ -485,10 +485,10 @@ Index: acpica-unix-20160527/source/compiler/aslrestype1.c RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH, CurrentByteOffset + ASL_RESDESC_OFFSET (FixedMemory32.AddressLength)); break; -Index: acpica-unix-20160527/source/compiler/aslrestype1i.c +Index: acpica-unix2-20161117/source/compiler/aslrestype1i.c =================================================================== ---- acpica-unix-20160527.orig/source/compiler/aslrestype1i.c -+++ acpica-unix-20160527/source/compiler/aslrestype1i.c +--- acpica-unix2-20161117.orig/source/compiler/aslrestype1i.c ++++ acpica-unix2-20161117/source/compiler/aslrestype1i.c @@ -198,6 +198,8 @@ RsDoFixedDmaDescriptor ( ACPI_PARSE_OBJECT *InitializerOp; ASL_RESOURCE_NODE *Rnode; @@ -625,10 +625,10 @@ Index: acpica-unix-20160527/source/compiler/aslrestype1i.c + ACPI_MOVE_16_TO_16(&Descriptor->Irq.IrqMask, &IrqMask); return (Rnode); } -Index: acpica-unix-20160527/source/compiler/aslrestype2.c +Index: acpica-unix2-20161117/source/compiler/aslrestype2.c =================================================================== ---- acpica-unix-20160527.orig/source/compiler/aslrestype2.c -+++ acpica-unix-20160527/source/compiler/aslrestype2.c +--- acpica-unix2-20161117.orig/source/compiler/aslrestype2.c ++++ acpica-unix2-20161117/source/compiler/aslrestype2.c @@ -76,6 +76,7 @@ RsDoGeneralRegisterDescriptor ( ACPI_PARSE_OBJECT *InitializerOp; ASL_RESOURCE_NODE *Rnode; @@ -658,7 +658,7 @@ Index: acpica-unix-20160527/source/compiler/aslrestype2.c RsCreateQwordField (InitializerOp, ACPI_RESTAG_ADDRESS, CurrentByteOffset + ASL_RESDESC_OFFSET (GenericReg.Address)); break; -@@ -172,6 +176,7 @@ RsDoInterruptDescriptor ( +@@ -177,6 +181,7 @@ RsDoInterruptDescriptor ( AML_RESOURCE *Rover = NULL; ACPI_PARSE_OBJECT *InitializerOp; ASL_RESOURCE_NODE *Rnode; @@ -666,7 +666,7 @@ Index: acpica-unix-20160527/source/compiler/aslrestype2.c UINT16 StringLength = 0; UINT32 OptionIndex = 0; UINT32 CurrentByteOffset; -@@ -220,7 +225,7 @@ RsDoInterruptDescriptor ( +@@ -225,7 +230,7 @@ RsDoInterruptDescriptor ( * Initial descriptor length -- may be enlarged if there are * optional fields present */ @@ -675,7 +675,7 @@ Index: acpica-unix-20160527/source/compiler/aslrestype2.c Descriptor->ExtendedIrq.InterruptCount = 0; Rover = ACPI_CAST_PTR (AML_RESOURCE, -@@ -328,10 +333,11 @@ RsDoInterruptDescriptor ( +@@ -333,10 +338,11 @@ RsDoInterruptDescriptor ( /* Save the integer and move pointer to the next one */ @@ -689,7 +689,7 @@ Index: acpica-unix-20160527/source/compiler/aslrestype2.c /* Case 7: First interrupt number in list */ -@@ -367,7 +373,7 @@ RsDoInterruptDescriptor ( +@@ -372,7 +378,7 @@ RsDoInterruptDescriptor ( { Rover->ByteItem = ResSourceIndex; Rover = ACPI_ADD_PTR (AML_RESOURCE, &(Rover->ByteItem), 1); @@ -698,7 +698,7 @@ Index: acpica-unix-20160527/source/compiler/aslrestype2.c } /* Add optional ResSource string if present */ -@@ -379,14 +385,15 @@ RsDoInterruptDescriptor ( +@@ -384,14 +390,15 @@ RsDoInterruptDescriptor ( Rover = ACPI_ADD_PTR ( AML_RESOURCE, &(Rover->ByteItem), StringLength); @@ -716,7 +716,7 @@ Index: acpica-unix-20160527/source/compiler/aslrestype2.c return (Rnode); } -@@ -434,7 +441,7 @@ RsDoVendorLargeDescriptor ( +@@ -439,7 +446,7 @@ RsDoVendorLargeDescriptor ( Descriptor = Rnode->Buffer; Descriptor->VendorLarge.DescriptorType = ACPI_RESOURCE_NAME_VENDOR_LARGE; @@ -725,10 +725,10 @@ Index: acpica-unix-20160527/source/compiler/aslrestype2.c /* Point to end-of-descriptor for vendor data */ -Index: acpica-unix-20160527/source/compiler/aslrestype2d.c +Index: acpica-unix2-20161117/source/compiler/aslrestype2d.c =================================================================== ---- acpica-unix-20160527.orig/source/compiler/aslrestype2d.c -+++ acpica-unix-20160527/source/compiler/aslrestype2d.c +--- acpica-unix2-20161117.orig/source/compiler/aslrestype2d.c ++++ acpica-unix2-20161117/source/compiler/aslrestype2d.c @@ -79,7 +79,13 @@ RsDoDwordIoDescriptor ( ACPI_PARSE_OBJECT *GranOp = NULL; ASL_RESOURCE_NODE *Rnode; @@ -1084,10 +1084,10 @@ Index: acpica-unix-20160527/source/compiler/aslrestype2d.c Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS32) + OptionIndex + StringLength; return (Rnode); -Index: acpica-unix-20160527/source/compiler/aslrestype2e.c +Index: acpica-unix2-20161117/source/compiler/aslrestype2e.c =================================================================== ---- acpica-unix-20160527.orig/source/compiler/aslrestype2e.c -+++ acpica-unix-20160527/source/compiler/aslrestype2e.c +--- acpica-unix2-20161117.orig/source/compiler/aslrestype2e.c ++++ acpica-unix2-20161117/source/compiler/aslrestype2e.c @@ -78,6 +78,13 @@ RsDoExtendedIoDescriptor ( ACPI_PARSE_OBJECT *GranOp = NULL; ASL_RESOURCE_NODE *Rnode; @@ -1193,10 +1193,10 @@ Index: acpica-unix-20160527/source/compiler/aslrestype2e.c Rnode->BufferLength = sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) + StringLength; return (Rnode); -Index: acpica-unix-20160527/source/compiler/aslrestype2q.c +Index: acpica-unix2-20161117/source/compiler/aslrestype2q.c =================================================================== ---- acpica-unix-20160527.orig/source/compiler/aslrestype2q.c -+++ acpica-unix-20160527/source/compiler/aslrestype2q.c +--- acpica-unix2-20161117.orig/source/compiler/aslrestype2q.c ++++ acpica-unix2-20161117/source/compiler/aslrestype2q.c @@ -80,7 +80,13 @@ RsDoQwordIoDescriptor ( ASL_RESOURCE_NODE *Rnode; UINT8 *OptionalFields; @@ -1535,10 +1535,10 @@ Index: acpica-unix-20160527/source/compiler/aslrestype2q.c Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS64) + OptionIndex + StringLength; return (Rnode); -Index: acpica-unix-20160527/source/compiler/aslrestype2s.c +Index: acpica-unix2-20161117/source/compiler/aslrestype2s.c =================================================================== ---- acpica-unix-20160527.orig/source/compiler/aslrestype2s.c -+++ acpica-unix-20160527/source/compiler/aslrestype2s.c +--- acpica-unix2-20161117.orig/source/compiler/aslrestype2s.c ++++ acpica-unix2-20161117/source/compiler/aslrestype2s.c @@ -290,6 +290,9 @@ RsDoGpioIntDescriptor ( UINT16 VendorLength; UINT16 InterruptLength; @@ -1852,10 +1852,10 @@ Index: acpica-unix-20160527/source/compiler/aslrestype2s.c MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource); return (Rnode); } -Index: acpica-unix-20160527/source/compiler/aslrestype2w.c +Index: acpica-unix2-20161117/source/compiler/aslrestype2w.c =================================================================== ---- acpica-unix-20160527.orig/source/compiler/aslrestype2w.c -+++ acpica-unix-20160527/source/compiler/aslrestype2w.c +--- acpica-unix2-20161117.orig/source/compiler/aslrestype2w.c ++++ acpica-unix2-20161117/source/compiler/aslrestype2w.c @@ -81,6 +81,12 @@ RsDoWordIoDescriptor ( UINT8 *OptionalFields; UINT16 StringLength = 0; @@ -2199,10 +2199,10 @@ Index: acpica-unix-20160527/source/compiler/aslrestype2w.c Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) + OptionIndex + StringLength; return (Rnode); -Index: acpica-unix-20160527/source/include/acmacros.h +Index: acpica-unix2-20161117/source/include/acmacros.h =================================================================== ---- acpica-unix-20160527.orig/source/include/acmacros.h -+++ acpica-unix-20160527/source/include/acmacros.h +--- acpica-unix2-20161117.orig/source/include/acmacros.h ++++ acpica-unix2-20161117/source/include/acmacros.h @@ -100,7 +100,8 @@ /* 32-bit source, 16/32/64 destination */ @@ -2240,10 +2240,10 @@ Index: acpica-unix-20160527/source/include/acmacros.h #define ACPI_MOVE_32_TO_32(d, s) *(UINT32 *)(void *)(d) = *(UINT32 *)(void *)(s) #define ACPI_MOVE_32_TO_64(d, s) *(UINT64 *)(void *)(d) = *(UINT32 *)(void *)(s) -Index: acpica-unix-20160527/source/include/platform/aclinux.h +Index: acpica-unix2-20161117/source/include/platform/aclinux.h =================================================================== ---- acpica-unix-20160729.orig/source/include/platform/aclinux.h -+++ acpica-unix-20160729/source/include/platform/aclinux.h +--- acpica-unix2-20161117.orig/source/include/platform/aclinux.h ++++ acpica-unix2-20161117/source/include/platform/aclinux.h @@ -179,6 +179,7 @@ #ifdef ACPI_USE_STANDARD_HEADERS @@ -2252,25 +2252,3 @@ Index: acpica-unix-20160527/source/include/platform/aclinux.h #endif /* Define/disable kernel-specific declarators */ - -@@ -190,8 +191,7 @@ - #define ACPI_FLUSH_CPU_CACHE() - #define ACPI_CAST_PTHREAD_T(Pthread) ((ACPI_THREAD_ID) (Pthread)) - --#if defined(__ia64__) || defined(__x86_64__) ||\ -- defined(__aarch64__) || defined(__PPC64__) -+#if __SIZEOF_LONG__ == 8 - #define ACPI_MACHINE_WIDTH 64 - #define COMPILER_DEPENDENT_INT64 long - #define COMPILER_DEPENDENT_UINT64 unsigned long -@@ -202,6 +202,10 @@ - #define ACPI_USE_NATIVE_DIVIDE - #endif - -+#if __BYTE_ORDER == __BIG_ENDIAN -+#define ACPI_BIG_ENDIAN -+#endif -+ - #ifndef __cdecl - #define __cdecl - #endif diff --git a/debian-unaligned.patch b/debian-unaligned.patch index b83c10a..19e4551 100644 --- a/debian-unaligned.patch +++ b/debian-unaligned.patch @@ -18,10 +18,10 @@ Signed-off-by: Paolo Bonzini source/include/actypes.h | 26 +++++++++++++------------- 3 files changed, 32 insertions(+), 21 deletions(-) -Index: acpica-unix2-20160422/source/compiler/asltree.c +Index: acpica-unix2-20161117/source/compiler/asltree.c =================================================================== ---- acpica-unix2-20160422.orig/source/compiler/asltree.c -+++ acpica-unix2-20160422/source/compiler/asltree.c +--- acpica-unix2-20161117.orig/source/compiler/asltree.c ++++ acpica-unix2-20161117/source/compiler/asltree.c @@ -913,28 +913,31 @@ TrCreateValuedLeafNode ( "Op %s Value %8.8X%8.8X ", Op->Asl.LineNumber, Op->Asl.Column, Op, UtGetOpName(ParseOpcode), @@ -74,10 +74,10 @@ Index: acpica-unix2-20160422/source/compiler/asltree.c break; } -Index: acpica-unix2-20160422/source/components/executer/exoparg2.c +Index: acpica-unix2-20161117/source/components/executer/exoparg2.c =================================================================== ---- acpica-unix2-20160422.orig/source/components/executer/exoparg2.c -+++ acpica-unix2-20160422/source/components/executer/exoparg2.c +--- acpica-unix2-20161117.orig/source/components/executer/exoparg2.c ++++ acpica-unix2-20161117/source/components/executer/exoparg2.c @@ -172,6 +172,8 @@ AcpiExOpcode_2A_2T_1R ( ACPI_OPERAND_OBJECT **Operand = &WalkState->Operands[0]; ACPI_OPERAND_OBJECT *ReturnDesc1 = NULL; @@ -118,10 +118,10 @@ Index: acpica-unix2-20160422/source/components/executer/exoparg2.c break; case AML_CONCAT_OP: /* Concatenate (Data1, Data2, Result) */ -Index: acpica-unix2-20160422/source/include/actypes.h +Index: acpica-unix2-20161117/source/include/actypes.h =================================================================== ---- acpica-unix2-20160422.orig/source/include/actypes.h -+++ acpica-unix2-20160422/source/include/actypes.h +--- acpica-unix2-20161117.orig/source/include/actypes.h ++++ acpica-unix2-20161117/source/include/actypes.h @@ -143,6 +143,19 @@ typedef COMPILER_DEPENDENT_INT64 */ #define ACPI_THREAD_ID UINT64 diff --git a/f23-harden.patch b/f23-harden.patch index 7d88fd3..bdb5936 100644 --- a/f23-harden.patch +++ b/f23-harden.patch @@ -8,10 +8,10 @@ From: Al Stone generate/unix/iasl/Makefile | 13 +++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) -Index: acpica-unix2-20160831/generate/unix/Makefile.config +Index: acpica-unix2-20161117/generate/unix/Makefile.config =================================================================== ---- acpica-unix2-20160831.orig/generate/unix/Makefile.config -+++ acpica-unix2-20160831/generate/unix/Makefile.config +--- acpica-unix2-20161117.orig/generate/unix/Makefile.config ++++ acpica-unix2-20161117/generate/unix/Makefile.config @@ -171,6 +171,8 @@ ifneq ($(NOFORTIFY),TRUE) OPT_CFLAGS += -D_FORTIFY_SOURCE=2 endif @@ -21,10 +21,10 @@ Index: acpica-unix2-20160831/generate/unix/Makefile.config CFLAGS += \ -D$(HOST)\ -D_GNU_SOURCE\ -Index: acpica-unix2-20160831/generate/unix/iasl/Makefile +Index: acpica-unix2-20161117/generate/unix/iasl/Makefile =================================================================== ---- acpica-unix2-20160831.orig/generate/unix/iasl/Makefile -+++ acpica-unix2-20160831/generate/unix/iasl/Makefile +--- acpica-unix2-20161117.orig/generate/unix/iasl/Makefile ++++ acpica-unix2-20161117/generate/unix/iasl/Makefile @@ -319,20 +319,21 @@ $(OBJDIR)/prparserparse.c $(OBJDIR)/prpa # Cannot use the common compile warning flags since the C files are created # by the utilities above and they are not necessarily ANSI C, etc. diff --git a/free.patch b/free.patch index 5c4d291..09b8e76 100644 --- a/free.patch +++ b/free.patch @@ -1,9 +1,10 @@ This prevents a segfault when an Include file does not exist. -diff -Naur acpica-unix2-20160930/source/compiler/aslfiles.c acpica-unix2-20160930-s390/source/compiler/aslfiles.c ---- acpica-unix2-20160930/source/compiler/aslfiles.c 2016-09-30 10:43:56.000000000 -0600 -+++ acpica-unix2-20160930-s390/source/compiler/aslfiles.c 2016-12-06 18:55:08.693785207 -0700 -@@ -319,7 +319,7 @@ +Index: acpica-unix2-20161117/source/compiler/aslfiles.c +=================================================================== +--- acpica-unix2-20161117.orig/source/compiler/aslfiles.c ++++ acpica-unix2-20161117/source/compiler/aslfiles.c +@@ -319,7 +319,7 @@ FlOpenIncludeWithPrefix ( if (!IncludeFile) { fprintf (stderr, "Could not open include file %s\n", Pathname); diff --git a/int-format.patch b/int-format.patch index 103df44..a8c0fa7 100644 --- a/int-format.patch +++ b/int-format.patch @@ -24,10 +24,10 @@ From: Al Stone source/tools/acpiexec/aemain.c | 2 +- 18 files changed, 28 insertions(+), 28 deletions(-) -Index: acpica-unix2-20160831/source/compiler/aslcompile.c +Index: acpica-unix2-20161117/source/compiler/aslcompile.c =================================================================== ---- acpica-unix2-20160831.orig/source/compiler/aslcompile.c -+++ acpica-unix2-20160831/source/compiler/aslcompile.c +--- acpica-unix2-20161117.orig/source/compiler/aslcompile.c ++++ acpica-unix2-20161117/source/compiler/aslcompile.c @@ -729,7 +729,7 @@ CmCleanupAndExit ( if (Gbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT) @@ -37,10 +37,10 @@ Index: acpica-unix2-20160831/source/compiler/aslcompile.c ASL_MAX_ERROR_COUNT); } -Index: acpica-unix2-20160831/source/compiler/aslerror.c +Index: acpica-unix2-20161117/source/compiler/aslerror.c =================================================================== ---- acpica-unix2-20160831.orig/source/compiler/aslerror.c -+++ acpica-unix2-20160831/source/compiler/aslerror.c +--- acpica-unix2-20161117.orig/source/compiler/aslerror.c ++++ acpica-unix2-20161117/source/compiler/aslerror.c @@ -687,7 +687,7 @@ AslCommonError ( Gbl_ExceptionCount[Level]++; if (Gbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT) @@ -59,10 +59,10 @@ Index: acpica-unix2-20160831/source/compiler/aslerror.c ASL_MAX_DISABLED_MESSAGES); return (AE_LIMIT); } -Index: acpica-unix2-20160831/source/compiler/aslopt.c +Index: acpica-unix2-20161117/source/compiler/aslopt.c =================================================================== ---- acpica-unix2-20160831.orig/source/compiler/aslopt.c -+++ acpica-unix2-20160831/source/compiler/aslopt.c +--- acpica-unix2-20161117.orig/source/compiler/aslopt.c ++++ acpica-unix2-20161117/source/compiler/aslopt.c @@ -584,7 +584,7 @@ OptOptimizeNamePath ( } @@ -72,10 +72,10 @@ Index: acpica-unix2-20160831/source/compiler/aslopt.c Op->Asl.LogicalLineNumber, AcpiPsGetOpcodeName (Op->Common.Parent->Common.AmlOpcode), AcpiPsGetOpcodeName (Op->Common.AmlOpcode))); -Index: acpica-unix2-20160831/source/compiler/aslpredef.c +Index: acpica-unix2-20161117/source/compiler/aslpredef.c =================================================================== ---- acpica-unix2-20160831.orig/source/compiler/aslpredef.c -+++ acpica-unix2-20160831/source/compiler/aslpredef.c +--- acpica-unix2-20161117.orig/source/compiler/aslpredef.c ++++ acpica-unix2-20161117/source/compiler/aslpredef.c @@ -114,7 +114,7 @@ ApCheckForPredefinedMethod ( if (MethodInfo->NumArguments != 0) @@ -85,10 +85,10 @@ Index: acpica-unix2-20160831/source/compiler/aslpredef.c AslError (ASL_WARNING, ASL_MSG_RESERVED_ARG_COUNT_HI, Op, MsgBuffer); -Index: acpica-unix2-20160831/source/compiler/aslprepkg.c +Index: acpica-unix2-20161117/source/compiler/aslprepkg.c =================================================================== ---- acpica-unix2-20160831.orig/source/compiler/aslprepkg.c -+++ acpica-unix2-20160831/source/compiler/aslprepkg.c +--- acpica-unix2-20161117.orig/source/compiler/aslprepkg.c ++++ acpica-unix2-20161117/source/compiler/aslprepkg.c @@ -309,7 +309,7 @@ ApCheckPackage ( if (Count & 1) @@ -98,10 +98,10 @@ Index: acpica-unix2-20160831/source/compiler/aslprepkg.c Predefined->Info.Name, Count); AslError (ASL_ERROR, ASL_MSG_RESERVED_PACKAGE_LENGTH, -Index: acpica-unix2-20160831/source/components/debugger/dbexec.c +Index: acpica-unix2-20161117/source/components/debugger/dbexec.c =================================================================== ---- acpica-unix2-20160831.orig/source/components/debugger/dbexec.c -+++ acpica-unix2-20160831/source/components/debugger/dbexec.c +--- acpica-unix2-20161117.orig/source/components/debugger/dbexec.c ++++ acpica-unix2-20161117/source/components/debugger/dbexec.c @@ -214,7 +214,7 @@ AcpiDbExecuteMethod ( ACPI_ERROR ((AE_INFO, "Possible overflow of internal debugger " @@ -111,10 +111,10 @@ Index: acpica-unix2-20160831/source/components/debugger/dbexec.c } } -Index: acpica-unix2-20160831/source/components/dispatcher/dsmthdat.c +Index: acpica-unix2-20161117/source/components/dispatcher/dsmthdat.c =================================================================== ---- acpica-unix2-20160831.orig/source/components/dispatcher/dsmthdat.c -+++ acpica-unix2-20160831/source/components/dispatcher/dsmthdat.c +--- acpica-unix2-20161117.orig/source/components/dispatcher/dsmthdat.c ++++ acpica-unix2-20161117/source/components/dispatcher/dsmthdat.c @@ -291,7 +291,7 @@ AcpiDsMethodDataGetNode ( if (Index > ACPI_METHOD_MAX_LOCAL) { @@ -133,10 +133,10 @@ Index: acpica-unix2-20160831/source/components/dispatcher/dsmthdat.c Index, ACPI_METHOD_MAX_ARG)); return_ACPI_STATUS (AE_AML_INVALID_INDEX); } -Index: acpica-unix2-20160831/source/components/dispatcher/dsutils.c +Index: acpica-unix2-20161117/source/components/dispatcher/dsutils.c =================================================================== ---- acpica-unix2-20160831.orig/source/components/dispatcher/dsutils.c -+++ acpica-unix2-20160831/source/components/dispatcher/dsutils.c +--- acpica-unix2-20161117.orig/source/components/dispatcher/dsutils.c ++++ acpica-unix2-20161117/source/components/dispatcher/dsutils.c @@ -793,7 +793,7 @@ AcpiDsCreateOperands ( } @@ -146,10 +146,10 @@ Index: acpica-unix2-20160831/source/components/dispatcher/dsutils.c WalkState->NumOperands, ArgCount, Index)); /* Create the interpreter arguments, in reverse order */ -Index: acpica-unix2-20160831/source/components/dispatcher/dswscope.c +Index: acpica-unix2-20161117/source/components/dispatcher/dswscope.c =================================================================== ---- acpica-unix2-20160831.orig/source/components/dispatcher/dswscope.c -+++ acpica-unix2-20160831/source/components/dispatcher/dswscope.c +--- acpica-unix2-20161117.orig/source/components/dispatcher/dswscope.c ++++ acpica-unix2-20161117/source/components/dispatcher/dswscope.c @@ -149,7 +149,7 @@ AcpiDsScopeStackPush ( WalkState->ScopeDepth++; @@ -168,10 +168,10 @@ Index: acpica-unix2-20160831/source/components/dispatcher/dswscope.c (UINT32) WalkState->ScopeDepth, AcpiUtGetNodeName (ScopeInfo->Scope.Node), AcpiUtGetTypeName (ScopeInfo->Common.Value))); -Index: acpica-unix2-20160831/source/components/events/evgpe.c +Index: acpica-unix2-20161117/source/components/events/evgpe.c =================================================================== ---- acpica-unix2-20160831.orig/source/components/events/evgpe.c -+++ acpica-unix2-20160831/source/components/events/evgpe.c +--- acpica-unix2-20161117.orig/source/components/events/evgpe.c ++++ acpica-unix2-20161117/source/components/events/evgpe.c @@ -494,7 +494,7 @@ AcpiEvGpeDetect ( "Ignore disabled registers for GPE %02X-%02X: " "RunEnable=%02X, WakeEnable=%02X\n", @@ -190,10 +190,10 @@ Index: acpica-unix2-20160831/source/components/events/evgpe.c StatusReg, EnableReg, GpeRegisterInfo->EnableForRun, GpeRegisterInfo->EnableForWake)); -Index: acpica-unix2-20160831/source/components/executer/exdump.c +Index: acpica-unix2-20161117/source/components/executer/exdump.c =================================================================== ---- acpica-unix2-20160831.orig/source/components/executer/exdump.c -+++ acpica-unix2-20160831/source/components/executer/exdump.c +--- acpica-unix2-20161117.orig/source/components/executer/exdump.c ++++ acpica-unix2-20161117/source/components/executer/exdump.c @@ -668,7 +668,7 @@ AcpiExDumpOperand ( if (Depth > 0) { @@ -203,10 +203,10 @@ Index: acpica-unix2-20160831/source/components/executer/exdump.c } else { -Index: acpica-unix2-20160831/source/components/executer/exfldio.c +Index: acpica-unix2-20161117/source/components/executer/exfldio.c =================================================================== ---- acpica-unix2-20160831.orig/source/components/executer/exfldio.c -+++ acpica-unix2-20160831/source/components/executer/exfldio.c +--- acpica-unix2-20161117.orig/source/components/executer/exfldio.c ++++ acpica-unix2-20161117/source/components/executer/exfldio.c @@ -681,8 +681,8 @@ AcpiExWriteWithUpdateRule ( ACPI_ERROR ((AE_INFO, @@ -218,10 +218,10 @@ Index: acpica-unix2-20160831/source/components/executer/exfldio.c return_ACPI_STATUS (AE_AML_OPERAND_VALUE); } } -Index: acpica-unix2-20160831/source/components/executer/exnames.c +Index: acpica-unix2-20161117/source/components/executer/exnames.c =================================================================== ---- acpica-unix2-20160831.orig/source/components/executer/exnames.c -+++ acpica-unix2-20160831/source/components/executer/exnames.c +--- acpica-unix2-20161117.orig/source/components/executer/exnames.c ++++ acpica-unix2-20161117/source/components/executer/exnames.c @@ -240,7 +240,7 @@ AcpiExNameSegment ( */ ACPI_DEBUG_PRINT ((ACPI_DB_INFO, @@ -240,10 +240,10 @@ Index: acpica-unix2-20160831/source/components/executer/exnames.c } *InAmlAddress = ACPI_CAST_PTR (UINT8, AmlAddress); -Index: acpica-unix2-20160831/source/components/hardware/hwregs.c +Index: acpica-unix2-20161117/source/components/hardware/hwregs.c =================================================================== ---- acpica-unix2-20160831.orig/source/components/hardware/hwregs.c -+++ acpica-unix2-20160831/source/components/hardware/hwregs.c +--- acpica-unix2-20161117.orig/source/components/hardware/hwregs.c ++++ acpica-unix2-20161117/source/components/hardware/hwregs.c @@ -300,7 +300,7 @@ AcpiHwClearAcpiStatus ( @@ -253,10 +253,10 @@ Index: acpica-unix2-20160831/source/components/hardware/hwregs.c ACPI_FORMAT_UINT64 (AcpiGbl_XPm1aStatus.Address))); LockFlags = AcpiOsAcquireLock (AcpiGbl_HardwareLock); -Index: acpica-unix2-20160831/source/components/tables/tbfadt.c +Index: acpica-unix2-20161117/source/components/tables/tbfadt.c =================================================================== ---- acpica-unix2-20160831.orig/source/components/tables/tbfadt.c -+++ acpica-unix2-20160831/source/components/tables/tbfadt.c +--- acpica-unix2-20161117.orig/source/components/tables/tbfadt.c ++++ acpica-unix2-20161117/source/components/tables/tbfadt.c @@ -233,7 +233,7 @@ AcpiTbInitGenericAddress ( if (!(Flags & ACPI_FADT_GPE_REGISTER)) { @@ -275,7 +275,7 @@ Index: acpica-unix2-20160831/source/components/tables/tbfadt.c RegisterName, Address32, ACPI_FORMAT_UINT64 (Address64), AcpiGbl_Use32BitFadtAddresses ? 32 : 64)); -@@ -621,7 +621,7 @@ AcpiTbConvertFadt ( +@@ -620,7 +620,7 @@ AcpiTbConvertFadt ( ACPI_BIOS_WARNING ((AE_INFO, "32/64X address mismatch in FADT/%s: " @@ -284,10 +284,10 @@ Index: acpica-unix2-20160831/source/components/tables/tbfadt.c Name, Address32, ACPI_FORMAT_UINT64 (Address64->Address), AcpiGbl_Use32BitFadtAddresses ? 32 : 64)); -Index: acpica-unix2-20160831/source/components/tables/tbxfroot.c +Index: acpica-unix2-20161117/source/components/tables/tbxfroot.c =================================================================== ---- acpica-unix2-20160831.orig/source/components/tables/tbxfroot.c -+++ acpica-unix2-20160831/source/components/tables/tbxfroot.c +--- acpica-unix2-20161117.orig/source/components/tables/tbxfroot.c ++++ acpica-unix2-20161117/source/components/tables/tbxfroot.c @@ -177,7 +177,7 @@ AcpiFindRootPointer ( { ACPI_ERROR ((AE_INFO, @@ -315,10 +315,10 @@ Index: acpica-unix2-20160831/source/components/tables/tbxfroot.c return_ACPI_STATUS (AE_NO_MEMORY); } -Index: acpica-unix2-20160831/source/components/utilities/utownerid.c +Index: acpica-unix2-20161117/source/components/utilities/utownerid.c =================================================================== ---- acpica-unix2-20160831.orig/source/components/utilities/utownerid.c -+++ acpica-unix2-20160831/source/components/utilities/utownerid.c +--- acpica-unix2-20161117.orig/source/components/utilities/utownerid.c ++++ acpica-unix2-20161117/source/components/utilities/utownerid.c @@ -231,7 +231,7 @@ AcpiUtReleaseOwnerId ( else { @@ -328,10 +328,10 @@ Index: acpica-unix2-20160831/source/components/utilities/utownerid.c } (void) AcpiUtReleaseMutex (ACPI_MTX_CACHES); -Index: acpica-unix2-20160831/source/tools/acpiexec/aemain.c +Index: acpica-unix2-20161117/source/tools/acpiexec/aemain.c =================================================================== ---- acpica-unix2-20160831.orig/source/tools/acpiexec/aemain.c -+++ acpica-unix2-20160831/source/tools/acpiexec/aemain.c +--- acpica-unix2-20161117.orig/source/tools/acpiexec/aemain.c ++++ acpica-unix2-20161117/source/tools/acpiexec/aemain.c @@ -207,7 +207,7 @@ AeDoOptions ( if (strlen (AcpiGbl_Optarg) > (AE_BUFFER_SIZE -1)) diff --git a/name-miscompare.patch b/name-miscompare.patch index bbaeab6..c7979f0 100644 --- a/name-miscompare.patch +++ b/name-miscompare.patch @@ -10,10 +10,10 @@ made in the remainder of the function. source/compiler/aslanalyze.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -Index: acpica-unix2-20160422/source/compiler/aslanalyze.c +Index: acpica-unix2-20161117/source/compiler/aslanalyze.c =================================================================== ---- acpica-unix2-20160422.orig/source/compiler/aslanalyze.c -+++ acpica-unix2-20160422/source/compiler/aslanalyze.c +--- acpica-unix2-20161117.orig/source/compiler/aslanalyze.c ++++ acpica-unix2-20161117/source/compiler/aslanalyze.c @@ -461,7 +461,7 @@ ApCheckForGpeNameConflict ( /* Need a null-terminated string version of NameSeg */ diff --git a/re-enable-big-endian.patch b/re-enable-big-endian.patch index 5f6f10d..7371b52 100644 --- a/re-enable-big-endian.patch +++ b/re-enable-big-endian.patch @@ -7,10 +7,10 @@ Al Stone source/compiler/aslmain.c | 12 ------------ 1 file changed, 12 deletions(-) -Index: acpica-unix2-20160831/source/compiler/aslmain.c +Index: acpica-unix2-20161117/source/compiler/aslmain.c =================================================================== ---- acpica-unix2-20160831.orig/source/compiler/aslmain.c -+++ acpica-unix2-20160831/source/compiler/aslmain.c +--- acpica-unix2-20161117.orig/source/compiler/aslmain.c ++++ acpica-unix2-20161117/source/compiler/aslmain.c @@ -99,18 +99,6 @@ main ( int ReturnStatus = 0; diff --git a/s390x-ptrs.patch b/s390x-ptrs.patch index 99da1ee..cf7a469 100644 --- a/s390x-ptrs.patch +++ b/s390x-ptrs.patch @@ -1,6 +1,7 @@ -diff -Naur acpica-unix2-20160831/source/include/platform/aclinux.h acpica-unix2-20160831-s390x/source/include/platform/aclinux.h ---- acpica-unix2-20160831/source/include/platform/aclinux.h 2016-09-01 15:18:36.306268594 -0600 -+++ acpica-unix2-20160831-s390x/source/include/platform/aclinux.h 2016-09-01 16:01:34.955157827 -0600 +Index: acpica-unix2-20161117/source/include/platform/aclinux.h +=================================================================== +--- acpica-unix2-20161117.orig/source/include/platform/aclinux.h ++++ acpica-unix2-20161117/source/include/platform/aclinux.h @@ -194,7 +194,8 @@ #define ACPI_CAST_PTHREAD_T(Pthread) ((ACPI_THREAD_ID) (Pthread)) diff --git a/sources b/sources index de1e0fe..a95c035 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -44a36d5ac3faaaca4b0c0df6c14f9e93 acpica-unix2-20160930.tar.gz -067a3b96e5f8cc211aeb0444d135af8e acpitests-unix-20160930.tar.gz +SHA512 (acpica-unix2-20161117.tar.gz) = fc7626a0729dc87043faec68027c5b6c98b62c95075f5b83aba6110a43a51719c555b550a42f4f624617a99e7d33cb8503f147c6a1dbb25f2cd6644538f4c9a2 +SHA512 (acpitests-unix-20161117.tar.gz) = 8b68bc294c31a56b0d7bd9ea61ddadb25b978e4fade16db7fb8bbb8ca0e89f364fc49a2b17c1d7f694bc79007934aa2ef00e06f0fb9675f5fa5029cf53b9e0e8 diff --git a/template.patch b/template.patch index 749b8ee..0ce8a78 100644 --- a/template.patch +++ b/template.patch @@ -7,10 +7,10 @@ From: Al Stone tests/templates/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: acpica-unix2-20160422/tests/templates/Makefile +Index: acpica-unix2-20161117/tests/templates/Makefile =================================================================== ---- acpica-unix2-20160422.orig/tests/templates/Makefile -+++ acpica-unix2-20160422/tests/templates/Makefile +--- acpica-unix2-20161117.orig/tests/templates/Makefile ++++ acpica-unix2-20161117/tests/templates/Makefile @@ -2,7 +2,7 @@ PROG= templates diff --git a/update-big-endian.patch b/update-big-endian.patch index 9d2d1db..9e43c6c 100644 --- a/update-big-endian.patch +++ b/update-big-endian.patch @@ -1,7 +1,8 @@ -diff -Naur acpica-unix2-20160930.ref/source/common/acfileio.c acpica-unix2-20160930/source/common/acfileio.c ---- acpica-unix2-20160930.ref/source/common/acfileio.c 2016-09-30 10:43:55.000000000 -0600 -+++ acpica-unix2-20160930/source/common/acfileio.c 2017-01-09 14:06:45.477221545 -0700 -@@ -241,6 +241,7 @@ +Index: acpica-unix2-20161117/source/common/acfileio.c +=================================================================== +--- acpica-unix2-20161117.orig/source/common/acfileio.c ++++ acpica-unix2-20161117/source/common/acfileio.c +@@ -250,6 +250,7 @@ AcGetOneTableFromFile ( ACPI_TABLE_HEADER *Table; INT32 Count; long TableOffset; @@ -9,7 +10,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/acfileio.c acpica-unix2-20160 *ReturnTable = NULL; -@@ -281,7 +282,8 @@ +@@ -289,7 +290,8 @@ AcGetOneTableFromFile ( /* Allocate a buffer for the entire table */ @@ -19,7 +20,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/acfileio.c acpica-unix2-20160 if (!Table) { return (AE_NO_MEMORY); -@@ -291,8 +293,8 @@ +@@ -299,8 +301,8 @@ AcGetOneTableFromFile ( fseek (File, TableOffset, SEEK_SET); @@ -30,7 +31,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/acfileio.c acpica-unix2-20160 { Status = AE_ERROR; goto ErrorExit; -@@ -300,7 +302,7 @@ +@@ -308,7 +310,7 @@ AcGetOneTableFromFile ( /* Validate the checksum (just issue a warning) */ @@ -39,7 +40,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/acfileio.c acpica-unix2-20160 if (ACPI_FAILURE (Status)) { Status = AcCheckTextModeCorruption (Table); -@@ -392,6 +394,7 @@ +@@ -400,6 +402,7 @@ AcValidateTableHeader ( ACPI_SIZE Actual; long OriginalOffset; UINT32 FileSize; @@ -47,7 +48,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/acfileio.c acpica-unix2-20160 UINT32 i; -@@ -423,11 +426,12 @@ +@@ -431,11 +434,12 @@ AcValidateTableHeader ( /* Validate table length against bytes remaining in the file */ FileSize = CmGetFileSize (File); @@ -62,10 +63,11 @@ diff -Naur acpica-unix2-20160930.ref/source/common/acfileio.c acpica-unix2-20160 (UINT32) (FileSize - TableOffset)); return (AE_BAD_HEADER); } -diff -Naur acpica-unix2-20160930.ref/source/common/ahpredef.c acpica-unix2-20160930/source/common/ahpredef.c ---- acpica-unix2-20160930.ref/source/common/ahpredef.c 2016-09-30 10:43:56.000000000 -0600 -+++ acpica-unix2-20160930/source/common/ahpredef.c 2017-01-09 14:06:45.478221539 -0700 -@@ -358,7 +358,7 @@ +Index: acpica-unix2-20161117/source/common/ahpredef.c +=================================================================== +--- acpica-unix2-20161117.orig/source/common/ahpredef.c ++++ acpica-unix2-20161117/source/common/ahpredef.c +@@ -358,7 +358,7 @@ AcpiAhMatchPredefinedName ( char *Nameseg) { const AH_PREDEFINED_NAME *Info; @@ -74,10 +76,11 @@ diff -Naur acpica-unix2-20160930.ref/source/common/ahpredef.c acpica-unix2-20160 for (Info = AslPredefinedInfo; Info->Name; Info++) { -diff -Naur acpica-unix2-20160930.ref/source/common/dmtable.c acpica-unix2-20160930/source/common/dmtable.c ---- acpica-unix2-20160930.ref/source/common/dmtable.c 2016-09-30 10:43:56.000000000 -0600 -+++ acpica-unix2-20160930/source/common/dmtable.c 2017-01-09 14:06:45.479221534 -0700 -@@ -499,7 +499,7 @@ +Index: acpica-unix2-20161117/source/common/dmtable.c +=================================================================== +--- acpica-unix2-20161117.orig/source/common/dmtable.c ++++ acpica-unix2-20161117/source/common/dmtable.c +@@ -499,7 +499,7 @@ AcpiDmDumpDataTable ( */ if (ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_FACS)) { @@ -86,7 +89,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtable.c acpica-unix2-201609 Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoFacs); if (ACPI_FAILURE (Status)) { -@@ -513,13 +513,14 @@ +@@ -513,13 +513,14 @@ AcpiDmDumpDataTable ( else if (ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_S3PT)) { Length = AcpiDmDumpS3pt (Table); @@ -102,7 +105,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtable.c acpica-unix2-201609 Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoHeader); if (ACPI_FAILURE (Status)) { -@@ -730,6 +731,7 @@ +@@ -730,6 +731,7 @@ AcpiDmDumpTable ( BOOLEAN LastOutputBlankLine = FALSE; ACPI_STATUS Status; char RepairedName[8]; @@ -110,7 +113,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtable.c acpica-unix2-201609 if (!Info) -@@ -1097,8 +1099,9 @@ +@@ -1097,8 +1099,9 @@ AcpiDmDumpTable ( /* Checksum, display and validate */ AcpiOsPrintf ("%2.2X", *Target); @@ -122,7 +125,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtable.c acpica-unix2-201609 ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Checksum); if (Temp8 != ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Checksum) -@@ -1163,14 +1166,14 @@ +@@ -1163,14 +1166,14 @@ AcpiDmDumpTable ( /* DMAR subtable types */ @@ -140,7 +143,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtable.c acpica-unix2-201609 break; case ACPI_DMT_DMAR_SCOPE: -@@ -1261,14 +1264,14 @@ +@@ -1261,14 +1264,14 @@ AcpiDmDumpTable ( /* HEST subtable types */ @@ -158,7 +161,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtable.c acpica-unix2-201609 break; case ACPI_DMT_HESTNTFY: -@@ -1334,13 +1337,14 @@ +@@ -1334,13 +1337,14 @@ AcpiDmDumpTable ( /* NFIT subtable types */ @@ -175,10 +178,11 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtable.c acpica-unix2-201609 AcpiDmNfitSubnames[Temp16]); break; -diff -Naur acpica-unix2-20160930.ref/source/common/dmtables.c acpica-unix2-20160930/source/common/dmtables.c ---- acpica-unix2-20160930.ref/source/common/dmtables.c 2016-09-30 10:43:56.000000000 -0600 -+++ acpica-unix2-20160930/source/common/dmtables.c 2017-01-09 14:06:45.480221528 -0700 -@@ -140,7 +140,9 @@ +Index: acpica-unix2-20161117/source/common/dmtables.c +=================================================================== +--- acpica-unix2-20161117.orig/source/common/dmtables.c ++++ acpica-unix2-20161117/source/common/dmtables.c +@@ -140,7 +140,9 @@ AdCreateTableHeader ( ACPI_TABLE_HEADER *Table) { UINT8 Checksum; @@ -189,7 +193,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtables.c acpica-unix2-20160 /* Reset globals for External statements */ -@@ -152,9 +154,10 @@ +@@ -152,9 +154,10 @@ AdCreateTableHeader ( */ AdDisassemblerHeader (Filename, ACPI_IS_AML_TABLE); @@ -201,7 +205,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtables.c acpica-unix2-20160 /* Print and validate the revision */ -@@ -186,7 +189,7 @@ +@@ -186,7 +189,7 @@ AdCreateTableHeader ( AcpiOsPrintf ("\n * Checksum 0x%2.2X", Table->Checksum); @@ -210,7 +214,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtables.c acpica-unix2-20160 if (Checksum) { AcpiOsPrintf (" **** Incorrect checksum, should be 0x%2.2X", -@@ -196,9 +199,11 @@ +@@ -196,9 +199,11 @@ AdCreateTableHeader ( AcpiOsPrintf ("\n"); AcpiOsPrintf (" * OEM ID \"%.6s\"\n", Table->OemId); AcpiOsPrintf (" * OEM Table ID \"%.8s\"\n", Table->OemTableId); @@ -224,7 +228,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtables.c acpica-unix2-20160 AcpiOsPrintf (" */\n"); /* -@@ -211,7 +216,7 @@ +@@ -211,7 +216,7 @@ AdCreateTableHeader ( AcpiOsPrintf ( "DefinitionBlock (\"\", \"%4.4s\", %hu, \"%.6s\", \"%.8s\", 0x%8.8X)\n", Table->Signature, Table->Revision, @@ -233,7 +237,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtables.c acpica-unix2-20160 } -@@ -386,7 +391,8 @@ +@@ -386,7 +391,8 @@ AdParseTable ( fprintf (stderr, "Pass 1 parse of [%4.4s]\n", (char *) Table->Signature); @@ -243,10 +247,11 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtables.c acpica-unix2-20160 AmlStart = ((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER)); /* Create the root object */ -diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160930/source/common/dmtbdump.c ---- acpica-unix2-20160930.ref/source/common/dmtbdump.c 2016-09-30 10:43:56.000000000 -0600 -+++ acpica-unix2-20160930/source/common/dmtbdump.c 2017-01-09 14:06:45.484221507 -0700 -@@ -296,6 +296,8 @@ +Index: acpica-unix2-20161117/source/common/dmtbdump.c +=================================================================== +--- acpica-unix2-20161117.orig/source/common/dmtbdump.c ++++ acpica-unix2-20161117/source/common/dmtbdump.c +@@ -277,6 +277,8 @@ AcpiDmDumpRsdt ( UINT32 Entries; UINT32 Offset; UINT32 i; @@ -255,7 +260,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 /* Point to start of table pointer array */ -@@ -305,12 +307,14 @@ +@@ -286,12 +288,14 @@ AcpiDmDumpRsdt ( /* RSDT uses 32-bit pointers */ @@ -272,7 +277,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 Offset += sizeof (UINT32); } } -@@ -336,6 +340,8 @@ +@@ -317,6 +321,8 @@ AcpiDmDumpXsdt ( UINT32 Entries; UINT32 Offset; UINT32 i; @@ -281,7 +286,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 /* Point to start of table pointer array */ -@@ -345,12 +351,14 @@ +@@ -326,12 +332,14 @@ AcpiDmDumpXsdt ( /* XSDT uses 64-bit pointers */ @@ -298,64 +303,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 Offset += sizeof (UINT64); } } -@@ -384,6 +392,7 @@ - ACPI_STATUS Status; - UINT8 FadtRevision; - UINT32 ExpectedLength; -+ UINT32 ActualLength; - UINT32 i; - - -@@ -400,6 +409,7 @@ - return; - } - -+ ACPI_MOVE_32_TO_32(&ActualLength, &Table->Length); - if (FadtRevision > ACPI_FADT_MAX_VERSION) - { - AcpiOsPrintf ("// ACPI Warning: Revision %u is not fully supported, " -@@ -409,12 +419,12 @@ - else - { - ExpectedLength = FadtRevisionLength[FadtRevision]; -- if (Table->Length != ExpectedLength) -+ if (ActualLength != ExpectedLength) - { - AcpiOsPrintf ( - "// ACPI Warning: Input FADT revision %X does not match " - "expected length: found 0x%X expected 0x%X\n", -- FadtRevision, Table->Length, ExpectedLength); -+ FadtRevision, ActualLength, ExpectedLength); - } - } - -@@ -432,14 +442,14 @@ - - /* Dump the fields specific to FADT revision[i] */ - -- Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, -+ Status = AcpiDmDumpTable (ActualLength, 0, Table, 0, - FadtRevisionInfo[i]); - if (ACPI_FAILURE (Status)) - { - return; - } - -- if (Table->Length <= FadtRevisionLength[i]) -+ if (ActualLength <= FadtRevisionLength[i]) - { - break; /* End of table */ - } -@@ -447,7 +457,7 @@ - - /* Build a local FADT to test some FADT values */ - -- AcpiTbCreateLocalFadt (Table, Table->Length); -+ AcpiTbCreateLocalFadt (Table, ActualLength); - } - - -@@ -478,17 +488,21 @@ +@@ -524,17 +532,21 @@ AcpiDmDumpAsf ( UINT32 DataOffset = 0; UINT32 i; UINT8 Type; @@ -380,7 +328,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 if (ACPI_FAILURE (Status)) { return; -@@ -545,8 +559,7 @@ +@@ -591,8 +603,7 @@ AcpiDmDumpAsf ( return; } @@ -390,7 +338,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 if (ACPI_FAILURE (Status)) { return; -@@ -562,7 +575,7 @@ +@@ -608,7 +619,7 @@ AcpiDmDumpAsf ( for (i = 0; i < DataCount; i++) { AcpiOsPrintf ("\n"); @@ -399,7 +347,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 DataTable, DataLength, DataInfoTable); if (ACPI_FAILURE (Status)) { -@@ -608,15 +621,14 @@ +@@ -654,15 +665,14 @@ AcpiDmDumpAsf ( /* Point to next subtable */ @@ -418,7 +366,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 } } -@@ -640,12 +652,13 @@ +@@ -686,12 +696,13 @@ AcpiDmDumpCpep ( { ACPI_STATUS Status; ACPI_CPEP_POLLING *SubTable; @@ -433,7 +381,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoCpep); if (ACPI_FAILURE (Status)) { -@@ -655,7 +668,7 @@ +@@ -701,7 +712,7 @@ AcpiDmDumpCpep ( /* Subtables */ SubTable = ACPI_ADD_PTR (ACPI_CPEP_POLLING, Table, Offset); @@ -442,7 +390,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 { AcpiOsPrintf ("\n"); Status = AcpiDmDumpTable (Length, Offset, SubTable, -@@ -695,7 +708,10 @@ +@@ -741,7 +752,10 @@ AcpiDmDumpCsrt ( ACPI_CSRT_GROUP *SubTable; ACPI_CSRT_SHARED_INFO *SharedInfoTable; ACPI_CSRT_DESCRIPTOR *SubSubTable; @@ -454,7 +402,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 UINT32 Offset = sizeof (ACPI_TABLE_CSRT); UINT32 SubOffset; UINT32 SubSubOffset; -@@ -706,14 +722,16 @@ +@@ -752,14 +766,16 @@ AcpiDmDumpCsrt ( /* Subtables (Resource Groups) */ @@ -473,7 +421,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 if (ACPI_FAILURE (Status)) { return; -@@ -733,19 +751,20 @@ +@@ -779,19 +795,20 @@ AcpiDmDumpCsrt ( return; } @@ -498,7 +446,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 if (ACPI_FAILURE (Status)) { return; -@@ -755,7 +774,7 @@ +@@ -801,7 +818,7 @@ AcpiDmDumpCsrt ( /* Resource-specific info buffer */ @@ -507,7 +455,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 if (InfoLength) { Status = AcpiDmDumpTable (Length, -@@ -770,16 +789,15 @@ +@@ -816,16 +833,15 @@ AcpiDmDumpCsrt ( /* Point to next sub-subtable */ @@ -528,7 +476,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 } } -@@ -803,16 +821,20 @@ +@@ -849,16 +865,20 @@ AcpiDmDumpDbg2 ( { ACPI_STATUS Status; ACPI_DBG2_DEVICE *SubTable; @@ -550,7 +498,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoDbg2); if (ACPI_FAILURE (Status)) { -@@ -822,11 +844,12 @@ +@@ -868,11 +888,12 @@ AcpiDmDumpDbg2 ( /* Subtables */ SubTable = ACPI_ADD_PTR (ACPI_DBG2_DEVICE, Table, Offset); @@ -565,7 +513,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 if (ACPI_FAILURE (Status)) { return; -@@ -836,13 +859,13 @@ +@@ -882,13 +903,13 @@ AcpiDmDumpDbg2 ( for (i = 0; i < SubTable->RegisterCount; i++) { @@ -582,7 +530,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 if (ACPI_FAILURE (Status)) { return; -@@ -853,13 +876,13 @@ +@@ -899,13 +920,13 @@ AcpiDmDumpDbg2 ( for (i = 0; i < SubTable->RegisterCount; i++) { @@ -599,7 +547,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 if (ACPI_FAILURE (Status)) { return; -@@ -869,12 +892,13 @@ +@@ -915,12 +936,13 @@ AcpiDmDumpDbg2 ( /* Dump the Namestring (required) */ AcpiOsPrintf ("\n"); @@ -615,7 +563,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 if (ACPI_FAILURE (Status)) { return; -@@ -884,9 +908,10 @@ +@@ -930,9 +952,10 @@ AcpiDmDumpDbg2 ( if (SubTable->OemDataOffset) { @@ -629,7 +577,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 if (ACPI_FAILURE (Status)) { return; -@@ -895,9 +920,9 @@ +@@ -941,9 +964,9 @@ AcpiDmDumpDbg2 ( /* Point to next subtable */ @@ -641,7 +589,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 } } -@@ -921,17 +946,20 @@ +@@ -967,17 +990,20 @@ AcpiDmDumpDmar ( { ACPI_STATUS Status; ACPI_DMAR_HEADER *SubTable; @@ -663,7 +611,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoDmar); if (ACPI_FAILURE (Status)) { -@@ -941,13 +969,14 @@ +@@ -987,13 +1013,14 @@ AcpiDmDumpDmar ( /* Subtables */ SubTable = ACPI_ADD_PTR (ACPI_DMAR_HEADER, Table, Offset); @@ -680,7 +628,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 if (ACPI_FAILURE (Status)) { return; -@@ -955,7 +984,8 @@ +@@ -1001,7 +1028,8 @@ AcpiDmDumpDmar ( AcpiOsPrintf ("\n"); @@ -690,7 +638,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 { case ACPI_DMAR_TYPE_HARDWARE_UNIT: -@@ -990,12 +1020,12 @@ +@@ -1036,12 +1064,12 @@ AcpiDmDumpDmar ( default: AcpiOsPrintf ("\n**** Unknown DMAR subtable type 0x%X\n\n", @@ -705,7 +653,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 if (ACPI_FAILURE (Status)) { return; -@@ -1004,8 +1034,8 @@ +@@ -1050,8 +1078,8 @@ AcpiDmDumpDmar ( /* * Dump the optional device scope entries */ @@ -716,7 +664,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 { /* These types do not support device scopes */ -@@ -1013,7 +1043,7 @@ +@@ -1059,7 +1087,7 @@ AcpiDmDumpDmar ( } ScopeTable = ACPI_ADD_PTR (ACPI_DMAR_DEVICE_SCOPE, SubTable, ScopeOffset); @@ -725,7 +673,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 { AcpiOsPrintf ("\n"); Status = AcpiDmDumpTable (Length, Offset + ScopeOffset, ScopeTable, -@@ -1054,9 +1084,8 @@ +@@ -1100,9 +1128,8 @@ AcpiDmDumpDmar ( NextSubtable: /* Point to next subtable */ @@ -737,7 +685,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 } } -@@ -1083,12 +1112,15 @@ +@@ -1129,12 +1156,15 @@ AcpiDmDumpDrtm ( ACPI_DRTM_RESOURCE_LIST *DrtmRl; ACPI_DRTM_DPS_ID *DrtmDps; UINT32 Count; @@ -755,7 +703,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 if (ACPI_FAILURE (Status)) { return; -@@ -1102,7 +1134,7 @@ +@@ -1148,7 +1178,7 @@ AcpiDmDumpDrtm ( DrtmVtl = ACPI_ADD_PTR (ACPI_DRTM_VTABLE_LIST, Table, Offset); AcpiOsPrintf ("\n"); @@ -764,7 +712,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 DrtmVtl, ACPI_OFFSET (ACPI_DRTM_VTABLE_LIST, ValidatedTables), AcpiDmTableInfoDrtm0); if (ACPI_FAILURE (Status)) -@@ -1115,10 +1147,11 @@ +@@ -1161,10 +1191,11 @@ AcpiDmDumpDrtm ( /* Dump Validated table addresses */ Count = 0; @@ -779,7 +727,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 ACPI_ADD_PTR (void, Table, Offset), sizeof (UINT64), AcpiDmTableInfoDrtm0a); if (ACPI_FAILURE (Status)) -@@ -1134,7 +1167,7 @@ +@@ -1180,7 +1211,7 @@ AcpiDmDumpDrtm ( DrtmRl = ACPI_ADD_PTR (ACPI_DRTM_RESOURCE_LIST, Table, Offset); AcpiOsPrintf ("\n"); @@ -788,7 +736,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 DrtmRl, ACPI_OFFSET (ACPI_DRTM_RESOURCE_LIST, Resources), AcpiDmTableInfoDrtm1); if (ACPI_FAILURE (Status)) -@@ -1147,10 +1180,11 @@ +@@ -1193,10 +1224,11 @@ AcpiDmDumpDrtm ( /* Dump the Resource List */ Count = 0; @@ -803,7 +751,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 ACPI_ADD_PTR (void, Table, Offset), sizeof (ACPI_DRTM_RESOURCE), AcpiDmTableInfoDrtm1a); if (ACPI_FAILURE (Status)) -@@ -1166,7 +1200,7 @@ +@@ -1212,7 +1244,7 @@ AcpiDmDumpDrtm ( DrtmDps = ACPI_ADD_PTR (ACPI_DRTM_DPS_ID, Table, Offset); AcpiOsPrintf ("\n"); @@ -812,7 +760,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 DrtmDps, sizeof (ACPI_DRTM_DPS_ID), AcpiDmTableInfoDrtm2); } -@@ -1190,12 +1224,13 @@ +@@ -1236,12 +1268,13 @@ AcpiDmDumpEinj ( { ACPI_STATUS Status; ACPI_WHEA_HEADER *SubTable; @@ -827,7 +775,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoEinj); if (ACPI_FAILURE (Status)) { -@@ -1205,7 +1240,7 @@ +@@ -1251,7 +1284,7 @@ AcpiDmDumpEinj ( /* Subtables */ SubTable = ACPI_ADD_PTR (ACPI_WHEA_HEADER, Table, Offset); @@ -836,7 +784,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 { AcpiOsPrintf ("\n"); Status = AcpiDmDumpTable (Length, Offset, SubTable, -@@ -1243,12 +1278,13 @@ +@@ -1289,12 +1322,13 @@ AcpiDmDumpErst ( { ACPI_STATUS Status; ACPI_WHEA_HEADER *SubTable; @@ -851,7 +799,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoErst); if (ACPI_FAILURE (Status)) { -@@ -1258,7 +1294,7 @@ +@@ -1304,7 +1338,7 @@ AcpiDmDumpErst ( /* Subtables */ SubTable = ACPI_ADD_PTR (ACPI_WHEA_HEADER, Table, Offset); @@ -860,7 +808,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 { AcpiOsPrintf ("\n"); Status = AcpiDmDumpTable (Length, Offset, SubTable, -@@ -1296,17 +1332,19 @@ +@@ -1342,17 +1376,19 @@ AcpiDmDumpFpdt ( { ACPI_STATUS Status; ACPI_FPDT_HEADER *SubTable; @@ -882,7 +830,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 { /* Common subtable header */ -@@ -1318,7 +1356,8 @@ +@@ -1364,7 +1400,8 @@ AcpiDmDumpFpdt ( return; } @@ -892,7 +840,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 { case ACPI_FPDT_TYPE_BOOT: -@@ -1332,8 +1371,7 @@ +@@ -1378,8 +1415,7 @@ AcpiDmDumpFpdt ( default: @@ -902,7 +850,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 /* Attempt to continue */ -@@ -1381,16 +1419,19 @@ +@@ -1427,16 +1463,19 @@ AcpiDmDumpGtdt ( { ACPI_STATUS Status; ACPI_GTDT_HEADER *SubTable; @@ -923,7 +871,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoGtdt); if (ACPI_FAILURE (Status)) { -@@ -1400,7 +1441,7 @@ +@@ -1446,7 +1485,7 @@ AcpiDmDumpGtdt ( /* Subtables */ SubTable = ACPI_ADD_PTR (ACPI_GTDT_HEADER, Table, Offset); @@ -932,7 +880,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 { /* Common subtable header */ -@@ -1418,8 +1459,9 @@ +@@ -1464,8 +1503,9 @@ AcpiDmDumpGtdt ( case ACPI_GTDT_TYPE_TIMER_BLOCK: SubTableLength = sizeof (ACPI_GTDT_TIMER_BLOCK); @@ -943,7 +891,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 InfoTable = AcpiDmTableInfoGtdt0; break; -@@ -1440,8 +1482,9 @@ +@@ -1486,8 +1526,9 @@ AcpiDmDumpGtdt ( return; } @@ -954,7 +902,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 if (ACPI_FAILURE (Status)) { return; -@@ -1500,16 +1543,18 @@ +@@ -1546,16 +1587,18 @@ AcpiDmDumpHest ( { ACPI_STATUS Status; ACPI_HEST_HEADER *SubTable; @@ -974,7 +922,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoHest); if (ACPI_FAILURE (Status)) { -@@ -1519,10 +1564,11 @@ +@@ -1565,10 +1608,11 @@ AcpiDmDumpHest ( /* Subtables */ SubTable = ACPI_ADD_PTR (ACPI_HEST_HEADER, Table, Offset); @@ -988,7 +936,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 { case ACPI_HEST_TYPE_IA32_CHECK: -@@ -1651,15 +1697,21 @@ +@@ -1697,15 +1741,21 @@ AcpiDmDumpIort ( ACPI_IORT_SMMU *IortSmmu = NULL; UINT32 Offset; UINT32 NodeOffset; @@ -1012,7 +960,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 if (ACPI_FAILURE (Status)) { return; -@@ -1670,18 +1722,19 @@ +@@ -1716,18 +1766,19 @@ AcpiDmDumpIort ( /* Dump the OptionalPadding (optional) */ @@ -1037,7 +985,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 { /* Common subtable header */ -@@ -1717,7 +1770,8 @@ +@@ -1763,7 +1814,8 @@ AcpiDmDumpIort ( case ACPI_IORT_NODE_PCI_ROOT_COMPLEX: InfoTable = AcpiDmTableInfoIort2; @@ -1047,7 +995,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 break; case ACPI_IORT_NODE_SMMU: -@@ -1730,7 +1784,8 @@ +@@ -1776,7 +1828,8 @@ AcpiDmDumpIort ( case ACPI_IORT_NODE_SMMU_V3: InfoTable = AcpiDmTableInfoIort4; @@ -1057,7 +1005,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 break; default: -@@ -1740,7 +1795,8 @@ +@@ -1786,7 +1839,8 @@ AcpiDmDumpIort ( /* Attempt to continue */ @@ -1067,7 +1015,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 { AcpiOsPrintf ("Invalid zero length IORT node\n"); return; -@@ -1751,7 +1807,7 @@ +@@ -1797,7 +1851,7 @@ AcpiDmDumpIort ( /* Dump the node subtable header */ AcpiOsPrintf ("\n"); @@ -1076,7 +1024,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset), Length, InfoTable); if (ACPI_FAILURE (Status)) -@@ -1771,9 +1827,10 @@ +@@ -1817,9 +1871,10 @@ AcpiDmDumpIort ( if (IortItsGroup) { @@ -1089,7 +1037,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset), 4, AcpiDmTableInfoIort0a); NodeOffset += 4; -@@ -1785,11 +1842,11 @@ +@@ -1831,11 +1886,11 @@ AcpiDmDumpIort ( /* Dump the Padding (optional) */ @@ -1105,7 +1053,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 if (ACPI_FAILURE (Status)) { return; -@@ -1806,8 +1863,8 @@ +@@ -1852,8 +1907,8 @@ AcpiDmDumpIort ( if (IortSmmu) { Length = 2 * sizeof (UINT64); @@ -1116,7 +1064,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset), Length, AcpiDmTableInfoIort3a); if (ACPI_FAILURE (Status)) -@@ -1815,10 +1872,11 @@ +@@ -1861,10 +1916,11 @@ AcpiDmDumpIort ( return; } @@ -1131,7 +1079,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset), 8, AcpiDmTableInfoIort3b); if (ACPI_FAILURE (Status)) -@@ -1829,10 +1887,11 @@ +@@ -1875,10 +1931,11 @@ AcpiDmDumpIort ( NodeOffset += 8; } @@ -1146,7 +1094,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset), 8, AcpiDmTableInfoIort3c); if (ACPI_FAILURE (Status)) -@@ -1852,12 +1911,13 @@ +@@ -1898,12 +1955,13 @@ AcpiDmDumpIort ( /* Dump the ID mappings */ @@ -1163,7 +1111,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset), Length, AcpiDmTableInfoIortMap); if (ACPI_FAILURE (Status)) -@@ -1871,8 +1931,9 @@ +@@ -1917,8 +1975,9 @@ AcpiDmDumpIort ( NextSubTable: /* Point to next node subtable */ @@ -1175,7 +1123,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 } } -@@ -1903,11 +1964,14 @@ +@@ -1949,11 +2008,14 @@ AcpiDmDumpIvrs ( ACPI_IVRS_DE_HEADER *DeviceEntry; ACPI_IVRS_HEADER *SubTable; ACPI_DMTABLE_INFO *InfoTable; @@ -1191,7 +1139,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 if (ACPI_FAILURE (Status)) { return; -@@ -1916,13 +1980,14 @@ +@@ -1962,13 +2024,14 @@ AcpiDmDumpIvrs ( /* Subtables */ SubTable = ACPI_ADD_PTR (ACPI_IVRS_HEADER, Table, Offset); @@ -1209,7 +1157,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 if (ACPI_FAILURE (Status)) { return; -@@ -1949,7 +2014,7 @@ +@@ -1995,7 +2058,7 @@ AcpiDmDumpIvrs ( /* Attempt to continue */ @@ -1218,7 +1166,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 { AcpiOsPrintf ("Invalid zero length subtable\n"); return; -@@ -1960,8 +2025,8 @@ +@@ -2006,8 +2069,8 @@ AcpiDmDumpIvrs ( /* Dump the subtable */ AcpiOsPrintf ("\n"); @@ -1229,7 +1177,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 if (ACPI_FAILURE (Status)) { return; -@@ -1975,7 +2040,7 @@ +@@ -2021,7 +2084,7 @@ AcpiDmDumpIvrs ( DeviceEntry = ACPI_ADD_PTR (ACPI_IVRS_DE_HEADER, SubTable, sizeof (ACPI_IVRS_HARDWARE)); @@ -1238,7 +1186,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 { AcpiOsPrintf ("\n"); /* -@@ -2037,7 +2102,7 @@ +@@ -2083,7 +2146,7 @@ AcpiDmDumpIvrs ( /* Dump the Device Entry */ @@ -1247,7 +1195,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 DeviceEntry, EntryLength, InfoTable); if (ACPI_FAILURE (Status)) { -@@ -2053,8 +2118,8 @@ +@@ -2099,8 +2162,8 @@ AcpiDmDumpIvrs ( NextSubTable: /* Point to next subtable */ @@ -1258,7 +1206,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 } } -@@ -2080,7 +2145,7 @@ +@@ -2126,7 +2189,7 @@ AcpiDmDumpLpit ( { ACPI_STATUS Status; ACPI_LPIT_HEADER *SubTable; @@ -1267,7 +1215,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 UINT32 Offset = sizeof (ACPI_TABLE_LPIT); ACPI_DMTABLE_INFO *InfoTable; UINT32 SubTableLength; -@@ -2088,8 +2153,9 @@ +@@ -2134,8 +2197,9 @@ AcpiDmDumpLpit ( /* Subtables */ @@ -1278,7 +1226,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 { /* Common subtable header */ -@@ -2153,13 +2219,14 @@ +@@ -2199,13 +2263,14 @@ AcpiDmDumpMadt ( { ACPI_STATUS Status; ACPI_SUBTABLE_HEADER *SubTable; @@ -1294,7 +1242,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoMadt); if (ACPI_FAILURE (Status)) { -@@ -2169,7 +2236,7 @@ +@@ -2215,7 +2280,7 @@ AcpiDmDumpMadt ( /* Subtables */ SubTable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Table, Offset); @@ -1303,7 +1251,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 { /* Common subtable header */ -@@ -2315,11 +2382,13 @@ +@@ -2361,11 +2426,13 @@ AcpiDmDumpMcfg ( ACPI_STATUS Status; UINT32 Offset = sizeof (ACPI_TABLE_MCFG); ACPI_MCFG_ALLOCATION *SubTable; @@ -1318,7 +1266,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 if (ACPI_FAILURE (Status)) { return; -@@ -2328,17 +2397,17 @@ +@@ -2374,17 +2441,17 @@ AcpiDmDumpMcfg ( /* Subtables */ SubTable = ACPI_ADD_PTR (ACPI_MCFG_ALLOCATION, Table, Offset); @@ -1340,7 +1288,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 sizeof (ACPI_MCFG_ALLOCATION), AcpiDmTableInfoMcfg0); if (ACPI_FAILURE (Status)) { -@@ -2372,6 +2441,7 @@ +@@ -2418,6 +2485,7 @@ AcpiDmDumpMpst ( { ACPI_STATUS Status; UINT32 Offset = sizeof (ACPI_TABLE_MPST); @@ -1348,7 +1296,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 ACPI_MPST_POWER_NODE *SubTable0; ACPI_MPST_POWER_STATE *SubTable0A; ACPI_MPST_COMPONENT *SubTable0B; -@@ -2380,11 +2450,13 @@ +@@ -2426,11 +2494,13 @@ AcpiDmDumpMpst ( UINT16 SubtableCount; UINT32 PowerStateCount; UINT32 ComponentCount; @@ -1363,7 +1311,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 if (ACPI_FAILURE (Status)) { return; -@@ -2392,13 +2464,14 @@ +@@ -2438,13 +2508,14 @@ AcpiDmDumpMpst ( /* Subtable: Memory Power Node(s) */ @@ -1381,7 +1329,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 sizeof (ACPI_MPST_POWER_NODE), AcpiDmTableInfoMpst0); if (ACPI_FAILURE (Status)) { -@@ -2407,8 +2480,8 @@ +@@ -2453,8 +2524,8 @@ AcpiDmDumpMpst ( /* Extract the sub-subtable counts */ @@ -1392,7 +1340,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 Offset += sizeof (ACPI_MPST_POWER_NODE); /* Sub-subtables - Memory Power State Structure(s) */ -@@ -2419,7 +2492,7 @@ +@@ -2465,7 +2536,7 @@ AcpiDmDumpMpst ( while (PowerStateCount) { AcpiOsPrintf ("\n"); @@ -1401,7 +1349,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 sizeof (ACPI_MPST_POWER_STATE), AcpiDmTableInfoMpst0A); if (ACPI_FAILURE (Status)) { -@@ -2429,7 +2502,7 @@ +@@ -2475,7 +2546,7 @@ AcpiDmDumpMpst ( SubTable0A++; PowerStateCount--; Offset += sizeof (ACPI_MPST_POWER_STATE); @@ -1410,7 +1358,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 /* Sub-subtables - Physical Component ID Structure(s) */ -@@ -2442,7 +2515,7 @@ +@@ -2488,7 +2559,7 @@ AcpiDmDumpMpst ( while (ComponentCount) { @@ -1419,7 +1367,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 sizeof (ACPI_MPST_COMPONENT), AcpiDmTableInfoMpst0B); if (ACPI_FAILURE (Status)) { -@@ -2457,17 +2530,19 @@ +@@ -2503,17 +2574,19 @@ AcpiDmDumpMpst ( /* Point to next Memory Power Node subtable */ SubtableCount--; @@ -1442,7 +1390,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 sizeof (ACPI_MPST_DATA_HDR), AcpiDmTableInfoMpst1); if (ACPI_FAILURE (Status)) { -@@ -2482,10 +2557,10 @@ +@@ -2528,10 +2601,10 @@ AcpiDmDumpMpst ( SubTable2 = ACPI_ADD_PTR (ACPI_MPST_POWER_DATA, SubTable1, sizeof (ACPI_MPST_DATA_HDR)); @@ -1455,7 +1403,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 sizeof (ACPI_MPST_POWER_DATA), AcpiDmTableInfoMpst2); if (ACPI_FAILURE (Status)) { -@@ -2518,11 +2593,13 @@ +@@ -2564,11 +2637,13 @@ AcpiDmDumpMsct ( ACPI_STATUS Status; UINT32 Offset = sizeof (ACPI_TABLE_MSCT); ACPI_MSCT_PROXIMITY *SubTable; @@ -1470,7 +1418,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 if (ACPI_FAILURE (Status)) { return; -@@ -2531,12 +2608,12 @@ +@@ -2577,12 +2652,12 @@ AcpiDmDumpMsct ( /* Subtables */ SubTable = ACPI_ADD_PTR (ACPI_MSCT_PROXIMITY, Table, Offset); @@ -1485,7 +1433,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 sizeof (ACPI_MSCT_PROXIMITY), AcpiDmTableInfoMsct0); if (ACPI_FAILURE (Status)) { -@@ -2571,11 +2648,13 @@ +@@ -2617,11 +2692,13 @@ AcpiDmDumpMtmr ( ACPI_STATUS Status; UINT32 Offset = sizeof (ACPI_TABLE_MTMR); ACPI_MTMR_ENTRY *SubTable; @@ -1500,7 +1448,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 if (ACPI_FAILURE (Status)) { return; -@@ -2584,12 +2663,12 @@ +@@ -2630,12 +2707,12 @@ AcpiDmDumpMtmr ( /* Subtables */ SubTable = ACPI_ADD_PTR (ACPI_MTMR_ENTRY, Table, Offset); @@ -1515,7 +1463,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 sizeof (ACPI_MTMR_ENTRY), AcpiDmTableInfoMtmr0); if (ACPI_FAILURE (Status)) { -@@ -2631,11 +2710,17 @@ +@@ -2677,11 +2754,17 @@ AcpiDmDumpNfit ( ACPI_NFIT_SMBIOS *SmbiosInfo = NULL; ACPI_NFIT_FLUSH_ADDRESS *Hint = NULL; UINT32 i; @@ -1534,7 +1482,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 if (ACPI_FAILURE (Status)) { return; -@@ -2644,19 +2729,21 @@ +@@ -2690,19 +2773,21 @@ AcpiDmDumpNfit ( /* Subtables */ SubTable = ACPI_ADD_PTR (ACPI_NFIT_HEADER, Table, Offset); @@ -1560,7 +1508,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 { case ACPI_NFIT_TYPE_SYSTEM_ADDRESS: -@@ -2708,7 +2795,7 @@ +@@ -2754,7 +2839,7 @@ AcpiDmDumpNfit ( /* Attempt to continue */ @@ -1569,7 +1517,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 { AcpiOsPrintf ("Invalid zero length subtable\n"); return; -@@ -2717,8 +2804,8 @@ +@@ -2763,8 +2848,8 @@ AcpiDmDumpNfit ( } AcpiOsPrintf ("\n"); @@ -1580,7 +1528,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 if (ACPI_FAILURE (Status)) { return; -@@ -2726,13 +2813,14 @@ +@@ -2772,13 +2857,14 @@ AcpiDmDumpNfit ( /* Per-subtable variable-length fields */ @@ -1598,7 +1546,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 &Interleave->LineOffset[i], sizeof (UINT32), AcpiDmTableInfoNfit2a); if (ACPI_FAILURE (Status)) -@@ -2746,12 +2834,11 @@ +@@ -2792,12 +2878,11 @@ AcpiDmDumpNfit ( case ACPI_NFIT_TYPE_SMBIOS: @@ -1613,7 +1561,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 sizeof (ACPI_NFIT_SMBIOS) - sizeof (UINT8), SmbiosInfo, Length, AcpiDmTableInfoNfit3a); -@@ -2765,9 +2852,10 @@ +@@ -2811,9 +2896,10 @@ AcpiDmDumpNfit ( case ACPI_NFIT_TYPE_FLUSH_ADDRESS: @@ -1626,7 +1574,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 &Hint->HintAddress[i], sizeof (UINT64), AcpiDmTableInfoNfit6a); if (ACPI_FAILURE (Status)) -@@ -2786,8 +2874,8 @@ +@@ -2832,8 +2918,8 @@ AcpiDmDumpNfit ( NextSubTable: /* Point to next subtable */ @@ -1637,7 +1585,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 } } -@@ -2812,12 +2900,13 @@ +@@ -2858,12 +2944,13 @@ AcpiDmDumpPcct ( ACPI_STATUS Status; ACPI_PCCT_SUBSPACE *SubTable; ACPI_DMTABLE_INFO *InfoTable; @@ -1652,7 +1600,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoPcct); if (ACPI_FAILURE (Status)) { -@@ -2827,7 +2916,7 @@ +@@ -2873,7 +2960,7 @@ AcpiDmDumpPcct ( /* Subtables */ SubTable = ACPI_ADD_PTR (ACPI_PCCT_SUBSPACE, Table, Offset); @@ -1661,7 +1609,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 { /* Common subtable header */ -@@ -2903,16 +2992,21 @@ +@@ -2949,16 +3036,21 @@ AcpiDmDumpPmtt ( ACPI_PMTT_HEADER *MemSubTable; ACPI_PMTT_HEADER *DimmSubTable; ACPI_PMTT_DOMAIN *DomainArray; @@ -1685,7 +1633,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoPmtt); if (ACPI_FAILURE (Status)) { -@@ -2922,13 +3016,14 @@ +@@ -2968,13 +3060,14 @@ AcpiDmDumpPmtt ( /* Subtables */ SubTable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, Table, Offset); @@ -1702,7 +1650,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 if (ACPI_FAILURE (Status)) { return; -@@ -2947,7 +3042,7 @@ +@@ -2993,7 +3086,7 @@ AcpiDmDumpPmtt ( /* Dump the fixed-length portion of the subtable */ Status = AcpiDmDumpTable (Length, Offset, SubTable, @@ -1711,7 +1659,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 if (ACPI_FAILURE (Status)) { return; -@@ -2959,15 +3054,16 @@ +@@ -3005,15 +3098,16 @@ AcpiDmDumpPmtt ( MemSubTable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, SubTable, sizeof (ACPI_PMTT_SOCKET)); @@ -1731,7 +1679,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 if (ACPI_FAILURE (Status)) { return; -@@ -2987,7 +3083,7 @@ +@@ -3033,7 +3127,7 @@ AcpiDmDumpPmtt ( Status = AcpiDmDumpTable (Length, Offset + MemOffset, MemSubTable, @@ -1740,7 +1688,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 if (ACPI_FAILURE (Status)) { return; -@@ -2995,13 +3091,14 @@ +@@ -3041,13 +3135,14 @@ AcpiDmDumpPmtt ( /* Walk the variable count of proximity domains */ @@ -1758,7 +1706,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 DomainCount) { Status = AcpiDmDumpTable (Length, -@@ -3029,15 +3126,16 @@ +@@ -3075,15 +3170,16 @@ AcpiDmDumpPmtt ( DimmSubTable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, MemSubTable, DomainOffset); @@ -1778,7 +1726,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 if (ACPI_FAILURE (Status)) { return; -@@ -3057,7 +3155,7 @@ +@@ -3103,7 +3199,7 @@ AcpiDmDumpPmtt ( Status = AcpiDmDumpTable (Length, Offset + MemOffset + DimmOffset, DimmSubTable, @@ -1787,7 +1735,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 if (ACPI_FAILURE (Status)) { return; -@@ -3065,23 +3163,22 @@ +@@ -3111,23 +3207,22 @@ AcpiDmDumpPmtt ( /* Point to next DIMM subtable */ @@ -1817,7 +1765,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 } } -@@ -3107,6 +3204,8 @@ +@@ -3153,6 +3248,8 @@ AcpiDmDumpS3pt ( ACPI_FPDT_HEADER *SubTable; ACPI_DMTABLE_INFO *InfoTable; ACPI_TABLE_S3PT *S3ptTable = ACPI_CAST_PTR (ACPI_TABLE_S3PT, Tables); @@ -1826,7 +1774,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 /* Main table */ -@@ -3117,20 +3216,22 @@ +@@ -3163,20 +3260,22 @@ AcpiDmDumpS3pt ( return 0; } @@ -1852,7 +1800,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 { case ACPI_S3PT_TYPE_RESUME: -@@ -3145,7 +3246,7 @@ +@@ -3191,7 +3290,7 @@ AcpiDmDumpS3pt ( default: AcpiOsPrintf ("\n**** Unknown S3PT subtable type 0x%X\n", @@ -1861,7 +1809,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 /* Attempt to continue */ -@@ -3158,7 +3259,7 @@ +@@ -3204,7 +3303,7 @@ AcpiDmDumpS3pt ( } AcpiOsPrintf ("\n"); @@ -1870,7 +1818,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 SubTable->Length, InfoTable); if (ACPI_FAILURE (Status)) { -@@ -3192,9 +3293,11 @@ +@@ -3238,9 +3337,11 @@ void AcpiDmDumpSlic ( ACPI_TABLE_HEADER *Table) { @@ -1884,7 +1832,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 } -@@ -3217,14 +3320,17 @@ +@@ -3263,14 +3364,17 @@ AcpiDmDumpSlit ( ACPI_STATUS Status; UINT32 Offset; UINT8 *Row; @@ -1904,7 +1852,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 if (ACPI_FAILURE (Status)) { return; -@@ -3232,7 +3338,8 @@ +@@ -3278,7 +3382,8 @@ AcpiDmDumpSlit ( /* Display the Locality NxN Matrix */ @@ -1914,7 +1862,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 Offset = ACPI_OFFSET (ACPI_TABLE_SLIT, Entry[0]); Row = (UINT8 *) ACPI_CAST_PTR (ACPI_TABLE_SLIT, Table)->Entry; -@@ -3245,7 +3352,7 @@ +@@ -3291,7 +3396,7 @@ AcpiDmDumpSlit ( { /* Check for beyond EOT */ @@ -1923,7 +1871,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 { AcpiOsPrintf ( "\n**** Not enough room in table for all localities\n"); -@@ -3297,11 +3404,13 @@ +@@ -3343,11 +3448,13 @@ AcpiDmDumpSrat ( UINT32 Offset = sizeof (ACPI_TABLE_SRAT); ACPI_SUBTABLE_HEADER *SubTable; ACPI_DMTABLE_INFO *InfoTable; @@ -1938,7 +1886,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 if (ACPI_FAILURE (Status)) { return; -@@ -3310,12 +3419,12 @@ +@@ -3356,12 +3463,12 @@ AcpiDmDumpSrat ( /* Subtables */ SubTable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Table, Offset); @@ -1953,7 +1901,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 SubTable->Length, AcpiDmTableInfoSratHdr); if (ACPI_FAILURE (Status)) { -@@ -3359,7 +3468,7 @@ +@@ -3405,7 +3512,7 @@ AcpiDmDumpSrat ( } AcpiOsPrintf ("\n"); @@ -1962,7 +1910,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 SubTable->Length, InfoTable); if (ACPI_FAILURE (Status)) { -@@ -3396,13 +3505,14 @@ +@@ -3442,13 +3549,14 @@ AcpiDmDumpStao ( { ACPI_STATUS Status; char *Namepath; @@ -1978,7 +1926,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoStao); if (ACPI_FAILURE (Status)) { -@@ -3411,7 +3521,7 @@ +@@ -3457,7 +3565,7 @@ AcpiDmDumpStao ( /* The rest of the table consists of Namepath strings */ @@ -1987,7 +1935,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 { Namepath = ACPI_ADD_PTR (char, Table, Offset); StringLength = strlen (Namepath) + 1; -@@ -3453,11 +3563,14 @@ +@@ -3499,11 +3607,14 @@ AcpiDmDumpTcpa ( ACPI_TABLE_TCPA_HDR *SubTable = ACPI_ADD_PTR ( ACPI_TABLE_TCPA_HDR, Table, Offset); ACPI_STATUS Status; @@ -2003,7 +1951,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 0, AcpiDmTableInfoTcpaHdr); if (ACPI_FAILURE (Status)) { -@@ -3468,18 +3581,19 @@ +@@ -3514,18 +3625,19 @@ AcpiDmDumpTcpa ( * Examine the PlatformClass field to determine the table type. * Either a client or server table. Only one. */ @@ -2028,7 +1976,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 break; default: -@@ -3516,11 +3630,13 @@ +@@ -3562,11 +3674,13 @@ AcpiDmDumpVrtc ( ACPI_STATUS Status; UINT32 Offset = sizeof (ACPI_TABLE_VRTC); ACPI_VRTC_ENTRY *SubTable; @@ -2043,7 +1991,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 if (ACPI_FAILURE (Status)) { return; -@@ -3529,12 +3645,12 @@ +@@ -3575,12 +3689,12 @@ AcpiDmDumpVrtc ( /* Subtables */ SubTable = ACPI_ADD_PTR (ACPI_VRTC_ENTRY, Table, Offset); @@ -2058,7 +2006,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 sizeof (ACPI_VRTC_ENTRY), AcpiDmTableInfoVrtc0); if (ACPI_FAILURE (Status)) { -@@ -3569,11 +3685,13 @@ +@@ -3615,11 +3729,13 @@ AcpiDmDumpWdat ( ACPI_STATUS Status; UINT32 Offset = sizeof (ACPI_TABLE_WDAT); ACPI_WDAT_ENTRY *SubTable; @@ -2073,7 +2021,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 if (ACPI_FAILURE (Status)) { return; -@@ -3582,12 +3700,12 @@ +@@ -3628,12 +3744,12 @@ AcpiDmDumpWdat ( /* Subtables */ SubTable = ACPI_ADD_PTR (ACPI_WDAT_ENTRY, Table, Offset); @@ -2088,7 +2036,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 sizeof (ACPI_WDAT_ENTRY), AcpiDmTableInfoWdat0); if (ACPI_FAILURE (Status)) { -@@ -3622,12 +3740,13 @@ +@@ -3668,12 +3784,13 @@ AcpiDmDumpWpbt ( { ACPI_STATUS Status; ACPI_TABLE_WPBT *SubTable; @@ -2103,7 +2051,7 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoWpbt); if (ACPI_FAILURE (Status)) { -@@ -3637,10 +3756,10 @@ +@@ -3683,10 +3800,10 @@ AcpiDmDumpWpbt ( /* Extract the arguments buffer length from the main table */ SubTable = ACPI_CAST_PTR (ACPI_TABLE_WPBT, Table); @@ -2116,10 +2064,11 @@ diff -Naur acpica-unix2-20160930.ref/source/common/dmtbdump.c acpica-unix2-20160 + (void) AcpiDmDumpTable (Length, 0, Table, ArgumentsLength, AcpiDmTableInfoWpbt0); } -diff -Naur acpica-unix2-20160930.ref/source/compiler/aslrestype2.c acpica-unix2-20160930/source/compiler/aslrestype2.c ---- acpica-unix2-20160930.ref/source/compiler/aslrestype2.c 2017-01-09 14:05:46.288545739 -0700 -+++ acpica-unix2-20160930/source/compiler/aslrestype2.c 2017-01-09 14:07:05.394112460 -0700 -@@ -98,21 +98,33 @@ +Index: acpica-unix2-20161117/source/compiler/aslrestype2.c +=================================================================== +--- acpica-unix2-20161117.orig/source/compiler/aslrestype2.c ++++ acpica-unix2-20161117/source/compiler/aslrestype2.c +@@ -98,21 +98,33 @@ RsDoGeneralRegisterDescriptor ( { case 0: /* Address space */ @@ -2153,7 +2102,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/aslrestype2.c acpica-unix2- RsCreateByteField (InitializerOp, ACPI_RESTAG_REGISTERBITOFFSET, CurrentByteOffset + ASL_RESDESC_OFFSET (GenericReg.BitOffset)); break; -@@ -127,7 +139,11 @@ +@@ -127,7 +139,11 @@ RsDoGeneralRegisterDescriptor ( case 4: /* Access Size (ACPI 3.0) */ @@ -2165,10 +2114,11 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/aslrestype2.c acpica-unix2- RsCreateByteField (InitializerOp, ACPI_RESTAG_ACCESSSIZE, CurrentByteOffset + ASL_RESDESC_OFFSET (GenericReg.AccessSize)); -diff -Naur acpica-unix2-20160930.ref/source/compiler/dtfield.c acpica-unix2-20160930/source/compiler/dtfield.c ---- acpica-unix2-20160930.ref/source/compiler/dtfield.c 2016-09-30 10:43:57.000000000 -0600 -+++ acpica-unix2-20160930/source/compiler/dtfield.c 2017-01-09 14:07:05.395112454 -0700 -@@ -360,7 +360,27 @@ +Index: acpica-unix2-20161117/source/compiler/dtfield.c +=================================================================== +--- acpica-unix2-20161117.orig/source/compiler/dtfield.c ++++ acpica-unix2-20161117/source/compiler/dtfield.c +@@ -360,7 +360,27 @@ DtCompileInteger ( DtError (ASL_ERROR, ASL_MSG_INTEGER_SIZE, Field, MsgBuffer); } @@ -2197,10 +2147,11 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dtfield.c acpica-unix2-2016 return; } -diff -Naur acpica-unix2-20160930.ref/source/compiler/dtsubtable.c acpica-unix2-20160930/source/compiler/dtsubtable.c ---- acpica-unix2-20160930.ref/source/compiler/dtsubtable.c 2016-09-30 10:43:57.000000000 -0600 -+++ acpica-unix2-20160930/source/compiler/dtsubtable.c 2017-01-09 14:07:05.395112454 -0700 -@@ -379,6 +379,21 @@ +Index: acpica-unix2-20161117/source/compiler/dtsubtable.c +=================================================================== +--- acpica-unix2-20161117.orig/source/compiler/dtsubtable.c ++++ acpica-unix2-20161117/source/compiler/dtsubtable.c +@@ -379,6 +379,21 @@ DtSetSubtableLength ( return; } @@ -2224,10 +2175,11 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dtsubtable.c acpica-unix2-2 + Subtable->SizeOfLengthField); + } } -diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable1.c acpica-unix2-20160930/source/compiler/dttable1.c ---- acpica-unix2-20160930.ref/source/compiler/dttable1.c 2016-09-30 10:43:57.000000000 -0600 -+++ acpica-unix2-20160930/source/compiler/dttable1.c 2017-01-09 14:07:05.395112454 -0700 -@@ -282,6 +282,8 @@ +Index: acpica-unix2-20161117/source/compiler/dttable1.c +=================================================================== +--- acpica-unix2-20161117.orig/source/compiler/dttable1.c ++++ acpica-unix2-20161117/source/compiler/dttable1.c +@@ -282,6 +282,8 @@ DtCompileCsrt ( DT_FIELD **PFieldList = (DT_FIELD **) List; UINT32 DescriptorCount; UINT32 GroupLength; @@ -2236,7 +2188,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable1.c acpica-unix2-201 /* Subtables (Resource Groups) */ -@@ -300,12 +302,20 @@ +@@ -300,12 +302,20 @@ DtCompileCsrt ( /* Compute the number of resource descriptors */ @@ -2257,7 +2209,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable1.c acpica-unix2-201 DescriptorCount = (GroupLength / sizeof (ACPI_CSRT_DESCRIPTOR)); -@@ -393,6 +403,8 @@ +@@ -393,6 +403,8 @@ DtCompileDbg2 ( ACPI_DBG2_DEVICE *DeviceInfo; UINT16 CurrentOffset; UINT32 i; @@ -2266,7 +2218,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable1.c acpica-unix2-201 /* Main table */ -@@ -409,10 +421,11 @@ +@@ -409,10 +421,11 @@ DtCompileDbg2 ( /* Main table fields */ Dbg2Header = ACPI_CAST_PTR (ACPI_DBG2_HEADER, Subtable->Buffer); @@ -2280,7 +2232,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable1.c acpica-unix2-201 DtPushSubtable (Subtable); /* Process all Device Information subtables (Count = InfoCount) */ -@@ -439,7 +452,7 @@ +@@ -439,7 +452,7 @@ DtCompileDbg2 ( /* BaseAddressRegister GAS array (Required, size is RegisterCount) */ @@ -2289,7 +2241,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable1.c acpica-unix2-201 for (i = 0; *PFieldList && (i < DeviceInfo->RegisterCount); i++) { Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2Addr, -@@ -455,7 +468,7 @@ +@@ -455,7 +468,7 @@ DtCompileDbg2 ( /* AddressSize array (Required, size = RegisterCount) */ @@ -2298,7 +2250,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable1.c acpica-unix2-201 for (i = 0; *PFieldList && (i < DeviceInfo->RegisterCount); i++) { Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2Size, -@@ -471,7 +484,7 @@ +@@ -471,7 +484,7 @@ DtCompileDbg2 ( /* NamespaceString device identifier (Required, size = NamePathLength) */ @@ -2307,7 +2259,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable1.c acpica-unix2-201 Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2Name, &Subtable, TRUE); if (ACPI_FAILURE (Status)) -@@ -481,8 +494,9 @@ +@@ -481,8 +494,9 @@ DtCompileDbg2 ( /* Update the device info header */ @@ -2319,7 +2271,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable1.c acpica-unix2-201 DtInsertSubtable (ParentTable, Subtable); /* OemData - Variable-length data (Optional, size = OemDataLength) */ -@@ -503,8 +517,8 @@ +@@ -503,8 +517,8 @@ DtCompileDbg2 ( if (Subtable && Subtable->Length) { @@ -2330,7 +2282,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable1.c acpica-unix2-201 DtInsertSubtable (ParentTable, Subtable); } -@@ -544,6 +558,8 @@ +@@ -544,6 +558,8 @@ DtCompileDmar ( ACPI_DMAR_DEVICE_SCOPE *DmarDeviceScope; UINT32 DeviceScopeLength; UINT32 PciPathLength; @@ -2339,7 +2291,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable1.c acpica-unix2-201 Status = DtCompileTable (PFieldList, AcpiDmTableInfoDmar, &Subtable, TRUE); -@@ -573,8 +589,11 @@ +@@ -573,8 +589,11 @@ DtCompileDmar ( DtPushSubtable (Subtable); DmarHeader = ACPI_CAST_PTR (ACPI_DMAR_HEADER, Subtable->Buffer); @@ -2352,7 +2304,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable1.c acpica-unix2-201 { case ACPI_DMAR_TYPE_HARDWARE_UNIT: -@@ -621,8 +640,8 @@ +@@ -621,8 +640,8 @@ DtCompileDmar ( /* * Optional Device Scope subtables */ @@ -2363,7 +2315,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable1.c acpica-unix2-201 { /* These types do not support device scopes */ -@@ -631,8 +650,8 @@ +@@ -631,8 +650,8 @@ DtCompileDmar ( } DtPushSubtable (Subtable); @@ -2374,7 +2326,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable1.c acpica-unix2-201 while (DeviceScopeLength) { Status = DtCompileTable (PFieldList, AcpiDmTableInfoDmarScope, -@@ -757,7 +776,7 @@ +@@ -757,7 +776,7 @@ DtCompileDrtm ( Count++; } @@ -2383,7 +2335,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable1.c acpica-unix2-201 DtPopSubtable (); ParentTable = DtPeekSubtable (); -@@ -795,7 +814,7 @@ +@@ -795,7 +814,7 @@ DtCompileDrtm ( Count++; } @@ -2392,7 +2344,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable1.c acpica-unix2-201 DtPopSubtable (); ParentTable = DtPeekSubtable (); -@@ -889,6 +908,7 @@ +@@ -889,6 +908,7 @@ DtCompileGtdt ( ACPI_SUBTABLE_HEADER *GtdtHeader; ACPI_DMTABLE_INFO *InfoTable; UINT32 GtCount; @@ -2400,7 +2352,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable1.c acpica-unix2-201 Status = DtCompileTable (PFieldList, AcpiDmTableInfoGtdt, -@@ -955,8 +975,9 @@ +@@ -955,8 +975,9 @@ DtCompileGtdt ( DtPushSubtable (Subtable); ParentTable = DtPeekSubtable (); @@ -2412,7 +2364,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable1.c acpica-unix2-201 while (GtCount) { -@@ -1009,6 +1030,7 @@ +@@ -1009,6 +1030,7 @@ DtCompileFpdt ( ACPI_DMTABLE_INFO *InfoTable; DT_FIELD **PFieldList = (DT_FIELD **) List; DT_FIELD *SubtableStart; @@ -2420,7 +2372,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable1.c acpica-unix2-201 while (*PFieldList) -@@ -1027,7 +1049,8 @@ +@@ -1027,7 +1049,8 @@ DtCompileFpdt ( FpdtHeader = ACPI_CAST_PTR (ACPI_FPDT_HEADER, Subtable->Buffer); @@ -2430,7 +2382,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable1.c acpica-unix2-201 { case ACPI_FPDT_TYPE_BOOT: -@@ -1085,6 +1108,7 @@ +@@ -1085,6 +1108,7 @@ DtCompileHest ( ACPI_DMTABLE_INFO *InfoTable; UINT16 Type; UINT32 BankCount; @@ -2438,7 +2390,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable1.c acpica-unix2-201 Status = DtCompileTable (PFieldList, AcpiDmTableInfoHest, -@@ -1102,8 +1126,9 @@ +@@ -1102,8 +1126,9 @@ DtCompileHest ( /* Get subtable type */ SubtableStart = *PFieldList; @@ -2449,7 +2401,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable1.c acpica-unix2-201 switch (Type) { case ACPI_HEST_TYPE_IA32_CHECK: -@@ -1225,11 +1250,13 @@ +@@ -1225,11 +1250,13 @@ DtCompileIort ( ACPI_IORT_SMMU *IortSmmu; UINT32 NodeNumber; UINT32 NodeLength; @@ -2463,7 +2415,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable1.c acpica-unix2-201 ParentTable = DtPeekSubtable (); -@@ -1255,7 +1282,7 @@ +@@ -1255,7 +1282,7 @@ DtCompileIort ( * Optionally allows the generic data types to be used for filling * this field. */ @@ -2472,7 +2424,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable1.c acpica-unix2-201 Status = DtCompileTable (PFieldList, AcpiDmTableInfoIortPad, &Subtable, TRUE); if (ACPI_FAILURE (Status)) -@@ -1265,7 +1292,7 @@ +@@ -1265,7 +1292,7 @@ DtCompileIort ( if (Subtable) { DtInsertSubtable (ParentTable, Subtable); @@ -2481,7 +2433,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable1.c acpica-unix2-201 } else { -@@ -1275,8 +1302,9 @@ +@@ -1275,8 +1302,9 @@ DtCompileIort ( { return (Status); } @@ -2492,7 +2444,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable1.c acpica-unix2-201 NodeNumber = 0; while (*PFieldList) -@@ -1330,7 +1358,7 @@ +@@ -1330,7 +1358,7 @@ DtCompileIort ( ItsNumber++; } @@ -2501,7 +2453,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable1.c acpica-unix2-201 break; case ACPI_IORT_NODE_NAMED_COMPONENT: -@@ -1364,15 +1392,16 @@ +@@ -1364,15 +1392,16 @@ DtCompileIort ( } else { @@ -2521,7 +2473,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable1.c acpica-unix2-201 &Subtable); if (ACPI_FAILURE (Status)) { -@@ -1380,7 +1409,8 @@ +@@ -1380,7 +1409,8 @@ DtCompileIort ( } DtInsertSubtable (ParentTable, Subtable); @@ -2531,7 +2483,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable1.c acpica-unix2-201 } } break; -@@ -1413,7 +1443,7 @@ +@@ -1413,7 +1443,7 @@ DtCompileIort ( /* Compile global interrupt array */ @@ -2540,7 +2492,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable1.c acpica-unix2-201 Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3a, &Subtable, TRUE); if (ACPI_FAILURE (Status)) -@@ -1427,7 +1457,7 @@ +@@ -1427,7 +1457,7 @@ DtCompileIort ( /* Compile context interrupt array */ ContextIrptNumber = 0; @@ -2549,7 +2501,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable1.c acpica-unix2-201 while (*PFieldList) { Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3b, -@@ -1447,12 +1477,12 @@ +@@ -1447,12 +1477,12 @@ DtCompileIort ( ContextIrptNumber++; } @@ -2564,7 +2516,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable1.c acpica-unix2-201 while (*PFieldList) { Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3c, -@@ -1472,7 +1502,7 @@ +@@ -1472,7 +1502,7 @@ DtCompileIort ( PmuIrptNumber++; } @@ -2573,7 +2525,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable1.c acpica-unix2-201 break; case ACPI_IORT_NODE_SMMU_V3: -@@ -1496,7 +1526,7 @@ +@@ -1496,7 +1526,7 @@ DtCompileIort ( /* Compile Array of ID mappings */ @@ -2582,7 +2534,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable1.c acpica-unix2-201 IdMappingNumber = 0; while (*PFieldList) { -@@ -1517,7 +1547,7 @@ +@@ -1517,7 +1547,7 @@ DtCompileIort ( IdMappingNumber++; } @@ -2591,7 +2543,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable1.c acpica-unix2-201 /* * Node length can be determined by DT_LENGTH option -@@ -1528,7 +1558,7 @@ +@@ -1528,7 +1558,7 @@ DtCompileIort ( NodeNumber++; } @@ -2600,10 +2552,11 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable1.c acpica-unix2-201 return (AE_OK); } -diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable2.c acpica-unix2-20160930/source/compiler/dttable2.c ---- acpica-unix2-20160930.ref/source/compiler/dttable2.c 2016-09-30 10:43:57.000000000 -0600 -+++ acpica-unix2-20160930/source/compiler/dttable2.c 2017-01-09 14:07:05.395112454 -0700 -@@ -346,7 +346,7 @@ +Index: acpica-unix2-20161117/source/compiler/dttable2.c +=================================================================== +--- acpica-unix2-20161117.orig/source/compiler/dttable2.c ++++ acpica-unix2-20161117/source/compiler/dttable2.c +@@ -346,7 +346,7 @@ DtCompileMpst ( DtPushSubtable (Subtable); MpstChannelInfo = ACPI_CAST_PTR (ACPI_MPST_CHANNEL, Subtable->Buffer); @@ -2612,7 +2565,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable2.c acpica-unix2-201 while (*PFieldList && SubtableCount) { -@@ -364,8 +364,8 @@ +@@ -364,8 +364,8 @@ DtCompileMpst ( DtPushSubtable (Subtable); MpstPowerNode = ACPI_CAST_PTR (ACPI_MPST_POWER_NODE, Subtable->Buffer); @@ -2623,7 +2576,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable2.c acpica-unix2-201 ParentTable = DtPeekSubtable (); -@@ -518,6 +518,7 @@ +@@ -518,6 +518,7 @@ DtCompileNfit ( UINT32 Count; ACPI_NFIT_INTERLEAVE *Interleave = NULL; ACPI_NFIT_FLUSH_ADDRESS *Hint = NULL; @@ -2631,7 +2584,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable2.c acpica-unix2-201 /* Main table */ -@@ -551,7 +552,8 @@ +@@ -551,7 +552,8 @@ DtCompileNfit ( NfitHeader = ACPI_CAST_PTR (ACPI_NFIT_HEADER, Subtable->Buffer); @@ -2641,7 +2594,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable2.c acpica-unix2-201 { case ACPI_NFIT_TYPE_SYSTEM_ADDRESS: -@@ -606,7 +608,7 @@ +@@ -606,7 +608,7 @@ DtCompileNfit ( DtInsertSubtable (ParentTable, Subtable); DtPopSubtable (); @@ -2650,7 +2603,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable2.c acpica-unix2-201 { case ACPI_NFIT_TYPE_INTERLEAVE: -@@ -632,7 +634,7 @@ +@@ -632,7 +634,7 @@ DtCompileNfit ( Count++; } @@ -2659,7 +2612,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable2.c acpica-unix2-201 DtPopSubtable (); break; -@@ -678,7 +680,7 @@ +@@ -678,7 +680,7 @@ DtCompileNfit ( Count++; } @@ -2668,7 +2621,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable2.c acpica-unix2-201 DtPopSubtable (); break; -@@ -885,7 +887,7 @@ +@@ -885,7 +887,7 @@ DtCompilePmtt ( PmttController = ACPI_CAST_PTR (ACPI_PMTT_CONTROLLER, (Subtable->Buffer - sizeof (ACPI_PMTT_HEADER))); @@ -2677,7 +2630,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable2.c acpica-unix2-201 while (DomainCount) { -@@ -986,6 +988,7 @@ +@@ -986,6 +988,7 @@ DtCompileS3pt ( DT_SUBTABLE *ParentTable; ACPI_DMTABLE_INFO *InfoTable; DT_FIELD *SubtableStart; @@ -2685,7 +2638,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable2.c acpica-unix2-201 Status = DtCompileTable (PFieldList, AcpiDmTableInfoS3pt, -@@ -1013,7 +1016,8 @@ +@@ -1013,7 +1016,8 @@ DtCompileS3pt ( S3ptHeader = ACPI_CAST_PTR (ACPI_FPDT_HEADER, Subtable->Buffer); @@ -2695,7 +2648,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable2.c acpica-unix2-201 { case ACPI_S3PT_TYPE_RESUME: -@@ -1110,6 +1114,7 @@ +@@ -1110,6 +1114,7 @@ DtCompileSlit ( DT_FIELD *FieldList; UINT32 Localities; UINT8 *LocalityBuffer; @@ -2703,7 +2656,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable2.c acpica-unix2-201 Status = DtCompileTable (PFieldList, AcpiDmTableInfoSlit, -@@ -1122,7 +1127,8 @@ +@@ -1122,7 +1127,8 @@ DtCompileSlit ( ParentTable = DtPeekSubtable (); DtInsertSubtable (ParentTable, Subtable); @@ -2713,7 +2666,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable2.c acpica-unix2-201 LocalityBuffer = UtLocalCalloc (Localities); /* Compile each locality buffer */ -@@ -1311,6 +1317,7 @@ +@@ -1311,6 +1317,7 @@ DtCompileTcpa ( ACPI_TABLE_TCPA_HDR *TcpaHeader; DT_SUBTABLE *ParentTable; ACPI_STATUS Status; @@ -2721,7 +2674,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable2.c acpica-unix2-201 /* Compile the main table */ -@@ -1331,7 +1338,8 @@ +@@ -1331,7 +1338,8 @@ DtCompileTcpa ( */ TcpaHeader = ACPI_CAST_PTR (ACPI_TABLE_TCPA_HDR, ParentTable->Buffer); @@ -2731,7 +2684,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable2.c acpica-unix2-201 { case ACPI_TCPA_CLIENT_TABLE: -@@ -1527,6 +1535,9 @@ +@@ -1527,6 +1535,9 @@ DtCompileWpbt ( ACPI_TABLE_WPBT *Table; ACPI_STATUS Status; UINT16 Length; @@ -2741,7 +2694,7 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable2.c acpica-unix2-201 /* Compile the main table */ -@@ -1554,7 +1565,16 @@ +@@ -1554,7 +1565,16 @@ DtCompileWpbt ( Length = (UINT16) Subtable->TotalLength; Table = ACPI_CAST_PTR (ACPI_TABLE_WPBT, ParentTable->Buffer); @@ -2759,10 +2712,11 @@ diff -Naur acpica-unix2-20160930.ref/source/compiler/dttable2.c acpica-unix2-201 ParentTable = DtPeekSubtable (); DtInsertSubtable (ParentTable, Subtable); -diff -Naur acpica-unix2-20160930.ref/source/components/disassembler/dmbuffer.c acpica-unix2-20160930/source/components/disassembler/dmbuffer.c ---- acpica-unix2-20160930.ref/source/components/disassembler/dmbuffer.c 2016-09-30 10:43:58.000000000 -0600 -+++ acpica-unix2-20160930/source/components/disassembler/dmbuffer.c 2017-01-09 14:07:05.396112449 -0700 -@@ -204,7 +204,7 @@ +Index: acpica-unix2-20161117/source/components/disassembler/dmbuffer.c +=================================================================== +--- acpica-unix2-20161117.orig/source/components/disassembler/dmbuffer.c ++++ acpica-unix2-20161117/source/components/disassembler/dmbuffer.c +@@ -204,7 +204,7 @@ AcpiDmByteList ( ByteData = Op->Named.Data; @@ -2771,7 +2725,7 @@ diff -Naur acpica-unix2-20160930.ref/source/components/disassembler/dmbuffer.c a /* * The byte list belongs to a buffer, and can be produced by either -@@ -304,7 +304,8 @@ +@@ -304,7 +304,8 @@ AcpiDmIsUuidBuffer ( /* Extract the byte list info */ ByteData = NextOp->Named.Data; @@ -2781,7 +2735,7 @@ diff -Naur acpica-unix2-20160930.ref/source/components/disassembler/dmbuffer.c a /* Byte count must be exactly 16 */ -@@ -424,7 +425,8 @@ +@@ -424,7 +425,8 @@ AcpiDmIsUnicodeBuffer ( /* Extract the byte list info */ ByteData = NextOp->Named.Data; @@ -2791,7 +2745,7 @@ diff -Naur acpica-unix2-20160930.ref/source/components/disassembler/dmbuffer.c a WordCount = ACPI_DIV_2 (ByteCount); /* -@@ -833,19 +835,22 @@ +@@ -852,19 +854,22 @@ AcpiDmUnicode ( UINT32 WordCount; UINT32 i; int OutputValue; @@ -2816,7 +2770,7 @@ diff -Naur acpica-unix2-20160930.ref/source/components/disassembler/dmbuffer.c a /* Handle values that must be escaped */ -@@ -954,16 +959,18 @@ +@@ -973,16 +978,18 @@ AcpiDmCheckForHardwareId ( ACPI_PARSE_OBJECT *Op) { UINT32 Name; @@ -2837,10 +2791,11 @@ diff -Naur acpica-unix2-20160930.ref/source/components/disassembler/dmbuffer.c a NextOp = AcpiPsGetDepthNext (NULL, Op); if (!NextOp) -diff -Naur acpica-unix2-20160930.ref/source/components/disassembler/dmopcode.c acpica-unix2-20160930/source/components/disassembler/dmopcode.c ---- acpica-unix2-20160930.ref/source/components/disassembler/dmopcode.c 2016-09-30 10:43:58.000000000 -0600 -+++ acpica-unix2-20160930/source/components/disassembler/dmopcode.c 2017-01-09 14:06:45.486221496 -0700 -@@ -244,6 +244,7 @@ +Index: acpica-unix2-20161117/source/components/disassembler/dmopcode.c +=================================================================== +--- acpica-unix2-20161117.orig/source/components/disassembler/dmopcode.c ++++ acpica-unix2-20161117/source/components/disassembler/dmopcode.c +@@ -244,6 +244,7 @@ AcpiDmPredefinedDescription ( char *NameString; int LastCharIsDigit; int LastCharsAreHex; @@ -2848,7 +2803,7 @@ diff -Naur acpica-unix2-20160930.ref/source/components/disassembler/dmopcode.c a if (!Op) -@@ -261,7 +262,9 @@ +@@ -261,7 +262,9 @@ AcpiDmPredefinedDescription ( /* Predefined name must start with an underscore */ @@ -2859,7 +2814,7 @@ diff -Naur acpica-unix2-20160930.ref/source/components/disassembler/dmopcode.c a if (NameString[0] != '_') { return; -@@ -871,21 +874,26 @@ +@@ -871,21 +874,26 @@ AcpiDmDisassembleOneOp ( AcpiDmNamestring (Op->Common.Value.Name); break; @@ -2891,31 +2846,11 @@ diff -Naur acpica-unix2-20160930.ref/source/components/disassembler/dmopcode.c a Info->BitOffset += Offset; if (Info->BitOffset % 8 == 0) -diff -Naur acpica-unix2-20160930.ref/source/components/disassembler/dmresrc.c acpica-unix2-20160930/source/components/disassembler/dmresrc.c ---- acpica-unix2-20160930.ref/source/components/disassembler/dmresrc.c 2016-09-30 10:43:58.000000000 -0600 -+++ acpica-unix2-20160930/source/components/disassembler/dmresrc.c 2017-01-09 14:06:45.486221496 -0700 -@@ -392,7 +392,7 @@ - ACPI_PARSE_OBJECT *NextOp; - UINT8 *Aml; - UINT8 *EndAml; -- ACPI_SIZE Length; -+ UINT32 Length; - - - /* This op must be a buffer */ -@@ -418,7 +418,7 @@ - } - - Aml = NextOp->Named.Data; -- Length = (ACPI_SIZE) NextOp->Common.Value.Integer; -+ Length = NextOp->Common.Value.Size; - - /* Walk the byte list, abort on any invalid descriptor type or length */ - -diff -Naur acpica-unix2-20160930.ref/source/components/disassembler/dmresrcl2.c acpica-unix2-20160930/source/components/disassembler/dmresrcl2.c ---- acpica-unix2-20160930.ref/source/components/disassembler/dmresrcl2.c 2016-09-30 10:43:58.000000000 -0600 -+++ acpica-unix2-20160930/source/components/disassembler/dmresrcl2.c 2017-01-09 14:07:05.396112449 -0700 -@@ -191,22 +191,24 @@ +Index: acpica-unix2-20161117/source/components/disassembler/dmresrcl2.c +=================================================================== +--- acpica-unix2-20161117.orig/source/components/disassembler/dmresrcl2.c ++++ acpica-unix2-20161117/source/components/disassembler/dmresrcl2.c +@@ -191,22 +191,24 @@ AcpiDmGpioCommon ( char *DeviceName = NULL; UINT32 PinCount; UINT32 i; @@ -2944,7 +2879,7 @@ diff -Naur acpica-unix2-20160930.ref/source/components/disassembler/dmresrcl2.c /* Insert a descriptor name */ -@@ -215,15 +217,16 @@ +@@ -215,15 +217,16 @@ AcpiDmGpioCommon ( /* Dump the vendor data */ @@ -2966,7 +2901,7 @@ diff -Naur acpica-unix2-20160930.ref/source/components/disassembler/dmresrcl2.c } AcpiOsPrintf (")\n"); -@@ -233,17 +236,25 @@ +@@ -233,17 +236,25 @@ AcpiDmGpioCommon ( AcpiDmIndent (Level + 1); AcpiOsPrintf ("{ // Pin list\n"); @@ -2995,7 +2930,7 @@ diff -Naur acpica-unix2-20160930.ref/source/components/disassembler/dmresrcl2.c ((i + 1) < PinCount) ? "," : ""); } -@@ -277,16 +288,18 @@ +@@ -277,16 +288,18 @@ AcpiDmGpioIntDescriptor ( UINT32 Length, UINT32 Level) { @@ -3017,7 +2952,7 @@ diff -Naur acpica-unix2-20160930.ref/source/components/disassembler/dmresrcl2.c /* PinConfig, DebounceTimeout */ -@@ -299,7 +312,8 @@ +@@ -299,7 +312,8 @@ AcpiDmGpioIntDescriptor ( { AcpiOsPrintf ("0x%2.2X, ", Resource->Gpio.PinConfig); } @@ -3027,7 +2962,7 @@ diff -Naur acpica-unix2-20160930.ref/source/components/disassembler/dmresrcl2.c /* Dump the GpioInt/GpioIo common portion of the descriptor */ -@@ -329,14 +343,16 @@ +@@ -329,14 +343,16 @@ AcpiDmGpioIoDescriptor ( UINT32 Length, UINT32 Level) { @@ -3045,7 +2980,7 @@ diff -Naur acpica-unix2-20160930.ref/source/components/disassembler/dmresrcl2.c if (Resource->Gpio.PinConfig <= 3) { -@@ -350,10 +366,13 @@ +@@ -350,10 +366,13 @@ AcpiDmGpioIoDescriptor ( /* DebounceTimeout, DriveStrength, IoRestriction */ @@ -3062,7 +2997,7 @@ diff -Naur acpica-unix2-20160930.ref/source/components/disassembler/dmresrcl2.c /* Dump the GpioInt/GpioIo common portion of the descriptor */ -@@ -427,6 +446,7 @@ +@@ -427,6 +446,7 @@ AcpiDmDumpSerialBusVendorData ( { UINT8 *VendorData; UINT32 VendorLength; @@ -3070,7 +3005,7 @@ diff -Naur acpica-unix2-20160930.ref/source/components/disassembler/dmresrcl2.c /* Get the (optional) vendor data and length */ -@@ -435,8 +455,8 @@ +@@ -435,8 +455,8 @@ AcpiDmDumpSerialBusVendorData ( { case AML_RESOURCE_I2C_SERIALBUSTYPE: @@ -3081,7 +3016,7 @@ diff -Naur acpica-unix2-20160930.ref/source/components/disassembler/dmresrcl2.c VendorData = ACPI_ADD_PTR (UINT8, Resource, sizeof (AML_RESOURCE_I2C_SERIALBUS)); -@@ -444,8 +464,8 @@ +@@ -444,8 +464,8 @@ AcpiDmDumpSerialBusVendorData ( case AML_RESOURCE_SPI_SERIALBUSTYPE: @@ -3092,7 +3027,7 @@ diff -Naur acpica-unix2-20160930.ref/source/components/disassembler/dmresrcl2.c VendorData = ACPI_ADD_PTR (UINT8, Resource, sizeof (AML_RESOURCE_SPI_SERIALBUS)); -@@ -453,8 +473,8 @@ +@@ -453,8 +473,8 @@ AcpiDmDumpSerialBusVendorData ( case AML_RESOURCE_UART_SERIALBUSTYPE: @@ -3103,7 +3038,7 @@ diff -Naur acpica-unix2-20160930.ref/source/components/disassembler/dmresrcl2.c VendorData = ACPI_ADD_PTR (UINT8, Resource, sizeof (AML_RESOURCE_UART_SERIALBUS)); -@@ -495,15 +515,19 @@ +@@ -495,15 +515,19 @@ AcpiDmI2cSerialBusDescriptor ( { UINT32 ResourceSourceOffset; char *DeviceName; @@ -3125,7 +3060,7 @@ diff -Naur acpica-unix2-20160930.ref/source/components/disassembler/dmresrcl2.c AcpiDmIndent (Level + 1); AcpiOsPrintf ("%s, ", -@@ -511,8 +535,8 @@ +@@ -511,8 +535,8 @@ AcpiDmI2cSerialBusDescriptor ( /* ResourceSource is a required field */ @@ -3136,10 +3071,11 @@ diff -Naur acpica-unix2-20160930.ref/source/components/disassembler/dmresrcl2.c DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset); AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX); -diff -Naur acpica-unix2-20160930.ref/source/components/disassembler/dmresrcl.c acpica-unix2-20160930/source/components/disassembler/dmresrcl.c ---- acpica-unix2-20160930.ref/source/components/disassembler/dmresrcl.c 2016-09-30 10:43:58.000000000 -0600 -+++ acpica-unix2-20160930/source/components/disassembler/dmresrcl.c 2017-01-09 14:07:05.396112449 -0700 -@@ -141,7 +141,8 @@ +Index: acpica-unix2-20161117/source/components/disassembler/dmresrcl.c +=================================================================== +--- acpica-unix2-20161117.orig/source/components/disassembler/dmresrcl.c ++++ acpica-unix2-20161117/source/components/disassembler/dmresrcl.c +@@ -141,7 +141,8 @@ AcpiDmMemoryFields ( UINT32 Level) { UINT32 i; @@ -3149,7 +3085,7 @@ diff -Naur acpica-unix2-20160930.ref/source/components/disassembler/dmresrcl.c a for (i = 0; i < 4; i++) { -@@ -151,14 +152,14 @@ +@@ -151,14 +152,14 @@ AcpiDmMemoryFields ( { case 16: @@ -3168,7 +3104,7 @@ diff -Naur acpica-unix2-20160930.ref/source/components/disassembler/dmresrcl.c a break; default: -@@ -190,7 +191,9 @@ +@@ -190,7 +191,9 @@ AcpiDmAddressFields ( UINT32 Level) { UINT32 i; @@ -3179,7 +3115,7 @@ diff -Naur acpica-unix2-20160930.ref/source/components/disassembler/dmresrcl.c a AcpiOsPrintf ("\n"); -@@ -202,20 +205,20 @@ +@@ -202,20 +205,20 @@ AcpiDmAddressFields ( { case 16: @@ -3206,7 +3142,7 @@ diff -Naur acpica-unix2-20160930.ref/source/components/disassembler/dmresrcl.c a break; default: -@@ -868,6 +871,7 @@ +@@ -868,6 +871,7 @@ AcpiDmFixedMemory32Descriptor ( UINT32 Length, UINT32 Level) { @@ -3214,7 +3150,7 @@ diff -Naur acpica-unix2-20160930.ref/source/components/disassembler/dmresrcl.c a /* Dump name and read/write flag */ -@@ -876,12 +880,12 @@ +@@ -876,12 +880,12 @@ AcpiDmFixedMemory32Descriptor ( AcpiGbl_RwDecode [ACPI_GET_1BIT_FLAG (Resource->FixedMemory32.Flags)]); AcpiDmIndent (Level + 1); @@ -3231,7 +3167,7 @@ diff -Naur acpica-unix2-20160930.ref/source/components/disassembler/dmresrcl.c a /* Insert a descriptor name */ -@@ -913,6 +917,7 @@ +@@ -913,6 +917,7 @@ AcpiDmGenericRegisterDescriptor ( UINT32 Length, UINT32 Level) { @@ -3239,7 +3175,7 @@ diff -Naur acpica-unix2-20160930.ref/source/components/disassembler/dmresrcl.c a AcpiDmIndent (Level); AcpiOsPrintf ("Register ("); -@@ -926,7 +931,9 @@ +@@ -926,7 +931,9 @@ AcpiDmGenericRegisterDescriptor ( AcpiDmDumpInteger8 (Resource->GenericReg.BitOffset, "Bit Offset"); AcpiDmIndent (Level + 1); @@ -3250,7 +3186,7 @@ diff -Naur acpica-unix2-20160930.ref/source/components/disassembler/dmresrcl.c a /* Optional field for ACPI 3.0 */ -@@ -972,7 +979,7 @@ +@@ -972,7 +979,7 @@ AcpiDmInterruptDescriptor ( UINT32 Level) { UINT32 i; @@ -3259,7 +3195,7 @@ diff -Naur acpica-unix2-20160930.ref/source/components/disassembler/dmresrcl.c a AcpiDmIndent (Level); AcpiOsPrintf ("Interrupt (%s, %s, %s, %s, ", -@@ -986,10 +993,11 @@ +@@ -986,10 +993,11 @@ AcpiDmInterruptDescriptor ( * list. Must compute length based on length of the list. First xrupt * is included in the struct (reason for -1 below) */ @@ -3272,7 +3208,7 @@ diff -Naur acpica-unix2-20160930.ref/source/components/disassembler/dmresrcl.c a /* Insert a descriptor name */ -@@ -1002,9 +1010,12 @@ +@@ -1002,9 +1010,12 @@ AcpiDmInterruptDescriptor ( AcpiOsPrintf ("{\n"); for (i = 0; i < Resource->ExtendedIrq.InterruptCount; i++) { @@ -3287,10 +3223,11 @@ diff -Naur acpica-unix2-20160930.ref/source/components/disassembler/dmresrcl.c a } AcpiDmIndent (Level); -diff -Naur acpica-unix2-20160930.ref/source/components/disassembler/dmresrcs.c acpica-unix2-20160930/source/components/disassembler/dmresrcs.c ---- acpica-unix2-20160930.ref/source/components/disassembler/dmresrcs.c 2016-09-30 10:43:58.000000000 -0600 -+++ acpica-unix2-20160930/source/components/disassembler/dmresrcs.c 2017-01-09 14:07:05.396112449 -0700 -@@ -72,6 +72,7 @@ +Index: acpica-unix2-20161117/source/components/disassembler/dmresrcs.c +=================================================================== +--- acpica-unix2-20161117.orig/source/components/disassembler/dmresrcs.c ++++ acpica-unix2-20161117/source/components/disassembler/dmresrcs.c +@@ -72,6 +72,7 @@ AcpiDmIrqDescriptor ( UINT32 Length, UINT32 Level) { @@ -3298,7 +3235,7 @@ diff -Naur acpica-unix2-20160930.ref/source/components/disassembler/dmresrcs.c a AcpiDmIndent (Level); AcpiOsPrintf ("%s (", -@@ -93,7 +94,8 @@ +@@ -93,7 +94,8 @@ AcpiDmIrqDescriptor ( AcpiOsPrintf (")\n"); AcpiDmIndent (Level + 1); @@ -3308,7 +3245,7 @@ diff -Naur acpica-unix2-20160930.ref/source/components/disassembler/dmresrcs.c a } -@@ -204,16 +206,19 @@ +@@ -204,16 +206,19 @@ AcpiDmIoDescriptor ( UINT32 Length, UINT32 Level) { @@ -3330,7 +3267,7 @@ diff -Naur acpica-unix2-20160930.ref/source/components/disassembler/dmresrcs.c a AcpiDmIndent (Level + 1); AcpiDmDumpInteger8 (Resource->Io.Alignment, "Alignment"); -@@ -251,12 +256,14 @@ +@@ -251,12 +256,14 @@ AcpiDmFixedIoDescriptor ( UINT32 Length, UINT32 Level) { @@ -3346,10 +3283,11 @@ diff -Naur acpica-unix2-20160930.ref/source/components/disassembler/dmresrcs.c a AcpiDmIndent (Level + 1); AcpiDmDumpInteger8 (Resource->FixedIo.AddressLength, "Length"); -diff -Naur acpica-unix2-20160930.ref/source/components/dispatcher/dsfield.c acpica-unix2-20160930/source/components/dispatcher/dsfield.c ---- acpica-unix2-20160930.ref/source/components/dispatcher/dsfield.c 2016-09-30 10:43:58.000000000 -0600 -+++ acpica-unix2-20160930/source/components/dispatcher/dsfield.c 2017-01-09 14:06:45.487221490 -0700 -@@ -318,6 +318,7 @@ +Index: acpica-unix2-20161117/source/components/dispatcher/dsfield.c +=================================================================== +--- acpica-unix2-20161117.orig/source/components/dispatcher/dsfield.c ++++ acpica-unix2-20161117/source/components/dispatcher/dsfield.c +@@ -318,6 +318,7 @@ AcpiDsGetFieldNames ( ACPI_STATUS Status; UINT64 Position; ACPI_PARSE_OBJECT *Child; @@ -3357,7 +3295,7 @@ diff -Naur acpica-unix2-20160930.ref/source/components/dispatcher/dsfield.c acpi ACPI_FUNCTION_TRACE_PTR (DsGetFieldNames, Info); -@@ -424,10 +425,17 @@ +@@ -424,10 +425,17 @@ AcpiDsGetFieldNames ( /* Lookup the name, it should already exist */ @@ -3375,7 +3313,7 @@ diff -Naur acpica-unix2-20160930.ref/source/components/dispatcher/dsfield.c acpi if (ACPI_FAILURE (Status)) { ACPI_ERROR_NAMESPACE ((char *) &Arg->Named.Name, Status); -@@ -652,9 +660,17 @@ +@@ -652,9 +660,17 @@ AcpiDsInitFieldObjects ( */ if (Arg->Common.AmlOpcode == AML_INT_NAMEDFIELD_OP) { @@ -3393,10 +3331,11 @@ diff -Naur acpica-unix2-20160930.ref/source/components/dispatcher/dsfield.c acpi if (ACPI_FAILURE (Status)) { ACPI_ERROR_NAMESPACE ((char *) &Arg->Named.Name, Status); -diff -Naur acpica-unix2-20160930.ref/source/components/events/evgpeblk.c acpica-unix2-20160930/source/components/events/evgpeblk.c ---- acpica-unix2-20160930.ref/source/components/events/evgpeblk.c 2016-09-30 10:43:58.000000000 -0600 -+++ acpica-unix2-20160930/source/components/events/evgpeblk.c 2017-01-09 14:08:41.322587039 -0700 -@@ -376,6 +376,7 @@ +Index: acpica-unix2-20161117/source/components/events/evgpeblk.c +=================================================================== +--- acpica-unix2-20161117.orig/source/components/events/evgpeblk.c ++++ acpica-unix2-20161117/source/components/events/evgpeblk.c +@@ -376,6 +376,7 @@ AcpiEvCreateGpeBlock ( ACPI_STATUS Status; ACPI_GPE_BLOCK_INFO *GpeBlock; ACPI_GPE_WALK_INFO WalkInfo; @@ -3404,7 +3343,7 @@ diff -Naur acpica-unix2-20160930.ref/source/components/events/evgpeblk.c acpica- ACPI_FUNCTION_TRACE (EvCreateGpeBlock); -@@ -396,7 +397,7 @@ +@@ -396,7 +397,7 @@ AcpiEvCreateGpeBlock ( /* Initialize the new GPE block */ @@ -3413,7 +3352,7 @@ diff -Naur acpica-unix2-20160930.ref/source/components/events/evgpeblk.c acpica- GpeBlock->SpaceId = SpaceId; GpeBlock->Node = GpeDevice; GpeBlock->GpeCount = (UINT16) (RegisterCount * ACPI_GPE_REGISTER_WIDTH); -@@ -445,11 +446,13 @@ +@@ -445,11 +446,13 @@ AcpiEvCreateGpeBlock ( (*ReturnGpeBlock) = GpeBlock; } @@ -3428,10 +3367,11 @@ diff -Naur acpica-unix2-20160930.ref/source/components/events/evgpeblk.c acpica- InterruptNumber == AcpiGbl_FADT.SciInterrupt ? " (SCI)" : "")); /* Update global count of currently available GPEs */ -diff -Naur acpica-unix2-20160930.ref/source/components/hardware/hwregs.c acpica-unix2-20160930/source/components/hardware/hwregs.c ---- acpica-unix2-20160930.ref/source/components/hardware/hwregs.c 2017-01-09 14:05:46.298545684 -0700 -+++ acpica-unix2-20160930/source/components/hardware/hwregs.c 2017-01-09 14:08:41.322587039 -0700 -@@ -104,7 +104,7 @@ +Index: acpica-unix2-20161117/source/components/hardware/hwregs.c +=================================================================== +--- acpica-unix2-20161117.orig/source/components/hardware/hwregs.c ++++ acpica-unix2-20161117/source/components/hardware/hwregs.c +@@ -104,7 +104,7 @@ AcpiHwValidateRegister ( * Address must not be null. A null address also indicates an optional * ACPI register that is not supported, so no error message. */ @@ -3440,10 +3380,11 @@ diff -Naur acpica-unix2-20160930.ref/source/components/hardware/hwregs.c acpica- if (!(*Address)) { return (AE_BAD_ADDRESS); -diff -Naur acpica-unix2-20160930.ref/source/components/hardware/hwvalid.c acpica-unix2-20160930/source/components/hardware/hwvalid.c ---- acpica-unix2-20160930.ref/source/components/hardware/hwvalid.c 2016-09-30 10:43:59.000000000 -0600 -+++ acpica-unix2-20160930/source/components/hardware/hwvalid.c 2017-01-09 14:08:41.322587039 -0700 -@@ -135,6 +135,8 @@ +Index: acpica-unix2-20161117/source/components/hardware/hwvalid.c +=================================================================== +--- acpica-unix2-20161117.orig/source/components/hardware/hwvalid.c ++++ acpica-unix2-20161117/source/components/hardware/hwvalid.c +@@ -135,6 +135,8 @@ AcpiHwValidateIoRequest ( UINT32 ByteWidth; ACPI_IO_ADDRESS LastAddress; const ACPI_PORT_INFO *PortInfo; @@ -3452,7 +3393,7 @@ diff -Naur acpica-unix2-20160930.ref/source/components/hardware/hwvalid.c acpica ACPI_FUNCTION_TRACE (HwValidateIoRequest); -@@ -161,7 +163,10 @@ +@@ -161,7 +163,10 @@ AcpiHwValidateIoRequest ( /* Maximum 16-bit address in I/O space */ @@ -3464,10 +3405,11 @@ diff -Naur acpica-unix2-20160930.ref/source/components/hardware/hwvalid.c acpica { ACPI_ERROR ((AE_INFO, "Illegal I/O port address/length above 64K: %8.8X%8.8X/0x%X", -diff -Naur acpica-unix2-20160930.ref/source/components/namespace/nsaccess.c acpica-unix2-20160930/source/components/namespace/nsaccess.c ---- acpica-unix2-20160930.ref/source/components/namespace/nsaccess.c 2016-09-30 10:43:59.000000000 -0600 -+++ acpica-unix2-20160930/source/components/namespace/nsaccess.c 2017-01-09 14:07:05.396112449 -0700 -@@ -309,6 +309,7 @@ +Index: acpica-unix2-20161117/source/components/namespace/nsaccess.c +=================================================================== +--- acpica-unix2-20161117.orig/source/components/namespace/nsaccess.c ++++ acpica-unix2-20161117/source/components/namespace/nsaccess.c +@@ -309,6 +309,7 @@ AcpiNsLookup ( ACPI_OBJECT_TYPE ThisSearchType; UINT32 SearchParentFlag = ACPI_NS_SEARCH_PARENT; UINT32 LocalFlags; @@ -3475,7 +3417,7 @@ diff -Naur acpica-unix2-20160930.ref/source/components/namespace/nsaccess.c acpi ACPI_FUNCTION_TRACE (NsLookup); -@@ -657,9 +658,10 @@ +@@ -657,9 +658,10 @@ AcpiNsLookup ( { /* Complain about a type mismatch */ @@ -3487,10 +3429,11 @@ diff -Naur acpica-unix2-20160930.ref/source/components/namespace/nsaccess.c acpi AcpiUtGetTypeName (ThisNode->Type), AcpiUtGetTypeName (TypeToCheckFor))); } -diff -Naur acpica-unix2-20160930.ref/source/components/namespace/nsparse.c acpica-unix2-20160930/source/components/namespace/nsparse.c ---- acpica-unix2-20160930.ref/source/components/namespace/nsparse.c 2016-09-30 10:43:59.000000000 -0600 -+++ acpica-unix2-20160930/source/components/namespace/nsparse.c 2017-01-09 14:06:45.487221490 -0700 -@@ -196,13 +196,14 @@ +Index: acpica-unix2-20161117/source/components/namespace/nsparse.c +=================================================================== +--- acpica-unix2-20161117.orig/source/components/namespace/nsparse.c ++++ acpica-unix2-20161117/source/components/namespace/nsparse.c +@@ -196,13 +196,14 @@ AcpiNsOneCompleteParse ( /* Table must consist of at least a complete header */ @@ -3507,10 +3450,11 @@ diff -Naur acpica-unix2-20160930.ref/source/components/namespace/nsparse.c acpic Status = AcpiTbGetOwnerId (TableIndex, &OwnerId); if (ACPI_FAILURE (Status)) -diff -Naur acpica-unix2-20160930.ref/source/components/tables/tbdata.c acpica-unix2-20160930/source/components/tables/tbdata.c ---- acpica-unix2-20160930.ref/source/components/tables/tbdata.c 2016-09-30 10:43:59.000000000 -0600 -+++ acpica-unix2-20160930/source/components/tables/tbdata.c 2017-01-09 14:08:41.322587039 -0700 -@@ -407,6 +407,7 @@ +Index: acpica-unix2-20161117/source/components/tables/tbdata.c +=================================================================== +--- acpica-unix2-20161117.orig/source/components/tables/tbdata.c ++++ acpica-unix2-20161117/source/components/tables/tbdata.c +@@ -407,6 +407,7 @@ AcpiTbVerifyTempTable ( char *Signature) { ACPI_STATUS Status = AE_OK; @@ -3518,7 +3462,7 @@ diff -Naur acpica-unix2-20160930.ref/source/components/tables/tbdata.c acpica-un ACPI_FUNCTION_TRACE (TbVerifyTempTable); -@@ -436,7 +437,8 @@ +@@ -436,7 +437,8 @@ AcpiTbVerifyTempTable ( if (AcpiGbl_VerifyTableChecksum) { @@ -3528,63 +3472,11 @@ diff -Naur acpica-unix2-20160930.ref/source/components/tables/tbdata.c acpica-un if (ACPI_FAILURE (Status)) { ACPI_EXCEPTION ((AE_INFO, AE_NO_MEMORY, -diff -Naur acpica-unix2-20160930.ref/source/components/tables/tbfadt.c acpica-unix2-20160930/source/components/tables/tbfadt.c ---- acpica-unix2-20160930.ref/source/components/tables/tbfadt.c 2017-01-09 14:05:46.298545684 -0700 -+++ acpica-unix2-20160930/source/components/tables/tbfadt.c 2017-01-09 14:08:41.323587033 -0700 -@@ -341,6 +341,7 @@ - { - UINT32 Length; - ACPI_TABLE_HEADER *Table; -+ UINT64 Tmp64; - - - /* -@@ -350,10 +351,11 @@ - * Get a local copy of the FADT and convert it to a common format - * Map entire FADT, assumed to be smaller than one page. - */ -- Length = AcpiGbl_RootTableList.Tables[AcpiGbl_FadtIndex].Length; -+ ACPI_MOVE_32_TO_32(&Length, -+ &AcpiGbl_RootTableList.Tables[AcpiGbl_FadtIndex].Length); - - Table = AcpiOsMapMemory ( -- AcpiGbl_RootTableList.Tables[AcpiGbl_FadtIndex].Address, Length); -+ AcpiGbl_RootTableList.Tables[AcpiGbl_FadtIndex].Address, Length); - if (!Table) - { - return; -@@ -375,8 +377,9 @@ - - /* Obtain the DSDT and FACS tables via their addresses within the FADT */ - -+ ACPI_MOVE_64_TO_64(&Tmp64, &AcpiGbl_FADT.XDsdt); - AcpiTbInstallStandardTable ( -- (ACPI_PHYSICAL_ADDRESS) AcpiGbl_FADT.XDsdt, -+ (ACPI_PHYSICAL_ADDRESS) Tmp64, - ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL, FALSE, TRUE, - &AcpiGbl_DsdtIndex); - -@@ -386,15 +389,17 @@ - { - if (AcpiGbl_FADT.Facs) - { -+ ACPI_MOVE_32_TO_64(&Tmp64, &AcpiGbl_FADT.Facs); - AcpiTbInstallStandardTable ( -- (ACPI_PHYSICAL_ADDRESS) AcpiGbl_FADT.Facs, -+ (ACPI_PHYSICAL_ADDRESS) Tmp64, - ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL, FALSE, TRUE, - &AcpiGbl_FacsIndex); - } - if (AcpiGbl_FADT.XFacs) - { -+ ACPI_MOVE_64_TO_64(&Tmp64, &AcpiGbl_FADT.XFacs); - AcpiTbInstallStandardTable ( -- (ACPI_PHYSICAL_ADDRESS) AcpiGbl_FADT.XFacs, -+ (ACPI_PHYSICAL_ADDRESS) Tmp64, - ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL, FALSE, TRUE, - &AcpiGbl_XFacsIndex); - } -@@ -519,6 +524,8 @@ +Index: acpica-unix2-20161117/source/components/tables/tbfadt.c +=================================================================== +--- acpica-unix2-20161117.orig/source/components/tables/tbfadt.c ++++ acpica-unix2-20161117/source/components/tables/tbfadt.c +@@ -520,6 +520,8 @@ AcpiTbConvertFadt ( UINT8 Length; UINT8 Flags; UINT32 i; @@ -3593,17 +3485,17 @@ diff -Naur acpica-unix2-20160930.ref/source/components/tables/tbfadt.c acpica-un /* -@@ -534,7 +541,8 @@ - * - * Note: FADT revision 3 is the ACPI 2.0 version of the FADT. +@@ -533,7 +535,8 @@ AcpiTbConvertFadt ( + * Note: The FADT revision value is unreliable. Only the length can be + * trusted. */ -- if (AcpiGbl_FADT.Header.Length <= ACPI_FADT_V3_SIZE) +- if (AcpiGbl_FADT.Header.Length <= ACPI_FADT_V2_SIZE) + ACPI_MOVE_32_TO_32(&Tmp32, &AcpiGbl_FADT.Header.Length); -+ if (Tmp32 <= ACPI_FADT_V3_SIZE) ++ if (Tmp32 <= ACPI_FADT_V2_SIZE) { AcpiGbl_FADT.PreferredProfile = 0; AcpiGbl_FADT.PstateControl = 0; -@@ -547,14 +555,15 @@ +@@ -546,14 +549,15 @@ AcpiTbConvertFadt ( * current FADT version as defined by the ACPI specification. * Thus, we will have a common FADT internally. */ @@ -3622,7 +3514,7 @@ diff -Naur acpica-unix2-20160930.ref/source/components/tables/tbfadt.c acpica-un /* If Hardware Reduced flag is set, we are all done */ -@@ -615,7 +624,9 @@ +@@ -614,7 +618,9 @@ AcpiTbConvertFadt ( { if (Address64->Address) { @@ -3633,7 +3525,7 @@ diff -Naur acpica-unix2-20160930.ref/source/components/tables/tbfadt.c acpica-un { /* Address mismatch */ -@@ -656,9 +667,11 @@ +@@ -655,9 +661,11 @@ AcpiTbConvertFadt ( */ if (!Address64->Address || AcpiGbl_Use32BitFadtAddresses) { @@ -3646,7 +3538,7 @@ diff -Naur acpica-unix2-20160930.ref/source/components/tables/tbfadt.c acpica-un } } -@@ -781,10 +794,14 @@ +@@ -780,10 +788,14 @@ AcpiTbSetupFadtRegisters ( if (Source64->Address) { @@ -3663,10 +3555,11 @@ diff -Naur acpica-unix2-20160930.ref/source/components/tables/tbfadt.c acpica-un "PmRegisters", 0); } } -diff -Naur acpica-unix2-20160930.ref/source/components/tables/tbfind.c acpica-unix2-20160930/source/components/tables/tbfind.c ---- acpica-unix2-20160930.ref/source/components/tables/tbfind.c 2016-09-30 10:43:59.000000000 -0600 -+++ acpica-unix2-20160930/source/components/tables/tbfind.c 2017-01-09 14:08:41.323587033 -0700 -@@ -108,8 +108,11 @@ +Index: acpica-unix2-20161117/source/components/tables/tbfind.c +=================================================================== +--- acpica-unix2-20161117.orig/source/components/tables/tbfind.c ++++ acpica-unix2-20161117/source/components/tables/tbfind.c +@@ -108,8 +108,11 @@ AcpiTbFindTable ( (void) AcpiUtAcquireMutex (ACPI_MTX_TABLES); for (i = 0; i < AcpiGbl_RootTableList.CurrentTableCount; ++i) { @@ -3679,10 +3572,11 @@ diff -Naur acpica-unix2-20160930.ref/source/components/tables/tbfind.c acpica-un { /* Not the requested table */ -diff -Naur acpica-unix2-20160930.ref/source/components/tables/tbprint.c acpica-unix2-20160930/source/components/tables/tbprint.c ---- acpica-unix2-20160930.ref/source/components/tables/tbprint.c 2016-09-30 10:43:59.000000000 -0600 -+++ acpica-unix2-20160930/source/components/tables/tbprint.c 2017-01-09 14:06:45.488221485 -0700 -@@ -143,15 +143,18 @@ +Index: acpica-unix2-20161117/source/components/tables/tbprint.c +=================================================================== +--- acpica-unix2-20161117.orig/source/components/tables/tbprint.c ++++ acpica-unix2-20161117/source/components/tables/tbprint.c +@@ -143,15 +143,18 @@ AcpiTbPrintTableHeader ( ACPI_TABLE_HEADER *Header) { ACPI_TABLE_HEADER LocalHeader; @@ -3703,7 +3597,7 @@ diff -Naur acpica-unix2-20160930.ref/source/components/tables/tbprint.c acpica-u } else if (ACPI_VALIDATE_RSDP_SIG (Header->Signature)) { -@@ -174,13 +177,16 @@ +@@ -174,13 +177,16 @@ AcpiTbPrintTableHeader ( AcpiTbCleanupTableHeader (&LocalHeader, Header); @@ -3723,10 +3617,11 @@ diff -Naur acpica-unix2-20160930.ref/source/components/tables/tbprint.c acpica-u } } -diff -Naur acpica-unix2-20160930.ref/source/components/tables/tbutils.c acpica-unix2-20160930/source/components/tables/tbutils.c ---- acpica-unix2-20160930.ref/source/components/tables/tbutils.c 2016-09-30 10:43:59.000000000 -0600 -+++ acpica-unix2-20160930/source/components/tables/tbutils.c 2017-01-09 14:08:41.323587033 -0700 -@@ -238,7 +238,7 @@ +Index: acpica-unix2-20161117/source/components/tables/tbutils.c +=================================================================== +--- acpica-unix2-20161117.orig/source/components/tables/tbutils.c ++++ acpica-unix2-20161117/source/components/tables/tbutils.c +@@ -238,7 +238,7 @@ AcpiTbGetRootTableEntry ( * 64-bit platform, XSDT: Move (unaligned) 64-bit to local, * return 64-bit */ @@ -3735,7 +3630,7 @@ diff -Naur acpica-unix2-20160930.ref/source/components/tables/tbutils.c acpica-u #if ACPI_MACHINE_WIDTH == 32 if (Address64 > ACPI_UINT32_MAX) -@@ -251,7 +251,8 @@ +@@ -251,7 +251,8 @@ AcpiTbGetRootTableEntry ( ACPI_FORMAT_UINT64 (Address64))); } #endif @@ -3745,7 +3640,7 @@ diff -Naur acpica-unix2-20160930.ref/source/components/tables/tbutils.c acpica-u } } -@@ -287,6 +288,7 @@ +@@ -287,6 +288,7 @@ AcpiTbParseRootTable ( UINT8 *TableEntry; ACPI_STATUS Status; UINT32 TableIndex; @@ -3753,7 +3648,7 @@ diff -Naur acpica-unix2-20160930.ref/source/components/tables/tbutils.c acpica-u ACPI_FUNCTION_TRACE (TbParseRootTable); -@@ -345,7 +347,7 @@ +@@ -345,7 +347,7 @@ AcpiTbParseRootTable ( * Validate length of the table, and map entire table. * Minimum length table must contain at least one entry. */ @@ -3762,7 +3657,7 @@ diff -Naur acpica-unix2-20160930.ref/source/components/tables/tbutils.c acpica-u AcpiOsUnmapMemory (Table, sizeof (ACPI_TABLE_HEADER)); if (Length < (sizeof (ACPI_TABLE_HEADER) + TableEntrySize)) -@@ -372,7 +374,7 @@ +@@ -372,7 +374,7 @@ AcpiTbParseRootTable ( /* Get the number of entries and pointer to first entry */ @@ -3771,7 +3666,7 @@ diff -Naur acpica-unix2-20160930.ref/source/components/tables/tbutils.c acpica-u TableEntrySize); TableEntry = ACPI_ADD_PTR (UINT8, Table, sizeof (ACPI_TABLE_HEADER)); -@@ -394,10 +396,10 @@ +@@ -394,10 +396,10 @@ AcpiTbParseRootTable ( Status = AcpiTbInstallStandardTable (Address, ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL, FALSE, TRUE, &TableIndex); @@ -3785,23 +3680,11 @@ diff -Naur acpica-unix2-20160930.ref/source/components/tables/tbutils.c acpica-u { AcpiGbl_FadtIndex = TableIndex; AcpiTbParseFadt (); -diff -Naur acpica-unix2-20160930.ref/source/components/tables/tbxface.c acpica-unix2-20160930/source/components/tables/tbxface.c ---- acpica-unix2-20160930.ref/source/components/tables/tbxface.c 2016-09-30 10:43:59.000000000 -0600 -+++ acpica-unix2-20160930/source/components/tables/tbxface.c 2017-01-09 14:08:41.323587033 -0700 -@@ -246,8 +246,11 @@ - - for (i = 0, j = 0; i < AcpiGbl_RootTableList.CurrentTableCount; i++) - { -+ UINT32 Tmp32; -+ -+ ACPI_MOVE_32_TO_32(&Tmp32, (UINT32 *)Signature); - if (!ACPI_COMPARE_NAME ( -- &(AcpiGbl_RootTableList.Tables[i].Signature), Signature)) -+ &(AcpiGbl_RootTableList.Tables[i].Signature), &Tmp32)) - { - continue; - } -@@ -332,8 +335,11 @@ +Index: acpica-unix2-20161117/source/components/tables/tbxface.c +=================================================================== +--- acpica-unix2-20161117.orig/source/components/tables/tbxface.c ++++ acpica-unix2-20161117/source/components/tables/tbxface.c +@@ -263,8 +263,11 @@ AcpiGetTableHeader ( for (i = 0, j = 0; i < AcpiGbl_RootTableList.CurrentTableCount; i++) { @@ -3814,10 +3697,11 @@ diff -Naur acpica-unix2-20160930.ref/source/components/tables/tbxface.c acpica-u { continue; } -diff -Naur acpica-unix2-20160930.ref/source/components/tables/tbxfload.c acpica-unix2-20160930/source/components/tables/tbxfload.c ---- acpica-unix2-20160930.ref/source/components/tables/tbxfload.c 2016-09-30 10:43:59.000000000 -0600 -+++ acpica-unix2-20160930/source/components/tables/tbxfload.c 2017-01-09 14:08:41.323587033 -0700 -@@ -156,6 +156,7 @@ +Index: acpica-unix2-20161117/source/components/tables/tbxfload.c +=================================================================== +--- acpica-unix2-20161117.orig/source/components/tables/tbxfload.c ++++ acpica-unix2-20161117/source/components/tables/tbxfload.c +@@ -156,6 +156,7 @@ AcpiTbLoadNamespace ( ACPI_TABLE_DESC *Table; UINT32 TablesLoaded = 0; UINT32 TablesFailed = 0; @@ -3825,7 +3709,7 @@ diff -Naur acpica-unix2-20160930.ref/source/components/tables/tbxfload.c acpica- ACPI_FUNCTION_TRACE (TbLoadNamespace); -@@ -169,8 +170,9 @@ +@@ -169,8 +170,9 @@ AcpiTbLoadNamespace ( */ Table = &AcpiGbl_RootTableList.Tables[AcpiGbl_DsdtIndex]; @@ -3836,9 +3720,10 @@ diff -Naur acpica-unix2-20160930.ref/source/components/tables/tbxfload.c acpica- ACPI_FAILURE (AcpiTbValidateTable (Table))) { Status = AE_NO_ACPI_TABLES; -diff -Naur acpica-unix2-20160930.ref/source/include/acmacros.h acpica-unix2-20160930/source/include/acmacros.h ---- acpica-unix2-20160930.ref/source/include/acmacros.h 2017-01-09 14:05:46.289545733 -0700 -+++ acpica-unix2-20160930/source/include/acmacros.h 2017-01-09 14:07:05.397112443 -0700 +Index: acpica-unix2-20161117/source/include/acmacros.h +=================================================================== +--- acpica-unix2-20161117.orig/source/include/acmacros.h ++++ acpica-unix2-20161117/source/include/acmacros.h @@ -98,7 +98,9 @@ ((UINT8 *)(void *)(d))[6] = ((UINT8 *)(void *)(s))[1];\ ((UINT8 *)(void *)(d))[7] = ((UINT8 *)(void *)(s))[0];} @@ -3902,9 +3787,10 @@ diff -Naur acpica-unix2-20160930.ref/source/include/acmacros.h acpica-unix2-2016 #define ACPI_MOVE_32_TO_16(d, s) ACPI_MOVE_16_TO_16(d, s) /* Truncate to 16 */ -diff -Naur acpica-unix2-20160930.ref/source/include/platform/aclinux.h acpica-unix2-20160930/source/include/platform/aclinux.h ---- acpica-unix2-20160930.ref/source/include/platform/aclinux.h 2017-01-09 14:05:46.303545656 -0700 -+++ acpica-unix2-20160930/source/include/platform/aclinux.h 2017-01-09 14:06:45.488221485 -0700 +Index: acpica-unix2-20161117/source/include/platform/aclinux.h +=================================================================== +--- acpica-unix2-20161117.orig/source/include/platform/aclinux.h ++++ acpica-unix2-20161117/source/include/platform/aclinux.h @@ -210,6 +210,10 @@ #define __cdecl #endif @@ -3916,10 +3802,11 @@ diff -Naur acpica-unix2-20160930.ref/source/include/platform/aclinux.h acpica-un #endif /* __KERNEL__ */ #endif /* __ACLINUX_H__ */ -diff -Naur acpica-unix2-20160930.ref/source/tools/acpiexec/aetables.c acpica-unix2-20160930/source/tools/acpiexec/aetables.c ---- acpica-unix2-20160930.ref/source/tools/acpiexec/aetables.c 2016-09-30 10:44:01.000000000 -0600 -+++ acpica-unix2-20160930/source/tools/acpiexec/aetables.c 2017-01-09 14:08:41.324587028 -0700 -@@ -146,21 +146,25 @@ +Index: acpica-unix2-20161117/source/tools/acpiexec/aetables.c +=================================================================== +--- acpica-unix2-20161117.orig/source/tools/acpiexec/aetables.c ++++ acpica-unix2-20161117/source/tools/acpiexec/aetables.c +@@ -146,21 +146,25 @@ AeInitializeTableHeader ( char *Signature, UINT32 Length) { @@ -3949,7 +3836,7 @@ diff -Naur acpica-unix2-20160930.ref/source/tools/acpiexec/aetables.c acpica-uni } -@@ -188,6 +192,7 @@ +@@ -188,6 +192,7 @@ AeBuildLocalTables ( ACPI_NEW_TABLE_DESC *NextTable; UINT32 NextIndex; ACPI_TABLE_FADT *ExternalFadt = NULL; @@ -3957,7 +3844,7 @@ diff -Naur acpica-unix2-20160930.ref/source/tools/acpiexec/aetables.c acpica-uni /* -@@ -374,6 +379,8 @@ +@@ -374,6 +379,8 @@ AeBuildLocalTables ( } else { @@ -3966,7 +3853,7 @@ diff -Naur acpica-unix2-20160930.ref/source/tools/acpiexec/aetables.c acpica-uni /* * Build a local FADT so we can test the hardware/event init */ -@@ -385,34 +392,44 @@ +@@ -385,34 +392,44 @@ AeBuildLocalTables ( LocalFADT.Facs = 0; LocalFADT.XDsdt = DsdtAddress; @@ -4020,7 +3907,7 @@ diff -Naur acpica-unix2-20160930.ref/source/tools/acpiexec/aetables.c acpica-uni LocalFADT.XPm1bEventBlock.BitWidth = (UINT8) ACPI_MUL_8 (LocalFADT.Pm1EventLength); } -@@ -425,13 +442,17 @@ +@@ -425,13 +442,17 @@ AeBuildLocalTables ( memset (&LocalFACS, 0, sizeof (ACPI_TABLE_FACS)); ACPI_MOVE_NAME (LocalFACS.Signature, ACPI_SIG_FACS); @@ -4040,7 +3927,7 @@ diff -Naur acpica-unix2-20160930.ref/source/tools/acpiexec/aetables.c acpica-uni /* * Build a fake table [TEST] so that we make sure that the * ACPICA core ignores it -@@ -440,11 +461,12 @@ +@@ -440,11 +461,12 @@ AeBuildLocalTables ( ACPI_MOVE_NAME (LocalTEST.Signature, "TEST"); LocalTEST.Revision = 1; @@ -4055,7 +3942,7 @@ diff -Naur acpica-unix2-20160930.ref/source/tools/acpiexec/aetables.c acpica-uni /* * Build a fake table with a bad signature [BAD!] so that we make -@@ -454,11 +476,12 @@ +@@ -454,11 +476,12 @@ AeBuildLocalTables ( ACPI_MOVE_NAME (LocalBADTABLE.Signature, "BAD!"); LocalBADTABLE.Revision = 1;