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

Update to 20170629 upstream source and refresh patches

Browse Source 
Signed-off-by: Al Stone <ahs3@redhat.com>
This commit is contained in:
Al Stone 2017-08-11 17:14:55 -06:00
parent b0fde58d3b
commit b60b74884b
8 changed files with 173 additions and 227 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -70,3 +70,5 @@
/acpitests-unix-20170303.tar.gz
/acpica-unix2-20170531.tar.gz
/acpitests-unix-20170531.tar.gz
/acpica-unix2-20170629.tar.gz
/acpitests-unix-20170629.tar.gz

5
acpica-tools.spec
View File

@ -1,5 +1,5 @@
Name: acpica-tools
Version: 20170531
Version: 20170629
Release: 1%{?dist}
Summary: ACPICA tools for the development and debug of ACPI tables
@ -194,6 +194,9 @@ fi
%changelog
* Fri Aug 11 2017 Al Stone <ahs3@redhat.com> - 20170629-1
- Update to 20170629 source tree, including patch refeshes
* Fri Aug 11 2017 Al Stone <ahs3@redhat.com> - 20170531-1
- Update to 20170531 source tree, including patch refeshes

94
debian-big_endian.patch
View File

@ -18,11 +18,11 @@ support
source/include/platform/aclinux.h | 8 ++
12 files changed, 487 insertions(+), 283 deletions(-)
Index: acpica-unix2-20170531/source/compiler/aslcodegen.c
Index: acpica-unix2-20170629/source/compiler/aslcodegen.c
===================================================================
--- acpica-unix2-20170531.orig/source/compiler/aslcodegen.c
+++ acpica-unix2-20170531/source/compiler/aslcodegen.c
@@ -238,16 +238,12 @@ CgWriteAmlOpcode (
--- acpica-unix2-20170629.orig/source/compiler/aslcodegen.c
+++ acpica-unix2-20170629/source/compiler/aslcodegen.c
@@ -240,16 +240,12 @@ CgWriteAmlOpcode (
ACPI_PARSE_OBJECT *Op)
{
UINT8 PkgLenFirstByte;
@ -45,7 +45,7 @@ Index: acpica-unix2-20170531/source/compiler/aslcodegen.c
/* We expect some DEFAULT_ARGs, just ignore them */
@@ -280,51 +276,52 @@ CgWriteAmlOpcode (
@@ -282,51 +278,52 @@ CgWriteAmlOpcode (
/* Special opcodes for within a field definition */
@ -109,7 +109,7 @@ Index: acpica-unix2-20170531/source/compiler/aslcodegen.c
break;
}
@@ -335,8 +332,8 @@ CgWriteAmlOpcode (
@@ -337,8 +334,8 @@ CgWriteAmlOpcode (
if (Op->Asl.AmlPkgLenBytes == 1)
{
/* Simplest case -- no bytes to follow, just write the count */
@ -120,7 +120,7 @@ Index: acpica-unix2-20170531/source/compiler/aslcodegen.c
}
else if (Op->Asl.AmlPkgLenBytes != 0)
{
@@ -346,7 +343,7 @@ CgWriteAmlOpcode (
@@ -348,7 +345,7 @@ CgWriteAmlOpcode (
*/
PkgLenFirstByte = (UINT8)
(((UINT32) (Op->Asl.AmlPkgLenBytes - 1) << 6) |
@ -129,7 +129,7 @@ Index: acpica-unix2-20170531/source/compiler/aslcodegen.c
CgLocalWriteAmlData (Op, &PkgLenFirstByte, 1);
@@ -354,39 +351,47 @@ CgWriteAmlOpcode (
@@ -356,39 +353,47 @@ CgWriteAmlOpcode (
* Shift the length over by the 4 bits we just stuffed
* in the first byte
*/
@ -189,7 +189,7 @@ Index: acpica-unix2-20170531/source/compiler/aslcodegen.c
break;
case AML_STRING_OP:
@@ -420,6 +425,7 @@ CgWriteTableHeader (
@@ -422,6 +427,7 @@ CgWriteTableHeader (
ACPI_PARSE_OBJECT *Op)
{
ACPI_PARSE_OBJECT *Child;
@ -197,7 +197,7 @@ Index: acpica-unix2-20170531/source/compiler/aslcodegen.c
UINT32 CommentLength;
ACPI_COMMENT_NODE *Current;
@@ -473,7 +479,7 @@ CgWriteTableHeader (
@@ -475,7 +481,7 @@ CgWriteTableHeader (
/* OEM Revision */
Child = Child->Asl.Next;
@ -206,7 +206,7 @@ Index: acpica-unix2-20170531/source/compiler/aslcodegen.c
/* Compiler ID */
@@ -481,12 +487,13 @@ CgWriteTableHeader (
@@ -483,12 +489,13 @@ CgWriteTableHeader (
/* Compiler version */
@ -223,7 +223,7 @@ Index: acpica-unix2-20170531/source/compiler/aslcodegen.c
/* Calculate the comment lengths for this definition block parseOp */
@@ -643,7 +650,10 @@ CgWriteNode (
@@ -645,7 +652,10 @@ CgWriteNode (
ACPI_PARSE_OBJECT *Op)
{
ASL_RESOURCE_NODE *Rnode;
@ -235,7 +235,7 @@ Index: acpica-unix2-20170531/source/compiler/aslcodegen.c
/* Write all comments here. */
if (Gbl_CaptureComments)
@@ -672,13 +682,24 @@ CgWriteNode (
@@ -674,13 +684,24 @@ CgWriteNode (
switch (Op->Asl.AmlOpcode)
{
case AML_RAW_DATA_BYTE:
@ -263,10 +263,10 @@ Index: acpica-unix2-20170531/source/compiler/aslcodegen.c
case AML_RAW_DATA_BUFFER:
Index: acpica-unix2-20170531/source/compiler/aslopcodes.c
Index: acpica-unix2-20170629/source/compiler/aslopcodes.c
===================================================================
--- acpica-unix2-20170531.orig/source/compiler/aslopcodes.c
+++ acpica-unix2-20170531/source/compiler/aslopcodes.c
--- acpica-unix2-20170629.orig/source/compiler/aslopcodes.c
+++ acpica-unix2-20170629/source/compiler/aslopcodes.c
@@ -485,6 +485,7 @@ OpcDoUnicode (
UINT32 i;
UINT8 *AsciiString;
@ -285,10 +285,10 @@ Index: acpica-unix2-20170531/source/compiler/aslopcodes.c
}
/*
Index: acpica-unix2-20170531/source/compiler/aslrestype1.c
Index: acpica-unix2-20170629/source/compiler/aslrestype1.c
===================================================================
--- acpica-unix2-20170531.orig/source/compiler/aslrestype1.c
+++ acpica-unix2-20170531/source/compiler/aslrestype1.c
--- acpica-unix2-20170629.orig/source/compiler/aslrestype1.c
+++ acpica-unix2-20170629/source/compiler/aslrestype1.c
@@ -142,6 +142,11 @@ RsDoMemory24Descriptor (
ACPI_PARSE_OBJECT *LengthOp = NULL;
ASL_RESOURCE_NODE *Rnode;
@ -485,10 +485,10 @@ Index: acpica-unix2-20170531/source/compiler/aslrestype1.c
RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
CurrentByteOffset + ASL_RESDESC_OFFSET (FixedMemory32.AddressLength));
break;
Index: acpica-unix2-20170531/source/compiler/aslrestype1i.c
Index: acpica-unix2-20170629/source/compiler/aslrestype1i.c
===================================================================
--- acpica-unix2-20170531.orig/source/compiler/aslrestype1i.c
+++ acpica-unix2-20170531/source/compiler/aslrestype1i.c
--- acpica-unix2-20170629.orig/source/compiler/aslrestype1i.c
+++ acpica-unix2-20170629/source/compiler/aslrestype1i.c
@@ -198,6 +198,8 @@ RsDoFixedDmaDescriptor (
ACPI_PARSE_OBJECT *InitializerOp;
ASL_RESOURCE_NODE *Rnode;
@ -625,10 +625,10 @@ Index: acpica-unix2-20170531/source/compiler/aslrestype1i.c
+ ACPI_MOVE_16_TO_16(&Descriptor->Irq.IrqMask, &IrqMask);
return (Rnode);
}
Index: acpica-unix2-20170531/source/compiler/aslrestype2.c
Index: acpica-unix2-20170629/source/compiler/aslrestype2.c
===================================================================
--- acpica-unix2-20170531.orig/source/compiler/aslrestype2.c
+++ acpica-unix2-20170531/source/compiler/aslrestype2.c
--- acpica-unix2-20170629.orig/source/compiler/aslrestype2.c
+++ acpica-unix2-20170629/source/compiler/aslrestype2.c
@@ -76,6 +76,7 @@ RsDoGeneralRegisterDescriptor (
ACPI_PARSE_OBJECT *InitializerOp;
ASL_RESOURCE_NODE *Rnode;
@ -725,10 +725,10 @@ Index: acpica-unix2-20170531/source/compiler/aslrestype2.c
/* Point to end-of-descriptor for vendor data */
Index: acpica-unix2-20170531/source/compiler/aslrestype2d.c
Index: acpica-unix2-20170629/source/compiler/aslrestype2d.c
===================================================================
--- acpica-unix2-20170531.orig/source/compiler/aslrestype2d.c
+++ acpica-unix2-20170531/source/compiler/aslrestype2d.c
--- acpica-unix2-20170629.orig/source/compiler/aslrestype2d.c
+++ acpica-unix2-20170629/source/compiler/aslrestype2d.c
@@ -79,7 +79,13 @@ RsDoDwordIoDescriptor (
ACPI_PARSE_OBJECT *GranOp = NULL;
ASL_RESOURCE_NODE *Rnode;
@ -1084,10 +1084,10 @@ Index: acpica-unix2-20170531/source/compiler/aslrestype2d.c
Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS32) +
OptionIndex + StringLength;
return (Rnode);
Index: acpica-unix2-20170531/source/compiler/aslrestype2e.c
Index: acpica-unix2-20170629/source/compiler/aslrestype2e.c
===================================================================
--- acpica-unix2-20170531.orig/source/compiler/aslrestype2e.c
+++ acpica-unix2-20170531/source/compiler/aslrestype2e.c
--- acpica-unix2-20170629.orig/source/compiler/aslrestype2e.c
+++ acpica-unix2-20170629/source/compiler/aslrestype2e.c
@@ -78,6 +78,13 @@ RsDoExtendedIoDescriptor (
ACPI_PARSE_OBJECT *GranOp = NULL;
ASL_RESOURCE_NODE *Rnode;
@ -1193,10 +1193,10 @@ Index: acpica-unix2-20170531/source/compiler/aslrestype2e.c
Rnode->BufferLength = sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) +
StringLength;
return (Rnode);
Index: acpica-unix2-20170531/source/compiler/aslrestype2q.c
Index: acpica-unix2-20170629/source/compiler/aslrestype2q.c
===================================================================
--- acpica-unix2-20170531.orig/source/compiler/aslrestype2q.c
+++ acpica-unix2-20170531/source/compiler/aslrestype2q.c
--- acpica-unix2-20170629.orig/source/compiler/aslrestype2q.c
+++ acpica-unix2-20170629/source/compiler/aslrestype2q.c
@@ -80,7 +80,13 @@ RsDoQwordIoDescriptor (
ASL_RESOURCE_NODE *Rnode;
UINT8 *OptionalFields;
@ -1535,10 +1535,10 @@ Index: acpica-unix2-20170531/source/compiler/aslrestype2q.c
Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS64) +
OptionIndex + StringLength;
return (Rnode);
Index: acpica-unix2-20170531/source/compiler/aslrestype2s.c
Index: acpica-unix2-20170629/source/compiler/aslrestype2s.c
===================================================================
--- acpica-unix2-20170531.orig/source/compiler/aslrestype2s.c
+++ acpica-unix2-20170531/source/compiler/aslrestype2s.c
--- acpica-unix2-20170629.orig/source/compiler/aslrestype2s.c
+++ acpica-unix2-20170629/source/compiler/aslrestype2s.c
@@ -340,6 +340,9 @@ RsDoGpioIntDescriptor (
UINT16 VendorLength;
UINT16 InterruptLength;
@ -1852,10 +1852,10 @@ Index: acpica-unix2-20170531/source/compiler/aslrestype2s.c
MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource);
return (Rnode);
}
Index: acpica-unix2-20170531/source/compiler/aslrestype2w.c
Index: acpica-unix2-20170629/source/compiler/aslrestype2w.c
===================================================================
--- acpica-unix2-20170531.orig/source/compiler/aslrestype2w.c
+++ acpica-unix2-20170531/source/compiler/aslrestype2w.c
--- acpica-unix2-20170629.orig/source/compiler/aslrestype2w.c
+++ acpica-unix2-20170629/source/compiler/aslrestype2w.c
@@ -81,6 +81,12 @@ RsDoWordIoDescriptor (
UINT8 *OptionalFields;
UINT16 StringLength = 0;
@ -2199,10 +2199,10 @@ Index: acpica-unix2-20170531/source/compiler/aslrestype2w.c
Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) +
OptionIndex + StringLength;
return (Rnode);
Index: acpica-unix2-20170531/source/include/acmacros.h
Index: acpica-unix2-20170629/source/include/acmacros.h
===================================================================
--- acpica-unix2-20170531.orig/source/include/acmacros.h
+++ acpica-unix2-20170531/source/include/acmacros.h
--- acpica-unix2-20170629.orig/source/include/acmacros.h
+++ acpica-unix2-20170629/source/include/acmacros.h
@@ -100,7 +100,8 @@
/* 32-bit source, 16/32/64 destination */
@ -2240,11 +2240,11 @@ Index: acpica-unix2-20170531/source/include/acmacros.h
#define ACPI_MOVE_32_TO_32(d, s) *(UINT32 *)(void *)(d) = *(UINT32 *)(void *)(s)
#define ACPI_MOVE_32_TO_64(d, s) *(UINT64 *)(void *)(d) = *(UINT32 *)(void *)(s)
Index: acpica-unix2-20170531/source/include/platform/aclinux.h
Index: acpica-unix2-20170629/source/include/platform/aclinux.h
===================================================================
--- acpica-unix2-20170531.orig/source/include/platform/aclinux.h
+++ acpica-unix2-20170531/source/include/platform/aclinux.h
@@ -185,6 +185,7 @@
--- acpica-unix2-20170629.orig/source/include/platform/aclinux.h
+++ acpica-unix2-20170629/source/include/platform/aclinux.h
@@ -190,6 +190,7 @@
#ifdef ACPI_USE_STANDARD_HEADERS
#include <unistd.h>

60
debian-unaligned.patch
View File

@ -1,7 +1,4 @@
Patch carried over from the prior iasl package and updated. This allows
From: Al Stone <ahs3@redhat.com>
for builds on systems requiring aligned memory access. Please see
http://lists.acpica.org/pipermail/devel/2010-July/000159.html. Resolves
BZ#865013 and BZ#856856.
@ -13,67 +10,10 @@ Also fix callsites where wrong assumptions where made in terms of aligment.
Signed-off-by: Mattia Dongili <malattia@linux.it>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
source/compiler/asltree.c | 15 ++++++++++-----
source/components/executer/exoparg2.c | 12 +++++++++---
source/include/actypes.h | 26 +++++++++++++-------------
3 files changed, 32 insertions(+), 21 deletions(-)
Index: acpica-unix2-20170531/source/compiler/asltree.c
===================================================================
--- acpica-unix2-20170531.orig/source/compiler/asltree.c
+++ acpica-unix2-20170531/source/compiler/asltree.c
@@ -995,28 +995,31 @@ TrCreateValuedLeafNode (
"Op %s Value %8.8X%8.8X ",
Op->Asl.LineNumber, Op->Asl.Column, Op, UtGetOpName(ParseOpcode),
ACPI_FORMAT_UINT64 (Value));
- Op->Asl.Value.Integer = Value;
switch (ParseOpcode)
{
case PARSEOP_STRING_LITERAL:
- DbgPrint (ASL_PARSE_OUTPUT, "STRING->%s", Value);
+ Op->Asl.Value.String = (ACPI_STRING) (ACPI_SIZE) Value;
+ DbgPrint (ASL_PARSE_OUTPUT, "STRING->%s", Op->Asl.Value.String);
break;
case PARSEOP_NAMESEG:
- DbgPrint (ASL_PARSE_OUTPUT, "NAMESEG->%s", Value);
+ Op->Asl.Value.String = (ACPI_STRING) (ACPI_SIZE) Value;
+ DbgPrint (ASL_PARSE_OUTPUT, "NAMESEG->%s", Op->Asl.Value.String);
break;
case PARSEOP_NAMESTRING:
- DbgPrint (ASL_PARSE_OUTPUT, "NAMESTRING->%s", Value);
+ Op->Asl.Value.String = (ACPI_STRING) (ACPI_SIZE) Value;
+ DbgPrint (ASL_PARSE_OUTPUT, "NAMESTRING->%s", Op->Asl.Value.String);
break;
case PARSEOP_EISAID:
- DbgPrint (ASL_PARSE_OUTPUT, "EISAID->%s", Value);
+ Op->Asl.Value.String = (ACPI_STRING) (ACPI_SIZE) Value;
+ DbgPrint (ASL_PARSE_OUTPUT, "EISAID->%s", Op->Asl.Value.String);
break;
case PARSEOP_METHOD:
@@ -1026,12 +1029,14 @@ TrCreateValuedLeafNode (
case PARSEOP_INTEGER:
+ Op->Asl.Value.Integer = Value;
DbgPrint (ASL_PARSE_OUTPUT, "INTEGER->%8.8X%8.8X",
ACPI_FORMAT_UINT64 (Value));
break;
default:
+ Op->Asl.Value.Integer = Value;
break;
}
Index: acpica-unix2-20170531/source/components/executer/exoparg2.c
===================================================================
--- acpica-unix2-20170531.orig/source/components/executer/exoparg2.c

14
f23-harden.patch
View File

@ -8,10 +8,10 @@ From: Al Stone <ahs3@redhat.com>
generate/unix/iasl/Makefile | 13 +++++++------
2 files changed, 9 insertions(+), 6 deletions(-)
Index: acpica-unix2-20170531/generate/unix/Makefile.config
Index: acpica-unix2-20170629/generate/unix/Makefile.config
===================================================================
--- acpica-unix2-20170531.orig/generate/unix/Makefile.config
+++ acpica-unix2-20170531/generate/unix/Makefile.config
--- acpica-unix2-20170629.orig/generate/unix/Makefile.config
+++ acpica-unix2-20170629/generate/unix/Makefile.config
@@ -180,6 +180,8 @@ ifneq ($(NOFORTIFY),TRUE)
OPT_CFLAGS += -D_FORTIFY_SOURCE=2
endif
@ -21,11 +21,11 @@ Index: acpica-unix2-20170531/generate/unix/Makefile.config
CFLAGS += \
-D$(HOST)\
-D_GNU_SOURCE\
Index: acpica-unix2-20170531/generate/unix/iasl/Makefile
Index: acpica-unix2-20170629/generate/unix/iasl/Makefile
===================================================================
--- acpica-unix2-20170531.orig/generate/unix/iasl/Makefile
+++ acpica-unix2-20170531/generate/unix/iasl/Makefile
@@ -333,26 +333,27 @@ $(OBJDIR)/prparserparse.c $(OBJDIR)/prpa
--- acpica-unix2-20170629.orig/generate/unix/iasl/Makefile
+++ acpica-unix2-20170629/generate/unix/iasl/Makefile
@@ -334,26 +334,27 @@ $(OBJDIR)/prparserparse.c $(OBJDIR)/prpa
# Cannot use the common compile warning flags since the C files are created
# by the utilities above and they are not necessarily ANSI C, etc.
#

9
ppc64le.patch
View File

@ -1,7 +1,8 @@
diff -Naur acpica-unix2-20170119.orig/source/include/platform/aclinux.h acpica-unix2-20170119/source/include/platform/aclinux.h
--- acpica-unix2-20170119.orig/source/include/platform/aclinux.h 2017-01-30 15:38:53.465753721 -0700
+++ acpica-unix2-20170119/source/include/platform/aclinux.h 2017-01-30 15:42:55.911358257 -0700
@@ -219,9 +219,11 @@
Index: acpica-unix2-20170629/source/include/platform/aclinux.h
===================================================================
--- acpica-unix2-20170629.orig/source/include/platform/aclinux.h
+++ acpica-unix2-20170629/source/include/platform/aclinux.h
@@ -224,9 +224,11 @@
#define __cdecl
#endif

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (acpica-unix2-20170531.tar.gz) = 055563bbc7762fd18de4d1e3d59d5592485270ffd1b5f5ca09e4996f063b8478de3d142064a3f785d3fbfc1fd9c276751b7c3fcda914dec751cd1289de2d6ea5
SHA512 (acpitests-unix-20170531.tar.gz) = 978f7fba5cd2498ef6c2eafe71836538ba909294eb3848972378e88487fa59a123076dd21761eb3e7630e44d8eb3359d10820ca9011a72473919e7e0c1fff5c2
SHA512 (acpica-unix2-20170629.tar.gz) = acbfcb02e48634bbde8143a5c420504bed385d4ab01027d5a8de60a3e49d007d1bfa699544ffa4e0a3b04d03821896e5fe4a852b3ca2b2976afe7c290b3eac1d
SHA512 (acpitests-unix-20170629.tar.gz) = ec310cd24feafc28a749d635a7527c468cbbbeb80eb4b3d15dbf551014557b619856c6de585bd9f828cce591815e974fca6d71ab98a16eec414c606dc1792496

212
update-big-endian.patch
View File

@ -1,8 +1,8 @@
Index: acpica-unix2-20170531/source/common/acfileio.c
Index: acpica-unix2-20170629/source/common/acfileio.c
===================================================================
--- acpica-unix2-20170531.orig/source/common/acfileio.c
+++ acpica-unix2-20170531/source/common/acfileio.c
@@ -250,6 +250,7 @@ AcGetOneTableFromFile (
--- acpica-unix2-20170629.orig/source/common/acfileio.c
+++ acpica-unix2-20170629/source/common/acfileio.c
@@ -280,6 +280,7 @@ AcGetOneTableFromFile (
ACPI_TABLE_HEADER *Table;
INT32 Count;
long TableOffset;
@ -10,7 +10,7 @@ Index: acpica-unix2-20170531/source/common/acfileio.c
*ReturnTable = NULL;
@@ -289,7 +290,8 @@ AcGetOneTableFromFile (
@@ -319,7 +320,8 @@ AcGetOneTableFromFile (
/* Allocate a buffer for the entire table */
@ -20,7 +20,7 @@ Index: acpica-unix2-20170531/source/common/acfileio.c
if (!Table)
{
return (AE_NO_MEMORY);
@@ -299,8 +301,8 @@ AcGetOneTableFromFile (
@@ -329,8 +331,8 @@ AcGetOneTableFromFile (
fseek (File, TableOffset, SEEK_SET);
@ -31,7 +31,7 @@ Index: acpica-unix2-20170531/source/common/acfileio.c
{
Status = AE_ERROR;
goto ErrorExit;
@@ -308,7 +310,7 @@ AcGetOneTableFromFile (
@@ -338,7 +340,7 @@ AcGetOneTableFromFile (
/* Validate the checksum (just issue a warning) */
@ -40,7 +40,7 @@ Index: acpica-unix2-20170531/source/common/acfileio.c
if (ACPI_FAILURE (Status))
{
Status = AcCheckTextModeCorruption (Table);
@@ -400,6 +402,7 @@ AcValidateTableHeader (
@@ -430,6 +432,7 @@ AcValidateTableHeader (
ACPI_SIZE Actual;
long OriginalOffset;
UINT32 FileSize;
@ -48,7 +48,7 @@ Index: acpica-unix2-20170531/source/common/acfileio.c
UINT32 i;
@@ -429,11 +432,12 @@ AcValidateTableHeader (
@@ -459,11 +462,12 @@ AcValidateTableHeader (
/* Validate table length against bytes remaining in the file */
FileSize = CmGetFileSize (File);
@ -63,10 +63,10 @@ Index: acpica-unix2-20170531/source/common/acfileio.c
(UINT32) (FileSize - TableOffset));
return (AE_BAD_HEADER);
}
Index: acpica-unix2-20170531/source/common/dmtable.c
Index: acpica-unix2-20170629/source/common/dmtable.c
===================================================================
--- acpica-unix2-20170531.orig/source/common/dmtable.c
+++ acpica-unix2-20170531/source/common/dmtable.c
--- acpica-unix2-20170629.orig/source/common/dmtable.c
+++ acpica-unix2-20170629/source/common/dmtable.c
@@ -523,7 +523,7 @@ AcpiDmDumpDataTable (
*/
if (ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_FACS))
@ -165,10 +165,10 @@ Index: acpica-unix2-20170531/source/common/dmtable.c
AcpiDmNfitSubnames[Temp16]);
break;
Index: acpica-unix2-20170531/source/common/dmtables.c
Index: acpica-unix2-20170629/source/common/dmtables.c
===================================================================
--- acpica-unix2-20170531.orig/source/common/dmtables.c
+++ acpica-unix2-20170531/source/common/dmtables.c
--- acpica-unix2-20170629.orig/source/common/dmtables.c
+++ acpica-unix2-20170629/source/common/dmtables.c
@@ -142,7 +142,9 @@ AdCreateTableHeader (
ACPI_TABLE_HEADER *Table)
{
@ -234,10 +234,10 @@ Index: acpica-unix2-20170531/source/common/dmtables.c
AmlStart = ((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER));
ASL_CV_INIT_FILETREE(Table, AmlStart, AmlLength);
Index: acpica-unix2-20170531/source/common/dmtbdump.c
Index: acpica-unix2-20170629/source/common/dmtbdump.c
===================================================================
--- acpica-unix2-20170531.orig/source/common/dmtbdump.c
+++ acpica-unix2-20170531/source/common/dmtbdump.c
--- acpica-unix2-20170629.orig/source/common/dmtbdump.c
+++ acpica-unix2-20170629/source/common/dmtbdump.c
@@ -277,6 +277,8 @@ AcpiDmDumpRsdt (
UINT32 Entries;
UINT32 Offset;
@ -2051,10 +2051,10 @@ Index: acpica-unix2-20170531/source/common/dmtbdump.c
+ (void) AcpiDmDumpTable (Length, 0, Table, ArgumentsLength,
AcpiDmTableInfoWpbt0);
}
Index: acpica-unix2-20170531/source/compiler/aslrestype2.c
Index: acpica-unix2-20170629/source/compiler/aslrestype2.c
===================================================================
--- acpica-unix2-20170531.orig/source/compiler/aslrestype2.c
+++ acpica-unix2-20170531/source/compiler/aslrestype2.c
--- acpica-unix2-20170629.orig/source/compiler/aslrestype2.c
+++ acpica-unix2-20170629/source/compiler/aslrestype2.c
@@ -98,21 +98,33 @@ RsDoGeneralRegisterDescriptor (
{
case 0: /* Address space */
@ -2101,10 +2101,10 @@ Index: acpica-unix2-20170531/source/compiler/aslrestype2.c
RsCreateByteField (InitializerOp, ACPI_RESTAG_ACCESSSIZE,
CurrentByteOffset + ASL_RESDESC_OFFSET (GenericReg.AccessSize));
Index: acpica-unix2-20170531/source/compiler/dtfield.c
Index: acpica-unix2-20170629/source/compiler/dtfield.c
===================================================================
--- acpica-unix2-20170531.orig/source/compiler/dtfield.c
+++ acpica-unix2-20170531/source/compiler/dtfield.c
--- acpica-unix2-20170629.orig/source/compiler/dtfield.c
+++ acpica-unix2-20170629/source/compiler/dtfield.c
@@ -360,7 +360,27 @@ DtCompileInteger (
DtError (ASL_ERROR, ASL_MSG_INTEGER_SIZE, Field, MsgBuffer);
}
@ -2134,10 +2134,10 @@ Index: acpica-unix2-20170531/source/compiler/dtfield.c
return;
}
Index: acpica-unix2-20170531/source/compiler/dtsubtable.c
Index: acpica-unix2-20170629/source/compiler/dtsubtable.c
===================================================================
--- acpica-unix2-20170531.orig/source/compiler/dtsubtable.c
+++ acpica-unix2-20170531/source/compiler/dtsubtable.c
--- acpica-unix2-20170629.orig/source/compiler/dtsubtable.c
+++ acpica-unix2-20170629/source/compiler/dtsubtable.c
@@ -379,6 +379,21 @@ DtSetSubtableLength (
return;
}
@ -2162,10 +2162,10 @@ Index: acpica-unix2-20170531/source/compiler/dtsubtable.c
+ Subtable->SizeOfLengthField);
+ }
}
Index: acpica-unix2-20170531/source/compiler/dttable1.c
Index: acpica-unix2-20170629/source/compiler/dttable1.c
===================================================================
--- acpica-unix2-20170531.orig/source/compiler/dttable1.c
+++ acpica-unix2-20170531/source/compiler/dttable1.c
--- acpica-unix2-20170629.orig/source/compiler/dttable1.c
+++ acpica-unix2-20170629/source/compiler/dttable1.c
@@ -282,6 +282,8 @@ DtCompileCsrt (
DT_FIELD **PFieldList = (DT_FIELD **) List;
UINT32 DescriptorCount;
@ -2539,10 +2539,10 @@ Index: acpica-unix2-20170531/source/compiler/dttable1.c
return (AE_OK);
}
Index: acpica-unix2-20170531/source/compiler/dttable2.c
Index: acpica-unix2-20170629/source/compiler/dttable2.c
===================================================================
--- acpica-unix2-20170531.orig/source/compiler/dttable2.c
+++ acpica-unix2-20170531/source/compiler/dttable2.c
--- acpica-unix2-20170629.orig/source/compiler/dttable2.c
+++ acpica-unix2-20170629/source/compiler/dttable2.c
@@ -346,7 +346,7 @@ DtCompileMpst (
DtPushSubtable (Subtable);
@ -2699,10 +2699,10 @@ Index: acpica-unix2-20170531/source/compiler/dttable2.c
ParentTable = DtPeekSubtable ();
DtInsertSubtable (ParentTable, Subtable);
Index: acpica-unix2-20170531/source/components/disassembler/dmbuffer.c
Index: acpica-unix2-20170629/source/components/disassembler/dmbuffer.c
===================================================================
--- acpica-unix2-20170531.orig/source/components/disassembler/dmbuffer.c
+++ acpica-unix2-20170531/source/components/disassembler/dmbuffer.c
--- acpica-unix2-20170629.orig/source/components/disassembler/dmbuffer.c
+++ acpica-unix2-20170629/source/components/disassembler/dmbuffer.c
@@ -204,7 +204,7 @@ AcpiDmByteList (
@ -2778,10 +2778,10 @@ Index: acpica-unix2-20170531/source/components/disassembler/dmbuffer.c
NextOp = AcpiPsGetDepthNext (NULL, Op);
if (!NextOp)
Index: acpica-unix2-20170531/source/components/disassembler/dmopcode.c
Index: acpica-unix2-20170629/source/components/disassembler/dmopcode.c
===================================================================
--- acpica-unix2-20170531.orig/source/components/disassembler/dmopcode.c
+++ acpica-unix2-20170531/source/components/disassembler/dmopcode.c
--- acpica-unix2-20170629.orig/source/components/disassembler/dmopcode.c
+++ acpica-unix2-20170629/source/components/disassembler/dmopcode.c
@@ -244,6 +244,7 @@ AcpiDmPredefinedDescription (
char *NameString;
int LastCharIsDigit;
@ -2801,7 +2801,7 @@ Index: acpica-unix2-20170531/source/components/disassembler/dmopcode.c
if (NameString[0] != '_')
{
return;
@@ -875,25 +878,29 @@ AcpiDmDisassembleOneOp (
@@ -880,25 +883,29 @@ AcpiDmDisassembleOneOp (
AcpiDmNamestring (Op->Common.Value.Name);
break;
@ -2836,10 +2836,10 @@ Index: acpica-unix2-20170531/source/components/disassembler/dmopcode.c
Info->BitOffset += Offset;
if (Info->BitOffset % 8 == 0)
Index: acpica-unix2-20170531/source/components/disassembler/dmresrcl2.c
Index: acpica-unix2-20170629/source/components/disassembler/dmresrcl2.c
===================================================================
--- acpica-unix2-20170531.orig/source/components/disassembler/dmresrcl2.c
+++ acpica-unix2-20170531/source/components/disassembler/dmresrcl2.c
--- acpica-unix2-20170629.orig/source/components/disassembler/dmresrcl2.c
+++ acpica-unix2-20170629/source/components/disassembler/dmresrcl2.c
@@ -191,22 +191,24 @@ AcpiDmGpioCommon (
char *DeviceName = NULL;
UINT32 PinCount;
@ -3061,10 +3061,10 @@ Index: acpica-unix2-20170531/source/components/disassembler/dmresrcl2.c
DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset);
AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
Index: acpica-unix2-20170531/source/components/disassembler/dmresrcl.c
Index: acpica-unix2-20170629/source/components/disassembler/dmresrcl.c
===================================================================
--- acpica-unix2-20170531.orig/source/components/disassembler/dmresrcl.c
+++ acpica-unix2-20170531/source/components/disassembler/dmresrcl.c
--- acpica-unix2-20170629.orig/source/components/disassembler/dmresrcl.c
+++ acpica-unix2-20170629/source/components/disassembler/dmresrcl.c
@@ -141,7 +141,8 @@ AcpiDmMemoryFields (
UINT32 Level)
{
@ -3213,10 +3213,10 @@ Index: acpica-unix2-20170531/source/components/disassembler/dmresrcl.c
}
AcpiDmIndent (Level);
Index: acpica-unix2-20170531/source/components/disassembler/dmresrcs.c
Index: acpica-unix2-20170629/source/components/disassembler/dmresrcs.c
===================================================================
--- acpica-unix2-20170531.orig/source/components/disassembler/dmresrcs.c
+++ acpica-unix2-20170531/source/components/disassembler/dmresrcs.c
--- acpica-unix2-20170629.orig/source/components/disassembler/dmresrcs.c
+++ acpica-unix2-20170629/source/components/disassembler/dmresrcs.c
@@ -72,6 +72,7 @@ AcpiDmIrqDescriptor (
UINT32 Length,
UINT32 Level)
@ -3273,10 +3273,10 @@ Index: acpica-unix2-20170531/source/components/disassembler/dmresrcs.c
AcpiDmIndent (Level + 1);
AcpiDmDumpInteger8 (Resource->FixedIo.AddressLength, "Length");
Index: acpica-unix2-20170531/source/components/dispatcher/dsfield.c
Index: acpica-unix2-20170629/source/components/dispatcher/dsfield.c
===================================================================
--- acpica-unix2-20170531.orig/source/components/dispatcher/dsfield.c
+++ acpica-unix2-20170531/source/components/dispatcher/dsfield.c
--- acpica-unix2-20170629.orig/source/components/dispatcher/dsfield.c
+++ acpica-unix2-20170629/source/components/dispatcher/dsfield.c
@@ -318,6 +318,7 @@ AcpiDsGetFieldNames (
ACPI_STATUS Status;
UINT64 Position;
@ -3321,10 +3321,10 @@ Index: acpica-unix2-20170531/source/components/dispatcher/dsfield.c
if (ACPI_FAILURE (Status))
{
ACPI_ERROR_NAMESPACE ((char *) &Arg->Named.Name, Status);
Index: acpica-unix2-20170531/source/components/events/evgpeblk.c
Index: acpica-unix2-20170629/source/components/events/evgpeblk.c
===================================================================
--- acpica-unix2-20170531.orig/source/components/events/evgpeblk.c
+++ acpica-unix2-20170531/source/components/events/evgpeblk.c
--- acpica-unix2-20170629.orig/source/components/events/evgpeblk.c
+++ acpica-unix2-20170629/source/components/events/evgpeblk.c
@@ -376,6 +376,7 @@ AcpiEvCreateGpeBlock (
ACPI_STATUS Status;
ACPI_GPE_BLOCK_INFO *GpeBlock;
@ -3357,10 +3357,10 @@ Index: acpica-unix2-20170531/source/components/events/evgpeblk.c
InterruptNumber == AcpiGbl_FADT.SciInterrupt ? " (SCI)" : ""));
/* Update global count of currently available GPEs */
Index: acpica-unix2-20170531/source/components/hardware/hwregs.c
Index: acpica-unix2-20170629/source/components/hardware/hwregs.c
===================================================================
--- acpica-unix2-20170531.orig/source/components/hardware/hwregs.c
+++ acpica-unix2-20170531/source/components/hardware/hwregs.c
--- acpica-unix2-20170629.orig/source/components/hardware/hwregs.c
+++ acpica-unix2-20170629/source/components/hardware/hwregs.c
@@ -197,7 +197,7 @@ AcpiHwValidateRegister (
* Address must not be null. A null address also indicates an optional
* ACPI register that is not supported, so no error message.
@ -3370,10 +3370,10 @@ Index: acpica-unix2-20170531/source/components/hardware/hwregs.c
if (!(*Address))
{
return (AE_BAD_ADDRESS);
Index: acpica-unix2-20170531/source/components/hardware/hwvalid.c
Index: acpica-unix2-20170629/source/components/hardware/hwvalid.c
===================================================================
--- acpica-unix2-20170531.orig/source/components/hardware/hwvalid.c
+++ acpica-unix2-20170531/source/components/hardware/hwvalid.c
--- acpica-unix2-20170629.orig/source/components/hardware/hwvalid.c
+++ acpica-unix2-20170629/source/components/hardware/hwvalid.c
@@ -135,6 +135,8 @@ AcpiHwValidateIoRequest (
UINT32 ByteWidth;
ACPI_IO_ADDRESS LastAddress;
@ -3395,10 +3395,10 @@ Index: acpica-unix2-20170531/source/components/hardware/hwvalid.c
{
ACPI_ERROR ((AE_INFO,
"Illegal I/O port address/length above 64K: %8.8X%8.8X/0x%X",
Index: acpica-unix2-20170531/source/components/namespace/nsaccess.c
Index: acpica-unix2-20170629/source/components/namespace/nsaccess.c
===================================================================
--- acpica-unix2-20170531.orig/source/components/namespace/nsaccess.c
+++ acpica-unix2-20170531/source/components/namespace/nsaccess.c
--- acpica-unix2-20170629.orig/source/components/namespace/nsaccess.c
+++ acpica-unix2-20170629/source/components/namespace/nsaccess.c
@@ -312,6 +312,7 @@ AcpiNsLookup (
ACPI_OBJECT_TYPE ThisSearchType;
UINT32 SearchParentFlag = ACPI_NS_SEARCH_PARENT;
@ -3407,7 +3407,7 @@ Index: acpica-unix2-20170531/source/components/namespace/nsaccess.c
ACPI_FUNCTION_TRACE (NsLookup);
@@ -684,9 +685,10 @@ AcpiNsLookup (
@@ -691,9 +692,10 @@ AcpiNsLookup (
{
/* Complain about a type mismatch */
@ -3419,10 +3419,10 @@ Index: acpica-unix2-20170531/source/components/namespace/nsaccess.c
AcpiUtGetTypeName (ThisNode->Type),
AcpiUtGetTypeName (TypeToCheckFor)));
}
Index: acpica-unix2-20170531/source/components/namespace/nsparse.c
Index: acpica-unix2-20170629/source/components/namespace/nsparse.c
===================================================================
--- acpica-unix2-20170531.orig/source/components/namespace/nsparse.c
+++ acpica-unix2-20170531/source/components/namespace/nsparse.c
--- acpica-unix2-20170629.orig/source/components/namespace/nsparse.c
+++ acpica-unix2-20170629/source/components/namespace/nsparse.c
@@ -196,13 +196,14 @@ AcpiNsOneCompleteParse (
/* Table must consist of at least a complete header */
@ -3440,32 +3440,32 @@ Index: acpica-unix2-20170531/source/components/namespace/nsparse.c
Status = AcpiTbGetOwnerId (TableIndex, &OwnerId);
if (ACPI_FAILURE (Status))
Index: acpica-unix2-20170531/source/components/tables/tbdata.c
Index: acpica-unix2-20170629/source/components/tables/tbdata.c
===================================================================
--- acpica-unix2-20170531.orig/source/components/tables/tbdata.c
+++ acpica-unix2-20170531/source/components/tables/tbdata.c
@@ -407,6 +407,7 @@ AcpiTbVerifyTempTable (
char *Signature)
--- acpica-unix2-20170629.orig/source/components/tables/tbdata.c
+++ acpica-unix2-20170629/source/components/tables/tbdata.c
@@ -550,6 +550,7 @@ AcpiTbVerifyTempTable (
UINT32 *TableIndex)
{
ACPI_STATUS Status = AE_OK;
+ UINT32 Length;
ACPI_FUNCTION_TRACE (TbVerifyTempTable);
@@ -436,7 +437,8 @@ AcpiTbVerifyTempTable (
if (AcpiGbl_VerifyTableChecksum)
@@ -579,7 +580,8 @@ AcpiTbVerifyTempTable (
{
/* Verify the checksum */
- Status = AcpiTbVerifyChecksum (TableDesc->Pointer, TableDesc->Length);
+ ACPI_MOVE_32_TO_32(&Length, &TableDesc->Length);
+ ACPI_MOVE_32_TO_32(&Length, &TableDesc->Length);
+ Status = AcpiTbVerifyChecksum (TableDesc->Pointer, Length);
if (ACPI_FAILURE (Status))
{
ACPI_EXCEPTION ((AE_INFO, AE_NO_MEMORY,
Index: acpica-unix2-20170531/source/components/tables/tbfadt.c
Index: acpica-unix2-20170629/source/components/tables/tbfadt.c
===================================================================
--- acpica-unix2-20170531.orig/source/components/tables/tbfadt.c
+++ acpica-unix2-20170531/source/components/tables/tbfadt.c
--- acpica-unix2-20170629.orig/source/components/tables/tbfadt.c
+++ acpica-unix2-20170629/source/components/tables/tbfadt.c
@@ -520,6 +520,8 @@ AcpiTbConvertFadt (
UINT8 Length;
UINT8 Flags;
@ -3545,10 +3545,10 @@ Index: acpica-unix2-20170531/source/components/tables/tbfadt.c
"PmRegisters", 0);
}
}
Index: acpica-unix2-20170531/source/components/tables/tbfind.c
Index: acpica-unix2-20170629/source/components/tables/tbfind.c
===================================================================
--- acpica-unix2-20170531.orig/source/components/tables/tbfind.c
+++ acpica-unix2-20170531/source/components/tables/tbfind.c
--- acpica-unix2-20170629.orig/source/components/tables/tbfind.c
+++ acpica-unix2-20170629/source/components/tables/tbfind.c
@@ -108,8 +108,11 @@ AcpiTbFindTable (
(void) AcpiUtAcquireMutex (ACPI_MTX_TABLES);
for (i = 0; i < AcpiGbl_RootTableList.CurrentTableCount; ++i)
@ -3562,10 +3562,10 @@ Index: acpica-unix2-20170531/source/components/tables/tbfind.c
{
/* Not the requested table */
Index: acpica-unix2-20170531/source/components/tables/tbprint.c
Index: acpica-unix2-20170629/source/components/tables/tbprint.c
===================================================================
--- acpica-unix2-20170531.orig/source/components/tables/tbprint.c
+++ acpica-unix2-20170531/source/components/tables/tbprint.c
--- acpica-unix2-20170629.orig/source/components/tables/tbprint.c
+++ acpica-unix2-20170629/source/components/tables/tbprint.c
@@ -143,15 +143,18 @@ AcpiTbPrintTableHeader (
ACPI_TABLE_HEADER *Header)
{
@ -3607,10 +3607,10 @@ Index: acpica-unix2-20170531/source/components/tables/tbprint.c
}
}
Index: acpica-unix2-20170531/source/components/tables/tbutils.c
Index: acpica-unix2-20170629/source/components/tables/tbutils.c
===================================================================
--- acpica-unix2-20170531.orig/source/components/tables/tbutils.c
+++ acpica-unix2-20170531/source/components/tables/tbutils.c
--- acpica-unix2-20170629.orig/source/components/tables/tbutils.c
+++ acpica-unix2-20170629/source/components/tables/tbutils.c
@@ -238,7 +238,7 @@ AcpiTbGetRootTableEntry (
* 64-bit platform, XSDT: Move (unaligned) 64-bit to local,
* return 64-bit
@ -3670,11 +3670,11 @@ Index: acpica-unix2-20170531/source/components/tables/tbutils.c
{
AcpiGbl_FadtIndex = TableIndex;
AcpiTbParseFadt ();
Index: acpica-unix2-20170531/source/components/tables/tbxface.c
Index: acpica-unix2-20170629/source/components/tables/tbxface.c
===================================================================
--- acpica-unix2-20170531.orig/source/components/tables/tbxface.c
+++ acpica-unix2-20170531/source/components/tables/tbxface.c
@@ -263,8 +263,11 @@ AcpiGetTableHeader (
--- acpica-unix2-20170629.orig/source/components/tables/tbxface.c
+++ acpica-unix2-20170629/source/components/tables/tbxface.c
@@ -290,8 +290,11 @@ AcpiGetTableHeader (
for (i = 0, j = 0; i < AcpiGbl_RootTableList.CurrentTableCount; i++)
{
@ -3687,10 +3687,10 @@ Index: acpica-unix2-20170531/source/components/tables/tbxface.c
{
continue;
}
Index: acpica-unix2-20170531/source/components/tables/tbxfload.c
Index: acpica-unix2-20170629/source/components/tables/tbxfload.c
===================================================================
--- acpica-unix2-20170531.orig/source/components/tables/tbxfload.c
+++ acpica-unix2-20170531/source/components/tables/tbxfload.c
--- acpica-unix2-20170629.orig/source/components/tables/tbxfload.c
+++ acpica-unix2-20170629/source/components/tables/tbxfload.c
@@ -156,6 +156,7 @@ AcpiTbLoadNamespace (
ACPI_TABLE_DESC *Table;
UINT32 TablesLoaded = 0;
@ -3710,10 +3710,10 @@ Index: acpica-unix2-20170531/source/components/tables/tbxfload.c
ACPI_FAILURE (AcpiTbValidateTable (Table)))
{
Status = AE_NO_ACPI_TABLES;
Index: acpica-unix2-20170531/source/include/acmacros.h
Index: acpica-unix2-20170629/source/include/acmacros.h
===================================================================
--- acpica-unix2-20170531.orig/source/include/acmacros.h
+++ acpica-unix2-20170531/source/include/acmacros.h
--- acpica-unix2-20170629.orig/source/include/acmacros.h
+++ acpica-unix2-20170629/source/include/acmacros.h
@@ -98,7 +98,9 @@
((UINT8 *)(void *)(d))[6] = ((UINT8 *)(void *)(s))[1];\
((UINT8 *)(void *)(d))[7] = ((UINT8 *)(void *)(s))[0];}
@ -3777,11 +3777,11 @@ Index: acpica-unix2-20170531/source/include/acmacros.h
#define ACPI_MOVE_32_TO_16(d, s) ACPI_MOVE_16_TO_16(d, s) /* Truncate to 16 */
Index: acpica-unix2-20170531/source/include/platform/aclinux.h
Index: acpica-unix2-20170629/source/include/platform/aclinux.h
===================================================================
--- acpica-unix2-20170531.orig/source/include/platform/aclinux.h
+++ acpica-unix2-20170531/source/include/platform/aclinux.h
@@ -219,6 +219,10 @@
--- acpica-unix2-20170629.orig/source/include/platform/aclinux.h
+++ acpica-unix2-20170629/source/include/platform/aclinux.h
@@ -224,6 +224,10 @@
#define __cdecl
#endif
@ -3792,10 +3792,10 @@ Index: acpica-unix2-20170531/source/include/platform/aclinux.h
#endif /* __KERNEL__ */
#endif /* __ACLINUX_H__ */
Index: acpica-unix2-20170531/source/tools/acpiexec/aetables.c
Index: acpica-unix2-20170629/source/tools/acpiexec/aetables.c
===================================================================
--- acpica-unix2-20170531.orig/source/tools/acpiexec/aetables.c
+++ acpica-unix2-20170531/source/tools/acpiexec/aetables.c
--- acpica-unix2-20170629.orig/source/tools/acpiexec/aetables.c
+++ acpica-unix2-20170629/source/tools/acpiexec/aetables.c
@@ -146,21 +146,25 @@ AeInitializeTableHeader (
char *Signature,
UINT32 Length)