From 38a008cb324d2830fa0e3fcbf5f85c35a0a34410 Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Sun, 25 Oct 2020 11:36:21 -0600
Subject: [PATCH] Fix up patches to account for displacements due to SPDX info
Signed-off-by: Al Stone <ahs3@redhat.com>
---
...l-big-endian-support-for-WPBT-tables.patch | 25 +-
...port-DSDT-SSDT-in-a-big-endian-world.patch | 647 +++++++++---------
0041-Support-MTMR-in-a-big-endian-world.patch | 15 +-
0042-Support-VRTC-in-a-big-endian-world.patch | 15 +-
0043-Support-S3PT-in-a-big-endian-world.patch | 33 +-
5 files changed, 360 insertions(+), 375 deletions(-)
diff --git a/0039-Add-partial-big-endian-support-for-WPBT-tables.patch b/0039-Add-partial-big-endian-support-for-WPBT-tables.patch
index 071d600..3207b7d 100644
--- a/0039-Add-partial-big-endian-support-for-WPBT-tables.patch
+++ b/0039-Add-partial-big-endian-support-for-WPBT-tables.patch
@@ -12,11 +12,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/compiler/dttable2.c | 3 ++-
2 files changed, 6 insertions(+), 5 deletions(-)
-diff --git a/source/common/dmtbdump3.c b/source/common/dmtbdump3.c
-index d2f2bf7b7..da9b81c92 100644
---- a/source/common/dmtbdump3.c
-+++ b/source/common/dmtbdump3.c
-@@ -736,13 +736,13 @@ AcpiDmDumpWpbt (
+Index: acpica-unix2-20200925/source/common/dmtbdump3.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/common/dmtbdump3.c
++++ acpica-unix2-20200925/source/common/dmtbdump3.c
+@@ -628,13 +628,13 @@ AcpiDmDumpWpbt (
{
ACPI_STATUS Status;
ACPI_TABLE_WPBT *Subtable;
@@ -32,7 +32,7 @@ index d2f2bf7b7..da9b81c92 100644
if (ACPI_FAILURE (Status))
{
return;
-@@ -751,10 +751,10 @@ AcpiDmDumpWpbt (
+@@ -643,10 +643,10 @@ AcpiDmDumpWpbt (
/* Extract the arguments buffer length from the main table */
Subtable = ACPI_CAST_PTR (ACPI_TABLE_WPBT, Table);
@@ -45,11 +45,11 @@ index d2f2bf7b7..da9b81c92 100644
+ (void) AcpiDmDumpTable (TableLength, 0, Table, ArgumentsLength,
AcpiDmTableInfoWpbt0);
}
-diff --git a/source/compiler/dttable2.c b/source/compiler/dttable2.c
-index 584c09ee8..48729b48f 100644
---- a/source/compiler/dttable2.c
-+++ b/source/compiler/dttable2.c
-@@ -2298,7 +2298,8 @@ DtCompileWpbt (
+Index: acpica-unix2-20200925/source/compiler/dttable2.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/compiler/dttable2.c
++++ acpica-unix2-20200925/source/compiler/dttable2.c
+@@ -2190,7 +2190,8 @@ DtCompileWpbt (
/* Extract the length of the Arguments buffer, insert into main table */
@@ -59,6 +59,3 @@ index 584c09ee8..48729b48f 100644
Table = ACPI_CAST_PTR (ACPI_TABLE_WPBT, ParentTable->Buffer);
Table->ArgumentsLength = Length;
---
-2.26.2
-
diff --git a/0040-Support-DSDT-SSDT-in-a-big-endian-world.patch b/0040-Support-DSDT-SSDT-in-a-big-endian-world.patch
index 43b4114..bfa106b 100644
--- a/0040-Support-DSDT-SSDT-in-a-big-endian-world.patch
+++ b/0040-Support-DSDT-SSDT-in-a-big-endian-world.patch
@@ -39,11 +39,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/components/namespace/nsutils.c | 7 +-
25 files changed, 682 insertions(+), 323 deletions(-)
-diff --git a/source/common/dmrestag.c b/source/common/dmrestag.c
-index fe6e74146..eed863037 100644
---- a/source/common/dmrestag.c
-+++ b/source/common/dmrestag.c
-@@ -1146,7 +1146,7 @@ AcpiDmAddResourcesToNamespace (
+Index: acpica-unix2-20200925/source/common/dmrestag.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/common/dmrestag.c
++++ acpica-unix2-20200925/source/common/dmrestag.c
+@@ -1038,7 +1038,7 @@ AcpiDmAddResourcesToNamespace (
* NextOp contains the Aml pointer and the Aml length
*/
AcpiUtWalkAmlResources (NULL, (UINT8 *) NextOp->Named.Data,
@@ -52,11 +52,11 @@ index fe6e74146..eed863037 100644
AcpiDmAddResourceToNamespace, (void **) BufferNode);
}
-diff --git a/source/common/dmtables.c b/source/common/dmtables.c
-index ee18d26c9..2a5551ece 100644
---- a/source/common/dmtables.c
-+++ b/source/common/dmtables.c
-@@ -250,6 +250,10 @@ AdCreateTableHeader (
+Index: acpica-unix2-20200925/source/common/dmtables.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/common/dmtables.c
++++ acpica-unix2-20200925/source/common/dmtables.c
+@@ -142,6 +142,10 @@ AdCreateTableHeader (
ACPI_TABLE_HEADER *Table)
{
UINT8 Checksum;
@@ -67,7 +67,7 @@ index ee18d26c9..2a5551ece 100644
/* Reset globals for External statements */
-@@ -264,7 +268,7 @@ AdCreateTableHeader (
+@@ -156,7 +160,7 @@ AdCreateTableHeader (
AcpiOsPrintf (" * Original Table Header:\n");
AcpiOsPrintf (" * Signature \"%4.4s\"\n", Table->Signature);
@@ -76,7 +76,7 @@ index ee18d26c9..2a5551ece 100644
/* Print and validate the revision */
-@@ -296,7 +300,7 @@ AdCreateTableHeader (
+@@ -188,7 +192,7 @@ AdCreateTableHeader (
AcpiOsPrintf ("\n * Checksum 0x%2.2X", Table->Checksum);
@@ -85,7 +85,7 @@ index ee18d26c9..2a5551ece 100644
if (Checksum)
{
AcpiOsPrintf (" **** Incorrect checksum, should be 0x%2.2X",
-@@ -306,9 +310,9 @@ AdCreateTableHeader (
+@@ -198,9 +202,9 @@ AdCreateTableHeader (
AcpiOsPrintf ("\n");
AcpiOsPrintf (" * OEM ID \"%.6s\"\n", Table->OemId);
AcpiOsPrintf (" * OEM Table ID \"%.8s\"\n", Table->OemTableId);
@@ -97,7 +97,7 @@ index ee18d26c9..2a5551ece 100644
AcpiOsPrintf (" */\n");
/*
-@@ -329,7 +333,7 @@ AdCreateTableHeader (
+@@ -221,7 +225,7 @@ AdCreateTableHeader (
AcpiOsPrintf (
"DefinitionBlock (\"\", \"%4.4s\", %u, \"%.6s\", \"%.8s\", 0x%8.8X)\n",
Table->Signature, Table->Revision,
@@ -106,7 +106,7 @@ index ee18d26c9..2a5551ece 100644
}
-@@ -504,7 +508,8 @@ AdParseTable (
+@@ -396,7 +400,8 @@ AdParseTable (
fprintf (stderr, "Pass 1 parse of [%4.4s]\n", (char *) Table->Signature);
@@ -116,11 +116,11 @@ index ee18d26c9..2a5551ece 100644
AmlStart = ((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER));
AcpiUtSetIntegerWidth (Table->Revision);
-diff --git a/source/common/dmtbdump.c b/source/common/dmtbdump.c
-index 92d86930b..5ad20ff62 100644
---- a/source/common/dmtbdump.c
-+++ b/source/common/dmtbdump.c
-@@ -441,8 +441,7 @@ AcpiDmDumpXsdt (
+Index: acpica-unix2-20200925/source/common/dmtbdump.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/common/dmtbdump.c
++++ acpica-unix2-20200925/source/common/dmtbdump.c
+@@ -333,8 +333,7 @@ AcpiDmDumpXsdt (
for (i = 0; i < Entries; i++)
{
AcpiDmLineHeader2 (Offset, sizeof (UINT64), "ACPI Table Address", i);
@@ -130,11 +130,11 @@ index 92d86930b..5ad20ff62 100644
Offset += sizeof (UINT64);
}
}
-diff --git a/source/compiler/aslcodegen.c b/source/compiler/aslcodegen.c
-index ba0384e84..14be9dcc2 100644
---- a/source/compiler/aslcodegen.c
-+++ b/source/compiler/aslcodegen.c
-@@ -346,6 +346,10 @@ CgWriteAmlOpcode (
+Index: acpica-unix2-20200925/source/compiler/aslcodegen.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/compiler/aslcodegen.c
++++ acpica-unix2-20200925/source/compiler/aslcodegen.c
+@@ -238,6 +238,10 @@ CgWriteAmlOpcode (
{
UINT8 PkgLenFirstByte;
UINT32 i;
@@ -145,7 +145,7 @@ index ba0384e84..14be9dcc2 100644
union {
UINT16 Opcode;
UINT8 OpcodeBytes[2];
-@@ -413,25 +417,26 @@ CgWriteAmlOpcode (
+@@ -305,25 +309,26 @@ CgWriteAmlOpcode (
/* Value is the length to be encoded (Used in field definitions) */
@@ -176,7 +176,7 @@ index ba0384e84..14be9dcc2 100644
break;
}
-@@ -443,7 +448,8 @@ CgWriteAmlOpcode (
+@@ -335,7 +340,8 @@ CgWriteAmlOpcode (
{
/* Simplest case -- no bytes to follow, just write the count */
@@ -186,7 +186,7 @@ index ba0384e84..14be9dcc2 100644
}
else if (Op->Asl.AmlPkgLenBytes != 0)
{
-@@ -451,9 +457,10 @@ CgWriteAmlOpcode (
+@@ -343,9 +349,10 @@ CgWriteAmlOpcode (
* Encode the "bytes to follow" in the first byte, top two bits.
* The low-order nybble of the length is in the bottom 4 bits
*/
@@ -198,7 +198,7 @@ index ba0384e84..14be9dcc2 100644
CgLocalWriteAmlData (Op, &PkgLenFirstByte, 1);
-@@ -467,6 +474,9 @@ CgWriteAmlOpcode (
+@@ -359,6 +366,9 @@ CgWriteAmlOpcode (
* Now we can write the remaining bytes -
* either 1, 2, or 3 bytes
*/
@@ -208,7 +208,7 @@ index ba0384e84..14be9dcc2 100644
for (i = 0; i < (UINT32) (Op->Asl.AmlPkgLenBytes - 1); i++)
{
CgLocalWriteAmlData (Op, &PkgLen.LenBytes[i], 1);
-@@ -478,22 +488,30 @@ CgWriteAmlOpcode (
+@@ -370,22 +380,30 @@ CgWriteAmlOpcode (
{
case AML_BYTE_OP:
@@ -243,7 +243,7 @@ index ba0384e84..14be9dcc2 100644
break;
case AML_STRING_OP:
-@@ -531,6 +549,7 @@ CgWriteTableHeader (
+@@ -423,6 +441,7 @@ CgWriteTableHeader (
ACPI_PARSE_OBJECT *Child;
UINT32 CommentLength;
ACPI_COMMENT_NODE *Current;
@@ -251,7 +251,7 @@ index ba0384e84..14be9dcc2 100644
memset (&AslGbl_TableHeader, 0, sizeof (ACPI_TABLE_HEADER));
-@@ -586,7 +605,9 @@ CgWriteTableHeader (
+@@ -478,7 +497,9 @@ CgWriteTableHeader (
/* OEM Revision */
Child = Child->Asl.Next;
@@ -262,7 +262,7 @@ index ba0384e84..14be9dcc2 100644
/* Compiler ID */
-@@ -594,7 +615,8 @@ CgWriteTableHeader (
+@@ -486,7 +507,8 @@ CgWriteTableHeader (
/* Compiler version */
@@ -272,7 +272,7 @@ index ba0384e84..14be9dcc2 100644
/* Table length. Checksum zero for now, will rewrite later */
-@@ -649,6 +671,15 @@ CgWriteTableHeader (
+@@ -541,6 +563,15 @@ CgWriteTableHeader (
AslGbl_TableHeader.Checksum = 0;
Op->Asl.FinalAmlOffset = ftell (AslGbl_Files[ASL_FILE_AML_OUTPUT].Handle);
@@ -288,7 +288,7 @@ index ba0384e84..14be9dcc2 100644
/* Write entire header and clear the table header global */
CgLocalWriteAmlData (Op, &AslGbl_TableHeader, sizeof (ACPI_TABLE_HEADER));
-@@ -733,6 +764,7 @@ CgWriteNode (
+@@ -625,6 +656,7 @@ CgWriteNode (
ACPI_PARSE_OBJECT *Op)
{
ASL_RESOURCE_NODE *Rnode;
@@ -296,7 +296,7 @@ index ba0384e84..14be9dcc2 100644
/* Write all comments here. */
-@@ -761,7 +793,10 @@ CgWriteNode (
+@@ -653,7 +685,10 @@ CgWriteNode (
case AML_RAW_DATA_DWORD:
case AML_RAW_DATA_QWORD:
@@ -308,11 +308,11 @@ index ba0384e84..14be9dcc2 100644
return;
-diff --git a/source/compiler/aslopcodes.c b/source/compiler/aslopcodes.c
-index b2a023650..afc9004af 100644
---- a/source/compiler/aslopcodes.c
-+++ b/source/compiler/aslopcodes.c
-@@ -619,7 +619,8 @@ OpcDoUnicode (
+Index: acpica-unix2-20200925/source/compiler/aslopcodes.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/compiler/aslopcodes.c
++++ acpica-unix2-20200925/source/compiler/aslopcodes.c
+@@ -511,7 +511,8 @@ OpcDoUnicode (
for (i = 0; i < Count; i++)
{
@@ -322,11 +322,11 @@ index b2a023650..afc9004af 100644
}
/*
-diff --git a/source/compiler/aslrestype1.c b/source/compiler/aslrestype1.c
-index 4dff4607d..e7639c0bb 100644
---- a/source/compiler/aslrestype1.c
-+++ b/source/compiler/aslrestype1.c
-@@ -251,6 +251,7 @@ RsDoMemory24Descriptor (
+Index: acpica-unix2-20200925/source/compiler/aslrestype1.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/compiler/aslrestype1.c
++++ acpica-unix2-20200925/source/compiler/aslrestype1.c
+@@ -143,6 +143,7 @@ RsDoMemory24Descriptor (
ASL_RESOURCE_NODE *Rnode;
UINT32 CurrentByteOffset;
UINT32 i;
@@ -334,7 +334,7 @@ index 4dff4607d..e7639c0bb 100644
InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -259,7 +260,8 @@ RsDoMemory24Descriptor (
+@@ -151,7 +152,8 @@ RsDoMemory24Descriptor (
Descriptor = Rnode->Buffer;
Descriptor->Memory24.DescriptorType = ACPI_RESOURCE_NAME_MEMORY24;
@@ -344,7 +344,7 @@ index 4dff4607d..e7639c0bb 100644
/* Process all child initialization nodes */
-@@ -276,7 +278,8 @@ RsDoMemory24Descriptor (
+@@ -168,7 +170,8 @@ RsDoMemory24Descriptor (
case 1: /* Min Address */
@@ -354,7 +354,7 @@ index 4dff4607d..e7639c0bb 100644
RsCreateWordField (InitializerOp, ACPI_RESTAG_MINADDR,
CurrentByteOffset + ASL_RESDESC_OFFSET (Memory24.Minimum));
MinOp = InitializerOp;
-@@ -284,7 +287,8 @@ RsDoMemory24Descriptor (
+@@ -176,7 +179,8 @@ RsDoMemory24Descriptor (
case 2: /* Max Address */
@@ -364,7 +364,7 @@ index 4dff4607d..e7639c0bb 100644
RsCreateWordField (InitializerOp, ACPI_RESTAG_MAXADDR,
CurrentByteOffset + ASL_RESDESC_OFFSET (Memory24.Maximum));
MaxOp = InitializerOp;
-@@ -292,14 +296,16 @@ RsDoMemory24Descriptor (
+@@ -184,14 +188,16 @@ RsDoMemory24Descriptor (
case 3: /* Alignment */
@@ -383,7 +383,7 @@ index 4dff4607d..e7639c0bb 100644
RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH,
CurrentByteOffset + ASL_RESDESC_OFFSET (Memory24.AddressLength));
LengthOp = InitializerOp;
-@@ -357,6 +363,8 @@ RsDoMemory32Descriptor (
+@@ -249,6 +255,8 @@ RsDoMemory32Descriptor (
ASL_RESOURCE_NODE *Rnode;
UINT32 CurrentByteOffset;
UINT32 i;
@@ -392,7 +392,7 @@ index 4dff4607d..e7639c0bb 100644
InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -365,7 +373,8 @@ RsDoMemory32Descriptor (
+@@ -257,7 +265,8 @@ RsDoMemory32Descriptor (
Descriptor = Rnode->Buffer;
Descriptor->Memory32.DescriptorType = ACPI_RESOURCE_NAME_MEMORY32;
@@ -402,7 +402,7 @@ index 4dff4607d..e7639c0bb 100644
/* Process all child initialization nodes */
-@@ -382,7 +391,8 @@ RsDoMemory32Descriptor (
+@@ -274,7 +283,8 @@ RsDoMemory32Descriptor (
case 1: /* Min Address */
@@ -412,7 +412,7 @@ index 4dff4607d..e7639c0bb 100644
RsCreateDwordField (InitializerOp, ACPI_RESTAG_MINADDR,
CurrentByteOffset + ASL_RESDESC_OFFSET (Memory32.Minimum));
MinOp = InitializerOp;
-@@ -390,7 +400,8 @@ RsDoMemory32Descriptor (
+@@ -282,7 +292,8 @@ RsDoMemory32Descriptor (
case 2: /* Max Address */
@@ -422,7 +422,7 @@ index 4dff4607d..e7639c0bb 100644
RsCreateDwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
CurrentByteOffset + ASL_RESDESC_OFFSET (Memory32.Maximum));
MaxOp = InitializerOp;
-@@ -398,7 +409,8 @@ RsDoMemory32Descriptor (
+@@ -290,7 +301,8 @@ RsDoMemory32Descriptor (
case 3: /* Alignment */
@@ -432,7 +432,7 @@ index 4dff4607d..e7639c0bb 100644
RsCreateDwordField (InitializerOp, ACPI_RESTAG_ALIGNMENT,
CurrentByteOffset + ASL_RESDESC_OFFSET (Memory32.Alignment));
AlignOp = InitializerOp;
-@@ -406,7 +418,8 @@ RsDoMemory32Descriptor (
+@@ -298,7 +310,8 @@ RsDoMemory32Descriptor (
case 4: /* Length */
@@ -442,7 +442,7 @@ index 4dff4607d..e7639c0bb 100644
RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
CurrentByteOffset + ASL_RESDESC_OFFSET (Memory32.AddressLength));
LengthOp = InitializerOp;
-@@ -460,6 +473,8 @@ RsDoMemory32FixedDescriptor (
+@@ -352,6 +365,8 @@ RsDoMemory32FixedDescriptor (
ASL_RESOURCE_NODE *Rnode;
UINT32 CurrentByteOffset;
UINT32 i;
@@ -451,7 +451,7 @@ index 4dff4607d..e7639c0bb 100644
InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -468,7 +483,8 @@ RsDoMemory32FixedDescriptor (
+@@ -360,7 +375,8 @@ RsDoMemory32FixedDescriptor (
Descriptor = Rnode->Buffer;
Descriptor->FixedMemory32.DescriptorType = ACPI_RESOURCE_NAME_FIXED_MEMORY32;
@@ -461,7 +461,7 @@ index 4dff4607d..e7639c0bb 100644
/* Process all child initialization nodes */
-@@ -485,14 +501,16 @@ RsDoMemory32FixedDescriptor (
+@@ -377,14 +393,16 @@ RsDoMemory32FixedDescriptor (
case 1: /* Address */
@@ -480,11 +480,11 @@ index 4dff4607d..e7639c0bb 100644
RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
CurrentByteOffset + ASL_RESDESC_OFFSET (FixedMemory32.AddressLength));
break;
-diff --git a/source/compiler/aslrestype1i.c b/source/compiler/aslrestype1i.c
-index 9e9bc2096..532553c4b 100644
---- a/source/compiler/aslrestype1i.c
-+++ b/source/compiler/aslrestype1i.c
-@@ -307,6 +307,7 @@ RsDoFixedDmaDescriptor (
+Index: acpica-unix2-20200925/source/compiler/aslrestype1i.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/compiler/aslrestype1i.c
++++ acpica-unix2-20200925/source/compiler/aslrestype1i.c
+@@ -199,6 +199,7 @@ RsDoFixedDmaDescriptor (
ASL_RESOURCE_NODE *Rnode;
UINT32 CurrentByteOffset;
UINT32 i;
@@ -492,7 +492,7 @@ index 9e9bc2096..532553c4b 100644
InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -325,14 +326,16 @@ RsDoFixedDmaDescriptor (
+@@ -217,14 +218,16 @@ RsDoFixedDmaDescriptor (
{
case 0: /* DMA Request Lines [WORD] (_DMA) */
@@ -511,7 +511,7 @@ index 9e9bc2096..532553c4b 100644
RsCreateWordField (InitializerOp, ACPI_RESTAG_DMATYPE,
CurrentByteOffset + ASL_RESDESC_OFFSET (FixedDma.Channels));
break;
-@@ -383,6 +386,7 @@ RsDoFixedIoDescriptor (
+@@ -275,6 +278,7 @@ RsDoFixedIoDescriptor (
ASL_RESOURCE_NODE *Rnode;
UINT32 CurrentByteOffset;
UINT32 i;
@@ -519,7 +519,7 @@ index 9e9bc2096..532553c4b 100644
InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -401,8 +405,8 @@ RsDoFixedIoDescriptor (
+@@ -293,8 +297,8 @@ RsDoFixedIoDescriptor (
{
case 0: /* Base Address */
@@ -530,7 +530,7 @@ index 9e9bc2096..532553c4b 100644
RsCreateWordField (InitializerOp, ACPI_RESTAG_BASEADDRESS,
CurrentByteOffset + ASL_RESDESC_OFFSET (FixedIo.Address));
AddressOp = InitializerOp;
-@@ -466,6 +470,7 @@ RsDoIoDescriptor (
+@@ -358,6 +362,7 @@ RsDoIoDescriptor (
ASL_RESOURCE_NODE *Rnode;
UINT32 CurrentByteOffset;
UINT32 i;
@@ -538,7 +538,7 @@ index 9e9bc2096..532553c4b 100644
InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -491,8 +496,8 @@ RsDoIoDescriptor (
+@@ -383,8 +388,8 @@ RsDoIoDescriptor (
case 1: /* Min Address */
@@ -549,7 +549,7 @@ index 9e9bc2096..532553c4b 100644
RsCreateWordField (InitializerOp, ACPI_RESTAG_MINADDR,
CurrentByteOffset + ASL_RESDESC_OFFSET (Io.Minimum));
MinOp = InitializerOp;
-@@ -500,8 +505,8 @@ RsDoIoDescriptor (
+@@ -392,8 +397,8 @@ RsDoIoDescriptor (
case 2: /* Max Address */
@@ -560,7 +560,7 @@ index 9e9bc2096..532553c4b 100644
RsCreateWordField (InitializerOp, ACPI_RESTAG_MAXADDR,
CurrentByteOffset + ASL_RESDESC_OFFSET (Io.Maximum));
MaxOp = InitializerOp;
-@@ -542,10 +547,10 @@ RsDoIoDescriptor (
+@@ -434,10 +439,10 @@ RsDoIoDescriptor (
/* Validate the Min/Max/Len/Align values */
RsSmallAddressCheck (ACPI_RESOURCE_NAME_IO,
@@ -575,7 +575,7 @@ index 9e9bc2096..532553c4b 100644
MinOp, MaxOp, LengthOp, AlignOp, Info->DescriptorTypeOp);
return (Rnode);
-@@ -669,7 +674,7 @@ RsDoIrqDescriptor (
+@@ -561,7 +566,7 @@ RsDoIrqDescriptor (
/* Now we can set the channel mask */
@@ -584,7 +584,7 @@ index 9e9bc2096..532553c4b 100644
return (Rnode);
}
-@@ -768,6 +773,6 @@ RsDoIrqNoFlagsDescriptor (
+@@ -660,6 +665,6 @@ RsDoIrqNoFlagsDescriptor (
/* Now we can set the interrupt mask */
@@ -592,11 +592,11 @@ index 9e9bc2096..532553c4b 100644
+ Descriptor->Irq.IrqMask = AcpiUtReadUint16(&IrqMask);
return (Rnode);
}
-diff --git a/source/compiler/aslrestype2.c b/source/compiler/aslrestype2.c
-index 93236853a..13d0476e7 100644
---- a/source/compiler/aslrestype2.c
-+++ b/source/compiler/aslrestype2.c
-@@ -185,6 +185,8 @@ RsDoGeneralRegisterDescriptor (
+Index: acpica-unix2-20200925/source/compiler/aslrestype2.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/compiler/aslrestype2.c
++++ acpica-unix2-20200925/source/compiler/aslrestype2.c
+@@ -77,6 +77,8 @@ RsDoGeneralRegisterDescriptor (
ASL_RESOURCE_NODE *Rnode;
UINT32 CurrentByteOffset;
UINT32 i;
@@ -605,7 +605,7 @@ index 93236853a..13d0476e7 100644
InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -193,7 +195,8 @@ RsDoGeneralRegisterDescriptor (
+@@ -85,7 +87,8 @@ RsDoGeneralRegisterDescriptor (
Descriptor = Rnode->Buffer;
Descriptor->GenericReg.DescriptorType = ACPI_RESOURCE_NAME_GENERIC_REGISTER;
@@ -615,7 +615,7 @@ index 93236853a..13d0476e7 100644
/* Process all child initialization nodes */
-@@ -224,7 +227,8 @@ RsDoGeneralRegisterDescriptor (
+@@ -116,7 +119,8 @@ RsDoGeneralRegisterDescriptor (
case 3: /* Register Address */
@@ -625,7 +625,7 @@ index 93236853a..13d0476e7 100644
RsCreateQwordField (InitializerOp, ACPI_RESTAG_ADDRESS,
CurrentByteOffset + ASL_RESDESC_OFFSET (GenericReg.Address));
break;
-@@ -292,6 +296,8 @@ RsDoInterruptDescriptor (
+@@ -184,6 +188,8 @@ RsDoInterruptDescriptor (
BOOLEAN HasResSourceIndex = FALSE;
UINT8 ResSourceIndex = 0;
UINT8 *ResSourceString = NULL;
@@ -634,7 +634,7 @@ index 93236853a..13d0476e7 100644
InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -333,7 +339,7 @@ RsDoInterruptDescriptor (
+@@ -225,7 +231,7 @@ RsDoInterruptDescriptor (
* Initial descriptor length -- may be enlarged if there are
* optional fields present
*/
@@ -643,7 +643,7 @@ index 93236853a..13d0476e7 100644
Descriptor->ExtendedIrq.InterruptCount = 0;
Rover = ACPI_CAST_PTR (AML_RESOURCE,
-@@ -441,7 +447,8 @@ RsDoInterruptDescriptor (
+@@ -333,7 +339,8 @@ RsDoInterruptDescriptor (
/* Save the integer and move pointer to the next one */
@@ -653,7 +653,7 @@ index 93236853a..13d0476e7 100644
Rover = ACPI_ADD_PTR (AML_RESOURCE, &(Rover->DwordItem), 4);
Descriptor->ExtendedIrq.InterruptCount++;
Descriptor->ExtendedIrq.ResourceLength += 4;
-@@ -492,6 +499,8 @@ RsDoInterruptDescriptor (
+@@ -384,6 +391,8 @@ RsDoInterruptDescriptor (
Descriptor->ExtendedIrq.ResourceLength = (UINT16)
(Descriptor->ExtendedIrq.ResourceLength + StringLength);
}
@@ -662,7 +662,7 @@ index 93236853a..13d0476e7 100644
Rnode->BufferLength =
(ASL_RESDESC_OFFSET (ExtendedIrq.Interrupts[0]) -
-@@ -544,7 +553,8 @@ RsDoVendorLargeDescriptor (
+@@ -436,7 +445,8 @@ RsDoVendorLargeDescriptor (
Descriptor = Rnode->Buffer;
Descriptor->VendorLarge.DescriptorType = ACPI_RESOURCE_NAME_VENDOR_LARGE;
@@ -672,11 +672,11 @@ index 93236853a..13d0476e7 100644
/* Point to end-of-descriptor for vendor data */
-diff --git a/source/compiler/aslrestype2d.c b/source/compiler/aslrestype2d.c
-index 394530ae3..fd9dc91de 100644
---- a/source/compiler/aslrestype2d.c
-+++ b/source/compiler/aslrestype2d.c
-@@ -192,6 +192,8 @@ RsDoDwordIoDescriptor (
+Index: acpica-unix2-20200925/source/compiler/aslrestype2d.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/compiler/aslrestype2d.c
++++ acpica-unix2-20200925/source/compiler/aslrestype2d.c
+@@ -84,6 +84,8 @@ RsDoDwordIoDescriptor (
UINT32 CurrentByteOffset;
UINT32 i;
BOOLEAN ResSourceIndex = FALSE;
@@ -685,7 +685,7 @@ index 394530ae3..fd9dc91de 100644
InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -255,8 +257,8 @@ RsDoDwordIoDescriptor (
+@@ -147,8 +149,8 @@ RsDoDwordIoDescriptor (
case 5: /* Address Granularity */
@@ -696,7 +696,7 @@ index 394530ae3..fd9dc91de 100644
RsCreateDwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Granularity));
GranOp = InitializerOp;
-@@ -264,8 +266,8 @@ RsDoDwordIoDescriptor (
+@@ -156,8 +158,8 @@ RsDoDwordIoDescriptor (
case 6: /* Address Min */
@@ -707,7 +707,7 @@ index 394530ae3..fd9dc91de 100644
RsCreateDwordField (InitializerOp, ACPI_RESTAG_MINADDR,
CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Minimum));
MinOp = InitializerOp;
-@@ -273,8 +275,8 @@ RsDoDwordIoDescriptor (
+@@ -165,8 +167,8 @@ RsDoDwordIoDescriptor (
case 7: /* Address Max */
@@ -718,7 +718,7 @@ index 394530ae3..fd9dc91de 100644
RsCreateDwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Maximum));
MaxOp = InitializerOp;
-@@ -282,16 +284,16 @@ RsDoDwordIoDescriptor (
+@@ -174,16 +176,16 @@ RsDoDwordIoDescriptor (
case 8: /* Translation Offset */
@@ -739,7 +739,7 @@ index 394530ae3..fd9dc91de 100644
RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.AddressLength));
LengthOp = InitializerOp;
-@@ -379,11 +381,14 @@ RsDoDwordIoDescriptor (
+@@ -271,11 +273,14 @@ RsDoDwordIoDescriptor (
/* Validate the Min/Max/Len/Gran values */
@@ -758,7 +758,7 @@ index 394530ae3..fd9dc91de 100644
Descriptor->Address32.Flags,
MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
-@@ -422,6 +427,8 @@ RsDoDwordMemoryDescriptor (
+@@ -314,6 +319,8 @@ RsDoDwordMemoryDescriptor (
UINT32 CurrentByteOffset;
UINT32 i;
BOOLEAN ResSourceIndex = FALSE;
@@ -767,7 +767,7 @@ index 394530ae3..fd9dc91de 100644
InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -493,8 +500,8 @@ RsDoDwordMemoryDescriptor (
+@@ -385,8 +392,8 @@ RsDoDwordMemoryDescriptor (
case 6: /* Address Granularity */
@@ -778,7 +778,7 @@ index 394530ae3..fd9dc91de 100644
RsCreateDwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Granularity));
GranOp = InitializerOp;
-@@ -502,8 +509,8 @@ RsDoDwordMemoryDescriptor (
+@@ -394,8 +401,8 @@ RsDoDwordMemoryDescriptor (
case 7: /* Min Address */
@@ -789,7 +789,7 @@ index 394530ae3..fd9dc91de 100644
RsCreateDwordField (InitializerOp, ACPI_RESTAG_MINADDR,
CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Minimum));
MinOp = InitializerOp;
-@@ -511,8 +518,8 @@ RsDoDwordMemoryDescriptor (
+@@ -403,8 +410,8 @@ RsDoDwordMemoryDescriptor (
case 8: /* Max Address */
@@ -800,7 +800,7 @@ index 394530ae3..fd9dc91de 100644
RsCreateDwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Maximum));
MaxOp = InitializerOp;
-@@ -520,16 +527,16 @@ RsDoDwordMemoryDescriptor (
+@@ -412,16 +419,16 @@ RsDoDwordMemoryDescriptor (
case 9: /* Translation Offset */
@@ -821,7 +821,7 @@ index 394530ae3..fd9dc91de 100644
RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.AddressLength));
LengthOp = InitializerOp;
-@@ -614,11 +621,14 @@ RsDoDwordMemoryDescriptor (
+@@ -506,11 +513,14 @@ RsDoDwordMemoryDescriptor (
/* Validate the Min/Max/Len/Gran values */
@@ -840,7 +840,7 @@ index 394530ae3..fd9dc91de 100644
Descriptor->Address32.Flags,
MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
-@@ -657,6 +667,8 @@ RsDoDwordSpaceDescriptor (
+@@ -549,6 +559,8 @@ RsDoDwordSpaceDescriptor (
UINT32 CurrentByteOffset;
UINT32 i;
BOOLEAN ResSourceIndex = FALSE;
@@ -849,7 +849,7 @@ index 394530ae3..fd9dc91de 100644
InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -724,8 +736,8 @@ RsDoDwordSpaceDescriptor (
+@@ -616,8 +628,8 @@ RsDoDwordSpaceDescriptor (
case 6: /* Address Granularity */
@@ -860,7 +860,7 @@ index 394530ae3..fd9dc91de 100644
RsCreateDwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Granularity));
GranOp = InitializerOp;
-@@ -733,8 +745,8 @@ RsDoDwordSpaceDescriptor (
+@@ -625,8 +637,8 @@ RsDoDwordSpaceDescriptor (
case 7: /* Min Address */
@@ -871,7 +871,7 @@ index 394530ae3..fd9dc91de 100644
RsCreateDwordField (InitializerOp, ACPI_RESTAG_MINADDR,
CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Minimum));
MinOp = InitializerOp;
-@@ -742,8 +754,8 @@ RsDoDwordSpaceDescriptor (
+@@ -634,8 +646,8 @@ RsDoDwordSpaceDescriptor (
case 8: /* Max Address */
@@ -882,7 +882,7 @@ index 394530ae3..fd9dc91de 100644
RsCreateDwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Maximum));
MaxOp = InitializerOp;
-@@ -751,16 +763,16 @@ RsDoDwordSpaceDescriptor (
+@@ -643,16 +655,16 @@ RsDoDwordSpaceDescriptor (
case 9: /* Translation Offset */
@@ -903,7 +903,7 @@ index 394530ae3..fd9dc91de 100644
RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.AddressLength));
LengthOp = InitializerOp;
-@@ -831,11 +843,14 @@ RsDoDwordSpaceDescriptor (
+@@ -723,11 +735,14 @@ RsDoDwordSpaceDescriptor (
/* Validate the Min/Max/Len/Gran values */
@@ -922,11 +922,11 @@ index 394530ae3..fd9dc91de 100644
Descriptor->Address32.Flags,
MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
-diff --git a/source/compiler/aslrestype2e.c b/source/compiler/aslrestype2e.c
-index b188994d3..ad61efc77 100644
---- a/source/compiler/aslrestype2e.c
-+++ b/source/compiler/aslrestype2e.c
-@@ -188,6 +188,7 @@ RsDoExtendedIoDescriptor (
+Index: acpica-unix2-20200925/source/compiler/aslrestype2e.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/compiler/aslrestype2e.c
++++ acpica-unix2-20200925/source/compiler/aslrestype2e.c
+@@ -80,6 +80,7 @@ RsDoExtendedIoDescriptor (
UINT16 StringLength = 0;
UINT32 CurrentByteOffset;
UINT32 i;
@@ -934,7 +934,7 @@ index b188994d3..ad61efc77 100644
InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -247,7 +248,8 @@ RsDoExtendedIoDescriptor (
+@@ -139,7 +140,8 @@ RsDoExtendedIoDescriptor (
case 5: /* Address Granularity */
@@ -944,7 +944,7 @@ index b188994d3..ad61efc77 100644
RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Granularity));
GranOp = InitializerOp;
-@@ -255,7 +257,8 @@ RsDoExtendedIoDescriptor (
+@@ -147,7 +149,8 @@ RsDoExtendedIoDescriptor (
case 6: /* Address Min */
@@ -954,7 +954,7 @@ index b188994d3..ad61efc77 100644
RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR,
CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Minimum));
MinOp = InitializerOp;
-@@ -263,7 +266,8 @@ RsDoExtendedIoDescriptor (
+@@ -155,7 +158,8 @@ RsDoExtendedIoDescriptor (
case 7: /* Address Max */
@@ -964,7 +964,7 @@ index b188994d3..ad61efc77 100644
RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Maximum));
MaxOp = InitializerOp;
-@@ -271,14 +275,16 @@ RsDoExtendedIoDescriptor (
+@@ -163,14 +167,16 @@ RsDoExtendedIoDescriptor (
case 8: /* Translation Offset */
@@ -983,7 +983,7 @@ index b188994d3..ad61efc77 100644
RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH,
CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.AddressLength));
LengthOp = InitializerOp;
-@@ -286,7 +292,8 @@ RsDoExtendedIoDescriptor (
+@@ -178,7 +184,8 @@ RsDoExtendedIoDescriptor (
case 10: /* Type-Specific Attributes */
@@ -993,7 +993,7 @@ index b188994d3..ad61efc77 100644
RsCreateQwordField (InitializerOp, ACPI_RESTAG_TYPESPECIFICATTRIBUTES,
CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.TypeSpecific));
break;
-@@ -321,11 +328,14 @@ RsDoExtendedIoDescriptor (
+@@ -213,11 +220,14 @@ RsDoExtendedIoDescriptor (
/* Validate the Min/Max/Len/Gran values */
@@ -1012,7 +1012,7 @@ index b188994d3..ad61efc77 100644
Descriptor->ExtAddress64.Flags,
MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
-@@ -361,6 +371,7 @@ RsDoExtendedMemoryDescriptor (
+@@ -253,6 +263,7 @@ RsDoExtendedMemoryDescriptor (
UINT16 StringLength = 0;
UINT32 CurrentByteOffset;
UINT32 i;
@@ -1020,7 +1020,7 @@ index b188994d3..ad61efc77 100644
InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -427,7 +438,8 @@ RsDoExtendedMemoryDescriptor (
+@@ -319,7 +330,8 @@ RsDoExtendedMemoryDescriptor (
case 6: /* Address Granularity */
@@ -1030,7 +1030,7 @@ index b188994d3..ad61efc77 100644
RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Granularity));
GranOp = InitializerOp;
-@@ -435,7 +447,8 @@ RsDoExtendedMemoryDescriptor (
+@@ -327,7 +339,8 @@ RsDoExtendedMemoryDescriptor (
case 7: /* Min Address */
@@ -1040,7 +1040,7 @@ index b188994d3..ad61efc77 100644
RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR,
CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Minimum));
MinOp = InitializerOp;
-@@ -443,7 +456,8 @@ RsDoExtendedMemoryDescriptor (
+@@ -335,7 +348,8 @@ RsDoExtendedMemoryDescriptor (
case 8: /* Max Address */
@@ -1050,7 +1050,7 @@ index b188994d3..ad61efc77 100644
RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Maximum));
MaxOp = InitializerOp;
-@@ -451,14 +465,16 @@ RsDoExtendedMemoryDescriptor (
+@@ -343,14 +357,16 @@ RsDoExtendedMemoryDescriptor (
case 9: /* Translation Offset */
@@ -1069,7 +1069,7 @@ index b188994d3..ad61efc77 100644
RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH,
CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.AddressLength));
LengthOp = InitializerOp;
-@@ -466,7 +482,8 @@ RsDoExtendedMemoryDescriptor (
+@@ -358,7 +374,8 @@ RsDoExtendedMemoryDescriptor (
case 11: /* Type-Specific Attributes */
@@ -1079,7 +1079,7 @@ index b188994d3..ad61efc77 100644
RsCreateQwordField (InitializerOp, ACPI_RESTAG_TYPESPECIFICATTRIBUTES,
CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.TypeSpecific));
break;
-@@ -502,11 +519,14 @@ RsDoExtendedMemoryDescriptor (
+@@ -394,11 +411,14 @@ RsDoExtendedMemoryDescriptor (
/* Validate the Min/Max/Len/Gran values */
@@ -1098,7 +1098,7 @@ index b188994d3..ad61efc77 100644
Descriptor->ExtAddress64.Flags,
MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
-@@ -542,6 +562,7 @@ RsDoExtendedSpaceDescriptor (
+@@ -434,6 +454,7 @@ RsDoExtendedSpaceDescriptor (
UINT16 StringLength = 0;
UINT32 CurrentByteOffset;
UINT32 i;
@@ -1106,7 +1106,7 @@ index b188994d3..ad61efc77 100644
InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -605,7 +626,8 @@ RsDoExtendedSpaceDescriptor (
+@@ -497,7 +518,8 @@ RsDoExtendedSpaceDescriptor (
case 6: /* Address Granularity */
@@ -1116,7 +1116,7 @@ index b188994d3..ad61efc77 100644
RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Granularity));
GranOp = InitializerOp;
-@@ -613,7 +635,8 @@ RsDoExtendedSpaceDescriptor (
+@@ -505,7 +527,8 @@ RsDoExtendedSpaceDescriptor (
case 7: /* Min Address */
@@ -1126,7 +1126,7 @@ index b188994d3..ad61efc77 100644
RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR,
CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Minimum));
MinOp = InitializerOp;
-@@ -621,7 +644,8 @@ RsDoExtendedSpaceDescriptor (
+@@ -513,7 +536,8 @@ RsDoExtendedSpaceDescriptor (
case 8: /* Max Address */
@@ -1136,7 +1136,7 @@ index b188994d3..ad61efc77 100644
RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Maximum));
MaxOp = InitializerOp;
-@@ -629,14 +653,16 @@ RsDoExtendedSpaceDescriptor (
+@@ -521,14 +545,16 @@ RsDoExtendedSpaceDescriptor (
case 9: /* Translation Offset */
@@ -1155,7 +1155,7 @@ index b188994d3..ad61efc77 100644
RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH,
CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.AddressLength));
LengthOp = InitializerOp;
-@@ -644,7 +670,8 @@ RsDoExtendedSpaceDescriptor (
+@@ -536,7 +562,8 @@ RsDoExtendedSpaceDescriptor (
case 11: /* Type-Specific Attributes */
@@ -1165,7 +1165,7 @@ index b188994d3..ad61efc77 100644
RsCreateQwordField (InitializerOp, ACPI_RESTAG_TYPESPECIFICATTRIBUTES,
CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.TypeSpecific));
break;
-@@ -665,11 +692,14 @@ RsDoExtendedSpaceDescriptor (
+@@ -557,11 +584,14 @@ RsDoExtendedSpaceDescriptor (
/* Validate the Min/Max/Len/Gran values */
@@ -1184,11 +1184,11 @@ index b188994d3..ad61efc77 100644
Descriptor->ExtAddress64.Flags,
MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
-diff --git a/source/compiler/aslrestype2q.c b/source/compiler/aslrestype2q.c
-index 02db0ab34..7706b07ac 100644
---- a/source/compiler/aslrestype2q.c
-+++ b/source/compiler/aslrestype2q.c
-@@ -192,6 +192,7 @@ RsDoQwordIoDescriptor (
+Index: acpica-unix2-20200925/source/compiler/aslrestype2q.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/compiler/aslrestype2q.c
++++ acpica-unix2-20200925/source/compiler/aslrestype2q.c
+@@ -84,6 +84,7 @@ RsDoQwordIoDescriptor (
UINT32 CurrentByteOffset;
UINT32 i;
BOOLEAN ResSourceIndex = FALSE;
@@ -1196,7 +1196,7 @@ index 02db0ab34..7706b07ac 100644
InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -255,7 +256,8 @@ RsDoQwordIoDescriptor (
+@@ -147,7 +148,8 @@ RsDoQwordIoDescriptor (
case 5: /* Address Granularity */
@@ -1206,7 +1206,7 @@ index 02db0ab34..7706b07ac 100644
RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Granularity));
GranOp = InitializerOp;
-@@ -263,7 +265,8 @@ RsDoQwordIoDescriptor (
+@@ -155,7 +157,8 @@ RsDoQwordIoDescriptor (
case 6: /* Address Min */
@@ -1216,7 +1216,7 @@ index 02db0ab34..7706b07ac 100644
RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR,
CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Minimum));
MinOp = InitializerOp;
-@@ -271,7 +274,8 @@ RsDoQwordIoDescriptor (
+@@ -163,7 +166,8 @@ RsDoQwordIoDescriptor (
case 7: /* Address Max */
@@ -1226,7 +1226,7 @@ index 02db0ab34..7706b07ac 100644
RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Maximum));
MaxOp = InitializerOp;
-@@ -279,14 +283,16 @@ RsDoQwordIoDescriptor (
+@@ -171,14 +175,16 @@ RsDoQwordIoDescriptor (
case 8: /* Translation Offset */
@@ -1245,7 +1245,7 @@ index 02db0ab34..7706b07ac 100644
RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH,
CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.AddressLength));
LengthOp = InitializerOp;
-@@ -370,11 +376,14 @@ RsDoQwordIoDescriptor (
+@@ -262,11 +268,14 @@ RsDoQwordIoDescriptor (
/* Validate the Min/Max/Len/Gran values */
@@ -1264,7 +1264,7 @@ index 02db0ab34..7706b07ac 100644
Descriptor->Address64.Flags,
MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
-@@ -413,6 +422,7 @@ RsDoQwordMemoryDescriptor (
+@@ -305,6 +314,7 @@ RsDoQwordMemoryDescriptor (
UINT32 CurrentByteOffset;
UINT32 i;
BOOLEAN ResSourceIndex = FALSE;
@@ -1272,7 +1272,7 @@ index 02db0ab34..7706b07ac 100644
InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -483,7 +493,8 @@ RsDoQwordMemoryDescriptor (
+@@ -375,7 +385,8 @@ RsDoQwordMemoryDescriptor (
case 6: /* Address Granularity */
@@ -1282,7 +1282,7 @@ index 02db0ab34..7706b07ac 100644
RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Granularity));
GranOp = InitializerOp;
-@@ -491,7 +502,8 @@ RsDoQwordMemoryDescriptor (
+@@ -383,7 +394,8 @@ RsDoQwordMemoryDescriptor (
case 7: /* Min Address */
@@ -1292,7 +1292,7 @@ index 02db0ab34..7706b07ac 100644
RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR,
CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Minimum));
MinOp = InitializerOp;
-@@ -499,7 +511,8 @@ RsDoQwordMemoryDescriptor (
+@@ -391,7 +403,8 @@ RsDoQwordMemoryDescriptor (
case 8: /* Max Address */
@@ -1302,7 +1302,7 @@ index 02db0ab34..7706b07ac 100644
RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Maximum));
MaxOp = InitializerOp;
-@@ -507,14 +520,16 @@ RsDoQwordMemoryDescriptor (
+@@ -399,14 +412,16 @@ RsDoQwordMemoryDescriptor (
case 9: /* Translation Offset */
@@ -1321,7 +1321,7 @@ index 02db0ab34..7706b07ac 100644
RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH,
CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.AddressLength));
LengthOp = InitializerOp;
-@@ -599,11 +614,14 @@ RsDoQwordMemoryDescriptor (
+@@ -491,11 +506,14 @@ RsDoQwordMemoryDescriptor (
/* Validate the Min/Max/Len/Gran values */
@@ -1340,7 +1340,7 @@ index 02db0ab34..7706b07ac 100644
Descriptor->Address64.Flags,
MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
-@@ -642,6 +660,7 @@ RsDoQwordSpaceDescriptor (
+@@ -534,6 +552,7 @@ RsDoQwordSpaceDescriptor (
UINT32 CurrentByteOffset;
UINT32 i;
BOOLEAN ResSourceIndex = FALSE;
@@ -1348,7 +1348,7 @@ index 02db0ab34..7706b07ac 100644
InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -709,7 +728,8 @@ RsDoQwordSpaceDescriptor (
+@@ -601,7 +620,8 @@ RsDoQwordSpaceDescriptor (
case 6: /* Address Granularity */
@@ -1358,7 +1358,7 @@ index 02db0ab34..7706b07ac 100644
RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Granularity));
GranOp = InitializerOp;
-@@ -717,7 +737,8 @@ RsDoQwordSpaceDescriptor (
+@@ -609,7 +629,8 @@ RsDoQwordSpaceDescriptor (
case 7: /* Min Address */
@@ -1368,7 +1368,7 @@ index 02db0ab34..7706b07ac 100644
RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR,
CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Minimum));
MinOp = InitializerOp;
-@@ -725,7 +746,8 @@ RsDoQwordSpaceDescriptor (
+@@ -617,7 +638,8 @@ RsDoQwordSpaceDescriptor (
case 8: /* Max Address */
@@ -1378,7 +1378,7 @@ index 02db0ab34..7706b07ac 100644
RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Maximum));
MaxOp = InitializerOp;
-@@ -733,14 +755,16 @@ RsDoQwordSpaceDescriptor (
+@@ -625,14 +647,16 @@ RsDoQwordSpaceDescriptor (
case 9: /* Translation Offset */
@@ -1397,7 +1397,7 @@ index 02db0ab34..7706b07ac 100644
RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH,
CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.AddressLength));
LengthOp = InitializerOp;
-@@ -810,11 +834,14 @@ RsDoQwordSpaceDescriptor (
+@@ -702,11 +726,14 @@ RsDoQwordSpaceDescriptor (
/* Validate the Min/Max/Len/Gran values */
@@ -1416,11 +1416,11 @@ index 02db0ab34..7706b07ac 100644
Descriptor->Address64.Flags,
MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
-diff --git a/source/compiler/aslrestype2s.c b/source/compiler/aslrestype2s.c
-index c075c89c9..7aa23a35b 100644
---- a/source/compiler/aslrestype2s.c
-+++ b/source/compiler/aslrestype2s.c
-@@ -451,6 +451,7 @@ RsDoGpioIntDescriptor (
+Index: acpica-unix2-20200925/source/compiler/aslrestype2s.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/compiler/aslrestype2s.c
++++ acpica-unix2-20200925/source/compiler/aslrestype2s.c
+@@ -343,6 +343,7 @@ RsDoGpioIntDescriptor (
UINT32 CurrentByteOffset;
UINT32 PinCount = 0;
UINT32 i;
@@ -1428,7 +1428,7 @@ index c075c89c9..7aa23a35b 100644
InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -593,7 +594,8 @@ RsDoGpioIntDescriptor (
+@@ -485,7 +486,8 @@ RsDoGpioIntDescriptor (
* (implies resource source must immediately follow the pin list.)
* Name: _PIN
*/
@@ -1438,7 +1438,7 @@ index c075c89c9..7aa23a35b 100644
InterruptList++;
PinCount++;
-@@ -626,6 +628,27 @@ RsDoGpioIntDescriptor (
+@@ -518,6 +520,27 @@ RsDoGpioIntDescriptor (
MpSaveGpioInfo (Info->MappingOp, Descriptor,
PinCount, PinList, ResourceSource);
@@ -1466,7 +1466,7 @@ index c075c89c9..7aa23a35b 100644
return (Rnode);
}
-@@ -660,6 +683,7 @@ RsDoGpioIoDescriptor (
+@@ -552,6 +575,7 @@ RsDoGpioIoDescriptor (
UINT32 CurrentByteOffset;
UINT32 PinCount = 0;
UINT32 i;
@@ -1474,7 +1474,7 @@ index c075c89c9..7aa23a35b 100644
InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -799,7 +823,8 @@ RsDoGpioIoDescriptor (
+@@ -691,7 +715,8 @@ RsDoGpioIoDescriptor (
* (implies resource source must immediately follow the pin list.)
* Name: _PIN
*/
@@ -1484,7 +1484,7 @@ index c075c89c9..7aa23a35b 100644
InterruptList++;
PinCount++;
-@@ -832,6 +857,27 @@ RsDoGpioIoDescriptor (
+@@ -724,6 +749,27 @@ RsDoGpioIoDescriptor (
MpSaveGpioInfo (Info->MappingOp, Descriptor,
PinCount, PinList, ResourceSource);
@@ -1512,7 +1512,7 @@ index c075c89c9..7aa23a35b 100644
return (Rnode);
}
-@@ -862,6 +908,8 @@ RsDoI2cSerialBusDescriptor (
+@@ -754,6 +800,8 @@ RsDoI2cSerialBusDescriptor (
UINT16 DescriptorSize;
UINT32 CurrentByteOffset;
UINT32 i;
@@ -1521,7 +1521,7 @@ index c075c89c9..7aa23a35b 100644
InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -889,7 +937,8 @@ RsDoI2cSerialBusDescriptor (
+@@ -781,7 +829,8 @@ RsDoI2cSerialBusDescriptor (
Descriptor->I2cSerialBus.RevisionId = AML_RESOURCE_I2C_REVISION;
Descriptor->I2cSerialBus.TypeRevisionId = AML_RESOURCE_I2C_TYPE_REVISION;
Descriptor->I2cSerialBus.Type = AML_RESOURCE_I2C_SERIALBUSTYPE;
@@ -1531,7 +1531,7 @@ index c075c89c9..7aa23a35b 100644
if (Info->DescriptorTypeOp->Asl.ParseOpcode == PARSEOP_I2C_SERIALBUS_V2)
{
-@@ -903,13 +952,15 @@ RsDoI2cSerialBusDescriptor (
+@@ -795,13 +844,15 @@ RsDoI2cSerialBusDescriptor (
/* Process all child initialization nodes */
@@ -1548,7 +1548,7 @@ index c075c89c9..7aa23a35b 100644
RsCreateWordField (InitializerOp, ACPI_RESTAG_ADDRESS,
CurrentByteOffset + ASL_RESDESC_OFFSET (I2cSerialBus.SlaveAddress));
break;
-@@ -923,16 +974,19 @@ RsDoI2cSerialBusDescriptor (
+@@ -815,16 +866,19 @@ RsDoI2cSerialBusDescriptor (
case 2: /* Connection Speed [DWORD] (_SPE) */
@@ -1570,7 +1570,7 @@ index c075c89c9..7aa23a35b 100644
break;
case 4: /* ResSource [Optional Field - STRING] */
-@@ -990,6 +1044,8 @@ RsDoI2cSerialBusDescriptor (
+@@ -882,6 +936,8 @@ RsDoI2cSerialBusDescriptor (
InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
}
@@ -1579,7 +1579,7 @@ index c075c89c9..7aa23a35b 100644
MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource);
return (Rnode);
}
-@@ -1021,6 +1077,8 @@ RsDoSpiSerialBusDescriptor (
+@@ -913,6 +969,8 @@ RsDoSpiSerialBusDescriptor (
UINT16 DescriptorSize;
UINT32 CurrentByteOffset;
UINT32 i;
@@ -1588,7 +1588,7 @@ index c075c89c9..7aa23a35b 100644
InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -1043,12 +1101,13 @@ RsDoSpiSerialBusDescriptor (
+@@ -935,12 +993,13 @@ RsDoSpiSerialBusDescriptor (
sizeof (AML_RESOURCE_LARGE_HEADER));
Descriptor = Rnode->Buffer;
@@ -1604,7 +1604,7 @@ index c075c89c9..7aa23a35b 100644
if (Info->DescriptorTypeOp->Asl.ParseOpcode == PARSEOP_SPI_SERIALBUS_V2)
{
-@@ -1063,29 +1122,35 @@ RsDoSpiSerialBusDescriptor (
+@@ -955,29 +1014,35 @@ RsDoSpiSerialBusDescriptor (
/* Process all child initialization nodes */
@@ -1643,7 +1643,7 @@ index c075c89c9..7aa23a35b 100644
break;
case 3: /* Device Bit Length [BYTE] (_LEN) */
-@@ -1104,7 +1169,8 @@ RsDoSpiSerialBusDescriptor (
+@@ -996,7 +1061,8 @@ RsDoSpiSerialBusDescriptor (
case 5: /* Connection Speed [DWORD] (_SPE) */
@@ -1653,7 +1653,7 @@ index c075c89c9..7aa23a35b 100644
RsCreateDwordField (InitializerOp, ACPI_RESTAG_SPEED,
CurrentByteOffset + ASL_RESDESC_OFFSET (SpiSerialBus.ConnectionSpeed));
break;
-@@ -1209,6 +1275,8 @@ RsDoUartSerialBusDescriptor (
+@@ -1101,6 +1167,8 @@ RsDoUartSerialBusDescriptor (
UINT16 DescriptorSize;
UINT32 CurrentByteOffset;
UINT32 i;
@@ -1662,7 +1662,7 @@ index c075c89c9..7aa23a35b 100644
InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -1231,12 +1299,13 @@ RsDoUartSerialBusDescriptor (
+@@ -1123,12 +1191,13 @@ RsDoUartSerialBusDescriptor (
sizeof (AML_RESOURCE_LARGE_HEADER));
Descriptor = Rnode->Buffer;
@@ -1678,7 +1678,7 @@ index c075c89c9..7aa23a35b 100644
if (Info->DescriptorTypeOp->Asl.ParseOpcode == PARSEOP_UART_SERIALBUS_V2)
{
-@@ -1250,29 +1319,35 @@ RsDoUartSerialBusDescriptor (
+@@ -1142,29 +1211,35 @@ RsDoUartSerialBusDescriptor (
/* Process all child initialization nodes */
@@ -1717,7 +1717,7 @@ index c075c89c9..7aa23a35b 100644
break;
case 3: /* Lines In Use [BYTE] (_LIN) */
-@@ -1284,9 +1359,11 @@ RsDoUartSerialBusDescriptor (
+@@ -1176,9 +1251,11 @@ RsDoUartSerialBusDescriptor (
case 4: /* Endianness [Flag] (_END) */
@@ -1730,7 +1730,7 @@ index c075c89c9..7aa23a35b 100644
break;
case 5: /* Parity [BYTE] (_PAR) */
-@@ -1298,21 +1375,25 @@ RsDoUartSerialBusDescriptor (
+@@ -1190,21 +1267,25 @@ RsDoUartSerialBusDescriptor (
case 6: /* Flow Control [Flags] (_FLC) */
@@ -1759,7 +1759,7 @@ index c075c89c9..7aa23a35b 100644
RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH_TX,
CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TxFifoSize));
break;
-@@ -1416,6 +1497,7 @@ RsDoPinFunctionDescriptor (
+@@ -1308,6 +1389,7 @@ RsDoPinFunctionDescriptor (
UINT32 CurrentByteOffset;
UINT32 PinCount = 0;
UINT32 i;
@@ -1767,7 +1767,7 @@ index c075c89c9..7aa23a35b 100644
InitializerOp = Info->DescriptorTypeOp->Asl.Child;
CurrentByteOffset = Info->CurrentByteOffset;
-@@ -1439,7 +1521,7 @@ RsDoPinFunctionDescriptor (
+@@ -1331,7 +1413,7 @@ RsDoPinFunctionDescriptor (
sizeof (AML_RESOURCE_LARGE_HEADER));
Descriptor = Rnode->Buffer;
@@ -1776,7 +1776,7 @@ index c075c89c9..7aa23a35b 100644
Descriptor->PinFunction.DescriptorType = ACPI_RESOURCE_NAME_PIN_FUNCTION;
Descriptor->PinFunction.RevisionId = AML_RESOURCE_PIN_FUNCTION_REVISION;
-@@ -1479,7 +1561,8 @@ RsDoPinFunctionDescriptor (
+@@ -1371,7 +1453,8 @@ RsDoPinFunctionDescriptor (
case 2: /* Function Number [WORD] (_FUN) */
@@ -1786,7 +1786,7 @@ index c075c89c9..7aa23a35b 100644
RsCreateDwordField (InitializerOp, ACPI_RESTAG_FUNCTION,
CurrentByteOffset + ASL_RESDESC_OFFSET (PinFunction.FunctionNumber));
break;
-@@ -1527,6 +1610,12 @@ RsDoPinFunctionDescriptor (
+@@ -1419,6 +1502,12 @@ RsDoPinFunctionDescriptor (
{
Descriptor->PinFunction.VendorLength = VendorLength;
}
@@ -1799,7 +1799,7 @@ index c075c89c9..7aa23a35b 100644
break;
default:
-@@ -1538,7 +1627,8 @@ RsDoPinFunctionDescriptor (
+@@ -1430,7 +1519,8 @@ RsDoPinFunctionDescriptor (
* (implies resource source must immediately follow the pin list.)
* Name: _PIN
*/
@@ -1809,7 +1809,7 @@ index c075c89c9..7aa23a35b 100644
PinList++;
PinCount++;
-@@ -1569,6 +1659,13 @@ RsDoPinFunctionDescriptor (
+@@ -1461,6 +1551,13 @@ RsDoPinFunctionDescriptor (
InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
}
@@ -1823,7 +1823,7 @@ index c075c89c9..7aa23a35b 100644
return (Rnode);
}
-@@ -1602,6 +1699,8 @@ RsDoPinConfigDescriptor (
+@@ -1494,6 +1591,8 @@ RsDoPinConfigDescriptor (
UINT32 CurrentByteOffset;
UINT32 PinCount = 0;
UINT32 i;
@@ -1832,7 +1832,7 @@ index c075c89c9..7aa23a35b 100644
InitializerOp = Info->DescriptorTypeOp->Asl.Child;
CurrentByteOffset = Info->CurrentByteOffset;
-@@ -1625,7 +1724,7 @@ RsDoPinConfigDescriptor (
+@@ -1517,7 +1616,7 @@ RsDoPinConfigDescriptor (
sizeof (AML_RESOURCE_LARGE_HEADER));
Descriptor = Rnode->Buffer;
@@ -1841,7 +1841,7 @@ index c075c89c9..7aa23a35b 100644
Descriptor->PinConfig.DescriptorType = ACPI_RESOURCE_NAME_PIN_CONFIG;
Descriptor->PinConfig.RevisionId = AML_RESOURCE_PIN_CONFIG_REVISION;
-@@ -1679,7 +1778,8 @@ RsDoPinConfigDescriptor (
+@@ -1571,7 +1670,8 @@ RsDoPinConfigDescriptor (
case 2: /* Pin Config Value [DWORD] (_VAL) */
@@ -1851,7 +1851,7 @@ index c075c89c9..7aa23a35b 100644
RsCreateDwordField (InitializerOp, ACPI_RESTAG_PINCONFIG_VALUE,
CurrentByteOffset + ASL_RESDESC_OFFSET (PinConfig.PinConfigValue));
break;
-@@ -1738,7 +1838,8 @@ RsDoPinConfigDescriptor (
+@@ -1630,7 +1730,8 @@ RsDoPinConfigDescriptor (
* (implies resource source must immediately follow the pin list.)
* Name: _PIN
*/
@@ -1861,7 +1861,7 @@ index c075c89c9..7aa23a35b 100644
PinList++;
PinCount++;
-@@ -1769,6 +1870,16 @@ RsDoPinConfigDescriptor (
+@@ -1661,6 +1762,16 @@ RsDoPinConfigDescriptor (
InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
}
@@ -1878,7 +1878,7 @@ index c075c89c9..7aa23a35b 100644
return (Rnode);
}
-@@ -1802,6 +1913,7 @@ RsDoPinGroupDescriptor (
+@@ -1694,6 +1805,7 @@ RsDoPinGroupDescriptor (
UINT32 CurrentByteOffset;
UINT32 PinCount = 0;
UINT32 i;
@@ -1886,7 +1886,7 @@ index c075c89c9..7aa23a35b 100644
InitializerOp = Info->DescriptorTypeOp->Asl.Child;
CurrentByteOffset = Info->CurrentByteOffset;
-@@ -1825,7 +1937,7 @@ RsDoPinGroupDescriptor (
+@@ -1717,7 +1829,7 @@ RsDoPinGroupDescriptor (
sizeof (AML_RESOURCE_LARGE_HEADER));
Descriptor = Rnode->Buffer;
@@ -1895,7 +1895,7 @@ index c075c89c9..7aa23a35b 100644
Descriptor->PinGroup.DescriptorType = ACPI_RESOURCE_NAME_PIN_GROUP;
Descriptor->PinGroup.RevisionId = AML_RESOURCE_PIN_GROUP_REVISION;
-@@ -1892,7 +2004,8 @@ RsDoPinGroupDescriptor (
+@@ -1784,7 +1896,8 @@ RsDoPinGroupDescriptor (
* (implies resource source must immediately follow the pin list.)
* Name: _PIN
*/
@@ -1905,7 +1905,7 @@ index c075c89c9..7aa23a35b 100644
PinList++;
PinCount++;
-@@ -1923,6 +2036,16 @@ RsDoPinGroupDescriptor (
+@@ -1815,6 +1928,16 @@ RsDoPinGroupDescriptor (
InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
}
@@ -1922,7 +1922,7 @@ index c075c89c9..7aa23a35b 100644
return (Rnode);
}
-@@ -1955,6 +2078,7 @@ RsDoPinGroupFunctionDescriptor (
+@@ -1847,6 +1970,7 @@ RsDoPinGroupFunctionDescriptor (
UINT16 DescriptorSize;
UINT32 CurrentByteOffset;
UINT32 i;
@@ -1930,7 +1930,7 @@ index c075c89c9..7aa23a35b 100644
InitializerOp = Info->DescriptorTypeOp->Asl.Child;
CurrentByteOffset = Info->CurrentByteOffset;
-@@ -1978,7 +2102,7 @@ RsDoPinGroupFunctionDescriptor (
+@@ -1870,7 +1994,7 @@ RsDoPinGroupFunctionDescriptor (
sizeof (AML_RESOURCE_LARGE_HEADER));
Descriptor = Rnode->Buffer;
@@ -1939,7 +1939,7 @@ index c075c89c9..7aa23a35b 100644
Descriptor->PinGroupFunction.DescriptorType = ACPI_RESOURCE_NAME_PIN_GROUP_FUNCTION;
Descriptor->PinGroupFunction.RevisionId = AML_RESOURCE_PIN_GROUP_FUNCTION_REVISION;
-@@ -2010,7 +2134,8 @@ RsDoPinGroupFunctionDescriptor (
+@@ -1902,7 +2026,8 @@ RsDoPinGroupFunctionDescriptor (
case 1: /* Function Number [WORD] */
@@ -1949,7 +1949,7 @@ index c075c89c9..7aa23a35b 100644
RsCreateDwordField (InitializerOp, ACPI_RESTAG_FUNCTION,
CurrentByteOffset + ASL_RESDESC_OFFSET (PinGroupFunction.FunctionNumber));
break;
-@@ -2069,6 +2194,16 @@ RsDoPinGroupFunctionDescriptor (
+@@ -1961,6 +2086,16 @@ RsDoPinGroupFunctionDescriptor (
InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
}
@@ -1966,7 +1966,7 @@ index c075c89c9..7aa23a35b 100644
return (Rnode);
}
-@@ -2101,6 +2236,8 @@ RsDoPinGroupConfigDescriptor (
+@@ -1993,6 +2128,8 @@ RsDoPinGroupConfigDescriptor (
UINT16 DescriptorSize;
UINT32 CurrentByteOffset;
UINT32 i;
@@ -1975,7 +1975,7 @@ index c075c89c9..7aa23a35b 100644
InitializerOp = Info->DescriptorTypeOp->Asl.Child;
CurrentByteOffset = Info->CurrentByteOffset;
-@@ -2124,7 +2261,7 @@ RsDoPinGroupConfigDescriptor (
+@@ -2016,7 +2153,7 @@ RsDoPinGroupConfigDescriptor (
sizeof (AML_RESOURCE_LARGE_HEADER));
Descriptor = Rnode->Buffer;
@@ -1984,7 +1984,7 @@ index c075c89c9..7aa23a35b 100644
Descriptor->PinGroupConfig.DescriptorType = ACPI_RESOURCE_NAME_PIN_GROUP_CONFIG;
Descriptor->PinGroupConfig.RevisionId = AML_RESOURCE_PIN_GROUP_CONFIG_REVISION;
-@@ -2177,7 +2314,8 @@ RsDoPinGroupConfigDescriptor (
+@@ -2069,7 +2206,8 @@ RsDoPinGroupConfigDescriptor (
case 2: /* Pin Config Value [DWORD] (_VAL) */
@@ -1994,7 +1994,7 @@ index c075c89c9..7aa23a35b 100644
RsCreateDwordField (InitializerOp, ACPI_RESTAG_PINCONFIG_VALUE,
CurrentByteOffset + ASL_RESDESC_OFFSET (PinGroupConfig.PinConfigValue));
break;
-@@ -2238,5 +2376,15 @@ RsDoPinGroupConfigDescriptor (
+@@ -2130,5 +2268,15 @@ RsDoPinGroupConfigDescriptor (
InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
}
@@ -2010,11 +2010,11 @@ index c075c89c9..7aa23a35b 100644
+
return (Rnode);
}
-diff --git a/source/compiler/aslrestype2w.c b/source/compiler/aslrestype2w.c
-index b2113f4c9..6077f5f1a 100644
---- a/source/compiler/aslrestype2w.c
-+++ b/source/compiler/aslrestype2w.c
-@@ -192,6 +192,7 @@ RsDoWordIoDescriptor (
+Index: acpica-unix2-20200925/source/compiler/aslrestype2w.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/compiler/aslrestype2w.c
++++ acpica-unix2-20200925/source/compiler/aslrestype2w.c
+@@ -84,6 +84,7 @@ RsDoWordIoDescriptor (
UINT32 CurrentByteOffset;
UINT32 i;
BOOLEAN ResSourceIndex = FALSE;
@@ -2022,7 +2022,7 @@ index b2113f4c9..6077f5f1a 100644
InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -255,7 +256,8 @@ RsDoWordIoDescriptor (
+@@ -147,7 +148,8 @@ RsDoWordIoDescriptor (
case 5: /* Address Granularity */
@@ -2032,7 +2032,7 @@ index b2113f4c9..6077f5f1a 100644
RsCreateWordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Granularity));
GranOp = InitializerOp;
-@@ -263,7 +265,8 @@ RsDoWordIoDescriptor (
+@@ -155,7 +157,8 @@ RsDoWordIoDescriptor (
case 6: /* Address Min */
@@ -2042,7 +2042,7 @@ index b2113f4c9..6077f5f1a 100644
RsCreateWordField (InitializerOp, ACPI_RESTAG_MINADDR,
CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Minimum));
MinOp = InitializerOp;
-@@ -271,7 +274,8 @@ RsDoWordIoDescriptor (
+@@ -163,7 +166,8 @@ RsDoWordIoDescriptor (
case 7: /* Address Max */
@@ -2052,7 +2052,7 @@ index b2113f4c9..6077f5f1a 100644
RsCreateWordField (InitializerOp, ACPI_RESTAG_MAXADDR,
CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Maximum));
MaxOp = InitializerOp;
-@@ -279,14 +283,16 @@ RsDoWordIoDescriptor (
+@@ -171,14 +175,16 @@ RsDoWordIoDescriptor (
case 8: /* Translation Offset */
@@ -2071,7 +2071,7 @@ index b2113f4c9..6077f5f1a 100644
RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH,
CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.AddressLength));
LengthOp = InitializerOp;
-@@ -371,13 +377,17 @@ RsDoWordIoDescriptor (
+@@ -263,13 +269,17 @@ RsDoWordIoDescriptor (
/* Validate the Min/Max/Len/Gran values */
RsLargeAddressCheck (
@@ -2093,7 +2093,7 @@ index b2113f4c9..6077f5f1a 100644
Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) +
OptionIndex + StringLength;
return (Rnode);
-@@ -413,6 +423,7 @@ RsDoWordBusNumberDescriptor (
+@@ -305,6 +315,7 @@ RsDoWordBusNumberDescriptor (
UINT32 CurrentByteOffset;
UINT32 i;
BOOLEAN ResSourceIndex = FALSE;
@@ -2101,7 +2101,7 @@ index b2113f4c9..6077f5f1a 100644
InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -469,8 +480,8 @@ RsDoWordBusNumberDescriptor (
+@@ -361,8 +372,8 @@ RsDoWordBusNumberDescriptor (
case 4: /* Address Granularity */
@@ -2112,7 +2112,7 @@ index b2113f4c9..6077f5f1a 100644
RsCreateWordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Granularity));
GranOp = InitializerOp;
-@@ -478,8 +489,8 @@ RsDoWordBusNumberDescriptor (
+@@ -370,8 +381,8 @@ RsDoWordBusNumberDescriptor (
case 5: /* Min Address */
@@ -2123,7 +2123,7 @@ index b2113f4c9..6077f5f1a 100644
RsCreateWordField (InitializerOp, ACPI_RESTAG_MINADDR,
CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Minimum));
MinOp = InitializerOp;
-@@ -487,8 +498,8 @@ RsDoWordBusNumberDescriptor (
+@@ -379,8 +390,8 @@ RsDoWordBusNumberDescriptor (
case 6: /* Max Address */
@@ -2134,7 +2134,7 @@ index b2113f4c9..6077f5f1a 100644
RsCreateWordField (InitializerOp, ACPI_RESTAG_MAXADDR,
CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Maximum));
MaxOp = InitializerOp;
-@@ -496,16 +507,16 @@ RsDoWordBusNumberDescriptor (
+@@ -388,16 +399,16 @@ RsDoWordBusNumberDescriptor (
case 7: /* Translation Offset */
@@ -2155,7 +2155,7 @@ index b2113f4c9..6077f5f1a 100644
RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH,
CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.AddressLength));
LengthOp = InitializerOp;
-@@ -576,13 +587,17 @@ RsDoWordBusNumberDescriptor (
+@@ -468,13 +479,17 @@ RsDoWordBusNumberDescriptor (
/* Validate the Min/Max/Len/Gran values */
RsLargeAddressCheck (
@@ -2177,7 +2177,7 @@ index b2113f4c9..6077f5f1a 100644
Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) +
OptionIndex + StringLength;
return (Rnode);
-@@ -618,6 +633,7 @@ RsDoWordSpaceDescriptor (
+@@ -510,6 +525,7 @@ RsDoWordSpaceDescriptor (
UINT32 CurrentByteOffset;
UINT32 i;
BOOLEAN ResSourceIndex = FALSE;
@@ -2185,7 +2185,7 @@ index b2113f4c9..6077f5f1a 100644
InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -685,8 +701,8 @@ RsDoWordSpaceDescriptor (
+@@ -577,8 +593,8 @@ RsDoWordSpaceDescriptor (
case 6: /* Address Granularity */
@@ -2196,7 +2196,7 @@ index b2113f4c9..6077f5f1a 100644
RsCreateWordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Granularity));
GranOp = InitializerOp;
-@@ -694,8 +710,8 @@ RsDoWordSpaceDescriptor (
+@@ -586,8 +602,8 @@ RsDoWordSpaceDescriptor (
case 7: /* Min Address */
@@ -2207,7 +2207,7 @@ index b2113f4c9..6077f5f1a 100644
RsCreateWordField (InitializerOp, ACPI_RESTAG_MINADDR,
CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Minimum));
MinOp = InitializerOp;
-@@ -703,8 +719,8 @@ RsDoWordSpaceDescriptor (
+@@ -595,8 +611,8 @@ RsDoWordSpaceDescriptor (
case 8: /* Max Address */
@@ -2218,7 +2218,7 @@ index b2113f4c9..6077f5f1a 100644
RsCreateWordField (InitializerOp, ACPI_RESTAG_MAXADDR,
CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Maximum));
MaxOp = InitializerOp;
-@@ -712,16 +728,16 @@ RsDoWordSpaceDescriptor (
+@@ -604,16 +620,16 @@ RsDoWordSpaceDescriptor (
case 9: /* Translation Offset */
@@ -2239,7 +2239,7 @@ index b2113f4c9..6077f5f1a 100644
RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH,
CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.AddressLength));
LengthOp = InitializerOp;
-@@ -792,13 +808,17 @@ RsDoWordSpaceDescriptor (
+@@ -684,13 +700,17 @@ RsDoWordSpaceDescriptor (
/* Validate the Min/Max/Len/Gran values */
RsLargeAddressCheck (
@@ -2261,11 +2261,11 @@ index b2113f4c9..6077f5f1a 100644
Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) +
OptionIndex + StringLength;
return (Rnode);
-diff --git a/source/components/disassembler/dmbuffer.c b/source/components/disassembler/dmbuffer.c
-index 810f727fa..6960e9913 100644
---- a/source/components/disassembler/dmbuffer.c
-+++ b/source/components/disassembler/dmbuffer.c
-@@ -312,7 +312,7 @@ AcpiDmByteList (
+Index: acpica-unix2-20200925/source/components/disassembler/dmbuffer.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/components/disassembler/dmbuffer.c
++++ acpica-unix2-20200925/source/components/disassembler/dmbuffer.c
+@@ -204,7 +204,7 @@ AcpiDmByteList (
ByteData = Op->Named.Data;
@@ -2274,7 +2274,7 @@ index 810f727fa..6960e9913 100644
/*
* The byte list belongs to a buffer, and can be produced by either
-@@ -416,7 +416,7 @@ AcpiDmIsUuidBuffer (
+@@ -308,7 +308,7 @@ AcpiDmIsUuidBuffer (
/* Extract the byte list info */
ByteData = NextOp->Named.Data;
@@ -2283,7 +2283,7 @@ index 810f727fa..6960e9913 100644
/* Byte count must be exactly 16 */
-@@ -544,7 +544,7 @@ AcpiDmIsUnicodeBuffer (
+@@ -436,7 +436,7 @@ AcpiDmIsUnicodeBuffer (
/* Extract the byte list info */
ByteData = NextOp->Named.Data;
@@ -2292,7 +2292,7 @@ index 810f727fa..6960e9913 100644
WordCount = ACPI_DIV_2 (ByteCount);
/*
-@@ -986,14 +986,14 @@ AcpiDmUnicode (
+@@ -878,14 +878,14 @@ AcpiDmUnicode (
/* Extract the buffer info as a WORD buffer */
WordData = ACPI_CAST_PTR (UINT16, Op->Named.Data);
@@ -2309,11 +2309,11 @@ index 810f727fa..6960e9913 100644
/* Handle values that must be escaped */
-diff --git a/source/components/disassembler/dmopcode.c b/source/components/disassembler/dmopcode.c
-index 1372a0f25..bb7abab2c 100644
---- a/source/components/disassembler/dmopcode.c
-+++ b/source/components/disassembler/dmopcode.c
-@@ -990,23 +990,23 @@ AcpiDmDisassembleOneOp (
+Index: acpica-unix2-20200925/source/components/disassembler/dmopcode.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/components/disassembler/dmopcode.c
++++ acpica-unix2-20200925/source/components/disassembler/dmopcode.c
+@@ -882,23 +882,23 @@ AcpiDmDisassembleOneOp (
case AML_INT_NAMEDFIELD_OP:
@@ -2341,11 +2341,11 @@ index 1372a0f25..bb7abab2c 100644
Info->BitOffset += Offset;
if (Info->BitOffset % 8 == 0)
-diff --git a/source/components/disassembler/dmresrc.c b/source/components/disassembler/dmresrc.c
-index a3403322b..af75a7833 100644
---- a/source/components/disassembler/dmresrc.c
-+++ b/source/components/disassembler/dmresrc.c
-@@ -525,7 +525,7 @@ AcpiDmIsResourceTemplate (
+Index: acpica-unix2-20200925/source/components/disassembler/dmresrc.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/components/disassembler/dmresrc.c
++++ acpica-unix2-20200925/source/components/disassembler/dmresrc.c
+@@ -417,7 +417,7 @@ AcpiDmIsResourceTemplate (
return (AE_TYPE);
}
@@ -2354,11 +2354,11 @@ index a3403322b..af75a7833 100644
/* Get the length of the raw initialization byte list */
-diff --git a/source/components/disassembler/dmresrcl.c b/source/components/disassembler/dmresrcl.c
-index e9d391df3..eed859928 100644
---- a/source/components/disassembler/dmresrcl.c
-+++ b/source/components/disassembler/dmresrcl.c
-@@ -249,6 +249,8 @@ AcpiDmMemoryFields (
+Index: acpica-unix2-20200925/source/components/disassembler/dmresrcl.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/components/disassembler/dmresrcl.c
++++ acpica-unix2-20200925/source/components/disassembler/dmresrcl.c
+@@ -141,6 +141,8 @@ AcpiDmMemoryFields (
UINT32 Level)
{
UINT32 i;
@@ -2367,7 +2367,7 @@ index e9d391df3..eed859928 100644
for (i = 0; i < 4; i++)
-@@ -259,14 +261,16 @@ AcpiDmMemoryFields (
+@@ -151,14 +153,16 @@ AcpiDmMemoryFields (
{
case 16:
@@ -2388,7 +2388,7 @@ index e9d391df3..eed859928 100644
break;
default:
-@@ -298,6 +302,9 @@ AcpiDmAddressFields (
+@@ -190,6 +194,9 @@ AcpiDmAddressFields (
UINT32 Level)
{
UINT32 i;
@@ -2398,7 +2398,7 @@ index e9d391df3..eed859928 100644
AcpiOsPrintf ("\n");
-@@ -310,20 +317,23 @@ AcpiDmAddressFields (
+@@ -202,20 +209,23 @@ AcpiDmAddressFields (
{
case 16:
@@ -2428,7 +2428,7 @@ index e9d391df3..eed859928 100644
break;
default:
-@@ -857,7 +867,7 @@ AcpiDmExtendedDescriptor (
+@@ -749,7 +759,7 @@ AcpiDmExtendedDescriptor (
/* Extra field for this descriptor only */
AcpiDmIndent (Level + 1);
@@ -2437,7 +2437,7 @@ index e9d391df3..eed859928 100644
"Type-Specific Attributes");
/* Insert a descriptor name */
-@@ -984,11 +994,11 @@ AcpiDmFixedMemory32Descriptor (
+@@ -876,11 +886,11 @@ AcpiDmFixedMemory32Descriptor (
AcpiGbl_RwDecode [ACPI_GET_1BIT_FLAG (Resource->FixedMemory32.Flags)]);
AcpiDmIndent (Level + 1);
@@ -2451,7 +2451,7 @@ index e9d391df3..eed859928 100644
"Address Length");
/* Insert a descriptor name */
-@@ -1034,7 +1044,8 @@ AcpiDmGenericRegisterDescriptor (
+@@ -926,7 +936,8 @@ AcpiDmGenericRegisterDescriptor (
AcpiDmDumpInteger8 (Resource->GenericReg.BitOffset, "Bit Offset");
AcpiDmIndent (Level + 1);
@@ -2461,7 +2461,7 @@ index e9d391df3..eed859928 100644
/* Optional field for ACPI 3.0 */
-@@ -1097,7 +1108,7 @@ AcpiDmInterruptDescriptor (
+@@ -989,7 +1000,7 @@ AcpiDmInterruptDescriptor (
AcpiDmResourceSource (Resource,
sizeof (AML_RESOURCE_EXTENDED_IRQ) +
((UINT32) Resource->ExtendedIrq.InterruptCount - 1) * sizeof (UINT32),
@@ -2470,7 +2470,7 @@ index e9d391df3..eed859928 100644
/* Insert a descriptor name */
-@@ -1112,7 +1123,7 @@ AcpiDmInterruptDescriptor (
+@@ -1004,7 +1015,7 @@ AcpiDmInterruptDescriptor (
{
AcpiDmIndent (Level + 1);
AcpiOsPrintf ("0x%8.8X,\n",
@@ -2479,11 +2479,11 @@ index e9d391df3..eed859928 100644
}
AcpiDmIndent (Level);
-diff --git a/source/components/disassembler/dmresrcl2.c b/source/components/disassembler/dmresrcl2.c
-index a2a85dfdc..11c3af1af 100644
---- a/source/components/disassembler/dmresrcl2.c
-+++ b/source/components/disassembler/dmresrcl2.c
-@@ -299,22 +299,27 @@ AcpiDmGpioCommon (
+Index: acpica-unix2-20200925/source/components/disassembler/dmresrcl2.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/components/disassembler/dmresrcl2.c
++++ acpica-unix2-20200925/source/components/disassembler/dmresrcl2.c
+@@ -191,22 +191,27 @@ AcpiDmGpioCommon (
char *DeviceName = NULL;
UINT32 PinCount;
UINT32 i;
@@ -2515,7 +2515,7 @@ index a2a85dfdc..11c3af1af 100644
/* Insert a descriptor name */
-@@ -323,15 +328,15 @@ AcpiDmGpioCommon (
+@@ -215,15 +220,15 @@ AcpiDmGpioCommon (
/* Dump the vendor data */
@@ -2536,7 +2536,7 @@ index a2a85dfdc..11c3af1af 100644
}
AcpiOsPrintf (")\n");
-@@ -341,17 +346,17 @@ AcpiDmGpioCommon (
+@@ -233,17 +238,17 @@ AcpiDmGpioCommon (
AcpiDmIndent (Level + 1);
AcpiOsPrintf ("{ // Pin list\n");
@@ -2559,7 +2559,7 @@ index a2a85dfdc..11c3af1af 100644
((i + 1) < PinCount) ? "," : "");
}
-@@ -385,16 +390,18 @@ AcpiDmGpioIntDescriptor (
+@@ -277,16 +282,18 @@ AcpiDmGpioIntDescriptor (
UINT32 Length,
UINT32 Level)
{
@@ -2581,7 +2581,7 @@ index a2a85dfdc..11c3af1af 100644
/* PinConfig, DebounceTimeout */
-@@ -407,7 +414,8 @@ AcpiDmGpioIntDescriptor (
+@@ -299,7 +306,8 @@ AcpiDmGpioIntDescriptor (
{
AcpiOsPrintf ("0x%2.2X, ", Resource->Gpio.PinConfig);
}
@@ -2591,7 +2591,7 @@ index a2a85dfdc..11c3af1af 100644
/* Dump the GpioInt/GpioIo common portion of the descriptor */
-@@ -437,14 +445,16 @@ AcpiDmGpioIoDescriptor (
+@@ -329,14 +337,16 @@ AcpiDmGpioIoDescriptor (
UINT32 Length,
UINT32 Level)
{
@@ -2609,7 +2609,7 @@ index a2a85dfdc..11c3af1af 100644
if (Resource->Gpio.PinConfig <= 3)
{
-@@ -458,10 +468,10 @@ AcpiDmGpioIoDescriptor (
+@@ -350,10 +360,10 @@ AcpiDmGpioIoDescriptor (
/* DebounceTimeout, DriveStrength, IoRestriction */
@@ -2624,7 +2624,7 @@ index a2a85dfdc..11c3af1af 100644
/* Dump the GpioInt/GpioIo common portion of the descriptor */
-@@ -542,6 +552,9 @@ AcpiDmPinFunctionDescriptor (
+@@ -434,6 +444,9 @@ AcpiDmPinFunctionDescriptor (
char *DeviceName = NULL;
UINT32 PinCount;
UINT32 i;
@@ -2634,7 +2634,7 @@ index a2a85dfdc..11c3af1af 100644
AcpiDmIndent (Level);
AcpiOsPrintf ("PinFunction (%s, ",
-@@ -559,12 +572,14 @@ AcpiDmPinFunctionDescriptor (
+@@ -451,12 +464,14 @@ AcpiDmPinFunctionDescriptor (
/* FunctionNumber */
@@ -2652,7 +2652,7 @@ index a2a85dfdc..11c3af1af 100644
AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
}
-@@ -584,15 +599,15 @@ AcpiDmPinFunctionDescriptor (
+@@ -476,15 +491,15 @@ AcpiDmPinFunctionDescriptor (
/* Dump the vendor data */
@@ -2673,7 +2673,7 @@ index a2a85dfdc..11c3af1af 100644
}
AcpiOsPrintf (")\n");
-@@ -603,17 +618,17 @@ AcpiDmPinFunctionDescriptor (
+@@ -495,17 +510,17 @@ AcpiDmPinFunctionDescriptor (
AcpiOsPrintf ("{ // Pin list\n");
@@ -2696,7 +2696,7 @@ index a2a85dfdc..11c3af1af 100644
((i + 1) < PinCount) ? "," : "");
}
-@@ -649,7 +664,8 @@ AcpiDmDumpSerialBusVendorData (
+@@ -541,7 +556,8 @@ AcpiDmDumpSerialBusVendorData (
{
case AML_RESOURCE_I2C_SERIALBUSTYPE:
@@ -2706,7 +2706,7 @@ index a2a85dfdc..11c3af1af 100644
AML_RESOURCE_I2C_MIN_DATA_LEN;
VendorData = ACPI_ADD_PTR (UINT8, Resource,
-@@ -658,7 +674,8 @@ AcpiDmDumpSerialBusVendorData (
+@@ -550,7 +566,8 @@ AcpiDmDumpSerialBusVendorData (
case AML_RESOURCE_SPI_SERIALBUSTYPE:
@@ -2716,7 +2716,7 @@ index a2a85dfdc..11c3af1af 100644
AML_RESOURCE_SPI_MIN_DATA_LEN;
VendorData = ACPI_ADD_PTR (UINT8, Resource,
-@@ -667,7 +684,8 @@ AcpiDmDumpSerialBusVendorData (
+@@ -559,7 +576,8 @@ AcpiDmDumpSerialBusVendorData (
case AML_RESOURCE_UART_SERIALBUSTYPE:
@@ -2726,7 +2726,7 @@ index a2a85dfdc..11c3af1af 100644
AML_RESOURCE_UART_MIN_DATA_LEN;
VendorData = ACPI_ADD_PTR (UINT8, Resource,
-@@ -715,9 +733,9 @@ AcpiDmI2cSerialBusDescriptor (
+@@ -607,9 +625,9 @@ AcpiDmI2cSerialBusDescriptor (
AcpiDmIndent (Level);
AcpiOsPrintf ("I2cSerialBusV2 (0x%4.4X, %s, 0x%8.8X,\n",
@@ -2738,7 +2738,7 @@ index a2a85dfdc..11c3af1af 100644
AcpiDmIndent (Level + 1);
AcpiOsPrintf ("%s, ",
-@@ -726,7 +744,7 @@ AcpiDmI2cSerialBusDescriptor (
+@@ -618,7 +636,7 @@ AcpiDmI2cSerialBusDescriptor (
/* ResourceSource is a required field */
ResourceSourceOffset = sizeof (AML_RESOURCE_COMMON_SERIALBUS) +
@@ -2747,7 +2747,7 @@ index a2a85dfdc..11c3af1af 100644
DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset);
AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
-@@ -783,15 +801,17 @@ AcpiDmSpiSerialBusDescriptor (
+@@ -675,15 +693,17 @@ AcpiDmSpiSerialBusDescriptor (
{
UINT32 ResourceSourceOffset;
char *DeviceName;
@@ -2768,7 +2768,7 @@ index a2a85dfdc..11c3af1af 100644
Resource->SpiSerialBus.DataBitLength);
/* SlaveMode, ConnectionSpeed, ClockPolarity, ClockPhase */
-@@ -799,7 +819,7 @@ AcpiDmSpiSerialBusDescriptor (
+@@ -691,7 +711,7 @@ AcpiDmSpiSerialBusDescriptor (
AcpiDmIndent (Level + 1);
AcpiOsPrintf ("%s, 0x%8.8X, %s,\n",
AcpiGbl_SmDecode [ACPI_GET_1BIT_FLAG (Resource->SpiSerialBus.Flags)],
@@ -2777,7 +2777,7 @@ index a2a85dfdc..11c3af1af 100644
AcpiGbl_CpoDecode [ACPI_GET_1BIT_FLAG (Resource->SpiSerialBus.ClockPolarity)]);
AcpiDmIndent (Level + 1);
-@@ -809,7 +829,7 @@ AcpiDmSpiSerialBusDescriptor (
+@@ -701,7 +721,7 @@ AcpiDmSpiSerialBusDescriptor (
/* ResourceSource is a required field */
ResourceSourceOffset = sizeof (AML_RESOURCE_COMMON_SERIALBUS) +
@@ -2786,7 +2786,7 @@ index a2a85dfdc..11c3af1af 100644
DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset);
AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
-@@ -866,15 +886,17 @@ AcpiDmUartSerialBusDescriptor (
+@@ -758,15 +778,17 @@ AcpiDmUartSerialBusDescriptor (
{
UINT32 ResourceSourceOffset;
char *DeviceName;
@@ -2807,7 +2807,7 @@ index a2a85dfdc..11c3af1af 100644
/* LinesInUse, IsBigEndian, Parity, FlowControl */
-@@ -889,13 +911,13 @@ AcpiDmUartSerialBusDescriptor (
+@@ -781,13 +803,13 @@ AcpiDmUartSerialBusDescriptor (
AcpiDmIndent (Level + 1);
AcpiOsPrintf ("0x%4.4X, 0x%4.4X, ",
@@ -2824,11 +2824,11 @@ index a2a85dfdc..11c3af1af 100644
DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset);
AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
-diff --git a/source/components/disassembler/dmresrcs.c b/source/components/disassembler/dmresrcs.c
-index 5f5c7edaf..21d397637 100644
---- a/source/components/disassembler/dmresrcs.c
-+++ b/source/components/disassembler/dmresrcs.c
-@@ -201,7 +201,7 @@ AcpiDmIrqDescriptor (
+Index: acpica-unix2-20200925/source/components/disassembler/dmresrcs.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/components/disassembler/dmresrcs.c
++++ acpica-unix2-20200925/source/components/disassembler/dmresrcs.c
+@@ -93,7 +93,7 @@ AcpiDmIrqDescriptor (
AcpiOsPrintf (")\n");
AcpiDmIndent (Level + 1);
@@ -2837,7 +2837,7 @@ index 5f5c7edaf..21d397637 100644
}
-@@ -269,8 +269,8 @@ AcpiDmFixedDmaDescriptor (
+@@ -161,8 +161,8 @@ AcpiDmFixedDmaDescriptor (
AcpiDmIndent (Level);
AcpiOsPrintf ("FixedDMA (0x%4.4X, 0x%4.4X, ",
@@ -2848,7 +2848,7 @@ index 5f5c7edaf..21d397637 100644
if (Resource->FixedDma.Width <= 5)
{
-@@ -318,10 +318,12 @@ AcpiDmIoDescriptor (
+@@ -210,10 +210,12 @@ AcpiDmIoDescriptor (
AcpiGbl_IoDecode [ACPI_GET_1BIT_FLAG (Resource->Io.Flags)]);
AcpiDmIndent (Level + 1);
@@ -2863,7 +2863,7 @@ index 5f5c7edaf..21d397637 100644
AcpiDmIndent (Level + 1);
AcpiDmDumpInteger8 (Resource->Io.Alignment, "Alignment");
-@@ -364,10 +366,12 @@ AcpiDmFixedIoDescriptor (
+@@ -256,10 +258,12 @@ AcpiDmFixedIoDescriptor (
AcpiOsPrintf ("FixedIO (\n");
AcpiDmIndent (Level + 1);
@@ -2878,11 +2878,11 @@ index 5f5c7edaf..21d397637 100644
/* Insert a descriptor name */
-diff --git a/source/components/disassembler/dmwalk.c b/source/components/disassembler/dmwalk.c
-index 76ef0aacb..069c11fbb 100644
---- a/source/components/disassembler/dmwalk.c
-+++ b/source/components/disassembler/dmwalk.c
-@@ -1263,7 +1263,7 @@ AcpiDmAscendingOp (
+Index: acpica-unix2-20200925/source/components/disassembler/dmwalk.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/components/disassembler/dmwalk.c
++++ acpica-unix2-20200925/source/components/disassembler/dmwalk.c
+@@ -1155,7 +1155,7 @@ AcpiDmAscendingOp (
{
ParentOp->Common.DisasmFlags |= ACPI_PARSEOP_EMPTY_TERMLIST;
ASL_CV_CLOSE_PAREN (Op, Level);
@@ -2891,11 +2891,11 @@ index 76ef0aacb..069c11fbb 100644
}
}
-diff --git a/source/components/dispatcher/dsfield.c b/source/components/dispatcher/dsfield.c
-index f41990780..937c1e9f5 100644
---- a/source/components/dispatcher/dsfield.c
-+++ b/source/components/dispatcher/dsfield.c
-@@ -444,6 +444,8 @@ AcpiDsGetFieldNames (
+Index: acpica-unix2-20200925/source/components/dispatcher/dsfield.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/components/dispatcher/dsfield.c
++++ acpica-unix2-20200925/source/components/dispatcher/dsfield.c
+@@ -336,6 +336,8 @@ AcpiDsGetFieldNames (
char *NamePath;
#endif
@@ -2904,7 +2904,7 @@ index f41990780..937c1e9f5 100644
ACPI_FUNCTION_TRACE_PTR (DsGetFieldNames, Info);
-@@ -550,14 +552,17 @@ AcpiDsGetFieldNames (
+@@ -442,14 +444,17 @@ AcpiDsGetFieldNames (
/* Lookup the name, it should already exist */
@@ -2924,7 +2924,7 @@ index f41990780..937c1e9f5 100644
return_ACPI_STATUS (Status);
}
else
-@@ -811,8 +816,13 @@ AcpiDsInitFieldObjects (
+@@ -703,8 +708,13 @@ AcpiDsInitFieldObjects (
*/
if (Arg->Common.AmlOpcode == AML_INT_NAMEDFIELD_OP)
{
@@ -2939,11 +2939,11 @@ index f41990780..937c1e9f5 100644
Flags, WalkState, &Node);
if (ACPI_FAILURE (Status))
{
-diff --git a/source/components/namespace/nsaccess.c b/source/components/namespace/nsaccess.c
-index f9227ee4d..55e768698 100644
---- a/source/components/namespace/nsaccess.c
-+++ b/source/components/namespace/nsaccess.c
-@@ -753,7 +753,7 @@ AcpiNsLookup (
+Index: acpica-unix2-20200925/source/components/namespace/nsaccess.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/components/namespace/nsaccess.c
++++ acpica-unix2-20200925/source/components/namespace/nsaccess.c
+@@ -645,7 +645,7 @@ AcpiNsLookup (
/* Extract one ACPI name from the front of the pathname */
@@ -2952,11 +2952,11 @@ index f9227ee4d..55e768698 100644
/* Try to find the single (4 character) ACPI name */
-diff --git a/source/components/namespace/nsnames.c b/source/components/namespace/nsnames.c
-index a27a87f02..16202ce32 100644
---- a/source/components/namespace/nsnames.c
-+++ b/source/components/namespace/nsnames.c
-@@ -408,7 +408,7 @@ AcpiNsBuildNormalizedPath (
+Index: acpica-unix2-20200925/source/components/namespace/nsnames.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/components/namespace/nsnames.c
++++ acpica-unix2-20200925/source/components/namespace/nsnames.c
+@@ -300,7 +300,7 @@ AcpiNsBuildNormalizedPath (
ACPI_PATH_PUT8(FullPath, PathSize, AML_DUAL_NAME_PREFIX, Length);
}
@@ -2965,11 +2965,11 @@ index a27a87f02..16202ce32 100644
DoNoTrailing = NoTrailing;
for (i = 0; i < 4; i++)
{
-diff --git a/source/components/namespace/nsparse.c b/source/components/namespace/nsparse.c
-index f10db0e4d..a5cb221aa 100644
---- a/source/components/namespace/nsparse.c
-+++ b/source/components/namespace/nsparse.c
-@@ -311,6 +311,7 @@ AcpiNsOneCompleteParse (
+Index: acpica-unix2-20200925/source/components/namespace/nsparse.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/components/namespace/nsparse.c
++++ acpica-unix2-20200925/source/components/namespace/nsparse.c
+@@ -203,6 +203,7 @@ AcpiNsOneCompleteParse (
ACPI_WALK_STATE *WalkState;
ACPI_TABLE_HEADER *Table;
ACPI_OWNER_ID OwnerId;
@@ -2977,7 +2977,7 @@ index f10db0e4d..a5cb221aa 100644
ACPI_FUNCTION_TRACE (NsOneCompleteParse);
-@@ -324,13 +325,14 @@ AcpiNsOneCompleteParse (
+@@ -216,13 +217,14 @@ AcpiNsOneCompleteParse (
/* Table must consist of at least a complete header */
@@ -2994,11 +2994,11 @@ index f10db0e4d..a5cb221aa 100644
Status = AcpiTbGetOwnerId (TableIndex, &OwnerId);
if (ACPI_FAILURE (Status))
-diff --git a/source/components/namespace/nsutils.c b/source/components/namespace/nsutils.c
-index a74dd1299..6df0d087d 100644
---- a/source/components/namespace/nsutils.c
-+++ b/source/components/namespace/nsutils.c
-@@ -380,7 +380,6 @@ AcpiNsBuildInternalName (
+Index: acpica-unix2-20200925/source/components/namespace/nsutils.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/components/namespace/nsutils.c
++++ acpica-unix2-20200925/source/components/namespace/nsutils.c
+@@ -272,7 +272,6 @@ AcpiNsBuildInternalName (
const char *ExternalName = Info->NextExternalChar;
char *Result = NULL;
UINT32 i;
@@ -3006,7 +3006,7 @@ index a74dd1299..6df0d087d 100644
ACPI_FUNCTION_TRACE (NsBuildInternalName);
-@@ -444,7 +443,6 @@ AcpiNsBuildInternalName (
+@@ -336,7 +335,6 @@ AcpiNsBuildInternalName (
for (; NumSegments; NumSegments--)
{
@@ -3014,7 +3014,7 @@ index a74dd1299..6df0d087d 100644
for (i = 0; i < ACPI_NAMESEG_SIZE; i++)
{
if (ACPI_IS_PATH_SEPARATOR (*ExternalName) ||
-@@ -452,17 +450,16 @@ AcpiNsBuildInternalName (
+@@ -344,17 +342,16 @@ AcpiNsBuildInternalName (
{
/* Pad the segment with underscore(s) if segment is short */
@@ -3034,6 +3034,3 @@ index a74dd1299..6df0d087d 100644
/* Now we must have a path separator, or the pathname is bad */
---
-2.26.2
-
diff --git a/0041-Support-MTMR-in-a-big-endian-world.patch b/0041-Support-MTMR-in-a-big-endian-world.patch
index afb4976..c1245bd 100644
--- a/0041-Support-MTMR-in-a-big-endian-world.patch
+++ b/0041-Support-MTMR-in-a-big-endian-world.patch
@@ -8,11 +8,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/common/dmtbdump2.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
-diff --git a/source/common/dmtbdump2.c b/source/common/dmtbdump2.c
-index 285fd30d7..7450ca3f7 100644
---- a/source/common/dmtbdump2.c
-+++ b/source/common/dmtbdump2.c
-@@ -1156,11 +1156,12 @@ AcpiDmDumpMtmr (
+Index: acpica-unix2-20200925/source/common/dmtbdump2.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20200925/source/common/dmtbdump2.c
+@@ -1048,11 +1048,12 @@ AcpiDmDumpMtmr (
ACPI_STATUS Status;
UINT32 Offset = sizeof (ACPI_TABLE_MTMR);
ACPI_MTMR_ENTRY *Subtable;
@@ -26,7 +26,7 @@ index 285fd30d7..7450ca3f7 100644
if (ACPI_FAILURE (Status))
{
return;
-@@ -1169,12 +1170,12 @@ AcpiDmDumpMtmr (
+@@ -1061,12 +1062,12 @@ AcpiDmDumpMtmr (
/* Subtables */
Subtable = ACPI_ADD_PTR (ACPI_MTMR_ENTRY, Table, Offset);
@@ -41,6 +41,3 @@ index 285fd30d7..7450ca3f7 100644
sizeof (ACPI_MTMR_ENTRY), AcpiDmTableInfoMtmr0);
if (ACPI_FAILURE (Status))
{
---
-2.26.2
-
diff --git a/0042-Support-VRTC-in-a-big-endian-world.patch b/0042-Support-VRTC-in-a-big-endian-world.patch
index 6bd6d62..e66d27e 100644
--- a/0042-Support-VRTC-in-a-big-endian-world.patch
+++ b/0042-Support-VRTC-in-a-big-endian-world.patch
@@ -7,11 +7,11 @@ Subject: [PATCH 4/5] Support VRTC in a big-endian world
source/common/dmtbdump3.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
-diff --git a/source/common/dmtbdump3.c b/source/common/dmtbdump3.c
-index da9b81c92..db2f54ffb 100644
---- a/source/common/dmtbdump3.c
-+++ b/source/common/dmtbdump3.c
-@@ -629,11 +629,12 @@ AcpiDmDumpVrtc (
+Index: acpica-unix2-20200925/source/common/dmtbdump3.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/common/dmtbdump3.c
++++ acpica-unix2-20200925/source/common/dmtbdump3.c
+@@ -521,11 +521,12 @@ AcpiDmDumpVrtc (
ACPI_STATUS Status;
UINT32 Offset = sizeof (ACPI_TABLE_VRTC);
ACPI_VRTC_ENTRY *Subtable;
@@ -25,7 +25,7 @@ index da9b81c92..db2f54ffb 100644
if (ACPI_FAILURE (Status))
{
return;
-@@ -642,12 +643,12 @@ AcpiDmDumpVrtc (
+@@ -534,12 +535,12 @@ AcpiDmDumpVrtc (
/* Subtables */
Subtable = ACPI_ADD_PTR (ACPI_VRTC_ENTRY, Table, Offset);
@@ -40,6 +40,3 @@ index da9b81c92..db2f54ffb 100644
sizeof (ACPI_VRTC_ENTRY), AcpiDmTableInfoVrtc0);
if (ACPI_FAILURE (Status))
{
---
-2.26.2
-
diff --git a/0043-Support-S3PT-in-a-big-endian-world.patch b/0043-Support-S3PT-in-a-big-endian-world.patch
index 3e41bfe..b8c804e 100644
--- a/0043-Support-S3PT-in-a-big-endian-world.patch
+++ b/0043-Support-S3PT-in-a-big-endian-world.patch
@@ -8,11 +8,11 @@ Subject: [PATCH 5/5] Support S3PT in a big-endian world
source/compiler/dttable2.c | 4 +++-
2 files changed, 12 insertions(+), 7 deletions(-)
-diff --git a/source/common/dmtbdump2.c b/source/common/dmtbdump2.c
-index 7450ca3f7..ada564cd5 100644
---- a/source/common/dmtbdump2.c
-+++ b/source/common/dmtbdump2.c
-@@ -1917,6 +1917,8 @@ AcpiDmDumpS3pt (
+Index: acpica-unix2-20200925/source/common/dmtbdump2.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20200925/source/common/dmtbdump2.c
+@@ -1809,6 +1809,8 @@ AcpiDmDumpS3pt (
ACPI_FPDT_HEADER *Subtable;
ACPI_DMTABLE_INFO *InfoTable;
ACPI_TABLE_S3PT *S3ptTable = ACPI_CAST_PTR (ACPI_TABLE_S3PT, Tables);
@@ -21,7 +21,7 @@ index 7450ca3f7..ada564cd5 100644
/* Main table */
-@@ -1928,19 +1930,20 @@ AcpiDmDumpS3pt (
+@@ -1820,19 +1822,20 @@ AcpiDmDumpS3pt (
}
Subtable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, S3ptTable, Offset);
@@ -45,7 +45,7 @@ index 7450ca3f7..ada564cd5 100644
{
case ACPI_S3PT_TYPE_RESUME:
-@@ -1955,7 +1958,7 @@ AcpiDmDumpS3pt (
+@@ -1847,7 +1850,7 @@ AcpiDmDumpS3pt (
default:
AcpiOsPrintf ("\n**** Unknown S3PT subtable type 0x%X\n",
@@ -54,7 +54,7 @@ index 7450ca3f7..ada564cd5 100644
/* Attempt to continue */
-@@ -1968,7 +1971,7 @@ AcpiDmDumpS3pt (
+@@ -1860,7 +1863,7 @@ AcpiDmDumpS3pt (
}
AcpiOsPrintf ("\n");
@@ -63,7 +63,7 @@ index 7450ca3f7..ada564cd5 100644
Subtable->Length, InfoTable);
if (ACPI_FAILURE (Status))
{
-@@ -1982,7 +1985,7 @@ NextSubtable:
+@@ -1874,7 +1877,7 @@ NextSubtable:
Subtable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, Subtable, Subtable->Length);
}
@@ -72,11 +72,11 @@ index 7450ca3f7..ada564cd5 100644
}
-diff --git a/source/compiler/dttable2.c b/source/compiler/dttable2.c
-index 48729b48f..1ac063795 100644
---- a/source/compiler/dttable2.c
-+++ b/source/compiler/dttable2.c
-@@ -1296,6 +1296,7 @@ DtCompileS3pt (
+Index: acpica-unix2-20200925/source/compiler/dttable2.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/compiler/dttable2.c
++++ acpica-unix2-20200925/source/compiler/dttable2.c
+@@ -1188,6 +1188,7 @@ DtCompileS3pt (
DT_SUBTABLE *ParentTable;
ACPI_DMTABLE_INFO *InfoTable;
DT_FIELD *SubtableStart;
@@ -84,7 +84,7 @@ index 48729b48f..1ac063795 100644
Status = DtCompileTable (PFieldList, AcpiDmTableInfoS3pt,
-@@ -1323,7 +1324,8 @@ DtCompileS3pt (
+@@ -1215,7 +1216,8 @@ DtCompileS3pt (
S3ptHeader = ACPI_CAST_PTR (ACPI_FPDT_HEADER, Subtable->Buffer);
@@ -94,6 +94,3 @@ index 48729b48f..1ac063795 100644
{
case ACPI_S3PT_TYPE_RESUME:
---
-2.26.2
-