rpms/acpica-tools
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update source to 20171215 version

Browse Source 
Signed-off-by: Al Stone <ahs3@redhat.com>
This commit is contained in:
Al Stone 2018-01-08 11:44:03 -07:00
parent fd1a3d2421
commit 226b598efa
4 changed files with 185 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -80,3 +80,5 @@
/acpitests-unix-20170929.tar.gz /acpitests-unix-20170929.tar.gz
/acpica-unix2-20171110.tar.gz /acpica-unix2-20171110.tar.gz
/acpitests-unix-20171110.tar.gz /acpitests-unix-20171110.tar.gz
/acpica-unix2-20171215.tar.gz
/acpitests-unix-20171215.tar.gz

5
acpica-tools.spec
View File

@ -1,5 +1,5 @@
Name: acpica-tools Name: acpica-tools
Version: 20171110 Version: 20171215
Release: 1%{?dist} Release: 1%{?dist}
Summary: ACPICA tools for the development and debug of ACPI tables Summary: ACPICA tools for the development and debug of ACPI tables
@ -190,6 +190,9 @@ fi
%changelog %changelog
* Mon Jan 8 2018 Al Stone <ahs3@redhat.com> - 20171215-1
- Update to 20171215 source tree, including patch refeshes
* Mon Nov 20 2017 Al Stone <ahs3@redhat.com> - 20171110-1 * Mon Nov 20 2017 Al Stone <ahs3@redhat.com> - 20171110-1
- Update to 20171110 source tree, including patch refeshes - Update to 20171110 source tree, including patch refeshes
- Add patch for mips64el build, should it ever be needed; it also cleans - Add patch for mips64el build, should it ever be needed; it also cleans

354
big-endian.patch
View File

@ -23,10 +23,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/include/platform/aclinux.h | 8 ++ source/include/platform/aclinux.h | 8 ++
12 files changed, 487 insertions(+), 283 deletions(-) 12 files changed, 487 insertions(+), 283 deletions(-)
Index: acpica-unix-20171110/source/compiler/aslcodegen.c Index: acpica-unix2-20171215/source/compiler/aslcodegen.c
=================================================================== ===================================================================
--- acpica-unix-20171110.orig/source/compiler/aslcodegen.c --- acpica-unix2-20171215.orig/source/compiler/aslcodegen.c
+++ acpica-unix-20171110/source/compiler/aslcodegen.c +++ acpica-unix2-20171215/source/compiler/aslcodegen.c
@@ -240,16 +240,12 @@ CgWriteAmlOpcode ( @@ -240,16 +240,12 @@ CgWriteAmlOpcode (
ACPI_PARSE_OBJECT *Op) ACPI_PARSE_OBJECT *Op)
{ {
@ -239,8 +239,8 @@ Index: acpica-unix-20171110/source/compiler/aslcodegen.c
+ UINT64 QWord; + UINT64 QWord;
/* Write all comments here. */ /* Write all comments here. */
if (Gbl_CaptureComments)
@@ -674,13 +684,24 @@ CgWriteNode ( @@ -675,13 +685,24 @@ CgWriteNode (
switch (Op->Asl.AmlOpcode) switch (Op->Asl.AmlOpcode)
{ {
case AML_RAW_DATA_BYTE: case AML_RAW_DATA_BYTE:
@ -268,10 +268,10 @@ Index: acpica-unix-20171110/source/compiler/aslcodegen.c
case AML_RAW_DATA_BUFFER: case AML_RAW_DATA_BUFFER:
Index: acpica-unix-20171110/source/compiler/aslopcodes.c Index: acpica-unix2-20171215/source/compiler/aslopcodes.c
=================================================================== ===================================================================
--- acpica-unix-20171110.orig/source/compiler/aslopcodes.c --- acpica-unix2-20171215.orig/source/compiler/aslopcodes.c
+++ acpica-unix-20171110/source/compiler/aslopcodes.c +++ acpica-unix2-20171215/source/compiler/aslopcodes.c
@@ -485,6 +485,7 @@ OpcDoUnicode ( @@ -485,6 +485,7 @@ OpcDoUnicode (
UINT32 i; UINT32 i;
UINT8 *AsciiString; UINT8 *AsciiString;
@ -290,10 +290,10 @@ Index: acpica-unix-20171110/source/compiler/aslopcodes.c
} }
/* /*
Index: acpica-unix-20171110/source/compiler/aslrestype1.c Index: acpica-unix2-20171215/source/compiler/aslrestype1.c
=================================================================== ===================================================================
--- acpica-unix-20171110.orig/source/compiler/aslrestype1.c --- acpica-unix2-20171215.orig/source/compiler/aslrestype1.c
+++ acpica-unix-20171110/source/compiler/aslrestype1.c +++ acpica-unix2-20171215/source/compiler/aslrestype1.c
@@ -142,6 +142,11 @@ RsDoMemory24Descriptor ( @@ -142,6 +142,11 @@ RsDoMemory24Descriptor (
ACPI_PARSE_OBJECT *LengthOp = NULL; ACPI_PARSE_OBJECT *LengthOp = NULL;
ASL_RESOURCE_NODE *Rnode; ASL_RESOURCE_NODE *Rnode;
@ -490,10 +490,10 @@ Index: acpica-unix-20171110/source/compiler/aslrestype1.c
RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH, RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
CurrentByteOffset + ASL_RESDESC_OFFSET (FixedMemory32.AddressLength)); CurrentByteOffset + ASL_RESDESC_OFFSET (FixedMemory32.AddressLength));
break; break;
Index: acpica-unix-20171110/source/compiler/aslrestype1i.c Index: acpica-unix2-20171215/source/compiler/aslrestype1i.c
=================================================================== ===================================================================
--- acpica-unix-20171110.orig/source/compiler/aslrestype1i.c --- acpica-unix2-20171215.orig/source/compiler/aslrestype1i.c
+++ acpica-unix-20171110/source/compiler/aslrestype1i.c +++ acpica-unix2-20171215/source/compiler/aslrestype1i.c
@@ -198,6 +198,8 @@ RsDoFixedDmaDescriptor ( @@ -198,6 +198,8 @@ RsDoFixedDmaDescriptor (
ACPI_PARSE_OBJECT *InitializerOp; ACPI_PARSE_OBJECT *InitializerOp;
ASL_RESOURCE_NODE *Rnode; ASL_RESOURCE_NODE *Rnode;
@ -630,10 +630,10 @@ Index: acpica-unix-20171110/source/compiler/aslrestype1i.c
+ ACPI_MOVE_16_TO_16(&Descriptor->Irq.IrqMask, &IrqMask); + ACPI_MOVE_16_TO_16(&Descriptor->Irq.IrqMask, &IrqMask);
return (Rnode); return (Rnode);
} }
Index: acpica-unix-20171110/source/compiler/aslrestype2.c Index: acpica-unix2-20171215/source/compiler/aslrestype2.c
=================================================================== ===================================================================
--- acpica-unix-20171110.orig/source/compiler/aslrestype2.c --- acpica-unix2-20171215.orig/source/compiler/aslrestype2.c
+++ acpica-unix-20171110/source/compiler/aslrestype2.c +++ acpica-unix2-20171215/source/compiler/aslrestype2.c
@@ -76,6 +76,7 @@ RsDoGeneralRegisterDescriptor ( @@ -76,6 +76,7 @@ RsDoGeneralRegisterDescriptor (
ACPI_PARSE_OBJECT *InitializerOp; ACPI_PARSE_OBJECT *InitializerOp;
ASL_RESOURCE_NODE *Rnode; ASL_RESOURCE_NODE *Rnode;
@ -774,10 +774,10 @@ Index: acpica-unix-20171110/source/compiler/aslrestype2.c
/* Point to end-of-descriptor for vendor data */ /* Point to end-of-descriptor for vendor data */
Index: acpica-unix-20171110/source/compiler/aslrestype2d.c Index: acpica-unix2-20171215/source/compiler/aslrestype2d.c
=================================================================== ===================================================================
--- acpica-unix-20171110.orig/source/compiler/aslrestype2d.c --- acpica-unix2-20171215.orig/source/compiler/aslrestype2d.c
+++ acpica-unix-20171110/source/compiler/aslrestype2d.c +++ acpica-unix2-20171215/source/compiler/aslrestype2d.c
@@ -79,7 +79,13 @@ RsDoDwordIoDescriptor ( @@ -79,7 +79,13 @@ RsDoDwordIoDescriptor (
ACPI_PARSE_OBJECT *GranOp = NULL; ACPI_PARSE_OBJECT *GranOp = NULL;
ASL_RESOURCE_NODE *Rnode; ASL_RESOURCE_NODE *Rnode;
@ -1133,10 +1133,10 @@ Index: acpica-unix-20171110/source/compiler/aslrestype2d.c
Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS32) + Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS32) +
OptionIndex + StringLength; OptionIndex + StringLength;
return (Rnode); return (Rnode);
Index: acpica-unix-20171110/source/compiler/aslrestype2e.c Index: acpica-unix2-20171215/source/compiler/aslrestype2e.c
=================================================================== ===================================================================
--- acpica-unix-20171110.orig/source/compiler/aslrestype2e.c --- acpica-unix2-20171215.orig/source/compiler/aslrestype2e.c
+++ acpica-unix-20171110/source/compiler/aslrestype2e.c +++ acpica-unix2-20171215/source/compiler/aslrestype2e.c
@@ -78,6 +78,13 @@ RsDoExtendedIoDescriptor ( @@ -78,6 +78,13 @@ RsDoExtendedIoDescriptor (
ACPI_PARSE_OBJECT *GranOp = NULL; ACPI_PARSE_OBJECT *GranOp = NULL;
ASL_RESOURCE_NODE *Rnode; ASL_RESOURCE_NODE *Rnode;
@ -1242,10 +1242,10 @@ Index: acpica-unix-20171110/source/compiler/aslrestype2e.c
Rnode->BufferLength = sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) + Rnode->BufferLength = sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) +
StringLength; StringLength;
return (Rnode); return (Rnode);
Index: acpica-unix-20171110/source/compiler/aslrestype2q.c Index: acpica-unix2-20171215/source/compiler/aslrestype2q.c
=================================================================== ===================================================================
--- acpica-unix-20171110.orig/source/compiler/aslrestype2q.c --- acpica-unix2-20171215.orig/source/compiler/aslrestype2q.c
+++ acpica-unix-20171110/source/compiler/aslrestype2q.c +++ acpica-unix2-20171215/source/compiler/aslrestype2q.c
@@ -80,7 +80,13 @@ RsDoQwordIoDescriptor ( @@ -80,7 +80,13 @@ RsDoQwordIoDescriptor (
ASL_RESOURCE_NODE *Rnode; ASL_RESOURCE_NODE *Rnode;
UINT8 *OptionalFields; UINT8 *OptionalFields;
@ -1584,10 +1584,10 @@ Index: acpica-unix-20171110/source/compiler/aslrestype2q.c
Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS64) + Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS64) +
OptionIndex + StringLength; OptionIndex + StringLength;
return (Rnode); return (Rnode);
Index: acpica-unix-20171110/source/compiler/aslrestype2s.c Index: acpica-unix2-20171215/source/compiler/aslrestype2s.c
=================================================================== ===================================================================
--- acpica-unix-20171110.orig/source/compiler/aslrestype2s.c --- acpica-unix2-20171215.orig/source/compiler/aslrestype2s.c
+++ acpica-unix-20171110/source/compiler/aslrestype2s.c +++ acpica-unix2-20171215/source/compiler/aslrestype2s.c
@@ -340,9 +340,14 @@ RsDoGpioIntDescriptor ( @@ -340,9 +340,14 @@ RsDoGpioIntDescriptor (
UINT16 VendorLength; UINT16 VendorLength;
UINT16 InterruptLength; UINT16 InterruptLength;
@ -2053,10 +2053,10 @@ Index: acpica-unix-20171110/source/compiler/aslrestype2s.c
MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource); MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource);
return (Rnode); return (Rnode);
} }
Index: acpica-unix-20171110/source/compiler/aslrestype2w.c Index: acpica-unix2-20171215/source/compiler/aslrestype2w.c
=================================================================== ===================================================================
--- acpica-unix-20171110.orig/source/compiler/aslrestype2w.c --- acpica-unix2-20171215.orig/source/compiler/aslrestype2w.c
+++ acpica-unix-20171110/source/compiler/aslrestype2w.c +++ acpica-unix2-20171215/source/compiler/aslrestype2w.c
@@ -81,6 +81,12 @@ RsDoWordIoDescriptor ( @@ -81,6 +81,12 @@ RsDoWordIoDescriptor (
UINT8 *OptionalFields; UINT8 *OptionalFields;
UINT16 StringLength = 0; UINT16 StringLength = 0;
@ -2400,10 +2400,10 @@ Index: acpica-unix-20171110/source/compiler/aslrestype2w.c
Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) + Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) +
OptionIndex + StringLength; OptionIndex + StringLength;
return (Rnode); return (Rnode);
Index: acpica-unix-20171110/source/include/acmacros.h Index: acpica-unix2-20171215/source/include/acmacros.h
=================================================================== ===================================================================
--- acpica-unix-20171110.orig/source/include/acmacros.h --- acpica-unix2-20171215.orig/source/include/acmacros.h
+++ acpica-unix-20171110/source/include/acmacros.h +++ acpica-unix2-20171215/source/include/acmacros.h
@@ -98,9 +98,12 @@ @@ -98,9 +98,12 @@
((UINT8 *)(void *)(d))[6] = ((UINT8 *)(void *)(s))[1];\ ((UINT8 *)(void *)(d))[6] = ((UINT8 *)(void *)(s))[1];\
((UINT8 *)(void *)(d))[7] = ((UINT8 *)(void *)(s))[0];} ((UINT8 *)(void *)(d))[7] = ((UINT8 *)(void *)(s))[0];}
@ -2482,10 +2482,10 @@ Index: acpica-unix-20171110/source/include/acmacros.h
#define ACPI_MOVE_32_TO_16(d, s) ACPI_MOVE_16_TO_16(d, s) /* Truncate to 16 */ #define ACPI_MOVE_32_TO_16(d, s) ACPI_MOVE_16_TO_16(d, s) /* Truncate to 16 */
Index: acpica-unix-20171110/source/include/platform/aclinux.h Index: acpica-unix2-20171215/source/include/platform/aclinux.h
=================================================================== ===================================================================
--- acpica-unix-20171110.orig/source/include/platform/aclinux.h --- acpica-unix2-20171215.orig/source/include/platform/aclinux.h
+++ acpica-unix-20171110/source/include/platform/aclinux.h +++ acpica-unix2-20171215/source/include/platform/aclinux.h
@@ -191,6 +191,7 @@ @@ -191,6 +191,7 @@
#ifdef ACPI_USE_STANDARD_HEADERS #ifdef ACPI_USE_STANDARD_HEADERS
@ -2505,10 +2505,10 @@ Index: acpica-unix-20171110/source/include/platform/aclinux.h
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* __ACLINUX_H__ */ #endif /* __ACLINUX_H__ */
Index: acpica-unix-20171110/source/compiler/aslanalyze.c Index: acpica-unix2-20171215/source/compiler/aslanalyze.c
=================================================================== ===================================================================
--- acpica-unix-20171110.orig/source/compiler/aslanalyze.c --- acpica-unix2-20171215.orig/source/compiler/aslanalyze.c
+++ acpica-unix-20171110/source/compiler/aslanalyze.c +++ acpica-unix2-20171215/source/compiler/aslanalyze.c
@@ -461,7 +461,7 @@ ApCheckForGpeNameConflict ( @@ -461,7 +461,7 @@ ApCheckForGpeNameConflict (
/* Need a null-terminated string version of NameSeg */ /* Need a null-terminated string version of NameSeg */
@ -2527,10 +2527,10 @@ Index: acpica-unix-20171110/source/compiler/aslanalyze.c
/* Inject opposite letter ("L" versus "E") */ /* Inject opposite letter ("L" versus "E") */
Index: acpica-unix-20171110/source/compiler/asllookup.c Index: acpica-unix2-20171215/source/compiler/asllookup.c
=================================================================== ===================================================================
--- acpica-unix-20171110.orig/source/compiler/asllookup.c --- acpica-unix2-20171215.orig/source/compiler/asllookup.c
+++ acpica-unix-20171110/source/compiler/asllookup.c +++ acpica-unix2-20171215/source/compiler/asllookup.c
@@ -119,6 +119,7 @@ LkIsObjectUsed ( @@ -119,6 +119,7 @@ LkIsObjectUsed (
{ {
ACPI_NAMESPACE_NODE *Node = ACPI_CAST_PTR (ACPI_NAMESPACE_NODE, ObjHandle); ACPI_NAMESPACE_NODE *Node = ACPI_CAST_PTR (ACPI_NAMESPACE_NODE, ObjHandle);
@ -2561,10 +2561,10 @@ Index: acpica-unix-20171110/source/compiler/asllookup.c
AslError (ASL_REMARK, ASL_MSG_NOT_REFERENCED, AslError (ASL_REMARK, ASL_MSG_NOT_REFERENCED,
LkGetNameOp (Node->Op), MsgBuffer); LkGetNameOp (Node->Op), MsgBuffer);
return (AE_OK); return (AE_OK);
Index: acpica-unix-20171110/source/compiler/aslmain.c Index: acpica-unix2-20171215/source/compiler/aslmain.c
=================================================================== ===================================================================
--- acpica-unix-20171110.orig/source/compiler/aslmain.c --- acpica-unix2-20171215.orig/source/compiler/aslmain.c
+++ acpica-unix-20171110/source/compiler/aslmain.c +++ acpica-unix2-20171215/source/compiler/aslmain.c
@@ -102,18 +102,6 @@ main ( @@ -102,18 +102,6 @@ main (
signal (SIGINT, AslSignalHandler); signal (SIGINT, AslSignalHandler);
signal (SIGSEGV, AslSignalHandler); signal (SIGSEGV, AslSignalHandler);
@ -2584,10 +2584,10 @@ Index: acpica-unix-20171110/source/compiler/aslmain.c
AcpiOsInitialize (); AcpiOsInitialize ();
ACPI_DEBUG_INITIALIZE (); /* For debug version only */ ACPI_DEBUG_INITIALIZE (); /* For debug version only */
Index: acpica-unix-20171110/source/common/acfileio.c Index: acpica-unix2-20171215/source/common/acfileio.c
=================================================================== ===================================================================
--- acpica-unix-20171110.orig/source/common/acfileio.c --- acpica-unix2-20171215.orig/source/common/acfileio.c
+++ acpica-unix-20171110/source/common/acfileio.c +++ acpica-unix2-20171215/source/common/acfileio.c
@@ -280,6 +280,7 @@ AcGetOneTableFromFile ( @@ -280,6 +280,7 @@ AcGetOneTableFromFile (
ACPI_TABLE_HEADER *Table; ACPI_TABLE_HEADER *Table;
INT32 Count; INT32 Count;
@ -2649,10 +2649,10 @@ Index: acpica-unix-20171110/source/common/acfileio.c
(UINT32) (FileSize - TableOffset)); (UINT32) (FileSize - TableOffset));
return (AE_BAD_HEADER); return (AE_BAD_HEADER);
} }
Index: acpica-unix-20171110/source/common/dmtable.c Index: acpica-unix2-20171215/source/common/dmtable.c
=================================================================== ===================================================================
--- acpica-unix-20171110.orig/source/common/dmtable.c --- acpica-unix2-20171215.orig/source/common/dmtable.c
+++ acpica-unix-20171110/source/common/dmtable.c +++ acpica-unix2-20171215/source/common/dmtable.c
@@ -550,7 +550,7 @@ AcpiDmDumpDataTable ( @@ -550,7 +550,7 @@ AcpiDmDumpDataTable (
*/ */
if (ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_FACS)) if (ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_FACS))
@ -2751,10 +2751,10 @@ Index: acpica-unix-20171110/source/common/dmtable.c
AcpiDmNfitSubnames[Temp16]); AcpiDmNfitSubnames[Temp16]);
break; break;
Index: acpica-unix-20171110/source/common/dmtables.c Index: acpica-unix2-20171215/source/common/dmtables.c
=================================================================== ===================================================================
--- acpica-unix-20171110.orig/source/common/dmtables.c --- acpica-unix2-20171215.orig/source/common/dmtables.c
+++ acpica-unix-20171110/source/common/dmtables.c +++ acpica-unix2-20171215/source/common/dmtables.c
@@ -142,7 +142,9 @@ AdCreateTableHeader ( @@ -142,7 +142,9 @@ AdCreateTableHeader (
ACPI_TABLE_HEADER *Table) ACPI_TABLE_HEADER *Table)
{ {
@ -2820,10 +2820,10 @@ Index: acpica-unix-20171110/source/common/dmtables.c
AmlStart = ((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER)); AmlStart = ((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER));
ASL_CV_INIT_FILETREE(Table, AmlStart, AmlLength); ASL_CV_INIT_FILETREE(Table, AmlStart, AmlLength);
Index: acpica-unix-20171110/source/common/dmtbdump.c Index: acpica-unix2-20171215/source/common/dmtbdump.c
=================================================================== ===================================================================
--- acpica-unix-20171110.orig/source/common/dmtbdump.c --- acpica-unix2-20171215.orig/source/common/dmtbdump.c
+++ acpica-unix-20171110/source/common/dmtbdump.c +++ acpica-unix2-20171215/source/common/dmtbdump.c
@@ -277,6 +277,8 @@ AcpiDmDumpRsdt ( @@ -277,6 +277,8 @@ AcpiDmDumpRsdt (
UINT32 Entries; UINT32 Entries;
UINT32 Offset; UINT32 Offset;
@ -4499,7 +4499,7 @@ Index: acpica-unix-20171110/source/common/dmtbdump.c
Subtable->Length, InfoTable); Subtable->Length, InfoTable);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
@@ -3810,9 +3908,11 @@ void @@ -3809,9 +3907,11 @@ void
AcpiDmDumpSlic ( AcpiDmDumpSlic (
ACPI_TABLE_HEADER *Table) ACPI_TABLE_HEADER *Table)
{ {
@ -4513,7 +4513,7 @@ Index: acpica-unix-20171110/source/common/dmtbdump.c
} }
@@ -3835,14 +3935,17 @@ AcpiDmDumpSlit ( @@ -3834,14 +3934,17 @@ AcpiDmDumpSlit (
ACPI_STATUS Status; ACPI_STATUS Status;
UINT32 Offset; UINT32 Offset;
UINT8 *Row; UINT8 *Row;
@ -4533,7 +4533,7 @@ Index: acpica-unix-20171110/source/common/dmtbdump.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -3850,7 +3953,8 @@ AcpiDmDumpSlit ( @@ -3849,7 +3952,8 @@ AcpiDmDumpSlit (
/* Display the Locality NxN Matrix */ /* Display the Locality NxN Matrix */
@ -4543,7 +4543,7 @@ Index: acpica-unix-20171110/source/common/dmtbdump.c
Offset = ACPI_OFFSET (ACPI_TABLE_SLIT, Entry[0]); Offset = ACPI_OFFSET (ACPI_TABLE_SLIT, Entry[0]);
Row = (UINT8 *) ACPI_CAST_PTR (ACPI_TABLE_SLIT, Table)->Entry; Row = (UINT8 *) ACPI_CAST_PTR (ACPI_TABLE_SLIT, Table)->Entry;
@@ -3863,7 +3967,7 @@ AcpiDmDumpSlit ( @@ -3862,7 +3966,7 @@ AcpiDmDumpSlit (
{ {
/* Check for beyond EOT */ /* Check for beyond EOT */
@ -4552,7 +4552,7 @@ Index: acpica-unix-20171110/source/common/dmtbdump.c
{ {
AcpiOsPrintf ( AcpiOsPrintf (
"\n**** Not enough room in table for all localities\n"); "\n**** Not enough room in table for all localities\n");
@@ -3915,11 +4019,13 @@ AcpiDmDumpSrat ( @@ -3914,11 +4018,13 @@ AcpiDmDumpSrat (
UINT32 Offset = sizeof (ACPI_TABLE_SRAT); UINT32 Offset = sizeof (ACPI_TABLE_SRAT);
ACPI_SUBTABLE_HEADER *Subtable; ACPI_SUBTABLE_HEADER *Subtable;
ACPI_DMTABLE_INFO *InfoTable; ACPI_DMTABLE_INFO *InfoTable;
@ -4567,7 +4567,7 @@ Index: acpica-unix-20171110/source/common/dmtbdump.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -3928,12 +4034,12 @@ AcpiDmDumpSrat ( @@ -3927,12 +4033,12 @@ AcpiDmDumpSrat (
/* Subtables */ /* Subtables */
Subtable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Table, Offset); Subtable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Table, Offset);
@ -4582,7 +4582,7 @@ Index: acpica-unix-20171110/source/common/dmtbdump.c
Subtable->Length, AcpiDmTableInfoSratHdr); Subtable->Length, AcpiDmTableInfoSratHdr);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
@@ -3982,7 +4088,7 @@ AcpiDmDumpSrat ( @@ -3981,7 +4087,7 @@ AcpiDmDumpSrat (
} }
AcpiOsPrintf ("\n"); AcpiOsPrintf ("\n");
@ -4591,7 +4591,7 @@ Index: acpica-unix-20171110/source/common/dmtbdump.c
Subtable->Length, InfoTable); Subtable->Length, InfoTable);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
@@ -4019,13 +4125,14 @@ AcpiDmDumpStao ( @@ -4018,13 +4124,14 @@ AcpiDmDumpStao (
{ {
ACPI_STATUS Status; ACPI_STATUS Status;
char *Namepath; char *Namepath;
@ -4607,7 +4607,7 @@ Index: acpica-unix-20171110/source/common/dmtbdump.c
Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoStao); Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoStao);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
@@ -4034,7 +4141,7 @@ AcpiDmDumpStao ( @@ -4033,7 +4140,7 @@ AcpiDmDumpStao (
/* The rest of the table consists of Namepath strings */ /* The rest of the table consists of Namepath strings */
@ -4616,7 +4616,7 @@ Index: acpica-unix-20171110/source/common/dmtbdump.c
{ {
Namepath = ACPI_ADD_PTR (char, Table, Offset); Namepath = ACPI_ADD_PTR (char, Table, Offset);
StringLength = strlen (Namepath) + 1; StringLength = strlen (Namepath) + 1;
@@ -4076,11 +4183,14 @@ AcpiDmDumpTcpa ( @@ -4075,11 +4182,14 @@ AcpiDmDumpTcpa (
ACPI_TABLE_TCPA_HDR *Subtable = ACPI_ADD_PTR ( ACPI_TABLE_TCPA_HDR *Subtable = ACPI_ADD_PTR (
ACPI_TABLE_TCPA_HDR, Table, Offset); ACPI_TABLE_TCPA_HDR, Table, Offset);
ACPI_STATUS Status; ACPI_STATUS Status;
@ -4632,7 +4632,7 @@ Index: acpica-unix-20171110/source/common/dmtbdump.c
0, AcpiDmTableInfoTcpaHdr); 0, AcpiDmTableInfoTcpaHdr);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
@@ -4091,18 +4201,19 @@ AcpiDmDumpTcpa ( @@ -4090,18 +4200,19 @@ AcpiDmDumpTcpa (
* Examine the PlatformClass field to determine the table type. * Examine the PlatformClass field to determine the table type.
* Either a client or server table. Only one. * Either a client or server table. Only one.
*/ */
@ -4657,7 +4657,7 @@ Index: acpica-unix-20171110/source/common/dmtbdump.c
break; break;
default: default:
@@ -4197,11 +4308,13 @@ AcpiDmDumpVrtc ( @@ -4196,11 +4307,13 @@ AcpiDmDumpVrtc (
ACPI_STATUS Status; ACPI_STATUS Status;
UINT32 Offset = sizeof (ACPI_TABLE_VRTC); UINT32 Offset = sizeof (ACPI_TABLE_VRTC);
ACPI_VRTC_ENTRY *Subtable; ACPI_VRTC_ENTRY *Subtable;
@ -4672,7 +4672,7 @@ Index: acpica-unix-20171110/source/common/dmtbdump.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -4210,12 +4323,12 @@ AcpiDmDumpVrtc ( @@ -4209,12 +4322,12 @@ AcpiDmDumpVrtc (
/* Subtables */ /* Subtables */
Subtable = ACPI_ADD_PTR (ACPI_VRTC_ENTRY, Table, Offset); Subtable = ACPI_ADD_PTR (ACPI_VRTC_ENTRY, Table, Offset);
@ -4687,7 +4687,7 @@ Index: acpica-unix-20171110/source/common/dmtbdump.c
sizeof (ACPI_VRTC_ENTRY), AcpiDmTableInfoVrtc0); sizeof (ACPI_VRTC_ENTRY), AcpiDmTableInfoVrtc0);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
@@ -4250,11 +4363,13 @@ AcpiDmDumpWdat ( @@ -4249,11 +4362,13 @@ AcpiDmDumpWdat (
ACPI_STATUS Status; ACPI_STATUS Status;
UINT32 Offset = sizeof (ACPI_TABLE_WDAT); UINT32 Offset = sizeof (ACPI_TABLE_WDAT);
ACPI_WDAT_ENTRY *Subtable; ACPI_WDAT_ENTRY *Subtable;
@ -4702,7 +4702,7 @@ Index: acpica-unix-20171110/source/common/dmtbdump.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -4263,12 +4378,12 @@ AcpiDmDumpWdat ( @@ -4262,12 +4377,12 @@ AcpiDmDumpWdat (
/* Subtables */ /* Subtables */
Subtable = ACPI_ADD_PTR (ACPI_WDAT_ENTRY, Table, Offset); Subtable = ACPI_ADD_PTR (ACPI_WDAT_ENTRY, Table, Offset);
@ -4717,7 +4717,7 @@ Index: acpica-unix-20171110/source/common/dmtbdump.c
sizeof (ACPI_WDAT_ENTRY), AcpiDmTableInfoWdat0); sizeof (ACPI_WDAT_ENTRY), AcpiDmTableInfoWdat0);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
@@ -4303,12 +4418,13 @@ AcpiDmDumpWpbt ( @@ -4302,12 +4417,13 @@ AcpiDmDumpWpbt (
{ {
ACPI_STATUS Status; ACPI_STATUS Status;
ACPI_TABLE_WPBT *Subtable; ACPI_TABLE_WPBT *Subtable;
@ -4732,7 +4732,7 @@ Index: acpica-unix-20171110/source/common/dmtbdump.c
Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoWpbt); Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoWpbt);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
@@ -4318,10 +4434,10 @@ AcpiDmDumpWpbt ( @@ -4317,10 +4433,10 @@ AcpiDmDumpWpbt (
/* Extract the arguments buffer length from the main table */ /* Extract the arguments buffer length from the main table */
Subtable = ACPI_CAST_PTR (ACPI_TABLE_WPBT, Table); Subtable = ACPI_CAST_PTR (ACPI_TABLE_WPBT, Table);
@ -4745,10 +4745,10 @@ Index: acpica-unix-20171110/source/common/dmtbdump.c
+ (void) AcpiDmDumpTable (Length, 0, Table, ArgumentsLength, + (void) AcpiDmDumpTable (Length, 0, Table, ArgumentsLength,
AcpiDmTableInfoWpbt0); AcpiDmTableInfoWpbt0);
} }
Index: acpica-unix-20171110/source/compiler/dtfield.c Index: acpica-unix2-20171215/source/compiler/dtfield.c
=================================================================== ===================================================================
--- acpica-unix-20171110.orig/source/compiler/dtfield.c --- acpica-unix2-20171215.orig/source/compiler/dtfield.c
+++ acpica-unix-20171110/source/compiler/dtfield.c +++ acpica-unix2-20171215/source/compiler/dtfield.c
@@ -359,7 +359,27 @@ DtCompileInteger ( @@ -359,7 +359,27 @@ DtCompileInteger (
DtError (ASL_ERROR, ASL_MSG_INTEGER_SIZE, Field, MsgBuffer); DtError (ASL_ERROR, ASL_MSG_INTEGER_SIZE, Field, MsgBuffer);
} }
@ -4778,10 +4778,10 @@ Index: acpica-unix-20171110/source/compiler/dtfield.c
return; return;
} }
Index: acpica-unix-20171110/source/compiler/dtsubtable.c Index: acpica-unix2-20171215/source/compiler/dtsubtable.c
=================================================================== ===================================================================
--- acpica-unix-20171110.orig/source/compiler/dtsubtable.c --- acpica-unix2-20171215.orig/source/compiler/dtsubtable.c
+++ acpica-unix-20171110/source/compiler/dtsubtable.c +++ acpica-unix2-20171215/source/compiler/dtsubtable.c
@@ -378,6 +378,21 @@ DtSetSubtableLength ( @@ -378,6 +378,21 @@ DtSetSubtableLength (
return; return;
} }
@ -4806,10 +4806,10 @@ Index: acpica-unix-20171110/source/compiler/dtsubtable.c
+ Subtable->SizeOfLengthField); + Subtable->SizeOfLengthField);
+ } + }
} }
Index: acpica-unix-20171110/source/compiler/dttable1.c Index: acpica-unix2-20171215/source/compiler/dttable1.c
=================================================================== ===================================================================
--- acpica-unix-20171110.orig/source/compiler/dttable1.c --- acpica-unix2-20171215.orig/source/compiler/dttable1.c
+++ acpica-unix-20171110/source/compiler/dttable1.c +++ acpica-unix2-20171215/source/compiler/dttable1.c
@@ -281,6 +281,8 @@ DtCompileCsrt ( @@ -281,6 +281,8 @@ DtCompileCsrt (
DT_FIELD **PFieldList = (DT_FIELD **) List; DT_FIELD **PFieldList = (DT_FIELD **) List;
UINT32 DescriptorCount; UINT32 DescriptorCount;
@ -4902,7 +4902,7 @@ Index: acpica-unix-20171110/source/compiler/dttable1.c
DtInsertSubtable (ParentTable, Subtable); DtInsertSubtable (ParentTable, Subtable);
/* OemData - Variable-length data (Optional, size = OemDataLength) */ /* OemData - Variable-length data (Optional, size = OemDataLength) */
@@ -502,8 +516,8 @@ DtCompileDbg2 ( @@ -508,8 +522,8 @@ DtCompileDbg2 (
if (Subtable && Subtable->Length) if (Subtable && Subtable->Length)
{ {
@ -4913,7 +4913,7 @@ Index: acpica-unix-20171110/source/compiler/dttable1.c
DtInsertSubtable (ParentTable, Subtable); DtInsertSubtable (ParentTable, Subtable);
} }
@@ -543,6 +557,8 @@ DtCompileDmar ( @@ -549,6 +563,8 @@ DtCompileDmar (
ACPI_DMAR_DEVICE_SCOPE *DmarDeviceScope; ACPI_DMAR_DEVICE_SCOPE *DmarDeviceScope;
UINT32 DeviceScopeLength; UINT32 DeviceScopeLength;
UINT32 PciPathLength; UINT32 PciPathLength;
@ -4922,7 +4922,7 @@ Index: acpica-unix-20171110/source/compiler/dttable1.c
Status = DtCompileTable (PFieldList, AcpiDmTableInfoDmar, &Subtable, TRUE); Status = DtCompileTable (PFieldList, AcpiDmTableInfoDmar, &Subtable, TRUE);
@@ -572,8 +588,11 @@ DtCompileDmar ( @@ -578,8 +594,11 @@ DtCompileDmar (
DtPushSubtable (Subtable); DtPushSubtable (Subtable);
DmarHeader = ACPI_CAST_PTR (ACPI_DMAR_HEADER, Subtable->Buffer); DmarHeader = ACPI_CAST_PTR (ACPI_DMAR_HEADER, Subtable->Buffer);
@ -4935,7 +4935,7 @@ Index: acpica-unix-20171110/source/compiler/dttable1.c
{ {
case ACPI_DMAR_TYPE_HARDWARE_UNIT: case ACPI_DMAR_TYPE_HARDWARE_UNIT:
@@ -620,8 +639,8 @@ DtCompileDmar ( @@ -626,8 +645,8 @@ DtCompileDmar (
/* /*
* Optional Device Scope subtables * Optional Device Scope subtables
*/ */
@ -4946,7 +4946,7 @@ Index: acpica-unix-20171110/source/compiler/dttable1.c
{ {
/* These types do not support device scopes */ /* These types do not support device scopes */
@@ -631,7 +650,7 @@ DtCompileDmar ( @@ -637,7 +656,7 @@ DtCompileDmar (
DtPushSubtable (Subtable); DtPushSubtable (Subtable);
DeviceScopeLength = DmarHeader->Length - Subtable->Length - DeviceScopeLength = DmarHeader->Length - Subtable->Length -
@ -4955,7 +4955,7 @@ Index: acpica-unix-20171110/source/compiler/dttable1.c
while (DeviceScopeLength) while (DeviceScopeLength)
{ {
Status = DtCompileTable (PFieldList, AcpiDmTableInfoDmarScope, Status = DtCompileTable (PFieldList, AcpiDmTableInfoDmarScope,
@@ -756,7 +775,7 @@ DtCompileDrtm ( @@ -762,7 +781,7 @@ DtCompileDrtm (
Count++; Count++;
} }
@ -4964,7 +4964,7 @@ Index: acpica-unix-20171110/source/compiler/dttable1.c
DtPopSubtable (); DtPopSubtable ();
ParentTable = DtPeekSubtable (); ParentTable = DtPeekSubtable ();
@@ -794,7 +813,7 @@ DtCompileDrtm ( @@ -800,7 +819,7 @@ DtCompileDrtm (
Count++; Count++;
} }
@ -4973,7 +4973,7 @@ Index: acpica-unix-20171110/source/compiler/dttable1.c
DtPopSubtable (); DtPopSubtable ();
ParentTable = DtPeekSubtable (); ParentTable = DtPeekSubtable ();
@@ -888,6 +907,7 @@ DtCompileGtdt ( @@ -894,6 +913,7 @@ DtCompileGtdt (
ACPI_SUBTABLE_HEADER *GtdtHeader; ACPI_SUBTABLE_HEADER *GtdtHeader;
ACPI_DMTABLE_INFO *InfoTable; ACPI_DMTABLE_INFO *InfoTable;
UINT32 GtCount; UINT32 GtCount;
@ -4981,7 +4981,7 @@ Index: acpica-unix-20171110/source/compiler/dttable1.c
Status = DtCompileTable (PFieldList, AcpiDmTableInfoGtdt, Status = DtCompileTable (PFieldList, AcpiDmTableInfoGtdt,
@@ -954,8 +974,9 @@ DtCompileGtdt ( @@ -960,8 +980,9 @@ DtCompileGtdt (
DtPushSubtable (Subtable); DtPushSubtable (Subtable);
ParentTable = DtPeekSubtable (); ParentTable = DtPeekSubtable ();
@ -4993,7 +4993,7 @@ Index: acpica-unix-20171110/source/compiler/dttable1.c
while (GtCount) while (GtCount)
{ {
@@ -1008,6 +1029,7 @@ DtCompileFpdt ( @@ -1014,6 +1035,7 @@ DtCompileFpdt (
ACPI_DMTABLE_INFO *InfoTable; ACPI_DMTABLE_INFO *InfoTable;
DT_FIELD **PFieldList = (DT_FIELD **) List; DT_FIELD **PFieldList = (DT_FIELD **) List;
DT_FIELD *SubtableStart; DT_FIELD *SubtableStart;
@ -5001,7 +5001,7 @@ Index: acpica-unix-20171110/source/compiler/dttable1.c
while (*PFieldList) while (*PFieldList)
@@ -1026,7 +1048,8 @@ DtCompileFpdt ( @@ -1032,7 +1054,8 @@ DtCompileFpdt (
FpdtHeader = ACPI_CAST_PTR (ACPI_FPDT_HEADER, Subtable->Buffer); FpdtHeader = ACPI_CAST_PTR (ACPI_FPDT_HEADER, Subtable->Buffer);
@ -5011,7 +5011,7 @@ Index: acpica-unix-20171110/source/compiler/dttable1.c
{ {
case ACPI_FPDT_TYPE_BOOT: case ACPI_FPDT_TYPE_BOOT:
@@ -1084,6 +1107,7 @@ DtCompileHest ( @@ -1090,6 +1113,7 @@ DtCompileHest (
ACPI_DMTABLE_INFO *InfoTable; ACPI_DMTABLE_INFO *InfoTable;
UINT16 Type; UINT16 Type;
UINT32 BankCount; UINT32 BankCount;
@ -5019,7 +5019,7 @@ Index: acpica-unix-20171110/source/compiler/dttable1.c
Status = DtCompileTable (PFieldList, AcpiDmTableInfoHest, Status = DtCompileTable (PFieldList, AcpiDmTableInfoHest,
@@ -1101,8 +1125,9 @@ DtCompileHest ( @@ -1107,8 +1131,9 @@ DtCompileHest (
/* Get subtable type */ /* Get subtable type */
SubtableStart = *PFieldList; SubtableStart = *PFieldList;
@ -5030,7 +5030,7 @@ Index: acpica-unix-20171110/source/compiler/dttable1.c
switch (Type) switch (Type)
{ {
case ACPI_HEST_TYPE_IA32_CHECK: case ACPI_HEST_TYPE_IA32_CHECK:
@@ -1452,11 +1477,13 @@ DtCompileIort ( @@ -1458,11 +1483,13 @@ DtCompileIort (
ACPI_IORT_SMMU *IortSmmu; ACPI_IORT_SMMU *IortSmmu;
UINT32 NodeNumber; UINT32 NodeNumber;
UINT32 NodeLength; UINT32 NodeLength;
@ -5044,7 +5044,7 @@ Index: acpica-unix-20171110/source/compiler/dttable1.c
ParentTable = DtPeekSubtable (); ParentTable = DtPeekSubtable ();
@@ -1482,7 +1509,7 @@ DtCompileIort ( @@ -1488,7 +1515,7 @@ DtCompileIort (
* Optionally allows the generic data types to be used for filling * Optionally allows the generic data types to be used for filling
* this field. * this field.
*/ */
@ -5053,7 +5053,7 @@ Index: acpica-unix-20171110/source/compiler/dttable1.c
Status = DtCompileTable (PFieldList, AcpiDmTableInfoIortPad, Status = DtCompileTable (PFieldList, AcpiDmTableInfoIortPad,
&Subtable, TRUE); &Subtable, TRUE);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
@@ -1492,7 +1519,7 @@ DtCompileIort ( @@ -1498,7 +1525,7 @@ DtCompileIort (
if (Subtable) if (Subtable)
{ {
DtInsertSubtable (ParentTable, Subtable); DtInsertSubtable (ParentTable, Subtable);
@ -5062,7 +5062,7 @@ Index: acpica-unix-20171110/source/compiler/dttable1.c
} }
else else
{ {
@@ -1502,8 +1529,9 @@ DtCompileIort ( @@ -1508,8 +1535,9 @@ DtCompileIort (
{ {
return (Status); return (Status);
} }
@ -5073,7 +5073,7 @@ Index: acpica-unix-20171110/source/compiler/dttable1.c
NodeNumber = 0; NodeNumber = 0;
while (*PFieldList) while (*PFieldList)
@@ -1557,7 +1585,7 @@ DtCompileIort ( @@ -1563,7 +1591,7 @@ DtCompileIort (
ItsNumber++; ItsNumber++;
} }
@ -5082,7 +5082,7 @@ Index: acpica-unix-20171110/source/compiler/dttable1.c
break; break;
case ACPI_IORT_NODE_NAMED_COMPONENT: case ACPI_IORT_NODE_NAMED_COMPONENT:
@@ -1591,15 +1619,16 @@ DtCompileIort ( @@ -1597,15 +1625,16 @@ DtCompileIort (
} }
else else
{ {
@ -5102,7 +5102,7 @@ Index: acpica-unix-20171110/source/compiler/dttable1.c
&Subtable); &Subtable);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
@@ -1607,7 +1636,8 @@ DtCompileIort ( @@ -1613,7 +1642,8 @@ DtCompileIort (
} }
DtInsertSubtable (ParentTable, Subtable); DtInsertSubtable (ParentTable, Subtable);
@ -5112,7 +5112,7 @@ Index: acpica-unix-20171110/source/compiler/dttable1.c
} }
} }
break; break;
@@ -1640,7 +1670,7 @@ DtCompileIort ( @@ -1646,7 +1676,7 @@ DtCompileIort (
/* Compile global interrupt array */ /* Compile global interrupt array */
@ -5121,7 +5121,7 @@ Index: acpica-unix-20171110/source/compiler/dttable1.c
Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3a, Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3a,
&Subtable, TRUE); &Subtable, TRUE);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
@@ -1654,7 +1684,7 @@ DtCompileIort ( @@ -1660,7 +1690,7 @@ DtCompileIort (
/* Compile context interrupt array */ /* Compile context interrupt array */
ContextIrptNumber = 0; ContextIrptNumber = 0;
@ -5130,7 +5130,7 @@ Index: acpica-unix-20171110/source/compiler/dttable1.c
while (*PFieldList) while (*PFieldList)
{ {
Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3b, Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3b,
@@ -1674,12 +1704,12 @@ DtCompileIort ( @@ -1680,12 +1710,12 @@ DtCompileIort (
ContextIrptNumber++; ContextIrptNumber++;
} }
@ -5145,7 +5145,7 @@ Index: acpica-unix-20171110/source/compiler/dttable1.c
while (*PFieldList) while (*PFieldList)
{ {
Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3c, Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3c,
@@ -1699,7 +1729,7 @@ DtCompileIort ( @@ -1705,7 +1735,7 @@ DtCompileIort (
PmuIrptNumber++; PmuIrptNumber++;
} }
@ -5154,7 +5154,7 @@ Index: acpica-unix-20171110/source/compiler/dttable1.c
break; break;
case ACPI_IORT_NODE_SMMU_V3: case ACPI_IORT_NODE_SMMU_V3:
@@ -1723,7 +1753,7 @@ DtCompileIort ( @@ -1729,7 +1759,7 @@ DtCompileIort (
/* Compile Array of ID mappings */ /* Compile Array of ID mappings */
@ -5163,7 +5163,7 @@ Index: acpica-unix-20171110/source/compiler/dttable1.c
IdMappingNumber = 0; IdMappingNumber = 0;
while (*PFieldList) while (*PFieldList)
{ {
@@ -1744,7 +1774,7 @@ DtCompileIort ( @@ -1750,7 +1780,7 @@ DtCompileIort (
IdMappingNumber++; IdMappingNumber++;
} }
@ -5172,7 +5172,7 @@ Index: acpica-unix-20171110/source/compiler/dttable1.c
if (!IdMappingNumber) if (!IdMappingNumber)
{ {
IortNode->MappingOffset = 0; IortNode->MappingOffset = 0;
@@ -1759,7 +1789,7 @@ DtCompileIort ( @@ -1765,7 +1795,7 @@ DtCompileIort (
NodeNumber++; NodeNumber++;
} }
@ -5181,10 +5181,10 @@ Index: acpica-unix-20171110/source/compiler/dttable1.c
return (AE_OK); return (AE_OK);
} }
Index: acpica-unix-20171110/source/compiler/dttable2.c Index: acpica-unix2-20171215/source/compiler/dttable2.c
=================================================================== ===================================================================
--- acpica-unix-20171110.orig/source/compiler/dttable2.c --- acpica-unix2-20171215.orig/source/compiler/dttable2.c
+++ acpica-unix-20171110/source/compiler/dttable2.c +++ acpica-unix2-20171215/source/compiler/dttable2.c
@@ -345,7 +345,7 @@ DtCompileMpst ( @@ -345,7 +345,7 @@ DtCompileMpst (
DtPushSubtable (Subtable); DtPushSubtable (Subtable);
@ -5341,10 +5341,10 @@ Index: acpica-unix-20171110/source/compiler/dttable2.c
ParentTable = DtPeekSubtable (); ParentTable = DtPeekSubtable ();
DtInsertSubtable (ParentTable, Subtable); DtInsertSubtable (ParentTable, Subtable);
Index: acpica-unix-20171110/source/components/disassembler/dmbuffer.c Index: acpica-unix2-20171215/source/components/disassembler/dmbuffer.c
=================================================================== ===================================================================
--- acpica-unix-20171110.orig/source/components/disassembler/dmbuffer.c --- acpica-unix2-20171215.orig/source/components/disassembler/dmbuffer.c
+++ acpica-unix-20171110/source/components/disassembler/dmbuffer.c +++ acpica-unix2-20171215/source/components/disassembler/dmbuffer.c
@@ -204,7 +204,7 @@ AcpiDmByteList ( @@ -204,7 +204,7 @@ AcpiDmByteList (
@ -5420,10 +5420,10 @@ Index: acpica-unix-20171110/source/components/disassembler/dmbuffer.c
NextOp = AcpiPsGetDepthNext (NULL, Op); NextOp = AcpiPsGetDepthNext (NULL, Op);
if (!NextOp) if (!NextOp)
Index: acpica-unix-20171110/source/components/disassembler/dmopcode.c Index: acpica-unix2-20171215/source/components/disassembler/dmopcode.c
=================================================================== ===================================================================
--- acpica-unix-20171110.orig/source/components/disassembler/dmopcode.c --- acpica-unix2-20171215.orig/source/components/disassembler/dmopcode.c
+++ acpica-unix-20171110/source/components/disassembler/dmopcode.c +++ acpica-unix2-20171215/source/components/disassembler/dmopcode.c
@@ -244,6 +244,7 @@ AcpiDmPredefinedDescription ( @@ -244,6 +244,7 @@ AcpiDmPredefinedDescription (
char *NameString; char *NameString;
int LastCharIsDigit; int LastCharIsDigit;
@ -5494,10 +5494,10 @@ Index: acpica-unix-20171110/source/components/disassembler/dmopcode.c
Info->Level += 1; Info->Level += 1;
Info->MappingOp = Op; Info->MappingOp = Op;
Index: acpica-unix-20171110/source/components/disassembler/dmresrcl.c Index: acpica-unix2-20171215/source/components/disassembler/dmresrcl.c
=================================================================== ===================================================================
--- acpica-unix-20171110.orig/source/components/disassembler/dmresrcl.c --- acpica-unix2-20171215.orig/source/components/disassembler/dmresrcl.c
+++ acpica-unix-20171110/source/components/disassembler/dmresrcl.c +++ acpica-unix2-20171215/source/components/disassembler/dmresrcl.c
@@ -141,7 +141,8 @@ AcpiDmMemoryFields ( @@ -141,7 +141,8 @@ AcpiDmMemoryFields (
UINT32 Level) UINT32 Level)
{ {
@ -5646,10 +5646,10 @@ Index: acpica-unix-20171110/source/components/disassembler/dmresrcl.c
} }
AcpiDmIndent (Level); AcpiDmIndent (Level);
Index: acpica-unix-20171110/source/components/disassembler/dmresrcl2.c Index: acpica-unix2-20171215/source/components/disassembler/dmresrcl2.c
=================================================================== ===================================================================
--- acpica-unix-20171110.orig/source/components/disassembler/dmresrcl2.c --- acpica-unix2-20171215.orig/source/components/disassembler/dmresrcl2.c
+++ acpica-unix-20171110/source/components/disassembler/dmresrcl2.c +++ acpica-unix2-20171215/source/components/disassembler/dmresrcl2.c
@@ -191,22 +191,24 @@ AcpiDmGpioCommon ( @@ -191,22 +191,24 @@ AcpiDmGpioCommon (
char *DeviceName = NULL; char *DeviceName = NULL;
UINT32 PinCount; UINT32 PinCount;
@ -5873,10 +5873,10 @@ Index: acpica-unix-20171110/source/components/disassembler/dmresrcl2.c
DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset); DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset);
AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX); AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
Index: acpica-unix-20171110/source/components/disassembler/dmresrcs.c Index: acpica-unix2-20171215/source/components/disassembler/dmresrcs.c
=================================================================== ===================================================================
--- acpica-unix-20171110.orig/source/components/disassembler/dmresrcs.c --- acpica-unix2-20171215.orig/source/components/disassembler/dmresrcs.c
+++ acpica-unix-20171110/source/components/disassembler/dmresrcs.c +++ acpica-unix2-20171215/source/components/disassembler/dmresrcs.c
@@ -72,6 +72,7 @@ AcpiDmIrqDescriptor ( @@ -72,6 +72,7 @@ AcpiDmIrqDescriptor (
UINT32 Length, UINT32 Length,
UINT32 Level) UINT32 Level)
@ -5933,10 +5933,10 @@ Index: acpica-unix-20171110/source/components/disassembler/dmresrcs.c
AcpiDmIndent (Level + 1); AcpiDmIndent (Level + 1);
AcpiDmDumpInteger8 (Resource->FixedIo.AddressLength, "Length"); AcpiDmDumpInteger8 (Resource->FixedIo.AddressLength, "Length");
Index: acpica-unix-20171110/source/components/dispatcher/dsfield.c Index: acpica-unix2-20171215/source/components/dispatcher/dsfield.c
=================================================================== ===================================================================
--- acpica-unix-20171110.orig/source/components/dispatcher/dsfield.c --- acpica-unix2-20171215.orig/source/components/dispatcher/dsfield.c
+++ acpica-unix-20171110/source/components/dispatcher/dsfield.c +++ acpica-unix2-20171215/source/components/dispatcher/dsfield.c
@@ -321,6 +321,7 @@ AcpiDsGetFieldNames ( @@ -321,6 +321,7 @@ AcpiDsGetFieldNames (
ACPI_STATUS Status; ACPI_STATUS Status;
UINT64 Position; UINT64 Position;
@ -5981,10 +5981,10 @@ Index: acpica-unix-20171110/source/components/dispatcher/dsfield.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
ACPI_ERROR_NAMESPACE (WalkState->ScopeInfo, ACPI_ERROR_NAMESPACE (WalkState->ScopeInfo,
Index: acpica-unix-20171110/source/components/events/evgpeblk.c Index: acpica-unix2-20171215/source/components/events/evgpeblk.c
=================================================================== ===================================================================
--- acpica-unix-20171110.orig/source/components/events/evgpeblk.c --- acpica-unix2-20171215.orig/source/components/events/evgpeblk.c
+++ acpica-unix-20171110/source/components/events/evgpeblk.c +++ acpica-unix2-20171215/source/components/events/evgpeblk.c
@@ -376,6 +376,7 @@ AcpiEvCreateGpeBlock ( @@ -376,6 +376,7 @@ AcpiEvCreateGpeBlock (
ACPI_STATUS Status; ACPI_STATUS Status;
ACPI_GPE_BLOCK_INFO *GpeBlock; ACPI_GPE_BLOCK_INFO *GpeBlock;
@ -6017,10 +6017,10 @@ Index: acpica-unix-20171110/source/components/events/evgpeblk.c
InterruptNumber == AcpiGbl_FADT.SciInterrupt ? " (SCI)" : "")); InterruptNumber == AcpiGbl_FADT.SciInterrupt ? " (SCI)" : ""));
/* Update global count of currently available GPEs */ /* Update global count of currently available GPEs */
Index: acpica-unix-20171110/source/components/hardware/hwregs.c Index: acpica-unix2-20171215/source/components/hardware/hwregs.c
=================================================================== ===================================================================
--- acpica-unix-20171110.orig/source/components/hardware/hwregs.c --- acpica-unix2-20171215.orig/source/components/hardware/hwregs.c
+++ acpica-unix-20171110/source/components/hardware/hwregs.c +++ acpica-unix2-20171215/source/components/hardware/hwregs.c
@@ -197,7 +197,7 @@ AcpiHwValidateRegister ( @@ -197,7 +197,7 @@ AcpiHwValidateRegister (
* Address must not be null. A null address also indicates an optional * Address must not be null. A null address also indicates an optional
* ACPI register that is not supported, so no error message. * ACPI register that is not supported, so no error message.
@ -6030,10 +6030,10 @@ Index: acpica-unix-20171110/source/components/hardware/hwregs.c
if (!(*Address)) if (!(*Address))
{ {
return (AE_BAD_ADDRESS); return (AE_BAD_ADDRESS);
Index: acpica-unix-20171110/source/components/hardware/hwvalid.c Index: acpica-unix2-20171215/source/components/hardware/hwvalid.c
=================================================================== ===================================================================
--- acpica-unix-20171110.orig/source/components/hardware/hwvalid.c --- acpica-unix2-20171215.orig/source/components/hardware/hwvalid.c
+++ acpica-unix-20171110/source/components/hardware/hwvalid.c +++ acpica-unix2-20171215/source/components/hardware/hwvalid.c
@@ -135,6 +135,8 @@ AcpiHwValidateIoRequest ( @@ -135,6 +135,8 @@ AcpiHwValidateIoRequest (
UINT32 ByteWidth; UINT32 ByteWidth;
ACPI_IO_ADDRESS LastAddress; ACPI_IO_ADDRESS LastAddress;
@ -6042,8 +6042,8 @@ Index: acpica-unix-20171110/source/components/hardware/hwvalid.c
+ UINT64 Tmp64; + UINT64 Tmp64;
ACPI_FUNCTION_NAME (HwValidateIoRequest); ACPI_FUNCTION_TRACE (HwValidateIoRequest);
@@ -161,7 +163,10 @@ AcpiHwValidateIoRequest ( @@ -162,7 +164,10 @@ AcpiHwValidateIoRequest (
/* Maximum 16-bit address in I/O space */ /* Maximum 16-bit address in I/O space */
@ -6055,10 +6055,10 @@ Index: acpica-unix-20171110/source/components/hardware/hwvalid.c
{ {
ACPI_ERROR ((AE_INFO, ACPI_ERROR ((AE_INFO,
"Illegal I/O port address/length above 64K: %8.8X%8.8X/0x%X", "Illegal I/O port address/length above 64K: %8.8X%8.8X/0x%X",
Index: acpica-unix-20171110/source/components/namespace/nsaccess.c Index: acpica-unix2-20171215/source/components/namespace/nsaccess.c
=================================================================== ===================================================================
--- acpica-unix-20171110.orig/source/components/namespace/nsaccess.c --- acpica-unix2-20171215.orig/source/components/namespace/nsaccess.c
+++ acpica-unix-20171110/source/components/namespace/nsaccess.c +++ acpica-unix2-20171215/source/components/namespace/nsaccess.c
@@ -313,6 +313,7 @@ AcpiNsLookup ( @@ -313,6 +313,7 @@ AcpiNsLookup (
ACPI_OBJECT_TYPE ThisSearchType; ACPI_OBJECT_TYPE ThisSearchType;
UINT32 SearchParentFlag = ACPI_NS_SEARCH_PARENT; UINT32 SearchParentFlag = ACPI_NS_SEARCH_PARENT;
@ -6079,10 +6079,10 @@ Index: acpica-unix-20171110/source/components/namespace/nsaccess.c
AcpiUtGetTypeName (ThisNode->Type), AcpiUtGetTypeName (ThisNode->Type),
AcpiUtGetTypeName (TypeToCheckFor))); AcpiUtGetTypeName (TypeToCheckFor)));
} }
Index: acpica-unix-20171110/source/components/namespace/nsparse.c Index: acpica-unix2-20171215/source/components/namespace/nsparse.c
=================================================================== ===================================================================
--- acpica-unix-20171110.orig/source/components/namespace/nsparse.c --- acpica-unix2-20171215.orig/source/components/namespace/nsparse.c
+++ acpica-unix-20171110/source/components/namespace/nsparse.c +++ acpica-unix2-20171215/source/components/namespace/nsparse.c
@@ -196,13 +196,14 @@ AcpiNsOneCompleteParse ( @@ -196,13 +196,14 @@ AcpiNsOneCompleteParse (
/* Table must consist of at least a complete header */ /* Table must consist of at least a complete header */
@ -6100,10 +6100,10 @@ Index: acpica-unix-20171110/source/components/namespace/nsparse.c
Status = AcpiTbGetOwnerId (TableIndex, &OwnerId); Status = AcpiTbGetOwnerId (TableIndex, &OwnerId);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
Index: acpica-unix-20171110/source/components/tables/tbdata.c Index: acpica-unix2-20171215/source/components/tables/tbdata.c
=================================================================== ===================================================================
--- acpica-unix-20171110.orig/source/components/tables/tbdata.c --- acpica-unix2-20171215.orig/source/components/tables/tbdata.c
+++ acpica-unix-20171110/source/components/tables/tbdata.c +++ acpica-unix2-20171215/source/components/tables/tbdata.c
@@ -552,6 +552,7 @@ AcpiTbVerifyTempTable ( @@ -552,6 +552,7 @@ AcpiTbVerifyTempTable (
UINT32 *TableIndex) UINT32 *TableIndex)
{ {
@ -6122,10 +6122,10 @@ Index: acpica-unix-20171110/source/components/tables/tbdata.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
ACPI_EXCEPTION ((AE_INFO, AE_NO_MEMORY, ACPI_EXCEPTION ((AE_INFO, AE_NO_MEMORY,
Index: acpica-unix-20171110/source/components/tables/tbfadt.c Index: acpica-unix2-20171215/source/components/tables/tbfadt.c
=================================================================== ===================================================================
--- acpica-unix-20171110.orig/source/components/tables/tbfadt.c --- acpica-unix2-20171215.orig/source/components/tables/tbfadt.c
+++ acpica-unix-20171110/source/components/tables/tbfadt.c +++ acpica-unix2-20171215/source/components/tables/tbfadt.c
@@ -424,18 +424,20 @@ AcpiTbCreateLocalFadt ( @@ -424,18 +424,20 @@ AcpiTbCreateLocalFadt (
ACPI_TABLE_HEADER *Table, ACPI_TABLE_HEADER *Table,
UINT32 Length) UINT32 Length)
@ -6237,10 +6237,10 @@ Index: acpica-unix-20171110/source/components/tables/tbfadt.c
"PmRegisters", 0); "PmRegisters", 0);
} }
} }
Index: acpica-unix-20171110/source/components/tables/tbfind.c Index: acpica-unix2-20171215/source/components/tables/tbfind.c
=================================================================== ===================================================================
--- acpica-unix-20171110.orig/source/components/tables/tbfind.c --- acpica-unix2-20171215.orig/source/components/tables/tbfind.c
+++ acpica-unix-20171110/source/components/tables/tbfind.c +++ acpica-unix2-20171215/source/components/tables/tbfind.c
@@ -108,8 +108,11 @@ AcpiTbFindTable ( @@ -108,8 +108,11 @@ AcpiTbFindTable (
(void) AcpiUtAcquireMutex (ACPI_MTX_TABLES); (void) AcpiUtAcquireMutex (ACPI_MTX_TABLES);
for (i = 0; i < AcpiGbl_RootTableList.CurrentTableCount; ++i) for (i = 0; i < AcpiGbl_RootTableList.CurrentTableCount; ++i)
@ -6254,10 +6254,10 @@ Index: acpica-unix-20171110/source/components/tables/tbfind.c
{ {
/* Not the requested table */ /* Not the requested table */
Index: acpica-unix-20171110/source/components/tables/tbprint.c Index: acpica-unix2-20171215/source/components/tables/tbprint.c
=================================================================== ===================================================================
--- acpica-unix-20171110.orig/source/components/tables/tbprint.c --- acpica-unix2-20171215.orig/source/components/tables/tbprint.c
+++ acpica-unix-20171110/source/components/tables/tbprint.c +++ acpica-unix2-20171215/source/components/tables/tbprint.c
@@ -143,15 +143,18 @@ AcpiTbPrintTableHeader ( @@ -143,15 +143,18 @@ AcpiTbPrintTableHeader (
ACPI_TABLE_HEADER *Header) ACPI_TABLE_HEADER *Header)
{ {
@ -6299,10 +6299,10 @@ Index: acpica-unix-20171110/source/components/tables/tbprint.c
} }
} }
Index: acpica-unix-20171110/source/components/tables/tbutils.c Index: acpica-unix2-20171215/source/components/tables/tbutils.c
=================================================================== ===================================================================
--- acpica-unix-20171110.orig/source/components/tables/tbutils.c --- acpica-unix2-20171215.orig/source/components/tables/tbutils.c
+++ acpica-unix-20171110/source/components/tables/tbutils.c +++ acpica-unix2-20171215/source/components/tables/tbutils.c
@@ -238,7 +238,7 @@ AcpiTbGetRootTableEntry ( @@ -238,7 +238,7 @@ AcpiTbGetRootTableEntry (
* 64-bit platform, XSDT: Move (unaligned) 64-bit to local, * 64-bit platform, XSDT: Move (unaligned) 64-bit to local,
* return 64-bit * return 64-bit
@ -6362,10 +6362,10 @@ Index: acpica-unix-20171110/source/components/tables/tbutils.c
{ {
AcpiGbl_FadtIndex = TableIndex; AcpiGbl_FadtIndex = TableIndex;
AcpiTbParseFadt (); AcpiTbParseFadt ();
Index: acpica-unix-20171110/source/components/tables/tbxface.c Index: acpica-unix2-20171215/source/components/tables/tbxface.c
=================================================================== ===================================================================
--- acpica-unix-20171110.orig/source/components/tables/tbxface.c --- acpica-unix2-20171215.orig/source/components/tables/tbxface.c
+++ acpica-unix-20171110/source/components/tables/tbxface.c +++ acpica-unix2-20171215/source/components/tables/tbxface.c
@@ -293,8 +293,11 @@ AcpiGetTableHeader ( @@ -293,8 +293,11 @@ AcpiGetTableHeader (
for (i = 0, j = 0; i < AcpiGbl_RootTableList.CurrentTableCount; i++) for (i = 0, j = 0; i < AcpiGbl_RootTableList.CurrentTableCount; i++)
@ -6379,10 +6379,10 @@ Index: acpica-unix-20171110/source/components/tables/tbxface.c
{ {
continue; continue;
} }
Index: acpica-unix-20171110/source/components/tables/tbxfload.c Index: acpica-unix2-20171215/source/components/tables/tbxfload.c
=================================================================== ===================================================================
--- acpica-unix-20171110.orig/source/components/tables/tbxfload.c --- acpica-unix2-20171215.orig/source/components/tables/tbxfload.c
+++ acpica-unix-20171110/source/components/tables/tbxfload.c +++ acpica-unix2-20171215/source/components/tables/tbxfload.c
@@ -156,6 +156,7 @@ AcpiTbLoadNamespace ( @@ -156,6 +156,7 @@ AcpiTbLoadNamespace (
ACPI_TABLE_DESC *Table; ACPI_TABLE_DESC *Table;
UINT32 TablesLoaded = 0; UINT32 TablesLoaded = 0;
@ -6402,10 +6402,10 @@ Index: acpica-unix-20171110/source/components/tables/tbxfload.c
ACPI_FAILURE (AcpiTbValidateTable (Table))) ACPI_FAILURE (AcpiTbValidateTable (Table)))
{ {
Status = AE_NO_ACPI_TABLES; Status = AE_NO_ACPI_TABLES;
Index: acpica-unix-20171110/source/tools/acpiexec/aetables.c Index: acpica-unix2-20171215/source/tools/acpiexec/aetables.c
=================================================================== ===================================================================
--- acpica-unix-20171110.orig/source/tools/acpiexec/aetables.c --- acpica-unix2-20171215.orig/source/tools/acpiexec/aetables.c
+++ acpica-unix-20171110/source/tools/acpiexec/aetables.c +++ acpica-unix2-20171215/source/tools/acpiexec/aetables.c
@@ -146,21 +146,25 @@ AeInitializeTableHeader ( @@ -146,21 +146,25 @@ AeInitializeTableHeader (
char *Signature, char *Signature,
UINT32 Length) UINT32 Length)
@ -6557,10 +6557,10 @@ Index: acpica-unix-20171110/source/tools/acpiexec/aetables.c
} }
return (AE_OK); return (AE_OK);
Index: acpica-unix-20171110/source/common/dmswitch.c Index: acpica-unix2-20171215/source/common/dmswitch.c
=================================================================== ===================================================================
--- acpica-unix-20171110.orig/source/common/dmswitch.c --- acpica-unix2-20171215.orig/source/common/dmswitch.c
+++ acpica-unix-20171110/source/common/dmswitch.c +++ acpica-unix2-20171215/source/common/dmswitch.c
@@ -88,13 +88,15 @@ AcpiDmProcessSwitch ( @@ -88,13 +88,15 @@ AcpiDmProcessSwitch (
ACPI_PARSE_OBJECT_LIST *Current; ACPI_PARSE_OBJECT_LIST *Current;
ACPI_PARSE_OBJECT_LIST *Previous; ACPI_PARSE_OBJECT_LIST *Previous;

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (acpica-unix2-20171110.tar.gz) = e7add3a1a41894c997f4f71f9f4c1b889b246912f4c5525a6d99b37b099773b3840ebe9d1e050bdb0dbda9b0d784105247dcbb6e1b85801522db2ee1370f9962 SHA512 (acpica-unix2-20171215.tar.gz) = 3e28025bb23e3c118f294ab0696ccbfb05dcf83d7c860b859ae97516f05a12dad750a850dce81ed50c4056b34d6ea9b130fb248154767506655dce7de8d924bb
SHA512 (acpitests-unix-20171110.tar.gz) = 8d7842c431890541ae9ad7270020a995e09b80fdcd7528e534f9ad876ffa1f1b9a39452bca6747cc1a5b749a752d785c8bfedafbe9af29b28d1af3db079fb3d4 SHA512 (acpitests-unix-20171215.tar.gz) = b405e87f18b15bd01540d32c021a7b900139abd7e698b55786ccbaf8536c5068087a8ba1e7adbb69e0954cdc6b347e9a88428f1e8f889e0e9eb3a472c11235f9