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

Update to 20190816 upstream source and refresh patches

Browse Source 
Signed-off-by: Al Stone <ahs3@redhat.com>
This commit is contained in:
Al Stone 2019-10-27 16:01:59 -06:00
parent b596c3965c
commit 5fcb15b704
11 changed files with 247 additions and 228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -117,3 +117,5 @@ series
/acpitests-unix-20190509.tar.gz
/acpica-unix2-20190703.tar.gz
/acpitests-unix-20190703.tar.gz
/acpica-unix2-20190816.tar.gz
/acpitests-unix-20190816.tar.gz

8
OPT_LDFLAGS.patch
View File

@ -1,7 +1,7 @@
Index: acpica-unix2-20170728/generate/unix/Makefile.config
Index: acpica-unix-20190816/generate/unix/Makefile.config
===================================================================
--- acpica-unix2-20170728.orig/generate/unix/Makefile.config
+++ acpica-unix2-20170728/generate/unix/Makefile.config
--- acpica-unix-20190816.orig/generate/unix/Makefile.config
+++ acpica-unix-20190816/generate/unix/Makefile.config
@@ -23,6 +23,9 @@
# OPT_CFLAGS can be overridden on the make command line by
# adding OPT_CFLAGS="..." to the invocation.
@ -12,7 +12,7 @@ Index: acpica-unix2-20170728/generate/unix/Makefile.config
# Notes:
# gcc should be version 4 or greater, otherwise some of the options
# used will not be recognized.
@@ -157,6 +160,11 @@ LDFLAGS +=-m32
@@ -165,6 +168,11 @@ LDFLAGS +=-m32
endif
#

7
acpica-tools.spec
View File

@ -1,5 +1,5 @@
Name: acpica-tools
Version: 20190703
Version: 20190816
Release: 1%{?dist}
Summary: ACPICA tools for the development and debug of ACPI tables
@ -239,7 +239,10 @@ fi
%changelog
* Thu Oct 24 2019 Al Stone <ahs3@redhat.com>
* Sun Oct 27 2019 Al Stone <ahs3@redhat.com> - 20190816-1
- Update to 20190816 source tree, including patch refeshes.
* Thu Oct 24 2019 Al Stone <ahs3@redhat.com> - 20190703-1
- Update to 20190703 source tree, including patch refeshes.
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 20190509-5

9
big-endian-v2.patch
View File

@ -3,10 +3,11 @@ in the original big-endian patch; we try to capture those here.
Signed-off-by: Al Stone <ahs3@redhat.com>
diff -Naur acpica-unix2-20170929.orig/source/compiler/asllookup.c acpica-unix2-20170929/source/compiler/asllookup.c
--- acpica-unix2-20170929.orig/source/compiler/asllookup.c 2017-10-09 12:26:25.893508481 -0600
+++ acpica-unix2-20170929/source/compiler/asllookup.c 2017-10-17 11:45:42.230763844 -0600
@@ -249,7 +249,8 @@
Index: acpica-unix-20180508/source/compiler/asllookup.c
===================================================================
--- acpica-unix-20180508.orig/source/compiler/asllookup.c
+++ acpica-unix-20180508/source/compiler/asllookup.c
@@ -249,7 +249,8 @@ LkIsObjectUsed (
* ACPI names and are typically not referenced since they are meant
* to be called by the host OS.
*/

290
big-endian.patch
View File

@ -23,10 +23,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/include/platform/aclinux.h | 8 ++
12 files changed, 487 insertions(+), 283 deletions(-)
Index: acpica-unix-20190405/source/compiler/aslcodegen.c
Index: acpica-unix-20190816/source/compiler/aslcodegen.c
===================================================================
--- acpica-unix-20190405.orig/source/compiler/aslcodegen.c
+++ acpica-unix-20190405/source/compiler/aslcodegen.c
--- acpica-unix-20190816.orig/source/compiler/aslcodegen.c
+++ acpica-unix-20190816/source/compiler/aslcodegen.c
@@ -237,16 +237,12 @@ CgWriteAmlOpcode (
ACPI_PARSE_OBJECT *Op)
{
@ -228,7 +228,7 @@ Index: acpica-unix-20190405/source/compiler/aslcodegen.c
/* Calculate the comment lengths for this definition block parseOp */
@@ -624,7 +631,10 @@ CgWriteNode (
@@ -625,7 +632,10 @@ CgWriteNode (
ACPI_PARSE_OBJECT *Op)
{
ASL_RESOURCE_NODE *Rnode;
@ -240,7 +240,7 @@ Index: acpica-unix-20190405/source/compiler/aslcodegen.c
/* Write all comments here. */
@@ -648,13 +658,24 @@ CgWriteNode (
@@ -649,13 +659,24 @@ CgWriteNode (
switch (Op->Asl.AmlOpcode)
{
case AML_RAW_DATA_BYTE:
@ -268,10 +268,10 @@ Index: acpica-unix-20190405/source/compiler/aslcodegen.c
case AML_RAW_DATA_BUFFER:
Index: acpica-unix-20190405/source/compiler/aslopcodes.c
Index: acpica-unix-20190816/source/compiler/aslopcodes.c
===================================================================
--- acpica-unix-20190405.orig/source/compiler/aslopcodes.c
+++ acpica-unix-20190405/source/compiler/aslopcodes.c
--- acpica-unix-20190816.orig/source/compiler/aslopcodes.c
+++ acpica-unix-20190816/source/compiler/aslopcodes.c
@@ -485,6 +485,7 @@ OpcDoUnicode (
UINT32 i;
UINT8 *AsciiString;
@ -290,10 +290,10 @@ Index: acpica-unix-20190405/source/compiler/aslopcodes.c
}
/*
Index: acpica-unix-20190405/source/compiler/aslrestype1.c
Index: acpica-unix-20190816/source/compiler/aslrestype1.c
===================================================================
--- acpica-unix-20190405.orig/source/compiler/aslrestype1.c
+++ acpica-unix-20190405/source/compiler/aslrestype1.c
--- acpica-unix-20190816.orig/source/compiler/aslrestype1.c
+++ acpica-unix-20190816/source/compiler/aslrestype1.c
@@ -142,6 +142,11 @@ RsDoMemory24Descriptor (
ACPI_PARSE_OBJECT *LengthOp = NULL;
ASL_RESOURCE_NODE *Rnode;
@ -490,10 +490,10 @@ Index: acpica-unix-20190405/source/compiler/aslrestype1.c
RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
CurrentByteOffset + ASL_RESDESC_OFFSET (FixedMemory32.AddressLength));
break;
Index: acpica-unix-20190405/source/compiler/aslrestype1i.c
Index: acpica-unix-20190816/source/compiler/aslrestype1i.c
===================================================================
--- acpica-unix-20190405.orig/source/compiler/aslrestype1i.c
+++ acpica-unix-20190405/source/compiler/aslrestype1i.c
--- acpica-unix-20190816.orig/source/compiler/aslrestype1i.c
+++ acpica-unix-20190816/source/compiler/aslrestype1i.c
@@ -198,6 +198,8 @@ RsDoFixedDmaDescriptor (
ACPI_PARSE_OBJECT *InitializerOp;
ASL_RESOURCE_NODE *Rnode;
@ -630,10 +630,10 @@ Index: acpica-unix-20190405/source/compiler/aslrestype1i.c
+ ACPI_MOVE_16_TO_16(&Descriptor->Irq.IrqMask, &IrqMask);
return (Rnode);
}
Index: acpica-unix-20190405/source/compiler/aslrestype2.c
Index: acpica-unix-20190816/source/compiler/aslrestype2.c
===================================================================
--- acpica-unix-20190405.orig/source/compiler/aslrestype2.c
+++ acpica-unix-20190405/source/compiler/aslrestype2.c
--- acpica-unix-20190816.orig/source/compiler/aslrestype2.c
+++ acpica-unix-20190816/source/compiler/aslrestype2.c
@@ -76,6 +76,7 @@ RsDoGeneralRegisterDescriptor (
ACPI_PARSE_OBJECT *InitializerOp;
ASL_RESOURCE_NODE *Rnode;
@ -774,10 +774,10 @@ Index: acpica-unix-20190405/source/compiler/aslrestype2.c
/* Point to end-of-descriptor for vendor data */
Index: acpica-unix-20190405/source/compiler/aslrestype2d.c
Index: acpica-unix-20190816/source/compiler/aslrestype2d.c
===================================================================
--- acpica-unix-20190405.orig/source/compiler/aslrestype2d.c
+++ acpica-unix-20190405/source/compiler/aslrestype2d.c
--- acpica-unix-20190816.orig/source/compiler/aslrestype2d.c
+++ acpica-unix-20190816/source/compiler/aslrestype2d.c
@@ -79,7 +79,13 @@ RsDoDwordIoDescriptor (
ACPI_PARSE_OBJECT *GranOp = NULL;
ASL_RESOURCE_NODE *Rnode;
@ -1133,10 +1133,10 @@ Index: acpica-unix-20190405/source/compiler/aslrestype2d.c
Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS32) +
OptionIndex + StringLength;
return (Rnode);
Index: acpica-unix-20190405/source/compiler/aslrestype2e.c
Index: acpica-unix-20190816/source/compiler/aslrestype2e.c
===================================================================
--- acpica-unix-20190405.orig/source/compiler/aslrestype2e.c
+++ acpica-unix-20190405/source/compiler/aslrestype2e.c
--- acpica-unix-20190816.orig/source/compiler/aslrestype2e.c
+++ acpica-unix-20190816/source/compiler/aslrestype2e.c
@@ -78,6 +78,13 @@ RsDoExtendedIoDescriptor (
ACPI_PARSE_OBJECT *GranOp = NULL;
ASL_RESOURCE_NODE *Rnode;
@ -1242,10 +1242,10 @@ Index: acpica-unix-20190405/source/compiler/aslrestype2e.c
Rnode->BufferLength = sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) +
StringLength;
return (Rnode);
Index: acpica-unix-20190405/source/compiler/aslrestype2q.c
Index: acpica-unix-20190816/source/compiler/aslrestype2q.c
===================================================================
--- acpica-unix-20190405.orig/source/compiler/aslrestype2q.c
+++ acpica-unix-20190405/source/compiler/aslrestype2q.c
--- acpica-unix-20190816.orig/source/compiler/aslrestype2q.c
+++ acpica-unix-20190816/source/compiler/aslrestype2q.c
@@ -80,7 +80,13 @@ RsDoQwordIoDescriptor (
ASL_RESOURCE_NODE *Rnode;
UINT8 *OptionalFields;
@ -1584,10 +1584,10 @@ Index: acpica-unix-20190405/source/compiler/aslrestype2q.c
Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS64) +
OptionIndex + StringLength;
return (Rnode);
Index: acpica-unix-20190405/source/compiler/aslrestype2s.c
Index: acpica-unix-20190816/source/compiler/aslrestype2s.c
===================================================================
--- acpica-unix-20190405.orig/source/compiler/aslrestype2s.c
+++ acpica-unix-20190405/source/compiler/aslrestype2s.c
--- acpica-unix-20190816.orig/source/compiler/aslrestype2s.c
+++ acpica-unix-20190816/source/compiler/aslrestype2s.c
@@ -340,9 +340,14 @@ RsDoGpioIntDescriptor (
UINT16 VendorLength;
UINT16 InterruptLength;
@ -2053,10 +2053,10 @@ Index: acpica-unix-20190405/source/compiler/aslrestype2s.c
MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource);
return (Rnode);
}
Index: acpica-unix-20190405/source/compiler/aslrestype2w.c
Index: acpica-unix-20190816/source/compiler/aslrestype2w.c
===================================================================
--- acpica-unix-20190405.orig/source/compiler/aslrestype2w.c
+++ acpica-unix-20190405/source/compiler/aslrestype2w.c
--- acpica-unix-20190816.orig/source/compiler/aslrestype2w.c
+++ acpica-unix-20190816/source/compiler/aslrestype2w.c
@@ -81,6 +81,12 @@ RsDoWordIoDescriptor (
UINT8 *OptionalFields;
UINT16 StringLength = 0;
@ -2400,10 +2400,10 @@ Index: acpica-unix-20190405/source/compiler/aslrestype2w.c
Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) +
OptionIndex + StringLength;
return (Rnode);
Index: acpica-unix-20190405/source/include/acmacros.h
Index: acpica-unix-20190816/source/include/acmacros.h
===================================================================
--- acpica-unix-20190405.orig/source/include/acmacros.h
+++ acpica-unix-20190405/source/include/acmacros.h
--- acpica-unix-20190816.orig/source/include/acmacros.h
+++ acpica-unix-20190816/source/include/acmacros.h
@@ -98,9 +98,12 @@
((UINT8 *)(void *)(d))[6] = ((UINT8 *)(void *)(s))[1];\
((UINT8 *)(void *)(d))[7] = ((UINT8 *)(void *)(s))[0];}
@ -2482,10 +2482,10 @@ Index: acpica-unix-20190405/source/include/acmacros.h
#define ACPI_MOVE_32_TO_16(d, s) ACPI_MOVE_16_TO_16(d, s) /* Truncate to 16 */
Index: acpica-unix-20190405/source/include/platform/aclinux.h
Index: acpica-unix-20190816/source/include/platform/aclinux.h
===================================================================
--- acpica-unix-20190405.orig/source/include/platform/aclinux.h
+++ acpica-unix-20190405/source/include/platform/aclinux.h
--- acpica-unix-20190816.orig/source/include/platform/aclinux.h
+++ acpica-unix-20190816/source/include/platform/aclinux.h
@@ -198,6 +198,7 @@
#ifdef ACPI_USE_STANDARD_HEADERS
@ -2505,10 +2505,10 @@ Index: acpica-unix-20190405/source/include/platform/aclinux.h
#endif /* __KERNEL__ */
#endif /* __ACLINUX_H__ */
Index: acpica-unix-20190405/source/compiler/aslanalyze.c
Index: acpica-unix-20190816/source/compiler/aslanalyze.c
===================================================================
--- acpica-unix-20190405.orig/source/compiler/aslanalyze.c
+++ acpica-unix-20190405/source/compiler/aslanalyze.c
--- acpica-unix-20190816.orig/source/compiler/aslanalyze.c
+++ acpica-unix-20190816/source/compiler/aslanalyze.c
@@ -461,7 +461,7 @@ ApCheckForGpeNameConflict (
/* Need a null-terminated string version of NameSeg */
@ -2527,10 +2527,10 @@ Index: acpica-unix-20190405/source/compiler/aslanalyze.c
/* Inject opposite letter ("L" versus "E") */
Index: acpica-unix-20190405/source/compiler/asllookup.c
Index: acpica-unix-20190816/source/compiler/asllookup.c
===================================================================
--- acpica-unix-20190405.orig/source/compiler/asllookup.c
+++ acpica-unix-20190405/source/compiler/asllookup.c
--- acpica-unix-20190816.orig/source/compiler/asllookup.c
+++ acpica-unix-20190816/source/compiler/asllookup.c
@@ -119,6 +119,7 @@ LkIsObjectUsed (
{
ACPI_NAMESPACE_NODE *Node = ACPI_CAST_PTR (ACPI_NAMESPACE_NODE, ObjHandle);
@ -2561,10 +2561,10 @@ Index: acpica-unix-20190405/source/compiler/asllookup.c
AslError (ASL_REMARK, ASL_MSG_NOT_REFERENCED,
LkGetNameOp (Node->Op), AslGbl_MsgBuffer);
return (AE_OK);
Index: acpica-unix-20190405/source/compiler/aslmain.c
Index: acpica-unix-20190816/source/compiler/aslmain.c
===================================================================
--- acpica-unix-20190405.orig/source/compiler/aslmain.c
+++ acpica-unix-20190405/source/compiler/aslmain.c
--- acpica-unix-20190816.orig/source/compiler/aslmain.c
+++ acpica-unix-20190816/source/compiler/aslmain.c
@@ -101,18 +101,6 @@ main (
signal (SIGINT, AslSignalHandler);
@ -2584,10 +2584,10 @@ Index: acpica-unix-20190405/source/compiler/aslmain.c
AcpiOsInitialize ();
ACPI_DEBUG_INITIALIZE (); /* For debug version only */
Index: acpica-unix-20190405/source/common/acfileio.c
Index: acpica-unix-20190816/source/common/acfileio.c
===================================================================
--- acpica-unix-20190405.orig/source/common/acfileio.c
+++ acpica-unix-20190405/source/common/acfileio.c
--- acpica-unix-20190816.orig/source/common/acfileio.c
+++ acpica-unix-20190816/source/common/acfileio.c
@@ -280,6 +280,7 @@ AcGetOneTableFromFile (
ACPI_TABLE_HEADER *Table;
INT32 Count;
@ -2654,10 +2654,10 @@ Index: acpica-unix-20190405/source/common/acfileio.c
(UINT32) (FileSize - TableOffset));
return (AE_BAD_HEADER);
}
Index: acpica-unix-20190405/source/common/dmtable.c
Index: acpica-unix-20190816/source/common/dmtable.c
===================================================================
--- acpica-unix-20190405.orig/source/common/dmtable.c
+++ acpica-unix-20190405/source/common/dmtable.c
--- acpica-unix-20190816.orig/source/common/dmtable.c
+++ acpica-unix-20190816/source/common/dmtable.c
@@ -551,7 +551,7 @@ AcpiDmDumpDataTable (
*/
if (ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_FACS))
@ -2756,10 +2756,10 @@ Index: acpica-unix-20190405/source/common/dmtable.c
AcpiDmNfitSubnames[Temp16]);
break;
Index: acpica-unix-20190405/source/common/dmtables.c
Index: acpica-unix-20190816/source/common/dmtables.c
===================================================================
--- acpica-unix-20190405.orig/source/common/dmtables.c
+++ acpica-unix-20190405/source/common/dmtables.c
--- acpica-unix-20190816.orig/source/common/dmtables.c
+++ acpica-unix-20190816/source/common/dmtables.c
@@ -142,7 +142,9 @@ AdCreateTableHeader (
ACPI_TABLE_HEADER *Table)
{
@ -2825,10 +2825,10 @@ Index: acpica-unix-20190405/source/common/dmtables.c
AmlStart = ((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER));
ASL_CV_INIT_FILETREE(Table, AmlStart, AmlLength);
Index: acpica-unix-20190405/source/common/dmtbdump.c
Index: acpica-unix-20190816/source/common/dmtbdump.c
===================================================================
--- acpica-unix-20190405.orig/source/common/dmtbdump.c
+++ acpica-unix-20190405/source/common/dmtbdump.c
--- acpica-unix-20190816.orig/source/common/dmtbdump.c
+++ acpica-unix-20190816/source/common/dmtbdump.c
@@ -277,6 +277,8 @@ AcpiDmDumpRsdt (
UINT32 Entries;
UINT32 Offset;
@ -2987,10 +2987,10 @@ Index: acpica-unix-20190405/source/common/dmtbdump.c
- Revision, Length, ExpectedLength);
+ Revision, Tmp32, ExpectedLength);
}
Index: acpica-unix-20190405/source/common/dmtbdump1.c
Index: acpica-unix-20190816/source/common/dmtbdump1.c
===================================================================
--- acpica-unix-20190405.orig/source/common/dmtbdump1.c
+++ acpica-unix-20190405/source/common/dmtbdump1.c
--- acpica-unix-20190816.orig/source/common/dmtbdump1.c
+++ acpica-unix-20190816/source/common/dmtbdump1.c
@@ -79,17 +79,21 @@ AcpiDmDumpAsf (
UINT32 DataOffset = 0;
UINT32 i;
@ -3624,10 +3624,10 @@ Index: acpica-unix-20190405/source/common/dmtbdump1.c
{
case ACPI_HEST_TYPE_IA32_CHECK:
Index: acpica-unix-20190405/source/common/dmtbdump2.c
Index: acpica-unix-20190816/source/common/dmtbdump2.c
===================================================================
--- acpica-unix-20190405.orig/source/common/dmtbdump2.c
+++ acpica-unix-20190405/source/common/dmtbdump2.c
--- acpica-unix-20190816.orig/source/common/dmtbdump2.c
+++ acpica-unix-20190816/source/common/dmtbdump2.c
@@ -75,15 +75,21 @@ AcpiDmDumpIort (
ACPI_IORT_SMMU *IortSmmu = NULL;
UINT32 Offset;
@ -3969,8 +3969,8 @@ Index: acpica-unix-20190405/source/common/dmtbdump2.c
+ if (Offset + sizeof (ACPI_MCFG_ALLOCATION) > Len)
{
AcpiOsPrintf ("Warning: there are %u invalid trailing bytes\n",
- sizeof (ACPI_MCFG_ALLOCATION) - (Offset - Table->Length));
+ sizeof (ACPI_MCFG_ALLOCATION) - (Offset - Len));
- (UINT32) sizeof (ACPI_MCFG_ALLOCATION) - (Offset - Table->Length));
+ (UINT32) sizeof (ACPI_MCFG_ALLOCATION) - (Offset - Len));
return;
}
@ -4510,10 +4510,10 @@ Index: acpica-unix-20190405/source/common/dmtbdump2.c
Subtable->Length, InfoTable);
if (ACPI_FAILURE (Status))
{
Index: acpica-unix-20190405/source/common/dmtbdump3.c
Index: acpica-unix-20190816/source/common/dmtbdump3.c
===================================================================
--- acpica-unix-20190405.orig/source/common/dmtbdump3.c
+++ acpica-unix-20190405/source/common/dmtbdump3.c
--- acpica-unix-20190816.orig/source/common/dmtbdump3.c
+++ acpica-unix-20190816/source/common/dmtbdump3.c
@@ -68,9 +68,11 @@ void
AcpiDmDumpSlic (
ACPI_TABLE_HEADER *Table)
@ -4760,11 +4760,11 @@ Index: acpica-unix-20190405/source/common/dmtbdump3.c
+ (void) AcpiDmDumpTable (Length, 0, Table, ArgumentsLength,
AcpiDmTableInfoWpbt0);
}
Index: acpica-unix-20190405/source/compiler/dtfield.c
Index: acpica-unix-20190816/source/compiler/dtfield.c
===================================================================
--- acpica-unix-20190405.orig/source/compiler/dtfield.c
+++ acpica-unix-20190405/source/compiler/dtfield.c
@@ -359,7 +359,27 @@ DtCompileInteger (
--- acpica-unix-20190816.orig/source/compiler/dtfield.c
+++ acpica-unix-20190816/source/compiler/dtfield.c
@@ -361,7 +361,27 @@ DtCompileInteger (
DtError (ASL_ERROR, ASL_MSG_INTEGER_SIZE, Field, AslGbl_MsgBuffer);
}
@ -4793,10 +4793,10 @@ Index: acpica-unix-20190405/source/compiler/dtfield.c
return;
}
Index: acpica-unix-20190405/source/compiler/dtsubtable.c
Index: acpica-unix-20190816/source/compiler/dtsubtable.c
===================================================================
--- acpica-unix-20190405.orig/source/compiler/dtsubtable.c
+++ acpica-unix-20190405/source/compiler/dtsubtable.c
--- acpica-unix-20190816.orig/source/compiler/dtsubtable.c
+++ acpica-unix-20190816/source/compiler/dtsubtable.c
@@ -378,6 +378,21 @@ DtSetSubtableLength (
return;
}
@ -4821,10 +4821,10 @@ Index: acpica-unix-20190405/source/compiler/dtsubtable.c
+ Subtable->SizeOfLengthField);
+ }
}
Index: acpica-unix-20190405/source/compiler/dttable1.c
Index: acpica-unix-20190816/source/compiler/dttable1.c
===================================================================
--- acpica-unix-20190405.orig/source/compiler/dttable1.c
+++ acpica-unix-20190405/source/compiler/dttable1.c
--- acpica-unix-20190816.orig/source/compiler/dttable1.c
+++ acpica-unix-20190816/source/compiler/dttable1.c
@@ -281,6 +281,8 @@ DtCompileCsrt (
DT_FIELD **PFieldList = (DT_FIELD **) List;
UINT32 DescriptorCount;
@ -5196,10 +5196,10 @@ Index: acpica-unix-20190405/source/compiler/dttable1.c
return (AE_OK);
}
Index: acpica-unix-20190405/source/compiler/dttable2.c
Index: acpica-unix-20190816/source/compiler/dttable2.c
===================================================================
--- acpica-unix-20190405.orig/source/compiler/dttable2.c
+++ acpica-unix-20190405/source/compiler/dttable2.c
--- acpica-unix-20190816.orig/source/compiler/dttable2.c
+++ acpica-unix-20190816/source/compiler/dttable2.c
@@ -345,7 +345,7 @@ DtCompileMpst (
DtPushSubtable (Subtable);
@ -5392,10 +5392,10 @@ Index: acpica-unix-20190405/source/compiler/dttable2.c
ParentTable = DtPeekSubtable ();
DtInsertSubtable (ParentTable, Subtable);
Index: acpica-unix-20190405/source/components/disassembler/dmbuffer.c
Index: acpica-unix-20190816/source/components/disassembler/dmbuffer.c
===================================================================
--- acpica-unix-20190405.orig/source/components/disassembler/dmbuffer.c
+++ acpica-unix-20190405/source/components/disassembler/dmbuffer.c
--- acpica-unix-20190816.orig/source/components/disassembler/dmbuffer.c
+++ acpica-unix-20190816/source/components/disassembler/dmbuffer.c
@@ -204,7 +204,7 @@ AcpiDmByteList (
@ -5471,10 +5471,10 @@ Index: acpica-unix-20190405/source/components/disassembler/dmbuffer.c
NextOp = AcpiPsGetDepthNext (NULL, Op);
if (!NextOp)
Index: acpica-unix-20190405/source/components/disassembler/dmopcode.c
Index: acpica-unix-20190816/source/components/disassembler/dmopcode.c
===================================================================
--- acpica-unix-20190405.orig/source/components/disassembler/dmopcode.c
+++ acpica-unix-20190405/source/components/disassembler/dmopcode.c
--- acpica-unix-20190816.orig/source/components/disassembler/dmopcode.c
+++ acpica-unix-20190816/source/components/disassembler/dmopcode.c
@@ -244,6 +244,7 @@ AcpiDmPredefinedDescription (
char *NameString;
int LastCharIsDigit;
@ -5545,10 +5545,10 @@ Index: acpica-unix-20190405/source/components/disassembler/dmopcode.c
Info->Level += 1;
Info->MappingOp = Op;
Index: acpica-unix-20190405/source/components/disassembler/dmresrcl.c
Index: acpica-unix-20190816/source/components/disassembler/dmresrcl.c
===================================================================
--- acpica-unix-20190405.orig/source/components/disassembler/dmresrcl.c
+++ acpica-unix-20190405/source/components/disassembler/dmresrcl.c
--- acpica-unix-20190816.orig/source/components/disassembler/dmresrcl.c
+++ acpica-unix-20190816/source/components/disassembler/dmresrcl.c
@@ -141,7 +141,8 @@ AcpiDmMemoryFields (
UINT32 Level)
{
@ -5697,10 +5697,10 @@ Index: acpica-unix-20190405/source/components/disassembler/dmresrcl.c
}
AcpiDmIndent (Level);
Index: acpica-unix-20190405/source/components/disassembler/dmresrcl2.c
Index: acpica-unix-20190816/source/components/disassembler/dmresrcl2.c
===================================================================
--- acpica-unix-20190405.orig/source/components/disassembler/dmresrcl2.c
+++ acpica-unix-20190405/source/components/disassembler/dmresrcl2.c
--- acpica-unix-20190816.orig/source/components/disassembler/dmresrcl2.c
+++ acpica-unix-20190816/source/components/disassembler/dmresrcl2.c
@@ -191,22 +191,24 @@ AcpiDmGpioCommon (
char *DeviceName = NULL;
UINT32 PinCount;
@ -5924,10 +5924,10 @@ Index: acpica-unix-20190405/source/components/disassembler/dmresrcl2.c
DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset);
AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
Index: acpica-unix-20190405/source/components/disassembler/dmresrcs.c
Index: acpica-unix-20190816/source/components/disassembler/dmresrcs.c
===================================================================
--- acpica-unix-20190405.orig/source/components/disassembler/dmresrcs.c
+++ acpica-unix-20190405/source/components/disassembler/dmresrcs.c
--- acpica-unix-20190816.orig/source/components/disassembler/dmresrcs.c
+++ acpica-unix-20190816/source/components/disassembler/dmresrcs.c
@@ -72,6 +72,7 @@ AcpiDmIrqDescriptor (
UINT32 Length,
UINT32 Level)
@ -5984,10 +5984,10 @@ Index: acpica-unix-20190405/source/components/disassembler/dmresrcs.c
AcpiDmIndent (Level + 1);
AcpiDmDumpInteger8 (Resource->FixedIo.AddressLength, "Length");
Index: acpica-unix-20190405/source/components/dispatcher/dsfield.c
Index: acpica-unix-20190816/source/components/dispatcher/dsfield.c
===================================================================
--- acpica-unix-20190405.orig/source/components/dispatcher/dsfield.c
+++ acpica-unix-20190405/source/components/dispatcher/dsfield.c
--- acpica-unix-20190816.orig/source/components/dispatcher/dsfield.c
+++ acpica-unix-20190816/source/components/dispatcher/dsfield.c
@@ -325,6 +325,7 @@ AcpiDsGetFieldNames (
ACPI_STATUS Status;
UINT64 Position;
@ -6032,10 +6032,10 @@ Index: acpica-unix-20190405/source/components/dispatcher/dsfield.c
if (ACPI_FAILURE (Status))
{
ACPI_ERROR_NAMESPACE (WalkState->ScopeInfo,
Index: acpica-unix-20190405/source/components/events/evgpeblk.c
Index: acpica-unix-20190816/source/components/events/evgpeblk.c
===================================================================
--- acpica-unix-20190405.orig/source/components/events/evgpeblk.c
+++ acpica-unix-20190405/source/components/events/evgpeblk.c
--- acpica-unix-20190816.orig/source/components/events/evgpeblk.c
+++ acpica-unix-20190816/source/components/events/evgpeblk.c
@@ -376,6 +376,7 @@ AcpiEvCreateGpeBlock (
ACPI_STATUS Status;
ACPI_GPE_BLOCK_INFO *GpeBlock;
@ -6068,10 +6068,10 @@ Index: acpica-unix-20190405/source/components/events/evgpeblk.c
InterruptNumber == AcpiGbl_FADT.SciInterrupt ? " (SCI)" : ""));
/* Update global count of currently available GPEs */
Index: acpica-unix-20190405/source/components/hardware/hwregs.c
Index: acpica-unix-20190816/source/components/hardware/hwregs.c
===================================================================
--- acpica-unix-20190405.orig/source/components/hardware/hwregs.c
+++ acpica-unix-20190405/source/components/hardware/hwregs.c
--- acpica-unix-20190816.orig/source/components/hardware/hwregs.c
+++ acpica-unix-20190816/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.
@ -6081,10 +6081,10 @@ Index: acpica-unix-20190405/source/components/hardware/hwregs.c
if (!(*Address))
{
return (AE_BAD_ADDRESS);
Index: acpica-unix-20190405/source/components/hardware/hwvalid.c
Index: acpica-unix-20190816/source/components/hardware/hwvalid.c
===================================================================
--- acpica-unix-20190405.orig/source/components/hardware/hwvalid.c
+++ acpica-unix-20190405/source/components/hardware/hwvalid.c
--- acpica-unix-20190816.orig/source/components/hardware/hwvalid.c
+++ acpica-unix-20190816/source/components/hardware/hwvalid.c
@@ -135,6 +135,8 @@ AcpiHwValidateIoRequest (
UINT32 ByteWidth;
ACPI_IO_ADDRESS LastAddress;
@ -6106,11 +6106,11 @@ Index: acpica-unix-20190405/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-unix-20190405/source/components/namespace/nsaccess.c
Index: acpica-unix-20190816/source/components/namespace/nsaccess.c
===================================================================
--- acpica-unix-20190405.orig/source/components/namespace/nsaccess.c
+++ acpica-unix-20190405/source/components/namespace/nsaccess.c
@@ -314,6 +314,7 @@ AcpiNsLookup (
--- acpica-unix-20190816.orig/source/components/namespace/nsaccess.c
+++ acpica-unix-20190816/source/components/namespace/nsaccess.c
@@ -349,6 +349,7 @@ AcpiNsLookup (
UINT32 SearchParentFlag = ACPI_NS_SEARCH_PARENT;
UINT32 LocalFlags;
ACPI_INTERPRETER_MODE LocalInterpreterMode;
@ -6118,7 +6118,7 @@ Index: acpica-unix-20190405/source/components/namespace/nsaccess.c
ACPI_FUNCTION_TRACE (NsLookup);
@@ -723,9 +724,10 @@ AcpiNsLookup (
@@ -758,9 +759,10 @@ AcpiNsLookup (
{
/* Complain about a type mismatch */
@ -6130,10 +6130,10 @@ Index: acpica-unix-20190405/source/components/namespace/nsaccess.c
AcpiUtGetTypeName (ThisNode->Type),
AcpiUtGetTypeName (TypeToCheckFor)));
}
Index: acpica-unix-20190405/source/components/namespace/nsparse.c
Index: acpica-unix-20190816/source/components/namespace/nsparse.c
===================================================================
--- acpica-unix-20190405.orig/source/components/namespace/nsparse.c
+++ acpica-unix-20190405/source/components/namespace/nsparse.c
--- acpica-unix-20190816.orig/source/components/namespace/nsparse.c
+++ acpica-unix-20190816/source/components/namespace/nsparse.c
@@ -216,13 +216,14 @@ AcpiNsOneCompleteParse (
/* Table must consist of at least a complete header */
@ -6151,10 +6151,10 @@ Index: acpica-unix-20190405/source/components/namespace/nsparse.c
Status = AcpiTbGetOwnerId (TableIndex, &OwnerId);
if (ACPI_FAILURE (Status))
Index: acpica-unix-20190405/source/components/tables/tbdata.c
Index: acpica-unix-20190816/source/components/tables/tbdata.c
===================================================================
--- acpica-unix-20190405.orig/source/components/tables/tbdata.c
+++ acpica-unix-20190405/source/components/tables/tbdata.c
--- acpica-unix-20190816.orig/source/components/tables/tbdata.c
+++ acpica-unix-20190816/source/components/tables/tbdata.c
@@ -552,6 +552,7 @@ AcpiTbVerifyTempTable (
UINT32 *TableIndex)
{
@ -6173,10 +6173,10 @@ Index: acpica-unix-20190405/source/components/tables/tbdata.c
if (ACPI_FAILURE (Status))
{
ACPI_EXCEPTION ((AE_INFO, AE_NO_MEMORY,
Index: acpica-unix-20190405/source/components/tables/tbfadt.c
Index: acpica-unix-20190816/source/components/tables/tbfadt.c
===================================================================
--- acpica-unix-20190405.orig/source/components/tables/tbfadt.c
+++ acpica-unix-20190405/source/components/tables/tbfadt.c
--- acpica-unix-20190816.orig/source/components/tables/tbfadt.c
+++ acpica-unix-20190816/source/components/tables/tbfadt.c
@@ -424,18 +424,20 @@ AcpiTbCreateLocalFadt (
ACPI_TABLE_HEADER *Table,
UINT32 Length)
@ -6288,10 +6288,10 @@ Index: acpica-unix-20190405/source/components/tables/tbfadt.c
"PmRegisters", 0);
}
}
Index: acpica-unix-20190405/source/components/tables/tbfind.c
Index: acpica-unix-20190816/source/components/tables/tbfind.c
===================================================================
--- acpica-unix-20190405.orig/source/components/tables/tbfind.c
+++ acpica-unix-20190405/source/components/tables/tbfind.c
--- acpica-unix-20190816.orig/source/components/tables/tbfind.c
+++ acpica-unix-20190816/source/components/tables/tbfind.c
@@ -108,8 +108,11 @@ AcpiTbFindTable (
(void) AcpiUtAcquireMutex (ACPI_MTX_TABLES);
for (i = 0; i < AcpiGbl_RootTableList.CurrentTableCount; ++i)
@ -6305,10 +6305,10 @@ Index: acpica-unix-20190405/source/components/tables/tbfind.c
{
/* Not the requested table */
Index: acpica-unix-20190405/source/components/tables/tbprint.c
Index: acpica-unix-20190816/source/components/tables/tbprint.c
===================================================================
--- acpica-unix-20190405.orig/source/components/tables/tbprint.c
+++ acpica-unix-20190405/source/components/tables/tbprint.c
--- acpica-unix-20190816.orig/source/components/tables/tbprint.c
+++ acpica-unix-20190816/source/components/tables/tbprint.c
@@ -143,15 +143,18 @@ AcpiTbPrintTableHeader (
ACPI_TABLE_HEADER *Header)
{
@ -6350,10 +6350,10 @@ Index: acpica-unix-20190405/source/components/tables/tbprint.c
}
}
Index: acpica-unix-20190405/source/components/tables/tbutils.c
Index: acpica-unix-20190816/source/components/tables/tbutils.c
===================================================================
--- acpica-unix-20190405.orig/source/components/tables/tbutils.c
+++ acpica-unix-20190405/source/components/tables/tbutils.c
--- acpica-unix-20190816.orig/source/components/tables/tbutils.c
+++ acpica-unix-20190816/source/components/tables/tbutils.c
@@ -238,7 +238,7 @@ AcpiTbGetRootTableEntry (
* 64-bit platform, XSDT: Move (unaligned) 64-bit to local,
* return 64-bit
@ -6413,10 +6413,10 @@ Index: acpica-unix-20190405/source/components/tables/tbutils.c
{
AcpiGbl_FadtIndex = TableIndex;
AcpiTbParseFadt ();
Index: acpica-unix-20190405/source/components/tables/tbxface.c
Index: acpica-unix-20190816/source/components/tables/tbxface.c
===================================================================
--- acpica-unix-20190405.orig/source/components/tables/tbxface.c
+++ acpica-unix-20190405/source/components/tables/tbxface.c
--- acpica-unix-20190816.orig/source/components/tables/tbxface.c
+++ acpica-unix-20190816/source/components/tables/tbxface.c
@@ -293,8 +293,11 @@ AcpiGetTableHeader (
for (i = 0, j = 0; i < AcpiGbl_RootTableList.CurrentTableCount; i++)
@ -6430,10 +6430,10 @@ Index: acpica-unix-20190405/source/components/tables/tbxface.c
{
continue;
}
Index: acpica-unix-20190405/source/components/tables/tbxfload.c
Index: acpica-unix-20190816/source/components/tables/tbxfload.c
===================================================================
--- acpica-unix-20190405.orig/source/components/tables/tbxfload.c
+++ acpica-unix-20190405/source/components/tables/tbxfload.c
--- acpica-unix-20190816.orig/source/components/tables/tbxfload.c
+++ acpica-unix-20190816/source/components/tables/tbxfload.c
@@ -153,6 +153,7 @@ AcpiTbLoadNamespace (
ACPI_TABLE_DESC *Table;
UINT32 TablesLoaded = 0;
@ -6453,10 +6453,10 @@ Index: acpica-unix-20190405/source/components/tables/tbxfload.c
ACPI_FAILURE (AcpiTbValidateTable (Table)))
{
Status = AE_NO_ACPI_TABLES;
Index: acpica-unix-20190405/source/tools/acpiexec/aetables.c
Index: acpica-unix-20190816/source/tools/acpiexec/aetables.c
===================================================================
--- acpica-unix-20190405.orig/source/tools/acpiexec/aetables.c
+++ acpica-unix-20190405/source/tools/acpiexec/aetables.c
--- acpica-unix-20190816.orig/source/tools/acpiexec/aetables.c
+++ acpica-unix-20190816/source/tools/acpiexec/aetables.c
@@ -146,21 +146,25 @@ AeInitializeTableHeader (
char *Signature,
UINT32 Length)
@ -6608,10 +6608,10 @@ Index: acpica-unix-20190405/source/tools/acpiexec/aetables.c
}
return (AE_OK);
Index: acpica-unix-20190405/source/common/dmswitch.c
Index: acpica-unix-20190816/source/common/dmswitch.c
===================================================================
--- acpica-unix-20190405.orig/source/common/dmswitch.c
+++ acpica-unix-20190405/source/common/dmswitch.c
--- acpica-unix-20190816.orig/source/common/dmswitch.c
+++ acpica-unix-20190816/source/common/dmswitch.c
@@ -88,13 +88,15 @@ AcpiDmProcessSwitch (
ACPI_PARSE_OBJECT_LIST *Current;
ACPI_PARSE_OBJECT_LIST *Previous;

26
f23-harden.patch
View File

@ -8,11 +8,11 @@ From: Al Stone <ahs3@redhat.com>
generate/unix/iasl/Makefile | 13 +++++++------
2 files changed, 9 insertions(+), 6 deletions(-)
Index: acpica-unix2-20180209/generate/unix/Makefile.config
Index: acpica-unix-20190816/generate/unix/Makefile.config
===================================================================
--- acpica-unix2-20180209.orig/generate/unix/Makefile.config
+++ acpica-unix2-20180209/generate/unix/Makefile.config
@@ -182,6 +182,8 @@ ifneq ($(NOFORTIFY),TRUE)
--- acpica-unix-20190816.orig/generate/unix/Makefile.config
+++ acpica-unix-20190816/generate/unix/Makefile.config
@@ -190,6 +190,8 @@ ifneq ($(NOFORTIFY),TRUE)
OPT_CFLAGS += -D_FORTIFY_SOURCE=2
endif
@ -21,11 +21,11 @@ Index: acpica-unix2-20180209/generate/unix/Makefile.config
CFLAGS += \
-D$(HOST)\
-D_GNU_SOURCE\
Index: acpica-unix2-20180209/generate/unix/iasl/Makefile
Index: acpica-unix-20190816/generate/unix/iasl/Makefile
===================================================================
--- acpica-unix2-20180209.orig/generate/unix/iasl/Makefile
+++ acpica-unix2-20180209/generate/unix/iasl/Makefile
@@ -344,26 +344,27 @@ $(OBJDIR)/prparserparse.c $(OBJDIR)/prpa
--- acpica-unix-20190816.orig/generate/unix/iasl/Makefile
+++ acpica-unix-20190816/generate/unix/iasl/Makefile
@@ -358,34 +358,35 @@ $(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.
#
@ -38,6 +38,16 @@ Index: acpica-unix2-20180209/generate/unix/iasl/Makefile
$(OBJDIR)/aslcompilerparse.o : $(OBJDIR)/aslcompilerparse.c
@echo "- " "Intermediate" $<
- @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
+ @$(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $<
$(OBJDIR)/dtcompilerparserlex.o : $(OBJDIR)/dtcompilerparserlex.c
@echo "- " "Intermediate" $<
- @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
+ @$(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $<
$(OBJDIR)/dtcompilerparserparse.o : $(OBJDIR)/dtcompilerparserparse.c
@echo "- " "Intermediate" $<
- @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
+ @$(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $<
$(OBJDIR)/dtparserlex.o : $(OBJDIR)/dtparserlex.c

5
grammar.asl.result
View File

@ -37,6 +37,9 @@ Warning 3055 - ^ Invalid Hex/Octal Escape - Non-
grammar.asl 620: RCIV (Subtract (Arg0, 1))
Remark 2098 - ^ Recursive method call (RCIV)
grammar.asl 631: Processor(CPU0,0x0,0xFFFFFFFF,0x0) {}
Warning 3168 - ^ Legacy Processor() keyword detected. Use Device() keyword instead.
grammar.asl 668: Method(SMWE, 4)
Remark 2146 - ^ Method Argument is never used (Arg0)
@ -371,4 +374,4 @@ Ignoring all errors, forcing AML file generation
ASL Input: grammar.asl - 323653 bytes 4818 keywords 10284 source lines
AML Output: grammar.aml - 43758 bytes 4148 opcodes 670 named objects
Compilation successful. 6 Errors, 88 Warnings, 27 Remarks, 1106 Optimizations
Compilation successful. 6 Errors, 89 Warnings, 27 Remarks, 1106 Optimizations

96
int-format.patch
View File

@ -21,11 +21,11 @@ From: Al Stone <ahs3@redhat.com>
source/components/utilities/utownerid.c | 2 +-
18 files changed, 28 insertions(+), 28 deletions(-)
Index: acpica-unix-20190405/source/compiler/aslerror.c
Index: acpica-unix-20190816/source/compiler/aslerror.c
===================================================================
--- acpica-unix-20190405.orig/source/compiler/aslerror.c
+++ acpica-unix-20190405/source/compiler/aslerror.c
@@ -906,7 +906,7 @@ AslLogNewError (
--- acpica-unix-20190816.orig/source/compiler/aslerror.c
+++ acpica-unix-20190816/source/compiler/aslerror.c
@@ -898,7 +898,7 @@ AslLogNewError (
AslGbl_ExceptionCount[ModifiedLevel]++;
if (!AslGbl_IgnoreErrors && AslGbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT)
{
@ -34,10 +34,10 @@ Index: acpica-unix-20190405/source/compiler/aslerror.c
AslGbl_SourceLine = 0;
AslGbl_NextError = AslGbl_ErrorLog;
Index: acpica-unix-20190405/source/compiler/aslopt.c
Index: acpica-unix-20190816/source/compiler/aslopt.c
===================================================================
--- acpica-unix-20190405.orig/source/compiler/aslopt.c
+++ acpica-unix-20190405/source/compiler/aslopt.c
--- acpica-unix-20190816.orig/source/compiler/aslopt.c
+++ acpica-unix-20190816/source/compiler/aslopt.c
@@ -583,7 +583,7 @@ OptOptimizeNamePath (
}
@ -47,10 +47,10 @@ Index: acpica-unix-20190405/source/compiler/aslopt.c
Op->Asl.LogicalLineNumber,
AcpiPsGetOpcodeName (Op->Common.Parent->Common.AmlOpcode),
AcpiPsGetOpcodeName (Op->Common.AmlOpcode)));
Index: acpica-unix-20190405/source/compiler/aslprepkg.c
Index: acpica-unix-20190816/source/compiler/aslprepkg.c
===================================================================
--- acpica-unix-20190405.orig/source/compiler/aslprepkg.c
+++ acpica-unix-20190405/source/compiler/aslprepkg.c
--- acpica-unix-20190816.orig/source/compiler/aslprepkg.c
+++ acpica-unix-20190816/source/compiler/aslprepkg.c
@@ -309,7 +309,7 @@ ApCheckPackage (
if (Count & 1)
@ -60,10 +60,10 @@ Index: acpica-unix-20190405/source/compiler/aslprepkg.c
Predefined->Info.Name, Count);
AslError (ASL_ERROR, ASL_MSG_RESERVED_PACKAGE_LENGTH,
Index: acpica-unix-20190405/source/components/debugger/dbexec.c
Index: acpica-unix-20190816/source/components/debugger/dbexec.c
===================================================================
--- acpica-unix-20190405.orig/source/components/debugger/dbexec.c
+++ acpica-unix-20190405/source/components/debugger/dbexec.c
--- acpica-unix-20190816.orig/source/components/debugger/dbexec.c
+++ acpica-unix-20190816/source/components/debugger/dbexec.c
@@ -230,7 +230,7 @@ AcpiDbExecuteMethod (
ACPI_ERROR ((AE_INFO,
"Possible buffer overflow within AML Debugger "
@ -73,10 +73,10 @@ Index: acpica-unix-20190405/source/components/debugger/dbexec.c
}
}
Index: acpica-unix-20190405/source/components/dispatcher/dsmthdat.c
Index: acpica-unix-20190816/source/components/dispatcher/dsmthdat.c
===================================================================
--- acpica-unix-20190405.orig/source/components/dispatcher/dsmthdat.c
+++ acpica-unix-20190405/source/components/dispatcher/dsmthdat.c
--- acpica-unix-20190816.orig/source/components/dispatcher/dsmthdat.c
+++ acpica-unix-20190816/source/components/dispatcher/dsmthdat.c
@@ -291,7 +291,7 @@ AcpiDsMethodDataGetNode (
if (Index > ACPI_METHOD_MAX_LOCAL)
{
@ -95,10 +95,10 @@ Index: acpica-unix-20190405/source/components/dispatcher/dsmthdat.c
Index, ACPI_METHOD_MAX_ARG));
return_ACPI_STATUS (AE_AML_INVALID_INDEX);
}
Index: acpica-unix-20190405/source/components/dispatcher/dsutils.c
Index: acpica-unix-20190816/source/components/dispatcher/dsutils.c
===================================================================
--- acpica-unix-20190405.orig/source/components/dispatcher/dsutils.c
+++ acpica-unix-20190405/source/components/dispatcher/dsutils.c
--- acpica-unix-20190816.orig/source/components/dispatcher/dsutils.c
+++ acpica-unix-20190816/source/components/dispatcher/dsutils.c
@@ -786,7 +786,7 @@ AcpiDsCreateOperands (
}
@ -108,10 +108,10 @@ Index: acpica-unix-20190405/source/components/dispatcher/dsutils.c
WalkState->NumOperands, ArgCount, Index));
/* Create the interpreter arguments, in reverse order */
Index: acpica-unix-20190405/source/components/dispatcher/dswscope.c
Index: acpica-unix-20190816/source/components/dispatcher/dswscope.c
===================================================================
--- acpica-unix-20190405.orig/source/components/dispatcher/dswscope.c
+++ acpica-unix-20190405/source/components/dispatcher/dswscope.c
--- acpica-unix-20190816.orig/source/components/dispatcher/dswscope.c
+++ acpica-unix-20190816/source/components/dispatcher/dswscope.c
@@ -149,7 +149,7 @@ AcpiDsScopeStackPush (
WalkState->ScopeDepth++;
@ -130,11 +130,11 @@ Index: acpica-unix-20190405/source/components/dispatcher/dswscope.c
(UINT32) WalkState->ScopeDepth,
AcpiUtGetNodeName (ScopeInfo->Scope.Node),
AcpiUtGetTypeName (ScopeInfo->Common.Value)));
Index: acpica-unix-20190405/source/components/events/evgpe.c
Index: acpica-unix-20190816/source/components/events/evgpe.c
===================================================================
--- acpica-unix-20190405.orig/source/components/events/evgpe.c
+++ acpica-unix-20190405/source/components/events/evgpe.c
@@ -489,7 +489,7 @@ AcpiEvGpeDetect (
--- acpica-unix-20190816.orig/source/components/events/evgpe.c
+++ acpica-unix-20190816/source/components/events/evgpe.c
@@ -488,7 +488,7 @@ AcpiEvGpeDetect (
"Ignore disabled registers for GPE %02X-%02X: "
"RunEnable=%02X, WakeEnable=%02X\n",
GpeRegisterInfo->BaseGpeNumber,
@ -143,10 +143,10 @@ Index: acpica-unix-20190405/source/components/events/evgpe.c
GpeRegisterInfo->EnableForRun,
GpeRegisterInfo->EnableForWake));
continue;
Index: acpica-unix-20190405/source/components/executer/exdump.c
Index: acpica-unix-20190816/source/components/executer/exdump.c
===================================================================
--- acpica-unix-20190405.orig/source/components/executer/exdump.c
+++ acpica-unix-20190405/source/components/executer/exdump.c
--- acpica-unix-20190816.orig/source/components/executer/exdump.c
+++ acpica-unix-20190816/source/components/executer/exdump.c
@@ -678,7 +678,7 @@ AcpiExDumpOperand (
if (Depth > 0)
{
@ -156,10 +156,10 @@ Index: acpica-unix-20190405/source/components/executer/exdump.c
}
else
{
Index: acpica-unix-20190405/source/components/executer/exfldio.c
Index: acpica-unix-20190816/source/components/executer/exfldio.c
===================================================================
--- acpica-unix-20190405.orig/source/components/executer/exfldio.c
+++ acpica-unix-20190405/source/components/executer/exfldio.c
--- acpica-unix-20190816.orig/source/components/executer/exfldio.c
+++ acpica-unix-20190816/source/components/executer/exfldio.c
@@ -681,8 +681,8 @@ AcpiExWriteWithUpdateRule (
ACPI_ERROR ((AE_INFO,
@ -171,10 +171,10 @@ Index: acpica-unix-20190405/source/components/executer/exfldio.c
return_ACPI_STATUS (AE_AML_OPERAND_VALUE);
}
}
Index: acpica-unix-20190405/source/components/executer/exnames.c
Index: acpica-unix-20190816/source/components/executer/exnames.c
===================================================================
--- acpica-unix-20190405.orig/source/components/executer/exnames.c
+++ acpica-unix-20190405/source/components/executer/exnames.c
--- acpica-unix-20190816.orig/source/components/executer/exnames.c
+++ acpica-unix-20190816/source/components/executer/exnames.c
@@ -237,7 +237,7 @@ AcpiExNameSegment (
*/
ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
@ -193,10 +193,10 @@ Index: acpica-unix-20190405/source/components/executer/exnames.c
}
*InAmlAddress = ACPI_CAST_PTR (UINT8, AmlAddress);
Index: acpica-unix-20190405/source/components/hardware/hwregs.c
Index: acpica-unix-20190816/source/components/hardware/hwregs.c
===================================================================
--- acpica-unix-20190405.orig/source/components/hardware/hwregs.c
+++ acpica-unix-20190405/source/components/hardware/hwregs.c
--- acpica-unix-20190816.orig/source/components/hardware/hwregs.c
+++ acpica-unix-20190816/source/components/hardware/hwregs.c
@@ -460,7 +460,7 @@ AcpiHwClearAcpiStatus (
@ -206,10 +206,10 @@ Index: acpica-unix-20190405/source/components/hardware/hwregs.c
ACPI_FORMAT_UINT64 (AcpiGbl_XPm1aStatus.Address)));
LockFlags = AcpiOsAcquireLock (AcpiGbl_HardwareLock);
Index: acpica-unix-20190405/source/components/tables/tbfadt.c
Index: acpica-unix-20190816/source/components/tables/tbfadt.c
===================================================================
--- acpica-unix-20190405.orig/source/components/tables/tbfadt.c
+++ acpica-unix-20190405/source/components/tables/tbfadt.c
--- acpica-unix-20190816.orig/source/components/tables/tbfadt.c
+++ acpica-unix-20190816/source/components/tables/tbfadt.c
@@ -233,7 +233,7 @@ AcpiTbInitGenericAddress (
if (!(Flags & ACPI_FADT_GPE_REGISTER))
{
@ -237,10 +237,10 @@ Index: acpica-unix-20190405/source/components/tables/tbfadt.c
Name, Address32,
ACPI_FORMAT_UINT64 (Address64->Address),
AcpiGbl_Use32BitFadtAddresses ? 32 : 64));
Index: acpica-unix-20190405/source/components/tables/tbxfroot.c
Index: acpica-unix-20190816/source/components/tables/tbxfroot.c
===================================================================
--- acpica-unix-20190405.orig/source/components/tables/tbxfroot.c
+++ acpica-unix-20190405/source/components/tables/tbxfroot.c
--- acpica-unix-20190816.orig/source/components/tables/tbxfroot.c
+++ acpica-unix-20190816/source/components/tables/tbxfroot.c
@@ -177,7 +177,7 @@ AcpiFindRootPointer (
{
ACPI_ERROR ((AE_INFO,
@ -268,15 +268,15 @@ Index: acpica-unix-20190405/source/components/tables/tbxfroot.c
return_ACPI_STATUS (AE_NO_MEMORY);
}
Index: acpica-unix-20190405/source/components/utilities/utownerid.c
Index: acpica-unix-20190816/source/components/utilities/utownerid.c
===================================================================
--- acpica-unix-20190405.orig/source/components/utilities/utownerid.c
+++ acpica-unix-20190405/source/components/utilities/utownerid.c
--- acpica-unix-20190816.orig/source/components/utilities/utownerid.c
+++ acpica-unix-20190816/source/components/utilities/utownerid.c
@@ -237,7 +237,7 @@ AcpiUtReleaseOwnerId (
else
{
ACPI_ERROR ((AE_INFO,
- "Release of non-allocated OwnerId: 0x%2.2X", OwnerId + 1));
- "Attempted release of non-allocated OwnerId: 0x%3.3X", OwnerId + 1));
+ "Release of non-allocated OwnerId: 0x%2.2X", (UINT32) OwnerId + 1));
}

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (acpica-unix2-20190703.tar.gz) = 8445a6d354ce3bcbfb5159f4ec0312b1e910c0b1b2033a2300f892e4ac580abab4e3f5b4ded379f0036299359d307330511ab7053678cfd9031d7df4c365f555
SHA512 (acpitests-unix-20190703.tar.gz) = d9bab56198dc00fc11b50a199035eb9dc164c226441cd00e163ecd6362d399a50058afa7582f86e62a085b990772995fc10e077581a3b04a6c6b2e95e055f167
SHA512 (acpica-unix2-20190816.tar.gz) = f2b5363a18391d35465cc14d3be1c2f5b72c599a02e617febc7abc64f0a825fd7ef06d9bc5f13264cf526b7f4ba6a605dd188152c6007efcf661641b537d22b2
SHA512 (acpitests-unix-20190816.tar.gz) = ea3944888a5229be246c47b9d53256ccc42a988e3dd98995df6ab77ebb0715e777577df609340ee806c5274536ecdcf5798d2aad3786f5a1462a6be8dea9ed1b

14
template.patch
View File

@ -7,16 +7,16 @@ From: Al Stone <ahs3@redhat.com>
tests/templates/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: acpica-unix2-20161222/tests/templates/Makefile
Index: acpica-unix-20190816/tests/templates/Makefile
===================================================================
--- acpica-unix2-20161222.orig/tests/templates/Makefile
+++ acpica-unix2-20161222/tests/templates/Makefile
@@ -2,7 +2,7 @@
PROG= templates
--- acpica-unix-20190816.orig/tests/templates/Makefile
+++ acpica-unix-20190816/tests/templates/Makefile
@@ -26,7 +26,7 @@ $(aml_obj): %.aml: %.asl
templates :
- sh templates.sh
+ sh templates.sh 1
clean :
rm -f *.asl *.aml *.dsl *.hex diff.log
.PHONY: clean
clean:

14
unaligned.patch
View File

@ -14,10 +14,10 @@ Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
source/include/actypes.h | 26 +++++++++++++-------------
3 files changed, 32 insertions(+), 21 deletions(-)
Index: acpica-unix2-20170728/source/components/executer/exoparg2.c
Index: acpica-unix-20180508/source/components/executer/exoparg2.c
===================================================================
--- acpica-unix2-20170728.orig/source/components/executer/exoparg2.c
+++ acpica-unix2-20170728/source/components/executer/exoparg2.c
--- acpica-unix-20180508.orig/source/components/executer/exoparg2.c
+++ acpica-unix-20180508/source/components/executer/exoparg2.c
@@ -172,6 +172,8 @@ AcpiExOpcode_2A_2T_1R (
ACPI_OPERAND_OBJECT **Operand = &WalkState->Operands[0];
ACPI_OPERAND_OBJECT *ReturnDesc1 = NULL;
@ -58,10 +58,10 @@ Index: acpica-unix2-20170728/source/components/executer/exoparg2.c
break;
case AML_CONCATENATE_OP: /* Concatenate (Data1, Data2, Result) */
Index: acpica-unix2-20170728/source/include/actypes.h
Index: acpica-unix-20180508/source/include/actypes.h
===================================================================
--- acpica-unix2-20170728.orig/source/include/actypes.h
+++ acpica-unix2-20170728/source/include/actypes.h
--- acpica-unix-20180508.orig/source/include/actypes.h
+++ acpica-unix-20180508/source/include/actypes.h
@@ -143,6 +143,19 @@ typedef COMPILER_DEPENDENT_INT64
*/
#define ACPI_THREAD_ID UINT64
@ -75,7 +75,7 @@ Index: acpica-unix2-20170728/source/include/actypes.h
+ * Note: EM64T and other X86-64 processors support misaligned transfers,
+ * so there is no need to define this flag.
+ */
+#if defined (__IA64__) || defined (__ia64__) || defined(__alpha__) || defined(__sparc__) || defined(__hppa__)
+#if defined (__IA64__) || defined (__ia64__) || defined(__alpha__) || defined(__sparc__) || defined(__hppa__) || defined(__arm__)
+#define ACPI_MISALIGNMENT_NOT_SUPPORTED
+#endif
+