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

Update to 20209326 sources, with refreshed patches

Browse Source 
Signed-off-by: Al Stone <ahs3@redhat.com>
This commit is contained in:
Al Stone 2020-04-01 14:07:44 -06:00
parent 2652e3e2c4
commit 5b73a30c60
8 changed files with 66 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -127,3 +127,5 @@ series
/acpitests-unix-20200110.tar.gz /acpitests-unix-20200110.tar.gz
/acpica-unix2-20200214.tar.gz /acpica-unix2-20200214.tar.gz
/acpitests-unix-20200214.tar.gz /acpitests-unix-20200214.tar.gz
/acpica-unix2-20200326.tar.gz
/acpitests-unix-20200326.tar.gz

12
acpica-tools.spec
View File

@ -1,5 +1,5 @@
Name: acpica-tools Name: acpica-tools
Version: 20200214 Version: 20200326
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
@ -46,11 +46,8 @@ Patch18: str-trunc-warn.patch
Patch19: ptr-cast.patch Patch19: ptr-cast.patch
Patch20: aslcodegen.patch Patch20: aslcodegen.patch
Patch21: facp.patch Patch21: facp.patch
Patch22: dup-symbol.patch
Patch23: no-common.patch
Patch24: armv7-str-fixes.patch Patch24: armv7-str-fixes.patch
Patch25: dbtest.patch Patch25: dbtest.patch
Patch26: pcc.patch
Patch27: big-endian-v3.patch Patch27: big-endian-v3.patch
BuildRequires: bison patchutils flex gcc BuildRequires: bison patchutils flex gcc
@ -125,11 +122,8 @@ gzip -dc %{SOURCE1} | tar -x --strip-components=1 -f -
%patch19 -p1 -b .ptr-cast %patch19 -p1 -b .ptr-cast
%patch20 -p1 -b .aslcodegen %patch20 -p1 -b .aslcodegen
%patch21 -p1 -b .facp %patch21 -p1 -b .facp
%patch22 -p1 -b .dup-symbol
%patch23 -p1 -b .no-common
%patch24 -p1 -b .armv7-str-fixes %patch24 -p1 -b .armv7-str-fixes
%patch25 -p1 -b .dbtest %patch25 -p1 -b .dbtest
%patch26 -p1 -b .pcc
%patch27 -p1 -b .big-endian-v3 %patch27 -p1 -b .big-endian-v3
cp -p %{SOURCE2} README.Fedora cp -p %{SOURCE2} README.Fedora
@ -247,6 +241,10 @@ fi
%changelog %changelog
* Web Apr 1 2020 Al Stone <ahs3@redhat.com> - 20200326-1
- Update to 20200326 source tree, including patch refreshes
- Removed a couple of patches that got included upstream
* Wed Feb 26 2020 Al Stone <ahs3@redhat.com> - 20200214-1 * Wed Feb 26 2020 Al Stone <ahs3@redhat.com> - 20200214-1
- Update to 20200214 source tree, including patch refreshes - Update to 20200214 source tree, including patch refreshes
- Add patch to fix up issues where strings and 4-byte quantities - Add patch to fix up issues where strings and 4-byte quantities

104
big-endian-dmtbdump2.patch
View File

@ -1,7 +1,7 @@
Index: acpica-unix-20191018/source/common/dmtbdump2.c Index: acpica-unix-20209326/source/common/dmtbdump2.c
=================================================================== ===================================================================
--- acpica-unix-20191018.orig/source/common/dmtbdump2.c --- acpica-unix-20209326.orig/source/common/dmtbdump2.c
+++ acpica-unix-20191018/source/common/dmtbdump2.c +++ acpica-unix-20209326/source/common/dmtbdump2.c
@@ -75,16 +75,23 @@ AcpiDmDumpIort ( @@ -75,16 +75,23 @@ AcpiDmDumpIort (
ACPI_IORT_SMMU *IortSmmu = NULL; ACPI_IORT_SMMU *IortSmmu = NULL;
UINT32 Offset; UINT32 Offset;
@ -223,7 +223,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -386,7 +407,7 @@ AcpiDmDumpIvrs ( @@ -391,7 +412,7 @@ AcpiDmDumpIvrs (
/* Attempt to continue */ /* Attempt to continue */
@ -232,7 +232,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
{ {
AcpiOsPrintf ("Invalid zero length subtable\n"); AcpiOsPrintf ("Invalid zero length subtable\n");
return; return;
@@ -397,8 +418,8 @@ AcpiDmDumpIvrs ( @@ -402,8 +423,8 @@ AcpiDmDumpIvrs (
/* Dump the subtable */ /* Dump the subtable */
AcpiOsPrintf ("\n"); AcpiOsPrintf ("\n");
@ -243,16 +243,16 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -412,7 +433,7 @@ AcpiDmDumpIvrs ( @@ -427,7 +448,7 @@ AcpiDmDumpIvrs (
DeviceEntry = ACPI_ADD_PTR (ACPI_IVRS_DE_HEADER, Subtable, sizeof (ACPI_IVRS_HARDWARE2));
sizeof (ACPI_IVRS_HARDWARE)); }
- while (EntryOffset < (Offset + Subtable->Length)) - while (EntryOffset < (Offset + Subtable->Length))
+ while (EntryOffset < (Offset + SubLength)) + while (EntryOffset < (Offset + SubLength))
{ {
AcpiOsPrintf ("\n"); AcpiOsPrintf ("\n");
/* /*
@@ -474,7 +495,7 @@ AcpiDmDumpIvrs ( @@ -489,7 +510,7 @@ AcpiDmDumpIvrs (
/* Dump the Device Entry */ /* Dump the Device Entry */
@ -261,7 +261,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
DeviceEntry, EntryLength, InfoTable); DeviceEntry, EntryLength, InfoTable);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
@@ -490,8 +511,8 @@ AcpiDmDumpIvrs ( @@ -505,8 +526,8 @@ AcpiDmDumpIvrs (
NextSubtable: NextSubtable:
/* Point to next subtable */ /* Point to next subtable */
@ -272,7 +272,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
} }
} }
@@ -517,7 +538,7 @@ AcpiDmDumpLpit ( @@ -532,7 +553,7 @@ AcpiDmDumpLpit (
{ {
ACPI_STATUS Status; ACPI_STATUS Status;
ACPI_LPIT_HEADER *Subtable; ACPI_LPIT_HEADER *Subtable;
@ -281,7 +281,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
UINT32 Offset = sizeof (ACPI_TABLE_LPIT); UINT32 Offset = sizeof (ACPI_TABLE_LPIT);
ACPI_DMTABLE_INFO *InfoTable; ACPI_DMTABLE_INFO *InfoTable;
UINT32 SubtableLength; UINT32 SubtableLength;
@@ -525,8 +546,9 @@ AcpiDmDumpLpit ( @@ -540,8 +561,9 @@ AcpiDmDumpLpit (
/* Subtables */ /* Subtables */
@ -292,7 +292,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
{ {
/* Common subtable header */ /* Common subtable header */
@@ -590,13 +612,14 @@ AcpiDmDumpMadt ( @@ -605,13 +627,14 @@ AcpiDmDumpMadt (
{ {
ACPI_STATUS Status; ACPI_STATUS Status;
ACPI_SUBTABLE_HEADER *Subtable; ACPI_SUBTABLE_HEADER *Subtable;
@ -308,7 +308,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoMadt); Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoMadt);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
@@ -606,7 +629,7 @@ AcpiDmDumpMadt ( @@ -621,7 +644,7 @@ AcpiDmDumpMadt (
/* Subtables */ /* Subtables */
Subtable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Table, Offset); Subtable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Table, Offset);
@ -317,7 +317,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
{ {
/* Common subtable header */ /* Common subtable header */
@@ -752,11 +775,13 @@ AcpiDmDumpMcfg ( @@ -767,11 +790,13 @@ AcpiDmDumpMcfg (
ACPI_STATUS Status; ACPI_STATUS Status;
UINT32 Offset = sizeof (ACPI_TABLE_MCFG); UINT32 Offset = sizeof (ACPI_TABLE_MCFG);
ACPI_MCFG_ALLOCATION *Subtable; ACPI_MCFG_ALLOCATION *Subtable;
@ -332,7 +332,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -765,17 +790,17 @@ AcpiDmDumpMcfg ( @@ -780,17 +805,17 @@ AcpiDmDumpMcfg (
/* Subtables */ /* Subtables */
Subtable = ACPI_ADD_PTR (ACPI_MCFG_ALLOCATION, Table, Offset); Subtable = ACPI_ADD_PTR (ACPI_MCFG_ALLOCATION, Table, Offset);
@ -354,7 +354,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
sizeof (ACPI_MCFG_ALLOCATION), AcpiDmTableInfoMcfg0); sizeof (ACPI_MCFG_ALLOCATION), AcpiDmTableInfoMcfg0);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
@@ -809,6 +834,7 @@ AcpiDmDumpMpst ( @@ -824,6 +849,7 @@ AcpiDmDumpMpst (
{ {
ACPI_STATUS Status; ACPI_STATUS Status;
UINT32 Offset = sizeof (ACPI_TABLE_MPST); UINT32 Offset = sizeof (ACPI_TABLE_MPST);
@ -362,7 +362,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
ACPI_MPST_POWER_NODE *Subtable0; ACPI_MPST_POWER_NODE *Subtable0;
ACPI_MPST_POWER_STATE *Subtable0A; ACPI_MPST_POWER_STATE *Subtable0A;
ACPI_MPST_COMPONENT *Subtable0B; ACPI_MPST_COMPONENT *Subtable0B;
@@ -817,11 +843,13 @@ AcpiDmDumpMpst ( @@ -832,11 +858,13 @@ AcpiDmDumpMpst (
UINT16 SubtableCount; UINT16 SubtableCount;
UINT32 PowerStateCount; UINT32 PowerStateCount;
UINT32 ComponentCount; UINT32 ComponentCount;
@ -377,7 +377,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -829,13 +857,14 @@ AcpiDmDumpMpst ( @@ -844,13 +872,14 @@ AcpiDmDumpMpst (
/* Subtable: Memory Power Node(s) */ /* Subtable: Memory Power Node(s) */
@ -395,7 +395,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
sizeof (ACPI_MPST_POWER_NODE), AcpiDmTableInfoMpst0); sizeof (ACPI_MPST_POWER_NODE), AcpiDmTableInfoMpst0);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
@@ -844,8 +873,8 @@ AcpiDmDumpMpst ( @@ -859,8 +888,8 @@ AcpiDmDumpMpst (
/* Extract the sub-subtable counts */ /* Extract the sub-subtable counts */
@ -406,7 +406,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
Offset += sizeof (ACPI_MPST_POWER_NODE); Offset += sizeof (ACPI_MPST_POWER_NODE);
/* Sub-subtables - Memory Power State Structure(s) */ /* Sub-subtables - Memory Power State Structure(s) */
@@ -856,7 +885,7 @@ AcpiDmDumpMpst ( @@ -871,7 +900,7 @@ AcpiDmDumpMpst (
while (PowerStateCount) while (PowerStateCount)
{ {
AcpiOsPrintf ("\n"); AcpiOsPrintf ("\n");
@ -415,7 +415,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
sizeof (ACPI_MPST_POWER_STATE), AcpiDmTableInfoMpst0A); sizeof (ACPI_MPST_POWER_STATE), AcpiDmTableInfoMpst0A);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
@@ -866,7 +895,7 @@ AcpiDmDumpMpst ( @@ -881,7 +910,7 @@ AcpiDmDumpMpst (
Subtable0A++; Subtable0A++;
PowerStateCount--; PowerStateCount--;
Offset += sizeof (ACPI_MPST_POWER_STATE); Offset += sizeof (ACPI_MPST_POWER_STATE);
@ -424,7 +424,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
/* Sub-subtables - Physical Component ID Structure(s) */ /* Sub-subtables - Physical Component ID Structure(s) */
@@ -879,7 +908,7 @@ AcpiDmDumpMpst ( @@ -894,7 +923,7 @@ AcpiDmDumpMpst (
while (ComponentCount) while (ComponentCount)
{ {
@ -433,7 +433,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
sizeof (ACPI_MPST_COMPONENT), AcpiDmTableInfoMpst0B); sizeof (ACPI_MPST_COMPONENT), AcpiDmTableInfoMpst0B);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
@@ -894,17 +923,19 @@ AcpiDmDumpMpst ( @@ -909,17 +938,19 @@ AcpiDmDumpMpst (
/* Point to next Memory Power Node subtable */ /* Point to next Memory Power Node subtable */
SubtableCount--; SubtableCount--;
@ -456,7 +456,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
sizeof (ACPI_MPST_DATA_HDR), AcpiDmTableInfoMpst1); sizeof (ACPI_MPST_DATA_HDR), AcpiDmTableInfoMpst1);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
@@ -919,10 +950,10 @@ AcpiDmDumpMpst ( @@ -934,10 +965,10 @@ AcpiDmDumpMpst (
Subtable2 = ACPI_ADD_PTR (ACPI_MPST_POWER_DATA, Subtable1, Subtable2 = ACPI_ADD_PTR (ACPI_MPST_POWER_DATA, Subtable1,
sizeof (ACPI_MPST_DATA_HDR)); sizeof (ACPI_MPST_DATA_HDR));
@ -469,7 +469,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
sizeof (ACPI_MPST_POWER_DATA), AcpiDmTableInfoMpst2); sizeof (ACPI_MPST_POWER_DATA), AcpiDmTableInfoMpst2);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
@@ -955,11 +986,13 @@ AcpiDmDumpMsct ( @@ -970,11 +1001,13 @@ AcpiDmDumpMsct (
ACPI_STATUS Status; ACPI_STATUS Status;
UINT32 Offset = sizeof (ACPI_TABLE_MSCT); UINT32 Offset = sizeof (ACPI_TABLE_MSCT);
ACPI_MSCT_PROXIMITY *Subtable; ACPI_MSCT_PROXIMITY *Subtable;
@ -484,7 +484,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -968,12 +1001,12 @@ AcpiDmDumpMsct ( @@ -983,12 +1016,12 @@ AcpiDmDumpMsct (
/* Subtables */ /* Subtables */
Subtable = ACPI_ADD_PTR (ACPI_MSCT_PROXIMITY, Table, Offset); Subtable = ACPI_ADD_PTR (ACPI_MSCT_PROXIMITY, Table, Offset);
@ -499,7 +499,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
sizeof (ACPI_MSCT_PROXIMITY), AcpiDmTableInfoMsct0); sizeof (ACPI_MSCT_PROXIMITY), AcpiDmTableInfoMsct0);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
@@ -1008,11 +1041,13 @@ AcpiDmDumpMtmr ( @@ -1023,11 +1056,13 @@ AcpiDmDumpMtmr (
ACPI_STATUS Status; ACPI_STATUS Status;
UINT32 Offset = sizeof (ACPI_TABLE_MTMR); UINT32 Offset = sizeof (ACPI_TABLE_MTMR);
ACPI_MTMR_ENTRY *Subtable; ACPI_MTMR_ENTRY *Subtable;
@ -514,7 +514,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -1021,12 +1056,12 @@ AcpiDmDumpMtmr ( @@ -1036,12 +1071,12 @@ AcpiDmDumpMtmr (
/* Subtables */ /* Subtables */
Subtable = ACPI_ADD_PTR (ACPI_MTMR_ENTRY, Table, Offset); Subtable = ACPI_ADD_PTR (ACPI_MTMR_ENTRY, Table, Offset);
@ -529,7 +529,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
sizeof (ACPI_MTMR_ENTRY), AcpiDmTableInfoMtmr0); sizeof (ACPI_MTMR_ENTRY), AcpiDmTableInfoMtmr0);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
@@ -1068,11 +1103,17 @@ AcpiDmDumpNfit ( @@ -1083,11 +1118,17 @@ AcpiDmDumpNfit (
ACPI_NFIT_SMBIOS *SmbiosInfo = NULL; ACPI_NFIT_SMBIOS *SmbiosInfo = NULL;
ACPI_NFIT_FLUSH_ADDRESS *Hint = NULL; ACPI_NFIT_FLUSH_ADDRESS *Hint = NULL;
UINT32 i; UINT32 i;
@ -548,7 +548,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -1081,19 +1122,21 @@ AcpiDmDumpNfit ( @@ -1096,19 +1137,21 @@ AcpiDmDumpNfit (
/* Subtables */ /* Subtables */
Subtable = ACPI_ADD_PTR (ACPI_NFIT_HEADER, Table, Offset); Subtable = ACPI_ADD_PTR (ACPI_NFIT_HEADER, Table, Offset);
@ -574,7 +574,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
{ {
case ACPI_NFIT_TYPE_SYSTEM_ADDRESS: case ACPI_NFIT_TYPE_SYSTEM_ADDRESS:
@@ -1148,7 +1191,7 @@ AcpiDmDumpNfit ( @@ -1163,7 +1206,7 @@ AcpiDmDumpNfit (
/* Attempt to continue */ /* Attempt to continue */
@ -583,7 +583,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
{ {
AcpiOsPrintf ("Invalid zero length subtable\n"); AcpiOsPrintf ("Invalid zero length subtable\n");
return; return;
@@ -1157,8 +1200,8 @@ AcpiDmDumpNfit ( @@ -1172,8 +1215,8 @@ AcpiDmDumpNfit (
} }
AcpiOsPrintf ("\n"); AcpiOsPrintf ("\n");
@ -594,7 +594,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -1166,14 +1209,15 @@ AcpiDmDumpNfit ( @@ -1181,14 +1224,15 @@ AcpiDmDumpNfit (
/* Per-subtable variable-length fields */ /* Per-subtable variable-length fields */
@ -613,7 +613,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
&Interleave->LineOffset[i], &Interleave->LineOffset[i],
sizeof (UINT32), AcpiDmTableInfoNfit2a); sizeof (UINT32), AcpiDmTableInfoNfit2a);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
@@ -1187,12 +1231,11 @@ AcpiDmDumpNfit ( @@ -1202,12 +1246,11 @@ AcpiDmDumpNfit (
case ACPI_NFIT_TYPE_SMBIOS: case ACPI_NFIT_TYPE_SMBIOS:
@ -628,7 +628,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
sizeof (ACPI_NFIT_SMBIOS) - sizeof (UINT8), sizeof (ACPI_NFIT_SMBIOS) - sizeof (UINT8),
SmbiosInfo, SmbiosInfo,
Length, AcpiDmTableInfoNfit3a); Length, AcpiDmTableInfoNfit3a);
@@ -1207,9 +1250,10 @@ AcpiDmDumpNfit ( @@ -1222,9 +1265,10 @@ AcpiDmDumpNfit (
case ACPI_NFIT_TYPE_FLUSH_ADDRESS: case ACPI_NFIT_TYPE_FLUSH_ADDRESS:
Hint = ACPI_CAST_PTR (ACPI_NFIT_FLUSH_ADDRESS, Subtable); Hint = ACPI_CAST_PTR (ACPI_NFIT_FLUSH_ADDRESS, Subtable);
@ -641,7 +641,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
&Hint->HintAddress[i], &Hint->HintAddress[i],
sizeof (UINT64), AcpiDmTableInfoNfit6a); sizeof (UINT64), AcpiDmTableInfoNfit6a);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
@@ -1228,8 +1272,8 @@ AcpiDmDumpNfit ( @@ -1243,8 +1287,8 @@ AcpiDmDumpNfit (
NextSubtable: NextSubtable:
/* Point to next subtable */ /* Point to next subtable */
@ -652,7 +652,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
} }
} }
@@ -1254,12 +1298,13 @@ AcpiDmDumpPcct ( @@ -1269,12 +1313,13 @@ AcpiDmDumpPcct (
ACPI_STATUS Status; ACPI_STATUS Status;
ACPI_PCCT_SUBSPACE *Subtable; ACPI_PCCT_SUBSPACE *Subtable;
ACPI_DMTABLE_INFO *InfoTable; ACPI_DMTABLE_INFO *InfoTable;
@ -667,7 +667,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoPcct); Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoPcct);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
@@ -1269,7 +1314,7 @@ AcpiDmDumpPcct ( @@ -1284,7 +1329,7 @@ AcpiDmDumpPcct (
/* Subtables */ /* Subtables */
Subtable = ACPI_ADD_PTR (ACPI_PCCT_SUBSPACE, Table, Offset); Subtable = ACPI_ADD_PTR (ACPI_PCCT_SUBSPACE, Table, Offset);
@ -676,7 +676,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
{ {
/* Common subtable header */ /* Common subtable header */
@@ -1409,16 +1454,21 @@ AcpiDmDumpPmtt ( @@ -1424,16 +1469,21 @@ AcpiDmDumpPmtt (
ACPI_PMTT_HEADER *MemSubtable; ACPI_PMTT_HEADER *MemSubtable;
ACPI_PMTT_HEADER *DimmSubtable; ACPI_PMTT_HEADER *DimmSubtable;
ACPI_PMTT_DOMAIN *DomainArray; ACPI_PMTT_DOMAIN *DomainArray;
@ -700,7 +700,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoPmtt); Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoPmtt);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
@@ -1428,13 +1478,14 @@ AcpiDmDumpPmtt ( @@ -1443,13 +1493,14 @@ AcpiDmDumpPmtt (
/* Subtables */ /* Subtables */
Subtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, Table, Offset); Subtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, Table, Offset);
@ -717,7 +717,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -1453,7 +1504,7 @@ AcpiDmDumpPmtt ( @@ -1468,7 +1519,7 @@ AcpiDmDumpPmtt (
/* Dump the fixed-length portion of the subtable */ /* Dump the fixed-length portion of the subtable */
Status = AcpiDmDumpTable (Length, Offset, Subtable, Status = AcpiDmDumpTable (Length, Offset, Subtable,
@ -726,7 +726,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -1465,15 +1516,16 @@ AcpiDmDumpPmtt ( @@ -1480,15 +1531,16 @@ AcpiDmDumpPmtt (
MemSubtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, Subtable, MemSubtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, Subtable,
sizeof (ACPI_PMTT_SOCKET)); sizeof (ACPI_PMTT_SOCKET));
@ -746,7 +746,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -1493,7 +1545,7 @@ AcpiDmDumpPmtt ( @@ -1508,7 +1560,7 @@ AcpiDmDumpPmtt (
Status = AcpiDmDumpTable (Length, Status = AcpiDmDumpTable (Length,
Offset + MemOffset, MemSubtable, Offset + MemOffset, MemSubtable,
@ -755,7 +755,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -1501,13 +1553,14 @@ AcpiDmDumpPmtt ( @@ -1516,13 +1568,14 @@ AcpiDmDumpPmtt (
/* Walk the variable count of proximity domains */ /* Walk the variable count of proximity domains */
@ -773,7 +773,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
DomainCount) DomainCount)
{ {
Status = AcpiDmDumpTable (Length, Status = AcpiDmDumpTable (Length,
@@ -1535,15 +1588,16 @@ AcpiDmDumpPmtt ( @@ -1550,15 +1603,16 @@ AcpiDmDumpPmtt (
DimmSubtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, MemSubtable, DimmSubtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, MemSubtable,
DomainOffset); DomainOffset);
@ -793,7 +793,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -1563,7 +1617,7 @@ AcpiDmDumpPmtt ( @@ -1578,7 +1632,7 @@ AcpiDmDumpPmtt (
Status = AcpiDmDumpTable (Length, Status = AcpiDmDumpTable (Length,
Offset + MemOffset + DimmOffset, DimmSubtable, Offset + MemOffset + DimmOffset, DimmSubtable,
@ -802,7 +802,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -1571,23 +1625,22 @@ AcpiDmDumpPmtt ( @@ -1586,23 +1640,22 @@ AcpiDmDumpPmtt (
/* Point to next DIMM subtable */ /* Point to next DIMM subtable */
@ -832,7 +832,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
} }
} }
@@ -1748,6 +1801,8 @@ AcpiDmDumpS3pt ( @@ -1763,6 +1816,8 @@ AcpiDmDumpS3pt (
ACPI_FPDT_HEADER *Subtable; ACPI_FPDT_HEADER *Subtable;
ACPI_DMTABLE_INFO *InfoTable; ACPI_DMTABLE_INFO *InfoTable;
ACPI_TABLE_S3PT *S3ptTable = ACPI_CAST_PTR (ACPI_TABLE_S3PT, Tables); ACPI_TABLE_S3PT *S3ptTable = ACPI_CAST_PTR (ACPI_TABLE_S3PT, Tables);
@ -841,7 +841,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
/* Main table */ /* Main table */
@@ -1758,20 +1813,22 @@ AcpiDmDumpS3pt ( @@ -1773,20 +1828,22 @@ AcpiDmDumpS3pt (
return 0; return 0;
} }
@ -867,7 +867,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
{ {
case ACPI_S3PT_TYPE_RESUME: case ACPI_S3PT_TYPE_RESUME:
@@ -1786,7 +1843,7 @@ AcpiDmDumpS3pt ( @@ -1801,7 +1858,7 @@ AcpiDmDumpS3pt (
default: default:
AcpiOsPrintf ("\n**** Unknown S3PT subtable type 0x%X\n", AcpiOsPrintf ("\n**** Unknown S3PT subtable type 0x%X\n",
@ -876,7 +876,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
/* Attempt to continue */ /* Attempt to continue */
@@ -1799,7 +1856,7 @@ AcpiDmDumpS3pt ( @@ -1814,7 +1871,7 @@ AcpiDmDumpS3pt (
} }
AcpiOsPrintf ("\n"); AcpiOsPrintf ("\n");

10
big-endian-v3.patch
View File

@ -20,7 +20,7 @@ diff -Naur acpica-unix2-20200214.orig/source/components/namespace/nsutils.c acpi
diff -Naur acpica-unix2-20200214.orig/source/common/dmtbdump2.c acpica-unix2-20200214/source/common/dmtbdump2.c diff -Naur acpica-unix2-20200214.orig/source/common/dmtbdump2.c acpica-unix2-20200214/source/common/dmtbdump2.c
--- acpica-unix2-20200214.orig/source/common/dmtbdump2.c 2020-02-26 11:44:13.732967820 -0700 --- acpica-unix2-20200214.orig/source/common/dmtbdump2.c 2020-02-26 11:44:13.732967820 -0700
+++ acpica-unix2-20200214/source/common/dmtbdump2.c 2020-02-26 12:38:44.286849954 -0700 +++ acpica-unix2-20200214/source/common/dmtbdump2.c 2020-02-26 12:38:44.286849954 -0700
@@ -1670,6 +1670,8 @@ @@ -1685,6 +1685,8 @@
UINT32 Offset = sizeof (ACPI_TABLE_FPDT); UINT32 Offset = sizeof (ACPI_TABLE_FPDT);
ACPI_DMTABLE_INFO *InfoTable; ACPI_DMTABLE_INFO *InfoTable;
UINT32 i; UINT32 i;
@ -29,7 +29,7 @@ diff -Naur acpica-unix2-20200214.orig/source/common/dmtbdump2.c acpica-unix2-202
/* There is no main table (other than the standard ACPI header) */ /* There is no main table (other than the standard ACPI header) */
@@ -1677,7 +1679,8 @@ @@ -1692,7 +1694,8 @@
/* Subtables */ /* Subtables */
Offset = sizeof (ACPI_TABLE_HEADER); Offset = sizeof (ACPI_TABLE_HEADER);
@ -39,7 +39,7 @@ diff -Naur acpica-unix2-20200214.orig/source/common/dmtbdump2.c acpica-unix2-202
{ {
AcpiOsPrintf ("\n"); AcpiOsPrintf ("\n");
@@ -1689,7 +1692,7 @@ @@ -1704,7 +1707,7 @@
AcpiOsPrintf ("Invalid subtable length\n"); AcpiOsPrintf ("Invalid subtable length\n");
return; return;
} }
@ -48,7 +48,7 @@ diff -Naur acpica-unix2-20200214.orig/source/common/dmtbdump2.c acpica-unix2-202
Subtable->Length, AcpiDmTableInfoPpttHdr); Subtable->Length, AcpiDmTableInfoPpttHdr);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
@@ -1731,7 +1734,7 @@ @@ -1746,7 +1749,7 @@
AcpiOsPrintf ("Invalid subtable length\n"); AcpiOsPrintf ("Invalid subtable length\n");
return; return;
} }
@ -57,7 +57,7 @@ diff -Naur acpica-unix2-20200214.orig/source/common/dmtbdump2.c acpica-unix2-202
Subtable->Length, InfoTable); Subtable->Length, InfoTable);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
@@ -1747,15 +1750,16 @@ @@ -1762,15 +1765,16 @@
/* Dump SMBIOS handles */ /* Dump SMBIOS handles */

22
dup-symbol.patch
View File

@ -1,22 +0,0 @@
diff -Naur acpica-unix2-20191213.orig/source/tools/acpiexec/aemain.c acpica-unix2-20191213/source/tools/acpiexec/aemain.c
--- acpica-unix2-20191213.orig/source/tools/acpiexec/aemain.c 2020-02-23 16:32:25.935853162 -0700
+++ acpica-unix2-20191213/source/tools/acpiexec/aemain.c 2020-02-23 16:44:38.949901103 -0700
@@ -84,7 +84,6 @@
UINT8 AcpiGbl_RegionFillValue = 0;
BOOLEAN AcpiGbl_IgnoreErrors = FALSE;
BOOLEAN AcpiGbl_AbortLoopOnTimeout = FALSE;
-BOOLEAN AcpiGbl_DbOpt_NoRegionSupport = FALSE;
UINT8 AcpiGbl_UseHwReducedFadt = FALSE;
BOOLEAN AcpiGbl_DoInterfaceTests = FALSE;
BOOLEAN AcpiGbl_LoadTestTables = FALSE;
@@ -549,6 +548,10 @@
goto NormalExit;
}
+ /* Initialize globals modified by command line options */
+
+ AcpiGbl_DbOpt_NoRegionSupport = FALSE;
+
/* Get the command line options */
ExitCode = AeDoOptions (argc, argv);

36
no-common.patch
View File

@ -1,36 +0,0 @@
diff -Naur acpica-unix2-20191213.orig/source/compiler/dtcompiler.h acpica-unix2-20191213/source/compiler/dtcompiler.h
--- acpica-unix2-20191213.orig/source/compiler/dtcompiler.h 2020-02-23 18:05:24.257395129 -0700
+++ acpica-unix2-20191213/source/compiler/dtcompiler.h 2020-02-23 18:06:42.956236378 -0700
@@ -351,7 +351,7 @@
/* dtparser - lex/yacc files */
-UINT64 DtCompilerParserResult; /* Expression return value */
+extern UINT64 DtCompilerParserResult; /* Expression return value */
int
DtCompilerParserparse (
void);
diff -Naur acpica-unix2-20191213.orig/source/compiler/aslcompiler.l acpica-unix2-20191213/source/compiler/aslcompiler.l
--- acpica-unix2-20191213.orig/source/compiler/aslcompiler.l 2019-12-13 08:58:18.000000000 -0700
+++ acpica-unix2-20191213/source/compiler/aslcompiler.l 2020-02-24 15:08:53.067560139 -0700
@@ -48,7 +48,7 @@
#include <stdlib.h>
#include <string.h>
-YYSTYPE AslCompilerlval;
+#define YYSTYPE AslCompilerlval;
/*
* Generation: Use the following command line:
diff -Naur acpica-unix2-20191213.orig/source/compiler/prparser.l acpica-unix2-20191213/source/compiler/prparser.l
--- acpica-unix2-20191213.orig/source/compiler/prparser.l 2019-12-13 08:58:19.000000000 -0700
+++ acpica-unix2-20191213/source/compiler/prparser.l 2020-02-24 15:09:25.909839732 -0700
@@ -116,7 +116,7 @@
/*
* Local support functions
*/
-YY_BUFFER_STATE LexBuffer;
+static YY_BUFFER_STATE LexBuffer;
/******************************************************************************

24
pcc.patch
View File

@ -1,24 +0,0 @@
diff -Naur acpica-unix2-20200214.orig/source/compiler/aslcompiler.l acpica-unix2-20200214/source/compiler/aslcompiler.l
--- acpica-unix2-20200214.orig/source/compiler/aslcompiler.l 2020-02-25 17:24:22.169290551 -0700
+++ acpica-unix2-20200214/source/compiler/aslcompiler.l 2020-02-25 17:26:01.807138585 -0700
@@ -584,7 +584,7 @@
"IPMI" { count (0); return (PARSEOP_REGIONSPACE_IPMI); }
"GeneralPurposeIo" { count (0); return (PARSEOP_REGIONSPACE_GPIO); } /* ACPI 5.0 */
"GenericSerialBus" { count (0); return (PARSEOP_REGIONSPACE_GSBUS); } /* ACPI 5.0 */
-"PlatformCommChannel" { count (0); return (PARSEOP_REGIONSPACE_PCC); } /* ACPI 5.0 */
+"PCC" { count (0); return (PARSEOP_REGIONSPACE_PCC); } /* ACPI 5.0 */
"FFixedHW" { count (0); return (PARSEOP_REGIONSPACE_FFIXEDHW); }
/* ResourceTypeKeyword: Resource Usage - Resource Descriptors */
diff -Naur acpica-unix2-20200214.orig/source/components/utilities/utdecode.c acpica-unix2-20200214/source/components/utilities/utdecode.c
--- acpica-unix2-20200214.orig/source/components/utilities/utdecode.c 2020-02-14 10:33:55.000000000 -0700
+++ acpica-unix2-20200214/source/components/utilities/utdecode.c 2020-02-25 17:26:28.524365981 -0700
@@ -116,7 +116,7 @@
"IPMI", /* 0x07 */
"GeneralPurposeIo", /* 0x08 */
"GenericSerialBus", /* 0x09 */
- "PlatformCommChannel"/* 0x0A */
+ "PCC" /* 0x0A */
};

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (acpica-unix2-20200214.tar.gz) = 0b22f8c8255b030b5e8a2cf5b459344d1f644b26a4fcf1e95b3682335204598a3587f8f2a5ac169f99d76a10ae529051e1dabd1672c8d8bf5a4441c71d4cb1fd SHA512 (acpica-unix2-20200326.tar.gz) = 5028fae5c976593b15cf429e62de30afef3af11ddac9351d9ec0de789d495b553d459e676bc4d3e862edc0c536487a7ee63a137d95c5d1783e6a17ab9114c202
SHA512 (acpitests-unix-20200214.tar.gz) = b4d37d4784d3fbb697f244477c085e433efa152bc4c4a06d336b216358405252a77c331f4e792f5fa9b912d6f5f200aa1b6379f1b5064e58be12cf8d4415ee15 SHA512 (acpitests-unix-20200326.tar.gz) = 332b4ed016cee48662a5f4572e6d170461f02ee1386109a3970fbe8d104f2a2b14c19235ea43ae9b26e8faf9ef9597cb3d2148e498741361aca62978d0b62189