From 97df1c2ef7772c22f4e1a09978886167dfbdbb73 Mon Sep 17 00:00:00 2001 From: Al Stone Date: Fri, 18 Mar 2022 16:08:40 -0600 Subject: [PATCH] Update all patches to match upstream 20211217 release Signed-off-by: Al Stone --- ...lity-functions-to-be-endian-agnostic.patch | 46 ++--- ...ing-Unicode-properly-when-big-endian.patch | 14 +- ...ort-ASF-tables-in-a-big-endian-world.patch | 12 +- ...rt-CPEP-tables-in-a-big-endian-world.patch | 10 +- ...ort-DBG2-table-in-a-big-endian-world.patch | 32 ++-- 0012-Support-DMAR-in-a-big-endian-world.patch | 34 ++-- 0013-Support-DRTM-in-a-big-endian-world.patch | 24 +-- 0014-Support-EINJ-in-a-big-endian-world.patch | 10 +- 0015-Support-ERST-in-a-big-endian-world.patch | 10 +- ...-FADT-aka-FACP-in-a-big-endian-world.patch | 24 +-- ...ort-most-FPDTs-in-a-big-endian-world.patch | 18 +- 0018-Support-GTDT-in-a-big-endian-world.patch | 18 +- 0019-Support-HEST-in-a-big-endian-world.patch | 18 +- ...t-RSDT-RSD-PTR-in-a-big-endian-world.patch | 10 +- 0021-Support-XSDT-in-a-big-endian-world.patch | 10 +- 0022-Support-SRAT-in-a-big-endian-world.patch | 8 +- 0023-Support-SLIT-in-a-big-endian-world.patch | 14 +- 0024-Support-MSCT-in-a-big-endian-world.patch | 6 +- 0026-Support-NFIT-in-a-big-endian-world.patch | 20 +- 0027-Support-SDEV-in-a-big-endian-world.patch | 38 ++-- 0028-Support-HMAT-in-a-big-endian-world.patch | 30 +-- 0029-Support-PDTT-in-a-big-endian-world.patch | 10 +- 0030-Support-PPTT-in-a-big-endian-world.patch | 28 +-- 0031-Support-PCCT-in-a-big-endian-world.patch | 12 +- 0032-Support-WDAT-in-a-big-endian-world.patch | 10 +- 0033-Support-TCPA-in-a-big-endian-world.patch | 20 +- 0034-Support-STAO-in-a-big-endian-world.patch | 10 +- ...-SLIC-and-MSDM-in-a-big-endian-world.patch | 6 +- 0038-Support-PMTT-in-a-big-endian-world.patch | 18 +- 0039-Support-TPM2-in-a-big-endian-world.patch | 32 ++-- 0040-Support-S3PT-in-a-big-endian-world.patch | 26 +-- ...port-DSDT-SSDT-in-a-big-endian-world.patch | 176 +++++++++--------- ...T-fixed-use-of-optional-ResourceInfo.patch | 22 +-- 0046-Support-PHAT-in-a-big-endian-world.patch | 30 +-- acpica-tools.spec | 21 ++- armv7-str-fixes.patch | 8 +- badcode.asl.result | 4 +- facp.patch | 28 --- grammar.asl.result | 125 +++++++------ ull-32bit.patch | 8 +- 40 files changed, 498 insertions(+), 502 deletions(-) delete mode 100644 facp.patch diff --git a/0002-Modify-utility-functions-to-be-endian-agnostic.patch b/0002-Modify-utility-functions-to-be-endian-agnostic.patch index ff08d2e..8c06f05 100644 --- a/0002-Modify-utility-functions-to-be-endian-agnostic.patch +++ b/0002-Modify-utility-functions-to-be-endian-agnostic.patch @@ -24,10 +24,10 @@ Signed-off-by: Al Stone source/components/tables/tbprint.c | 13 +++++++++---- 5 files changed, 26 insertions(+), 17 deletions(-) -Index: acpica-unix2-20210730/source/common/acfileio.c +Index: acpica-unix2-20211217/source/common/acfileio.c =================================================================== ---- acpica-unix2-20210730.orig/source/common/acfileio.c -+++ acpica-unix2-20210730/source/common/acfileio.c +--- acpica-unix2-20211217.orig/source/common/acfileio.c ++++ acpica-unix2-20211217/source/common/acfileio.c @@ -280,6 +280,7 @@ AcGetOneTableFromFile ( ACPI_TABLE_HEADER *Table; INT32 Count; @@ -79,7 +79,7 @@ Index: acpica-unix2-20210730/source/common/acfileio.c ACPI_FUNCTION_TRACE (AcValidateTableHeader); -@@ -467,11 +470,12 @@ AcValidateTableHeader ( +@@ -472,11 +475,12 @@ AcValidateTableHeader ( /* Validate table length against bytes remaining in the file */ FileSize = CmGetFileSize (File); @@ -94,11 +94,11 @@ Index: acpica-unix2-20210730/source/common/acfileio.c (UINT32) (FileSize - TableOffset)); return (AE_BAD_HEADER); } -Index: acpica-unix2-20210730/source/common/dmtable.c +Index: acpica-unix2-20211217/source/common/dmtable.c =================================================================== ---- acpica-unix2-20210730.orig/source/common/dmtable.c -+++ acpica-unix2-20210730/source/common/dmtable.c -@@ -641,7 +641,7 @@ AcpiDmDumpDataTable ( +--- acpica-unix2-20211217.orig/source/common/dmtable.c ++++ acpica-unix2-20211217/source/common/dmtable.c +@@ -710,7 +710,7 @@ AcpiDmDumpDataTable ( { /* Dump the raw table data */ @@ -107,7 +107,7 @@ Index: acpica-unix2-20210730/source/common/dmtable.c AcpiOsPrintf ("\n/*\n%s: Length %d (0x%X)\n\n", ACPI_RAW_TABLE_DATA_HEADER, Length, Length); -@@ -658,7 +658,7 @@ AcpiDmDumpDataTable ( +@@ -727,7 +727,7 @@ AcpiDmDumpDataTable ( */ if (ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_FACS)) { @@ -116,7 +116,7 @@ Index: acpica-unix2-20210730/source/common/dmtable.c Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoFacs); if (ACPI_FAILURE (Status)) { -@@ -678,7 +678,7 @@ AcpiDmDumpDataTable ( +@@ -748,7 +748,7 @@ AcpiDmDumpDataTable ( /* * All other tables must use the common ACPI table header, dump it now */ @@ -125,7 +125,7 @@ Index: acpica-unix2-20210730/source/common/dmtable.c Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoHeader); if (ACPI_FAILURE (Status)) { -@@ -1324,7 +1324,7 @@ AcpiDmDumpTable ( +@@ -1407,7 +1407,7 @@ AcpiDmDumpTable ( AcpiOsPrintf ("%2.2X", *Target); Temp8 = AcpiDmGenerateChecksum (Table, @@ -134,10 +134,10 @@ Index: acpica-unix2-20210730/source/common/dmtable.c ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Checksum); if (Temp8 != ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Checksum) -Index: acpica-unix2-20210730/source/compiler/dtfield.c +Index: acpica-unix2-20211217/source/compiler/dtfield.c =================================================================== ---- acpica-unix2-20210730.orig/source/compiler/dtfield.c -+++ acpica-unix2-20210730/source/compiler/dtfield.c +--- acpica-unix2-20211217.orig/source/compiler/dtfield.c ++++ acpica-unix2-20211217/source/compiler/dtfield.c @@ -361,7 +361,7 @@ DtCompileInteger ( DtError (ASL_ERROR, ASL_MSG_INTEGER_SIZE, Field, AslGbl_MsgBuffer); } @@ -147,10 +147,10 @@ Index: acpica-unix2-20210730/source/compiler/dtfield.c return; } -Index: acpica-unix2-20210730/source/compiler/dtsubtable.c +Index: acpica-unix2-20211217/source/compiler/dtsubtable.c =================================================================== ---- acpica-unix2-20210730.orig/source/compiler/dtsubtable.c -+++ acpica-unix2-20210730/source/compiler/dtsubtable.c +--- acpica-unix2-20211217.orig/source/compiler/dtsubtable.c ++++ acpica-unix2-20211217/source/compiler/dtsubtable.c @@ -378,6 +378,6 @@ DtSetSubtableLength ( return; } @@ -160,10 +160,10 @@ Index: acpica-unix2-20210730/source/compiler/dtsubtable.c + AcpiUtWriteUint (Subtable->LengthField, Subtable->SizeOfLengthField, + &Subtable->TotalLength, sizeof (Subtable->TotalLength)); } -Index: acpica-unix2-20210730/source/components/tables/tbprint.c +Index: acpica-unix2-20211217/source/components/tables/tbprint.c =================================================================== ---- acpica-unix2-20210730.orig/source/components/tables/tbprint.c -+++ acpica-unix2-20210730/source/components/tables/tbprint.c +--- acpica-unix2-20211217.orig/source/components/tables/tbprint.c ++++ acpica-unix2-20211217/source/components/tables/tbprint.c @@ -44,6 +44,8 @@ #include "acpi.h" #include "accommon.h" @@ -180,9 +180,9 @@ Index: acpica-unix2-20210730/source/components/tables/tbprint.c - Header->Length)); + AcpiUtReadUint32 (&Header->Length))); } - else if (ACPI_VALIDATE_RSDP_SIG (Header->Signature)) - { -@@ -178,9 +180,12 @@ AcpiTbPrintTableHeader ( + else if (ACPI_VALIDATE_RSDP_SIG (ACPI_CAST_PTR (ACPI_TABLE_RSDP, + Header)->Signature)) +@@ -179,9 +181,12 @@ AcpiTbPrintTableHeader ( "%-4.4s 0x%8.8X%8.8X" " %06X (v%.2d %-6.6s %-8.8s %08X %-4.4s %08X)", LocalHeader.Signature, ACPI_FORMAT_UINT64 (Address), diff --git a/0007-Handle-dumping-Unicode-properly-when-big-endian.patch b/0007-Handle-dumping-Unicode-properly-when-big-endian.patch index 9fe820a..a046fe9 100644 --- a/0007-Handle-dumping-Unicode-properly-when-big-endian.patch +++ b/0007-Handle-dumping-Unicode-properly-when-big-endian.patch @@ -8,11 +8,11 @@ Signed-off-by: Al Stone source/common/dmtbdump.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) -Index: acpica-unix2-20210730/source/common/dmtbdump.c +Index: acpica-unix2-20211217/source/common/dmtbdump.c =================================================================== ---- acpica-unix2-20210730.orig/source/common/dmtbdump.c -+++ acpica-unix2-20210730/source/common/dmtbdump.c -@@ -146,6 +146,8 @@ AcpiDmDumpUnicode ( +--- acpica-unix2-20211217.orig/source/common/dmtbdump.c ++++ acpica-unix2-20211217/source/common/dmtbdump.c +@@ -200,6 +200,8 @@ AcpiDmDumpUnicode ( UINT8 *Buffer; UINT32 Length; UINT32 i; @@ -21,7 +21,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump.c Buffer = ((UINT8 *) Table) + BufferOffset; -@@ -155,7 +157,8 @@ AcpiDmDumpUnicode ( +@@ -209,7 +211,8 @@ AcpiDmDumpUnicode ( for (i = 0; i < Length; i += 2) { @@ -31,7 +31,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump.c { goto DumpRawBuffer; } -@@ -163,7 +166,8 @@ AcpiDmDumpUnicode ( +@@ -217,7 +220,8 @@ AcpiDmDumpUnicode ( /* Ensure all high bytes are zero */ @@ -41,7 +41,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump.c { if (Buffer[i]) { -@@ -176,7 +180,8 @@ AcpiDmDumpUnicode ( +@@ -230,7 +234,8 @@ AcpiDmDumpUnicode ( AcpiOsPrintf ("\""); for (i = 0; i < Length; i += 2) { diff --git a/0009-Support-ASF-tables-in-a-big-endian-world.patch b/0009-Support-ASF-tables-in-a-big-endian-world.patch index 1010c29..a0cdeb7 100644 --- a/0009-Support-ASF-tables-in-a-big-endian-world.patch +++ b/0009-Support-ASF-tables-in-a-big-endian-world.patch @@ -10,11 +10,11 @@ Signed-off-by: Al Stone source/common/dmtbdump1.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) -Index: acpica-unix2-20210730/source/common/dmtbdump1.c +Index: acpica-unix2-20211217/source/common/dmtbdump1.c =================================================================== ---- acpica-unix2-20210730.orig/source/common/dmtbdump1.c -+++ acpica-unix2-20210730/source/common/dmtbdump1.c -@@ -298,16 +298,18 @@ AcpiDmDumpAsf ( +--- acpica-unix2-20211217.orig/source/common/dmtbdump1.c ++++ acpica-unix2-20211217/source/common/dmtbdump1.c +@@ -296,16 +296,18 @@ AcpiDmDumpAsf ( UINT32 DataOffset = 0; UINT32 i; UINT8 Type; @@ -35,7 +35,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c Subtable->Header.Length, AcpiDmTableInfoAsfHdr); if (ACPI_FAILURE (Status)) { -@@ -365,7 +367,7 @@ AcpiDmDumpAsf ( +@@ -363,7 +365,7 @@ AcpiDmDumpAsf ( return; } @@ -44,7 +44,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c Subtable->Header.Length, InfoTable); if (ACPI_FAILURE (Status)) { -@@ -382,7 +384,7 @@ AcpiDmDumpAsf ( +@@ -380,7 +382,7 @@ AcpiDmDumpAsf ( for (i = 0; i < DataCount; i++) { AcpiOsPrintf ("\n"); diff --git a/0010-Support-CPEP-tables-in-a-big-endian-world.patch b/0010-Support-CPEP-tables-in-a-big-endian-world.patch index 9247b9b..a27a312 100644 --- a/0010-Support-CPEP-tables-in-a-big-endian-world.patch +++ b/0010-Support-CPEP-tables-in-a-big-endian-world.patch @@ -8,11 +8,11 @@ Signed-off-by: Al Stone source/common/dmtbdump1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -Index: acpica-unix2-20210730/source/common/dmtbdump1.c +Index: acpica-unix2-20211217/source/common/dmtbdump1.c =================================================================== ---- acpica-unix2-20210730.orig/source/common/dmtbdump1.c -+++ acpica-unix2-20210730/source/common/dmtbdump1.c -@@ -538,7 +538,7 @@ AcpiDmDumpCpep ( +--- acpica-unix2-20211217.orig/source/common/dmtbdump1.c ++++ acpica-unix2-20211217/source/common/dmtbdump1.c +@@ -536,7 +536,7 @@ AcpiDmDumpCpep ( { ACPI_STATUS Status; ACPI_CPEP_POLLING *Subtable; @@ -21,7 +21,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c UINT32 Offset = sizeof (ACPI_TABLE_CPEP); -@@ -553,7 +553,7 @@ AcpiDmDumpCpep ( +@@ -551,7 +551,7 @@ AcpiDmDumpCpep ( /* Subtables */ Subtable = ACPI_ADD_PTR (ACPI_CPEP_POLLING, Table, Offset); diff --git a/0011-Support-DBG2-table-in-a-big-endian-world.patch b/0011-Support-DBG2-table-in-a-big-endian-world.patch index 7c22228..5a2c9dd 100644 --- a/0011-Support-DBG2-table-in-a-big-endian-world.patch +++ b/0011-Support-DBG2-table-in-a-big-endian-world.patch @@ -9,11 +9,11 @@ Signed-off-by: Al Stone source/compiler/dttable1.c | 43 ++++++++++++++++++++++++-------------- 2 files changed, 48 insertions(+), 32 deletions(-) -Index: acpica-unix2-20210730/source/common/dmtbdump1.c +Index: acpica-unix2-20211217/source/common/dmtbdump1.c =================================================================== ---- acpica-unix2-20210730.orig/source/common/dmtbdump1.c -+++ acpica-unix2-20210730/source/common/dmtbdump1.c -@@ -593,7 +593,7 @@ AcpiDmDumpCsrt ( +--- acpica-unix2-20211217.orig/source/common/dmtbdump1.c ++++ acpica-unix2-20211217/source/common/dmtbdump1.c +@@ -591,7 +591,7 @@ AcpiDmDumpCsrt ( ACPI_CSRT_GROUP *Subtable; ACPI_CSRT_SHARED_INFO *SharedInfoTable; ACPI_CSRT_DESCRIPTOR *SubSubtable; @@ -22,7 +22,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c UINT32 Offset = sizeof (ACPI_TABLE_CSRT); UINT32 SubOffset; UINT32 SubSubOffset; -@@ -605,7 +605,7 @@ AcpiDmDumpCsrt ( +@@ -603,7 +603,7 @@ AcpiDmDumpCsrt ( /* Subtables (Resource Groups) */ Subtable = ACPI_ADD_PTR (ACPI_CSRT_GROUP, Table, Offset); @@ -31,7 +31,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c { /* Resource group subtable */ -@@ -639,7 +639,7 @@ AcpiDmDumpCsrt ( +@@ -637,7 +637,7 @@ AcpiDmDumpCsrt ( Offset + SubOffset); while ((SubOffset < Subtable->Length) && @@ -40,7 +40,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c { AcpiOsPrintf ("\n"); Status = AcpiDmDumpTable (Length, Offset + SubOffset, SubSubtable, -@@ -700,12 +700,13 @@ AcpiDmDumpDbg2 ( +@@ -698,12 +698,13 @@ AcpiDmDumpDbg2 ( { ACPI_STATUS Status; ACPI_DBG2_DEVICE *Subtable; @@ -55,7 +55,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c /* Main table */ -@@ -719,11 +720,12 @@ AcpiDmDumpDbg2 ( +@@ -717,11 +718,12 @@ AcpiDmDumpDbg2 ( /* Subtables */ Subtable = ACPI_ADD_PTR (ACPI_DBG2_DEVICE, Table, Offset); @@ -70,7 +70,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c if (ACPI_FAILURE (Status)) { return; -@@ -733,13 +735,13 @@ AcpiDmDumpDbg2 ( +@@ -731,13 +733,13 @@ AcpiDmDumpDbg2 ( for (i = 0; i < Subtable->RegisterCount; i++) { @@ -86,7 +86,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c if (ACPI_FAILURE (Status)) { return; -@@ -750,13 +752,13 @@ AcpiDmDumpDbg2 ( +@@ -748,13 +750,13 @@ AcpiDmDumpDbg2 ( for (i = 0; i < Subtable->RegisterCount; i++) { @@ -102,7 +102,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c if (ACPI_FAILURE (Status)) { return; -@@ -766,12 +768,12 @@ AcpiDmDumpDbg2 ( +@@ -764,12 +766,12 @@ AcpiDmDumpDbg2 ( /* Dump the Namestring (required) */ AcpiOsPrintf ("\n"); @@ -117,7 +117,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c if (ACPI_FAILURE (Status)) { return; -@@ -781,8 +783,11 @@ AcpiDmDumpDbg2 ( +@@ -779,8 +781,11 @@ AcpiDmDumpDbg2 ( if (Subtable->OemDataOffset) { @@ -131,7 +131,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c AcpiDmTableInfoDbg2OemData); if (ACPI_FAILURE (Status)) { -@@ -792,9 +797,9 @@ AcpiDmDumpDbg2 ( +@@ -790,9 +795,9 @@ AcpiDmDumpDbg2 ( /* Point to next subtable */ @@ -143,10 +143,10 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c } } -Index: acpica-unix2-20210730/source/compiler/dttable1.c +Index: acpica-unix2-20211217/source/compiler/dttable1.c =================================================================== ---- acpica-unix2-20210730.orig/source/compiler/dttable1.c -+++ acpica-unix2-20210730/source/compiler/dttable1.c +--- acpica-unix2-20211217.orig/source/compiler/dttable1.c ++++ acpica-unix2-20211217/source/compiler/dttable1.c @@ -572,6 +572,7 @@ DtCompileCsrt ( DT_FIELD **PFieldList = (DT_FIELD **) List; UINT32 DescriptorCount; diff --git a/0012-Support-DMAR-in-a-big-endian-world.patch b/0012-Support-DMAR-in-a-big-endian-world.patch index f083ef8..895f65f 100644 --- a/0012-Support-DMAR-in-a-big-endian-world.patch +++ b/0012-Support-DMAR-in-a-big-endian-world.patch @@ -10,11 +10,11 @@ Signed-off-by: Al Stone source/compiler/dttable1.c | 12 +++++++----- 3 files changed, 24 insertions(+), 18 deletions(-) -Index: acpica-unix2-20210730/source/common/dmtable.c +Index: acpica-unix2-20211217/source/common/dmtable.c =================================================================== ---- acpica-unix2-20210730.orig/source/common/dmtable.c -+++ acpica-unix2-20210730/source/common/dmtable.c -@@ -1487,13 +1487,13 @@ AcpiDmDumpTable ( +--- acpica-unix2-20211217.orig/source/common/dmtable.c ++++ acpica-unix2-20211217/source/common/dmtable.c +@@ -1570,13 +1570,13 @@ AcpiDmDumpTable ( /* DMAR subtable types */ @@ -30,11 +30,11 @@ Index: acpica-unix2-20210730/source/common/dmtable.c AcpiDmDmarSubnames[Temp16]); break; -Index: acpica-unix2-20210730/source/common/dmtbdump1.c +Index: acpica-unix2-20211217/source/common/dmtbdump1.c =================================================================== ---- acpica-unix2-20210730.orig/source/common/dmtbdump1.c -+++ acpica-unix2-20210730/source/common/dmtbdump1.c -@@ -823,13 +823,15 @@ AcpiDmDumpDmar ( +--- acpica-unix2-20211217.orig/source/common/dmtbdump1.c ++++ acpica-unix2-20211217/source/common/dmtbdump1.c +@@ -821,13 +821,15 @@ AcpiDmDumpDmar ( { ACPI_STATUS Status; ACPI_DMAR_HEADER *Subtable; @@ -51,7 +51,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c /* Main table */ -@@ -843,13 +845,14 @@ AcpiDmDumpDmar ( +@@ -841,13 +843,14 @@ AcpiDmDumpDmar ( /* Subtables */ Subtable = ACPI_ADD_PTR (ACPI_DMAR_HEADER, Table, Offset); @@ -68,7 +68,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c if (ACPI_FAILURE (Status)) { return; -@@ -857,7 +860,8 @@ AcpiDmDumpDmar ( +@@ -855,7 +858,8 @@ AcpiDmDumpDmar ( AcpiOsPrintf ("\n"); @@ -78,7 +78,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c { case ACPI_DMAR_TYPE_HARDWARE_UNIT: -@@ -892,12 +896,12 @@ AcpiDmDumpDmar ( +@@ -890,12 +894,12 @@ AcpiDmDumpDmar ( default: AcpiOsPrintf ("\n**** Unknown DMAR subtable type 0x%X\n\n", @@ -93,7 +93,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c if (ACPI_FAILURE (Status)) { return; -@@ -906,8 +910,8 @@ AcpiDmDumpDmar ( +@@ -904,8 +908,8 @@ AcpiDmDumpDmar ( /* * Dump the optional device scope entries */ @@ -104,7 +104,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c { /* These types do not support device scopes */ -@@ -915,7 +919,7 @@ AcpiDmDumpDmar ( +@@ -913,7 +917,7 @@ AcpiDmDumpDmar ( } ScopeTable = ACPI_ADD_PTR (ACPI_DMAR_DEVICE_SCOPE, Subtable, ScopeOffset); @@ -113,7 +113,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c { AcpiOsPrintf ("\n"); Status = AcpiDmDumpTable (Length, Offset + ScopeOffset, ScopeTable, -@@ -956,9 +960,9 @@ AcpiDmDumpDmar ( +@@ -954,9 +958,9 @@ AcpiDmDumpDmar ( NextSubtable: /* Point to next subtable */ @@ -125,10 +125,10 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c } } -Index: acpica-unix2-20210730/source/compiler/dttable1.c +Index: acpica-unix2-20211217/source/compiler/dttable1.c =================================================================== ---- acpica-unix2-20210730.orig/source/compiler/dttable1.c -+++ acpica-unix2-20210730/source/compiler/dttable1.c +--- acpica-unix2-20211217.orig/source/compiler/dttable1.c ++++ acpica-unix2-20211217/source/compiler/dttable1.c @@ -851,6 +851,7 @@ DtCompileDmar ( ACPI_DMAR_DEVICE_SCOPE *DmarDeviceScope; UINT32 DeviceScopeLength; diff --git a/0013-Support-DRTM-in-a-big-endian-world.patch b/0013-Support-DRTM-in-a-big-endian-world.patch index e7bdcd8..02fa91e 100644 --- a/0013-Support-DRTM-in-a-big-endian-world.patch +++ b/0013-Support-DRTM-in-a-big-endian-world.patch @@ -9,11 +9,11 @@ Signed-off-by: Al Stone source/compiler/dttable1.c | 6 ++++-- 2 files changed, 19 insertions(+), 12 deletions(-) -Index: acpica-unix2-20210730/source/common/dmtbdump1.c +Index: acpica-unix2-20211217/source/common/dmtbdump1.c =================================================================== ---- acpica-unix2-20210730.orig/source/common/dmtbdump1.c -+++ acpica-unix2-20210730/source/common/dmtbdump1.c -@@ -989,11 +989,14 @@ AcpiDmDumpDrtm ( +--- acpica-unix2-20211217.orig/source/common/dmtbdump1.c ++++ acpica-unix2-20211217/source/common/dmtbdump1.c +@@ -987,11 +987,14 @@ AcpiDmDumpDrtm ( ACPI_DRTM_RESOURCE_LIST *DrtmRl; ACPI_DRTM_DPS_ID *DrtmDps; UINT32 Count; @@ -29,7 +29,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c AcpiDmTableInfoDrtm); if (ACPI_FAILURE (Status)) { -@@ -1008,7 +1011,7 @@ AcpiDmDumpDrtm ( +@@ -1006,7 +1009,7 @@ AcpiDmDumpDrtm ( DrtmVtl = ACPI_ADD_PTR (ACPI_DRTM_VTABLE_LIST, Table, Offset); AcpiOsPrintf ("\n"); @@ -38,7 +38,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c DrtmVtl, ACPI_OFFSET (ACPI_DRTM_VTABLE_LIST, ValidatedTables), AcpiDmTableInfoDrtm0); if (ACPI_FAILURE (Status)) -@@ -1021,10 +1024,11 @@ AcpiDmDumpDrtm ( +@@ -1019,10 +1022,11 @@ AcpiDmDumpDrtm ( /* Dump Validated table addresses */ Count = 0; @@ -53,7 +53,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c ACPI_ADD_PTR (void, Table, Offset), sizeof (UINT64), AcpiDmTableInfoDrtm0a); if (ACPI_FAILURE (Status)) -@@ -1040,7 +1044,7 @@ AcpiDmDumpDrtm ( +@@ -1038,7 +1042,7 @@ AcpiDmDumpDrtm ( DrtmRl = ACPI_ADD_PTR (ACPI_DRTM_RESOURCE_LIST, Table, Offset); AcpiOsPrintf ("\n"); @@ -62,7 +62,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c DrtmRl, ACPI_OFFSET (ACPI_DRTM_RESOURCE_LIST, Resources), AcpiDmTableInfoDrtm1); if (ACPI_FAILURE (Status)) -@@ -1053,10 +1057,11 @@ AcpiDmDumpDrtm ( +@@ -1051,10 +1055,11 @@ AcpiDmDumpDrtm ( /* Dump the Resource List */ Count = 0; @@ -77,7 +77,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c ACPI_ADD_PTR (void, Table, Offset), sizeof (ACPI_DRTM_RESOURCE), AcpiDmTableInfoDrtm1a); if (ACPI_FAILURE (Status)) -@@ -1072,7 +1077,7 @@ AcpiDmDumpDrtm ( +@@ -1070,7 +1075,7 @@ AcpiDmDumpDrtm ( DrtmDps = ACPI_ADD_PTR (ACPI_DRTM_DPS_ID, Table, Offset); AcpiOsPrintf ("\n"); @@ -86,10 +86,10 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c DrtmDps, sizeof (ACPI_DRTM_DPS_ID), AcpiDmTableInfoDrtm2); } -Index: acpica-unix2-20210730/source/compiler/dttable1.c +Index: acpica-unix2-20211217/source/compiler/dttable1.c =================================================================== ---- acpica-unix2-20210730.orig/source/compiler/dttable1.c -+++ acpica-unix2-20210730/source/compiler/dttable1.c +--- acpica-unix2-20211217.orig/source/compiler/dttable1.c ++++ acpica-unix2-20211217/source/compiler/dttable1.c @@ -1066,7 +1066,8 @@ DtCompileDrtm ( Count++; } diff --git a/0014-Support-EINJ-in-a-big-endian-world.patch b/0014-Support-EINJ-in-a-big-endian-world.patch index 157cce7..5e360a1 100644 --- a/0014-Support-EINJ-in-a-big-endian-world.patch +++ b/0014-Support-EINJ-in-a-big-endian-world.patch @@ -8,11 +8,11 @@ Signed-off-by: Al Stone source/common/dmtbdump1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -Index: acpica-unix2-20210730/source/common/dmtbdump1.c +Index: acpica-unix2-20211217/source/common/dmtbdump1.c =================================================================== ---- acpica-unix2-20210730.orig/source/common/dmtbdump1.c -+++ acpica-unix2-20210730/source/common/dmtbdump1.c -@@ -1101,7 +1101,7 @@ AcpiDmDumpEinj ( +--- acpica-unix2-20211217.orig/source/common/dmtbdump1.c ++++ acpica-unix2-20211217/source/common/dmtbdump1.c +@@ -1099,7 +1099,7 @@ AcpiDmDumpEinj ( { ACPI_STATUS Status; ACPI_WHEA_HEADER *Subtable; @@ -21,7 +21,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c UINT32 Offset = sizeof (ACPI_TABLE_EINJ); -@@ -1116,7 +1116,7 @@ AcpiDmDumpEinj ( +@@ -1114,7 +1114,7 @@ AcpiDmDumpEinj ( /* Subtables */ Subtable = ACPI_ADD_PTR (ACPI_WHEA_HEADER, Table, Offset); diff --git a/0015-Support-ERST-in-a-big-endian-world.patch b/0015-Support-ERST-in-a-big-endian-world.patch index 3e19334..db9cade 100644 --- a/0015-Support-ERST-in-a-big-endian-world.patch +++ b/0015-Support-ERST-in-a-big-endian-world.patch @@ -8,11 +8,11 @@ Signed-off-by: Al Stone source/common/dmtbdump1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -Index: acpica-unix2-20210730/source/common/dmtbdump1.c +Index: acpica-unix2-20211217/source/common/dmtbdump1.c =================================================================== ---- acpica-unix2-20210730.orig/source/common/dmtbdump1.c -+++ acpica-unix2-20210730/source/common/dmtbdump1.c -@@ -1154,7 +1154,7 @@ AcpiDmDumpErst ( +--- acpica-unix2-20211217.orig/source/common/dmtbdump1.c ++++ acpica-unix2-20211217/source/common/dmtbdump1.c +@@ -1152,7 +1152,7 @@ AcpiDmDumpErst ( { ACPI_STATUS Status; ACPI_WHEA_HEADER *Subtable; @@ -21,7 +21,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c UINT32 Offset = sizeof (ACPI_TABLE_ERST); -@@ -1169,7 +1169,7 @@ AcpiDmDumpErst ( +@@ -1167,7 +1167,7 @@ AcpiDmDumpErst ( /* Subtables */ Subtable = ACPI_ADD_PTR (ACPI_WHEA_HEADER, Table, Offset); diff --git a/0016-Support-FADT-aka-FACP-in-a-big-endian-world.patch b/0016-Support-FADT-aka-FACP-in-a-big-endian-world.patch index 9aa875f..f74a041 100644 --- a/0016-Support-FADT-aka-FACP-in-a-big-endian-world.patch +++ b/0016-Support-FADT-aka-FACP-in-a-big-endian-world.patch @@ -9,11 +9,11 @@ Signed-off-by: Al Stone source/components/tables/tbfadt.c | 34 +++++++++++++++++++++++-------- 2 files changed, 38 insertions(+), 21 deletions(-) -Index: acpica-unix2-20210730/source/common/dmtbdump.c +Index: acpica-unix2-20211217/source/common/dmtbdump.c =================================================================== ---- acpica-unix2-20210730.orig/source/common/dmtbdump.c -+++ acpica-unix2-20210730/source/common/dmtbdump.c -@@ -363,11 +363,12 @@ AcpiDmDumpFadt ( +--- acpica-unix2-20211217.orig/source/common/dmtbdump.c ++++ acpica-unix2-20211217/source/common/dmtbdump.c +@@ -417,11 +417,12 @@ AcpiDmDumpFadt ( ACPI_TABLE_HEADER *Table) { ACPI_STATUS Status; @@ -27,7 +27,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump.c AcpiDmTableInfoFadt1); if (ACPI_FAILURE (Status)) { -@@ -376,10 +377,10 @@ AcpiDmDumpFadt ( +@@ -430,10 +431,10 @@ AcpiDmDumpFadt ( /* Check for FADT revision 2 fields (ACPI 1.0B MS extensions) */ @@ -41,7 +41,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump.c AcpiDmTableInfoFadt2); if (ACPI_FAILURE (Status)) { -@@ -389,9 +390,9 @@ AcpiDmDumpFadt ( +@@ -443,9 +444,9 @@ AcpiDmDumpFadt ( /* Check for FADT revision 3/4 fields and up (ACPI 2.0+ extended data) */ @@ -53,7 +53,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump.c AcpiDmTableInfoFadt3); if (ACPI_FAILURE (Status)) { -@@ -400,9 +401,9 @@ AcpiDmDumpFadt ( +@@ -454,9 +455,9 @@ AcpiDmDumpFadt ( /* Check for FADT revision 5 fields and up (ACPI 5.0+) */ @@ -65,7 +65,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump.c AcpiDmTableInfoFadt5); if (ACPI_FAILURE (Status)) { -@@ -412,9 +413,9 @@ AcpiDmDumpFadt ( +@@ -466,9 +467,9 @@ AcpiDmDumpFadt ( /* Check for FADT revision 6 fields and up (ACPI 6.0+) */ @@ -77,7 +77,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump.c AcpiDmTableInfoFadt6); if (ACPI_FAILURE (Status)) { -@@ -425,11 +426,11 @@ AcpiDmDumpFadt ( +@@ -479,11 +480,11 @@ AcpiDmDumpFadt ( /* Validate various fields in the FADT, including length */ @@ -91,10 +91,10 @@ Index: acpica-unix2-20210730/source/common/dmtbdump.c } -Index: acpica-unix2-20210730/source/components/tables/tbfadt.c +Index: acpica-unix2-20211217/source/components/tables/tbfadt.c =================================================================== ---- acpica-unix2-20210730.orig/source/components/tables/tbfadt.c -+++ acpica-unix2-20210730/source/components/tables/tbfadt.c +--- acpica-unix2-20211217.orig/source/components/tables/tbfadt.c ++++ acpica-unix2-20211217/source/components/tables/tbfadt.c @@ -289,7 +289,6 @@ AcpiTbSelectAddress ( UINT32 Address32, UINT64 Address64) diff --git a/0017-Support-most-FPDTs-in-a-big-endian-world.patch b/0017-Support-most-FPDTs-in-a-big-endian-world.patch index bd43520..058f86a 100644 --- a/0017-Support-most-FPDTs-in-a-big-endian-world.patch +++ b/0017-Support-most-FPDTs-in-a-big-endian-world.patch @@ -12,11 +12,11 @@ Signed-off-by: Al Stone source/compiler/dttable1.c | 4 +++- 2 files changed, 10 insertions(+), 6 deletions(-) -Index: acpica-unix2-20210730/source/common/dmtbdump1.c +Index: acpica-unix2-20211217/source/common/dmtbdump1.c =================================================================== ---- acpica-unix2-20210730.orig/source/common/dmtbdump1.c -+++ acpica-unix2-20210730/source/common/dmtbdump1.c -@@ -1207,9 +1207,10 @@ AcpiDmDumpFpdt ( +--- acpica-unix2-20211217.orig/source/common/dmtbdump1.c ++++ acpica-unix2-20211217/source/common/dmtbdump1.c +@@ -1205,9 +1205,10 @@ AcpiDmDumpFpdt ( { ACPI_STATUS Status; ACPI_FPDT_HEADER *Subtable; @@ -28,7 +28,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c /* There is no main table (other than the standard ACPI header) */ -@@ -1217,19 +1218,20 @@ AcpiDmDumpFpdt ( +@@ -1215,19 +1216,20 @@ AcpiDmDumpFpdt ( /* Subtables */ Subtable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, Table, Offset); @@ -52,7 +52,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c { case ACPI_FPDT_TYPE_BOOT: -@@ -1256,7 +1258,7 @@ AcpiDmDumpFpdt ( +@@ -1254,7 +1256,7 @@ AcpiDmDumpFpdt ( goto NextSubtable; } @@ -61,10 +61,10 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c Subtable->Length, InfoTable); if (ACPI_FAILURE (Status)) { -Index: acpica-unix2-20210730/source/compiler/dttable1.c +Index: acpica-unix2-20211217/source/compiler/dttable1.c =================================================================== ---- acpica-unix2-20210730.orig/source/compiler/dttable1.c -+++ acpica-unix2-20210730/source/compiler/dttable1.c +--- acpica-unix2-20211217.orig/source/compiler/dttable1.c ++++ acpica-unix2-20211217/source/compiler/dttable1.c @@ -1342,6 +1342,7 @@ DtCompileFpdt ( ACPI_DMTABLE_INFO *InfoTable; DT_FIELD **PFieldList = (DT_FIELD **) List; diff --git a/0018-Support-GTDT-in-a-big-endian-world.patch b/0018-Support-GTDT-in-a-big-endian-world.patch index 8017791..fdfcd8d 100644 --- a/0018-Support-GTDT-in-a-big-endian-world.patch +++ b/0018-Support-GTDT-in-a-big-endian-world.patch @@ -9,11 +9,11 @@ Signed-off-by: Al Stone source/compiler/dttable1.c | 9 +++++++-- 2 files changed, 16 insertions(+), 6 deletions(-) -Index: acpica-unix2-20210730/source/common/dmtbdump1.c +Index: acpica-unix2-20211217/source/common/dmtbdump1.c =================================================================== ---- acpica-unix2-20210730.orig/source/common/dmtbdump1.c -+++ acpica-unix2-20210730/source/common/dmtbdump1.c -@@ -1294,7 +1294,7 @@ AcpiDmDumpGtdt ( +--- acpica-unix2-20211217.orig/source/common/dmtbdump1.c ++++ acpica-unix2-20211217/source/common/dmtbdump1.c +@@ -1292,7 +1292,7 @@ AcpiDmDumpGtdt ( { ACPI_STATUS Status; ACPI_GTDT_HEADER *Subtable; @@ -22,7 +22,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c UINT32 Offset = sizeof (ACPI_TABLE_GTDT); ACPI_DMTABLE_INFO *InfoTable; UINT32 SubtableLength; -@@ -1330,7 +1330,7 @@ AcpiDmDumpGtdt ( +@@ -1328,7 +1328,7 @@ AcpiDmDumpGtdt ( /* Subtables */ @@ -31,7 +31,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c { /* Common subtable header */ -@@ -1348,8 +1348,13 @@ AcpiDmDumpGtdt ( +@@ -1346,8 +1346,13 @@ AcpiDmDumpGtdt ( case ACPI_GTDT_TYPE_TIMER_BLOCK: SubtableLength = sizeof (ACPI_GTDT_TIMER_BLOCK); @@ -47,10 +47,10 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c InfoTable = AcpiDmTableInfoGtdt0; break; -Index: acpica-unix2-20210730/source/compiler/dttable1.c +Index: acpica-unix2-20211217/source/compiler/dttable1.c =================================================================== ---- acpica-unix2-20210730.orig/source/compiler/dttable1.c -+++ acpica-unix2-20210730/source/compiler/dttable1.c +--- acpica-unix2-20211217.orig/source/compiler/dttable1.c ++++ acpica-unix2-20211217/source/compiler/dttable1.c @@ -1288,8 +1288,13 @@ DtCompileGtdt ( DtPushSubtable (Subtable); ParentTable = DtPeekSubtable (); diff --git a/0019-Support-HEST-in-a-big-endian-world.patch b/0019-Support-HEST-in-a-big-endian-world.patch index 8fcc14c..611e052 100644 --- a/0019-Support-HEST-in-a-big-endian-world.patch +++ b/0019-Support-HEST-in-a-big-endian-world.patch @@ -9,11 +9,11 @@ Signed-off-by: Al Stone source/compiler/dttable1.c | 4 +++- 2 files changed, 9 insertions(+), 5 deletions(-) -Index: acpica-unix2-20210730/source/common/dmtbdump1.c +Index: acpica-unix2-20211217/source/common/dmtbdump1.c =================================================================== ---- acpica-unix2-20210730.orig/source/common/dmtbdump1.c -+++ acpica-unix2-20210730/source/common/dmtbdump1.c -@@ -1435,12 +1435,13 @@ AcpiDmDumpHest ( +--- acpica-unix2-20211217.orig/source/common/dmtbdump1.c ++++ acpica-unix2-20211217/source/common/dmtbdump1.c +@@ -1433,12 +1433,13 @@ AcpiDmDumpHest ( { ACPI_STATUS Status; ACPI_HEST_HEADER *Subtable; @@ -28,7 +28,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c /* Main table */ -@@ -1454,10 +1455,11 @@ AcpiDmDumpHest ( +@@ -1452,10 +1453,11 @@ AcpiDmDumpHest ( /* Subtables */ Subtable = ACPI_ADD_PTR (ACPI_HEST_HEADER, Table, Offset); @@ -42,7 +42,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c { case ACPI_HEST_TYPE_IA32_CHECK: -@@ -1524,7 +1526,7 @@ AcpiDmDumpHest ( +@@ -1522,7 +1524,7 @@ AcpiDmDumpHest ( /* Cannot continue on unknown type - no length */ AcpiOsPrintf ("\n**** Unknown HEST subtable type 0x%X\n", @@ -51,10 +51,10 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c return; } -Index: acpica-unix2-20210730/source/compiler/dttable1.c +Index: acpica-unix2-20211217/source/compiler/dttable1.c =================================================================== ---- acpica-unix2-20210730.orig/source/compiler/dttable1.c -+++ acpica-unix2-20210730/source/compiler/dttable1.c +--- acpica-unix2-20211217.orig/source/compiler/dttable1.c ++++ acpica-unix2-20211217/source/compiler/dttable1.c @@ -1424,6 +1424,7 @@ DtCompileHest ( DT_FIELD *SubtableStart; ACPI_DMTABLE_INFO *InfoTable; diff --git a/0020-Support-RSDT-RSD-PTR-in-a-big-endian-world.patch b/0020-Support-RSDT-RSD-PTR-in-a-big-endian-world.patch index b6f1812..0df5881 100644 --- a/0020-Support-RSDT-RSD-PTR-in-a-big-endian-world.patch +++ b/0020-Support-RSDT-RSD-PTR-in-a-big-endian-world.patch @@ -8,11 +8,11 @@ Signed-off-by: Al Stone source/common/dmtbdump.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -Index: acpica-unix2-20210730/source/common/dmtbdump.c +Index: acpica-unix2-20211217/source/common/dmtbdump.c =================================================================== ---- acpica-unix2-20210730.orig/source/common/dmtbdump.c -+++ acpica-unix2-20210730/source/common/dmtbdump.c -@@ -282,6 +282,7 @@ AcpiDmDumpRsdt ( +--- acpica-unix2-20211217.orig/source/common/dmtbdump.c ++++ acpica-unix2-20211217/source/common/dmtbdump.c +@@ -336,6 +336,7 @@ AcpiDmDumpRsdt ( UINT32 Entries; UINT32 Offset; UINT32 i; @@ -20,7 +20,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump.c /* Point to start of table pointer array */ -@@ -291,12 +292,12 @@ AcpiDmDumpRsdt ( +@@ -345,12 +346,12 @@ AcpiDmDumpRsdt ( /* RSDT uses 32-bit pointers */ diff --git a/0021-Support-XSDT-in-a-big-endian-world.patch b/0021-Support-XSDT-in-a-big-endian-world.patch index d3bd2b7..40639d6 100644 --- a/0021-Support-XSDT-in-a-big-endian-world.patch +++ b/0021-Support-XSDT-in-a-big-endian-world.patch @@ -8,11 +8,11 @@ Signed-off-by: Al Stone source/common/dmtbdump.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -Index: acpica-unix2-20210730/source/common/dmtbdump.c +Index: acpica-unix2-20211217/source/common/dmtbdump.c =================================================================== ---- acpica-unix2-20210730.orig/source/common/dmtbdump.c -+++ acpica-unix2-20210730/source/common/dmtbdump.c -@@ -323,6 +323,7 @@ AcpiDmDumpXsdt ( +--- acpica-unix2-20211217.orig/source/common/dmtbdump.c ++++ acpica-unix2-20211217/source/common/dmtbdump.c +@@ -377,6 +377,7 @@ AcpiDmDumpXsdt ( UINT32 Entries; UINT32 Offset; UINT32 i; @@ -20,7 +20,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump.c /* Point to start of table pointer array */ -@@ -332,12 +333,13 @@ AcpiDmDumpXsdt ( +@@ -386,12 +387,13 @@ AcpiDmDumpXsdt ( /* XSDT uses 64-bit pointers */ diff --git a/0022-Support-SRAT-in-a-big-endian-world.patch b/0022-Support-SRAT-in-a-big-endian-world.patch index 123d2db..896efe9 100644 --- a/0022-Support-SRAT-in-a-big-endian-world.patch +++ b/0022-Support-SRAT-in-a-big-endian-world.patch @@ -8,10 +8,10 @@ Signed-off-by: Al Stone source/common/dmtbdump3.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) -Index: acpica-unix2-20210730/source/common/dmtbdump3.c +Index: acpica-unix2-20211217/source/common/dmtbdump3.c =================================================================== ---- acpica-unix2-20210730.orig/source/common/dmtbdump3.c -+++ acpica-unix2-20210730/source/common/dmtbdump3.c +--- acpica-unix2-20211217.orig/source/common/dmtbdump3.c ++++ acpica-unix2-20211217/source/common/dmtbdump3.c @@ -173,11 +173,12 @@ AcpiDmDumpSrat ( UINT32 Offset = sizeof (ACPI_TABLE_SRAT); ACPI_SUBTABLE_HEADER *Subtable; @@ -41,7 +41,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump3.c Subtable->Length, AcpiDmTableInfoSratHdr); if (ACPI_FAILURE (Status)) { -@@ -245,7 +246,7 @@ AcpiDmDumpSrat ( +@@ -250,7 +251,7 @@ AcpiDmDumpSrat ( } AcpiOsPrintf ("\n"); diff --git a/0023-Support-SLIT-in-a-big-endian-world.patch b/0023-Support-SLIT-in-a-big-endian-world.patch index 9f56350..c546b1d 100644 --- a/0023-Support-SLIT-in-a-big-endian-world.patch +++ b/0023-Support-SLIT-in-a-big-endian-world.patch @@ -9,10 +9,10 @@ Signed-off-by: Al Stone source/compiler/dttable2.c | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) -Index: acpica-unix2-20210730/source/common/dmtbdump3.c +Index: acpica-unix2-20211217/source/common/dmtbdump3.c =================================================================== ---- acpica-unix2-20210730.orig/source/common/dmtbdump3.c -+++ acpica-unix2-20210730/source/common/dmtbdump3.c +--- acpica-unix2-20211217.orig/source/common/dmtbdump3.c ++++ acpica-unix2-20211217/source/common/dmtbdump3.c @@ -96,11 +96,12 @@ AcpiDmDumpSlit ( UINT32 Localities; UINT32 i; @@ -46,11 +46,11 @@ Index: acpica-unix2-20210730/source/common/dmtbdump3.c { AcpiOsPrintf ( "\n**** Not enough room in table for all localities\n"); -Index: acpica-unix2-20210730/source/compiler/dttable2.c +Index: acpica-unix2-20211217/source/compiler/dttable2.c =================================================================== ---- acpica-unix2-20210730.orig/source/compiler/dttable2.c -+++ acpica-unix2-20210730/source/compiler/dttable2.c -@@ -1837,7 +1837,7 @@ DtCompileSlit ( +--- acpica-unix2-20211217.orig/source/compiler/dttable2.c ++++ acpica-unix2-20211217/source/compiler/dttable2.c +@@ -2221,7 +2221,7 @@ DtCompileSlit ( ParentTable = DtPeekSubtable (); DtInsertSubtable (ParentTable, Subtable); diff --git a/0024-Support-MSCT-in-a-big-endian-world.patch b/0024-Support-MSCT-in-a-big-endian-world.patch index 4f972b0..43dae55 100644 --- a/0024-Support-MSCT-in-a-big-endian-world.patch +++ b/0024-Support-MSCT-in-a-big-endian-world.patch @@ -8,10 +8,10 @@ Signed-off-by: Al Stone source/common/dmtbdump2.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) -Index: acpica-unix2-20210730/source/common/dmtbdump2.c +Index: acpica-unix2-20211217/source/common/dmtbdump2.c =================================================================== ---- acpica-unix2-20210730.orig/source/common/dmtbdump2.c -+++ acpica-unix2-20210730/source/common/dmtbdump2.c +--- acpica-unix2-20211217.orig/source/common/dmtbdump2.c ++++ acpica-unix2-20211217/source/common/dmtbdump2.c @@ -1133,11 +1133,12 @@ AcpiDmDumpMsct ( ACPI_STATUS Status; UINT32 Offset = sizeof (ACPI_TABLE_MSCT); diff --git a/0026-Support-NFIT-in-a-big-endian-world.patch b/0026-Support-NFIT-in-a-big-endian-world.patch index c774903..5089e09 100644 --- a/0026-Support-NFIT-in-a-big-endian-world.patch +++ b/0026-Support-NFIT-in-a-big-endian-world.patch @@ -13,11 +13,11 @@ Signed-off-by: Al Stone source/compiler/dttable2.c | 11 ++++++--- 3 files changed, 39 insertions(+), 25 deletions(-) -Index: acpica-unix2-20210730/source/common/dmtable.c +Index: acpica-unix2-20211217/source/common/dmtable.c =================================================================== ---- acpica-unix2-20210730.orig/source/common/dmtable.c -+++ acpica-unix2-20210730/source/common/dmtable.c -@@ -1672,13 +1672,13 @@ AcpiDmDumpTable ( +--- acpica-unix2-20211217.orig/source/common/dmtable.c ++++ acpica-unix2-20211217/source/common/dmtable.c +@@ -1755,13 +1755,13 @@ AcpiDmDumpTable ( /* NFIT subtable types */ @@ -33,10 +33,10 @@ Index: acpica-unix2-20210730/source/common/dmtable.c AcpiDmNfitSubnames[Temp16]); break; -Index: acpica-unix2-20210730/source/common/dmtbdump2.c +Index: acpica-unix2-20211217/source/common/dmtbdump2.c =================================================================== ---- acpica-unix2-20210730.orig/source/common/dmtbdump2.c -+++ acpica-unix2-20210730/source/common/dmtbdump2.c +--- acpica-unix2-20211217.orig/source/common/dmtbdump2.c ++++ acpica-unix2-20211217/source/common/dmtbdump2.c @@ -1192,18 +1192,23 @@ AcpiDmDumpNfit ( ACPI_STATUS Status; UINT32 Offset = sizeof (ACPI_TABLE_NFIT); @@ -175,10 +175,10 @@ Index: acpica-unix2-20210730/source/common/dmtbdump2.c } } -Index: acpica-unix2-20210730/source/compiler/dttable2.c +Index: acpica-unix2-20211217/source/compiler/dttable2.c =================================================================== ---- acpica-unix2-20210730.orig/source/compiler/dttable2.c -+++ acpica-unix2-20210730/source/compiler/dttable2.c +--- acpica-unix2-20211217.orig/source/compiler/dttable2.c ++++ acpica-unix2-20211217/source/compiler/dttable2.c @@ -497,6 +497,7 @@ DtCompileNfit ( UINT32 Count; ACPI_NFIT_INTERLEAVE *Interleave = NULL; diff --git a/0027-Support-SDEV-in-a-big-endian-world.patch b/0027-Support-SDEV-in-a-big-endian-world.patch index d933b58..11adeb5 100644 --- a/0027-Support-SDEV-in-a-big-endian-world.patch +++ b/0027-Support-SDEV-in-a-big-endian-world.patch @@ -9,11 +9,11 @@ Signed-off-by: Al Stone source/compiler/dttable2.c | 27 ++++++++++++++++++++- 2 files changed, 52 insertions(+), 23 deletions(-) -Index: acpica-unix2-20210730/source/common/dmtbdump2.c +Index: acpica-unix2-20211217/source/common/dmtbdump2.c =================================================================== ---- acpica-unix2-20210730.orig/source/common/dmtbdump2.c -+++ acpica-unix2-20210730/source/common/dmtbdump2.c -@@ -2125,7 +2125,7 @@ AcpiDmDumpSdev ( +--- acpica-unix2-20211217.orig/source/common/dmtbdump2.c ++++ acpica-unix2-20211217/source/common/dmtbdump2.c +@@ -2534,7 +2534,7 @@ AcpiDmDumpSdev ( ACPI_SDEV_NAMESPACE *Namesp; ACPI_DMTABLE_INFO *InfoTable; ACPI_DMTABLE_INFO *SecureComponentInfoTable; @@ -22,7 +22,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump2.c UINT32 Offset = sizeof (ACPI_TABLE_SDEV); UINT16 PathOffset; UINT16 PathLength; -@@ -2133,11 +2133,12 @@ AcpiDmDumpSdev ( +@@ -2542,11 +2542,12 @@ AcpiDmDumpSdev ( UINT16 VendorDataLength; ACPI_SDEV_SECURE_COMPONENT *SecureComponent = NULL; UINT32 CurrentOffset = 0; @@ -36,7 +36,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump2.c if (ACPI_FAILURE (Status)) { return; -@@ -2146,13 +2147,14 @@ AcpiDmDumpSdev ( +@@ -2555,13 +2556,14 @@ AcpiDmDumpSdev ( /* Subtables */ Subtable = ACPI_ADD_PTR (ACPI_SDEV_HEADER, Table, Offset); @@ -54,7 +54,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump2.c if (ACPI_FAILURE (Status)) { return; -@@ -2175,8 +2177,8 @@ AcpiDmDumpSdev ( +@@ -2584,8 +2586,8 @@ AcpiDmDumpSdev ( } AcpiOsPrintf ("\n"); @@ -65,7 +65,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump2.c if (ACPI_FAILURE (Status)) { return; -@@ -2235,12 +2237,12 @@ AcpiDmDumpSdev ( +@@ -2644,12 +2646,12 @@ AcpiDmDumpSdev ( /* Dump the PCIe device ID(s) */ Namesp = ACPI_CAST_PTR (ACPI_SDEV_NAMESPACE, Subtable); @@ -81,7 +81,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump2.c ACPI_ADD_PTR (UINT8, Namesp, PathOffset), PathLength, AcpiDmTableInfoSdev0a); if (ACPI_FAILURE (Status)) -@@ -2252,14 +2254,14 @@ AcpiDmDumpSdev ( +@@ -2661,14 +2663,14 @@ AcpiDmDumpSdev ( /* Dump the vendor-specific data */ @@ -100,7 +100,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump2.c ACPI_ADD_PTR (UINT8, Namesp, VendorDataOffset), VendorDataLength, AcpiDmTableInfoSdev1b); if (ACPI_FAILURE (Status)) -@@ -2274,12 +2276,12 @@ AcpiDmDumpSdev ( +@@ -2683,12 +2685,12 @@ AcpiDmDumpSdev ( /* PCI path substructures */ Pcie = ACPI_CAST_PTR (ACPI_SDEV_PCIE, Subtable); @@ -116,7 +116,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump2.c PathOffset + Offset, ACPI_ADD_PTR (UINT8, Pcie, PathOffset), sizeof (ACPI_SDEV_PCIE_PATH), AcpiDmTableInfoSdev1a); -@@ -2294,12 +2296,14 @@ AcpiDmDumpSdev ( +@@ -2703,12 +2705,14 @@ AcpiDmDumpSdev ( /* VendorData */ @@ -134,7 +134,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump2.c ACPI_ADD_PTR (UINT8, Pcie, VendorDataOffset), VendorDataLength, AcpiDmTableInfoSdev1b); if (ACPI_FAILURE (Status)) -@@ -2316,8 +2320,8 @@ AcpiDmDumpSdev ( +@@ -2725,8 +2729,8 @@ AcpiDmDumpSdev ( NextSubtable: /* Point to next subtable */ @@ -145,11 +145,11 @@ Index: acpica-unix2-20210730/source/common/dmtbdump2.c + SubtableLength); } } -Index: acpica-unix2-20210730/source/compiler/dttable2.c +Index: acpica-unix2-20211217/source/compiler/dttable2.c =================================================================== ---- acpica-unix2-20210730.orig/source/compiler/dttable2.c -+++ acpica-unix2-20210730/source/compiler/dttable2.c -@@ -1493,6 +1493,7 @@ DtCompileSdev ( +--- acpica-unix2-20211217.orig/source/compiler/dttable2.c ++++ acpica-unix2-20211217/source/compiler/dttable2.c +@@ -1877,6 +1877,7 @@ DtCompileSdev ( UINT32 EntryCount; ACPI_SDEV_SECURE_COMPONENT *SecureComponent = NULL; UINT16 ComponentLength = 0; @@ -157,7 +157,7 @@ Index: acpica-unix2-20210730/source/compiler/dttable2.c /* Subtables */ -@@ -1514,7 +1515,7 @@ DtCompileSdev ( +@@ -1898,7 +1899,7 @@ DtCompileSdev ( DtPushSubtable (Subtable); SdevHeader = ACPI_CAST_PTR (ACPI_SDEV_HEADER, Subtable->Buffer); @@ -166,7 +166,7 @@ Index: acpica-unix2-20210730/source/compiler/dttable2.c switch (SdevHeader->Type) { -@@ -1687,6 +1688,18 @@ DtCompileSdev ( +@@ -2071,6 +2072,18 @@ DtCompileSdev ( } } @@ -185,7 +185,7 @@ Index: acpica-unix2-20210730/source/compiler/dttable2.c break; case ACPI_SDEV_TYPE_PCIE_ENDPOINT_DEVICE: -@@ -1749,6 +1762,18 @@ DtCompileSdev ( +@@ -2133,6 +2146,18 @@ DtCompileSdev ( SdevHeader->Length = sizeof (ACPI_SDEV_PCIE) + Pcie->PathLength + Pcie->VendorDataLength; diff --git a/0028-Support-HMAT-in-a-big-endian-world.patch b/0028-Support-HMAT-in-a-big-endian-world.patch index 4ee8edf..9cbb611 100644 --- a/0028-Support-HMAT-in-a-big-endian-world.patch +++ b/0028-Support-HMAT-in-a-big-endian-world.patch @@ -9,11 +9,11 @@ Signed-off-by: Al Stone source/compiler/dttable1.c | 24 ++++++++++--- 2 files changed, 59 insertions(+), 35 deletions(-) -Index: acpica-unix2-20210730/source/common/dmtbdump1.c +Index: acpica-unix2-20211217/source/common/dmtbdump1.c =================================================================== ---- acpica-unix2-20210730.orig/source/common/dmtbdump1.c -+++ acpica-unix2-20210730/source/common/dmtbdump1.c -@@ -1598,37 +1598,45 @@ AcpiDmDumpHmat ( +--- acpica-unix2-20211217.orig/source/common/dmtbdump1.c ++++ acpica-unix2-20211217/source/common/dmtbdump1.c +@@ -1596,37 +1596,45 @@ AcpiDmDumpHmat ( UINT32 Length; ACPI_DMTABLE_INFO *InfoTable; UINT32 i, j; @@ -65,7 +65,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c { case ACPI_HMAT_TYPE_ADDRESS_RANGE: -@@ -1651,7 +1659,7 @@ AcpiDmDumpHmat ( +@@ -1649,7 +1657,7 @@ AcpiDmDumpHmat ( default: AcpiOsPrintf ("\n**** Unknown HMAT structure type 0x%X\n", @@ -74,7 +74,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c /* Attempt to continue */ -@@ -1660,13 +1668,13 @@ AcpiDmDumpHmat ( +@@ -1658,13 +1666,13 @@ AcpiDmDumpHmat ( /* Dump HMAT structure body */ @@ -91,7 +91,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c if (ACPI_FAILURE (Status)) { return; -@@ -1674,7 +1682,7 @@ AcpiDmDumpHmat ( +@@ -1672,7 +1680,7 @@ AcpiDmDumpHmat ( /* Dump HMAT structure additionals */ @@ -100,7 +100,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c { case ACPI_HMAT_TYPE_LOCALITY: -@@ -1683,15 +1691,16 @@ AcpiDmDumpHmat ( +@@ -1681,15 +1689,16 @@ AcpiDmDumpHmat ( /* Dump initiator proximity domains */ @@ -121,7 +121,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, HmatStruct, SubtableOffset), 4, AcpiDmTableInfoHmat1a); if (ACPI_FAILURE (Status)) -@@ -1704,15 +1713,16 @@ AcpiDmDumpHmat ( +@@ -1702,15 +1711,16 @@ AcpiDmDumpHmat ( /* Dump target proximity domains */ @@ -142,7 +142,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, HmatStruct, SubtableOffset), 4, AcpiDmTableInfoHmat1b); if (ACPI_FAILURE (Status)) -@@ -1725,18 +1735,17 @@ AcpiDmDumpHmat ( +@@ -1723,18 +1733,17 @@ AcpiDmDumpHmat ( /* Dump latency/bandwidth entris */ @@ -166,7 +166,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, HmatStruct, SubtableOffset), 2, AcpiDmTableInfoHmat1c); if (ACPI_FAILURE(Status)) -@@ -1756,15 +1765,16 @@ AcpiDmDumpHmat ( +@@ -1754,15 +1763,16 @@ AcpiDmDumpHmat ( /* Dump SMBIOS handles */ @@ -187,7 +187,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, HmatStruct, SubtableOffset), 2, AcpiDmTableInfoHmat2a); if (ACPI_FAILURE (Status)) -@@ -1784,6 +1794,6 @@ AcpiDmDumpHmat ( +@@ -1782,6 +1792,6 @@ AcpiDmDumpHmat ( NextSubtable: /* Point to next HMAT structure subtable */ @@ -195,10 +195,10 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c + Offset += (HmatStructLength); } } -Index: acpica-unix2-20210730/source/compiler/dttable1.c +Index: acpica-unix2-20211217/source/compiler/dttable1.c =================================================================== ---- acpica-unix2-20210730.orig/source/compiler/dttable1.c -+++ acpica-unix2-20210730/source/compiler/dttable1.c +--- acpica-unix2-20211217.orig/source/compiler/dttable1.c ++++ acpica-unix2-20211217/source/compiler/dttable1.c @@ -1586,6 +1586,8 @@ DtCompileHmat ( UINT32 TgtPDNumber; UINT64 EntryNumber; diff --git a/0029-Support-PDTT-in-a-big-endian-world.patch b/0029-Support-PDTT-in-a-big-endian-world.patch index c1a0144..3ddabc9 100644 --- a/0029-Support-PDTT-in-a-big-endian-world.patch +++ b/0029-Support-PDTT-in-a-big-endian-world.patch @@ -8,11 +8,11 @@ Signed-off-by: Al Stone source/common/dmtbdump2.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -Index: acpica-unix2-20210730/source/common/dmtbdump2.c +Index: acpica-unix2-20211217/source/common/dmtbdump2.c =================================================================== ---- acpica-unix2-20210730.orig/source/common/dmtbdump2.c -+++ acpica-unix2-20210730/source/common/dmtbdump2.c -@@ -1498,13 +1498,13 @@ AcpiDmDumpPdtt ( +--- acpica-unix2-20211217.orig/source/common/dmtbdump2.c ++++ acpica-unix2-20211217/source/common/dmtbdump2.c +@@ -1907,13 +1907,13 @@ AcpiDmDumpPdtt ( { ACPI_STATUS Status; ACPI_PDTT_CHANNEL *Subtable; @@ -28,7 +28,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump2.c if (ACPI_FAILURE (Status)) { return; -@@ -1513,10 +1513,10 @@ AcpiDmDumpPdtt ( +@@ -1922,10 +1922,10 @@ AcpiDmDumpPdtt ( /* Subtables. Currently there is only one type, but can be multiples */ Subtable = ACPI_ADD_PTR (ACPI_PDTT_CHANNEL, Table, Offset); diff --git a/0030-Support-PPTT-in-a-big-endian-world.patch b/0030-Support-PPTT-in-a-big-endian-world.patch index 4e63eeb..e1fd491 100644 --- a/0030-Support-PPTT-in-a-big-endian-world.patch +++ b/0030-Support-PPTT-in-a-big-endian-world.patch @@ -9,11 +9,11 @@ Signed-off-by: Al Stone source/compiler/dttable2.c | 7 +++++-- 2 files changed, 15 insertions(+), 9 deletions(-) -Index: acpica-unix2-20210730/source/common/dmtbdump2.c +Index: acpica-unix2-20211217/source/common/dmtbdump2.c =================================================================== ---- acpica-unix2-20210730.orig/source/common/dmtbdump2.c -+++ acpica-unix2-20210730/source/common/dmtbdump2.c -@@ -1785,6 +1785,8 @@ AcpiDmDumpPptt ( +--- acpica-unix2-20211217.orig/source/common/dmtbdump2.c ++++ acpica-unix2-20211217/source/common/dmtbdump2.c +@@ -2194,6 +2194,8 @@ AcpiDmDumpPptt ( UINT32 Offset = sizeof (ACPI_TABLE_FPDT); ACPI_DMTABLE_INFO *InfoTable; UINT32 i; @@ -22,7 +22,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump2.c /* There is no main table (other than the standard ACPI header) */ -@@ -1792,7 +1794,7 @@ AcpiDmDumpPptt ( +@@ -2201,7 +2203,7 @@ AcpiDmDumpPptt ( /* Subtables */ Offset = sizeof (ACPI_TABLE_HEADER); @@ -31,7 +31,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump2.c { AcpiOsPrintf ("\n"); -@@ -1804,7 +1806,7 @@ AcpiDmDumpPptt ( +@@ -2213,7 +2215,7 @@ AcpiDmDumpPptt ( AcpiOsPrintf ("Invalid subtable length\n"); return; } @@ -40,7 +40,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump2.c Subtable->Length, AcpiDmTableInfoPpttHdr); if (ACPI_FAILURE (Status)) { -@@ -1846,7 +1848,7 @@ AcpiDmDumpPptt ( +@@ -2255,7 +2257,7 @@ AcpiDmDumpPptt ( AcpiOsPrintf ("Invalid subtable length\n"); return; } @@ -49,7 +49,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump2.c Subtable->Length, InfoTable); if (ACPI_FAILURE (Status)) { -@@ -1862,15 +1864,16 @@ AcpiDmDumpPptt ( +@@ -2271,15 +2273,16 @@ AcpiDmDumpPptt ( /* Dump SMBIOS handles */ @@ -70,11 +70,11 @@ Index: acpica-unix2-20210730/source/common/dmtbdump2.c ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Subtable, SubtableOffset), 4, AcpiDmTableInfoPptt0a); if (ACPI_FAILURE (Status)) -Index: acpica-unix2-20210730/source/compiler/dttable2.c +Index: acpica-unix2-20211217/source/compiler/dttable2.c =================================================================== ---- acpica-unix2-20210730.orig/source/compiler/dttable2.c -+++ acpica-unix2-20210730/source/compiler/dttable2.c -@@ -1123,6 +1123,7 @@ DtCompilePptt ( +--- acpica-unix2-20211217.orig/source/compiler/dttable2.c ++++ acpica-unix2-20211217/source/compiler/dttable2.c +@@ -1507,6 +1507,7 @@ DtCompilePptt ( DT_FIELD **PFieldList = (DT_FIELD **) List; DT_FIELD *SubtableStart; ACPI_TABLE_HEADER *PpttAcpiHeader; @@ -82,7 +82,7 @@ Index: acpica-unix2-20210730/source/compiler/dttable2.c ParentTable = DtPeekSubtable (); -@@ -1187,7 +1188,7 @@ DtCompilePptt ( +@@ -1571,7 +1572,7 @@ DtCompilePptt ( { /* Compile initiator proximity domain list */ @@ -91,7 +91,7 @@ Index: acpica-unix2-20210730/source/compiler/dttable2.c while (*PFieldList) { Status = DtCompileTable (PFieldList, -@@ -1203,8 +1204,10 @@ DtCompilePptt ( +@@ -1587,8 +1588,10 @@ DtCompilePptt ( DtInsertSubtable (ParentTable, Subtable); PpttHeader->Length += (UINT8)(Subtable->Length); diff --git a/0031-Support-PCCT-in-a-big-endian-world.patch b/0031-Support-PCCT-in-a-big-endian-world.patch index 7a51793..970958c 100644 --- a/0031-Support-PCCT-in-a-big-endian-world.patch +++ b/0031-Support-PCCT-in-a-big-endian-world.patch @@ -8,11 +8,11 @@ Signed-off-by: Al Stone source/common/dmtbdump2.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -Index: acpica-unix2-20210730/source/common/dmtbdump2.c +Index: acpica-unix2-20211217/source/common/dmtbdump2.c =================================================================== ---- acpica-unix2-20210730.orig/source/common/dmtbdump2.c -+++ acpica-unix2-20210730/source/common/dmtbdump2.c -@@ -1394,13 +1394,13 @@ AcpiDmDumpPcct ( +--- acpica-unix2-20211217.orig/source/common/dmtbdump2.c ++++ acpica-unix2-20211217/source/common/dmtbdump2.c +@@ -1803,13 +1803,13 @@ AcpiDmDumpPcct ( ACPI_STATUS Status; ACPI_PCCT_SUBSPACE *Subtable; ACPI_DMTABLE_INFO *InfoTable; @@ -28,7 +28,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump2.c if (ACPI_FAILURE (Status)) { return; -@@ -1409,12 +1409,12 @@ AcpiDmDumpPcct ( +@@ -1818,12 +1818,12 @@ AcpiDmDumpPcct ( /* Subtables */ Subtable = ACPI_ADD_PTR (ACPI_PCCT_SUBSPACE, Table, Offset); @@ -43,7 +43,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump2.c Subtable->Header.Length, AcpiDmTableInfoPcctHdr); if (ACPI_FAILURE (Status)) { -@@ -1462,7 +1462,7 @@ AcpiDmDumpPcct ( +@@ -1871,7 +1871,7 @@ AcpiDmDumpPcct ( } AcpiOsPrintf ("\n"); diff --git a/0032-Support-WDAT-in-a-big-endian-world.patch b/0032-Support-WDAT-in-a-big-endian-world.patch index 401f038..83a9c05 100644 --- a/0032-Support-WDAT-in-a-big-endian-world.patch +++ b/0032-Support-WDAT-in-a-big-endian-world.patch @@ -8,11 +8,11 @@ Signed-off-by: Al Stone source/common/dmtbdump3.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) -Index: acpica-unix2-20210730/source/common/dmtbdump3.c +Index: acpica-unix2-20211217/source/common/dmtbdump3.c =================================================================== ---- acpica-unix2-20210730.orig/source/common/dmtbdump3.c -+++ acpica-unix2-20210730/source/common/dmtbdump3.c -@@ -675,11 +675,12 @@ AcpiDmDumpWdat ( +--- acpica-unix2-20211217.orig/source/common/dmtbdump3.c ++++ acpica-unix2-20211217/source/common/dmtbdump3.c +@@ -680,11 +680,12 @@ AcpiDmDumpWdat ( ACPI_STATUS Status; UINT32 Offset = sizeof (ACPI_TABLE_WDAT); ACPI_WDAT_ENTRY *Subtable; @@ -26,7 +26,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump3.c if (ACPI_FAILURE (Status)) { return; -@@ -688,12 +689,12 @@ AcpiDmDumpWdat ( +@@ -693,12 +694,12 @@ AcpiDmDumpWdat ( /* Subtables */ Subtable = ACPI_ADD_PTR (ACPI_WDAT_ENTRY, Table, Offset); diff --git a/0033-Support-TCPA-in-a-big-endian-world.patch b/0033-Support-TCPA-in-a-big-endian-world.patch index b10373a..806ea8e 100644 --- a/0033-Support-TCPA-in-a-big-endian-world.patch +++ b/0033-Support-TCPA-in-a-big-endian-world.patch @@ -9,11 +9,11 @@ Signed-off-by: Al Stone source/compiler/dttable2.c | 4 +++- 2 files changed, 11 insertions(+), 6 deletions(-) -Index: acpica-unix2-20210730/source/common/dmtbdump3.c +Index: acpica-unix2-20211217/source/common/dmtbdump3.c =================================================================== ---- acpica-unix2-20210730.orig/source/common/dmtbdump3.c -+++ acpica-unix2-20210730/source/common/dmtbdump3.c -@@ -401,11 +401,13 @@ AcpiDmDumpTcpa ( +--- acpica-unix2-20211217.orig/source/common/dmtbdump3.c ++++ acpica-unix2-20211217/source/common/dmtbdump3.c +@@ -406,11 +406,13 @@ AcpiDmDumpTcpa ( ACPI_TABLE_TCPA_HDR *Subtable = ACPI_ADD_PTR ( ACPI_TABLE_TCPA_HDR, Table, Offset); ACPI_STATUS Status; @@ -28,7 +28,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump3.c 0, AcpiDmTableInfoTcpaHdr); if (ACPI_FAILURE (Status)) { -@@ -416,18 +418,19 @@ AcpiDmDumpTcpa ( +@@ -421,18 +423,19 @@ AcpiDmDumpTcpa ( * Examine the PlatformClass field to determine the table type. * Either a client or server table. Only one. */ @@ -52,11 +52,11 @@ Index: acpica-unix2-20210730/source/common/dmtbdump3.c break; default: -Index: acpica-unix2-20210730/source/compiler/dttable2.c +Index: acpica-unix2-20211217/source/compiler/dttable2.c =================================================================== ---- acpica-unix2-20210730.orig/source/compiler/dttable2.c -+++ acpica-unix2-20210730/source/compiler/dttable2.c -@@ -2139,6 +2139,7 @@ DtCompileTcpa ( +--- acpica-unix2-20211217.orig/source/compiler/dttable2.c ++++ acpica-unix2-20211217/source/compiler/dttable2.c +@@ -2527,6 +2527,7 @@ DtCompileTcpa ( ACPI_TABLE_TCPA_HDR *TcpaHeader; DT_SUBTABLE *ParentTable; ACPI_STATUS Status; @@ -64,7 +64,7 @@ Index: acpica-unix2-20210730/source/compiler/dttable2.c /* Compile the main table */ -@@ -2159,7 +2160,8 @@ DtCompileTcpa ( +@@ -2547,7 +2548,8 @@ DtCompileTcpa ( */ TcpaHeader = ACPI_CAST_PTR (ACPI_TABLE_TCPA_HDR, ParentTable->Buffer); diff --git a/0034-Support-STAO-in-a-big-endian-world.patch b/0034-Support-STAO-in-a-big-endian-world.patch index 2fcb5e8..120f915 100644 --- a/0034-Support-STAO-in-a-big-endian-world.patch +++ b/0034-Support-STAO-in-a-big-endian-world.patch @@ -8,11 +8,11 @@ Signed-off-by: Al Stone source/common/dmtbdump3.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -Index: acpica-unix2-20210730/source/common/dmtbdump3.c +Index: acpica-unix2-20211217/source/common/dmtbdump3.c =================================================================== ---- acpica-unix2-20210730.orig/source/common/dmtbdump3.c -+++ acpica-unix2-20210730/source/common/dmtbdump3.c -@@ -285,14 +285,14 @@ AcpiDmDumpStao ( +--- acpica-unix2-20211217.orig/source/common/dmtbdump3.c ++++ acpica-unix2-20211217/source/common/dmtbdump3.c +@@ -290,14 +290,14 @@ AcpiDmDumpStao ( { ACPI_STATUS Status; char *Namepath; @@ -29,7 +29,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump3.c if (ACPI_FAILURE (Status)) { return; -@@ -300,7 +300,7 @@ AcpiDmDumpStao ( +@@ -305,7 +305,7 @@ AcpiDmDumpStao ( /* The rest of the table consists of Namepath strings */ diff --git a/0035-Support-SLIC-and-MSDM-in-a-big-endian-world.patch b/0035-Support-SLIC-and-MSDM-in-a-big-endian-world.patch index a9f0b5b..c961086 100644 --- a/0035-Support-SLIC-and-MSDM-in-a-big-endian-world.patch +++ b/0035-Support-SLIC-and-MSDM-in-a-big-endian-world.patch @@ -13,10 +13,10 @@ Signed-off-by: Al Stone source/common/dmtbdump3.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -Index: acpica-unix2-20210730/source/common/dmtbdump3.c +Index: acpica-unix2-20211217/source/common/dmtbdump3.c =================================================================== ---- acpica-unix2-20210730.orig/source/common/dmtbdump3.c -+++ acpica-unix2-20210730/source/common/dmtbdump3.c +--- acpica-unix2-20211217.orig/source/common/dmtbdump3.c ++++ acpica-unix2-20211217/source/common/dmtbdump3.c @@ -68,9 +68,11 @@ void AcpiDmDumpSlic ( ACPI_TABLE_HEADER *Table) diff --git a/0038-Support-PMTT-in-a-big-endian-world.patch b/0038-Support-PMTT-in-a-big-endian-world.patch index 7e2bd91..f5853ee 100644 --- a/0038-Support-PMTT-in-a-big-endian-world.patch +++ b/0038-Support-PMTT-in-a-big-endian-world.patch @@ -8,11 +8,11 @@ Signed-off-by: Al Stone source/common/dmtbdump2.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) -Index: acpica-unix2-20210730/source/common/dmtbdump2.c +Index: acpica-unix2-20211217/source/common/dmtbdump2.c =================================================================== ---- acpica-unix2-20210730.orig/source/common/dmtbdump2.c -+++ acpica-unix2-20210730/source/common/dmtbdump2.c -@@ -1686,8 +1686,9 @@ AcpiDmDumpPmtt ( +--- acpica-unix2-20211217.orig/source/common/dmtbdump2.c ++++ acpica-unix2-20211217/source/common/dmtbdump2.c +@@ -2095,8 +2095,9 @@ AcpiDmDumpPmtt ( { ACPI_STATUS Status; ACPI_PMTT_HEADER *Subtable; @@ -23,7 +23,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump2.c /* Main table */ -@@ -1701,17 +1702,18 @@ AcpiDmDumpPmtt ( +@@ -2110,17 +2111,18 @@ AcpiDmDumpPmtt ( /* Subtables */ Subtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, Table, Offset); @@ -44,7 +44,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump2.c if (ACPI_FAILURE (Status)) { return; -@@ -1720,7 +1722,7 @@ AcpiDmDumpPmtt ( +@@ -2129,7 +2131,7 @@ AcpiDmDumpPmtt ( case ACPI_PMTT_TYPE_CONTROLLER: Status = AcpiDmDumpTable (Length, Offset, Subtable, @@ -53,7 +53,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump2.c if (ACPI_FAILURE (Status)) { return; -@@ -1729,7 +1731,7 @@ AcpiDmDumpPmtt ( +@@ -2138,7 +2140,7 @@ AcpiDmDumpPmtt ( case ACPI_PMTT_TYPE_DIMM: Status = AcpiDmDumpTable (Length, Offset, Subtable, @@ -62,7 +62,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump2.c if (ACPI_FAILURE (Status)) { return; -@@ -1738,7 +1740,7 @@ AcpiDmDumpPmtt ( +@@ -2147,7 +2149,7 @@ AcpiDmDumpPmtt ( case ACPI_PMTT_TYPE_VENDOR: Status = AcpiDmDumpTable (Length, Offset, Subtable, @@ -71,7 +71,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump2.c if (ACPI_FAILURE (Status)) { return; -@@ -1754,9 +1756,9 @@ AcpiDmDumpPmtt ( +@@ -2163,9 +2165,9 @@ AcpiDmDumpPmtt ( /* Point to next subtable */ diff --git a/0039-Support-TPM2-in-a-big-endian-world.patch b/0039-Support-TPM2-in-a-big-endian-world.patch index 99bdf64..177f908 100644 --- a/0039-Support-TPM2-in-a-big-endian-world.patch +++ b/0039-Support-TPM2-in-a-big-endian-world.patch @@ -9,11 +9,11 @@ Signed-off-by: Al Stone source/compiler/dttable2.c | 8 +++++--- 2 files changed, 15 insertions(+), 11 deletions(-) -Index: acpica-unix2-20210730/source/common/dmtbdump3.c +Index: acpica-unix2-20211217/source/common/dmtbdump3.c =================================================================== ---- acpica-unix2-20210730.orig/source/common/dmtbdump3.c -+++ acpica-unix2-20210730/source/common/dmtbdump3.c -@@ -470,11 +470,12 @@ AcpiDmDumpTpm2Rev3 ( +--- acpica-unix2-20211217.orig/source/common/dmtbdump3.c ++++ acpica-unix2-20211217/source/common/dmtbdump3.c +@@ -475,11 +475,12 @@ AcpiDmDumpTpm2Rev3 ( ACPI_TABLE_TPM23 *CommonHeader = ACPI_CAST_PTR (ACPI_TABLE_TPM23, Table); ACPI_TPM23_TRAILER *Subtable = ACPI_ADD_PTR (ACPI_TPM23_TRAILER, Table, Offset); ACPI_STATUS Status; @@ -27,7 +27,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump3.c if (ACPI_FAILURE (Status)) { return; -@@ -486,8 +487,8 @@ AcpiDmDumpTpm2Rev3 ( +@@ -491,8 +492,8 @@ AcpiDmDumpTpm2Rev3 ( { case ACPI_TPM23_ACPI_START_METHOD: @@ -38,7 +38,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump3.c break; default: -@@ -517,6 +518,7 @@ AcpiDmDumpTpm2 ( +@@ -522,6 +523,7 @@ AcpiDmDumpTpm2 ( ACPI_TPM2_TRAILER *Subtable = ACPI_ADD_PTR (ACPI_TPM2_TRAILER, Table, Offset); ACPI_TPM2_ARM_SMC *ArmSubtable; ACPI_STATUS Status; @@ -46,7 +46,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump3.c if (Table->Revision == 3) -@@ -527,7 +529,7 @@ AcpiDmDumpTpm2 ( +@@ -532,7 +534,7 @@ AcpiDmDumpTpm2 ( /* Main table */ @@ -55,7 +55,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump3.c if (ACPI_FAILURE (Status)) { -@@ -535,8 +537,8 @@ AcpiDmDumpTpm2 ( +@@ -540,8 +542,8 @@ AcpiDmDumpTpm2 ( } AcpiOsPrintf ("\n"); @@ -66,7 +66,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump3.c if (ACPI_FAILURE (Status)) { return; -@@ -551,8 +553,8 @@ AcpiDmDumpTpm2 ( +@@ -556,8 +558,8 @@ AcpiDmDumpTpm2 ( Offset += sizeof (ACPI_TPM2_TRAILER); AcpiOsPrintf ("\n"); @@ -77,11 +77,11 @@ Index: acpica-unix2-20210730/source/common/dmtbdump3.c break; default: -Index: acpica-unix2-20210730/source/compiler/dttable2.c +Index: acpica-unix2-20211217/source/compiler/dttable2.c =================================================================== ---- acpica-unix2-20210730.orig/source/compiler/dttable2.c -+++ acpica-unix2-20210730/source/compiler/dttable2.c -@@ -2267,6 +2267,7 @@ DtCompileTpm2 ( +--- acpica-unix2-20211217.orig/source/compiler/dttable2.c ++++ acpica-unix2-20211217/source/compiler/dttable2.c +@@ -2655,6 +2655,7 @@ DtCompileTpm2 ( DT_SUBTABLE *ParentTable; ACPI_STATUS Status = AE_OK; ACPI_TABLE_HEADER *Header; @@ -89,7 +89,7 @@ Index: acpica-unix2-20210730/source/compiler/dttable2.c ParentTable = DtPeekSubtable (); -@@ -2310,7 +2311,8 @@ DtCompileTpm2 ( +@@ -2698,7 +2699,8 @@ DtCompileTpm2 ( /* Subtable type depends on the StartMethod */ @@ -99,7 +99,7 @@ Index: acpica-unix2-20210730/source/compiler/dttable2.c { case ACPI_TPM2_COMMAND_BUFFER_WITH_ARM_SMC: -@@ -2341,7 +2343,7 @@ DtCompileTpm2 ( +@@ -2729,7 +2731,7 @@ DtCompileTpm2 ( case ACPI_TPM2_RESERVED10: AcpiOsPrintf ("\n**** Reserved TPM2 Start Method type 0x%X\n", @@ -108,7 +108,7 @@ Index: acpica-unix2-20210730/source/compiler/dttable2.c Status = AE_ERROR; break; -@@ -2349,7 +2351,7 @@ DtCompileTpm2 ( +@@ -2737,7 +2739,7 @@ DtCompileTpm2 ( default: AcpiOsPrintf ("\n**** Unknown TPM2 Start Method type 0x%X\n", diff --git a/0040-Support-S3PT-in-a-big-endian-world.patch b/0040-Support-S3PT-in-a-big-endian-world.patch index 9f5782d..03bc849 100644 --- a/0040-Support-S3PT-in-a-big-endian-world.patch +++ b/0040-Support-S3PT-in-a-big-endian-world.patch @@ -8,11 +8,11 @@ Subject: [PATCH 40/45] Support S3PT in a big-endian world source/compiler/dttable2.c | 4 +++- 2 files changed, 12 insertions(+), 7 deletions(-) -Index: acpica-unix2-20210730/source/common/dmtbdump2.c +Index: acpica-unix2-20211217/source/common/dmtbdump2.c =================================================================== ---- acpica-unix2-20210730.orig/source/common/dmtbdump2.c -+++ acpica-unix2-20210730/source/common/dmtbdump2.c -@@ -2039,6 +2039,8 @@ AcpiDmDumpS3pt ( +--- acpica-unix2-20211217.orig/source/common/dmtbdump2.c ++++ acpica-unix2-20211217/source/common/dmtbdump2.c +@@ -2448,6 +2448,8 @@ AcpiDmDumpS3pt ( ACPI_FPDT_HEADER *Subtable; ACPI_DMTABLE_INFO *InfoTable; ACPI_TABLE_S3PT *S3ptTable = ACPI_CAST_PTR (ACPI_TABLE_S3PT, Tables); @@ -21,7 +21,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump2.c /* Main table */ -@@ -2050,19 +2052,20 @@ AcpiDmDumpS3pt ( +@@ -2459,19 +2461,20 @@ AcpiDmDumpS3pt ( } Subtable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, S3ptTable, Offset); @@ -45,7 +45,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump2.c { case ACPI_S3PT_TYPE_RESUME: -@@ -2077,7 +2080,7 @@ AcpiDmDumpS3pt ( +@@ -2486,7 +2489,7 @@ AcpiDmDumpS3pt ( default: AcpiOsPrintf ("\n**** Unknown S3PT subtable type 0x%X\n", @@ -54,7 +54,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump2.c /* Attempt to continue */ -@@ -2090,7 +2093,7 @@ AcpiDmDumpS3pt ( +@@ -2499,7 +2502,7 @@ AcpiDmDumpS3pt ( } AcpiOsPrintf ("\n"); @@ -63,7 +63,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump2.c Subtable->Length, InfoTable); if (ACPI_FAILURE (Status)) { -@@ -2104,7 +2107,7 @@ NextSubtable: +@@ -2513,7 +2516,7 @@ NextSubtable: Subtable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, Subtable, Subtable->Length); } @@ -72,11 +72,11 @@ Index: acpica-unix2-20210730/source/common/dmtbdump2.c } -Index: acpica-unix2-20210730/source/compiler/dttable2.c +Index: acpica-unix2-20211217/source/compiler/dttable2.c =================================================================== ---- acpica-unix2-20210730.orig/source/compiler/dttable2.c -+++ acpica-unix2-20210730/source/compiler/dttable2.c -@@ -1406,6 +1406,7 @@ DtCompileS3pt ( +--- acpica-unix2-20211217.orig/source/compiler/dttable2.c ++++ acpica-unix2-20211217/source/compiler/dttable2.c +@@ -1790,6 +1790,7 @@ DtCompileS3pt ( DT_SUBTABLE *ParentTable; ACPI_DMTABLE_INFO *InfoTable; DT_FIELD *SubtableStart; @@ -84,7 +84,7 @@ Index: acpica-unix2-20210730/source/compiler/dttable2.c Status = DtCompileTable (PFieldList, AcpiDmTableInfoS3pt, -@@ -1433,7 +1434,8 @@ DtCompileS3pt ( +@@ -1817,7 +1818,8 @@ DtCompileS3pt ( S3ptHeader = ACPI_CAST_PTR (ACPI_FPDT_HEADER, Subtable->Buffer); diff --git a/0043-Support-DSDT-SSDT-in-a-big-endian-world.patch b/0043-Support-DSDT-SSDT-in-a-big-endian-world.patch index 1f5c3dd..e104037 100644 --- a/0043-Support-DSDT-SSDT-in-a-big-endian-world.patch +++ b/0043-Support-DSDT-SSDT-in-a-big-endian-world.patch @@ -42,10 +42,10 @@ Signed-off-by: Al Stone source/components/utilities/utresrc.c | 2 +- 28 files changed, 721 insertions(+), 341 deletions(-) -Index: acpica-unix2-20210730/source/common/adwalk.c +Index: acpica-unix2-20211217/source/common/adwalk.c =================================================================== ---- acpica-unix2-20210730.orig/source/common/adwalk.c -+++ acpica-unix2-20210730/source/common/adwalk.c +--- acpica-unix2-20211217.orig/source/common/adwalk.c ++++ acpica-unix2-20211217/source/common/adwalk.c @@ -679,7 +679,8 @@ AcpiDmLoadDescendingOp ( if (!Path && Op->Common.AmlOpcode == AML_INT_NAMEDFIELD_OP) @@ -56,10 +56,10 @@ Index: acpica-unix2-20210730/source/common/adwalk.c FieldPath[4] = 0; Path = FieldPath; } -Index: acpica-unix2-20210730/source/common/dmrestag.c +Index: acpica-unix2-20211217/source/common/dmrestag.c =================================================================== ---- acpica-unix2-20210730.orig/source/common/dmrestag.c -+++ acpica-unix2-20210730/source/common/dmrestag.c +--- acpica-unix2-20211217.orig/source/common/dmrestag.c ++++ acpica-unix2-20211217/source/common/dmrestag.c @@ -1048,7 +1048,7 @@ AcpiDmAddResourcesToNamespace ( * NextOp contains the Aml pointer and the Aml length */ @@ -69,10 +69,10 @@ Index: acpica-unix2-20210730/source/common/dmrestag.c AcpiDmAddResourceToNamespace, (void **) BufferNode); } -Index: acpica-unix2-20210730/source/common/dmtables.c +Index: acpica-unix2-20211217/source/common/dmtables.c =================================================================== ---- acpica-unix2-20210730.orig/source/common/dmtables.c -+++ acpica-unix2-20210730/source/common/dmtables.c +--- acpica-unix2-20211217.orig/source/common/dmtables.c ++++ acpica-unix2-20211217/source/common/dmtables.c @@ -142,6 +142,10 @@ AdCreateTableHeader ( ACPI_TABLE_HEADER *Table) { @@ -133,11 +133,11 @@ Index: acpica-unix2-20210730/source/common/dmtables.c AmlStart = ((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER)); AcpiUtSetIntegerWidth (Table->Revision); -Index: acpica-unix2-20210730/source/common/dmtbdump.c +Index: acpica-unix2-20211217/source/common/dmtbdump.c =================================================================== ---- acpica-unix2-20210730.orig/source/common/dmtbdump.c -+++ acpica-unix2-20210730/source/common/dmtbdump.c -@@ -338,8 +338,7 @@ AcpiDmDumpXsdt ( +--- acpica-unix2-20211217.orig/source/common/dmtbdump.c ++++ acpica-unix2-20211217/source/common/dmtbdump.c +@@ -392,8 +392,7 @@ AcpiDmDumpXsdt ( for (i = 0; i < Entries; i++) { AcpiDmLineHeader2 (Offset, sizeof (UINT64), "ACPI Table Address", i); @@ -147,11 +147,11 @@ Index: acpica-unix2-20210730/source/common/dmtbdump.c Offset += sizeof (UINT64); } } -Index: acpica-unix2-20210730/source/common/dmtbdump3.c +Index: acpica-unix2-20211217/source/common/dmtbdump3.c =================================================================== ---- acpica-unix2-20210730.orig/source/common/dmtbdump3.c -+++ acpica-unix2-20210730/source/common/dmtbdump3.c -@@ -736,12 +736,13 @@ AcpiDmDumpWpbt ( +--- acpica-unix2-20211217.orig/source/common/dmtbdump3.c ++++ acpica-unix2-20211217/source/common/dmtbdump3.c +@@ -741,12 +741,13 @@ AcpiDmDumpWpbt ( { ACPI_STATUS Status; ACPI_TABLE_WPBT *Subtable; @@ -166,7 +166,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump3.c if (ACPI_FAILURE (Status)) { return; -@@ -750,13 +751,13 @@ AcpiDmDumpWpbt ( +@@ -755,13 +756,13 @@ AcpiDmDumpWpbt ( /* Extract the arguments buffer length from the main table */ Subtable = ACPI_CAST_PTR (ACPI_TABLE_WPBT, Table); @@ -182,10 +182,10 @@ Index: acpica-unix2-20210730/source/common/dmtbdump3.c AcpiDmTableInfoWpbt0); } } -Index: acpica-unix2-20210730/source/compiler/aslcodegen.c +Index: acpica-unix2-20211217/source/compiler/aslcodegen.c =================================================================== ---- acpica-unix2-20210730.orig/source/compiler/aslcodegen.c -+++ acpica-unix2-20210730/source/compiler/aslcodegen.c +--- acpica-unix2-20211217.orig/source/compiler/aslcodegen.c ++++ acpica-unix2-20211217/source/compiler/aslcodegen.c @@ -238,6 +238,10 @@ CgWriteAmlOpcode ( { UINT8 PkgLenFirstByte; @@ -348,10 +348,10 @@ Index: acpica-unix2-20210730/source/compiler/aslcodegen.c return; -Index: acpica-unix2-20210730/source/compiler/aslopcodes.c +Index: acpica-unix2-20211217/source/compiler/aslopcodes.c =================================================================== ---- acpica-unix2-20210730.orig/source/compiler/aslopcodes.c -+++ acpica-unix2-20210730/source/compiler/aslopcodes.c +--- acpica-unix2-20211217.orig/source/compiler/aslopcodes.c ++++ acpica-unix2-20211217/source/compiler/aslopcodes.c @@ -511,7 +511,8 @@ OpcDoUnicode ( for (i = 0; i < Count; i++) @@ -362,10 +362,10 @@ Index: acpica-unix2-20210730/source/compiler/aslopcodes.c } /* -Index: acpica-unix2-20210730/source/compiler/aslrestype1.c +Index: acpica-unix2-20211217/source/compiler/aslrestype1.c =================================================================== ---- acpica-unix2-20210730.orig/source/compiler/aslrestype1.c -+++ acpica-unix2-20210730/source/compiler/aslrestype1.c +--- acpica-unix2-20211217.orig/source/compiler/aslrestype1.c ++++ acpica-unix2-20211217/source/compiler/aslrestype1.c @@ -143,6 +143,7 @@ RsDoMemory24Descriptor ( ASL_RESOURCE_NODE *Rnode; UINT32 CurrentByteOffset; @@ -550,10 +550,10 @@ Index: acpica-unix2-20210730/source/compiler/aslrestype1.c RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH, CurrentByteOffset + ASL_RESDESC_OFFSET (FixedMemory32.AddressLength)); break; -Index: acpica-unix2-20210730/source/compiler/aslrestype1i.c +Index: acpica-unix2-20211217/source/compiler/aslrestype1i.c =================================================================== ---- acpica-unix2-20210730.orig/source/compiler/aslrestype1i.c -+++ acpica-unix2-20210730/source/compiler/aslrestype1i.c +--- acpica-unix2-20211217.orig/source/compiler/aslrestype1i.c ++++ acpica-unix2-20211217/source/compiler/aslrestype1i.c @@ -199,6 +199,7 @@ RsDoFixedDmaDescriptor ( ASL_RESOURCE_NODE *Rnode; UINT32 CurrentByteOffset; @@ -671,10 +671,10 @@ Index: acpica-unix2-20210730/source/compiler/aslrestype1i.c + Descriptor->Irq.IrqMask = AcpiUtReadUint16(&IrqMask); return (Rnode); } -Index: acpica-unix2-20210730/source/compiler/aslrestype2.c +Index: acpica-unix2-20211217/source/compiler/aslrestype2.c =================================================================== ---- acpica-unix2-20210730.orig/source/compiler/aslrestype2.c -+++ acpica-unix2-20210730/source/compiler/aslrestype2.c +--- acpica-unix2-20211217.orig/source/compiler/aslrestype2.c ++++ acpica-unix2-20211217/source/compiler/aslrestype2.c @@ -77,6 +77,8 @@ RsDoGeneralRegisterDescriptor ( ASL_RESOURCE_NODE *Rnode; UINT32 CurrentByteOffset; @@ -751,10 +751,10 @@ Index: acpica-unix2-20210730/source/compiler/aslrestype2.c /* Point to end-of-descriptor for vendor data */ -Index: acpica-unix2-20210730/source/compiler/aslrestype2d.c +Index: acpica-unix2-20211217/source/compiler/aslrestype2d.c =================================================================== ---- acpica-unix2-20210730.orig/source/compiler/aslrestype2d.c -+++ acpica-unix2-20210730/source/compiler/aslrestype2d.c +--- acpica-unix2-20211217.orig/source/compiler/aslrestype2d.c ++++ acpica-unix2-20211217/source/compiler/aslrestype2d.c @@ -84,6 +84,8 @@ RsDoDwordIoDescriptor ( UINT32 CurrentByteOffset; UINT32 i; @@ -1001,10 +1001,10 @@ Index: acpica-unix2-20210730/source/compiler/aslrestype2d.c Descriptor->Address32.Flags, MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp); -Index: acpica-unix2-20210730/source/compiler/aslrestype2q.c +Index: acpica-unix2-20211217/source/compiler/aslrestype2q.c =================================================================== ---- acpica-unix2-20210730.orig/source/compiler/aslrestype2q.c -+++ acpica-unix2-20210730/source/compiler/aslrestype2q.c +--- acpica-unix2-20211217.orig/source/compiler/aslrestype2q.c ++++ acpica-unix2-20211217/source/compiler/aslrestype2q.c @@ -84,6 +84,7 @@ RsDoQwordIoDescriptor ( UINT32 CurrentByteOffset; UINT32 i; @@ -1233,10 +1233,10 @@ Index: acpica-unix2-20210730/source/compiler/aslrestype2q.c Descriptor->Address64.Flags, MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp); -Index: acpica-unix2-20210730/source/compiler/aslrestype2w.c +Index: acpica-unix2-20211217/source/compiler/aslrestype2w.c =================================================================== ---- acpica-unix2-20210730.orig/source/compiler/aslrestype2w.c -+++ acpica-unix2-20210730/source/compiler/aslrestype2w.c +--- acpica-unix2-20211217.orig/source/compiler/aslrestype2w.c ++++ acpica-unix2-20211217/source/compiler/aslrestype2w.c @@ -84,6 +84,7 @@ RsDoWordIoDescriptor ( UINT32 CurrentByteOffset; UINT32 i; @@ -1484,11 +1484,11 @@ Index: acpica-unix2-20210730/source/compiler/aslrestype2w.c Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) + OptionIndex + StringLength; return (Rnode); -Index: acpica-unix2-20210730/source/compiler/dttable2.c +Index: acpica-unix2-20211217/source/compiler/dttable2.c =================================================================== ---- acpica-unix2-20210730.orig/source/compiler/dttable2.c -+++ acpica-unix2-20210730/source/compiler/dttable2.c -@@ -2645,7 +2645,8 @@ DtCompileWpbt ( +--- acpica-unix2-20211217.orig/source/compiler/dttable2.c ++++ acpica-unix2-20211217/source/compiler/dttable2.c +@@ -3033,7 +3033,8 @@ DtCompileWpbt ( /* Extract the length of the Arguments buffer, insert into main table */ @@ -1498,10 +1498,10 @@ Index: acpica-unix2-20210730/source/compiler/dttable2.c DtInsertSubtable (ParentTable, Subtable); return (AE_OK); } -Index: acpica-unix2-20210730/source/components/disassembler/dmbuffer.c +Index: acpica-unix2-20211217/source/components/disassembler/dmbuffer.c =================================================================== ---- acpica-unix2-20210730.orig/source/components/disassembler/dmbuffer.c -+++ acpica-unix2-20210730/source/components/disassembler/dmbuffer.c +--- acpica-unix2-20211217.orig/source/components/disassembler/dmbuffer.c ++++ acpica-unix2-20211217/source/components/disassembler/dmbuffer.c @@ -204,7 +204,7 @@ AcpiDmByteList ( @@ -1591,10 +1591,10 @@ Index: acpica-unix2-20210730/source/components/disassembler/dmbuffer.c AcpiOsPrintf ("EisaId (\"%s\")", IdBuffer); /* If we know about the ID, emit the description */ -Index: acpica-unix2-20210730/source/components/disassembler/dmopcode.c +Index: acpica-unix2-20211217/source/components/disassembler/dmopcode.c =================================================================== ---- acpica-unix2-20210730.orig/source/components/disassembler/dmopcode.c -+++ acpica-unix2-20210730/source/components/disassembler/dmopcode.c +--- acpica-unix2-20211217.orig/source/components/disassembler/dmopcode.c ++++ acpica-unix2-20211217/source/components/disassembler/dmopcode.c @@ -778,7 +778,9 @@ AcpiDmDisassembleOneOp ( } else @@ -1651,10 +1651,10 @@ Index: acpica-unix2-20210730/source/components/disassembler/dmopcode.c Info->BitOffset += Offset; if (Info->BitOffset % 8 == 0) -Index: acpica-unix2-20210730/source/components/disassembler/dmresrc.c +Index: acpica-unix2-20211217/source/components/disassembler/dmresrc.c =================================================================== ---- acpica-unix2-20210730.orig/source/components/disassembler/dmresrc.c -+++ acpica-unix2-20210730/source/components/disassembler/dmresrc.c +--- acpica-unix2-20211217.orig/source/components/disassembler/dmresrc.c ++++ acpica-unix2-20211217/source/components/disassembler/dmresrc.c @@ -417,7 +417,7 @@ AcpiDmIsResourceTemplate ( return (AE_TYPE); } @@ -1664,10 +1664,10 @@ Index: acpica-unix2-20210730/source/components/disassembler/dmresrc.c /* Get the length of the raw initialization byte list */ -Index: acpica-unix2-20210730/source/components/disassembler/dmresrcl.c +Index: acpica-unix2-20211217/source/components/disassembler/dmresrcl.c =================================================================== ---- acpica-unix2-20210730.orig/source/components/disassembler/dmresrcl.c -+++ acpica-unix2-20210730/source/components/disassembler/dmresrcl.c +--- acpica-unix2-20211217.orig/source/components/disassembler/dmresrcl.c ++++ acpica-unix2-20211217/source/components/disassembler/dmresrcl.c @@ -141,6 +141,8 @@ AcpiDmMemoryFields ( UINT32 Level) { @@ -1789,10 +1789,10 @@ Index: acpica-unix2-20210730/source/components/disassembler/dmresrcl.c } AcpiDmIndent (Level); -Index: acpica-unix2-20210730/source/components/disassembler/dmresrcl2.c +Index: acpica-unix2-20211217/source/components/disassembler/dmresrcl2.c =================================================================== ---- acpica-unix2-20210730.orig/source/components/disassembler/dmresrcl2.c -+++ acpica-unix2-20210730/source/components/disassembler/dmresrcl2.c +--- acpica-unix2-20211217.orig/source/components/disassembler/dmresrcl2.c ++++ acpica-unix2-20211217/source/components/disassembler/dmresrcl2.c @@ -199,22 +199,27 @@ AcpiDmGpioCommon ( char *DeviceName = NULL; UINT32 PinCount; @@ -2134,10 +2134,10 @@ Index: acpica-unix2-20210730/source/components/disassembler/dmresrcl2.c DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset); AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX); -Index: acpica-unix2-20210730/source/components/disassembler/dmresrcs.c +Index: acpica-unix2-20211217/source/components/disassembler/dmresrcs.c =================================================================== ---- acpica-unix2-20210730.orig/source/components/disassembler/dmresrcs.c -+++ acpica-unix2-20210730/source/components/disassembler/dmresrcs.c +--- acpica-unix2-20211217.orig/source/components/disassembler/dmresrcs.c ++++ acpica-unix2-20211217/source/components/disassembler/dmresrcs.c @@ -93,7 +93,7 @@ AcpiDmIrqDescriptor ( AcpiOsPrintf (")\n"); @@ -2188,10 +2188,10 @@ Index: acpica-unix2-20210730/source/components/disassembler/dmresrcs.c /* Insert a descriptor name */ -Index: acpica-unix2-20210730/source/components/disassembler/dmwalk.c +Index: acpica-unix2-20211217/source/components/disassembler/dmwalk.c =================================================================== ---- acpica-unix2-20210730.orig/source/components/disassembler/dmwalk.c -+++ acpica-unix2-20210730/source/components/disassembler/dmwalk.c +--- acpica-unix2-20211217.orig/source/components/disassembler/dmwalk.c ++++ acpica-unix2-20211217/source/components/disassembler/dmwalk.c @@ -1155,7 +1155,7 @@ AcpiDmAscendingOp ( { ParentOp->Common.DisasmFlags |= ACPI_PARSEOP_EMPTY_TERMLIST; @@ -2201,10 +2201,10 @@ Index: acpica-unix2-20210730/source/components/disassembler/dmwalk.c } } -Index: acpica-unix2-20210730/source/components/namespace/nsaccess.c +Index: acpica-unix2-20211217/source/components/namespace/nsaccess.c =================================================================== ---- acpica-unix2-20210730.orig/source/components/namespace/nsaccess.c -+++ acpica-unix2-20210730/source/components/namespace/nsaccess.c +--- acpica-unix2-20211217.orig/source/components/namespace/nsaccess.c ++++ acpica-unix2-20211217/source/components/namespace/nsaccess.c @@ -644,7 +644,7 @@ AcpiNsLookup ( /* Extract one ACPI name from the front of the pathname */ @@ -2214,10 +2214,10 @@ Index: acpica-unix2-20210730/source/components/namespace/nsaccess.c /* Try to find the single (4 character) ACPI name */ -Index: acpica-unix2-20210730/source/components/namespace/nsnames.c +Index: acpica-unix2-20211217/source/components/namespace/nsnames.c =================================================================== ---- acpica-unix2-20210730.orig/source/components/namespace/nsnames.c -+++ acpica-unix2-20210730/source/components/namespace/nsnames.c +--- acpica-unix2-20211217.orig/source/components/namespace/nsnames.c ++++ acpica-unix2-20211217/source/components/namespace/nsnames.c @@ -297,10 +297,10 @@ AcpiNsBuildNormalizedPath ( { if (NextNode != Node) @@ -2231,10 +2231,10 @@ Index: acpica-unix2-20210730/source/components/namespace/nsnames.c DoNoTrailing = NoTrailing; for (i = 0; i < 4; i++) { -Index: acpica-unix2-20210730/source/components/namespace/nsparse.c +Index: acpica-unix2-20211217/source/components/namespace/nsparse.c =================================================================== ---- acpica-unix2-20210730.orig/source/components/namespace/nsparse.c -+++ acpica-unix2-20210730/source/components/namespace/nsparse.c +--- acpica-unix2-20211217.orig/source/components/namespace/nsparse.c ++++ acpica-unix2-20211217/source/components/namespace/nsparse.c @@ -203,6 +203,7 @@ AcpiNsOneCompleteParse ( ACPI_WALK_STATE *WalkState; ACPI_TABLE_HEADER *Table; @@ -2260,10 +2260,10 @@ Index: acpica-unix2-20210730/source/components/namespace/nsparse.c Status = AcpiTbGetOwnerId (TableIndex, &OwnerId); if (ACPI_FAILURE (Status)) -Index: acpica-unix2-20210730/source/components/namespace/nsutils.c +Index: acpica-unix2-20211217/source/components/namespace/nsutils.c =================================================================== ---- acpica-unix2-20210730.orig/source/components/namespace/nsutils.c -+++ acpica-unix2-20210730/source/components/namespace/nsutils.c +--- acpica-unix2-20211217.orig/source/components/namespace/nsutils.c ++++ acpica-unix2-20211217/source/components/namespace/nsutils.c @@ -272,7 +272,6 @@ AcpiNsBuildInternalName ( const char *ExternalName = Info->NextExternalChar; char *Result = NULL; @@ -2300,10 +2300,10 @@ Index: acpica-unix2-20210730/source/components/namespace/nsutils.c /* Now we must have a path separator, or the pathname is bad */ -Index: acpica-unix2-20210730/source/components/utilities/utresrc.c +Index: acpica-unix2-20211217/source/components/utilities/utresrc.c =================================================================== ---- acpica-unix2-20210730.orig/source/components/utilities/utresrc.c -+++ acpica-unix2-20210730/source/components/utilities/utresrc.c +--- acpica-unix2-20211217.orig/source/components/utilities/utresrc.c ++++ acpica-unix2-20211217/source/components/utilities/utresrc.c @@ -541,7 +541,7 @@ AcpiUtGetResourceLength ( { /* Large Resource type -- bytes 1-2 contain the 16-bit length */ @@ -2313,10 +2313,10 @@ Index: acpica-unix2-20210730/source/components/utilities/utresrc.c } else -Index: acpica-unix2-20210730/source/compiler/aslrestype2e.c +Index: acpica-unix2-20211217/source/compiler/aslrestype2e.c =================================================================== ---- acpica-unix2-20210730.orig/source/compiler/aslrestype2e.c -+++ acpica-unix2-20210730/source/compiler/aslrestype2e.c +--- acpica-unix2-20211217.orig/source/compiler/aslrestype2e.c ++++ acpica-unix2-20211217/source/compiler/aslrestype2e.c @@ -80,6 +80,7 @@ RsDoExtendedIoDescriptor ( UINT16 StringLength = 0; UINT32 CurrentByteOffset; @@ -2575,10 +2575,10 @@ Index: acpica-unix2-20210730/source/compiler/aslrestype2e.c Descriptor->ExtAddress64.Flags, MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp); -Index: acpica-unix2-20210730/source/compiler/aslrestype2s.c +Index: acpica-unix2-20211217/source/compiler/aslrestype2s.c =================================================================== ---- acpica-unix2-20210730.orig/source/compiler/aslrestype2s.c -+++ acpica-unix2-20210730/source/compiler/aslrestype2s.c +--- acpica-unix2-20211217.orig/source/compiler/aslrestype2s.c ++++ acpica-unix2-20211217/source/compiler/aslrestype2s.c @@ -343,6 +343,7 @@ RsDoGpioIntDescriptor ( UINT32 CurrentByteOffset; UINT32 PinCount = 0; diff --git a/0045-CSRT-fixed-use-of-optional-ResourceInfo.patch b/0045-CSRT-fixed-use-of-optional-ResourceInfo.patch index 62866f4..788669c 100644 --- a/0045-CSRT-fixed-use-of-optional-ResourceInfo.patch +++ b/0045-CSRT-fixed-use-of-optional-ResourceInfo.patch @@ -12,11 +12,11 @@ Signed-off-by: Al Stone source/compiler/dttable1.c | 28 +++++++++++++------------ 2 files changed, 39 insertions(+), 32 deletions(-) -Index: acpica-unix2-20210730/source/common/dmtbdump1.c +Index: acpica-unix2-20211217/source/common/dmtbdump1.c =================================================================== ---- acpica-unix2-20210730.orig/source/common/dmtbdump1.c -+++ acpica-unix2-20210730/source/common/dmtbdump1.c -@@ -593,11 +593,13 @@ AcpiDmDumpCsrt ( +--- acpica-unix2-20211217.orig/source/common/dmtbdump1.c ++++ acpica-unix2-20211217/source/common/dmtbdump1.c +@@ -591,11 +591,13 @@ AcpiDmDumpCsrt ( ACPI_CSRT_GROUP *Subtable; ACPI_CSRT_SHARED_INFO *SharedInfoTable; ACPI_CSRT_DESCRIPTOR *SubSubtable; @@ -31,7 +31,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c /* The main table only contains the ACPI header, thus already handled */ -@@ -605,13 +607,14 @@ AcpiDmDumpCsrt ( +@@ -603,13 +605,14 @@ AcpiDmDumpCsrt ( /* Subtables (Resource Groups) */ Subtable = ACPI_ADD_PTR (ACPI_CSRT_GROUP, Table, Offset); @@ -49,7 +49,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c if (ACPI_FAILURE (Status)) { return; -@@ -624,26 +627,28 @@ AcpiDmDumpCsrt ( +@@ -622,26 +625,28 @@ AcpiDmDumpCsrt ( Offset + SubOffset); AcpiOsPrintf ("\n"); @@ -85,7 +85,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c if (ACPI_FAILURE (Status)) { return; -@@ -653,11 +658,12 @@ AcpiDmDumpCsrt ( +@@ -651,11 +656,12 @@ AcpiDmDumpCsrt ( /* Resource-specific info buffer */ @@ -101,7 +101,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c InfoLength, AcpiDmTableInfoCsrt2a); if (ACPI_FAILURE (Status)) { -@@ -667,16 +673,15 @@ AcpiDmDumpCsrt ( +@@ -665,16 +671,15 @@ AcpiDmDumpCsrt ( /* Point to next sub-subtable */ @@ -122,10 +122,10 @@ Index: acpica-unix2-20210730/source/common/dmtbdump1.c } } -Index: acpica-unix2-20210730/source/compiler/dttable1.c +Index: acpica-unix2-20211217/source/compiler/dttable1.c =================================================================== ---- acpica-unix2-20210730.orig/source/compiler/dttable1.c -+++ acpica-unix2-20210730/source/compiler/dttable1.c +--- acpica-unix2-20211217.orig/source/compiler/dttable1.c ++++ acpica-unix2-20211217/source/compiler/dttable1.c @@ -570,14 +570,16 @@ DtCompileCsrt ( DT_SUBTABLE *Subtable; DT_SUBTABLE *ParentTable; diff --git a/0046-Support-PHAT-in-a-big-endian-world.patch b/0046-Support-PHAT-in-a-big-endian-world.patch index 011e519..ea9bea6 100644 --- a/0046-Support-PHAT-in-a-big-endian-world.patch +++ b/0046-Support-PHAT-in-a-big-endian-world.patch @@ -9,11 +9,11 @@ Signed-off-by: Al Stone source/compiler/dttable2.c | 12 +++++++++--- 2 files changed, 29 insertions(+), 19 deletions(-) -Index: acpica-unix2-20210604/source/common/dmtbdump2.c +Index: acpica-unix2-20211217/source/common/dmtbdump2.c =================================================================== ---- acpica-unix2-20210604.orig/source/common/dmtbdump2.c -+++ acpica-unix2-20210604/source/common/dmtbdump2.c -@@ -1573,39 +1573,41 @@ AcpiDmDumpPhat ( +--- acpica-unix2-20211217.orig/source/common/dmtbdump2.c ++++ acpica-unix2-20211217/source/common/dmtbdump2.c +@@ -1982,39 +1982,41 @@ AcpiDmDumpPhat ( ACPI_PHAT_HEADER *Subtable; ACPI_PHAT_VERSION_DATA *VersionData; UINT32 RecordCount; @@ -62,7 +62,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump2.c break; default: -@@ -1616,22 +1618,22 @@ AcpiDmDumpPhat ( +@@ -2025,22 +2027,22 @@ AcpiDmDumpPhat ( return; } @@ -89,7 +89,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump2.c ACPI_ADD_PTR (ACPI_PHAT_HEADER, Subtable, sizeof (ACPI_PHAT_VERSION_DATA)), sizeof (ACPI_PHAT_VERSION_ELEMENT), AcpiDmTableInfoPhat0a); if (ACPI_FAILURE (Status)) -@@ -1649,7 +1651,7 @@ AcpiDmDumpPhat ( +@@ -2058,7 +2060,7 @@ AcpiDmDumpPhat ( /* account for the null terminator */ PathLength = strlen (ACPI_ADD_PTR (char, Subtable, sizeof (ACPI_PHAT_HEALTH_DATA))) + 1; @@ -98,7 +98,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump2.c ACPI_ADD_PTR (ACPI_PHAT_HEADER, Subtable, sizeof (ACPI_PHAT_HEALTH_DATA)), PathLength, AcpiDmTableInfoPhat1a); if (ACPI_FAILURE (Status)) -@@ -1660,8 +1662,8 @@ AcpiDmDumpPhat ( +@@ -2069,8 +2071,8 @@ AcpiDmDumpPhat ( /* Get vendor data - data length is the remaining subtable length */ VendorLength = @@ -109,7 +109,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump2.c ACPI_ADD_PTR (ACPI_PHAT_HEADER, Subtable, sizeof (ACPI_PHAT_HEALTH_DATA) + PathLength), VendorLength, AcpiDmTableInfoPhat1b); if (ACPI_FAILURE (Status)) -@@ -1673,15 +1675,15 @@ AcpiDmDumpPhat ( +@@ -2082,15 +2084,15 @@ AcpiDmDumpPhat ( default: AcpiOsPrintf ("\n**** Unknown PHAT subtable type 0x%X\n\n", @@ -128,11 +128,11 @@ Index: acpica-unix2-20210604/source/common/dmtbdump2.c } } -Index: acpica-unix2-20210604/source/compiler/dttable2.c +Index: acpica-unix2-20211217/source/compiler/dttable2.c =================================================================== ---- acpica-unix2-20210604.orig/source/compiler/dttable2.c -+++ acpica-unix2-20210604/source/compiler/dttable2.c -@@ -870,6 +870,8 @@ DtCompilePhat ( +--- acpica-unix2-20211217.orig/source/compiler/dttable2.c ++++ acpica-unix2-20211217/source/compiler/dttable2.c +@@ -1254,6 +1254,8 @@ DtCompilePhat ( ACPI_DMTABLE_INFO *Info; ACPI_PHAT_VERSION_DATA *VersionData; UINT32 RecordCount; @@ -141,7 +141,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable2.c /* The table consist of subtables */ -@@ -887,8 +889,9 @@ DtCompilePhat ( +@@ -1271,8 +1273,9 @@ DtCompilePhat ( DtPushSubtable (Subtable); PhatHeader = ACPI_CAST_PTR (ACPI_PHAT_HEADER, Subtable->Buffer); @@ -152,7 +152,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable2.c { case ACPI_PHAT_TYPE_FW_VERSION_DATA: -@@ -919,13 +922,13 @@ DtCompilePhat ( +@@ -1303,13 +1306,13 @@ DtCompilePhat ( ParentTable = DtPeekSubtable (); DtInsertSubtable (ParentTable, Subtable); @@ -168,7 +168,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable2.c while (RecordCount) { -@@ -976,6 +979,9 @@ DtCompilePhat ( +@@ -1360,6 +1363,9 @@ DtCompilePhat ( DtFatal (ASL_MSG_UNKNOWN_SUBTABLE, *PFieldList, "PHAT"); return (AE_ERROR); } diff --git a/acpica-tools.spec b/acpica-tools.spec index 4ae3f29..0af4295 100644 --- a/acpica-tools.spec +++ b/acpica-tools.spec @@ -1,5 +1,5 @@ Name: acpica-tools -Version: 20210730 +Version: 20211217 Release: 1%{?dist} Summary: ACPICA tools for the development and debug of ACPI tables @@ -84,12 +84,13 @@ Patch109: cve-2017-13694.patch Patch110: cve-2017-13695.patch Patch111: str-trunc-warn.patch Patch112: ptr-cast.patch -Patch113: facp.patch -Patch114: armv7-str-fixes.patch -Patch115: dbtest.patch -Patch116: ull-32bit.patch +Patch113: armv7-str-fixes.patch +Patch114: dbtest.patch +Patch115: ull-32bit.patch +Patch116: dangling-ptr.patch +Patch117: uuid-len.patch -BuildRequires: make +BuildRequires: make BuildRequires: bison patchutils flex gcc # The previous iasl package contained only a very small subset of these tools @@ -253,6 +254,14 @@ fi %changelog +* Fri Mar 18 2022 Al Stone - 20211217-1 +- Update to 20211217 upstream source. Bring all the patches up to date. +- Rawhide use of GCC 12 introduces a new check for dangling pointers which + causes non-portable code in utdebug.c stack functions to not compile; add + a patch to disable -Wdangling-pointer=2 for the specific functions +- The AeRegionHandler() code in acpiexec call a UUID function with a buffer + too small for the UUID output string; add a patch to correct this. + * Wed Jan 19 2022 Fedora Release Engineering - 20210604-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/armv7-str-fixes.patch b/armv7-str-fixes.patch index fdc2434..497c92b 100644 --- a/armv7-str-fixes.patch +++ b/armv7-str-fixes.patch @@ -1,8 +1,8 @@ -Index: acpica-unix2-20200925/source/include/actypes.h +Index: acpica-unix2-20211217/source/include/actypes.h =================================================================== ---- acpica-unix2-20200925.orig/source/include/actypes.h -+++ acpica-unix2-20200925/source/include/actypes.h -@@ -561,7 +561,7 @@ typedef UINT64 +--- acpica-unix2-20211217.orig/source/include/actypes.h ++++ acpica-unix2-20211217/source/include/actypes.h +@@ -560,7 +560,7 @@ typedef UINT64 #define ACPI_COPY_NAMESEG(dest,src) (*ACPI_CAST_PTR (UINT32, (dest)) = *ACPI_CAST_PTR (UINT32, (src))) #else #define ACPI_COMPARE_NAMESEG(a,b) (!strncmp (ACPI_CAST_PTR (char, (a)), ACPI_CAST_PTR (char, (b)), ACPI_NAMESEG_SIZE)) diff --git a/badcode.asl.result b/badcode.asl.result index 100cd4b..093c50d 100644 --- a/badcode.asl.result +++ b/badcode.asl.result @@ -146,7 +146,7 @@ badcode.asl 197: Return ("Unexpected Return Value") Warning 3104 - Reserved method should not return a value ^ (_Q22) badcode.asl 203: Device (EC) -Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) +Error 6141 - ^ Missing dependency (Device object requires a _HID or _ADR) badcode.asl 205: Method (_REG, 2) Warning 3079 - ^ _REG has no corresponding Operation Region @@ -263,4 +263,4 @@ Ignoring all errors, forcing AML file generation ASL Input: badcode.asl - 11588 bytes 81 keywords 408 source lines AML Output: badcode.aml - 1195 bytes 20 opcodes 61 named objects -Compilation successful. 45 Errors, 29 Warnings, 11 Remarks, 16 Optimizations, 1 Constants Folded +Compilation successful. 46 Errors, 28 Warnings, 11 Remarks, 16 Optimizations, 1 Constants Folded diff --git a/facp.patch b/facp.patch deleted file mode 100644 index 1d7ffee..0000000 --- a/facp.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 7670c56ebe004e698551635f9c5d48a1794066dd Mon Sep 17 00:00:00 2001 -From: Al Stone -Date: Wed, 19 Dec 2018 16:52:41 -0700 -Subject: [PATCH] Correct DSDT Address field in FACP tables - -The FADT allows either the DSDT Address or XDSDT Address field to be -zero. However, the table definition used by the table compiler still -requires the DSDT Address to be non-zero, which is not correct. So, -remove the DT_NON_ZERO flag from the field. - -Signed-off-by: Al Stone ---- - source/common/dmtbinfo.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: acpica-unix2-20200925/source/common/dmtbinfo.c -=================================================================== ---- acpica-unix2-20200925.orig/source/common/dmtbinfo.c -+++ acpica-unix2-20200925/source/common/dmtbinfo.c -@@ -184,7 +184,7 @@ ACPI_DMTABLE_INFO AcpiDmTableI - ACPI_DMTABLE_INFO AcpiDmTableInfoFadt1[] = - { - {ACPI_DMT_UINT32, ACPI_FADT_OFFSET (Facs), "FACS Address", 0}, -- {ACPI_DMT_UINT32, ACPI_FADT_OFFSET (Dsdt), "DSDT Address", DT_NON_ZERO}, -+ {ACPI_DMT_UINT32, ACPI_FADT_OFFSET (Dsdt), "DSDT Address", 0}, - {ACPI_DMT_UINT8, ACPI_FADT_OFFSET (Model), "Model", 0}, - {ACPI_DMT_FADTPM, ACPI_FADT_OFFSET (PreferredProfile), "PM Profile", 0}, - {ACPI_DMT_UINT16, ACPI_FADT_OFFSET (SciInterrupt), "SCI Interrupt", 0}, diff --git a/grammar.asl.result b/grammar.asl.result index 5269983..84cebe4 100644 --- a/grammar.asl.result +++ b/grammar.asl.result @@ -1,23 +1,32 @@ grammar.asl 120: Device (A1) -Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) +Error 6141 - ^ Missing dependency (Device object requires a _HID or _ADR) grammar.asl 135: Device (A2) -Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) +Error 6141 - ^ Missing dependency (Device object requires a _HID or _ADR) grammar.asl 145: Device (A3) -Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) +Error 6141 - ^ Missing dependency (Device object requires a _HID or _ADR) grammar.asl 155: Device (A4) -Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) +Error 6141 - ^ Missing dependency (Device object requires a _HID or _ADR) grammar.asl 171: Device (IRES) -Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) +Error 6141 - ^ Missing dependency (Device object requires a _HID or _ADR) + +grammar.asl 171: Device (IRES) +Warning 3141 - ^ Missing dependency (Device has a _SRS, missing a _PRS, required) + +grammar.asl 171: Device (IRES) +Remark 2141 - ^ Missing dependency (Device has a _SRS, no corresponding _DIS) grammar.asl 199: Name (_NPK, Package () Warning 3133 - ^ Unknown reserved name (_NPK) grammar.asl 208: Device (RES) -Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) +Error 6141 - ^ Missing dependency (Device object requires a _HID or _ADR) + +grammar.asl 208: Device (RES) +Remark 2141 - ^ Missing dependency (Device has a _SRS, no corresponding _DIS) grammar.asl 247: Name (PRT0, ResourceTemplate () Remark 2173 - ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\RES._CRS) @@ -82,6 +91,12 @@ Remark 2089 - Object is not referenced ^ (Name [FL grammar.asl 705: Device(PCI0) Warning 3073 - Multiple types ^ (Device object requires either a _HID or _ADR, but not both) +grammar.asl 705: Device(PCI0) +Warning 3141 - Missing dependency ^ (Device has a _SRS, missing a _PRS, required) + +grammar.asl 705: Device(PCI0) +Remark 2141 - Missing dependency ^ (Device has a _SRS, no corresponding _DIS) + grammar.asl 712: Name(PRT0, ResourceTemplate() { Remark 2173 - ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\_SB.PCI0._CRS) @@ -89,13 +104,13 @@ grammar.asl 733: Method(_SRS) Warning 3102 - ^ Reserved method has too few arguments (_SRS requires 1) grammar.asl 738: Device(EIO) -Warning 3141 - Missing dependency ^ (Device object requires a _HID or _ADR in same scope) +Error 6141 - Missing dependency ^ (Device object requires a _HID or _ADR) grammar.asl 822: If(LNot(SMRE(0x09,0x17,Local2,RefOf(Local3)))){ Warning 3144 - Method Local is set but never used ^ (Local3) grammar.asl 913: Device (DEV1) -Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) +Error 6141 - ^ Missing dependency (Device object requires a _HID or _ADR) grammar.asl 963: Divide (Local0, Local1, Local3) Warning 3144 - Method Local is set but never used ^ (Local3) @@ -200,16 +215,16 @@ grammar.asl 1930: Store (RefOf (MAIN), Local5) Warning 3144 - Method Local is set but never used ^ (Local5) grammar.asl 2005: Device (IFEL) -Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) +Error 6141 - ^ Missing dependency (Device object requires a _HID or _ADR) grammar.asl 2162: Device (NOSV) -Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) +Error 6141 - ^ Missing dependency (Device object requires a _HID or _ADR) grammar.asl 2168: Name (WRD, 0x1234) Remark 2173 - ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\NOSV.TEST) grammar.asl 2583: Device (IDXF) -Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) +Error 6141 - ^ Missing dependency (Device object requires a _HID or _ADR) grammar.asl 2611: Store (IFE0, Local0) Warning 3144 - ^ Method Local is set but never used (Local0) @@ -221,10 +236,10 @@ grammar.asl 2613: Store (IFE2, Local2) Warning 3144 - ^ Method Local is set but never used (Local2) grammar.asl 2630: Device (NSTL) -Warning 3141 - Missing dependency ^ (Device object requires a _HID or _ADR in same scope) +Error 6141 - Missing dependency ^ (Device object requires a _HID or _ADR) grammar.asl 2658: Device (RTBF) -Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) +Error 6141 - ^ Missing dependency (Device object requires a _HID or _ADR) grammar.asl 2667: Name (ABUF, Buffer() {"ARBITRARY_BUFFER"}) Remark 2173 - ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\RTBF.RBUF) @@ -233,19 +248,19 @@ grammar.asl 2695: Name (BUFR, Buffer(Local1) {}) Remark 2173 - ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\RTBF.RBUF) grammar.asl 2756: Device (GPE2) -Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) +Error 6141 - ^ Missing dependency (Device object requires a _HID or _ADR) grammar.asl 2771: Device (PRW2) -Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) +Error 6141 - ^ Missing dependency (Device object requires a _HID or _ADR) grammar.asl 2819: Device (PRW1) -Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) +Error 6141 - ^ Missing dependency (Device object requires a _HID or _ADR) grammar.asl 2886: Store (Arg0, Local0) Warning 3144 - ^ Method Local is set but never used (Local0) grammar.asl 2889: Device (RTLV) -Warning 3141 - Missing dependency ^ (Device object requires a _HID or _ADR in same scope) +Error 6141 - Missing dependency ^ (Device object requires a _HID or _ADR) grammar.asl 2989: Device (PCI1) Warning 3073 - Multiple types ^ (Device object requires either a _HID or _ADR, but not both) @@ -254,22 +269,22 @@ grammar.asl 2993: Name (_CRS,0) Error 6105 - ^ Invalid object type for reserved name (_CRS: found Integer, Buffer required) grammar.asl 3017: Device (RETP) -Warning 3141 - Missing dependency ^ (Device object requires a _HID or _ADR in same scope) +Error 6141 - Missing dependency ^ (Device object requires a _HID or _ADR) grammar.asl 3053: Device (WHLR) -Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) +Error 6141 - ^ Missing dependency (Device object requires a _HID or _ADR) grammar.asl 3109: Device (ANDO) -Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) +Error 6141 - ^ Missing dependency (Device object requires a _HID or _ADR) grammar.asl 3343: Name(RSLT,1) Remark 2173 - ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\ANDO.TEST) grammar.asl 3383: Device (BRKP) -Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) +Error 6141 - ^ Missing dependency (Device object requires a _HID or _ADR) grammar.asl 3420: Device (ADSU) -Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) +Error 6141 - ^ Missing dependency (Device object requires a _HID or _ADR) grammar.asl 3435: Name (DWRD, 0x12345678) Remark 2173 - ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\ADSU.TEST) @@ -281,7 +296,7 @@ grammar.asl 3437: Name (BYT, 0x12) Remark 2173 - ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\ADSU.TEST) grammar.asl 3513: Device (INDC) -Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) +Error 6141 - ^ Missing dependency (Device object requires a _HID or _ADR) grammar.asl 3528: Name (DWRD, 0x12345678) Remark 2173 - ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\INDC.TEST) @@ -293,13 +308,13 @@ grammar.asl 3530: Name (BYT, 0x12) Remark 2173 - ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\INDC.TEST) grammar.asl 3611: Device (LOPS) -Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) +Error 6141 - ^ Missing dependency (Device object requires a _HID or _ADR) grammar.asl 3956: Device (FDSO) -Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) +Error 6141 - ^ Missing dependency (Device object requires a _HID or _ADR) grammar.asl 4120: Device (MLDV) -Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) +Error 6141 - ^ Missing dependency (Device object requires a _HID or _ADR) grammar.asl 4135: Name (RMDR, 0) Remark 2173 - ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\MLDV.TEST) @@ -314,13 +329,13 @@ grammar.asl 4138: Name (BYT, 0x12) Remark 2173 - ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\MLDV.TEST) grammar.asl 4253: Device (NBIT) -Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) +Error 6141 - ^ Missing dependency (Device object requires a _HID or _ADR) grammar.asl 4489: Device (SHFT) -Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) +Error 6141 - ^ Missing dependency (Device object requires a _HID or _ADR) grammar.asl 4685: Device (XORD) -Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) +Error 6141 - ^ Missing dependency (Device object requires a _HID or _ADR) grammar.asl 4693: OperationRegion (RAM, SystemMemory, 0x800000, 256) Warning 3175 - ^ Static OperationRegion should be declared outside control method @@ -329,28 +344,28 @@ grammar.asl 4693: OperationRegion (RAM, SystemMemory, 0x800000, 25 Remark 2173 - ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\XORD.TEST) grammar.asl 5022: Device (CRBF) -Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) +Error 6141 - ^ Missing dependency (Device object requires a _HID or _ADR) grammar.asl 5100: Device (IDX4) -Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) +Error 6141 - ^ Missing dependency (Device object requires a _HID or _ADR) grammar.asl 5117: OperationRegion (RAM, SystemMemory, Arg0, 0x100) Remark 2173 - ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\IDX4.MADM) grammar.asl 5639: Device (EVNT) -Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) +Error 6141 - ^ Missing dependency (Device object requires a _HID or _ADR) grammar.asl 5867: Device (SZLV) -Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) +Error 6141 - ^ Missing dependency (Device object requires a _HID or _ADR) grammar.asl 5960: Device (BYTF) -Warning 3141 - Missing dependency ^ (Device object requires a _HID or _ADR in same scope) +Error 6141 - Missing dependency ^ (Device object requires a _HID or _ADR) grammar.asl 5970: Device (C005) -Warning 3141 - Missing dependency ^ (Device object requires a _HID or _ADR in same scope) +Error 6141 - Missing dependency ^ (Device object requires a _HID or _ADR) grammar.asl 5972: Device (C013) -Warning 3141 - Missing dependency ^ (Device object requires a _HID or _ADR in same scope) +Error 6141 - Missing dependency ^ (Device object requires a _HID or _ADR) grammar.asl 6027: Name (_HID, "*PNP0A06") Error 6061 - Invalid leading asterisk ^ (*PNP0A06) @@ -359,13 +374,13 @@ grammar.asl 6166: Name (C18C, Package (2) Remark 2063 - ^ Initializer list shorter than declared package length grammar.asl 6190: Device (C19B) -Warning 3141 - Missing dependency ^ (Device object requires a _HID or _ADR in same scope) +Error 6141 - Missing dependency ^ (Device object requires a _HID or _ADR) grammar.asl 6199: Divide (Local1, 10, Local0, Local2) // Local0 = Local1 / 10 Warning 3144 - Method Local is set but never used ^ (Local0) grammar.asl 6244: Device (DWDF) -Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) +Error 6141 - ^ Missing dependency (Device object requires a _HID or _ADR) grammar.asl 6276: Method (MKW_, 2) Remark 2146 - ^ Method Argument is never used (Arg0) @@ -374,13 +389,13 @@ grammar.asl 6276: Method (MKW_, 2) Remark 2146 - ^ Method Argument is never used (Arg1) grammar.asl 6285: Device (DVAX) -Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) +Error 6141 - ^ Missing dependency (Device object requires a _HID or _ADR) grammar.asl 6328: Device (IDX6) -Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) +Error 6141 - ^ Missing dependency (Device object requires a _HID or _ADR) grammar.asl 6352: Device (TST_) -Warning 3141 - Missing dependency ^ (Device object requires a _HID or _ADR in same scope) +Error 6141 - Missing dependency ^ (Device object requires a _HID or _ADR) grammar.asl 6371: Store (IFE0, Local0) Warning 3144 - ^ Method Local is set but never used (Local0) @@ -404,7 +419,7 @@ grammar.asl 6380: Store (\IDX6.TST_.IFE1, Local6) Warning 3144 - Method Local is set but never used ^ (Local6) grammar.asl 6393: Device (IDX5) -Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) +Error 6141 - ^ Missing dependency (Device object requires a _HID or _ADR) grammar.asl 6416: Name (BUF0, Buffer (Local0) {}) Remark 2173 - ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\IDX5.MCTH) @@ -431,7 +446,7 @@ grammar.asl 6625: Name (BUFR, Buffer(16) Remark 2173 - ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\_SB.IDX0.TEST) grammar.asl 6709: Device (BITI) -Warning 3141 - Missing dependency ^ (Device object requires a _HID or _ADR in same scope) +Error 6141 - Missing dependency ^ (Device object requires a _HID or _ADR) grammar.asl 6817: And (Local0, 1, Local0) // Local0 &= 1 Error 6066 - ^ Method local variable is not initialized (Local0) @@ -443,7 +458,7 @@ grammar.asl 6903: Name (_HID, "*PNP0C0A") // Control Method B Error 6061 - Invalid leading asterisk ^ (*PNP0C0A) grammar.asl 6912: Device (IDX3) -Warning 3141 - Missing dependency ^ (Device object requires a _HID or _ADR in same scope) +Error 6141 - Missing dependency ^ (Device object requires a _HID or _ADR) grammar.asl 6922: Name (BUFR, Buffer () {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}) Remark 2173 - ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\_SB.IDX3.LCLB) @@ -452,7 +467,7 @@ grammar.asl 6974: Name (PKG, Package () {0, 1, 2, 3, 4, 5, 6 Remark 2173 - ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\_SB.IDX3.LCLP) grammar.asl 7057: Device(IDX7) -Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) +Error 6141 - ^ Missing dependency (Device object requires a _HID or _ADR) grammar.asl 7074: Name (DEST, Buffer () // 62 characters plus NULL Remark 2173 - ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\IDX7.TST1) @@ -491,7 +506,7 @@ grammar.asl 7556: Name (DBUF, Buffer () {"abcdefghijklmnopqrstuvwx Remark 2173 - ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\IDX7.TSTL) grammar.asl 7736: Device (MTCH) -Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) +Error 6141 - ^ Missing dependency (Device object requires a _HID or _ADR) grammar.asl 7743: Name (TIM0, Package () Remark 2173 - ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\MTCH.TEST) @@ -512,13 +527,13 @@ grammar.asl 7760: CreateDWordField (TMD0, 16, CHNF) Remark 2089 - Object is not referenced ^ (Name [CHNF] is within a method [TEST]) grammar.asl 7934: Device (WHLB) -Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) +Error 6141 - ^ Missing dependency (Device object requires a _HID or _ADR) grammar.asl 8275: Name (BUFR, Package (13) {}) Remark 2173 - ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\_SB.BAT1._BIF) grammar.asl 8295: Device (IDX2) -Warning 3141 - Missing dependency ^ (Device object requires a _HID or _ADR in same scope) +Error 6141 - Missing dependency ^ (Device object requires a _HID or _ADR) grammar.asl 8300: Name (SRCB, Buffer () {"Short Buffer"}) // 12 characters plus NULL Remark 2173 - ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\_SB.IDX2.B2IB) @@ -530,7 +545,7 @@ grammar.asl 8493: Name (DEST, Package (2) {}) Remark 2173 - ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\_SB.IDX2.FB2P) grammar.asl 8678: Device (SIZO) -Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) +Error 6141 - ^ Missing dependency (Device object requires a _HID or _ADR) grammar.asl 8708: Name (BUFR, Buffer (12) {}) // uninitialized Buffer Remark 2173 - ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\SIZO.SARG) @@ -563,19 +578,19 @@ grammar.asl 9132: Store (_OS, Local0) Warning 3144 - ^ Method Local is set but never used (Local0) grammar.asl 9262: Device (MBIT) -Warning 3141 - Missing dependency ^ (Device object requires a _HID or _ADR in same scope) +Error 6141 - Missing dependency ^ (Device object requires a _HID or _ADR) grammar.asl 9273: Device (MWRD) -Warning 3141 - Missing dependency ^ (Device object requires a _HID or _ADR in same scope) +Error 6141 - Missing dependency ^ (Device object requires a _HID or _ADR) grammar.asl 9281: Device (MBYT) -Warning 3141 - Missing dependency ^ (Device object requires a _HID or _ADR in same scope) +Error 6141 - Missing dependency ^ (Device object requires a _HID or _ADR) grammar.asl 9354: Device (SMIS) -Warning 3141 - Missing dependency ^ (Device object requires a _HID or _ADR in same scope) +Error 6141 - Missing dependency ^ (Device object requires a _HID or _ADR) grammar.asl 9408: Device(CNDT) -Warning 3141 - Missing dependency ^ (Device object requires a _HID or _ADR in same scope) +Error 6141 - Missing dependency ^ (Device object requires a _HID or _ADR) Intel ACPI Component Architecture @@ -587,4 +602,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, 93 Warnings, 94 Remarks, 1106 Optimizations +Compilation successful. 60 Errors, 41 Warnings, 97 Remarks, 1106 Optimizations diff --git a/ull-32bit.patch b/ull-32bit.patch index 7d0580b..17cfe58 100644 --- a/ull-32bit.patch +++ b/ull-32bit.patch @@ -1,8 +1,8 @@ -Index: acpica-unix2-20210604/source/common/dmtbdump.c +Index: acpica-unix2-20211217/source/common/dmtbdump.c =================================================================== ---- acpica-unix2-20210604.orig/source/common/dmtbdump.c -+++ acpica-unix2-20210604/source/common/dmtbdump.c -@@ -338,7 +338,11 @@ AcpiDmDumpXsdt ( +--- acpica-unix2-20211217.orig/source/common/dmtbdump.c ++++ acpica-unix2-20211217/source/common/dmtbdump.c +@@ -392,7 +392,11 @@ AcpiDmDumpXsdt ( for (i = 0; i < Entries; i++) { AcpiDmLineHeader2 (Offset, sizeof (UINT64), "ACPI Table Address", i);