Update to 20220331 upstream sources

This includes new source tarballs, updated patches, and updated
expected results for test cases.  In addition, three new tables
(PRMT, RGRT and SVKL) now have big-endian support.

Signed-off-by: Al Stone <ahs3@redhat.com>
This commit is contained in:
Al Stone 2022-04-03 15:18:02 -06:00
parent cf71d6aebb
commit fc3eef63e8
70 changed files with 783 additions and 648 deletions

2
.gitignore vendored
View File

@ -154,3 +154,5 @@ series
/acpitests-unix-20210930.tar.gz /acpitests-unix-20210930.tar.gz
/acpica-unix2-20211217.tar.gz /acpica-unix2-20211217.tar.gz
/acpitests-unix-20211217.tar.gz /acpitests-unix-20211217.tar.gz
/acpica-unix2-20220331.tar.gz
/acpitests-unix-20220331.tar.gz

View File

@ -35,10 +35,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
12 files changed, 275 insertions(+), 87 deletions(-) 12 files changed, 275 insertions(+), 87 deletions(-)
create mode 100644 source/components/utilities/utendian.c create mode 100644 source/components/utilities/utendian.c
Index: acpica-unix2-20210730/generate/unix/acpibin/Makefile Index: acpica-unix2-20220331/generate/unix/acpibin/Makefile
=================================================================== ===================================================================
--- acpica-unix2-20210730.orig/generate/unix/acpibin/Makefile --- acpica-unix2-20220331.orig/generate/unix/acpibin/Makefile
+++ acpica-unix2-20210730/generate/unix/acpibin/Makefile +++ acpica-unix2-20220331/generate/unix/acpibin/Makefile
@@ -37,6 +37,7 @@ OBJECTS = \ @@ -37,6 +37,7 @@ OBJECTS = \
$(OBJDIR)/utcache.o\ $(OBJDIR)/utcache.o\
$(OBJDIR)/utdebug.o\ $(OBJDIR)/utdebug.o\
@ -47,10 +47,10 @@ Index: acpica-unix2-20210730/generate/unix/acpibin/Makefile
$(OBJDIR)/utexcep.o\ $(OBJDIR)/utexcep.o\
$(OBJDIR)/utglobal.o\ $(OBJDIR)/utglobal.o\
$(OBJDIR)/utlock.o\ $(OBJDIR)/utlock.o\
Index: acpica-unix2-20210730/generate/unix/acpidump/Makefile Index: acpica-unix2-20220331/generate/unix/acpidump/Makefile
=================================================================== ===================================================================
--- acpica-unix2-20210730.orig/generate/unix/acpidump/Makefile --- acpica-unix2-20220331.orig/generate/unix/acpidump/Makefile
+++ acpica-unix2-20210730/generate/unix/acpidump/Makefile +++ acpica-unix2-20220331/generate/unix/acpidump/Makefile
@@ -36,6 +36,7 @@ OBJECTS = \ @@ -36,6 +36,7 @@ OBJECTS = \
$(OBJDIR)/osunixdir.o\ $(OBJDIR)/osunixdir.o\
$(OBJDIR)/osunixmap.o\ $(OBJDIR)/osunixmap.o\
@ -59,10 +59,10 @@ Index: acpica-unix2-20210730/generate/unix/acpidump/Makefile
$(OBJDIR)/tbprint.o\ $(OBJDIR)/tbprint.o\
$(OBJDIR)/tbxfroot.o\ $(OBJDIR)/tbxfroot.o\
$(OBJDIR)/utascii.o\ $(OBJDIR)/utascii.o\
Index: acpica-unix2-20210730/generate/unix/acpiexamples/Makefile Index: acpica-unix2-20220331/generate/unix/acpiexamples/Makefile
=================================================================== ===================================================================
--- acpica-unix2-20210730.orig/generate/unix/acpiexamples/Makefile --- acpica-unix2-20220331.orig/generate/unix/acpiexamples/Makefile
+++ acpica-unix2-20210730/generate/unix/acpiexamples/Makefile +++ acpica-unix2-20220331/generate/unix/acpiexamples/Makefile
@@ -139,6 +139,7 @@ OBJECTS = \ @@ -139,6 +139,7 @@ OBJECTS = \
$(OBJDIR)/utdebug.o\ $(OBJDIR)/utdebug.o\
$(OBJDIR)/utdecode.o\ $(OBJDIR)/utdecode.o\
@ -71,10 +71,10 @@ Index: acpica-unix2-20210730/generate/unix/acpiexamples/Makefile
$(OBJDIR)/uterror.o\ $(OBJDIR)/uterror.o\
$(OBJDIR)/uteval.o\ $(OBJDIR)/uteval.o\
$(OBJDIR)/utexcep.o\ $(OBJDIR)/utexcep.o\
Index: acpica-unix2-20210730/generate/unix/acpiexec/Makefile Index: acpica-unix2-20220331/generate/unix/acpiexec/Makefile
=================================================================== ===================================================================
--- acpica-unix2-20210730.orig/generate/unix/acpiexec/Makefile --- acpica-unix2-20220331.orig/generate/unix/acpiexec/Makefile
+++ acpica-unix2-20210730/generate/unix/acpiexec/Makefile +++ acpica-unix2-20220331/generate/unix/acpiexec/Makefile
@@ -214,6 +214,7 @@ OBJECTS = \ @@ -214,6 +214,7 @@ OBJECTS = \
$(OBJDIR)/utdebug.o\ $(OBJDIR)/utdebug.o\
$(OBJDIR)/utdecode.o\ $(OBJDIR)/utdecode.o\
@ -83,10 +83,10 @@ Index: acpica-unix2-20210730/generate/unix/acpiexec/Makefile
$(OBJDIR)/uterror.o\ $(OBJDIR)/uterror.o\
$(OBJDIR)/uteval.o\ $(OBJDIR)/uteval.o\
$(OBJDIR)/utexcep.o\ $(OBJDIR)/utexcep.o\
Index: acpica-unix2-20210730/generate/unix/acpihelp/Makefile Index: acpica-unix2-20220331/generate/unix/acpihelp/Makefile
=================================================================== ===================================================================
--- acpica-unix2-20210730.orig/generate/unix/acpihelp/Makefile --- acpica-unix2-20220331.orig/generate/unix/acpihelp/Makefile
+++ acpica-unix2-20210730/generate/unix/acpihelp/Makefile +++ acpica-unix2-20220331/generate/unix/acpihelp/Makefile
@@ -45,6 +45,7 @@ OBJECTS = \ @@ -45,6 +45,7 @@ OBJECTS = \
$(OBJDIR)/getopt.o\ $(OBJDIR)/getopt.o\
$(OBJDIR)/osunixxf.o\ $(OBJDIR)/osunixxf.o\
@ -95,10 +95,10 @@ Index: acpica-unix2-20210730/generate/unix/acpihelp/Makefile
$(OBJDIR)/utexcep.o\ $(OBJDIR)/utexcep.o\
$(OBJDIR)/utglobal.o\ $(OBJDIR)/utglobal.o\
$(OBJDIR)/uthex.o\ $(OBJDIR)/uthex.o\
Index: acpica-unix2-20210730/generate/unix/iasl/Makefile Index: acpica-unix2-20220331/generate/unix/iasl/Makefile
=================================================================== ===================================================================
--- acpica-unix2-20210730.orig/generate/unix/iasl/Makefile --- acpica-unix2-20220331.orig/generate/unix/iasl/Makefile
+++ acpica-unix2-20210730/generate/unix/iasl/Makefile +++ acpica-unix2-20220331/generate/unix/iasl/Makefile
@@ -225,6 +225,7 @@ OBJECTS = \ @@ -225,6 +225,7 @@ OBJECTS = \
$(OBJDIR)/utdebug.o\ $(OBJDIR)/utdebug.o\
$(OBJDIR)/utdecode.o\ $(OBJDIR)/utdecode.o\
@ -107,10 +107,10 @@ Index: acpica-unix2-20210730/generate/unix/iasl/Makefile
$(OBJDIR)/uterror.o\ $(OBJDIR)/uterror.o\
$(OBJDIR)/utexcep.o\ $(OBJDIR)/utexcep.o\
$(OBJDIR)/utglobal.o\ $(OBJDIR)/utglobal.o\
Index: acpica-unix2-20210730/source/compiler/aslcompiler.h Index: acpica-unix2-20220331/source/compiler/aslcompiler.h
=================================================================== ===================================================================
--- acpica-unix2-20210730.orig/source/compiler/aslcompiler.h --- acpica-unix2-20220331.orig/source/compiler/aslcompiler.h
+++ acpica-unix2-20210730/source/compiler/aslcompiler.h +++ acpica-unix2-20220331/source/compiler/aslcompiler.h
@@ -1120,10 +1120,6 @@ BOOLEAN @@ -1120,10 +1120,6 @@ BOOLEAN
UtIsIdInteger ( UtIsIdInteger (
UINT8 *Target); UINT8 *Target);
@ -122,10 +122,10 @@ Index: acpica-unix2-20210730/source/compiler/aslcompiler.h
BOOLEAN BOOLEAN
UtQueryForOverwrite ( UtQueryForOverwrite (
char *Pathname); char *Pathname);
Index: acpica-unix2-20210730/source/compiler/aslutils.c Index: acpica-unix2-20220331/source/compiler/aslutils.c
=================================================================== ===================================================================
--- acpica-unix2-20210730.orig/source/compiler/aslutils.c --- acpica-unix2-20220331.orig/source/compiler/aslutils.c
+++ acpica-unix2-20210730/source/compiler/aslutils.c +++ acpica-unix2-20220331/source/compiler/aslutils.c
@@ -73,33 +73,6 @@ UtDisplayErrorSummary ( @@ -73,33 +73,6 @@ UtDisplayErrorSummary (
/******************************************************************************* /*******************************************************************************
@ -160,10 +160,10 @@ Index: acpica-unix2-20210730/source/compiler/aslutils.c
* FUNCTION: UtIsIdInteger * FUNCTION: UtIsIdInteger
* *
* PARAMETERS: Pointer to an ACPI ID (HID, CID) string * PARAMETERS: Pointer to an ACPI ID (HID, CID) string
Index: acpica-unix2-20210730/source/components/utilities/utendian.c Index: acpica-unix2-20220331/source/components/utilities/utendian.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ acpica-unix2-20210730/source/components/utilities/utendian.c +++ acpica-unix2-20220331/source/components/utilities/utendian.c
@@ -0,0 +1,236 @@ @@ -0,0 +1,236 @@
+/****************************************************************************** +/******************************************************************************
+ * + *
@ -401,10 +401,10 @@ Index: acpica-unix2-20210730/source/components/utilities/utendian.c
+ Dst[ii] = Src[SrcLength - ii - 1]; + Dst[ii] = Src[SrcLength - ii - 1];
+ +
+} +}
Index: acpica-unix2-20210730/source/include/acmacros.h Index: acpica-unix2-20220331/source/include/acmacros.h
=================================================================== ===================================================================
--- acpica-unix2-20210730.orig/source/include/acmacros.h --- acpica-unix2-20220331.orig/source/include/acmacros.h
+++ acpica-unix2-20210730/source/include/acmacros.h +++ acpica-unix2-20220331/source/include/acmacros.h
@@ -76,61 +76,6 @@ @@ -76,61 +76,6 @@
* If the hardware supports the transfer of unaligned data, just do the store. * If the hardware supports the transfer of unaligned data, just do the store.
* Otherwise, we have to move one byte at a time. * Otherwise, we have to move one byte at a time.
@ -475,10 +475,10 @@ Index: acpica-unix2-20210730/source/include/acmacros.h
/* /*
Index: acpica-unix2-20210730/source/include/acutils.h Index: acpica-unix2-20220331/source/include/acutils.h
=================================================================== ===================================================================
--- acpica-unix2-20210730.orig/source/include/acutils.h --- acpica-unix2-20220331.orig/source/include/acutils.h
+++ acpica-unix2-20210730/source/include/acutils.h +++ acpica-unix2-20220331/source/include/acutils.h
@@ -1167,4 +1167,36 @@ AcpiUtConvertUuidToString ( @@ -1167,4 +1167,36 @@ AcpiUtConvertUuidToString (
char *OutString); char *OutString);
#endif #endif
@ -516,11 +516,11 @@ Index: acpica-unix2-20210730/source/include/acutils.h
+#endif +#endif
+ +
#endif /* _ACUTILS_H */ #endif /* _ACUTILS_H */
Index: acpica-unix2-20210730/source/include/platform/aclinux.h Index: acpica-unix2-20220331/source/include/platform/aclinux.h
=================================================================== ===================================================================
--- acpica-unix2-20210730.orig/source/include/platform/aclinux.h --- acpica-unix2-20220331.orig/source/include/platform/aclinux.h
+++ acpica-unix2-20210730/source/include/platform/aclinux.h +++ acpica-unix2-20220331/source/include/platform/aclinux.h
@@ -198,6 +198,7 @@ @@ -203,6 +203,7 @@
#ifdef ACPI_USE_STANDARD_HEADERS #ifdef ACPI_USE_STANDARD_HEADERS
#include <unistd.h> #include <unistd.h>

View File

@ -24,10 +24,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/components/tables/tbprint.c | 13 +++++++++---- source/components/tables/tbprint.c | 13 +++++++++----
5 files changed, 26 insertions(+), 17 deletions(-) 5 files changed, 26 insertions(+), 17 deletions(-)
Index: acpica-unix2-20211217/source/common/acfileio.c Index: acpica-unix2-20220331/source/common/acfileio.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/common/acfileio.c --- acpica-unix2-20220331.orig/source/common/acfileio.c
+++ acpica-unix2-20211217/source/common/acfileio.c +++ acpica-unix2-20220331/source/common/acfileio.c
@@ -280,6 +280,7 @@ AcGetOneTableFromFile ( @@ -280,6 +280,7 @@ AcGetOneTableFromFile (
ACPI_TABLE_HEADER *Table; ACPI_TABLE_HEADER *Table;
INT32 Count; INT32 Count;
@ -94,11 +94,11 @@ Index: acpica-unix2-20211217/source/common/acfileio.c
(UINT32) (FileSize - TableOffset)); (UINT32) (FileSize - TableOffset));
return (AE_BAD_HEADER); return (AE_BAD_HEADER);
} }
Index: acpica-unix2-20211217/source/common/dmtable.c Index: acpica-unix2-20220331/source/common/dmtable.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/common/dmtable.c --- acpica-unix2-20220331.orig/source/common/dmtable.c
+++ acpica-unix2-20211217/source/common/dmtable.c +++ acpica-unix2-20220331/source/common/dmtable.c
@@ -710,7 +710,7 @@ AcpiDmDumpDataTable ( @@ -713,7 +713,7 @@ AcpiDmDumpDataTable (
{ {
/* Dump the raw table data */ /* Dump the raw table data */
@ -107,7 +107,7 @@ Index: acpica-unix2-20211217/source/common/dmtable.c
AcpiOsPrintf ("\n/*\n%s: Length %d (0x%X)\n\n", AcpiOsPrintf ("\n/*\n%s: Length %d (0x%X)\n\n",
ACPI_RAW_TABLE_DATA_HEADER, Length, Length); ACPI_RAW_TABLE_DATA_HEADER, Length, Length);
@@ -727,7 +727,7 @@ AcpiDmDumpDataTable ( @@ -730,7 +730,7 @@ AcpiDmDumpDataTable (
*/ */
if (ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_FACS)) if (ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_FACS))
{ {
@ -116,7 +116,7 @@ Index: acpica-unix2-20211217/source/common/dmtable.c
Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoFacs); Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoFacs);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
@@ -748,7 +748,7 @@ AcpiDmDumpDataTable ( @@ -751,7 +751,7 @@ AcpiDmDumpDataTable (
/* /*
* All other tables must use the common ACPI table header, dump it now * All other tables must use the common ACPI table header, dump it now
*/ */
@ -125,7 +125,7 @@ Index: acpica-unix2-20211217/source/common/dmtable.c
Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoHeader); Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoHeader);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
@@ -1407,7 +1407,7 @@ AcpiDmDumpTable ( @@ -1415,7 +1415,7 @@ AcpiDmDumpTable (
AcpiOsPrintf ("%2.2X", *Target); AcpiOsPrintf ("%2.2X", *Target);
Temp8 = AcpiDmGenerateChecksum (Table, Temp8 = AcpiDmGenerateChecksum (Table,
@ -134,10 +134,10 @@ Index: acpica-unix2-20211217/source/common/dmtable.c
ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Checksum); ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Checksum);
if (Temp8 != ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Checksum) if (Temp8 != ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Checksum)
Index: acpica-unix2-20211217/source/compiler/dtfield.c Index: acpica-unix2-20220331/source/compiler/dtfield.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/compiler/dtfield.c --- acpica-unix2-20220331.orig/source/compiler/dtfield.c
+++ acpica-unix2-20211217/source/compiler/dtfield.c +++ acpica-unix2-20220331/source/compiler/dtfield.c
@@ -361,7 +361,7 @@ DtCompileInteger ( @@ -361,7 +361,7 @@ DtCompileInteger (
DtError (ASL_ERROR, ASL_MSG_INTEGER_SIZE, Field, AslGbl_MsgBuffer); DtError (ASL_ERROR, ASL_MSG_INTEGER_SIZE, Field, AslGbl_MsgBuffer);
} }
@ -147,10 +147,10 @@ Index: acpica-unix2-20211217/source/compiler/dtfield.c
return; return;
} }
Index: acpica-unix2-20211217/source/compiler/dtsubtable.c Index: acpica-unix2-20220331/source/compiler/dtsubtable.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/compiler/dtsubtable.c --- acpica-unix2-20220331.orig/source/compiler/dtsubtable.c
+++ acpica-unix2-20211217/source/compiler/dtsubtable.c +++ acpica-unix2-20220331/source/compiler/dtsubtable.c
@@ -378,6 +378,6 @@ DtSetSubtableLength ( @@ -378,6 +378,6 @@ DtSetSubtableLength (
return; return;
} }
@ -160,10 +160,10 @@ Index: acpica-unix2-20211217/source/compiler/dtsubtable.c
+ AcpiUtWriteUint (Subtable->LengthField, Subtable->SizeOfLengthField, + AcpiUtWriteUint (Subtable->LengthField, Subtable->SizeOfLengthField,
+ &Subtable->TotalLength, sizeof (Subtable->TotalLength)); + &Subtable->TotalLength, sizeof (Subtable->TotalLength));
} }
Index: acpica-unix2-20211217/source/components/tables/tbprint.c Index: acpica-unix2-20220331/source/components/tables/tbprint.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/components/tables/tbprint.c --- acpica-unix2-20220331.orig/source/components/tables/tbprint.c
+++ acpica-unix2-20211217/source/components/tables/tbprint.c +++ acpica-unix2-20220331/source/components/tables/tbprint.c
@@ -44,6 +44,8 @@ @@ -44,6 +44,8 @@
#include "acpi.h" #include "acpi.h"
#include "accommon.h" #include "accommon.h"

View File

@ -13,10 +13,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/tools/acpibin/abcompare.c | 7 ++++--- source/tools/acpibin/abcompare.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-) 1 file changed, 4 insertions(+), 3 deletions(-)
Index: acpica-unix2-20210730/source/tools/acpibin/abcompare.c Index: acpica-unix2-20220331/source/tools/acpibin/abcompare.c
=================================================================== ===================================================================
--- acpica-unix2-20210730.orig/source/tools/acpibin/abcompare.c --- acpica-unix2-20220331.orig/source/tools/acpibin/abcompare.c
+++ acpica-unix2-20210730/source/tools/acpibin/abcompare.c +++ acpica-unix2-20220331/source/tools/acpibin/abcompare.c
@@ -42,6 +42,7 @@ @@ -42,6 +42,7 @@
*/ */

View File

@ -13,10 +13,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/components/namespace/nsutils.c | 7 +++++-- source/components/namespace/nsutils.c | 7 +++++--
2 files changed, 5 insertions(+), 14 deletions(-) 2 files changed, 5 insertions(+), 14 deletions(-)
Index: acpica-unix2-20210730/source/compiler/aslmain.c Index: acpica-unix2-20220331/source/compiler/aslmain.c
=================================================================== ===================================================================
--- acpica-unix2-20210730.orig/source/compiler/aslmain.c --- acpica-unix2-20220331.orig/source/compiler/aslmain.c
+++ acpica-unix2-20210730/source/compiler/aslmain.c +++ acpica-unix2-20220331/source/compiler/aslmain.c
@@ -101,18 +101,6 @@ main ( @@ -101,18 +101,6 @@ main (
signal (SIGINT, AslSignalHandler); signal (SIGINT, AslSignalHandler);
@ -36,10 +36,10 @@ Index: acpica-unix2-20210730/source/compiler/aslmain.c
AcpiOsInitialize (); AcpiOsInitialize ();
ACPI_DEBUG_INITIALIZE (); /* For debug version only */ ACPI_DEBUG_INITIALIZE (); /* For debug version only */
Index: acpica-unix2-20210730/source/components/namespace/nsutils.c Index: acpica-unix2-20220331/source/components/namespace/nsutils.c
=================================================================== ===================================================================
--- acpica-unix2-20210730.orig/source/components/namespace/nsutils.c --- acpica-unix2-20220331.orig/source/components/namespace/nsutils.c
+++ acpica-unix2-20210730/source/components/namespace/nsutils.c +++ acpica-unix2-20220331/source/components/namespace/nsutils.c
@@ -272,6 +272,7 @@ AcpiNsBuildInternalName ( @@ -272,6 +272,7 @@ AcpiNsBuildInternalName (
const char *ExternalName = Info->NextExternalChar; const char *ExternalName = Info->NextExternalChar;
char *Result = NULL; char *Result = NULL;

View File

@ -9,10 +9,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/compiler/cvparser.c | 5 +++-- source/compiler/cvparser.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-) 1 file changed, 3 insertions(+), 2 deletions(-)
Index: acpica-unix2-20210730/source/compiler/cvparser.c Index: acpica-unix2-20220331/source/compiler/cvparser.c
=================================================================== ===================================================================
--- acpica-unix2-20210730.orig/source/compiler/cvparser.c --- acpica-unix2-20220331.orig/source/compiler/cvparser.c
+++ acpica-unix2-20210730/source/compiler/cvparser.c +++ acpica-unix2-20220331/source/compiler/cvparser.c
@@ -144,6 +144,7 @@ CvInitFileTree ( @@ -144,6 +144,7 @@ CvInitFileTree (
char *ChildFilename = NULL; char *ChildFilename = NULL;
UINT8 *AmlStart; UINT8 *AmlStart;

View File

@ -8,10 +8,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/compiler/aslanalyze.c | 4 ++-- source/compiler/aslanalyze.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
Index: acpica-unix2-20210730/source/compiler/aslanalyze.c Index: acpica-unix2-20220331/source/compiler/aslanalyze.c
=================================================================== ===================================================================
--- acpica-unix2-20210730.orig/source/compiler/aslanalyze.c --- acpica-unix2-20220331.orig/source/compiler/aslanalyze.c
+++ acpica-unix2-20210730/source/compiler/aslanalyze.c +++ acpica-unix2-20220331/source/compiler/aslanalyze.c
@@ -469,7 +469,7 @@ ApCheckForGpeNameConflict ( @@ -469,7 +469,7 @@ ApCheckForGpeNameConflict (
/* Need a null-terminated string version of NameSeg */ /* Need a null-terminated string version of NameSeg */

View File

@ -8,10 +8,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/common/dmtbdump.c | 11 ++++++++--- source/common/dmtbdump.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-) 1 file changed, 8 insertions(+), 3 deletions(-)
Index: acpica-unix2-20211217/source/common/dmtbdump.c Index: acpica-unix2-20220331/source/common/dmtbdump.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/common/dmtbdump.c --- acpica-unix2-20220331.orig/source/common/dmtbdump.c
+++ acpica-unix2-20211217/source/common/dmtbdump.c +++ acpica-unix2-20220331/source/common/dmtbdump.c
@@ -200,6 +200,8 @@ AcpiDmDumpUnicode ( @@ -200,6 +200,8 @@ AcpiDmDumpUnicode (
UINT8 *Buffer; UINT8 *Buffer;
UINT32 Length; UINT32 Length;

View File

@ -8,10 +8,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/common/dmtbdump2.c | 4 ++-- source/common/dmtbdump2.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
Index: acpica-unix2-20210730/source/common/dmtbdump2.c Index: acpica-unix2-20220331/source/common/dmtbdump2.c
=================================================================== ===================================================================
--- acpica-unix2-20210730.orig/source/common/dmtbdump2.c --- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
+++ acpica-unix2-20210730/source/common/dmtbdump2.c +++ acpica-unix2-20220331/source/common/dmtbdump2.c
@@ -763,7 +763,7 @@ AcpiDmDumpMadt ( @@ -763,7 +763,7 @@ AcpiDmDumpMadt (
{ {
ACPI_STATUS Status; ACPI_STATUS Status;
@ -21,10 +21,10 @@ Index: acpica-unix2-20210730/source/common/dmtbdump2.c
UINT32 Offset = sizeof (ACPI_TABLE_MADT); UINT32 Offset = sizeof (ACPI_TABLE_MADT);
ACPI_DMTABLE_INFO *InfoTable; ACPI_DMTABLE_INFO *InfoTable;
@@ -779,7 +779,7 @@ AcpiDmDumpMadt ( @@ -781,7 +781,7 @@ AcpiDmDumpMadt (
/* Subtables */
Subtable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Table, Offset); Subtable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Table, Offset);
DbgPrint (ASL_PARSE_OUTPUT, "//0B) Offset %X, from table start: 0x%8.8X%8.8X\n",
Offset, ACPI_FORMAT_UINT64 (ACPI_CAST_PTR (char, Subtable) - ACPI_CAST_PTR (char, Table)));
- while (Offset < Table->Length) - while (Offset < Table->Length)
+ while (Offset < Length) + while (Offset < Length)
{ {

View File

@ -10,11 +10,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/common/dmtbdump1.c | 10 ++++++---- source/common/dmtbdump1.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-) 1 file changed, 6 insertions(+), 4 deletions(-)
Index: acpica-unix2-20211217/source/common/dmtbdump1.c Index: acpica-unix2-20220331/source/common/dmtbdump1.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/common/dmtbdump1.c --- acpica-unix2-20220331.orig/source/common/dmtbdump1.c
+++ acpica-unix2-20211217/source/common/dmtbdump1.c +++ acpica-unix2-20220331/source/common/dmtbdump1.c
@@ -296,16 +296,18 @@ AcpiDmDumpAsf ( @@ -358,16 +358,18 @@ AcpiDmDumpAsf (
UINT32 DataOffset = 0; UINT32 DataOffset = 0;
UINT32 i; UINT32 i;
UINT8 Type; UINT8 Type;
@ -35,7 +35,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
Subtable->Header.Length, AcpiDmTableInfoAsfHdr); Subtable->Header.Length, AcpiDmTableInfoAsfHdr);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
@@ -363,7 +365,7 @@ AcpiDmDumpAsf ( @@ -425,7 +427,7 @@ AcpiDmDumpAsf (
return; return;
} }
@ -44,7 +44,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
Subtable->Header.Length, InfoTable); Subtable->Header.Length, InfoTable);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
@@ -380,7 +382,7 @@ AcpiDmDumpAsf ( @@ -442,7 +444,7 @@ AcpiDmDumpAsf (
for (i = 0; i < DataCount; i++) for (i = 0; i < DataCount; i++)
{ {
AcpiOsPrintf ("\n"); AcpiOsPrintf ("\n");

View File

@ -8,11 +8,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/common/dmtbdump1.c | 4 ++-- source/common/dmtbdump1.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
Index: acpica-unix2-20211217/source/common/dmtbdump1.c Index: acpica-unix2-20220331/source/common/dmtbdump1.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/common/dmtbdump1.c --- acpica-unix2-20220331.orig/source/common/dmtbdump1.c
+++ acpica-unix2-20211217/source/common/dmtbdump1.c +++ acpica-unix2-20220331/source/common/dmtbdump1.c
@@ -536,7 +536,7 @@ AcpiDmDumpCpep ( @@ -614,7 +614,7 @@ AcpiDmDumpCpep (
{ {
ACPI_STATUS Status; ACPI_STATUS Status;
ACPI_CPEP_POLLING *Subtable; ACPI_CPEP_POLLING *Subtable;
@ -21,7 +21,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
UINT32 Offset = sizeof (ACPI_TABLE_CPEP); UINT32 Offset = sizeof (ACPI_TABLE_CPEP);
@@ -551,7 +551,7 @@ AcpiDmDumpCpep ( @@ -629,7 +629,7 @@ AcpiDmDumpCpep (
/* Subtables */ /* Subtables */
Subtable = ACPI_ADD_PTR (ACPI_CPEP_POLLING, Table, Offset); Subtable = ACPI_ADD_PTR (ACPI_CPEP_POLLING, Table, Offset);

View File

@ -9,11 +9,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/compiler/dttable1.c | 43 ++++++++++++++++++++++++-------------- source/compiler/dttable1.c | 43 ++++++++++++++++++++++++--------------
2 files changed, 48 insertions(+), 32 deletions(-) 2 files changed, 48 insertions(+), 32 deletions(-)
Index: acpica-unix2-20211217/source/common/dmtbdump1.c Index: acpica-unix2-20220331/source/common/dmtbdump1.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/common/dmtbdump1.c --- acpica-unix2-20220331.orig/source/common/dmtbdump1.c
+++ acpica-unix2-20211217/source/common/dmtbdump1.c +++ acpica-unix2-20220331/source/common/dmtbdump1.c
@@ -591,7 +591,7 @@ AcpiDmDumpCsrt ( @@ -669,7 +669,7 @@ AcpiDmDumpCsrt (
ACPI_CSRT_GROUP *Subtable; ACPI_CSRT_GROUP *Subtable;
ACPI_CSRT_SHARED_INFO *SharedInfoTable; ACPI_CSRT_SHARED_INFO *SharedInfoTable;
ACPI_CSRT_DESCRIPTOR *SubSubtable; ACPI_CSRT_DESCRIPTOR *SubSubtable;
@ -22,7 +22,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
UINT32 Offset = sizeof (ACPI_TABLE_CSRT); UINT32 Offset = sizeof (ACPI_TABLE_CSRT);
UINT32 SubOffset; UINT32 SubOffset;
UINT32 SubSubOffset; UINT32 SubSubOffset;
@@ -603,7 +603,7 @@ AcpiDmDumpCsrt ( @@ -681,7 +681,7 @@ AcpiDmDumpCsrt (
/* Subtables (Resource Groups) */ /* Subtables (Resource Groups) */
Subtable = ACPI_ADD_PTR (ACPI_CSRT_GROUP, Table, Offset); Subtable = ACPI_ADD_PTR (ACPI_CSRT_GROUP, Table, Offset);
@ -31,7 +31,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
{ {
/* Resource group subtable */ /* Resource group subtable */
@@ -637,7 +637,7 @@ AcpiDmDumpCsrt ( @@ -715,7 +715,7 @@ AcpiDmDumpCsrt (
Offset + SubOffset); Offset + SubOffset);
while ((SubOffset < Subtable->Length) && while ((SubOffset < Subtable->Length) &&
@ -40,7 +40,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
{ {
AcpiOsPrintf ("\n"); AcpiOsPrintf ("\n");
Status = AcpiDmDumpTable (Length, Offset + SubOffset, SubSubtable, Status = AcpiDmDumpTable (Length, Offset + SubOffset, SubSubtable,
@@ -698,12 +698,13 @@ AcpiDmDumpDbg2 ( @@ -776,12 +776,13 @@ AcpiDmDumpDbg2 (
{ {
ACPI_STATUS Status; ACPI_STATUS Status;
ACPI_DBG2_DEVICE *Subtable; ACPI_DBG2_DEVICE *Subtable;
@ -55,7 +55,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
/* Main table */ /* Main table */
@@ -717,11 +718,12 @@ AcpiDmDumpDbg2 ( @@ -795,11 +796,12 @@ AcpiDmDumpDbg2 (
/* Subtables */ /* Subtables */
Subtable = ACPI_ADD_PTR (ACPI_DBG2_DEVICE, Table, Offset); Subtable = ACPI_ADD_PTR (ACPI_DBG2_DEVICE, Table, Offset);
@ -70,7 +70,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -731,13 +733,13 @@ AcpiDmDumpDbg2 ( @@ -809,13 +811,13 @@ AcpiDmDumpDbg2 (
for (i = 0; i < Subtable->RegisterCount; i++) for (i = 0; i < Subtable->RegisterCount; i++)
{ {
@ -86,7 +86,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -748,13 +750,13 @@ AcpiDmDumpDbg2 ( @@ -826,13 +828,13 @@ AcpiDmDumpDbg2 (
for (i = 0; i < Subtable->RegisterCount; i++) for (i = 0; i < Subtable->RegisterCount; i++)
{ {
@ -102,7 +102,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -764,12 +766,12 @@ AcpiDmDumpDbg2 ( @@ -842,12 +844,12 @@ AcpiDmDumpDbg2 (
/* Dump the Namestring (required) */ /* Dump the Namestring (required) */
AcpiOsPrintf ("\n"); AcpiOsPrintf ("\n");
@ -117,7 +117,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -779,8 +781,11 @@ AcpiDmDumpDbg2 ( @@ -857,8 +859,11 @@ AcpiDmDumpDbg2 (
if (Subtable->OemDataOffset) if (Subtable->OemDataOffset)
{ {
@ -131,7 +131,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
AcpiDmTableInfoDbg2OemData); AcpiDmTableInfoDbg2OemData);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
@@ -790,9 +795,9 @@ AcpiDmDumpDbg2 ( @@ -868,9 +873,9 @@ AcpiDmDumpDbg2 (
/* Point to next subtable */ /* Point to next subtable */
@ -143,11 +143,11 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
} }
} }
Index: acpica-unix2-20211217/source/compiler/dttable1.c Index: acpica-unix2-20220331/source/compiler/dttable1.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/compiler/dttable1.c --- acpica-unix2-20220331.orig/source/compiler/dttable1.c
+++ acpica-unix2-20211217/source/compiler/dttable1.c +++ acpica-unix2-20220331/source/compiler/dttable1.c
@@ -572,6 +572,7 @@ DtCompileCsrt ( @@ -718,6 +718,7 @@ DtCompileCsrt (
DT_FIELD **PFieldList = (DT_FIELD **) List; DT_FIELD **PFieldList = (DT_FIELD **) List;
UINT32 DescriptorCount; UINT32 DescriptorCount;
UINT32 GroupLength; UINT32 GroupLength;
@ -155,7 +155,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
/* Subtables (Resource Groups) */ /* Subtables (Resource Groups) */
@@ -590,12 +591,13 @@ DtCompileCsrt ( @@ -736,12 +737,13 @@ DtCompileCsrt (
/* Compute the number of resource descriptors */ /* Compute the number of resource descriptors */
@ -175,7 +175,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
DescriptorCount = (GroupLength / DescriptorCount = (GroupLength /
sizeof (ACPI_CSRT_DESCRIPTOR)); sizeof (ACPI_CSRT_DESCRIPTOR));
@@ -683,6 +685,7 @@ DtCompileDbg2 ( @@ -829,6 +831,7 @@ DtCompileDbg2 (
ACPI_DBG2_DEVICE *DeviceInfo; ACPI_DBG2_DEVICE *DeviceInfo;
UINT16 CurrentOffset; UINT16 CurrentOffset;
UINT32 i; UINT32 i;
@ -183,7 +183,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
/* Main table */ /* Main table */
@@ -699,10 +702,12 @@ DtCompileDbg2 ( @@ -845,10 +848,12 @@ DtCompileDbg2 (
/* Main table fields */ /* Main table fields */
Dbg2Header = ACPI_CAST_PTR (ACPI_DBG2_HEADER, Subtable->Buffer); Dbg2Header = ACPI_CAST_PTR (ACPI_DBG2_HEADER, Subtable->Buffer);
@ -199,7 +199,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
DtPushSubtable (Subtable); DtPushSubtable (Subtable);
/* Process all Device Information subtables (Count = InfoCount) */ /* Process all Device Information subtables (Count = InfoCount) */
@@ -729,7 +734,8 @@ DtCompileDbg2 ( @@ -875,7 +880,8 @@ DtCompileDbg2 (
/* BaseAddressRegister GAS array (Required, size is RegisterCount) */ /* BaseAddressRegister GAS array (Required, size is RegisterCount) */
@ -209,7 +209,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
for (i = 0; *PFieldList && (i < DeviceInfo->RegisterCount); i++) for (i = 0; *PFieldList && (i < DeviceInfo->RegisterCount); i++)
{ {
Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2Addr, Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2Addr,
@@ -745,7 +751,8 @@ DtCompileDbg2 ( @@ -891,7 +897,8 @@ DtCompileDbg2 (
/* AddressSize array (Required, size = RegisterCount) */ /* AddressSize array (Required, size = RegisterCount) */
@ -219,7 +219,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
for (i = 0; *PFieldList && (i < DeviceInfo->RegisterCount); i++) for (i = 0; *PFieldList && (i < DeviceInfo->RegisterCount); i++)
{ {
Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2Size, Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2Size,
@@ -761,7 +768,8 @@ DtCompileDbg2 ( @@ -907,7 +914,8 @@ DtCompileDbg2 (
/* NamespaceString device identifier (Required, size = NamePathLength) */ /* NamespaceString device identifier (Required, size = NamePathLength) */
@ -229,7 +229,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2Name, Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2Name,
&Subtable); &Subtable);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
@@ -771,8 +779,9 @@ DtCompileDbg2 ( @@ -917,8 +925,9 @@ DtCompileDbg2 (
/* Update the device info header */ /* Update the device info header */
@ -241,7 +241,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
DtInsertSubtable (ParentTable, Subtable); DtInsertSubtable (ParentTable, Subtable);
/* OemData - Variable-length data (Optional, size = OemDataLength) */ /* OemData - Variable-length data (Optional, size = OemDataLength) */
@@ -799,8 +808,10 @@ DtCompileDbg2 ( @@ -945,8 +954,10 @@ DtCompileDbg2 (
if (Subtable && Subtable->Length) if (Subtable && Subtable->Length)
{ {

View File

@ -10,11 +10,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/compiler/dttable1.c | 12 +++++++----- source/compiler/dttable1.c | 12 +++++++-----
3 files changed, 24 insertions(+), 18 deletions(-) 3 files changed, 24 insertions(+), 18 deletions(-)
Index: acpica-unix2-20211217/source/common/dmtable.c Index: acpica-unix2-20220331/source/common/dmtable.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/common/dmtable.c --- acpica-unix2-20220331.orig/source/common/dmtable.c
+++ acpica-unix2-20211217/source/common/dmtable.c +++ acpica-unix2-20220331/source/common/dmtable.c
@@ -1570,13 +1570,13 @@ AcpiDmDumpTable ( @@ -1578,13 +1578,13 @@ AcpiDmDumpTable (
/* DMAR subtable types */ /* DMAR subtable types */
@ -30,11 +30,11 @@ Index: acpica-unix2-20211217/source/common/dmtable.c
AcpiDmDmarSubnames[Temp16]); AcpiDmDmarSubnames[Temp16]);
break; break;
Index: acpica-unix2-20211217/source/common/dmtbdump1.c Index: acpica-unix2-20220331/source/common/dmtbdump1.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/common/dmtbdump1.c --- acpica-unix2-20220331.orig/source/common/dmtbdump1.c
+++ acpica-unix2-20211217/source/common/dmtbdump1.c +++ acpica-unix2-20220331/source/common/dmtbdump1.c
@@ -821,13 +821,15 @@ AcpiDmDumpDmar ( @@ -899,13 +899,15 @@ AcpiDmDumpDmar (
{ {
ACPI_STATUS Status; ACPI_STATUS Status;
ACPI_DMAR_HEADER *Subtable; ACPI_DMAR_HEADER *Subtable;
@ -51,7 +51,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
/* Main table */ /* Main table */
@@ -841,13 +843,14 @@ AcpiDmDumpDmar ( @@ -919,13 +921,14 @@ AcpiDmDumpDmar (
/* Subtables */ /* Subtables */
Subtable = ACPI_ADD_PTR (ACPI_DMAR_HEADER, Table, Offset); Subtable = ACPI_ADD_PTR (ACPI_DMAR_HEADER, Table, Offset);
@ -68,7 +68,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -855,7 +858,8 @@ AcpiDmDumpDmar ( @@ -933,7 +936,8 @@ AcpiDmDumpDmar (
AcpiOsPrintf ("\n"); AcpiOsPrintf ("\n");
@ -78,7 +78,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
{ {
case ACPI_DMAR_TYPE_HARDWARE_UNIT: case ACPI_DMAR_TYPE_HARDWARE_UNIT:
@@ -890,12 +894,12 @@ AcpiDmDumpDmar ( @@ -974,12 +978,12 @@ AcpiDmDumpDmar (
default: default:
AcpiOsPrintf ("\n**** Unknown DMAR subtable type 0x%X\n\n", AcpiOsPrintf ("\n**** Unknown DMAR subtable type 0x%X\n\n",
@ -93,7 +93,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -904,8 +908,8 @@ AcpiDmDumpDmar ( @@ -988,8 +992,8 @@ AcpiDmDumpDmar (
/* /*
* Dump the optional device scope entries * Dump the optional device scope entries
*/ */
@ -104,7 +104,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
{ {
/* These types do not support device scopes */ /* These types do not support device scopes */
@@ -913,7 +917,7 @@ AcpiDmDumpDmar ( @@ -997,7 +1001,7 @@ AcpiDmDumpDmar (
} }
ScopeTable = ACPI_ADD_PTR (ACPI_DMAR_DEVICE_SCOPE, Subtable, ScopeOffset); ScopeTable = ACPI_ADD_PTR (ACPI_DMAR_DEVICE_SCOPE, Subtable, ScopeOffset);
@ -113,7 +113,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
{ {
AcpiOsPrintf ("\n"); AcpiOsPrintf ("\n");
Status = AcpiDmDumpTable (Length, Offset + ScopeOffset, ScopeTable, Status = AcpiDmDumpTable (Length, Offset + ScopeOffset, ScopeTable,
@@ -954,9 +958,9 @@ AcpiDmDumpDmar ( @@ -1038,9 +1042,9 @@ AcpiDmDumpDmar (
NextSubtable: NextSubtable:
/* Point to next subtable */ /* Point to next subtable */
@ -125,11 +125,11 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
} }
} }
Index: acpica-unix2-20211217/source/compiler/dttable1.c Index: acpica-unix2-20220331/source/compiler/dttable1.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/compiler/dttable1.c --- acpica-unix2-20220331.orig/source/compiler/dttable1.c
+++ acpica-unix2-20211217/source/compiler/dttable1.c +++ acpica-unix2-20220331/source/compiler/dttable1.c
@@ -851,6 +851,7 @@ DtCompileDmar ( @@ -997,6 +997,7 @@ DtCompileDmar (
ACPI_DMAR_DEVICE_SCOPE *DmarDeviceScope; ACPI_DMAR_DEVICE_SCOPE *DmarDeviceScope;
UINT32 DeviceScopeLength; UINT32 DeviceScopeLength;
UINT32 PciPathLength; UINT32 PciPathLength;
@ -137,7 +137,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
Status = DtCompileTable (PFieldList, AcpiDmTableInfoDmar, &Subtable); Status = DtCompileTable (PFieldList, AcpiDmTableInfoDmar, &Subtable);
@@ -881,7 +882,8 @@ DtCompileDmar ( @@ -1027,7 +1028,8 @@ DtCompileDmar (
DmarHeader = ACPI_CAST_PTR (ACPI_DMAR_HEADER, Subtable->Buffer); DmarHeader = ACPI_CAST_PTR (ACPI_DMAR_HEADER, Subtable->Buffer);
@ -147,7 +147,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
{ {
case ACPI_DMAR_TYPE_HARDWARE_UNIT: case ACPI_DMAR_TYPE_HARDWARE_UNIT:
@@ -928,8 +930,8 @@ DtCompileDmar ( @@ -1079,8 +1081,8 @@ DtCompileDmar (
/* /*
* Optional Device Scope subtables * Optional Device Scope subtables
*/ */
@ -158,7 +158,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
{ {
/* These types do not support device scopes */ /* These types do not support device scopes */
@@ -938,8 +940,8 @@ DtCompileDmar ( @@ -1089,8 +1091,8 @@ DtCompileDmar (
} }
DtPushSubtable (Subtable); DtPushSubtable (Subtable);

View File

@ -9,11 +9,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/compiler/dttable1.c | 6 ++++-- source/compiler/dttable1.c | 6 ++++--
2 files changed, 19 insertions(+), 12 deletions(-) 2 files changed, 19 insertions(+), 12 deletions(-)
Index: acpica-unix2-20211217/source/common/dmtbdump1.c Index: acpica-unix2-20220331/source/common/dmtbdump1.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/common/dmtbdump1.c --- acpica-unix2-20220331.orig/source/common/dmtbdump1.c
+++ acpica-unix2-20211217/source/common/dmtbdump1.c +++ acpica-unix2-20220331/source/common/dmtbdump1.c
@@ -987,11 +987,14 @@ AcpiDmDumpDrtm ( @@ -1071,11 +1071,14 @@ AcpiDmDumpDrtm (
ACPI_DRTM_RESOURCE_LIST *DrtmRl; ACPI_DRTM_RESOURCE_LIST *DrtmRl;
ACPI_DRTM_DPS_ID *DrtmDps; ACPI_DRTM_DPS_ID *DrtmDps;
UINT32 Count; UINT32 Count;
@ -29,7 +29,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
AcpiDmTableInfoDrtm); AcpiDmTableInfoDrtm);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
@@ -1006,7 +1009,7 @@ AcpiDmDumpDrtm ( @@ -1090,7 +1093,7 @@ AcpiDmDumpDrtm (
DrtmVtl = ACPI_ADD_PTR (ACPI_DRTM_VTABLE_LIST, Table, Offset); DrtmVtl = ACPI_ADD_PTR (ACPI_DRTM_VTABLE_LIST, Table, Offset);
AcpiOsPrintf ("\n"); AcpiOsPrintf ("\n");
@ -38,7 +38,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
DrtmVtl, ACPI_OFFSET (ACPI_DRTM_VTABLE_LIST, ValidatedTables), DrtmVtl, ACPI_OFFSET (ACPI_DRTM_VTABLE_LIST, ValidatedTables),
AcpiDmTableInfoDrtm0); AcpiDmTableInfoDrtm0);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
@@ -1019,10 +1022,11 @@ AcpiDmDumpDrtm ( @@ -1103,10 +1106,11 @@ AcpiDmDumpDrtm (
/* Dump Validated table addresses */ /* Dump Validated table addresses */
Count = 0; Count = 0;
@ -53,7 +53,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
ACPI_ADD_PTR (void, Table, Offset), sizeof (UINT64), ACPI_ADD_PTR (void, Table, Offset), sizeof (UINT64),
AcpiDmTableInfoDrtm0a); AcpiDmTableInfoDrtm0a);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
@@ -1038,7 +1042,7 @@ AcpiDmDumpDrtm ( @@ -1122,7 +1126,7 @@ AcpiDmDumpDrtm (
DrtmRl = ACPI_ADD_PTR (ACPI_DRTM_RESOURCE_LIST, Table, Offset); DrtmRl = ACPI_ADD_PTR (ACPI_DRTM_RESOURCE_LIST, Table, Offset);
AcpiOsPrintf ("\n"); AcpiOsPrintf ("\n");
@ -62,7 +62,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
DrtmRl, ACPI_OFFSET (ACPI_DRTM_RESOURCE_LIST, Resources), DrtmRl, ACPI_OFFSET (ACPI_DRTM_RESOURCE_LIST, Resources),
AcpiDmTableInfoDrtm1); AcpiDmTableInfoDrtm1);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
@@ -1051,10 +1055,11 @@ AcpiDmDumpDrtm ( @@ -1135,10 +1139,11 @@ AcpiDmDumpDrtm (
/* Dump the Resource List */ /* Dump the Resource List */
Count = 0; Count = 0;
@ -77,7 +77,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
ACPI_ADD_PTR (void, Table, Offset), ACPI_ADD_PTR (void, Table, Offset),
sizeof (ACPI_DRTM_RESOURCE), AcpiDmTableInfoDrtm1a); sizeof (ACPI_DRTM_RESOURCE), AcpiDmTableInfoDrtm1a);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
@@ -1070,7 +1075,7 @@ AcpiDmDumpDrtm ( @@ -1154,7 +1159,7 @@ AcpiDmDumpDrtm (
DrtmDps = ACPI_ADD_PTR (ACPI_DRTM_DPS_ID, Table, Offset); DrtmDps = ACPI_ADD_PTR (ACPI_DRTM_DPS_ID, Table, Offset);
AcpiOsPrintf ("\n"); AcpiOsPrintf ("\n");
@ -86,11 +86,11 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
DrtmDps, sizeof (ACPI_DRTM_DPS_ID), AcpiDmTableInfoDrtm2); DrtmDps, sizeof (ACPI_DRTM_DPS_ID), AcpiDmTableInfoDrtm2);
} }
Index: acpica-unix2-20211217/source/compiler/dttable1.c Index: acpica-unix2-20220331/source/compiler/dttable1.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/compiler/dttable1.c --- acpica-unix2-20220331.orig/source/compiler/dttable1.c
+++ acpica-unix2-20211217/source/compiler/dttable1.c +++ acpica-unix2-20220331/source/compiler/dttable1.c
@@ -1066,7 +1066,8 @@ DtCompileDrtm ( @@ -1217,7 +1217,8 @@ DtCompileDrtm (
Count++; Count++;
} }
@ -100,7 +100,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
DtPopSubtable (); DtPopSubtable ();
ParentTable = DtPeekSubtable (); ParentTable = DtPeekSubtable ();
@@ -1104,7 +1105,8 @@ DtCompileDrtm ( @@ -1255,7 +1256,8 @@ DtCompileDrtm (
Count++; Count++;
} }

View File

@ -8,11 +8,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/common/dmtbdump1.c | 4 ++-- source/common/dmtbdump1.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
Index: acpica-unix2-20211217/source/common/dmtbdump1.c Index: acpica-unix2-20220331/source/common/dmtbdump1.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/common/dmtbdump1.c --- acpica-unix2-20220331.orig/source/common/dmtbdump1.c
+++ acpica-unix2-20211217/source/common/dmtbdump1.c +++ acpica-unix2-20220331/source/common/dmtbdump1.c
@@ -1099,7 +1099,7 @@ AcpiDmDumpEinj ( @@ -1183,7 +1183,7 @@ AcpiDmDumpEinj (
{ {
ACPI_STATUS Status; ACPI_STATUS Status;
ACPI_WHEA_HEADER *Subtable; ACPI_WHEA_HEADER *Subtable;
@ -21,7 +21,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
UINT32 Offset = sizeof (ACPI_TABLE_EINJ); UINT32 Offset = sizeof (ACPI_TABLE_EINJ);
@@ -1114,7 +1114,7 @@ AcpiDmDumpEinj ( @@ -1198,7 +1198,7 @@ AcpiDmDumpEinj (
/* Subtables */ /* Subtables */
Subtable = ACPI_ADD_PTR (ACPI_WHEA_HEADER, Table, Offset); Subtable = ACPI_ADD_PTR (ACPI_WHEA_HEADER, Table, Offset);

View File

@ -8,11 +8,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/common/dmtbdump1.c | 4 ++-- source/common/dmtbdump1.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
Index: acpica-unix2-20211217/source/common/dmtbdump1.c Index: acpica-unix2-20220331/source/common/dmtbdump1.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/common/dmtbdump1.c --- acpica-unix2-20220331.orig/source/common/dmtbdump1.c
+++ acpica-unix2-20211217/source/common/dmtbdump1.c +++ acpica-unix2-20220331/source/common/dmtbdump1.c
@@ -1152,7 +1152,7 @@ AcpiDmDumpErst ( @@ -1236,7 +1236,7 @@ AcpiDmDumpErst (
{ {
ACPI_STATUS Status; ACPI_STATUS Status;
ACPI_WHEA_HEADER *Subtable; ACPI_WHEA_HEADER *Subtable;
@ -21,7 +21,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
UINT32 Offset = sizeof (ACPI_TABLE_ERST); UINT32 Offset = sizeof (ACPI_TABLE_ERST);
@@ -1167,7 +1167,7 @@ AcpiDmDumpErst ( @@ -1251,7 +1251,7 @@ AcpiDmDumpErst (
/* Subtables */ /* Subtables */
Subtable = ACPI_ADD_PTR (ACPI_WHEA_HEADER, Table, Offset); Subtable = ACPI_ADD_PTR (ACPI_WHEA_HEADER, Table, Offset);

View File

@ -9,10 +9,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/components/tables/tbfadt.c | 34 +++++++++++++++++++++++-------- source/components/tables/tbfadt.c | 34 +++++++++++++++++++++++--------
2 files changed, 38 insertions(+), 21 deletions(-) 2 files changed, 38 insertions(+), 21 deletions(-)
Index: acpica-unix2-20211217/source/common/dmtbdump.c Index: acpica-unix2-20220331/source/common/dmtbdump.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/common/dmtbdump.c --- acpica-unix2-20220331.orig/source/common/dmtbdump.c
+++ acpica-unix2-20211217/source/common/dmtbdump.c +++ acpica-unix2-20220331/source/common/dmtbdump.c
@@ -417,11 +417,12 @@ AcpiDmDumpFadt ( @@ -417,11 +417,12 @@ AcpiDmDumpFadt (
ACPI_TABLE_HEADER *Table) ACPI_TABLE_HEADER *Table)
{ {
@ -91,10 +91,10 @@ Index: acpica-unix2-20211217/source/common/dmtbdump.c
} }
Index: acpica-unix2-20211217/source/components/tables/tbfadt.c Index: acpica-unix2-20220331/source/components/tables/tbfadt.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/components/tables/tbfadt.c --- acpica-unix2-20220331.orig/source/components/tables/tbfadt.c
+++ acpica-unix2-20211217/source/components/tables/tbfadt.c +++ acpica-unix2-20220331/source/components/tables/tbfadt.c
@@ -289,7 +289,6 @@ AcpiTbSelectAddress ( @@ -289,7 +289,6 @@ AcpiTbSelectAddress (
UINT32 Address32, UINT32 Address32,
UINT64 Address64) UINT64 Address64)

View File

@ -12,11 +12,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/compiler/dttable1.c | 4 +++- source/compiler/dttable1.c | 4 +++-
2 files changed, 10 insertions(+), 6 deletions(-) 2 files changed, 10 insertions(+), 6 deletions(-)
Index: acpica-unix2-20211217/source/common/dmtbdump1.c Index: acpica-unix2-20220331/source/common/dmtbdump1.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/common/dmtbdump1.c --- acpica-unix2-20220331.orig/source/common/dmtbdump1.c
+++ acpica-unix2-20211217/source/common/dmtbdump1.c +++ acpica-unix2-20220331/source/common/dmtbdump1.c
@@ -1205,9 +1205,10 @@ AcpiDmDumpFpdt ( @@ -1289,9 +1289,10 @@ AcpiDmDumpFpdt (
{ {
ACPI_STATUS Status; ACPI_STATUS Status;
ACPI_FPDT_HEADER *Subtable; ACPI_FPDT_HEADER *Subtable;
@ -28,7 +28,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
/* There is no main table (other than the standard ACPI header) */ /* There is no main table (other than the standard ACPI header) */
@@ -1215,19 +1216,20 @@ AcpiDmDumpFpdt ( @@ -1299,19 +1300,20 @@ AcpiDmDumpFpdt (
/* Subtables */ /* Subtables */
Subtable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, Table, Offset); Subtable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, Table, Offset);
@ -52,7 +52,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
{ {
case ACPI_FPDT_TYPE_BOOT: case ACPI_FPDT_TYPE_BOOT:
@@ -1254,7 +1256,7 @@ AcpiDmDumpFpdt ( @@ -1338,7 +1340,7 @@ AcpiDmDumpFpdt (
goto NextSubtable; goto NextSubtable;
} }
@ -61,11 +61,11 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
Subtable->Length, InfoTable); Subtable->Length, InfoTable);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
Index: acpica-unix2-20211217/source/compiler/dttable1.c Index: acpica-unix2-20220331/source/compiler/dttable1.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/compiler/dttable1.c --- acpica-unix2-20220331.orig/source/compiler/dttable1.c
+++ acpica-unix2-20211217/source/compiler/dttable1.c +++ acpica-unix2-20220331/source/compiler/dttable1.c
@@ -1342,6 +1342,7 @@ DtCompileFpdt ( @@ -1493,6 +1493,7 @@ DtCompileFpdt (
ACPI_DMTABLE_INFO *InfoTable; ACPI_DMTABLE_INFO *InfoTable;
DT_FIELD **PFieldList = (DT_FIELD **) List; DT_FIELD **PFieldList = (DT_FIELD **) List;
DT_FIELD *SubtableStart; DT_FIELD *SubtableStart;
@ -73,7 +73,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
while (*PFieldList) while (*PFieldList)
@@ -1360,7 +1361,8 @@ DtCompileFpdt ( @@ -1511,7 +1512,8 @@ DtCompileFpdt (
FpdtHeader = ACPI_CAST_PTR (ACPI_FPDT_HEADER, Subtable->Buffer); FpdtHeader = ACPI_CAST_PTR (ACPI_FPDT_HEADER, Subtable->Buffer);

View File

@ -9,11 +9,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/compiler/dttable1.c | 9 +++++++-- source/compiler/dttable1.c | 9 +++++++--
2 files changed, 16 insertions(+), 6 deletions(-) 2 files changed, 16 insertions(+), 6 deletions(-)
Index: acpica-unix2-20211217/source/common/dmtbdump1.c Index: acpica-unix2-20220331/source/common/dmtbdump1.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/common/dmtbdump1.c --- acpica-unix2-20220331.orig/source/common/dmtbdump1.c
+++ acpica-unix2-20211217/source/common/dmtbdump1.c +++ acpica-unix2-20220331/source/common/dmtbdump1.c
@@ -1292,7 +1292,7 @@ AcpiDmDumpGtdt ( @@ -1376,7 +1376,7 @@ AcpiDmDumpGtdt (
{ {
ACPI_STATUS Status; ACPI_STATUS Status;
ACPI_GTDT_HEADER *Subtable; ACPI_GTDT_HEADER *Subtable;
@ -22,7 +22,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
UINT32 Offset = sizeof (ACPI_TABLE_GTDT); UINT32 Offset = sizeof (ACPI_TABLE_GTDT);
ACPI_DMTABLE_INFO *InfoTable; ACPI_DMTABLE_INFO *InfoTable;
UINT32 SubtableLength; UINT32 SubtableLength;
@@ -1328,7 +1328,7 @@ AcpiDmDumpGtdt ( @@ -1412,7 +1412,7 @@ AcpiDmDumpGtdt (
/* Subtables */ /* Subtables */
@ -31,7 +31,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
{ {
/* Common subtable header */ /* Common subtable header */
@@ -1346,8 +1346,13 @@ AcpiDmDumpGtdt ( @@ -1430,8 +1430,13 @@ AcpiDmDumpGtdt (
case ACPI_GTDT_TYPE_TIMER_BLOCK: case ACPI_GTDT_TYPE_TIMER_BLOCK:
SubtableLength = sizeof (ACPI_GTDT_TIMER_BLOCK); SubtableLength = sizeof (ACPI_GTDT_TIMER_BLOCK);
@ -47,11 +47,11 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
InfoTable = AcpiDmTableInfoGtdt0; InfoTable = AcpiDmTableInfoGtdt0;
break; break;
Index: acpica-unix2-20211217/source/compiler/dttable1.c Index: acpica-unix2-20220331/source/compiler/dttable1.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/compiler/dttable1.c --- acpica-unix2-20220331.orig/source/compiler/dttable1.c
+++ acpica-unix2-20211217/source/compiler/dttable1.c +++ acpica-unix2-20220331/source/compiler/dttable1.c
@@ -1288,8 +1288,13 @@ DtCompileGtdt ( @@ -1439,8 +1439,13 @@ DtCompileGtdt (
DtPushSubtable (Subtable); DtPushSubtable (Subtable);
ParentTable = DtPeekSubtable (); ParentTable = DtPeekSubtable ();

View File

@ -9,11 +9,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/compiler/dttable1.c | 4 +++- source/compiler/dttable1.c | 4 +++-
2 files changed, 9 insertions(+), 5 deletions(-) 2 files changed, 9 insertions(+), 5 deletions(-)
Index: acpica-unix2-20211217/source/common/dmtbdump1.c Index: acpica-unix2-20220331/source/common/dmtbdump1.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/common/dmtbdump1.c --- acpica-unix2-20220331.orig/source/common/dmtbdump1.c
+++ acpica-unix2-20211217/source/common/dmtbdump1.c +++ acpica-unix2-20220331/source/common/dmtbdump1.c
@@ -1433,12 +1433,13 @@ AcpiDmDumpHest ( @@ -1517,12 +1517,13 @@ AcpiDmDumpHest (
{ {
ACPI_STATUS Status; ACPI_STATUS Status;
ACPI_HEST_HEADER *Subtable; ACPI_HEST_HEADER *Subtable;
@ -28,7 +28,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
/* Main table */ /* Main table */
@@ -1452,10 +1453,11 @@ AcpiDmDumpHest ( @@ -1536,10 +1537,11 @@ AcpiDmDumpHest (
/* Subtables */ /* Subtables */
Subtable = ACPI_ADD_PTR (ACPI_HEST_HEADER, Table, Offset); Subtable = ACPI_ADD_PTR (ACPI_HEST_HEADER, Table, Offset);
@ -42,7 +42,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
{ {
case ACPI_HEST_TYPE_IA32_CHECK: case ACPI_HEST_TYPE_IA32_CHECK:
@@ -1522,7 +1524,7 @@ AcpiDmDumpHest ( @@ -1606,7 +1608,7 @@ AcpiDmDumpHest (
/* Cannot continue on unknown type - no length */ /* Cannot continue on unknown type - no length */
AcpiOsPrintf ("\n**** Unknown HEST subtable type 0x%X\n", AcpiOsPrintf ("\n**** Unknown HEST subtable type 0x%X\n",
@ -51,11 +51,11 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
return; return;
} }
Index: acpica-unix2-20211217/source/compiler/dttable1.c Index: acpica-unix2-20220331/source/compiler/dttable1.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/compiler/dttable1.c --- acpica-unix2-20220331.orig/source/compiler/dttable1.c
+++ acpica-unix2-20211217/source/compiler/dttable1.c +++ acpica-unix2-20220331/source/compiler/dttable1.c
@@ -1424,6 +1424,7 @@ DtCompileHest ( @@ -1575,6 +1575,7 @@ DtCompileHest (
DT_FIELD *SubtableStart; DT_FIELD *SubtableStart;
ACPI_DMTABLE_INFO *InfoTable; ACPI_DMTABLE_INFO *InfoTable;
UINT16 Type; UINT16 Type;
@ -63,7 +63,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
UINT32 BankCount; UINT32 BankCount;
@@ -1442,7 +1443,8 @@ DtCompileHest ( @@ -1593,7 +1594,8 @@ DtCompileHest (
/* Get subtable type */ /* Get subtable type */
SubtableStart = *PFieldList; SubtableStart = *PFieldList;

View File

@ -8,10 +8,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/common/dmtbdump.c | 5 +++-- source/common/dmtbdump.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-) 1 file changed, 3 insertions(+), 2 deletions(-)
Index: acpica-unix2-20211217/source/common/dmtbdump.c Index: acpica-unix2-20220331/source/common/dmtbdump.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/common/dmtbdump.c --- acpica-unix2-20220331.orig/source/common/dmtbdump.c
+++ acpica-unix2-20211217/source/common/dmtbdump.c +++ acpica-unix2-20220331/source/common/dmtbdump.c
@@ -336,6 +336,7 @@ AcpiDmDumpRsdt ( @@ -336,6 +336,7 @@ AcpiDmDumpRsdt (
UINT32 Entries; UINT32 Entries;
UINT32 Offset; UINT32 Offset;

View File

@ -8,10 +8,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/common/dmtbdump.c | 6 ++++-- source/common/dmtbdump.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-) 1 file changed, 4 insertions(+), 2 deletions(-)
Index: acpica-unix2-20211217/source/common/dmtbdump.c Index: acpica-unix2-20220331/source/common/dmtbdump.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/common/dmtbdump.c --- acpica-unix2-20220331.orig/source/common/dmtbdump.c
+++ acpica-unix2-20211217/source/common/dmtbdump.c +++ acpica-unix2-20220331/source/common/dmtbdump.c
@@ -377,6 +377,7 @@ AcpiDmDumpXsdt ( @@ -377,6 +377,7 @@ AcpiDmDumpXsdt (
UINT32 Entries; UINT32 Entries;
UINT32 Offset; UINT32 Offset;

View File

@ -8,10 +8,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/common/dmtbdump3.c | 9 +++++---- source/common/dmtbdump3.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-) 1 file changed, 5 insertions(+), 4 deletions(-)
Index: acpica-unix2-20211217/source/common/dmtbdump3.c Index: acpica-unix2-20220331/source/common/dmtbdump3.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/common/dmtbdump3.c --- acpica-unix2-20220331.orig/source/common/dmtbdump3.c
+++ acpica-unix2-20211217/source/common/dmtbdump3.c +++ acpica-unix2-20220331/source/common/dmtbdump3.c
@@ -173,11 +173,12 @@ AcpiDmDumpSrat ( @@ -173,11 +173,12 @@ AcpiDmDumpSrat (
UINT32 Offset = sizeof (ACPI_TABLE_SRAT); UINT32 Offset = sizeof (ACPI_TABLE_SRAT);
ACPI_SUBTABLE_HEADER *Subtable; ACPI_SUBTABLE_HEADER *Subtable;

View File

@ -9,10 +9,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/compiler/dttable2.c | 2 +- source/compiler/dttable2.c | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-) 2 files changed, 6 insertions(+), 4 deletions(-)
Index: acpica-unix2-20211217/source/common/dmtbdump3.c Index: acpica-unix2-20220331/source/common/dmtbdump3.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/common/dmtbdump3.c --- acpica-unix2-20220331.orig/source/common/dmtbdump3.c
+++ acpica-unix2-20211217/source/common/dmtbdump3.c +++ acpica-unix2-20220331/source/common/dmtbdump3.c
@@ -96,11 +96,12 @@ AcpiDmDumpSlit ( @@ -96,11 +96,12 @@ AcpiDmDumpSlit (
UINT32 Localities; UINT32 Localities;
UINT32 i; UINT32 i;
@ -46,11 +46,11 @@ Index: acpica-unix2-20211217/source/common/dmtbdump3.c
{ {
AcpiOsPrintf ( AcpiOsPrintf (
"\n**** Not enough room in table for all localities\n"); "\n**** Not enough room in table for all localities\n");
Index: acpica-unix2-20211217/source/compiler/dttable2.c Index: acpica-unix2-20220331/source/compiler/dttable2.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/compiler/dttable2.c --- acpica-unix2-20220331.orig/source/compiler/dttable2.c
+++ acpica-unix2-20211217/source/compiler/dttable2.c +++ acpica-unix2-20220331/source/compiler/dttable2.c
@@ -2221,7 +2221,7 @@ DtCompileSlit ( @@ -2234,7 +2234,7 @@ DtCompileSlit (
ParentTable = DtPeekSubtable (); ParentTable = DtPeekSubtable ();
DtInsertSubtable (ParentTable, Subtable); DtInsertSubtable (ParentTable, Subtable);

View File

@ -8,11 +8,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/common/dmtbdump2.c | 7 ++++--- source/common/dmtbdump2.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-) 1 file changed, 4 insertions(+), 3 deletions(-)
Index: acpica-unix2-20211217/source/common/dmtbdump2.c Index: acpica-unix2-20220331/source/common/dmtbdump2.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/common/dmtbdump2.c --- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
+++ acpica-unix2-20211217/source/common/dmtbdump2.c +++ acpica-unix2-20220331/source/common/dmtbdump2.c
@@ -1133,11 +1133,12 @@ AcpiDmDumpMsct ( @@ -1185,11 +1185,12 @@ AcpiDmDumpMsct (
ACPI_STATUS Status; ACPI_STATUS Status;
UINT32 Offset = sizeof (ACPI_TABLE_MSCT); UINT32 Offset = sizeof (ACPI_TABLE_MSCT);
ACPI_MSCT_PROXIMITY *Subtable; ACPI_MSCT_PROXIMITY *Subtable;
@ -26,7 +26,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -1146,12 +1147,12 @@ AcpiDmDumpMsct ( @@ -1198,12 +1199,12 @@ AcpiDmDumpMsct (
/* Subtables */ /* Subtables */
Subtable = ACPI_ADD_PTR (ACPI_MSCT_PROXIMITY, Table, Offset); Subtable = ACPI_ADD_PTR (ACPI_MSCT_PROXIMITY, Table, Offset);

View File

@ -9,11 +9,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/compiler/dttable2.c | 8 ++++---- source/compiler/dttable2.c | 8 ++++----
2 files changed, 23 insertions(+), 18 deletions(-) 2 files changed, 23 insertions(+), 18 deletions(-)
Index: acpica-unix2-20210730/source/common/dmtbdump2.c Index: acpica-unix2-20220331/source/common/dmtbdump2.c
=================================================================== ===================================================================
--- acpica-unix2-20210730.orig/source/common/dmtbdump2.c --- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
+++ acpica-unix2-20210730/source/common/dmtbdump2.c +++ acpica-unix2-20220331/source/common/dmtbdump2.c
@@ -995,11 +995,13 @@ AcpiDmDumpMpst ( @@ -1047,11 +1047,13 @@ AcpiDmDumpMpst (
UINT16 SubtableCount; UINT16 SubtableCount;
UINT32 PowerStateCount; UINT32 PowerStateCount;
UINT32 ComponentCount; UINT32 ComponentCount;
@ -28,7 +28,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump2.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -1007,13 +1009,14 @@ AcpiDmDumpMpst ( @@ -1059,13 +1061,14 @@ AcpiDmDumpMpst (
/* Subtable: Memory Power Node(s) */ /* Subtable: Memory Power Node(s) */
@ -46,7 +46,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump2.c
sizeof (ACPI_MPST_POWER_NODE), AcpiDmTableInfoMpst0); sizeof (ACPI_MPST_POWER_NODE), AcpiDmTableInfoMpst0);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
@@ -1022,8 +1025,8 @@ AcpiDmDumpMpst ( @@ -1074,8 +1077,8 @@ AcpiDmDumpMpst (
/* Extract the sub-subtable counts */ /* Extract the sub-subtable counts */
@ -57,7 +57,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump2.c
Offset += sizeof (ACPI_MPST_POWER_NODE); Offset += sizeof (ACPI_MPST_POWER_NODE);
/* Sub-subtables - Memory Power State Structure(s) */ /* Sub-subtables - Memory Power State Structure(s) */
@@ -1034,7 +1037,7 @@ AcpiDmDumpMpst ( @@ -1086,7 +1089,7 @@ AcpiDmDumpMpst (
while (PowerStateCount) while (PowerStateCount)
{ {
AcpiOsPrintf ("\n"); AcpiOsPrintf ("\n");
@ -66,7 +66,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump2.c
sizeof (ACPI_MPST_POWER_STATE), AcpiDmTableInfoMpst0A); sizeof (ACPI_MPST_POWER_STATE), AcpiDmTableInfoMpst0A);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
@@ -1057,7 +1060,7 @@ AcpiDmDumpMpst ( @@ -1109,7 +1112,7 @@ AcpiDmDumpMpst (
while (ComponentCount) while (ComponentCount)
{ {
@ -75,7 +75,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump2.c
sizeof (ACPI_MPST_COMPONENT), AcpiDmTableInfoMpst0B); sizeof (ACPI_MPST_COMPONENT), AcpiDmTableInfoMpst0B);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
@@ -1074,22 +1077,24 @@ AcpiDmDumpMpst ( @@ -1126,22 +1129,24 @@ AcpiDmDumpMpst (
SubtableCount--; SubtableCount--;
Subtable0 = ACPI_ADD_PTR (ACPI_MPST_POWER_NODE, Subtable0, Subtable0 = ACPI_ADD_PTR (ACPI_MPST_POWER_NODE, Subtable0,
sizeof (ACPI_MPST_POWER_NODE) + sizeof (ACPI_MPST_POWER_NODE) +
@ -104,7 +104,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump2.c
Offset += sizeof (ACPI_MPST_DATA_HDR); Offset += sizeof (ACPI_MPST_DATA_HDR);
/* Subtable: Memory Power State Characteristics structure(s) */ /* Subtable: Memory Power State Characteristics structure(s) */
@@ -1097,10 +1102,10 @@ AcpiDmDumpMpst ( @@ -1149,10 +1154,10 @@ AcpiDmDumpMpst (
Subtable2 = ACPI_ADD_PTR (ACPI_MPST_POWER_DATA, Subtable1, Subtable2 = ACPI_ADD_PTR (ACPI_MPST_POWER_DATA, Subtable1,
sizeof (ACPI_MPST_DATA_HDR)); sizeof (ACPI_MPST_DATA_HDR));
@ -117,11 +117,11 @@ Index: acpica-unix2-20210730/source/common/dmtbdump2.c
sizeof (ACPI_MPST_POWER_DATA), AcpiDmTableInfoMpst2); sizeof (ACPI_MPST_POWER_DATA), AcpiDmTableInfoMpst2);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
Index: acpica-unix2-20210730/source/compiler/dttable2.c Index: acpica-unix2-20220331/source/compiler/dttable2.c
=================================================================== ===================================================================
--- acpica-unix2-20210730.orig/source/compiler/dttable2.c --- acpica-unix2-20220331.orig/source/compiler/dttable2.c
+++ acpica-unix2-20210730/source/compiler/dttable2.c +++ acpica-unix2-20220331/source/compiler/dttable2.c
@@ -350,7 +350,7 @@ DtCompileMpst ( @@ -359,7 +359,7 @@ DtCompileMpst (
DtPushSubtable (Subtable); DtPushSubtable (Subtable);
MpstChannelInfo = ACPI_CAST_PTR (ACPI_MPST_CHANNEL, Subtable->Buffer); MpstChannelInfo = ACPI_CAST_PTR (ACPI_MPST_CHANNEL, Subtable->Buffer);
@ -130,7 +130,7 @@ Index: acpica-unix2-20210730/source/compiler/dttable2.c
while (*PFieldList && SubtableCount) while (*PFieldList && SubtableCount)
{ {
@@ -368,8 +368,8 @@ DtCompileMpst ( @@ -377,8 +377,8 @@ DtCompileMpst (
DtPushSubtable (Subtable); DtPushSubtable (Subtable);
MpstPowerNode = ACPI_CAST_PTR (ACPI_MPST_POWER_NODE, Subtable->Buffer); MpstPowerNode = ACPI_CAST_PTR (ACPI_MPST_POWER_NODE, Subtable->Buffer);
@ -141,7 +141,7 @@ Index: acpica-unix2-20210730/source/compiler/dttable2.c
ParentTable = DtPeekSubtable (); ParentTable = DtPeekSubtable ();
@@ -422,7 +422,7 @@ DtCompileMpst ( @@ -431,7 +431,7 @@ DtCompileMpst (
DtPushSubtable (Subtable); DtPushSubtable (Subtable);
MpstDataHeader = ACPI_CAST_PTR (ACPI_MPST_DATA_HDR, Subtable->Buffer); MpstDataHeader = ACPI_CAST_PTR (ACPI_MPST_DATA_HDR, Subtable->Buffer);

View File

@ -13,11 +13,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/compiler/dttable2.c | 11 ++++++--- source/compiler/dttable2.c | 11 ++++++---
3 files changed, 39 insertions(+), 25 deletions(-) 3 files changed, 39 insertions(+), 25 deletions(-)
Index: acpica-unix2-20211217/source/common/dmtable.c Index: acpica-unix2-20220331/source/common/dmtable.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/common/dmtable.c --- acpica-unix2-20220331.orig/source/common/dmtable.c
+++ acpica-unix2-20211217/source/common/dmtable.c +++ acpica-unix2-20220331/source/common/dmtable.c
@@ -1755,13 +1755,13 @@ AcpiDmDumpTable ( @@ -1766,13 +1766,13 @@ AcpiDmDumpTable (
/* NFIT subtable types */ /* NFIT subtable types */
@ -33,11 +33,11 @@ Index: acpica-unix2-20211217/source/common/dmtable.c
AcpiDmNfitSubnames[Temp16]); AcpiDmNfitSubnames[Temp16]);
break; break;
Index: acpica-unix2-20211217/source/common/dmtbdump2.c Index: acpica-unix2-20220331/source/common/dmtbdump2.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/common/dmtbdump2.c --- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
+++ acpica-unix2-20211217/source/common/dmtbdump2.c +++ acpica-unix2-20220331/source/common/dmtbdump2.c
@@ -1192,18 +1192,23 @@ AcpiDmDumpNfit ( @@ -1244,18 +1244,23 @@ AcpiDmDumpNfit (
ACPI_STATUS Status; ACPI_STATUS Status;
UINT32 Offset = sizeof (ACPI_TABLE_NFIT); UINT32 Offset = sizeof (ACPI_TABLE_NFIT);
UINT32 FieldOffset = 0; UINT32 FieldOffset = 0;
@ -63,7 +63,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -1212,19 +1217,21 @@ AcpiDmDumpNfit ( @@ -1264,19 +1269,21 @@ AcpiDmDumpNfit (
/* Subtables */ /* Subtables */
Subtable = ACPI_ADD_PTR (ACPI_NFIT_HEADER, Table, Offset); Subtable = ACPI_ADD_PTR (ACPI_NFIT_HEADER, Table, Offset);
@ -89,7 +89,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
{ {
case ACPI_NFIT_TYPE_SYSTEM_ADDRESS: case ACPI_NFIT_TYPE_SYSTEM_ADDRESS:
@@ -1275,11 +1282,11 @@ AcpiDmDumpNfit ( @@ -1327,11 +1334,11 @@ AcpiDmDumpNfit (
default: default:
AcpiOsPrintf ("\n**** Unknown NFIT subtable type 0x%X\n", AcpiOsPrintf ("\n**** Unknown NFIT subtable type 0x%X\n",
@ -103,7 +103,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
{ {
AcpiOsPrintf ("Invalid zero length subtable\n"); AcpiOsPrintf ("Invalid zero length subtable\n");
return; return;
@@ -1288,8 +1295,8 @@ AcpiDmDumpNfit ( @@ -1340,8 +1347,8 @@ AcpiDmDumpNfit (
} }
AcpiOsPrintf ("\n"); AcpiOsPrintf ("\n");
@ -114,7 +114,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -1297,14 +1304,15 @@ AcpiDmDumpNfit ( @@ -1349,14 +1356,15 @@ AcpiDmDumpNfit (
/* Per-subtable variable-length fields */ /* Per-subtable variable-length fields */
@ -133,7 +133,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
&Interleave->LineOffset[i], &Interleave->LineOffset[i],
sizeof (UINT32), AcpiDmTableInfoNfit2a); sizeof (UINT32), AcpiDmTableInfoNfit2a);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
@@ -1318,14 +1326,14 @@ AcpiDmDumpNfit ( @@ -1370,14 +1378,14 @@ AcpiDmDumpNfit (
case ACPI_NFIT_TYPE_SMBIOS: case ACPI_NFIT_TYPE_SMBIOS:
@ -151,7 +151,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
Length, AcpiDmTableInfoNfit3a); Length, AcpiDmTableInfoNfit3a);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
@@ -1338,9 +1346,10 @@ AcpiDmDumpNfit ( @@ -1390,9 +1398,10 @@ AcpiDmDumpNfit (
case ACPI_NFIT_TYPE_FLUSH_ADDRESS: case ACPI_NFIT_TYPE_FLUSH_ADDRESS:
Hint = ACPI_CAST_PTR (ACPI_NFIT_FLUSH_ADDRESS, Subtable); Hint = ACPI_CAST_PTR (ACPI_NFIT_FLUSH_ADDRESS, Subtable);
@ -164,7 +164,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
&Hint->HintAddress[i], &Hint->HintAddress[i],
sizeof (UINT64), AcpiDmTableInfoNfit6a); sizeof (UINT64), AcpiDmTableInfoNfit6a);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
@@ -1359,8 +1368,8 @@ AcpiDmDumpNfit ( @@ -1411,8 +1420,8 @@ AcpiDmDumpNfit (
NextSubtable: NextSubtable:
/* Point to next subtable */ /* Point to next subtable */
@ -175,11 +175,11 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
} }
} }
Index: acpica-unix2-20211217/source/compiler/dttable2.c Index: acpica-unix2-20220331/source/compiler/dttable2.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/compiler/dttable2.c --- acpica-unix2-20220331.orig/source/compiler/dttable2.c
+++ acpica-unix2-20211217/source/compiler/dttable2.c +++ acpica-unix2-20220331/source/compiler/dttable2.c
@@ -497,6 +497,7 @@ DtCompileNfit ( @@ -506,6 +506,7 @@ DtCompileNfit (
UINT32 Count; UINT32 Count;
ACPI_NFIT_INTERLEAVE *Interleave = NULL; ACPI_NFIT_INTERLEAVE *Interleave = NULL;
ACPI_NFIT_FLUSH_ADDRESS *Hint = NULL; ACPI_NFIT_FLUSH_ADDRESS *Hint = NULL;
@ -187,7 +187,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable2.c
/* Main table */ /* Main table */
@@ -530,7 +531,8 @@ DtCompileNfit ( @@ -539,7 +540,8 @@ DtCompileNfit (
NfitHeader = ACPI_CAST_PTR (ACPI_NFIT_HEADER, Subtable->Buffer); NfitHeader = ACPI_CAST_PTR (ACPI_NFIT_HEADER, Subtable->Buffer);
@ -197,7 +197,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable2.c
{ {
case ACPI_NFIT_TYPE_SYSTEM_ADDRESS: case ACPI_NFIT_TYPE_SYSTEM_ADDRESS:
@@ -590,7 +592,7 @@ DtCompileNfit ( @@ -599,7 +601,7 @@ DtCompileNfit (
DtInsertSubtable (ParentTable, Subtable); DtInsertSubtable (ParentTable, Subtable);
DtPopSubtable (); DtPopSubtable ();
@ -206,7 +206,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable2.c
{ {
case ACPI_NFIT_TYPE_INTERLEAVE: case ACPI_NFIT_TYPE_INTERLEAVE:
@@ -616,7 +618,8 @@ DtCompileNfit ( @@ -625,7 +627,8 @@ DtCompileNfit (
Count++; Count++;
} }
@ -216,7 +216,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable2.c
break; break;
case ACPI_NFIT_TYPE_SMBIOS: case ACPI_NFIT_TYPE_SMBIOS:
@@ -662,6 +665,8 @@ DtCompileNfit ( @@ -671,6 +674,8 @@ DtCompileNfit (
} }
Hint->HintCount = (UINT16) Count; Hint->HintCount = (UINT16) Count;

View File

@ -9,11 +9,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/compiler/dttable2.c | 27 ++++++++++++++++++++- source/compiler/dttable2.c | 27 ++++++++++++++++++++-
2 files changed, 52 insertions(+), 23 deletions(-) 2 files changed, 52 insertions(+), 23 deletions(-)
Index: acpica-unix2-20211217/source/common/dmtbdump2.c Index: acpica-unix2-20220331/source/common/dmtbdump2.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/common/dmtbdump2.c --- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
+++ acpica-unix2-20211217/source/common/dmtbdump2.c +++ acpica-unix2-20220331/source/common/dmtbdump2.c
@@ -2534,7 +2534,7 @@ AcpiDmDumpSdev ( @@ -2581,7 +2581,7 @@ AcpiDmDumpSdev (
ACPI_SDEV_NAMESPACE *Namesp; ACPI_SDEV_NAMESPACE *Namesp;
ACPI_DMTABLE_INFO *InfoTable; ACPI_DMTABLE_INFO *InfoTable;
ACPI_DMTABLE_INFO *SecureComponentInfoTable; ACPI_DMTABLE_INFO *SecureComponentInfoTable;
@ -22,7 +22,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
UINT32 Offset = sizeof (ACPI_TABLE_SDEV); UINT32 Offset = sizeof (ACPI_TABLE_SDEV);
UINT16 PathOffset; UINT16 PathOffset;
UINT16 PathLength; UINT16 PathLength;
@@ -2542,11 +2542,12 @@ AcpiDmDumpSdev ( @@ -2589,11 +2589,12 @@ AcpiDmDumpSdev (
UINT16 VendorDataLength; UINT16 VendorDataLength;
ACPI_SDEV_SECURE_COMPONENT *SecureComponent = NULL; ACPI_SDEV_SECURE_COMPONENT *SecureComponent = NULL;
UINT32 CurrentOffset = 0; UINT32 CurrentOffset = 0;
@ -36,7 +36,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -2555,13 +2556,14 @@ AcpiDmDumpSdev ( @@ -2602,13 +2603,14 @@ AcpiDmDumpSdev (
/* Subtables */ /* Subtables */
Subtable = ACPI_ADD_PTR (ACPI_SDEV_HEADER, Table, Offset); Subtable = ACPI_ADD_PTR (ACPI_SDEV_HEADER, Table, Offset);
@ -54,7 +54,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -2584,8 +2586,8 @@ AcpiDmDumpSdev ( @@ -2631,8 +2633,8 @@ AcpiDmDumpSdev (
} }
AcpiOsPrintf ("\n"); AcpiOsPrintf ("\n");
@ -65,7 +65,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -2644,12 +2646,12 @@ AcpiDmDumpSdev ( @@ -2691,12 +2693,12 @@ AcpiDmDumpSdev (
/* Dump the PCIe device ID(s) */ /* Dump the PCIe device ID(s) */
Namesp = ACPI_CAST_PTR (ACPI_SDEV_NAMESPACE, Subtable); Namesp = ACPI_CAST_PTR (ACPI_SDEV_NAMESPACE, Subtable);
@ -81,7 +81,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
ACPI_ADD_PTR (UINT8, Namesp, PathOffset), ACPI_ADD_PTR (UINT8, Namesp, PathOffset),
PathLength, AcpiDmTableInfoSdev0a); PathLength, AcpiDmTableInfoSdev0a);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
@@ -2661,14 +2663,14 @@ AcpiDmDumpSdev ( @@ -2708,14 +2710,14 @@ AcpiDmDumpSdev (
/* Dump the vendor-specific data */ /* Dump the vendor-specific data */
@ -100,7 +100,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
ACPI_ADD_PTR (UINT8, Namesp, VendorDataOffset), ACPI_ADD_PTR (UINT8, Namesp, VendorDataOffset),
VendorDataLength, AcpiDmTableInfoSdev1b); VendorDataLength, AcpiDmTableInfoSdev1b);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
@@ -2683,12 +2685,12 @@ AcpiDmDumpSdev ( @@ -2730,12 +2732,12 @@ AcpiDmDumpSdev (
/* PCI path substructures */ /* PCI path substructures */
Pcie = ACPI_CAST_PTR (ACPI_SDEV_PCIE, Subtable); Pcie = ACPI_CAST_PTR (ACPI_SDEV_PCIE, Subtable);
@ -116,7 +116,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
PathOffset + Offset, PathOffset + Offset,
ACPI_ADD_PTR (UINT8, Pcie, PathOffset), ACPI_ADD_PTR (UINT8, Pcie, PathOffset),
sizeof (ACPI_SDEV_PCIE_PATH), AcpiDmTableInfoSdev1a); sizeof (ACPI_SDEV_PCIE_PATH), AcpiDmTableInfoSdev1a);
@@ -2703,12 +2705,14 @@ AcpiDmDumpSdev ( @@ -2750,12 +2752,14 @@ AcpiDmDumpSdev (
/* VendorData */ /* VendorData */
@ -134,7 +134,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
ACPI_ADD_PTR (UINT8, Pcie, VendorDataOffset), ACPI_ADD_PTR (UINT8, Pcie, VendorDataOffset),
VendorDataLength, AcpiDmTableInfoSdev1b); VendorDataLength, AcpiDmTableInfoSdev1b);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
@@ -2725,8 +2729,8 @@ AcpiDmDumpSdev ( @@ -2772,8 +2776,8 @@ AcpiDmDumpSdev (
NextSubtable: NextSubtable:
/* Point to next subtable */ /* Point to next subtable */
@ -145,11 +145,11 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
+ SubtableLength); + SubtableLength);
} }
} }
Index: acpica-unix2-20211217/source/compiler/dttable2.c Index: acpica-unix2-20220331/source/compiler/dttable2.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/compiler/dttable2.c --- acpica-unix2-20220331.orig/source/compiler/dttable2.c
+++ acpica-unix2-20211217/source/compiler/dttable2.c +++ acpica-unix2-20220331/source/compiler/dttable2.c
@@ -1877,6 +1877,7 @@ DtCompileSdev ( @@ -1890,6 +1890,7 @@ DtCompileSdev (
UINT32 EntryCount; UINT32 EntryCount;
ACPI_SDEV_SECURE_COMPONENT *SecureComponent = NULL; ACPI_SDEV_SECURE_COMPONENT *SecureComponent = NULL;
UINT16 ComponentLength = 0; UINT16 ComponentLength = 0;
@ -157,7 +157,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable2.c
/* Subtables */ /* Subtables */
@@ -1898,7 +1899,7 @@ DtCompileSdev ( @@ -1911,7 +1912,7 @@ DtCompileSdev (
DtPushSubtable (Subtable); DtPushSubtable (Subtable);
SdevHeader = ACPI_CAST_PTR (ACPI_SDEV_HEADER, Subtable->Buffer); SdevHeader = ACPI_CAST_PTR (ACPI_SDEV_HEADER, Subtable->Buffer);
@ -166,7 +166,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable2.c
switch (SdevHeader->Type) switch (SdevHeader->Type)
{ {
@@ -2071,6 +2072,18 @@ DtCompileSdev ( @@ -2084,6 +2085,18 @@ DtCompileSdev (
} }
} }
@ -185,7 +185,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable2.c
break; break;
case ACPI_SDEV_TYPE_PCIE_ENDPOINT_DEVICE: case ACPI_SDEV_TYPE_PCIE_ENDPOINT_DEVICE:
@@ -2133,6 +2146,18 @@ DtCompileSdev ( @@ -2146,6 +2159,18 @@ DtCompileSdev (
SdevHeader->Length = SdevHeader->Length =
sizeof (ACPI_SDEV_PCIE) + sizeof (ACPI_SDEV_PCIE) +
Pcie->PathLength + Pcie->VendorDataLength; Pcie->PathLength + Pcie->VendorDataLength;

View File

@ -9,11 +9,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/compiler/dttable1.c | 24 ++++++++++--- source/compiler/dttable1.c | 24 ++++++++++---
2 files changed, 59 insertions(+), 35 deletions(-) 2 files changed, 59 insertions(+), 35 deletions(-)
Index: acpica-unix2-20211217/source/common/dmtbdump1.c Index: acpica-unix2-20220331/source/common/dmtbdump1.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/common/dmtbdump1.c --- acpica-unix2-20220331.orig/source/common/dmtbdump1.c
+++ acpica-unix2-20211217/source/common/dmtbdump1.c +++ acpica-unix2-20220331/source/common/dmtbdump1.c
@@ -1596,37 +1596,45 @@ AcpiDmDumpHmat ( @@ -1680,37 +1680,45 @@ AcpiDmDumpHmat (
UINT32 Length; UINT32 Length;
ACPI_DMTABLE_INFO *InfoTable; ACPI_DMTABLE_INFO *InfoTable;
UINT32 i, j; UINT32 i, j;
@ -65,7 +65,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
{ {
case ACPI_HMAT_TYPE_ADDRESS_RANGE: case ACPI_HMAT_TYPE_ADDRESS_RANGE:
@@ -1649,7 +1657,7 @@ AcpiDmDumpHmat ( @@ -1733,7 +1741,7 @@ AcpiDmDumpHmat (
default: default:
AcpiOsPrintf ("\n**** Unknown HMAT structure type 0x%X\n", AcpiOsPrintf ("\n**** Unknown HMAT structure type 0x%X\n",
@ -74,7 +74,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
/* Attempt to continue */ /* Attempt to continue */
@@ -1658,13 +1666,13 @@ AcpiDmDumpHmat ( @@ -1742,13 +1750,13 @@ AcpiDmDumpHmat (
/* Dump HMAT structure body */ /* Dump HMAT structure body */
@ -91,7 +91,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -1672,7 +1680,7 @@ AcpiDmDumpHmat ( @@ -1756,7 +1764,7 @@ AcpiDmDumpHmat (
/* Dump HMAT structure additionals */ /* Dump HMAT structure additionals */
@ -100,7 +100,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
{ {
case ACPI_HMAT_TYPE_LOCALITY: case ACPI_HMAT_TYPE_LOCALITY:
@@ -1681,15 +1689,16 @@ AcpiDmDumpHmat ( @@ -1765,15 +1773,16 @@ AcpiDmDumpHmat (
/* Dump initiator proximity domains */ /* Dump initiator proximity domains */
@ -121,7 +121,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, HmatStruct, SubtableOffset), ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, HmatStruct, SubtableOffset),
4, AcpiDmTableInfoHmat1a); 4, AcpiDmTableInfoHmat1a);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
@@ -1702,15 +1711,16 @@ AcpiDmDumpHmat ( @@ -1786,15 +1795,16 @@ AcpiDmDumpHmat (
/* Dump target proximity domains */ /* Dump target proximity domains */
@ -142,7 +142,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, HmatStruct, SubtableOffset), ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, HmatStruct, SubtableOffset),
4, AcpiDmTableInfoHmat1b); 4, AcpiDmTableInfoHmat1b);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
@@ -1723,18 +1733,17 @@ AcpiDmDumpHmat ( @@ -1807,18 +1817,17 @@ AcpiDmDumpHmat (
/* Dump latency/bandwidth entris */ /* Dump latency/bandwidth entris */
@ -166,7 +166,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, HmatStruct, SubtableOffset), ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, HmatStruct, SubtableOffset),
2, AcpiDmTableInfoHmat1c); 2, AcpiDmTableInfoHmat1c);
if (ACPI_FAILURE(Status)) if (ACPI_FAILURE(Status))
@@ -1754,15 +1763,16 @@ AcpiDmDumpHmat ( @@ -1838,15 +1847,16 @@ AcpiDmDumpHmat (
/* Dump SMBIOS handles */ /* Dump SMBIOS handles */
@ -187,7 +187,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, HmatStruct, SubtableOffset), ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, HmatStruct, SubtableOffset),
2, AcpiDmTableInfoHmat2a); 2, AcpiDmTableInfoHmat2a);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
@@ -1782,6 +1792,6 @@ AcpiDmDumpHmat ( @@ -1866,6 +1876,6 @@ AcpiDmDumpHmat (
NextSubtable: NextSubtable:
/* Point to next HMAT structure subtable */ /* Point to next HMAT structure subtable */
@ -195,11 +195,11 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
+ Offset += (HmatStructLength); + Offset += (HmatStructLength);
} }
} }
Index: acpica-unix2-20211217/source/compiler/dttable1.c Index: acpica-unix2-20220331/source/compiler/dttable1.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/compiler/dttable1.c --- acpica-unix2-20220331.orig/source/compiler/dttable1.c
+++ acpica-unix2-20211217/source/compiler/dttable1.c +++ acpica-unix2-20220331/source/compiler/dttable1.c
@@ -1586,6 +1586,8 @@ DtCompileHmat ( @@ -1737,6 +1737,8 @@ DtCompileHmat (
UINT32 TgtPDNumber; UINT32 TgtPDNumber;
UINT64 EntryNumber; UINT64 EntryNumber;
UINT16 SMBIOSHandleNumber; UINT16 SMBIOSHandleNumber;
@ -208,7 +208,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
ParentTable = DtPeekSubtable (); ParentTable = DtPeekSubtable ();
@@ -1616,7 +1618,8 @@ DtCompileHmat ( @@ -1767,7 +1769,8 @@ DtCompileHmat (
/* Compile HMAT structure body */ /* Compile HMAT structure body */
@ -218,7 +218,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
{ {
case ACPI_HMAT_TYPE_ADDRESS_RANGE: case ACPI_HMAT_TYPE_ADDRESS_RANGE:
@@ -1649,7 +1652,7 @@ DtCompileHmat ( @@ -1800,7 +1803,7 @@ DtCompileHmat (
/* Compile HMAT structure additionals */ /* Compile HMAT structure additionals */
@ -227,7 +227,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
{ {
case ACPI_HMAT_TYPE_LOCALITY: case ACPI_HMAT_TYPE_LOCALITY:
@@ -1675,7 +1678,7 @@ DtCompileHmat ( @@ -1826,7 +1829,7 @@ DtCompileHmat (
HmatStruct->Length += Subtable->Length; HmatStruct->Length += Subtable->Length;
IntPDNumber++; IntPDNumber++;
} }
@ -236,7 +236,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
/* Compile target proximity domain list */ /* Compile target proximity domain list */
@@ -1696,7 +1699,7 @@ DtCompileHmat ( @@ -1847,7 +1850,7 @@ DtCompileHmat (
HmatStruct->Length += Subtable->Length; HmatStruct->Length += Subtable->Length;
TgtPDNumber++; TgtPDNumber++;
} }
@ -245,7 +245,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
/* Save start of the entries for reporting errors */ /* Save start of the entries for reporting errors */
@@ -1722,6 +1725,9 @@ DtCompileHmat ( @@ -1873,6 +1876,9 @@ DtCompileHmat (
EntryNumber++; EntryNumber++;
} }
@ -255,7 +255,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
/* Validate number of entries */ /* Validate number of entries */
if (EntryNumber != if (EntryNumber !=
@@ -1755,11 +1761,19 @@ DtCompileHmat ( @@ -1906,11 +1912,19 @@ DtCompileHmat (
HmatStruct->Length += Subtable->Length; HmatStruct->Length += Subtable->Length;
SMBIOSHandleNumber++; SMBIOSHandleNumber++;
} }

View File

@ -8,11 +8,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/common/dmtbdump2.c | 8 ++++---- source/common/dmtbdump2.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-) 1 file changed, 4 insertions(+), 4 deletions(-)
Index: acpica-unix2-20211217/source/common/dmtbdump2.c Index: acpica-unix2-20220331/source/common/dmtbdump2.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/common/dmtbdump2.c --- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
+++ acpica-unix2-20211217/source/common/dmtbdump2.c +++ acpica-unix2-20220331/source/common/dmtbdump2.c
@@ -1907,13 +1907,13 @@ AcpiDmDumpPdtt ( @@ -1954,13 +1954,13 @@ AcpiDmDumpPdtt (
{ {
ACPI_STATUS Status; ACPI_STATUS Status;
ACPI_PDTT_CHANNEL *Subtable; ACPI_PDTT_CHANNEL *Subtable;
@ -28,7 +28,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -1922,10 +1922,10 @@ AcpiDmDumpPdtt ( @@ -1969,10 +1969,10 @@ AcpiDmDumpPdtt (
/* Subtables. Currently there is only one type, but can be multiples */ /* Subtables. Currently there is only one type, but can be multiples */
Subtable = ACPI_ADD_PTR (ACPI_PDTT_CHANNEL, Table, Offset); Subtable = ACPI_ADD_PTR (ACPI_PDTT_CHANNEL, Table, Offset);

View File

@ -9,11 +9,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/compiler/dttable2.c | 7 +++++-- source/compiler/dttable2.c | 7 +++++--
2 files changed, 15 insertions(+), 9 deletions(-) 2 files changed, 15 insertions(+), 9 deletions(-)
Index: acpica-unix2-20211217/source/common/dmtbdump2.c Index: acpica-unix2-20220331/source/common/dmtbdump2.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/common/dmtbdump2.c --- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
+++ acpica-unix2-20211217/source/common/dmtbdump2.c +++ acpica-unix2-20220331/source/common/dmtbdump2.c
@@ -2194,6 +2194,8 @@ AcpiDmDumpPptt ( @@ -2241,6 +2241,8 @@ AcpiDmDumpPptt (
UINT32 Offset = sizeof (ACPI_TABLE_FPDT); UINT32 Offset = sizeof (ACPI_TABLE_FPDT);
ACPI_DMTABLE_INFO *InfoTable; ACPI_DMTABLE_INFO *InfoTable;
UINT32 i; UINT32 i;
@ -22,7 +22,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
/* There is no main table (other than the standard ACPI header) */ /* There is no main table (other than the standard ACPI header) */
@@ -2201,7 +2203,7 @@ AcpiDmDumpPptt ( @@ -2248,7 +2250,7 @@ AcpiDmDumpPptt (
/* Subtables */ /* Subtables */
Offset = sizeof (ACPI_TABLE_HEADER); Offset = sizeof (ACPI_TABLE_HEADER);
@ -31,7 +31,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
{ {
AcpiOsPrintf ("\n"); AcpiOsPrintf ("\n");
@@ -2213,7 +2215,7 @@ AcpiDmDumpPptt ( @@ -2260,7 +2262,7 @@ AcpiDmDumpPptt (
AcpiOsPrintf ("Invalid subtable length\n"); AcpiOsPrintf ("Invalid subtable length\n");
return; return;
} }
@ -40,7 +40,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
Subtable->Length, AcpiDmTableInfoPpttHdr); Subtable->Length, AcpiDmTableInfoPpttHdr);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
@@ -2255,7 +2257,7 @@ AcpiDmDumpPptt ( @@ -2302,7 +2304,7 @@ AcpiDmDumpPptt (
AcpiOsPrintf ("Invalid subtable length\n"); AcpiOsPrintf ("Invalid subtable length\n");
return; return;
} }
@ -49,7 +49,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
Subtable->Length, InfoTable); Subtable->Length, InfoTable);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
@@ -2271,15 +2273,16 @@ AcpiDmDumpPptt ( @@ -2318,15 +2320,16 @@ AcpiDmDumpPptt (
/* Dump SMBIOS handles */ /* Dump SMBIOS handles */
@ -70,11 +70,11 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Subtable, SubtableOffset), ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Subtable, SubtableOffset),
4, AcpiDmTableInfoPptt0a); 4, AcpiDmTableInfoPptt0a);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
Index: acpica-unix2-20211217/source/compiler/dttable2.c Index: acpica-unix2-20220331/source/compiler/dttable2.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/compiler/dttable2.c --- acpica-unix2-20220331.orig/source/compiler/dttable2.c
+++ acpica-unix2-20211217/source/compiler/dttable2.c +++ acpica-unix2-20220331/source/compiler/dttable2.c
@@ -1507,6 +1507,7 @@ DtCompilePptt ( @@ -1520,6 +1520,7 @@ DtCompilePptt (
DT_FIELD **PFieldList = (DT_FIELD **) List; DT_FIELD **PFieldList = (DT_FIELD **) List;
DT_FIELD *SubtableStart; DT_FIELD *SubtableStart;
ACPI_TABLE_HEADER *PpttAcpiHeader; ACPI_TABLE_HEADER *PpttAcpiHeader;
@ -82,7 +82,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable2.c
ParentTable = DtPeekSubtable (); ParentTable = DtPeekSubtable ();
@@ -1571,7 +1572,7 @@ DtCompilePptt ( @@ -1584,7 +1585,7 @@ DtCompilePptt (
{ {
/* Compile initiator proximity domain list */ /* Compile initiator proximity domain list */
@ -91,7 +91,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable2.c
while (*PFieldList) while (*PFieldList)
{ {
Status = DtCompileTable (PFieldList, Status = DtCompileTable (PFieldList,
@@ -1587,8 +1588,10 @@ DtCompilePptt ( @@ -1600,8 +1601,10 @@ DtCompilePptt (
DtInsertSubtable (ParentTable, Subtable); DtInsertSubtable (ParentTable, Subtable);
PpttHeader->Length += (UINT8)(Subtable->Length); PpttHeader->Length += (UINT8)(Subtable->Length);

View File

@ -8,11 +8,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/common/dmtbdump2.c | 10 +++++----- source/common/dmtbdump2.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-) 1 file changed, 5 insertions(+), 5 deletions(-)
Index: acpica-unix2-20211217/source/common/dmtbdump2.c Index: acpica-unix2-20220331/source/common/dmtbdump2.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/common/dmtbdump2.c --- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
+++ acpica-unix2-20211217/source/common/dmtbdump2.c +++ acpica-unix2-20220331/source/common/dmtbdump2.c
@@ -1803,13 +1803,13 @@ AcpiDmDumpPcct ( @@ -1850,13 +1850,13 @@ AcpiDmDumpPcct (
ACPI_STATUS Status; ACPI_STATUS Status;
ACPI_PCCT_SUBSPACE *Subtable; ACPI_PCCT_SUBSPACE *Subtable;
ACPI_DMTABLE_INFO *InfoTable; ACPI_DMTABLE_INFO *InfoTable;
@ -28,7 +28,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -1818,12 +1818,12 @@ AcpiDmDumpPcct ( @@ -1865,12 +1865,12 @@ AcpiDmDumpPcct (
/* Subtables */ /* Subtables */
Subtable = ACPI_ADD_PTR (ACPI_PCCT_SUBSPACE, Table, Offset); Subtable = ACPI_ADD_PTR (ACPI_PCCT_SUBSPACE, Table, Offset);
@ -43,7 +43,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
Subtable->Header.Length, AcpiDmTableInfoPcctHdr); Subtable->Header.Length, AcpiDmTableInfoPcctHdr);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
@@ -1871,7 +1871,7 @@ AcpiDmDumpPcct ( @@ -1918,7 +1918,7 @@ AcpiDmDumpPcct (
} }
AcpiOsPrintf ("\n"); AcpiOsPrintf ("\n");

View File

@ -8,10 +8,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/common/dmtbdump3.c | 7 ++++--- source/common/dmtbdump3.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-) 1 file changed, 4 insertions(+), 3 deletions(-)
Index: acpica-unix2-20211217/source/common/dmtbdump3.c Index: acpica-unix2-20220331/source/common/dmtbdump3.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/common/dmtbdump3.c --- acpica-unix2-20220331.orig/source/common/dmtbdump3.c
+++ acpica-unix2-20211217/source/common/dmtbdump3.c +++ acpica-unix2-20220331/source/common/dmtbdump3.c
@@ -680,11 +680,12 @@ AcpiDmDumpWdat ( @@ -680,11 +680,12 @@ AcpiDmDumpWdat (
ACPI_STATUS Status; ACPI_STATUS Status;
UINT32 Offset = sizeof (ACPI_TABLE_WDAT); UINT32 Offset = sizeof (ACPI_TABLE_WDAT);

View File

@ -9,10 +9,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/compiler/dttable2.c | 4 +++- source/compiler/dttable2.c | 4 +++-
2 files changed, 11 insertions(+), 6 deletions(-) 2 files changed, 11 insertions(+), 6 deletions(-)
Index: acpica-unix2-20211217/source/common/dmtbdump3.c Index: acpica-unix2-20220331/source/common/dmtbdump3.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/common/dmtbdump3.c --- acpica-unix2-20220331.orig/source/common/dmtbdump3.c
+++ acpica-unix2-20211217/source/common/dmtbdump3.c +++ acpica-unix2-20220331/source/common/dmtbdump3.c
@@ -406,11 +406,13 @@ AcpiDmDumpTcpa ( @@ -406,11 +406,13 @@ AcpiDmDumpTcpa (
ACPI_TABLE_TCPA_HDR *Subtable = ACPI_ADD_PTR ( ACPI_TABLE_TCPA_HDR *Subtable = ACPI_ADD_PTR (
ACPI_TABLE_TCPA_HDR, Table, Offset); ACPI_TABLE_TCPA_HDR, Table, Offset);
@ -52,11 +52,11 @@ Index: acpica-unix2-20211217/source/common/dmtbdump3.c
break; break;
default: default:
Index: acpica-unix2-20211217/source/compiler/dttable2.c Index: acpica-unix2-20220331/source/compiler/dttable2.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/compiler/dttable2.c --- acpica-unix2-20220331.orig/source/compiler/dttable2.c
+++ acpica-unix2-20211217/source/compiler/dttable2.c +++ acpica-unix2-20220331/source/compiler/dttable2.c
@@ -2527,6 +2527,7 @@ DtCompileTcpa ( @@ -2540,6 +2540,7 @@ DtCompileTcpa (
ACPI_TABLE_TCPA_HDR *TcpaHeader; ACPI_TABLE_TCPA_HDR *TcpaHeader;
DT_SUBTABLE *ParentTable; DT_SUBTABLE *ParentTable;
ACPI_STATUS Status; ACPI_STATUS Status;
@ -64,7 +64,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable2.c
/* Compile the main table */ /* Compile the main table */
@@ -2547,7 +2548,8 @@ DtCompileTcpa ( @@ -2560,7 +2561,8 @@ DtCompileTcpa (
*/ */
TcpaHeader = ACPI_CAST_PTR (ACPI_TABLE_TCPA_HDR, ParentTable->Buffer); TcpaHeader = ACPI_CAST_PTR (ACPI_TABLE_TCPA_HDR, ParentTable->Buffer);

View File

@ -8,10 +8,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/common/dmtbdump3.c | 6 +++--- source/common/dmtbdump3.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-) 1 file changed, 3 insertions(+), 3 deletions(-)
Index: acpica-unix2-20211217/source/common/dmtbdump3.c Index: acpica-unix2-20220331/source/common/dmtbdump3.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/common/dmtbdump3.c --- acpica-unix2-20220331.orig/source/common/dmtbdump3.c
+++ acpica-unix2-20211217/source/common/dmtbdump3.c +++ acpica-unix2-20220331/source/common/dmtbdump3.c
@@ -290,14 +290,14 @@ AcpiDmDumpStao ( @@ -290,14 +290,14 @@ AcpiDmDumpStao (
{ {
ACPI_STATUS Status; ACPI_STATUS Status;

View File

@ -13,10 +13,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/common/dmtbdump3.c | 6 ++++-- source/common/dmtbdump3.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-) 1 file changed, 4 insertions(+), 2 deletions(-)
Index: acpica-unix2-20211217/source/common/dmtbdump3.c Index: acpica-unix2-20220331/source/common/dmtbdump3.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/common/dmtbdump3.c --- acpica-unix2-20220331.orig/source/common/dmtbdump3.c
+++ acpica-unix2-20211217/source/common/dmtbdump3.c +++ acpica-unix2-20220331/source/common/dmtbdump3.c
@@ -68,9 +68,11 @@ void @@ -68,9 +68,11 @@ void
AcpiDmDumpSlic ( AcpiDmDumpSlic (
ACPI_TABLE_HEADER *Table) ACPI_TABLE_HEADER *Table)

View File

@ -8,11 +8,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/common/dmtbdump2.c | 11 ++++++----- source/common/dmtbdump2.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-) 1 file changed, 6 insertions(+), 5 deletions(-)
Index: acpica-unix2-20210730/source/common/dmtbdump2.c Index: acpica-unix2-20220331/source/common/dmtbdump2.c
=================================================================== ===================================================================
--- acpica-unix2-20210730.orig/source/common/dmtbdump2.c --- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
+++ acpica-unix2-20210730/source/common/dmtbdump2.c +++ acpica-unix2-20220331/source/common/dmtbdump2.c
@@ -930,11 +930,12 @@ AcpiDmDumpMcfg ( @@ -982,11 +982,12 @@ AcpiDmDumpMcfg (
ACPI_STATUS Status; ACPI_STATUS Status;
UINT32 Offset = sizeof (ACPI_TABLE_MCFG); UINT32 Offset = sizeof (ACPI_TABLE_MCFG);
ACPI_MCFG_ALLOCATION *Subtable; ACPI_MCFG_ALLOCATION *Subtable;
@ -26,7 +26,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump2.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -943,17 +944,17 @@ AcpiDmDumpMcfg ( @@ -995,17 +996,17 @@ AcpiDmDumpMcfg (
/* Subtables */ /* Subtables */
Subtable = ACPI_ADD_PTR (ACPI_MCFG_ALLOCATION, Table, Offset); Subtable = ACPI_ADD_PTR (ACPI_MCFG_ALLOCATION, Table, Offset);

View File

@ -8,10 +8,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/common/dmtbdump2.c | 8 ++++---- source/common/dmtbdump2.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-) 1 file changed, 4 insertions(+), 4 deletions(-)
Index: acpica-unix2-20210730/source/common/dmtbdump2.c Index: acpica-unix2-20220331/source/common/dmtbdump2.c
=================================================================== ===================================================================
--- acpica-unix2-20210730.orig/source/common/dmtbdump2.c --- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
+++ acpica-unix2-20210730/source/common/dmtbdump2.c +++ acpica-unix2-20220331/source/common/dmtbdump2.c
@@ -690,7 +690,7 @@ AcpiDmDumpLpit ( @@ -690,7 +690,7 @@ AcpiDmDumpLpit (
{ {
ACPI_STATUS Status; ACPI_STATUS Status;

View File

@ -8,11 +8,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/common/dmtbdump2.c | 18 ++++++++++-------- source/common/dmtbdump2.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-) 1 file changed, 10 insertions(+), 8 deletions(-)
Index: acpica-unix2-20211217/source/common/dmtbdump2.c Index: acpica-unix2-20220331/source/common/dmtbdump2.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/common/dmtbdump2.c --- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
+++ acpica-unix2-20211217/source/common/dmtbdump2.c +++ acpica-unix2-20220331/source/common/dmtbdump2.c
@@ -2095,8 +2095,9 @@ AcpiDmDumpPmtt ( @@ -2142,8 +2142,9 @@ AcpiDmDumpPmtt (
{ {
ACPI_STATUS Status; ACPI_STATUS Status;
ACPI_PMTT_HEADER *Subtable; ACPI_PMTT_HEADER *Subtable;
@ -23,7 +23,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
/* Main table */ /* Main table */
@@ -2110,17 +2111,18 @@ AcpiDmDumpPmtt ( @@ -2157,17 +2158,18 @@ AcpiDmDumpPmtt (
/* Subtables */ /* Subtables */
Subtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, Table, Offset); Subtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, Table, Offset);
@ -44,7 +44,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -2129,7 +2131,7 @@ AcpiDmDumpPmtt ( @@ -2176,7 +2178,7 @@ AcpiDmDumpPmtt (
case ACPI_PMTT_TYPE_CONTROLLER: case ACPI_PMTT_TYPE_CONTROLLER:
Status = AcpiDmDumpTable (Length, Offset, Subtable, Status = AcpiDmDumpTable (Length, Offset, Subtable,
@ -53,7 +53,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -2138,7 +2140,7 @@ AcpiDmDumpPmtt ( @@ -2185,7 +2187,7 @@ AcpiDmDumpPmtt (
case ACPI_PMTT_TYPE_DIMM: case ACPI_PMTT_TYPE_DIMM:
Status = AcpiDmDumpTable (Length, Offset, Subtable, Status = AcpiDmDumpTable (Length, Offset, Subtable,
@ -62,7 +62,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -2147,7 +2149,7 @@ AcpiDmDumpPmtt ( @@ -2194,7 +2196,7 @@ AcpiDmDumpPmtt (
case ACPI_PMTT_TYPE_VENDOR: case ACPI_PMTT_TYPE_VENDOR:
Status = AcpiDmDumpTable (Length, Offset, Subtable, Status = AcpiDmDumpTable (Length, Offset, Subtable,
@ -71,7 +71,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -2163,9 +2165,9 @@ AcpiDmDumpPmtt ( @@ -2210,9 +2212,9 @@ AcpiDmDumpPmtt (
/* Point to next subtable */ /* Point to next subtable */

View File

@ -9,10 +9,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/compiler/dttable2.c | 8 +++++--- source/compiler/dttable2.c | 8 +++++---
2 files changed, 15 insertions(+), 11 deletions(-) 2 files changed, 15 insertions(+), 11 deletions(-)
Index: acpica-unix2-20211217/source/common/dmtbdump3.c Index: acpica-unix2-20220331/source/common/dmtbdump3.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/common/dmtbdump3.c --- acpica-unix2-20220331.orig/source/common/dmtbdump3.c
+++ acpica-unix2-20211217/source/common/dmtbdump3.c +++ acpica-unix2-20220331/source/common/dmtbdump3.c
@@ -475,11 +475,12 @@ AcpiDmDumpTpm2Rev3 ( @@ -475,11 +475,12 @@ AcpiDmDumpTpm2Rev3 (
ACPI_TABLE_TPM23 *CommonHeader = ACPI_CAST_PTR (ACPI_TABLE_TPM23, Table); ACPI_TABLE_TPM23 *CommonHeader = ACPI_CAST_PTR (ACPI_TABLE_TPM23, Table);
ACPI_TPM23_TRAILER *Subtable = ACPI_ADD_PTR (ACPI_TPM23_TRAILER, Table, Offset); ACPI_TPM23_TRAILER *Subtable = ACPI_ADD_PTR (ACPI_TPM23_TRAILER, Table, Offset);
@ -77,11 +77,11 @@ Index: acpica-unix2-20211217/source/common/dmtbdump3.c
break; break;
default: default:
Index: acpica-unix2-20211217/source/compiler/dttable2.c Index: acpica-unix2-20220331/source/compiler/dttable2.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/compiler/dttable2.c --- acpica-unix2-20220331.orig/source/compiler/dttable2.c
+++ acpica-unix2-20211217/source/compiler/dttable2.c +++ acpica-unix2-20220331/source/compiler/dttable2.c
@@ -2655,6 +2655,7 @@ DtCompileTpm2 ( @@ -2668,6 +2668,7 @@ DtCompileTpm2 (
DT_SUBTABLE *ParentTable; DT_SUBTABLE *ParentTable;
ACPI_STATUS Status = AE_OK; ACPI_STATUS Status = AE_OK;
ACPI_TABLE_HEADER *Header; ACPI_TABLE_HEADER *Header;
@ -89,7 +89,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable2.c
ParentTable = DtPeekSubtable (); ParentTable = DtPeekSubtable ();
@@ -2698,7 +2699,8 @@ DtCompileTpm2 ( @@ -2711,7 +2712,8 @@ DtCompileTpm2 (
/* Subtable type depends on the StartMethod */ /* Subtable type depends on the StartMethod */
@ -99,7 +99,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable2.c
{ {
case ACPI_TPM2_COMMAND_BUFFER_WITH_ARM_SMC: case ACPI_TPM2_COMMAND_BUFFER_WITH_ARM_SMC:
@@ -2729,7 +2731,7 @@ DtCompileTpm2 ( @@ -2742,7 +2744,7 @@ DtCompileTpm2 (
case ACPI_TPM2_RESERVED10: case ACPI_TPM2_RESERVED10:
AcpiOsPrintf ("\n**** Reserved TPM2 Start Method type 0x%X\n", AcpiOsPrintf ("\n**** Reserved TPM2 Start Method type 0x%X\n",
@ -108,7 +108,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable2.c
Status = AE_ERROR; Status = AE_ERROR;
break; break;
@@ -2737,7 +2739,7 @@ DtCompileTpm2 ( @@ -2750,7 +2752,7 @@ DtCompileTpm2 (
default: default:
AcpiOsPrintf ("\n**** Unknown TPM2 Start Method type 0x%X\n", AcpiOsPrintf ("\n**** Unknown TPM2 Start Method type 0x%X\n",

View File

@ -8,11 +8,11 @@ Subject: [PATCH 40/45] Support S3PT in a big-endian world
source/compiler/dttable2.c | 4 +++- source/compiler/dttable2.c | 4 +++-
2 files changed, 12 insertions(+), 7 deletions(-) 2 files changed, 12 insertions(+), 7 deletions(-)
Index: acpica-unix2-20211217/source/common/dmtbdump2.c Index: acpica-unix2-20220331/source/common/dmtbdump2.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/common/dmtbdump2.c --- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
+++ acpica-unix2-20211217/source/common/dmtbdump2.c +++ acpica-unix2-20220331/source/common/dmtbdump2.c
@@ -2448,6 +2448,8 @@ AcpiDmDumpS3pt ( @@ -2495,6 +2495,8 @@ AcpiDmDumpS3pt (
ACPI_FPDT_HEADER *Subtable; ACPI_FPDT_HEADER *Subtable;
ACPI_DMTABLE_INFO *InfoTable; ACPI_DMTABLE_INFO *InfoTable;
ACPI_TABLE_S3PT *S3ptTable = ACPI_CAST_PTR (ACPI_TABLE_S3PT, Tables); ACPI_TABLE_S3PT *S3ptTable = ACPI_CAST_PTR (ACPI_TABLE_S3PT, Tables);
@ -21,7 +21,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
/* Main table */ /* Main table */
@@ -2459,19 +2461,20 @@ AcpiDmDumpS3pt ( @@ -2506,19 +2508,20 @@ AcpiDmDumpS3pt (
} }
Subtable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, S3ptTable, Offset); Subtable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, S3ptTable, Offset);
@ -45,7 +45,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
{ {
case ACPI_S3PT_TYPE_RESUME: case ACPI_S3PT_TYPE_RESUME:
@@ -2486,7 +2489,7 @@ AcpiDmDumpS3pt ( @@ -2533,7 +2536,7 @@ AcpiDmDumpS3pt (
default: default:
AcpiOsPrintf ("\n**** Unknown S3PT subtable type 0x%X\n", AcpiOsPrintf ("\n**** Unknown S3PT subtable type 0x%X\n",
@ -54,7 +54,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
/* Attempt to continue */ /* Attempt to continue */
@@ -2499,7 +2502,7 @@ AcpiDmDumpS3pt ( @@ -2546,7 +2549,7 @@ AcpiDmDumpS3pt (
} }
AcpiOsPrintf ("\n"); AcpiOsPrintf ("\n");
@ -63,7 +63,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
Subtable->Length, InfoTable); Subtable->Length, InfoTable);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
@@ -2513,7 +2516,7 @@ NextSubtable: @@ -2560,7 +2563,7 @@ NextSubtable:
Subtable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, Subtable, Subtable->Length); Subtable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, Subtable, Subtable->Length);
} }
@ -72,11 +72,11 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
} }
Index: acpica-unix2-20211217/source/compiler/dttable2.c Index: acpica-unix2-20220331/source/compiler/dttable2.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/compiler/dttable2.c --- acpica-unix2-20220331.orig/source/compiler/dttable2.c
+++ acpica-unix2-20211217/source/compiler/dttable2.c +++ acpica-unix2-20220331/source/compiler/dttable2.c
@@ -1790,6 +1790,7 @@ DtCompileS3pt ( @@ -1803,6 +1803,7 @@ DtCompileS3pt (
DT_SUBTABLE *ParentTable; DT_SUBTABLE *ParentTable;
ACPI_DMTABLE_INFO *InfoTable; ACPI_DMTABLE_INFO *InfoTable;
DT_FIELD *SubtableStart; DT_FIELD *SubtableStart;
@ -84,7 +84,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable2.c
Status = DtCompileTable (PFieldList, AcpiDmTableInfoS3pt, Status = DtCompileTable (PFieldList, AcpiDmTableInfoS3pt,
@@ -1817,7 +1818,8 @@ DtCompileS3pt ( @@ -1830,7 +1831,8 @@ DtCompileS3pt (
S3ptHeader = ACPI_CAST_PTR (ACPI_FPDT_HEADER, Subtable->Buffer); S3ptHeader = ACPI_CAST_PTR (ACPI_FPDT_HEADER, Subtable->Buffer);

View File

@ -9,10 +9,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/compiler/dttable1.c | 40 ++++++++++-------- source/compiler/dttable1.c | 40 ++++++++++--------
2 files changed, 72 insertions(+), 53 deletions(-) 2 files changed, 72 insertions(+), 53 deletions(-)
Index: acpica-unix2-20210730/source/common/dmtbdump2.c Index: acpica-unix2-20220331/source/common/dmtbdump2.c
=================================================================== ===================================================================
--- acpica-unix2-20210730.orig/source/common/dmtbdump2.c --- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
+++ acpica-unix2-20210730/source/common/dmtbdump2.c +++ acpica-unix2-20220331/source/common/dmtbdump2.c
@@ -77,17 +77,20 @@ AcpiDmDumpIort ( @@ -77,17 +77,20 @@ AcpiDmDumpIort (
ACPI_IORT_RMR *IortRmr = NULL; ACPI_IORT_RMR *IortRmr = NULL;
UINT32 Offset; UINT32 Offset;
@ -246,11 +246,11 @@ Index: acpica-unix2-20210730/source/common/dmtbdump2.c
} }
} }
Index: acpica-unix2-20210730/source/compiler/dttable1.c Index: acpica-unix2-20220331/source/compiler/dttable1.c
=================================================================== ===================================================================
--- acpica-unix2-20210730.orig/source/compiler/dttable1.c --- acpica-unix2-20220331.orig/source/compiler/dttable1.c
+++ acpica-unix2-20210730/source/compiler/dttable1.c +++ acpica-unix2-20220331/source/compiler/dttable1.c
@@ -1809,6 +1809,7 @@ DtCompileIort ( @@ -1960,6 +1960,7 @@ DtCompileIort (
ACPI_IORT_ITS_GROUP *IortItsGroup; ACPI_IORT_ITS_GROUP *IortItsGroup;
ACPI_IORT_SMMU *IortSmmu; ACPI_IORT_SMMU *IortSmmu;
ACPI_IORT_RMR *IortRmr; ACPI_IORT_RMR *IortRmr;
@ -258,7 +258,7 @@ Index: acpica-unix2-20210730/source/compiler/dttable1.c
UINT32 NodeNumber; UINT32 NodeNumber;
UINT32 NodeLength; UINT32 NodeLength;
UINT32 IdMappingNumber; UINT32 IdMappingNumber;
@@ -1854,7 +1855,7 @@ DtCompileIort ( @@ -2005,7 +2006,7 @@ DtCompileIort (
* Optionally allows the generic data types to be used for filling * Optionally allows the generic data types to be used for filling
* this field. * this field.
*/ */
@ -267,7 +267,7 @@ Index: acpica-unix2-20210730/source/compiler/dttable1.c
Status = DtCompileTable (PFieldList, AcpiDmTableInfoIortPad, Status = DtCompileTable (PFieldList, AcpiDmTableInfoIortPad,
&Subtable); &Subtable);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
@@ -1864,7 +1865,7 @@ DtCompileIort ( @@ -2015,7 +2016,7 @@ DtCompileIort (
if (Subtable) if (Subtable)
{ {
DtInsertSubtable (ParentTable, Subtable); DtInsertSubtable (ParentTable, Subtable);
@ -276,7 +276,7 @@ Index: acpica-unix2-20210730/source/compiler/dttable1.c
} }
else else
{ {
@@ -1874,7 +1875,7 @@ DtCompileIort ( @@ -2025,7 +2026,7 @@ DtCompileIort (
{ {
return (Status); return (Status);
} }
@ -285,7 +285,7 @@ Index: acpica-unix2-20210730/source/compiler/dttable1.c
} }
NodeNumber = 0; NodeNumber = 0;
@@ -1938,7 +1939,7 @@ DtCompileIort ( @@ -2089,7 +2090,7 @@ DtCompileIort (
ItsNumber++; ItsNumber++;
} }
@ -294,7 +294,7 @@ Index: acpica-unix2-20210730/source/compiler/dttable1.c
break; break;
case ACPI_IORT_NODE_NAMED_COMPONENT: case ACPI_IORT_NODE_NAMED_COMPONENT:
@@ -1972,15 +1973,18 @@ DtCompileIort ( @@ -2123,15 +2124,18 @@ DtCompileIort (
} }
else else
{ {
@ -316,7 +316,7 @@ Index: acpica-unix2-20210730/source/compiler/dttable1.c
&Subtable); &Subtable);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
@@ -1988,7 +1992,7 @@ DtCompileIort ( @@ -2139,7 +2143,7 @@ DtCompileIort (
} }
DtInsertSubtable (ParentTable, Subtable); DtInsertSubtable (ParentTable, Subtable);
@ -325,7 +325,7 @@ Index: acpica-unix2-20210730/source/compiler/dttable1.c
} }
} }
break; break;
@@ -2021,7 +2025,7 @@ DtCompileIort ( @@ -2172,7 +2176,7 @@ DtCompileIort (
/* Compile global interrupt array */ /* Compile global interrupt array */
@ -334,7 +334,7 @@ Index: acpica-unix2-20210730/source/compiler/dttable1.c
Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3a, Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3a,
&Subtable); &Subtable);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
@@ -2035,7 +2039,7 @@ DtCompileIort ( @@ -2186,7 +2190,7 @@ DtCompileIort (
/* Compile context interrupt array */ /* Compile context interrupt array */
ContextIrptNumber = 0; ContextIrptNumber = 0;
@ -343,7 +343,7 @@ Index: acpica-unix2-20210730/source/compiler/dttable1.c
while (*PFieldList) while (*PFieldList)
{ {
Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3b, Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3b,
@@ -2055,12 +2059,12 @@ DtCompileIort ( @@ -2206,12 +2210,12 @@ DtCompileIort (
ContextIrptNumber++; ContextIrptNumber++;
} }
@ -358,7 +358,7 @@ Index: acpica-unix2-20210730/source/compiler/dttable1.c
while (*PFieldList) while (*PFieldList)
{ {
Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3c, Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3c,
@@ -2080,7 +2084,7 @@ DtCompileIort ( @@ -2231,7 +2235,7 @@ DtCompileIort (
PmuIrptNumber++; PmuIrptNumber++;
} }
@ -367,7 +367,7 @@ Index: acpica-unix2-20210730/source/compiler/dttable1.c
break; break;
case ACPI_IORT_NODE_SMMU_V3: case ACPI_IORT_NODE_SMMU_V3:
@@ -2125,7 +2129,7 @@ DtCompileIort ( @@ -2276,7 +2280,7 @@ DtCompileIort (
/* Compile RMR Descriptors */ /* Compile RMR Descriptors */
RmrCount = 0; RmrCount = 0;
@ -376,7 +376,7 @@ Index: acpica-unix2-20210730/source/compiler/dttable1.c
while (*PFieldList) while (*PFieldList)
{ {
Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort6a, Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort6a,
@@ -2145,7 +2149,7 @@ DtCompileIort ( @@ -2296,7 +2300,7 @@ DtCompileIort (
RmrCount++; RmrCount++;
} }
@ -384,8 +384,8 @@ Index: acpica-unix2-20210730/source/compiler/dttable1.c
+ IortRmr->RmrCount = AcpiUtReadUint32 (&RmrCount); + IortRmr->RmrCount = AcpiUtReadUint32 (&RmrCount);
break; break;
default: default:
@@ -2156,7 +2160,7 @@ DtCompileIort ( @@ -2307,7 +2311,7 @@ DtCompileIort (
/* Compile Array of ID mappings */ /* Compile Array of ID mappings */
@ -394,7 +394,7 @@ Index: acpica-unix2-20210730/source/compiler/dttable1.c
IdMappingNumber = 0; IdMappingNumber = 0;
while (*PFieldList) while (*PFieldList)
{ {
@@ -2177,7 +2181,7 @@ DtCompileIort ( @@ -2328,7 +2332,7 @@ DtCompileIort (
IdMappingNumber++; IdMappingNumber++;
} }
@ -403,7 +403,7 @@ Index: acpica-unix2-20210730/source/compiler/dttable1.c
if (!IdMappingNumber) if (!IdMappingNumber)
{ {
IortNode->MappingOffset = 0; IortNode->MappingOffset = 0;
@@ -2192,7 +2196,7 @@ DtCompileIort ( @@ -2343,7 +2347,7 @@ DtCompileIort (
NodeNumber++; NodeNumber++;
} }

View File

@ -8,10 +8,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/common/dmtbdump2.c | 34 +++++++++++++++++++--------------- source/common/dmtbdump2.c | 34 +++++++++++++++++++---------------
1 file changed, 19 insertions(+), 15 deletions(-) 1 file changed, 19 insertions(+), 15 deletions(-)
Index: acpica-unix2-20210730/source/common/dmtbdump2.c Index: acpica-unix2-20220331/source/common/dmtbdump2.c
=================================================================== ===================================================================
--- acpica-unix2-20210730.orig/source/common/dmtbdump2.c --- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
+++ acpica-unix2-20210730/source/common/dmtbdump2.c +++ acpica-unix2-20220331/source/common/dmtbdump2.c
@@ -419,11 +419,14 @@ AcpiDmDumpIvrs ( @@ -419,11 +419,14 @@ AcpiDmDumpIvrs (
ACPI_IVRS_DE_HEADER *DeviceEntry; ACPI_IVRS_DE_HEADER *DeviceEntry;
ACPI_IVRS_HEADER *Subtable; ACPI_IVRS_HEADER *Subtable;

View File

@ -42,10 +42,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/components/utilities/utresrc.c | 2 +- source/components/utilities/utresrc.c | 2 +-
28 files changed, 721 insertions(+), 341 deletions(-) 28 files changed, 721 insertions(+), 341 deletions(-)
Index: acpica-unix2-20211217/source/common/adwalk.c Index: acpica-unix2-20220331/source/common/adwalk.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/common/adwalk.c --- acpica-unix2-20220331.orig/source/common/adwalk.c
+++ acpica-unix2-20211217/source/common/adwalk.c +++ acpica-unix2-20220331/source/common/adwalk.c
@@ -679,7 +679,8 @@ AcpiDmLoadDescendingOp ( @@ -679,7 +679,8 @@ AcpiDmLoadDescendingOp (
if (!Path && Op->Common.AmlOpcode == AML_INT_NAMEDFIELD_OP) if (!Path && Op->Common.AmlOpcode == AML_INT_NAMEDFIELD_OP)
@ -56,10 +56,10 @@ Index: acpica-unix2-20211217/source/common/adwalk.c
FieldPath[4] = 0; FieldPath[4] = 0;
Path = FieldPath; Path = FieldPath;
} }
Index: acpica-unix2-20211217/source/common/dmrestag.c Index: acpica-unix2-20220331/source/common/dmrestag.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/common/dmrestag.c --- acpica-unix2-20220331.orig/source/common/dmrestag.c
+++ acpica-unix2-20211217/source/common/dmrestag.c +++ acpica-unix2-20220331/source/common/dmrestag.c
@@ -1048,7 +1048,7 @@ AcpiDmAddResourcesToNamespace ( @@ -1048,7 +1048,7 @@ AcpiDmAddResourcesToNamespace (
* NextOp contains the Aml pointer and the Aml length * NextOp contains the Aml pointer and the Aml length
*/ */
@ -69,10 +69,10 @@ Index: acpica-unix2-20211217/source/common/dmrestag.c
AcpiDmAddResourceToNamespace, (void **) BufferNode); AcpiDmAddResourceToNamespace, (void **) BufferNode);
} }
Index: acpica-unix2-20211217/source/common/dmtables.c Index: acpica-unix2-20220331/source/common/dmtables.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/common/dmtables.c --- acpica-unix2-20220331.orig/source/common/dmtables.c
+++ acpica-unix2-20211217/source/common/dmtables.c +++ acpica-unix2-20220331/source/common/dmtables.c
@@ -142,6 +142,10 @@ AdCreateTableHeader ( @@ -142,6 +142,10 @@ AdCreateTableHeader (
ACPI_TABLE_HEADER *Table) ACPI_TABLE_HEADER *Table)
{ {
@ -133,10 +133,10 @@ Index: acpica-unix2-20211217/source/common/dmtables.c
AmlStart = ((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER)); AmlStart = ((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER));
AcpiUtSetIntegerWidth (Table->Revision); AcpiUtSetIntegerWidth (Table->Revision);
Index: acpica-unix2-20211217/source/common/dmtbdump.c Index: acpica-unix2-20220331/source/common/dmtbdump.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/common/dmtbdump.c --- acpica-unix2-20220331.orig/source/common/dmtbdump.c
+++ acpica-unix2-20211217/source/common/dmtbdump.c +++ acpica-unix2-20220331/source/common/dmtbdump.c
@@ -392,8 +392,7 @@ AcpiDmDumpXsdt ( @@ -392,8 +392,7 @@ AcpiDmDumpXsdt (
for (i = 0; i < Entries; i++) for (i = 0; i < Entries; i++)
{ {
@ -147,10 +147,10 @@ Index: acpica-unix2-20211217/source/common/dmtbdump.c
Offset += sizeof (UINT64); Offset += sizeof (UINT64);
} }
} }
Index: acpica-unix2-20211217/source/common/dmtbdump3.c Index: acpica-unix2-20220331/source/common/dmtbdump3.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/common/dmtbdump3.c --- acpica-unix2-20220331.orig/source/common/dmtbdump3.c
+++ acpica-unix2-20211217/source/common/dmtbdump3.c +++ acpica-unix2-20220331/source/common/dmtbdump3.c
@@ -741,12 +741,13 @@ AcpiDmDumpWpbt ( @@ -741,12 +741,13 @@ AcpiDmDumpWpbt (
{ {
ACPI_STATUS Status; ACPI_STATUS Status;
@ -182,10 +182,10 @@ Index: acpica-unix2-20211217/source/common/dmtbdump3.c
AcpiDmTableInfoWpbt0); AcpiDmTableInfoWpbt0);
} }
} }
Index: acpica-unix2-20211217/source/compiler/aslcodegen.c Index: acpica-unix2-20220331/source/compiler/aslcodegen.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/compiler/aslcodegen.c --- acpica-unix2-20220331.orig/source/compiler/aslcodegen.c
+++ acpica-unix2-20211217/source/compiler/aslcodegen.c +++ acpica-unix2-20220331/source/compiler/aslcodegen.c
@@ -238,6 +238,10 @@ CgWriteAmlOpcode ( @@ -238,6 +238,10 @@ CgWriteAmlOpcode (
{ {
UINT8 PkgLenFirstByte; UINT8 PkgLenFirstByte;
@ -348,10 +348,10 @@ Index: acpica-unix2-20211217/source/compiler/aslcodegen.c
return; return;
Index: acpica-unix2-20211217/source/compiler/aslopcodes.c Index: acpica-unix2-20220331/source/compiler/aslopcodes.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/compiler/aslopcodes.c --- acpica-unix2-20220331.orig/source/compiler/aslopcodes.c
+++ acpica-unix2-20211217/source/compiler/aslopcodes.c +++ acpica-unix2-20220331/source/compiler/aslopcodes.c
@@ -511,7 +511,8 @@ OpcDoUnicode ( @@ -511,7 +511,8 @@ OpcDoUnicode (
for (i = 0; i < Count; i++) for (i = 0; i < Count; i++)
@ -362,10 +362,10 @@ Index: acpica-unix2-20211217/source/compiler/aslopcodes.c
} }
/* /*
Index: acpica-unix2-20211217/source/compiler/aslrestype1.c Index: acpica-unix2-20220331/source/compiler/aslrestype1.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/compiler/aslrestype1.c --- acpica-unix2-20220331.orig/source/compiler/aslrestype1.c
+++ acpica-unix2-20211217/source/compiler/aslrestype1.c +++ acpica-unix2-20220331/source/compiler/aslrestype1.c
@@ -143,6 +143,7 @@ RsDoMemory24Descriptor ( @@ -143,6 +143,7 @@ RsDoMemory24Descriptor (
ASL_RESOURCE_NODE *Rnode; ASL_RESOURCE_NODE *Rnode;
UINT32 CurrentByteOffset; UINT32 CurrentByteOffset;
@ -550,10 +550,10 @@ Index: acpica-unix2-20211217/source/compiler/aslrestype1.c
RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH, RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
CurrentByteOffset + ASL_RESDESC_OFFSET (FixedMemory32.AddressLength)); CurrentByteOffset + ASL_RESDESC_OFFSET (FixedMemory32.AddressLength));
break; break;
Index: acpica-unix2-20211217/source/compiler/aslrestype1i.c Index: acpica-unix2-20220331/source/compiler/aslrestype1i.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/compiler/aslrestype1i.c --- acpica-unix2-20220331.orig/source/compiler/aslrestype1i.c
+++ acpica-unix2-20211217/source/compiler/aslrestype1i.c +++ acpica-unix2-20220331/source/compiler/aslrestype1i.c
@@ -199,6 +199,7 @@ RsDoFixedDmaDescriptor ( @@ -199,6 +199,7 @@ RsDoFixedDmaDescriptor (
ASL_RESOURCE_NODE *Rnode; ASL_RESOURCE_NODE *Rnode;
UINT32 CurrentByteOffset; UINT32 CurrentByteOffset;
@ -671,10 +671,10 @@ Index: acpica-unix2-20211217/source/compiler/aslrestype1i.c
+ Descriptor->Irq.IrqMask = AcpiUtReadUint16(&IrqMask); + Descriptor->Irq.IrqMask = AcpiUtReadUint16(&IrqMask);
return (Rnode); return (Rnode);
} }
Index: acpica-unix2-20211217/source/compiler/aslrestype2.c Index: acpica-unix2-20220331/source/compiler/aslrestype2.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/compiler/aslrestype2.c --- acpica-unix2-20220331.orig/source/compiler/aslrestype2.c
+++ acpica-unix2-20211217/source/compiler/aslrestype2.c +++ acpica-unix2-20220331/source/compiler/aslrestype2.c
@@ -77,6 +77,8 @@ RsDoGeneralRegisterDescriptor ( @@ -77,6 +77,8 @@ RsDoGeneralRegisterDescriptor (
ASL_RESOURCE_NODE *Rnode; ASL_RESOURCE_NODE *Rnode;
UINT32 CurrentByteOffset; UINT32 CurrentByteOffset;
@ -751,10 +751,10 @@ Index: acpica-unix2-20211217/source/compiler/aslrestype2.c
/* Point to end-of-descriptor for vendor data */ /* Point to end-of-descriptor for vendor data */
Index: acpica-unix2-20211217/source/compiler/aslrestype2d.c Index: acpica-unix2-20220331/source/compiler/aslrestype2d.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/compiler/aslrestype2d.c --- acpica-unix2-20220331.orig/source/compiler/aslrestype2d.c
+++ acpica-unix2-20211217/source/compiler/aslrestype2d.c +++ acpica-unix2-20220331/source/compiler/aslrestype2d.c
@@ -84,6 +84,8 @@ RsDoDwordIoDescriptor ( @@ -84,6 +84,8 @@ RsDoDwordIoDescriptor (
UINT32 CurrentByteOffset; UINT32 CurrentByteOffset;
UINT32 i; UINT32 i;
@ -1001,10 +1001,10 @@ Index: acpica-unix2-20211217/source/compiler/aslrestype2d.c
Descriptor->Address32.Flags, Descriptor->Address32.Flags,
MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp); MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
Index: acpica-unix2-20211217/source/compiler/aslrestype2q.c Index: acpica-unix2-20220331/source/compiler/aslrestype2q.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/compiler/aslrestype2q.c --- acpica-unix2-20220331.orig/source/compiler/aslrestype2q.c
+++ acpica-unix2-20211217/source/compiler/aslrestype2q.c +++ acpica-unix2-20220331/source/compiler/aslrestype2q.c
@@ -84,6 +84,7 @@ RsDoQwordIoDescriptor ( @@ -84,6 +84,7 @@ RsDoQwordIoDescriptor (
UINT32 CurrentByteOffset; UINT32 CurrentByteOffset;
UINT32 i; UINT32 i;
@ -1233,10 +1233,10 @@ Index: acpica-unix2-20211217/source/compiler/aslrestype2q.c
Descriptor->Address64.Flags, Descriptor->Address64.Flags,
MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp); MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
Index: acpica-unix2-20211217/source/compiler/aslrestype2w.c Index: acpica-unix2-20220331/source/compiler/aslrestype2w.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/compiler/aslrestype2w.c --- acpica-unix2-20220331.orig/source/compiler/aslrestype2w.c
+++ acpica-unix2-20211217/source/compiler/aslrestype2w.c +++ acpica-unix2-20220331/source/compiler/aslrestype2w.c
@@ -84,6 +84,7 @@ RsDoWordIoDescriptor ( @@ -84,6 +84,7 @@ RsDoWordIoDescriptor (
UINT32 CurrentByteOffset; UINT32 CurrentByteOffset;
UINT32 i; UINT32 i;
@ -1484,11 +1484,11 @@ Index: acpica-unix2-20211217/source/compiler/aslrestype2w.c
Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) + Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) +
OptionIndex + StringLength; OptionIndex + StringLength;
return (Rnode); return (Rnode);
Index: acpica-unix2-20211217/source/compiler/dttable2.c Index: acpica-unix2-20220331/source/compiler/dttable2.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/compiler/dttable2.c --- acpica-unix2-20220331.orig/source/compiler/dttable2.c
+++ acpica-unix2-20211217/source/compiler/dttable2.c +++ acpica-unix2-20220331/source/compiler/dttable2.c
@@ -3033,7 +3033,8 @@ DtCompileWpbt ( @@ -3046,7 +3046,8 @@ DtCompileWpbt (
/* Extract the length of the Arguments buffer, insert into main table */ /* Extract the length of the Arguments buffer, insert into main table */
@ -1498,10 +1498,10 @@ Index: acpica-unix2-20211217/source/compiler/dttable2.c
DtInsertSubtable (ParentTable, Subtable); DtInsertSubtable (ParentTable, Subtable);
return (AE_OK); return (AE_OK);
} }
Index: acpica-unix2-20211217/source/components/disassembler/dmbuffer.c Index: acpica-unix2-20220331/source/components/disassembler/dmbuffer.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/components/disassembler/dmbuffer.c --- acpica-unix2-20220331.orig/source/components/disassembler/dmbuffer.c
+++ acpica-unix2-20211217/source/components/disassembler/dmbuffer.c +++ acpica-unix2-20220331/source/components/disassembler/dmbuffer.c
@@ -204,7 +204,7 @@ AcpiDmByteList ( @@ -204,7 +204,7 @@ AcpiDmByteList (
@ -1591,10 +1591,10 @@ Index: acpica-unix2-20211217/source/components/disassembler/dmbuffer.c
AcpiOsPrintf ("EisaId (\"%s\")", IdBuffer); AcpiOsPrintf ("EisaId (\"%s\")", IdBuffer);
/* If we know about the ID, emit the description */ /* If we know about the ID, emit the description */
Index: acpica-unix2-20211217/source/components/disassembler/dmopcode.c Index: acpica-unix2-20220331/source/components/disassembler/dmopcode.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/components/disassembler/dmopcode.c --- acpica-unix2-20220331.orig/source/components/disassembler/dmopcode.c
+++ acpica-unix2-20211217/source/components/disassembler/dmopcode.c +++ acpica-unix2-20220331/source/components/disassembler/dmopcode.c
@@ -778,7 +778,9 @@ AcpiDmDisassembleOneOp ( @@ -778,7 +778,9 @@ AcpiDmDisassembleOneOp (
} }
else else
@ -1651,10 +1651,10 @@ Index: acpica-unix2-20211217/source/components/disassembler/dmopcode.c
Info->BitOffset += Offset; Info->BitOffset += Offset;
if (Info->BitOffset % 8 == 0) if (Info->BitOffset % 8 == 0)
Index: acpica-unix2-20211217/source/components/disassembler/dmresrc.c Index: acpica-unix2-20220331/source/components/disassembler/dmresrc.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/components/disassembler/dmresrc.c --- acpica-unix2-20220331.orig/source/components/disassembler/dmresrc.c
+++ acpica-unix2-20211217/source/components/disassembler/dmresrc.c +++ acpica-unix2-20220331/source/components/disassembler/dmresrc.c
@@ -417,7 +417,7 @@ AcpiDmIsResourceTemplate ( @@ -417,7 +417,7 @@ AcpiDmIsResourceTemplate (
return (AE_TYPE); return (AE_TYPE);
} }
@ -1664,10 +1664,10 @@ Index: acpica-unix2-20211217/source/components/disassembler/dmresrc.c
/* Get the length of the raw initialization byte list */ /* Get the length of the raw initialization byte list */
Index: acpica-unix2-20211217/source/components/disassembler/dmresrcl.c Index: acpica-unix2-20220331/source/components/disassembler/dmresrcl.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/components/disassembler/dmresrcl.c --- acpica-unix2-20220331.orig/source/components/disassembler/dmresrcl.c
+++ acpica-unix2-20211217/source/components/disassembler/dmresrcl.c +++ acpica-unix2-20220331/source/components/disassembler/dmresrcl.c
@@ -141,6 +141,8 @@ AcpiDmMemoryFields ( @@ -141,6 +141,8 @@ AcpiDmMemoryFields (
UINT32 Level) UINT32 Level)
{ {
@ -1789,10 +1789,10 @@ Index: acpica-unix2-20211217/source/components/disassembler/dmresrcl.c
} }
AcpiDmIndent (Level); AcpiDmIndent (Level);
Index: acpica-unix2-20211217/source/components/disassembler/dmresrcl2.c Index: acpica-unix2-20220331/source/components/disassembler/dmresrcl2.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/components/disassembler/dmresrcl2.c --- acpica-unix2-20220331.orig/source/components/disassembler/dmresrcl2.c
+++ acpica-unix2-20211217/source/components/disassembler/dmresrcl2.c +++ acpica-unix2-20220331/source/components/disassembler/dmresrcl2.c
@@ -199,22 +199,27 @@ AcpiDmGpioCommon ( @@ -199,22 +199,27 @@ AcpiDmGpioCommon (
char *DeviceName = NULL; char *DeviceName = NULL;
UINT32 PinCount; UINT32 PinCount;
@ -2134,10 +2134,10 @@ Index: acpica-unix2-20211217/source/components/disassembler/dmresrcl2.c
DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset); DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset);
AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX); AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
Index: acpica-unix2-20211217/source/components/disassembler/dmresrcs.c Index: acpica-unix2-20220331/source/components/disassembler/dmresrcs.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/components/disassembler/dmresrcs.c --- acpica-unix2-20220331.orig/source/components/disassembler/dmresrcs.c
+++ acpica-unix2-20211217/source/components/disassembler/dmresrcs.c +++ acpica-unix2-20220331/source/components/disassembler/dmresrcs.c
@@ -93,7 +93,7 @@ AcpiDmIrqDescriptor ( @@ -93,7 +93,7 @@ AcpiDmIrqDescriptor (
AcpiOsPrintf (")\n"); AcpiOsPrintf (")\n");
@ -2188,11 +2188,11 @@ Index: acpica-unix2-20211217/source/components/disassembler/dmresrcs.c
/* Insert a descriptor name */ /* Insert a descriptor name */
Index: acpica-unix2-20211217/source/components/disassembler/dmwalk.c Index: acpica-unix2-20220331/source/components/disassembler/dmwalk.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/components/disassembler/dmwalk.c --- acpica-unix2-20220331.orig/source/components/disassembler/dmwalk.c
+++ acpica-unix2-20211217/source/components/disassembler/dmwalk.c +++ acpica-unix2-20220331/source/components/disassembler/dmwalk.c
@@ -1155,7 +1155,7 @@ AcpiDmAscendingOp ( @@ -1163,7 +1163,7 @@ AcpiDmAscendingOp (
{ {
ParentOp->Common.DisasmFlags |= ACPI_PARSEOP_EMPTY_TERMLIST; ParentOp->Common.DisasmFlags |= ACPI_PARSEOP_EMPTY_TERMLIST;
ASL_CV_CLOSE_PAREN (Op, Level); ASL_CV_CLOSE_PAREN (Op, Level);
@ -2201,10 +2201,10 @@ Index: acpica-unix2-20211217/source/components/disassembler/dmwalk.c
} }
} }
Index: acpica-unix2-20211217/source/components/namespace/nsaccess.c Index: acpica-unix2-20220331/source/components/namespace/nsaccess.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/components/namespace/nsaccess.c --- acpica-unix2-20220331.orig/source/components/namespace/nsaccess.c
+++ acpica-unix2-20211217/source/components/namespace/nsaccess.c +++ acpica-unix2-20220331/source/components/namespace/nsaccess.c
@@ -644,7 +644,7 @@ AcpiNsLookup ( @@ -644,7 +644,7 @@ AcpiNsLookup (
/* Extract one ACPI name from the front of the pathname */ /* Extract one ACPI name from the front of the pathname */
@ -2214,10 +2214,10 @@ Index: acpica-unix2-20211217/source/components/namespace/nsaccess.c
/* Try to find the single (4 character) ACPI name */ /* Try to find the single (4 character) ACPI name */
Index: acpica-unix2-20211217/source/components/namespace/nsnames.c Index: acpica-unix2-20220331/source/components/namespace/nsnames.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/components/namespace/nsnames.c --- acpica-unix2-20220331.orig/source/components/namespace/nsnames.c
+++ acpica-unix2-20211217/source/components/namespace/nsnames.c +++ acpica-unix2-20220331/source/components/namespace/nsnames.c
@@ -297,10 +297,10 @@ AcpiNsBuildNormalizedPath ( @@ -297,10 +297,10 @@ AcpiNsBuildNormalizedPath (
{ {
if (NextNode != Node) if (NextNode != Node)
@ -2231,10 +2231,10 @@ Index: acpica-unix2-20211217/source/components/namespace/nsnames.c
DoNoTrailing = NoTrailing; DoNoTrailing = NoTrailing;
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
{ {
Index: acpica-unix2-20211217/source/components/namespace/nsparse.c Index: acpica-unix2-20220331/source/components/namespace/nsparse.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/components/namespace/nsparse.c --- acpica-unix2-20220331.orig/source/components/namespace/nsparse.c
+++ acpica-unix2-20211217/source/components/namespace/nsparse.c +++ acpica-unix2-20220331/source/components/namespace/nsparse.c
@@ -203,6 +203,7 @@ AcpiNsOneCompleteParse ( @@ -203,6 +203,7 @@ AcpiNsOneCompleteParse (
ACPI_WALK_STATE *WalkState; ACPI_WALK_STATE *WalkState;
ACPI_TABLE_HEADER *Table; ACPI_TABLE_HEADER *Table;
@ -2260,10 +2260,10 @@ Index: acpica-unix2-20211217/source/components/namespace/nsparse.c
Status = AcpiTbGetOwnerId (TableIndex, &OwnerId); Status = AcpiTbGetOwnerId (TableIndex, &OwnerId);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
Index: acpica-unix2-20211217/source/components/namespace/nsutils.c Index: acpica-unix2-20220331/source/components/namespace/nsutils.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/components/namespace/nsutils.c --- acpica-unix2-20220331.orig/source/components/namespace/nsutils.c
+++ acpica-unix2-20211217/source/components/namespace/nsutils.c +++ acpica-unix2-20220331/source/components/namespace/nsutils.c
@@ -272,7 +272,6 @@ AcpiNsBuildInternalName ( @@ -272,7 +272,6 @@ AcpiNsBuildInternalName (
const char *ExternalName = Info->NextExternalChar; const char *ExternalName = Info->NextExternalChar;
char *Result = NULL; char *Result = NULL;
@ -2300,10 +2300,10 @@ Index: acpica-unix2-20211217/source/components/namespace/nsutils.c
/* Now we must have a path separator, or the pathname is bad */ /* Now we must have a path separator, or the pathname is bad */
Index: acpica-unix2-20211217/source/components/utilities/utresrc.c Index: acpica-unix2-20220331/source/components/utilities/utresrc.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/components/utilities/utresrc.c --- acpica-unix2-20220331.orig/source/components/utilities/utresrc.c
+++ acpica-unix2-20211217/source/components/utilities/utresrc.c +++ acpica-unix2-20220331/source/components/utilities/utresrc.c
@@ -541,7 +541,7 @@ AcpiUtGetResourceLength ( @@ -541,7 +541,7 @@ AcpiUtGetResourceLength (
{ {
/* Large Resource type -- bytes 1-2 contain the 16-bit length */ /* Large Resource type -- bytes 1-2 contain the 16-bit length */
@ -2313,10 +2313,10 @@ Index: acpica-unix2-20211217/source/components/utilities/utresrc.c
} }
else else
Index: acpica-unix2-20211217/source/compiler/aslrestype2e.c Index: acpica-unix2-20220331/source/compiler/aslrestype2e.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/compiler/aslrestype2e.c --- acpica-unix2-20220331.orig/source/compiler/aslrestype2e.c
+++ acpica-unix2-20211217/source/compiler/aslrestype2e.c +++ acpica-unix2-20220331/source/compiler/aslrestype2e.c
@@ -80,6 +80,7 @@ RsDoExtendedIoDescriptor ( @@ -80,6 +80,7 @@ RsDoExtendedIoDescriptor (
UINT16 StringLength = 0; UINT16 StringLength = 0;
UINT32 CurrentByteOffset; UINT32 CurrentByteOffset;
@ -2575,10 +2575,10 @@ Index: acpica-unix2-20211217/source/compiler/aslrestype2e.c
Descriptor->ExtAddress64.Flags, Descriptor->ExtAddress64.Flags,
MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp); MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
Index: acpica-unix2-20211217/source/compiler/aslrestype2s.c Index: acpica-unix2-20220331/source/compiler/aslrestype2s.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/compiler/aslrestype2s.c --- acpica-unix2-20220331.orig/source/compiler/aslrestype2s.c
+++ acpica-unix2-20211217/source/compiler/aslrestype2s.c +++ acpica-unix2-20220331/source/compiler/aslrestype2s.c
@@ -343,6 +343,7 @@ RsDoGpioIntDescriptor ( @@ -343,6 +343,7 @@ RsDoGpioIntDescriptor (
UINT32 CurrentByteOffset; UINT32 CurrentByteOffset;
UINT32 PinCount = 0; UINT32 PinCount = 0;

View File

@ -12,11 +12,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/compiler/dttable1.c | 28 +++++++++++++------------ source/compiler/dttable1.c | 28 +++++++++++++------------
2 files changed, 39 insertions(+), 32 deletions(-) 2 files changed, 39 insertions(+), 32 deletions(-)
Index: acpica-unix2-20211217/source/common/dmtbdump1.c Index: acpica-unix2-20220331/source/common/dmtbdump1.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/common/dmtbdump1.c --- acpica-unix2-20220331.orig/source/common/dmtbdump1.c
+++ acpica-unix2-20211217/source/common/dmtbdump1.c +++ acpica-unix2-20220331/source/common/dmtbdump1.c
@@ -591,11 +591,13 @@ AcpiDmDumpCsrt ( @@ -669,11 +669,13 @@ AcpiDmDumpCsrt (
ACPI_CSRT_GROUP *Subtable; ACPI_CSRT_GROUP *Subtable;
ACPI_CSRT_SHARED_INFO *SharedInfoTable; ACPI_CSRT_SHARED_INFO *SharedInfoTable;
ACPI_CSRT_DESCRIPTOR *SubSubtable; ACPI_CSRT_DESCRIPTOR *SubSubtable;
@ -31,7 +31,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
/* The main table only contains the ACPI header, thus already handled */ /* The main table only contains the ACPI header, thus already handled */
@@ -603,13 +605,14 @@ AcpiDmDumpCsrt ( @@ -681,13 +683,14 @@ AcpiDmDumpCsrt (
/* Subtables (Resource Groups) */ /* Subtables (Resource Groups) */
Subtable = ACPI_ADD_PTR (ACPI_CSRT_GROUP, Table, Offset); Subtable = ACPI_ADD_PTR (ACPI_CSRT_GROUP, Table, Offset);
@ -49,7 +49,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -622,26 +625,28 @@ AcpiDmDumpCsrt ( @@ -700,26 +703,28 @@ AcpiDmDumpCsrt (
Offset + SubOffset); Offset + SubOffset);
AcpiOsPrintf ("\n"); AcpiOsPrintf ("\n");
@ -85,7 +85,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -651,11 +656,12 @@ AcpiDmDumpCsrt ( @@ -729,11 +734,12 @@ AcpiDmDumpCsrt (
/* Resource-specific info buffer */ /* Resource-specific info buffer */
@ -101,7 +101,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
InfoLength, AcpiDmTableInfoCsrt2a); InfoLength, AcpiDmTableInfoCsrt2a);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
@@ -665,16 +671,15 @@ AcpiDmDumpCsrt ( @@ -743,16 +749,15 @@ AcpiDmDumpCsrt (
/* Point to next sub-subtable */ /* Point to next sub-subtable */
@ -122,11 +122,11 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
} }
} }
Index: acpica-unix2-20211217/source/compiler/dttable1.c Index: acpica-unix2-20220331/source/compiler/dttable1.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/compiler/dttable1.c --- acpica-unix2-20220331.orig/source/compiler/dttable1.c
+++ acpica-unix2-20211217/source/compiler/dttable1.c +++ acpica-unix2-20220331/source/compiler/dttable1.c
@@ -570,14 +570,16 @@ DtCompileCsrt ( @@ -716,14 +716,16 @@ DtCompileCsrt (
DT_SUBTABLE *Subtable; DT_SUBTABLE *Subtable;
DT_SUBTABLE *ParentTable; DT_SUBTABLE *ParentTable;
DT_FIELD **PFieldList = (DT_FIELD **) List; DT_FIELD **PFieldList = (DT_FIELD **) List;
@ -144,7 +144,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
while (*PFieldList) while (*PFieldList)
{ {
/* Resource group subtable */ /* Resource group subtable */
@@ -592,16 +594,13 @@ DtCompileCsrt ( @@ -738,16 +740,13 @@ DtCompileCsrt (
/* Compute the number of resource descriptors */ /* Compute the number of resource descriptors */
Tmp = AcpiUtReadUint32 (&(ACPI_CAST_PTR (ACPI_CSRT_GROUP, Tmp = AcpiUtReadUint32 (&(ACPI_CAST_PTR (ACPI_CSRT_GROUP,
@ -163,7 +163,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
DtInsertSubtable (ParentTable, Subtable); DtInsertSubtable (ParentTable, Subtable);
DtPushSubtable (Subtable); DtPushSubtable (Subtable);
ParentTable = DtPeekSubtable (); ParentTable = DtPeekSubtable ();
@@ -616,10 +615,13 @@ DtCompileCsrt ( @@ -762,10 +761,13 @@ DtCompileCsrt (
} }
DtInsertSubtable (ParentTable, Subtable); DtInsertSubtable (ParentTable, Subtable);
@ -178,7 +178,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
{ {
Status = DtCompileTable (PFieldList, AcpiDmTableInfoCsrt2, Status = DtCompileTable (PFieldList, AcpiDmTableInfoCsrt2,
@@ -628,6 +630,10 @@ DtCompileCsrt ( @@ -774,6 +776,10 @@ DtCompileCsrt (
{ {
return (Status); return (Status);
} }
@ -189,7 +189,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
DtInsertSubtable (ParentTable, Subtable); DtInsertSubtable (ParentTable, Subtable);
@@ -637,11 +643,7 @@ DtCompileCsrt ( @@ -783,11 +789,7 @@ DtCompileCsrt (
{ {
Status = DtCompileTable (PFieldList, AcpiDmTableInfoCsrt2a, Status = DtCompileTable (PFieldList, AcpiDmTableInfoCsrt2a,
&Subtable); &Subtable);
@ -202,7 +202,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
{ {
DtInsertSubtable (ParentTable, Subtable); DtInsertSubtable (ParentTable, Subtable);
} }
@@ -649,7 +651,7 @@ DtCompileCsrt ( @@ -795,7 +797,7 @@ DtCompileCsrt (
DtPopSubtable (); DtPopSubtable ();
ParentTable = DtPeekSubtable (); ParentTable = DtPeekSubtable ();

View File

@ -9,11 +9,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/compiler/dttable2.c | 12 +++++++++--- source/compiler/dttable2.c | 12 +++++++++---
2 files changed, 29 insertions(+), 19 deletions(-) 2 files changed, 29 insertions(+), 19 deletions(-)
Index: acpica-unix2-20211217/source/common/dmtbdump2.c Index: acpica-unix2-20220331/source/common/dmtbdump2.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/common/dmtbdump2.c --- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
+++ acpica-unix2-20211217/source/common/dmtbdump2.c +++ acpica-unix2-20220331/source/common/dmtbdump2.c
@@ -1982,39 +1982,41 @@ AcpiDmDumpPhat ( @@ -2029,39 +2029,41 @@ AcpiDmDumpPhat (
ACPI_PHAT_HEADER *Subtable; ACPI_PHAT_HEADER *Subtable;
ACPI_PHAT_VERSION_DATA *VersionData; ACPI_PHAT_VERSION_DATA *VersionData;
UINT32 RecordCount; UINT32 RecordCount;
@ -62,7 +62,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
break; break;
default: default:
@@ -2025,22 +2027,22 @@ AcpiDmDumpPhat ( @@ -2072,22 +2074,22 @@ AcpiDmDumpPhat (
return; return;
} }
@ -89,7 +89,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
ACPI_ADD_PTR (ACPI_PHAT_HEADER, Subtable, sizeof (ACPI_PHAT_VERSION_DATA)), ACPI_ADD_PTR (ACPI_PHAT_HEADER, Subtable, sizeof (ACPI_PHAT_VERSION_DATA)),
sizeof (ACPI_PHAT_VERSION_ELEMENT), AcpiDmTableInfoPhat0a); sizeof (ACPI_PHAT_VERSION_ELEMENT), AcpiDmTableInfoPhat0a);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
@@ -2058,7 +2060,7 @@ AcpiDmDumpPhat ( @@ -2105,7 +2107,7 @@ AcpiDmDumpPhat (
/* account for the null terminator */ /* account for the null terminator */
PathLength = strlen (ACPI_ADD_PTR (char, Subtable, sizeof (ACPI_PHAT_HEALTH_DATA))) + 1; PathLength = strlen (ACPI_ADD_PTR (char, Subtable, sizeof (ACPI_PHAT_HEALTH_DATA))) + 1;
@ -98,7 +98,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
ACPI_ADD_PTR (ACPI_PHAT_HEADER, Subtable, sizeof (ACPI_PHAT_HEALTH_DATA)), ACPI_ADD_PTR (ACPI_PHAT_HEADER, Subtable, sizeof (ACPI_PHAT_HEALTH_DATA)),
PathLength, AcpiDmTableInfoPhat1a); PathLength, AcpiDmTableInfoPhat1a);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
@@ -2069,8 +2071,8 @@ AcpiDmDumpPhat ( @@ -2116,8 +2118,8 @@ AcpiDmDumpPhat (
/* Get vendor data - data length is the remaining subtable length */ /* Get vendor data - data length is the remaining subtable length */
VendorLength = VendorLength =
@ -109,7 +109,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
ACPI_ADD_PTR (ACPI_PHAT_HEADER, Subtable, sizeof (ACPI_PHAT_HEALTH_DATA) + PathLength), ACPI_ADD_PTR (ACPI_PHAT_HEADER, Subtable, sizeof (ACPI_PHAT_HEALTH_DATA) + PathLength),
VendorLength, AcpiDmTableInfoPhat1b); VendorLength, AcpiDmTableInfoPhat1b);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
@@ -2082,15 +2084,15 @@ AcpiDmDumpPhat ( @@ -2129,15 +2131,15 @@ AcpiDmDumpPhat (
default: default:
AcpiOsPrintf ("\n**** Unknown PHAT subtable type 0x%X\n\n", AcpiOsPrintf ("\n**** Unknown PHAT subtable type 0x%X\n\n",
@ -128,11 +128,11 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
} }
} }
Index: acpica-unix2-20211217/source/compiler/dttable2.c Index: acpica-unix2-20220331/source/compiler/dttable2.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/compiler/dttable2.c --- acpica-unix2-20220331.orig/source/compiler/dttable2.c
+++ acpica-unix2-20211217/source/compiler/dttable2.c +++ acpica-unix2-20220331/source/compiler/dttable2.c
@@ -1254,6 +1254,8 @@ DtCompilePhat ( @@ -1267,6 +1267,8 @@ DtCompilePhat (
ACPI_DMTABLE_INFO *Info; ACPI_DMTABLE_INFO *Info;
ACPI_PHAT_VERSION_DATA *VersionData; ACPI_PHAT_VERSION_DATA *VersionData;
UINT32 RecordCount; UINT32 RecordCount;
@ -141,7 +141,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable2.c
/* The table consist of subtables */ /* The table consist of subtables */
@@ -1271,8 +1273,9 @@ DtCompilePhat ( @@ -1284,8 +1286,9 @@ DtCompilePhat (
DtPushSubtable (Subtable); DtPushSubtable (Subtable);
PhatHeader = ACPI_CAST_PTR (ACPI_PHAT_HEADER, Subtable->Buffer); PhatHeader = ACPI_CAST_PTR (ACPI_PHAT_HEADER, Subtable->Buffer);
@ -152,7 +152,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable2.c
{ {
case ACPI_PHAT_TYPE_FW_VERSION_DATA: case ACPI_PHAT_TYPE_FW_VERSION_DATA:
@@ -1303,13 +1306,13 @@ DtCompilePhat ( @@ -1316,13 +1319,13 @@ DtCompilePhat (
ParentTable = DtPeekSubtable (); ParentTable = DtPeekSubtable ();
DtInsertSubtable (ParentTable, Subtable); DtInsertSubtable (ParentTable, Subtable);
@ -168,7 +168,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable2.c
while (RecordCount) while (RecordCount)
{ {
@@ -1360,6 +1363,9 @@ DtCompilePhat ( @@ -1373,6 +1376,9 @@ DtCompilePhat (
DtFatal (ASL_MSG_UNKNOWN_SUBTABLE, *PFieldList, "PHAT"); DtFatal (ASL_MSG_UNKNOWN_SUBTABLE, *PFieldList, "PHAT");
return (AE_ERROR); return (AE_ERROR);
} }

View File

@ -0,0 +1,51 @@
Signed-off-by: Dean Nelson <dnelson@redhat.com>
Reviewed-by: Al Stone <ahs3@redhat.com>
---
source/common/dmtbdump2.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
Index: acpica-unix2-20220331/source/common/dmtbdump2.c
===================================================================
--- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
+++ acpica-unix2-20220331/source/common/dmtbdump2.c
@@ -2415,13 +2415,14 @@ AcpiDmDumpPrmt (
ACPI_PRMT_MODULE_INFO *PrmtModuleInfo;
ACPI_PRMT_HANDLER_INFO *PrmtHandlerInfo;
ACPI_STATUS Status;
+ UINT32 TableLength = AcpiUtReadUint32 (&Table->Length);
UINT32 i, j;
/* Main table header */
PrmtHeader = ACPI_ADD_PTR (ACPI_TABLE_PRMT_HEADER, Table, CurrentOffset);
- Status = AcpiDmDumpTable (Table->Length, CurrentOffset, PrmtHeader,
+ Status = AcpiDmDumpTable (TableLength, CurrentOffset, PrmtHeader,
sizeof (ACPI_TABLE_PRMT_HEADER), AcpiDmTableInfoPrmtHdr);
if (ACPI_FAILURE (Status))
{
@@ -2433,20 +2434,20 @@ AcpiDmDumpPrmt (
/* PRM Module Information Structure array */
- for (i = 0; i < PrmtHeader->ModuleInfoCount; ++i)
+ for (i = 0; i < AcpiUtReadUint32 (&PrmtHeader->ModuleInfoCount); ++i)
{
PrmtModuleInfo = ACPI_ADD_PTR (ACPI_PRMT_MODULE_INFO, Table, CurrentOffset);
- Status = AcpiDmDumpTable (Table->Length, CurrentOffset, PrmtModuleInfo,
+ Status = AcpiDmDumpTable (TableLength, CurrentOffset, PrmtModuleInfo,
sizeof (ACPI_PRMT_MODULE_INFO), AcpiDmTableInfoPrmtModule);
CurrentOffset += sizeof (ACPI_PRMT_MODULE_INFO);
/* PRM handler information structure array */
- for (j = 0; j < PrmtModuleInfo->HandlerInfoCount; ++j)
+ for (j = 0; j < AcpiUtReadUint16 (&PrmtModuleInfo->HandlerInfoCount); ++j)
{
PrmtHandlerInfo = ACPI_ADD_PTR (ACPI_PRMT_HANDLER_INFO, Table, CurrentOffset);
- Status = AcpiDmDumpTable (Table->Length, CurrentOffset, PrmtHandlerInfo,
+ Status = AcpiDmDumpTable (TableLength, CurrentOffset, PrmtHandlerInfo,
sizeof (ACPI_PRMT_HANDLER_INFO), AcpiDmTableInfoPrmtHandler);
CurrentOffset += sizeof (ACPI_PRMT_HANDLER_INFO);

View File

@ -0,0 +1,35 @@
Signed-off-by: Dean Nelson <dnelson@redhat.com>
Reviewed-by: Al Stone <ahs3@redhat.com>
---
source/common/dmtbdump2.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
Index: acpica-unix2-20220331/source/common/dmtbdump2.c
===================================================================
--- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
+++ acpica-unix2-20220331/source/common/dmtbdump2.c
@@ -2475,11 +2475,12 @@ AcpiDmDumpRgrt (
ACPI_STATUS Status;
ACPI_TABLE_RGRT *Subtable = ACPI_CAST_PTR (ACPI_TABLE_RGRT, Table);
UINT32 Offset = sizeof (ACPI_TABLE_RGRT);
+ UINT32 TableLength = AcpiUtReadUint32 (&Table->Length);
/* Main table */
- Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoRgrt);
+ Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoRgrt);
if (ACPI_FAILURE (Status))
{
return;
@@ -2487,8 +2488,8 @@ AcpiDmDumpRgrt (
/* Dump the binary image as a subtable */
- Status = AcpiDmDumpTable (Table->Length, Offset, &Subtable->Image,
- Table->Length - Offset, AcpiDmTableInfoRgrt0);
+ Status = AcpiDmDumpTable (TableLength, Offset, &Subtable->Image,
+ TableLength - Offset, AcpiDmTableInfoRgrt0);
if (ACPI_FAILURE (Status))
{
return;

View File

@ -0,0 +1,42 @@
Signed-off-by: Dean Nelson <dnelson@redhat.com>
Reviewed-by: Al Stone <ahs3@redhat.com>
---
source/common/dmtbdump3.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
Index: acpica-unix2-20220331/source/common/dmtbdump3.c
===================================================================
--- acpica-unix2-20220331.orig/source/common/dmtbdump3.c
+++ acpica-unix2-20220331/source/common/dmtbdump3.c
@@ -344,14 +344,14 @@ AcpiDmDumpSvkl (
ACPI_TABLE_HEADER *Table)
{
ACPI_STATUS Status;
- UINT32 Length = Table->Length;
+ UINT32 TableLength = AcpiUtReadUint32 (&Table->Length);
UINT32 Offset = sizeof (ACPI_TABLE_SVKL);
ACPI_SVKL_KEY *Subtable;
/* Main table */
- Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoSvkl);
+ Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoSvkl);
if (ACPI_FAILURE (Status))
{
return;
@@ -360,12 +360,12 @@ AcpiDmDumpSvkl (
/* The rest of the table consists of subtables (single type) */
Subtable = ACPI_ADD_PTR (ACPI_SVKL_KEY, Table, Offset);
- while (Offset < Table->Length)
+ while (Offset < TableLength)
{
/* Dump the subtable */
AcpiOsPrintf ("\n");
- Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
+ Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
sizeof (ACPI_SVKL_KEY), AcpiDmTableInfoSvkl0);
if (ACPI_FAILURE (Status))
{

View File

@ -1,7 +1,7 @@
Index: acpica-unix2-20200925/generate/unix/Makefile.config Index: acpica-unix2-20220331/generate/unix/Makefile.config
=================================================================== ===================================================================
--- acpica-unix2-20200925.orig/generate/unix/Makefile.config --- acpica-unix2-20220331.orig/generate/unix/Makefile.config
+++ acpica-unix2-20200925/generate/unix/Makefile.config +++ acpica-unix2-20220331/generate/unix/Makefile.config
@@ -23,6 +23,9 @@ @@ -23,6 +23,9 @@
# OPT_CFLAGS can be overridden on the make command line by # OPT_CFLAGS can be overridden on the make command line by
# adding OPT_CFLAGS="..." to the invocation. # adding OPT_CFLAGS="..." to the invocation.

View File

@ -1,6 +1,6 @@
Name: acpica-tools Name: acpica-tools
Version: 20211217 Version: 20220331
Release: 2%{?dist} Release: 1%{?dist}
Summary: ACPICA tools for the development and debug of ACPI tables Summary: ACPICA tools for the development and debug of ACPI tables
License: GPLv2 License: GPLv2
@ -71,6 +71,9 @@ Patch41: 0042-Support-IVRS-in-a-big-endian-world.patch
Patch42: 0043-Support-DSDT-SSDT-in-a-big-endian-world.patch Patch42: 0043-Support-DSDT-SSDT-in-a-big-endian-world.patch
Patch43: 0045-CSRT-fixed-use-of-optional-ResourceInfo.patch Patch43: 0045-CSRT-fixed-use-of-optional-ResourceInfo.patch
Patch44: 0046-Support-PHAT-in-a-big-endian-world.patch Patch44: 0046-Support-PHAT-in-a-big-endian-world.patch
Patch45: 0047-Support-PRMT-in-a-big-endian-world.patch
Patch46: 0048-Support-RGRT-in-a-big-endian-world.patch
Patch47: 0049-Support-SVKL-in-a-big-endian-world.patch
# other miscellaneous patches # other miscellaneous patches
Patch100: unaligned.patch Patch100: unaligned.patch
@ -256,6 +259,11 @@ fi
%changelog %changelog
* Sun Apr 3 2022 Al Stone <ahs3@redhat.com> - 20220331-1
- Update to 20220331 upstream source. Bring all the patches up to date.
- Update the results of misc test cases.
- Add in big-endian patches for PRMT, RGRT and SVKL tables (thanks, Dean!)
* Mon Mar 28 2022 Al Stone <ahs3@redhat.com> - 20211217-2 * Mon Mar 28 2022 Al Stone <ahs3@redhat.com> - 20211217-2
- Stop building i686; it is the only Arch that stumbles across a problem - Stop building i686; it is the only Arch that stumbles across a problem
in using varargs but since the Arch has been essentially deprecated, in using varargs but since the Arch has been essentially deprecated,

View File

@ -1,7 +1,7 @@
Index: acpica-unix2-20210604/source/include/acmacros.h Index: acpica-unix2-20220331/source/include/acmacros.h
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/include/acmacros.h --- acpica-unix2-20220331.orig/source/include/acmacros.h
+++ acpica-unix2-20210604/source/include/acmacros.h +++ acpica-unix2-20220331/source/include/acmacros.h
@@ -108,6 +108,8 @@ @@ -108,6 +108,8 @@
/* 16-bit source, 16/32/64 destination */ /* 16-bit source, 16/32/64 destination */

View File

@ -1,8 +1,8 @@
Index: acpica-unix2-20211217/source/include/actypes.h Index: acpica-unix2-20220331/source/include/actypes.h
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/include/actypes.h --- acpica-unix2-20220331.orig/source/include/actypes.h
+++ acpica-unix2-20211217/source/include/actypes.h +++ acpica-unix2-20220331/source/include/actypes.h
@@ -560,7 +560,7 @@ typedef UINT64 @@ -564,7 +564,7 @@ typedef UINT64
#define ACPI_COPY_NAMESEG(dest,src) (*ACPI_CAST_PTR (UINT32, (dest)) = *ACPI_CAST_PTR (UINT32, (src))) #define ACPI_COPY_NAMESEG(dest,src) (*ACPI_CAST_PTR (UINT32, (dest)) = *ACPI_CAST_PTR (UINT32, (src)))
#else #else
#define ACPI_COMPARE_NAMESEG(a,b) (!strncmp (ACPI_CAST_PTR (char, (a)), ACPI_CAST_PTR (char, (b)), ACPI_NAMESEG_SIZE)) #define ACPI_COMPARE_NAMESEG(a,b) (!strncmp (ACPI_CAST_PTR (char, (a)), ACPI_CAST_PTR (char, (b)), ACPI_NAMESEG_SIZE))

View File

@ -256,11 +256,11 @@ Warning 3144 - ^ Method Local is set but never used
Intel ACPI Component Architecture Intel ACPI Component Architecture
ASL+ Optimizing Compiler/Disassembler version VVVVVVVV ASL+ Optimizing Compiler/Disassembler version VVVVVVVV
Copyright (c) 2000 - 2021 Intel Corporation Copyright (c) 2000 - 2022 Intel Corporation
Ignoring all errors, forcing AML file generation Ignoring all errors, forcing AML file generation
ASL Input: badcode.asl - 11588 bytes 81 keywords 408 source lines ASL Input: badcode.asl - 11588 bytes 81 keywords 408 source lines
AML Output: badcode.aml - 1195 bytes 20 opcodes 61 named objects AML Output: badcode.aml - 1195 bytes 20 opcodes 61 named objects
Compilation successful. 46 Errors, 28 Warnings, 11 Remarks, 16 Optimizations, 1 Constants Folded Compilation successful. 0 Errors, 28 Warnings, 11 Remarks, 16 Optimizations, 1 Constants Folded

View File

@ -25,17 +25,14 @@ Remark 2182 - ^ At least one lower case letter found
converterSample.asl 68: Name (a1, 0x04) converterSample.asl 68: Name (a1, 0x04)
Remark 2089 - Object is not referenced ^ (Name [A1__] is within a method [SCOP]) Remark 2089 - Object is not referenced ^ (Name [A1__] is within a method [SCOP])
converterSample.asl 76: Offset(0),//c37
Remark 2158 - ^ Unnecessary/redundant use of Offset operator
Intel ACPI Component Architecture Intel ACPI Component Architecture
ASL+ Optimizing Compiler/Disassembler version VVVVVVVV ASL+ Optimizing Compiler/Disassembler version VVVVVVVV
Copyright (c) 2000 - 2021 Intel Corporation Copyright (c) 2000 - 2022 Intel Corporation
Ignoring all errors, forcing AML file generation Ignoring all errors, forcing AML file generation
ASL Input: converterSample.asl - 1968 bytes 11 keywords 85 source lines ASL Input: converterSample.asl - 1968 bytes 11 keywords 85 source lines
AML Output: converterSample.aml - 182 bytes 2 opcodes 9 named objects AML Output: converterSample.aml - 184 bytes 2 opcodes 9 named objects
Compilation successful. 0 Errors, 0 Warnings, 10 Remarks, 10 Optimizations Compilation successful. 0 Errors, 0 Warnings, 9 Remarks, 9 Optimizations

View File

@ -63,10 +63,10 @@ Github-Location: https://github.com/acpica/acpica/pull/295/commits/987a3b5cf7175
source/components/dispatcher/dsutils.c | 9 ++++++++- source/components/dispatcher/dsutils.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-) 1 file changed, 8 insertions(+), 1 deletion(-)
Index: acpica-unix2-20200925/source/components/dispatcher/dsutils.c Index: acpica-unix2-20220331/source/components/dispatcher/dsutils.c
=================================================================== ===================================================================
--- acpica-unix2-20200925.orig/source/components/dispatcher/dsutils.c --- acpica-unix2-20220331.orig/source/components/dispatcher/dsutils.c
+++ acpica-unix2-20200925/source/components/dispatcher/dsutils.c +++ acpica-unix2-20220331/source/components/dispatcher/dsutils.c
@@ -759,6 +759,8 @@ AcpiDsCreateOperands ( @@ -759,6 +759,8 @@ AcpiDsCreateOperands (
ACPI_PARSE_OBJECT *Arguments[ACPI_OBJ_NUM_OPERANDS]; ACPI_PARSE_OBJECT *Arguments[ACPI_OBJ_NUM_OPERANDS];
UINT32 ArgCount = 0; UINT32 ArgCount = 0;

View File

@ -130,10 +130,10 @@ Github-Location: https://github.com/acpica/acpica/pull/278/commits/4a0243ecb4c94
source/components/parser/psobject.c | 44 ++++++++++++++----------------------- source/components/parser/psobject.c | 44 ++++++++++++++-----------------------
1 file changed, 16 insertions(+), 28 deletions(-) 1 file changed, 16 insertions(+), 28 deletions(-)
Index: acpica-unix2-20200925/source/components/parser/psobject.c Index: acpica-unix2-20220331/source/components/parser/psobject.c
=================================================================== ===================================================================
--- acpica-unix2-20200925.orig/source/components/parser/psobject.c --- acpica-unix2-20220331.orig/source/components/parser/psobject.c
+++ acpica-unix2-20200925/source/components/parser/psobject.c +++ acpica-unix2-20220331/source/components/parser/psobject.c
@@ -707,7 +707,8 @@ AcpiPsCompleteFinalOp ( @@ -707,7 +707,8 @@ AcpiPsCompleteFinalOp (
ACPI_PARSE_OBJECT *Op, ACPI_PARSE_OBJECT *Op,
ACPI_STATUS Status) ACPI_STATUS Status)

View File

@ -67,10 +67,10 @@ Github-Location: https://github.com/acpica/acpica/pull/296/commits/37f2c716f2c6a
source/components/namespace/nseval.c | 10 ++++++++++ source/components/namespace/nseval.c | 10 ++++++++++
1 file changed, 10 insertions(+) 1 file changed, 10 insertions(+)
Index: acpica-unix2-20200925/source/components/namespace/nseval.c Index: acpica-unix2-20220331/source/components/namespace/nseval.c
=================================================================== ===================================================================
--- acpica-unix2-20200925.orig/source/components/namespace/nseval.c --- acpica-unix2-20220331.orig/source/components/namespace/nseval.c
+++ acpica-unix2-20200925/source/components/namespace/nseval.c +++ acpica-unix2-20220331/source/components/namespace/nseval.c
@@ -329,6 +329,16 @@ AcpiNsEvaluate ( @@ -329,6 +329,16 @@ AcpiNsEvaluate (
Info->ReturnObject = NULL; Info->ReturnObject = NULL;
} }

View File

@ -4,10 +4,10 @@ into an ACPI_OBJECT instead of just the pointer (see the use in the call
to memcpy()). So, move the init so GCC recognizes that ValueToWrite is to memcpy()). So, move the init so GCC recognizes that ValueToWrite is
only a pointer, and not a whole string that needs to be moved. only a pointer, and not a whole string that needs to be moved.
Index: acpica-unix2-20200925/source/components/debugger/dbtest.c Index: acpica-unix2-20220331/source/components/debugger/dbtest.c
=================================================================== ===================================================================
--- acpica-unix2-20200925.orig/source/components/debugger/dbtest.c --- acpica-unix2-20220331.orig/source/components/debugger/dbtest.c
+++ acpica-unix2-20200925/source/components/debugger/dbtest.c +++ acpica-unix2-20220331/source/components/debugger/dbtest.c
@@ -719,9 +719,10 @@ AcpiDbTestStringType ( @@ -719,9 +719,10 @@ AcpiDbTestStringType (
ACPI_OBJECT *Temp1 = NULL; ACPI_OBJECT *Temp1 = NULL;
ACPI_OBJECT *Temp2 = NULL; ACPI_OBJECT *Temp2 = NULL;

View File

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

View File

@ -595,11 +595,11 @@ Error 6141 - Missing dependency ^ (Device object requires a _HID or _ADR)
Intel ACPI Component Architecture Intel ACPI Component Architecture
ASL+ Optimizing Compiler/Disassembler version VVVVVVVV ASL+ Optimizing Compiler/Disassembler version VVVVVVVV
Copyright (c) 2000 - 2021 Intel Corporation Copyright (c) 2000 - 2022 Intel Corporation
Ignoring all errors, forcing AML file generation Ignoring all errors, forcing AML file generation
ASL Input: grammar.asl - 323653 bytes 4818 keywords 10284 source lines ASL Input: grammar.asl - 323653 bytes 4818 keywords 10284 source lines
AML Output: grammar.aml - 43758 bytes 4148 opcodes 670 named objects AML Output: grammar.aml - 43758 bytes 4148 opcodes 670 named objects
Compilation successful. 60 Errors, 41 Warnings, 97 Remarks, 1106 Optimizations Compilation successful. 0 Errors, 41 Warnings, 97 Remarks, 1106 Optimizations

View File

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

View File

@ -1,7 +1,7 @@
Index: acpica-unix2-20200925/source/compiler/aslparseop.c Index: acpica-unix2-20220331/source/compiler/aslparseop.c
=================================================================== ===================================================================
--- acpica-unix2-20200925.orig/source/compiler/aslparseop.c --- acpica-unix2-20220331.orig/source/compiler/aslparseop.c
+++ acpica-unix2-20200925/source/compiler/aslparseop.c +++ acpica-unix2-20220331/source/compiler/aslparseop.c
@@ -285,7 +285,16 @@ TrCreateValuedLeafOp ( @@ -285,7 +285,16 @@ TrCreateValuedLeafOp (

View File

@ -1,7 +1,7 @@
Index: acpica-unix2-20200925/source/components/tables/tbutils.c Index: acpica-unix2-20220331/source/components/tables/tbutils.c
=================================================================== ===================================================================
--- acpica-unix2-20200925.orig/source/components/tables/tbutils.c --- acpica-unix2-20220331.orig/source/components/tables/tbutils.c
+++ acpica-unix2-20200925/source/components/tables/tbutils.c +++ acpica-unix2-20220331/source/components/tables/tbutils.c
@@ -238,9 +238,11 @@ AcpiTbGetRootTableEntry ( @@ -238,9 +238,11 @@ AcpiTbGetRootTableEntry (
* 64-bit platform, XSDT: Move (unaligned) 64-bit to local, * 64-bit platform, XSDT: Move (unaligned) 64-bit to local,
* return 64-bit * return 64-bit
@ -31,10 +31,10 @@ Index: acpica-unix2-20200925/source/components/tables/tbutils.c
} }
} }
Index: acpica-unix2-20200925/source/compiler/aslparseop.c Index: acpica-unix2-20220331/source/compiler/aslparseop.c
=================================================================== ===================================================================
--- acpica-unix2-20200925.orig/source/compiler/aslparseop.c --- acpica-unix2-20220331.orig/source/compiler/aslparseop.c
+++ acpica-unix2-20200925/source/compiler/aslparseop.c +++ acpica-unix2-20220331/source/compiler/aslparseop.c
@@ -289,7 +289,11 @@ TrCreateValuedLeafOp ( @@ -289,7 +289,11 @@ TrCreateValuedLeafOp (
ParseOpcode == PARSEOP_NAMESEG || ParseOpcode == PARSEOP_NAMESEG ||
ParseOpcode == PARSEOP_STRING_LITERAL) ParseOpcode == PARSEOP_STRING_LITERAL)

View File

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

View File

@ -1,2 +1,2 @@
SHA512 (acpica-unix2-20211217.tar.gz) = e8e6e4f4543205d2ed9c8fe2b49c8952272d4a1b066018327660c6a4e0fd018d3144e18a759784b6b4a37efe726ec0c61ff36026a1021cdcba6c7627e105385d SHA512 (acpica-unix2-20220331.tar.gz) = c606396323dc342ae4c7bab9526b04aca09b00a932363146c1791523962ade0bdb4e40b67ff2a0a246df3ce322592879288c3fcc5fb7a450beb87a6d70c5ef40
SHA512 (acpitests-unix-20211217.tar.gz) = 1dd73746accc78118477d57b01c43d60df02c8a3cea4ebba8ea2dac85871193debe359437f4cd25a3662520063f5f4a28f5e3fdfc3bc979fdd8a136fee7e43ac SHA512 (acpitests-unix-20220331.tar.gz) = 28ead3ff06fc7e409e5fd02358048470daac6d3a96f24408068b84199f33513b5fcaa7c00a31972e63fc481d4b5980f8b8f131549d9d1bcd19fa20f3a1c2aaaf

View File

@ -1,7 +1,7 @@
Index: acpica-unix2-20200925/source/compiler/aslanalyze.c Index: acpica-unix2-20220331/source/compiler/aslanalyze.c
=================================================================== ===================================================================
--- acpica-unix2-20200925.orig/source/compiler/aslanalyze.c --- acpica-unix2-20220331.orig/source/compiler/aslanalyze.c
+++ acpica-unix2-20200925/source/compiler/aslanalyze.c +++ acpica-unix2-20220331/source/compiler/aslanalyze.c
@@ -358,11 +358,16 @@ AnCheckMethodReturnValue ( @@ -358,11 +358,16 @@ AnCheckMethodReturnValue (
*/ */
if (ThisNodeBtype != 0) if (ThisNodeBtype != 0)
@ -21,10 +21,10 @@ Index: acpica-unix2-20200925/source/compiler/aslanalyze.c
} }
} }
Index: acpica-unix2-20200925/source/compiler/aslpredef.c Index: acpica-unix2-20220331/source/compiler/aslpredef.c
=================================================================== ===================================================================
--- acpica-unix2-20200925.orig/source/compiler/aslpredef.c --- acpica-unix2-20220331.orig/source/compiler/aslpredef.c
+++ acpica-unix2-20200925/source/compiler/aslpredef.c +++ acpica-unix2-20220331/source/compiler/aslpredef.c
@@ -159,14 +159,19 @@ ApCheckForPredefinedMethod ( @@ -159,14 +159,19 @@ ApCheckForPredefinedMethod (
if (MethodInfo->NumReturnNoValue && if (MethodInfo->NumReturnNoValue &&
ThisName->Info.ExpectedBtypes) ThisName->Info.ExpectedBtypes)
@ -84,10 +84,10 @@ Index: acpica-unix2-20200925/source/compiler/aslpredef.c
return (AE_TYPE); return (AE_TYPE);
} }
Index: acpica-unix2-20200925/source/compiler/aslwalks.c Index: acpica-unix2-20220331/source/compiler/aslwalks.c
=================================================================== ===================================================================
--- acpica-unix2-20200925.orig/source/compiler/aslwalks.c --- acpica-unix2-20220331.orig/source/compiler/aslwalks.c
+++ acpica-unix2-20200925/source/compiler/aslwalks.c +++ acpica-unix2-20220331/source/compiler/aslwalks.c
@@ -515,15 +515,19 @@ AnOperandTypecheckWalkEnd ( @@ -515,15 +515,19 @@ AnOperandTypecheckWalkEnd (
else if (!CommonBtypes) else if (!CommonBtypes)
{ {

View File

@ -7,10 +7,10 @@ From: Al Stone <ahs3@redhat.com>
tests/templates/Makefile | 2 +- tests/templates/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
Index: acpica-unix2-20200925/tests/templates/Makefile Index: acpica-unix2-20220331/tests/templates/Makefile
=================================================================== ===================================================================
--- acpica-unix2-20200925.orig/tests/templates/Makefile --- acpica-unix2-20220331.orig/tests/templates/Makefile
+++ acpica-unix2-20200925/tests/templates/Makefile +++ acpica-unix2-20220331/tests/templates/Makefile
@@ -26,7 +26,7 @@ $(aml_obj): %.aml: %.asl @@ -26,7 +26,7 @@ $(aml_obj): %.aml: %.asl

View File

@ -1,7 +1,7 @@
Index: acpica-unix2-20211217/source/common/dmtbdump.c Index: acpica-unix2-20220331/source/common/dmtbdump.c
=================================================================== ===================================================================
--- acpica-unix2-20211217.orig/source/common/dmtbdump.c --- acpica-unix2-20220331.orig/source/common/dmtbdump.c
+++ acpica-unix2-20211217/source/common/dmtbdump.c +++ acpica-unix2-20220331/source/common/dmtbdump.c
@@ -392,7 +392,11 @@ AcpiDmDumpXsdt ( @@ -392,7 +392,11 @@ AcpiDmDumpXsdt (
for (i = 0; i < Entries; i++) for (i = 0; i < Entries; i++)
{ {

View File

@ -14,10 +14,10 @@ Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
source/include/actypes.h | 26 +++++++++++++------------- source/include/actypes.h | 26 +++++++++++++-------------
3 files changed, 32 insertions(+), 21 deletions(-) 3 files changed, 32 insertions(+), 21 deletions(-)
Index: acpica-unix2-20200925/source/components/executer/exoparg2.c Index: acpica-unix2-20220331/source/components/executer/exoparg2.c
=================================================================== ===================================================================
--- acpica-unix2-20200925.orig/source/components/executer/exoparg2.c --- acpica-unix2-20220331.orig/source/components/executer/exoparg2.c
+++ acpica-unix2-20200925/source/components/executer/exoparg2.c +++ acpica-unix2-20220331/source/components/executer/exoparg2.c
@@ -172,6 +172,8 @@ AcpiExOpcode_2A_2T_1R ( @@ -172,6 +172,8 @@ AcpiExOpcode_2A_2T_1R (
ACPI_OPERAND_OBJECT **Operand = &WalkState->Operands[0]; ACPI_OPERAND_OBJECT **Operand = &WalkState->Operands[0];
ACPI_OPERAND_OBJECT *ReturnDesc1 = NULL; ACPI_OPERAND_OBJECT *ReturnDesc1 = NULL;
@ -58,10 +58,10 @@ Index: acpica-unix2-20200925/source/components/executer/exoparg2.c
break; break;
case AML_CONCATENATE_OP: /* Concatenate (Data1, Data2, Result) */ case AML_CONCATENATE_OP: /* Concatenate (Data1, Data2, Result) */
Index: acpica-unix2-20200925/source/include/actypes.h Index: acpica-unix2-20220331/source/include/actypes.h
=================================================================== ===================================================================
--- acpica-unix2-20200925.orig/source/include/actypes.h --- acpica-unix2-20220331.orig/source/include/actypes.h
+++ acpica-unix2-20200925/source/include/actypes.h +++ acpica-unix2-20220331/source/include/actypes.h
@@ -143,6 +143,19 @@ typedef COMPILER_DEPENDENT_INT64 @@ -143,6 +143,19 @@ typedef COMPILER_DEPENDENT_INT64
*/ */
#define ACPI_THREAD_ID UINT64 #define ACPI_THREAD_ID UINT64