Update the patches so they apply

Signed-off-by: Al Stone <ahs3@redhat.com>
This commit is contained in:
Al Stone 2022-03-09 19:45:13 -07:00
parent 6c32bdbf15
commit 5a8256ff73
47 changed files with 458 additions and 453 deletions

2
.gitignore vendored
View File

@ -148,3 +148,5 @@ series
/acpica-unix2-20210604.tar_0.gz /acpica-unix2-20210604.tar_0.gz
/acpitests-unix-20210604.tar.gz /acpitests-unix-20210604.tar.gz
/acpica-unix2-20210604.tar.gz /acpica-unix2-20210604.tar.gz
/acpica-unix2-20210730.tar.gz
/acpitests-unix-20210730.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-20210604/generate/unix/acpibin/Makefile Index: acpica-unix2-20210730/generate/unix/acpibin/Makefile
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/generate/unix/acpibin/Makefile --- acpica-unix2-20210730.orig/generate/unix/acpibin/Makefile
+++ acpica-unix2-20210604/generate/unix/acpibin/Makefile +++ acpica-unix2-20210730/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-20210604/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-20210604/generate/unix/acpidump/Makefile Index: acpica-unix2-20210730/generate/unix/acpidump/Makefile
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/generate/unix/acpidump/Makefile --- acpica-unix2-20210730.orig/generate/unix/acpidump/Makefile
+++ acpica-unix2-20210604/generate/unix/acpidump/Makefile +++ acpica-unix2-20210730/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-20210604/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-20210604/generate/unix/acpiexamples/Makefile Index: acpica-unix2-20210730/generate/unix/acpiexamples/Makefile
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/generate/unix/acpiexamples/Makefile --- acpica-unix2-20210730.orig/generate/unix/acpiexamples/Makefile
+++ acpica-unix2-20210604/generate/unix/acpiexamples/Makefile +++ acpica-unix2-20210730/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-20210604/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-20210604/generate/unix/acpiexec/Makefile Index: acpica-unix2-20210730/generate/unix/acpiexec/Makefile
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/generate/unix/acpiexec/Makefile --- acpica-unix2-20210730.orig/generate/unix/acpiexec/Makefile
+++ acpica-unix2-20210604/generate/unix/acpiexec/Makefile +++ acpica-unix2-20210730/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-20210604/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-20210604/generate/unix/acpihelp/Makefile Index: acpica-unix2-20210730/generate/unix/acpihelp/Makefile
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/generate/unix/acpihelp/Makefile --- acpica-unix2-20210730.orig/generate/unix/acpihelp/Makefile
+++ acpica-unix2-20210604/generate/unix/acpihelp/Makefile +++ acpica-unix2-20210730/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-20210604/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-20210604/generate/unix/iasl/Makefile Index: acpica-unix2-20210730/generate/unix/iasl/Makefile
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/generate/unix/iasl/Makefile --- acpica-unix2-20210730.orig/generate/unix/iasl/Makefile
+++ acpica-unix2-20210604/generate/unix/iasl/Makefile +++ acpica-unix2-20210730/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-20210604/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-20210604/source/compiler/aslcompiler.h Index: acpica-unix2-20210730/source/compiler/aslcompiler.h
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/compiler/aslcompiler.h --- acpica-unix2-20210730.orig/source/compiler/aslcompiler.h
+++ acpica-unix2-20210604/source/compiler/aslcompiler.h +++ acpica-unix2-20210730/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-20210604/source/compiler/aslcompiler.h
BOOLEAN BOOLEAN
UtQueryForOverwrite ( UtQueryForOverwrite (
char *Pathname); char *Pathname);
Index: acpica-unix2-20210604/source/compiler/aslutils.c Index: acpica-unix2-20210730/source/compiler/aslutils.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/compiler/aslutils.c --- acpica-unix2-20210730.orig/source/compiler/aslutils.c
+++ acpica-unix2-20210604/source/compiler/aslutils.c +++ acpica-unix2-20210730/source/compiler/aslutils.c
@@ -73,33 +73,6 @@ UtDisplayErrorSummary ( @@ -73,33 +73,6 @@ UtDisplayErrorSummary (
/******************************************************************************* /*******************************************************************************
@ -160,10 +160,10 @@ Index: acpica-unix2-20210604/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-20210604/source/components/utilities/utendian.c Index: acpica-unix2-20210730/source/components/utilities/utendian.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ acpica-unix2-20210604/source/components/utilities/utendian.c +++ acpica-unix2-20210730/source/components/utilities/utendian.c
@@ -0,0 +1,236 @@ @@ -0,0 +1,236 @@
+/****************************************************************************** +/******************************************************************************
+ * + *
@ -401,10 +401,10 @@ Index: acpica-unix2-20210604/source/components/utilities/utendian.c
+ Dst[ii] = Src[SrcLength - ii - 1]; + Dst[ii] = Src[SrcLength - ii - 1];
+ +
+} +}
Index: acpica-unix2-20210604/source/include/acmacros.h Index: acpica-unix2-20210730/source/include/acmacros.h
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/include/acmacros.h --- acpica-unix2-20210730.orig/source/include/acmacros.h
+++ acpica-unix2-20210604/source/include/acmacros.h +++ acpica-unix2-20210730/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-20210604/source/include/acmacros.h
/* /*
Index: acpica-unix2-20210604/source/include/acutils.h Index: acpica-unix2-20210730/source/include/acutils.h
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/include/acutils.h --- acpica-unix2-20210730.orig/source/include/acutils.h
+++ acpica-unix2-20210604/source/include/acutils.h +++ acpica-unix2-20210730/source/include/acutils.h
@@ -1167,4 +1167,36 @@ AcpiUtConvertUuidToString ( @@ -1167,4 +1167,36 @@ AcpiUtConvertUuidToString (
char *OutString); char *OutString);
#endif #endif
@ -516,10 +516,10 @@ Index: acpica-unix2-20210604/source/include/acutils.h
+#endif +#endif
+ +
#endif /* _ACUTILS_H */ #endif /* _ACUTILS_H */
Index: acpica-unix2-20210604/source/include/platform/aclinux.h Index: acpica-unix2-20210730/source/include/platform/aclinux.h
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/include/platform/aclinux.h --- acpica-unix2-20210730.orig/source/include/platform/aclinux.h
+++ acpica-unix2-20210604/source/include/platform/aclinux.h +++ acpica-unix2-20210730/source/include/platform/aclinux.h
@@ -198,6 +198,7 @@ @@ -198,6 +198,7 @@
#ifdef ACPI_USE_STANDARD_HEADERS #ifdef ACPI_USE_STANDARD_HEADERS

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-20210604/source/common/acfileio.c Index: acpica-unix2-20210730/source/common/acfileio.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/common/acfileio.c --- acpica-unix2-20210730.orig/source/common/acfileio.c
+++ acpica-unix2-20210604/source/common/acfileio.c +++ acpica-unix2-20210730/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-20210604/source/common/acfileio.c
(UINT32) (FileSize - TableOffset)); (UINT32) (FileSize - TableOffset));
return (AE_BAD_HEADER); return (AE_BAD_HEADER);
} }
Index: acpica-unix2-20210604/source/common/dmtable.c Index: acpica-unix2-20210730/source/common/dmtable.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/common/dmtable.c --- acpica-unix2-20210730.orig/source/common/dmtable.c
+++ acpica-unix2-20210604/source/common/dmtable.c +++ acpica-unix2-20210730/source/common/dmtable.c
@@ -591,7 +591,7 @@ AcpiDmDumpDataTable ( @@ -641,7 +641,7 @@ AcpiDmDumpDataTable (
{ {
/* Dump the raw table data */ /* Dump the raw table data */
@ -107,7 +107,7 @@ Index: acpica-unix2-20210604/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);
@@ -608,7 +608,7 @@ AcpiDmDumpDataTable ( @@ -658,7 +658,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-20210604/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))
{ {
@@ -628,7 +628,7 @@ AcpiDmDumpDataTable ( @@ -678,7 +678,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-20210604/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))
{ {
@@ -1262,7 +1262,7 @@ AcpiDmDumpTable ( @@ -1324,7 +1324,7 @@ AcpiDmDumpTable (
AcpiOsPrintf ("%2.2X", *Target); AcpiOsPrintf ("%2.2X", *Target);
Temp8 = AcpiDmGenerateChecksum (Table, Temp8 = AcpiDmGenerateChecksum (Table,
@ -134,10 +134,10 @@ Index: acpica-unix2-20210604/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-20210604/source/compiler/dtfield.c Index: acpica-unix2-20210730/source/compiler/dtfield.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/compiler/dtfield.c --- acpica-unix2-20210730.orig/source/compiler/dtfield.c
+++ acpica-unix2-20210604/source/compiler/dtfield.c +++ acpica-unix2-20210730/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-20210604/source/compiler/dtfield.c
return; return;
} }
Index: acpica-unix2-20210604/source/compiler/dtsubtable.c Index: acpica-unix2-20210730/source/compiler/dtsubtable.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/compiler/dtsubtable.c --- acpica-unix2-20210730.orig/source/compiler/dtsubtable.c
+++ acpica-unix2-20210604/source/compiler/dtsubtable.c +++ acpica-unix2-20210730/source/compiler/dtsubtable.c
@@ -378,6 +378,6 @@ DtSetSubtableLength ( @@ -378,6 +378,6 @@ DtSetSubtableLength (
return; return;
} }
@ -160,10 +160,10 @@ Index: acpica-unix2-20210604/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-20210604/source/components/tables/tbprint.c Index: acpica-unix2-20210730/source/components/tables/tbprint.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/components/tables/tbprint.c --- acpica-unix2-20210730.orig/source/components/tables/tbprint.c
+++ acpica-unix2-20210604/source/components/tables/tbprint.c +++ acpica-unix2-20210730/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-20210604/source/tools/acpibin/abcompare.c Index: acpica-unix2-20210730/source/tools/acpibin/abcompare.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/tools/acpibin/abcompare.c --- acpica-unix2-20210730.orig/source/tools/acpibin/abcompare.c
+++ acpica-unix2-20210604/source/tools/acpibin/abcompare.c +++ acpica-unix2-20210730/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-20210604/source/compiler/aslmain.c Index: acpica-unix2-20210730/source/compiler/aslmain.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/compiler/aslmain.c --- acpica-unix2-20210730.orig/source/compiler/aslmain.c
+++ acpica-unix2-20210604/source/compiler/aslmain.c +++ acpica-unix2-20210730/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-20210604/source/compiler/aslmain.c
AcpiOsInitialize (); AcpiOsInitialize ();
ACPI_DEBUG_INITIALIZE (); /* For debug version only */ ACPI_DEBUG_INITIALIZE (); /* For debug version only */
Index: acpica-unix2-20210604/source/components/namespace/nsutils.c Index: acpica-unix2-20210730/source/components/namespace/nsutils.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/components/namespace/nsutils.c --- acpica-unix2-20210730.orig/source/components/namespace/nsutils.c
+++ acpica-unix2-20210604/source/components/namespace/nsutils.c +++ acpica-unix2-20210730/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-20210604/source/compiler/cvparser.c Index: acpica-unix2-20210730/source/compiler/cvparser.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/compiler/cvparser.c --- acpica-unix2-20210730.orig/source/compiler/cvparser.c
+++ acpica-unix2-20210604/source/compiler/cvparser.c +++ acpica-unix2-20210730/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-20210604/source/compiler/aslanalyze.c Index: acpica-unix2-20210730/source/compiler/aslanalyze.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/compiler/aslanalyze.c --- acpica-unix2-20210730.orig/source/compiler/aslanalyze.c
+++ acpica-unix2-20210604/source/compiler/aslanalyze.c +++ acpica-unix2-20210730/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-20210604/source/common/dmtbdump.c Index: acpica-unix2-20210730/source/common/dmtbdump.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/common/dmtbdump.c --- acpica-unix2-20210730.orig/source/common/dmtbdump.c
+++ acpica-unix2-20210604/source/common/dmtbdump.c +++ acpica-unix2-20210730/source/common/dmtbdump.c
@@ -146,6 +146,8 @@ AcpiDmDumpUnicode ( @@ -146,6 +146,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-20210604/source/common/dmtbdump2.c Index: acpica-unix2-20210730/source/common/dmtbdump2.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/common/dmtbdump2.c --- acpica-unix2-20210730.orig/source/common/dmtbdump2.c
+++ acpica-unix2-20210604/source/common/dmtbdump2.c +++ acpica-unix2-20210730/source/common/dmtbdump2.c
@@ -763,7 +763,7 @@ AcpiDmDumpMadt ( @@ -763,7 +763,7 @@ AcpiDmDumpMadt (
{ {
ACPI_STATUS Status; ACPI_STATUS Status;

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-20210604/source/common/dmtbdump1.c Index: acpica-unix2-20210730/source/common/dmtbdump1.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/common/dmtbdump1.c --- acpica-unix2-20210730.orig/source/common/dmtbdump1.c
+++ acpica-unix2-20210604/source/common/dmtbdump1.c +++ acpica-unix2-20210730/source/common/dmtbdump1.c
@@ -79,16 +79,18 @@ AcpiDmDumpAsf ( @@ -298,16 +298,18 @@ AcpiDmDumpAsf (
UINT32 DataOffset = 0; UINT32 DataOffset = 0;
UINT32 i; UINT32 i;
UINT8 Type; UINT8 Type;
@ -35,7 +35,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
Subtable->Header.Length, AcpiDmTableInfoAsfHdr); Subtable->Header.Length, AcpiDmTableInfoAsfHdr);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
@@ -146,7 +148,7 @@ AcpiDmDumpAsf ( @@ -365,7 +367,7 @@ AcpiDmDumpAsf (
return; return;
} }
@ -44,7 +44,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
Subtable->Header.Length, InfoTable); Subtable->Header.Length, InfoTable);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
@@ -163,7 +165,7 @@ AcpiDmDumpAsf ( @@ -382,7 +384,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-20210604/source/common/dmtbdump1.c Index: acpica-unix2-20210730/source/common/dmtbdump1.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/common/dmtbdump1.c --- acpica-unix2-20210730.orig/source/common/dmtbdump1.c
+++ acpica-unix2-20210604/source/common/dmtbdump1.c +++ acpica-unix2-20210730/source/common/dmtbdump1.c
@@ -319,7 +319,7 @@ AcpiDmDumpCpep ( @@ -538,7 +538,7 @@ AcpiDmDumpCpep (
{ {
ACPI_STATUS Status; ACPI_STATUS Status;
ACPI_CPEP_POLLING *Subtable; ACPI_CPEP_POLLING *Subtable;
@ -21,7 +21,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
UINT32 Offset = sizeof (ACPI_TABLE_CPEP); UINT32 Offset = sizeof (ACPI_TABLE_CPEP);
@@ -334,7 +334,7 @@ AcpiDmDumpCpep ( @@ -553,7 +553,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-20210604/source/common/dmtbdump1.c Index: acpica-unix2-20210730/source/common/dmtbdump1.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/common/dmtbdump1.c --- acpica-unix2-20210730.orig/source/common/dmtbdump1.c
+++ acpica-unix2-20210604/source/common/dmtbdump1.c +++ acpica-unix2-20210730/source/common/dmtbdump1.c
@@ -374,7 +374,7 @@ AcpiDmDumpCsrt ( @@ -593,7 +593,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-20210604/source/common/dmtbdump1.c
UINT32 Offset = sizeof (ACPI_TABLE_CSRT); UINT32 Offset = sizeof (ACPI_TABLE_CSRT);
UINT32 SubOffset; UINT32 SubOffset;
UINT32 SubSubOffset; UINT32 SubSubOffset;
@@ -386,7 +386,7 @@ AcpiDmDumpCsrt ( @@ -605,7 +605,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-20210604/source/common/dmtbdump1.c
{ {
/* Resource group subtable */ /* Resource group subtable */
@@ -420,7 +420,7 @@ AcpiDmDumpCsrt ( @@ -639,7 +639,7 @@ AcpiDmDumpCsrt (
Offset + SubOffset); Offset + SubOffset);
while ((SubOffset < Subtable->Length) && while ((SubOffset < Subtable->Length) &&
@ -40,7 +40,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
{ {
AcpiOsPrintf ("\n"); AcpiOsPrintf ("\n");
Status = AcpiDmDumpTable (Length, Offset + SubOffset, SubSubtable, Status = AcpiDmDumpTable (Length, Offset + SubOffset, SubSubtable,
@@ -481,12 +481,13 @@ AcpiDmDumpDbg2 ( @@ -700,12 +700,13 @@ AcpiDmDumpDbg2 (
{ {
ACPI_STATUS Status; ACPI_STATUS Status;
ACPI_DBG2_DEVICE *Subtable; ACPI_DBG2_DEVICE *Subtable;
@ -55,7 +55,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
/* Main table */ /* Main table */
@@ -500,11 +501,12 @@ AcpiDmDumpDbg2 ( @@ -719,11 +720,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-20210604/source/common/dmtbdump1.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -514,13 +516,13 @@ AcpiDmDumpDbg2 ( @@ -733,13 +735,13 @@ AcpiDmDumpDbg2 (
for (i = 0; i < Subtable->RegisterCount; i++) for (i = 0; i < Subtable->RegisterCount; i++)
{ {
@ -86,7 +86,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -531,13 +533,13 @@ AcpiDmDumpDbg2 ( @@ -750,13 +752,13 @@ AcpiDmDumpDbg2 (
for (i = 0; i < Subtable->RegisterCount; i++) for (i = 0; i < Subtable->RegisterCount; i++)
{ {
@ -102,7 +102,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -547,12 +549,12 @@ AcpiDmDumpDbg2 ( @@ -766,12 +768,12 @@ AcpiDmDumpDbg2 (
/* Dump the Namestring (required) */ /* Dump the Namestring (required) */
AcpiOsPrintf ("\n"); AcpiOsPrintf ("\n");
@ -117,7 +117,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -562,8 +564,11 @@ AcpiDmDumpDbg2 ( @@ -781,8 +783,11 @@ AcpiDmDumpDbg2 (
if (Subtable->OemDataOffset) if (Subtable->OemDataOffset)
{ {
@ -131,7 +131,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
AcpiDmTableInfoDbg2OemData); AcpiDmTableInfoDbg2OemData);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
@@ -573,9 +578,9 @@ AcpiDmDumpDbg2 ( @@ -792,9 +797,9 @@ AcpiDmDumpDbg2 (
/* Point to next subtable */ /* Point to next subtable */
@ -143,11 +143,11 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
} }
} }
Index: acpica-unix2-20210604/source/compiler/dttable1.c Index: acpica-unix2-20210730/source/compiler/dttable1.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/compiler/dttable1.c --- acpica-unix2-20210730.orig/source/compiler/dttable1.c
+++ acpica-unix2-20210604/source/compiler/dttable1.c +++ acpica-unix2-20210730/source/compiler/dttable1.c
@@ -355,6 +355,7 @@ DtCompileCsrt ( @@ -572,6 +572,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-20210604/source/compiler/dttable1.c
/* Subtables (Resource Groups) */ /* Subtables (Resource Groups) */
@@ -373,12 +374,13 @@ DtCompileCsrt ( @@ -590,12 +591,13 @@ DtCompileCsrt (
/* Compute the number of resource descriptors */ /* Compute the number of resource descriptors */
@ -175,7 +175,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
DescriptorCount = (GroupLength / DescriptorCount = (GroupLength /
sizeof (ACPI_CSRT_DESCRIPTOR)); sizeof (ACPI_CSRT_DESCRIPTOR));
@@ -466,6 +468,7 @@ DtCompileDbg2 ( @@ -683,6 +685,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-20210604/source/compiler/dttable1.c
/* Main table */ /* Main table */
@@ -482,10 +485,12 @@ DtCompileDbg2 ( @@ -699,10 +702,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-20210604/source/compiler/dttable1.c
DtPushSubtable (Subtable); DtPushSubtable (Subtable);
/* Process all Device Information subtables (Count = InfoCount) */ /* Process all Device Information subtables (Count = InfoCount) */
@@ -512,7 +517,8 @@ DtCompileDbg2 ( @@ -729,7 +734,8 @@ DtCompileDbg2 (
/* BaseAddressRegister GAS array (Required, size is RegisterCount) */ /* BaseAddressRegister GAS array (Required, size is RegisterCount) */
@ -209,7 +209,7 @@ Index: acpica-unix2-20210604/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,
@@ -528,7 +534,8 @@ DtCompileDbg2 ( @@ -745,7 +751,8 @@ DtCompileDbg2 (
/* AddressSize array (Required, size = RegisterCount) */ /* AddressSize array (Required, size = RegisterCount) */
@ -219,7 +219,7 @@ Index: acpica-unix2-20210604/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,
@@ -544,7 +551,8 @@ DtCompileDbg2 ( @@ -761,7 +768,8 @@ DtCompileDbg2 (
/* NamespaceString device identifier (Required, size = NamePathLength) */ /* NamespaceString device identifier (Required, size = NamePathLength) */
@ -229,7 +229,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2Name, Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2Name,
&Subtable); &Subtable);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
@@ -554,8 +562,9 @@ DtCompileDbg2 ( @@ -771,8 +779,9 @@ DtCompileDbg2 (
/* Update the device info header */ /* Update the device info header */
@ -241,7 +241,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
DtInsertSubtable (ParentTable, Subtable); DtInsertSubtable (ParentTable, Subtable);
/* OemData - Variable-length data (Optional, size = OemDataLength) */ /* OemData - Variable-length data (Optional, size = OemDataLength) */
@@ -582,8 +591,10 @@ DtCompileDbg2 ( @@ -799,8 +808,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-20210604/source/common/dmtable.c Index: acpica-unix2-20210730/source/common/dmtable.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/common/dmtable.c --- acpica-unix2-20210730.orig/source/common/dmtable.c
+++ acpica-unix2-20210604/source/common/dmtable.c +++ acpica-unix2-20210730/source/common/dmtable.c
@@ -1341,13 +1341,13 @@ AcpiDmDumpTable ( @@ -1487,13 +1487,13 @@ AcpiDmDumpTable (
/* DMAR subtable types */ /* DMAR subtable types */
@ -30,11 +30,11 @@ Index: acpica-unix2-20210604/source/common/dmtable.c
AcpiDmDmarSubnames[Temp16]); AcpiDmDmarSubnames[Temp16]);
break; break;
Index: acpica-unix2-20210604/source/common/dmtbdump1.c Index: acpica-unix2-20210730/source/common/dmtbdump1.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/common/dmtbdump1.c --- acpica-unix2-20210730.orig/source/common/dmtbdump1.c
+++ acpica-unix2-20210604/source/common/dmtbdump1.c +++ acpica-unix2-20210730/source/common/dmtbdump1.c
@@ -604,13 +604,15 @@ AcpiDmDumpDmar ( @@ -823,13 +823,15 @@ AcpiDmDumpDmar (
{ {
ACPI_STATUS Status; ACPI_STATUS Status;
ACPI_DMAR_HEADER *Subtable; ACPI_DMAR_HEADER *Subtable;
@ -51,7 +51,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
/* Main table */ /* Main table */
@@ -624,13 +626,14 @@ AcpiDmDumpDmar ( @@ -843,13 +845,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-20210604/source/common/dmtbdump1.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -638,7 +641,8 @@ AcpiDmDumpDmar ( @@ -857,7 +860,8 @@ AcpiDmDumpDmar (
AcpiOsPrintf ("\n"); AcpiOsPrintf ("\n");
@ -78,7 +78,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
{ {
case ACPI_DMAR_TYPE_HARDWARE_UNIT: case ACPI_DMAR_TYPE_HARDWARE_UNIT:
@@ -673,12 +677,12 @@ AcpiDmDumpDmar ( @@ -892,12 +896,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-20210604/source/common/dmtbdump1.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -687,8 +691,8 @@ AcpiDmDumpDmar ( @@ -906,8 +910,8 @@ AcpiDmDumpDmar (
/* /*
* Dump the optional device scope entries * Dump the optional device scope entries
*/ */
@ -104,7 +104,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
{ {
/* These types do not support device scopes */ /* These types do not support device scopes */
@@ -696,7 +700,7 @@ AcpiDmDumpDmar ( @@ -915,7 +919,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-20210604/source/common/dmtbdump1.c
{ {
AcpiOsPrintf ("\n"); AcpiOsPrintf ("\n");
Status = AcpiDmDumpTable (Length, Offset + ScopeOffset, ScopeTable, Status = AcpiDmDumpTable (Length, Offset + ScopeOffset, ScopeTable,
@@ -737,9 +741,9 @@ AcpiDmDumpDmar ( @@ -956,9 +960,9 @@ AcpiDmDumpDmar (
NextSubtable: NextSubtable:
/* Point to next subtable */ /* Point to next subtable */
@ -125,11 +125,11 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
} }
} }
Index: acpica-unix2-20210604/source/compiler/dttable1.c Index: acpica-unix2-20210730/source/compiler/dttable1.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/compiler/dttable1.c --- acpica-unix2-20210730.orig/source/compiler/dttable1.c
+++ acpica-unix2-20210604/source/compiler/dttable1.c +++ acpica-unix2-20210730/source/compiler/dttable1.c
@@ -634,6 +634,7 @@ DtCompileDmar ( @@ -851,6 +851,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-20210604/source/compiler/dttable1.c
Status = DtCompileTable (PFieldList, AcpiDmTableInfoDmar, &Subtable); Status = DtCompileTable (PFieldList, AcpiDmTableInfoDmar, &Subtable);
@@ -664,7 +665,8 @@ DtCompileDmar ( @@ -881,7 +882,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-20210604/source/compiler/dttable1.c
{ {
case ACPI_DMAR_TYPE_HARDWARE_UNIT: case ACPI_DMAR_TYPE_HARDWARE_UNIT:
@@ -711,8 +713,8 @@ DtCompileDmar ( @@ -928,8 +930,8 @@ DtCompileDmar (
/* /*
* Optional Device Scope subtables * Optional Device Scope subtables
*/ */
@ -158,7 +158,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
{ {
/* These types do not support device scopes */ /* These types do not support device scopes */
@@ -721,8 +723,8 @@ DtCompileDmar ( @@ -938,8 +940,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-20210604/source/common/dmtbdump1.c Index: acpica-unix2-20210730/source/common/dmtbdump1.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/common/dmtbdump1.c --- acpica-unix2-20210730.orig/source/common/dmtbdump1.c
+++ acpica-unix2-20210604/source/common/dmtbdump1.c +++ acpica-unix2-20210730/source/common/dmtbdump1.c
@@ -770,11 +770,14 @@ AcpiDmDumpDrtm ( @@ -989,11 +989,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-20210604/source/common/dmtbdump1.c
AcpiDmTableInfoDrtm); AcpiDmTableInfoDrtm);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
@@ -789,7 +792,7 @@ AcpiDmDumpDrtm ( @@ -1008,7 +1011,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-20210604/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))
@@ -802,10 +805,11 @@ AcpiDmDumpDrtm ( @@ -1021,10 +1024,11 @@ AcpiDmDumpDrtm (
/* Dump Validated table addresses */ /* Dump Validated table addresses */
Count = 0; Count = 0;
@ -53,7 +53,7 @@ Index: acpica-unix2-20210604/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))
@@ -821,7 +825,7 @@ AcpiDmDumpDrtm ( @@ -1040,7 +1044,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-20210604/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))
@@ -834,10 +838,11 @@ AcpiDmDumpDrtm ( @@ -1053,10 +1057,11 @@ AcpiDmDumpDrtm (
/* Dump the Resource List */ /* Dump the Resource List */
Count = 0; Count = 0;
@ -77,7 +77,7 @@ Index: acpica-unix2-20210604/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))
@@ -853,7 +858,7 @@ AcpiDmDumpDrtm ( @@ -1072,7 +1077,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-20210604/source/common/dmtbdump1.c
DrtmDps, sizeof (ACPI_DRTM_DPS_ID), AcpiDmTableInfoDrtm2); DrtmDps, sizeof (ACPI_DRTM_DPS_ID), AcpiDmTableInfoDrtm2);
} }
Index: acpica-unix2-20210604/source/compiler/dttable1.c Index: acpica-unix2-20210730/source/compiler/dttable1.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/compiler/dttable1.c --- acpica-unix2-20210730.orig/source/compiler/dttable1.c
+++ acpica-unix2-20210604/source/compiler/dttable1.c +++ acpica-unix2-20210730/source/compiler/dttable1.c
@@ -849,7 +849,8 @@ DtCompileDrtm ( @@ -1066,7 +1066,8 @@ DtCompileDrtm (
Count++; Count++;
} }
@ -100,7 +100,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
DtPopSubtable (); DtPopSubtable ();
ParentTable = DtPeekSubtable (); ParentTable = DtPeekSubtable ();
@@ -887,7 +888,8 @@ DtCompileDrtm ( @@ -1104,7 +1105,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-20210604/source/common/dmtbdump1.c Index: acpica-unix2-20210730/source/common/dmtbdump1.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/common/dmtbdump1.c --- acpica-unix2-20210730.orig/source/common/dmtbdump1.c
+++ acpica-unix2-20210604/source/common/dmtbdump1.c +++ acpica-unix2-20210730/source/common/dmtbdump1.c
@@ -882,7 +882,7 @@ AcpiDmDumpEinj ( @@ -1101,7 +1101,7 @@ AcpiDmDumpEinj (
{ {
ACPI_STATUS Status; ACPI_STATUS Status;
ACPI_WHEA_HEADER *Subtable; ACPI_WHEA_HEADER *Subtable;
@ -21,7 +21,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
UINT32 Offset = sizeof (ACPI_TABLE_EINJ); UINT32 Offset = sizeof (ACPI_TABLE_EINJ);
@@ -897,7 +897,7 @@ AcpiDmDumpEinj ( @@ -1116,7 +1116,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-20210604/source/common/dmtbdump1.c Index: acpica-unix2-20210730/source/common/dmtbdump1.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/common/dmtbdump1.c --- acpica-unix2-20210730.orig/source/common/dmtbdump1.c
+++ acpica-unix2-20210604/source/common/dmtbdump1.c +++ acpica-unix2-20210730/source/common/dmtbdump1.c
@@ -935,7 +935,7 @@ AcpiDmDumpErst ( @@ -1154,7 +1154,7 @@ AcpiDmDumpErst (
{ {
ACPI_STATUS Status; ACPI_STATUS Status;
ACPI_WHEA_HEADER *Subtable; ACPI_WHEA_HEADER *Subtable;
@ -21,7 +21,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
UINT32 Offset = sizeof (ACPI_TABLE_ERST); UINT32 Offset = sizeof (ACPI_TABLE_ERST);
@@ -950,7 +950,7 @@ AcpiDmDumpErst ( @@ -1169,7 +1169,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-20210604/source/common/dmtbdump.c Index: acpica-unix2-20210730/source/common/dmtbdump.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/common/dmtbdump.c --- acpica-unix2-20210730.orig/source/common/dmtbdump.c
+++ acpica-unix2-20210604/source/common/dmtbdump.c +++ acpica-unix2-20210730/source/common/dmtbdump.c
@@ -363,11 +363,12 @@ AcpiDmDumpFadt ( @@ -363,11 +363,12 @@ AcpiDmDumpFadt (
ACPI_TABLE_HEADER *Table) ACPI_TABLE_HEADER *Table)
{ {
@ -91,10 +91,10 @@ Index: acpica-unix2-20210604/source/common/dmtbdump.c
} }
Index: acpica-unix2-20210604/source/components/tables/tbfadt.c Index: acpica-unix2-20210730/source/components/tables/tbfadt.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/components/tables/tbfadt.c --- acpica-unix2-20210730.orig/source/components/tables/tbfadt.c
+++ acpica-unix2-20210604/source/components/tables/tbfadt.c +++ acpica-unix2-20210730/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-20210604/source/common/dmtbdump1.c Index: acpica-unix2-20210730/source/common/dmtbdump1.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/common/dmtbdump1.c --- acpica-unix2-20210730.orig/source/common/dmtbdump1.c
+++ acpica-unix2-20210604/source/common/dmtbdump1.c +++ acpica-unix2-20210730/source/common/dmtbdump1.c
@@ -988,9 +988,10 @@ AcpiDmDumpFpdt ( @@ -1207,9 +1207,10 @@ AcpiDmDumpFpdt (
{ {
ACPI_STATUS Status; ACPI_STATUS Status;
ACPI_FPDT_HEADER *Subtable; ACPI_FPDT_HEADER *Subtable;
@ -28,7 +28,7 @@ Index: acpica-unix2-20210604/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) */
@@ -998,19 +999,20 @@ AcpiDmDumpFpdt ( @@ -1217,19 +1218,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-20210604/source/common/dmtbdump1.c
{ {
case ACPI_FPDT_TYPE_BOOT: case ACPI_FPDT_TYPE_BOOT:
@@ -1037,7 +1039,7 @@ AcpiDmDumpFpdt ( @@ -1256,7 +1258,7 @@ AcpiDmDumpFpdt (
goto NextSubtable; goto NextSubtable;
} }
@ -61,11 +61,11 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
Subtable->Length, InfoTable); Subtable->Length, InfoTable);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
Index: acpica-unix2-20210604/source/compiler/dttable1.c Index: acpica-unix2-20210730/source/compiler/dttable1.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/compiler/dttable1.c --- acpica-unix2-20210730.orig/source/compiler/dttable1.c
+++ acpica-unix2-20210604/source/compiler/dttable1.c +++ acpica-unix2-20210730/source/compiler/dttable1.c
@@ -1125,6 +1125,7 @@ DtCompileFpdt ( @@ -1342,6 +1342,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-20210604/source/compiler/dttable1.c
while (*PFieldList) while (*PFieldList)
@@ -1143,7 +1144,8 @@ DtCompileFpdt ( @@ -1360,7 +1361,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-20210604/source/common/dmtbdump1.c Index: acpica-unix2-20210730/source/common/dmtbdump1.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/common/dmtbdump1.c --- acpica-unix2-20210730.orig/source/common/dmtbdump1.c
+++ acpica-unix2-20210604/source/common/dmtbdump1.c +++ acpica-unix2-20210730/source/common/dmtbdump1.c
@@ -1075,7 +1075,7 @@ AcpiDmDumpGtdt ( @@ -1294,7 +1294,7 @@ AcpiDmDumpGtdt (
{ {
ACPI_STATUS Status; ACPI_STATUS Status;
ACPI_GTDT_HEADER *Subtable; ACPI_GTDT_HEADER *Subtable;
@ -22,7 +22,7 @@ Index: acpica-unix2-20210604/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;
@@ -1111,7 +1111,7 @@ AcpiDmDumpGtdt ( @@ -1330,7 +1330,7 @@ AcpiDmDumpGtdt (
/* Subtables */ /* Subtables */
@ -31,7 +31,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
{ {
/* Common subtable header */ /* Common subtable header */
@@ -1129,8 +1129,13 @@ AcpiDmDumpGtdt ( @@ -1348,8 +1348,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-20210604/source/common/dmtbdump1.c
InfoTable = AcpiDmTableInfoGtdt0; InfoTable = AcpiDmTableInfoGtdt0;
break; break;
Index: acpica-unix2-20210604/source/compiler/dttable1.c Index: acpica-unix2-20210730/source/compiler/dttable1.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/compiler/dttable1.c --- acpica-unix2-20210730.orig/source/compiler/dttable1.c
+++ acpica-unix2-20210604/source/compiler/dttable1.c +++ acpica-unix2-20210730/source/compiler/dttable1.c
@@ -1071,8 +1071,13 @@ DtCompileGtdt ( @@ -1288,8 +1288,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-20210604/source/common/dmtbdump1.c Index: acpica-unix2-20210730/source/common/dmtbdump1.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/common/dmtbdump1.c --- acpica-unix2-20210730.orig/source/common/dmtbdump1.c
+++ acpica-unix2-20210604/source/common/dmtbdump1.c +++ acpica-unix2-20210730/source/common/dmtbdump1.c
@@ -1216,12 +1216,13 @@ AcpiDmDumpHest ( @@ -1435,12 +1435,13 @@ AcpiDmDumpHest (
{ {
ACPI_STATUS Status; ACPI_STATUS Status;
ACPI_HEST_HEADER *Subtable; ACPI_HEST_HEADER *Subtable;
@ -28,7 +28,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
/* Main table */ /* Main table */
@@ -1235,10 +1236,11 @@ AcpiDmDumpHest ( @@ -1454,10 +1455,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-20210604/source/common/dmtbdump1.c
{ {
case ACPI_HEST_TYPE_IA32_CHECK: case ACPI_HEST_TYPE_IA32_CHECK:
@@ -1305,7 +1307,7 @@ AcpiDmDumpHest ( @@ -1524,7 +1526,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-20210604/source/common/dmtbdump1.c
return; return;
} }
Index: acpica-unix2-20210604/source/compiler/dttable1.c Index: acpica-unix2-20210730/source/compiler/dttable1.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/compiler/dttable1.c --- acpica-unix2-20210730.orig/source/compiler/dttable1.c
+++ acpica-unix2-20210604/source/compiler/dttable1.c +++ acpica-unix2-20210730/source/compiler/dttable1.c
@@ -1207,6 +1207,7 @@ DtCompileHest ( @@ -1424,6 +1424,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-20210604/source/compiler/dttable1.c
UINT32 BankCount; UINT32 BankCount;
@@ -1225,7 +1226,8 @@ DtCompileHest ( @@ -1442,7 +1443,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-20210604/source/common/dmtbdump.c Index: acpica-unix2-20210730/source/common/dmtbdump.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/common/dmtbdump.c --- acpica-unix2-20210730.orig/source/common/dmtbdump.c
+++ acpica-unix2-20210604/source/common/dmtbdump.c +++ acpica-unix2-20210730/source/common/dmtbdump.c
@@ -282,6 +282,7 @@ AcpiDmDumpRsdt ( @@ -282,6 +282,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-20210604/source/common/dmtbdump.c Index: acpica-unix2-20210730/source/common/dmtbdump.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/common/dmtbdump.c --- acpica-unix2-20210730.orig/source/common/dmtbdump.c
+++ acpica-unix2-20210604/source/common/dmtbdump.c +++ acpica-unix2-20210730/source/common/dmtbdump.c
@@ -323,6 +323,7 @@ AcpiDmDumpXsdt ( @@ -323,6 +323,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-20210604/source/common/dmtbdump3.c Index: acpica-unix2-20210730/source/common/dmtbdump3.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/common/dmtbdump3.c --- acpica-unix2-20210730.orig/source/common/dmtbdump3.c
+++ acpica-unix2-20210604/source/common/dmtbdump3.c +++ acpica-unix2-20210730/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-20210604/source/common/dmtbdump3.c Index: acpica-unix2-20210730/source/common/dmtbdump3.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/common/dmtbdump3.c --- acpica-unix2-20210730.orig/source/common/dmtbdump3.c
+++ acpica-unix2-20210604/source/common/dmtbdump3.c +++ acpica-unix2-20210730/source/common/dmtbdump3.c
@@ -96,11 +96,12 @@ AcpiDmDumpSlit ( @@ -96,11 +96,12 @@ AcpiDmDumpSlit (
UINT32 Localities; UINT32 Localities;
UINT32 i; UINT32 i;
@ -46,10 +46,10 @@ Index: acpica-unix2-20210604/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-20210604/source/compiler/dttable2.c Index: acpica-unix2-20210730/source/compiler/dttable2.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/compiler/dttable2.c --- acpica-unix2-20210730.orig/source/compiler/dttable2.c
+++ acpica-unix2-20210604/source/compiler/dttable2.c +++ acpica-unix2-20210730/source/compiler/dttable2.c
@@ -1837,7 +1837,7 @@ DtCompileSlit ( @@ -1837,7 +1837,7 @@ DtCompileSlit (
ParentTable = DtPeekSubtable (); ParentTable = DtPeekSubtable ();
DtInsertSubtable (ParentTable, Subtable); DtInsertSubtable (ParentTable, Subtable);

View File

@ -8,10 +8,10 @@ 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-20210604/source/common/dmtbdump2.c Index: acpica-unix2-20210730/source/common/dmtbdump2.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/common/dmtbdump2.c --- acpica-unix2-20210730.orig/source/common/dmtbdump2.c
+++ acpica-unix2-20210604/source/common/dmtbdump2.c +++ acpica-unix2-20210730/source/common/dmtbdump2.c
@@ -1133,11 +1133,12 @@ AcpiDmDumpMsct ( @@ -1133,11 +1133,12 @@ AcpiDmDumpMsct (
ACPI_STATUS Status; ACPI_STATUS Status;
UINT32 Offset = sizeof (ACPI_TABLE_MSCT); UINT32 Offset = sizeof (ACPI_TABLE_MSCT);

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, 23 insertions(+), 18 deletions(-) 2 files changed, 23 insertions(+), 18 deletions(-)
Index: acpica-unix2-20210604/source/common/dmtbdump2.c Index: acpica-unix2-20210730/source/common/dmtbdump2.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/common/dmtbdump2.c --- acpica-unix2-20210730.orig/source/common/dmtbdump2.c
+++ acpica-unix2-20210604/source/common/dmtbdump2.c +++ acpica-unix2-20210730/source/common/dmtbdump2.c
@@ -995,11 +995,13 @@ AcpiDmDumpMpst ( @@ -995,11 +995,13 @@ AcpiDmDumpMpst (
UINT16 SubtableCount; UINT16 SubtableCount;
UINT32 PowerStateCount; UINT32 PowerStateCount;
@ -117,10 +117,10 @@ Index: acpica-unix2-20210604/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-20210604/source/compiler/dttable2.c Index: acpica-unix2-20210730/source/compiler/dttable2.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/compiler/dttable2.c --- acpica-unix2-20210730.orig/source/compiler/dttable2.c
+++ acpica-unix2-20210604/source/compiler/dttable2.c +++ acpica-unix2-20210730/source/compiler/dttable2.c
@@ -350,7 +350,7 @@ DtCompileMpst ( @@ -350,7 +350,7 @@ DtCompileMpst (
DtPushSubtable (Subtable); DtPushSubtable (Subtable);

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-20210604/source/common/dmtable.c Index: acpica-unix2-20210730/source/common/dmtable.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/common/dmtable.c --- acpica-unix2-20210730.orig/source/common/dmtable.c
+++ acpica-unix2-20210604/source/common/dmtable.c +++ acpica-unix2-20210730/source/common/dmtable.c
@@ -1526,13 +1526,13 @@ AcpiDmDumpTable ( @@ -1672,13 +1672,13 @@ AcpiDmDumpTable (
/* NFIT subtable types */ /* NFIT subtable types */
@ -33,10 +33,10 @@ Index: acpica-unix2-20210604/source/common/dmtable.c
AcpiDmNfitSubnames[Temp16]); AcpiDmNfitSubnames[Temp16]);
break; break;
Index: acpica-unix2-20210604/source/common/dmtbdump2.c Index: acpica-unix2-20210730/source/common/dmtbdump2.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/common/dmtbdump2.c --- acpica-unix2-20210730.orig/source/common/dmtbdump2.c
+++ acpica-unix2-20210604/source/common/dmtbdump2.c +++ acpica-unix2-20210730/source/common/dmtbdump2.c
@@ -1192,18 +1192,23 @@ AcpiDmDumpNfit ( @@ -1192,18 +1192,23 @@ AcpiDmDumpNfit (
ACPI_STATUS Status; ACPI_STATUS Status;
UINT32 Offset = sizeof (ACPI_TABLE_NFIT); UINT32 Offset = sizeof (ACPI_TABLE_NFIT);
@ -175,10 +175,10 @@ Index: acpica-unix2-20210604/source/common/dmtbdump2.c
} }
} }
Index: acpica-unix2-20210604/source/compiler/dttable2.c Index: acpica-unix2-20210730/source/compiler/dttable2.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/compiler/dttable2.c --- acpica-unix2-20210730.orig/source/compiler/dttable2.c
+++ acpica-unix2-20210604/source/compiler/dttable2.c +++ acpica-unix2-20210730/source/compiler/dttable2.c
@@ -497,6 +497,7 @@ DtCompileNfit ( @@ -497,6 +497,7 @@ DtCompileNfit (
UINT32 Count; UINT32 Count;
ACPI_NFIT_INTERLEAVE *Interleave = NULL; ACPI_NFIT_INTERLEAVE *Interleave = NULL;

View File

@ -9,10 +9,10 @@ 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-20210604/source/common/dmtbdump2.c Index: acpica-unix2-20210730/source/common/dmtbdump2.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/common/dmtbdump2.c --- acpica-unix2-20210730.orig/source/common/dmtbdump2.c
+++ acpica-unix2-20210604/source/common/dmtbdump2.c +++ acpica-unix2-20210730/source/common/dmtbdump2.c
@@ -2125,7 +2125,7 @@ AcpiDmDumpSdev ( @@ -2125,7 +2125,7 @@ AcpiDmDumpSdev (
ACPI_SDEV_NAMESPACE *Namesp; ACPI_SDEV_NAMESPACE *Namesp;
ACPI_DMTABLE_INFO *InfoTable; ACPI_DMTABLE_INFO *InfoTable;
@ -145,10 +145,10 @@ Index: acpica-unix2-20210604/source/common/dmtbdump2.c
+ SubtableLength); + SubtableLength);
} }
} }
Index: acpica-unix2-20210604/source/compiler/dttable2.c Index: acpica-unix2-20210730/source/compiler/dttable2.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/compiler/dttable2.c --- acpica-unix2-20210730.orig/source/compiler/dttable2.c
+++ acpica-unix2-20210604/source/compiler/dttable2.c +++ acpica-unix2-20210730/source/compiler/dttable2.c
@@ -1493,6 +1493,7 @@ DtCompileSdev ( @@ -1493,6 +1493,7 @@ DtCompileSdev (
UINT32 EntryCount; UINT32 EntryCount;
ACPI_SDEV_SECURE_COMPONENT *SecureComponent = NULL; ACPI_SDEV_SECURE_COMPONENT *SecureComponent = NULL;

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-20210604/source/common/dmtbdump1.c Index: acpica-unix2-20210730/source/common/dmtbdump1.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/common/dmtbdump1.c --- acpica-unix2-20210730.orig/source/common/dmtbdump1.c
+++ acpica-unix2-20210604/source/common/dmtbdump1.c +++ acpica-unix2-20210730/source/common/dmtbdump1.c
@@ -1379,37 +1379,45 @@ AcpiDmDumpHmat ( @@ -1598,37 +1598,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-20210604/source/common/dmtbdump1.c
{ {
case ACPI_HMAT_TYPE_ADDRESS_RANGE: case ACPI_HMAT_TYPE_ADDRESS_RANGE:
@@ -1432,7 +1440,7 @@ AcpiDmDumpHmat ( @@ -1651,7 +1659,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-20210604/source/common/dmtbdump1.c
/* Attempt to continue */ /* Attempt to continue */
@@ -1441,13 +1449,13 @@ AcpiDmDumpHmat ( @@ -1660,13 +1668,13 @@ AcpiDmDumpHmat (
/* Dump HMAT structure body */ /* Dump HMAT structure body */
@ -91,7 +91,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -1455,7 +1463,7 @@ AcpiDmDumpHmat ( @@ -1674,7 +1682,7 @@ AcpiDmDumpHmat (
/* Dump HMAT structure additionals */ /* Dump HMAT structure additionals */
@ -100,7 +100,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
{ {
case ACPI_HMAT_TYPE_LOCALITY: case ACPI_HMAT_TYPE_LOCALITY:
@@ -1464,15 +1472,16 @@ AcpiDmDumpHmat ( @@ -1683,15 +1691,16 @@ AcpiDmDumpHmat (
/* Dump initiator proximity domains */ /* Dump initiator proximity domains */
@ -121,7 +121,7 @@ Index: acpica-unix2-20210604/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))
@@ -1485,15 +1494,16 @@ AcpiDmDumpHmat ( @@ -1704,15 +1713,16 @@ AcpiDmDumpHmat (
/* Dump target proximity domains */ /* Dump target proximity domains */
@ -142,7 +142,7 @@ Index: acpica-unix2-20210604/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))
@@ -1506,18 +1516,17 @@ AcpiDmDumpHmat ( @@ -1725,18 +1735,17 @@ AcpiDmDumpHmat (
/* Dump latency/bandwidth entris */ /* Dump latency/bandwidth entris */
@ -166,7 +166,7 @@ Index: acpica-unix2-20210604/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))
@@ -1537,15 +1546,16 @@ AcpiDmDumpHmat ( @@ -1756,15 +1765,16 @@ AcpiDmDumpHmat (
/* Dump SMBIOS handles */ /* Dump SMBIOS handles */
@ -187,7 +187,7 @@ Index: acpica-unix2-20210604/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))
@@ -1565,6 +1575,6 @@ AcpiDmDumpHmat ( @@ -1784,6 +1794,6 @@ AcpiDmDumpHmat (
NextSubtable: NextSubtable:
/* Point to next HMAT structure subtable */ /* Point to next HMAT structure subtable */
@ -195,11 +195,11 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
+ Offset += (HmatStructLength); + Offset += (HmatStructLength);
} }
} }
Index: acpica-unix2-20210604/source/compiler/dttable1.c Index: acpica-unix2-20210730/source/compiler/dttable1.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/compiler/dttable1.c --- acpica-unix2-20210730.orig/source/compiler/dttable1.c
+++ acpica-unix2-20210604/source/compiler/dttable1.c +++ acpica-unix2-20210730/source/compiler/dttable1.c
@@ -1369,6 +1369,8 @@ DtCompileHmat ( @@ -1586,6 +1586,8 @@ DtCompileHmat (
UINT32 TgtPDNumber; UINT32 TgtPDNumber;
UINT64 EntryNumber; UINT64 EntryNumber;
UINT16 SMBIOSHandleNumber; UINT16 SMBIOSHandleNumber;
@ -208,7 +208,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
ParentTable = DtPeekSubtable (); ParentTable = DtPeekSubtable ();
@@ -1399,7 +1401,8 @@ DtCompileHmat ( @@ -1616,7 +1618,8 @@ DtCompileHmat (
/* Compile HMAT structure body */ /* Compile HMAT structure body */
@ -218,7 +218,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
{ {
case ACPI_HMAT_TYPE_ADDRESS_RANGE: case ACPI_HMAT_TYPE_ADDRESS_RANGE:
@@ -1432,7 +1435,7 @@ DtCompileHmat ( @@ -1649,7 +1652,7 @@ DtCompileHmat (
/* Compile HMAT structure additionals */ /* Compile HMAT structure additionals */
@ -227,7 +227,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
{ {
case ACPI_HMAT_TYPE_LOCALITY: case ACPI_HMAT_TYPE_LOCALITY:
@@ -1458,7 +1461,7 @@ DtCompileHmat ( @@ -1675,7 +1678,7 @@ DtCompileHmat (
HmatStruct->Length += Subtable->Length; HmatStruct->Length += Subtable->Length;
IntPDNumber++; IntPDNumber++;
} }
@ -236,7 +236,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
/* Compile target proximity domain list */ /* Compile target proximity domain list */
@@ -1479,7 +1482,7 @@ DtCompileHmat ( @@ -1696,7 +1699,7 @@ DtCompileHmat (
HmatStruct->Length += Subtable->Length; HmatStruct->Length += Subtable->Length;
TgtPDNumber++; TgtPDNumber++;
} }
@ -245,7 +245,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
/* Save start of the entries for reporting errors */ /* Save start of the entries for reporting errors */
@@ -1505,6 +1508,9 @@ DtCompileHmat ( @@ -1722,6 +1725,9 @@ DtCompileHmat (
EntryNumber++; EntryNumber++;
} }
@ -255,7 +255,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
/* Validate number of entries */ /* Validate number of entries */
if (EntryNumber != if (EntryNumber !=
@@ -1538,11 +1544,19 @@ DtCompileHmat ( @@ -1755,11 +1761,19 @@ DtCompileHmat (
HmatStruct->Length += Subtable->Length; HmatStruct->Length += Subtable->Length;
SMBIOSHandleNumber++; SMBIOSHandleNumber++;
} }

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-20210604/source/common/dmtbdump2.c Index: acpica-unix2-20210730/source/common/dmtbdump2.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/common/dmtbdump2.c --- acpica-unix2-20210730.orig/source/common/dmtbdump2.c
+++ acpica-unix2-20210604/source/common/dmtbdump2.c +++ acpica-unix2-20210730/source/common/dmtbdump2.c
@@ -1498,13 +1498,13 @@ AcpiDmDumpPdtt ( @@ -1498,13 +1498,13 @@ AcpiDmDumpPdtt (
{ {
ACPI_STATUS Status; ACPI_STATUS Status;

View File

@ -9,10 +9,10 @@ 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-20210604/source/common/dmtbdump2.c Index: acpica-unix2-20210730/source/common/dmtbdump2.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/common/dmtbdump2.c --- acpica-unix2-20210730.orig/source/common/dmtbdump2.c
+++ acpica-unix2-20210604/source/common/dmtbdump2.c +++ acpica-unix2-20210730/source/common/dmtbdump2.c
@@ -1785,6 +1785,8 @@ AcpiDmDumpPptt ( @@ -1785,6 +1785,8 @@ AcpiDmDumpPptt (
UINT32 Offset = sizeof (ACPI_TABLE_FPDT); UINT32 Offset = sizeof (ACPI_TABLE_FPDT);
ACPI_DMTABLE_INFO *InfoTable; ACPI_DMTABLE_INFO *InfoTable;
@ -70,10 +70,10 @@ Index: acpica-unix2-20210604/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-20210604/source/compiler/dttable2.c Index: acpica-unix2-20210730/source/compiler/dttable2.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/compiler/dttable2.c --- acpica-unix2-20210730.orig/source/compiler/dttable2.c
+++ acpica-unix2-20210604/source/compiler/dttable2.c +++ acpica-unix2-20210730/source/compiler/dttable2.c
@@ -1123,6 +1123,7 @@ DtCompilePptt ( @@ -1123,6 +1123,7 @@ DtCompilePptt (
DT_FIELD **PFieldList = (DT_FIELD **) List; DT_FIELD **PFieldList = (DT_FIELD **) List;
DT_FIELD *SubtableStart; DT_FIELD *SubtableStart;

View File

@ -8,10 +8,10 @@ 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-20210604/source/common/dmtbdump2.c Index: acpica-unix2-20210730/source/common/dmtbdump2.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/common/dmtbdump2.c --- acpica-unix2-20210730.orig/source/common/dmtbdump2.c
+++ acpica-unix2-20210604/source/common/dmtbdump2.c +++ acpica-unix2-20210730/source/common/dmtbdump2.c
@@ -1394,13 +1394,13 @@ AcpiDmDumpPcct ( @@ -1394,13 +1394,13 @@ AcpiDmDumpPcct (
ACPI_STATUS Status; ACPI_STATUS Status;
ACPI_PCCT_SUBSPACE *Subtable; ACPI_PCCT_SUBSPACE *Subtable;

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-20210604/source/common/dmtbdump3.c Index: acpica-unix2-20210730/source/common/dmtbdump3.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/common/dmtbdump3.c --- acpica-unix2-20210730.orig/source/common/dmtbdump3.c
+++ acpica-unix2-20210604/source/common/dmtbdump3.c +++ acpica-unix2-20210730/source/common/dmtbdump3.c
@@ -675,11 +675,12 @@ AcpiDmDumpWdat ( @@ -675,11 +675,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-20210604/source/common/dmtbdump3.c Index: acpica-unix2-20210730/source/common/dmtbdump3.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/common/dmtbdump3.c --- acpica-unix2-20210730.orig/source/common/dmtbdump3.c
+++ acpica-unix2-20210604/source/common/dmtbdump3.c +++ acpica-unix2-20210730/source/common/dmtbdump3.c
@@ -401,11 +401,13 @@ AcpiDmDumpTcpa ( @@ -401,11 +401,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,10 +52,10 @@ Index: acpica-unix2-20210604/source/common/dmtbdump3.c
break; break;
default: default:
Index: acpica-unix2-20210604/source/compiler/dttable2.c Index: acpica-unix2-20210730/source/compiler/dttable2.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/compiler/dttable2.c --- acpica-unix2-20210730.orig/source/compiler/dttable2.c
+++ acpica-unix2-20210604/source/compiler/dttable2.c +++ acpica-unix2-20210730/source/compiler/dttable2.c
@@ -2139,6 +2139,7 @@ DtCompileTcpa ( @@ -2139,6 +2139,7 @@ DtCompileTcpa (
ACPI_TABLE_TCPA_HDR *TcpaHeader; ACPI_TABLE_TCPA_HDR *TcpaHeader;
DT_SUBTABLE *ParentTable; DT_SUBTABLE *ParentTable;

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-20210604/source/common/dmtbdump3.c Index: acpica-unix2-20210730/source/common/dmtbdump3.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/common/dmtbdump3.c --- acpica-unix2-20210730.orig/source/common/dmtbdump3.c
+++ acpica-unix2-20210604/source/common/dmtbdump3.c +++ acpica-unix2-20210730/source/common/dmtbdump3.c
@@ -285,14 +285,14 @@ AcpiDmDumpStao ( @@ -285,14 +285,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-20210604/source/common/dmtbdump3.c Index: acpica-unix2-20210730/source/common/dmtbdump3.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/common/dmtbdump3.c --- acpica-unix2-20210730.orig/source/common/dmtbdump3.c
+++ acpica-unix2-20210604/source/common/dmtbdump3.c +++ acpica-unix2-20210730/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,10 +8,10 @@ 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-20210604/source/common/dmtbdump2.c Index: acpica-unix2-20210730/source/common/dmtbdump2.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/common/dmtbdump2.c --- acpica-unix2-20210730.orig/source/common/dmtbdump2.c
+++ acpica-unix2-20210604/source/common/dmtbdump2.c +++ acpica-unix2-20210730/source/common/dmtbdump2.c
@@ -930,11 +930,12 @@ AcpiDmDumpMcfg ( @@ -930,11 +930,12 @@ AcpiDmDumpMcfg (
ACPI_STATUS Status; ACPI_STATUS Status;
UINT32 Offset = sizeof (ACPI_TABLE_MCFG); UINT32 Offset = sizeof (ACPI_TABLE_MCFG);

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-20210604/source/common/dmtbdump2.c Index: acpica-unix2-20210730/source/common/dmtbdump2.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/common/dmtbdump2.c --- acpica-unix2-20210730.orig/source/common/dmtbdump2.c
+++ acpica-unix2-20210604/source/common/dmtbdump2.c +++ acpica-unix2-20210730/source/common/dmtbdump2.c
@@ -690,7 +690,7 @@ AcpiDmDumpLpit ( @@ -690,7 +690,7 @@ AcpiDmDumpLpit (
{ {
ACPI_STATUS Status; ACPI_STATUS Status;

View File

@ -8,10 +8,10 @@ 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-20210604/source/common/dmtbdump2.c Index: acpica-unix2-20210730/source/common/dmtbdump2.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/common/dmtbdump2.c --- acpica-unix2-20210730.orig/source/common/dmtbdump2.c
+++ acpica-unix2-20210604/source/common/dmtbdump2.c +++ acpica-unix2-20210730/source/common/dmtbdump2.c
@@ -1686,8 +1686,9 @@ AcpiDmDumpPmtt ( @@ -1686,8 +1686,9 @@ AcpiDmDumpPmtt (
{ {
ACPI_STATUS Status; ACPI_STATUS Status;

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-20210604/source/common/dmtbdump3.c Index: acpica-unix2-20210730/source/common/dmtbdump3.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/common/dmtbdump3.c --- acpica-unix2-20210730.orig/source/common/dmtbdump3.c
+++ acpica-unix2-20210604/source/common/dmtbdump3.c +++ acpica-unix2-20210730/source/common/dmtbdump3.c
@@ -470,11 +470,12 @@ AcpiDmDumpTpm2Rev3 ( @@ -470,11 +470,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,10 +77,10 @@ Index: acpica-unix2-20210604/source/common/dmtbdump3.c
break; break;
default: default:
Index: acpica-unix2-20210604/source/compiler/dttable2.c Index: acpica-unix2-20210730/source/compiler/dttable2.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/compiler/dttable2.c --- acpica-unix2-20210730.orig/source/compiler/dttable2.c
+++ acpica-unix2-20210604/source/compiler/dttable2.c +++ acpica-unix2-20210730/source/compiler/dttable2.c
@@ -2267,6 +2267,7 @@ DtCompileTpm2 ( @@ -2267,6 +2267,7 @@ DtCompileTpm2 (
DT_SUBTABLE *ParentTable; DT_SUBTABLE *ParentTable;
ACPI_STATUS Status = AE_OK; ACPI_STATUS Status = AE_OK;

View File

@ -8,10 +8,10 @@ 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-20210604/source/common/dmtbdump2.c Index: acpica-unix2-20210730/source/common/dmtbdump2.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/common/dmtbdump2.c --- acpica-unix2-20210730.orig/source/common/dmtbdump2.c
+++ acpica-unix2-20210604/source/common/dmtbdump2.c +++ acpica-unix2-20210730/source/common/dmtbdump2.c
@@ -2039,6 +2039,8 @@ AcpiDmDumpS3pt ( @@ -2039,6 +2039,8 @@ AcpiDmDumpS3pt (
ACPI_FPDT_HEADER *Subtable; ACPI_FPDT_HEADER *Subtable;
ACPI_DMTABLE_INFO *InfoTable; ACPI_DMTABLE_INFO *InfoTable;
@ -72,10 +72,10 @@ Index: acpica-unix2-20210604/source/common/dmtbdump2.c
} }
Index: acpica-unix2-20210604/source/compiler/dttable2.c Index: acpica-unix2-20210730/source/compiler/dttable2.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/compiler/dttable2.c --- acpica-unix2-20210730.orig/source/compiler/dttable2.c
+++ acpica-unix2-20210604/source/compiler/dttable2.c +++ acpica-unix2-20210730/source/compiler/dttable2.c
@@ -1406,6 +1406,7 @@ DtCompileS3pt ( @@ -1406,6 +1406,7 @@ DtCompileS3pt (
DT_SUBTABLE *ParentTable; DT_SUBTABLE *ParentTable;
ACPI_DMTABLE_INFO *InfoTable; ACPI_DMTABLE_INFO *InfoTable;

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-20210604/source/common/dmtbdump2.c Index: acpica-unix2-20210730/source/common/dmtbdump2.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/common/dmtbdump2.c --- acpica-unix2-20210730.orig/source/common/dmtbdump2.c
+++ acpica-unix2-20210604/source/common/dmtbdump2.c +++ acpica-unix2-20210730/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-20210604/source/common/dmtbdump2.c
} }
} }
Index: acpica-unix2-20210604/source/compiler/dttable1.c Index: acpica-unix2-20210730/source/compiler/dttable1.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/compiler/dttable1.c --- acpica-unix2-20210730.orig/source/compiler/dttable1.c
+++ acpica-unix2-20210604/source/compiler/dttable1.c +++ acpica-unix2-20210730/source/compiler/dttable1.c
@@ -1592,6 +1592,7 @@ DtCompileIort ( @@ -1809,6 +1809,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-20210604/source/compiler/dttable1.c
UINT32 NodeNumber; UINT32 NodeNumber;
UINT32 NodeLength; UINT32 NodeLength;
UINT32 IdMappingNumber; UINT32 IdMappingNumber;
@@ -1637,7 +1638,7 @@ DtCompileIort ( @@ -1854,7 +1855,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-20210604/source/compiler/dttable1.c
Status = DtCompileTable (PFieldList, AcpiDmTableInfoIortPad, Status = DtCompileTable (PFieldList, AcpiDmTableInfoIortPad,
&Subtable); &Subtable);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
@@ -1647,7 +1648,7 @@ DtCompileIort ( @@ -1864,7 +1865,7 @@ DtCompileIort (
if (Subtable) if (Subtable)
{ {
DtInsertSubtable (ParentTable, Subtable); DtInsertSubtable (ParentTable, Subtable);
@ -276,7 +276,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
} }
else else
{ {
@@ -1657,7 +1658,7 @@ DtCompileIort ( @@ -1874,7 +1875,7 @@ DtCompileIort (
{ {
return (Status); return (Status);
} }
@ -285,7 +285,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
} }
NodeNumber = 0; NodeNumber = 0;
@@ -1721,7 +1722,7 @@ DtCompileIort ( @@ -1938,7 +1939,7 @@ DtCompileIort (
ItsNumber++; ItsNumber++;
} }
@ -294,7 +294,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
break; break;
case ACPI_IORT_NODE_NAMED_COMPONENT: case ACPI_IORT_NODE_NAMED_COMPONENT:
@@ -1755,15 +1756,18 @@ DtCompileIort ( @@ -1972,15 +1973,18 @@ DtCompileIort (
} }
else else
{ {
@ -316,7 +316,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
&Subtable); &Subtable);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
@@ -1771,7 +1775,7 @@ DtCompileIort ( @@ -1988,7 +1992,7 @@ DtCompileIort (
} }
DtInsertSubtable (ParentTable, Subtable); DtInsertSubtable (ParentTable, Subtable);
@ -325,7 +325,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
} }
} }
break; break;
@@ -1804,7 +1808,7 @@ DtCompileIort ( @@ -2021,7 +2025,7 @@ DtCompileIort (
/* Compile global interrupt array */ /* Compile global interrupt array */
@ -334,7 +334,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3a, Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3a,
&Subtable); &Subtable);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
@@ -1818,7 +1822,7 @@ DtCompileIort ( @@ -2035,7 +2039,7 @@ DtCompileIort (
/* Compile context interrupt array */ /* Compile context interrupt array */
ContextIrptNumber = 0; ContextIrptNumber = 0;
@ -343,7 +343,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
while (*PFieldList) while (*PFieldList)
{ {
Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3b, Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3b,
@@ -1838,12 +1842,12 @@ DtCompileIort ( @@ -2055,12 +2059,12 @@ DtCompileIort (
ContextIrptNumber++; ContextIrptNumber++;
} }
@ -358,7 +358,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
while (*PFieldList) while (*PFieldList)
{ {
Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3c, Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3c,
@@ -1863,7 +1867,7 @@ DtCompileIort ( @@ -2080,7 +2084,7 @@ DtCompileIort (
PmuIrptNumber++; PmuIrptNumber++;
} }
@ -367,7 +367,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
break; break;
case ACPI_IORT_NODE_SMMU_V3: case ACPI_IORT_NODE_SMMU_V3:
@@ -1908,7 +1912,7 @@ DtCompileIort ( @@ -2125,7 +2129,7 @@ DtCompileIort (
/* Compile RMR Descriptors */ /* Compile RMR Descriptors */
RmrCount = 0; RmrCount = 0;
@ -376,7 +376,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
while (*PFieldList) while (*PFieldList)
{ {
Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort6a, Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort6a,
@@ -1928,7 +1932,7 @@ DtCompileIort ( @@ -2145,7 +2149,7 @@ DtCompileIort (
RmrCount++; RmrCount++;
} }
@ -385,7 +385,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
break; break;
default: default:
@@ -1939,7 +1943,7 @@ DtCompileIort ( @@ -2156,7 +2160,7 @@ DtCompileIort (
/* Compile Array of ID mappings */ /* Compile Array of ID mappings */
@ -394,7 +394,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
IdMappingNumber = 0; IdMappingNumber = 0;
while (*PFieldList) while (*PFieldList)
{ {
@@ -1960,7 +1964,7 @@ DtCompileIort ( @@ -2177,7 +2181,7 @@ DtCompileIort (
IdMappingNumber++; IdMappingNumber++;
} }
@ -403,7 +403,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
if (!IdMappingNumber) if (!IdMappingNumber)
{ {
IortNode->MappingOffset = 0; IortNode->MappingOffset = 0;
@@ -1975,7 +1979,7 @@ DtCompileIort ( @@ -2192,7 +2196,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-20210604/source/common/dmtbdump2.c Index: acpica-unix2-20210730/source/common/dmtbdump2.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/common/dmtbdump2.c --- acpica-unix2-20210730.orig/source/common/dmtbdump2.c
+++ acpica-unix2-20210604/source/common/dmtbdump2.c +++ acpica-unix2-20210730/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-20210604/source/common/adwalk.c Index: acpica-unix2-20210730/source/common/adwalk.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/common/adwalk.c --- acpica-unix2-20210730.orig/source/common/adwalk.c
+++ acpica-unix2-20210604/source/common/adwalk.c +++ acpica-unix2-20210730/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-20210604/source/common/adwalk.c
FieldPath[4] = 0; FieldPath[4] = 0;
Path = FieldPath; Path = FieldPath;
} }
Index: acpica-unix2-20210604/source/common/dmrestag.c Index: acpica-unix2-20210730/source/common/dmrestag.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/common/dmrestag.c --- acpica-unix2-20210730.orig/source/common/dmrestag.c
+++ acpica-unix2-20210604/source/common/dmrestag.c +++ acpica-unix2-20210730/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-20210604/source/common/dmrestag.c
AcpiDmAddResourceToNamespace, (void **) BufferNode); AcpiDmAddResourceToNamespace, (void **) BufferNode);
} }
Index: acpica-unix2-20210604/source/common/dmtables.c Index: acpica-unix2-20210730/source/common/dmtables.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/common/dmtables.c --- acpica-unix2-20210730.orig/source/common/dmtables.c
+++ acpica-unix2-20210604/source/common/dmtables.c +++ acpica-unix2-20210730/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-20210604/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-20210604/source/common/dmtbdump.c Index: acpica-unix2-20210730/source/common/dmtbdump.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/common/dmtbdump.c --- acpica-unix2-20210730.orig/source/common/dmtbdump.c
+++ acpica-unix2-20210604/source/common/dmtbdump.c +++ acpica-unix2-20210730/source/common/dmtbdump.c
@@ -338,8 +338,7 @@ AcpiDmDumpXsdt ( @@ -338,8 +338,7 @@ AcpiDmDumpXsdt (
for (i = 0; i < Entries; i++) for (i = 0; i < Entries; i++)
{ {
@ -147,43 +147,45 @@ Index: acpica-unix2-20210604/source/common/dmtbdump.c
Offset += sizeof (UINT64); Offset += sizeof (UINT64);
} }
} }
Index: acpica-unix2-20210604/source/common/dmtbdump3.c Index: acpica-unix2-20210730/source/common/dmtbdump3.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/common/dmtbdump3.c --- acpica-unix2-20210730.orig/source/common/dmtbdump3.c
+++ acpica-unix2-20210604/source/common/dmtbdump3.c +++ acpica-unix2-20210730/source/common/dmtbdump3.c
@@ -736,13 +736,13 @@ AcpiDmDumpWpbt ( @@ -736,12 +736,13 @@ AcpiDmDumpWpbt (
{ {
ACPI_STATUS Status; ACPI_STATUS Status;
ACPI_TABLE_WPBT *Subtable; ACPI_TABLE_WPBT *Subtable;
- UINT32 Length = Table->Length;
+ UINT32 TableLength = AcpiUtReadUint32 (&Table->Length); + UINT32 TableLength = AcpiUtReadUint32 (&Table->Length);
UINT16 ArgumentsLength; UINT16 ArgumentsLength;
/* Dump the main table */ /* Dump the main table */
- Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoWpbt); - Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoWpbt);
+ Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoWpbt); + Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoWpbt);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -751,10 +751,10 @@ AcpiDmDumpWpbt ( @@ -750,13 +751,13 @@ AcpiDmDumpWpbt (
/* Extract the arguments buffer length from the main table */ /* Extract the arguments buffer length from the main table */
Subtable = ACPI_CAST_PTR (ACPI_TABLE_WPBT, Table); Subtable = ACPI_CAST_PTR (ACPI_TABLE_WPBT, Table);
- ArgumentsLength = Subtable->ArgumentsLength; - ArgumentsLength = Subtable->ArgumentsLength;
+ ArgumentsLength = AcpiUtReadUint16 (&Subtable->ArgumentsLength); + ArgumentsLength = AcpiUtReadUint16 (&Subtable->ArgumentsLength);
/* Dump the arguments buffer */ /* Dump the arguments buffer if present */
- (void) AcpiDmDumpTable (Table->Length, 0, Table, ArgumentsLength, if (ArgumentsLength)
+ (void) AcpiDmDumpTable (TableLength, 0, Table, ArgumentsLength, {
AcpiDmTableInfoWpbt0); - (void) AcpiDmDumpTable (Table->Length, 0, Table, ArgumentsLength,
+ (void) AcpiDmDumpTable (TableLength, 0, Table, ArgumentsLength,
AcpiDmTableInfoWpbt0);
}
} }
Index: acpica-unix2-20210604/source/compiler/aslcodegen.c Index: acpica-unix2-20210730/source/compiler/aslcodegen.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/compiler/aslcodegen.c --- acpica-unix2-20210730.orig/source/compiler/aslcodegen.c
+++ acpica-unix2-20210604/source/compiler/aslcodegen.c +++ acpica-unix2-20210730/source/compiler/aslcodegen.c
@@ -238,6 +238,10 @@ CgWriteAmlOpcode ( @@ -238,6 +238,10 @@ CgWriteAmlOpcode (
{ {
UINT8 PkgLenFirstByte; UINT8 PkgLenFirstByte;
@ -346,10 +348,10 @@ Index: acpica-unix2-20210604/source/compiler/aslcodegen.c
return; return;
Index: acpica-unix2-20210604/source/compiler/aslopcodes.c Index: acpica-unix2-20210730/source/compiler/aslopcodes.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/compiler/aslopcodes.c --- acpica-unix2-20210730.orig/source/compiler/aslopcodes.c
+++ acpica-unix2-20210604/source/compiler/aslopcodes.c +++ acpica-unix2-20210730/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++)
@ -360,10 +362,10 @@ Index: acpica-unix2-20210604/source/compiler/aslopcodes.c
} }
/* /*
Index: acpica-unix2-20210604/source/compiler/aslrestype1.c Index: acpica-unix2-20210730/source/compiler/aslrestype1.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/compiler/aslrestype1.c --- acpica-unix2-20210730.orig/source/compiler/aslrestype1.c
+++ acpica-unix2-20210604/source/compiler/aslrestype1.c +++ acpica-unix2-20210730/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;
@ -548,10 +550,10 @@ Index: acpica-unix2-20210604/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-20210604/source/compiler/aslrestype1i.c Index: acpica-unix2-20210730/source/compiler/aslrestype1i.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/compiler/aslrestype1i.c --- acpica-unix2-20210730.orig/source/compiler/aslrestype1i.c
+++ acpica-unix2-20210604/source/compiler/aslrestype1i.c +++ acpica-unix2-20210730/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;
@ -669,10 +671,10 @@ Index: acpica-unix2-20210604/source/compiler/aslrestype1i.c
+ Descriptor->Irq.IrqMask = AcpiUtReadUint16(&IrqMask); + Descriptor->Irq.IrqMask = AcpiUtReadUint16(&IrqMask);
return (Rnode); return (Rnode);
} }
Index: acpica-unix2-20210604/source/compiler/aslrestype2.c Index: acpica-unix2-20210730/source/compiler/aslrestype2.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/compiler/aslrestype2.c --- acpica-unix2-20210730.orig/source/compiler/aslrestype2.c
+++ acpica-unix2-20210604/source/compiler/aslrestype2.c +++ acpica-unix2-20210730/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;
@ -749,10 +751,10 @@ Index: acpica-unix2-20210604/source/compiler/aslrestype2.c
/* Point to end-of-descriptor for vendor data */ /* Point to end-of-descriptor for vendor data */
Index: acpica-unix2-20210604/source/compiler/aslrestype2d.c Index: acpica-unix2-20210730/source/compiler/aslrestype2d.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/compiler/aslrestype2d.c --- acpica-unix2-20210730.orig/source/compiler/aslrestype2d.c
+++ acpica-unix2-20210604/source/compiler/aslrestype2d.c +++ acpica-unix2-20210730/source/compiler/aslrestype2d.c
@@ -84,6 +84,8 @@ RsDoDwordIoDescriptor ( @@ -84,6 +84,8 @@ RsDoDwordIoDescriptor (
UINT32 CurrentByteOffset; UINT32 CurrentByteOffset;
UINT32 i; UINT32 i;
@ -999,10 +1001,10 @@ Index: acpica-unix2-20210604/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-20210604/source/compiler/aslrestype2q.c Index: acpica-unix2-20210730/source/compiler/aslrestype2q.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/compiler/aslrestype2q.c --- acpica-unix2-20210730.orig/source/compiler/aslrestype2q.c
+++ acpica-unix2-20210604/source/compiler/aslrestype2q.c +++ acpica-unix2-20210730/source/compiler/aslrestype2q.c
@@ -84,6 +84,7 @@ RsDoQwordIoDescriptor ( @@ -84,6 +84,7 @@ RsDoQwordIoDescriptor (
UINT32 CurrentByteOffset; UINT32 CurrentByteOffset;
UINT32 i; UINT32 i;
@ -1231,10 +1233,10 @@ Index: acpica-unix2-20210604/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-20210604/source/compiler/aslrestype2w.c Index: acpica-unix2-20210730/source/compiler/aslrestype2w.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/compiler/aslrestype2w.c --- acpica-unix2-20210730.orig/source/compiler/aslrestype2w.c
+++ acpica-unix2-20210604/source/compiler/aslrestype2w.c +++ acpica-unix2-20210730/source/compiler/aslrestype2w.c
@@ -84,6 +84,7 @@ RsDoWordIoDescriptor ( @@ -84,6 +84,7 @@ RsDoWordIoDescriptor (
UINT32 CurrentByteOffset; UINT32 CurrentByteOffset;
UINT32 i; UINT32 i;
@ -1482,24 +1484,24 @@ Index: acpica-unix2-20210604/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-20210604/source/compiler/dttable2.c Index: acpica-unix2-20210730/source/compiler/dttable2.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/compiler/dttable2.c --- acpica-unix2-20210730.orig/source/compiler/dttable2.c
+++ acpica-unix2-20210604/source/compiler/dttable2.c +++ acpica-unix2-20210730/source/compiler/dttable2.c
@@ -2635,7 +2635,8 @@ DtCompileWpbt ( @@ -2645,7 +2645,8 @@ DtCompileWpbt (
/* Extract the length of the Arguments buffer, insert into main table */ /* Extract the length of the Arguments buffer, insert into main table */
- Length = (UINT16) Subtable->TotalLength; - Table->ArgumentsLength = (UINT16) Subtable->TotalLength;
+ AcpiUtWriteUint (&Length, sizeof (UINT16), + AcpiUtWriteUint (&Table->ArgumentsLength, sizeof (UINT16),
+ &Subtable->TotalLength, sizeof (UINT32)); + &Subtable->TotalLength, sizeof (UINT32));
Table = ACPI_CAST_PTR (ACPI_TABLE_WPBT, ParentTable->Buffer); DtInsertSubtable (ParentTable, Subtable);
Table->ArgumentsLength = Length; return (AE_OK);
}
Index: acpica-unix2-20210604/source/components/disassembler/dmbuffer.c Index: acpica-unix2-20210730/source/components/disassembler/dmbuffer.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/components/disassembler/dmbuffer.c --- acpica-unix2-20210730.orig/source/components/disassembler/dmbuffer.c
+++ acpica-unix2-20210604/source/components/disassembler/dmbuffer.c +++ acpica-unix2-20210730/source/components/disassembler/dmbuffer.c
@@ -204,7 +204,7 @@ AcpiDmByteList ( @@ -204,7 +204,7 @@ AcpiDmByteList (
@ -1589,10 +1591,10 @@ Index: acpica-unix2-20210604/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-20210604/source/components/disassembler/dmopcode.c Index: acpica-unix2-20210730/source/components/disassembler/dmopcode.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/components/disassembler/dmopcode.c --- acpica-unix2-20210730.orig/source/components/disassembler/dmopcode.c
+++ acpica-unix2-20210604/source/components/disassembler/dmopcode.c +++ acpica-unix2-20210730/source/components/disassembler/dmopcode.c
@@ -778,7 +778,9 @@ AcpiDmDisassembleOneOp ( @@ -778,7 +778,9 @@ AcpiDmDisassembleOneOp (
} }
else else
@ -1649,10 +1651,10 @@ Index: acpica-unix2-20210604/source/components/disassembler/dmopcode.c
Info->BitOffset += Offset; Info->BitOffset += Offset;
if (Info->BitOffset % 8 == 0) if (Info->BitOffset % 8 == 0)
Index: acpica-unix2-20210604/source/components/disassembler/dmresrc.c Index: acpica-unix2-20210730/source/components/disassembler/dmresrc.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/components/disassembler/dmresrc.c --- acpica-unix2-20210730.orig/source/components/disassembler/dmresrc.c
+++ acpica-unix2-20210604/source/components/disassembler/dmresrc.c +++ acpica-unix2-20210730/source/components/disassembler/dmresrc.c
@@ -417,7 +417,7 @@ AcpiDmIsResourceTemplate ( @@ -417,7 +417,7 @@ AcpiDmIsResourceTemplate (
return (AE_TYPE); return (AE_TYPE);
} }
@ -1662,10 +1664,10 @@ Index: acpica-unix2-20210604/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-20210604/source/components/disassembler/dmresrcl.c Index: acpica-unix2-20210730/source/components/disassembler/dmresrcl.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/components/disassembler/dmresrcl.c --- acpica-unix2-20210730.orig/source/components/disassembler/dmresrcl.c
+++ acpica-unix2-20210604/source/components/disassembler/dmresrcl.c +++ acpica-unix2-20210730/source/components/disassembler/dmresrcl.c
@@ -141,6 +141,8 @@ AcpiDmMemoryFields ( @@ -141,6 +141,8 @@ AcpiDmMemoryFields (
UINT32 Level) UINT32 Level)
{ {
@ -1787,10 +1789,10 @@ Index: acpica-unix2-20210604/source/components/disassembler/dmresrcl.c
} }
AcpiDmIndent (Level); AcpiDmIndent (Level);
Index: acpica-unix2-20210604/source/components/disassembler/dmresrcl2.c Index: acpica-unix2-20210730/source/components/disassembler/dmresrcl2.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/components/disassembler/dmresrcl2.c --- acpica-unix2-20210730.orig/source/components/disassembler/dmresrcl2.c
+++ acpica-unix2-20210604/source/components/disassembler/dmresrcl2.c +++ acpica-unix2-20210730/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;
@ -2132,10 +2134,10 @@ Index: acpica-unix2-20210604/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-20210604/source/components/disassembler/dmresrcs.c Index: acpica-unix2-20210730/source/components/disassembler/dmresrcs.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/components/disassembler/dmresrcs.c --- acpica-unix2-20210730.orig/source/components/disassembler/dmresrcs.c
+++ acpica-unix2-20210604/source/components/disassembler/dmresrcs.c +++ acpica-unix2-20210730/source/components/disassembler/dmresrcs.c
@@ -93,7 +93,7 @@ AcpiDmIrqDescriptor ( @@ -93,7 +93,7 @@ AcpiDmIrqDescriptor (
AcpiOsPrintf (")\n"); AcpiOsPrintf (")\n");
@ -2186,10 +2188,10 @@ Index: acpica-unix2-20210604/source/components/disassembler/dmresrcs.c
/* Insert a descriptor name */ /* Insert a descriptor name */
Index: acpica-unix2-20210604/source/components/disassembler/dmwalk.c Index: acpica-unix2-20210730/source/components/disassembler/dmwalk.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/components/disassembler/dmwalk.c --- acpica-unix2-20210730.orig/source/components/disassembler/dmwalk.c
+++ acpica-unix2-20210604/source/components/disassembler/dmwalk.c +++ acpica-unix2-20210730/source/components/disassembler/dmwalk.c
@@ -1155,7 +1155,7 @@ AcpiDmAscendingOp ( @@ -1155,7 +1155,7 @@ AcpiDmAscendingOp (
{ {
ParentOp->Common.DisasmFlags |= ACPI_PARSEOP_EMPTY_TERMLIST; ParentOp->Common.DisasmFlags |= ACPI_PARSEOP_EMPTY_TERMLIST;
@ -2199,10 +2201,10 @@ Index: acpica-unix2-20210604/source/components/disassembler/dmwalk.c
} }
} }
Index: acpica-unix2-20210604/source/components/namespace/nsaccess.c Index: acpica-unix2-20210730/source/components/namespace/nsaccess.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/components/namespace/nsaccess.c --- acpica-unix2-20210730.orig/source/components/namespace/nsaccess.c
+++ acpica-unix2-20210604/source/components/namespace/nsaccess.c +++ acpica-unix2-20210730/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 */
@ -2212,10 +2214,10 @@ Index: acpica-unix2-20210604/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-20210604/source/components/namespace/nsnames.c Index: acpica-unix2-20210730/source/components/namespace/nsnames.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/components/namespace/nsnames.c --- acpica-unix2-20210730.orig/source/components/namespace/nsnames.c
+++ acpica-unix2-20210604/source/components/namespace/nsnames.c +++ acpica-unix2-20210730/source/components/namespace/nsnames.c
@@ -297,10 +297,10 @@ AcpiNsBuildNormalizedPath ( @@ -297,10 +297,10 @@ AcpiNsBuildNormalizedPath (
{ {
if (NextNode != Node) if (NextNode != Node)
@ -2229,10 +2231,10 @@ Index: acpica-unix2-20210604/source/components/namespace/nsnames.c
DoNoTrailing = NoTrailing; DoNoTrailing = NoTrailing;
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
{ {
Index: acpica-unix2-20210604/source/components/namespace/nsparse.c Index: acpica-unix2-20210730/source/components/namespace/nsparse.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/components/namespace/nsparse.c --- acpica-unix2-20210730.orig/source/components/namespace/nsparse.c
+++ acpica-unix2-20210604/source/components/namespace/nsparse.c +++ acpica-unix2-20210730/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;
@ -2258,10 +2260,10 @@ Index: acpica-unix2-20210604/source/components/namespace/nsparse.c
Status = AcpiTbGetOwnerId (TableIndex, &OwnerId); Status = AcpiTbGetOwnerId (TableIndex, &OwnerId);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
Index: acpica-unix2-20210604/source/components/namespace/nsutils.c Index: acpica-unix2-20210730/source/components/namespace/nsutils.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/components/namespace/nsutils.c --- acpica-unix2-20210730.orig/source/components/namespace/nsutils.c
+++ acpica-unix2-20210604/source/components/namespace/nsutils.c +++ acpica-unix2-20210730/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;
@ -2298,10 +2300,10 @@ Index: acpica-unix2-20210604/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-20210604/source/components/utilities/utresrc.c Index: acpica-unix2-20210730/source/components/utilities/utresrc.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/components/utilities/utresrc.c --- acpica-unix2-20210730.orig/source/components/utilities/utresrc.c
+++ acpica-unix2-20210604/source/components/utilities/utresrc.c +++ acpica-unix2-20210730/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 */
@ -2311,10 +2313,10 @@ Index: acpica-unix2-20210604/source/components/utilities/utresrc.c
} }
else else
Index: acpica-unix2-20210604/source/compiler/aslrestype2e.c Index: acpica-unix2-20210730/source/compiler/aslrestype2e.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/compiler/aslrestype2e.c --- acpica-unix2-20210730.orig/source/compiler/aslrestype2e.c
+++ acpica-unix2-20210604/source/compiler/aslrestype2e.c +++ acpica-unix2-20210730/source/compiler/aslrestype2e.c
@@ -80,6 +80,7 @@ RsDoExtendedIoDescriptor ( @@ -80,6 +80,7 @@ RsDoExtendedIoDescriptor (
UINT16 StringLength = 0; UINT16 StringLength = 0;
UINT32 CurrentByteOffset; UINT32 CurrentByteOffset;
@ -2573,10 +2575,10 @@ Index: acpica-unix2-20210604/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-20210604/source/compiler/aslrestype2s.c Index: acpica-unix2-20210730/source/compiler/aslrestype2s.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/compiler/aslrestype2s.c --- acpica-unix2-20210730.orig/source/compiler/aslrestype2s.c
+++ acpica-unix2-20210604/source/compiler/aslrestype2s.c +++ acpica-unix2-20210730/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-20210604/source/common/dmtbdump1.c Index: acpica-unix2-20210730/source/common/dmtbdump1.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/common/dmtbdump1.c --- acpica-unix2-20210730.orig/source/common/dmtbdump1.c
+++ acpica-unix2-20210604/source/common/dmtbdump1.c +++ acpica-unix2-20210730/source/common/dmtbdump1.c
@@ -374,11 +374,13 @@ AcpiDmDumpCsrt ( @@ -593,11 +593,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-20210604/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 */
@@ -386,13 +388,14 @@ AcpiDmDumpCsrt ( @@ -605,13 +607,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-20210604/source/common/dmtbdump1.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -405,26 +408,28 @@ AcpiDmDumpCsrt ( @@ -624,26 +627,28 @@ AcpiDmDumpCsrt (
Offset + SubOffset); Offset + SubOffset);
AcpiOsPrintf ("\n"); AcpiOsPrintf ("\n");
@ -85,7 +85,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
return; return;
@@ -434,11 +439,12 @@ AcpiDmDumpCsrt ( @@ -653,11 +658,12 @@ AcpiDmDumpCsrt (
/* Resource-specific info buffer */ /* Resource-specific info buffer */
@ -101,7 +101,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
InfoLength, AcpiDmTableInfoCsrt2a); InfoLength, AcpiDmTableInfoCsrt2a);
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
@@ -448,16 +454,15 @@ AcpiDmDumpCsrt ( @@ -667,16 +673,15 @@ AcpiDmDumpCsrt (
/* Point to next sub-subtable */ /* Point to next sub-subtable */
@ -122,11 +122,11 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
} }
} }
Index: acpica-unix2-20210604/source/compiler/dttable1.c Index: acpica-unix2-20210730/source/compiler/dttable1.c
=================================================================== ===================================================================
--- acpica-unix2-20210604.orig/source/compiler/dttable1.c --- acpica-unix2-20210730.orig/source/compiler/dttable1.c
+++ acpica-unix2-20210604/source/compiler/dttable1.c +++ acpica-unix2-20210730/source/compiler/dttable1.c
@@ -353,14 +353,16 @@ DtCompileCsrt ( @@ -570,14 +570,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-20210604/source/compiler/dttable1.c
while (*PFieldList) while (*PFieldList)
{ {
/* Resource group subtable */ /* Resource group subtable */
@@ -375,16 +377,13 @@ DtCompileCsrt ( @@ -592,16 +594,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-20210604/source/compiler/dttable1.c
DtInsertSubtable (ParentTable, Subtable); DtInsertSubtable (ParentTable, Subtable);
DtPushSubtable (Subtable); DtPushSubtable (Subtable);
ParentTable = DtPeekSubtable (); ParentTable = DtPeekSubtable ();
@@ -399,10 +398,13 @@ DtCompileCsrt ( @@ -616,10 +615,13 @@ DtCompileCsrt (
} }
DtInsertSubtable (ParentTable, Subtable); DtInsertSubtable (ParentTable, Subtable);
@ -178,7 +178,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
{ {
Status = DtCompileTable (PFieldList, AcpiDmTableInfoCsrt2, Status = DtCompileTable (PFieldList, AcpiDmTableInfoCsrt2,
@@ -411,6 +413,10 @@ DtCompileCsrt ( @@ -628,6 +630,10 @@ DtCompileCsrt (
{ {
return (Status); return (Status);
} }
@ -189,7 +189,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
DtInsertSubtable (ParentTable, Subtable); DtInsertSubtable (ParentTable, Subtable);
@@ -420,11 +426,7 @@ DtCompileCsrt ( @@ -637,11 +643,7 @@ DtCompileCsrt (
{ {
Status = DtCompileTable (PFieldList, AcpiDmTableInfoCsrt2a, Status = DtCompileTable (PFieldList, AcpiDmTableInfoCsrt2a,
&Subtable); &Subtable);
@ -202,7 +202,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
{ {
DtInsertSubtable (ParentTable, Subtable); DtInsertSubtable (ParentTable, Subtable);
} }
@@ -432,7 +434,7 @@ DtCompileCsrt ( @@ -649,7 +651,7 @@ DtCompileCsrt (
DtPopSubtable (); DtPopSubtable ();
ParentTable = DtPeekSubtable (); ParentTable = DtPeekSubtable ();

View File

@ -1,12 +1,12 @@
Name: acpica-tools Name: acpica-tools
Version: 20210604 Version: 20210730
Release: 4%{?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
URL: https://www.acpica.org/ URL: https://www.acpica.org/
Source0: https://acpica.org/sites/acpica/files/acpica-unix2-%{version}.tar_0.gz Source0: https://acpica.org/sites/acpica/files/acpica-unix2-%{version}.tar.gz
Source1: https://acpica.org/sites/acpica/files/acpitests-unix-%{version}.tar.gz Source1: https://acpica.org/sites/acpica/files/acpitests-unix-%{version}.tar.gz
Source2: README.Fedora Source2: README.Fedora
Source3: iasl.1 Source3: iasl.1
@ -67,9 +67,8 @@ Patch39: 0040-Support-S3PT-in-a-big-endian-world.patch
Patch40: 0041-Support-IORT-in-a-big-endian-world.patch Patch40: 0041-Support-IORT-in-a-big-endian-world.patch
Patch41: 0042-Support-IVRS-in-a-big-endian-world.patch 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: 0044-Initial-support-for-WPBT-in-big-endian-needs-more.patch Patch43: 0045-CSRT-fixed-use-of-optional-ResourceInfo.patch
Patch44: 0045-CSRT-fixed-use-of-optional-ResourceInfo.patch Patch44: 0046-Support-PHAT-in-a-big-endian-world.patch
Patch45: 0046-Support-PHAT-in-a-big-endian-world.patch
# other miscellaneous patches # other miscellaneous patches
Patch100: unaligned.patch Patch100: unaligned.patch
@ -89,7 +88,6 @@ Patch113: facp.patch
Patch114: armv7-str-fixes.patch Patch114: armv7-str-fixes.patch
Patch115: dbtest.patch Patch115: dbtest.patch
Patch116: ull-32bit.patch Patch116: ull-32bit.patch
Patch117: wpbt-unicode.patch
BuildRequires: make BuildRequires: make
BuildRequires: bison patchutils flex gcc BuildRequires: bison patchutils flex gcc
@ -258,6 +256,9 @@ fi
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 20210604-4 * Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 20210604-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Mon Oct 4 2021 Al Stone <ahs3@redhat.com> - 20210730-1
- Update to 20210730 upstream source. Bring all the patches up to date.
* Tue Jul 27 2021 Al Stone <ahs3@redhat.com> - 20210604-3 * Tue Jul 27 2021 Al Stone <ahs3@redhat.com> - 20210604-3
- Running 'iasl -T all' would segfault when dumping the PHAT template; - Running 'iasl -T all' would segfault when dumping the PHAT template;
fixed AcpiDmDumpPhat() by removing unnecessary assignments from patch fixed AcpiDmDumpPhat() by removing unnecessary assignments from patch

View File

@ -1,2 +1,2 @@
SHA512 (acpica-unix2-20210604.tar_0.gz) = f7f6e3c1964ffae186fe3d34b64a6251dd2e4423244c08c7e4301fd38396eac1af6e562956984a37af803ac11d5a46dd2dce88540787df353fc268002710dc62 SHA512 (acpica-unix2-20210730.tar.gz) = 9a8b88e44029a241cd3f26714b244723a59b7235662ecdf0c042b816495f140722aeb3897424c6f43bdddc81c141b1fa09c9645a6e0c4d860159001a65e08483
SHA512 (acpitests-unix-20210604.tar.gz) = 80b4676f1a9e11a7c1962eb8f292400322bbcfc91718749138c7807c7bbc38e52dd88c8e42096752e491298f4b07f6a68fa9ff2c49450be1de3abef56e8ba08a SHA512 (acpitests-unix-20210730.tar.gz) = 4d01574f05ec1fd22d3fcdf6b5245c5670245c4edb11e8ce44fdcac73296552095539eab854cfb271abfd6409507951f0e8512ff57a74caa0e8609fef5f2035e