Update to 20190329 version of upstream source

Signed-off-by: Al Stone <ahs3@redhat.com>
This commit is contained in:
Al Stone 2019-05-10 18:40:20 -06:00
parent 46f0c7f440
commit b07847bae5
9 changed files with 196 additions and 192 deletions

2
.gitignore vendored
View File

@ -109,3 +109,5 @@ series
/acpitests-unix-20190108.tar.gz /acpitests-unix-20190108.tar.gz
/acpica-unix2-20190215.tar.gz /acpica-unix2-20190215.tar.gz
/acpitests-unix-20190215.tar.gz /acpitests-unix-20190215.tar.gz
/acpica-unix2-20190329.tar.gz
/acpitests-unix-20190329.tar.gz

View File

@ -1,5 +1,5 @@
Name: acpica-tools Name: acpica-tools
Version: 20190215 Version: 20190329
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
@ -43,7 +43,6 @@ Patch15: str-trunc-warn.patch
Patch16: ptr-cast.patch Patch16: ptr-cast.patch
Patch17: aslcodegen.patch Patch17: aslcodegen.patch
Patch18: facp.patch Patch18: facp.patch
Patch19: gcc9.patch
BuildRequires: bison patchutils flex gcc BuildRequires: bison patchutils flex gcc
@ -112,7 +111,6 @@ gzip -dc %{SOURCE1} | tar -x --strip-components=1 -f -
%patch16 -p1 -b .ptr-cast %patch16 -p1 -b .ptr-cast
%patch17 -p1 -b .aslcodegen %patch17 -p1 -b .aslcodegen
%patch18 -p1 -b .facp %patch18 -p1 -b .facp
%patch19 -p1 -b .gcc9
cp -p %{SOURCE2} README.Fedora cp -p %{SOURCE2} README.Fedora
cp -p %{SOURCE3} iasl.1 cp -p %{SOURCE3} iasl.1
@ -241,6 +239,9 @@ fi
%changelog %changelog
* Fri May 10 2019 Al Stone <ahs3@redhat.com> - 20190329-1
- Update to 20190329 source tree, including patch refeshes.
* Fri May 10 2019 Al Stone <ahs3@redhat.com> - 20190215-1 * Fri May 10 2019 Al Stone <ahs3@redhat.com> - 20190215-1
- Update to 20190215 source tree, including patch refeshes. - Update to 20190215 source tree, including patch refeshes.

View File

@ -4,11 +4,11 @@ support; this patch repairs that adaptation.
Signed-off-by: Al Stone <ahs3@redhat.com> Signed-off-by: Al Stone <ahs3@redhat.com>
Index: acpica-unix2-20181003/source/compiler/aslcodegen.c Index: acpica-unix-20190329/source/compiler/aslcodegen.c
=================================================================== ===================================================================
--- acpica-unix2-20181003.orig/source/compiler/aslcodegen.c --- acpica-unix-20190329.orig/source/compiler/aslcodegen.c
+++ acpica-unix2-20181003/source/compiler/aslcodegen.c +++ acpica-unix-20190329/source/compiler/aslcodegen.c
@@ -494,8 +494,7 @@ CgWriteTableHeader ( @@ -500,8 +500,7 @@ CgWriteTableHeader (
/* Table length. Checksum zero for now, will rewrite later */ /* Table length. Checksum zero for now, will rewrite later */
@ -18,7 +18,7 @@ Index: acpica-unix2-20181003/source/compiler/aslcodegen.c
/* Calculate the comment lengths for this definition block parseOp */ /* Calculate the comment lengths for this definition block parseOp */
@@ -541,6 +540,8 @@ CgWriteTableHeader ( @@ -547,6 +546,8 @@ CgWriteTableHeader (
CvDbgPrint (" Length: %u\n", CommentLength); CvDbgPrint (" Length: %u\n", CommentLength);
} }
} }

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-20190215/source/compiler/aslcodegen.c Index: acpica-unix-20190329/source/compiler/aslcodegen.c
=================================================================== ===================================================================
--- acpica-unix-20190215.orig/source/compiler/aslcodegen.c --- acpica-unix-20190329.orig/source/compiler/aslcodegen.c
+++ acpica-unix-20190215/source/compiler/aslcodegen.c +++ acpica-unix-20190329/source/compiler/aslcodegen.c
@@ -240,16 +240,12 @@ CgWriteAmlOpcode ( @@ -240,16 +240,12 @@ CgWriteAmlOpcode (
ACPI_PARSE_OBJECT *Op) ACPI_PARSE_OBJECT *Op)
{ {
@ -194,7 +194,7 @@ Index: acpica-unix-20190215/source/compiler/aslcodegen.c
break; break;
case AML_STRING_OP: case AML_STRING_OP:
@@ -422,6 +427,7 @@ CgWriteTableHeader ( @@ -424,6 +429,7 @@ CgWriteTableHeader (
ACPI_PARSE_OBJECT *Op) ACPI_PARSE_OBJECT *Op)
{ {
ACPI_PARSE_OBJECT *Child; ACPI_PARSE_OBJECT *Child;
@ -202,7 +202,7 @@ Index: acpica-unix-20190215/source/compiler/aslcodegen.c
UINT32 CommentLength; UINT32 CommentLength;
ACPI_COMMENT_NODE *Current; ACPI_COMMENT_NODE *Current;
@@ -475,7 +481,7 @@ CgWriteTableHeader ( @@ -481,7 +487,7 @@ CgWriteTableHeader (
/* OEM Revision */ /* OEM Revision */
Child = Child->Asl.Next; Child = Child->Asl.Next;
@ -211,7 +211,7 @@ Index: acpica-unix-20190215/source/compiler/aslcodegen.c
/* Compiler ID */ /* Compiler ID */
@@ -483,12 +489,13 @@ CgWriteTableHeader ( @@ -489,12 +495,13 @@ CgWriteTableHeader (
/* Compiler version */ /* Compiler version */
@ -228,7 +228,7 @@ Index: acpica-unix-20190215/source/compiler/aslcodegen.c
/* Calculate the comment lengths for this definition block parseOp */ /* Calculate the comment lengths for this definition block parseOp */
@@ -646,7 +653,10 @@ CgWriteNode ( @@ -652,7 +659,10 @@ CgWriteNode (
ACPI_PARSE_OBJECT *Op) ACPI_PARSE_OBJECT *Op)
{ {
ASL_RESOURCE_NODE *Rnode; ASL_RESOURCE_NODE *Rnode;
@ -240,7 +240,7 @@ Index: acpica-unix-20190215/source/compiler/aslcodegen.c
/* Write all comments here. */ /* Write all comments here. */
@@ -670,13 +680,24 @@ CgWriteNode ( @@ -676,13 +686,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-20190215/source/compiler/aslcodegen.c
case AML_RAW_DATA_BUFFER: case AML_RAW_DATA_BUFFER:
Index: acpica-unix-20190215/source/compiler/aslopcodes.c Index: acpica-unix-20190329/source/compiler/aslopcodes.c
=================================================================== ===================================================================
--- acpica-unix-20190215.orig/source/compiler/aslopcodes.c --- acpica-unix-20190329.orig/source/compiler/aslopcodes.c
+++ acpica-unix-20190215/source/compiler/aslopcodes.c +++ acpica-unix-20190329/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-20190215/source/compiler/aslopcodes.c
} }
/* /*
Index: acpica-unix-20190215/source/compiler/aslrestype1.c Index: acpica-unix-20190329/source/compiler/aslrestype1.c
=================================================================== ===================================================================
--- acpica-unix-20190215.orig/source/compiler/aslrestype1.c --- acpica-unix-20190329.orig/source/compiler/aslrestype1.c
+++ acpica-unix-20190215/source/compiler/aslrestype1.c +++ acpica-unix-20190329/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-20190215/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-20190215/source/compiler/aslrestype1i.c Index: acpica-unix-20190329/source/compiler/aslrestype1i.c
=================================================================== ===================================================================
--- acpica-unix-20190215.orig/source/compiler/aslrestype1i.c --- acpica-unix-20190329.orig/source/compiler/aslrestype1i.c
+++ acpica-unix-20190215/source/compiler/aslrestype1i.c +++ acpica-unix-20190329/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-20190215/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-20190215/source/compiler/aslrestype2.c Index: acpica-unix-20190329/source/compiler/aslrestype2.c
=================================================================== ===================================================================
--- acpica-unix-20190215.orig/source/compiler/aslrestype2.c --- acpica-unix-20190329.orig/source/compiler/aslrestype2.c
+++ acpica-unix-20190215/source/compiler/aslrestype2.c +++ acpica-unix-20190329/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-20190215/source/compiler/aslrestype2.c
/* Point to end-of-descriptor for vendor data */ /* Point to end-of-descriptor for vendor data */
Index: acpica-unix-20190215/source/compiler/aslrestype2d.c Index: acpica-unix-20190329/source/compiler/aslrestype2d.c
=================================================================== ===================================================================
--- acpica-unix-20190215.orig/source/compiler/aslrestype2d.c --- acpica-unix-20190329.orig/source/compiler/aslrestype2d.c
+++ acpica-unix-20190215/source/compiler/aslrestype2d.c +++ acpica-unix-20190329/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-20190215/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-20190215/source/compiler/aslrestype2e.c Index: acpica-unix-20190329/source/compiler/aslrestype2e.c
=================================================================== ===================================================================
--- acpica-unix-20190215.orig/source/compiler/aslrestype2e.c --- acpica-unix-20190329.orig/source/compiler/aslrestype2e.c
+++ acpica-unix-20190215/source/compiler/aslrestype2e.c +++ acpica-unix-20190329/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-20190215/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-20190215/source/compiler/aslrestype2q.c Index: acpica-unix-20190329/source/compiler/aslrestype2q.c
=================================================================== ===================================================================
--- acpica-unix-20190215.orig/source/compiler/aslrestype2q.c --- acpica-unix-20190329.orig/source/compiler/aslrestype2q.c
+++ acpica-unix-20190215/source/compiler/aslrestype2q.c +++ acpica-unix-20190329/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-20190215/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-20190215/source/compiler/aslrestype2s.c Index: acpica-unix-20190329/source/compiler/aslrestype2s.c
=================================================================== ===================================================================
--- acpica-unix-20190215.orig/source/compiler/aslrestype2s.c --- acpica-unix-20190329.orig/source/compiler/aslrestype2s.c
+++ acpica-unix-20190215/source/compiler/aslrestype2s.c +++ acpica-unix-20190329/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-20190215/source/compiler/aslrestype2s.c
MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource); MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource);
return (Rnode); return (Rnode);
} }
Index: acpica-unix-20190215/source/compiler/aslrestype2w.c Index: acpica-unix-20190329/source/compiler/aslrestype2w.c
=================================================================== ===================================================================
--- acpica-unix-20190215.orig/source/compiler/aslrestype2w.c --- acpica-unix-20190329.orig/source/compiler/aslrestype2w.c
+++ acpica-unix-20190215/source/compiler/aslrestype2w.c +++ acpica-unix-20190329/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-20190215/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-20190215/source/include/acmacros.h Index: acpica-unix-20190329/source/include/acmacros.h
=================================================================== ===================================================================
--- acpica-unix-20190215.orig/source/include/acmacros.h --- acpica-unix-20190329.orig/source/include/acmacros.h
+++ acpica-unix-20190215/source/include/acmacros.h +++ acpica-unix-20190329/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,11 +2482,11 @@ Index: acpica-unix-20190215/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-20190215/source/include/platform/aclinux.h Index: acpica-unix-20190329/source/include/platform/aclinux.h
=================================================================== ===================================================================
--- acpica-unix-20190215.orig/source/include/platform/aclinux.h --- acpica-unix-20190329.orig/source/include/platform/aclinux.h
+++ acpica-unix-20190215/source/include/platform/aclinux.h +++ acpica-unix-20190329/source/include/platform/aclinux.h
@@ -193,6 +193,7 @@ @@ -198,6 +198,7 @@
#ifdef ACPI_USE_STANDARD_HEADERS #ifdef ACPI_USE_STANDARD_HEADERS
#include <unistd.h> #include <unistd.h>
@ -2494,7 +2494,7 @@ Index: acpica-unix-20190215/source/include/platform/aclinux.h
#endif #endif
/* Define/disable kernel-specific declarators */ /* Define/disable kernel-specific declarators */
@@ -227,6 +228,10 @@ @@ -232,6 +233,10 @@
#define __cdecl #define __cdecl
#endif #endif
@ -2505,17 +2505,17 @@ Index: acpica-unix-20190215/source/include/platform/aclinux.h
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* __ACLINUX_H__ */ #endif /* __ACLINUX_H__ */
Index: acpica-unix-20190215/source/compiler/aslanalyze.c Index: acpica-unix-20190329/source/compiler/aslanalyze.c
=================================================================== ===================================================================
--- acpica-unix-20190215.orig/source/compiler/aslanalyze.c --- acpica-unix-20190329.orig/source/compiler/aslanalyze.c
+++ acpica-unix-20190215/source/compiler/aslanalyze.c +++ acpica-unix-20190329/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 */
- ACPI_MOVE_32_TO_32 (Name, &Op->Asl.NameSeg); - ACPI_MOVE_32_TO_32 (Name, &Op->Asl.NameSeg);
+ ACPI_MOVE_NAME (Name, &Op->Asl.NameSeg); + ACPI_COPY_NAMESEG (Name, &Op->Asl.NameSeg);
Name[ACPI_NAME_SIZE] = 0; Name[ACPI_NAMESEG_SIZE] = 0;
/* /*
@@ -488,7 +488,7 @@ ApCheckForGpeNameConflict ( @@ -488,7 +488,7 @@ ApCheckForGpeNameConflict (
@ -2523,14 +2523,14 @@ Index: acpica-unix-20190215/source/compiler/aslanalyze.c
* Create the target name that would cause collision (Flip E/L) * Create the target name that would cause collision (Flip E/L)
*/ */
- ACPI_MOVE_32_TO_32 (Target, Name); - ACPI_MOVE_32_TO_32 (Target, Name);
+ ACPI_MOVE_NAME (Target, Name); + ACPI_COPY_NAMESEG (Target, Name);
/* Inject opposite letter ("L" versus "E") */ /* Inject opposite letter ("L" versus "E") */
Index: acpica-unix-20190215/source/compiler/asllookup.c Index: acpica-unix-20190329/source/compiler/asllookup.c
=================================================================== ===================================================================
--- acpica-unix-20190215.orig/source/compiler/asllookup.c --- acpica-unix-20190329.orig/source/compiler/asllookup.c
+++ acpica-unix-20190215/source/compiler/asllookup.c +++ acpica-unix-20190329/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-20190215/source/compiler/asllookup.c
AslError (ASL_REMARK, ASL_MSG_NOT_REFERENCED, AslError (ASL_REMARK, ASL_MSG_NOT_REFERENCED,
LkGetNameOp (Node->Op), AslGbl_MsgBuffer); LkGetNameOp (Node->Op), AslGbl_MsgBuffer);
return (AE_OK); return (AE_OK);
Index: acpica-unix-20190215/source/compiler/aslmain.c Index: acpica-unix-20190329/source/compiler/aslmain.c
=================================================================== ===================================================================
--- acpica-unix-20190215.orig/source/compiler/aslmain.c --- acpica-unix-20190329.orig/source/compiler/aslmain.c
+++ acpica-unix-20190215/source/compiler/aslmain.c +++ acpica-unix-20190329/source/compiler/aslmain.c
@@ -101,18 +101,6 @@ main ( @@ -101,18 +101,6 @@ main (
signal (SIGINT, AslSignalHandler); signal (SIGINT, AslSignalHandler);
@ -2584,10 +2584,10 @@ Index: acpica-unix-20190215/source/compiler/aslmain.c
AcpiOsInitialize (); AcpiOsInitialize ();
ACPI_DEBUG_INITIALIZE (); /* For debug version only */ ACPI_DEBUG_INITIALIZE (); /* For debug version only */
Index: acpica-unix-20190215/source/common/acfileio.c Index: acpica-unix-20190329/source/common/acfileio.c
=================================================================== ===================================================================
--- acpica-unix-20190215.orig/source/common/acfileio.c --- acpica-unix-20190329.orig/source/common/acfileio.c
+++ acpica-unix-20190215/source/common/acfileio.c +++ acpica-unix-20190329/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;
@ -2654,13 +2654,13 @@ Index: acpica-unix-20190215/source/common/acfileio.c
(UINT32) (FileSize - TableOffset)); (UINT32) (FileSize - TableOffset));
return (AE_BAD_HEADER); return (AE_BAD_HEADER);
} }
Index: acpica-unix-20190215/source/common/dmtable.c Index: acpica-unix-20190329/source/common/dmtable.c
=================================================================== ===================================================================
--- acpica-unix-20190215.orig/source/common/dmtable.c --- acpica-unix-20190329.orig/source/common/dmtable.c
+++ acpica-unix-20190215/source/common/dmtable.c +++ acpica-unix-20190329/source/common/dmtable.c
@@ -551,7 +551,7 @@ AcpiDmDumpDataTable ( @@ -551,7 +551,7 @@ AcpiDmDumpDataTable (
*/ */
if (ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_FACS)) if (ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_FACS))
{ {
- Length = Table->Length; - Length = Table->Length;
+ ACPI_MOVE_32_TO_32(&Length, &Table->Length); + ACPI_MOVE_32_TO_32(&Length, &Table->Length);
@ -2668,7 +2668,7 @@ Index: acpica-unix-20190215/source/common/dmtable.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
@@ -565,13 +565,14 @@ AcpiDmDumpDataTable ( @@ -565,13 +565,14 @@ AcpiDmDumpDataTable (
else if (ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_S3PT)) else if (ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_S3PT))
{ {
Length = AcpiDmDumpS3pt (Table); Length = AcpiDmDumpS3pt (Table);
+ ACPI_MOVE_32_TO_32(&Length, &Table->Length); + ACPI_MOVE_32_TO_32(&Length, &Table->Length);
@ -2756,10 +2756,10 @@ Index: acpica-unix-20190215/source/common/dmtable.c
AcpiDmNfitSubnames[Temp16]); AcpiDmNfitSubnames[Temp16]);
break; break;
Index: acpica-unix-20190215/source/common/dmtables.c Index: acpica-unix-20190329/source/common/dmtables.c
=================================================================== ===================================================================
--- acpica-unix-20190215.orig/source/common/dmtables.c --- acpica-unix-20190329.orig/source/common/dmtables.c
+++ acpica-unix-20190215/source/common/dmtables.c +++ acpica-unix-20190329/source/common/dmtables.c
@@ -142,7 +142,9 @@ AdCreateTableHeader ( @@ -142,7 +142,9 @@ AdCreateTableHeader (
ACPI_TABLE_HEADER *Table) ACPI_TABLE_HEADER *Table)
{ {
@ -2825,10 +2825,10 @@ Index: acpica-unix-20190215/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-20190215/source/common/dmtbdump.c Index: acpica-unix-20190329/source/common/dmtbdump.c
=================================================================== ===================================================================
--- acpica-unix-20190215.orig/source/common/dmtbdump.c --- acpica-unix-20190329.orig/source/common/dmtbdump.c
+++ acpica-unix-20190215/source/common/dmtbdump.c +++ acpica-unix-20190329/source/common/dmtbdump.c
@@ -277,6 +277,8 @@ AcpiDmDumpRsdt ( @@ -277,6 +277,8 @@ AcpiDmDumpRsdt (
UINT32 Entries; UINT32 Entries;
UINT32 Offset; UINT32 Offset;
@ -2987,10 +2987,10 @@ Index: acpica-unix-20190215/source/common/dmtbdump.c
- Revision, Length, ExpectedLength); - Revision, Length, ExpectedLength);
+ Revision, Tmp32, ExpectedLength); + Revision, Tmp32, ExpectedLength);
} }
Index: acpica-unix-20190215/source/common/dmtbdump1.c Index: acpica-unix-20190329/source/common/dmtbdump1.c
=================================================================== ===================================================================
--- acpica-unix-20190215.orig/source/common/dmtbdump1.c --- acpica-unix-20190329.orig/source/common/dmtbdump1.c
+++ acpica-unix-20190215/source/common/dmtbdump1.c +++ acpica-unix-20190329/source/common/dmtbdump1.c
@@ -79,17 +79,21 @@ AcpiDmDumpAsf ( @@ -79,17 +79,21 @@ AcpiDmDumpAsf (
UINT32 DataOffset = 0; UINT32 DataOffset = 0;
UINT32 i; UINT32 i;
@ -3624,10 +3624,10 @@ Index: acpica-unix-20190215/source/common/dmtbdump1.c
{ {
case ACPI_HEST_TYPE_IA32_CHECK: case ACPI_HEST_TYPE_IA32_CHECK:
Index: acpica-unix-20190215/source/common/dmtbdump2.c Index: acpica-unix-20190329/source/common/dmtbdump2.c
=================================================================== ===================================================================
--- acpica-unix-20190215.orig/source/common/dmtbdump2.c --- acpica-unix-20190329.orig/source/common/dmtbdump2.c
+++ acpica-unix-20190215/source/common/dmtbdump2.c +++ acpica-unix-20190329/source/common/dmtbdump2.c
@@ -75,15 +75,21 @@ AcpiDmDumpIort ( @@ -75,15 +75,21 @@ AcpiDmDumpIort (
ACPI_IORT_SMMU *IortSmmu = NULL; ACPI_IORT_SMMU *IortSmmu = NULL;
UINT32 Offset; UINT32 Offset;
@ -4510,10 +4510,10 @@ Index: acpica-unix-20190215/source/common/dmtbdump2.c
Subtable->Length, InfoTable); Subtable->Length, InfoTable);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
Index: acpica-unix-20190215/source/common/dmtbdump3.c Index: acpica-unix-20190329/source/common/dmtbdump3.c
=================================================================== ===================================================================
--- acpica-unix-20190215.orig/source/common/dmtbdump3.c --- acpica-unix-20190329.orig/source/common/dmtbdump3.c
+++ acpica-unix-20190215/source/common/dmtbdump3.c +++ acpica-unix-20190329/source/common/dmtbdump3.c
@@ -68,9 +68,11 @@ void @@ -68,9 +68,11 @@ void
AcpiDmDumpSlic ( AcpiDmDumpSlic (
ACPI_TABLE_HEADER *Table) ACPI_TABLE_HEADER *Table)
@ -4760,10 +4760,10 @@ Index: acpica-unix-20190215/source/common/dmtbdump3.c
+ (void) AcpiDmDumpTable (Length, 0, Table, ArgumentsLength, + (void) AcpiDmDumpTable (Length, 0, Table, ArgumentsLength,
AcpiDmTableInfoWpbt0); AcpiDmTableInfoWpbt0);
} }
Index: acpica-unix-20190215/source/compiler/dtfield.c Index: acpica-unix-20190329/source/compiler/dtfield.c
=================================================================== ===================================================================
--- acpica-unix-20190215.orig/source/compiler/dtfield.c --- acpica-unix-20190329.orig/source/compiler/dtfield.c
+++ acpica-unix-20190215/source/compiler/dtfield.c +++ acpica-unix-20190329/source/compiler/dtfield.c
@@ -359,7 +359,27 @@ DtCompileInteger ( @@ -359,7 +359,27 @@ DtCompileInteger (
DtError (ASL_ERROR, ASL_MSG_INTEGER_SIZE, Field, AslGbl_MsgBuffer); DtError (ASL_ERROR, ASL_MSG_INTEGER_SIZE, Field, AslGbl_MsgBuffer);
} }
@ -4793,10 +4793,10 @@ Index: acpica-unix-20190215/source/compiler/dtfield.c
return; return;
} }
Index: acpica-unix-20190215/source/compiler/dtsubtable.c Index: acpica-unix-20190329/source/compiler/dtsubtable.c
=================================================================== ===================================================================
--- acpica-unix-20190215.orig/source/compiler/dtsubtable.c --- acpica-unix-20190329.orig/source/compiler/dtsubtable.c
+++ acpica-unix-20190215/source/compiler/dtsubtable.c +++ acpica-unix-20190329/source/compiler/dtsubtable.c
@@ -378,6 +378,21 @@ DtSetSubtableLength ( @@ -378,6 +378,21 @@ DtSetSubtableLength (
return; return;
} }
@ -4821,10 +4821,10 @@ Index: acpica-unix-20190215/source/compiler/dtsubtable.c
+ Subtable->SizeOfLengthField); + Subtable->SizeOfLengthField);
+ } + }
} }
Index: acpica-unix-20190215/source/compiler/dttable1.c Index: acpica-unix-20190329/source/compiler/dttable1.c
=================================================================== ===================================================================
--- acpica-unix-20190215.orig/source/compiler/dttable1.c --- acpica-unix-20190329.orig/source/compiler/dttable1.c
+++ acpica-unix-20190215/source/compiler/dttable1.c +++ acpica-unix-20190329/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;
@ -5196,10 +5196,10 @@ Index: acpica-unix-20190215/source/compiler/dttable1.c
return (AE_OK); return (AE_OK);
} }
Index: acpica-unix-20190215/source/compiler/dttable2.c Index: acpica-unix-20190329/source/compiler/dttable2.c
=================================================================== ===================================================================
--- acpica-unix-20190215.orig/source/compiler/dttable2.c --- acpica-unix-20190329.orig/source/compiler/dttable2.c
+++ acpica-unix-20190215/source/compiler/dttable2.c +++ acpica-unix-20190329/source/compiler/dttable2.c
@@ -345,7 +345,7 @@ DtCompileMpst ( @@ -345,7 +345,7 @@ DtCompileMpst (
DtPushSubtable (Subtable); DtPushSubtable (Subtable);
@ -5392,10 +5392,10 @@ Index: acpica-unix-20190215/source/compiler/dttable2.c
ParentTable = DtPeekSubtable (); ParentTable = DtPeekSubtable ();
DtInsertSubtable (ParentTable, Subtable); DtInsertSubtable (ParentTable, Subtable);
Index: acpica-unix-20190215/source/components/disassembler/dmbuffer.c Index: acpica-unix-20190329/source/components/disassembler/dmbuffer.c
=================================================================== ===================================================================
--- acpica-unix-20190215.orig/source/components/disassembler/dmbuffer.c --- acpica-unix-20190329.orig/source/components/disassembler/dmbuffer.c
+++ acpica-unix-20190215/source/components/disassembler/dmbuffer.c +++ acpica-unix-20190329/source/components/disassembler/dmbuffer.c
@@ -204,7 +204,7 @@ AcpiDmByteList ( @@ -204,7 +204,7 @@ AcpiDmByteList (
@ -5471,15 +5471,15 @@ Index: acpica-unix-20190215/source/components/disassembler/dmbuffer.c
NextOp = AcpiPsGetDepthNext (NULL, Op); NextOp = AcpiPsGetDepthNext (NULL, Op);
if (!NextOp) if (!NextOp)
Index: acpica-unix-20190215/source/components/disassembler/dmopcode.c Index: acpica-unix-20190329/source/components/disassembler/dmopcode.c
=================================================================== ===================================================================
--- acpica-unix-20190215.orig/source/components/disassembler/dmopcode.c --- acpica-unix-20190329.orig/source/components/disassembler/dmopcode.c
+++ acpica-unix-20190215/source/components/disassembler/dmopcode.c +++ acpica-unix-20190329/source/components/disassembler/dmopcode.c
@@ -244,6 +244,7 @@ AcpiDmPredefinedDescription ( @@ -244,6 +244,7 @@ AcpiDmPredefinedDescription (
char *NameString; char *NameString;
int LastCharIsDigit; int LastCharIsDigit;
int LastCharsAreHex; int LastCharsAreHex;
+ char TmpName[ACPI_NAME_SIZE + 1]; + char TmpName[ACPI_NAMESEG_SIZE + 1];
if (!Op) if (!Op)
@ -5488,7 +5488,7 @@ Index: acpica-unix-20190215/source/components/disassembler/dmopcode.c
/* Predefined name must start with an underscore */ /* Predefined name must start with an underscore */
- NameString = ACPI_CAST_PTR (char, &Op->Named.Name); - NameString = ACPI_CAST_PTR (char, &Op->Named.Name);
+ memset(TmpName, 0, ACPI_NAME_SIZE + 1); + memset(TmpName, 0, ACPI_NAMESEG_SIZE + 1);
+ ACPI_MOVE_32_TO_32(TmpName, &Op->Named.Name); + ACPI_MOVE_32_TO_32(TmpName, &Op->Named.Name);
+ NameString = TmpName; + NameString = TmpName;
if (NameString[0] != '_') if (NameString[0] != '_')
@ -5545,10 +5545,10 @@ Index: acpica-unix-20190215/source/components/disassembler/dmopcode.c
Info->Level += 1; Info->Level += 1;
Info->MappingOp = Op; Info->MappingOp = Op;
Index: acpica-unix-20190215/source/components/disassembler/dmresrcl.c Index: acpica-unix-20190329/source/components/disassembler/dmresrcl.c
=================================================================== ===================================================================
--- acpica-unix-20190215.orig/source/components/disassembler/dmresrcl.c --- acpica-unix-20190329.orig/source/components/disassembler/dmresrcl.c
+++ acpica-unix-20190215/source/components/disassembler/dmresrcl.c +++ acpica-unix-20190329/source/components/disassembler/dmresrcl.c
@@ -141,7 +141,8 @@ AcpiDmMemoryFields ( @@ -141,7 +141,8 @@ AcpiDmMemoryFields (
UINT32 Level) UINT32 Level)
{ {
@ -5697,10 +5697,10 @@ Index: acpica-unix-20190215/source/components/disassembler/dmresrcl.c
} }
AcpiDmIndent (Level); AcpiDmIndent (Level);
Index: acpica-unix-20190215/source/components/disassembler/dmresrcl2.c Index: acpica-unix-20190329/source/components/disassembler/dmresrcl2.c
=================================================================== ===================================================================
--- acpica-unix-20190215.orig/source/components/disassembler/dmresrcl2.c --- acpica-unix-20190329.orig/source/components/disassembler/dmresrcl2.c
+++ acpica-unix-20190215/source/components/disassembler/dmresrcl2.c +++ acpica-unix-20190329/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;
@ -5924,10 +5924,10 @@ Index: acpica-unix-20190215/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-20190215/source/components/disassembler/dmresrcs.c Index: acpica-unix-20190329/source/components/disassembler/dmresrcs.c
=================================================================== ===================================================================
--- acpica-unix-20190215.orig/source/components/disassembler/dmresrcs.c --- acpica-unix-20190329.orig/source/components/disassembler/dmresrcs.c
+++ acpica-unix-20190215/source/components/disassembler/dmresrcs.c +++ acpica-unix-20190329/source/components/disassembler/dmresrcs.c
@@ -72,6 +72,7 @@ AcpiDmIrqDescriptor ( @@ -72,6 +72,7 @@ AcpiDmIrqDescriptor (
UINT32 Length, UINT32 Length,
UINT32 Level) UINT32 Level)
@ -5984,10 +5984,10 @@ Index: acpica-unix-20190215/source/components/disassembler/dmresrcs.c
AcpiDmIndent (Level + 1); AcpiDmIndent (Level + 1);
AcpiDmDumpInteger8 (Resource->FixedIo.AddressLength, "Length"); AcpiDmDumpInteger8 (Resource->FixedIo.AddressLength, "Length");
Index: acpica-unix-20190215/source/components/dispatcher/dsfield.c Index: acpica-unix-20190329/source/components/dispatcher/dsfield.c
=================================================================== ===================================================================
--- acpica-unix-20190215.orig/source/components/dispatcher/dsfield.c --- acpica-unix-20190329.orig/source/components/dispatcher/dsfield.c
+++ acpica-unix-20190215/source/components/dispatcher/dsfield.c +++ acpica-unix-20190329/source/components/dispatcher/dsfield.c
@@ -325,6 +325,7 @@ AcpiDsGetFieldNames ( @@ -325,6 +325,7 @@ AcpiDsGetFieldNames (
ACPI_STATUS Status; ACPI_STATUS Status;
UINT64 Position; UINT64 Position;
@ -6032,15 +6032,15 @@ Index: acpica-unix-20190215/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-20190215/source/components/events/evgpeblk.c Index: acpica-unix-20190329/source/components/events/evgpeblk.c
=================================================================== ===================================================================
--- acpica-unix-20190215.orig/source/components/events/evgpeblk.c --- acpica-unix-20190329.orig/source/components/events/evgpeblk.c
+++ acpica-unix-20190215/source/components/events/evgpeblk.c +++ acpica-unix-20190329/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;
ACPI_GPE_WALK_INFO WalkInfo; ACPI_GPE_WALK_INFO WalkInfo;
+ char Name[ACPI_NAME_SIZE + 1]; + char Name[ACPI_NAMESEG_SIZE + 1];
ACPI_FUNCTION_TRACE (EvCreateGpeBlock); ACPI_FUNCTION_TRACE (EvCreateGpeBlock);
@ -6057,7 +6057,7 @@ Index: acpica-unix-20190215/source/components/events/evgpeblk.c
(*ReturnGpeBlock) = GpeBlock; (*ReturnGpeBlock) = GpeBlock;
} }
+ memset(&Name, 0, ACPI_NAME_SIZE + 1); + memset(&Name, 0, ACPI_NAMESEG_SIZE + 1);
+ ACPI_MOVE_32_TO_32(&Name, &GpeDevice->Name.Ascii); + ACPI_MOVE_32_TO_32(&Name, &GpeDevice->Name.Ascii);
ACPI_DEBUG_PRINT_RAW ((ACPI_DB_INIT, ACPI_DEBUG_PRINT_RAW ((ACPI_DB_INIT,
" Initialized GPE %02X to %02X [%4.4s] %u regs on interrupt 0x%X%s\n", " Initialized GPE %02X to %02X [%4.4s] %u regs on interrupt 0x%X%s\n",
@ -6068,10 +6068,10 @@ Index: acpica-unix-20190215/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-20190215/source/components/hardware/hwregs.c Index: acpica-unix-20190329/source/components/hardware/hwregs.c
=================================================================== ===================================================================
--- acpica-unix-20190215.orig/source/components/hardware/hwregs.c --- acpica-unix-20190329.orig/source/components/hardware/hwregs.c
+++ acpica-unix-20190215/source/components/hardware/hwregs.c +++ acpica-unix-20190329/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.
@ -6081,10 +6081,10 @@ Index: acpica-unix-20190215/source/components/hardware/hwregs.c
if (!(*Address)) if (!(*Address))
{ {
return (AE_BAD_ADDRESS); return (AE_BAD_ADDRESS);
Index: acpica-unix-20190215/source/components/hardware/hwvalid.c Index: acpica-unix-20190329/source/components/hardware/hwvalid.c
=================================================================== ===================================================================
--- acpica-unix-20190215.orig/source/components/hardware/hwvalid.c --- acpica-unix-20190329.orig/source/components/hardware/hwvalid.c
+++ acpica-unix-20190215/source/components/hardware/hwvalid.c +++ acpica-unix-20190329/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;
@ -6106,10 +6106,10 @@ Index: acpica-unix-20190215/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-20190215/source/components/namespace/nsaccess.c Index: acpica-unix-20190329/source/components/namespace/nsaccess.c
=================================================================== ===================================================================
--- acpica-unix-20190215.orig/source/components/namespace/nsaccess.c --- acpica-unix-20190329.orig/source/components/namespace/nsaccess.c
+++ acpica-unix-20190215/source/components/namespace/nsaccess.c +++ acpica-unix-20190329/source/components/namespace/nsaccess.c
@@ -314,6 +314,7 @@ AcpiNsLookup ( @@ -314,6 +314,7 @@ AcpiNsLookup (
UINT32 SearchParentFlag = ACPI_NS_SEARCH_PARENT; UINT32 SearchParentFlag = ACPI_NS_SEARCH_PARENT;
UINT32 LocalFlags; UINT32 LocalFlags;
@ -6130,10 +6130,10 @@ Index: acpica-unix-20190215/source/components/namespace/nsaccess.c
AcpiUtGetTypeName (ThisNode->Type), AcpiUtGetTypeName (ThisNode->Type),
AcpiUtGetTypeName (TypeToCheckFor))); AcpiUtGetTypeName (TypeToCheckFor)));
} }
Index: acpica-unix-20190215/source/components/namespace/nsparse.c Index: acpica-unix-20190329/source/components/namespace/nsparse.c
=================================================================== ===================================================================
--- acpica-unix-20190215.orig/source/components/namespace/nsparse.c --- acpica-unix-20190329.orig/source/components/namespace/nsparse.c
+++ acpica-unix-20190215/source/components/namespace/nsparse.c +++ acpica-unix-20190329/source/components/namespace/nsparse.c
@@ -216,13 +216,14 @@ AcpiNsOneCompleteParse ( @@ -216,13 +216,14 @@ AcpiNsOneCompleteParse (
/* Table must consist of at least a complete header */ /* Table must consist of at least a complete header */
@ -6151,10 +6151,10 @@ Index: acpica-unix-20190215/source/components/namespace/nsparse.c
Status = AcpiTbGetOwnerId (TableIndex, &OwnerId); Status = AcpiTbGetOwnerId (TableIndex, &OwnerId);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
Index: acpica-unix-20190215/source/components/tables/tbdata.c Index: acpica-unix-20190329/source/components/tables/tbdata.c
=================================================================== ===================================================================
--- acpica-unix-20190215.orig/source/components/tables/tbdata.c --- acpica-unix-20190329.orig/source/components/tables/tbdata.c
+++ acpica-unix-20190215/source/components/tables/tbdata.c +++ acpica-unix-20190329/source/components/tables/tbdata.c
@@ -552,6 +552,7 @@ AcpiTbVerifyTempTable ( @@ -552,6 +552,7 @@ AcpiTbVerifyTempTable (
UINT32 *TableIndex) UINT32 *TableIndex)
{ {
@ -6173,10 +6173,10 @@ Index: acpica-unix-20190215/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-20190215/source/components/tables/tbfadt.c Index: acpica-unix-20190329/source/components/tables/tbfadt.c
=================================================================== ===================================================================
--- acpica-unix-20190215.orig/source/components/tables/tbfadt.c --- acpica-unix-20190329.orig/source/components/tables/tbfadt.c
+++ acpica-unix-20190215/source/components/tables/tbfadt.c +++ acpica-unix-20190329/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)
@ -6288,10 +6288,10 @@ Index: acpica-unix-20190215/source/components/tables/tbfadt.c
"PmRegisters", 0); "PmRegisters", 0);
} }
} }
Index: acpica-unix-20190215/source/components/tables/tbfind.c Index: acpica-unix-20190329/source/components/tables/tbfind.c
=================================================================== ===================================================================
--- acpica-unix-20190215.orig/source/components/tables/tbfind.c --- acpica-unix-20190329.orig/source/components/tables/tbfind.c
+++ acpica-unix-20190215/source/components/tables/tbfind.c +++ acpica-unix-20190329/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)
@ -6300,15 +6300,15 @@ Index: acpica-unix-20190215/source/components/tables/tbfind.c
+ +
+ ACPI_MOVE_32_TO_32(&Tmp32, &Header.Signature); + ACPI_MOVE_32_TO_32(&Tmp32, &Header.Signature);
if (memcmp (&(AcpiGbl_RootTableList.Tables[i].Signature), if (memcmp (&(AcpiGbl_RootTableList.Tables[i].Signature),
- Header.Signature, ACPI_NAME_SIZE)) - Header.Signature, ACPI_NAMESEG_SIZE))
+ &Tmp32, ACPI_NAME_SIZE)) + &Tmp32, ACPI_NAMESEG_SIZE))
{ {
/* Not the requested table */ /* Not the requested table */
Index: acpica-unix-20190215/source/components/tables/tbprint.c Index: acpica-unix-20190329/source/components/tables/tbprint.c
=================================================================== ===================================================================
--- acpica-unix-20190215.orig/source/components/tables/tbprint.c --- acpica-unix-20190329.orig/source/components/tables/tbprint.c
+++ acpica-unix-20190215/source/components/tables/tbprint.c +++ acpica-unix-20190329/source/components/tables/tbprint.c
@@ -143,15 +143,18 @@ AcpiTbPrintTableHeader ( @@ -143,15 +143,18 @@ AcpiTbPrintTableHeader (
ACPI_TABLE_HEADER *Header) ACPI_TABLE_HEADER *Header)
{ {
@ -6318,7 +6318,7 @@ Index: acpica-unix-20190215/source/components/tables/tbprint.c
+ UINT32 CompilerRev; + UINT32 CompilerRev;
if (ACPI_COMPARE_NAME (Header->Signature, ACPI_SIG_FACS)) if (ACPI_COMPARE_NAMESEG (Header->Signature, ACPI_SIG_FACS))
{ {
/* FACS only has signature and length fields */ /* FACS only has signature and length fields */
@ -6350,10 +6350,10 @@ Index: acpica-unix-20190215/source/components/tables/tbprint.c
} }
} }
Index: acpica-unix-20190215/source/components/tables/tbutils.c Index: acpica-unix-20190329/source/components/tables/tbutils.c
=================================================================== ===================================================================
--- acpica-unix-20190215.orig/source/components/tables/tbutils.c --- acpica-unix-20190329.orig/source/components/tables/tbutils.c
+++ acpica-unix-20190215/source/components/tables/tbutils.c +++ acpica-unix-20190329/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
@ -6406,17 +6406,17 @@ Index: acpica-unix-20190215/source/components/tables/tbutils.c
+ ACPI_MOVE_32_TO_32(&Tmp32, + ACPI_MOVE_32_TO_32(&Tmp32,
+ &AcpiGbl_RootTableList.Tables[TableIndex].Signature); + &AcpiGbl_RootTableList.Tables[TableIndex].Signature);
if (ACPI_SUCCESS (Status) && if (ACPI_SUCCESS (Status) &&
- ACPI_COMPARE_NAME ( - ACPI_COMPARE_NAMESEG (
- &AcpiGbl_RootTableList.Tables[TableIndex].Signature, - &AcpiGbl_RootTableList.Tables[TableIndex].Signature,
- ACPI_SIG_FADT)) - ACPI_SIG_FADT))
+ ACPI_COMPARE_NAME (&Tmp32, ACPI_SIG_FADT)) + ACPI_COMPARE_NAMESEG (&Tmp32, ACPI_SIG_FADT))
{ {
AcpiGbl_FadtIndex = TableIndex; AcpiGbl_FadtIndex = TableIndex;
AcpiTbParseFadt (); AcpiTbParseFadt ();
Index: acpica-unix-20190215/source/components/tables/tbxface.c Index: acpica-unix-20190329/source/components/tables/tbxface.c
=================================================================== ===================================================================
--- acpica-unix-20190215.orig/source/components/tables/tbxface.c --- acpica-unix-20190329.orig/source/components/tables/tbxface.c
+++ acpica-unix-20190215/source/components/tables/tbxface.c +++ acpica-unix-20190329/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++)
@ -6424,16 +6424,16 @@ Index: acpica-unix-20190215/source/components/tables/tbxface.c
+ UINT32 Tmp32; + UINT32 Tmp32;
+ +
+ ACPI_MOVE_32_TO_32(&Tmp32, (UINT32 *)Signature); + ACPI_MOVE_32_TO_32(&Tmp32, (UINT32 *)Signature);
if (!ACPI_COMPARE_NAME ( if (!ACPI_COMPARE_NAMESEG (
- &(AcpiGbl_RootTableList.Tables[i].Signature), Signature)) - &(AcpiGbl_RootTableList.Tables[i].Signature), Signature))
+ &(AcpiGbl_RootTableList.Tables[i].Signature), &Tmp32)) + &(AcpiGbl_RootTableList.Tables[i].Signature), &Tmp32))
{ {
continue; continue;
} }
Index: acpica-unix-20190215/source/components/tables/tbxfload.c Index: acpica-unix-20190329/source/components/tables/tbxfload.c
=================================================================== ===================================================================
--- acpica-unix-20190215.orig/source/components/tables/tbxfload.c --- acpica-unix-20190329.orig/source/components/tables/tbxfload.c
+++ acpica-unix-20190215/source/components/tables/tbxfload.c +++ acpica-unix-20190329/source/components/tables/tbxfload.c
@@ -153,6 +153,7 @@ AcpiTbLoadNamespace ( @@ -153,6 +153,7 @@ AcpiTbLoadNamespace (
ACPI_TABLE_DESC *Table; ACPI_TABLE_DESC *Table;
UINT32 TablesLoaded = 0; UINT32 TablesLoaded = 0;
@ -6448,15 +6448,15 @@ Index: acpica-unix-20190215/source/components/tables/tbxfload.c
+ ACPI_MOVE_32_TO_32(&Tmp32, &Table->Signature.Ascii); + ACPI_MOVE_32_TO_32(&Tmp32, &Table->Signature.Ascii);
if (!AcpiGbl_RootTableList.CurrentTableCount || if (!AcpiGbl_RootTableList.CurrentTableCount ||
- !ACPI_COMPARE_NAME (Table->Signature.Ascii, ACPI_SIG_DSDT) || - !ACPI_COMPARE_NAMESEG (Table->Signature.Ascii, ACPI_SIG_DSDT) ||
+ !ACPI_COMPARE_NAME (&Tmp32, ACPI_SIG_DSDT) || + !ACPI_COMPARE_NAMESEG (&Tmp32, ACPI_SIG_DSDT) ||
ACPI_FAILURE (AcpiTbValidateTable (Table))) ACPI_FAILURE (AcpiTbValidateTable (Table)))
{ {
Status = AE_NO_ACPI_TABLES; Status = AE_NO_ACPI_TABLES;
Index: acpica-unix-20190215/source/tools/acpiexec/aetables.c Index: acpica-unix-20190329/source/tools/acpiexec/aetables.c
=================================================================== ===================================================================
--- acpica-unix-20190215.orig/source/tools/acpiexec/aetables.c --- acpica-unix-20190329.orig/source/tools/acpiexec/aetables.c
+++ acpica-unix-20190215/source/tools/acpiexec/aetables.c +++ acpica-unix-20190329/source/tools/acpiexec/aetables.c
@@ -146,21 +146,25 @@ AeInitializeTableHeader ( @@ -146,21 +146,25 @@ AeInitializeTableHeader (
char *Signature, char *Signature,
UINT32 Length) UINT32 Length)
@ -6464,7 +6464,7 @@ Index: acpica-unix-20190215/source/tools/acpiexec/aetables.c
+ UINT16 Tmp16; + UINT16 Tmp16;
+ UINT32 Tmp32; + UINT32 Tmp32;
ACPI_MOVE_NAME (Header->Signature, Signature); ACPI_COPY_NAMESEG (Header->Signature, Signature);
- Header->Length = Length; - Header->Length = Length;
+ ACPI_MOVE_32_TO_32(&Header->Length, &Length); + ACPI_MOVE_32_TO_32(&Header->Length, &Length);
@ -6473,7 +6473,7 @@ Index: acpica-unix-20190215/source/tools/acpiexec/aetables.c
+ ACPI_MOVE_16_TO_16(&Header->OemRevision, &Tmp16); + ACPI_MOVE_16_TO_16(&Header->OemRevision, &Tmp16);
memcpy (Header->OemId, "Intel ", ACPI_OEM_ID_SIZE); memcpy (Header->OemId, "Intel ", ACPI_OEM_ID_SIZE);
memcpy (Header->OemTableId, "AcpiExec", ACPI_OEM_TABLE_ID_SIZE); memcpy (Header->OemTableId, "AcpiExec", ACPI_OEM_TABLE_ID_SIZE);
ACPI_MOVE_NAME (Header->AslCompilerId, "INTL"); ACPI_COPY_NAMESEG (Header->AslCompilerId, "INTL");
- Header->AslCompilerRevision = ACPI_CA_VERSION; - Header->AslCompilerRevision = ACPI_CA_VERSION;
+ Tmp32 = ACPI_CA_VERSION; + Tmp32 = ACPI_CA_VERSION;
+ ACPI_MOVE_32_TO_32(&Header->AslCompilerRevision, &Tmp32); + ACPI_MOVE_32_TO_32(&Header->AslCompilerRevision, &Tmp32);
@ -6560,7 +6560,7 @@ Index: acpica-unix-20190215/source/tools/acpiexec/aetables.c
} }
@@ -425,13 +442,17 @@ AeBuildLocalTables ( @@ -425,13 +442,17 @@ AeBuildLocalTables (
memset (&LocalFACS, 0, sizeof (ACPI_TABLE_FACS)); memset (&LocalFACS, 0, sizeof (ACPI_TABLE_FACS));
ACPI_MOVE_NAME (LocalFACS.Signature, ACPI_SIG_FACS); ACPI_COPY_NAMESEG (LocalFACS.Signature, ACPI_SIG_FACS);
- LocalFACS.Length = sizeof (ACPI_TABLE_FACS); - LocalFACS.Length = sizeof (ACPI_TABLE_FACS);
- LocalFACS.GlobalLock = 0x11AA0011; - LocalFACS.GlobalLock = 0x11AA0011;
@ -6579,7 +6579,7 @@ Index: acpica-unix-20190215/source/tools/acpiexec/aetables.c
* Build a fake table [TEST] so that we make sure that the * Build a fake table [TEST] so that we make sure that the
* ACPICA core ignores it * ACPICA core ignores it
@@ -440,11 +461,12 @@ AeBuildLocalTables ( @@ -440,11 +461,12 @@ AeBuildLocalTables (
ACPI_MOVE_NAME (LocalTEST.Signature, "TEST"); ACPI_COPY_NAMESEG (LocalTEST.Signature, "TEST");
LocalTEST.Revision = 1; LocalTEST.Revision = 1;
- LocalTEST.Length = sizeof (ACPI_TABLE_HEADER); - LocalTEST.Length = sizeof (ACPI_TABLE_HEADER);
@ -6594,7 +6594,7 @@ Index: acpica-unix-20190215/source/tools/acpiexec/aetables.c
/* /*
* Build a fake table with a bad signature [BAD!] so that we make * Build a fake table with a bad signature [BAD!] so that we make
@@ -454,11 +476,12 @@ AeBuildLocalTables ( @@ -454,11 +476,12 @@ AeBuildLocalTables (
ACPI_MOVE_NAME (LocalBADTABLE.Signature, "BAD!"); ACPI_COPY_NAMESEG (LocalBADTABLE.Signature, "BAD!");
LocalBADTABLE.Revision = 1; LocalBADTABLE.Revision = 1;
- LocalBADTABLE.Length = sizeof (ACPI_TABLE_HEADER); - LocalBADTABLE.Length = sizeof (ACPI_TABLE_HEADER);
@ -6608,10 +6608,10 @@ Index: acpica-unix-20190215/source/tools/acpiexec/aetables.c
} }
return (AE_OK); return (AE_OK);
Index: acpica-unix-20190215/source/common/dmswitch.c Index: acpica-unix-20190329/source/common/dmswitch.c
=================================================================== ===================================================================
--- acpica-unix-20190215.orig/source/common/dmswitch.c --- acpica-unix-20190329.orig/source/common/dmswitch.c
+++ acpica-unix-20190215/source/common/dmswitch.c +++ acpica-unix-20190329/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;

View File

@ -1,3 +1,4 @@
ACPI Warning: NsLookup: Type mismatch on OPR2 (Region), searching for (BankField) (20190329/nsaccess-728)
grammar.asl 120: Device (A1) grammar.asl 120: Device (A1)
Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope)

View File

@ -1,7 +1,7 @@
Index: acpica-unix2-20180313/source/compiler/aslparseop.c Index: acpica-unix-20190329/source/compiler/aslparseop.c
=================================================================== ===================================================================
--- acpica-unix2-20180313.orig/source/compiler/aslparseop.c --- acpica-unix-20190329.orig/source/compiler/aslparseop.c
+++ acpica-unix2-20180313/source/compiler/aslparseop.c +++ acpica-unix-20190329/source/compiler/aslparseop.c
@@ -283,7 +283,16 @@ TrCreateValuedLeafOp ( @@ -283,7 +283,16 @@ TrCreateValuedLeafOp (
@ -20,11 +20,11 @@ Index: acpica-unix2-20180313/source/compiler/aslparseop.c
DbgPrint (ASL_PARSE_OUTPUT, DbgPrint (ASL_PARSE_OUTPUT,
"\nCreateValuedLeafOp Ln/Col %u/%u NewOp %p " "\nCreateValuedLeafOp Ln/Col %u/%u NewOp %p "
Index: acpica-unix2-20180313/source/include/platform/aclinux.h Index: acpica-unix-20190329/source/include/platform/aclinux.h
=================================================================== ===================================================================
--- acpica-unix2-20180313.orig/source/include/platform/aclinux.h --- acpica-unix-20190329.orig/source/include/platform/aclinux.h
+++ acpica-unix2-20180313/source/include/platform/aclinux.h +++ acpica-unix-20190329/source/include/platform/aclinux.h
@@ -227,10 +227,8 @@ @@ -232,10 +232,8 @@
#endif #endif
#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ #if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__

View File

@ -1,8 +1,8 @@
Index: acpica-unix2-20180313/source/include/platform/aclinux.h Index: acpica-unix-20190329/source/include/platform/aclinux.h
=================================================================== ===================================================================
--- acpica-unix2-20180313.orig/source/include/platform/aclinux.h --- acpica-unix-20190329.orig/source/include/platform/aclinux.h
+++ acpica-unix2-20180313/source/include/platform/aclinux.h +++ acpica-unix-20190329/source/include/platform/aclinux.h
@@ -228,9 +228,11 @@ @@ -233,9 +233,11 @@
#define __cdecl #define __cdecl
#endif #endif

View File

@ -3,11 +3,11 @@ Description: Stop listing all 64bit architectures
64bit architectures. 64bit architectures.
Author: Adrian Bunk <bunk@debian.org> Author: Adrian Bunk <bunk@debian.org>
Index: acpica-unix2-20180313/source/include/platform/aclinux.h Index: acpica-unix-20190329/source/include/platform/aclinux.h
=================================================================== ===================================================================
--- acpica-unix2-20180313.orig/source/include/platform/aclinux.h --- acpica-unix-20190329.orig/source/include/platform/aclinux.h
+++ acpica-unix2-20180313/source/include/platform/aclinux.h +++ acpica-unix-20190329/source/include/platform/aclinux.h
@@ -210,9 +210,7 @@ @@ -215,9 +215,7 @@
#define ACPI_FLUSH_CPU_CACHE() #define ACPI_FLUSH_CPU_CACHE()
#define ACPI_CAST_PTHREAD_T(Pthread) ((ACPI_THREAD_ID) (Pthread)) #define ACPI_CAST_PTHREAD_T(Pthread) ((ACPI_THREAD_ID) (Pthread))

View File

@ -1,2 +1,2 @@
SHA512 (acpica-unix2-20190215.tar.gz) = fad9d58e62049b4090187df698e2b1ca09be2fdc54f4aa36bd19f22df2b10e03b249db752270914dc08870392b583e1da0f302bc0e819e7fba3227ae21e2c3fa SHA512 (acpica-unix2-20190329.tar.gz) = e2732703ec62595d37e7dae274fef751dfbaa5dd0acbef22bb4bc1d8285b7524f8b38b95cfb6a568d5c9bac38e1198a53998c742f7a494f055846a13e9f4b305
SHA512 (acpitests-unix-20190215.tar.gz) = 80060a61c80b01231b10e04dd65c2ab41d42824c439152cf128328890cee39ef597dc3f5bc535db4566cb322394bfce2760e1835df781d699818049cad5a4419 SHA512 (acpitests-unix-20190329.tar.gz) = 3d3f7d3381cdc7a7f76c5b4083dd6f3096a9a756d45098d7d4143ae52c6ca61c9e4d28ef852204b5f10f04367343cc638929cafa2063e86fda7e4418ecc2685d