From b596c3965c774481526bd38481361fe65358f499 Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Fri, 25 Oct 2019 11:16:24 -0600
Subject: [PATCH 01/82] Update to 20190703 upstream

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 .gitignore         | 2 ++
 acpica-tools.spec  | 7 +++++--
 grammar.asl.result | 7 -------
 sources            | 4 ++--
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index fe9e476..50d1e35 100644
--- a/.gitignore
+++ b/.gitignore
@@ -115,3 +115,5 @@ series
 /acpitests-unix-20190405.tar.gz
 /acpica-unix2-20190509.tar.gz
 /acpitests-unix-20190509.tar.gz
+/acpica-unix2-20190703.tar.gz
+/acpitests-unix-20190703.tar.gz
diff --git a/acpica-tools.spec b/acpica-tools.spec
index 1d9bd23..da35ea5 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -1,6 +1,6 @@
 Name:           acpica-tools
-Version:        20190509
-Release:        5%{?dist}
+Version:        20190703
+Release:        1%{?dist}
 Summary:        ACPICA tools for the development and debug of ACPI tables
 
 License:        GPLv2
@@ -239,6 +239,9 @@ fi
 
 
 %changelog
+* Thu Oct 24 2019 Al Stone <ahs3@redhat.com>
+- Update to 20190703 source tree, including patch refeshes.
+
 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 20190509-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
diff --git a/grammar.asl.result b/grammar.asl.result
index 6601604..90341c0 100644
--- a/grammar.asl.result
+++ b/grammar.asl.result
@@ -1,10 +1,3 @@
-ACPI Warning: NsLookup: Type mismatch on GIDX (RegionField), searching for (Region) (20190509/nsaccess-728)
-ACPI Warning: NsLookup: Type mismatch on IDX2 (RegionField), searching for (Region) (20190509/nsaccess-728)
-ACPI Warning: NsLookup: Type mismatch on INDX (RegionField), searching for (Region) (20190509/nsaccess-728)
-ACPI Warning: NsLookup: Type mismatch on AIDX (RegionField), searching for (Region) (20190509/nsaccess-728)
-ACPI Warning: NsLookup: Type mismatch on C05D (RegionField), searching for (Region) (20190509/nsaccess-728)
-ACPI Warning: NsLookup: Type mismatch on INDX (RegionField), searching for (Region) (20190509/nsaccess-728)
-ACPI Warning: NsLookup: Type mismatch on IND2 (RegionField), searching for (Region) (20190509/nsaccess-728)
 grammar.asl    120:     Device (A1)
 Warning  3141 -                 ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
 
diff --git a/sources b/sources
index e6a8e7a..be7b154 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (acpica-unix2-20190509.tar.gz) = 0c3433dc5afd4bb43272c22468515af4914e6c90fcc649dbd62915f911a2e5e553a40f334882c1411d3f0157e06e3879bf4a79b898cdb9cdb4f34430458a2f18
-SHA512 (acpitests-unix-20190509.tar.gz) = 278d1c65c9a9ea77fb99bcc58347cf2a160d2dfeb0c27560688fcb2c3d7bd3613b2470c9ab4939e2c59bee8929fd639fa2c8d78660ad96658c010b6c73bd3fcf
+SHA512 (acpica-unix2-20190703.tar.gz) = 8445a6d354ce3bcbfb5159f4ec0312b1e910c0b1b2033a2300f892e4ac580abab4e3f5b4ded379f0036299359d307330511ab7053678cfd9031d7df4c365f555
+SHA512 (acpitests-unix-20190703.tar.gz) = d9bab56198dc00fc11b50a199035eb9dc164c226441cd00e163ecd6362d399a50058afa7582f86e62a085b990772995fc10e077581a3b04a6c6b2e95e055f167

From 5fcb15b704261c28c6139c1e3d9be2a2e80255f5 Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Sun, 27 Oct 2019 16:01:59 -0600
Subject: [PATCH 02/82] Update to 20190816 upstream source and refresh patches

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 .gitignore          |   2 +
 OPT_LDFLAGS.patch   |   8 +-
 acpica-tools.spec   |   7 +-
 big-endian-v2.patch |   9 +-
 big-endian.patch    | 290 ++++++++++++++++++++++----------------------
 f23-harden.patch    |  26 ++--
 grammar.asl.result  |   5 +-
 int-format.patch    |  96 +++++++--------
 sources             |   4 +-
 template.patch      |  14 +--
 unaligned.patch     |  14 +--
 11 files changed, 247 insertions(+), 228 deletions(-)

diff --git a/.gitignore b/.gitignore
index 50d1e35..ab14efb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -117,3 +117,5 @@ series
 /acpitests-unix-20190509.tar.gz
 /acpica-unix2-20190703.tar.gz
 /acpitests-unix-20190703.tar.gz
+/acpica-unix2-20190816.tar.gz
+/acpitests-unix-20190816.tar.gz
diff --git a/OPT_LDFLAGS.patch b/OPT_LDFLAGS.patch
index a1ca276..975a97e 100644
--- a/OPT_LDFLAGS.patch
+++ b/OPT_LDFLAGS.patch
@@ -1,7 +1,7 @@
-Index: acpica-unix2-20170728/generate/unix/Makefile.config
+Index: acpica-unix-20190816/generate/unix/Makefile.config
 ===================================================================
---- acpica-unix2-20170728.orig/generate/unix/Makefile.config
-+++ acpica-unix2-20170728/generate/unix/Makefile.config
+--- acpica-unix-20190816.orig/generate/unix/Makefile.config
++++ acpica-unix-20190816/generate/unix/Makefile.config
 @@ -23,6 +23,9 @@
  # OPT_CFLAGS can be overridden on the make command line by
  #   adding OPT_CFLAGS="..." to the invocation.
@@ -12,7 +12,7 @@ Index: acpica-unix2-20170728/generate/unix/Makefile.config
  # Notes:
  #   gcc should be version 4 or greater, otherwise some of the options
  #     used will not be recognized.
-@@ -157,6 +160,11 @@ LDFLAGS +=-m32
+@@ -165,6 +168,11 @@ LDFLAGS +=-m32
  endif
  
  #
diff --git a/acpica-tools.spec b/acpica-tools.spec
index da35ea5..d1a8446 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -1,5 +1,5 @@
 Name:           acpica-tools
-Version:        20190703
+Version:        20190816
 Release:        1%{?dist}
 Summary:        ACPICA tools for the development and debug of ACPI tables
 
@@ -239,7 +239,10 @@ fi
 
 
 %changelog
-* Thu Oct 24 2019 Al Stone <ahs3@redhat.com>
+* Sun Oct 27 2019 Al Stone <ahs3@redhat.com> - 20190816-1
+- Update to 20190816 source tree, including patch refeshes.
+
+* Thu Oct 24 2019 Al Stone <ahs3@redhat.com> - 20190703-1
 - Update to 20190703 source tree, including patch refeshes.
 
 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 20190509-5
diff --git a/big-endian-v2.patch b/big-endian-v2.patch
index 0c8831a..600a43d 100644
--- a/big-endian-v2.patch
+++ b/big-endian-v2.patch
@@ -3,10 +3,11 @@ in the original big-endian patch; we try to capture those here.
 
 Signed-off-by: Al Stone <ahs3@redhat.com>
 
-diff -Naur acpica-unix2-20170929.orig/source/compiler/asllookup.c acpica-unix2-20170929/source/compiler/asllookup.c
---- acpica-unix2-20170929.orig/source/compiler/asllookup.c	2017-10-09 12:26:25.893508481 -0600
-+++ acpica-unix2-20170929/source/compiler/asllookup.c	2017-10-17 11:45:42.230763844 -0600
-@@ -249,7 +249,8 @@
+Index: acpica-unix-20180508/source/compiler/asllookup.c
+===================================================================
+--- acpica-unix-20180508.orig/source/compiler/asllookup.c
++++ acpica-unix-20180508/source/compiler/asllookup.c
+@@ -249,7 +249,8 @@ LkIsObjectUsed (
       * ACPI names and are typically not referenced since they are meant
       * to be called by the host OS.
       */
diff --git a/big-endian.patch b/big-endian.patch
index c2699f9..5735a94 100644
--- a/big-endian.patch
+++ b/big-endian.patch
@@ -23,10 +23,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/include/platform/aclinux.h |    8 ++
  12 files changed, 487 insertions(+), 283 deletions(-)
 
-Index: acpica-unix-20190405/source/compiler/aslcodegen.c
+Index: acpica-unix-20190816/source/compiler/aslcodegen.c
 ===================================================================
---- acpica-unix-20190405.orig/source/compiler/aslcodegen.c
-+++ acpica-unix-20190405/source/compiler/aslcodegen.c
+--- acpica-unix-20190816.orig/source/compiler/aslcodegen.c
++++ acpica-unix-20190816/source/compiler/aslcodegen.c
 @@ -237,16 +237,12 @@ CgWriteAmlOpcode (
      ACPI_PARSE_OBJECT       *Op)
  {
@@ -228,7 +228,7 @@ Index: acpica-unix-20190405/source/compiler/aslcodegen.c
  
      /* Calculate the comment lengths for this definition block parseOp */
  
-@@ -624,7 +631,10 @@ CgWriteNode (
+@@ -625,7 +632,10 @@ CgWriteNode (
      ACPI_PARSE_OBJECT       *Op)
  {
      ASL_RESOURCE_NODE       *Rnode;
@@ -240,7 +240,7 @@ Index: acpica-unix-20190405/source/compiler/aslcodegen.c
  
      /* Write all comments here. */
  
-@@ -648,13 +658,24 @@ CgWriteNode (
+@@ -649,13 +659,24 @@ CgWriteNode (
      switch (Op->Asl.AmlOpcode)
      {
      case AML_RAW_DATA_BYTE:
@@ -268,10 +268,10 @@ Index: acpica-unix-20190405/source/compiler/aslcodegen.c
  
      case AML_RAW_DATA_BUFFER:
  
-Index: acpica-unix-20190405/source/compiler/aslopcodes.c
+Index: acpica-unix-20190816/source/compiler/aslopcodes.c
 ===================================================================
---- acpica-unix-20190405.orig/source/compiler/aslopcodes.c
-+++ acpica-unix-20190405/source/compiler/aslopcodes.c
+--- acpica-unix-20190816.orig/source/compiler/aslopcodes.c
++++ acpica-unix-20190816/source/compiler/aslopcodes.c
 @@ -485,6 +485,7 @@ OpcDoUnicode (
      UINT32                  i;
      UINT8                   *AsciiString;
@@ -290,10 +290,10 @@ Index: acpica-unix-20190405/source/compiler/aslopcodes.c
      }
  
      /*
-Index: acpica-unix-20190405/source/compiler/aslrestype1.c
+Index: acpica-unix-20190816/source/compiler/aslrestype1.c
 ===================================================================
---- acpica-unix-20190405.orig/source/compiler/aslrestype1.c
-+++ acpica-unix-20190405/source/compiler/aslrestype1.c
+--- acpica-unix-20190816.orig/source/compiler/aslrestype1.c
++++ acpica-unix-20190816/source/compiler/aslrestype1.c
 @@ -142,6 +142,11 @@ RsDoMemory24Descriptor (
      ACPI_PARSE_OBJECT       *LengthOp = NULL;
      ASL_RESOURCE_NODE       *Rnode;
@@ -490,10 +490,10 @@ Index: acpica-unix-20190405/source/compiler/aslrestype1.c
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (FixedMemory32.AddressLength));
              break;
-Index: acpica-unix-20190405/source/compiler/aslrestype1i.c
+Index: acpica-unix-20190816/source/compiler/aslrestype1i.c
 ===================================================================
---- acpica-unix-20190405.orig/source/compiler/aslrestype1i.c
-+++ acpica-unix-20190405/source/compiler/aslrestype1i.c
+--- acpica-unix-20190816.orig/source/compiler/aslrestype1i.c
++++ acpica-unix-20190816/source/compiler/aslrestype1i.c
 @@ -198,6 +198,8 @@ RsDoFixedDmaDescriptor (
      ACPI_PARSE_OBJECT       *InitializerOp;
      ASL_RESOURCE_NODE       *Rnode;
@@ -630,10 +630,10 @@ Index: acpica-unix-20190405/source/compiler/aslrestype1i.c
 +    ACPI_MOVE_16_TO_16(&Descriptor->Irq.IrqMask, &IrqMask);
      return (Rnode);
  }
-Index: acpica-unix-20190405/source/compiler/aslrestype2.c
+Index: acpica-unix-20190816/source/compiler/aslrestype2.c
 ===================================================================
---- acpica-unix-20190405.orig/source/compiler/aslrestype2.c
-+++ acpica-unix-20190405/source/compiler/aslrestype2.c
+--- acpica-unix-20190816.orig/source/compiler/aslrestype2.c
++++ acpica-unix-20190816/source/compiler/aslrestype2.c
 @@ -76,6 +76,7 @@ RsDoGeneralRegisterDescriptor (
      ACPI_PARSE_OBJECT       *InitializerOp;
      ASL_RESOURCE_NODE       *Rnode;
@@ -774,10 +774,10 @@ Index: acpica-unix-20190405/source/compiler/aslrestype2.c
  
      /* Point to end-of-descriptor for vendor data */
  
-Index: acpica-unix-20190405/source/compiler/aslrestype2d.c
+Index: acpica-unix-20190816/source/compiler/aslrestype2d.c
 ===================================================================
---- acpica-unix-20190405.orig/source/compiler/aslrestype2d.c
-+++ acpica-unix-20190405/source/compiler/aslrestype2d.c
+--- acpica-unix-20190816.orig/source/compiler/aslrestype2d.c
++++ acpica-unix-20190816/source/compiler/aslrestype2d.c
 @@ -79,7 +79,13 @@ RsDoDwordIoDescriptor (
      ACPI_PARSE_OBJECT       *GranOp = NULL;
      ASL_RESOURCE_NODE       *Rnode;
@@ -1133,10 +1133,10 @@ Index: acpica-unix-20190405/source/compiler/aslrestype2d.c
      Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS32) +
          OptionIndex + StringLength;
      return (Rnode);
-Index: acpica-unix-20190405/source/compiler/aslrestype2e.c
+Index: acpica-unix-20190816/source/compiler/aslrestype2e.c
 ===================================================================
---- acpica-unix-20190405.orig/source/compiler/aslrestype2e.c
-+++ acpica-unix-20190405/source/compiler/aslrestype2e.c
+--- acpica-unix-20190816.orig/source/compiler/aslrestype2e.c
++++ acpica-unix-20190816/source/compiler/aslrestype2e.c
 @@ -78,6 +78,13 @@ RsDoExtendedIoDescriptor (
      ACPI_PARSE_OBJECT       *GranOp = NULL;
      ASL_RESOURCE_NODE       *Rnode;
@@ -1242,10 +1242,10 @@ Index: acpica-unix-20190405/source/compiler/aslrestype2e.c
      Rnode->BufferLength = sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) +
          StringLength;
      return (Rnode);
-Index: acpica-unix-20190405/source/compiler/aslrestype2q.c
+Index: acpica-unix-20190816/source/compiler/aslrestype2q.c
 ===================================================================
---- acpica-unix-20190405.orig/source/compiler/aslrestype2q.c
-+++ acpica-unix-20190405/source/compiler/aslrestype2q.c
+--- acpica-unix-20190816.orig/source/compiler/aslrestype2q.c
++++ acpica-unix-20190816/source/compiler/aslrestype2q.c
 @@ -80,7 +80,13 @@ RsDoQwordIoDescriptor (
      ASL_RESOURCE_NODE       *Rnode;
      UINT8                   *OptionalFields;
@@ -1584,10 +1584,10 @@ Index: acpica-unix-20190405/source/compiler/aslrestype2q.c
      Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS64) +
          OptionIndex + StringLength;
      return (Rnode);
-Index: acpica-unix-20190405/source/compiler/aslrestype2s.c
+Index: acpica-unix-20190816/source/compiler/aslrestype2s.c
 ===================================================================
---- acpica-unix-20190405.orig/source/compiler/aslrestype2s.c
-+++ acpica-unix-20190405/source/compiler/aslrestype2s.c
+--- acpica-unix-20190816.orig/source/compiler/aslrestype2s.c
++++ acpica-unix-20190816/source/compiler/aslrestype2s.c
 @@ -340,9 +340,14 @@ RsDoGpioIntDescriptor (
      UINT16                  VendorLength;
      UINT16                  InterruptLength;
@@ -2053,10 +2053,10 @@ Index: acpica-unix-20190405/source/compiler/aslrestype2s.c
      MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource);
      return (Rnode);
  }
-Index: acpica-unix-20190405/source/compiler/aslrestype2w.c
+Index: acpica-unix-20190816/source/compiler/aslrestype2w.c
 ===================================================================
---- acpica-unix-20190405.orig/source/compiler/aslrestype2w.c
-+++ acpica-unix-20190405/source/compiler/aslrestype2w.c
+--- acpica-unix-20190816.orig/source/compiler/aslrestype2w.c
++++ acpica-unix-20190816/source/compiler/aslrestype2w.c
 @@ -81,6 +81,12 @@ RsDoWordIoDescriptor (
      UINT8                   *OptionalFields;
      UINT16                  StringLength = 0;
@@ -2400,10 +2400,10 @@ Index: acpica-unix-20190405/source/compiler/aslrestype2w.c
      Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) +
          OptionIndex + StringLength;
      return (Rnode);
-Index: acpica-unix-20190405/source/include/acmacros.h
+Index: acpica-unix-20190816/source/include/acmacros.h
 ===================================================================
---- acpica-unix-20190405.orig/source/include/acmacros.h
-+++ acpica-unix-20190405/source/include/acmacros.h
+--- acpica-unix-20190816.orig/source/include/acmacros.h
++++ acpica-unix-20190816/source/include/acmacros.h
 @@ -98,9 +98,12 @@
                                             ((UINT8 *)(void *)(d))[6] = ((UINT8 *)(void *)(s))[1];\
                                             ((UINT8 *)(void *)(d))[7] = ((UINT8 *)(void *)(s))[0];}
@@ -2482,10 +2482,10 @@ Index: acpica-unix-20190405/source/include/acmacros.h
  
  #define ACPI_MOVE_32_TO_16(d, s)        ACPI_MOVE_16_TO_16(d, s)    /* Truncate to 16 */
  
-Index: acpica-unix-20190405/source/include/platform/aclinux.h
+Index: acpica-unix-20190816/source/include/platform/aclinux.h
 ===================================================================
---- acpica-unix-20190405.orig/source/include/platform/aclinux.h
-+++ acpica-unix-20190405/source/include/platform/aclinux.h
+--- acpica-unix-20190816.orig/source/include/platform/aclinux.h
++++ acpica-unix-20190816/source/include/platform/aclinux.h
 @@ -198,6 +198,7 @@
  
  #ifdef ACPI_USE_STANDARD_HEADERS
@@ -2505,10 +2505,10 @@ Index: acpica-unix-20190405/source/include/platform/aclinux.h
  #endif /* __KERNEL__ */
  
  #endif /* __ACLINUX_H__ */
-Index: acpica-unix-20190405/source/compiler/aslanalyze.c
+Index: acpica-unix-20190816/source/compiler/aslanalyze.c
 ===================================================================
---- acpica-unix-20190405.orig/source/compiler/aslanalyze.c
-+++ acpica-unix-20190405/source/compiler/aslanalyze.c
+--- acpica-unix-20190816.orig/source/compiler/aslanalyze.c
++++ acpica-unix-20190816/source/compiler/aslanalyze.c
 @@ -461,7 +461,7 @@ ApCheckForGpeNameConflict (
  
      /* Need a null-terminated string version of NameSeg */
@@ -2527,10 +2527,10 @@ Index: acpica-unix-20190405/source/compiler/aslanalyze.c
  
      /* Inject opposite letter ("L" versus "E") */
  
-Index: acpica-unix-20190405/source/compiler/asllookup.c
+Index: acpica-unix-20190816/source/compiler/asllookup.c
 ===================================================================
---- acpica-unix-20190405.orig/source/compiler/asllookup.c
-+++ acpica-unix-20190405/source/compiler/asllookup.c
+--- acpica-unix-20190816.orig/source/compiler/asllookup.c
++++ acpica-unix-20190816/source/compiler/asllookup.c
 @@ -119,6 +119,7 @@ LkIsObjectUsed (
  {
      ACPI_NAMESPACE_NODE     *Node = ACPI_CAST_PTR (ACPI_NAMESPACE_NODE, ObjHandle);
@@ -2561,10 +2561,10 @@ Index: acpica-unix-20190405/source/compiler/asllookup.c
              AslError (ASL_REMARK, ASL_MSG_NOT_REFERENCED,
                  LkGetNameOp (Node->Op), AslGbl_MsgBuffer);
              return (AE_OK);
-Index: acpica-unix-20190405/source/compiler/aslmain.c
+Index: acpica-unix-20190816/source/compiler/aslmain.c
 ===================================================================
---- acpica-unix-20190405.orig/source/compiler/aslmain.c
-+++ acpica-unix-20190405/source/compiler/aslmain.c
+--- acpica-unix-20190816.orig/source/compiler/aslmain.c
++++ acpica-unix-20190816/source/compiler/aslmain.c
 @@ -101,18 +101,6 @@ main (
  
      signal (SIGINT, AslSignalHandler);
@@ -2584,10 +2584,10 @@ Index: acpica-unix-20190405/source/compiler/aslmain.c
      AcpiOsInitialize ();
      ACPI_DEBUG_INITIALIZE (); /* For debug version only */
  
-Index: acpica-unix-20190405/source/common/acfileio.c
+Index: acpica-unix-20190816/source/common/acfileio.c
 ===================================================================
---- acpica-unix-20190405.orig/source/common/acfileio.c
-+++ acpica-unix-20190405/source/common/acfileio.c
+--- acpica-unix-20190816.orig/source/common/acfileio.c
++++ acpica-unix-20190816/source/common/acfileio.c
 @@ -280,6 +280,7 @@ AcGetOneTableFromFile (
      ACPI_TABLE_HEADER       *Table;
      INT32                   Count;
@@ -2654,10 +2654,10 @@ Index: acpica-unix-20190405/source/common/acfileio.c
              (UINT32) (FileSize - TableOffset));
          return (AE_BAD_HEADER);
      }
-Index: acpica-unix-20190405/source/common/dmtable.c
+Index: acpica-unix-20190816/source/common/dmtable.c
 ===================================================================
---- acpica-unix-20190405.orig/source/common/dmtable.c
-+++ acpica-unix-20190405/source/common/dmtable.c
+--- acpica-unix-20190816.orig/source/common/dmtable.c
++++ acpica-unix-20190816/source/common/dmtable.c
 @@ -551,7 +551,7 @@ AcpiDmDumpDataTable (
       */
      if (ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_FACS))
@@ -2756,10 +2756,10 @@ Index: acpica-unix-20190405/source/common/dmtable.c
                  AcpiDmNfitSubnames[Temp16]);
              break;
  
-Index: acpica-unix-20190405/source/common/dmtables.c
+Index: acpica-unix-20190816/source/common/dmtables.c
 ===================================================================
---- acpica-unix-20190405.orig/source/common/dmtables.c
-+++ acpica-unix-20190405/source/common/dmtables.c
+--- acpica-unix-20190816.orig/source/common/dmtables.c
++++ acpica-unix-20190816/source/common/dmtables.c
 @@ -142,7 +142,9 @@ AdCreateTableHeader (
      ACPI_TABLE_HEADER       *Table)
  {
@@ -2825,10 +2825,10 @@ Index: acpica-unix-20190405/source/common/dmtables.c
      AmlStart = ((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER));
      ASL_CV_INIT_FILETREE(Table, AmlStart, AmlLength);
  
-Index: acpica-unix-20190405/source/common/dmtbdump.c
+Index: acpica-unix-20190816/source/common/dmtbdump.c
 ===================================================================
---- acpica-unix-20190405.orig/source/common/dmtbdump.c
-+++ acpica-unix-20190405/source/common/dmtbdump.c
+--- acpica-unix-20190816.orig/source/common/dmtbdump.c
++++ acpica-unix-20190816/source/common/dmtbdump.c
 @@ -277,6 +277,8 @@ AcpiDmDumpRsdt (
      UINT32                  Entries;
      UINT32                  Offset;
@@ -2987,10 +2987,10 @@ Index: acpica-unix-20190405/source/common/dmtbdump.c
 -        Revision, Length, ExpectedLength);
 +        Revision, Tmp32, ExpectedLength);
  }
-Index: acpica-unix-20190405/source/common/dmtbdump1.c
+Index: acpica-unix-20190816/source/common/dmtbdump1.c
 ===================================================================
---- acpica-unix-20190405.orig/source/common/dmtbdump1.c
-+++ acpica-unix-20190405/source/common/dmtbdump1.c
+--- acpica-unix-20190816.orig/source/common/dmtbdump1.c
++++ acpica-unix-20190816/source/common/dmtbdump1.c
 @@ -79,17 +79,21 @@ AcpiDmDumpAsf (
      UINT32                  DataOffset = 0;
      UINT32                  i;
@@ -3624,10 +3624,10 @@ Index: acpica-unix-20190405/source/common/dmtbdump1.c
          {
          case ACPI_HEST_TYPE_IA32_CHECK:
  
-Index: acpica-unix-20190405/source/common/dmtbdump2.c
+Index: acpica-unix-20190816/source/common/dmtbdump2.c
 ===================================================================
---- acpica-unix-20190405.orig/source/common/dmtbdump2.c
-+++ acpica-unix-20190405/source/common/dmtbdump2.c
+--- acpica-unix-20190816.orig/source/common/dmtbdump2.c
++++ acpica-unix-20190816/source/common/dmtbdump2.c
 @@ -75,15 +75,21 @@ AcpiDmDumpIort (
      ACPI_IORT_SMMU          *IortSmmu = NULL;
      UINT32                  Offset;
@@ -3969,8 +3969,8 @@ Index: acpica-unix-20190405/source/common/dmtbdump2.c
 +        if (Offset + sizeof (ACPI_MCFG_ALLOCATION) > Len)
          {
              AcpiOsPrintf ("Warning: there are %u invalid trailing bytes\n",
--                sizeof (ACPI_MCFG_ALLOCATION) - (Offset - Table->Length));
-+                sizeof (ACPI_MCFG_ALLOCATION) - (Offset - Len));
+-                (UINT32) sizeof (ACPI_MCFG_ALLOCATION) - (Offset - Table->Length));
++                (UINT32) sizeof (ACPI_MCFG_ALLOCATION) - (Offset - Len));
              return;
          }
  
@@ -4510,10 +4510,10 @@ Index: acpica-unix-20190405/source/common/dmtbdump2.c
              Subtable->Length, InfoTable);
          if (ACPI_FAILURE (Status))
          {
-Index: acpica-unix-20190405/source/common/dmtbdump3.c
+Index: acpica-unix-20190816/source/common/dmtbdump3.c
 ===================================================================
---- acpica-unix-20190405.orig/source/common/dmtbdump3.c
-+++ acpica-unix-20190405/source/common/dmtbdump3.c
+--- acpica-unix-20190816.orig/source/common/dmtbdump3.c
++++ acpica-unix-20190816/source/common/dmtbdump3.c
 @@ -68,9 +68,11 @@ void
  AcpiDmDumpSlic (
      ACPI_TABLE_HEADER       *Table)
@@ -4760,11 +4760,11 @@ Index: acpica-unix-20190405/source/common/dmtbdump3.c
 +    (void) AcpiDmDumpTable (Length, 0, Table, ArgumentsLength,
          AcpiDmTableInfoWpbt0);
  }
-Index: acpica-unix-20190405/source/compiler/dtfield.c
+Index: acpica-unix-20190816/source/compiler/dtfield.c
 ===================================================================
---- acpica-unix-20190405.orig/source/compiler/dtfield.c
-+++ acpica-unix-20190405/source/compiler/dtfield.c
-@@ -359,7 +359,27 @@ DtCompileInteger (
+--- acpica-unix-20190816.orig/source/compiler/dtfield.c
++++ acpica-unix-20190816/source/compiler/dtfield.c
+@@ -361,7 +361,27 @@ DtCompileInteger (
          DtError (ASL_ERROR, ASL_MSG_INTEGER_SIZE, Field, AslGbl_MsgBuffer);
      }
  
@@ -4793,10 +4793,10 @@ Index: acpica-unix-20190405/source/compiler/dtfield.c
      return;
  }
  
-Index: acpica-unix-20190405/source/compiler/dtsubtable.c
+Index: acpica-unix-20190816/source/compiler/dtsubtable.c
 ===================================================================
---- acpica-unix-20190405.orig/source/compiler/dtsubtable.c
-+++ acpica-unix-20190405/source/compiler/dtsubtable.c
+--- acpica-unix-20190816.orig/source/compiler/dtsubtable.c
++++ acpica-unix-20190816/source/compiler/dtsubtable.c
 @@ -378,6 +378,21 @@ DtSetSubtableLength (
          return;
      }
@@ -4821,10 +4821,10 @@ Index: acpica-unix-20190405/source/compiler/dtsubtable.c
 +        	Subtable->SizeOfLengthField);
 +    }
  }
-Index: acpica-unix-20190405/source/compiler/dttable1.c
+Index: acpica-unix-20190816/source/compiler/dttable1.c
 ===================================================================
---- acpica-unix-20190405.orig/source/compiler/dttable1.c
-+++ acpica-unix-20190405/source/compiler/dttable1.c
+--- acpica-unix-20190816.orig/source/compiler/dttable1.c
++++ acpica-unix-20190816/source/compiler/dttable1.c
 @@ -281,6 +281,8 @@ DtCompileCsrt (
      DT_FIELD                **PFieldList = (DT_FIELD **) List;
      UINT32                  DescriptorCount;
@@ -5196,10 +5196,10 @@ Index: acpica-unix-20190405/source/compiler/dttable1.c
      return (AE_OK);
  }
  
-Index: acpica-unix-20190405/source/compiler/dttable2.c
+Index: acpica-unix-20190816/source/compiler/dttable2.c
 ===================================================================
---- acpica-unix-20190405.orig/source/compiler/dttable2.c
-+++ acpica-unix-20190405/source/compiler/dttable2.c
+--- acpica-unix-20190816.orig/source/compiler/dttable2.c
++++ acpica-unix-20190816/source/compiler/dttable2.c
 @@ -345,7 +345,7 @@ DtCompileMpst (
      DtPushSubtable (Subtable);
  
@@ -5392,10 +5392,10 @@ Index: acpica-unix-20190405/source/compiler/dttable2.c
  
      ParentTable = DtPeekSubtable ();
      DtInsertSubtable (ParentTable, Subtable);
-Index: acpica-unix-20190405/source/components/disassembler/dmbuffer.c
+Index: acpica-unix-20190816/source/components/disassembler/dmbuffer.c
 ===================================================================
---- acpica-unix-20190405.orig/source/components/disassembler/dmbuffer.c
-+++ acpica-unix-20190405/source/components/disassembler/dmbuffer.c
+--- acpica-unix-20190816.orig/source/components/disassembler/dmbuffer.c
++++ acpica-unix-20190816/source/components/disassembler/dmbuffer.c
 @@ -204,7 +204,7 @@ AcpiDmByteList (
  
  
@@ -5471,10 +5471,10 @@ Index: acpica-unix-20190405/source/components/disassembler/dmbuffer.c
  
      NextOp = AcpiPsGetDepthNext (NULL, Op);
      if (!NextOp)
-Index: acpica-unix-20190405/source/components/disassembler/dmopcode.c
+Index: acpica-unix-20190816/source/components/disassembler/dmopcode.c
 ===================================================================
---- acpica-unix-20190405.orig/source/components/disassembler/dmopcode.c
-+++ acpica-unix-20190405/source/components/disassembler/dmopcode.c
+--- acpica-unix-20190816.orig/source/components/disassembler/dmopcode.c
++++ acpica-unix-20190816/source/components/disassembler/dmopcode.c
 @@ -244,6 +244,7 @@ AcpiDmPredefinedDescription (
      char                        *NameString;
      int                         LastCharIsDigit;
@@ -5545,10 +5545,10 @@ Index: acpica-unix-20190405/source/components/disassembler/dmopcode.c
  
              Info->Level += 1;
              Info->MappingOp = Op;
-Index: acpica-unix-20190405/source/components/disassembler/dmresrcl.c
+Index: acpica-unix-20190816/source/components/disassembler/dmresrcl.c
 ===================================================================
---- acpica-unix-20190405.orig/source/components/disassembler/dmresrcl.c
-+++ acpica-unix-20190405/source/components/disassembler/dmresrcl.c
+--- acpica-unix-20190816.orig/source/components/disassembler/dmresrcl.c
++++ acpica-unix-20190816/source/components/disassembler/dmresrcl.c
 @@ -141,7 +141,8 @@ AcpiDmMemoryFields (
      UINT32                  Level)
  {
@@ -5697,10 +5697,10 @@ Index: acpica-unix-20190405/source/components/disassembler/dmresrcl.c
      }
  
      AcpiDmIndent (Level);
-Index: acpica-unix-20190405/source/components/disassembler/dmresrcl2.c
+Index: acpica-unix-20190816/source/components/disassembler/dmresrcl2.c
 ===================================================================
---- acpica-unix-20190405.orig/source/components/disassembler/dmresrcl2.c
-+++ acpica-unix-20190405/source/components/disassembler/dmresrcl2.c
+--- acpica-unix-20190816.orig/source/components/disassembler/dmresrcl2.c
++++ acpica-unix-20190816/source/components/disassembler/dmresrcl2.c
 @@ -191,22 +191,24 @@ AcpiDmGpioCommon (
      char                    *DeviceName = NULL;
      UINT32                  PinCount;
@@ -5924,10 +5924,10 @@ Index: acpica-unix-20190405/source/components/disassembler/dmresrcl2.c
  
      DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset);
      AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
-Index: acpica-unix-20190405/source/components/disassembler/dmresrcs.c
+Index: acpica-unix-20190816/source/components/disassembler/dmresrcs.c
 ===================================================================
---- acpica-unix-20190405.orig/source/components/disassembler/dmresrcs.c
-+++ acpica-unix-20190405/source/components/disassembler/dmresrcs.c
+--- acpica-unix-20190816.orig/source/components/disassembler/dmresrcs.c
++++ acpica-unix-20190816/source/components/disassembler/dmresrcs.c
 @@ -72,6 +72,7 @@ AcpiDmIrqDescriptor (
      UINT32                  Length,
      UINT32                  Level)
@@ -5984,10 +5984,10 @@ Index: acpica-unix-20190405/source/components/disassembler/dmresrcs.c
  
      AcpiDmIndent (Level + 1);
      AcpiDmDumpInteger8 (Resource->FixedIo.AddressLength, "Length");
-Index: acpica-unix-20190405/source/components/dispatcher/dsfield.c
+Index: acpica-unix-20190816/source/components/dispatcher/dsfield.c
 ===================================================================
---- acpica-unix-20190405.orig/source/components/dispatcher/dsfield.c
-+++ acpica-unix-20190405/source/components/dispatcher/dsfield.c
+--- acpica-unix-20190816.orig/source/components/dispatcher/dsfield.c
++++ acpica-unix-20190816/source/components/dispatcher/dsfield.c
 @@ -325,6 +325,7 @@ AcpiDsGetFieldNames (
      ACPI_STATUS             Status;
      UINT64                  Position;
@@ -6032,10 +6032,10 @@ Index: acpica-unix-20190405/source/components/dispatcher/dsfield.c
              if (ACPI_FAILURE (Status))
              {
                  ACPI_ERROR_NAMESPACE (WalkState->ScopeInfo,
-Index: acpica-unix-20190405/source/components/events/evgpeblk.c
+Index: acpica-unix-20190816/source/components/events/evgpeblk.c
 ===================================================================
---- acpica-unix-20190405.orig/source/components/events/evgpeblk.c
-+++ acpica-unix-20190405/source/components/events/evgpeblk.c
+--- acpica-unix-20190816.orig/source/components/events/evgpeblk.c
++++ acpica-unix-20190816/source/components/events/evgpeblk.c
 @@ -376,6 +376,7 @@ AcpiEvCreateGpeBlock (
      ACPI_STATUS             Status;
      ACPI_GPE_BLOCK_INFO     *GpeBlock;
@@ -6068,10 +6068,10 @@ Index: acpica-unix-20190405/source/components/events/evgpeblk.c
          InterruptNumber == AcpiGbl_FADT.SciInterrupt ? " (SCI)" : ""));
  
      /* Update global count of currently available GPEs */
-Index: acpica-unix-20190405/source/components/hardware/hwregs.c
+Index: acpica-unix-20190816/source/components/hardware/hwregs.c
 ===================================================================
---- acpica-unix-20190405.orig/source/components/hardware/hwregs.c
-+++ acpica-unix-20190405/source/components/hardware/hwregs.c
+--- acpica-unix-20190816.orig/source/components/hardware/hwregs.c
++++ acpica-unix-20190816/source/components/hardware/hwregs.c
 @@ -197,7 +197,7 @@ AcpiHwValidateRegister (
       * Address must not be null. A null address also indicates an optional
       * ACPI register that is not supported, so no error message.
@@ -6081,10 +6081,10 @@ Index: acpica-unix-20190405/source/components/hardware/hwregs.c
      if (!(*Address))
      {
          return (AE_BAD_ADDRESS);
-Index: acpica-unix-20190405/source/components/hardware/hwvalid.c
+Index: acpica-unix-20190816/source/components/hardware/hwvalid.c
 ===================================================================
---- acpica-unix-20190405.orig/source/components/hardware/hwvalid.c
-+++ acpica-unix-20190405/source/components/hardware/hwvalid.c
+--- acpica-unix-20190816.orig/source/components/hardware/hwvalid.c
++++ acpica-unix-20190816/source/components/hardware/hwvalid.c
 @@ -135,6 +135,8 @@ AcpiHwValidateIoRequest (
      UINT32                  ByteWidth;
      ACPI_IO_ADDRESS         LastAddress;
@@ -6106,11 +6106,11 @@ Index: acpica-unix-20190405/source/components/hardware/hwvalid.c
      {
          ACPI_ERROR ((AE_INFO,
              "Illegal I/O port address/length above 64K: %8.8X%8.8X/0x%X",
-Index: acpica-unix-20190405/source/components/namespace/nsaccess.c
+Index: acpica-unix-20190816/source/components/namespace/nsaccess.c
 ===================================================================
---- acpica-unix-20190405.orig/source/components/namespace/nsaccess.c
-+++ acpica-unix-20190405/source/components/namespace/nsaccess.c
-@@ -314,6 +314,7 @@ AcpiNsLookup (
+--- acpica-unix-20190816.orig/source/components/namespace/nsaccess.c
++++ acpica-unix-20190816/source/components/namespace/nsaccess.c
+@@ -349,6 +349,7 @@ AcpiNsLookup (
      UINT32                  SearchParentFlag = ACPI_NS_SEARCH_PARENT;
      UINT32                  LocalFlags;
      ACPI_INTERPRETER_MODE   LocalInterpreterMode;
@@ -6118,7 +6118,7 @@ Index: acpica-unix-20190405/source/components/namespace/nsaccess.c
  
  
      ACPI_FUNCTION_TRACE (NsLookup);
-@@ -723,9 +724,10 @@ AcpiNsLookup (
+@@ -758,9 +759,10 @@ AcpiNsLookup (
              {
                  /* Complain about a type mismatch */
  
@@ -6130,10 +6130,10 @@ Index: acpica-unix-20190405/source/components/namespace/nsaccess.c
                      AcpiUtGetTypeName (ThisNode->Type),
                      AcpiUtGetTypeName (TypeToCheckFor)));
              }
-Index: acpica-unix-20190405/source/components/namespace/nsparse.c
+Index: acpica-unix-20190816/source/components/namespace/nsparse.c
 ===================================================================
---- acpica-unix-20190405.orig/source/components/namespace/nsparse.c
-+++ acpica-unix-20190405/source/components/namespace/nsparse.c
+--- acpica-unix-20190816.orig/source/components/namespace/nsparse.c
++++ acpica-unix-20190816/source/components/namespace/nsparse.c
 @@ -216,13 +216,14 @@ AcpiNsOneCompleteParse (
  
      /* Table must consist of at least a complete header */
@@ -6151,10 +6151,10 @@ Index: acpica-unix-20190405/source/components/namespace/nsparse.c
  
      Status = AcpiTbGetOwnerId (TableIndex, &OwnerId);
      if (ACPI_FAILURE (Status))
-Index: acpica-unix-20190405/source/components/tables/tbdata.c
+Index: acpica-unix-20190816/source/components/tables/tbdata.c
 ===================================================================
---- acpica-unix-20190405.orig/source/components/tables/tbdata.c
-+++ acpica-unix-20190405/source/components/tables/tbdata.c
+--- acpica-unix-20190816.orig/source/components/tables/tbdata.c
++++ acpica-unix-20190816/source/components/tables/tbdata.c
 @@ -552,6 +552,7 @@ AcpiTbVerifyTempTable (
      UINT32                  *TableIndex)
  {
@@ -6173,10 +6173,10 @@ Index: acpica-unix-20190405/source/components/tables/tbdata.c
          if (ACPI_FAILURE (Status))
          {
              ACPI_EXCEPTION ((AE_INFO, AE_NO_MEMORY,
-Index: acpica-unix-20190405/source/components/tables/tbfadt.c
+Index: acpica-unix-20190816/source/components/tables/tbfadt.c
 ===================================================================
---- acpica-unix-20190405.orig/source/components/tables/tbfadt.c
-+++ acpica-unix-20190405/source/components/tables/tbfadt.c
+--- acpica-unix-20190816.orig/source/components/tables/tbfadt.c
++++ acpica-unix-20190816/source/components/tables/tbfadt.c
 @@ -424,18 +424,20 @@ AcpiTbCreateLocalFadt (
      ACPI_TABLE_HEADER       *Table,
      UINT32                  Length)
@@ -6288,10 +6288,10 @@ Index: acpica-unix-20190405/source/components/tables/tbfadt.c
                  "PmRegisters", 0);
          }
      }
-Index: acpica-unix-20190405/source/components/tables/tbfind.c
+Index: acpica-unix-20190816/source/components/tables/tbfind.c
 ===================================================================
---- acpica-unix-20190405.orig/source/components/tables/tbfind.c
-+++ acpica-unix-20190405/source/components/tables/tbfind.c
+--- acpica-unix-20190816.orig/source/components/tables/tbfind.c
++++ acpica-unix-20190816/source/components/tables/tbfind.c
 @@ -108,8 +108,11 @@ AcpiTbFindTable (
      (void) AcpiUtAcquireMutex (ACPI_MTX_TABLES);
      for (i = 0; i < AcpiGbl_RootTableList.CurrentTableCount; ++i)
@@ -6305,10 +6305,10 @@ Index: acpica-unix-20190405/source/components/tables/tbfind.c
          {
              /* Not the requested table */
  
-Index: acpica-unix-20190405/source/components/tables/tbprint.c
+Index: acpica-unix-20190816/source/components/tables/tbprint.c
 ===================================================================
---- acpica-unix-20190405.orig/source/components/tables/tbprint.c
-+++ acpica-unix-20190405/source/components/tables/tbprint.c
+--- acpica-unix-20190816.orig/source/components/tables/tbprint.c
++++ acpica-unix-20190816/source/components/tables/tbprint.c
 @@ -143,15 +143,18 @@ AcpiTbPrintTableHeader (
      ACPI_TABLE_HEADER       *Header)
  {
@@ -6350,10 +6350,10 @@ Index: acpica-unix-20190405/source/components/tables/tbprint.c
      }
  }
  
-Index: acpica-unix-20190405/source/components/tables/tbutils.c
+Index: acpica-unix-20190816/source/components/tables/tbutils.c
 ===================================================================
---- acpica-unix-20190405.orig/source/components/tables/tbutils.c
-+++ acpica-unix-20190405/source/components/tables/tbutils.c
+--- acpica-unix-20190816.orig/source/components/tables/tbutils.c
++++ acpica-unix-20190816/source/components/tables/tbutils.c
 @@ -238,7 +238,7 @@ AcpiTbGetRootTableEntry (
           * 64-bit platform, XSDT: Move (unaligned) 64-bit to local,
           *  return 64-bit
@@ -6413,10 +6413,10 @@ Index: acpica-unix-20190405/source/components/tables/tbutils.c
          {
              AcpiGbl_FadtIndex = TableIndex;
              AcpiTbParseFadt ();
-Index: acpica-unix-20190405/source/components/tables/tbxface.c
+Index: acpica-unix-20190816/source/components/tables/tbxface.c
 ===================================================================
---- acpica-unix-20190405.orig/source/components/tables/tbxface.c
-+++ acpica-unix-20190405/source/components/tables/tbxface.c
+--- acpica-unix-20190816.orig/source/components/tables/tbxface.c
++++ acpica-unix-20190816/source/components/tables/tbxface.c
 @@ -293,8 +293,11 @@ AcpiGetTableHeader (
  
      for (i = 0, j = 0; i < AcpiGbl_RootTableList.CurrentTableCount; i++)
@@ -6430,10 +6430,10 @@ Index: acpica-unix-20190405/source/components/tables/tbxface.c
          {
              continue;
          }
-Index: acpica-unix-20190405/source/components/tables/tbxfload.c
+Index: acpica-unix-20190816/source/components/tables/tbxfload.c
 ===================================================================
---- acpica-unix-20190405.orig/source/components/tables/tbxfload.c
-+++ acpica-unix-20190405/source/components/tables/tbxfload.c
+--- acpica-unix-20190816.orig/source/components/tables/tbxfload.c
++++ acpica-unix-20190816/source/components/tables/tbxfload.c
 @@ -153,6 +153,7 @@ AcpiTbLoadNamespace (
      ACPI_TABLE_DESC         *Table;
      UINT32                  TablesLoaded = 0;
@@ -6453,10 +6453,10 @@ Index: acpica-unix-20190405/source/components/tables/tbxfload.c
           ACPI_FAILURE (AcpiTbValidateTable (Table)))
      {
          Status = AE_NO_ACPI_TABLES;
-Index: acpica-unix-20190405/source/tools/acpiexec/aetables.c
+Index: acpica-unix-20190816/source/tools/acpiexec/aetables.c
 ===================================================================
---- acpica-unix-20190405.orig/source/tools/acpiexec/aetables.c
-+++ acpica-unix-20190405/source/tools/acpiexec/aetables.c
+--- acpica-unix-20190816.orig/source/tools/acpiexec/aetables.c
++++ acpica-unix-20190816/source/tools/acpiexec/aetables.c
 @@ -146,21 +146,25 @@ AeInitializeTableHeader (
      char                    *Signature,
      UINT32                  Length)
@@ -6608,10 +6608,10 @@ Index: acpica-unix-20190405/source/tools/acpiexec/aetables.c
      }
  
      return (AE_OK);
-Index: acpica-unix-20190405/source/common/dmswitch.c
+Index: acpica-unix-20190816/source/common/dmswitch.c
 ===================================================================
---- acpica-unix-20190405.orig/source/common/dmswitch.c
-+++ acpica-unix-20190405/source/common/dmswitch.c
+--- acpica-unix-20190816.orig/source/common/dmswitch.c
++++ acpica-unix-20190816/source/common/dmswitch.c
 @@ -88,13 +88,15 @@ AcpiDmProcessSwitch (
      ACPI_PARSE_OBJECT_LIST  *Current;
      ACPI_PARSE_OBJECT_LIST  *Previous;
diff --git a/f23-harden.patch b/f23-harden.patch
index 2891d9b..70e1f5a 100644
--- a/f23-harden.patch
+++ b/f23-harden.patch
@@ -8,11 +8,11 @@ From: Al Stone <ahs3@redhat.com>
  generate/unix/iasl/Makefile   |   13 +++++++------
  2 files changed, 9 insertions(+), 6 deletions(-)
 
-Index: acpica-unix2-20180209/generate/unix/Makefile.config
+Index: acpica-unix-20190816/generate/unix/Makefile.config
 ===================================================================
---- acpica-unix2-20180209.orig/generate/unix/Makefile.config
-+++ acpica-unix2-20180209/generate/unix/Makefile.config
-@@ -182,6 +182,8 @@ ifneq ($(NOFORTIFY),TRUE)
+--- acpica-unix-20190816.orig/generate/unix/Makefile.config
++++ acpica-unix-20190816/generate/unix/Makefile.config
+@@ -190,6 +190,8 @@ ifneq ($(NOFORTIFY),TRUE)
  OPT_CFLAGS += -D_FORTIFY_SOURCE=2
  endif
  
@@ -21,11 +21,11 @@ Index: acpica-unix2-20180209/generate/unix/Makefile.config
  CFLAGS += \
      -D$(HOST)\
      -D_GNU_SOURCE\
-Index: acpica-unix2-20180209/generate/unix/iasl/Makefile
+Index: acpica-unix-20190816/generate/unix/iasl/Makefile
 ===================================================================
---- acpica-unix2-20180209.orig/generate/unix/iasl/Makefile
-+++ acpica-unix2-20180209/generate/unix/iasl/Makefile
-@@ -344,26 +344,27 @@ $(OBJDIR)/prparserparse.c $(OBJDIR)/prpa
+--- acpica-unix-20190816.orig/generate/unix/iasl/Makefile
++++ acpica-unix-20190816/generate/unix/iasl/Makefile
+@@ -358,34 +358,35 @@ $(OBJDIR)/prparserparse.c $(OBJDIR)/prpa
  # Cannot use the common compile warning flags since the C files are created
  # by the utilities above and they are not necessarily ANSI C, etc.
  #
@@ -38,6 +38,16 @@ Index: acpica-unix2-20180209/generate/unix/iasl/Makefile
  $(OBJDIR)/aslcompilerparse.o : $(OBJDIR)/aslcompilerparse.c
  	@echo "- " "Intermediate" $<
 -	@$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
++	@$(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $<
+ 
+ $(OBJDIR)/dtcompilerparserlex.o :      $(OBJDIR)/dtcompilerparserlex.c
+ 	@echo "- " "Intermediate" $<
+-	@$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
++	@$(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $<
+ 
+ $(OBJDIR)/dtcompilerparserparse.o :    $(OBJDIR)/dtcompilerparserparse.c
+ 	@echo "- " "Intermediate" $<
+-	@$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
 +	@$(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $<
  
  $(OBJDIR)/dtparserlex.o :      $(OBJDIR)/dtparserlex.c
diff --git a/grammar.asl.result b/grammar.asl.result
index 90341c0..73351de 100644
--- a/grammar.asl.result
+++ b/grammar.asl.result
@@ -37,6 +37,9 @@ Warning  3055 -                                ^ Invalid Hex/Octal Escape - Non-
 grammar.asl    620:         RCIV (Subtract (Arg0, 1))
 Remark   2098 -               ^ Recursive method call (RCIV)
 
+grammar.asl    631:         Processor(CPU0,0x0,0xFFFFFFFF,0x0) {}
+Warning  3168 -                         ^ Legacy Processor() keyword detected. Use Device() keyword instead.
+
 grammar.asl    668:     Method(SMWE, 4)
 Remark   2146 -                  ^ Method Argument is never used (Arg0)
 
@@ -371,4 +374,4 @@ Ignoring all errors, forcing AML file generation
 ASL Input:     grammar.asl -  323653 bytes   4818 keywords  10284 source lines
 AML Output:    grammar.aml -   43758 bytes   4148 opcodes     670 named objects
 
-Compilation successful. 6 Errors, 88 Warnings, 27 Remarks, 1106 Optimizations
+Compilation successful. 6 Errors, 89 Warnings, 27 Remarks, 1106 Optimizations
diff --git a/int-format.patch b/int-format.patch
index de10b2d..a578087 100644
--- a/int-format.patch
+++ b/int-format.patch
@@ -21,11 +21,11 @@ From: Al Stone <ahs3@redhat.com>
  source/components/utilities/utownerid.c |    2 +-
  18 files changed, 28 insertions(+), 28 deletions(-)
 
-Index: acpica-unix-20190405/source/compiler/aslerror.c
+Index: acpica-unix-20190816/source/compiler/aslerror.c
 ===================================================================
---- acpica-unix-20190405.orig/source/compiler/aslerror.c
-+++ acpica-unix-20190405/source/compiler/aslerror.c
-@@ -906,7 +906,7 @@ AslLogNewError (
+--- acpica-unix-20190816.orig/source/compiler/aslerror.c
++++ acpica-unix-20190816/source/compiler/aslerror.c
+@@ -898,7 +898,7 @@ AslLogNewError (
      AslGbl_ExceptionCount[ModifiedLevel]++;
      if (!AslGbl_IgnoreErrors && AslGbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT)
      {
@@ -34,10 +34,10 @@ Index: acpica-unix-20190405/source/compiler/aslerror.c
  
          AslGbl_SourceLine = 0;
          AslGbl_NextError = AslGbl_ErrorLog;
-Index: acpica-unix-20190405/source/compiler/aslopt.c
+Index: acpica-unix-20190816/source/compiler/aslopt.c
 ===================================================================
---- acpica-unix-20190405.orig/source/compiler/aslopt.c
-+++ acpica-unix-20190405/source/compiler/aslopt.c
+--- acpica-unix-20190816.orig/source/compiler/aslopt.c
++++ acpica-unix-20190816/source/compiler/aslopt.c
 @@ -583,7 +583,7 @@ OptOptimizeNamePath (
      }
  
@@ -47,10 +47,10 @@ Index: acpica-unix-20190405/source/compiler/aslopt.c
          Op->Asl.LogicalLineNumber,
          AcpiPsGetOpcodeName (Op->Common.Parent->Common.AmlOpcode),
          AcpiPsGetOpcodeName (Op->Common.AmlOpcode)));
-Index: acpica-unix-20190405/source/compiler/aslprepkg.c
+Index: acpica-unix-20190816/source/compiler/aslprepkg.c
 ===================================================================
---- acpica-unix-20190405.orig/source/compiler/aslprepkg.c
-+++ acpica-unix-20190405/source/compiler/aslprepkg.c
+--- acpica-unix-20190816.orig/source/compiler/aslprepkg.c
++++ acpica-unix-20190816/source/compiler/aslprepkg.c
 @@ -309,7 +309,7 @@ ApCheckPackage (
  
          if (Count & 1)
@@ -60,10 +60,10 @@ Index: acpica-unix-20190405/source/compiler/aslprepkg.c
                  Predefined->Info.Name, Count);
  
              AslError (ASL_ERROR, ASL_MSG_RESERVED_PACKAGE_LENGTH,
-Index: acpica-unix-20190405/source/components/debugger/dbexec.c
+Index: acpica-unix-20190816/source/components/debugger/dbexec.c
 ===================================================================
---- acpica-unix-20190405.orig/source/components/debugger/dbexec.c
-+++ acpica-unix-20190405/source/components/debugger/dbexec.c
+--- acpica-unix-20190816.orig/source/components/debugger/dbexec.c
++++ acpica-unix-20190816/source/components/debugger/dbexec.c
 @@ -230,7 +230,7 @@ AcpiDbExecuteMethod (
              ACPI_ERROR ((AE_INFO,
                  "Possible buffer overflow within AML Debugger "
@@ -73,10 +73,10 @@ Index: acpica-unix-20190405/source/components/debugger/dbexec.c
          }
      }
  
-Index: acpica-unix-20190405/source/components/dispatcher/dsmthdat.c
+Index: acpica-unix-20190816/source/components/dispatcher/dsmthdat.c
 ===================================================================
---- acpica-unix-20190405.orig/source/components/dispatcher/dsmthdat.c
-+++ acpica-unix-20190405/source/components/dispatcher/dsmthdat.c
+--- acpica-unix-20190816.orig/source/components/dispatcher/dsmthdat.c
++++ acpica-unix-20190816/source/components/dispatcher/dsmthdat.c
 @@ -291,7 +291,7 @@ AcpiDsMethodDataGetNode (
          if (Index > ACPI_METHOD_MAX_LOCAL)
          {
@@ -95,10 +95,10 @@ Index: acpica-unix-20190405/source/components/dispatcher/dsmthdat.c
                  Index, ACPI_METHOD_MAX_ARG));
              return_ACPI_STATUS (AE_AML_INVALID_INDEX);
          }
-Index: acpica-unix-20190405/source/components/dispatcher/dsutils.c
+Index: acpica-unix-20190816/source/components/dispatcher/dsutils.c
 ===================================================================
---- acpica-unix-20190405.orig/source/components/dispatcher/dsutils.c
-+++ acpica-unix-20190405/source/components/dispatcher/dsutils.c
+--- acpica-unix-20190816.orig/source/components/dispatcher/dsutils.c
++++ acpica-unix-20190816/source/components/dispatcher/dsutils.c
 @@ -786,7 +786,7 @@ AcpiDsCreateOperands (
      }
  
@@ -108,10 +108,10 @@ Index: acpica-unix-20190405/source/components/dispatcher/dsutils.c
          WalkState->NumOperands, ArgCount, Index));
  
      /* Create the interpreter arguments, in reverse order */
-Index: acpica-unix-20190405/source/components/dispatcher/dswscope.c
+Index: acpica-unix-20190816/source/components/dispatcher/dswscope.c
 ===================================================================
---- acpica-unix-20190405.orig/source/components/dispatcher/dswscope.c
-+++ acpica-unix-20190405/source/components/dispatcher/dswscope.c
+--- acpica-unix-20190816.orig/source/components/dispatcher/dswscope.c
++++ acpica-unix-20190816/source/components/dispatcher/dswscope.c
 @@ -149,7 +149,7 @@ AcpiDsScopeStackPush (
      WalkState->ScopeDepth++;
  
@@ -130,11 +130,11 @@ Index: acpica-unix-20190405/source/components/dispatcher/dswscope.c
          (UINT32) WalkState->ScopeDepth,
          AcpiUtGetNodeName (ScopeInfo->Scope.Node),
          AcpiUtGetTypeName (ScopeInfo->Common.Value)));
-Index: acpica-unix-20190405/source/components/events/evgpe.c
+Index: acpica-unix-20190816/source/components/events/evgpe.c
 ===================================================================
---- acpica-unix-20190405.orig/source/components/events/evgpe.c
-+++ acpica-unix-20190405/source/components/events/evgpe.c
-@@ -489,7 +489,7 @@ AcpiEvGpeDetect (
+--- acpica-unix-20190816.orig/source/components/events/evgpe.c
++++ acpica-unix-20190816/source/components/events/evgpe.c
+@@ -488,7 +488,7 @@ AcpiEvGpeDetect (
                      "Ignore disabled registers for GPE %02X-%02X: "
                      "RunEnable=%02X, WakeEnable=%02X\n",
                      GpeRegisterInfo->BaseGpeNumber,
@@ -143,10 +143,10 @@ Index: acpica-unix-20190405/source/components/events/evgpe.c
                      GpeRegisterInfo->EnableForRun,
                      GpeRegisterInfo->EnableForWake));
                  continue;
-Index: acpica-unix-20190405/source/components/executer/exdump.c
+Index: acpica-unix-20190816/source/components/executer/exdump.c
 ===================================================================
---- acpica-unix-20190405.orig/source/components/executer/exdump.c
-+++ acpica-unix-20190405/source/components/executer/exdump.c
+--- acpica-unix-20190816.orig/source/components/executer/exdump.c
++++ acpica-unix-20190816/source/components/executer/exdump.c
 @@ -678,7 +678,7 @@ AcpiExDumpOperand (
      if (Depth > 0)
      {
@@ -156,10 +156,10 @@ Index: acpica-unix-20190405/source/components/executer/exdump.c
      }
      else
      {
-Index: acpica-unix-20190405/source/components/executer/exfldio.c
+Index: acpica-unix-20190816/source/components/executer/exfldio.c
 ===================================================================
---- acpica-unix-20190405.orig/source/components/executer/exfldio.c
-+++ acpica-unix-20190405/source/components/executer/exfldio.c
+--- acpica-unix-20190816.orig/source/components/executer/exfldio.c
++++ acpica-unix-20190816/source/components/executer/exfldio.c
 @@ -681,8 +681,8 @@ AcpiExWriteWithUpdateRule (
  
              ACPI_ERROR ((AE_INFO,
@@ -171,10 +171,10 @@ Index: acpica-unix-20190405/source/components/executer/exfldio.c
              return_ACPI_STATUS (AE_AML_OPERAND_VALUE);
          }
      }
-Index: acpica-unix-20190405/source/components/executer/exnames.c
+Index: acpica-unix-20190816/source/components/executer/exnames.c
 ===================================================================
---- acpica-unix-20190405.orig/source/components/executer/exnames.c
-+++ acpica-unix-20190405/source/components/executer/exnames.c
+--- acpica-unix-20190816.orig/source/components/executer/exnames.c
++++ acpica-unix-20190816/source/components/executer/exnames.c
 @@ -237,7 +237,7 @@ AcpiExNameSegment (
           */
          ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
@@ -193,10 +193,10 @@ Index: acpica-unix-20190405/source/components/executer/exnames.c
      }
  
      *InAmlAddress = ACPI_CAST_PTR (UINT8, AmlAddress);
-Index: acpica-unix-20190405/source/components/hardware/hwregs.c
+Index: acpica-unix-20190816/source/components/hardware/hwregs.c
 ===================================================================
---- acpica-unix-20190405.orig/source/components/hardware/hwregs.c
-+++ acpica-unix-20190405/source/components/hardware/hwregs.c
+--- acpica-unix-20190816.orig/source/components/hardware/hwregs.c
++++ acpica-unix-20190816/source/components/hardware/hwregs.c
 @@ -460,7 +460,7 @@ AcpiHwClearAcpiStatus (
  
  
@@ -206,10 +206,10 @@ Index: acpica-unix-20190405/source/components/hardware/hwregs.c
          ACPI_FORMAT_UINT64 (AcpiGbl_XPm1aStatus.Address)));
  
      LockFlags = AcpiOsAcquireLock (AcpiGbl_HardwareLock);
-Index: acpica-unix-20190405/source/components/tables/tbfadt.c
+Index: acpica-unix-20190816/source/components/tables/tbfadt.c
 ===================================================================
---- acpica-unix-20190405.orig/source/components/tables/tbfadt.c
-+++ acpica-unix-20190405/source/components/tables/tbfadt.c
+--- acpica-unix-20190816.orig/source/components/tables/tbfadt.c
++++ acpica-unix-20190816/source/components/tables/tbfadt.c
 @@ -233,7 +233,7 @@ AcpiTbInitGenericAddress (
          if (!(Flags & ACPI_FADT_GPE_REGISTER))
          {
@@ -237,10 +237,10 @@ Index: acpica-unix-20190405/source/components/tables/tbfadt.c
                          Name, Address32,
                          ACPI_FORMAT_UINT64 (Address64->Address),
                          AcpiGbl_Use32BitFadtAddresses ? 32 : 64));
-Index: acpica-unix-20190405/source/components/tables/tbxfroot.c
+Index: acpica-unix-20190816/source/components/tables/tbxfroot.c
 ===================================================================
---- acpica-unix-20190405.orig/source/components/tables/tbxfroot.c
-+++ acpica-unix-20190405/source/components/tables/tbxfroot.c
+--- acpica-unix-20190816.orig/source/components/tables/tbxfroot.c
++++ acpica-unix-20190816/source/components/tables/tbxfroot.c
 @@ -177,7 +177,7 @@ AcpiFindRootPointer (
      {
          ACPI_ERROR ((AE_INFO,
@@ -268,15 +268,15 @@ Index: acpica-unix-20190405/source/components/tables/tbxfroot.c
  
          return_ACPI_STATUS (AE_NO_MEMORY);
      }
-Index: acpica-unix-20190405/source/components/utilities/utownerid.c
+Index: acpica-unix-20190816/source/components/utilities/utownerid.c
 ===================================================================
---- acpica-unix-20190405.orig/source/components/utilities/utownerid.c
-+++ acpica-unix-20190405/source/components/utilities/utownerid.c
+--- acpica-unix-20190816.orig/source/components/utilities/utownerid.c
++++ acpica-unix-20190816/source/components/utilities/utownerid.c
 @@ -237,7 +237,7 @@ AcpiUtReleaseOwnerId (
      else
      {
          ACPI_ERROR ((AE_INFO,
--            "Release of non-allocated OwnerId: 0x%2.2X", OwnerId + 1));
+-            "Attempted release of non-allocated OwnerId: 0x%3.3X", OwnerId + 1));
 +            "Release of non-allocated OwnerId: 0x%2.2X", (UINT32) OwnerId + 1));
      }
  
diff --git a/sources b/sources
index be7b154..ff9ab51 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (acpica-unix2-20190703.tar.gz) = 8445a6d354ce3bcbfb5159f4ec0312b1e910c0b1b2033a2300f892e4ac580abab4e3f5b4ded379f0036299359d307330511ab7053678cfd9031d7df4c365f555
-SHA512 (acpitests-unix-20190703.tar.gz) = d9bab56198dc00fc11b50a199035eb9dc164c226441cd00e163ecd6362d399a50058afa7582f86e62a085b990772995fc10e077581a3b04a6c6b2e95e055f167
+SHA512 (acpica-unix2-20190816.tar.gz) = f2b5363a18391d35465cc14d3be1c2f5b72c599a02e617febc7abc64f0a825fd7ef06d9bc5f13264cf526b7f4ba6a605dd188152c6007efcf661641b537d22b2
+SHA512 (acpitests-unix-20190816.tar.gz) = ea3944888a5229be246c47b9d53256ccc42a988e3dd98995df6ab77ebb0715e777577df609340ee806c5274536ecdcf5798d2aad3786f5a1462a6be8dea9ed1b
diff --git a/template.patch b/template.patch
index e8b06f5..c3e1387 100644
--- a/template.patch
+++ b/template.patch
@@ -7,16 +7,16 @@ From: Al Stone <ahs3@redhat.com>
  tests/templates/Makefile |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: acpica-unix2-20161222/tests/templates/Makefile
+Index: acpica-unix-20190816/tests/templates/Makefile
 ===================================================================
---- acpica-unix2-20161222.orig/tests/templates/Makefile
-+++ acpica-unix2-20161222/tests/templates/Makefile
-@@ -2,7 +2,7 @@
- PROG= templates
+--- acpica-unix-20190816.orig/tests/templates/Makefile
++++ acpica-unix-20190816/tests/templates/Makefile
+@@ -26,7 +26,7 @@ $(aml_obj): %.aml:  %.asl
+ 
  
  templates :
 -	sh templates.sh
 +	sh templates.sh 1
  
- clean :
- 	rm -f *.asl *.aml *.dsl *.hex diff.log
+ .PHONY: clean
+ clean:
diff --git a/unaligned.patch b/unaligned.patch
index 9a729d3..6365508 100644
--- a/unaligned.patch
+++ b/unaligned.patch
@@ -14,10 +14,10 @@ Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
  source/include/actypes.h              |   26 +++++++++++++-------------
  3 files changed, 32 insertions(+), 21 deletions(-)
 
-Index: acpica-unix2-20170728/source/components/executer/exoparg2.c
+Index: acpica-unix-20180508/source/components/executer/exoparg2.c
 ===================================================================
---- acpica-unix2-20170728.orig/source/components/executer/exoparg2.c
-+++ acpica-unix2-20170728/source/components/executer/exoparg2.c
+--- acpica-unix-20180508.orig/source/components/executer/exoparg2.c
++++ acpica-unix-20180508/source/components/executer/exoparg2.c
 @@ -172,6 +172,8 @@ AcpiExOpcode_2A_2T_1R (
      ACPI_OPERAND_OBJECT     **Operand = &WalkState->Operands[0];
      ACPI_OPERAND_OBJECT     *ReturnDesc1 = NULL;
@@ -58,10 +58,10 @@ Index: acpica-unix2-20170728/source/components/executer/exoparg2.c
          break;
  
      case AML_CONCATENATE_OP: /* Concatenate (Data1, Data2, Result) */
-Index: acpica-unix2-20170728/source/include/actypes.h
+Index: acpica-unix-20180508/source/include/actypes.h
 ===================================================================
---- acpica-unix2-20170728.orig/source/include/actypes.h
-+++ acpica-unix2-20170728/source/include/actypes.h
+--- acpica-unix-20180508.orig/source/include/actypes.h
++++ acpica-unix-20180508/source/include/actypes.h
 @@ -143,6 +143,19 @@ typedef COMPILER_DEPENDENT_INT64
   */
  #define ACPI_THREAD_ID                  UINT64
@@ -75,7 +75,7 @@ Index: acpica-unix2-20170728/source/include/actypes.h
 + * Note: EM64T and other X86-64 processors support misaligned transfers,
 + * so there is no need to define this flag.
 + */
-+#if defined (__IA64__) || defined (__ia64__) || defined(__alpha__) || defined(__sparc__) || defined(__hppa__) 
++#if defined (__IA64__) || defined (__ia64__) || defined(__alpha__) || defined(__sparc__) || defined(__hppa__) || defined(__arm__)
 +#define ACPI_MISALIGNMENT_NOT_SUPPORTED
 +#endif
 +

From 0acf62d4a9716dce2130bec61a2cf3a38bb5a7d6 Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Tue, 29 Oct 2019 17:41:12 -0600
Subject: [PATCH 03/82] Add in a patch to fix incorrect exit status from iasl

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 acpica-tools.spec | 19 ++++++-------------
 badexit.patch     | 17 +++++++++++++++++
 2 files changed, 23 insertions(+), 13 deletions(-)
 create mode 100644 badexit.patch

diff --git a/acpica-tools.spec b/acpica-tools.spec
index d1a8446..0fb365f 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -42,6 +42,7 @@ Patch14:        str-trunc-warn.patch
 Patch15:	ptr-cast.patch
 Patch16:	aslcodegen.patch
 Patch17:	facp.patch
+Patch18:	badexit.patch
 
 BuildRequires:  bison patchutils flex gcc
 
@@ -111,6 +112,7 @@ gzip -dc %{SOURCE1} | tar -x --strip-components=1 -f -
 %patch15 -p1 -b .ptr-cast
 %patch16 -p1 -b .aslcodegen
 %patch17 -p1 -b .facp
+%patch18 -p1 -b .badexit
 
 cp -p %{SOURCE2} README.Fedora
 cp -p %{SOURCE3} iasl.1
@@ -197,18 +199,6 @@ cd tests
 # misc tests
 ./run-misc-tests.sh %{buildroot}%{_bindir} %{version}
 
-# Template tests
-cd templates
-make
-if [ -f diff.log ]
-then
-    if [ -s diff.log ]
-    then
-        exit 1                  # implies errors occurred
-    fi
-fi
-cd ..
-
 %pre
 if [ -e %{_bindir}/acpixtract-acpica ]
 then
@@ -239,8 +229,11 @@ fi
 
 
 %changelog
-* Sun Oct 27 2019 Al Stone <ahs3@redhat.com> - 20190816-1
+* Tue Oct 29 2019 Al Stone <ahs3@redhat.com> - 20190816-1
 - Update to 20190816 source tree, including patch refeshes.
+- Add a patch to fix a non-zero exit from iasl -T ALL that actually succeeds
+- Remove the "template" tests; they have been subsumed by aslts.sh as they
+  should be
 
 * Thu Oct 24 2019 Al Stone <ahs3@redhat.com> - 20190703-1
 - Update to 20190703 source tree, including patch refeshes.
diff --git a/badexit.patch b/badexit.patch
new file mode 100644
index 0000000..6e8353e
--- /dev/null
+++ b/badexit.patch
@@ -0,0 +1,17 @@
+When iasl is invoked with 'iasl -T ALL', and everything works correctly,
+it still exits with a non-zero value.  Exit with zero if all is well.
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+
+diff -Naur acpica-unix2-20190816/source/compiler/asloptions.c acpica-unix2-20190816.fix/source/compiler/asloptions.c
+--- acpica-unix2-20190816/source/compiler/asloptions.c	2019-08-16 09:01:30.000000000 -0600
++++ acpica-unix2-20190816.fix/source/compiler/asloptions.c	2019-10-29 15:52:40.987156555 -0600
+@@ -111,7 +111,7 @@
+         {
+             exit (-1);
+         }
+-        exit (1);
++        exit (0);
+     }
+ 
+     /* Next parameter must be the input filename */

From d7f8eec1b252f778159d84d8bdf15b0a179c89cc Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Sat, 23 Nov 2019 16:16:51 -0700
Subject: [PATCH 04/82] Update to 20191018 upstream source with refreshed
 patches

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 .gitignore                 |    2 +
 OPT_LDFLAGS.patch          |    6 +-
 acpica-tools.spec          |   87 +-
 arm7hl.patch               |    7 +-
 aslcodegen.patch           |    6 +-
 badexit.patch              |    9 +-
 big-endian-dmtbdump.patch  |  162 +++
 big-endian-dmtbdump1.patch |  637 ++++++++++
 big-endian-dmtbdump2.patch |  887 ++++++++++++++
 big-endian-dmtbdump3.patch |  250 ++++
 big-endian-v2.patch        |    6 +-
 big-endian.patch           | 2298 +++---------------------------------
 cve-2017-13693.patch       |    6 +-
 cve-2017-13694.patch       |   14 +-
 cve-2017-13695.patch       |    8 +-
 f23-harden.patch           |   12 +-
 grammar.asl.result         |   11 +-
 int-format.patch           |   90 +-
 mips-be-fix.patch          |   12 +-
 ppc64le.patch              |    6 +-
 ptr-cast.patch             |   20 +-
 simple-64bit.patch         |    6 +-
 sources                    |    4 +-
 str-trunc-warn.patch       |   20 +-
 template.patch             |    6 +-
 unaligned.patch            |   12 +-
 26 files changed, 2298 insertions(+), 2286 deletions(-)
 create mode 100644 big-endian-dmtbdump.patch
 create mode 100644 big-endian-dmtbdump1.patch
 create mode 100644 big-endian-dmtbdump2.patch
 create mode 100644 big-endian-dmtbdump3.patch

diff --git a/.gitignore b/.gitignore
index ab14efb..4886745 100644
--- a/.gitignore
+++ b/.gitignore
@@ -119,3 +119,5 @@ series
 /acpitests-unix-20190703.tar.gz
 /acpica-unix2-20190816.tar.gz
 /acpitests-unix-20190816.tar.gz
+/acpica-unix2-20191018.tar.gz
+/acpitests-unix-20191018.tar.gz
diff --git a/OPT_LDFLAGS.patch b/OPT_LDFLAGS.patch
index 975a97e..5d9a21f 100644
--- a/OPT_LDFLAGS.patch
+++ b/OPT_LDFLAGS.patch
@@ -1,7 +1,7 @@
-Index: acpica-unix-20190816/generate/unix/Makefile.config
+Index: acpica-unix-20191018/generate/unix/Makefile.config
 ===================================================================
---- acpica-unix-20190816.orig/generate/unix/Makefile.config
-+++ acpica-unix-20190816/generate/unix/Makefile.config
+--- acpica-unix-20191018.orig/generate/unix/Makefile.config
++++ acpica-unix-20191018/generate/unix/Makefile.config
 @@ -23,6 +23,9 @@
  # OPT_CFLAGS can be overridden on the make command line by
  #   adding OPT_CFLAGS="..." to the invocation.
diff --git a/acpica-tools.spec b/acpica-tools.spec
index 0fb365f..6d10d78 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -1,5 +1,5 @@
 Name:           acpica-tools
-Version:        20190816
+Version:        20191018
 Release:        1%{?dist}
 Summary:        ACPICA tools for the development and debug of ACPI tables
 
@@ -25,24 +25,28 @@ Source15:       run-misc-tests.sh
 Source16:       COPYING
 
 Patch0:         big-endian.patch
-Patch1:         unaligned.patch
-Patch2:         OPT_LDFLAGS.patch
-Patch3:         int-format.patch
-Patch4:         f23-harden.patch
-Patch5:         template.patch
-Patch6:         ppc64le.patch
-Patch7:         arm7hl.patch
-Patch8:         big-endian-v2.patch
-Patch9:         simple-64bit.patch
-Patch10:        mips-be-fix.patch
-Patch11:        cve-2017-13693.patch
-Patch12:        cve-2017-13694.patch
-Patch13:        cve-2017-13695.patch
-Patch14:        str-trunc-warn.patch
-Patch15:	ptr-cast.patch
-Patch16:	aslcodegen.patch
-Patch17:	facp.patch
-Patch18:	badexit.patch
+Patch1:         big-endian-dmtbdump.patch
+Patch2:         big-endian-dmtbdump1.patch
+Patch3:         big-endian-dmtbdump2.patch
+Patch4:         big-endian-dmtbdump3.patch
+Patch5:         unaligned.patch
+Patch6:         OPT_LDFLAGS.patch
+Patch7:         int-format.patch
+Patch8:         f23-harden.patch
+Patch9:         template.patch
+Patch10:        ppc64le.patch
+Patch11:        arm7hl.patch
+Patch12:        big-endian-v2.patch
+Patch13:        simple-64bit.patch
+Patch14:        mips-be-fix.patch
+Patch15:        cve-2017-13693.patch
+Patch16:        cve-2017-13694.patch
+Patch17:        cve-2017-13695.patch
+Patch18:        str-trunc-warn.patch
+Patch19:	ptr-cast.patch
+Patch20:	aslcodegen.patch
+Patch21:	facp.patch
+Patch22:	badexit.patch
 
 BuildRequires:  bison patchutils flex gcc
 
@@ -92,27 +96,31 @@ This version of the tools is being released under GPLv2 license.
 %setup -q -n acpica-unix2-%{version}
 gzip -dc %{SOURCE1} | tar -x --strip-components=1 -f -
 
-%patch0 -p1 -b .big-endian
-%patch1 -p1 -b .unaligned
-%patch2 -p1 -b .OPT_LDFLAGS
-%patch3 -p1 -b .int-format
-%patch4 -p1 -b .f23-harden
+%patch0  -p1 -b .big-endian
+%patch1  -p1 -b .big-endian-dmtbdump
+%patch2  -p1 -b .big-endian-dmtbdump1
+%patch3  -p1 -b .big-endian-dmtbdump2
+%patch4  -p1 -b .big-endian-dmtbdump3
+%patch5  -p1 -b .unaligned
+%patch6  -p1 -b .OPT_LDFLAGS
+%patch7  -p1 -b .int-format
+%patch8  -p1 -b .f23-harden
 # do not preserve a backup for this patch; it alters the results
 # of the template test case and forces it to fail
-%patch5 -p1
-%patch6 -p1 -b .ppc64le
-%patch7 -p1 -b .arm7hl
-%patch8 -p1 -b .big-endian-v2
-%patch9 -p1 -b .simple-64bit
-%patch10 -p1 -b .mips-be-fix
-%patch11 -p1 -b .cve-2017-13693
-%patch12 -p1 -b .cve-2017-13694
-%patch13 -p1 -b .cve-2017-13695
-%patch14 -p1 -b .str-trunc-warn
-%patch15 -p1 -b .ptr-cast
-%patch16 -p1 -b .aslcodegen
-%patch17 -p1 -b .facp
-%patch18 -p1 -b .badexit
+%patch9  -p1
+%patch10 -p1 -b .ppc64le
+%patch11 -p1 -b .arm7hl
+%patch12 -p1 -b .big-endian-v2
+%patch13 -p1 -b .simple-64bit
+%patch14 -p1 -b .mips-be-fix
+%patch15 -p1 -b .cve-2017-13693
+%patch16 -p1 -b .cve-2017-13694
+%patch17 -p1 -b .cve-2017-13695
+%patch18 -p1 -b .str-trunc-warn
+%patch19 -p1 -b .ptr-cast
+%patch20 -p1 -b .aslcodegen
+%patch21 -p1 -b .facp
+%patch22 -p1 -b .badexit
 
 cp -p %{SOURCE2} README.Fedora
 cp -p %{SOURCE3} iasl.1
@@ -229,6 +237,9 @@ fi
 
 
 %changelog
+* Sat Nov 23 2019 Al Stone <ahs3@redhat.com> - 20191018-1
+- Update to 20191019 source tree, including patch refeshes.
+
 * Tue Oct 29 2019 Al Stone <ahs3@redhat.com> - 20190816-1
 - Update to 20190816 source tree, including patch refeshes.
 - Add a patch to fix a non-zero exit from iasl -T ALL that actually succeeds
diff --git a/arm7hl.patch b/arm7hl.patch
index fb10291..75abf45 100644
--- a/arm7hl.patch
+++ b/arm7hl.patch
@@ -1,6 +1,7 @@
-diff -Naur acpica-unix2-20170119/source/include/acmacros.h acpica-unix2-20170119-arm7hl/source/include/acmacros.h
---- acpica-unix2-20170119/source/include/acmacros.h	2017-01-30 17:25:54.346151952 -0700
-+++ acpica-unix2-20170119-arm7hl/source/include/acmacros.h	2017-01-30 17:22:25.249388742 -0700
+Index: acpica-unix-20191018/source/include/acmacros.h
+===================================================================
+--- acpica-unix-20191018.orig/source/include/acmacros.h
++++ acpica-unix-20191018/source/include/acmacros.h
 @@ -178,6 +178,8 @@
  
  /* 16-bit source, 16/32/64 destination */
diff --git a/aslcodegen.patch b/aslcodegen.patch
index 9267f7e..2e2854e 100644
--- a/aslcodegen.patch
+++ b/aslcodegen.patch
@@ -4,10 +4,10 @@ support; this patch repairs that adaptation.
 
 Signed-off-by: Al Stone <ahs3@redhat.com>
 
-Index: acpica-unix-20190405/source/compiler/aslcodegen.c
+Index: acpica-unix-20191018/source/compiler/aslcodegen.c
 ===================================================================
---- acpica-unix-20190405.orig/source/compiler/aslcodegen.c
-+++ acpica-unix-20190405/source/compiler/aslcodegen.c
+--- acpica-unix-20191018.orig/source/compiler/aslcodegen.c
++++ acpica-unix-20191018/source/compiler/aslcodegen.c
 @@ -497,8 +497,7 @@ CgWriteTableHeader (
  
      /* Table length. Checksum zero for now, will rewrite later */
diff --git a/badexit.patch b/badexit.patch
index 6e8353e..6bcc699 100644
--- a/badexit.patch
+++ b/badexit.patch
@@ -3,10 +3,11 @@ it still exits with a non-zero value.  Exit with zero if all is well.
 
 Signed-off-by: Al Stone <ahs3@redhat.com>
 
-diff -Naur acpica-unix2-20190816/source/compiler/asloptions.c acpica-unix2-20190816.fix/source/compiler/asloptions.c
---- acpica-unix2-20190816/source/compiler/asloptions.c	2019-08-16 09:01:30.000000000 -0600
-+++ acpica-unix2-20190816.fix/source/compiler/asloptions.c	2019-10-29 15:52:40.987156555 -0600
-@@ -111,7 +111,7 @@
+Index: acpica-unix-20191018/source/compiler/asloptions.c
+===================================================================
+--- acpica-unix-20191018.orig/source/compiler/asloptions.c
++++ acpica-unix-20191018/source/compiler/asloptions.c
+@@ -111,7 +111,7 @@ AslCommandLine (
          {
              exit (-1);
          }
diff --git a/big-endian-dmtbdump.patch b/big-endian-dmtbdump.patch
new file mode 100644
index 0000000..fed81c1
--- /dev/null
+++ b/big-endian-dmtbdump.patch
@@ -0,0 +1,162 @@
+Index: acpica-unix-20191018/source/common/dmtbdump.c
+===================================================================
+--- acpica-unix-20191018.orig/source/common/dmtbdump.c
++++ acpica-unix-20191018/source/common/dmtbdump.c
+@@ -277,6 +277,8 @@ AcpiDmDumpRsdt (
+     UINT32                  Entries;
+     UINT32                  Offset;
+     UINT32                  i;
++    UINT32		    Length;
++    UINT32		    Address;
+ 
+ 
+     /* Point to start of table pointer array */
+@@ -286,12 +288,14 @@ AcpiDmDumpRsdt (
+ 
+     /* RSDT uses 32-bit pointers */
+ 
+-    Entries = (Table->Length - sizeof (ACPI_TABLE_HEADER)) / sizeof (UINT32);
++    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
++    Entries = (Length - sizeof (ACPI_TABLE_HEADER)) / sizeof (UINT32);
+ 
+     for (i = 0; i < Entries; i++)
+     {
+         AcpiDmLineHeader2 (Offset, sizeof (UINT32), "ACPI Table Address", i);
+-        AcpiOsPrintf ("%8.8X\n", Array[i]);
++	ACPI_MOVE_32_TO_32(&Address, &Array[i]);
++        AcpiOsPrintf ("%8.8X\n", Address);
+         Offset += sizeof (UINT32);
+     }
+ }
+@@ -317,6 +321,8 @@ AcpiDmDumpXsdt (
+     UINT32                  Entries;
+     UINT32                  Offset;
+     UINT32                  i;
++    UINT32                  Length;
++    UINT64		    Address;
+ 
+ 
+     /* Point to start of table pointer array */
+@@ -326,12 +332,14 @@ AcpiDmDumpXsdt (
+ 
+     /* XSDT uses 64-bit pointers */
+ 
+-    Entries = (Table->Length - sizeof (ACPI_TABLE_HEADER)) / sizeof (UINT64);
++    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
++    Entries = (Length - sizeof (ACPI_TABLE_HEADER)) / sizeof (UINT64);
+ 
+     for (i = 0; i < Entries; i++)
+     {
+         AcpiDmLineHeader2 (Offset, sizeof (UINT64), "ACPI Table Address", i);
+-        AcpiOsPrintf ("%8.8X%8.8X\n", ACPI_FORMAT_UINT64 (Array[i]));
++	ACPI_MOVE_64_TO_64(&Address, &Array[i]);
++        AcpiOsPrintf ("%8.8X%8.8X\n", ACPI_FORMAT_UINT64 (Address));
+         Offset += sizeof (UINT64);
+     }
+ }
+@@ -358,12 +366,12 @@ AcpiDmDumpFadt (
+     ACPI_TABLE_HEADER       *Table)
+ {
+     ACPI_STATUS             Status;
+-
++    UINT32		    Length;
+ 
+     /* Always dump the minimum FADT revision 1 fields (ACPI 1.0) */
+ 
+-    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
+-        AcpiDmTableInfoFadt1);
++    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
++    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoFadt1);
+     if (ACPI_FAILURE (Status))
+     {
+         return;
+@@ -371,11 +379,9 @@ AcpiDmDumpFadt (
+ 
+     /* Check for FADT revision 2 fields (ACPI 1.0B MS extensions) */
+ 
+-    if ((Table->Length > ACPI_FADT_V1_SIZE) &&
+-        (Table->Length <= ACPI_FADT_V2_SIZE))
++    if ((Length > ACPI_FADT_V1_SIZE) && (Length <= ACPI_FADT_V2_SIZE))
+     {
+-        Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
+-            AcpiDmTableInfoFadt2);
++        Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoFadt2);
+         if (ACPI_FAILURE (Status))
+         {
+             return;
+@@ -384,10 +390,9 @@ AcpiDmDumpFadt (
+ 
+     /* Check for FADT revision 3/4 fields and up (ACPI 2.0+ extended data) */
+ 
+-    else if (Table->Length > ACPI_FADT_V2_SIZE)
++    else if (Length > ACPI_FADT_V2_SIZE)
+     {
+-        Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
+-            AcpiDmTableInfoFadt3);
++        Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoFadt3);
+         if (ACPI_FAILURE (Status))
+         {
+             return;
+@@ -395,9 +400,9 @@ AcpiDmDumpFadt (
+ 
+         /* Check for FADT revision 5 fields and up (ACPI 5.0+) */
+ 
+-        if (Table->Length > ACPI_FADT_V3_SIZE)
++        if (Length > ACPI_FADT_V3_SIZE)
+         {
+-            Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
++            Status = AcpiDmDumpTable (Length, 0, Table, 0,
+                 AcpiDmTableInfoFadt5);
+             if (ACPI_FAILURE (Status))
+             {
+@@ -407,9 +412,9 @@ AcpiDmDumpFadt (
+ 
+         /* Check for FADT revision 6 fields and up (ACPI 6.0+) */
+ 
+-        if (Table->Length > ACPI_FADT_V3_SIZE)
++        if (Length > ACPI_FADT_V3_SIZE)
+         {
+-            Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
++            Status = AcpiDmDumpTable (Length, 0, Table, 0,
+                 AcpiDmTableInfoFadt6);
+             if (ACPI_FAILURE (Status))
+             {
+@@ -420,11 +425,11 @@ AcpiDmDumpFadt (
+ 
+     /* Validate various fields in the FADT, including length */
+ 
+-    AcpiTbCreateLocalFadt (Table, Table->Length);
++    AcpiTbCreateLocalFadt (Table, Length);
+ 
+     /* Validate FADT length against the revision */
+ 
+-    AcpiDmValidateFadtLength (Table->Revision, Table->Length);
++    AcpiDmValidateFadtLength (Table->Revision, Length);
+ }
+ 
+ 
+@@ -450,6 +455,7 @@ AcpiDmValidateFadtLength (
+     UINT32                  Length)
+ {
+     UINT32                  ExpectedLength;
++    UINT32		    Tmp32;
+ 
+ 
+     switch (Revision)
+@@ -485,7 +491,8 @@ AcpiDmValidateFadtLength (
+         return;
+     }
+ 
+-    if (Length == ExpectedLength)
++    ACPI_MOVE_32_TO_32(&Tmp32, &Length);
++    if (Tmp32 == ExpectedLength)
+     {
+         return;
+     }
+@@ -493,5 +500,5 @@ AcpiDmValidateFadtLength (
+     AcpiOsPrintf (
+         "\n// ACPI Warning: FADT revision %X does not match length: "
+         "found %X expected %X\n",
+-        Revision, Length, ExpectedLength);
++        Revision, Tmp32, ExpectedLength);
+ }
diff --git a/big-endian-dmtbdump1.patch b/big-endian-dmtbdump1.patch
new file mode 100644
index 0000000..ba37c6f
--- /dev/null
+++ b/big-endian-dmtbdump1.patch
@@ -0,0 +1,637 @@
+Index: acpica-unix-20191018/source/common/dmtbdump1.c
+===================================================================
+--- acpica-unix-20191018.orig/source/common/dmtbdump1.c
++++ acpica-unix-20191018/source/common/dmtbdump1.c
+@@ -79,17 +79,21 @@ AcpiDmDumpAsf (
+     UINT32                  DataOffset = 0;
+     UINT32                  i;
+     UINT8                   Type;
++    UINT32		    Len;
++    UINT16		    SubLen;
+ 
+ 
+     /* No main table, only subtables */
+ 
++    ACPI_MOVE_32_TO_32(&Len, &Table->Length);
+     Subtable = ACPI_ADD_PTR (ACPI_ASF_INFO, Table, Offset);
+-    while (Offset < Table->Length)
++    while (Offset < Len)
+     {
+         /* Common subtable header */
+ 
+-        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
+-            Subtable->Header.Length, AcpiDmTableInfoAsfHdr);
++	ACPI_MOVE_16_TO_16(&SubLen, &Subtable->Header.Length);
++        Status = AcpiDmDumpTable (Len, Offset, Subtable,
++            SubLen, AcpiDmTableInfoAsfHdr);
+         if (ACPI_FAILURE (Status))
+         {
+             return;
+@@ -146,8 +150,7 @@ AcpiDmDumpAsf (
+             return;
+         }
+ 
+-        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
+-            Subtable->Header.Length, InfoTable);
++        Status = AcpiDmDumpTable (Len, Offset, Subtable, SubLen, InfoTable);
+         if (ACPI_FAILURE (Status))
+         {
+             return;
+@@ -163,7 +166,7 @@ AcpiDmDumpAsf (
+             for (i = 0; i < DataCount; i++)
+             {
+                 AcpiOsPrintf ("\n");
+-                Status = AcpiDmDumpTable (Table->Length, DataOffset,
++                Status = AcpiDmDumpTable (Len, DataOffset,
+                     DataTable, DataLength, DataInfoTable);
+                 if (ACPI_FAILURE (Status))
+                 {
+@@ -209,15 +212,14 @@ AcpiDmDumpAsf (
+ 
+         /* Point to next subtable */
+ 
+-        if (!Subtable->Header.Length)
++        if (!SubLen)
+         {
+             AcpiOsPrintf ("Invalid zero subtable header length\n");
+             return;
+         }
+ 
+-        Offset += Subtable->Header.Length;
+-        Subtable = ACPI_ADD_PTR (ACPI_ASF_INFO, Subtable,
+-            Subtable->Header.Length);
++        Offset += SubLen;
++        Subtable = ACPI_ADD_PTR (ACPI_ASF_INFO, Subtable, SubLen);
+     }
+ }
+ 
+@@ -241,12 +243,13 @@ AcpiDmDumpCpep (
+ {
+     ACPI_STATUS             Status;
+     ACPI_CPEP_POLLING       *Subtable;
+-    UINT32                  Length = Table->Length;
++    UINT32                  Length;
+     UINT32                  Offset = sizeof (ACPI_TABLE_CPEP);
+ 
+ 
+     /* Main table */
+ 
++    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
+     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoCpep);
+     if (ACPI_FAILURE (Status))
+     {
+@@ -256,7 +259,7 @@ AcpiDmDumpCpep (
+     /* Subtables */
+ 
+     Subtable = ACPI_ADD_PTR (ACPI_CPEP_POLLING, Table, Offset);
+-    while (Offset < Table->Length)
++    while (Offset < Length)
+     {
+         AcpiOsPrintf ("\n");
+         Status = AcpiDmDumpTable (Length, Offset, Subtable,
+@@ -296,7 +299,10 @@ AcpiDmDumpCsrt (
+     ACPI_CSRT_GROUP         *Subtable;
+     ACPI_CSRT_SHARED_INFO   *SharedInfoTable;
+     ACPI_CSRT_DESCRIPTOR    *SubSubtable;
+-    UINT32                  Length = Table->Length;
++    UINT32                  Length;
++    UINT32                  SubLength;
++    UINT32                  SubSubLength;
++    UINT32                  SharedInfoLength;
+     UINT32                  Offset = sizeof (ACPI_TABLE_CSRT);
+     UINT32                  SubOffset;
+     UINT32                  SubSubOffset;
+@@ -307,14 +313,16 @@ AcpiDmDumpCsrt (
+ 
+     /* Subtables (Resource Groups) */
+ 
++    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
+     Subtable = ACPI_ADD_PTR (ACPI_CSRT_GROUP, Table, Offset);
+-    while (Offset < Table->Length)
++    while (Offset < Length)
+     {
+         /* Resource group subtable */
+ 
+         AcpiOsPrintf ("\n");
++        ACPI_MOVE_32_TO_32(&SubLength, &Subtable->Length);
+         Status = AcpiDmDumpTable (Length, Offset, Subtable,
+-            Subtable->Length, AcpiDmTableInfoCsrt0);
++            SubLength, AcpiDmTableInfoCsrt0);
+         if (ACPI_FAILURE (Status))
+         {
+             return;
+@@ -334,19 +342,20 @@ AcpiDmDumpCsrt (
+             return;
+         }
+ 
+-        SubOffset += Subtable->SharedInfoLength;
++	ACPI_MOVE_32_TO_32(&SharedInfoLength, &Subtable->SharedInfoLength);
++        SubOffset += SharedInfoLength;
+ 
+         /* Sub-Subtables (Resource Descriptors) */
+ 
+         SubSubtable = ACPI_ADD_PTR (ACPI_CSRT_DESCRIPTOR, Table,
+             Offset + SubOffset);
+ 
+-        while ((SubOffset < Subtable->Length) &&
+-              ((Offset + SubOffset) < Table->Length))
++        while ((SubOffset < SubLength) && ((Offset + SubOffset) < Length))
+         {
+             AcpiOsPrintf ("\n");
++	    ACPI_MOVE_32_TO_32(&SubSubLength, &SubSubtable->Length);
+             Status = AcpiDmDumpTable (Length, Offset + SubOffset, SubSubtable,
+-                SubSubtable->Length, AcpiDmTableInfoCsrt2);
++                SubSubLength, AcpiDmTableInfoCsrt2);
+             if (ACPI_FAILURE (Status))
+             {
+                 return;
+@@ -356,7 +365,7 @@ AcpiDmDumpCsrt (
+ 
+             /* Resource-specific info buffer */
+ 
+-            InfoLength = SubSubtable->Length - SubSubOffset;
++            InfoLength = SubSubLength - SubSubOffset;
+             if (InfoLength)
+             {
+                 Status = AcpiDmDumpTable (Length,
+@@ -370,16 +379,15 @@ AcpiDmDumpCsrt (
+ 
+             /* Point to next sub-subtable */
+ 
+-            SubOffset += SubSubtable->Length;
++            SubOffset += SubSubLength;
+             SubSubtable = ACPI_ADD_PTR (ACPI_CSRT_DESCRIPTOR, SubSubtable,
+-                SubSubtable->Length);
++                SubSubLength);
+         }
+ 
+         /* Point to next subtable */
+ 
+-        Offset += Subtable->Length;
+-        Subtable = ACPI_ADD_PTR (ACPI_CSRT_GROUP, Subtable,
+-            Subtable->Length);
++        Offset += SubLength;
++        Subtable = ACPI_ADD_PTR (ACPI_CSRT_GROUP, Subtable, SubLength);
+     }
+ }
+ 
+@@ -403,16 +411,20 @@ AcpiDmDumpDbg2 (
+ {
+     ACPI_STATUS             Status;
+     ACPI_DBG2_DEVICE        *Subtable;
+-    UINT32                  Length = Table->Length;
++    UINT32                  Length;
++    UINT16                  SubLength;
+     UINT32                  Offset = sizeof (ACPI_TABLE_DBG2);
+     UINT32                  i;
+     UINT32                  ArrayOffset;
+     UINT32                  AbsoluteOffset;
+     UINT8                   *Array;
++    UINT16		    Tmp16;
++    UINT16		    AlsoTmp16;
+ 
+ 
+     /* Main table */
+ 
++    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
+     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoDbg2);
+     if (ACPI_FAILURE (Status))
+     {
+@@ -422,11 +434,12 @@ AcpiDmDumpDbg2 (
+     /* Subtables */
+ 
+     Subtable = ACPI_ADD_PTR (ACPI_DBG2_DEVICE, Table, Offset);
+-    while (Offset < Table->Length)
++    while (Offset < Length)
+     {
+         AcpiOsPrintf ("\n");
++        ACPI_MOVE_16_TO_16(&SubLength, &Subtable->Length);
+         Status = AcpiDmDumpTable (Length, Offset, Subtable,
+-            Subtable->Length, AcpiDmTableInfoDbg2Device);
++            SubLength, AcpiDmTableInfoDbg2Device);
+         if (ACPI_FAILURE (Status))
+         {
+             return;
+@@ -436,13 +449,13 @@ AcpiDmDumpDbg2 (
+ 
+         for (i = 0; i < Subtable->RegisterCount; i++)
+         {
+-            ArrayOffset = Subtable->BaseAddressOffset +
+-                (sizeof (ACPI_GENERIC_ADDRESS) * i);
++	    ACPI_MOVE_16_TO_16(&Tmp16, &Subtable->BaseAddressOffset);
++            ArrayOffset = Tmp16 + (sizeof (ACPI_GENERIC_ADDRESS) * i);
+             AbsoluteOffset = Offset + ArrayOffset;
+             Array = (UINT8 *) Subtable + ArrayOffset;
+ 
+             Status = AcpiDmDumpTable (Length, AbsoluteOffset, Array,
+-                Subtable->Length, AcpiDmTableInfoDbg2Addr);
++                SubLength, AcpiDmTableInfoDbg2Addr);
+             if (ACPI_FAILURE (Status))
+             {
+                 return;
+@@ -453,13 +466,13 @@ AcpiDmDumpDbg2 (
+ 
+         for (i = 0; i < Subtable->RegisterCount; i++)
+         {
+-            ArrayOffset = Subtable->AddressSizeOffset +
+-                (sizeof (UINT32) * i);
++	    ACPI_MOVE_16_TO_16(&Tmp16, &Subtable->AddressSizeOffset);
++            ArrayOffset = Tmp16 + (sizeof (UINT32) * i);
+             AbsoluteOffset = Offset + ArrayOffset;
+             Array = (UINT8 *) Subtable + ArrayOffset;
+ 
+             Status = AcpiDmDumpTable (Length, AbsoluteOffset, Array,
+-                Subtable->Length, AcpiDmTableInfoDbg2Size);
++                SubLength, AcpiDmTableInfoDbg2Size);
+             if (ACPI_FAILURE (Status))
+             {
+                 return;
+@@ -469,12 +482,13 @@ AcpiDmDumpDbg2 (
+         /* Dump the Namestring (required) */
+ 
+         AcpiOsPrintf ("\n");
+-        ArrayOffset = Subtable->NamepathOffset;
++	ACPI_MOVE_16_TO_16(&Tmp16, &Subtable->NamepathOffset);
++        ArrayOffset = Tmp16;
+         AbsoluteOffset = Offset + ArrayOffset;
+         Array = (UINT8 *) Subtable + ArrayOffset;
+ 
+         Status = AcpiDmDumpTable (Length, AbsoluteOffset, Array,
+-            Subtable->Length, AcpiDmTableInfoDbg2Name);
++            SubLength, AcpiDmTableInfoDbg2Name);
+         if (ACPI_FAILURE (Status))
+         {
+             return;
+@@ -484,9 +498,10 @@ AcpiDmDumpDbg2 (
+ 
+         if (Subtable->OemDataOffset)
+         {
+-            Status = AcpiDmDumpTable (Length, Offset + Subtable->OemDataOffset,
+-                Table, Subtable->OemDataLength,
+-                AcpiDmTableInfoDbg2OemData);
++	    ACPI_MOVE_16_TO_16(&Tmp16, &Subtable->OemDataOffset);
++	    ACPI_MOVE_16_TO_16(&AlsoTmp16, &Subtable->OemDataLength);
++            Status = AcpiDmDumpTable (Length, Offset + Tmp16,
++                Table, AlsoTmp16, AcpiDmTableInfoDbg2OemData);
+             if (ACPI_FAILURE (Status))
+             {
+                 return;
+@@ -495,9 +510,9 @@ AcpiDmDumpDbg2 (
+ 
+         /* Point to next subtable */
+ 
+-        Offset += Subtable->Length;
++        Offset += SubLength;
+         Subtable = ACPI_ADD_PTR (ACPI_DBG2_DEVICE, Subtable,
+-            Subtable->Length);
++            SubLength);
+     }
+ }
+ 
+@@ -521,17 +536,20 @@ AcpiDmDumpDmar (
+ {
+     ACPI_STATUS             Status;
+     ACPI_DMAR_HEADER        *Subtable;
+-    UINT32                  Length = Table->Length;
++    UINT32                  Length;
++    UINT16                  SubLength;
+     UINT32                  Offset = sizeof (ACPI_TABLE_DMAR);
+     ACPI_DMTABLE_INFO       *InfoTable;
+     ACPI_DMAR_DEVICE_SCOPE  *ScopeTable;
+     UINT32                  ScopeOffset;
+     UINT8                   *PciPath;
+     UINT32                  PathOffset;
++    UINT16		    SubType;
+ 
+ 
+     /* Main table */
+ 
++    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
+     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoDmar);
+     if (ACPI_FAILURE (Status))
+     {
+@@ -541,13 +559,14 @@ AcpiDmDumpDmar (
+     /* Subtables */
+ 
+     Subtable = ACPI_ADD_PTR (ACPI_DMAR_HEADER, Table, Offset);
+-    while (Offset < Table->Length)
++    while (Offset < Length)
+     {
+         /* Common subtable header */
+ 
+         AcpiOsPrintf ("\n");
++	ACPI_MOVE_16_TO_16(&SubLength, &Subtable->Length);
+         Status = AcpiDmDumpTable (Length, Offset, Subtable,
+-            Subtable->Length, AcpiDmTableInfoDmarHdr);
++            SubLength, AcpiDmTableInfoDmarHdr);
+         if (ACPI_FAILURE (Status))
+         {
+             return;
+@@ -555,7 +574,8 @@ AcpiDmDumpDmar (
+ 
+         AcpiOsPrintf ("\n");
+ 
+-        switch (Subtable->Type)
++	ACPI_MOVE_16_TO_16(&SubType, &Subtable->Type);
++        switch (SubType)
+         {
+         case ACPI_DMAR_TYPE_HARDWARE_UNIT:
+ 
+@@ -590,12 +610,12 @@ AcpiDmDumpDmar (
+         default:
+ 
+             AcpiOsPrintf ("\n**** Unknown DMAR subtable type 0x%X\n\n",
+-                Subtable->Type);
++                SubType);
+             return;
+         }
+ 
+         Status = AcpiDmDumpTable (Length, Offset, Subtable,
+-            Subtable->Length, InfoTable);
++            SubLength, InfoTable);
+         if (ACPI_FAILURE (Status))
+         {
+             return;
+@@ -604,8 +624,8 @@ AcpiDmDumpDmar (
+         /*
+          * Dump the optional device scope entries
+          */
+-        if ((Subtable->Type == ACPI_DMAR_TYPE_HARDWARE_AFFINITY) ||
+-            (Subtable->Type == ACPI_DMAR_TYPE_NAMESPACE))
++        if ((SubType == ACPI_DMAR_TYPE_HARDWARE_AFFINITY) ||
++            (SubType == ACPI_DMAR_TYPE_NAMESPACE))
+         {
+             /* These types do not support device scopes */
+ 
+@@ -613,7 +633,7 @@ AcpiDmDumpDmar (
+         }
+ 
+         ScopeTable = ACPI_ADD_PTR (ACPI_DMAR_DEVICE_SCOPE, Subtable, ScopeOffset);
+-        while (ScopeOffset < Subtable->Length)
++        while (ScopeOffset < SubLength)
+         {
+             AcpiOsPrintf ("\n");
+             Status = AcpiDmDumpTable (Length, Offset + ScopeOffset, ScopeTable,
+@@ -654,9 +674,8 @@ AcpiDmDumpDmar (
+ NextSubtable:
+         /* Point to next subtable */
+ 
+-        Offset += Subtable->Length;
+-        Subtable = ACPI_ADD_PTR (ACPI_DMAR_HEADER, Subtable,
+-            Subtable->Length);
++        Offset += SubLength;
++        Subtable = ACPI_ADD_PTR (ACPI_DMAR_HEADER, Subtable, SubLength);
+     }
+ }
+ 
+@@ -683,12 +702,15 @@ AcpiDmDumpDrtm (
+     ACPI_DRTM_RESOURCE_LIST *DrtmRl;
+     ACPI_DRTM_DPS_ID        *DrtmDps;
+     UINT32                  Count;
++    UINT32                  ValidatedCount;
++    UINT32                  ResourceCount;
++    UINT32		    Length;
+ 
+ 
+     /* Main table */
+ 
+-    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
+-        AcpiDmTableInfoDrtm);
++    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
++    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoDrtm);
+     if (ACPI_FAILURE (Status))
+     {
+         return;
+@@ -702,7 +724,7 @@ AcpiDmDumpDrtm (
+ 
+     DrtmVtl = ACPI_ADD_PTR (ACPI_DRTM_VTABLE_LIST, Table, Offset);
+     AcpiOsPrintf ("\n");
+-    Status = AcpiDmDumpTable (Table->Length, Offset,
++    Status = AcpiDmDumpTable (Length, Offset,
+         DrtmVtl, ACPI_OFFSET (ACPI_DRTM_VTABLE_LIST, ValidatedTables),
+         AcpiDmTableInfoDrtm0);
+     if (ACPI_FAILURE (Status))
+@@ -715,10 +737,11 @@ AcpiDmDumpDrtm (
+     /* Dump Validated table addresses */
+ 
+     Count = 0;
+-    while ((Offset < Table->Length) &&
+-            (DrtmVtl->ValidatedTableCount > Count))
++    ACPI_MOVE_32_TO_32(&ValidatedCount, &DrtmVtl->ValidatedTableCount);
++    while ((Offset < Length) &&
++            (ValidatedCount > Count))
+     {
+-        Status = AcpiDmDumpTable (Table->Length, Offset,
++        Status = AcpiDmDumpTable (Length, Offset,
+             ACPI_ADD_PTR (void, Table, Offset), sizeof (UINT64),
+             AcpiDmTableInfoDrtm0a);
+         if (ACPI_FAILURE (Status))
+@@ -734,7 +757,7 @@ AcpiDmDumpDrtm (
+ 
+     DrtmRl = ACPI_ADD_PTR (ACPI_DRTM_RESOURCE_LIST, Table, Offset);
+     AcpiOsPrintf ("\n");
+-    Status = AcpiDmDumpTable (Table->Length, Offset,
++    Status = AcpiDmDumpTable (Length, Offset,
+         DrtmRl, ACPI_OFFSET (ACPI_DRTM_RESOURCE_LIST, Resources),
+         AcpiDmTableInfoDrtm1);
+     if (ACPI_FAILURE (Status))
+@@ -747,10 +770,11 @@ AcpiDmDumpDrtm (
+     /* Dump the Resource List */
+ 
+     Count = 0;
+-    while ((Offset < Table->Length) &&
+-           (DrtmRl->ResourceCount > Count))
++    ACPI_MOVE_32_TO_32(&ResourceCount, &DrtmRl->ResourceCount);
++    while ((Offset < Length) &&
++           (ResourceCount > Count))
+     {
+-        Status = AcpiDmDumpTable (Table->Length, Offset,
++        Status = AcpiDmDumpTable (Length, Offset,
+             ACPI_ADD_PTR (void, Table, Offset),
+             sizeof (ACPI_DRTM_RESOURCE), AcpiDmTableInfoDrtm1a);
+         if (ACPI_FAILURE (Status))
+@@ -766,7 +790,7 @@ AcpiDmDumpDrtm (
+ 
+     DrtmDps = ACPI_ADD_PTR (ACPI_DRTM_DPS_ID, Table, Offset);
+     AcpiOsPrintf ("\n");
+-    (void) AcpiDmDumpTable (Table->Length, Offset,
++    (void) AcpiDmDumpTable (Length, Offset,
+         DrtmDps, sizeof (ACPI_DRTM_DPS_ID), AcpiDmTableInfoDrtm2);
+ }
+ 
+@@ -790,12 +814,13 @@ AcpiDmDumpEinj (
+ {
+     ACPI_STATUS             Status;
+     ACPI_WHEA_HEADER        *Subtable;
+-    UINT32                  Length = Table->Length;
++    UINT32                  Length;
+     UINT32                  Offset = sizeof (ACPI_TABLE_EINJ);
+ 
+ 
+     /* Main table */
+ 
++    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
+     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoEinj);
+     if (ACPI_FAILURE (Status))
+     {
+@@ -805,7 +830,7 @@ AcpiDmDumpEinj (
+     /* Subtables */
+ 
+     Subtable = ACPI_ADD_PTR (ACPI_WHEA_HEADER, Table, Offset);
+-    while (Offset < Table->Length)
++    while (Offset < Length)
+     {
+         AcpiOsPrintf ("\n");
+         Status = AcpiDmDumpTable (Length, Offset, Subtable,
+@@ -843,12 +868,13 @@ AcpiDmDumpErst (
+ {
+     ACPI_STATUS             Status;
+     ACPI_WHEA_HEADER        *Subtable;
+-    UINT32                  Length = Table->Length;
++    UINT32                  Length;
+     UINT32                  Offset = sizeof (ACPI_TABLE_ERST);
+ 
+ 
+     /* Main table */
+ 
++    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
+     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoErst);
+     if (ACPI_FAILURE (Status))
+     {
+@@ -858,7 +884,7 @@ AcpiDmDumpErst (
+     /* Subtables */
+ 
+     Subtable = ACPI_ADD_PTR (ACPI_WHEA_HEADER, Table, Offset);
+-    while (Offset < Table->Length)
++    while (Offset < Length)
+     {
+         AcpiOsPrintf ("\n");
+         Status = AcpiDmDumpTable (Length, Offset, Subtable,
+@@ -896,17 +922,19 @@ AcpiDmDumpFpdt (
+ {
+     ACPI_STATUS             Status;
+     ACPI_FPDT_HEADER        *Subtable;
+-    UINT32                  Length = Table->Length;
++    UINT32                  Length;
+     UINT32                  Offset = sizeof (ACPI_TABLE_FPDT);
+     ACPI_DMTABLE_INFO       *InfoTable;
++    UINT16		    Type;
+ 
+ 
+     /* There is no main table (other than the standard ACPI header) */
+ 
+     /* Subtables */
+ 
++    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
+     Subtable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, Table, Offset);
+-    while (Offset < Table->Length)
++    while (Offset < Length)
+     {
+         /* Common subtable header */
+ 
+@@ -918,7 +946,8 @@ AcpiDmDumpFpdt (
+             return;
+         }
+ 
+-        switch (Subtable->Type)
++	ACPI_MOVE_16_TO_16(&Type, &Subtable->Type);
++        switch (Type)
+         {
+         case ACPI_FPDT_TYPE_BOOT:
+ 
+@@ -932,8 +961,7 @@ AcpiDmDumpFpdt (
+ 
+         default:
+ 
+-            AcpiOsPrintf ("\n**** Unknown FPDT subtable type 0x%X\n\n",
+-                Subtable->Type);
++            AcpiOsPrintf ("\n**** Unknown FPDT subtable type 0x%X\n\n", Type);
+ 
+             /* Attempt to continue */
+ 
+@@ -981,16 +1009,19 @@ AcpiDmDumpGtdt (
+ {
+     ACPI_STATUS             Status;
+     ACPI_GTDT_HEADER        *Subtable;
+-    UINT32                  Length = Table->Length;
++    UINT32                  Length;
++    UINT16                  SubLength;
+     UINT32                  Offset = sizeof (ACPI_TABLE_GTDT);
+     ACPI_DMTABLE_INFO       *InfoTable;
+     UINT32                  SubtableLength;
+     UINT32                  GtCount;
++    UINT32                  Tmp32;
+     ACPI_GTDT_TIMER_ENTRY   *GtxTable;
+ 
+ 
+     /* Main table */
+ 
++    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
+     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoGtdt);
+     if (ACPI_FAILURE (Status))
+     {
+@@ -1017,7 +1048,7 @@ AcpiDmDumpGtdt (
+ 
+     /* Subtables */
+ 
+-    while (Offset < Table->Length)
++    while (Offset < Length)
+     {
+         /* Common subtable header */
+ 
+@@ -1035,8 +1066,9 @@ AcpiDmDumpGtdt (
+         case ACPI_GTDT_TYPE_TIMER_BLOCK:
+ 
+             SubtableLength = sizeof (ACPI_GTDT_TIMER_BLOCK);
+-            GtCount = (ACPI_CAST_PTR (ACPI_GTDT_TIMER_BLOCK,
++            Tmp32 = (ACPI_CAST_PTR (ACPI_GTDT_TIMER_BLOCK,
+                 Subtable))->TimerCount;
++	    ACPI_MOVE_32_TO_32(&GtCount, &Tmp32);
+ 
+             InfoTable = AcpiDmTableInfoGtdt0;
+             break;
+@@ -1057,8 +1089,9 @@ AcpiDmDumpGtdt (
+             return;
+         }
+ 
++	ACPI_MOVE_16_TO_16(&SubLength, &Subtable->Length);
+         Status = AcpiDmDumpTable (Length, Offset, Subtable,
+-            Subtable->Length, InfoTable);
++            SubLength, InfoTable);
+         if (ACPI_FAILURE (Status))
+         {
+             return;
+@@ -1117,16 +1150,18 @@ AcpiDmDumpHest (
+ {
+     ACPI_STATUS             Status;
+     ACPI_HEST_HEADER        *Subtable;
+-    UINT32                  Length = Table->Length;
++    UINT32                  Length;
+     UINT32                  Offset = sizeof (ACPI_TABLE_HEST);
+     ACPI_DMTABLE_INFO       *InfoTable;
+     UINT32                  SubtableLength;
+     UINT32                  BankCount;
+     ACPI_HEST_IA_ERROR_BANK *BankTable;
++    UINT16		    SubType;
+ 
+ 
+     /* Main table */
+ 
++    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
+     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoHest);
+     if (ACPI_FAILURE (Status))
+     {
+@@ -1136,10 +1171,11 @@ AcpiDmDumpHest (
+     /* Subtables */
+ 
+     Subtable = ACPI_ADD_PTR (ACPI_HEST_HEADER, Table, Offset);
+-    while (Offset < Table->Length)
++    while (Offset < Length)
+     {
+         BankCount = 0;
+-        switch (Subtable->Type)
++	ACPI_MOVE_16_TO_16(&SubType, &Subtable->Type);
++        switch (SubType)
+         {
+         case ACPI_HEST_TYPE_IA32_CHECK:
+ 
diff --git a/big-endian-dmtbdump2.patch b/big-endian-dmtbdump2.patch
new file mode 100644
index 0000000..381da29
--- /dev/null
+++ b/big-endian-dmtbdump2.patch
@@ -0,0 +1,887 @@
+Index: acpica-unix-20191018/source/common/dmtbdump2.c
+===================================================================
+--- acpica-unix-20191018.orig/source/common/dmtbdump2.c
++++ acpica-unix-20191018/source/common/dmtbdump2.c
+@@ -75,16 +75,23 @@ AcpiDmDumpIort (
+     ACPI_IORT_SMMU          *IortSmmu = NULL;
+     UINT32                  Offset;
+     UINT32                  NodeOffset;
++    UINT16                  NodeLength;
+     UINT32                  Length;
+     ACPI_DMTABLE_INFO       *InfoTable;
+     char                    *String;
+     UINT32                  i;
+     UINT32                  MappingByteLength;
++    UINT32                  TableLen;
++    UINT32                  ItsCount;
++    UINT32                  MappingCount;
++    UINT32                  CtxIntCount;
++    UINT32                  PmuIntCount;
+ 
+ 
+     /* Main table */
+ 
+-    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoIort);
++    ACPI_MOVE_32_TO_32(&TableLen, &Table->Length);
++    Status = AcpiDmDumpTable (TableLen, 0, Table, 0, AcpiDmTableInfoIort);
+     if (ACPI_FAILURE (Status))
+     {
+         return;
+@@ -95,18 +102,19 @@ AcpiDmDumpIort (
+ 
+     /* Dump the OptionalPadding (optional) */
+ 
+-    if (Iort->NodeOffset > Offset)
++    ACPI_MOVE_32_TO_32(&NodeOffset, &Iort->NodeOffset);
++    if (NodeOffset > Offset)
+     {
+-        Status = AcpiDmDumpTable (Table->Length, Offset, Table,
+-            Iort->NodeOffset - Offset, AcpiDmTableInfoIortPad);
++        Status = AcpiDmDumpTable (TableLen, Offset, Table,
++            NodeOffset - Offset, AcpiDmTableInfoIortPad);
+         if (ACPI_FAILURE (Status))
+         {
+             return;
+         }
+     }
+ 
+-    Offset = Iort->NodeOffset;
+-    while (Offset < Table->Length)
++    ACPI_MOVE_32_TO_32(&Offset, &Iort->NodeOffset);
++    while (Offset < TableLen)
+     {
+         /* Common subtable header */
+ 
+@@ -142,7 +150,8 @@ AcpiDmDumpIort (
+         case ACPI_IORT_NODE_PCI_ROOT_COMPLEX:
+ 
+             InfoTable = AcpiDmTableInfoIort2;
+-            Length = IortNode->Length - NodeOffset;
++	    ACPI_MOVE_16_TO_16(&NodeLength, &IortNode->Length);
++            Length = NodeLength - NodeOffset;
+             break;
+ 
+         case ACPI_IORT_NODE_SMMU:
+@@ -155,7 +164,8 @@ AcpiDmDumpIort (
+         case ACPI_IORT_NODE_SMMU_V3:
+ 
+             InfoTable = AcpiDmTableInfoIort4;
+-            Length = IortNode->Length - NodeOffset;
++	    ACPI_MOVE_16_TO_16(&NodeLength, &IortNode->Length);
++            Length = NodeLength - NodeOffset;
+             break;
+ 
+         case ACPI_IORT_NODE_PMCG:
+@@ -171,7 +181,8 @@ AcpiDmDumpIort (
+ 
+             /* Attempt to continue */
+ 
+-            if (!IortNode->Length)
++	    ACPI_MOVE_16_TO_16(&NodeLength, &IortNode->Length);
++            if (!NodeLength)
+             {
+                 AcpiOsPrintf ("Invalid zero length IORT node\n");
+                 return;
+@@ -182,7 +193,7 @@ AcpiDmDumpIort (
+         /* Dump the node subtable header */
+ 
+         AcpiOsPrintf ("\n");
+-        Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
++        Status = AcpiDmDumpTable (TableLen, Offset + NodeOffset,
+             ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
+             Length, InfoTable);
+         if (ACPI_FAILURE (Status))
+@@ -202,9 +213,10 @@ AcpiDmDumpIort (
+ 
+             if (IortItsGroup)
+             {
+-                for (i = 0; i < IortItsGroup->ItsCount; i++)
++	        ACPI_MOVE_32_TO_32(&ItsCount, &IortItsGroup->ItsCount);
++                for (i = 0; i < ItsCount; i++)
+                 {
+-                    Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
++                    Status = AcpiDmDumpTable (TableLen, Offset + NodeOffset,
+                         ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
+                         4, AcpiDmTableInfoIort0a);
+                     if (ACPI_FAILURE (Status))
+@@ -221,12 +233,13 @@ AcpiDmDumpIort (
+ 
+             /* Dump the Padding (optional) */
+ 
+-            if (IortNode->Length > NodeOffset)
++	    ACPI_MOVE_16_TO_16(&NodeLength, &IortNode->Length);
++            if (NodeLength > NodeOffset)
+             {
+                 MappingByteLength =
+                     IortNode->MappingCount * sizeof (ACPI_IORT_ID_MAPPING);
+-                Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
+-                    Table, IortNode->Length - NodeOffset - MappingByteLength,
++                Status = AcpiDmDumpTable (TableLen, Offset + NodeOffset,
++                    Table, NodeLength - NodeOffset - MappingByteLength,
+                     AcpiDmTableInfoIort1a);
+                 if (ACPI_FAILURE (Status))
+                 {
+@@ -244,8 +257,8 @@ AcpiDmDumpIort (
+             if (IortSmmu)
+             {
+                 Length = 2 * sizeof (UINT64);
+-                NodeOffset = IortSmmu->GlobalInterruptOffset;
+-                Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
++                ACPI_MOVE_32_TO_32(&NodeOffset, &IortSmmu->GlobalInterruptOffset);
++                Status = AcpiDmDumpTable (TableLen, Offset + NodeOffset,
+                     ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
+                     Length, AcpiDmTableInfoIort3a);
+                 if (ACPI_FAILURE (Status))
+@@ -253,10 +266,11 @@ AcpiDmDumpIort (
+                     return;
+                 }
+ 
+-                NodeOffset = IortSmmu->ContextInterruptOffset;
+-                for (i = 0; i < IortSmmu->ContextInterruptCount; i++)
++                ACPI_MOVE_32_TO_32(&NodeOffset, &IortSmmu->ContextInterruptOffset);
++                ACPI_MOVE_32_TO_32(&CtxIntCount, &IortSmmu->ContextInterruptCount);
++                for (i = 0; i < CtxIntCount; i++)
+                 {
+-                    Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
++                    Status = AcpiDmDumpTable (TableLen, Offset + NodeOffset,
+                         ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
+                         8, AcpiDmTableInfoIort3b);
+                     if (ACPI_FAILURE (Status))
+@@ -267,10 +281,11 @@ AcpiDmDumpIort (
+                     NodeOffset += 8;
+                 }
+ 
+-                NodeOffset = IortSmmu->PmuInterruptOffset;
+-                for (i = 0; i < IortSmmu->PmuInterruptCount; i++)
++                ACPI_MOVE_32_TO_32(&NodeOffset, &IortSmmu->PmuInterruptOffset);
++                ACPI_MOVE_32_TO_32(&PmuIntCount, &IortSmmu->PmuInterruptCount);
++                for (i = 0; i < PmuIntCount; i++)
+                 {
+-                    Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
++                    Status = AcpiDmDumpTable (TableLen, Offset + NodeOffset,
+                         ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
+                         8, AcpiDmTableInfoIort3c);
+                     if (ACPI_FAILURE (Status))
+@@ -290,12 +305,13 @@ AcpiDmDumpIort (
+ 
+         /* Dump the ID mappings */
+ 
+-        NodeOffset = IortNode->MappingOffset;
+-        for (i = 0; i < IortNode->MappingCount; i++)
++        ACPI_MOVE_32_TO_32(&NodeOffset, &IortNode->MappingOffset);
++        ACPI_MOVE_32_TO_32(&MappingCount, &IortNode->MappingCount);
++        for (i = 0; i < MappingCount; i++)
+         {
+             AcpiOsPrintf ("\n");
+             Length = sizeof (ACPI_IORT_ID_MAPPING);
+-            Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
++            Status = AcpiDmDumpTable (TableLen, Offset + NodeOffset,
+                 ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
+                 Length, AcpiDmTableInfoIortMap);
+             if (ACPI_FAILURE (Status))
+@@ -309,7 +325,8 @@ AcpiDmDumpIort (
+ NextSubtable:
+         /* Point to next node subtable */
+ 
+-        Offset += IortNode->Length;
++        ACPI_MOVE_16_TO_16(&NodeLength, &IortNode->Length);
++        Offset += NodeLength;
+     }
+ }
+ 
+@@ -340,11 +357,14 @@ AcpiDmDumpIvrs (
+     ACPI_IVRS_DE_HEADER     *DeviceEntry;
+     ACPI_IVRS_HEADER        *Subtable;
+     ACPI_DMTABLE_INFO       *InfoTable;
++    UINT32		    Length;
++    UINT16		    SubLength;
+ 
+ 
+     /* Main table */
+ 
+-    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoIvrs);
++    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
++    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoIvrs);
+     if (ACPI_FAILURE (Status))
+     {
+         return;
+@@ -353,13 +373,14 @@ AcpiDmDumpIvrs (
+     /* Subtables */
+ 
+     Subtable = ACPI_ADD_PTR (ACPI_IVRS_HEADER, Table, Offset);
+-    while (Offset < Table->Length)
++    while (Offset < Length)
+     {
+         /* Common subtable header */
+ 
+         AcpiOsPrintf ("\n");
+-        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
+-            Subtable->Length, AcpiDmTableInfoIvrsHdr);
++        ACPI_MOVE_16_TO_16(&SubLength, &Subtable->Length);
++        Status = AcpiDmDumpTable (Length, Offset, Subtable,
++            SubLength, AcpiDmTableInfoIvrsHdr);
+         if (ACPI_FAILURE (Status))
+         {
+             return;
+@@ -386,7 +407,7 @@ AcpiDmDumpIvrs (
+ 
+             /* Attempt to continue */
+ 
+-            if (!Subtable->Length)
++            if (!SubLength)
+             {
+                 AcpiOsPrintf ("Invalid zero length subtable\n");
+                 return;
+@@ -397,8 +418,8 @@ AcpiDmDumpIvrs (
+         /* Dump the subtable */
+ 
+         AcpiOsPrintf ("\n");
+-        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
+-            Subtable->Length, InfoTable);
++        Status = AcpiDmDumpTable (Length, Offset, Subtable,
++            SubLength, InfoTable);
+         if (ACPI_FAILURE (Status))
+         {
+             return;
+@@ -412,7 +433,7 @@ AcpiDmDumpIvrs (
+             DeviceEntry = ACPI_ADD_PTR (ACPI_IVRS_DE_HEADER, Subtable,
+                 sizeof (ACPI_IVRS_HARDWARE));
+ 
+-            while (EntryOffset < (Offset + Subtable->Length))
++            while (EntryOffset < (Offset + SubLength))
+             {
+                 AcpiOsPrintf ("\n");
+                 /*
+@@ -474,7 +495,7 @@ AcpiDmDumpIvrs (
+ 
+                 /* Dump the Device Entry */
+ 
+-                Status = AcpiDmDumpTable (Table->Length, EntryOffset,
++                Status = AcpiDmDumpTable (Length, EntryOffset,
+                     DeviceEntry, EntryLength, InfoTable);
+                 if (ACPI_FAILURE (Status))
+                 {
+@@ -490,8 +511,8 @@ AcpiDmDumpIvrs (
+ NextSubtable:
+         /* Point to next subtable */
+ 
+-        Offset += Subtable->Length;
+-        Subtable = ACPI_ADD_PTR (ACPI_IVRS_HEADER, Subtable, Subtable->Length);
++        Offset += SubLength;
++        Subtable = ACPI_ADD_PTR (ACPI_IVRS_HEADER, Subtable, SubLength);
+     }
+ }
+ 
+@@ -517,7 +538,7 @@ AcpiDmDumpLpit (
+ {
+     ACPI_STATUS             Status;
+     ACPI_LPIT_HEADER        *Subtable;
+-    UINT32                  Length = Table->Length;
++    UINT32                  Length;
+     UINT32                  Offset = sizeof (ACPI_TABLE_LPIT);
+     ACPI_DMTABLE_INFO       *InfoTable;
+     UINT32                  SubtableLength;
+@@ -525,8 +546,9 @@ AcpiDmDumpLpit (
+ 
+     /* Subtables */
+ 
++    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
+     Subtable = ACPI_ADD_PTR (ACPI_LPIT_HEADER, Table, Offset);
+-    while (Offset < Table->Length)
++    while (Offset < Length)
+     {
+         /* Common subtable header */
+ 
+@@ -590,13 +612,14 @@ AcpiDmDumpMadt (
+ {
+     ACPI_STATUS             Status;
+     ACPI_SUBTABLE_HEADER    *Subtable;
+-    UINT32                  Length = Table->Length;
++    UINT32                  Length;
+     UINT32                  Offset = sizeof (ACPI_TABLE_MADT);
+     ACPI_DMTABLE_INFO       *InfoTable;
+ 
+ 
+     /* Main table */
+ 
++    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
+     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoMadt);
+     if (ACPI_FAILURE (Status))
+     {
+@@ -606,7 +629,7 @@ AcpiDmDumpMadt (
+     /* Subtables */
+ 
+     Subtable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Table, Offset);
+-    while (Offset < Table->Length)
++    while (Offset < Length)
+     {
+         /* Common subtable header */
+ 
+@@ -752,11 +775,13 @@ AcpiDmDumpMcfg (
+     ACPI_STATUS             Status;
+     UINT32                  Offset = sizeof (ACPI_TABLE_MCFG);
+     ACPI_MCFG_ALLOCATION    *Subtable;
++    UINT32		    Len;
+ 
+ 
+     /* Main table */
+ 
+-    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoMcfg);
++    ACPI_MOVE_32_TO_32(&Len, &Table->Length);
++    Status = AcpiDmDumpTable (Len, 0, Table, 0, AcpiDmTableInfoMcfg);
+     if (ACPI_FAILURE (Status))
+     {
+         return;
+@@ -765,17 +790,17 @@ AcpiDmDumpMcfg (
+     /* Subtables */
+ 
+     Subtable = ACPI_ADD_PTR (ACPI_MCFG_ALLOCATION, Table, Offset);
+-    while (Offset < Table->Length)
++    while (Offset < Len)
+     {
+-        if (Offset + sizeof (ACPI_MCFG_ALLOCATION) > Table->Length)
++        if (Offset + sizeof (ACPI_MCFG_ALLOCATION) > Len)
+         {
+             AcpiOsPrintf ("Warning: there are %u invalid trailing bytes\n",
+-                (UINT32) sizeof (ACPI_MCFG_ALLOCATION) - (Offset - Table->Length));
++                (UINT32) sizeof (ACPI_MCFG_ALLOCATION) - (Offset - Len));
+             return;
+         }
+ 
+         AcpiOsPrintf ("\n");
+-        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
++        Status = AcpiDmDumpTable (Len, Offset, Subtable,
+             sizeof (ACPI_MCFG_ALLOCATION), AcpiDmTableInfoMcfg0);
+         if (ACPI_FAILURE (Status))
+         {
+@@ -809,6 +834,7 @@ AcpiDmDumpMpst (
+ {
+     ACPI_STATUS             Status;
+     UINT32                  Offset = sizeof (ACPI_TABLE_MPST);
++    ACPI_TABLE_MPST	    *Mpst;
+     ACPI_MPST_POWER_NODE    *Subtable0;
+     ACPI_MPST_POWER_STATE   *Subtable0A;
+     ACPI_MPST_COMPONENT     *Subtable0B;
+@@ -817,11 +843,13 @@ AcpiDmDumpMpst (
+     UINT16                  SubtableCount;
+     UINT32                  PowerStateCount;
+     UINT32                  ComponentCount;
++    UINT32		    Length;
+ 
+ 
+     /* Main table */
+ 
+-    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoMpst);
++    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
++    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoMpst);
+     if (ACPI_FAILURE (Status))
+     {
+         return;
+@@ -829,13 +857,14 @@ AcpiDmDumpMpst (
+ 
+     /* Subtable: Memory Power Node(s) */
+ 
+-    SubtableCount = (ACPI_CAST_PTR (ACPI_TABLE_MPST, Table))->PowerNodeCount;
++    Mpst = ACPI_CAST_PTR (ACPI_TABLE_MPST, Table);
++    ACPI_MOVE_16_TO_16(&SubtableCount, &Mpst->PowerNodeCount);
+     Subtable0 = ACPI_ADD_PTR (ACPI_MPST_POWER_NODE, Table, Offset);
+ 
+-    while ((Offset < Table->Length) && SubtableCount)
++    while ((Offset < Length) && SubtableCount)
+     {
+         AcpiOsPrintf ("\n");
+-        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable0,
++        Status = AcpiDmDumpTable (Length, Offset, Subtable0,
+             sizeof (ACPI_MPST_POWER_NODE), AcpiDmTableInfoMpst0);
+         if (ACPI_FAILURE (Status))
+         {
+@@ -844,8 +873,8 @@ AcpiDmDumpMpst (
+ 
+         /* Extract the sub-subtable counts */
+ 
+-        PowerStateCount = Subtable0->NumPowerStates;
+-        ComponentCount = Subtable0->NumPhysicalComponents;
++        ACPI_MOVE_32_TO_32(&PowerStateCount, &Subtable0->NumPowerStates);
++        ACPI_MOVE_32_TO_32(&ComponentCount, &Subtable0->NumPhysicalComponents);
+         Offset += sizeof (ACPI_MPST_POWER_NODE);
+ 
+         /* Sub-subtables - Memory Power State Structure(s) */
+@@ -856,7 +885,7 @@ AcpiDmDumpMpst (
+         while (PowerStateCount)
+         {
+             AcpiOsPrintf ("\n");
+-            Status = AcpiDmDumpTable (Table->Length, Offset, Subtable0A,
++            Status = AcpiDmDumpTable (Length, Offset, Subtable0A,
+                 sizeof (ACPI_MPST_POWER_STATE), AcpiDmTableInfoMpst0A);
+             if (ACPI_FAILURE (Status))
+             {
+@@ -866,7 +895,7 @@ AcpiDmDumpMpst (
+             Subtable0A++;
+             PowerStateCount--;
+             Offset += sizeof (ACPI_MPST_POWER_STATE);
+-       }
++        }
+ 
+         /* Sub-subtables - Physical Component ID Structure(s) */
+ 
+@@ -879,7 +908,7 @@ AcpiDmDumpMpst (
+ 
+         while (ComponentCount)
+         {
+-            Status = AcpiDmDumpTable (Table->Length, Offset, Subtable0B,
++            Status = AcpiDmDumpTable (Length, Offset, Subtable0B,
+                 sizeof (ACPI_MPST_COMPONENT), AcpiDmTableInfoMpst0B);
+             if (ACPI_FAILURE (Status))
+             {
+@@ -894,17 +923,19 @@ AcpiDmDumpMpst (
+         /* Point to next Memory Power Node subtable */
+ 
+         SubtableCount--;
++        ACPI_MOVE_32_TO_32(&PowerStateCount, &Subtable0->NumPowerStates);
++        ACPI_MOVE_32_TO_32(&ComponentCount, &Subtable0->NumPhysicalComponents);
+         Subtable0 = ACPI_ADD_PTR (ACPI_MPST_POWER_NODE, Subtable0,
+             sizeof (ACPI_MPST_POWER_NODE) +
+-            (sizeof (ACPI_MPST_POWER_STATE) * Subtable0->NumPowerStates) +
+-            (sizeof (ACPI_MPST_COMPONENT) * Subtable0->NumPhysicalComponents));
++            (sizeof (ACPI_MPST_POWER_STATE) * PowerStateCount) +
++            (sizeof (ACPI_MPST_COMPONENT) * ComponentCount));
+     }
+ 
+     /* Subtable: Count of Memory Power State Characteristic structures */
+ 
+     AcpiOsPrintf ("\n");
+     Subtable1 = ACPI_CAST_PTR (ACPI_MPST_DATA_HDR, Subtable0);
+-    Status = AcpiDmDumpTable (Table->Length, Offset, Subtable1,
++    Status = AcpiDmDumpTable (Length, Offset, Subtable1,
+         sizeof (ACPI_MPST_DATA_HDR), AcpiDmTableInfoMpst1);
+     if (ACPI_FAILURE (Status))
+     {
+@@ -919,10 +950,10 @@ AcpiDmDumpMpst (
+     Subtable2 = ACPI_ADD_PTR (ACPI_MPST_POWER_DATA, Subtable1,
+         sizeof (ACPI_MPST_DATA_HDR));
+ 
+-    while ((Offset < Table->Length) && SubtableCount)
++    while ((Offset < Length) && SubtableCount)
+     {
+         AcpiOsPrintf ("\n");
+-        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable2,
++        Status = AcpiDmDumpTable (Length, Offset, Subtable2,
+             sizeof (ACPI_MPST_POWER_DATA), AcpiDmTableInfoMpst2);
+         if (ACPI_FAILURE (Status))
+         {
+@@ -955,11 +986,13 @@ AcpiDmDumpMsct (
+     ACPI_STATUS             Status;
+     UINT32                  Offset = sizeof (ACPI_TABLE_MSCT);
+     ACPI_MSCT_PROXIMITY     *Subtable;
++    UINT32		    Length;
+ 
+ 
+     /* Main table */
+ 
+-    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoMsct);
++    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
++    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoMsct);
+     if (ACPI_FAILURE (Status))
+     {
+         return;
+@@ -968,12 +1001,12 @@ AcpiDmDumpMsct (
+     /* Subtables */
+ 
+     Subtable = ACPI_ADD_PTR (ACPI_MSCT_PROXIMITY, Table, Offset);
+-    while (Offset < Table->Length)
++    while (Offset < Length)
+     {
+         /* Common subtable header */
+ 
+         AcpiOsPrintf ("\n");
+-        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
++        Status = AcpiDmDumpTable (Length, Offset, Subtable,
+             sizeof (ACPI_MSCT_PROXIMITY), AcpiDmTableInfoMsct0);
+         if (ACPI_FAILURE (Status))
+         {
+@@ -1008,11 +1041,13 @@ AcpiDmDumpMtmr (
+     ACPI_STATUS             Status;
+     UINT32                  Offset = sizeof (ACPI_TABLE_MTMR);
+     ACPI_MTMR_ENTRY         *Subtable;
++    UINT32		    Length;
+ 
+ 
+     /* Main table */
+ 
+-    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoMtmr);
++    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
++    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoMtmr);
+     if (ACPI_FAILURE (Status))
+     {
+         return;
+@@ -1021,12 +1056,12 @@ AcpiDmDumpMtmr (
+     /* Subtables */
+ 
+     Subtable = ACPI_ADD_PTR (ACPI_MTMR_ENTRY, Table, Offset);
+-    while (Offset < Table->Length)
++    while (Offset < Length)
+     {
+         /* Common subtable header */
+ 
+         AcpiOsPrintf ("\n");
+-        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
++        Status = AcpiDmDumpTable (Length, Offset, Subtable,
+             sizeof (ACPI_MTMR_ENTRY), AcpiDmTableInfoMtmr0);
+         if (ACPI_FAILURE (Status))
+         {
+@@ -1068,11 +1103,17 @@ AcpiDmDumpNfit (
+     ACPI_NFIT_SMBIOS        *SmbiosInfo = NULL;
+     ACPI_NFIT_FLUSH_ADDRESS *Hint = NULL;
+     UINT32                  i;
++    UINT32                  TableLength;
++    UINT16                  SubLength;
++    UINT16                  SubType;
++    UINT32                  Count;
++    UINT16                  Count16;
+ 
+ 
+     /* Main table */
+ 
+-    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoNfit);
++    ACPI_MOVE_32_TO_32(&TableLength, &Table->Length);
++    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoNfit);
+     if (ACPI_FAILURE (Status))
+     {
+         return;
+@@ -1081,19 +1122,21 @@ AcpiDmDumpNfit (
+     /* Subtables */
+ 
+     Subtable = ACPI_ADD_PTR (ACPI_NFIT_HEADER, Table, Offset);
+-    while (Offset < Table->Length)
++    while (Offset < TableLength)
+     {
+         /* NFIT subtable header */
+ 
+         AcpiOsPrintf ("\n");
+-        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
+-            Subtable->Length, AcpiDmTableInfoNfitHdr);
++	ACPI_MOVE_16_TO_16(&SubLength, &Subtable->Length);
++        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
++            SubLength, AcpiDmTableInfoNfitHdr);
+         if (ACPI_FAILURE (Status))
+         {
+             return;
+         }
+ 
+-        switch (Subtable->Type)
++	ACPI_MOVE_16_TO_16(&SubType, &Subtable->Type);
++        switch (SubType)
+         {
+         case ACPI_NFIT_TYPE_SYSTEM_ADDRESS:
+ 
+@@ -1148,7 +1191,7 @@ AcpiDmDumpNfit (
+ 
+             /* Attempt to continue */
+ 
+-            if (!Subtable->Length)
++            if (!SubLength)
+             {
+                 AcpiOsPrintf ("Invalid zero length subtable\n");
+                 return;
+@@ -1157,8 +1200,8 @@ AcpiDmDumpNfit (
+         }
+ 
+         AcpiOsPrintf ("\n");
+-        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
+-            Subtable->Length, InfoTable);
++        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
++            SubLength, InfoTable);
+         if (ACPI_FAILURE (Status))
+         {
+             return;
+@@ -1166,14 +1209,15 @@ AcpiDmDumpNfit (
+ 
+         /* Per-subtable variable-length fields */
+ 
+-        switch (Subtable->Type)
++        switch (SubType)
+         {
+         case ACPI_NFIT_TYPE_INTERLEAVE:
+ 
+             Interleave = ACPI_CAST_PTR (ACPI_NFIT_INTERLEAVE, Subtable);
+-            for (i = 0; i < Interleave->LineCount; i++)
++	    ACPI_MOVE_32_TO_32(&Count, &Interleave->LineCount);
++            for (i = 0; i < Count; i++)
+             {
+-                Status = AcpiDmDumpTable (Table->Length, Offset + FieldOffset,
++                Status = AcpiDmDumpTable (TableLength, Offset + FieldOffset,
+                     &Interleave->LineOffset[i],
+                     sizeof (UINT32), AcpiDmTableInfoNfit2a);
+                 if (ACPI_FAILURE (Status))
+@@ -1187,12 +1231,11 @@ AcpiDmDumpNfit (
+ 
+         case ACPI_NFIT_TYPE_SMBIOS:
+ 
+-            Length = Subtable->Length -
+-                sizeof (ACPI_NFIT_SMBIOS) + sizeof (UINT8);
++            Length = SubLength - sizeof (ACPI_NFIT_SMBIOS) + sizeof (UINT8);
+ 
+             if (Length)
+             {
+-                Status = AcpiDmDumpTable (Table->Length,
++                Status = AcpiDmDumpTable (TableLength,
+                     sizeof (ACPI_NFIT_SMBIOS) - sizeof (UINT8),
+                     SmbiosInfo,
+                     Length, AcpiDmTableInfoNfit3a);
+@@ -1207,9 +1250,10 @@ AcpiDmDumpNfit (
+         case ACPI_NFIT_TYPE_FLUSH_ADDRESS:
+ 
+             Hint = ACPI_CAST_PTR (ACPI_NFIT_FLUSH_ADDRESS, Subtable);
+-            for (i = 0; i < Hint->HintCount; i++)
++	    ACPI_MOVE_16_TO_16(&Count16, &Hint->HintCount);
++            for (i = 0; i < Count16; i++)
+             {
+-                Status = AcpiDmDumpTable (Table->Length, Offset + FieldOffset,
++                Status = AcpiDmDumpTable (TableLength, Offset + FieldOffset,
+                     &Hint->HintAddress[i],
+                     sizeof (UINT64), AcpiDmTableInfoNfit6a);
+                 if (ACPI_FAILURE (Status))
+@@ -1228,8 +1272,8 @@ AcpiDmDumpNfit (
+ NextSubtable:
+         /* Point to next subtable */
+ 
+-        Offset += Subtable->Length;
+-        Subtable = ACPI_ADD_PTR (ACPI_NFIT_HEADER, Subtable, Subtable->Length);
++        Offset += SubLength;
++        Subtable = ACPI_ADD_PTR (ACPI_NFIT_HEADER, Subtable, SubLength);
+     }
+ }
+ 
+@@ -1254,12 +1298,13 @@ AcpiDmDumpPcct (
+     ACPI_STATUS             Status;
+     ACPI_PCCT_SUBSPACE      *Subtable;
+     ACPI_DMTABLE_INFO       *InfoTable;
+-    UINT32                  Length = Table->Length;
++    UINT32                  Length;
+     UINT32                  Offset = sizeof (ACPI_TABLE_PCCT);
+ 
+ 
+     /* Main table */
+ 
++    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
+     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoPcct);
+     if (ACPI_FAILURE (Status))
+     {
+@@ -1269,7 +1314,7 @@ AcpiDmDumpPcct (
+     /* Subtables */
+ 
+     Subtable = ACPI_ADD_PTR (ACPI_PCCT_SUBSPACE, Table, Offset);
+-    while (Offset < Table->Length)
++    while (Offset < Length)
+     {
+         /* Common subtable header */
+ 
+@@ -1409,16 +1454,21 @@ AcpiDmDumpPmtt (
+     ACPI_PMTT_HEADER        *MemSubtable;
+     ACPI_PMTT_HEADER        *DimmSubtable;
+     ACPI_PMTT_DOMAIN        *DomainArray;
+-    UINT32                  Length = Table->Length;
++    UINT32                  Length;
+     UINT32                  Offset = sizeof (ACPI_TABLE_PMTT);
+     UINT32                  MemOffset;
+     UINT32                  DimmOffset;
+     UINT32                  DomainOffset;
+-    UINT32                  DomainCount;
++    UINT16                  DomainCount;
++    UINT16		    SubLength;
++    UINT16		    Tmp16;
++    UINT16		    MemLength;
++    UINT16		    DimmLength;
+ 
+ 
+     /* Main table */
+ 
++    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
+     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoPmtt);
+     if (ACPI_FAILURE (Status))
+     {
+@@ -1428,13 +1478,14 @@ AcpiDmDumpPmtt (
+     /* Subtables */
+ 
+     Subtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, Table, Offset);
+-    while (Offset < Table->Length)
++    while (Offset < Length)
+     {
+         /* Common subtable header */
+ 
+         AcpiOsPrintf ("\n");
++        ACPI_MOVE_16_TO_16(&SubLength, &Subtable->Length);
+         Status = AcpiDmDumpTable (Length, Offset, Subtable,
+-            Subtable->Length, AcpiDmTableInfoPmttHdr);
++            SubLength, AcpiDmTableInfoPmttHdr);
+         if (ACPI_FAILURE (Status))
+         {
+             return;
+@@ -1453,7 +1504,7 @@ AcpiDmDumpPmtt (
+         /* Dump the fixed-length portion of the subtable */
+ 
+         Status = AcpiDmDumpTable (Length, Offset, Subtable,
+-            Subtable->Length, AcpiDmTableInfoPmtt0);
++            SubLength, AcpiDmTableInfoPmtt0);
+         if (ACPI_FAILURE (Status))
+         {
+             return;
+@@ -1465,15 +1516,16 @@ AcpiDmDumpPmtt (
+         MemSubtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, Subtable,
+             sizeof (ACPI_PMTT_SOCKET));
+ 
+-        while (((Offset + MemOffset) < Table->Length) &&
+-            (MemOffset < Subtable->Length))
++        while (((Offset + MemOffset) < Length) &&
++            (MemOffset < SubLength))
+         {
+             /* Common subtable header */
+ 
+             AcpiOsPrintf ("\n");
++	    ACPI_MOVE_16_TO_16(&MemLength, &MemSubtable->Length);
+             Status = AcpiDmDumpTable (Length,
+                 Offset + MemOffset, MemSubtable,
+-                MemSubtable->Length, AcpiDmTableInfoPmttHdr);
++                MemLength, AcpiDmTableInfoPmttHdr);
+             if (ACPI_FAILURE (Status))
+             {
+                 return;
+@@ -1493,7 +1545,7 @@ AcpiDmDumpPmtt (
+ 
+             Status = AcpiDmDumpTable (Length,
+                 Offset + MemOffset, MemSubtable,
+-                MemSubtable->Length, AcpiDmTableInfoPmtt1);
++                MemLength, AcpiDmTableInfoPmtt1);
+             if (ACPI_FAILURE (Status))
+             {
+                 return;
+@@ -1501,13 +1553,14 @@ AcpiDmDumpPmtt (
+ 
+             /* Walk the variable count of proximity domains */
+ 
+-            DomainCount = ((ACPI_PMTT_CONTROLLER *) MemSubtable)->DomainCount;
++	    Tmp16 = ((ACPI_PMTT_CONTROLLER *) MemSubtable)->DomainCount;
++            ACPI_MOVE_16_TO_16(&DomainCount, &Tmp16);
+             DomainOffset = sizeof (ACPI_PMTT_CONTROLLER);
+             DomainArray = ACPI_ADD_PTR (ACPI_PMTT_DOMAIN, MemSubtable,
+                 sizeof (ACPI_PMTT_CONTROLLER));
+ 
+-            while (((Offset + MemOffset + DomainOffset) < Table->Length) &&
+-                ((MemOffset + DomainOffset) < Subtable->Length) &&
++            while (((Offset + MemOffset + DomainOffset) < Length) &&
++                ((MemOffset + DomainOffset) < SubLength) &&
+                 DomainCount)
+             {
+                 Status = AcpiDmDumpTable (Length,
+@@ -1535,15 +1588,16 @@ AcpiDmDumpPmtt (
+             DimmSubtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, MemSubtable,
+                 DomainOffset);
+ 
+-            while (((Offset + MemOffset + DimmOffset) < Table->Length) &&
+-                (DimmOffset < MemSubtable->Length))
++            while (((Offset + MemOffset + DimmOffset) < Length) &&
++                (DimmOffset < MemLength))
+             {
+                 /* Common subtable header */
+ 
+                 AcpiOsPrintf ("\n");
++		ACPI_MOVE_16_TO_16(&DimmLength, &DimmSubtable->Length);
+                 Status = AcpiDmDumpTable (Length,
+                     Offset + MemOffset + DimmOffset, DimmSubtable,
+-                    DimmSubtable->Length, AcpiDmTableInfoPmttHdr);
++                    DimmLength, AcpiDmTableInfoPmttHdr);
+                 if (ACPI_FAILURE (Status))
+                 {
+                     return;
+@@ -1563,7 +1617,7 @@ AcpiDmDumpPmtt (
+ 
+                 Status = AcpiDmDumpTable (Length,
+                     Offset + MemOffset + DimmOffset, DimmSubtable,
+-                    DimmSubtable->Length, AcpiDmTableInfoPmtt2);
++                    DimmLength, AcpiDmTableInfoPmtt2);
+                 if (ACPI_FAILURE (Status))
+                 {
+                     return;
+@@ -1571,23 +1625,22 @@ AcpiDmDumpPmtt (
+ 
+                 /* Point to next DIMM subtable */
+ 
+-                DimmOffset += DimmSubtable->Length;
++                DimmOffset += DimmLength;
+                 DimmSubtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER,
+-                    DimmSubtable, DimmSubtable->Length);
++                    DimmSubtable, DimmLength);
+             }
+ 
+             /* Point to next Controller subtable */
+ 
+-            MemOffset += MemSubtable->Length;
++            MemOffset += MemLength;
+             MemSubtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER,
+-                MemSubtable, MemSubtable->Length);
++                MemSubtable, MemLength);
+         }
+ 
+         /* Point to next Socket subtable */
+ 
+-        Offset += Subtable->Length;
+-        Subtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER,
+-            Subtable, Subtable->Length);
++        Offset += SubLength;
++        Subtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, Subtable, SubLength);
+     }
+ }
+ 
+@@ -1748,6 +1801,8 @@ AcpiDmDumpS3pt (
+     ACPI_FPDT_HEADER        *Subtable;
+     ACPI_DMTABLE_INFO       *InfoTable;
+     ACPI_TABLE_S3PT         *S3ptTable = ACPI_CAST_PTR (ACPI_TABLE_S3PT, Tables);
++    UINT32		    Length;
++    UINT16                  SubType;
+ 
+ 
+     /* Main table */
+@@ -1758,20 +1813,22 @@ AcpiDmDumpS3pt (
+         return 0;
+     }
+ 
++    ACPI_MOVE_32_TO_32(&Length, &S3ptTable->Length);
+     Subtable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, S3ptTable, Offset);
+-    while (Offset < S3ptTable->Length)
++    while (Offset < Length)
+     {
+         /* Common subtable header */
+ 
+         AcpiOsPrintf ("\n");
+-        Status = AcpiDmDumpTable (S3ptTable->Length, Offset, Subtable,
++        Status = AcpiDmDumpTable (Length, Offset, Subtable,
+             Subtable->Length, AcpiDmTableInfoS3ptHdr);
+         if (ACPI_FAILURE (Status))
+         {
+             return 0;
+         }
+ 
+-        switch (Subtable->Type)
++        ACPI_MOVE_16_TO_16(&SubType, &Subtable->Type);
++        switch (SubType)
+         {
+         case ACPI_S3PT_TYPE_RESUME:
+ 
+@@ -1786,7 +1843,7 @@ AcpiDmDumpS3pt (
+         default:
+ 
+             AcpiOsPrintf ("\n**** Unknown S3PT subtable type 0x%X\n",
+-                Subtable->Type);
++                SubType);
+ 
+             /* Attempt to continue */
+ 
+@@ -1799,7 +1856,7 @@ AcpiDmDumpS3pt (
+         }
+ 
+         AcpiOsPrintf ("\n");
+-        Status = AcpiDmDumpTable (S3ptTable->Length, Offset, Subtable,
++        Status = AcpiDmDumpTable (Length, Offset, Subtable,
+             Subtable->Length, InfoTable);
+         if (ACPI_FAILURE (Status))
+         {
diff --git a/big-endian-dmtbdump3.patch b/big-endian-dmtbdump3.patch
new file mode 100644
index 0000000..4daf79c
--- /dev/null
+++ b/big-endian-dmtbdump3.patch
@@ -0,0 +1,250 @@
+Index: acpica-unix-20191018/source/common/dmtbdump3.c
+===================================================================
+--- acpica-unix-20191018.orig/source/common/dmtbdump3.c
++++ acpica-unix-20191018/source/common/dmtbdump3.c
+@@ -68,9 +68,11 @@ void
+ AcpiDmDumpSlic (
+     ACPI_TABLE_HEADER       *Table)
+ {
++    UINT32	Length;
+ 
+-    (void) AcpiDmDumpTable (Table->Length, sizeof (ACPI_TABLE_HEADER), Table,
+-        Table->Length - sizeof (*Table), AcpiDmTableInfoSlic);
++    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
++    (void) AcpiDmDumpTable (Length, sizeof (ACPI_TABLE_HEADER), Table,
++        Length - sizeof (*Table), AcpiDmTableInfoSlic);
+ }
+ 
+ 
+@@ -93,14 +95,17 @@ AcpiDmDumpSlit (
+     ACPI_STATUS             Status;
+     UINT32                  Offset;
+     UINT8                   *Row;
+-    UINT32                  Localities;
++    UINT64                  Localities;
+     UINT32                  i;
+     UINT32                  j;
++    UINT32		    Length;
++    UINT64                  Tmp64;
+ 
+ 
+     /* Main table */
+ 
+-    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoSlit);
++    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
++    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoSlit);
+     if (ACPI_FAILURE (Status))
+     {
+         return;
+@@ -108,7 +113,8 @@ AcpiDmDumpSlit (
+ 
+     /* Display the Locality NxN Matrix */
+ 
+-    Localities = (UINT32) ACPI_CAST_PTR (ACPI_TABLE_SLIT, Table)->LocalityCount;
++    Tmp64 = (UINT64) ACPI_CAST_PTR (ACPI_TABLE_SLIT, Table)->LocalityCount;
++    ACPI_MOVE_64_TO_64(&Localities, &Tmp64);
+     Offset = ACPI_OFFSET (ACPI_TABLE_SLIT, Entry[0]);
+     Row = (UINT8 *) ACPI_CAST_PTR (ACPI_TABLE_SLIT, Table)->Entry;
+ 
+@@ -121,7 +127,7 @@ AcpiDmDumpSlit (
+         {
+             /* Check for beyond EOT */
+ 
+-            if (Offset >= Table->Length)
++            if (Offset >= Length)
+             {
+                 AcpiOsPrintf (
+                     "\n**** Not enough room in table for all localities\n");
+@@ -173,11 +179,13 @@ AcpiDmDumpSrat (
+     UINT32                  Offset = sizeof (ACPI_TABLE_SRAT);
+     ACPI_SUBTABLE_HEADER    *Subtable;
+     ACPI_DMTABLE_INFO       *InfoTable;
++    UINT32		    Length;
+ 
+ 
+     /* Main table */
+ 
+-    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoSrat);
++    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
++    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoSrat);
+     if (ACPI_FAILURE (Status))
+     {
+         return;
+@@ -186,12 +194,12 @@ AcpiDmDumpSrat (
+     /* Subtables */
+ 
+     Subtable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Table, Offset);
+-    while (Offset < Table->Length)
++    while (Offset < Length)
+     {
+         /* Common subtable header */
+ 
+         AcpiOsPrintf ("\n");
+-        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
++        Status = AcpiDmDumpTable (Length, Offset, Subtable,
+             Subtable->Length, AcpiDmTableInfoSratHdr);
+         if (ACPI_FAILURE (Status))
+         {
+@@ -245,7 +253,7 @@ AcpiDmDumpSrat (
+         }
+ 
+         AcpiOsPrintf ("\n");
+-        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
++        Status = AcpiDmDumpTable (Length, Offset, Subtable,
+             Subtable->Length, InfoTable);
+         if (ACPI_FAILURE (Status))
+         {
+@@ -282,13 +290,14 @@ AcpiDmDumpStao (
+ {
+     ACPI_STATUS             Status;
+     char                    *Namepath;
+-    UINT32                  Length = Table->Length;
++    UINT32                  Length;
+     UINT32                  StringLength;
+     UINT32                  Offset = sizeof (ACPI_TABLE_STAO);
+ 
+ 
+     /* Main table */
+ 
++    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
+     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoStao);
+     if (ACPI_FAILURE (Status))
+     {
+@@ -297,7 +306,7 @@ AcpiDmDumpStao (
+ 
+     /* The rest of the table consists of Namepath strings */
+ 
+-    while (Offset < Table->Length)
++    while (Offset < Length)
+     {
+         Namepath = ACPI_ADD_PTR (char, Table, Offset);
+         StringLength = strlen (Namepath) + 1;
+@@ -339,11 +348,14 @@ AcpiDmDumpTcpa (
+     ACPI_TABLE_TCPA_HDR     *Subtable = ACPI_ADD_PTR (
+                                 ACPI_TABLE_TCPA_HDR, Table, Offset);
+     ACPI_STATUS             Status;
++    UINT32		    Length;
++    UINT16		    PlatformClass;
+ 
+ 
+     /* Main table */
+ 
+-    Status = AcpiDmDumpTable (Table->Length, 0, Table,
++    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
++    Status = AcpiDmDumpTable (Length, 0, Table,
+         0, AcpiDmTableInfoTcpaHdr);
+     if (ACPI_FAILURE (Status))
+     {
+@@ -354,18 +366,19 @@ AcpiDmDumpTcpa (
+      * Examine the PlatformClass field to determine the table type.
+      * Either a client or server table. Only one.
+      */
+-    switch (CommonHeader->PlatformClass)
++    ACPI_MOVE_16_TO_16(&PlatformClass, &CommonHeader->PlatformClass);
++    switch (PlatformClass)
+     {
+     case ACPI_TCPA_CLIENT_TABLE:
+ 
+-        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
+-            Table->Length - Offset, AcpiDmTableInfoTcpaClient);
++        Status = AcpiDmDumpTable (Length, Offset, Subtable,
++            Length - Offset, AcpiDmTableInfoTcpaClient);
+         break;
+ 
+     case ACPI_TCPA_SERVER_TABLE:
+ 
+-        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
+-            Table->Length - Offset, AcpiDmTableInfoTcpaServer);
++        Status = AcpiDmDumpTable (Length, Offset, Subtable,
++            Length - Offset, AcpiDmTableInfoTcpaServer);
+         break;
+ 
+     default:
+@@ -512,11 +525,13 @@ AcpiDmDumpVrtc (
+     ACPI_STATUS             Status;
+     UINT32                  Offset = sizeof (ACPI_TABLE_VRTC);
+     ACPI_VRTC_ENTRY         *Subtable;
++    UINT32		    Length;
+ 
+ 
+     /* Main table */
+ 
+-    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoVrtc);
++    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
++    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoVrtc);
+     if (ACPI_FAILURE (Status))
+     {
+         return;
+@@ -525,12 +540,12 @@ AcpiDmDumpVrtc (
+     /* Subtables */
+ 
+     Subtable = ACPI_ADD_PTR (ACPI_VRTC_ENTRY, Table, Offset);
+-    while (Offset < Table->Length)
++    while (Offset < Length)
+     {
+         /* Common subtable header */
+ 
+         AcpiOsPrintf ("\n");
+-        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
++        Status = AcpiDmDumpTable (Length, Offset, Subtable,
+             sizeof (ACPI_VRTC_ENTRY), AcpiDmTableInfoVrtc0);
+         if (ACPI_FAILURE (Status))
+         {
+@@ -565,11 +580,13 @@ AcpiDmDumpWdat (
+     ACPI_STATUS             Status;
+     UINT32                  Offset = sizeof (ACPI_TABLE_WDAT);
+     ACPI_WDAT_ENTRY         *Subtable;
++    UINT32		    Length;
+ 
+ 
+     /* Main table */
+ 
+-    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoWdat);
++    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
++    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoWdat);
+     if (ACPI_FAILURE (Status))
+     {
+         return;
+@@ -578,12 +595,12 @@ AcpiDmDumpWdat (
+     /* Subtables */
+ 
+     Subtable = ACPI_ADD_PTR (ACPI_WDAT_ENTRY, Table, Offset);
+-    while (Offset < Table->Length)
++    while (Offset < Length)
+     {
+         /* Common subtable header */
+ 
+         AcpiOsPrintf ("\n");
+-        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
++        Status = AcpiDmDumpTable (Length, Offset, Subtable,
+             sizeof (ACPI_WDAT_ENTRY), AcpiDmTableInfoWdat0);
+         if (ACPI_FAILURE (Status))
+         {
+@@ -618,12 +635,13 @@ AcpiDmDumpWpbt (
+ {
+     ACPI_STATUS             Status;
+     ACPI_TABLE_WPBT         *Subtable;
+-    UINT32                  Length = Table->Length;
++    UINT32                  Length;
+     UINT16                  ArgumentsLength;
+ 
+ 
+     /* Dump the main table */
+ 
++    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
+     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoWpbt);
+     if (ACPI_FAILURE (Status))
+     {
+@@ -633,10 +651,10 @@ AcpiDmDumpWpbt (
+     /* Extract the arguments buffer length from the main table */
+ 
+     Subtable = ACPI_CAST_PTR (ACPI_TABLE_WPBT, Table);
+-    ArgumentsLength = Subtable->ArgumentsLength;
++    ACPI_MOVE_16_TO_16(&ArgumentsLength, &Subtable->ArgumentsLength);
+ 
+     /* Dump the arguments buffer */
+ 
+-    (void) AcpiDmDumpTable (Table->Length, 0, Table, ArgumentsLength,
++    (void) AcpiDmDumpTable (Length, 0, Table, ArgumentsLength,
+         AcpiDmTableInfoWpbt0);
+ }
diff --git a/big-endian-v2.patch b/big-endian-v2.patch
index 600a43d..807e534 100644
--- a/big-endian-v2.patch
+++ b/big-endian-v2.patch
@@ -3,10 +3,10 @@ in the original big-endian patch; we try to capture those here.
 
 Signed-off-by: Al Stone <ahs3@redhat.com>
 
-Index: acpica-unix-20180508/source/compiler/asllookup.c
+Index: acpica-unix-20191018/source/compiler/asllookup.c
 ===================================================================
---- acpica-unix-20180508.orig/source/compiler/asllookup.c
-+++ acpica-unix-20180508/source/compiler/asllookup.c
+--- acpica-unix-20191018.orig/source/compiler/asllookup.c
++++ acpica-unix-20191018/source/compiler/asllookup.c
 @@ -249,7 +249,8 @@ LkIsObjectUsed (
       * ACPI names and are typically not referenced since they are meant
       * to be called by the host OS.
diff --git a/big-endian.patch b/big-endian.patch
index 5735a94..bb12ed6 100644
--- a/big-endian.patch
+++ b/big-endian.patch
@@ -8,25 +8,10 @@ To date, this has been critical for the s390x architecture only.
 
 Signed-off-by: Al Stone <ahs3@redhat.com>
 
----
- source/compiler/aslcodegen.c      |  109 ++++++++++++++++++------------
- source/compiler/aslopcodes.c      |    4 +
- source/compiler/aslrestype1.c     |   68 +++++++++++++------
- source/compiler/aslrestype1i.c    |   38 +++++++---
- source/compiler/aslrestype2.c     |   25 ++++---
- source/compiler/aslrestype2d.c    |  134 +++++++++++++++++++++----------------
- source/compiler/aslrestype2e.c    |   39 +++++++----
- source/compiler/aslrestype2q.c    |  117 +++++++++++++++++++++-----------
- source/compiler/aslrestype2s.c    |   86 +++++++++++++++++-------
- source/compiler/aslrestype2w.c    |  127 +++++++++++++++++++++--------------
- source/include/acmacros.h         |   15 +++-
- source/include/platform/aclinux.h |    8 ++
- 12 files changed, 487 insertions(+), 283 deletions(-)
-
-Index: acpica-unix-20190816/source/compiler/aslcodegen.c
+Index: acpica-unix-20191018/source/compiler/aslcodegen.c
 ===================================================================
---- acpica-unix-20190816.orig/source/compiler/aslcodegen.c
-+++ acpica-unix-20190816/source/compiler/aslcodegen.c
+--- acpica-unix-20191018.orig/source/compiler/aslcodegen.c
++++ acpica-unix-20191018/source/compiler/aslcodegen.c
 @@ -237,16 +237,12 @@ CgWriteAmlOpcode (
      ACPI_PARSE_OBJECT       *Op)
  {
@@ -268,10 +253,10 @@ Index: acpica-unix-20190816/source/compiler/aslcodegen.c
  
      case AML_RAW_DATA_BUFFER:
  
-Index: acpica-unix-20190816/source/compiler/aslopcodes.c
+Index: acpica-unix-20191018/source/compiler/aslopcodes.c
 ===================================================================
---- acpica-unix-20190816.orig/source/compiler/aslopcodes.c
-+++ acpica-unix-20190816/source/compiler/aslopcodes.c
+--- acpica-unix-20191018.orig/source/compiler/aslopcodes.c
++++ acpica-unix-20191018/source/compiler/aslopcodes.c
 @@ -485,6 +485,7 @@ OpcDoUnicode (
      UINT32                  i;
      UINT8                   *AsciiString;
@@ -290,10 +275,10 @@ Index: acpica-unix-20190816/source/compiler/aslopcodes.c
      }
  
      /*
-Index: acpica-unix-20190816/source/compiler/aslrestype1.c
+Index: acpica-unix-20191018/source/compiler/aslrestype1.c
 ===================================================================
---- acpica-unix-20190816.orig/source/compiler/aslrestype1.c
-+++ acpica-unix-20190816/source/compiler/aslrestype1.c
+--- acpica-unix-20191018.orig/source/compiler/aslrestype1.c
++++ acpica-unix-20191018/source/compiler/aslrestype1.c
 @@ -142,6 +142,11 @@ RsDoMemory24Descriptor (
      ACPI_PARSE_OBJECT       *LengthOp = NULL;
      ASL_RESOURCE_NODE       *Rnode;
@@ -490,10 +475,10 @@ Index: acpica-unix-20190816/source/compiler/aslrestype1.c
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (FixedMemory32.AddressLength));
              break;
-Index: acpica-unix-20190816/source/compiler/aslrestype1i.c
+Index: acpica-unix-20191018/source/compiler/aslrestype1i.c
 ===================================================================
---- acpica-unix-20190816.orig/source/compiler/aslrestype1i.c
-+++ acpica-unix-20190816/source/compiler/aslrestype1i.c
+--- acpica-unix-20191018.orig/source/compiler/aslrestype1i.c
++++ acpica-unix-20191018/source/compiler/aslrestype1i.c
 @@ -198,6 +198,8 @@ RsDoFixedDmaDescriptor (
      ACPI_PARSE_OBJECT       *InitializerOp;
      ASL_RESOURCE_NODE       *Rnode;
@@ -630,10 +615,10 @@ Index: acpica-unix-20190816/source/compiler/aslrestype1i.c
 +    ACPI_MOVE_16_TO_16(&Descriptor->Irq.IrqMask, &IrqMask);
      return (Rnode);
  }
-Index: acpica-unix-20190816/source/compiler/aslrestype2.c
+Index: acpica-unix-20191018/source/compiler/aslrestype2.c
 ===================================================================
---- acpica-unix-20190816.orig/source/compiler/aslrestype2.c
-+++ acpica-unix-20190816/source/compiler/aslrestype2.c
+--- acpica-unix-20191018.orig/source/compiler/aslrestype2.c
++++ acpica-unix-20191018/source/compiler/aslrestype2.c
 @@ -76,6 +76,7 @@ RsDoGeneralRegisterDescriptor (
      ACPI_PARSE_OBJECT       *InitializerOp;
      ASL_RESOURCE_NODE       *Rnode;
@@ -747,9 +732,9 @@ Index: acpica-unix-20190816/source/compiler/aslrestype2.c
      }
  
      /* Add optional ResSource string if present */
-@@ -384,14 +406,15 @@ RsDoInterruptDescriptor (
-         Rover = ACPI_ADD_PTR (
-                     AML_RESOURCE, &(Rover->ByteItem), StringLength);
+@@ -381,14 +403,15 @@ RsDoInterruptDescriptor (
+     {
+         strcpy ((char *) Rover, (char *) ResSourceString);
  
 -        Descriptor->ExtendedIrq.ResourceLength = (UINT16)
 -            (Descriptor->ExtendedIrq.ResourceLength + StringLength);
@@ -765,7 +750,7 @@ Index: acpica-unix-20190816/source/compiler/aslrestype2.c
      return (Rnode);
  }
  
-@@ -439,7 +462,7 @@ RsDoVendorLargeDescriptor (
+@@ -436,7 +459,7 @@ RsDoVendorLargeDescriptor (
  
      Descriptor = Rnode->Buffer;
      Descriptor->VendorLarge.DescriptorType = ACPI_RESOURCE_NAME_VENDOR_LARGE;
@@ -774,10 +759,10 @@ Index: acpica-unix-20190816/source/compiler/aslrestype2.c
  
      /* Point to end-of-descriptor for vendor data */
  
-Index: acpica-unix-20190816/source/compiler/aslrestype2d.c
+Index: acpica-unix-20191018/source/compiler/aslrestype2d.c
 ===================================================================
---- acpica-unix-20190816.orig/source/compiler/aslrestype2d.c
-+++ acpica-unix-20190816/source/compiler/aslrestype2d.c
+--- acpica-unix-20191018.orig/source/compiler/aslrestype2d.c
++++ acpica-unix-20191018/source/compiler/aslrestype2d.c
 @@ -79,7 +79,13 @@ RsDoDwordIoDescriptor (
      ACPI_PARSE_OBJECT       *GranOp = NULL;
      ASL_RESOURCE_NODE       *Rnode;
@@ -1133,10 +1118,10 @@ Index: acpica-unix-20190816/source/compiler/aslrestype2d.c
      Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS32) +
          OptionIndex + StringLength;
      return (Rnode);
-Index: acpica-unix-20190816/source/compiler/aslrestype2e.c
+Index: acpica-unix-20191018/source/compiler/aslrestype2e.c
 ===================================================================
---- acpica-unix-20190816.orig/source/compiler/aslrestype2e.c
-+++ acpica-unix-20190816/source/compiler/aslrestype2e.c
+--- acpica-unix-20191018.orig/source/compiler/aslrestype2e.c
++++ acpica-unix-20191018/source/compiler/aslrestype2e.c
 @@ -78,6 +78,13 @@ RsDoExtendedIoDescriptor (
      ACPI_PARSE_OBJECT       *GranOp = NULL;
      ASL_RESOURCE_NODE       *Rnode;
@@ -1242,10 +1227,10 @@ Index: acpica-unix-20190816/source/compiler/aslrestype2e.c
      Rnode->BufferLength = sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) +
          StringLength;
      return (Rnode);
-Index: acpica-unix-20190816/source/compiler/aslrestype2q.c
+Index: acpica-unix-20191018/source/compiler/aslrestype2q.c
 ===================================================================
---- acpica-unix-20190816.orig/source/compiler/aslrestype2q.c
-+++ acpica-unix-20190816/source/compiler/aslrestype2q.c
+--- acpica-unix-20191018.orig/source/compiler/aslrestype2q.c
++++ acpica-unix-20191018/source/compiler/aslrestype2q.c
 @@ -80,7 +80,13 @@ RsDoQwordIoDescriptor (
      ASL_RESOURCE_NODE       *Rnode;
      UINT8                   *OptionalFields;
@@ -1584,10 +1569,10 @@ Index: acpica-unix-20190816/source/compiler/aslrestype2q.c
      Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS64) +
          OptionIndex + StringLength;
      return (Rnode);
-Index: acpica-unix-20190816/source/compiler/aslrestype2s.c
+Index: acpica-unix-20191018/source/compiler/aslrestype2s.c
 ===================================================================
---- acpica-unix-20190816.orig/source/compiler/aslrestype2s.c
-+++ acpica-unix-20190816/source/compiler/aslrestype2s.c
+--- acpica-unix-20191018.orig/source/compiler/aslrestype2s.c
++++ acpica-unix-20191018/source/compiler/aslrestype2s.c
 @@ -340,9 +340,14 @@ RsDoGpioIntDescriptor (
      UINT16                  VendorLength;
      UINT16                  InterruptLength;
@@ -1741,7 +1726,7 @@ Index: acpica-unix-20190816/source/compiler/aslrestype2s.c
  
  
      InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -577,7 +597,7 @@ RsDoGpioIoDescriptor (
+@@ -576,7 +596,7 @@ RsDoGpioIoDescriptor (
          sizeof (AML_RESOURCE_LARGE_HEADER));
  
      Descriptor = Rnode->Buffer;
@@ -1750,7 +1735,7 @@ Index: acpica-unix-20190816/source/compiler/aslrestype2s.c
      Descriptor->Gpio.DescriptorType = ACPI_RESOURCE_NAME_GPIO;
      Descriptor->Gpio.RevisionId = AML_RESOURCE_GPIO_REVISION;
      Descriptor->Gpio.ConnectionType = AML_RESOURCE_GPIO_TYPE_IO;
-@@ -591,11 +611,11 @@ RsDoGpioIoDescriptor (
+@@ -590,11 +610,11 @@ RsDoGpioIoDescriptor (
  
      /* Setup offsets within the descriptor */
  
@@ -1766,7 +1751,7 @@ Index: acpica-unix-20190816/source/compiler/aslrestype2s.c
  
      /* Process all child initialization nodes */
  
-@@ -605,7 +625,7 @@ RsDoGpioIoDescriptor (
+@@ -604,7 +624,7 @@ RsDoGpioIoDescriptor (
          {
          case 0: /* Share Type [Flags] (_SHR) */
  
@@ -1775,7 +1760,7 @@ Index: acpica-unix-20190816/source/compiler/aslrestype2s.c
              RsCreateBitField (InitializerOp, ACPI_RESTAG_INTERRUPTSHARE,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Gpio.IntFlags), 3);
              break;
-@@ -619,21 +639,21 @@ RsDoGpioIoDescriptor (
+@@ -618,21 +638,21 @@ RsDoGpioIoDescriptor (
  
          case 2: /* Debounce Timeout [WORD] (_DBT) */
  
@@ -1800,7 +1785,7 @@ Index: acpica-unix-20190816/source/compiler/aslrestype2s.c
              RsCreateMultiBitField (InitializerOp, ACPI_RESTAG_IORESTRICTION,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Gpio.IntFlags), 0, 2);
              break;
-@@ -659,7 +679,7 @@ RsDoGpioIoDescriptor (
+@@ -658,7 +678,7 @@ RsDoGpioIoDescriptor (
  
          case 7: /* Resource Usage (consumer/producer) */
  
@@ -1809,7 +1794,7 @@ Index: acpica-unix-20190816/source/compiler/aslrestype2s.c
              break;
  
          case 8: /* Resource Tag (Descriptor Name) */
-@@ -673,13 +693,14 @@ RsDoGpioIoDescriptor (
+@@ -672,13 +692,14 @@ RsDoGpioIoDescriptor (
               * This field is required in order to calculate the length
               * of the ResourceSource at runtime.
               */
@@ -1827,7 +1812,7 @@ Index: acpica-unix-20190816/source/compiler/aslrestype2s.c
              }
              break;
  
-@@ -692,7 +713,9 @@ RsDoGpioIoDescriptor (
+@@ -691,7 +712,9 @@ RsDoGpioIoDescriptor (
               *  (implies resource source must immediately follow the pin list.)
               *  Name: _PIN
               */
@@ -1838,7 +1823,7 @@ Index: acpica-unix-20190816/source/compiler/aslrestype2s.c
              InterruptList++;
              PinCount++;
  
-@@ -723,6 +746,11 @@ RsDoGpioIoDescriptor (
+@@ -722,6 +745,11 @@ RsDoGpioIoDescriptor (
          InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
      }
  
@@ -1850,7 +1835,7 @@ Index: acpica-unix-20190816/source/compiler/aslrestype2s.c
      MpSaveGpioInfo (Info->MappingOp, Descriptor,
          PinCount, PinList, ResourceSource);
      return (Rnode);
-@@ -753,8 +781,12 @@ RsDoI2cSerialBusDescriptor (
+@@ -752,8 +780,12 @@ RsDoI2cSerialBusDescriptor (
      UINT16                  ResSourceLength;
      UINT16                  VendorLength;
      UINT16                  DescriptorSize;
@@ -1863,7 +1848,7 @@ Index: acpica-unix-20190816/source/compiler/aslrestype2s.c
  
  
      InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -777,12 +809,14 @@ RsDoI2cSerialBusDescriptor (
+@@ -776,12 +808,14 @@ RsDoI2cSerialBusDescriptor (
          sizeof (AML_RESOURCE_LARGE_HEADER));
  
      Descriptor = Rnode->Buffer;
@@ -1880,7 +1865,7 @@ Index: acpica-unix-20190816/source/compiler/aslrestype2s.c
  
      if (Info->DescriptorTypeOp->Asl.ParseOpcode == PARSEOP_I2C_SERIALBUS_V2)
      {
-@@ -802,7 +836,7 @@ RsDoI2cSerialBusDescriptor (
+@@ -801,7 +835,7 @@ RsDoI2cSerialBusDescriptor (
          {
          case 0: /* Slave Address [WORD] (_ADR) */
  
@@ -1889,7 +1874,7 @@ Index: acpica-unix-20190816/source/compiler/aslrestype2s.c
              RsCreateWordField (InitializerOp, ACPI_RESTAG_ADDRESS,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (I2cSerialBus.SlaveAddress));
              break;
-@@ -816,14 +850,14 @@ RsDoI2cSerialBusDescriptor (
+@@ -815,14 +849,14 @@ RsDoI2cSerialBusDescriptor (
  
          case 2: /* Connection Speed [DWORD] (_SPE) */
  
@@ -1906,7 +1891,7 @@ Index: acpica-unix-20190816/source/compiler/aslrestype2s.c
              RsCreateBitField (InitializerOp, ACPI_RESTAG_MODE,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (I2cSerialBus.TypeSpecificFlags), 0);
              break;
-@@ -883,6 +917,9 @@ RsDoI2cSerialBusDescriptor (
+@@ -882,6 +916,9 @@ RsDoI2cSerialBusDescriptor (
          InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
      }
  
@@ -1916,7 +1901,7 @@ Index: acpica-unix-20190816/source/compiler/aslrestype2s.c
      MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource);
      return (Rnode);
  }
-@@ -912,6 +949,9 @@ RsDoSpiSerialBusDescriptor (
+@@ -911,6 +948,9 @@ RsDoSpiSerialBusDescriptor (
      UINT16                  ResSourceLength;
      UINT16                  VendorLength;
      UINT16                  DescriptorSize;
@@ -1926,7 +1911,7 @@ Index: acpica-unix-20190816/source/compiler/aslrestype2s.c
      UINT32                  CurrentByteOffset;
      UINT32                  i;
  
-@@ -962,21 +1002,21 @@ RsDoSpiSerialBusDescriptor (
+@@ -961,21 +1001,21 @@ RsDoSpiSerialBusDescriptor (
          {
          case 0: /* Device Selection [WORD] (_ADR) */
  
@@ -1951,7 +1936,7 @@ Index: acpica-unix-20190816/source/compiler/aslrestype2s.c
              RsCreateBitField (InitializerOp, ACPI_RESTAG_MODE,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (SpiSerialBus.TypeSpecificFlags), 0);
              break;
-@@ -997,7 +1037,7 @@ RsDoSpiSerialBusDescriptor (
+@@ -996,7 +1036,7 @@ RsDoSpiSerialBusDescriptor (
  
          case 5: /* Connection Speed [DWORD] (_SPE) */
  
@@ -1960,7 +1945,7 @@ Index: acpica-unix-20190816/source/compiler/aslrestype2s.c
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_SPEED,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (SpiSerialBus.ConnectionSpeed));
              break;
-@@ -1071,6 +1111,10 @@ RsDoSpiSerialBusDescriptor (
+@@ -1070,6 +1110,10 @@ RsDoSpiSerialBusDescriptor (
          InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
      }
  
@@ -1971,7 +1956,7 @@ Index: acpica-unix-20190816/source/compiler/aslrestype2s.c
      MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource);
      return (Rnode);
  }
-@@ -1100,6 +1144,10 @@ RsDoUartSerialBusDescriptor (
+@@ -1099,6 +1143,10 @@ RsDoUartSerialBusDescriptor (
      UINT16                  ResSourceLength;
      UINT16                  VendorLength;
      UINT16                  DescriptorSize;
@@ -1982,7 +1967,7 @@ Index: acpica-unix-20190816/source/compiler/aslrestype2s.c
      UINT32                  CurrentByteOffset;
      UINT32                  i;
  
-@@ -1149,21 +1197,21 @@ RsDoUartSerialBusDescriptor (
+@@ -1148,21 +1196,21 @@ RsDoUartSerialBusDescriptor (
          {
          case 0: /* Connection Speed (Baud Rate) [DWORD] (_SPE) */
  
@@ -2007,7 +1992,7 @@ Index: acpica-unix-20190816/source/compiler/aslrestype2s.c
              RsCreateMultiBitField (InitializerOp, ACPI_RESTAG_STOPBITS,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TypeSpecificFlags), 2, 2);
              break;
-@@ -1177,7 +1225,7 @@ RsDoUartSerialBusDescriptor (
+@@ -1176,7 +1224,7 @@ RsDoUartSerialBusDescriptor (
  
          case 4: /* Endianness [Flag] (_END) */
  
@@ -2016,7 +2001,7 @@ Index: acpica-unix-20190816/source/compiler/aslrestype2s.c
              RsCreateBitField (InitializerOp, ACPI_RESTAG_ENDIANNESS,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TypeSpecificFlags), 7);
              break;
-@@ -1191,21 +1239,21 @@ RsDoUartSerialBusDescriptor (
+@@ -1190,21 +1238,21 @@ RsDoUartSerialBusDescriptor (
  
          case 6: /* Flow Control [Flags] (_FLC) */
  
@@ -2041,7 +2026,7 @@ Index: acpica-unix-20190816/source/compiler/aslrestype2s.c
              RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH_TX,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TxFifoSize));
              break;
-@@ -1275,6 +1323,11 @@ RsDoUartSerialBusDescriptor (
+@@ -1274,6 +1322,11 @@ RsDoUartSerialBusDescriptor (
          InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
      }
  
@@ -2053,10 +2038,10 @@ Index: acpica-unix-20190816/source/compiler/aslrestype2s.c
      MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource);
      return (Rnode);
  }
-Index: acpica-unix-20190816/source/compiler/aslrestype2w.c
+Index: acpica-unix-20191018/source/compiler/aslrestype2w.c
 ===================================================================
---- acpica-unix-20190816.orig/source/compiler/aslrestype2w.c
-+++ acpica-unix-20190816/source/compiler/aslrestype2w.c
+--- acpica-unix-20191018.orig/source/compiler/aslrestype2w.c
++++ acpica-unix-20191018/source/compiler/aslrestype2w.c
 @@ -81,6 +81,12 @@ RsDoWordIoDescriptor (
      UINT8                   *OptionalFields;
      UINT16                  StringLength = 0;
@@ -2400,10 +2385,10 @@ Index: acpica-unix-20190816/source/compiler/aslrestype2w.c
      Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) +
          OptionIndex + StringLength;
      return (Rnode);
-Index: acpica-unix-20190816/source/include/acmacros.h
+Index: acpica-unix-20191018/source/include/acmacros.h
 ===================================================================
---- acpica-unix-20190816.orig/source/include/acmacros.h
-+++ acpica-unix-20190816/source/include/acmacros.h
+--- acpica-unix-20191018.orig/source/include/acmacros.h
++++ acpica-unix-20191018/source/include/acmacros.h
 @@ -98,9 +98,12 @@
                                             ((UINT8 *)(void *)(d))[6] = ((UINT8 *)(void *)(s))[1];\
                                             ((UINT8 *)(void *)(d))[7] = ((UINT8 *)(void *)(s))[0];}
@@ -2482,10 +2467,10 @@ Index: acpica-unix-20190816/source/include/acmacros.h
  
  #define ACPI_MOVE_32_TO_16(d, s)        ACPI_MOVE_16_TO_16(d, s)    /* Truncate to 16 */
  
-Index: acpica-unix-20190816/source/include/platform/aclinux.h
+Index: acpica-unix-20191018/source/include/platform/aclinux.h
 ===================================================================
---- acpica-unix-20190816.orig/source/include/platform/aclinux.h
-+++ acpica-unix-20190816/source/include/platform/aclinux.h
+--- acpica-unix-20191018.orig/source/include/platform/aclinux.h
++++ acpica-unix-20191018/source/include/platform/aclinux.h
 @@ -198,6 +198,7 @@
  
  #ifdef ACPI_USE_STANDARD_HEADERS
@@ -2505,16 +2490,16 @@ Index: acpica-unix-20190816/source/include/platform/aclinux.h
  #endif /* __KERNEL__ */
  
  #endif /* __ACLINUX_H__ */
-Index: acpica-unix-20190816/source/compiler/aslanalyze.c
+Index: acpica-unix-20191018/source/compiler/aslanalyze.c
 ===================================================================
---- acpica-unix-20190816.orig/source/compiler/aslanalyze.c
-+++ acpica-unix-20190816/source/compiler/aslanalyze.c
+--- acpica-unix-20191018.orig/source/compiler/aslanalyze.c
++++ acpica-unix-20191018/source/compiler/aslanalyze.c
 @@ -461,7 +461,7 @@ ApCheckForGpeNameConflict (
  
      /* Need a null-terminated string version of NameSeg */
  
--    ACPI_MOVE_32_TO_32 (Name, &Op->Asl.NameSeg);
-+    ACPI_COPY_NAMESEG (Name, &Op->Asl.NameSeg);
+-    ACPI_MOVE_32_TO_32 (Name, Op->Asl.NameSeg);
++    ACPI_COPY_NAMESEG (Name, Op->Asl.NameSeg);
      Name[ACPI_NAMESEG_SIZE] = 0;
  
      /*
@@ -2527,10 +2512,10 @@ Index: acpica-unix-20190816/source/compiler/aslanalyze.c
  
      /* Inject opposite letter ("L" versus "E") */
  
-Index: acpica-unix-20190816/source/compiler/asllookup.c
+Index: acpica-unix-20191018/source/compiler/asllookup.c
 ===================================================================
---- acpica-unix-20190816.orig/source/compiler/asllookup.c
-+++ acpica-unix-20190816/source/compiler/asllookup.c
+--- acpica-unix-20191018.orig/source/compiler/asllookup.c
++++ acpica-unix-20191018/source/compiler/asllookup.c
 @@ -119,6 +119,7 @@ LkIsObjectUsed (
  {
      ACPI_NAMESPACE_NODE     *Node = ACPI_CAST_PTR (ACPI_NAMESPACE_NODE, ObjHandle);
@@ -2561,10 +2546,10 @@ Index: acpica-unix-20190816/source/compiler/asllookup.c
              AslError (ASL_REMARK, ASL_MSG_NOT_REFERENCED,
                  LkGetNameOp (Node->Op), AslGbl_MsgBuffer);
              return (AE_OK);
-Index: acpica-unix-20190816/source/compiler/aslmain.c
+Index: acpica-unix-20191018/source/compiler/aslmain.c
 ===================================================================
---- acpica-unix-20190816.orig/source/compiler/aslmain.c
-+++ acpica-unix-20190816/source/compiler/aslmain.c
+--- acpica-unix-20191018.orig/source/compiler/aslmain.c
++++ acpica-unix-20191018/source/compiler/aslmain.c
 @@ -101,18 +101,6 @@ main (
  
      signal (SIGINT, AslSignalHandler);
@@ -2584,10 +2569,10 @@ Index: acpica-unix-20190816/source/compiler/aslmain.c
      AcpiOsInitialize ();
      ACPI_DEBUG_INITIALIZE (); /* For debug version only */
  
-Index: acpica-unix-20190816/source/common/acfileio.c
+Index: acpica-unix-20191018/source/common/acfileio.c
 ===================================================================
---- acpica-unix-20190816.orig/source/common/acfileio.c
-+++ acpica-unix-20190816/source/common/acfileio.c
+--- acpica-unix-20191018.orig/source/common/acfileio.c
++++ acpica-unix-20191018/source/common/acfileio.c
 @@ -280,6 +280,7 @@ AcGetOneTableFromFile (
      ACPI_TABLE_HEADER       *Table;
      INT32                   Count;
@@ -2654,10 +2639,10 @@ Index: acpica-unix-20190816/source/common/acfileio.c
              (UINT32) (FileSize - TableOffset));
          return (AE_BAD_HEADER);
      }
-Index: acpica-unix-20190816/source/common/dmtable.c
+Index: acpica-unix-20191018/source/common/dmtable.c
 ===================================================================
---- acpica-unix-20190816.orig/source/common/dmtable.c
-+++ acpica-unix-20190816/source/common/dmtable.c
+--- acpica-unix-20191018.orig/source/common/dmtable.c
++++ acpica-unix-20191018/source/common/dmtable.c
 @@ -551,7 +551,7 @@ AcpiDmDumpDataTable (
       */
      if (ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_FACS))
@@ -2756,10 +2741,10 @@ Index: acpica-unix-20190816/source/common/dmtable.c
                  AcpiDmNfitSubnames[Temp16]);
              break;
  
-Index: acpica-unix-20190816/source/common/dmtables.c
+Index: acpica-unix-20191018/source/common/dmtables.c
 ===================================================================
---- acpica-unix-20190816.orig/source/common/dmtables.c
-+++ acpica-unix-20190816/source/common/dmtables.c
+--- acpica-unix-20191018.orig/source/common/dmtables.c
++++ acpica-unix-20191018/source/common/dmtables.c
 @@ -142,7 +142,9 @@ AdCreateTableHeader (
      ACPI_TABLE_HEADER       *Table)
  {
@@ -2808,7 +2793,7 @@ Index: acpica-unix-20190816/source/common/dmtables.c
      /*
 @@ -221,7 +226,7 @@ AdCreateTableHeader (
      AcpiOsPrintf (
-         "DefinitionBlock (\"\", \"%4.4s\", %hu, \"%.6s\", \"%.8s\", 0x%8.8X)\n",
+         "DefinitionBlock (\"\", \"%4.4s\", %u, \"%.6s\", \"%.8s\", 0x%8.8X)\n",
          Table->Signature, Table->Revision,
 -        Table->OemId, Table->OemTableId, Table->OemRevision);
 +        Table->OemId, Table->OemTableId, OemRev);
@@ -2825,1945 +2810,10 @@ Index: acpica-unix-20190816/source/common/dmtables.c
      AmlStart = ((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER));
      ASL_CV_INIT_FILETREE(Table, AmlStart, AmlLength);
  
-Index: acpica-unix-20190816/source/common/dmtbdump.c
+Index: acpica-unix-20191018/source/compiler/dtfield.c
 ===================================================================
---- acpica-unix-20190816.orig/source/common/dmtbdump.c
-+++ acpica-unix-20190816/source/common/dmtbdump.c
-@@ -277,6 +277,8 @@ AcpiDmDumpRsdt (
-     UINT32                  Entries;
-     UINT32                  Offset;
-     UINT32                  i;
-+    UINT32		    Length;
-+    UINT32		    Address;
- 
- 
-     /* Point to start of table pointer array */
-@@ -286,12 +288,14 @@ AcpiDmDumpRsdt (
- 
-     /* RSDT uses 32-bit pointers */
- 
--    Entries = (Table->Length - sizeof (ACPI_TABLE_HEADER)) / sizeof (UINT32);
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+    Entries = (Length - sizeof (ACPI_TABLE_HEADER)) / sizeof (UINT32);
- 
-     for (i = 0; i < Entries; i++)
-     {
-         AcpiDmLineHeader2 (Offset, sizeof (UINT32), "ACPI Table Address", i);
--        AcpiOsPrintf ("%8.8X\n", Array[i]);
-+	ACPI_MOVE_32_TO_32(&Address, &Array[i]);
-+        AcpiOsPrintf ("%8.8X\n", Address);
-         Offset += sizeof (UINT32);
-     }
- }
-@@ -317,6 +321,8 @@ AcpiDmDumpXsdt (
-     UINT32                  Entries;
-     UINT32                  Offset;
-     UINT32                  i;
-+    UINT32                  Length;
-+    UINT64		    Address;
- 
- 
-     /* Point to start of table pointer array */
-@@ -326,12 +332,14 @@ AcpiDmDumpXsdt (
- 
-     /* XSDT uses 64-bit pointers */
- 
--    Entries = (Table->Length - sizeof (ACPI_TABLE_HEADER)) / sizeof (UINT64);
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+    Entries = (Length - sizeof (ACPI_TABLE_HEADER)) / sizeof (UINT64);
- 
-     for (i = 0; i < Entries; i++)
-     {
-         AcpiDmLineHeader2 (Offset, sizeof (UINT64), "ACPI Table Address", i);
--        AcpiOsPrintf ("%8.8X%8.8X\n", ACPI_FORMAT_UINT64 (Array[i]));
-+	ACPI_MOVE_64_TO_64(&Address, &Array[i]);
-+        AcpiOsPrintf ("%8.8X%8.8X\n", ACPI_FORMAT_UINT64 (Address));
-         Offset += sizeof (UINT64);
-     }
- }
-@@ -358,12 +366,12 @@ AcpiDmDumpFadt (
-     ACPI_TABLE_HEADER       *Table)
- {
-     ACPI_STATUS             Status;
--
-+    UINT32		    Length;
- 
-     /* Always dump the minimum FADT revision 1 fields (ACPI 1.0) */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
--        AcpiDmTableInfoFadt1);
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoFadt1);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -371,11 +379,9 @@ AcpiDmDumpFadt (
- 
-     /* Check for FADT revision 2 fields (ACPI 1.0B MS extensions) */
- 
--    if ((Table->Length > ACPI_FADT_V1_SIZE) &&
--        (Table->Length <= ACPI_FADT_V2_SIZE))
-+    if ((Length > ACPI_FADT_V1_SIZE) && (Length <= ACPI_FADT_V2_SIZE))
-     {
--        Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
--            AcpiDmTableInfoFadt2);
-+        Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoFadt2);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -384,10 +390,9 @@ AcpiDmDumpFadt (
- 
-     /* Check for FADT revision 3/4 fields and up (ACPI 2.0+ extended data) */
- 
--    else if (Table->Length > ACPI_FADT_V2_SIZE)
-+    else if (Length > ACPI_FADT_V2_SIZE)
-     {
--        Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
--            AcpiDmTableInfoFadt3);
-+        Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoFadt3);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -395,9 +400,9 @@ AcpiDmDumpFadt (
- 
-         /* Check for FADT revision 5 fields and up (ACPI 5.0+) */
- 
--        if (Table->Length > ACPI_FADT_V3_SIZE)
-+        if (Length > ACPI_FADT_V3_SIZE)
-         {
--            Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
-+            Status = AcpiDmDumpTable (Length, 0, Table, 0,
-                 AcpiDmTableInfoFadt5);
-             if (ACPI_FAILURE (Status))
-             {
-@@ -407,9 +412,9 @@ AcpiDmDumpFadt (
- 
-         /* Check for FADT revision 6 fields and up (ACPI 6.0+) */
- 
--        if (Table->Length > ACPI_FADT_V3_SIZE)
-+        if (Length > ACPI_FADT_V3_SIZE)
-         {
--            Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
-+            Status = AcpiDmDumpTable (Length, 0, Table, 0,
-                 AcpiDmTableInfoFadt6);
-             if (ACPI_FAILURE (Status))
-             {
-@@ -420,11 +425,11 @@ AcpiDmDumpFadt (
- 
-     /* Validate various fields in the FADT, including length */
- 
--    AcpiTbCreateLocalFadt (Table, Table->Length);
-+    AcpiTbCreateLocalFadt (Table, Length);
- 
-     /* Validate FADT length against the revision */
- 
--    AcpiDmValidateFadtLength (Table->Revision, Table->Length);
-+    AcpiDmValidateFadtLength (Table->Revision, Length);
- }
- 
- 
-@@ -450,6 +455,7 @@ AcpiDmValidateFadtLength (
-     UINT32                  Length)
- {
-     UINT32                  ExpectedLength;
-+    UINT32		    Tmp32;
- 
- 
-     switch (Revision)
-@@ -485,7 +491,8 @@ AcpiDmValidateFadtLength (
-         return;
-     }
- 
--    if (Length == ExpectedLength)
-+    ACPI_MOVE_32_TO_32(&Tmp32, &Length);
-+    if (Tmp32 == ExpectedLength)
-     {
-         return;
-     }
-@@ -493,5 +500,5 @@ AcpiDmValidateFadtLength (
-     AcpiOsPrintf (
-         "\n// ACPI Warning: FADT revision %X does not match length: "
-         "found %X expected %X\n",
--        Revision, Length, ExpectedLength);
-+        Revision, Tmp32, ExpectedLength);
- }
-Index: acpica-unix-20190816/source/common/dmtbdump1.c
-===================================================================
---- acpica-unix-20190816.orig/source/common/dmtbdump1.c
-+++ acpica-unix-20190816/source/common/dmtbdump1.c
-@@ -79,17 +79,21 @@ AcpiDmDumpAsf (
-     UINT32                  DataOffset = 0;
-     UINT32                  i;
-     UINT8                   Type;
-+    UINT32		    Len;
-+    UINT16		    SubLen;
- 
- 
-     /* No main table, only subtables */
- 
-+    ACPI_MOVE_32_TO_32(&Len, &Table->Length);
-     Subtable = ACPI_ADD_PTR (ACPI_ASF_INFO, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Len)
-     {
-         /* Common subtable header */
- 
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
--            Subtable->Header.Length, AcpiDmTableInfoAsfHdr);
-+	ACPI_MOVE_16_TO_16(&SubLen, &Subtable->Header.Length);
-+        Status = AcpiDmDumpTable (Len, Offset, Subtable,
-+            SubLen, AcpiDmTableInfoAsfHdr);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -146,8 +150,7 @@ AcpiDmDumpAsf (
-             return;
-         }
- 
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
--            Subtable->Header.Length, InfoTable);
-+        Status = AcpiDmDumpTable (Len, Offset, Subtable, SubLen, InfoTable);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -163,7 +166,7 @@ AcpiDmDumpAsf (
-             for (i = 0; i < DataCount; i++)
-             {
-                 AcpiOsPrintf ("\n");
--                Status = AcpiDmDumpTable (Table->Length, DataOffset,
-+                Status = AcpiDmDumpTable (Len, DataOffset,
-                     DataTable, DataLength, DataInfoTable);
-                 if (ACPI_FAILURE (Status))
-                 {
-@@ -209,15 +212,14 @@ AcpiDmDumpAsf (
- 
-         /* Point to next subtable */
- 
--        if (!Subtable->Header.Length)
-+        if (!SubLen)
-         {
-             AcpiOsPrintf ("Invalid zero subtable header length\n");
-             return;
-         }
- 
--        Offset += Subtable->Header.Length;
--        Subtable = ACPI_ADD_PTR (ACPI_ASF_INFO, Subtable,
--            Subtable->Header.Length);
-+        Offset += SubLen;
-+        Subtable = ACPI_ADD_PTR (ACPI_ASF_INFO, Subtable, SubLen);
-     }
- }
- 
-@@ -241,12 +243,13 @@ AcpiDmDumpCpep (
- {
-     ACPI_STATUS             Status;
-     ACPI_CPEP_POLLING       *Subtable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length;
-     UINT32                  Offset = sizeof (ACPI_TABLE_CPEP);
- 
- 
-     /* Main table */
- 
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoCpep);
-     if (ACPI_FAILURE (Status))
-     {
-@@ -256,7 +259,7 @@ AcpiDmDumpCpep (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_CPEP_POLLING, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         AcpiOsPrintf ("\n");
-         Status = AcpiDmDumpTable (Length, Offset, Subtable,
-@@ -296,7 +299,10 @@ AcpiDmDumpCsrt (
-     ACPI_CSRT_GROUP         *Subtable;
-     ACPI_CSRT_SHARED_INFO   *SharedInfoTable;
-     ACPI_CSRT_DESCRIPTOR    *SubSubtable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length;
-+    UINT32                  SubLength;
-+    UINT32                  SubSubLength;
-+    UINT32                  SharedInfoLength;
-     UINT32                  Offset = sizeof (ACPI_TABLE_CSRT);
-     UINT32                  SubOffset;
-     UINT32                  SubSubOffset;
-@@ -307,14 +313,16 @@ AcpiDmDumpCsrt (
- 
-     /* Subtables (Resource Groups) */
- 
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-     Subtable = ACPI_ADD_PTR (ACPI_CSRT_GROUP, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         /* Resource group subtable */
- 
-         AcpiOsPrintf ("\n");
-+        ACPI_MOVE_32_TO_32(&SubLength, &Subtable->Length);
-         Status = AcpiDmDumpTable (Length, Offset, Subtable,
--            Subtable->Length, AcpiDmTableInfoCsrt0);
-+            SubLength, AcpiDmTableInfoCsrt0);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -334,19 +342,20 @@ AcpiDmDumpCsrt (
-             return;
-         }
- 
--        SubOffset += Subtable->SharedInfoLength;
-+	ACPI_MOVE_32_TO_32(&SharedInfoLength, &Subtable->SharedInfoLength);
-+        SubOffset += SharedInfoLength;
- 
-         /* Sub-Subtables (Resource Descriptors) */
- 
-         SubSubtable = ACPI_ADD_PTR (ACPI_CSRT_DESCRIPTOR, Table,
-             Offset + SubOffset);
- 
--        while ((SubOffset < Subtable->Length) &&
--              ((Offset + SubOffset) < Table->Length))
-+        while ((SubOffset < SubLength) && ((Offset + SubOffset) < Length))
-         {
-             AcpiOsPrintf ("\n");
-+	    ACPI_MOVE_32_TO_32(&SubSubLength, &SubSubtable->Length);
-             Status = AcpiDmDumpTable (Length, Offset + SubOffset, SubSubtable,
--                SubSubtable->Length, AcpiDmTableInfoCsrt2);
-+                SubSubLength, AcpiDmTableInfoCsrt2);
-             if (ACPI_FAILURE (Status))
-             {
-                 return;
-@@ -356,7 +365,7 @@ AcpiDmDumpCsrt (
- 
-             /* Resource-specific info buffer */
- 
--            InfoLength = SubSubtable->Length - SubSubOffset;
-+            InfoLength = SubSubLength - SubSubOffset;
-             if (InfoLength)
-             {
-                 Status = AcpiDmDumpTable (Length,
-@@ -371,16 +380,15 @@ AcpiDmDumpCsrt (
- 
-             /* Point to next sub-subtable */
- 
--            SubOffset += SubSubtable->Length;
-+            SubOffset += SubSubLength;
-             SubSubtable = ACPI_ADD_PTR (ACPI_CSRT_DESCRIPTOR, SubSubtable,
--                SubSubtable->Length);
-+                SubSubLength);
-         }
- 
-         /* Point to next subtable */
- 
--        Offset += Subtable->Length;
--        Subtable = ACPI_ADD_PTR (ACPI_CSRT_GROUP, Subtable,
--            Subtable->Length);
-+        Offset += SubLength;
-+        Subtable = ACPI_ADD_PTR (ACPI_CSRT_GROUP, Subtable, SubLength);
-     }
- }
- 
-@@ -404,16 +412,20 @@ AcpiDmDumpDbg2 (
- {
-     ACPI_STATUS             Status;
-     ACPI_DBG2_DEVICE        *Subtable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length;
-+    UINT16                  SubLength;
-     UINT32                  Offset = sizeof (ACPI_TABLE_DBG2);
-     UINT32                  i;
-     UINT32                  ArrayOffset;
-     UINT32                  AbsoluteOffset;
-     UINT8                   *Array;
-+    UINT16		    Tmp16;
-+    UINT16		    AlsoTmp16;
- 
- 
-     /* Main table */
- 
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoDbg2);
-     if (ACPI_FAILURE (Status))
-     {
-@@ -423,11 +435,12 @@ AcpiDmDumpDbg2 (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_DBG2_DEVICE, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         AcpiOsPrintf ("\n");
-+        ACPI_MOVE_16_TO_16(&SubLength, &Subtable->Length);
-         Status = AcpiDmDumpTable (Length, Offset, Subtable,
--            Subtable->Length, AcpiDmTableInfoDbg2Device);
-+            SubLength, AcpiDmTableInfoDbg2Device);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -437,13 +450,13 @@ AcpiDmDumpDbg2 (
- 
-         for (i = 0; i < Subtable->RegisterCount; i++)
-         {
--            ArrayOffset = Subtable->BaseAddressOffset +
--                (sizeof (ACPI_GENERIC_ADDRESS) * i);
-+	    ACPI_MOVE_16_TO_16(&Tmp16, &Subtable->BaseAddressOffset);
-+            ArrayOffset = Tmp16 + (sizeof (ACPI_GENERIC_ADDRESS) * i);
-             AbsoluteOffset = Offset + ArrayOffset;
-             Array = (UINT8 *) Subtable + ArrayOffset;
- 
-             Status = AcpiDmDumpTable (Length, AbsoluteOffset, Array,
--                Subtable->Length, AcpiDmTableInfoDbg2Addr);
-+                SubLength, AcpiDmTableInfoDbg2Addr);
-             if (ACPI_FAILURE (Status))
-             {
-                 return;
-@@ -454,13 +467,13 @@ AcpiDmDumpDbg2 (
- 
-         for (i = 0; i < Subtable->RegisterCount; i++)
-         {
--            ArrayOffset = Subtable->AddressSizeOffset +
--                (sizeof (UINT32) * i);
-+	    ACPI_MOVE_16_TO_16(&Tmp16, &Subtable->AddressSizeOffset);
-+            ArrayOffset = Tmp16 + (sizeof (UINT32) * i);
-             AbsoluteOffset = Offset + ArrayOffset;
-             Array = (UINT8 *) Subtable + ArrayOffset;
- 
-             Status = AcpiDmDumpTable (Length, AbsoluteOffset, Array,
--                Subtable->Length, AcpiDmTableInfoDbg2Size);
-+                SubLength, AcpiDmTableInfoDbg2Size);
-             if (ACPI_FAILURE (Status))
-             {
-                 return;
-@@ -470,12 +483,13 @@ AcpiDmDumpDbg2 (
-         /* Dump the Namestring (required) */
- 
-         AcpiOsPrintf ("\n");
--        ArrayOffset = Subtable->NamepathOffset;
-+	ACPI_MOVE_16_TO_16(&Tmp16, &Subtable->NamepathOffset);
-+        ArrayOffset = Tmp16;
-         AbsoluteOffset = Offset + ArrayOffset;
-         Array = (UINT8 *) Subtable + ArrayOffset;
- 
-         Status = AcpiDmDumpTable (Length, AbsoluteOffset, Array,
--            Subtable->Length, AcpiDmTableInfoDbg2Name);
-+            SubLength, AcpiDmTableInfoDbg2Name);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -485,9 +499,10 @@ AcpiDmDumpDbg2 (
- 
-         if (Subtable->OemDataOffset)
-         {
--            Status = AcpiDmDumpTable (Length, Offset + Subtable->OemDataOffset,
--                Table, Subtable->OemDataLength,
--                AcpiDmTableInfoDbg2OemData);
-+	    ACPI_MOVE_16_TO_16(&Tmp16, &Subtable->OemDataOffset);
-+	    ACPI_MOVE_16_TO_16(&AlsoTmp16, &Subtable->OemDataLength);
-+            Status = AcpiDmDumpTable (Length, Offset + Tmp16,
-+                Table, AlsoTmp16, AcpiDmTableInfoDbg2OemData);
-             if (ACPI_FAILURE (Status))
-             {
-                 return;
-@@ -496,9 +511,9 @@ AcpiDmDumpDbg2 (
- 
-         /* Point to next subtable */
- 
--        Offset += Subtable->Length;
-+        Offset += SubLength;
-         Subtable = ACPI_ADD_PTR (ACPI_DBG2_DEVICE, Subtable,
--            Subtable->Length);
-+            SubLength);
-     }
- }
- 
-@@ -522,17 +537,20 @@ AcpiDmDumpDmar (
- {
-     ACPI_STATUS             Status;
-     ACPI_DMAR_HEADER        *Subtable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length;
-+    UINT16                  SubLength;
-     UINT32                  Offset = sizeof (ACPI_TABLE_DMAR);
-     ACPI_DMTABLE_INFO       *InfoTable;
-     ACPI_DMAR_DEVICE_SCOPE  *ScopeTable;
-     UINT32                  ScopeOffset;
-     UINT8                   *PciPath;
-     UINT32                  PathOffset;
-+    UINT16		    SubType;
- 
- 
-     /* Main table */
- 
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoDmar);
-     if (ACPI_FAILURE (Status))
-     {
-@@ -542,13 +560,14 @@ AcpiDmDumpDmar (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_DMAR_HEADER, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         /* Common subtable header */
- 
-         AcpiOsPrintf ("\n");
-+	ACPI_MOVE_16_TO_16(&SubLength, &Subtable->Length);
-         Status = AcpiDmDumpTable (Length, Offset, Subtable,
--            Subtable->Length, AcpiDmTableInfoDmarHdr);
-+            SubLength, AcpiDmTableInfoDmarHdr);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -556,7 +575,8 @@ AcpiDmDumpDmar (
- 
-         AcpiOsPrintf ("\n");
- 
--        switch (Subtable->Type)
-+	ACPI_MOVE_16_TO_16(&SubType, &Subtable->Type);
-+        switch (SubType)
-         {
-         case ACPI_DMAR_TYPE_HARDWARE_UNIT:
- 
-@@ -591,12 +611,12 @@ AcpiDmDumpDmar (
-         default:
- 
-             AcpiOsPrintf ("\n**** Unknown DMAR subtable type 0x%X\n\n",
--                Subtable->Type);
-+                SubType);
-             return;
-         }
- 
-         Status = AcpiDmDumpTable (Length, Offset, Subtable,
--            Subtable->Length, InfoTable);
-+            SubLength, InfoTable);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -605,8 +625,8 @@ AcpiDmDumpDmar (
-         /*
-          * Dump the optional device scope entries
-          */
--        if ((Subtable->Type == ACPI_DMAR_TYPE_HARDWARE_AFFINITY) ||
--            (Subtable->Type == ACPI_DMAR_TYPE_NAMESPACE))
-+        if ((SubType == ACPI_DMAR_TYPE_HARDWARE_AFFINITY) ||
-+            (SubType == ACPI_DMAR_TYPE_NAMESPACE))
-         {
-             /* These types do not support device scopes */
- 
-@@ -614,7 +634,7 @@ AcpiDmDumpDmar (
-         }
- 
-         ScopeTable = ACPI_ADD_PTR (ACPI_DMAR_DEVICE_SCOPE, Subtable, ScopeOffset);
--        while (ScopeOffset < Subtable->Length)
-+        while (ScopeOffset < SubLength)
-         {
-             AcpiOsPrintf ("\n");
-             Status = AcpiDmDumpTable (Length, Offset + ScopeOffset, ScopeTable,
-@@ -655,9 +675,8 @@ AcpiDmDumpDmar (
- NextSubtable:
-         /* Point to next subtable */
- 
--        Offset += Subtable->Length;
--        Subtable = ACPI_ADD_PTR (ACPI_DMAR_HEADER, Subtable,
--            Subtable->Length);
-+        Offset += SubLength;
-+        Subtable = ACPI_ADD_PTR (ACPI_DMAR_HEADER, Subtable, SubLength);
-     }
- }
- 
-@@ -684,12 +703,15 @@ AcpiDmDumpDrtm (
-     ACPI_DRTM_RESOURCE_LIST *DrtmRl;
-     ACPI_DRTM_DPS_ID        *DrtmDps;
-     UINT32                  Count;
-+    UINT32                  ValidatedCount;
-+    UINT32                  ResourceCount;
-+    UINT32		    Length;
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
--        AcpiDmTableInfoDrtm);
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoDrtm);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -703,7 +725,7 @@ AcpiDmDumpDrtm (
- 
-     DrtmVtl = ACPI_ADD_PTR (ACPI_DRTM_VTABLE_LIST, Table, Offset);
-     AcpiOsPrintf ("\n");
--    Status = AcpiDmDumpTable (Table->Length, Offset,
-+    Status = AcpiDmDumpTable (Length, Offset,
-         DrtmVtl, ACPI_OFFSET (ACPI_DRTM_VTABLE_LIST, ValidatedTables),
-         AcpiDmTableInfoDrtm0);
-     if (ACPI_FAILURE (Status))
-@@ -716,10 +738,11 @@ AcpiDmDumpDrtm (
-     /* Dump Validated table addresses */
- 
-     Count = 0;
--    while ((Offset < Table->Length) &&
--            (DrtmVtl->ValidatedTableCount > Count))
-+    ACPI_MOVE_32_TO_32(&ValidatedCount, &DrtmVtl->ValidatedTableCount);
-+    while ((Offset < Length) &&
-+            (ValidatedCount > Count))
-     {
--        Status = AcpiDmDumpTable (Table->Length, Offset,
-+        Status = AcpiDmDumpTable (Length, Offset,
-             ACPI_ADD_PTR (void, Table, Offset), sizeof (UINT64),
-             AcpiDmTableInfoDrtm0a);
-         if (ACPI_FAILURE (Status))
-@@ -735,7 +758,7 @@ AcpiDmDumpDrtm (
- 
-     DrtmRl = ACPI_ADD_PTR (ACPI_DRTM_RESOURCE_LIST, Table, Offset);
-     AcpiOsPrintf ("\n");
--    Status = AcpiDmDumpTable (Table->Length, Offset,
-+    Status = AcpiDmDumpTable (Length, Offset,
-         DrtmRl, ACPI_OFFSET (ACPI_DRTM_RESOURCE_LIST, Resources),
-         AcpiDmTableInfoDrtm1);
-     if (ACPI_FAILURE (Status))
-@@ -748,10 +771,11 @@ AcpiDmDumpDrtm (
-     /* Dump the Resource List */
- 
-     Count = 0;
--    while ((Offset < Table->Length) &&
--           (DrtmRl->ResourceCount > Count))
-+    ACPI_MOVE_32_TO_32(&ResourceCount, &DrtmRl->ResourceCount);
-+    while ((Offset < Length) &&
-+           (ResourceCount > Count))
-     {
--        Status = AcpiDmDumpTable (Table->Length, Offset,
-+        Status = AcpiDmDumpTable (Length, Offset,
-             ACPI_ADD_PTR (void, Table, Offset),
-             sizeof (ACPI_DRTM_RESOURCE), AcpiDmTableInfoDrtm1a);
-         if (ACPI_FAILURE (Status))
-@@ -767,7 +791,7 @@ AcpiDmDumpDrtm (
- 
-     DrtmDps = ACPI_ADD_PTR (ACPI_DRTM_DPS_ID, Table, Offset);
-     AcpiOsPrintf ("\n");
--    (void) AcpiDmDumpTable (Table->Length, Offset,
-+    (void) AcpiDmDumpTable (Length, Offset,
-         DrtmDps, sizeof (ACPI_DRTM_DPS_ID), AcpiDmTableInfoDrtm2);
- }
- 
-@@ -791,12 +815,13 @@ AcpiDmDumpEinj (
- {
-     ACPI_STATUS             Status;
-     ACPI_WHEA_HEADER        *Subtable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length;
-     UINT32                  Offset = sizeof (ACPI_TABLE_EINJ);
- 
- 
-     /* Main table */
- 
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoEinj);
-     if (ACPI_FAILURE (Status))
-     {
-@@ -806,7 +831,7 @@ AcpiDmDumpEinj (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_WHEA_HEADER, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         AcpiOsPrintf ("\n");
-         Status = AcpiDmDumpTable (Length, Offset, Subtable,
-@@ -844,12 +869,13 @@ AcpiDmDumpErst (
- {
-     ACPI_STATUS             Status;
-     ACPI_WHEA_HEADER        *Subtable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length;
-     UINT32                  Offset = sizeof (ACPI_TABLE_ERST);
- 
- 
-     /* Main table */
- 
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoErst);
-     if (ACPI_FAILURE (Status))
-     {
-@@ -859,7 +885,7 @@ AcpiDmDumpErst (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_WHEA_HEADER, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         AcpiOsPrintf ("\n");
-         Status = AcpiDmDumpTable (Length, Offset, Subtable,
-@@ -897,17 +923,19 @@ AcpiDmDumpFpdt (
- {
-     ACPI_STATUS             Status;
-     ACPI_FPDT_HEADER        *Subtable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length;
-     UINT32                  Offset = sizeof (ACPI_TABLE_FPDT);
-     ACPI_DMTABLE_INFO       *InfoTable;
-+    UINT16		    Type;
- 
- 
-     /* There is no main table (other than the standard ACPI header) */
- 
-     /* Subtables */
- 
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-     Subtable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         /* Common subtable header */
- 
-@@ -919,7 +947,8 @@ AcpiDmDumpFpdt (
-             return;
-         }
- 
--        switch (Subtable->Type)
-+	ACPI_MOVE_16_TO_16(&Type, &Subtable->Type);
-+        switch (Type)
-         {
-         case ACPI_FPDT_TYPE_BOOT:
- 
-@@ -933,8 +962,7 @@ AcpiDmDumpFpdt (
- 
-         default:
- 
--            AcpiOsPrintf ("\n**** Unknown FPDT subtable type 0x%X\n\n",
--                Subtable->Type);
-+            AcpiOsPrintf ("\n**** Unknown FPDT subtable type 0x%X\n\n", Type);
- 
-             /* Attempt to continue */
- 
-@@ -982,16 +1010,19 @@ AcpiDmDumpGtdt (
- {
-     ACPI_STATUS             Status;
-     ACPI_GTDT_HEADER        *Subtable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length;
-+    UINT16                  SubLength;
-     UINT32                  Offset = sizeof (ACPI_TABLE_GTDT);
-     ACPI_DMTABLE_INFO       *InfoTable;
-     UINT32                  SubtableLength;
-     UINT32                  GtCount;
-+    UINT32                  Tmp32;
-     ACPI_GTDT_TIMER_ENTRY   *GtxTable;
- 
- 
-     /* Main table */
- 
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoGtdt);
-     if (ACPI_FAILURE (Status))
-     {
-@@ -1018,7 +1049,7 @@ AcpiDmDumpGtdt (
- 
-     /* Subtables */
- 
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         /* Common subtable header */
- 
-@@ -1036,8 +1067,9 @@ AcpiDmDumpGtdt (
-         case ACPI_GTDT_TYPE_TIMER_BLOCK:
- 
-             SubtableLength = sizeof (ACPI_GTDT_TIMER_BLOCK);
--            GtCount = (ACPI_CAST_PTR (ACPI_GTDT_TIMER_BLOCK,
-+            Tmp32 = (ACPI_CAST_PTR (ACPI_GTDT_TIMER_BLOCK,
-                 Subtable))->TimerCount;
-+	    ACPI_MOVE_32_TO_32(&GtCount, &Tmp32);
- 
-             InfoTable = AcpiDmTableInfoGtdt0;
-             break;
-@@ -1058,8 +1090,9 @@ AcpiDmDumpGtdt (
-             return;
-         }
- 
-+	ACPI_MOVE_16_TO_16(&SubLength, &Subtable->Length);
-         Status = AcpiDmDumpTable (Length, Offset, Subtable,
--            Subtable->Length, InfoTable);
-+            SubLength, InfoTable);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -1118,16 +1151,18 @@ AcpiDmDumpHest (
- {
-     ACPI_STATUS             Status;
-     ACPI_HEST_HEADER        *Subtable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length;
-     UINT32                  Offset = sizeof (ACPI_TABLE_HEST);
-     ACPI_DMTABLE_INFO       *InfoTable;
-     UINT32                  SubtableLength;
-     UINT32                  BankCount;
-     ACPI_HEST_IA_ERROR_BANK *BankTable;
-+    UINT16		    SubType;
- 
- 
-     /* Main table */
- 
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoHest);
-     if (ACPI_FAILURE (Status))
-     {
-@@ -1137,10 +1172,11 @@ AcpiDmDumpHest (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_HEST_HEADER, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         BankCount = 0;
--        switch (Subtable->Type)
-+	ACPI_MOVE_16_TO_16(&SubType, &Subtable->Type);
-+        switch (SubType)
-         {
-         case ACPI_HEST_TYPE_IA32_CHECK:
- 
-Index: acpica-unix-20190816/source/common/dmtbdump2.c
-===================================================================
---- acpica-unix-20190816.orig/source/common/dmtbdump2.c
-+++ acpica-unix-20190816/source/common/dmtbdump2.c
-@@ -75,15 +75,21 @@ AcpiDmDumpIort (
-     ACPI_IORT_SMMU          *IortSmmu = NULL;
-     UINT32                  Offset;
-     UINT32                  NodeOffset;
-+    UINT16		    NodeLength;
-     UINT32                  Length;
-     ACPI_DMTABLE_INFO       *InfoTable;
-     char                    *String;
-     UINT32                  i;
--
-+    UINT32		    TableLen;
-+    UINT32		    ItsCount;
-+    UINT32		    MappingCount;
-+    UINT32		    CtxIntCount;
-+    UINT32		    PmuIntCount;
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoIort);
-+    ACPI_MOVE_32_TO_32(&TableLen, &Table->Length);
-+    Status = AcpiDmDumpTable (TableLen, 0, Table, 0, AcpiDmTableInfoIort);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -94,18 +100,19 @@ AcpiDmDumpIort (
- 
-     /* Dump the OptionalPadding (optional) */
- 
--    if (Iort->NodeOffset > Offset)
-+    ACPI_MOVE_32_TO_32(&NodeOffset, &Iort->NodeOffset);
-+    if (NodeOffset > Offset)
-     {
--        Status = AcpiDmDumpTable (Table->Length, Offset, Table,
--            Iort->NodeOffset - Offset, AcpiDmTableInfoIortPad);
-+        Status = AcpiDmDumpTable (TableLen, Offset, Table,
-+            NodeOffset - Offset, AcpiDmTableInfoIortPad);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-         }
-     }
- 
--    Offset = Iort->NodeOffset;
--    while (Offset < Table->Length)
-+    ACPI_MOVE_32_TO_32(&Offset, &Iort->NodeOffset);
-+    while (Offset < TableLen)
-     {
-         /* Common subtable header */
- 
-@@ -141,7 +148,8 @@ AcpiDmDumpIort (
-         case ACPI_IORT_NODE_PCI_ROOT_COMPLEX:
- 
-             InfoTable = AcpiDmTableInfoIort2;
--            Length = IortNode->Length - NodeOffset;
-+	    ACPI_MOVE_16_TO_16(&NodeLength, &IortNode->Length);
-+            Length = NodeLength - NodeOffset;
-             break;
- 
-         case ACPI_IORT_NODE_SMMU:
-@@ -154,7 +162,8 @@ AcpiDmDumpIort (
-         case ACPI_IORT_NODE_SMMU_V3:
- 
-             InfoTable = AcpiDmTableInfoIort4;
--            Length = IortNode->Length - NodeOffset;
-+	    ACPI_MOVE_16_TO_16(&NodeLength, &IortNode->Length);
-+            Length = NodeLength - NodeOffset;
-             break;
- 
-         case ACPI_IORT_NODE_PMCG:
-@@ -170,7 +179,8 @@ AcpiDmDumpIort (
- 
-             /* Attempt to continue */
- 
--            if (!IortNode->Length)
-+	    ACPI_MOVE_16_TO_16(&NodeLength, &IortNode->Length);
-+            if (!NodeLength)
-             {
-                 AcpiOsPrintf ("Invalid zero length IORT node\n");
-                 return;
-@@ -181,7 +191,7 @@ AcpiDmDumpIort (
-         /* Dump the node subtable header */
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
-+        Status = AcpiDmDumpTable (TableLen, Offset + NodeOffset,
-             ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
-             Length, InfoTable);
-         if (ACPI_FAILURE (Status))
-@@ -201,9 +211,10 @@ AcpiDmDumpIort (
- 
-             if (IortItsGroup)
-             {
--                for (i = 0; i < IortItsGroup->ItsCount; i++)
-+	        ACPI_MOVE_32_TO_32(&ItsCount, &IortItsGroup->ItsCount);
-+                for (i = 0; i < ItsCount; i++)
-                 {
--                    Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
-+                    Status = AcpiDmDumpTable (TableLen, Offset + NodeOffset,
-                         ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
-                         4, AcpiDmTableInfoIort0a);
-                     NodeOffset += 4;
-@@ -215,11 +226,11 @@ AcpiDmDumpIort (
- 
-             /* Dump the Padding (optional) */
- 
--            if (IortNode->Length > NodeOffset)
-+	    ACPI_MOVE_16_TO_16(&NodeLength, &IortNode->Length);
-+            if (NodeLength > NodeOffset)
-             {
--                Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
--                    Table, IortNode->Length - NodeOffset,
--                    AcpiDmTableInfoIort1a);
-+                Status = AcpiDmDumpTable (TableLen, Offset + NodeOffset,
-+                    Table, NodeLength - NodeOffset, AcpiDmTableInfoIort1a);
-                 if (ACPI_FAILURE (Status))
-                 {
-                     return;
-@@ -236,8 +247,8 @@ AcpiDmDumpIort (
-             if (IortSmmu)
-             {
-                 Length = 2 * sizeof (UINT64);
--                NodeOffset = IortSmmu->GlobalInterruptOffset;
--                Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
-+                ACPI_MOVE_32_TO_32(&NodeOffset, &IortSmmu->GlobalInterruptOffset);
-+                Status = AcpiDmDumpTable (TableLen, Offset + NodeOffset,
-                     ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
-                     Length, AcpiDmTableInfoIort3a);
-                 if (ACPI_FAILURE (Status))
-@@ -245,10 +256,11 @@ AcpiDmDumpIort (
-                     return;
-                 }
- 
--                NodeOffset = IortSmmu->ContextInterruptOffset;
--                for (i = 0; i < IortSmmu->ContextInterruptCount; i++)
-+                ACPI_MOVE_32_TO_32(&NodeOffset, &IortSmmu->ContextInterruptOffset);
-+                ACPI_MOVE_32_TO_32(&CtxIntCount, &IortSmmu->ContextInterruptCount);
-+                for (i = 0; i < CtxIntCount; i++)
-                 {
--                    Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
-+                    Status = AcpiDmDumpTable (TableLen, Offset + NodeOffset,
-                         ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
-                         8, AcpiDmTableInfoIort3b);
-                     if (ACPI_FAILURE (Status))
-@@ -259,10 +271,11 @@ AcpiDmDumpIort (
-                     NodeOffset += 8;
-                 }
- 
--                NodeOffset = IortSmmu->PmuInterruptOffset;
--                for (i = 0; i < IortSmmu->PmuInterruptCount; i++)
-+                ACPI_MOVE_32_TO_32(&NodeOffset, &IortSmmu->PmuInterruptOffset);
-+                ACPI_MOVE_32_TO_32(&PmuIntCount, &IortSmmu->PmuInterruptCount);
-+                for (i = 0; i < PmuIntCount; i++)
-                 {
--                    Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
-+                    Status = AcpiDmDumpTable (TableLen, Offset + NodeOffset,
-                         ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
-                         8, AcpiDmTableInfoIort3c);
-                     if (ACPI_FAILURE (Status))
-@@ -282,12 +295,13 @@ AcpiDmDumpIort (
- 
-         /* Dump the ID mappings */
- 
--        NodeOffset = IortNode->MappingOffset;
--        for (i = 0; i < IortNode->MappingCount; i++)
-+        ACPI_MOVE_32_TO_32(&NodeOffset, &IortNode->MappingOffset);
-+        ACPI_MOVE_32_TO_32(&MappingCount, &IortNode->MappingCount);
-+        for (i = 0; i < MappingCount; i++)
-         {
-             AcpiOsPrintf ("\n");
-             Length = sizeof (ACPI_IORT_ID_MAPPING);
--            Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
-+            Status = AcpiDmDumpTable (TableLen, Offset + NodeOffset,
-                 ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
-                 Length, AcpiDmTableInfoIortMap);
-             if (ACPI_FAILURE (Status))
-@@ -301,8 +315,9 @@ AcpiDmDumpIort (
- NextSubtable:
-         /* Point to next node subtable */
- 
--        Offset += IortNode->Length;
--        IortNode = ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, IortNode->Length);
-+	ACPI_MOVE_16_TO_16(&NodeLength, &IortNode->Length);
-+        Offset += NodeLength;
-+        IortNode = ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeLength);
-     }
- }
- 
-@@ -333,11 +348,14 @@ AcpiDmDumpIvrs (
-     ACPI_IVRS_DE_HEADER     *DeviceEntry;
-     ACPI_IVRS_HEADER        *Subtable;
-     ACPI_DMTABLE_INFO       *InfoTable;
-+    UINT32		    Length;
-+    UINT16		    SubLength;
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoIvrs);
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoIvrs);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -346,13 +364,14 @@ AcpiDmDumpIvrs (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_IVRS_HEADER, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         /* Common subtable header */
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
--            Subtable->Length, AcpiDmTableInfoIvrsHdr);
-+        ACPI_MOVE_16_TO_16(&SubLength, &Subtable->Length);
-+        Status = AcpiDmDumpTable (Length, Offset, Subtable,
-+            SubLength, AcpiDmTableInfoIvrsHdr);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -379,7 +398,7 @@ AcpiDmDumpIvrs (
- 
-             /* Attempt to continue */
- 
--            if (!Subtable->Length)
-+            if (!SubLength)
-             {
-                 AcpiOsPrintf ("Invalid zero length subtable\n");
-                 return;
-@@ -390,8 +409,8 @@ AcpiDmDumpIvrs (
-         /* Dump the subtable */
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
--            Subtable->Length, InfoTable);
-+        Status = AcpiDmDumpTable (Length, Offset, Subtable,
-+            SubLength, InfoTable);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -405,7 +424,7 @@ AcpiDmDumpIvrs (
-             DeviceEntry = ACPI_ADD_PTR (ACPI_IVRS_DE_HEADER, Subtable,
-                 sizeof (ACPI_IVRS_HARDWARE));
- 
--            while (EntryOffset < (Offset + Subtable->Length))
-+            while (EntryOffset < (Offset + SubLength))
-             {
-                 AcpiOsPrintf ("\n");
-                 /*
-@@ -467,7 +486,7 @@ AcpiDmDumpIvrs (
- 
-                 /* Dump the Device Entry */
- 
--                Status = AcpiDmDumpTable (Table->Length, EntryOffset,
-+                Status = AcpiDmDumpTable (Length, EntryOffset,
-                     DeviceEntry, EntryLength, InfoTable);
-                 if (ACPI_FAILURE (Status))
-                 {
-@@ -483,8 +502,8 @@ AcpiDmDumpIvrs (
- NextSubtable:
-         /* Point to next subtable */
- 
--        Offset += Subtable->Length;
--        Subtable = ACPI_ADD_PTR (ACPI_IVRS_HEADER, Subtable, Subtable->Length);
-+        Offset += SubLength;
-+        Subtable = ACPI_ADD_PTR (ACPI_IVRS_HEADER, Subtable, SubLength);
-     }
- }
- 
-@@ -510,7 +529,7 @@ AcpiDmDumpLpit (
- {
-     ACPI_STATUS             Status;
-     ACPI_LPIT_HEADER        *Subtable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length;
-     UINT32                  Offset = sizeof (ACPI_TABLE_LPIT);
-     ACPI_DMTABLE_INFO       *InfoTable;
-     UINT32                  SubtableLength;
-@@ -518,8 +537,9 @@ AcpiDmDumpLpit (
- 
-     /* Subtables */
- 
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-     Subtable = ACPI_ADD_PTR (ACPI_LPIT_HEADER, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         /* Common subtable header */
- 
-@@ -583,13 +603,14 @@ AcpiDmDumpMadt (
- {
-     ACPI_STATUS             Status;
-     ACPI_SUBTABLE_HEADER    *Subtable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length;
-     UINT32                  Offset = sizeof (ACPI_TABLE_MADT);
-     ACPI_DMTABLE_INFO       *InfoTable;
- 
- 
-     /* Main table */
- 
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoMadt);
-     if (ACPI_FAILURE (Status))
-     {
-@@ -599,7 +620,7 @@ AcpiDmDumpMadt (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         /* Common subtable header */
- 
-@@ -745,11 +766,13 @@ AcpiDmDumpMcfg (
-     ACPI_STATUS             Status;
-     UINT32                  Offset = sizeof (ACPI_TABLE_MCFG);
-     ACPI_MCFG_ALLOCATION    *Subtable;
-+    UINT32		    Len;
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoMcfg);
-+    ACPI_MOVE_32_TO_32(&Len, &Table->Length);
-+    Status = AcpiDmDumpTable (Len, 0, Table, 0, AcpiDmTableInfoMcfg);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -758,17 +781,17 @@ AcpiDmDumpMcfg (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_MCFG_ALLOCATION, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Len)
-     {
--        if (Offset + sizeof (ACPI_MCFG_ALLOCATION) > Table->Length)
-+        if (Offset + sizeof (ACPI_MCFG_ALLOCATION) > Len)
-         {
-             AcpiOsPrintf ("Warning: there are %u invalid trailing bytes\n",
--                (UINT32) sizeof (ACPI_MCFG_ALLOCATION) - (Offset - Table->Length));
-+                (UINT32) sizeof (ACPI_MCFG_ALLOCATION) - (Offset - Len));
-             return;
-         }
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (Len, Offset, Subtable,
-             sizeof (ACPI_MCFG_ALLOCATION), AcpiDmTableInfoMcfg0);
-         if (ACPI_FAILURE (Status))
-         {
-@@ -802,6 +825,7 @@ AcpiDmDumpMpst (
- {
-     ACPI_STATUS             Status;
-     UINT32                  Offset = sizeof (ACPI_TABLE_MPST);
-+    ACPI_TABLE_MPST	    *Mpst;
-     ACPI_MPST_POWER_NODE    *Subtable0;
-     ACPI_MPST_POWER_STATE   *Subtable0A;
-     ACPI_MPST_COMPONENT     *Subtable0B;
-@@ -810,11 +834,13 @@ AcpiDmDumpMpst (
-     UINT16                  SubtableCount;
-     UINT32                  PowerStateCount;
-     UINT32                  ComponentCount;
-+    UINT32		    Length;
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoMpst);
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoMpst);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -822,13 +848,14 @@ AcpiDmDumpMpst (
- 
-     /* Subtable: Memory Power Node(s) */
- 
--    SubtableCount = (ACPI_CAST_PTR (ACPI_TABLE_MPST, Table))->PowerNodeCount;
-+    Mpst = ACPI_CAST_PTR (ACPI_TABLE_MPST, Table);
-+    ACPI_MOVE_16_TO_16(&SubtableCount, &Mpst->PowerNodeCount);
-     Subtable0 = ACPI_ADD_PTR (ACPI_MPST_POWER_NODE, Table, Offset);
- 
--    while ((Offset < Table->Length) && SubtableCount)
-+    while ((Offset < Length) && SubtableCount)
-     {
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable0,
-+        Status = AcpiDmDumpTable (Length, Offset, Subtable0,
-             sizeof (ACPI_MPST_POWER_NODE), AcpiDmTableInfoMpst0);
-         if (ACPI_FAILURE (Status))
-         {
-@@ -837,8 +864,8 @@ AcpiDmDumpMpst (
- 
-         /* Extract the sub-subtable counts */
- 
--        PowerStateCount = Subtable0->NumPowerStates;
--        ComponentCount = Subtable0->NumPhysicalComponents;
-+        ACPI_MOVE_32_TO_32(&PowerStateCount, &Subtable0->NumPowerStates);
-+        ACPI_MOVE_32_TO_32(&ComponentCount, &Subtable0->NumPhysicalComponents);
-         Offset += sizeof (ACPI_MPST_POWER_NODE);
- 
-         /* Sub-subtables - Memory Power State Structure(s) */
-@@ -849,7 +876,7 @@ AcpiDmDumpMpst (
-         while (PowerStateCount)
-         {
-             AcpiOsPrintf ("\n");
--            Status = AcpiDmDumpTable (Table->Length, Offset, Subtable0A,
-+            Status = AcpiDmDumpTable (Length, Offset, Subtable0A,
-                 sizeof (ACPI_MPST_POWER_STATE), AcpiDmTableInfoMpst0A);
-             if (ACPI_FAILURE (Status))
-             {
-@@ -859,7 +886,7 @@ AcpiDmDumpMpst (
-             Subtable0A++;
-             PowerStateCount--;
-             Offset += sizeof (ACPI_MPST_POWER_STATE);
--       }
-+        }
- 
-         /* Sub-subtables - Physical Component ID Structure(s) */
- 
-@@ -872,7 +899,7 @@ AcpiDmDumpMpst (
- 
-         while (ComponentCount)
-         {
--            Status = AcpiDmDumpTable (Table->Length, Offset, Subtable0B,
-+            Status = AcpiDmDumpTable (Length, Offset, Subtable0B,
-                 sizeof (ACPI_MPST_COMPONENT), AcpiDmTableInfoMpst0B);
-             if (ACPI_FAILURE (Status))
-             {
-@@ -887,17 +914,19 @@ AcpiDmDumpMpst (
-         /* Point to next Memory Power Node subtable */
- 
-         SubtableCount--;
-+        ACPI_MOVE_32_TO_32(&PowerStateCount, &Subtable0->NumPowerStates);
-+        ACPI_MOVE_32_TO_32(&ComponentCount, &Subtable0->NumPhysicalComponents);
-         Subtable0 = ACPI_ADD_PTR (ACPI_MPST_POWER_NODE, Subtable0,
-             sizeof (ACPI_MPST_POWER_NODE) +
--            (sizeof (ACPI_MPST_POWER_STATE) * Subtable0->NumPowerStates) +
--            (sizeof (ACPI_MPST_COMPONENT) * Subtable0->NumPhysicalComponents));
-+            (sizeof (ACPI_MPST_POWER_STATE) * PowerStateCount) +
-+            (sizeof (ACPI_MPST_COMPONENT) * ComponentCount));
-     }
- 
-     /* Subtable: Count of Memory Power State Characteristic structures */
- 
-     AcpiOsPrintf ("\n");
-     Subtable1 = ACPI_CAST_PTR (ACPI_MPST_DATA_HDR, Subtable0);
--    Status = AcpiDmDumpTable (Table->Length, Offset, Subtable1,
-+    Status = AcpiDmDumpTable (Length, Offset, Subtable1,
-         sizeof (ACPI_MPST_DATA_HDR), AcpiDmTableInfoMpst1);
-     if (ACPI_FAILURE (Status))
-     {
-@@ -912,10 +941,10 @@ AcpiDmDumpMpst (
-     Subtable2 = ACPI_ADD_PTR (ACPI_MPST_POWER_DATA, Subtable1,
-         sizeof (ACPI_MPST_DATA_HDR));
- 
--    while ((Offset < Table->Length) && SubtableCount)
-+    while ((Offset < Length) && SubtableCount)
-     {
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable2,
-+        Status = AcpiDmDumpTable (Length, Offset, Subtable2,
-             sizeof (ACPI_MPST_POWER_DATA), AcpiDmTableInfoMpst2);
-         if (ACPI_FAILURE (Status))
-         {
-@@ -948,11 +977,13 @@ AcpiDmDumpMsct (
-     ACPI_STATUS             Status;
-     UINT32                  Offset = sizeof (ACPI_TABLE_MSCT);
-     ACPI_MSCT_PROXIMITY     *Subtable;
-+    UINT32		    Length;
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoMsct);
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoMsct);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -961,12 +992,12 @@ AcpiDmDumpMsct (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_MSCT_PROXIMITY, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         /* Common subtable header */
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (Length, Offset, Subtable,
-             sizeof (ACPI_MSCT_PROXIMITY), AcpiDmTableInfoMsct0);
-         if (ACPI_FAILURE (Status))
-         {
-@@ -1001,11 +1032,13 @@ AcpiDmDumpMtmr (
-     ACPI_STATUS             Status;
-     UINT32                  Offset = sizeof (ACPI_TABLE_MTMR);
-     ACPI_MTMR_ENTRY         *Subtable;
-+    UINT32		    Length;
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoMtmr);
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoMtmr);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -1014,12 +1047,12 @@ AcpiDmDumpMtmr (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_MTMR_ENTRY, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         /* Common subtable header */
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (Length, Offset, Subtable,
-             sizeof (ACPI_MTMR_ENTRY), AcpiDmTableInfoMtmr0);
-         if (ACPI_FAILURE (Status))
-         {
-@@ -1061,11 +1094,17 @@ AcpiDmDumpNfit (
-     ACPI_NFIT_SMBIOS        *SmbiosInfo = NULL;
-     ACPI_NFIT_FLUSH_ADDRESS *Hint = NULL;
-     UINT32                  i;
-+    UINT32                  TableLength;
-+    UINT16                  SubLength;
-+    UINT16                  SubType;
-+    UINT32                  Count;
-+    UINT16                  Count16;
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoNfit);
-+    ACPI_MOVE_32_TO_32(&TableLength, &Table->Length);
-+    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoNfit);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -1074,19 +1113,21 @@ AcpiDmDumpNfit (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_NFIT_HEADER, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < TableLength)
-     {
-         /* NFIT subtable header */
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
--            Subtable->Length, AcpiDmTableInfoNfitHdr);
-+	ACPI_MOVE_16_TO_16(&SubLength, &Subtable->Length);
-+        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
-+            SubLength, AcpiDmTableInfoNfitHdr);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-         }
- 
--        switch (Subtable->Type)
-+	ACPI_MOVE_16_TO_16(&SubType, &Subtable->Type);
-+        switch (SubType)
-         {
-         case ACPI_NFIT_TYPE_SYSTEM_ADDRESS:
- 
-@@ -1143,7 +1184,7 @@ AcpiDmDumpNfit (
- 
-             /* Attempt to continue */
- 
--            if (!Subtable->Length)
-+            if (!SubLength)
-             {
-                 AcpiOsPrintf ("Invalid zero length subtable\n");
-                 return;
-@@ -1152,8 +1193,8 @@ AcpiDmDumpNfit (
-         }
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
--            Subtable->Length, InfoTable);
-+        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
-+            SubLength, InfoTable);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -1161,13 +1202,14 @@ AcpiDmDumpNfit (
- 
-         /* Per-subtable variable-length fields */
- 
--        switch (Subtable->Type)
-+        switch (SubType)
-         {
-         case ACPI_NFIT_TYPE_INTERLEAVE:
- 
--            for (i = 0; i < Interleave->LineCount; i++)
-+	    ACPI_MOVE_32_TO_32(&Count, &Interleave->LineCount);
-+            for (i = 0; i < Count; i++)
-             {
--                Status = AcpiDmDumpTable (Table->Length, Offset + FieldOffset,
-+                Status = AcpiDmDumpTable (TableLength, Offset + FieldOffset,
-                     &Interleave->LineOffset[i],
-                     sizeof (UINT32), AcpiDmTableInfoNfit2a);
-                 if (ACPI_FAILURE (Status))
-@@ -1181,12 +1223,11 @@ AcpiDmDumpNfit (
- 
-         case ACPI_NFIT_TYPE_SMBIOS:
- 
--            Length = Subtable->Length -
--                sizeof (ACPI_NFIT_SMBIOS) + sizeof (UINT8);
-+            Length = SubLength - sizeof (ACPI_NFIT_SMBIOS) + sizeof (UINT8);
- 
-             if (Length)
-             {
--                Status = AcpiDmDumpTable (Table->Length,
-+                Status = AcpiDmDumpTable (TableLength,
-                     sizeof (ACPI_NFIT_SMBIOS) - sizeof (UINT8),
-                     SmbiosInfo,
-                     Length, AcpiDmTableInfoNfit3a);
-@@ -1200,9 +1241,10 @@ AcpiDmDumpNfit (
- 
-         case ACPI_NFIT_TYPE_FLUSH_ADDRESS:
- 
--            for (i = 0; i < Hint->HintCount; i++)
-+	    ACPI_MOVE_16_TO_16(&Count16, &Hint->HintCount);
-+            for (i = 0; i < Count16; i++)
-             {
--                Status = AcpiDmDumpTable (Table->Length, Offset + FieldOffset,
-+                Status = AcpiDmDumpTable (TableLength, Offset + FieldOffset,
-                     &Hint->HintAddress[i],
-                     sizeof (UINT64), AcpiDmTableInfoNfit6a);
-                 if (ACPI_FAILURE (Status))
-@@ -1221,8 +1263,8 @@ AcpiDmDumpNfit (
- NextSubtable:
-         /* Point to next subtable */
- 
--        Offset += Subtable->Length;
--        Subtable = ACPI_ADD_PTR (ACPI_NFIT_HEADER, Subtable, Subtable->Length);
-+        Offset += SubLength;
-+        Subtable = ACPI_ADD_PTR (ACPI_NFIT_HEADER, Subtable, SubLength);
-     }
- }
- 
-@@ -1247,12 +1289,13 @@ AcpiDmDumpPcct (
-     ACPI_STATUS             Status;
-     ACPI_PCCT_SUBSPACE      *Subtable;
-     ACPI_DMTABLE_INFO       *InfoTable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length;
-     UINT32                  Offset = sizeof (ACPI_TABLE_PCCT);
- 
- 
-     /* Main table */
- 
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoPcct);
-     if (ACPI_FAILURE (Status))
-     {
-@@ -1262,7 +1305,7 @@ AcpiDmDumpPcct (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_PCCT_SUBSPACE, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         /* Common subtable header */
- 
-@@ -1402,16 +1445,21 @@ AcpiDmDumpPmtt (
-     ACPI_PMTT_HEADER        *MemSubtable;
-     ACPI_PMTT_HEADER        *DimmSubtable;
-     ACPI_PMTT_DOMAIN        *DomainArray;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length;
-     UINT32                  Offset = sizeof (ACPI_TABLE_PMTT);
-     UINT32                  MemOffset;
-     UINT32                  DimmOffset;
-     UINT32                  DomainOffset;
--    UINT32                  DomainCount;
-+    UINT16                  DomainCount;
-+    UINT16		    SubLength;
-+    UINT16		    Tmp16;
-+    UINT16		    MemLength;
-+    UINT16		    DimmLength;
- 
- 
-     /* Main table */
- 
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoPmtt);
-     if (ACPI_FAILURE (Status))
-     {
-@@ -1421,13 +1469,14 @@ AcpiDmDumpPmtt (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         /* Common subtable header */
- 
-         AcpiOsPrintf ("\n");
-+        ACPI_MOVE_16_TO_16(&SubLength, &Subtable->Length);
-         Status = AcpiDmDumpTable (Length, Offset, Subtable,
--            Subtable->Length, AcpiDmTableInfoPmttHdr);
-+            SubLength, AcpiDmTableInfoPmttHdr);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -1446,7 +1495,7 @@ AcpiDmDumpPmtt (
-         /* Dump the fixed-length portion of the subtable */
- 
-         Status = AcpiDmDumpTable (Length, Offset, Subtable,
--            Subtable->Length, AcpiDmTableInfoPmtt0);
-+            SubLength, AcpiDmTableInfoPmtt0);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -1458,15 +1507,16 @@ AcpiDmDumpPmtt (
-         MemSubtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, Subtable,
-             sizeof (ACPI_PMTT_SOCKET));
- 
--        while (((Offset + MemOffset) < Table->Length) &&
--            (MemOffset < Subtable->Length))
-+        while (((Offset + MemOffset) < Length) &&
-+            (MemOffset < SubLength))
-         {
-             /* Common subtable header */
- 
-             AcpiOsPrintf ("\n");
-+	    ACPI_MOVE_16_TO_16(&MemLength, &MemSubtable->Length);
-             Status = AcpiDmDumpTable (Length,
-                 Offset + MemOffset, MemSubtable,
--                MemSubtable->Length, AcpiDmTableInfoPmttHdr);
-+                MemLength, AcpiDmTableInfoPmttHdr);
-             if (ACPI_FAILURE (Status))
-             {
-                 return;
-@@ -1486,7 +1536,7 @@ AcpiDmDumpPmtt (
- 
-             Status = AcpiDmDumpTable (Length,
-                 Offset + MemOffset, MemSubtable,
--                MemSubtable->Length, AcpiDmTableInfoPmtt1);
-+                MemLength, AcpiDmTableInfoPmtt1);
-             if (ACPI_FAILURE (Status))
-             {
-                 return;
-@@ -1494,13 +1544,14 @@ AcpiDmDumpPmtt (
- 
-             /* Walk the variable count of proximity domains */
- 
--            DomainCount = ((ACPI_PMTT_CONTROLLER *) MemSubtable)->DomainCount;
-+	    Tmp16 = ((ACPI_PMTT_CONTROLLER *) MemSubtable)->DomainCount;
-+            ACPI_MOVE_16_TO_16(&DomainCount, &Tmp16);
-             DomainOffset = sizeof (ACPI_PMTT_CONTROLLER);
-             DomainArray = ACPI_ADD_PTR (ACPI_PMTT_DOMAIN, MemSubtable,
-                 sizeof (ACPI_PMTT_CONTROLLER));
- 
--            while (((Offset + MemOffset + DomainOffset) < Table->Length) &&
--                ((MemOffset + DomainOffset) < Subtable->Length) &&
-+            while (((Offset + MemOffset + DomainOffset) < Length) &&
-+                ((MemOffset + DomainOffset) < SubLength) &&
-                 DomainCount)
-             {
-                 Status = AcpiDmDumpTable (Length,
-@@ -1528,15 +1579,16 @@ AcpiDmDumpPmtt (
-             DimmSubtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, MemSubtable,
-                 DomainOffset);
- 
--            while (((Offset + MemOffset + DimmOffset) < Table->Length) &&
--                (DimmOffset < MemSubtable->Length))
-+            while (((Offset + MemOffset + DimmOffset) < Length) &&
-+                (DimmOffset < MemLength))
-             {
-                 /* Common subtable header */
- 
-                 AcpiOsPrintf ("\n");
-+		ACPI_MOVE_16_TO_16(&DimmLength, &DimmSubtable->Length);
-                 Status = AcpiDmDumpTable (Length,
-                     Offset + MemOffset + DimmOffset, DimmSubtable,
--                    DimmSubtable->Length, AcpiDmTableInfoPmttHdr);
-+                    DimmLength, AcpiDmTableInfoPmttHdr);
-                 if (ACPI_FAILURE (Status))
-                 {
-                     return;
-@@ -1556,7 +1608,7 @@ AcpiDmDumpPmtt (
- 
-                 Status = AcpiDmDumpTable (Length,
-                     Offset + MemOffset + DimmOffset, DimmSubtable,
--                    DimmSubtable->Length, AcpiDmTableInfoPmtt2);
-+                    DimmLength, AcpiDmTableInfoPmtt2);
-                 if (ACPI_FAILURE (Status))
-                 {
-                     return;
-@@ -1564,23 +1616,22 @@ AcpiDmDumpPmtt (
- 
-                 /* Point to next DIMM subtable */
- 
--                DimmOffset += DimmSubtable->Length;
-+                DimmOffset += DimmLength;
-                 DimmSubtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER,
--                    DimmSubtable, DimmSubtable->Length);
-+                    DimmSubtable, DimmLength);
-             }
- 
-             /* Point to next Controller subtable */
- 
--            MemOffset += MemSubtable->Length;
-+            MemOffset += MemLength;
-             MemSubtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER,
--                MemSubtable, MemSubtable->Length);
-+                MemSubtable, MemLength);
-         }
- 
-         /* Point to next Socket subtable */
- 
--        Offset += Subtable->Length;
--        Subtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER,
--            Subtable, Subtable->Length);
-+        Offset += SubLength;
-+        Subtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, Subtable, SubLength);
-     }
- }
- 
-@@ -1736,6 +1787,8 @@ AcpiDmDumpS3pt (
-     ACPI_FPDT_HEADER        *Subtable;
-     ACPI_DMTABLE_INFO       *InfoTable;
-     ACPI_TABLE_S3PT         *S3ptTable = ACPI_CAST_PTR (ACPI_TABLE_S3PT, Tables);
-+    UINT32		    Length;
-+    UINT16                  SubType;
- 
- 
-     /* Main table */
-@@ -1746,20 +1799,22 @@ AcpiDmDumpS3pt (
-         return 0;
-     }
- 
-+    ACPI_MOVE_32_TO_32(&Length, &S3ptTable->Length);
-     Subtable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, S3ptTable, Offset);
--    while (Offset < S3ptTable->Length)
-+    while (Offset < Length)
-     {
-         /* Common subtable header */
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (S3ptTable->Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (Length, Offset, Subtable,
-             Subtable->Length, AcpiDmTableInfoS3ptHdr);
-         if (ACPI_FAILURE (Status))
-         {
-             return 0;
-         }
- 
--        switch (Subtable->Type)
-+        ACPI_MOVE_16_TO_16(&SubType, &Subtable->Type);
-+        switch (SubType)
-         {
-         case ACPI_S3PT_TYPE_RESUME:
- 
-@@ -1774,7 +1829,7 @@ AcpiDmDumpS3pt (
-         default:
- 
-             AcpiOsPrintf ("\n**** Unknown S3PT subtable type 0x%X\n",
--                Subtable->Type);
-+                SubType);
- 
-             /* Attempt to continue */
- 
-@@ -1787,7 +1842,7 @@ AcpiDmDumpS3pt (
-         }
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (S3ptTable->Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (Length, Offset, Subtable,
-             Subtable->Length, InfoTable);
-         if (ACPI_FAILURE (Status))
-         {
-Index: acpica-unix-20190816/source/common/dmtbdump3.c
-===================================================================
---- acpica-unix-20190816.orig/source/common/dmtbdump3.c
-+++ acpica-unix-20190816/source/common/dmtbdump3.c
-@@ -68,9 +68,11 @@ void
- AcpiDmDumpSlic (
-     ACPI_TABLE_HEADER       *Table)
- {
-+    UINT32	Length;
- 
--    (void) AcpiDmDumpTable (Table->Length, sizeof (ACPI_TABLE_HEADER), Table,
--        Table->Length - sizeof (*Table), AcpiDmTableInfoSlic);
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+    (void) AcpiDmDumpTable (Length, sizeof (ACPI_TABLE_HEADER), Table,
-+        Length - sizeof (*Table), AcpiDmTableInfoSlic);
- }
- 
- 
-@@ -93,14 +95,17 @@ AcpiDmDumpSlit (
-     ACPI_STATUS             Status;
-     UINT32                  Offset;
-     UINT8                   *Row;
--    UINT32                  Localities;
-+    UINT64                  Localities;
-     UINT32                  i;
-     UINT32                  j;
-+    UINT32		    Length;
-+    UINT64                  Tmp64;
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoSlit);
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoSlit);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -108,7 +113,8 @@ AcpiDmDumpSlit (
- 
-     /* Display the Locality NxN Matrix */
- 
--    Localities = (UINT32) ACPI_CAST_PTR (ACPI_TABLE_SLIT, Table)->LocalityCount;
-+    Tmp64 = (UINT64) ACPI_CAST_PTR (ACPI_TABLE_SLIT, Table)->LocalityCount;
-+    ACPI_MOVE_64_TO_64(&Localities, &Tmp64);
-     Offset = ACPI_OFFSET (ACPI_TABLE_SLIT, Entry[0]);
-     Row = (UINT8 *) ACPI_CAST_PTR (ACPI_TABLE_SLIT, Table)->Entry;
- 
-@@ -121,7 +127,7 @@ AcpiDmDumpSlit (
-         {
-             /* Check for beyond EOT */
- 
--            if (Offset >= Table->Length)
-+            if (Offset >= Length)
-             {
-                 AcpiOsPrintf (
-                     "\n**** Not enough room in table for all localities\n");
-@@ -173,11 +179,13 @@ AcpiDmDumpSrat (
-     UINT32                  Offset = sizeof (ACPI_TABLE_SRAT);
-     ACPI_SUBTABLE_HEADER    *Subtable;
-     ACPI_DMTABLE_INFO       *InfoTable;
-+    UINT32		    Length;
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoSrat);
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoSrat);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -186,12 +194,12 @@ AcpiDmDumpSrat (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         /* Common subtable header */
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (Length, Offset, Subtable,
-             Subtable->Length, AcpiDmTableInfoSratHdr);
-         if (ACPI_FAILURE (Status))
-         {
-@@ -245,7 +253,7 @@ AcpiDmDumpSrat (
-         }
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (Length, Offset, Subtable,
-             Subtable->Length, InfoTable);
-         if (ACPI_FAILURE (Status))
-         {
-@@ -282,13 +290,14 @@ AcpiDmDumpStao (
- {
-     ACPI_STATUS             Status;
-     char                    *Namepath;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length;
-     UINT32                  StringLength;
-     UINT32                  Offset = sizeof (ACPI_TABLE_STAO);
- 
- 
-     /* Main table */
- 
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoStao);
-     if (ACPI_FAILURE (Status))
-     {
-@@ -297,7 +306,7 @@ AcpiDmDumpStao (
- 
-     /* The rest of the table consists of Namepath strings */
- 
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         Namepath = ACPI_ADD_PTR (char, Table, Offset);
-         StringLength = strlen (Namepath) + 1;
-@@ -339,11 +348,14 @@ AcpiDmDumpTcpa (
-     ACPI_TABLE_TCPA_HDR     *Subtable = ACPI_ADD_PTR (
-                                 ACPI_TABLE_TCPA_HDR, Table, Offset);
-     ACPI_STATUS             Status;
-+    UINT32		    Length;
-+    UINT16		    PlatformClass;
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table,
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+    Status = AcpiDmDumpTable (Length, 0, Table,
-         0, AcpiDmTableInfoTcpaHdr);
-     if (ACPI_FAILURE (Status))
-     {
-@@ -354,18 +366,19 @@ AcpiDmDumpTcpa (
-      * Examine the PlatformClass field to determine the table type.
-      * Either a client or server table. Only one.
-      */
--    switch (CommonHeader->PlatformClass)
-+    ACPI_MOVE_16_TO_16(&PlatformClass, &CommonHeader->PlatformClass);
-+    switch (PlatformClass)
-     {
-     case ACPI_TCPA_CLIENT_TABLE:
- 
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
--            Table->Length - Offset, AcpiDmTableInfoTcpaClient);
-+        Status = AcpiDmDumpTable (Length, Offset, Subtable,
-+            Length - Offset, AcpiDmTableInfoTcpaClient);
-         break;
- 
-     case ACPI_TCPA_SERVER_TABLE:
- 
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
--            Table->Length - Offset, AcpiDmTableInfoTcpaServer);
-+        Status = AcpiDmDumpTable (Length, Offset, Subtable,
-+            Length - Offset, AcpiDmTableInfoTcpaServer);
-         break;
- 
-     default:
-@@ -512,11 +525,13 @@ AcpiDmDumpVrtc (
-     ACPI_STATUS             Status;
-     UINT32                  Offset = sizeof (ACPI_TABLE_VRTC);
-     ACPI_VRTC_ENTRY         *Subtable;
-+    UINT32		    Length;
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoVrtc);
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoVrtc);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -525,12 +540,12 @@ AcpiDmDumpVrtc (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_VRTC_ENTRY, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         /* Common subtable header */
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (Length, Offset, Subtable,
-             sizeof (ACPI_VRTC_ENTRY), AcpiDmTableInfoVrtc0);
-         if (ACPI_FAILURE (Status))
-         {
-@@ -565,11 +580,13 @@ AcpiDmDumpWdat (
-     ACPI_STATUS             Status;
-     UINT32                  Offset = sizeof (ACPI_TABLE_WDAT);
-     ACPI_WDAT_ENTRY         *Subtable;
-+    UINT32		    Length;
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoWdat);
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoWdat);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -578,12 +595,12 @@ AcpiDmDumpWdat (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_WDAT_ENTRY, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         /* Common subtable header */
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (Length, Offset, Subtable,
-             sizeof (ACPI_WDAT_ENTRY), AcpiDmTableInfoWdat0);
-         if (ACPI_FAILURE (Status))
-         {
-@@ -618,12 +635,13 @@ AcpiDmDumpWpbt (
- {
-     ACPI_STATUS             Status;
-     ACPI_TABLE_WPBT         *Subtable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length;
-     UINT16                  ArgumentsLength;
- 
- 
-     /* Dump the main table */
- 
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoWpbt);
-     if (ACPI_FAILURE (Status))
-     {
-@@ -633,10 +651,10 @@ AcpiDmDumpWpbt (
-     /* Extract the arguments buffer length from the main table */
- 
-     Subtable = ACPI_CAST_PTR (ACPI_TABLE_WPBT, Table);
--    ArgumentsLength = Subtable->ArgumentsLength;
-+    ACPI_MOVE_16_TO_16(&ArgumentsLength, &Subtable->ArgumentsLength);
- 
-     /* Dump the arguments buffer */
- 
--    (void) AcpiDmDumpTable (Table->Length, 0, Table, ArgumentsLength,
-+    (void) AcpiDmDumpTable (Length, 0, Table, ArgumentsLength,
-         AcpiDmTableInfoWpbt0);
- }
-Index: acpica-unix-20190816/source/compiler/dtfield.c
-===================================================================
---- acpica-unix-20190816.orig/source/compiler/dtfield.c
-+++ acpica-unix-20190816/source/compiler/dtfield.c
+--- acpica-unix-20191018.orig/source/compiler/dtfield.c
++++ acpica-unix-20191018/source/compiler/dtfield.c
 @@ -361,7 +361,27 @@ DtCompileInteger (
          DtError (ASL_ERROR, ASL_MSG_INTEGER_SIZE, Field, AslGbl_MsgBuffer);
      }
@@ -4793,10 +2843,10 @@ Index: acpica-unix-20190816/source/compiler/dtfield.c
      return;
  }
  
-Index: acpica-unix-20190816/source/compiler/dtsubtable.c
+Index: acpica-unix-20191018/source/compiler/dtsubtable.c
 ===================================================================
---- acpica-unix-20190816.orig/source/compiler/dtsubtable.c
-+++ acpica-unix-20190816/source/compiler/dtsubtable.c
+--- acpica-unix-20191018.orig/source/compiler/dtsubtable.c
++++ acpica-unix-20191018/source/compiler/dtsubtable.c
 @@ -378,6 +378,21 @@ DtSetSubtableLength (
          return;
      }
@@ -4821,10 +2871,10 @@ Index: acpica-unix-20190816/source/compiler/dtsubtable.c
 +        	Subtable->SizeOfLengthField);
 +    }
  }
-Index: acpica-unix-20190816/source/compiler/dttable1.c
+Index: acpica-unix-20191018/source/compiler/dttable1.c
 ===================================================================
---- acpica-unix-20190816.orig/source/compiler/dttable1.c
-+++ acpica-unix-20190816/source/compiler/dttable1.c
+--- acpica-unix-20191018.orig/source/compiler/dttable1.c
++++ acpica-unix-20191018/source/compiler/dttable1.c
 @@ -281,6 +281,8 @@ DtCompileCsrt (
      DT_FIELD                **PFieldList = (DT_FIELD **) List;
      UINT32                  DescriptorCount;
@@ -5196,10 +3246,10 @@ Index: acpica-unix-20190816/source/compiler/dttable1.c
      return (AE_OK);
  }
  
-Index: acpica-unix-20190816/source/compiler/dttable2.c
+Index: acpica-unix-20191018/source/compiler/dttable2.c
 ===================================================================
---- acpica-unix-20190816.orig/source/compiler/dttable2.c
-+++ acpica-unix-20190816/source/compiler/dttable2.c
+--- acpica-unix-20191018.orig/source/compiler/dttable2.c
++++ acpica-unix-20191018/source/compiler/dttable2.c
 @@ -345,7 +345,7 @@ DtCompileMpst (
      DtPushSubtable (Subtable);
  
@@ -5292,15 +3342,15 @@ Index: acpica-unix-20190816/source/compiler/dttable2.c
          {
          case ACPI_S3PT_TYPE_RESUME:
  
-@@ -1514,6 +1518,7 @@ DtCompileSlit (
-     DT_FIELD                *FieldList;
+@@ -1517,6 +1521,7 @@ DtCompileSlit (
      UINT32                  Localities;
+     UINT32                  LocalityListLength;
      UINT8                   *LocalityBuffer;
 +    UINT32		    Tmp;
  
  
      Status = DtCompileTable (PFieldList, AcpiDmTableInfoSlit,
-@@ -1526,7 +1531,8 @@ DtCompileSlit (
+@@ -1529,7 +1534,8 @@ DtCompileSlit (
      ParentTable = DtPeekSubtable ();
      DtInsertSubtable (ParentTable, Subtable);
  
@@ -5308,9 +3358,9 @@ Index: acpica-unix-20190816/source/compiler/dttable2.c
 +    Tmp = *ACPI_CAST_PTR (UINT32, Subtable->Buffer);
 +    ACPI_MOVE_32_TO_32(&Localities, &Tmp);
      LocalityBuffer = UtLocalCalloc (Localities);
+     LocalityListLength = 0;
  
-     /* Compile each locality buffer */
-@@ -1725,6 +1731,7 @@ DtCompileTcpa (
+@@ -1740,6 +1746,7 @@ DtCompileTcpa (
      ACPI_TABLE_TCPA_HDR     *TcpaHeader;
      DT_SUBTABLE             *ParentTable;
      ACPI_STATUS             Status;
@@ -5318,7 +3368,7 @@ Index: acpica-unix-20190816/source/compiler/dttable2.c
  
  
      /* Compile the main table */
-@@ -1745,7 +1752,8 @@ DtCompileTcpa (
+@@ -1760,7 +1767,8 @@ DtCompileTcpa (
       */
      TcpaHeader = ACPI_CAST_PTR (ACPI_TABLE_TCPA_HDR, ParentTable->Buffer);
  
@@ -5328,7 +3378,7 @@ Index: acpica-unix-20190816/source/compiler/dttable2.c
      {
      case ACPI_TCPA_CLIENT_TABLE:
  
-@@ -1793,6 +1801,7 @@ DtCompileTpm2Rev3 (
+@@ -1808,6 +1816,7 @@ DtCompileTpm2Rev3 (
      ACPI_TABLE_TPM23        *Tpm23Header;
      DT_SUBTABLE             *ParentTable;
      ACPI_STATUS             Status = AE_OK;
@@ -5336,7 +3386,7 @@ Index: acpica-unix-20190816/source/compiler/dttable2.c
  
  
      Status = DtCompileTable (PFieldList, AcpiDmTableInfoTpm23,
-@@ -1804,7 +1813,8 @@ DtCompileTpm2Rev3 (
+@@ -1819,7 +1828,8 @@ DtCompileTpm2Rev3 (
  
      /* Subtable type depends on the StartMethod */
  
@@ -5346,7 +3396,7 @@ Index: acpica-unix-20190816/source/compiler/dttable2.c
      {
      case ACPI_TPM23_ACPI_START_METHOD:
  
-@@ -1851,6 +1861,7 @@ DtCompileTpm2 (
+@@ -1866,6 +1876,7 @@ DtCompileTpm2 (
      DT_SUBTABLE             *ParentTable;
      ACPI_STATUS             Status = AE_OK;
      ACPI_TABLE_HEADER       *Header;
@@ -5354,7 +3404,7 @@ Index: acpica-unix-20190816/source/compiler/dttable2.c
  
  
      ParentTable = DtPeekSubtable ();
-@@ -1894,7 +1905,8 @@ DtCompileTpm2 (
+@@ -1909,7 +1920,8 @@ DtCompileTpm2 (
  
      /* Subtable type depends on the StartMethod */
  
@@ -5364,7 +3414,7 @@ Index: acpica-unix-20190816/source/compiler/dttable2.c
      {
      case ACPI_TPM2_COMMAND_BUFFER_WITH_ARM_SMC:
  
-@@ -2110,6 +2122,9 @@ DtCompileWpbt (
+@@ -2125,6 +2137,9 @@ DtCompileWpbt (
      ACPI_TABLE_WPBT         *Table;
      ACPI_STATUS             Status;
      UINT16                  Length;
@@ -5374,7 +3424,7 @@ Index: acpica-unix-20190816/source/compiler/dttable2.c
  
  
      /* Compile the main table */
-@@ -2137,7 +2152,16 @@ DtCompileWpbt (
+@@ -2152,7 +2167,16 @@ DtCompileWpbt (
  
      Length = (UINT16) Subtable->TotalLength;
      Table = ACPI_CAST_PTR (ACPI_TABLE_WPBT, ParentTable->Buffer);
@@ -5392,10 +3442,10 @@ Index: acpica-unix-20190816/source/compiler/dttable2.c
  
      ParentTable = DtPeekSubtable ();
      DtInsertSubtable (ParentTable, Subtable);
-Index: acpica-unix-20190816/source/components/disassembler/dmbuffer.c
+Index: acpica-unix-20191018/source/components/disassembler/dmbuffer.c
 ===================================================================
---- acpica-unix-20190816.orig/source/components/disassembler/dmbuffer.c
-+++ acpica-unix-20190816/source/components/disassembler/dmbuffer.c
+--- acpica-unix-20191018.orig/source/components/disassembler/dmbuffer.c
++++ acpica-unix-20191018/source/components/disassembler/dmbuffer.c
 @@ -204,7 +204,7 @@ AcpiDmByteList (
  
  
@@ -5471,10 +3521,10 @@ Index: acpica-unix-20190816/source/components/disassembler/dmbuffer.c
  
      NextOp = AcpiPsGetDepthNext (NULL, Op);
      if (!NextOp)
-Index: acpica-unix-20190816/source/components/disassembler/dmopcode.c
+Index: acpica-unix-20191018/source/components/disassembler/dmopcode.c
 ===================================================================
---- acpica-unix-20190816.orig/source/components/disassembler/dmopcode.c
-+++ acpica-unix-20190816/source/components/disassembler/dmopcode.c
+--- acpica-unix-20191018.orig/source/components/disassembler/dmopcode.c
++++ acpica-unix-20191018/source/components/disassembler/dmopcode.c
 @@ -244,6 +244,7 @@ AcpiDmPredefinedDescription (
      char                        *NameString;
      int                         LastCharIsDigit;
@@ -5545,10 +3595,10 @@ Index: acpica-unix-20190816/source/components/disassembler/dmopcode.c
  
              Info->Level += 1;
              Info->MappingOp = Op;
-Index: acpica-unix-20190816/source/components/disassembler/dmresrcl.c
+Index: acpica-unix-20191018/source/components/disassembler/dmresrcl.c
 ===================================================================
---- acpica-unix-20190816.orig/source/components/disassembler/dmresrcl.c
-+++ acpica-unix-20190816/source/components/disassembler/dmresrcl.c
+--- acpica-unix-20191018.orig/source/components/disassembler/dmresrcl.c
++++ acpica-unix-20191018/source/components/disassembler/dmresrcl.c
 @@ -141,7 +141,8 @@ AcpiDmMemoryFields (
      UINT32                  Level)
  {
@@ -5697,10 +3747,10 @@ Index: acpica-unix-20190816/source/components/disassembler/dmresrcl.c
      }
  
      AcpiDmIndent (Level);
-Index: acpica-unix-20190816/source/components/disassembler/dmresrcl2.c
+Index: acpica-unix-20191018/source/components/disassembler/dmresrcl2.c
 ===================================================================
---- acpica-unix-20190816.orig/source/components/disassembler/dmresrcl2.c
-+++ acpica-unix-20190816/source/components/disassembler/dmresrcl2.c
+--- acpica-unix-20191018.orig/source/components/disassembler/dmresrcl2.c
++++ acpica-unix-20191018/source/components/disassembler/dmresrcl2.c
 @@ -191,22 +191,24 @@ AcpiDmGpioCommon (
      char                    *DeviceName = NULL;
      UINT32                  PinCount;
@@ -5924,10 +3974,10 @@ Index: acpica-unix-20190816/source/components/disassembler/dmresrcl2.c
  
      DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset);
      AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
-Index: acpica-unix-20190816/source/components/disassembler/dmresrcs.c
+Index: acpica-unix-20191018/source/components/disassembler/dmresrcs.c
 ===================================================================
---- acpica-unix-20190816.orig/source/components/disassembler/dmresrcs.c
-+++ acpica-unix-20190816/source/components/disassembler/dmresrcs.c
+--- acpica-unix-20191018.orig/source/components/disassembler/dmresrcs.c
++++ acpica-unix-20191018/source/components/disassembler/dmresrcs.c
 @@ -72,6 +72,7 @@ AcpiDmIrqDescriptor (
      UINT32                  Length,
      UINT32                  Level)
@@ -5984,19 +4034,19 @@ Index: acpica-unix-20190816/source/components/disassembler/dmresrcs.c
  
      AcpiDmIndent (Level + 1);
      AcpiDmDumpInteger8 (Resource->FixedIo.AddressLength, "Length");
-Index: acpica-unix-20190816/source/components/dispatcher/dsfield.c
+Index: acpica-unix-20191018/source/components/dispatcher/dsfield.c
 ===================================================================
---- acpica-unix-20190816.orig/source/components/dispatcher/dsfield.c
-+++ acpica-unix-20190816/source/components/dispatcher/dsfield.c
-@@ -325,6 +325,7 @@ AcpiDsGetFieldNames (
+--- acpica-unix-20191018.orig/source/components/dispatcher/dsfield.c
++++ acpica-unix-20191018/source/components/dispatcher/dsfield.c
+@@ -324,6 +324,7 @@ AcpiDsGetFieldNames (
      ACPI_STATUS             Status;
      UINT64                  Position;
      ACPI_PARSE_OBJECT       *Child;
 +    UINT32 TmpName;
  
  #ifdef ACPI_EXEC_APP
-     UINT64                  Value = 0;
-@@ -439,10 +440,17 @@ AcpiDsGetFieldNames (
+     ACPI_OPERAND_OBJECT     *ResultDesc;
+@@ -437,10 +438,17 @@ AcpiDsGetFieldNames (
  
              /* Lookup the name, it should already exist */
  
@@ -6014,7 +4064,7 @@ Index: acpica-unix-20190816/source/components/dispatcher/dsfield.c
              if (ACPI_FAILURE (Status))
              {
                  ACPI_ERROR_NAMESPACE (WalkState->ScopeInfo,
-@@ -692,9 +700,17 @@ AcpiDsInitFieldObjects (
+@@ -689,9 +697,17 @@ AcpiDsInitFieldObjects (
           */
          if (Arg->Common.AmlOpcode == AML_INT_NAMEDFIELD_OP)
          {
@@ -6032,11 +4082,11 @@ Index: acpica-unix-20190816/source/components/dispatcher/dsfield.c
              if (ACPI_FAILURE (Status))
              {
                  ACPI_ERROR_NAMESPACE (WalkState->ScopeInfo,
-Index: acpica-unix-20190816/source/components/events/evgpeblk.c
+Index: acpica-unix-20191018/source/components/events/evgpeblk.c
 ===================================================================
---- acpica-unix-20190816.orig/source/components/events/evgpeblk.c
-+++ acpica-unix-20190816/source/components/events/evgpeblk.c
-@@ -376,6 +376,7 @@ AcpiEvCreateGpeBlock (
+--- acpica-unix-20191018.orig/source/components/events/evgpeblk.c
++++ acpica-unix-20191018/source/components/events/evgpeblk.c
+@@ -380,6 +380,7 @@ AcpiEvCreateGpeBlock (
      ACPI_STATUS             Status;
      ACPI_GPE_BLOCK_INFO     *GpeBlock;
      ACPI_GPE_WALK_INFO      WalkInfo;
@@ -6044,7 +4094,7 @@ Index: acpica-unix-20190816/source/components/events/evgpeblk.c
  
  
      ACPI_FUNCTION_TRACE (EvCreateGpeBlock);
-@@ -396,7 +397,7 @@ AcpiEvCreateGpeBlock (
+@@ -400,7 +401,7 @@ AcpiEvCreateGpeBlock (
  
      /* Initialize the new GPE block */
  
@@ -6053,7 +4103,7 @@ Index: acpica-unix-20190816/source/components/events/evgpeblk.c
      GpeBlock->SpaceId = SpaceId;
      GpeBlock->Node = GpeDevice;
      GpeBlock->GpeCount = (UINT16) (RegisterCount * ACPI_GPE_REGISTER_WIDTH);
-@@ -445,11 +446,13 @@ AcpiEvCreateGpeBlock (
+@@ -449,11 +450,13 @@ AcpiEvCreateGpeBlock (
          (*ReturnGpeBlock) = GpeBlock;
      }
  
@@ -6068,10 +4118,10 @@ Index: acpica-unix-20190816/source/components/events/evgpeblk.c
          InterruptNumber == AcpiGbl_FADT.SciInterrupt ? " (SCI)" : ""));
  
      /* Update global count of currently available GPEs */
-Index: acpica-unix-20190816/source/components/hardware/hwregs.c
+Index: acpica-unix-20191018/source/components/hardware/hwregs.c
 ===================================================================
---- acpica-unix-20190816.orig/source/components/hardware/hwregs.c
-+++ acpica-unix-20190816/source/components/hardware/hwregs.c
+--- acpica-unix-20191018.orig/source/components/hardware/hwregs.c
++++ acpica-unix-20191018/source/components/hardware/hwregs.c
 @@ -197,7 +197,7 @@ AcpiHwValidateRegister (
       * Address must not be null. A null address also indicates an optional
       * ACPI register that is not supported, so no error message.
@@ -6081,10 +4131,10 @@ Index: acpica-unix-20190816/source/components/hardware/hwregs.c
      if (!(*Address))
      {
          return (AE_BAD_ADDRESS);
-Index: acpica-unix-20190816/source/components/hardware/hwvalid.c
+Index: acpica-unix-20191018/source/components/hardware/hwvalid.c
 ===================================================================
---- acpica-unix-20190816.orig/source/components/hardware/hwvalid.c
-+++ acpica-unix-20190816/source/components/hardware/hwvalid.c
+--- acpica-unix-20191018.orig/source/components/hardware/hwvalid.c
++++ acpica-unix-20191018/source/components/hardware/hwvalid.c
 @@ -135,6 +135,8 @@ AcpiHwValidateIoRequest (
      UINT32                  ByteWidth;
      ACPI_IO_ADDRESS         LastAddress;
@@ -6106,10 +4156,10 @@ Index: acpica-unix-20190816/source/components/hardware/hwvalid.c
      {
          ACPI_ERROR ((AE_INFO,
              "Illegal I/O port address/length above 64K: %8.8X%8.8X/0x%X",
-Index: acpica-unix-20190816/source/components/namespace/nsaccess.c
+Index: acpica-unix-20191018/source/components/namespace/nsaccess.c
 ===================================================================
---- acpica-unix-20190816.orig/source/components/namespace/nsaccess.c
-+++ acpica-unix-20190816/source/components/namespace/nsaccess.c
+--- acpica-unix-20191018.orig/source/components/namespace/nsaccess.c
++++ acpica-unix-20191018/source/components/namespace/nsaccess.c
 @@ -349,6 +349,7 @@ AcpiNsLookup (
      UINT32                  SearchParentFlag = ACPI_NS_SEARCH_PARENT;
      UINT32                  LocalFlags;
@@ -6130,10 +4180,10 @@ Index: acpica-unix-20190816/source/components/namespace/nsaccess.c
                      AcpiUtGetTypeName (ThisNode->Type),
                      AcpiUtGetTypeName (TypeToCheckFor)));
              }
-Index: acpica-unix-20190816/source/components/namespace/nsparse.c
+Index: acpica-unix-20191018/source/components/namespace/nsparse.c
 ===================================================================
---- acpica-unix-20190816.orig/source/components/namespace/nsparse.c
-+++ acpica-unix-20190816/source/components/namespace/nsparse.c
+--- acpica-unix-20191018.orig/source/components/namespace/nsparse.c
++++ acpica-unix-20191018/source/components/namespace/nsparse.c
 @@ -216,13 +216,14 @@ AcpiNsOneCompleteParse (
  
      /* Table must consist of at least a complete header */
@@ -6151,10 +4201,10 @@ Index: acpica-unix-20190816/source/components/namespace/nsparse.c
  
      Status = AcpiTbGetOwnerId (TableIndex, &OwnerId);
      if (ACPI_FAILURE (Status))
-Index: acpica-unix-20190816/source/components/tables/tbdata.c
+Index: acpica-unix-20191018/source/components/tables/tbdata.c
 ===================================================================
---- acpica-unix-20190816.orig/source/components/tables/tbdata.c
-+++ acpica-unix-20190816/source/components/tables/tbdata.c
+--- acpica-unix-20191018.orig/source/components/tables/tbdata.c
++++ acpica-unix-20191018/source/components/tables/tbdata.c
 @@ -552,6 +552,7 @@ AcpiTbVerifyTempTable (
      UINT32                  *TableIndex)
  {
@@ -6173,10 +4223,10 @@ Index: acpica-unix-20190816/source/components/tables/tbdata.c
          if (ACPI_FAILURE (Status))
          {
              ACPI_EXCEPTION ((AE_INFO, AE_NO_MEMORY,
-Index: acpica-unix-20190816/source/components/tables/tbfadt.c
+Index: acpica-unix-20191018/source/components/tables/tbfadt.c
 ===================================================================
---- acpica-unix-20190816.orig/source/components/tables/tbfadt.c
-+++ acpica-unix-20190816/source/components/tables/tbfadt.c
+--- acpica-unix-20191018.orig/source/components/tables/tbfadt.c
++++ acpica-unix-20191018/source/components/tables/tbfadt.c
 @@ -424,18 +424,20 @@ AcpiTbCreateLocalFadt (
      ACPI_TABLE_HEADER       *Table,
      UINT32                  Length)
@@ -6288,10 +4338,10 @@ Index: acpica-unix-20190816/source/components/tables/tbfadt.c
                  "PmRegisters", 0);
          }
      }
-Index: acpica-unix-20190816/source/components/tables/tbfind.c
+Index: acpica-unix-20191018/source/components/tables/tbfind.c
 ===================================================================
---- acpica-unix-20190816.orig/source/components/tables/tbfind.c
-+++ acpica-unix-20190816/source/components/tables/tbfind.c
+--- acpica-unix-20191018.orig/source/components/tables/tbfind.c
++++ acpica-unix-20191018/source/components/tables/tbfind.c
 @@ -108,8 +108,11 @@ AcpiTbFindTable (
      (void) AcpiUtAcquireMutex (ACPI_MTX_TABLES);
      for (i = 0; i < AcpiGbl_RootTableList.CurrentTableCount; ++i)
@@ -6305,10 +4355,10 @@ Index: acpica-unix-20190816/source/components/tables/tbfind.c
          {
              /* Not the requested table */
  
-Index: acpica-unix-20190816/source/components/tables/tbprint.c
+Index: acpica-unix-20191018/source/components/tables/tbprint.c
 ===================================================================
---- acpica-unix-20190816.orig/source/components/tables/tbprint.c
-+++ acpica-unix-20190816/source/components/tables/tbprint.c
+--- acpica-unix-20191018.orig/source/components/tables/tbprint.c
++++ acpica-unix-20191018/source/components/tables/tbprint.c
 @@ -143,15 +143,18 @@ AcpiTbPrintTableHeader (
      ACPI_TABLE_HEADER       *Header)
  {
@@ -6350,10 +4400,10 @@ Index: acpica-unix-20190816/source/components/tables/tbprint.c
      }
  }
  
-Index: acpica-unix-20190816/source/components/tables/tbutils.c
+Index: acpica-unix-20191018/source/components/tables/tbutils.c
 ===================================================================
---- acpica-unix-20190816.orig/source/components/tables/tbutils.c
-+++ acpica-unix-20190816/source/components/tables/tbutils.c
+--- acpica-unix-20191018.orig/source/components/tables/tbutils.c
++++ acpica-unix-20191018/source/components/tables/tbutils.c
 @@ -238,7 +238,7 @@ AcpiTbGetRootTableEntry (
           * 64-bit platform, XSDT: Move (unaligned) 64-bit to local,
           *  return 64-bit
@@ -6413,10 +4463,10 @@ Index: acpica-unix-20190816/source/components/tables/tbutils.c
          {
              AcpiGbl_FadtIndex = TableIndex;
              AcpiTbParseFadt ();
-Index: acpica-unix-20190816/source/components/tables/tbxface.c
+Index: acpica-unix-20191018/source/components/tables/tbxface.c
 ===================================================================
---- acpica-unix-20190816.orig/source/components/tables/tbxface.c
-+++ acpica-unix-20190816/source/components/tables/tbxface.c
+--- acpica-unix-20191018.orig/source/components/tables/tbxface.c
++++ acpica-unix-20191018/source/components/tables/tbxface.c
 @@ -293,8 +293,11 @@ AcpiGetTableHeader (
  
      for (i = 0, j = 0; i < AcpiGbl_RootTableList.CurrentTableCount; i++)
@@ -6430,10 +4480,10 @@ Index: acpica-unix-20190816/source/components/tables/tbxface.c
          {
              continue;
          }
-Index: acpica-unix-20190816/source/components/tables/tbxfload.c
+Index: acpica-unix-20191018/source/components/tables/tbxfload.c
 ===================================================================
---- acpica-unix-20190816.orig/source/components/tables/tbxfload.c
-+++ acpica-unix-20190816/source/components/tables/tbxfload.c
+--- acpica-unix-20191018.orig/source/components/tables/tbxfload.c
++++ acpica-unix-20191018/source/components/tables/tbxfload.c
 @@ -153,6 +153,7 @@ AcpiTbLoadNamespace (
      ACPI_TABLE_DESC         *Table;
      UINT32                  TablesLoaded = 0;
@@ -6453,10 +4503,10 @@ Index: acpica-unix-20190816/source/components/tables/tbxfload.c
           ACPI_FAILURE (AcpiTbValidateTable (Table)))
      {
          Status = AE_NO_ACPI_TABLES;
-Index: acpica-unix-20190816/source/tools/acpiexec/aetables.c
+Index: acpica-unix-20191018/source/tools/acpiexec/aetables.c
 ===================================================================
---- acpica-unix-20190816.orig/source/tools/acpiexec/aetables.c
-+++ acpica-unix-20190816/source/tools/acpiexec/aetables.c
+--- acpica-unix-20191018.orig/source/tools/acpiexec/aetables.c
++++ acpica-unix-20191018/source/tools/acpiexec/aetables.c
 @@ -146,21 +146,25 @@ AeInitializeTableHeader (
      char                    *Signature,
      UINT32                  Length)
@@ -6608,10 +4658,10 @@ Index: acpica-unix-20190816/source/tools/acpiexec/aetables.c
      }
  
      return (AE_OK);
-Index: acpica-unix-20190816/source/common/dmswitch.c
+Index: acpica-unix-20191018/source/common/dmswitch.c
 ===================================================================
---- acpica-unix-20190816.orig/source/common/dmswitch.c
-+++ acpica-unix-20190816/source/common/dmswitch.c
+--- acpica-unix-20191018.orig/source/common/dmswitch.c
++++ acpica-unix-20191018/source/common/dmswitch.c
 @@ -88,13 +88,15 @@ AcpiDmProcessSwitch (
      ACPI_PARSE_OBJECT_LIST  *Current;
      ACPI_PARSE_OBJECT_LIST  *Previous;
diff --git a/cve-2017-13693.patch b/cve-2017-13693.patch
index f4d90e9..b0af7a6 100644
--- a/cve-2017-13693.patch
+++ b/cve-2017-13693.patch
@@ -63,10 +63,10 @@ Github-Location: https://github.com/acpica/acpica/pull/295/commits/987a3b5cf7175
  source/components/dispatcher/dsutils.c | 9 ++++++++-
  1 file changed, 8 insertions(+), 1 deletion(-)
 
-Index: acpica-unix2-20181213/source/components/dispatcher/dsutils.c
+Index: acpica-unix-20191018/source/components/dispatcher/dsutils.c
 ===================================================================
---- acpica-unix2-20181213.orig/source/components/dispatcher/dsutils.c
-+++ acpica-unix2-20181213/source/components/dispatcher/dsutils.c
+--- acpica-unix-20191018.orig/source/components/dispatcher/dsutils.c
++++ acpica-unix-20191018/source/components/dispatcher/dsutils.c
 @@ -759,6 +759,8 @@ AcpiDsCreateOperands (
      ACPI_PARSE_OBJECT       *Arguments[ACPI_OBJ_NUM_OPERANDS];
      UINT32                  ArgCount = 0;
diff --git a/cve-2017-13694.patch b/cve-2017-13694.patch
index c753108..8d582e0 100644
--- a/cve-2017-13694.patch
+++ b/cve-2017-13694.patch
@@ -130,11 +130,11 @@ Github-Location: https://github.com/acpica/acpica/pull/278/commits/4a0243ecb4c94
  source/components/parser/psobject.c | 44 ++++++++++++++-----------------------
  1 file changed, 16 insertions(+), 28 deletions(-)
 
-Index: acpica-unix2-20180531/source/components/parser/psobject.c
+Index: acpica-unix-20191018/source/components/parser/psobject.c
 ===================================================================
---- acpica-unix2-20180531.orig/source/components/parser/psobject.c
-+++ acpica-unix2-20180531/source/components/parser/psobject.c
-@@ -709,7 +709,8 @@ AcpiPsCompleteFinalOp (
+--- acpica-unix-20191018.orig/source/components/parser/psobject.c
++++ acpica-unix-20191018/source/components/parser/psobject.c
+@@ -707,7 +707,8 @@ AcpiPsCompleteFinalOp (
      ACPI_PARSE_OBJECT       *Op,
      ACPI_STATUS             Status)
  {
@@ -144,7 +144,7 @@ Index: acpica-unix2-20180531/source/components/parser/psobject.c
  
  
      ACPI_FUNCTION_TRACE_PTR (PsCompleteFinalOp, WalkState);
-@@ -726,7 +727,7 @@ AcpiPsCompleteFinalOp (
+@@ -724,7 +725,7 @@ AcpiPsCompleteFinalOp (
      {
          if (Op)
          {
@@ -153,7 +153,7 @@ Index: acpica-unix2-20180531/source/components/parser/psobject.c
              {
                  WalkState->Op = Op;
                  WalkState->OpInfo = AcpiPsGetOpcodeInfo (Op->Common.AmlOpcode);
-@@ -745,41 +746,28 @@ AcpiPsCompleteFinalOp (
+@@ -743,41 +744,28 @@ AcpiPsCompleteFinalOp (
  
                  if (Status == AE_CTRL_TERMINATE)
                  {
@@ -207,7 +207,7 @@ Index: acpica-unix2-20180531/source/components/parser/psobject.c
              }
          }
  
-@@ -788,5 +776,5 @@ AcpiPsCompleteFinalOp (
+@@ -786,5 +774,5 @@ AcpiPsCompleteFinalOp (
  
      } while (Op);
  
diff --git a/cve-2017-13695.patch b/cve-2017-13695.patch
index 878f47b..5f77aaf 100644
--- a/cve-2017-13695.patch
+++ b/cve-2017-13695.patch
@@ -67,11 +67,11 @@ Github-Location: https://github.com/acpica/acpica/pull/296/commits/37f2c716f2c6a
  source/components/namespace/nseval.c | 10 ++++++++++
  1 file changed, 10 insertions(+)
 
-Index: acpica-unix2-20181213/source/components/namespace/nseval.c
+Index: acpica-unix-20191018/source/components/namespace/nseval.c
 ===================================================================
---- acpica-unix2-20181213.orig/source/components/namespace/nseval.c
-+++ acpica-unix2-20181213/source/components/namespace/nseval.c
-@@ -336,6 +336,16 @@ AcpiNsEvaluate (
+--- acpica-unix-20191018.orig/source/components/namespace/nseval.c
++++ acpica-unix-20191018/source/components/namespace/nseval.c
+@@ -329,6 +329,16 @@ AcpiNsEvaluate (
              Info->ReturnObject = NULL;
          }
      }
diff --git a/f23-harden.patch b/f23-harden.patch
index 70e1f5a..c719d07 100644
--- a/f23-harden.patch
+++ b/f23-harden.patch
@@ -8,10 +8,10 @@ From: Al Stone <ahs3@redhat.com>
  generate/unix/iasl/Makefile   |   13 +++++++------
  2 files changed, 9 insertions(+), 6 deletions(-)
 
-Index: acpica-unix-20190816/generate/unix/Makefile.config
+Index: acpica-unix-20191018/generate/unix/Makefile.config
 ===================================================================
---- acpica-unix-20190816.orig/generate/unix/Makefile.config
-+++ acpica-unix-20190816/generate/unix/Makefile.config
+--- acpica-unix-20191018.orig/generate/unix/Makefile.config
++++ acpica-unix-20191018/generate/unix/Makefile.config
 @@ -190,6 +190,8 @@ ifneq ($(NOFORTIFY),TRUE)
  OPT_CFLAGS += -D_FORTIFY_SOURCE=2
  endif
@@ -21,10 +21,10 @@ Index: acpica-unix-20190816/generate/unix/Makefile.config
  CFLAGS += \
      -D$(HOST)\
      -D_GNU_SOURCE\
-Index: acpica-unix-20190816/generate/unix/iasl/Makefile
+Index: acpica-unix-20191018/generate/unix/iasl/Makefile
 ===================================================================
---- acpica-unix-20190816.orig/generate/unix/iasl/Makefile
-+++ acpica-unix-20190816/generate/unix/iasl/Makefile
+--- acpica-unix-20191018.orig/generate/unix/iasl/Makefile
++++ acpica-unix-20191018/generate/unix/iasl/Makefile
 @@ -358,34 +358,35 @@ $(OBJDIR)/prparserparse.c $(OBJDIR)/prpa
  # Cannot use the common compile warning flags since the C files are created
  # by the utilities above and they are not necessarily ANSI C, etc.
diff --git a/grammar.asl.result b/grammar.asl.result
index 73351de..e5ac529 100644
--- a/grammar.asl.result
+++ b/grammar.asl.result
@@ -67,6 +67,9 @@ Remark   2146 -                  ^ Method Argument is never used (Arg3)
 grammar.asl    701:             CreateField (\_SB_.SBUF, 148, 96, FLDV)
 Remark   2089 -                            Object is not referenced ^  (Name [FLDV] is within a method [_INI])
 
+grammar.asl    705:         Device(PCI0)
+Warning  3073 -       Multiple types ^  (Device object requires either a _HID or _ADR, but not both)
+
 grammar.asl    733:             Method(_SRS)
 Warning  3102 -                          ^ Reserved method has too few arguments (_SRS requires 1)
 
@@ -187,6 +190,9 @@ Warning  3144 -                                  ^ Method Local is set but never
 grammar.asl   2889:         Device (RTLV)
 Warning  3141 -    Missing dependency ^  (Device object requires a _HID or _ADR in same scope)
 
+grammar.asl   2989:         Device (PCI1)
+Warning  3073 -        Multiple types ^  (Device object requires either a _HID or _ADR, but not both)
+
 grammar.asl   2993:             Name (_CRS,0)
 Error    6105 -                           ^ Invalid object type for reserved name (_CRS: found Integer, Buffer required)
 
@@ -301,6 +307,9 @@ Warning  3144 -          Method Local is set but never used ^  (Local6)
 grammar.asl   6393:     Device (IDX5)
 Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
 
+grammar.asl   6474:         Device (PCI2)
+Warning  3073 -        Multiple types ^  (Device object requires either a _HID or _ADR, but not both)
+
 grammar.asl   6478:             Name (_CRS, Buffer(26)  {"\_SB_.PCI2._CRS..........."})
 Warning  3046 -        Invalid or unknown escape sequence ^ 
 
@@ -374,4 +383,4 @@ Ignoring all errors, forcing AML file generation
 ASL Input:     grammar.asl -  323653 bytes   4818 keywords  10284 source lines
 AML Output:    grammar.aml -   43758 bytes   4148 opcodes     670 named objects
 
-Compilation successful. 6 Errors, 89 Warnings, 27 Remarks, 1106 Optimizations
+Compilation successful. 6 Errors, 92 Warnings, 27 Remarks, 1106 Optimizations
diff --git a/int-format.patch b/int-format.patch
index a578087..bf0b05c 100644
--- a/int-format.patch
+++ b/int-format.patch
@@ -21,10 +21,10 @@ From: Al Stone <ahs3@redhat.com>
  source/components/utilities/utownerid.c |    2 +-
  18 files changed, 28 insertions(+), 28 deletions(-)
 
-Index: acpica-unix-20190816/source/compiler/aslerror.c
+Index: acpica-unix-20191018/source/compiler/aslerror.c
 ===================================================================
---- acpica-unix-20190816.orig/source/compiler/aslerror.c
-+++ acpica-unix-20190816/source/compiler/aslerror.c
+--- acpica-unix-20191018.orig/source/compiler/aslerror.c
++++ acpica-unix-20191018/source/compiler/aslerror.c
 @@ -898,7 +898,7 @@ AslLogNewError (
      AslGbl_ExceptionCount[ModifiedLevel]++;
      if (!AslGbl_IgnoreErrors && AslGbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT)
@@ -34,10 +34,10 @@ Index: acpica-unix-20190816/source/compiler/aslerror.c
  
          AslGbl_SourceLine = 0;
          AslGbl_NextError = AslGbl_ErrorLog;
-Index: acpica-unix-20190816/source/compiler/aslopt.c
+Index: acpica-unix-20191018/source/compiler/aslopt.c
 ===================================================================
---- acpica-unix-20190816.orig/source/compiler/aslopt.c
-+++ acpica-unix-20190816/source/compiler/aslopt.c
+--- acpica-unix-20191018.orig/source/compiler/aslopt.c
++++ acpica-unix-20191018/source/compiler/aslopt.c
 @@ -583,7 +583,7 @@ OptOptimizeNamePath (
      }
  
@@ -47,10 +47,10 @@ Index: acpica-unix-20190816/source/compiler/aslopt.c
          Op->Asl.LogicalLineNumber,
          AcpiPsGetOpcodeName (Op->Common.Parent->Common.AmlOpcode),
          AcpiPsGetOpcodeName (Op->Common.AmlOpcode)));
-Index: acpica-unix-20190816/source/compiler/aslprepkg.c
+Index: acpica-unix-20191018/source/compiler/aslprepkg.c
 ===================================================================
---- acpica-unix-20190816.orig/source/compiler/aslprepkg.c
-+++ acpica-unix-20190816/source/compiler/aslprepkg.c
+--- acpica-unix-20191018.orig/source/compiler/aslprepkg.c
++++ acpica-unix-20191018/source/compiler/aslprepkg.c
 @@ -309,7 +309,7 @@ ApCheckPackage (
  
          if (Count & 1)
@@ -60,10 +60,10 @@ Index: acpica-unix-20190816/source/compiler/aslprepkg.c
                  Predefined->Info.Name, Count);
  
              AslError (ASL_ERROR, ASL_MSG_RESERVED_PACKAGE_LENGTH,
-Index: acpica-unix-20190816/source/components/debugger/dbexec.c
+Index: acpica-unix-20191018/source/components/debugger/dbexec.c
 ===================================================================
---- acpica-unix-20190816.orig/source/components/debugger/dbexec.c
-+++ acpica-unix-20190816/source/components/debugger/dbexec.c
+--- acpica-unix-20191018.orig/source/components/debugger/dbexec.c
++++ acpica-unix-20191018/source/components/debugger/dbexec.c
 @@ -230,7 +230,7 @@ AcpiDbExecuteMethod (
              ACPI_ERROR ((AE_INFO,
                  "Possible buffer overflow within AML Debugger "
@@ -73,10 +73,10 @@ Index: acpica-unix-20190816/source/components/debugger/dbexec.c
          }
      }
  
-Index: acpica-unix-20190816/source/components/dispatcher/dsmthdat.c
+Index: acpica-unix-20191018/source/components/dispatcher/dsmthdat.c
 ===================================================================
---- acpica-unix-20190816.orig/source/components/dispatcher/dsmthdat.c
-+++ acpica-unix-20190816/source/components/dispatcher/dsmthdat.c
+--- acpica-unix-20191018.orig/source/components/dispatcher/dsmthdat.c
++++ acpica-unix-20191018/source/components/dispatcher/dsmthdat.c
 @@ -291,7 +291,7 @@ AcpiDsMethodDataGetNode (
          if (Index > ACPI_METHOD_MAX_LOCAL)
          {
@@ -95,10 +95,10 @@ Index: acpica-unix-20190816/source/components/dispatcher/dsmthdat.c
                  Index, ACPI_METHOD_MAX_ARG));
              return_ACPI_STATUS (AE_AML_INVALID_INDEX);
          }
-Index: acpica-unix-20190816/source/components/dispatcher/dsutils.c
+Index: acpica-unix-20191018/source/components/dispatcher/dsutils.c
 ===================================================================
---- acpica-unix-20190816.orig/source/components/dispatcher/dsutils.c
-+++ acpica-unix-20190816/source/components/dispatcher/dsutils.c
+--- acpica-unix-20191018.orig/source/components/dispatcher/dsutils.c
++++ acpica-unix-20191018/source/components/dispatcher/dsutils.c
 @@ -786,7 +786,7 @@ AcpiDsCreateOperands (
      }
  
@@ -108,10 +108,10 @@ Index: acpica-unix-20190816/source/components/dispatcher/dsutils.c
          WalkState->NumOperands, ArgCount, Index));
  
      /* Create the interpreter arguments, in reverse order */
-Index: acpica-unix-20190816/source/components/dispatcher/dswscope.c
+Index: acpica-unix-20191018/source/components/dispatcher/dswscope.c
 ===================================================================
---- acpica-unix-20190816.orig/source/components/dispatcher/dswscope.c
-+++ acpica-unix-20190816/source/components/dispatcher/dswscope.c
+--- acpica-unix-20191018.orig/source/components/dispatcher/dswscope.c
++++ acpica-unix-20191018/source/components/dispatcher/dswscope.c
 @@ -149,7 +149,7 @@ AcpiDsScopeStackPush (
      WalkState->ScopeDepth++;
  
@@ -130,10 +130,10 @@ Index: acpica-unix-20190816/source/components/dispatcher/dswscope.c
          (UINT32) WalkState->ScopeDepth,
          AcpiUtGetNodeName (ScopeInfo->Scope.Node),
          AcpiUtGetTypeName (ScopeInfo->Common.Value)));
-Index: acpica-unix-20190816/source/components/events/evgpe.c
+Index: acpica-unix-20191018/source/components/events/evgpe.c
 ===================================================================
---- acpica-unix-20190816.orig/source/components/events/evgpe.c
-+++ acpica-unix-20190816/source/components/events/evgpe.c
+--- acpica-unix-20191018.orig/source/components/events/evgpe.c
++++ acpica-unix-20191018/source/components/events/evgpe.c
 @@ -488,7 +488,7 @@ AcpiEvGpeDetect (
                      "Ignore disabled registers for GPE %02X-%02X: "
                      "RunEnable=%02X, WakeEnable=%02X\n",
@@ -143,10 +143,10 @@ Index: acpica-unix-20190816/source/components/events/evgpe.c
                      GpeRegisterInfo->EnableForRun,
                      GpeRegisterInfo->EnableForWake));
                  continue;
-Index: acpica-unix-20190816/source/components/executer/exdump.c
+Index: acpica-unix-20191018/source/components/executer/exdump.c
 ===================================================================
---- acpica-unix-20190816.orig/source/components/executer/exdump.c
-+++ acpica-unix-20190816/source/components/executer/exdump.c
+--- acpica-unix-20191018.orig/source/components/executer/exdump.c
++++ acpica-unix-20191018/source/components/executer/exdump.c
 @@ -678,7 +678,7 @@ AcpiExDumpOperand (
      if (Depth > 0)
      {
@@ -156,10 +156,10 @@ Index: acpica-unix-20190816/source/components/executer/exdump.c
      }
      else
      {
-Index: acpica-unix-20190816/source/components/executer/exfldio.c
+Index: acpica-unix-20191018/source/components/executer/exfldio.c
 ===================================================================
---- acpica-unix-20190816.orig/source/components/executer/exfldio.c
-+++ acpica-unix-20190816/source/components/executer/exfldio.c
+--- acpica-unix-20191018.orig/source/components/executer/exfldio.c
++++ acpica-unix-20191018/source/components/executer/exfldio.c
 @@ -681,8 +681,8 @@ AcpiExWriteWithUpdateRule (
  
              ACPI_ERROR ((AE_INFO,
@@ -171,10 +171,10 @@ Index: acpica-unix-20190816/source/components/executer/exfldio.c
              return_ACPI_STATUS (AE_AML_OPERAND_VALUE);
          }
      }
-Index: acpica-unix-20190816/source/components/executer/exnames.c
+Index: acpica-unix-20191018/source/components/executer/exnames.c
 ===================================================================
---- acpica-unix-20190816.orig/source/components/executer/exnames.c
-+++ acpica-unix-20190816/source/components/executer/exnames.c
+--- acpica-unix-20191018.orig/source/components/executer/exnames.c
++++ acpica-unix-20191018/source/components/executer/exnames.c
 @@ -237,7 +237,7 @@ AcpiExNameSegment (
           */
          ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
@@ -193,10 +193,10 @@ Index: acpica-unix-20190816/source/components/executer/exnames.c
      }
  
      *InAmlAddress = ACPI_CAST_PTR (UINT8, AmlAddress);
-Index: acpica-unix-20190816/source/components/hardware/hwregs.c
+Index: acpica-unix-20191018/source/components/hardware/hwregs.c
 ===================================================================
---- acpica-unix-20190816.orig/source/components/hardware/hwregs.c
-+++ acpica-unix-20190816/source/components/hardware/hwregs.c
+--- acpica-unix-20191018.orig/source/components/hardware/hwregs.c
++++ acpica-unix-20191018/source/components/hardware/hwregs.c
 @@ -460,7 +460,7 @@ AcpiHwClearAcpiStatus (
  
  
@@ -206,10 +206,10 @@ Index: acpica-unix-20190816/source/components/hardware/hwregs.c
          ACPI_FORMAT_UINT64 (AcpiGbl_XPm1aStatus.Address)));
  
      LockFlags = AcpiOsAcquireLock (AcpiGbl_HardwareLock);
-Index: acpica-unix-20190816/source/components/tables/tbfadt.c
+Index: acpica-unix-20191018/source/components/tables/tbfadt.c
 ===================================================================
---- acpica-unix-20190816.orig/source/components/tables/tbfadt.c
-+++ acpica-unix-20190816/source/components/tables/tbfadt.c
+--- acpica-unix-20191018.orig/source/components/tables/tbfadt.c
++++ acpica-unix-20191018/source/components/tables/tbfadt.c
 @@ -233,7 +233,7 @@ AcpiTbInitGenericAddress (
          if (!(Flags & ACPI_FADT_GPE_REGISTER))
          {
@@ -237,10 +237,10 @@ Index: acpica-unix-20190816/source/components/tables/tbfadt.c
                          Name, Address32,
                          ACPI_FORMAT_UINT64 (Address64->Address),
                          AcpiGbl_Use32BitFadtAddresses ? 32 : 64));
-Index: acpica-unix-20190816/source/components/tables/tbxfroot.c
+Index: acpica-unix-20191018/source/components/tables/tbxfroot.c
 ===================================================================
---- acpica-unix-20190816.orig/source/components/tables/tbxfroot.c
-+++ acpica-unix-20190816/source/components/tables/tbxfroot.c
+--- acpica-unix-20191018.orig/source/components/tables/tbxfroot.c
++++ acpica-unix-20191018/source/components/tables/tbxfroot.c
 @@ -177,7 +177,7 @@ AcpiFindRootPointer (
      {
          ACPI_ERROR ((AE_INFO,
@@ -268,10 +268,10 @@ Index: acpica-unix-20190816/source/components/tables/tbxfroot.c
  
          return_ACPI_STATUS (AE_NO_MEMORY);
      }
-Index: acpica-unix-20190816/source/components/utilities/utownerid.c
+Index: acpica-unix-20191018/source/components/utilities/utownerid.c
 ===================================================================
---- acpica-unix-20190816.orig/source/components/utilities/utownerid.c
-+++ acpica-unix-20190816/source/components/utilities/utownerid.c
+--- acpica-unix-20191018.orig/source/components/utilities/utownerid.c
++++ acpica-unix-20191018/source/components/utilities/utownerid.c
 @@ -237,7 +237,7 @@ AcpiUtReleaseOwnerId (
      else
      {
diff --git a/mips-be-fix.patch b/mips-be-fix.patch
index 20b1302..0e7fa91 100644
--- a/mips-be-fix.patch
+++ b/mips-be-fix.patch
@@ -1,7 +1,7 @@
-Index: acpica-unix-20190329/source/compiler/aslparseop.c
+Index: acpica-unix-20191018/source/compiler/aslparseop.c
 ===================================================================
---- acpica-unix-20190329.orig/source/compiler/aslparseop.c
-+++ acpica-unix-20190329/source/compiler/aslparseop.c
+--- acpica-unix-20191018.orig/source/compiler/aslparseop.c
++++ acpica-unix-20191018/source/compiler/aslparseop.c
 @@ -283,7 +283,16 @@ TrCreateValuedLeafOp (
  
  
@@ -20,10 +20,10 @@ Index: acpica-unix-20190329/source/compiler/aslparseop.c
  
      DbgPrint (ASL_PARSE_OUTPUT,
          "\nCreateValuedLeafOp  Ln/Col %u/%u NewOp %p  "
-Index: acpica-unix-20190329/source/include/platform/aclinux.h
+Index: acpica-unix-20191018/source/include/platform/aclinux.h
 ===================================================================
---- acpica-unix-20190329.orig/source/include/platform/aclinux.h
-+++ acpica-unix-20190329/source/include/platform/aclinux.h
+--- acpica-unix-20191018.orig/source/include/platform/aclinux.h
++++ acpica-unix-20191018/source/include/platform/aclinux.h
 @@ -232,10 +232,8 @@
  #endif
  
diff --git a/ppc64le.patch b/ppc64le.patch
index 4cb1e50..228f9d9 100644
--- a/ppc64le.patch
+++ b/ppc64le.patch
@@ -1,7 +1,7 @@
-Index: acpica-unix-20190329/source/include/platform/aclinux.h
+Index: acpica-unix-20191018/source/include/platform/aclinux.h
 ===================================================================
---- acpica-unix-20190329.orig/source/include/platform/aclinux.h
-+++ acpica-unix-20190329/source/include/platform/aclinux.h
+--- acpica-unix-20191018.orig/source/include/platform/aclinux.h
++++ acpica-unix-20191018/source/include/platform/aclinux.h
 @@ -233,9 +233,11 @@
  #define __cdecl
  #endif
diff --git a/ptr-cast.patch b/ptr-cast.patch
index 369d308..d052057 100644
--- a/ptr-cast.patch
+++ b/ptr-cast.patch
@@ -1,7 +1,8 @@
-diff -Naur acpica-unix2-20180209.orig/source/components/tables/tbutils.c acpica-unix2-20180209/source/components/tables/tbutils.c
---- acpica-unix2-20180209.orig/source/components/tables/tbutils.c	2018-03-15 16:47:21.831526264 -0600
-+++ acpica-unix2-20180209/source/components/tables/tbutils.c	2018-03-15 16:58:20.030097284 -0600
-@@ -238,9 +238,11 @@
+Index: acpica-unix-20191018/source/components/tables/tbutils.c
+===================================================================
+--- acpica-unix-20191018.orig/source/components/tables/tbutils.c
++++ acpica-unix-20191018/source/components/tables/tbutils.c
+@@ -238,9 +238,11 @@ AcpiTbGetRootTableEntry (
           * 64-bit platform, XSDT: Move (unaligned) 64-bit to local,
           *  return 64-bit
           */
@@ -14,7 +15,7 @@ diff -Naur acpica-unix2-20180209.orig/source/components/tables/tbutils.c acpica-
          if (Address64 > ACPI_UINT32_MAX)
          {
              /* Will truncate 64-bit address to 32 bits, issue warning */
-@@ -250,9 +252,15 @@
+@@ -250,9 +252,15 @@ AcpiTbGetRootTableEntry (
                  " truncating",
                  ACPI_FORMAT_UINT64 (Address64)));
          }
@@ -31,10 +32,11 @@ diff -Naur acpica-unix2-20180209.orig/source/components/tables/tbutils.c acpica-
      }
  }
  
-diff -Naur acpica-unix2-20180209.orig/source/compiler/aslparseop.c acpica-unix2-20180209/source/compiler/aslparseop.c
---- acpica-unix2-20180209.orig/source/compiler/aslparseop.c	2018-03-15 17:20:09.844338074 -0600
-+++ acpica-unix2-20180209/source/compiler/aslparseop.c	2018-03-15 17:28:19.570800797 -0600
-@@ -287,7 +287,11 @@
+Index: acpica-unix-20191018/source/compiler/aslparseop.c
+===================================================================
+--- acpica-unix-20191018.orig/source/compiler/aslparseop.c
++++ acpica-unix-20191018/source/compiler/aslparseop.c
+@@ -287,7 +287,11 @@ TrCreateValuedLeafOp (
          ParseOpcode == PARSEOP_NAMESEG ||
          ParseOpcode == PARSEOP_STRING_LITERAL)
      {
diff --git a/simple-64bit.patch b/simple-64bit.patch
index b1eaaba..80c771f 100644
--- a/simple-64bit.patch
+++ b/simple-64bit.patch
@@ -3,10 +3,10 @@ Description: Stop listing all 64bit architectures
  64bit architectures.
 Author: Adrian Bunk <bunk@debian.org>
 
-Index: acpica-unix-20190329/source/include/platform/aclinux.h
+Index: acpica-unix-20191018/source/include/platform/aclinux.h
 ===================================================================
---- acpica-unix-20190329.orig/source/include/platform/aclinux.h
-+++ acpica-unix-20190329/source/include/platform/aclinux.h
+--- acpica-unix-20191018.orig/source/include/platform/aclinux.h
++++ acpica-unix-20191018/source/include/platform/aclinux.h
 @@ -215,9 +215,7 @@
  #define ACPI_FLUSH_CPU_CACHE()
  #define ACPI_CAST_PTHREAD_T(Pthread) ((ACPI_THREAD_ID) (Pthread))
diff --git a/sources b/sources
index ff9ab51..756e2da 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (acpica-unix2-20190816.tar.gz) = f2b5363a18391d35465cc14d3be1c2f5b72c599a02e617febc7abc64f0a825fd7ef06d9bc5f13264cf526b7f4ba6a605dd188152c6007efcf661641b537d22b2
-SHA512 (acpitests-unix-20190816.tar.gz) = ea3944888a5229be246c47b9d53256ccc42a988e3dd98995df6ab77ebb0715e777577df609340ee806c5274536ecdcf5798d2aad3786f5a1462a6be8dea9ed1b
+SHA512 (acpica-unix2-20191018.tar.gz) = 4b6cfcfe7866f5cde8085d9deb539d7653043b806aa40466873bdc1e4e875c0be4b4906e53c087f9f34ec755518cb0a206b5107eae557b977a2a2ca184069244
+SHA512 (acpitests-unix-20191018.tar.gz) = a51ef4c9dfad41bc34a8ec9c2251c8f9266ec20e7bff2f15c0244f06291ff665fb36825e2d60745179067f59f8be10e1a3b1f1496d25def6feb0d03a287be90d
diff --git a/str-trunc-warn.patch b/str-trunc-warn.patch
index c5907f8..a62a34a 100644
--- a/str-trunc-warn.patch
+++ b/str-trunc-warn.patch
@@ -1,7 +1,7 @@
-Index: acpica-unix2-20181003/source/compiler/aslanalyze.c
+Index: acpica-unix-20191018/source/compiler/aslanalyze.c
 ===================================================================
---- acpica-unix2-20181003.orig/source/compiler/aslanalyze.c
-+++ acpica-unix2-20181003/source/compiler/aslanalyze.c
+--- acpica-unix-20191018.orig/source/compiler/aslanalyze.c
++++ acpica-unix-20191018/source/compiler/aslanalyze.c
 @@ -355,11 +355,16 @@ AnCheckMethodReturnValue (
           */
          if (ThisNodeBtype != 0)
@@ -21,10 +21,10 @@ Index: acpica-unix2-20181003/source/compiler/aslanalyze.c
          }
      }
  }
-Index: acpica-unix2-20181003/source/compiler/aslpredef.c
+Index: acpica-unix-20191018/source/compiler/aslpredef.c
 ===================================================================
---- acpica-unix2-20181003.orig/source/compiler/aslpredef.c
-+++ acpica-unix2-20181003/source/compiler/aslpredef.c
+--- acpica-unix-20191018.orig/source/compiler/aslpredef.c
++++ acpica-unix-20191018/source/compiler/aslpredef.c
 @@ -159,14 +159,19 @@ ApCheckForPredefinedMethod (
          if (MethodInfo->NumReturnNoValue &&
              ThisName->Info.ExpectedBtypes)
@@ -84,11 +84,11 @@ Index: acpica-unix2-20181003/source/compiler/aslpredef.c
      return (AE_TYPE);
  }
  
-Index: acpica-unix2-20181003/source/compiler/aslwalks.c
+Index: acpica-unix-20191018/source/compiler/aslwalks.c
 ===================================================================
---- acpica-unix2-20181003.orig/source/compiler/aslwalks.c
-+++ acpica-unix2-20181003/source/compiler/aslwalks.c
-@@ -507,15 +507,19 @@ AnOperandTypecheckWalkEnd (
+--- acpica-unix-20191018.orig/source/compiler/aslwalks.c
++++ acpica-unix-20191018/source/compiler/aslwalks.c
+@@ -515,15 +515,19 @@ AnOperandTypecheckWalkEnd (
              else if (!CommonBtypes)
              {
                  /* No match -- this is a type mismatch error */
diff --git a/template.patch b/template.patch
index c3e1387..662216a 100644
--- a/template.patch
+++ b/template.patch
@@ -7,10 +7,10 @@ From: Al Stone <ahs3@redhat.com>
  tests/templates/Makefile |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: acpica-unix-20190816/tests/templates/Makefile
+Index: acpica-unix-20191018/tests/templates/Makefile
 ===================================================================
---- acpica-unix-20190816.orig/tests/templates/Makefile
-+++ acpica-unix-20190816/tests/templates/Makefile
+--- acpica-unix-20191018.orig/tests/templates/Makefile
++++ acpica-unix-20191018/tests/templates/Makefile
 @@ -26,7 +26,7 @@ $(aml_obj): %.aml:  %.asl
  
  
diff --git a/unaligned.patch b/unaligned.patch
index 6365508..f1f35a0 100644
--- a/unaligned.patch
+++ b/unaligned.patch
@@ -14,10 +14,10 @@ Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
  source/include/actypes.h              |   26 +++++++++++++-------------
  3 files changed, 32 insertions(+), 21 deletions(-)
 
-Index: acpica-unix-20180508/source/components/executer/exoparg2.c
+Index: acpica-unix-20191018/source/components/executer/exoparg2.c
 ===================================================================
---- acpica-unix-20180508.orig/source/components/executer/exoparg2.c
-+++ acpica-unix-20180508/source/components/executer/exoparg2.c
+--- acpica-unix-20191018.orig/source/components/executer/exoparg2.c
++++ acpica-unix-20191018/source/components/executer/exoparg2.c
 @@ -172,6 +172,8 @@ AcpiExOpcode_2A_2T_1R (
      ACPI_OPERAND_OBJECT     **Operand = &WalkState->Operands[0];
      ACPI_OPERAND_OBJECT     *ReturnDesc1 = NULL;
@@ -58,10 +58,10 @@ Index: acpica-unix-20180508/source/components/executer/exoparg2.c
          break;
  
      case AML_CONCATENATE_OP: /* Concatenate (Data1, Data2, Result) */
-Index: acpica-unix-20180508/source/include/actypes.h
+Index: acpica-unix-20191018/source/include/actypes.h
 ===================================================================
---- acpica-unix-20180508.orig/source/include/actypes.h
-+++ acpica-unix-20180508/source/include/actypes.h
+--- acpica-unix-20191018.orig/source/include/actypes.h
++++ acpica-unix-20191018/source/include/actypes.h
 @@ -143,6 +143,19 @@ typedef COMPILER_DEPENDENT_INT64
   */
  #define ACPI_THREAD_ID                  UINT64

From d41282f47b29011ad411a4556df537fdd5ffe0e7 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 28 Jan 2020 11:10:23 +0000
Subject: [PATCH 05/82] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 acpica-tools.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/acpica-tools.spec b/acpica-tools.spec
index 0fb365f..b0e9038 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -1,6 +1,6 @@
 Name:           acpica-tools
 Version:        20190816
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        ACPICA tools for the development and debug of ACPI tables
 
 License:        GPLv2
@@ -229,6 +229,9 @@ fi
 
 
 %changelog
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20190816-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Tue Oct 29 2019 Al Stone <ahs3@redhat.com> - 20190816-1
 - Update to 20190816 source tree, including patch refeshes.
 - Add a patch to fix a non-zero exit from iasl -T ALL that actually succeeds

From 9a78de129679c12fc44c7cc4e5dd5f0fb333f337 Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Sun, 23 Feb 2020 16:10:20 -0700
Subject: [PATCH 06/82] Record that we tried to use the 20191018 upstream
 release, but chose not to

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 acpica-tools.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/acpica-tools.spec b/acpica-tools.spec
index edc4bbf..02b5af9 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -1,6 +1,6 @@
 Name:           acpica-tools
 Version:        20191018
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        ACPICA tools for the development and debug of ACPI tables
 
 License:        GPLv2
@@ -237,6 +237,10 @@ fi
 
 
 %changelog
+* Sun Feb 23 2020 Al Stone <ahs3@redhat.com> - 20191018-2
+- Upstream does not build from source -- this release not pushed into
+  the archives and noted here just for record keeping
+
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20190816-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 

From 7ca9ff9b51b1736e67b2162c6e8d880cbe94f2ea Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Mon, 24 Feb 2020 15:20:53 -0700
Subject: [PATCH 07/82] Update to 20191213 upstream source, and GCC10

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 .gitignore        |  2 ++
 acpica-tools.spec | 16 ++++++++++++----
 badexit.patch     | 18 ------------------
 dup-symbol.patch  | 22 ++++++++++++++++++++++
 no-common.patch   | 36 ++++++++++++++++++++++++++++++++++++
 sources           |  4 ++--
 6 files changed, 74 insertions(+), 24 deletions(-)
 delete mode 100644 badexit.patch
 create mode 100644 dup-symbol.patch
 create mode 100644 no-common.patch

diff --git a/.gitignore b/.gitignore
index 4886745..999302c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -121,3 +121,5 @@ series
 /acpitests-unix-20190816.tar.gz
 /acpica-unix2-20191018.tar.gz
 /acpitests-unix-20191018.tar.gz
+/acpica-unix2-20191213.tar.gz
+/acpitests-unix-20191213.tar.gz
diff --git a/acpica-tools.spec b/acpica-tools.spec
index 02b5af9..06cbe3d 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -1,6 +1,6 @@
 Name:           acpica-tools
-Version:        20191018
-Release:        2%{?dist}
+Version:        20191213
+Release:        1%{?dist}
 Summary:        ACPICA tools for the development and debug of ACPI tables
 
 License:        GPLv2
@@ -46,7 +46,8 @@ Patch18:        str-trunc-warn.patch
 Patch19:	ptr-cast.patch
 Patch20:	aslcodegen.patch
 Patch21:	facp.patch
-Patch22:	badexit.patch
+Patch22:	dup-symbol.patch
+Patch23:	no-common.patch
 
 BuildRequires:  bison patchutils flex gcc
 
@@ -120,7 +121,8 @@ gzip -dc %{SOURCE1} | tar -x --strip-components=1 -f -
 %patch19 -p1 -b .ptr-cast
 %patch20 -p1 -b .aslcodegen
 %patch21 -p1 -b .facp
-%patch22 -p1 -b .badexit
+%patch22 -p1 -b .dup-symbol
+%patch23 -p1 -b .no-common
 
 cp -p %{SOURCE2} README.Fedora
 cp -p %{SOURCE3} iasl.1
@@ -237,6 +239,12 @@ fi
 
 
 %changelog
+* Sun Feb 23 2020 Al Stone <ahs3@redhat.com> - 20191213-1
+- Update to 20191213 source tree, including patch refeshes.
+- badexit patch no longer needed, so removed
+- GCC10 enforces -fno-common now, catching multiple places where linkage
+  is not explicitly stated; added a patch to resolve the linker errors
+
 * Sun Feb 23 2020 Al Stone <ahs3@redhat.com> - 20191018-2
 - Upstream does not build from source -- this release not pushed into
   the archives and noted here just for record keeping
diff --git a/badexit.patch b/badexit.patch
deleted file mode 100644
index 6bcc699..0000000
--- a/badexit.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-When iasl is invoked with 'iasl -T ALL', and everything works correctly,
-it still exits with a non-zero value.  Exit with zero if all is well.
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
-
-Index: acpica-unix-20191018/source/compiler/asloptions.c
-===================================================================
---- acpica-unix-20191018.orig/source/compiler/asloptions.c
-+++ acpica-unix-20191018/source/compiler/asloptions.c
-@@ -111,7 +111,7 @@ AslCommandLine (
-         {
-             exit (-1);
-         }
--        exit (1);
-+        exit (0);
-     }
- 
-     /* Next parameter must be the input filename */
diff --git a/dup-symbol.patch b/dup-symbol.patch
new file mode 100644
index 0000000..fd0d56b
--- /dev/null
+++ b/dup-symbol.patch
@@ -0,0 +1,22 @@
+diff -Naur acpica-unix2-20191213.orig/source/tools/acpiexec/aemain.c acpica-unix2-20191213/source/tools/acpiexec/aemain.c
+--- acpica-unix2-20191213.orig/source/tools/acpiexec/aemain.c	2020-02-23 16:32:25.935853162 -0700
++++ acpica-unix2-20191213/source/tools/acpiexec/aemain.c	2020-02-23 16:44:38.949901103 -0700
+@@ -84,7 +84,6 @@
+ UINT8                       AcpiGbl_RegionFillValue = 0;
+ BOOLEAN                     AcpiGbl_IgnoreErrors = FALSE;
+ BOOLEAN                     AcpiGbl_AbortLoopOnTimeout = FALSE;
+-BOOLEAN                     AcpiGbl_DbOpt_NoRegionSupport = FALSE;
+ UINT8                       AcpiGbl_UseHwReducedFadt = FALSE;
+ BOOLEAN                     AcpiGbl_DoInterfaceTests = FALSE;
+ BOOLEAN                     AcpiGbl_LoadTestTables = FALSE;
+@@ -549,6 +548,10 @@
+         goto NormalExit;
+     }
+ 
++    /* Initialize globals modified by command line options */
++
++    AcpiGbl_DbOpt_NoRegionSupport = FALSE;
++
+     /* Get the command line options */
+ 
+     ExitCode = AeDoOptions (argc, argv);
diff --git a/no-common.patch b/no-common.patch
new file mode 100644
index 0000000..a9cbf1a
--- /dev/null
+++ b/no-common.patch
@@ -0,0 +1,36 @@
+diff -Naur acpica-unix2-20191213.orig/source/compiler/dtcompiler.h acpica-unix2-20191213/source/compiler/dtcompiler.h
+--- acpica-unix2-20191213.orig/source/compiler/dtcompiler.h	2020-02-23 18:05:24.257395129 -0700
++++ acpica-unix2-20191213/source/compiler/dtcompiler.h	2020-02-23 18:06:42.956236378 -0700
+@@ -351,7 +351,7 @@
+ 
+ /* dtparser - lex/yacc files */
+ 
+-UINT64                      DtCompilerParserResult; /* Expression return value */
++extern UINT64                      DtCompilerParserResult; /* Expression return value */
+ int
+ DtCompilerParserparse (
+     void);
+diff -Naur acpica-unix2-20191213.orig/source/compiler/aslcompiler.l acpica-unix2-20191213/source/compiler/aslcompiler.l
+--- acpica-unix2-20191213.orig/source/compiler/aslcompiler.l	2019-12-13 08:58:18.000000000 -0700
++++ acpica-unix2-20191213/source/compiler/aslcompiler.l	2020-02-24 15:08:53.067560139 -0700
+@@ -48,7 +48,7 @@
+ 
+ #include <stdlib.h>
+ #include <string.h>
+-YYSTYPE AslCompilerlval;
++extern YYSTYPE AslCompilerlval;
+ 
+ /*
+  * Generation:  Use the following command line:
+diff -Naur acpica-unix2-20191213.orig/source/compiler/prparser.l acpica-unix2-20191213/source/compiler/prparser.l
+--- acpica-unix2-20191213.orig/source/compiler/prparser.l	2019-12-13 08:58:19.000000000 -0700
++++ acpica-unix2-20191213/source/compiler/prparser.l	2020-02-24 15:09:25.909839732 -0700
+@@ -116,7 +116,7 @@
+ /*
+  * Local support functions
+  */
+-YY_BUFFER_STATE         LexBuffer;
++extern YY_BUFFER_STATE         LexBuffer;
+ 
+ 
+ /******************************************************************************
diff --git a/sources b/sources
index 756e2da..2af27b0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (acpica-unix2-20191018.tar.gz) = 4b6cfcfe7866f5cde8085d9deb539d7653043b806aa40466873bdc1e4e875c0be4b4906e53c087f9f34ec755518cb0a206b5107eae557b977a2a2ca184069244
-SHA512 (acpitests-unix-20191018.tar.gz) = a51ef4c9dfad41bc34a8ec9c2251c8f9266ec20e7bff2f15c0244f06291ff665fb36825e2d60745179067f59f8be10e1a3b1f1496d25def6feb0d03a287be90d
+SHA512 (acpica-unix2-20191213.tar.gz) = 144b8b8d56d3a1da0d11cbbfae7912860f995730c0d2ad34346ffcab3fa7fe9f907d14027b4ad7cc5b15d6ef6f6f9c44c34ee416e440ee578888c6dfcbf01cbf
+SHA512 (acpitests-unix-20191213.tar.gz) = 109f54dd5077a10a633afaa1436afdbcd55684d7c413ab361c5a355905dfe70cd351a861fd5f59ff0c0ea2f5a0fd934e701f16e31e7a5fbdf6bc11045a1be48a

From 35d1808c4657202dd77a8878a5ff9db7ef942a0d Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Mon, 24 Feb 2020 15:26:30 -0700
Subject: [PATCH 08/82] Update to 20200110 upstream source

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 .gitignore        | 2 ++
 acpica-tools.spec | 5 ++++-
 sources           | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 999302c..d204c27 100644
--- a/.gitignore
+++ b/.gitignore
@@ -123,3 +123,5 @@ series
 /acpitests-unix-20191018.tar.gz
 /acpica-unix2-20191213.tar.gz
 /acpitests-unix-20191213.tar.gz
+/acpica-unix2-20200110.tar.gz
+/acpitests-unix-20200110.tar.gz
diff --git a/acpica-tools.spec b/acpica-tools.spec
index 06cbe3d..dd06101 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -1,5 +1,5 @@
 Name:           acpica-tools
-Version:        20191213
+Version:        20200110
 Release:        1%{?dist}
 Summary:        ACPICA tools for the development and debug of ACPI tables
 
@@ -239,6 +239,9 @@ fi
 
 
 %changelog
+* Mon Feb 24 2020 Al Stone <ahs3@redhat.com> - 20200110-1
+- Update to 20200110 source tree, including patch refreshes
+
 * Sun Feb 23 2020 Al Stone <ahs3@redhat.com> - 20191213-1
 - Update to 20191213 source tree, including patch refeshes.
 - badexit patch no longer needed, so removed
diff --git a/sources b/sources
index 2af27b0..35345a6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (acpica-unix2-20191213.tar.gz) = 144b8b8d56d3a1da0d11cbbfae7912860f995730c0d2ad34346ffcab3fa7fe9f907d14027b4ad7cc5b15d6ef6f6f9c44c34ee416e440ee578888c6dfcbf01cbf
-SHA512 (acpitests-unix-20191213.tar.gz) = 109f54dd5077a10a633afaa1436afdbcd55684d7c413ab361c5a355905dfe70cd351a861fd5f59ff0c0ea2f5a0fd934e701f16e31e7a5fbdf6bc11045a1be48a
+SHA512 (acpica-unix2-20200110.tar.gz) = 5c7ab7d514a06dabbec75131bd6fc2fbcbc4e92b8a1fe63e45ccc90631556584b2dbbf96b3f945e8ab1eff40e5b0c9de96395aeed1cfd2bd03ec92d8442fed32
+SHA512 (acpitests-unix-20200110.tar.gz) = f3fd79de9df58e6d6f59a2c31d7b109a39b29b744a15e885af9cd44a765ee1cc85f7eb8314f7b00552b53898db555357d839e844c6c966488ae9a52d1ebff606

From 8817859d608e9c5f2e60ee72f5be8ee754c9a1a0 Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Mon, 24 Feb 2020 15:41:56 -0700
Subject: [PATCH 09/82] Update to 20200214 upstream and refresh patches

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 .gitignore                 |   2 +
 acpica-tools.spec          |   5 +-
 badcode.asl.result         |  10 +-
 big-endian.patch           | 274 ++++++++++++++++++-------------------
 converterSample.asl.result |  12 +-
 f23-harden.patch           |  14 +-
 grammar.asl.result         | 225 +++++++++++++++++++++++++++++-
 sources                    |   4 +-
 str-trunc-warn.patch       |  22 +--
 9 files changed, 397 insertions(+), 171 deletions(-)

diff --git a/.gitignore b/.gitignore
index d204c27..c9f2b27 100644
--- a/.gitignore
+++ b/.gitignore
@@ -125,3 +125,5 @@ series
 /acpitests-unix-20191213.tar.gz
 /acpica-unix2-20200110.tar.gz
 /acpitests-unix-20200110.tar.gz
+/acpica-unix2-20200214.tar.gz
+/acpitests-unix-20200214.tar.gz
diff --git a/acpica-tools.spec b/acpica-tools.spec
index dd06101..bcac358 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -1,5 +1,5 @@
 Name:           acpica-tools
-Version:        20200110
+Version:        20200214
 Release:        1%{?dist}
 Summary:        ACPICA tools for the development and debug of ACPI tables
 
@@ -239,6 +239,9 @@ fi
 
 
 %changelog
+* Mon Feb 24 2020 Al Stone <ahs3@redhat.com> - 20200214-1
+- Update to 20200214 source tree, including patch refreshes
+
 * Mon Feb 24 2020 Al Stone <ahs3@redhat.com> - 20200110-1
 - Update to 20200110 source tree, including patch refreshes
 
diff --git a/badcode.asl.result b/badcode.asl.result
index e4f174c..7f3e923 100644
--- a/badcode.asl.result
+++ b/badcode.asl.result
@@ -68,7 +68,7 @@ badcode.asl     97:     Method (MTH2)
 Remark   2119 -                   ^ Control Method marked Serialized (Due to use of Switch operator)
 
 badcode.asl     97:     Method (MTH2)
-Warning  3115 -                   ^ Not all control paths return a value (MTH2)
+Warning  3115 -                   ^ Not all control paths return a value (\MTH2)
 
 badcode.asl    101:         Switch (ToInteger (INT1))
 Error    6078 -                            ^ No Case statements under Switch
@@ -77,13 +77,13 @@ badcode.asl    120:         Store (MTH2 (), Local0)
 Warning  3144 -                                 ^ Method Local is set but never used (Local0)
 
 badcode.asl    120:         Store (MTH2 (), Local0)
-Warning  3122 -                      ^ Called method may not always return a value
+Warning  3122 -                      ^ Called method may not always return a value (\MTH2)
 
 badcode.asl    126:     Method (MTH5) {Store (MTH4(), Local0)}
 Warning  3144 -        Method Local is set but never used ^  (Local0)
 
 badcode.asl    126:     Method (MTH5) {Store (MTH4(), Local0)}
-Error    6080 -  Called method returns no value ^ 
+Error    6080 -  Called method returns no value ^  (\MTH4)
 
 badcode.asl    132:         Name (_HID, "*PNP0C0A")     // Illegal leading asterisk
 Error    6061 -        Invalid leading asterisk ^  (*PNP0C0A)
@@ -256,11 +256,11 @@ Warning  3144 -                            ^ Method Local is set but never used
 
 Intel ACPI Component Architecture
 ASL+ Optimizing Compiler/Disassembler version VVVVVVVV
-Copyright (c) 2000 - 2019 Intel Corporation
+Copyright (c) 2000 - 2020 Intel Corporation
 
 Ignoring all errors, forcing AML file generation
 
-ASL Input:     badcode.asl -   11587 bytes     81 keywords    408 source lines
+ASL Input:     badcode.asl -   11588 bytes     81 keywords    408 source lines
 AML Output:    badcode.aml -    1195 bytes     20 opcodes      61 named objects
 
 Compilation successful. 45 Errors, 29 Warnings, 11 Remarks, 16 Optimizations, 1 Constants Folded
diff --git a/big-endian.patch b/big-endian.patch
index bb12ed6..8d89a5b 100644
--- a/big-endian.patch
+++ b/big-endian.patch
@@ -8,10 +8,10 @@ To date, this has been critical for the s390x architecture only.
 
 Signed-off-by: Al Stone <ahs3@redhat.com>
 
-Index: acpica-unix-20191018/source/compiler/aslcodegen.c
+Index: acpica-unix-20200214/source/compiler/aslcodegen.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/aslcodegen.c
-+++ acpica-unix-20191018/source/compiler/aslcodegen.c
+--- acpica-unix-20200214.orig/source/compiler/aslcodegen.c
++++ acpica-unix-20200214/source/compiler/aslcodegen.c
 @@ -237,16 +237,12 @@ CgWriteAmlOpcode (
      ACPI_PARSE_OBJECT       *Op)
  {
@@ -253,10 +253,10 @@ Index: acpica-unix-20191018/source/compiler/aslcodegen.c
  
      case AML_RAW_DATA_BUFFER:
  
-Index: acpica-unix-20191018/source/compiler/aslopcodes.c
+Index: acpica-unix-20200214/source/compiler/aslopcodes.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/aslopcodes.c
-+++ acpica-unix-20191018/source/compiler/aslopcodes.c
+--- acpica-unix-20200214.orig/source/compiler/aslopcodes.c
++++ acpica-unix-20200214/source/compiler/aslopcodes.c
 @@ -485,6 +485,7 @@ OpcDoUnicode (
      UINT32                  i;
      UINT8                   *AsciiString;
@@ -275,10 +275,10 @@ Index: acpica-unix-20191018/source/compiler/aslopcodes.c
      }
  
      /*
-Index: acpica-unix-20191018/source/compiler/aslrestype1.c
+Index: acpica-unix-20200214/source/compiler/aslrestype1.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/aslrestype1.c
-+++ acpica-unix-20191018/source/compiler/aslrestype1.c
+--- acpica-unix-20200214.orig/source/compiler/aslrestype1.c
++++ acpica-unix-20200214/source/compiler/aslrestype1.c
 @@ -142,6 +142,11 @@ RsDoMemory24Descriptor (
      ACPI_PARSE_OBJECT       *LengthOp = NULL;
      ASL_RESOURCE_NODE       *Rnode;
@@ -475,10 +475,10 @@ Index: acpica-unix-20191018/source/compiler/aslrestype1.c
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (FixedMemory32.AddressLength));
              break;
-Index: acpica-unix-20191018/source/compiler/aslrestype1i.c
+Index: acpica-unix-20200214/source/compiler/aslrestype1i.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/aslrestype1i.c
-+++ acpica-unix-20191018/source/compiler/aslrestype1i.c
+--- acpica-unix-20200214.orig/source/compiler/aslrestype1i.c
++++ acpica-unix-20200214/source/compiler/aslrestype1i.c
 @@ -198,6 +198,8 @@ RsDoFixedDmaDescriptor (
      ACPI_PARSE_OBJECT       *InitializerOp;
      ASL_RESOURCE_NODE       *Rnode;
@@ -615,10 +615,10 @@ Index: acpica-unix-20191018/source/compiler/aslrestype1i.c
 +    ACPI_MOVE_16_TO_16(&Descriptor->Irq.IrqMask, &IrqMask);
      return (Rnode);
  }
-Index: acpica-unix-20191018/source/compiler/aslrestype2.c
+Index: acpica-unix-20200214/source/compiler/aslrestype2.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/aslrestype2.c
-+++ acpica-unix-20191018/source/compiler/aslrestype2.c
+--- acpica-unix-20200214.orig/source/compiler/aslrestype2.c
++++ acpica-unix-20200214/source/compiler/aslrestype2.c
 @@ -76,6 +76,7 @@ RsDoGeneralRegisterDescriptor (
      ACPI_PARSE_OBJECT       *InitializerOp;
      ASL_RESOURCE_NODE       *Rnode;
@@ -759,10 +759,10 @@ Index: acpica-unix-20191018/source/compiler/aslrestype2.c
  
      /* Point to end-of-descriptor for vendor data */
  
-Index: acpica-unix-20191018/source/compiler/aslrestype2d.c
+Index: acpica-unix-20200214/source/compiler/aslrestype2d.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/aslrestype2d.c
-+++ acpica-unix-20191018/source/compiler/aslrestype2d.c
+--- acpica-unix-20200214.orig/source/compiler/aslrestype2d.c
++++ acpica-unix-20200214/source/compiler/aslrestype2d.c
 @@ -79,7 +79,13 @@ RsDoDwordIoDescriptor (
      ACPI_PARSE_OBJECT       *GranOp = NULL;
      ASL_RESOURCE_NODE       *Rnode;
@@ -1118,10 +1118,10 @@ Index: acpica-unix-20191018/source/compiler/aslrestype2d.c
      Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS32) +
          OptionIndex + StringLength;
      return (Rnode);
-Index: acpica-unix-20191018/source/compiler/aslrestype2e.c
+Index: acpica-unix-20200214/source/compiler/aslrestype2e.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/aslrestype2e.c
-+++ acpica-unix-20191018/source/compiler/aslrestype2e.c
+--- acpica-unix-20200214.orig/source/compiler/aslrestype2e.c
++++ acpica-unix-20200214/source/compiler/aslrestype2e.c
 @@ -78,6 +78,13 @@ RsDoExtendedIoDescriptor (
      ACPI_PARSE_OBJECT       *GranOp = NULL;
      ASL_RESOURCE_NODE       *Rnode;
@@ -1227,10 +1227,10 @@ Index: acpica-unix-20191018/source/compiler/aslrestype2e.c
      Rnode->BufferLength = sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) +
          StringLength;
      return (Rnode);
-Index: acpica-unix-20191018/source/compiler/aslrestype2q.c
+Index: acpica-unix-20200214/source/compiler/aslrestype2q.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/aslrestype2q.c
-+++ acpica-unix-20191018/source/compiler/aslrestype2q.c
+--- acpica-unix-20200214.orig/source/compiler/aslrestype2q.c
++++ acpica-unix-20200214/source/compiler/aslrestype2q.c
 @@ -80,7 +80,13 @@ RsDoQwordIoDescriptor (
      ASL_RESOURCE_NODE       *Rnode;
      UINT8                   *OptionalFields;
@@ -1569,10 +1569,10 @@ Index: acpica-unix-20191018/source/compiler/aslrestype2q.c
      Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS64) +
          OptionIndex + StringLength;
      return (Rnode);
-Index: acpica-unix-20191018/source/compiler/aslrestype2s.c
+Index: acpica-unix-20200214/source/compiler/aslrestype2s.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/aslrestype2s.c
-+++ acpica-unix-20191018/source/compiler/aslrestype2s.c
+--- acpica-unix-20200214.orig/source/compiler/aslrestype2s.c
++++ acpica-unix-20200214/source/compiler/aslrestype2s.c
 @@ -340,9 +340,14 @@ RsDoGpioIntDescriptor (
      UINT16                  VendorLength;
      UINT16                  InterruptLength;
@@ -2038,10 +2038,10 @@ Index: acpica-unix-20191018/source/compiler/aslrestype2s.c
      MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource);
      return (Rnode);
  }
-Index: acpica-unix-20191018/source/compiler/aslrestype2w.c
+Index: acpica-unix-20200214/source/compiler/aslrestype2w.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/aslrestype2w.c
-+++ acpica-unix-20191018/source/compiler/aslrestype2w.c
+--- acpica-unix-20200214.orig/source/compiler/aslrestype2w.c
++++ acpica-unix-20200214/source/compiler/aslrestype2w.c
 @@ -81,6 +81,12 @@ RsDoWordIoDescriptor (
      UINT8                   *OptionalFields;
      UINT16                  StringLength = 0;
@@ -2385,10 +2385,10 @@ Index: acpica-unix-20191018/source/compiler/aslrestype2w.c
      Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) +
          OptionIndex + StringLength;
      return (Rnode);
-Index: acpica-unix-20191018/source/include/acmacros.h
+Index: acpica-unix-20200214/source/include/acmacros.h
 ===================================================================
---- acpica-unix-20191018.orig/source/include/acmacros.h
-+++ acpica-unix-20191018/source/include/acmacros.h
+--- acpica-unix-20200214.orig/source/include/acmacros.h
++++ acpica-unix-20200214/source/include/acmacros.h
 @@ -98,9 +98,12 @@
                                             ((UINT8 *)(void *)(d))[6] = ((UINT8 *)(void *)(s))[1];\
                                             ((UINT8 *)(void *)(d))[7] = ((UINT8 *)(void *)(s))[0];}
@@ -2467,10 +2467,10 @@ Index: acpica-unix-20191018/source/include/acmacros.h
  
  #define ACPI_MOVE_32_TO_16(d, s)        ACPI_MOVE_16_TO_16(d, s)    /* Truncate to 16 */
  
-Index: acpica-unix-20191018/source/include/platform/aclinux.h
+Index: acpica-unix-20200214/source/include/platform/aclinux.h
 ===================================================================
---- acpica-unix-20191018.orig/source/include/platform/aclinux.h
-+++ acpica-unix-20191018/source/include/platform/aclinux.h
+--- acpica-unix-20200214.orig/source/include/platform/aclinux.h
++++ acpica-unix-20200214/source/include/platform/aclinux.h
 @@ -198,6 +198,7 @@
  
  #ifdef ACPI_USE_STANDARD_HEADERS
@@ -2490,11 +2490,11 @@ Index: acpica-unix-20191018/source/include/platform/aclinux.h
  #endif /* __KERNEL__ */
  
  #endif /* __ACLINUX_H__ */
-Index: acpica-unix-20191018/source/compiler/aslanalyze.c
+Index: acpica-unix-20200214/source/compiler/aslanalyze.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/aslanalyze.c
-+++ acpica-unix-20191018/source/compiler/aslanalyze.c
-@@ -461,7 +461,7 @@ ApCheckForGpeNameConflict (
+--- acpica-unix-20200214.orig/source/compiler/aslanalyze.c
++++ acpica-unix-20200214/source/compiler/aslanalyze.c
+@@ -469,7 +469,7 @@ ApCheckForGpeNameConflict (
  
      /* Need a null-terminated string version of NameSeg */
  
@@ -2503,7 +2503,7 @@ Index: acpica-unix-20191018/source/compiler/aslanalyze.c
      Name[ACPI_NAMESEG_SIZE] = 0;
  
      /*
-@@ -488,7 +488,7 @@ ApCheckForGpeNameConflict (
+@@ -496,7 +496,7 @@ ApCheckForGpeNameConflict (
       * We are now sure we have an _Lxx or _Exx.
       * Create the target name that would cause collision (Flip E/L)
       */
@@ -2512,10 +2512,10 @@ Index: acpica-unix-20191018/source/compiler/aslanalyze.c
  
      /* Inject opposite letter ("L" versus "E") */
  
-Index: acpica-unix-20191018/source/compiler/asllookup.c
+Index: acpica-unix-20200214/source/compiler/asllookup.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/asllookup.c
-+++ acpica-unix-20191018/source/compiler/asllookup.c
+--- acpica-unix-20200214.orig/source/compiler/asllookup.c
++++ acpica-unix-20200214/source/compiler/asllookup.c
 @@ -119,6 +119,7 @@ LkIsObjectUsed (
  {
      ACPI_NAMESPACE_NODE     *Node = ACPI_CAST_PTR (ACPI_NAMESPACE_NODE, ObjHandle);
@@ -2546,10 +2546,10 @@ Index: acpica-unix-20191018/source/compiler/asllookup.c
              AslError (ASL_REMARK, ASL_MSG_NOT_REFERENCED,
                  LkGetNameOp (Node->Op), AslGbl_MsgBuffer);
              return (AE_OK);
-Index: acpica-unix-20191018/source/compiler/aslmain.c
+Index: acpica-unix-20200214/source/compiler/aslmain.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/aslmain.c
-+++ acpica-unix-20191018/source/compiler/aslmain.c
+--- acpica-unix-20200214.orig/source/compiler/aslmain.c
++++ acpica-unix-20200214/source/compiler/aslmain.c
 @@ -101,18 +101,6 @@ main (
  
      signal (SIGINT, AslSignalHandler);
@@ -2569,10 +2569,10 @@ Index: acpica-unix-20191018/source/compiler/aslmain.c
      AcpiOsInitialize ();
      ACPI_DEBUG_INITIALIZE (); /* For debug version only */
  
-Index: acpica-unix-20191018/source/common/acfileio.c
+Index: acpica-unix-20200214/source/common/acfileio.c
 ===================================================================
---- acpica-unix-20191018.orig/source/common/acfileio.c
-+++ acpica-unix-20191018/source/common/acfileio.c
+--- acpica-unix-20200214.orig/source/common/acfileio.c
++++ acpica-unix-20200214/source/common/acfileio.c
 @@ -280,6 +280,7 @@ AcGetOneTableFromFile (
      ACPI_TABLE_HEADER       *Table;
      INT32                   Count;
@@ -2639,10 +2639,10 @@ Index: acpica-unix-20191018/source/common/acfileio.c
              (UINT32) (FileSize - TableOffset));
          return (AE_BAD_HEADER);
      }
-Index: acpica-unix-20191018/source/common/dmtable.c
+Index: acpica-unix-20200214/source/common/dmtable.c
 ===================================================================
---- acpica-unix-20191018.orig/source/common/dmtable.c
-+++ acpica-unix-20191018/source/common/dmtable.c
+--- acpica-unix-20200214.orig/source/common/dmtable.c
++++ acpica-unix-20200214/source/common/dmtable.c
 @@ -551,7 +551,7 @@ AcpiDmDumpDataTable (
       */
      if (ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_FACS))
@@ -2741,10 +2741,10 @@ Index: acpica-unix-20191018/source/common/dmtable.c
                  AcpiDmNfitSubnames[Temp16]);
              break;
  
-Index: acpica-unix-20191018/source/common/dmtables.c
+Index: acpica-unix-20200214/source/common/dmtables.c
 ===================================================================
---- acpica-unix-20191018.orig/source/common/dmtables.c
-+++ acpica-unix-20191018/source/common/dmtables.c
+--- acpica-unix-20200214.orig/source/common/dmtables.c
++++ acpica-unix-20200214/source/common/dmtables.c
 @@ -142,7 +142,9 @@ AdCreateTableHeader (
      ACPI_TABLE_HEADER       *Table)
  {
@@ -2808,12 +2808,12 @@ Index: acpica-unix-20191018/source/common/dmtables.c
 +    ACPI_MOVE_32_TO_32(&AmlLength, &Table->Length);
 +    AmlLength -= sizeof (ACPI_TABLE_HEADER);
      AmlStart = ((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER));
-     ASL_CV_INIT_FILETREE(Table, AmlStart, AmlLength);
  
-Index: acpica-unix-20191018/source/compiler/dtfield.c
+     AcpiUtSetIntegerWidth (Table->Revision);
+Index: acpica-unix-20200214/source/compiler/dtfield.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/dtfield.c
-+++ acpica-unix-20191018/source/compiler/dtfield.c
+--- acpica-unix-20200214.orig/source/compiler/dtfield.c
++++ acpica-unix-20200214/source/compiler/dtfield.c
 @@ -361,7 +361,27 @@ DtCompileInteger (
          DtError (ASL_ERROR, ASL_MSG_INTEGER_SIZE, Field, AslGbl_MsgBuffer);
      }
@@ -2843,10 +2843,10 @@ Index: acpica-unix-20191018/source/compiler/dtfield.c
      return;
  }
  
-Index: acpica-unix-20191018/source/compiler/dtsubtable.c
+Index: acpica-unix-20200214/source/compiler/dtsubtable.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/dtsubtable.c
-+++ acpica-unix-20191018/source/compiler/dtsubtable.c
+--- acpica-unix-20200214.orig/source/compiler/dtsubtable.c
++++ acpica-unix-20200214/source/compiler/dtsubtable.c
 @@ -378,6 +378,21 @@ DtSetSubtableLength (
          return;
      }
@@ -2871,10 +2871,10 @@ Index: acpica-unix-20191018/source/compiler/dtsubtable.c
 +        	Subtable->SizeOfLengthField);
 +    }
  }
-Index: acpica-unix-20191018/source/compiler/dttable1.c
+Index: acpica-unix-20200214/source/compiler/dttable1.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/dttable1.c
-+++ acpica-unix-20191018/source/compiler/dttable1.c
+--- acpica-unix-20200214.orig/source/compiler/dttable1.c
++++ acpica-unix-20200214/source/compiler/dttable1.c
 @@ -281,6 +281,8 @@ DtCompileCsrt (
      DT_FIELD                **PFieldList = (DT_FIELD **) List;
      UINT32                  DescriptorCount;
@@ -3246,10 +3246,10 @@ Index: acpica-unix-20191018/source/compiler/dttable1.c
      return (AE_OK);
  }
  
-Index: acpica-unix-20191018/source/compiler/dttable2.c
+Index: acpica-unix-20200214/source/compiler/dttable2.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/dttable2.c
-+++ acpica-unix-20191018/source/compiler/dttable2.c
+--- acpica-unix-20200214.orig/source/compiler/dttable2.c
++++ acpica-unix-20200214/source/compiler/dttable2.c
 @@ -345,7 +345,7 @@ DtCompileMpst (
      DtPushSubtable (Subtable);
  
@@ -3360,7 +3360,7 @@ Index: acpica-unix-20191018/source/compiler/dttable2.c
      LocalityBuffer = UtLocalCalloc (Localities);
      LocalityListLength = 0;
  
-@@ -1740,6 +1746,7 @@ DtCompileTcpa (
+@@ -1741,6 +1747,7 @@ DtCompileTcpa (
      ACPI_TABLE_TCPA_HDR     *TcpaHeader;
      DT_SUBTABLE             *ParentTable;
      ACPI_STATUS             Status;
@@ -3368,7 +3368,7 @@ Index: acpica-unix-20191018/source/compiler/dttable2.c
  
  
      /* Compile the main table */
-@@ -1760,7 +1767,8 @@ DtCompileTcpa (
+@@ -1761,7 +1768,8 @@ DtCompileTcpa (
       */
      TcpaHeader = ACPI_CAST_PTR (ACPI_TABLE_TCPA_HDR, ParentTable->Buffer);
  
@@ -3378,7 +3378,7 @@ Index: acpica-unix-20191018/source/compiler/dttable2.c
      {
      case ACPI_TCPA_CLIENT_TABLE:
  
-@@ -1808,6 +1816,7 @@ DtCompileTpm2Rev3 (
+@@ -1809,6 +1817,7 @@ DtCompileTpm2Rev3 (
      ACPI_TABLE_TPM23        *Tpm23Header;
      DT_SUBTABLE             *ParentTable;
      ACPI_STATUS             Status = AE_OK;
@@ -3386,7 +3386,7 @@ Index: acpica-unix-20191018/source/compiler/dttable2.c
  
  
      Status = DtCompileTable (PFieldList, AcpiDmTableInfoTpm23,
-@@ -1819,7 +1828,8 @@ DtCompileTpm2Rev3 (
+@@ -1820,7 +1829,8 @@ DtCompileTpm2Rev3 (
  
      /* Subtable type depends on the StartMethod */
  
@@ -3396,7 +3396,7 @@ Index: acpica-unix-20191018/source/compiler/dttable2.c
      {
      case ACPI_TPM23_ACPI_START_METHOD:
  
-@@ -1866,6 +1876,7 @@ DtCompileTpm2 (
+@@ -1867,6 +1877,7 @@ DtCompileTpm2 (
      DT_SUBTABLE             *ParentTable;
      ACPI_STATUS             Status = AE_OK;
      ACPI_TABLE_HEADER       *Header;
@@ -3404,7 +3404,7 @@ Index: acpica-unix-20191018/source/compiler/dttable2.c
  
  
      ParentTable = DtPeekSubtable ();
-@@ -1909,7 +1920,8 @@ DtCompileTpm2 (
+@@ -1910,7 +1921,8 @@ DtCompileTpm2 (
  
      /* Subtable type depends on the StartMethod */
  
@@ -3414,7 +3414,7 @@ Index: acpica-unix-20191018/source/compiler/dttable2.c
      {
      case ACPI_TPM2_COMMAND_BUFFER_WITH_ARM_SMC:
  
-@@ -2125,6 +2137,9 @@ DtCompileWpbt (
+@@ -2126,6 +2138,9 @@ DtCompileWpbt (
      ACPI_TABLE_WPBT         *Table;
      ACPI_STATUS             Status;
      UINT16                  Length;
@@ -3424,7 +3424,7 @@ Index: acpica-unix-20191018/source/compiler/dttable2.c
  
  
      /* Compile the main table */
-@@ -2152,7 +2167,16 @@ DtCompileWpbt (
+@@ -2153,7 +2168,16 @@ DtCompileWpbt (
  
      Length = (UINT16) Subtable->TotalLength;
      Table = ACPI_CAST_PTR (ACPI_TABLE_WPBT, ParentTable->Buffer);
@@ -3442,10 +3442,10 @@ Index: acpica-unix-20191018/source/compiler/dttable2.c
  
      ParentTable = DtPeekSubtable ();
      DtInsertSubtable (ParentTable, Subtable);
-Index: acpica-unix-20191018/source/components/disassembler/dmbuffer.c
+Index: acpica-unix-20200214/source/components/disassembler/dmbuffer.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/disassembler/dmbuffer.c
-+++ acpica-unix-20191018/source/components/disassembler/dmbuffer.c
+--- acpica-unix-20200214.orig/source/components/disassembler/dmbuffer.c
++++ acpica-unix-20200214/source/components/disassembler/dmbuffer.c
 @@ -204,7 +204,7 @@ AcpiDmByteList (
  
  
@@ -3521,10 +3521,10 @@ Index: acpica-unix-20191018/source/components/disassembler/dmbuffer.c
  
      NextOp = AcpiPsGetDepthNext (NULL, Op);
      if (!NextOp)
-Index: acpica-unix-20191018/source/components/disassembler/dmopcode.c
+Index: acpica-unix-20200214/source/components/disassembler/dmopcode.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/disassembler/dmopcode.c
-+++ acpica-unix-20191018/source/components/disassembler/dmopcode.c
+--- acpica-unix-20200214.orig/source/components/disassembler/dmopcode.c
++++ acpica-unix-20200214/source/components/disassembler/dmopcode.c
 @@ -244,6 +244,7 @@ AcpiDmPredefinedDescription (
      char                        *NameString;
      int                         LastCharIsDigit;
@@ -3595,10 +3595,10 @@ Index: acpica-unix-20191018/source/components/disassembler/dmopcode.c
  
              Info->Level += 1;
              Info->MappingOp = Op;
-Index: acpica-unix-20191018/source/components/disassembler/dmresrcl.c
+Index: acpica-unix-20200214/source/components/disassembler/dmresrcl.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/disassembler/dmresrcl.c
-+++ acpica-unix-20191018/source/components/disassembler/dmresrcl.c
+--- acpica-unix-20200214.orig/source/components/disassembler/dmresrcl.c
++++ acpica-unix-20200214/source/components/disassembler/dmresrcl.c
 @@ -141,7 +141,8 @@ AcpiDmMemoryFields (
      UINT32                  Level)
  {
@@ -3747,10 +3747,10 @@ Index: acpica-unix-20191018/source/components/disassembler/dmresrcl.c
      }
  
      AcpiDmIndent (Level);
-Index: acpica-unix-20191018/source/components/disassembler/dmresrcl2.c
+Index: acpica-unix-20200214/source/components/disassembler/dmresrcl2.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/disassembler/dmresrcl2.c
-+++ acpica-unix-20191018/source/components/disassembler/dmresrcl2.c
+--- acpica-unix-20200214.orig/source/components/disassembler/dmresrcl2.c
++++ acpica-unix-20200214/source/components/disassembler/dmresrcl2.c
 @@ -191,22 +191,24 @@ AcpiDmGpioCommon (
      char                    *DeviceName = NULL;
      UINT32                  PinCount;
@@ -3974,10 +3974,10 @@ Index: acpica-unix-20191018/source/components/disassembler/dmresrcl2.c
  
      DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset);
      AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
-Index: acpica-unix-20191018/source/components/disassembler/dmresrcs.c
+Index: acpica-unix-20200214/source/components/disassembler/dmresrcs.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/disassembler/dmresrcs.c
-+++ acpica-unix-20191018/source/components/disassembler/dmresrcs.c
+--- acpica-unix-20200214.orig/source/components/disassembler/dmresrcs.c
++++ acpica-unix-20200214/source/components/disassembler/dmresrcs.c
 @@ -72,6 +72,7 @@ AcpiDmIrqDescriptor (
      UINT32                  Length,
      UINT32                  Level)
@@ -4034,10 +4034,10 @@ Index: acpica-unix-20191018/source/components/disassembler/dmresrcs.c
  
      AcpiDmIndent (Level + 1);
      AcpiDmDumpInteger8 (Resource->FixedIo.AddressLength, "Length");
-Index: acpica-unix-20191018/source/components/dispatcher/dsfield.c
+Index: acpica-unix-20200214/source/components/dispatcher/dsfield.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/dispatcher/dsfield.c
-+++ acpica-unix-20191018/source/components/dispatcher/dsfield.c
+--- acpica-unix-20200214.orig/source/components/dispatcher/dsfield.c
++++ acpica-unix-20200214/source/components/dispatcher/dsfield.c
 @@ -324,6 +324,7 @@ AcpiDsGetFieldNames (
      ACPI_STATUS             Status;
      UINT64                  Position;
@@ -4082,10 +4082,10 @@ Index: acpica-unix-20191018/source/components/dispatcher/dsfield.c
              if (ACPI_FAILURE (Status))
              {
                  ACPI_ERROR_NAMESPACE (WalkState->ScopeInfo,
-Index: acpica-unix-20191018/source/components/events/evgpeblk.c
+Index: acpica-unix-20200214/source/components/events/evgpeblk.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/events/evgpeblk.c
-+++ acpica-unix-20191018/source/components/events/evgpeblk.c
+--- acpica-unix-20200214.orig/source/components/events/evgpeblk.c
++++ acpica-unix-20200214/source/components/events/evgpeblk.c
 @@ -380,6 +380,7 @@ AcpiEvCreateGpeBlock (
      ACPI_STATUS             Status;
      ACPI_GPE_BLOCK_INFO     *GpeBlock;
@@ -4118,10 +4118,10 @@ Index: acpica-unix-20191018/source/components/events/evgpeblk.c
          InterruptNumber == AcpiGbl_FADT.SciInterrupt ? " (SCI)" : ""));
  
      /* Update global count of currently available GPEs */
-Index: acpica-unix-20191018/source/components/hardware/hwregs.c
+Index: acpica-unix-20200214/source/components/hardware/hwregs.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/hardware/hwregs.c
-+++ acpica-unix-20191018/source/components/hardware/hwregs.c
+--- acpica-unix-20200214.orig/source/components/hardware/hwregs.c
++++ acpica-unix-20200214/source/components/hardware/hwregs.c
 @@ -197,7 +197,7 @@ AcpiHwValidateRegister (
       * Address must not be null. A null address also indicates an optional
       * ACPI register that is not supported, so no error message.
@@ -4131,10 +4131,10 @@ Index: acpica-unix-20191018/source/components/hardware/hwregs.c
      if (!(*Address))
      {
          return (AE_BAD_ADDRESS);
-Index: acpica-unix-20191018/source/components/hardware/hwvalid.c
+Index: acpica-unix-20200214/source/components/hardware/hwvalid.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/hardware/hwvalid.c
-+++ acpica-unix-20191018/source/components/hardware/hwvalid.c
+--- acpica-unix-20200214.orig/source/components/hardware/hwvalid.c
++++ acpica-unix-20200214/source/components/hardware/hwvalid.c
 @@ -135,6 +135,8 @@ AcpiHwValidateIoRequest (
      UINT32                  ByteWidth;
      ACPI_IO_ADDRESS         LastAddress;
@@ -4156,10 +4156,10 @@ Index: acpica-unix-20191018/source/components/hardware/hwvalid.c
      {
          ACPI_ERROR ((AE_INFO,
              "Illegal I/O port address/length above 64K: %8.8X%8.8X/0x%X",
-Index: acpica-unix-20191018/source/components/namespace/nsaccess.c
+Index: acpica-unix-20200214/source/components/namespace/nsaccess.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/namespace/nsaccess.c
-+++ acpica-unix-20191018/source/components/namespace/nsaccess.c
+--- acpica-unix-20200214.orig/source/components/namespace/nsaccess.c
++++ acpica-unix-20200214/source/components/namespace/nsaccess.c
 @@ -349,6 +349,7 @@ AcpiNsLookup (
      UINT32                  SearchParentFlag = ACPI_NS_SEARCH_PARENT;
      UINT32                  LocalFlags;
@@ -4180,10 +4180,10 @@ Index: acpica-unix-20191018/source/components/namespace/nsaccess.c
                      AcpiUtGetTypeName (ThisNode->Type),
                      AcpiUtGetTypeName (TypeToCheckFor)));
              }
-Index: acpica-unix-20191018/source/components/namespace/nsparse.c
+Index: acpica-unix-20200214/source/components/namespace/nsparse.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/namespace/nsparse.c
-+++ acpica-unix-20191018/source/components/namespace/nsparse.c
+--- acpica-unix-20200214.orig/source/components/namespace/nsparse.c
++++ acpica-unix-20200214/source/components/namespace/nsparse.c
 @@ -216,13 +216,14 @@ AcpiNsOneCompleteParse (
  
      /* Table must consist of at least a complete header */
@@ -4201,10 +4201,10 @@ Index: acpica-unix-20191018/source/components/namespace/nsparse.c
  
      Status = AcpiTbGetOwnerId (TableIndex, &OwnerId);
      if (ACPI_FAILURE (Status))
-Index: acpica-unix-20191018/source/components/tables/tbdata.c
+Index: acpica-unix-20200214/source/components/tables/tbdata.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/tables/tbdata.c
-+++ acpica-unix-20191018/source/components/tables/tbdata.c
+--- acpica-unix-20200214.orig/source/components/tables/tbdata.c
++++ acpica-unix-20200214/source/components/tables/tbdata.c
 @@ -552,6 +552,7 @@ AcpiTbVerifyTempTable (
      UINT32                  *TableIndex)
  {
@@ -4223,10 +4223,10 @@ Index: acpica-unix-20191018/source/components/tables/tbdata.c
          if (ACPI_FAILURE (Status))
          {
              ACPI_EXCEPTION ((AE_INFO, AE_NO_MEMORY,
-Index: acpica-unix-20191018/source/components/tables/tbfadt.c
+Index: acpica-unix-20200214/source/components/tables/tbfadt.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/tables/tbfadt.c
-+++ acpica-unix-20191018/source/components/tables/tbfadt.c
+--- acpica-unix-20200214.orig/source/components/tables/tbfadt.c
++++ acpica-unix-20200214/source/components/tables/tbfadt.c
 @@ -424,18 +424,20 @@ AcpiTbCreateLocalFadt (
      ACPI_TABLE_HEADER       *Table,
      UINT32                  Length)
@@ -4338,10 +4338,10 @@ Index: acpica-unix-20191018/source/components/tables/tbfadt.c
                  "PmRegisters", 0);
          }
      }
-Index: acpica-unix-20191018/source/components/tables/tbfind.c
+Index: acpica-unix-20200214/source/components/tables/tbfind.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/tables/tbfind.c
-+++ acpica-unix-20191018/source/components/tables/tbfind.c
+--- acpica-unix-20200214.orig/source/components/tables/tbfind.c
++++ acpica-unix-20200214/source/components/tables/tbfind.c
 @@ -108,8 +108,11 @@ AcpiTbFindTable (
      (void) AcpiUtAcquireMutex (ACPI_MTX_TABLES);
      for (i = 0; i < AcpiGbl_RootTableList.CurrentTableCount; ++i)
@@ -4355,10 +4355,10 @@ Index: acpica-unix-20191018/source/components/tables/tbfind.c
          {
              /* Not the requested table */
  
-Index: acpica-unix-20191018/source/components/tables/tbprint.c
+Index: acpica-unix-20200214/source/components/tables/tbprint.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/tables/tbprint.c
-+++ acpica-unix-20191018/source/components/tables/tbprint.c
+--- acpica-unix-20200214.orig/source/components/tables/tbprint.c
++++ acpica-unix-20200214/source/components/tables/tbprint.c
 @@ -143,15 +143,18 @@ AcpiTbPrintTableHeader (
      ACPI_TABLE_HEADER       *Header)
  {
@@ -4400,10 +4400,10 @@ Index: acpica-unix-20191018/source/components/tables/tbprint.c
      }
  }
  
-Index: acpica-unix-20191018/source/components/tables/tbutils.c
+Index: acpica-unix-20200214/source/components/tables/tbutils.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/tables/tbutils.c
-+++ acpica-unix-20191018/source/components/tables/tbutils.c
+--- acpica-unix-20200214.orig/source/components/tables/tbutils.c
++++ acpica-unix-20200214/source/components/tables/tbutils.c
 @@ -238,7 +238,7 @@ AcpiTbGetRootTableEntry (
           * 64-bit platform, XSDT: Move (unaligned) 64-bit to local,
           *  return 64-bit
@@ -4463,10 +4463,10 @@ Index: acpica-unix-20191018/source/components/tables/tbutils.c
          {
              AcpiGbl_FadtIndex = TableIndex;
              AcpiTbParseFadt ();
-Index: acpica-unix-20191018/source/components/tables/tbxface.c
+Index: acpica-unix-20200214/source/components/tables/tbxface.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/tables/tbxface.c
-+++ acpica-unix-20191018/source/components/tables/tbxface.c
+--- acpica-unix-20200214.orig/source/components/tables/tbxface.c
++++ acpica-unix-20200214/source/components/tables/tbxface.c
 @@ -293,8 +293,11 @@ AcpiGetTableHeader (
  
      for (i = 0, j = 0; i < AcpiGbl_RootTableList.CurrentTableCount; i++)
@@ -4480,10 +4480,10 @@ Index: acpica-unix-20191018/source/components/tables/tbxface.c
          {
              continue;
          }
-Index: acpica-unix-20191018/source/components/tables/tbxfload.c
+Index: acpica-unix-20200214/source/components/tables/tbxfload.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/tables/tbxfload.c
-+++ acpica-unix-20191018/source/components/tables/tbxfload.c
+--- acpica-unix-20200214.orig/source/components/tables/tbxfload.c
++++ acpica-unix-20200214/source/components/tables/tbxfload.c
 @@ -153,6 +153,7 @@ AcpiTbLoadNamespace (
      ACPI_TABLE_DESC         *Table;
      UINT32                  TablesLoaded = 0;
@@ -4503,10 +4503,10 @@ Index: acpica-unix-20191018/source/components/tables/tbxfload.c
           ACPI_FAILURE (AcpiTbValidateTable (Table)))
      {
          Status = AE_NO_ACPI_TABLES;
-Index: acpica-unix-20191018/source/tools/acpiexec/aetables.c
+Index: acpica-unix-20200214/source/tools/acpiexec/aetables.c
 ===================================================================
---- acpica-unix-20191018.orig/source/tools/acpiexec/aetables.c
-+++ acpica-unix-20191018/source/tools/acpiexec/aetables.c
+--- acpica-unix-20200214.orig/source/tools/acpiexec/aetables.c
++++ acpica-unix-20200214/source/tools/acpiexec/aetables.c
 @@ -146,21 +146,25 @@ AeInitializeTableHeader (
      char                    *Signature,
      UINT32                  Length)
@@ -4658,10 +4658,10 @@ Index: acpica-unix-20191018/source/tools/acpiexec/aetables.c
      }
  
      return (AE_OK);
-Index: acpica-unix-20191018/source/common/dmswitch.c
+Index: acpica-unix-20200214/source/common/dmswitch.c
 ===================================================================
---- acpica-unix-20191018.orig/source/common/dmswitch.c
-+++ acpica-unix-20191018/source/common/dmswitch.c
+--- acpica-unix-20200214.orig/source/common/dmswitch.c
++++ acpica-unix-20200214/source/common/dmswitch.c
 @@ -88,13 +88,15 @@ AcpiDmProcessSwitch (
      ACPI_PARSE_OBJECT_LIST  *Current;
      ACPI_PARSE_OBJECT_LIST  *Previous;
diff --git a/converterSample.asl.result b/converterSample.asl.result
index fd63f11..47c532c 100644
--- a/converterSample.asl.result
+++ b/converterSample.asl.result
@@ -1,11 +1,11 @@
 converterSample.asl     37:     Method(MAIN) {
-Remark   2120 -                          ^ Control Method should be made Serialized (due to creation of named objects within)
+Remark   2120 -                          ^ Control Method should be made Serialized due to creation of named objects within (\MAIN)
 
 converterSample.asl     48:             Name(b,0);
 Remark   2089 -    Object is not referenced ^  (Name [B___] is within a method [MAIN])
 
 converterSample.asl     65:     Method(SCOP)
-Remark   2120 -                          ^ Control Method should be made Serialized (due to creation of named objects within)
+Remark   2120 -                          ^ Control Method should be made Serialized due to creation of named objects within (\SCOP)
 
 converterSample.asl     68:         Name (a1, 0x04)
 Remark   2089 -  Object is not referenced ^  (Name [A1__] is within a method [SCOP])
@@ -16,9 +16,11 @@ Remark   2158 -                           ^ Unnecessary/redundant use of Offset
 
 Intel ACPI Component Architecture
 ASL+ Optimizing Compiler/Disassembler version VVVVVVVV
-Copyright (c) 2000 - 2019 Intel Corporation
+Copyright (c) 2000 - 2020 Intel Corporation
+
+Ignoring all errors, forcing AML file generation
 
 ASL Input:     converterSample.asl -    1968 bytes     11 keywords     85 source lines
-AML Output:    converterSample.aml -     180 bytes      2 opcodes       9 named objects
+AML Output:    converterSample.aml -     182 bytes      2 opcodes       9 named objects
 
-Compilation successful. 0 Errors, 0 Warnings, 5 Remarks, 12 Optimizations, 1 Constants Folded
+Compilation successful. 0 Errors, 0 Warnings, 5 Remarks, 10 Optimizations
diff --git a/f23-harden.patch b/f23-harden.patch
index c719d07..eacb454 100644
--- a/f23-harden.patch
+++ b/f23-harden.patch
@@ -8,10 +8,10 @@ From: Al Stone <ahs3@redhat.com>
  generate/unix/iasl/Makefile   |   13 +++++++------
  2 files changed, 9 insertions(+), 6 deletions(-)
 
-Index: acpica-unix-20191018/generate/unix/Makefile.config
+Index: acpica-unix-20200214/generate/unix/Makefile.config
 ===================================================================
---- acpica-unix-20191018.orig/generate/unix/Makefile.config
-+++ acpica-unix-20191018/generate/unix/Makefile.config
+--- acpica-unix-20200214.orig/generate/unix/Makefile.config
++++ acpica-unix-20200214/generate/unix/Makefile.config
 @@ -190,6 +190,8 @@ ifneq ($(NOFORTIFY),TRUE)
  OPT_CFLAGS += -D_FORTIFY_SOURCE=2
  endif
@@ -19,12 +19,12 @@ Index: acpica-unix-20191018/generate/unix/Makefile.config
 +OPT_CFLAGS += -fPIC -pie
 +
  CFLAGS += \
-     -D$(HOST)\
+     -D$(ACPI_HOST)\
      -D_GNU_SOURCE\
-Index: acpica-unix-20191018/generate/unix/iasl/Makefile
+Index: acpica-unix-20200214/generate/unix/iasl/Makefile
 ===================================================================
---- acpica-unix-20191018.orig/generate/unix/iasl/Makefile
-+++ acpica-unix-20191018/generate/unix/iasl/Makefile
+--- acpica-unix-20200214.orig/generate/unix/iasl/Makefile
++++ acpica-unix-20200214/generate/unix/iasl/Makefile
 @@ -358,34 +358,35 @@ $(OBJDIR)/prparserparse.c $(OBJDIR)/prpa
  # Cannot use the common compile warning flags since the C files are created
  # by the utilities above and they are not necessarily ANSI C, etc.
diff --git a/grammar.asl.result b/grammar.asl.result
index e5ac529..c4b9c48 100644
--- a/grammar.asl.result
+++ b/grammar.asl.result
@@ -19,9 +19,15 @@ Warning  3133 -                 ^ Unknown reserved name (_NPK)
 grammar.asl    208:     Device (RES)
 Warning  3141 -                  ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
 
+grammar.asl    247:             Name (PRT0, ResourceTemplate ()
+Remark   2173 -                         ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\RES._CRS)
+
 grammar.asl    399:             CreateByteField (PRT0, R000._ASZ, RSIZ)
 Remark   2089 -                            Object is not referenced ^  (Name [RSIZ] is within a method [_CRS])
 
+grammar.asl    406:             Name (BUF0, ResourceTemplate ()
+Remark   2173 -                         ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\RES._PRS)
+
 grammar.asl    513:         Name (_STR, Unicode ("test"))
 Remark   2089 -                     ^ Object is not referenced (Name [_STR] is within a method [TCOP])
 
@@ -70,6 +76,9 @@ Remark   2089 -                            Object is not referenced ^  (Name [FL
 grammar.asl    705:         Device(PCI0)
 Warning  3073 -       Multiple types ^  (Device object requires either a _HID or _ADR, but not both)
 
+grammar.asl    712:                 Name(PRT0, ResourceTemplate() {
+Remark   2173 -                            ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\_SB.PCI0._CRS)
+
 grammar.asl    733:             Method(_SRS)
 Warning  3102 -                          ^ Reserved method has too few arguments (_SRS requires 1)
 
@@ -100,9 +109,21 @@ Remark   2146 -                   ^ Method Argument is never used (Arg0)
 grammar.asl   1300:         Name(BUFR, Buffer (Local0) {})
 Remark   2089 -                    ^ Object is not referenced (Name [BUFR] is within a method [OBJ1])
 
+grammar.asl   1300:         Name(BUFR, Buffer (Local0) {})
+Remark   2173 -                    ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\OBJ1)
+
+grammar.asl   1301:         Name(BUF1, Buffer (4) {1,2,3,4})
+Remark   2173 -                    ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\OBJ1)
+
+grammar.asl   1302:         Name(BUF2, Buffer (4) {})
+Remark   2173 -                    ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\OBJ1)
+
 grammar.asl   1307:         Alias (MTX1, MTX2)
 Remark   2089 -   Object is not referenced ^  (Name [MTX2] is within a method [OBJ1])
 
+grammar.asl   1321:         Name (BUF2, Buffer (128) {})
+Remark   2173 -                     ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\FLDS)
+
 grammar.asl   1329:         CreateField (BUF2, 148, 96, FLD3)
 Remark   2089 -                  Object is not referenced ^  (Name [FLD3] is within a method [FLDS])
 
@@ -112,9 +133,33 @@ Warning  3038 -                                    ^ Truncating 64-bit constant
 grammar.asl   1396:         if (LNotEqual (Local0, 0x1234567887654321))
 Warning  3038 -   Truncating 64-bit constant found in 32-bit table ^ 
 
+grammar.asl   1411:         Field (\_SB_.MEM.SMEM, AnyAcc, NoLock, Preserve)
+Remark   2173 -                                ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\FLDX)
+
+grammar.asl   1418:         Field (\_SB_.MEM.SMEM, AnyAcc, NoLock, Preserve)
+Remark   2173 -                                ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\FLDX)
+
+grammar.asl   1445:         Name (BUFO, Buffer (32) {})
+Remark   2173 -                     ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\OBJ2)
+
+grammar.asl   1448:         OperationRegion (OPR2, SystemMemory, Arg0, 256)
+Remark   2173 -                                ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\OBJ2)
+
+grammar.asl   1451:         Field (OPR2, ByteAcc, NoLock, Preserve)
+Remark   2173 -                      ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\OBJ2)
+
+grammar.asl   1462:         BankField (OPR2, BNK2, 0, ByteAcc, NoLock, Preserve)
+Remark   2173 -                          ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\OBJ2)
+
+grammar.asl   1469:         IndexField (IDX2, DAT2, ByteAcc, NoLock, Preserve)
+Remark   2173 -                           ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\OBJ2)
+
 grammar.asl   1476:         SizeOf (BUFO)
 Error    6114 -                       ^ Result is not used, operator has no effect
 
+grammar.asl   1490:         Event (EVT2)
+Remark   2173 -                      ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\OBJ2)
+
 grammar.asl   1496:         Alias (MTX2, MTXA)
 Remark   2089 -   Object is not referenced ^  (Name [MTXA] is within a method [OBJ2])
 
@@ -146,7 +191,13 @@ grammar.asl   1792:         Store (LLessEqual (0xFFFFFFFF, 0x11111111), Local5)
 Warning  3144 -                          Method Local is set but never used ^  (Local5)
 
 grammar.asl   1821:     Method (COND)
-Warning  3115 -                   ^ Not all control paths return a value (COND)
+Warning  3115 -                   ^ Not all control paths return a value (\COND)
+
+grammar.asl   1916:         Name (BBUF, Buffer() {0xB0, 0xB1, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, 0xB7})
+Remark   2173 -                     ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\REFS)
+
+grammar.asl   1918:         Name (NEST, Package ()
+Remark   2173 -                     ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\REFS)
 
 grammar.asl   1930:         Store (RefOf (MAIN), Local5)
 Warning  3144 -   Method Local is set but never used ^  (Local5)
@@ -157,6 +208,9 @@ Warning  3141 -                   ^ Missing dependency (Device object requires a
 grammar.asl   2162:     Device (NOSV)
 Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
 
+grammar.asl   2168:             Name (WRD, 0x1234)
+Remark   2173 -                        ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\NOSV.TEST)
+
 grammar.asl   2583:     Device (IDXF)
 Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
 
@@ -175,6 +229,12 @@ Warning  3141 -    Missing dependency ^  (Device object requires a _HID or _ADR
 grammar.asl   2658:     Device (RTBF)
 Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
 
+grammar.asl   2667:             Name (ABUF, Buffer() {"ARBITRARY_BUFFER"})
+Remark   2173 -                         ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\RTBF.RBUF)
+
+grammar.asl   2695:             Name (BUFR, Buffer(Local1) {})
+Remark   2173 -                         ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\RTBF.RBUF)
+
 grammar.asl   2756:     Device (GPE2)
 Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
 
@@ -205,15 +265,36 @@ Warning  3141 -                   ^ Missing dependency (Device object requires a
 grammar.asl   3109:     Device (ANDO)
 Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
 
+grammar.asl   3343:             Name(RSLT,1)
+Remark   2173 -                        ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\ANDO.TEST)
+
 grammar.asl   3383:     Device (BRKP)
 Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
 
 grammar.asl   3420:     Device (ADSU)
 Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
 
+grammar.asl   3435:             Name (DWRD, 0x12345678)
+Remark   2173 -                         ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\ADSU.TEST)
+
+grammar.asl   3436:             Name (WRD, 0x1234)
+Remark   2173 -                        ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\ADSU.TEST)
+
+grammar.asl   3437:             Name (BYT, 0x12)
+Remark   2173 -                        ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\ADSU.TEST)
+
 grammar.asl   3513:     Device (INDC)
 Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
 
+grammar.asl   3528:             Name (DWRD, 0x12345678)
+Remark   2173 -                         ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\INDC.TEST)
+
+grammar.asl   3529:             Name (WRD, 0x1234)
+Remark   2173 -                        ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\INDC.TEST)
+
+grammar.asl   3530:             Name (BYT, 0x12)
+Remark   2173 -                        ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\INDC.TEST)
+
 grammar.asl   3611:     Device (LOPS)
 Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
 
@@ -223,6 +304,18 @@ Warning  3141 -                   ^ Missing dependency (Device object requires a
 grammar.asl   4120:     Device (MLDV)
 Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
 
+grammar.asl   4135:             Name (RMDR, 0)
+Remark   2173 -                         ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\MLDV.TEST)
+
+grammar.asl   4136:             Name (DWRD, 0x12345678)
+Remark   2173 -                         ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\MLDV.TEST)
+
+grammar.asl   4137:             Name (WRD, 0x1234)
+Remark   2173 -                        ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\MLDV.TEST)
+
+grammar.asl   4138:             Name (BYT, 0x12)
+Remark   2173 -                        ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\MLDV.TEST)
+
 grammar.asl   4253:     Device (NBIT)
 Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
 
@@ -232,12 +325,33 @@ Warning  3141 -                   ^ Missing dependency (Device object requires a
 grammar.asl   4685:     Device (XORD)
 Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
 
+grammar.asl   4693:             OperationRegion (RAM, SystemMemory, 0x800000, 256)
+Warning  3175 -                                   ^ Static OperationRegion should be declared outside control method
+
+grammar.asl   4693:             OperationRegion (RAM, SystemMemory, 0x800000, 256)
+Remark   2173 -                                   ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\XORD.TEST)
+
+grammar.asl   4694:             Field (RAM, ByteAcc, NoLock, Preserve)
+Remark   2173 -                         ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\XORD.TEST)
+
 grammar.asl   5022:     Device (CRBF)
 Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
 
 grammar.asl   5100:     Device (IDX4)
 Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
 
+grammar.asl   5117:             OperationRegion (RAM, SystemMemory, Arg0, 0x100)
+Remark   2173 -                                   ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\IDX4.MADM)
+
+grammar.asl   5118:             Field (RAM, DwordAcc, NoLock, Preserve)
+Remark   2173 -                         ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\IDX4.MADM)
+
+grammar.asl   5123:             Field (RAM, ByteAcc, NoLock, Preserve)
+Remark   2173 -                         ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\IDX4.MADM)
+
+grammar.asl   5159:             Field (RAM, ByteAcc, NoLock, Preserve)
+Remark   2173 -                         ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\IDX4.MADM)
+
 grammar.asl   5639:     Device (EVNT)
 Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
 
@@ -307,30 +421,99 @@ Warning  3144 -          Method Local is set but never used ^  (Local6)
 grammar.asl   6393:     Device (IDX5)
 Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
 
+grammar.asl   6416:             Name (BUF0, Buffer (Local0) {})
+Remark   2173 -                         ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\IDX5.MCTH)
+
+grammar.asl   6417:             Name (BUF1, Buffer (Local0) {})
+Remark   2173 -                         ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\IDX5.MCTH)
+
 grammar.asl   6474:         Device (PCI2)
 Warning  3073 -        Multiple types ^  (Device object requires either a _HID or _ADR, but not both)
 
 grammar.asl   6478:             Name (_CRS, Buffer(26)  {"\_SB_.PCI2._CRS..........."})
 Warning  3046 -        Invalid or unknown escape sequence ^ 
 
+grammar.asl   6554:                 Name (BUFR, Package(13) {})
+Remark   2173 -                             ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\_SB.IDX0._BIF)
+
+grammar.asl   6578:                 Name (BUFR, Package(4) {1, 0x100, 0x76543210, 0x180})
+Remark   2173 -                             ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\_SB.IDX0._BST)
+
+grammar.asl   6593:                 Name (PBUF, Package(4) {})  //  leave uninitialized
+Remark   2173 -                             ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\_SB.IDX0.TEST)
+
+grammar.asl   6625:                 Name (BUFR, Buffer(16)
+Remark   2173 -                             ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\_SB.IDX0.TEST)
+
 grammar.asl   6709:         Device (BITI)
 Warning  3141 -    Missing dependency ^  (Device object requires a _HID or _ADR in same scope)
 
 grammar.asl   6817:                 And (Local0, 1, Local0) //  Local0 &= 1
 Error    6066 -                              ^ Method local variable is not initialized (Local0)
 
+grammar.asl   6846:             Name (C17C, Package (13)
+Remark   2173 -                         ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\_SB.C17B)
+
 grammar.asl   6903:             Name (_HID, "*PNP0C0A")     //  Control Method Battey ID
 Error    6061 -            Invalid leading asterisk ^  (*PNP0C0A)
 
 grammar.asl   6912:         Device (IDX3)
 Warning  3141 -    Missing dependency ^  (Device object requires a _HID or _ADR in same scope)
 
+grammar.asl   6922:                 Name (BUFR, Buffer ()   {0, 1, 2, 3, 4, 5, 6, 7, 8, 9})
+Remark   2173 -                             ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\_SB.IDX3.LCLB)
+
+grammar.asl   6974:                 Name (PKG, Package ()   {0, 1, 2, 3, 4, 5, 6, 7, 8, 9})
+Remark   2173 -                            ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\_SB.IDX3.LCLP)
+
 grammar.asl   7057:     Device(IDX7)
 Warning  3141 -                  ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
 
+grammar.asl   7074:             Name (DEST, Buffer ()                           //  62 characters plus NULL
+Remark   2173 -                         ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\IDX7.TST1)
+
+grammar.asl   7093:             Name (BUF0, Buffer() {0x1, 0x2, 0x3, 0x4, 0x5})
+Remark   2173 -                         ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\IDX7.TST2)
+
+grammar.asl   7110:             Name (BUF1, Buffer() {0x1, 0x2, 0x3, 0x4, 0x5})
+Remark   2173 -                         ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\IDX7.TST3)
+
+grammar.asl   7301:             Name (SRCB, Buffer (12) {}) //  12 characters
+Remark   2173 -                         ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\IDX7.TSTF)
+
+grammar.asl   7304:             Name (DEST, Buffer ()                       //  62 characters plus NULL
+Remark   2173 -                         ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\IDX7.TSTF)
+
+grammar.asl   7327:             Name (SRCB, Buffer (12) {}) //  12 characters
+Remark   2173 -                         ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\IDX7.TSTG)
+
+grammar.asl   7330:             Name (DEST, Buffer ()                       //  62 characters plus NULL
+Remark   2173 -                         ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\IDX7.TSTG)
+
+grammar.asl   7412:             Name (DBUF, Buffer () {"abcdefghijklmnopqrstuvwxyz"})
+Remark   2173 -                         ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\IDX7.TSTH)
+
+grammar.asl   7448:             Name (DBUF, Buffer () {"abcdefghijklmnopqrstuvwxyz"})
+Remark   2173 -                         ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\IDX7.TSTI)
+
+grammar.asl   7484:             Name (DBUF, Buffer () {"abcdefghijklmnopqrstuvwxyz"})
+Remark   2173 -                         ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\IDX7.TSTJ)
+
+grammar.asl   7520:             Name (DBUF, Buffer () {"abcdefghijklmnopqrstuvwxyz"})
+Remark   2173 -                         ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\IDX7.TSTK)
+
+grammar.asl   7556:             Name (DBUF, Buffer () {"abcdefghijklmnopqrstuvwxyz"})
+Remark   2173 -                         ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\IDX7.TSTL)
+
 grammar.asl   7736:     Device (MTCH)
 Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
 
+grammar.asl   7743:             Name (TIM0, Package ()
+Remark   2173 -                         ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\MTCH.TEST)
+
+grammar.asl   7755:             Name (TMD0, Buffer (20) {0xFF, 0xFF, 0xFF, 0xFF })
+Remark   2173 -                         ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\MTCH.TEST)
+
 grammar.asl   7757:             CreateDWordField (TMD0, 4, DMA0)
 Remark   2089 -                     Object is not referenced ^  (Name [DMA0] is within a method [TEST])
 
@@ -346,15 +529,51 @@ Remark   2089 -                      Object is not referenced ^  (Name [CHNF] is
 grammar.asl   7934:     Device (WHLB)
 Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
 
+grammar.asl   8275:                 Name (BUFR, Package (13)    {})
+Remark   2173 -                             ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\_SB.BAT1._BIF)
+
 grammar.asl   8295:         Device (IDX2)
 Warning  3141 -    Missing dependency ^  (Device object requires a _HID or _ADR in same scope)
 
+grammar.asl   8300:                 Name (SRCB, Buffer ()   {"Short Buffer"})   //  12 characters plus NULL
+Remark   2173 -                             ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\_SB.IDX2.B2IB)
+
+grammar.asl   8302:                 Name (DEST, Buffer ()                           //  62 characters plus NULL
+Remark   2173 -                             ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\_SB.IDX2.B2IB)
+
+grammar.asl   8493:                 Name (DEST, Package (2) {})
+Remark   2173 -                             ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\_SB.IDX2.FB2P)
+
 grammar.asl   8678:     Device (SIZO)
 Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
 
+grammar.asl   8708:             Name (BUFR, Buffer (12) {}) //  uninitialized Buffer
+Remark   2173 -                         ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\SIZO.SARG)
+
+grammar.asl   8709:             Name (BUF1, Buffer() {0x01, 0x02, 0x03, 0x04, 0x05})
+Remark   2173 -                         ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\SIZO.SARG)
+
+grammar.asl   8710:             Name (PKG0, Package (4) {}) //  uninitialized Package
+Remark   2173 -                         ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\SIZO.SARG)
+
+grammar.asl   8712:             Name (PKG1, Package (4)
+Remark   2173 -                         ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\SIZO.SARG)
+
 grammar.asl   8720:             Name (PKG2, Package (4)
 Remark   2063 -                                     ^ Initializer list shorter than declared package length
 
+grammar.asl   8720:             Name (PKG2, Package (4)
+Remark   2173 -                         ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\SIZO.SARG)
+
+grammar.asl   8973:             Name (BUFR, Buffer (12) {})
+Remark   2173 -                         ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\SIZO.SBUF)
+
+grammar.asl   9034:             Name (BUFR, Buffer (12) {}) //  uninitialized Buffer
+Remark   2173 -                         ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\SIZO.SLOC)
+
+grammar.asl   9036:             Name (PKG0, Package (4) {}) //  uninitialized Package
+Remark   2173 -                         ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\SIZO.SLOC)
+
 grammar.asl   9132:             Store (_OS, Local0)
 Warning  3144 -                                 ^ Method Local is set but never used (Local0)
 
@@ -376,11 +595,11 @@ Warning  3141 -   Missing dependency ^  (Device object requires a _HID or _ADR i
 
 Intel ACPI Component Architecture
 ASL+ Optimizing Compiler/Disassembler version VVVVVVVV
-Copyright (c) 2000 - 2019 Intel Corporation
+Copyright (c) 2000 - 2020 Intel Corporation
 
 Ignoring all errors, forcing AML file generation
 
 ASL Input:     grammar.asl -  323653 bytes   4818 keywords  10284 source lines
 AML Output:    grammar.aml -   43758 bytes   4148 opcodes     670 named objects
 
-Compilation successful. 6 Errors, 92 Warnings, 27 Remarks, 1106 Optimizations
+Compilation successful. 6 Errors, 93 Warnings, 99 Remarks, 1106 Optimizations
diff --git a/sources b/sources
index 35345a6..3ad2f69 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (acpica-unix2-20200110.tar.gz) = 5c7ab7d514a06dabbec75131bd6fc2fbcbc4e92b8a1fe63e45ccc90631556584b2dbbf96b3f945e8ab1eff40e5b0c9de96395aeed1cfd2bd03ec92d8442fed32
-SHA512 (acpitests-unix-20200110.tar.gz) = f3fd79de9df58e6d6f59a2c31d7b109a39b29b744a15e885af9cd44a765ee1cc85f7eb8314f7b00552b53898db555357d839e844c6c966488ae9a52d1ebff606
+SHA512 (acpica-unix2-20200214.tar.gz) = 0b22f8c8255b030b5e8a2cf5b459344d1f644b26a4fcf1e95b3682335204598a3587f8f2a5ac169f99d76a10ae529051e1dabd1672c8d8bf5a4441c71d4cb1fd
+SHA512 (acpitests-unix-20200214.tar.gz) = b4d37d4784d3fbb697f244477c085e433efa152bc4c4a06d336b216358405252a77c331f4e792f5fa9b912d6f5f200aa1b6379f1b5064e58be12cf8d4415ee15
diff --git a/str-trunc-warn.patch b/str-trunc-warn.patch
index a62a34a..763ae68 100644
--- a/str-trunc-warn.patch
+++ b/str-trunc-warn.patch
@@ -1,8 +1,8 @@
-Index: acpica-unix-20191018/source/compiler/aslanalyze.c
+Index: acpica-unix-20200214/source/compiler/aslanalyze.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/aslanalyze.c
-+++ acpica-unix-20191018/source/compiler/aslanalyze.c
-@@ -355,11 +355,16 @@ AnCheckMethodReturnValue (
+--- acpica-unix-20200214.orig/source/compiler/aslanalyze.c
++++ acpica-unix-20200214/source/compiler/aslanalyze.c
+@@ -358,11 +358,16 @@ AnCheckMethodReturnValue (
           */
          if (ThisNodeBtype != 0)
          {
@@ -20,11 +20,11 @@ Index: acpica-unix-20191018/source/compiler/aslanalyze.c
 +	         free(strp);
          }
      }
- }
-Index: acpica-unix-20191018/source/compiler/aslpredef.c
+ 
+Index: acpica-unix-20200214/source/compiler/aslpredef.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/aslpredef.c
-+++ acpica-unix-20191018/source/compiler/aslpredef.c
+--- acpica-unix-20200214.orig/source/compiler/aslpredef.c
++++ acpica-unix-20200214/source/compiler/aslpredef.c
 @@ -159,14 +159,19 @@ ApCheckForPredefinedMethod (
          if (MethodInfo->NumReturnNoValue &&
              ThisName->Info.ExpectedBtypes)
@@ -84,10 +84,10 @@ Index: acpica-unix-20191018/source/compiler/aslpredef.c
      return (AE_TYPE);
  }
  
-Index: acpica-unix-20191018/source/compiler/aslwalks.c
+Index: acpica-unix-20200214/source/compiler/aslwalks.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/aslwalks.c
-+++ acpica-unix-20191018/source/compiler/aslwalks.c
+--- acpica-unix-20200214.orig/source/compiler/aslwalks.c
++++ acpica-unix-20200214/source/compiler/aslwalks.c
 @@ -515,15 +515,19 @@ AnOperandTypecheckWalkEnd (
              else if (!CommonBtypes)
              {

From c482290009c0a465cf12c990a772d53f32c20caa Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Mon, 24 Feb 2020 16:03:06 -0700
Subject: [PATCH 10/82] Update expected results from misc test

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 converterSample.asl.result | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/converterSample.asl.result b/converterSample.asl.result
index 47c532c..34cb693 100644
--- a/converterSample.asl.result
+++ b/converterSample.asl.result
@@ -18,9 +18,7 @@ Intel ACPI Component Architecture
 ASL+ Optimizing Compiler/Disassembler version VVVVVVVV
 Copyright (c) 2000 - 2020 Intel Corporation
 
-Ignoring all errors, forcing AML file generation
-
 ASL Input:     converterSample.asl -    1968 bytes     11 keywords     85 source lines
-AML Output:    converterSample.aml -     182 bytes      2 opcodes       9 named objects
+AML Output:    converterSample.aml -     180 bytes      2 opcodes       9 named objects
 
-Compilation successful. 0 Errors, 0 Warnings, 5 Remarks, 10 Optimizations
+Compilation successful. 0 Errors, 0 Warnings, 5 Remarks, 12 Optimizations, 1 Constants Folded

From a203640b282e629e87312bce912dff83d2307dba Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Tue, 25 Feb 2020 11:00:37 -0700
Subject: [PATCH 11/82] Add two patches to deal with arch-specific issues on
 ARMv7 and s390x

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 acpica-tools.spec |  9 ++++++++-
 dbtest.patch      | 39 +++++++++++++++++++++++++++++++++++++++
 utstring.patch    | 16 ++++++++++++++++
 3 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 dbtest.patch
 create mode 100644 utstring.patch

diff --git a/acpica-tools.spec b/acpica-tools.spec
index bcac358..72d2ffc 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -48,6 +48,8 @@ Patch20:	aslcodegen.patch
 Patch21:	facp.patch
 Patch22:	dup-symbol.patch
 Patch23:	no-common.patch
+Patch24:	utstring.patch
+Patch25:	dbtest.patch
 
 BuildRequires:  bison patchutils flex gcc
 
@@ -123,6 +125,8 @@ gzip -dc %{SOURCE1} | tar -x --strip-components=1 -f -
 %patch21 -p1 -b .facp
 %patch22 -p1 -b .dup-symbol
 %patch23 -p1 -b .no-common
+%patch24 -p1 -b .utstring
+%patch25 -p1 -b .dbtest
 
 cp -p %{SOURCE2} README.Fedora
 cp -p %{SOURCE3} iasl.1
@@ -239,8 +243,11 @@ fi
 
 
 %changelog
-* Mon Feb 24 2020 Al Stone <ahs3@redhat.com> - 20200214-1
+* Tue Feb 25 2020 Al Stone <ahs3@redhat.com> - 20200214-1
 - Update to 20200214 source tree, including patch refreshes
+- Add patches to fix an ARMv7 specific issue (utstring) and
+  an s390x specific issue (dbtest), both involving more careful
+  checks of array sizes
 
 * Mon Feb 24 2020 Al Stone <ahs3@redhat.com> - 20200110-1
 - Update to 20200110 source tree, including patch refreshes
diff --git a/dbtest.patch b/dbtest.patch
new file mode 100644
index 0000000..68c653d
--- /dev/null
+++ b/dbtest.patch
@@ -0,0 +1,39 @@
+On s390, GCC does not like the string initialization in this case.  When
+ValueToWrite is initialized this way, GCC tries to copy the entire string
+into an ACPI_OBJECT instead of just the pointer (see the use in the call
+to memcpy()).  So, move the init so GCC recognizes that ValueToWrite is
+only a pointer, and not a whole string that needs to be moved.
+
+diff -Naur acpica-unix2-20200214.orig/source/components/debugger/dbtest.c acpica-unix2-20200214/source/components/debugger/dbtest.c
+--- acpica-unix2-20200214.orig/source/components/debugger/dbtest.c	2020-02-14 10:33:54.000000000 -0700
++++ acpica-unix2-20200214/source/components/debugger/dbtest.c	2020-02-25 10:50:42.793372070 -0700
+@@ -719,9 +719,10 @@
+     ACPI_OBJECT             *Temp1 = NULL;
+     ACPI_OBJECT             *Temp2 = NULL;
+     ACPI_OBJECT             *Temp3 = NULL;
+-    char                    *ValueToWrite = "Test String from AML Debugger";
++    char                    *ValueToWrite = NULL;
+     ACPI_OBJECT             WriteValue;
+     ACPI_STATUS             Status;
++    const char              *TestStr = "Test String from AML Debugger";
+ 
+ 
+     /* Read the original value */
+@@ -737,6 +738,9 @@
+ 
+     /* Write a new value */
+ 
++    ValueToWrite = AcpiOsAllocateZeroed(strlen(TestStr)+1);
++    strncpy(ValueToWrite, TestStr, strlen(TestStr));
++
+     WriteValue.Type = ACPI_TYPE_STRING;
+     WriteValue.String.Length = strlen (ValueToWrite);
+     WriteValue.String.Pointer = ValueToWrite;
+@@ -790,6 +794,7 @@
+     if (Temp1) {AcpiOsFree (Temp1);}
+     if (Temp2) {AcpiOsFree (Temp2);}
+     if (Temp3) {AcpiOsFree (Temp3);}
++    if (ValueToWrite) {AcpiOsFree (ValueToWrite);}
+     return (Status);
+ }
+ 
diff --git a/utstring.patch b/utstring.patch
new file mode 100644
index 0000000..c6af4bd
--- /dev/null
+++ b/utstring.patch
@@ -0,0 +1,16 @@
+On ARMv7, GCC catches this particular problem and reports trying
+to copy a string into a space too small; it counts the terminating
+NULL as part of the char[].
+
+diff -Naur acpica-unix2-20200214.orig/source/components/utilities/utstring.c acpica-unix2-20200214/source/components/utilities/utstring.c
+--- acpica-unix2-20200214.orig/source/components/utilities/utstring.c	2020-02-14 10:33:55.000000000 -0700
++++ acpica-unix2-20200214/source/components/utilities/utstring.c	2020-02-24 16:52:24.623218044 -0700
+@@ -185,7 +185,7 @@
+ {
+     UINT32                  i;
+     BOOLEAN                 FoundBadChar = FALSE;
+-    UINT32                  OriginalName;
++    char                    OriginalName[ACPI_NAMESEG_SIZE+1];
+ 
+ 
+     ACPI_FUNCTION_NAME (UtRepairName);

From a3576b784de04e41181a90174370fedf1d2eb507 Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Tue, 25 Feb 2020 11:56:15 -0700
Subject: [PATCH 12/82] Correct an ARMv7 patch

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 utstring.patch | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/utstring.patch b/utstring.patch
index c6af4bd..757fc2a 100644
--- a/utstring.patch
+++ b/utstring.patch
@@ -1,16 +1,28 @@
-On ARMv7, GCC catches this particular problem and reports trying
-to copy a string into a space too small; it counts the terminating
-NULL as part of the char[].
-
 diff -Naur acpica-unix2-20200214.orig/source/components/utilities/utstring.c acpica-unix2-20200214/source/components/utilities/utstring.c
 --- acpica-unix2-20200214.orig/source/components/utilities/utstring.c	2020-02-14 10:33:55.000000000 -0700
-+++ acpica-unix2-20200214/source/components/utilities/utstring.c	2020-02-24 16:52:24.623218044 -0700
++++ acpica-unix2-20200214/source/components/utilities/utstring.c	2020-02-25 11:21:31.329016004 -0700
 @@ -185,7 +185,7 @@
  {
      UINT32                  i;
      BOOLEAN                 FoundBadChar = FALSE;
 -    UINT32                  OriginalName;
-+    char                    OriginalName[ACPI_NAMESEG_SIZE+1];
++    char                    OriginalName[ACPI_NAMESEG+SIZE+1];
  
  
      ACPI_FUNCTION_NAME (UtRepairName);
+@@ -228,13 +228,13 @@
+         {
+             ACPI_WARNING ((AE_INFO,
+                 "Invalid character(s) in name (0x%.8X), repaired: [%4.4s]",
+-                OriginalName, Name));
++                (unsigned int)OriginalName, Name));
+         }
+         else
+         {
+             ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
+                 "Invalid character(s) in name (0x%.8X), repaired: [%4.4s]",
+-                OriginalName, Name));
++                (unsigned int)OriginalName, Name));
+         }
+     }
+ }

From cd3d7968523d0d53e6aa586ad34a1d3204724784 Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Tue, 25 Feb 2020 12:05:53 -0700
Subject: [PATCH 13/82] Correct the latest patches for other arches

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 dbtest.patch   | 2 +-
 utstring.patch | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dbtest.patch b/dbtest.patch
index 68c653d..eb8086e 100644
--- a/dbtest.patch
+++ b/dbtest.patch
@@ -24,7 +24,7 @@ diff -Naur acpica-unix2-20200214.orig/source/components/debugger/dbtest.c acpica
      /* Write a new value */
  
 +    ValueToWrite = AcpiOsAllocateZeroed(strlen(TestStr)+1);
-+    strncpy(ValueToWrite, TestStr, strlen(TestStr));
++    strncpy(ValueToWrite, TestStr, strlen(TestStr)+1);
 +
      WriteValue.Type = ACPI_TYPE_STRING;
      WriteValue.String.Length = strlen (ValueToWrite);
diff --git a/utstring.patch b/utstring.patch
index 757fc2a..626042c 100644
--- a/utstring.patch
+++ b/utstring.patch
@@ -6,7 +6,7 @@ diff -Naur acpica-unix2-20200214.orig/source/components/utilities/utstring.c acp
      UINT32                  i;
      BOOLEAN                 FoundBadChar = FALSE;
 -    UINT32                  OriginalName;
-+    char                    OriginalName[ACPI_NAMESEG+SIZE+1];
++    char                    OriginalName[ACPI_NAMESEG_SIZE+1];
  
  
      ACPI_FUNCTION_NAME (UtRepairName);
@@ -15,14 +15,14 @@ diff -Naur acpica-unix2-20200214.orig/source/components/utilities/utstring.c acp
              ACPI_WARNING ((AE_INFO,
                  "Invalid character(s) in name (0x%.8X), repaired: [%4.4s]",
 -                OriginalName, Name));
-+                (unsigned int)OriginalName, Name));
++                (unsigned int)*OriginalName, Name));
          }
          else
          {
              ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
                  "Invalid character(s) in name (0x%.8X), repaired: [%4.4s]",
 -                OriginalName, Name));
-+                (unsigned int)OriginalName, Name));
++                (unsigned int)*OriginalName, Name));
          }
      }
  }

From b2261cf6d374230ab9bd3e25abced6182bffb71f Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Tue, 25 Feb 2020 17:13:42 -0700
Subject: [PATCH 14/82] Cleanup the armv7hl build issues with string usage

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 acpica-tools.spec     |  4 ++--
 armv7-str-fixes.patch | 12 ++++++++++++
 utstring.patch        | 28 ----------------------------
 3 files changed, 14 insertions(+), 30 deletions(-)
 create mode 100644 armv7-str-fixes.patch
 delete mode 100644 utstring.patch

diff --git a/acpica-tools.spec b/acpica-tools.spec
index 72d2ffc..7a69423 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -48,7 +48,7 @@ Patch20:	aslcodegen.patch
 Patch21:	facp.patch
 Patch22:	dup-symbol.patch
 Patch23:	no-common.patch
-Patch24:	utstring.patch
+Patch24:	armv7-str-fixes.patch
 Patch25:	dbtest.patch
 
 BuildRequires:  bison patchutils flex gcc
@@ -125,7 +125,7 @@ gzip -dc %{SOURCE1} | tar -x --strip-components=1 -f -
 %patch21 -p1 -b .facp
 %patch22 -p1 -b .dup-symbol
 %patch23 -p1 -b .no-common
-%patch24 -p1 -b .utstring
+%patch24 -p1 -b .armv7-str-fixes
 %patch25 -p1 -b .dbtest
 
 cp -p %{SOURCE2} README.Fedora
diff --git a/armv7-str-fixes.patch b/armv7-str-fixes.patch
new file mode 100644
index 0000000..4de8226
--- /dev/null
+++ b/armv7-str-fixes.patch
@@ -0,0 +1,12 @@
+diff -Naur acpica-unix2-20200214.orig/source/include/actypes.h acpica-unix2-20200214/source/include/actypes.h
+--- acpica-unix2-20200214.orig/source/include/actypes.h	2020-02-25 15:41:26.479349637 -0700
++++ acpica-unix2-20200214/source/include/actypes.h	2020-02-25 15:44:49.519082258 -0700
+@@ -561,7 +561,7 @@
+ #define ACPI_COPY_NAMESEG(dest,src)     (*ACPI_CAST_PTR (UINT32, (dest)) = *ACPI_CAST_PTR (UINT32, (src)))
+ #else
+ #define ACPI_COMPARE_NAMESEG(a,b)       (!strncmp (ACPI_CAST_PTR (char, (a)), ACPI_CAST_PTR (char, (b)), ACPI_NAMESEG_SIZE))
+-#define ACPI_COPY_NAMESEG(dest,src)     (strncpy (ACPI_CAST_PTR (char, (dest)), ACPI_CAST_PTR (char, (src)), ACPI_NAMESEG_SIZE))
++#define ACPI_COPY_NAMESEG(dest,src)     (memcpy (ACPI_CAST_PTR (char, (dest)), ACPI_CAST_PTR (char, (src)), ACPI_NAMESEG_SIZE))
+ #endif
+ 
+ /* Support for the special RSDP signature (8 characters) */
diff --git a/utstring.patch b/utstring.patch
deleted file mode 100644
index 626042c..0000000
--- a/utstring.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Naur acpica-unix2-20200214.orig/source/components/utilities/utstring.c acpica-unix2-20200214/source/components/utilities/utstring.c
---- acpica-unix2-20200214.orig/source/components/utilities/utstring.c	2020-02-14 10:33:55.000000000 -0700
-+++ acpica-unix2-20200214/source/components/utilities/utstring.c	2020-02-25 11:21:31.329016004 -0700
-@@ -185,7 +185,7 @@
- {
-     UINT32                  i;
-     BOOLEAN                 FoundBadChar = FALSE;
--    UINT32                  OriginalName;
-+    char                    OriginalName[ACPI_NAMESEG_SIZE+1];
- 
- 
-     ACPI_FUNCTION_NAME (UtRepairName);
-@@ -228,13 +228,13 @@
-         {
-             ACPI_WARNING ((AE_INFO,
-                 "Invalid character(s) in name (0x%.8X), repaired: [%4.4s]",
--                OriginalName, Name));
-+                (unsigned int)*OriginalName, Name));
-         }
-         else
-         {
-             ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
-                 "Invalid character(s) in name (0x%.8X), repaired: [%4.4s]",
--                OriginalName, Name));
-+                (unsigned int)*OriginalName, Name));
-         }
-     }
- }

From a3593830581b0c629be9e69d5393e98ee8a80807 Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Tue, 25 Feb 2020 17:32:18 -0700
Subject: [PATCH 15/82] Add a patch to allow use of PCC Register() again

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 acpica-tools.spec | 12 +++++++++---
 pcc.patch         | 24 ++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 pcc.patch

diff --git a/acpica-tools.spec b/acpica-tools.spec
index 7a69423..1d33f70 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -50,6 +50,7 @@ Patch22:	dup-symbol.patch
 Patch23:	no-common.patch
 Patch24:	armv7-str-fixes.patch
 Patch25:	dbtest.patch
+Patch26:	pcc.patch
 
 BuildRequires:  bison patchutils flex gcc
 
@@ -127,6 +128,7 @@ gzip -dc %{SOURCE1} | tar -x --strip-components=1 -f -
 %patch23 -p1 -b .no-common
 %patch24 -p1 -b .armv7-str-fixes
 %patch25 -p1 -b .dbtest
+%patch26 -p1 -b .pcc
 
 cp -p %{SOURCE2} README.Fedora
 cp -p %{SOURCE3} iasl.1
@@ -245,9 +247,13 @@ fi
 %changelog
 * Tue Feb 25 2020 Al Stone <ahs3@redhat.com> - 20200214-1
 - Update to 20200214 source tree, including patch refreshes
-- Add patches to fix an ARMv7 specific issue (utstring) and
-  an s390x specific issue (dbtest), both involving more careful
-  checks of array sizes
+- Add patch to fix up issues where strings and 4-byte quantities
+  get interchanged; C strings want to be null terminated now, but
+  AML does not so using strncpy is painful.
+- Add patch for s390x specific issue (dbtest), where initializing a
+  string on the stack behaves a little differently 
+- "PCC" is a defined Register() type, but "PlatformCommChannel" was
+  being used instead; put it back to "PCC" as it should be in pcc.patch
 
 * Mon Feb 24 2020 Al Stone <ahs3@redhat.com> - 20200110-1
 - Update to 20200110 source tree, including patch refreshes
diff --git a/pcc.patch b/pcc.patch
new file mode 100644
index 0000000..1ed0bd1
--- /dev/null
+++ b/pcc.patch
@@ -0,0 +1,24 @@
+diff -Naur acpica-unix2-20200214.orig/source/compiler/aslcompiler.l acpica-unix2-20200214/source/compiler/aslcompiler.l
+--- acpica-unix2-20200214.orig/source/compiler/aslcompiler.l	2020-02-25 17:24:22.169290551 -0700
++++ acpica-unix2-20200214/source/compiler/aslcompiler.l	2020-02-25 17:26:01.807138585 -0700
+@@ -584,7 +584,7 @@
+ "IPMI"                      { count (0); return (PARSEOP_REGIONSPACE_IPMI); }
+ "GeneralPurposeIo"          { count (0); return (PARSEOP_REGIONSPACE_GPIO); }       /* ACPI 5.0 */
+ "GenericSerialBus"          { count (0); return (PARSEOP_REGIONSPACE_GSBUS); }      /* ACPI 5.0 */
+-"PlatformCommChannel"       { count (0); return (PARSEOP_REGIONSPACE_PCC); }        /* ACPI 5.0 */
++"PCC"                       { count (0); return (PARSEOP_REGIONSPACE_PCC); }        /* ACPI 5.0 */
+ "FFixedHW"                  { count (0); return (PARSEOP_REGIONSPACE_FFIXEDHW); }
+ 
+     /* ResourceTypeKeyword: Resource Usage - Resource Descriptors */
+diff -Naur acpica-unix2-20200214.orig/source/components/utilities/utdecode.c acpica-unix2-20200214/source/components/utilities/utdecode.c
+--- acpica-unix2-20200214.orig/source/components/utilities/utdecode.c	2020-02-14 10:33:55.000000000 -0700
++++ acpica-unix2-20200214/source/components/utilities/utdecode.c	2020-02-25 17:26:28.524365981 -0700
+@@ -116,7 +116,7 @@
+     "IPMI",              /* 0x07 */
+     "GeneralPurposeIo",  /* 0x08 */
+     "GenericSerialBus",  /* 0x09 */
+-    "PlatformCommChannel"/* 0x0A */
++    "PCC"                /* 0x0A */
+ };
+ 
+ 

From f3595ddf16d7b8ae8db366bf5bd0402e59b3a347 Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Wed, 26 Feb 2020 10:29:04 -0700
Subject: [PATCH 16/82] Add corrections to nsutils.c to allow for big-endian
 support

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 acpica-tools.spec   |  5 ++++-
 big-endian-v3.patch | 19 +++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 big-endian-v3.patch

diff --git a/acpica-tools.spec b/acpica-tools.spec
index 1d33f70..02c365a 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -51,6 +51,7 @@ Patch23:	no-common.patch
 Patch24:	armv7-str-fixes.patch
 Patch25:	dbtest.patch
 Patch26:	pcc.patch
+Patch27:	big-endian-v3.patch
 
 BuildRequires:  bison patchutils flex gcc
 
@@ -129,6 +130,7 @@ gzip -dc %{SOURCE1} | tar -x --strip-components=1 -f -
 %patch24 -p1 -b .armv7-str-fixes
 %patch25 -p1 -b .dbtest
 %patch26 -p1 -b .pcc
+%patch27 -p1 -b .big-endian-v3
 
 cp -p %{SOURCE2} README.Fedora
 cp -p %{SOURCE3} iasl.1
@@ -245,7 +247,7 @@ fi
 
 
 %changelog
-* Tue Feb 25 2020 Al Stone <ahs3@redhat.com> - 20200214-1
+* Wed Feb 26 2020 Al Stone <ahs3@redhat.com> - 20200214-1
 - Update to 20200214 source tree, including patch refreshes
 - Add patch to fix up issues where strings and 4-byte quantities
   get interchanged; C strings want to be null terminated now, but
@@ -254,6 +256,7 @@ fi
   string on the stack behaves a little differently 
 - "PCC" is a defined Register() type, but "PlatformCommChannel" was
   being used instead; put it back to "PCC" as it should be in pcc.patch
+- Add another big-endian patch to compensate for changes to nsutils.c
 
 * Mon Feb 24 2020 Al Stone <ahs3@redhat.com> - 20200110-1
 - Update to 20200110 source tree, including patch refreshes
diff --git a/big-endian-v3.patch b/big-endian-v3.patch
new file mode 100644
index 0000000..11fab3f
--- /dev/null
+++ b/big-endian-v3.patch
@@ -0,0 +1,19 @@
+diff -Naur acpica-unix2-20200214.orig/source/components/namespace/nsutils.c acpica-unix2-20200214/source/components/namespace/nsutils.c
+--- acpica-unix2-20200214.orig/source/components/namespace/nsutils.c	2020-02-14 10:33:55.000000000 -0700
++++ acpica-unix2-20200214/source/components/namespace/nsutils.c	2020-02-26 10:25:43.477022167 -0700
+@@ -363,6 +363,15 @@
+ 
+         /* Move on the next segment */
+ 
++	{
++	    /* Make sure the name segment reflects endian-ness first */
++
++	    UINT32 Tmp32 = 0;
++
++	    memcpy(&Tmp32, Result, ACPI_NAMESEG_SIZE);
++	    ACPI_MOVE_32_TO_32(Result, &Tmp32);
++	}
++
+         ExternalName++;
+         Result += ACPI_NAMESEG_SIZE;
+     }

From a4c3787ec9e91f3176441dfb42804239acb83aa8 Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Wed, 26 Feb 2020 12:40:10 -0700
Subject: [PATCH 17/82] Add s390 fixes to handle PPTT properly

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 big-endian-v3.patch | 87 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 87 insertions(+)

diff --git a/big-endian-v3.patch b/big-endian-v3.patch
index 11fab3f..f4d404e 100644
--- a/big-endian-v3.patch
+++ b/big-endian-v3.patch
@@ -17,3 +17,90 @@ diff -Naur acpica-unix2-20200214.orig/source/components/namespace/nsutils.c acpi
          ExternalName++;
          Result += ACPI_NAMESEG_SIZE;
      }
+diff -Naur acpica-unix2-20200214.orig/source/common/dmtbdump2.c acpica-unix2-20200214/source/common/dmtbdump2.c
+--- acpica-unix2-20200214.orig/source/common/dmtbdump2.c	2020-02-26 11:44:13.732967820 -0700
++++ acpica-unix2-20200214/source/common/dmtbdump2.c	2020-02-26 12:38:44.286849954 -0700
+@@ -1670,6 +1670,8 @@
+     UINT32                  Offset = sizeof (ACPI_TABLE_FPDT);
+     ACPI_DMTABLE_INFO       *InfoTable;
+     UINT32                  i;
++    UINT32                  TableLen;
++    UINT32                  NumPrivRes;
+ 
+ 
+     /* There is no main table (other than the standard ACPI header) */
+@@ -1677,7 +1679,8 @@
+     /* Subtables */
+ 
+     Offset = sizeof (ACPI_TABLE_HEADER);
+-    while (Offset < Table->Length)
++    ACPI_MOVE_32_TO_32(&TableLen, &Table->Length);
++    while (Offset < TableLen)
+     {
+         AcpiOsPrintf ("\n");
+ 
+@@ -1689,7 +1692,7 @@
+             AcpiOsPrintf ("Invalid subtable length\n");
+             return;
+         }
+-        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
++        Status = AcpiDmDumpTable (TableLen, Offset, Subtable,
+             Subtable->Length, AcpiDmTableInfoPpttHdr);
+         if (ACPI_FAILURE (Status))
+         {
+@@ -1731,7 +1734,7 @@
+             AcpiOsPrintf ("Invalid subtable length\n");
+             return;
+         }
+-        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
++        Status = AcpiDmDumpTable (TableLen, Offset, Subtable,
+             Subtable->Length, InfoTable);
+         if (ACPI_FAILURE (Status))
+         {
+@@ -1747,15 +1750,16 @@
+ 
+             /* Dump SMBIOS handles */
+ 
++	    ACPI_MOVE_32_TO_32(&NumPrivRes, &PpttProcessor->NumberOfPrivResources);
+             if ((UINT8)(Subtable->Length - SubtableOffset) <
+-                (UINT8)(PpttProcessor->NumberOfPrivResources * 4))
++                (UINT8)(NumPrivRes * 4))
+             {
+                 AcpiOsPrintf ("Invalid private resource number\n");
+                 return;
+             }
+-            for (i = 0; i < PpttProcessor->NumberOfPrivResources; i++)
++            for (i = 0; i < NumPrivRes; i++)
+             {
+-                Status = AcpiDmDumpTable (Table->Length, Offset + SubtableOffset,
++                Status = AcpiDmDumpTable (TableLen, Offset + SubtableOffset,
+                     ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Subtable, SubtableOffset),
+                     4, AcpiDmTableInfoPptt0a);
+                 if (ACPI_FAILURE (Status))
+diff -Naur acpica-unix2-20200214.orig/source/compiler/dttable2.c acpica-unix2-20200214/source/compiler/dttable2.c
+--- acpica-unix2-20200214.orig/source/compiler/dttable2.c	2020-02-26 11:44:13.726967769 -0700
++++ acpica-unix2-20200214/source/compiler/dttable2.c	2020-02-26 12:39:03.671014890 -0700
+@@ -1087,9 +1087,11 @@
+                 Subtable->Buffer, sizeof (ACPI_SUBTABLE_HEADER));
+             if (PpttProcessor)
+             {
++		UINT32 NumPrivRes;
++
+                 /* Compile initiator proximity domain list */
+ 
+-                PpttProcessor->NumberOfPrivResources = 0;
++                NumPrivRes = 0;
+                 while (*PFieldList)
+                 {
+                     Status = DtCompileTable (PFieldList,
+@@ -1105,8 +1107,9 @@
+ 
+                     DtInsertSubtable (ParentTable, Subtable);
+                     PpttHeader->Length += (UINT8)(Subtable->Length);
+-                    PpttProcessor->NumberOfPrivResources++;
++                    NumPrivRes++;
+                 }
++		ACPI_MOVE_32_TO_32(&PpttProcessor->NumberOfPrivResources, &NumPrivRes);
+             }
+             break;
+ 

From 2652e3e2c495edc9ba24b5e96642165f0345e7e8 Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Thu, 27 Feb 2020 13:27:54 -0700
Subject: [PATCH 18/82] Additional clean-up for big endian support

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 big-endian-v3.patch | 54 +++++++++++++++++++++++++++++++++++++++++++++
 no-common.patch     |  4 ++--
 2 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/big-endian-v3.patch b/big-endian-v3.patch
index f4d404e..e787789 100644
--- a/big-endian-v3.patch
+++ b/big-endian-v3.patch
@@ -104,3 +104,57 @@ diff -Naur acpica-unix2-20200214.orig/source/compiler/dttable2.c acpica-unix2-20
              }
              break;
  
+diff -Naur acpica-unix2-20200214.orig/source/compiler/aslxref.c acpica-unix2-20200214/source/compiler/aslxref.c
+--- acpica-unix2-20200214.orig/source/compiler/aslxref.c	2020-02-14 10:33:53.000000000 -0700
++++ acpica-unix2-20200214/source/compiler/aslxref.c	2020-02-26 13:21:43.973602232 -0700
+@@ -547,8 +547,14 @@
+      */
+     AslGbl_NsLookupCount++;
+ 
+-    Status = AcpiNsLookup (WalkState->ScopeInfo, Path, ObjectType,
+-        ACPI_IMODE_EXECUTE, Flags, WalkState, &Node);
++    {
++        UINT32 Tmp32;
++
++	ACPI_MOVE_32_TO_32(&Tmp32, Path);
++
++        Status = AcpiNsLookup (WalkState->ScopeInfo, (char *)&Tmp32, ObjectType,
++            ACPI_IMODE_EXECUTE, Flags, WalkState, &Node);
++    }
+     if (ACPI_FAILURE (Status))
+     {
+         if (Status == AE_NOT_FOUND)
+diff -Naur acpica-unix2-20200214.orig/source/compiler/aslload.c acpica-unix2-20200214/source/compiler/aslload.c
+--- acpica-unix2-20200214.orig/source/compiler/aslload.c	2020-02-14 10:33:53.000000000 -0700
++++ acpica-unix2-20200214/source/compiler/aslload.c	2020-02-27 13:25:19.308413494 -0700
+@@ -175,13 +175,17 @@
+     ACPI_NAMESPACE_NODE     *Node;
+     ACPI_STATUS             Status;
+     char                    *ExternalPath;
++    char                    TmpPath[ACPI_NAMESEG_SIZE];
+ 
+ 
+     SourceRegion = UtGetArg (Op, 0);
+     if (SourceRegion)
+     {
+-        Status = AcpiNsLookup (WalkState->ScopeInfo,
+-            SourceRegion->Asl.Value.String, AmlType, ACPI_IMODE_EXECUTE,
++	char TmpName[ACPI_NAMESEG_SIZE];
++
++        ACPI_MOVE_32_TO_32(TmpName, SourceRegion->Asl.Value.String);
++        Status = AcpiNsLookup (WalkState->ScopeInfo, TmpName,
++            AmlType, ACPI_IMODE_EXECUTE,
+             ACPI_NS_SEARCH_PARENT | ACPI_NS_DONT_OPEN_SCOPE, NULL, &Node);
+         if (Status == AE_NOT_FOUND)
+         {
+@@ -232,8 +236,9 @@
+ 
+         default:
+ 
++	    ACPI_MOVE_32_TO_32(TmpPath, Child->Asl.Value.String);
+             Status = AcpiNsLookup (WalkState->ScopeInfo,
+-                Child->Asl.Value.String,
++                TmpPath,
+                 ACPI_TYPE_LOCAL_REGION_FIELD,
+                 ACPI_IMODE_LOAD_PASS1,
+                 ACPI_NS_NO_UPSEARCH | ACPI_NS_DONT_OPEN_SCOPE |
diff --git a/no-common.patch b/no-common.patch
index a9cbf1a..975c067 100644
--- a/no-common.patch
+++ b/no-common.patch
@@ -18,7 +18,7 @@ diff -Naur acpica-unix2-20191213.orig/source/compiler/aslcompiler.l acpica-unix2
  #include <stdlib.h>
  #include <string.h>
 -YYSTYPE AslCompilerlval;
-+extern YYSTYPE AslCompilerlval;
++#define YYSTYPE AslCompilerlval;
  
  /*
   * Generation:  Use the following command line:
@@ -30,7 +30,7 @@ diff -Naur acpica-unix2-20191213.orig/source/compiler/prparser.l acpica-unix2-20
   * Local support functions
   */
 -YY_BUFFER_STATE         LexBuffer;
-+extern YY_BUFFER_STATE         LexBuffer;
++static YY_BUFFER_STATE         LexBuffer;
  
  
  /******************************************************************************

From 5b73a30c6050f064eb8a3730ea8e31b0eb4b6af6 Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Wed, 1 Apr 2020 14:07:44 -0600
Subject: [PATCH 19/82] Update to 20209326 sources, with refreshed patches

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 .gitignore                 |   2 +
 acpica-tools.spec          |  12 ++---
 big-endian-dmtbdump2.patch | 104 ++++++++++++++++++-------------------
 big-endian-v3.patch        |  10 ++--
 dup-symbol.patch           |  22 --------
 no-common.patch            |  36 -------------
 pcc.patch                  |  24 ---------
 sources                    |   4 +-
 8 files changed, 66 insertions(+), 148 deletions(-)
 delete mode 100644 dup-symbol.patch
 delete mode 100644 no-common.patch
 delete mode 100644 pcc.patch

diff --git a/.gitignore b/.gitignore
index c9f2b27..44d655f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -127,3 +127,5 @@ series
 /acpitests-unix-20200110.tar.gz
 /acpica-unix2-20200214.tar.gz
 /acpitests-unix-20200214.tar.gz
+/acpica-unix2-20200326.tar.gz
+/acpitests-unix-20200326.tar.gz
diff --git a/acpica-tools.spec b/acpica-tools.spec
index 02c365a..52f259c 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -1,5 +1,5 @@
 Name:           acpica-tools
-Version:        20200214
+Version:        20200326
 Release:        1%{?dist}
 Summary:        ACPICA tools for the development and debug of ACPI tables
 
@@ -46,11 +46,8 @@ Patch18:        str-trunc-warn.patch
 Patch19:	ptr-cast.patch
 Patch20:	aslcodegen.patch
 Patch21:	facp.patch
-Patch22:	dup-symbol.patch
-Patch23:	no-common.patch
 Patch24:	armv7-str-fixes.patch
 Patch25:	dbtest.patch
-Patch26:	pcc.patch
 Patch27:	big-endian-v3.patch
 
 BuildRequires:  bison patchutils flex gcc
@@ -125,11 +122,8 @@ gzip -dc %{SOURCE1} | tar -x --strip-components=1 -f -
 %patch19 -p1 -b .ptr-cast
 %patch20 -p1 -b .aslcodegen
 %patch21 -p1 -b .facp
-%patch22 -p1 -b .dup-symbol
-%patch23 -p1 -b .no-common
 %patch24 -p1 -b .armv7-str-fixes
 %patch25 -p1 -b .dbtest
-%patch26 -p1 -b .pcc
 %patch27 -p1 -b .big-endian-v3
 
 cp -p %{SOURCE2} README.Fedora
@@ -247,6 +241,10 @@ fi
 
 
 %changelog
+* Web Apr 1 2020 Al Stone <ahs3@redhat.com> - 20200326-1
+- Update to 20200326 source tree, including patch refreshes
+- Removed a couple of patches that got included upstream
+
 * Wed Feb 26 2020 Al Stone <ahs3@redhat.com> - 20200214-1
 - Update to 20200214 source tree, including patch refreshes
 - Add patch to fix up issues where strings and 4-byte quantities
diff --git a/big-endian-dmtbdump2.patch b/big-endian-dmtbdump2.patch
index 381da29..0ba1a44 100644
--- a/big-endian-dmtbdump2.patch
+++ b/big-endian-dmtbdump2.patch
@@ -1,7 +1,7 @@
-Index: acpica-unix-20191018/source/common/dmtbdump2.c
+Index: acpica-unix-20209326/source/common/dmtbdump2.c
 ===================================================================
---- acpica-unix-20191018.orig/source/common/dmtbdump2.c
-+++ acpica-unix-20191018/source/common/dmtbdump2.c
+--- acpica-unix-20209326.orig/source/common/dmtbdump2.c
++++ acpica-unix-20209326/source/common/dmtbdump2.c
 @@ -75,16 +75,23 @@ AcpiDmDumpIort (
      ACPI_IORT_SMMU          *IortSmmu = NULL;
      UINT32                  Offset;
@@ -223,7 +223,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
          if (ACPI_FAILURE (Status))
          {
              return;
-@@ -386,7 +407,7 @@ AcpiDmDumpIvrs (
+@@ -391,7 +412,7 @@ AcpiDmDumpIvrs (
  
              /* Attempt to continue */
  
@@ -232,7 +232,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
              {
                  AcpiOsPrintf ("Invalid zero length subtable\n");
                  return;
-@@ -397,8 +418,8 @@ AcpiDmDumpIvrs (
+@@ -402,8 +423,8 @@ AcpiDmDumpIvrs (
          /* Dump the subtable */
  
          AcpiOsPrintf ("\n");
@@ -243,16 +243,16 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
          if (ACPI_FAILURE (Status))
          {
              return;
-@@ -412,7 +433,7 @@ AcpiDmDumpIvrs (
-             DeviceEntry = ACPI_ADD_PTR (ACPI_IVRS_DE_HEADER, Subtable,
-                 sizeof (ACPI_IVRS_HARDWARE));
+@@ -427,7 +448,7 @@ AcpiDmDumpIvrs (
+                     sizeof (ACPI_IVRS_HARDWARE2));
+             }
  
 -            while (EntryOffset < (Offset + Subtable->Length))
 +            while (EntryOffset < (Offset + SubLength))
              {
                  AcpiOsPrintf ("\n");
                  /*
-@@ -474,7 +495,7 @@ AcpiDmDumpIvrs (
+@@ -489,7 +510,7 @@ AcpiDmDumpIvrs (
  
                  /* Dump the Device Entry */
  
@@ -261,7 +261,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
                      DeviceEntry, EntryLength, InfoTable);
                  if (ACPI_FAILURE (Status))
                  {
-@@ -490,8 +511,8 @@ AcpiDmDumpIvrs (
+@@ -505,8 +526,8 @@ AcpiDmDumpIvrs (
  NextSubtable:
          /* Point to next subtable */
  
@@ -272,7 +272,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
      }
  }
  
-@@ -517,7 +538,7 @@ AcpiDmDumpLpit (
+@@ -532,7 +553,7 @@ AcpiDmDumpLpit (
  {
      ACPI_STATUS             Status;
      ACPI_LPIT_HEADER        *Subtable;
@@ -281,7 +281,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
      UINT32                  Offset = sizeof (ACPI_TABLE_LPIT);
      ACPI_DMTABLE_INFO       *InfoTable;
      UINT32                  SubtableLength;
-@@ -525,8 +546,9 @@ AcpiDmDumpLpit (
+@@ -540,8 +561,9 @@ AcpiDmDumpLpit (
  
      /* Subtables */
  
@@ -292,7 +292,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
      {
          /* Common subtable header */
  
-@@ -590,13 +612,14 @@ AcpiDmDumpMadt (
+@@ -605,13 +627,14 @@ AcpiDmDumpMadt (
  {
      ACPI_STATUS             Status;
      ACPI_SUBTABLE_HEADER    *Subtable;
@@ -308,7 +308,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
      Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoMadt);
      if (ACPI_FAILURE (Status))
      {
-@@ -606,7 +629,7 @@ AcpiDmDumpMadt (
+@@ -621,7 +644,7 @@ AcpiDmDumpMadt (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Table, Offset);
@@ -317,7 +317,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
      {
          /* Common subtable header */
  
-@@ -752,11 +775,13 @@ AcpiDmDumpMcfg (
+@@ -767,11 +790,13 @@ AcpiDmDumpMcfg (
      ACPI_STATUS             Status;
      UINT32                  Offset = sizeof (ACPI_TABLE_MCFG);
      ACPI_MCFG_ALLOCATION    *Subtable;
@@ -332,7 +332,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
      if (ACPI_FAILURE (Status))
      {
          return;
-@@ -765,17 +790,17 @@ AcpiDmDumpMcfg (
+@@ -780,17 +805,17 @@ AcpiDmDumpMcfg (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_MCFG_ALLOCATION, Table, Offset);
@@ -354,7 +354,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
              sizeof (ACPI_MCFG_ALLOCATION), AcpiDmTableInfoMcfg0);
          if (ACPI_FAILURE (Status))
          {
-@@ -809,6 +834,7 @@ AcpiDmDumpMpst (
+@@ -824,6 +849,7 @@ AcpiDmDumpMpst (
  {
      ACPI_STATUS             Status;
      UINT32                  Offset = sizeof (ACPI_TABLE_MPST);
@@ -362,7 +362,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
      ACPI_MPST_POWER_NODE    *Subtable0;
      ACPI_MPST_POWER_STATE   *Subtable0A;
      ACPI_MPST_COMPONENT     *Subtable0B;
-@@ -817,11 +843,13 @@ AcpiDmDumpMpst (
+@@ -832,11 +858,13 @@ AcpiDmDumpMpst (
      UINT16                  SubtableCount;
      UINT32                  PowerStateCount;
      UINT32                  ComponentCount;
@@ -377,7 +377,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
      if (ACPI_FAILURE (Status))
      {
          return;
-@@ -829,13 +857,14 @@ AcpiDmDumpMpst (
+@@ -844,13 +872,14 @@ AcpiDmDumpMpst (
  
      /* Subtable: Memory Power Node(s) */
  
@@ -395,7 +395,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
              sizeof (ACPI_MPST_POWER_NODE), AcpiDmTableInfoMpst0);
          if (ACPI_FAILURE (Status))
          {
-@@ -844,8 +873,8 @@ AcpiDmDumpMpst (
+@@ -859,8 +888,8 @@ AcpiDmDumpMpst (
  
          /* Extract the sub-subtable counts */
  
@@ -406,7 +406,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
          Offset += sizeof (ACPI_MPST_POWER_NODE);
  
          /* Sub-subtables - Memory Power State Structure(s) */
-@@ -856,7 +885,7 @@ AcpiDmDumpMpst (
+@@ -871,7 +900,7 @@ AcpiDmDumpMpst (
          while (PowerStateCount)
          {
              AcpiOsPrintf ("\n");
@@ -415,7 +415,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
                  sizeof (ACPI_MPST_POWER_STATE), AcpiDmTableInfoMpst0A);
              if (ACPI_FAILURE (Status))
              {
-@@ -866,7 +895,7 @@ AcpiDmDumpMpst (
+@@ -881,7 +910,7 @@ AcpiDmDumpMpst (
              Subtable0A++;
              PowerStateCount--;
              Offset += sizeof (ACPI_MPST_POWER_STATE);
@@ -424,7 +424,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
  
          /* Sub-subtables - Physical Component ID Structure(s) */
  
-@@ -879,7 +908,7 @@ AcpiDmDumpMpst (
+@@ -894,7 +923,7 @@ AcpiDmDumpMpst (
  
          while (ComponentCount)
          {
@@ -433,7 +433,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
                  sizeof (ACPI_MPST_COMPONENT), AcpiDmTableInfoMpst0B);
              if (ACPI_FAILURE (Status))
              {
-@@ -894,17 +923,19 @@ AcpiDmDumpMpst (
+@@ -909,17 +938,19 @@ AcpiDmDumpMpst (
          /* Point to next Memory Power Node subtable */
  
          SubtableCount--;
@@ -456,7 +456,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
          sizeof (ACPI_MPST_DATA_HDR), AcpiDmTableInfoMpst1);
      if (ACPI_FAILURE (Status))
      {
-@@ -919,10 +950,10 @@ AcpiDmDumpMpst (
+@@ -934,10 +965,10 @@ AcpiDmDumpMpst (
      Subtable2 = ACPI_ADD_PTR (ACPI_MPST_POWER_DATA, Subtable1,
          sizeof (ACPI_MPST_DATA_HDR));
  
@@ -469,7 +469,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
              sizeof (ACPI_MPST_POWER_DATA), AcpiDmTableInfoMpst2);
          if (ACPI_FAILURE (Status))
          {
-@@ -955,11 +986,13 @@ AcpiDmDumpMsct (
+@@ -970,11 +1001,13 @@ AcpiDmDumpMsct (
      ACPI_STATUS             Status;
      UINT32                  Offset = sizeof (ACPI_TABLE_MSCT);
      ACPI_MSCT_PROXIMITY     *Subtable;
@@ -484,7 +484,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
      if (ACPI_FAILURE (Status))
      {
          return;
-@@ -968,12 +1001,12 @@ AcpiDmDumpMsct (
+@@ -983,12 +1016,12 @@ AcpiDmDumpMsct (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_MSCT_PROXIMITY, Table, Offset);
@@ -499,7 +499,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
              sizeof (ACPI_MSCT_PROXIMITY), AcpiDmTableInfoMsct0);
          if (ACPI_FAILURE (Status))
          {
-@@ -1008,11 +1041,13 @@ AcpiDmDumpMtmr (
+@@ -1023,11 +1056,13 @@ AcpiDmDumpMtmr (
      ACPI_STATUS             Status;
      UINT32                  Offset = sizeof (ACPI_TABLE_MTMR);
      ACPI_MTMR_ENTRY         *Subtable;
@@ -514,7 +514,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
      if (ACPI_FAILURE (Status))
      {
          return;
-@@ -1021,12 +1056,12 @@ AcpiDmDumpMtmr (
+@@ -1036,12 +1071,12 @@ AcpiDmDumpMtmr (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_MTMR_ENTRY, Table, Offset);
@@ -529,7 +529,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
              sizeof (ACPI_MTMR_ENTRY), AcpiDmTableInfoMtmr0);
          if (ACPI_FAILURE (Status))
          {
-@@ -1068,11 +1103,17 @@ AcpiDmDumpNfit (
+@@ -1083,11 +1118,17 @@ AcpiDmDumpNfit (
      ACPI_NFIT_SMBIOS        *SmbiosInfo = NULL;
      ACPI_NFIT_FLUSH_ADDRESS *Hint = NULL;
      UINT32                  i;
@@ -548,7 +548,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
      if (ACPI_FAILURE (Status))
      {
          return;
-@@ -1081,19 +1122,21 @@ AcpiDmDumpNfit (
+@@ -1096,19 +1137,21 @@ AcpiDmDumpNfit (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_NFIT_HEADER, Table, Offset);
@@ -574,7 +574,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
          {
          case ACPI_NFIT_TYPE_SYSTEM_ADDRESS:
  
-@@ -1148,7 +1191,7 @@ AcpiDmDumpNfit (
+@@ -1163,7 +1206,7 @@ AcpiDmDumpNfit (
  
              /* Attempt to continue */
  
@@ -583,7 +583,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
              {
                  AcpiOsPrintf ("Invalid zero length subtable\n");
                  return;
-@@ -1157,8 +1200,8 @@ AcpiDmDumpNfit (
+@@ -1172,8 +1215,8 @@ AcpiDmDumpNfit (
          }
  
          AcpiOsPrintf ("\n");
@@ -594,7 +594,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
          if (ACPI_FAILURE (Status))
          {
              return;
-@@ -1166,14 +1209,15 @@ AcpiDmDumpNfit (
+@@ -1181,14 +1224,15 @@ AcpiDmDumpNfit (
  
          /* Per-subtable variable-length fields */
  
@@ -613,7 +613,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
                      &Interleave->LineOffset[i],
                      sizeof (UINT32), AcpiDmTableInfoNfit2a);
                  if (ACPI_FAILURE (Status))
-@@ -1187,12 +1231,11 @@ AcpiDmDumpNfit (
+@@ -1202,12 +1246,11 @@ AcpiDmDumpNfit (
  
          case ACPI_NFIT_TYPE_SMBIOS:
  
@@ -628,7 +628,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
                      sizeof (ACPI_NFIT_SMBIOS) - sizeof (UINT8),
                      SmbiosInfo,
                      Length, AcpiDmTableInfoNfit3a);
-@@ -1207,9 +1250,10 @@ AcpiDmDumpNfit (
+@@ -1222,9 +1265,10 @@ AcpiDmDumpNfit (
          case ACPI_NFIT_TYPE_FLUSH_ADDRESS:
  
              Hint = ACPI_CAST_PTR (ACPI_NFIT_FLUSH_ADDRESS, Subtable);
@@ -641,7 +641,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
                      &Hint->HintAddress[i],
                      sizeof (UINT64), AcpiDmTableInfoNfit6a);
                  if (ACPI_FAILURE (Status))
-@@ -1228,8 +1272,8 @@ AcpiDmDumpNfit (
+@@ -1243,8 +1287,8 @@ AcpiDmDumpNfit (
  NextSubtable:
          /* Point to next subtable */
  
@@ -652,7 +652,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
      }
  }
  
-@@ -1254,12 +1298,13 @@ AcpiDmDumpPcct (
+@@ -1269,12 +1313,13 @@ AcpiDmDumpPcct (
      ACPI_STATUS             Status;
      ACPI_PCCT_SUBSPACE      *Subtable;
      ACPI_DMTABLE_INFO       *InfoTable;
@@ -667,7 +667,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
      Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoPcct);
      if (ACPI_FAILURE (Status))
      {
-@@ -1269,7 +1314,7 @@ AcpiDmDumpPcct (
+@@ -1284,7 +1329,7 @@ AcpiDmDumpPcct (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_PCCT_SUBSPACE, Table, Offset);
@@ -676,7 +676,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
      {
          /* Common subtable header */
  
-@@ -1409,16 +1454,21 @@ AcpiDmDumpPmtt (
+@@ -1424,16 +1469,21 @@ AcpiDmDumpPmtt (
      ACPI_PMTT_HEADER        *MemSubtable;
      ACPI_PMTT_HEADER        *DimmSubtable;
      ACPI_PMTT_DOMAIN        *DomainArray;
@@ -700,7 +700,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
      Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoPmtt);
      if (ACPI_FAILURE (Status))
      {
-@@ -1428,13 +1478,14 @@ AcpiDmDumpPmtt (
+@@ -1443,13 +1493,14 @@ AcpiDmDumpPmtt (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, Table, Offset);
@@ -717,7 +717,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
          if (ACPI_FAILURE (Status))
          {
              return;
-@@ -1453,7 +1504,7 @@ AcpiDmDumpPmtt (
+@@ -1468,7 +1519,7 @@ AcpiDmDumpPmtt (
          /* Dump the fixed-length portion of the subtable */
  
          Status = AcpiDmDumpTable (Length, Offset, Subtable,
@@ -726,7 +726,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
          if (ACPI_FAILURE (Status))
          {
              return;
-@@ -1465,15 +1516,16 @@ AcpiDmDumpPmtt (
+@@ -1480,15 +1531,16 @@ AcpiDmDumpPmtt (
          MemSubtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, Subtable,
              sizeof (ACPI_PMTT_SOCKET));
  
@@ -746,7 +746,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
              if (ACPI_FAILURE (Status))
              {
                  return;
-@@ -1493,7 +1545,7 @@ AcpiDmDumpPmtt (
+@@ -1508,7 +1560,7 @@ AcpiDmDumpPmtt (
  
              Status = AcpiDmDumpTable (Length,
                  Offset + MemOffset, MemSubtable,
@@ -755,7 +755,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
              if (ACPI_FAILURE (Status))
              {
                  return;
-@@ -1501,13 +1553,14 @@ AcpiDmDumpPmtt (
+@@ -1516,13 +1568,14 @@ AcpiDmDumpPmtt (
  
              /* Walk the variable count of proximity domains */
  
@@ -773,7 +773,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
                  DomainCount)
              {
                  Status = AcpiDmDumpTable (Length,
-@@ -1535,15 +1588,16 @@ AcpiDmDumpPmtt (
+@@ -1550,15 +1603,16 @@ AcpiDmDumpPmtt (
              DimmSubtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, MemSubtable,
                  DomainOffset);
  
@@ -793,7 +793,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
                  if (ACPI_FAILURE (Status))
                  {
                      return;
-@@ -1563,7 +1617,7 @@ AcpiDmDumpPmtt (
+@@ -1578,7 +1632,7 @@ AcpiDmDumpPmtt (
  
                  Status = AcpiDmDumpTable (Length,
                      Offset + MemOffset + DimmOffset, DimmSubtable,
@@ -802,7 +802,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
                  if (ACPI_FAILURE (Status))
                  {
                      return;
-@@ -1571,23 +1625,22 @@ AcpiDmDumpPmtt (
+@@ -1586,23 +1640,22 @@ AcpiDmDumpPmtt (
  
                  /* Point to next DIMM subtable */
  
@@ -832,7 +832,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
      }
  }
  
-@@ -1748,6 +1801,8 @@ AcpiDmDumpS3pt (
+@@ -1763,6 +1816,8 @@ AcpiDmDumpS3pt (
      ACPI_FPDT_HEADER        *Subtable;
      ACPI_DMTABLE_INFO       *InfoTable;
      ACPI_TABLE_S3PT         *S3ptTable = ACPI_CAST_PTR (ACPI_TABLE_S3PT, Tables);
@@ -841,7 +841,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
  
  
      /* Main table */
-@@ -1758,20 +1813,22 @@ AcpiDmDumpS3pt (
+@@ -1773,20 +1828,22 @@ AcpiDmDumpS3pt (
          return 0;
      }
  
@@ -867,7 +867,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
          {
          case ACPI_S3PT_TYPE_RESUME:
  
-@@ -1786,7 +1843,7 @@ AcpiDmDumpS3pt (
+@@ -1801,7 +1858,7 @@ AcpiDmDumpS3pt (
          default:
  
              AcpiOsPrintf ("\n**** Unknown S3PT subtable type 0x%X\n",
@@ -876,7 +876,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
  
              /* Attempt to continue */
  
-@@ -1799,7 +1856,7 @@ AcpiDmDumpS3pt (
+@@ -1814,7 +1871,7 @@ AcpiDmDumpS3pt (
          }
  
          AcpiOsPrintf ("\n");
diff --git a/big-endian-v3.patch b/big-endian-v3.patch
index e787789..e3db4f6 100644
--- a/big-endian-v3.patch
+++ b/big-endian-v3.patch
@@ -20,7 +20,7 @@ diff -Naur acpica-unix2-20200214.orig/source/components/namespace/nsutils.c acpi
 diff -Naur acpica-unix2-20200214.orig/source/common/dmtbdump2.c acpica-unix2-20200214/source/common/dmtbdump2.c
 --- acpica-unix2-20200214.orig/source/common/dmtbdump2.c	2020-02-26 11:44:13.732967820 -0700
 +++ acpica-unix2-20200214/source/common/dmtbdump2.c	2020-02-26 12:38:44.286849954 -0700
-@@ -1670,6 +1670,8 @@
+@@ -1685,6 +1685,8 @@
      UINT32                  Offset = sizeof (ACPI_TABLE_FPDT);
      ACPI_DMTABLE_INFO       *InfoTable;
      UINT32                  i;
@@ -29,7 +29,7 @@ diff -Naur acpica-unix2-20200214.orig/source/common/dmtbdump2.c acpica-unix2-202
  
  
      /* There is no main table (other than the standard ACPI header) */
-@@ -1677,7 +1679,8 @@
+@@ -1692,7 +1694,8 @@
      /* Subtables */
  
      Offset = sizeof (ACPI_TABLE_HEADER);
@@ -39,7 +39,7 @@ diff -Naur acpica-unix2-20200214.orig/source/common/dmtbdump2.c acpica-unix2-202
      {
          AcpiOsPrintf ("\n");
  
-@@ -1689,7 +1692,7 @@
+@@ -1704,7 +1707,7 @@
              AcpiOsPrintf ("Invalid subtable length\n");
              return;
          }
@@ -48,7 +48,7 @@ diff -Naur acpica-unix2-20200214.orig/source/common/dmtbdump2.c acpica-unix2-202
              Subtable->Length, AcpiDmTableInfoPpttHdr);
          if (ACPI_FAILURE (Status))
          {
-@@ -1731,7 +1734,7 @@
+@@ -1746,7 +1749,7 @@
              AcpiOsPrintf ("Invalid subtable length\n");
              return;
          }
@@ -57,7 +57,7 @@ diff -Naur acpica-unix2-20200214.orig/source/common/dmtbdump2.c acpica-unix2-202
              Subtable->Length, InfoTable);
          if (ACPI_FAILURE (Status))
          {
-@@ -1747,15 +1750,16 @@
+@@ -1762,15 +1765,16 @@
  
              /* Dump SMBIOS handles */
  
diff --git a/dup-symbol.patch b/dup-symbol.patch
deleted file mode 100644
index fd0d56b..0000000
--- a/dup-symbol.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur acpica-unix2-20191213.orig/source/tools/acpiexec/aemain.c acpica-unix2-20191213/source/tools/acpiexec/aemain.c
---- acpica-unix2-20191213.orig/source/tools/acpiexec/aemain.c	2020-02-23 16:32:25.935853162 -0700
-+++ acpica-unix2-20191213/source/tools/acpiexec/aemain.c	2020-02-23 16:44:38.949901103 -0700
-@@ -84,7 +84,6 @@
- UINT8                       AcpiGbl_RegionFillValue = 0;
- BOOLEAN                     AcpiGbl_IgnoreErrors = FALSE;
- BOOLEAN                     AcpiGbl_AbortLoopOnTimeout = FALSE;
--BOOLEAN                     AcpiGbl_DbOpt_NoRegionSupport = FALSE;
- UINT8                       AcpiGbl_UseHwReducedFadt = FALSE;
- BOOLEAN                     AcpiGbl_DoInterfaceTests = FALSE;
- BOOLEAN                     AcpiGbl_LoadTestTables = FALSE;
-@@ -549,6 +548,10 @@
-         goto NormalExit;
-     }
- 
-+    /* Initialize globals modified by command line options */
-+
-+    AcpiGbl_DbOpt_NoRegionSupport = FALSE;
-+
-     /* Get the command line options */
- 
-     ExitCode = AeDoOptions (argc, argv);
diff --git a/no-common.patch b/no-common.patch
deleted file mode 100644
index 975c067..0000000
--- a/no-common.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur acpica-unix2-20191213.orig/source/compiler/dtcompiler.h acpica-unix2-20191213/source/compiler/dtcompiler.h
---- acpica-unix2-20191213.orig/source/compiler/dtcompiler.h	2020-02-23 18:05:24.257395129 -0700
-+++ acpica-unix2-20191213/source/compiler/dtcompiler.h	2020-02-23 18:06:42.956236378 -0700
-@@ -351,7 +351,7 @@
- 
- /* dtparser - lex/yacc files */
- 
--UINT64                      DtCompilerParserResult; /* Expression return value */
-+extern UINT64                      DtCompilerParserResult; /* Expression return value */
- int
- DtCompilerParserparse (
-     void);
-diff -Naur acpica-unix2-20191213.orig/source/compiler/aslcompiler.l acpica-unix2-20191213/source/compiler/aslcompiler.l
---- acpica-unix2-20191213.orig/source/compiler/aslcompiler.l	2019-12-13 08:58:18.000000000 -0700
-+++ acpica-unix2-20191213/source/compiler/aslcompiler.l	2020-02-24 15:08:53.067560139 -0700
-@@ -48,7 +48,7 @@
- 
- #include <stdlib.h>
- #include <string.h>
--YYSTYPE AslCompilerlval;
-+#define YYSTYPE AslCompilerlval;
- 
- /*
-  * Generation:  Use the following command line:
-diff -Naur acpica-unix2-20191213.orig/source/compiler/prparser.l acpica-unix2-20191213/source/compiler/prparser.l
---- acpica-unix2-20191213.orig/source/compiler/prparser.l	2019-12-13 08:58:19.000000000 -0700
-+++ acpica-unix2-20191213/source/compiler/prparser.l	2020-02-24 15:09:25.909839732 -0700
-@@ -116,7 +116,7 @@
- /*
-  * Local support functions
-  */
--YY_BUFFER_STATE         LexBuffer;
-+static YY_BUFFER_STATE         LexBuffer;
- 
- 
- /******************************************************************************
diff --git a/pcc.patch b/pcc.patch
deleted file mode 100644
index 1ed0bd1..0000000
--- a/pcc.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur acpica-unix2-20200214.orig/source/compiler/aslcompiler.l acpica-unix2-20200214/source/compiler/aslcompiler.l
---- acpica-unix2-20200214.orig/source/compiler/aslcompiler.l	2020-02-25 17:24:22.169290551 -0700
-+++ acpica-unix2-20200214/source/compiler/aslcompiler.l	2020-02-25 17:26:01.807138585 -0700
-@@ -584,7 +584,7 @@
- "IPMI"                      { count (0); return (PARSEOP_REGIONSPACE_IPMI); }
- "GeneralPurposeIo"          { count (0); return (PARSEOP_REGIONSPACE_GPIO); }       /* ACPI 5.0 */
- "GenericSerialBus"          { count (0); return (PARSEOP_REGIONSPACE_GSBUS); }      /* ACPI 5.0 */
--"PlatformCommChannel"       { count (0); return (PARSEOP_REGIONSPACE_PCC); }        /* ACPI 5.0 */
-+"PCC"                       { count (0); return (PARSEOP_REGIONSPACE_PCC); }        /* ACPI 5.0 */
- "FFixedHW"                  { count (0); return (PARSEOP_REGIONSPACE_FFIXEDHW); }
- 
-     /* ResourceTypeKeyword: Resource Usage - Resource Descriptors */
-diff -Naur acpica-unix2-20200214.orig/source/components/utilities/utdecode.c acpica-unix2-20200214/source/components/utilities/utdecode.c
---- acpica-unix2-20200214.orig/source/components/utilities/utdecode.c	2020-02-14 10:33:55.000000000 -0700
-+++ acpica-unix2-20200214/source/components/utilities/utdecode.c	2020-02-25 17:26:28.524365981 -0700
-@@ -116,7 +116,7 @@
-     "IPMI",              /* 0x07 */
-     "GeneralPurposeIo",  /* 0x08 */
-     "GenericSerialBus",  /* 0x09 */
--    "PlatformCommChannel"/* 0x0A */
-+    "PCC"                /* 0x0A */
- };
- 
- 
diff --git a/sources b/sources
index 3ad2f69..ef5e62e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (acpica-unix2-20200214.tar.gz) = 0b22f8c8255b030b5e8a2cf5b459344d1f644b26a4fcf1e95b3682335204598a3587f8f2a5ac169f99d76a10ae529051e1dabd1672c8d8bf5a4441c71d4cb1fd
-SHA512 (acpitests-unix-20200214.tar.gz) = b4d37d4784d3fbb697f244477c085e433efa152bc4c4a06d336b216358405252a77c331f4e792f5fa9b912d6f5f200aa1b6379f1b5064e58be12cf8d4415ee15
+SHA512 (acpica-unix2-20200326.tar.gz) = 5028fae5c976593b15cf429e62de30afef3af11ddac9351d9ec0de789d495b553d459e676bc4d3e862edc0c536487a7ee63a137d95c5d1783e6a17ab9114c202
+SHA512 (acpitests-unix-20200326.tar.gz) = 332b4ed016cee48662a5f4572e6d170461f02ee1386109a3970fbe8d104f2a2b14c19235ea43ae9b26e8faf9ef9597cb3d2148e498741361aca62978d0b62189

From b549117a4bdcaee59775d57f9e3aa07c0bef119a Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Wed, 1 Apr 2020 14:07:44 -0600
Subject: [PATCH 20/82] Update to 20209326 sources, with refreshed patches

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 .gitignore                 |   2 +
 acpica-tools.spec          |  12 ++---
 big-endian-dmtbdump2.patch | 104 ++++++++++++++++++-------------------
 big-endian-v3.patch        |  10 ++--
 dup-symbol.patch           |  22 --------
 no-common.patch            |  36 -------------
 pcc.patch                  |  24 ---------
 sources                    |   4 +-
 8 files changed, 66 insertions(+), 148 deletions(-)
 delete mode 100644 dup-symbol.patch
 delete mode 100644 no-common.patch
 delete mode 100644 pcc.patch

diff --git a/.gitignore b/.gitignore
index c9f2b27..44d655f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -127,3 +127,5 @@ series
 /acpitests-unix-20200110.tar.gz
 /acpica-unix2-20200214.tar.gz
 /acpitests-unix-20200214.tar.gz
+/acpica-unix2-20200326.tar.gz
+/acpitests-unix-20200326.tar.gz
diff --git a/acpica-tools.spec b/acpica-tools.spec
index 02c365a..7d9848a 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -1,5 +1,5 @@
 Name:           acpica-tools
-Version:        20200214
+Version:        20200326
 Release:        1%{?dist}
 Summary:        ACPICA tools for the development and debug of ACPI tables
 
@@ -46,11 +46,8 @@ Patch18:        str-trunc-warn.patch
 Patch19:	ptr-cast.patch
 Patch20:	aslcodegen.patch
 Patch21:	facp.patch
-Patch22:	dup-symbol.patch
-Patch23:	no-common.patch
 Patch24:	armv7-str-fixes.patch
 Patch25:	dbtest.patch
-Patch26:	pcc.patch
 Patch27:	big-endian-v3.patch
 
 BuildRequires:  bison patchutils flex gcc
@@ -125,11 +122,8 @@ gzip -dc %{SOURCE1} | tar -x --strip-components=1 -f -
 %patch19 -p1 -b .ptr-cast
 %patch20 -p1 -b .aslcodegen
 %patch21 -p1 -b .facp
-%patch22 -p1 -b .dup-symbol
-%patch23 -p1 -b .no-common
 %patch24 -p1 -b .armv7-str-fixes
 %patch25 -p1 -b .dbtest
-%patch26 -p1 -b .pcc
 %patch27 -p1 -b .big-endian-v3
 
 cp -p %{SOURCE2} README.Fedora
@@ -247,6 +241,10 @@ fi
 
 
 %changelog
+* Wed Apr 1 2020 Al Stone <ahs3@redhat.com> - 20200326-1
+- Update to 20200326 source tree, including patch refreshes
+- Removed a couple of patches that got included upstream
+
 * Wed Feb 26 2020 Al Stone <ahs3@redhat.com> - 20200214-1
 - Update to 20200214 source tree, including patch refreshes
 - Add patch to fix up issues where strings and 4-byte quantities
diff --git a/big-endian-dmtbdump2.patch b/big-endian-dmtbdump2.patch
index 381da29..0ba1a44 100644
--- a/big-endian-dmtbdump2.patch
+++ b/big-endian-dmtbdump2.patch
@@ -1,7 +1,7 @@
-Index: acpica-unix-20191018/source/common/dmtbdump2.c
+Index: acpica-unix-20209326/source/common/dmtbdump2.c
 ===================================================================
---- acpica-unix-20191018.orig/source/common/dmtbdump2.c
-+++ acpica-unix-20191018/source/common/dmtbdump2.c
+--- acpica-unix-20209326.orig/source/common/dmtbdump2.c
++++ acpica-unix-20209326/source/common/dmtbdump2.c
 @@ -75,16 +75,23 @@ AcpiDmDumpIort (
      ACPI_IORT_SMMU          *IortSmmu = NULL;
      UINT32                  Offset;
@@ -223,7 +223,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
          if (ACPI_FAILURE (Status))
          {
              return;
-@@ -386,7 +407,7 @@ AcpiDmDumpIvrs (
+@@ -391,7 +412,7 @@ AcpiDmDumpIvrs (
  
              /* Attempt to continue */
  
@@ -232,7 +232,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
              {
                  AcpiOsPrintf ("Invalid zero length subtable\n");
                  return;
-@@ -397,8 +418,8 @@ AcpiDmDumpIvrs (
+@@ -402,8 +423,8 @@ AcpiDmDumpIvrs (
          /* Dump the subtable */
  
          AcpiOsPrintf ("\n");
@@ -243,16 +243,16 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
          if (ACPI_FAILURE (Status))
          {
              return;
-@@ -412,7 +433,7 @@ AcpiDmDumpIvrs (
-             DeviceEntry = ACPI_ADD_PTR (ACPI_IVRS_DE_HEADER, Subtable,
-                 sizeof (ACPI_IVRS_HARDWARE));
+@@ -427,7 +448,7 @@ AcpiDmDumpIvrs (
+                     sizeof (ACPI_IVRS_HARDWARE2));
+             }
  
 -            while (EntryOffset < (Offset + Subtable->Length))
 +            while (EntryOffset < (Offset + SubLength))
              {
                  AcpiOsPrintf ("\n");
                  /*
-@@ -474,7 +495,7 @@ AcpiDmDumpIvrs (
+@@ -489,7 +510,7 @@ AcpiDmDumpIvrs (
  
                  /* Dump the Device Entry */
  
@@ -261,7 +261,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
                      DeviceEntry, EntryLength, InfoTable);
                  if (ACPI_FAILURE (Status))
                  {
-@@ -490,8 +511,8 @@ AcpiDmDumpIvrs (
+@@ -505,8 +526,8 @@ AcpiDmDumpIvrs (
  NextSubtable:
          /* Point to next subtable */
  
@@ -272,7 +272,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
      }
  }
  
-@@ -517,7 +538,7 @@ AcpiDmDumpLpit (
+@@ -532,7 +553,7 @@ AcpiDmDumpLpit (
  {
      ACPI_STATUS             Status;
      ACPI_LPIT_HEADER        *Subtable;
@@ -281,7 +281,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
      UINT32                  Offset = sizeof (ACPI_TABLE_LPIT);
      ACPI_DMTABLE_INFO       *InfoTable;
      UINT32                  SubtableLength;
-@@ -525,8 +546,9 @@ AcpiDmDumpLpit (
+@@ -540,8 +561,9 @@ AcpiDmDumpLpit (
  
      /* Subtables */
  
@@ -292,7 +292,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
      {
          /* Common subtable header */
  
-@@ -590,13 +612,14 @@ AcpiDmDumpMadt (
+@@ -605,13 +627,14 @@ AcpiDmDumpMadt (
  {
      ACPI_STATUS             Status;
      ACPI_SUBTABLE_HEADER    *Subtable;
@@ -308,7 +308,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
      Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoMadt);
      if (ACPI_FAILURE (Status))
      {
-@@ -606,7 +629,7 @@ AcpiDmDumpMadt (
+@@ -621,7 +644,7 @@ AcpiDmDumpMadt (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Table, Offset);
@@ -317,7 +317,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
      {
          /* Common subtable header */
  
-@@ -752,11 +775,13 @@ AcpiDmDumpMcfg (
+@@ -767,11 +790,13 @@ AcpiDmDumpMcfg (
      ACPI_STATUS             Status;
      UINT32                  Offset = sizeof (ACPI_TABLE_MCFG);
      ACPI_MCFG_ALLOCATION    *Subtable;
@@ -332,7 +332,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
      if (ACPI_FAILURE (Status))
      {
          return;
-@@ -765,17 +790,17 @@ AcpiDmDumpMcfg (
+@@ -780,17 +805,17 @@ AcpiDmDumpMcfg (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_MCFG_ALLOCATION, Table, Offset);
@@ -354,7 +354,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
              sizeof (ACPI_MCFG_ALLOCATION), AcpiDmTableInfoMcfg0);
          if (ACPI_FAILURE (Status))
          {
-@@ -809,6 +834,7 @@ AcpiDmDumpMpst (
+@@ -824,6 +849,7 @@ AcpiDmDumpMpst (
  {
      ACPI_STATUS             Status;
      UINT32                  Offset = sizeof (ACPI_TABLE_MPST);
@@ -362,7 +362,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
      ACPI_MPST_POWER_NODE    *Subtable0;
      ACPI_MPST_POWER_STATE   *Subtable0A;
      ACPI_MPST_COMPONENT     *Subtable0B;
-@@ -817,11 +843,13 @@ AcpiDmDumpMpst (
+@@ -832,11 +858,13 @@ AcpiDmDumpMpst (
      UINT16                  SubtableCount;
      UINT32                  PowerStateCount;
      UINT32                  ComponentCount;
@@ -377,7 +377,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
      if (ACPI_FAILURE (Status))
      {
          return;
-@@ -829,13 +857,14 @@ AcpiDmDumpMpst (
+@@ -844,13 +872,14 @@ AcpiDmDumpMpst (
  
      /* Subtable: Memory Power Node(s) */
  
@@ -395,7 +395,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
              sizeof (ACPI_MPST_POWER_NODE), AcpiDmTableInfoMpst0);
          if (ACPI_FAILURE (Status))
          {
-@@ -844,8 +873,8 @@ AcpiDmDumpMpst (
+@@ -859,8 +888,8 @@ AcpiDmDumpMpst (
  
          /* Extract the sub-subtable counts */
  
@@ -406,7 +406,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
          Offset += sizeof (ACPI_MPST_POWER_NODE);
  
          /* Sub-subtables - Memory Power State Structure(s) */
-@@ -856,7 +885,7 @@ AcpiDmDumpMpst (
+@@ -871,7 +900,7 @@ AcpiDmDumpMpst (
          while (PowerStateCount)
          {
              AcpiOsPrintf ("\n");
@@ -415,7 +415,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
                  sizeof (ACPI_MPST_POWER_STATE), AcpiDmTableInfoMpst0A);
              if (ACPI_FAILURE (Status))
              {
-@@ -866,7 +895,7 @@ AcpiDmDumpMpst (
+@@ -881,7 +910,7 @@ AcpiDmDumpMpst (
              Subtable0A++;
              PowerStateCount--;
              Offset += sizeof (ACPI_MPST_POWER_STATE);
@@ -424,7 +424,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
  
          /* Sub-subtables - Physical Component ID Structure(s) */
  
-@@ -879,7 +908,7 @@ AcpiDmDumpMpst (
+@@ -894,7 +923,7 @@ AcpiDmDumpMpst (
  
          while (ComponentCount)
          {
@@ -433,7 +433,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
                  sizeof (ACPI_MPST_COMPONENT), AcpiDmTableInfoMpst0B);
              if (ACPI_FAILURE (Status))
              {
-@@ -894,17 +923,19 @@ AcpiDmDumpMpst (
+@@ -909,17 +938,19 @@ AcpiDmDumpMpst (
          /* Point to next Memory Power Node subtable */
  
          SubtableCount--;
@@ -456,7 +456,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
          sizeof (ACPI_MPST_DATA_HDR), AcpiDmTableInfoMpst1);
      if (ACPI_FAILURE (Status))
      {
-@@ -919,10 +950,10 @@ AcpiDmDumpMpst (
+@@ -934,10 +965,10 @@ AcpiDmDumpMpst (
      Subtable2 = ACPI_ADD_PTR (ACPI_MPST_POWER_DATA, Subtable1,
          sizeof (ACPI_MPST_DATA_HDR));
  
@@ -469,7 +469,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
              sizeof (ACPI_MPST_POWER_DATA), AcpiDmTableInfoMpst2);
          if (ACPI_FAILURE (Status))
          {
-@@ -955,11 +986,13 @@ AcpiDmDumpMsct (
+@@ -970,11 +1001,13 @@ AcpiDmDumpMsct (
      ACPI_STATUS             Status;
      UINT32                  Offset = sizeof (ACPI_TABLE_MSCT);
      ACPI_MSCT_PROXIMITY     *Subtable;
@@ -484,7 +484,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
      if (ACPI_FAILURE (Status))
      {
          return;
-@@ -968,12 +1001,12 @@ AcpiDmDumpMsct (
+@@ -983,12 +1016,12 @@ AcpiDmDumpMsct (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_MSCT_PROXIMITY, Table, Offset);
@@ -499,7 +499,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
              sizeof (ACPI_MSCT_PROXIMITY), AcpiDmTableInfoMsct0);
          if (ACPI_FAILURE (Status))
          {
-@@ -1008,11 +1041,13 @@ AcpiDmDumpMtmr (
+@@ -1023,11 +1056,13 @@ AcpiDmDumpMtmr (
      ACPI_STATUS             Status;
      UINT32                  Offset = sizeof (ACPI_TABLE_MTMR);
      ACPI_MTMR_ENTRY         *Subtable;
@@ -514,7 +514,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
      if (ACPI_FAILURE (Status))
      {
          return;
-@@ -1021,12 +1056,12 @@ AcpiDmDumpMtmr (
+@@ -1036,12 +1071,12 @@ AcpiDmDumpMtmr (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_MTMR_ENTRY, Table, Offset);
@@ -529,7 +529,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
              sizeof (ACPI_MTMR_ENTRY), AcpiDmTableInfoMtmr0);
          if (ACPI_FAILURE (Status))
          {
-@@ -1068,11 +1103,17 @@ AcpiDmDumpNfit (
+@@ -1083,11 +1118,17 @@ AcpiDmDumpNfit (
      ACPI_NFIT_SMBIOS        *SmbiosInfo = NULL;
      ACPI_NFIT_FLUSH_ADDRESS *Hint = NULL;
      UINT32                  i;
@@ -548,7 +548,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
      if (ACPI_FAILURE (Status))
      {
          return;
-@@ -1081,19 +1122,21 @@ AcpiDmDumpNfit (
+@@ -1096,19 +1137,21 @@ AcpiDmDumpNfit (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_NFIT_HEADER, Table, Offset);
@@ -574,7 +574,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
          {
          case ACPI_NFIT_TYPE_SYSTEM_ADDRESS:
  
-@@ -1148,7 +1191,7 @@ AcpiDmDumpNfit (
+@@ -1163,7 +1206,7 @@ AcpiDmDumpNfit (
  
              /* Attempt to continue */
  
@@ -583,7 +583,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
              {
                  AcpiOsPrintf ("Invalid zero length subtable\n");
                  return;
-@@ -1157,8 +1200,8 @@ AcpiDmDumpNfit (
+@@ -1172,8 +1215,8 @@ AcpiDmDumpNfit (
          }
  
          AcpiOsPrintf ("\n");
@@ -594,7 +594,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
          if (ACPI_FAILURE (Status))
          {
              return;
-@@ -1166,14 +1209,15 @@ AcpiDmDumpNfit (
+@@ -1181,14 +1224,15 @@ AcpiDmDumpNfit (
  
          /* Per-subtable variable-length fields */
  
@@ -613,7 +613,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
                      &Interleave->LineOffset[i],
                      sizeof (UINT32), AcpiDmTableInfoNfit2a);
                  if (ACPI_FAILURE (Status))
-@@ -1187,12 +1231,11 @@ AcpiDmDumpNfit (
+@@ -1202,12 +1246,11 @@ AcpiDmDumpNfit (
  
          case ACPI_NFIT_TYPE_SMBIOS:
  
@@ -628,7 +628,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
                      sizeof (ACPI_NFIT_SMBIOS) - sizeof (UINT8),
                      SmbiosInfo,
                      Length, AcpiDmTableInfoNfit3a);
-@@ -1207,9 +1250,10 @@ AcpiDmDumpNfit (
+@@ -1222,9 +1265,10 @@ AcpiDmDumpNfit (
          case ACPI_NFIT_TYPE_FLUSH_ADDRESS:
  
              Hint = ACPI_CAST_PTR (ACPI_NFIT_FLUSH_ADDRESS, Subtable);
@@ -641,7 +641,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
                      &Hint->HintAddress[i],
                      sizeof (UINT64), AcpiDmTableInfoNfit6a);
                  if (ACPI_FAILURE (Status))
-@@ -1228,8 +1272,8 @@ AcpiDmDumpNfit (
+@@ -1243,8 +1287,8 @@ AcpiDmDumpNfit (
  NextSubtable:
          /* Point to next subtable */
  
@@ -652,7 +652,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
      }
  }
  
-@@ -1254,12 +1298,13 @@ AcpiDmDumpPcct (
+@@ -1269,12 +1313,13 @@ AcpiDmDumpPcct (
      ACPI_STATUS             Status;
      ACPI_PCCT_SUBSPACE      *Subtable;
      ACPI_DMTABLE_INFO       *InfoTable;
@@ -667,7 +667,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
      Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoPcct);
      if (ACPI_FAILURE (Status))
      {
-@@ -1269,7 +1314,7 @@ AcpiDmDumpPcct (
+@@ -1284,7 +1329,7 @@ AcpiDmDumpPcct (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_PCCT_SUBSPACE, Table, Offset);
@@ -676,7 +676,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
      {
          /* Common subtable header */
  
-@@ -1409,16 +1454,21 @@ AcpiDmDumpPmtt (
+@@ -1424,16 +1469,21 @@ AcpiDmDumpPmtt (
      ACPI_PMTT_HEADER        *MemSubtable;
      ACPI_PMTT_HEADER        *DimmSubtable;
      ACPI_PMTT_DOMAIN        *DomainArray;
@@ -700,7 +700,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
      Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoPmtt);
      if (ACPI_FAILURE (Status))
      {
-@@ -1428,13 +1478,14 @@ AcpiDmDumpPmtt (
+@@ -1443,13 +1493,14 @@ AcpiDmDumpPmtt (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, Table, Offset);
@@ -717,7 +717,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
          if (ACPI_FAILURE (Status))
          {
              return;
-@@ -1453,7 +1504,7 @@ AcpiDmDumpPmtt (
+@@ -1468,7 +1519,7 @@ AcpiDmDumpPmtt (
          /* Dump the fixed-length portion of the subtable */
  
          Status = AcpiDmDumpTable (Length, Offset, Subtable,
@@ -726,7 +726,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
          if (ACPI_FAILURE (Status))
          {
              return;
-@@ -1465,15 +1516,16 @@ AcpiDmDumpPmtt (
+@@ -1480,15 +1531,16 @@ AcpiDmDumpPmtt (
          MemSubtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, Subtable,
              sizeof (ACPI_PMTT_SOCKET));
  
@@ -746,7 +746,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
              if (ACPI_FAILURE (Status))
              {
                  return;
-@@ -1493,7 +1545,7 @@ AcpiDmDumpPmtt (
+@@ -1508,7 +1560,7 @@ AcpiDmDumpPmtt (
  
              Status = AcpiDmDumpTable (Length,
                  Offset + MemOffset, MemSubtable,
@@ -755,7 +755,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
              if (ACPI_FAILURE (Status))
              {
                  return;
-@@ -1501,13 +1553,14 @@ AcpiDmDumpPmtt (
+@@ -1516,13 +1568,14 @@ AcpiDmDumpPmtt (
  
              /* Walk the variable count of proximity domains */
  
@@ -773,7 +773,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
                  DomainCount)
              {
                  Status = AcpiDmDumpTable (Length,
-@@ -1535,15 +1588,16 @@ AcpiDmDumpPmtt (
+@@ -1550,15 +1603,16 @@ AcpiDmDumpPmtt (
              DimmSubtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, MemSubtable,
                  DomainOffset);
  
@@ -793,7 +793,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
                  if (ACPI_FAILURE (Status))
                  {
                      return;
-@@ -1563,7 +1617,7 @@ AcpiDmDumpPmtt (
+@@ -1578,7 +1632,7 @@ AcpiDmDumpPmtt (
  
                  Status = AcpiDmDumpTable (Length,
                      Offset + MemOffset + DimmOffset, DimmSubtable,
@@ -802,7 +802,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
                  if (ACPI_FAILURE (Status))
                  {
                      return;
-@@ -1571,23 +1625,22 @@ AcpiDmDumpPmtt (
+@@ -1586,23 +1640,22 @@ AcpiDmDumpPmtt (
  
                  /* Point to next DIMM subtable */
  
@@ -832,7 +832,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
      }
  }
  
-@@ -1748,6 +1801,8 @@ AcpiDmDumpS3pt (
+@@ -1763,6 +1816,8 @@ AcpiDmDumpS3pt (
      ACPI_FPDT_HEADER        *Subtable;
      ACPI_DMTABLE_INFO       *InfoTable;
      ACPI_TABLE_S3PT         *S3ptTable = ACPI_CAST_PTR (ACPI_TABLE_S3PT, Tables);
@@ -841,7 +841,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
  
  
      /* Main table */
-@@ -1758,20 +1813,22 @@ AcpiDmDumpS3pt (
+@@ -1773,20 +1828,22 @@ AcpiDmDumpS3pt (
          return 0;
      }
  
@@ -867,7 +867,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
          {
          case ACPI_S3PT_TYPE_RESUME:
  
-@@ -1786,7 +1843,7 @@ AcpiDmDumpS3pt (
+@@ -1801,7 +1858,7 @@ AcpiDmDumpS3pt (
          default:
  
              AcpiOsPrintf ("\n**** Unknown S3PT subtable type 0x%X\n",
@@ -876,7 +876,7 @@ Index: acpica-unix-20191018/source/common/dmtbdump2.c
  
              /* Attempt to continue */
  
-@@ -1799,7 +1856,7 @@ AcpiDmDumpS3pt (
+@@ -1814,7 +1871,7 @@ AcpiDmDumpS3pt (
          }
  
          AcpiOsPrintf ("\n");
diff --git a/big-endian-v3.patch b/big-endian-v3.patch
index e787789..e3db4f6 100644
--- a/big-endian-v3.patch
+++ b/big-endian-v3.patch
@@ -20,7 +20,7 @@ diff -Naur acpica-unix2-20200214.orig/source/components/namespace/nsutils.c acpi
 diff -Naur acpica-unix2-20200214.orig/source/common/dmtbdump2.c acpica-unix2-20200214/source/common/dmtbdump2.c
 --- acpica-unix2-20200214.orig/source/common/dmtbdump2.c	2020-02-26 11:44:13.732967820 -0700
 +++ acpica-unix2-20200214/source/common/dmtbdump2.c	2020-02-26 12:38:44.286849954 -0700
-@@ -1670,6 +1670,8 @@
+@@ -1685,6 +1685,8 @@
      UINT32                  Offset = sizeof (ACPI_TABLE_FPDT);
      ACPI_DMTABLE_INFO       *InfoTable;
      UINT32                  i;
@@ -29,7 +29,7 @@ diff -Naur acpica-unix2-20200214.orig/source/common/dmtbdump2.c acpica-unix2-202
  
  
      /* There is no main table (other than the standard ACPI header) */
-@@ -1677,7 +1679,8 @@
+@@ -1692,7 +1694,8 @@
      /* Subtables */
  
      Offset = sizeof (ACPI_TABLE_HEADER);
@@ -39,7 +39,7 @@ diff -Naur acpica-unix2-20200214.orig/source/common/dmtbdump2.c acpica-unix2-202
      {
          AcpiOsPrintf ("\n");
  
-@@ -1689,7 +1692,7 @@
+@@ -1704,7 +1707,7 @@
              AcpiOsPrintf ("Invalid subtable length\n");
              return;
          }
@@ -48,7 +48,7 @@ diff -Naur acpica-unix2-20200214.orig/source/common/dmtbdump2.c acpica-unix2-202
              Subtable->Length, AcpiDmTableInfoPpttHdr);
          if (ACPI_FAILURE (Status))
          {
-@@ -1731,7 +1734,7 @@
+@@ -1746,7 +1749,7 @@
              AcpiOsPrintf ("Invalid subtable length\n");
              return;
          }
@@ -57,7 +57,7 @@ diff -Naur acpica-unix2-20200214.orig/source/common/dmtbdump2.c acpica-unix2-202
              Subtable->Length, InfoTable);
          if (ACPI_FAILURE (Status))
          {
-@@ -1747,15 +1750,16 @@
+@@ -1762,15 +1765,16 @@
  
              /* Dump SMBIOS handles */
  
diff --git a/dup-symbol.patch b/dup-symbol.patch
deleted file mode 100644
index fd0d56b..0000000
--- a/dup-symbol.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur acpica-unix2-20191213.orig/source/tools/acpiexec/aemain.c acpica-unix2-20191213/source/tools/acpiexec/aemain.c
---- acpica-unix2-20191213.orig/source/tools/acpiexec/aemain.c	2020-02-23 16:32:25.935853162 -0700
-+++ acpica-unix2-20191213/source/tools/acpiexec/aemain.c	2020-02-23 16:44:38.949901103 -0700
-@@ -84,7 +84,6 @@
- UINT8                       AcpiGbl_RegionFillValue = 0;
- BOOLEAN                     AcpiGbl_IgnoreErrors = FALSE;
- BOOLEAN                     AcpiGbl_AbortLoopOnTimeout = FALSE;
--BOOLEAN                     AcpiGbl_DbOpt_NoRegionSupport = FALSE;
- UINT8                       AcpiGbl_UseHwReducedFadt = FALSE;
- BOOLEAN                     AcpiGbl_DoInterfaceTests = FALSE;
- BOOLEAN                     AcpiGbl_LoadTestTables = FALSE;
-@@ -549,6 +548,10 @@
-         goto NormalExit;
-     }
- 
-+    /* Initialize globals modified by command line options */
-+
-+    AcpiGbl_DbOpt_NoRegionSupport = FALSE;
-+
-     /* Get the command line options */
- 
-     ExitCode = AeDoOptions (argc, argv);
diff --git a/no-common.patch b/no-common.patch
deleted file mode 100644
index 975c067..0000000
--- a/no-common.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur acpica-unix2-20191213.orig/source/compiler/dtcompiler.h acpica-unix2-20191213/source/compiler/dtcompiler.h
---- acpica-unix2-20191213.orig/source/compiler/dtcompiler.h	2020-02-23 18:05:24.257395129 -0700
-+++ acpica-unix2-20191213/source/compiler/dtcompiler.h	2020-02-23 18:06:42.956236378 -0700
-@@ -351,7 +351,7 @@
- 
- /* dtparser - lex/yacc files */
- 
--UINT64                      DtCompilerParserResult; /* Expression return value */
-+extern UINT64                      DtCompilerParserResult; /* Expression return value */
- int
- DtCompilerParserparse (
-     void);
-diff -Naur acpica-unix2-20191213.orig/source/compiler/aslcompiler.l acpica-unix2-20191213/source/compiler/aslcompiler.l
---- acpica-unix2-20191213.orig/source/compiler/aslcompiler.l	2019-12-13 08:58:18.000000000 -0700
-+++ acpica-unix2-20191213/source/compiler/aslcompiler.l	2020-02-24 15:08:53.067560139 -0700
-@@ -48,7 +48,7 @@
- 
- #include <stdlib.h>
- #include <string.h>
--YYSTYPE AslCompilerlval;
-+#define YYSTYPE AslCompilerlval;
- 
- /*
-  * Generation:  Use the following command line:
-diff -Naur acpica-unix2-20191213.orig/source/compiler/prparser.l acpica-unix2-20191213/source/compiler/prparser.l
---- acpica-unix2-20191213.orig/source/compiler/prparser.l	2019-12-13 08:58:19.000000000 -0700
-+++ acpica-unix2-20191213/source/compiler/prparser.l	2020-02-24 15:09:25.909839732 -0700
-@@ -116,7 +116,7 @@
- /*
-  * Local support functions
-  */
--YY_BUFFER_STATE         LexBuffer;
-+static YY_BUFFER_STATE         LexBuffer;
- 
- 
- /******************************************************************************
diff --git a/pcc.patch b/pcc.patch
deleted file mode 100644
index 1ed0bd1..0000000
--- a/pcc.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur acpica-unix2-20200214.orig/source/compiler/aslcompiler.l acpica-unix2-20200214/source/compiler/aslcompiler.l
---- acpica-unix2-20200214.orig/source/compiler/aslcompiler.l	2020-02-25 17:24:22.169290551 -0700
-+++ acpica-unix2-20200214/source/compiler/aslcompiler.l	2020-02-25 17:26:01.807138585 -0700
-@@ -584,7 +584,7 @@
- "IPMI"                      { count (0); return (PARSEOP_REGIONSPACE_IPMI); }
- "GeneralPurposeIo"          { count (0); return (PARSEOP_REGIONSPACE_GPIO); }       /* ACPI 5.0 */
- "GenericSerialBus"          { count (0); return (PARSEOP_REGIONSPACE_GSBUS); }      /* ACPI 5.0 */
--"PlatformCommChannel"       { count (0); return (PARSEOP_REGIONSPACE_PCC); }        /* ACPI 5.0 */
-+"PCC"                       { count (0); return (PARSEOP_REGIONSPACE_PCC); }        /* ACPI 5.0 */
- "FFixedHW"                  { count (0); return (PARSEOP_REGIONSPACE_FFIXEDHW); }
- 
-     /* ResourceTypeKeyword: Resource Usage - Resource Descriptors */
-diff -Naur acpica-unix2-20200214.orig/source/components/utilities/utdecode.c acpica-unix2-20200214/source/components/utilities/utdecode.c
---- acpica-unix2-20200214.orig/source/components/utilities/utdecode.c	2020-02-14 10:33:55.000000000 -0700
-+++ acpica-unix2-20200214/source/components/utilities/utdecode.c	2020-02-25 17:26:28.524365981 -0700
-@@ -116,7 +116,7 @@
-     "IPMI",              /* 0x07 */
-     "GeneralPurposeIo",  /* 0x08 */
-     "GenericSerialBus",  /* 0x09 */
--    "PlatformCommChannel"/* 0x0A */
-+    "PCC"                /* 0x0A */
- };
- 
- 
diff --git a/sources b/sources
index 3ad2f69..ef5e62e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (acpica-unix2-20200214.tar.gz) = 0b22f8c8255b030b5e8a2cf5b459344d1f644b26a4fcf1e95b3682335204598a3587f8f2a5ac169f99d76a10ae529051e1dabd1672c8d8bf5a4441c71d4cb1fd
-SHA512 (acpitests-unix-20200214.tar.gz) = b4d37d4784d3fbb697f244477c085e433efa152bc4c4a06d336b216358405252a77c331f4e792f5fa9b912d6f5f200aa1b6379f1b5064e58be12cf8d4415ee15
+SHA512 (acpica-unix2-20200326.tar.gz) = 5028fae5c976593b15cf429e62de30afef3af11ddac9351d9ec0de789d495b553d459e676bc4d3e862edc0c536487a7ee63a137d95c5d1783e6a17ab9114c202
+SHA512 (acpitests-unix-20200326.tar.gz) = 332b4ed016cee48662a5f4572e6d170461f02ee1386109a3970fbe8d104f2a2b14c19235ea43ae9b26e8faf9ef9597cb3d2148e498741361aca62978d0b62189

From 22392df24e37a3909640d108ef924363429e8144 Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Wed, 1 Apr 2020 15:50:50 -0600
Subject: [PATCH 21/82] Clean up some of the expected results

NB: this required not using one patch temporarily (big-endian-v3)
which may still turn out to be needed but in some corrected form.

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 acpica-tools.spec          | 4 ++--
 converterSample.asl.result | 8 +++++---
 run-misc-tests.sh          | 9 +++++----
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/acpica-tools.spec b/acpica-tools.spec
index 7d9848a..a8b36ba 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -48,7 +48,7 @@ Patch20:	aslcodegen.patch
 Patch21:	facp.patch
 Patch24:	armv7-str-fixes.patch
 Patch25:	dbtest.patch
-Patch27:	big-endian-v3.patch
+#Patch27:	big-endian-v3.patch
 
 BuildRequires:  bison patchutils flex gcc
 
@@ -124,7 +124,7 @@ gzip -dc %{SOURCE1} | tar -x --strip-components=1 -f -
 %patch21 -p1 -b .facp
 %patch24 -p1 -b .armv7-str-fixes
 %patch25 -p1 -b .dbtest
-%patch27 -p1 -b .big-endian-v3
+#%patch27 -p1 -b .big-endian-v3
 
 cp -p %{SOURCE2} README.Fedora
 cp -p %{SOURCE3} iasl.1
diff --git a/converterSample.asl.result b/converterSample.asl.result
index 34cb693..47c532c 100644
--- a/converterSample.asl.result
+++ b/converterSample.asl.result
@@ -18,7 +18,9 @@ Intel ACPI Component Architecture
 ASL+ Optimizing Compiler/Disassembler version VVVVVVVV
 Copyright (c) 2000 - 2020 Intel Corporation
 
-ASL Input:     converterSample.asl -    1968 bytes     11 keywords     85 source lines
-AML Output:    converterSample.aml -     180 bytes      2 opcodes       9 named objects
+Ignoring all errors, forcing AML file generation
 
-Compilation successful. 0 Errors, 0 Warnings, 5 Remarks, 12 Optimizations, 1 Constants Folded
+ASL Input:     converterSample.asl -    1968 bytes     11 keywords     85 source lines
+AML Output:    converterSample.aml -     182 bytes      2 opcodes       9 named objects
+
+Compilation successful. 0 Errors, 0 Warnings, 5 Remarks, 10 Optimizations
diff --git a/run-misc-tests.sh b/run-misc-tests.sh
index e16babf..c0da397 100644
--- a/run-misc-tests.sh
+++ b/run-misc-tests.sh
@@ -16,7 +16,7 @@ BINDIR="$1"
 VERSION="$2"
 
 # create files to compare against
-$BINDIR/iasl -h
+$BINDIR/iasl -hZZ
 
 sed -e "s/VVVVVVVV/$VERSION/" \
     ../badcode.asl.result > misc/badcode.asl.expected
@@ -39,9 +39,10 @@ $BINDIR/iasl -f -of grammar.asl 2>&1 | tee grammar.asl.actual
 diff grammar.asl.actual grammar.asl.expected >/dev/null 2>&1
 [ $? -eq 0 ] || exit 1
 
-# see if converterSample.asl succeeded as expected
-$BINDIR/iasl converterSample.asl 2>&1 | tee converterSample.asl.actual
+# see if converterSample.asl failed as expected
+# NB: the -f option is required so we can see all of the errors
+$BINDIR/iasl -f -of converterSample.asl 2>&1 | tee converterSample.asl.actual
 diff converterSample.asl.actual converterSample.asl.expected >/dev/null 2>&1
-[ $? -ne 0 ] && exit 1
+[ $? -eq 0 ] || exit 1
 
 exit 0

From 8992cb4a759d5926ce167ae17b94075f79c94e1a Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Fri, 12 Jun 2020 15:50:29 -0600
Subject: [PATCH 22/82] Update to 20200430 upstream version

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 .gitignore                 |   2 +
 OPT_LDFLAGS.patch          |   8 +-
 acpica-tools.spec          |   5 +-
 big-endian-dmtbdump2.patch |  96 ++++++-------
 big-endian.patch           | 266 ++++++++++++++++++-------------------
 f23-harden.patch           |  14 +-
 facp.patch                 |  13 +-
 int-format.patch           |  92 ++++++-------
 sources                    |   4 +-
 9 files changed, 251 insertions(+), 249 deletions(-)

diff --git a/.gitignore b/.gitignore
index 44d655f..2e7eaf7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -129,3 +129,5 @@ series
 /acpitests-unix-20200214.tar.gz
 /acpica-unix2-20200326.tar.gz
 /acpitests-unix-20200326.tar.gz
+/acpica-unix2-20200430.tar.gz
+/acpitests-unix-20200430.tar.gz
diff --git a/OPT_LDFLAGS.patch b/OPT_LDFLAGS.patch
index 5d9a21f..610d66d 100644
--- a/OPT_LDFLAGS.patch
+++ b/OPT_LDFLAGS.patch
@@ -1,7 +1,7 @@
-Index: acpica-unix-20191018/generate/unix/Makefile.config
+Index: acpica-unix2-20200528/generate/unix/Makefile.config
 ===================================================================
---- acpica-unix-20191018.orig/generate/unix/Makefile.config
-+++ acpica-unix-20191018/generate/unix/Makefile.config
+--- acpica-unix2-20200528.orig/generate/unix/Makefile.config
++++ acpica-unix2-20200528/generate/unix/Makefile.config
 @@ -23,6 +23,9 @@
  # OPT_CFLAGS can be overridden on the make command line by
  #   adding OPT_CFLAGS="..." to the invocation.
@@ -12,7 +12,7 @@ Index: acpica-unix-20191018/generate/unix/Makefile.config
  # Notes:
  #   gcc should be version 4 or greater, otherwise some of the options
  #     used will not be recognized.
-@@ -165,6 +168,11 @@ LDFLAGS +=-m32
+@@ -164,6 +167,11 @@ LDFLAGS +=-m32
  endif
  
  #
diff --git a/acpica-tools.spec b/acpica-tools.spec
index a8b36ba..4868994 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -1,5 +1,5 @@
 Name:           acpica-tools
-Version:        20200326
+Version:        20200430
 Release:        1%{?dist}
 Summary:        ACPICA tools for the development and debug of ACPI tables
 
@@ -241,6 +241,9 @@ fi
 
 
 %changelog
+* Thu Jun 8 2020 Al Stone <ahs3@redhat.com> - 202004306-1
+- Update to 202004306 source tree, including patch refreshes
+
 * Wed Apr 1 2020 Al Stone <ahs3@redhat.com> - 20200326-1
 - Update to 20200326 source tree, including patch refreshes
 - Removed a couple of patches that got included upstream
diff --git a/big-endian-dmtbdump2.patch b/big-endian-dmtbdump2.patch
index 0ba1a44..0997b5b 100644
--- a/big-endian-dmtbdump2.patch
+++ b/big-endian-dmtbdump2.patch
@@ -1,7 +1,7 @@
-Index: acpica-unix-20209326/source/common/dmtbdump2.c
+Index: acpica-unix2-20200528/source/common/dmtbdump2.c
 ===================================================================
---- acpica-unix-20209326.orig/source/common/dmtbdump2.c
-+++ acpica-unix-20209326/source/common/dmtbdump2.c
+--- acpica-unix2-20200528.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20200528/source/common/dmtbdump2.c
 @@ -75,16 +75,23 @@ AcpiDmDumpIort (
      ACPI_IORT_SMMU          *IortSmmu = NULL;
      UINT32                  Offset;
@@ -243,7 +243,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
          if (ACPI_FAILURE (Status))
          {
              return;
-@@ -427,7 +448,7 @@ AcpiDmDumpIvrs (
+@@ -429,7 +450,7 @@ AcpiDmDumpIvrs (
                      sizeof (ACPI_IVRS_HARDWARE2));
              }
  
@@ -252,7 +252,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
              {
                  AcpiOsPrintf ("\n");
                  /*
-@@ -489,7 +510,7 @@ AcpiDmDumpIvrs (
+@@ -491,7 +512,7 @@ AcpiDmDumpIvrs (
  
                  /* Dump the Device Entry */
  
@@ -261,7 +261,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
                      DeviceEntry, EntryLength, InfoTable);
                  if (ACPI_FAILURE (Status))
                  {
-@@ -505,8 +526,8 @@ AcpiDmDumpIvrs (
+@@ -507,8 +528,8 @@ AcpiDmDumpIvrs (
  NextSubtable:
          /* Point to next subtable */
  
@@ -272,7 +272,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
      }
  }
  
-@@ -532,7 +553,7 @@ AcpiDmDumpLpit (
+@@ -534,7 +555,7 @@ AcpiDmDumpLpit (
  {
      ACPI_STATUS             Status;
      ACPI_LPIT_HEADER        *Subtable;
@@ -281,7 +281,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
      UINT32                  Offset = sizeof (ACPI_TABLE_LPIT);
      ACPI_DMTABLE_INFO       *InfoTable;
      UINT32                  SubtableLength;
-@@ -540,8 +561,9 @@ AcpiDmDumpLpit (
+@@ -542,8 +563,9 @@ AcpiDmDumpLpit (
  
      /* Subtables */
  
@@ -292,7 +292,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
      {
          /* Common subtable header */
  
-@@ -605,13 +627,14 @@ AcpiDmDumpMadt (
+@@ -607,13 +629,14 @@ AcpiDmDumpMadt (
  {
      ACPI_STATUS             Status;
      ACPI_SUBTABLE_HEADER    *Subtable;
@@ -308,7 +308,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
      Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoMadt);
      if (ACPI_FAILURE (Status))
      {
-@@ -621,7 +644,7 @@ AcpiDmDumpMadt (
+@@ -623,7 +646,7 @@ AcpiDmDumpMadt (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Table, Offset);
@@ -317,7 +317,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
      {
          /* Common subtable header */
  
-@@ -767,11 +790,13 @@ AcpiDmDumpMcfg (
+@@ -769,11 +792,13 @@ AcpiDmDumpMcfg (
      ACPI_STATUS             Status;
      UINT32                  Offset = sizeof (ACPI_TABLE_MCFG);
      ACPI_MCFG_ALLOCATION    *Subtable;
@@ -332,7 +332,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
      if (ACPI_FAILURE (Status))
      {
          return;
-@@ -780,17 +805,17 @@ AcpiDmDumpMcfg (
+@@ -782,17 +807,17 @@ AcpiDmDumpMcfg (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_MCFG_ALLOCATION, Table, Offset);
@@ -354,7 +354,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
              sizeof (ACPI_MCFG_ALLOCATION), AcpiDmTableInfoMcfg0);
          if (ACPI_FAILURE (Status))
          {
-@@ -824,6 +849,7 @@ AcpiDmDumpMpst (
+@@ -826,6 +851,7 @@ AcpiDmDumpMpst (
  {
      ACPI_STATUS             Status;
      UINT32                  Offset = sizeof (ACPI_TABLE_MPST);
@@ -362,7 +362,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
      ACPI_MPST_POWER_NODE    *Subtable0;
      ACPI_MPST_POWER_STATE   *Subtable0A;
      ACPI_MPST_COMPONENT     *Subtable0B;
-@@ -832,11 +858,13 @@ AcpiDmDumpMpst (
+@@ -834,11 +860,13 @@ AcpiDmDumpMpst (
      UINT16                  SubtableCount;
      UINT32                  PowerStateCount;
      UINT32                  ComponentCount;
@@ -377,7 +377,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
      if (ACPI_FAILURE (Status))
      {
          return;
-@@ -844,13 +872,14 @@ AcpiDmDumpMpst (
+@@ -846,13 +874,14 @@ AcpiDmDumpMpst (
  
      /* Subtable: Memory Power Node(s) */
  
@@ -395,7 +395,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
              sizeof (ACPI_MPST_POWER_NODE), AcpiDmTableInfoMpst0);
          if (ACPI_FAILURE (Status))
          {
-@@ -859,8 +888,8 @@ AcpiDmDumpMpst (
+@@ -861,8 +890,8 @@ AcpiDmDumpMpst (
  
          /* Extract the sub-subtable counts */
  
@@ -406,7 +406,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
          Offset += sizeof (ACPI_MPST_POWER_NODE);
  
          /* Sub-subtables - Memory Power State Structure(s) */
-@@ -871,7 +900,7 @@ AcpiDmDumpMpst (
+@@ -873,7 +902,7 @@ AcpiDmDumpMpst (
          while (PowerStateCount)
          {
              AcpiOsPrintf ("\n");
@@ -415,7 +415,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
                  sizeof (ACPI_MPST_POWER_STATE), AcpiDmTableInfoMpst0A);
              if (ACPI_FAILURE (Status))
              {
-@@ -881,7 +910,7 @@ AcpiDmDumpMpst (
+@@ -883,7 +912,7 @@ AcpiDmDumpMpst (
              Subtable0A++;
              PowerStateCount--;
              Offset += sizeof (ACPI_MPST_POWER_STATE);
@@ -424,7 +424,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
  
          /* Sub-subtables - Physical Component ID Structure(s) */
  
-@@ -894,7 +923,7 @@ AcpiDmDumpMpst (
+@@ -896,7 +925,7 @@ AcpiDmDumpMpst (
  
          while (ComponentCount)
          {
@@ -433,7 +433,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
                  sizeof (ACPI_MPST_COMPONENT), AcpiDmTableInfoMpst0B);
              if (ACPI_FAILURE (Status))
              {
-@@ -909,17 +938,19 @@ AcpiDmDumpMpst (
+@@ -911,17 +940,19 @@ AcpiDmDumpMpst (
          /* Point to next Memory Power Node subtable */
  
          SubtableCount--;
@@ -456,7 +456,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
          sizeof (ACPI_MPST_DATA_HDR), AcpiDmTableInfoMpst1);
      if (ACPI_FAILURE (Status))
      {
-@@ -934,10 +965,10 @@ AcpiDmDumpMpst (
+@@ -936,10 +967,10 @@ AcpiDmDumpMpst (
      Subtable2 = ACPI_ADD_PTR (ACPI_MPST_POWER_DATA, Subtable1,
          sizeof (ACPI_MPST_DATA_HDR));
  
@@ -469,7 +469,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
              sizeof (ACPI_MPST_POWER_DATA), AcpiDmTableInfoMpst2);
          if (ACPI_FAILURE (Status))
          {
-@@ -970,11 +1001,13 @@ AcpiDmDumpMsct (
+@@ -972,11 +1003,13 @@ AcpiDmDumpMsct (
      ACPI_STATUS             Status;
      UINT32                  Offset = sizeof (ACPI_TABLE_MSCT);
      ACPI_MSCT_PROXIMITY     *Subtable;
@@ -484,7 +484,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
      if (ACPI_FAILURE (Status))
      {
          return;
-@@ -983,12 +1016,12 @@ AcpiDmDumpMsct (
+@@ -985,12 +1018,12 @@ AcpiDmDumpMsct (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_MSCT_PROXIMITY, Table, Offset);
@@ -499,7 +499,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
              sizeof (ACPI_MSCT_PROXIMITY), AcpiDmTableInfoMsct0);
          if (ACPI_FAILURE (Status))
          {
-@@ -1023,11 +1056,13 @@ AcpiDmDumpMtmr (
+@@ -1025,11 +1058,13 @@ AcpiDmDumpMtmr (
      ACPI_STATUS             Status;
      UINT32                  Offset = sizeof (ACPI_TABLE_MTMR);
      ACPI_MTMR_ENTRY         *Subtable;
@@ -514,7 +514,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
      if (ACPI_FAILURE (Status))
      {
          return;
-@@ -1036,12 +1071,12 @@ AcpiDmDumpMtmr (
+@@ -1038,12 +1073,12 @@ AcpiDmDumpMtmr (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_MTMR_ENTRY, Table, Offset);
@@ -529,7 +529,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
              sizeof (ACPI_MTMR_ENTRY), AcpiDmTableInfoMtmr0);
          if (ACPI_FAILURE (Status))
          {
-@@ -1083,11 +1118,17 @@ AcpiDmDumpNfit (
+@@ -1085,11 +1120,17 @@ AcpiDmDumpNfit (
      ACPI_NFIT_SMBIOS        *SmbiosInfo = NULL;
      ACPI_NFIT_FLUSH_ADDRESS *Hint = NULL;
      UINT32                  i;
@@ -548,7 +548,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
      if (ACPI_FAILURE (Status))
      {
          return;
-@@ -1096,19 +1137,21 @@ AcpiDmDumpNfit (
+@@ -1098,19 +1139,21 @@ AcpiDmDumpNfit (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_NFIT_HEADER, Table, Offset);
@@ -574,7 +574,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
          {
          case ACPI_NFIT_TYPE_SYSTEM_ADDRESS:
  
-@@ -1163,7 +1206,7 @@ AcpiDmDumpNfit (
+@@ -1165,7 +1208,7 @@ AcpiDmDumpNfit (
  
              /* Attempt to continue */
  
@@ -583,7 +583,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
              {
                  AcpiOsPrintf ("Invalid zero length subtable\n");
                  return;
-@@ -1172,8 +1215,8 @@ AcpiDmDumpNfit (
+@@ -1174,8 +1217,8 @@ AcpiDmDumpNfit (
          }
  
          AcpiOsPrintf ("\n");
@@ -594,7 +594,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
          if (ACPI_FAILURE (Status))
          {
              return;
-@@ -1181,14 +1224,15 @@ AcpiDmDumpNfit (
+@@ -1183,14 +1226,15 @@ AcpiDmDumpNfit (
  
          /* Per-subtable variable-length fields */
  
@@ -613,7 +613,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
                      &Interleave->LineOffset[i],
                      sizeof (UINT32), AcpiDmTableInfoNfit2a);
                  if (ACPI_FAILURE (Status))
-@@ -1202,12 +1246,11 @@ AcpiDmDumpNfit (
+@@ -1204,12 +1248,11 @@ AcpiDmDumpNfit (
  
          case ACPI_NFIT_TYPE_SMBIOS:
  
@@ -628,7 +628,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
                      sizeof (ACPI_NFIT_SMBIOS) - sizeof (UINT8),
                      SmbiosInfo,
                      Length, AcpiDmTableInfoNfit3a);
-@@ -1222,9 +1265,10 @@ AcpiDmDumpNfit (
+@@ -1224,9 +1267,10 @@ AcpiDmDumpNfit (
          case ACPI_NFIT_TYPE_FLUSH_ADDRESS:
  
              Hint = ACPI_CAST_PTR (ACPI_NFIT_FLUSH_ADDRESS, Subtable);
@@ -641,7 +641,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
                      &Hint->HintAddress[i],
                      sizeof (UINT64), AcpiDmTableInfoNfit6a);
                  if (ACPI_FAILURE (Status))
-@@ -1243,8 +1287,8 @@ AcpiDmDumpNfit (
+@@ -1245,8 +1289,8 @@ AcpiDmDumpNfit (
  NextSubtable:
          /* Point to next subtable */
  
@@ -652,7 +652,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
      }
  }
  
-@@ -1269,12 +1313,13 @@ AcpiDmDumpPcct (
+@@ -1271,12 +1315,13 @@ AcpiDmDumpPcct (
      ACPI_STATUS             Status;
      ACPI_PCCT_SUBSPACE      *Subtable;
      ACPI_DMTABLE_INFO       *InfoTable;
@@ -667,7 +667,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
      Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoPcct);
      if (ACPI_FAILURE (Status))
      {
-@@ -1284,7 +1329,7 @@ AcpiDmDumpPcct (
+@@ -1286,7 +1331,7 @@ AcpiDmDumpPcct (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_PCCT_SUBSPACE, Table, Offset);
@@ -676,7 +676,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
      {
          /* Common subtable header */
  
-@@ -1424,16 +1469,21 @@ AcpiDmDumpPmtt (
+@@ -1426,16 +1471,21 @@ AcpiDmDumpPmtt (
      ACPI_PMTT_HEADER        *MemSubtable;
      ACPI_PMTT_HEADER        *DimmSubtable;
      ACPI_PMTT_DOMAIN        *DomainArray;
@@ -700,7 +700,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
      Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoPmtt);
      if (ACPI_FAILURE (Status))
      {
-@@ -1443,13 +1493,14 @@ AcpiDmDumpPmtt (
+@@ -1445,13 +1495,14 @@ AcpiDmDumpPmtt (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, Table, Offset);
@@ -717,7 +717,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
          if (ACPI_FAILURE (Status))
          {
              return;
-@@ -1468,7 +1519,7 @@ AcpiDmDumpPmtt (
+@@ -1470,7 +1521,7 @@ AcpiDmDumpPmtt (
          /* Dump the fixed-length portion of the subtable */
  
          Status = AcpiDmDumpTable (Length, Offset, Subtable,
@@ -726,7 +726,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
          if (ACPI_FAILURE (Status))
          {
              return;
-@@ -1480,15 +1531,16 @@ AcpiDmDumpPmtt (
+@@ -1482,15 +1533,16 @@ AcpiDmDumpPmtt (
          MemSubtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, Subtable,
              sizeof (ACPI_PMTT_SOCKET));
  
@@ -746,7 +746,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
              if (ACPI_FAILURE (Status))
              {
                  return;
-@@ -1508,7 +1560,7 @@ AcpiDmDumpPmtt (
+@@ -1510,7 +1562,7 @@ AcpiDmDumpPmtt (
  
              Status = AcpiDmDumpTable (Length,
                  Offset + MemOffset, MemSubtable,
@@ -755,7 +755,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
              if (ACPI_FAILURE (Status))
              {
                  return;
-@@ -1516,13 +1568,14 @@ AcpiDmDumpPmtt (
+@@ -1518,13 +1570,14 @@ AcpiDmDumpPmtt (
  
              /* Walk the variable count of proximity domains */
  
@@ -773,7 +773,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
                  DomainCount)
              {
                  Status = AcpiDmDumpTable (Length,
-@@ -1550,15 +1603,16 @@ AcpiDmDumpPmtt (
+@@ -1552,15 +1605,16 @@ AcpiDmDumpPmtt (
              DimmSubtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, MemSubtable,
                  DomainOffset);
  
@@ -793,7 +793,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
                  if (ACPI_FAILURE (Status))
                  {
                      return;
-@@ -1578,7 +1632,7 @@ AcpiDmDumpPmtt (
+@@ -1580,7 +1634,7 @@ AcpiDmDumpPmtt (
  
                  Status = AcpiDmDumpTable (Length,
                      Offset + MemOffset + DimmOffset, DimmSubtable,
@@ -802,7 +802,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
                  if (ACPI_FAILURE (Status))
                  {
                      return;
-@@ -1586,23 +1640,22 @@ AcpiDmDumpPmtt (
+@@ -1588,23 +1642,22 @@ AcpiDmDumpPmtt (
  
                  /* Point to next DIMM subtable */
  
@@ -832,7 +832,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
      }
  }
  
-@@ -1763,6 +1816,8 @@ AcpiDmDumpS3pt (
+@@ -1765,6 +1818,8 @@ AcpiDmDumpS3pt (
      ACPI_FPDT_HEADER        *Subtable;
      ACPI_DMTABLE_INFO       *InfoTable;
      ACPI_TABLE_S3PT         *S3ptTable = ACPI_CAST_PTR (ACPI_TABLE_S3PT, Tables);
@@ -841,7 +841,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
  
  
      /* Main table */
-@@ -1773,20 +1828,22 @@ AcpiDmDumpS3pt (
+@@ -1775,20 +1830,22 @@ AcpiDmDumpS3pt (
          return 0;
      }
  
@@ -867,7 +867,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
          {
          case ACPI_S3PT_TYPE_RESUME:
  
-@@ -1801,7 +1858,7 @@ AcpiDmDumpS3pt (
+@@ -1803,7 +1860,7 @@ AcpiDmDumpS3pt (
          default:
  
              AcpiOsPrintf ("\n**** Unknown S3PT subtable type 0x%X\n",
@@ -876,7 +876,7 @@ Index: acpica-unix-20209326/source/common/dmtbdump2.c
  
              /* Attempt to continue */
  
-@@ -1814,7 +1871,7 @@ AcpiDmDumpS3pt (
+@@ -1816,7 +1873,7 @@ AcpiDmDumpS3pt (
          }
  
          AcpiOsPrintf ("\n");
diff --git a/big-endian.patch b/big-endian.patch
index 8d89a5b..284bc46 100644
--- a/big-endian.patch
+++ b/big-endian.patch
@@ -8,10 +8,10 @@ To date, this has been critical for the s390x architecture only.
 
 Signed-off-by: Al Stone <ahs3@redhat.com>
 
-Index: acpica-unix-20200214/source/compiler/aslcodegen.c
+Index: acpica-unix2-20200528/source/compiler/aslcodegen.c
 ===================================================================
---- acpica-unix-20200214.orig/source/compiler/aslcodegen.c
-+++ acpica-unix-20200214/source/compiler/aslcodegen.c
+--- acpica-unix2-20200528.orig/source/compiler/aslcodegen.c
++++ acpica-unix2-20200528/source/compiler/aslcodegen.c
 @@ -237,16 +237,12 @@ CgWriteAmlOpcode (
      ACPI_PARSE_OBJECT       *Op)
  {
@@ -253,10 +253,10 @@ Index: acpica-unix-20200214/source/compiler/aslcodegen.c
  
      case AML_RAW_DATA_BUFFER:
  
-Index: acpica-unix-20200214/source/compiler/aslopcodes.c
+Index: acpica-unix2-20200528/source/compiler/aslopcodes.c
 ===================================================================
---- acpica-unix-20200214.orig/source/compiler/aslopcodes.c
-+++ acpica-unix-20200214/source/compiler/aslopcodes.c
+--- acpica-unix2-20200528.orig/source/compiler/aslopcodes.c
++++ acpica-unix2-20200528/source/compiler/aslopcodes.c
 @@ -485,6 +485,7 @@ OpcDoUnicode (
      UINT32                  i;
      UINT8                   *AsciiString;
@@ -275,10 +275,10 @@ Index: acpica-unix-20200214/source/compiler/aslopcodes.c
      }
  
      /*
-Index: acpica-unix-20200214/source/compiler/aslrestype1.c
+Index: acpica-unix2-20200528/source/compiler/aslrestype1.c
 ===================================================================
---- acpica-unix-20200214.orig/source/compiler/aslrestype1.c
-+++ acpica-unix-20200214/source/compiler/aslrestype1.c
+--- acpica-unix2-20200528.orig/source/compiler/aslrestype1.c
++++ acpica-unix2-20200528/source/compiler/aslrestype1.c
 @@ -142,6 +142,11 @@ RsDoMemory24Descriptor (
      ACPI_PARSE_OBJECT       *LengthOp = NULL;
      ASL_RESOURCE_NODE       *Rnode;
@@ -475,10 +475,10 @@ Index: acpica-unix-20200214/source/compiler/aslrestype1.c
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (FixedMemory32.AddressLength));
              break;
-Index: acpica-unix-20200214/source/compiler/aslrestype1i.c
+Index: acpica-unix2-20200528/source/compiler/aslrestype1i.c
 ===================================================================
---- acpica-unix-20200214.orig/source/compiler/aslrestype1i.c
-+++ acpica-unix-20200214/source/compiler/aslrestype1i.c
+--- acpica-unix2-20200528.orig/source/compiler/aslrestype1i.c
++++ acpica-unix2-20200528/source/compiler/aslrestype1i.c
 @@ -198,6 +198,8 @@ RsDoFixedDmaDescriptor (
      ACPI_PARSE_OBJECT       *InitializerOp;
      ASL_RESOURCE_NODE       *Rnode;
@@ -615,10 +615,10 @@ Index: acpica-unix-20200214/source/compiler/aslrestype1i.c
 +    ACPI_MOVE_16_TO_16(&Descriptor->Irq.IrqMask, &IrqMask);
      return (Rnode);
  }
-Index: acpica-unix-20200214/source/compiler/aslrestype2.c
+Index: acpica-unix2-20200528/source/compiler/aslrestype2.c
 ===================================================================
---- acpica-unix-20200214.orig/source/compiler/aslrestype2.c
-+++ acpica-unix-20200214/source/compiler/aslrestype2.c
+--- acpica-unix2-20200528.orig/source/compiler/aslrestype2.c
++++ acpica-unix2-20200528/source/compiler/aslrestype2.c
 @@ -76,6 +76,7 @@ RsDoGeneralRegisterDescriptor (
      ACPI_PARSE_OBJECT       *InitializerOp;
      ASL_RESOURCE_NODE       *Rnode;
@@ -759,10 +759,10 @@ Index: acpica-unix-20200214/source/compiler/aslrestype2.c
  
      /* Point to end-of-descriptor for vendor data */
  
-Index: acpica-unix-20200214/source/compiler/aslrestype2d.c
+Index: acpica-unix2-20200528/source/compiler/aslrestype2d.c
 ===================================================================
---- acpica-unix-20200214.orig/source/compiler/aslrestype2d.c
-+++ acpica-unix-20200214/source/compiler/aslrestype2d.c
+--- acpica-unix2-20200528.orig/source/compiler/aslrestype2d.c
++++ acpica-unix2-20200528/source/compiler/aslrestype2d.c
 @@ -79,7 +79,13 @@ RsDoDwordIoDescriptor (
      ACPI_PARSE_OBJECT       *GranOp = NULL;
      ASL_RESOURCE_NODE       *Rnode;
@@ -1118,10 +1118,10 @@ Index: acpica-unix-20200214/source/compiler/aslrestype2d.c
      Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS32) +
          OptionIndex + StringLength;
      return (Rnode);
-Index: acpica-unix-20200214/source/compiler/aslrestype2e.c
+Index: acpica-unix2-20200528/source/compiler/aslrestype2e.c
 ===================================================================
---- acpica-unix-20200214.orig/source/compiler/aslrestype2e.c
-+++ acpica-unix-20200214/source/compiler/aslrestype2e.c
+--- acpica-unix2-20200528.orig/source/compiler/aslrestype2e.c
++++ acpica-unix2-20200528/source/compiler/aslrestype2e.c
 @@ -78,6 +78,13 @@ RsDoExtendedIoDescriptor (
      ACPI_PARSE_OBJECT       *GranOp = NULL;
      ASL_RESOURCE_NODE       *Rnode;
@@ -1227,10 +1227,10 @@ Index: acpica-unix-20200214/source/compiler/aslrestype2e.c
      Rnode->BufferLength = sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) +
          StringLength;
      return (Rnode);
-Index: acpica-unix-20200214/source/compiler/aslrestype2q.c
+Index: acpica-unix2-20200528/source/compiler/aslrestype2q.c
 ===================================================================
---- acpica-unix-20200214.orig/source/compiler/aslrestype2q.c
-+++ acpica-unix-20200214/source/compiler/aslrestype2q.c
+--- acpica-unix2-20200528.orig/source/compiler/aslrestype2q.c
++++ acpica-unix2-20200528/source/compiler/aslrestype2q.c
 @@ -80,7 +80,13 @@ RsDoQwordIoDescriptor (
      ASL_RESOURCE_NODE       *Rnode;
      UINT8                   *OptionalFields;
@@ -1569,10 +1569,10 @@ Index: acpica-unix-20200214/source/compiler/aslrestype2q.c
      Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS64) +
          OptionIndex + StringLength;
      return (Rnode);
-Index: acpica-unix-20200214/source/compiler/aslrestype2s.c
+Index: acpica-unix2-20200528/source/compiler/aslrestype2s.c
 ===================================================================
---- acpica-unix-20200214.orig/source/compiler/aslrestype2s.c
-+++ acpica-unix-20200214/source/compiler/aslrestype2s.c
+--- acpica-unix2-20200528.orig/source/compiler/aslrestype2s.c
++++ acpica-unix2-20200528/source/compiler/aslrestype2s.c
 @@ -340,9 +340,14 @@ RsDoGpioIntDescriptor (
      UINT16                  VendorLength;
      UINT16                  InterruptLength;
@@ -2038,10 +2038,10 @@ Index: acpica-unix-20200214/source/compiler/aslrestype2s.c
      MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource);
      return (Rnode);
  }
-Index: acpica-unix-20200214/source/compiler/aslrestype2w.c
+Index: acpica-unix2-20200528/source/compiler/aslrestype2w.c
 ===================================================================
---- acpica-unix-20200214.orig/source/compiler/aslrestype2w.c
-+++ acpica-unix-20200214/source/compiler/aslrestype2w.c
+--- acpica-unix2-20200528.orig/source/compiler/aslrestype2w.c
++++ acpica-unix2-20200528/source/compiler/aslrestype2w.c
 @@ -81,6 +81,12 @@ RsDoWordIoDescriptor (
      UINT8                   *OptionalFields;
      UINT16                  StringLength = 0;
@@ -2385,10 +2385,10 @@ Index: acpica-unix-20200214/source/compiler/aslrestype2w.c
      Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) +
          OptionIndex + StringLength;
      return (Rnode);
-Index: acpica-unix-20200214/source/include/acmacros.h
+Index: acpica-unix2-20200528/source/include/acmacros.h
 ===================================================================
---- acpica-unix-20200214.orig/source/include/acmacros.h
-+++ acpica-unix-20200214/source/include/acmacros.h
+--- acpica-unix2-20200528.orig/source/include/acmacros.h
++++ acpica-unix2-20200528/source/include/acmacros.h
 @@ -98,9 +98,12 @@
                                             ((UINT8 *)(void *)(d))[6] = ((UINT8 *)(void *)(s))[1];\
                                             ((UINT8 *)(void *)(d))[7] = ((UINT8 *)(void *)(s))[0];}
@@ -2467,10 +2467,10 @@ Index: acpica-unix-20200214/source/include/acmacros.h
  
  #define ACPI_MOVE_32_TO_16(d, s)        ACPI_MOVE_16_TO_16(d, s)    /* Truncate to 16 */
  
-Index: acpica-unix-20200214/source/include/platform/aclinux.h
+Index: acpica-unix2-20200528/source/include/platform/aclinux.h
 ===================================================================
---- acpica-unix-20200214.orig/source/include/platform/aclinux.h
-+++ acpica-unix-20200214/source/include/platform/aclinux.h
+--- acpica-unix2-20200528.orig/source/include/platform/aclinux.h
++++ acpica-unix2-20200528/source/include/platform/aclinux.h
 @@ -198,6 +198,7 @@
  
  #ifdef ACPI_USE_STANDARD_HEADERS
@@ -2490,10 +2490,10 @@ Index: acpica-unix-20200214/source/include/platform/aclinux.h
  #endif /* __KERNEL__ */
  
  #endif /* __ACLINUX_H__ */
-Index: acpica-unix-20200214/source/compiler/aslanalyze.c
+Index: acpica-unix2-20200528/source/compiler/aslanalyze.c
 ===================================================================
---- acpica-unix-20200214.orig/source/compiler/aslanalyze.c
-+++ acpica-unix-20200214/source/compiler/aslanalyze.c
+--- acpica-unix2-20200528.orig/source/compiler/aslanalyze.c
++++ acpica-unix2-20200528/source/compiler/aslanalyze.c
 @@ -469,7 +469,7 @@ ApCheckForGpeNameConflict (
  
      /* Need a null-terminated string version of NameSeg */
@@ -2512,10 +2512,10 @@ Index: acpica-unix-20200214/source/compiler/aslanalyze.c
  
      /* Inject opposite letter ("L" versus "E") */
  
-Index: acpica-unix-20200214/source/compiler/asllookup.c
+Index: acpica-unix2-20200528/source/compiler/asllookup.c
 ===================================================================
---- acpica-unix-20200214.orig/source/compiler/asllookup.c
-+++ acpica-unix-20200214/source/compiler/asllookup.c
+--- acpica-unix2-20200528.orig/source/compiler/asllookup.c
++++ acpica-unix2-20200528/source/compiler/asllookup.c
 @@ -119,6 +119,7 @@ LkIsObjectUsed (
  {
      ACPI_NAMESPACE_NODE     *Node = ACPI_CAST_PTR (ACPI_NAMESPACE_NODE, ObjHandle);
@@ -2546,10 +2546,10 @@ Index: acpica-unix-20200214/source/compiler/asllookup.c
              AslError (ASL_REMARK, ASL_MSG_NOT_REFERENCED,
                  LkGetNameOp (Node->Op), AslGbl_MsgBuffer);
              return (AE_OK);
-Index: acpica-unix-20200214/source/compiler/aslmain.c
+Index: acpica-unix2-20200528/source/compiler/aslmain.c
 ===================================================================
---- acpica-unix-20200214.orig/source/compiler/aslmain.c
-+++ acpica-unix-20200214/source/compiler/aslmain.c
+--- acpica-unix2-20200528.orig/source/compiler/aslmain.c
++++ acpica-unix2-20200528/source/compiler/aslmain.c
 @@ -101,18 +101,6 @@ main (
  
      signal (SIGINT, AslSignalHandler);
@@ -2569,10 +2569,10 @@ Index: acpica-unix-20200214/source/compiler/aslmain.c
      AcpiOsInitialize ();
      ACPI_DEBUG_INITIALIZE (); /* For debug version only */
  
-Index: acpica-unix-20200214/source/common/acfileio.c
+Index: acpica-unix2-20200528/source/common/acfileio.c
 ===================================================================
---- acpica-unix-20200214.orig/source/common/acfileio.c
-+++ acpica-unix-20200214/source/common/acfileio.c
+--- acpica-unix2-20200528.orig/source/common/acfileio.c
++++ acpica-unix2-20200528/source/common/acfileio.c
 @@ -280,6 +280,7 @@ AcGetOneTableFromFile (
      ACPI_TABLE_HEADER       *Table;
      INT32                   Count;
@@ -2639,10 +2639,10 @@ Index: acpica-unix-20200214/source/common/acfileio.c
              (UINT32) (FileSize - TableOffset));
          return (AE_BAD_HEADER);
      }
-Index: acpica-unix-20200214/source/common/dmtable.c
+Index: acpica-unix2-20200528/source/common/dmtable.c
 ===================================================================
---- acpica-unix-20200214.orig/source/common/dmtable.c
-+++ acpica-unix-20200214/source/common/dmtable.c
+--- acpica-unix2-20200528.orig/source/common/dmtable.c
++++ acpica-unix2-20200528/source/common/dmtable.c
 @@ -551,7 +551,7 @@ AcpiDmDumpDataTable (
       */
      if (ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_FACS))
@@ -2741,10 +2741,10 @@ Index: acpica-unix-20200214/source/common/dmtable.c
                  AcpiDmNfitSubnames[Temp16]);
              break;
  
-Index: acpica-unix-20200214/source/common/dmtables.c
+Index: acpica-unix2-20200528/source/common/dmtables.c
 ===================================================================
---- acpica-unix-20200214.orig/source/common/dmtables.c
-+++ acpica-unix-20200214/source/common/dmtables.c
+--- acpica-unix2-20200528.orig/source/common/dmtables.c
++++ acpica-unix2-20200528/source/common/dmtables.c
 @@ -142,7 +142,9 @@ AdCreateTableHeader (
      ACPI_TABLE_HEADER       *Table)
  {
@@ -2810,10 +2810,10 @@ Index: acpica-unix-20200214/source/common/dmtables.c
      AmlStart = ((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER));
  
      AcpiUtSetIntegerWidth (Table->Revision);
-Index: acpica-unix-20200214/source/compiler/dtfield.c
+Index: acpica-unix2-20200528/source/compiler/dtfield.c
 ===================================================================
---- acpica-unix-20200214.orig/source/compiler/dtfield.c
-+++ acpica-unix-20200214/source/compiler/dtfield.c
+--- acpica-unix2-20200528.orig/source/compiler/dtfield.c
++++ acpica-unix2-20200528/source/compiler/dtfield.c
 @@ -361,7 +361,27 @@ DtCompileInteger (
          DtError (ASL_ERROR, ASL_MSG_INTEGER_SIZE, Field, AslGbl_MsgBuffer);
      }
@@ -2843,10 +2843,10 @@ Index: acpica-unix-20200214/source/compiler/dtfield.c
      return;
  }
  
-Index: acpica-unix-20200214/source/compiler/dtsubtable.c
+Index: acpica-unix2-20200528/source/compiler/dtsubtable.c
 ===================================================================
---- acpica-unix-20200214.orig/source/compiler/dtsubtable.c
-+++ acpica-unix-20200214/source/compiler/dtsubtable.c
+--- acpica-unix2-20200528.orig/source/compiler/dtsubtable.c
++++ acpica-unix2-20200528/source/compiler/dtsubtable.c
 @@ -378,6 +378,21 @@ DtSetSubtableLength (
          return;
      }
@@ -2871,10 +2871,10 @@ Index: acpica-unix-20200214/source/compiler/dtsubtable.c
 +        	Subtable->SizeOfLengthField);
 +    }
  }
-Index: acpica-unix-20200214/source/compiler/dttable1.c
+Index: acpica-unix2-20200528/source/compiler/dttable1.c
 ===================================================================
---- acpica-unix-20200214.orig/source/compiler/dttable1.c
-+++ acpica-unix-20200214/source/compiler/dttable1.c
+--- acpica-unix2-20200528.orig/source/compiler/dttable1.c
++++ acpica-unix2-20200528/source/compiler/dttable1.c
 @@ -281,6 +281,8 @@ DtCompileCsrt (
      DT_FIELD                **PFieldList = (DT_FIELD **) List;
      UINT32                  DescriptorCount;
@@ -3246,10 +3246,10 @@ Index: acpica-unix-20200214/source/compiler/dttable1.c
      return (AE_OK);
  }
  
-Index: acpica-unix-20200214/source/compiler/dttable2.c
+Index: acpica-unix2-20200528/source/compiler/dttable2.c
 ===================================================================
---- acpica-unix-20200214.orig/source/compiler/dttable2.c
-+++ acpica-unix-20200214/source/compiler/dttable2.c
+--- acpica-unix2-20200528.orig/source/compiler/dttable2.c
++++ acpica-unix2-20200528/source/compiler/dttable2.c
 @@ -345,7 +345,7 @@ DtCompileMpst (
      DtPushSubtable (Subtable);
  
@@ -3442,10 +3442,10 @@ Index: acpica-unix-20200214/source/compiler/dttable2.c
  
      ParentTable = DtPeekSubtable ();
      DtInsertSubtable (ParentTable, Subtable);
-Index: acpica-unix-20200214/source/components/disassembler/dmbuffer.c
+Index: acpica-unix2-20200528/source/components/disassembler/dmbuffer.c
 ===================================================================
---- acpica-unix-20200214.orig/source/components/disassembler/dmbuffer.c
-+++ acpica-unix-20200214/source/components/disassembler/dmbuffer.c
+--- acpica-unix2-20200528.orig/source/components/disassembler/dmbuffer.c
++++ acpica-unix2-20200528/source/components/disassembler/dmbuffer.c
 @@ -204,7 +204,7 @@ AcpiDmByteList (
  
  
@@ -3455,7 +3455,7 @@ Index: acpica-unix-20200214/source/components/disassembler/dmbuffer.c
  
      /*
       * The byte list belongs to a buffer, and can be produced by either
-@@ -304,7 +304,8 @@ AcpiDmIsUuidBuffer (
+@@ -308,7 +308,8 @@ AcpiDmIsUuidBuffer (
      /* Extract the byte list info */
  
      ByteData = NextOp->Named.Data;
@@ -3465,7 +3465,7 @@ Index: acpica-unix-20200214/source/components/disassembler/dmbuffer.c
  
      /* Byte count must be exactly 16 */
  
-@@ -424,7 +425,8 @@ AcpiDmIsUnicodeBuffer (
+@@ -432,7 +433,8 @@ AcpiDmIsUnicodeBuffer (
      /* Extract the byte list info */
  
      ByteData = NextOp->Named.Data;
@@ -3475,7 +3475,7 @@ Index: acpica-unix-20200214/source/components/disassembler/dmbuffer.c
      WordCount = ACPI_DIV_2 (ByteCount);
  
      /*
-@@ -852,19 +854,22 @@ AcpiDmUnicode (
+@@ -869,19 +871,22 @@ AcpiDmUnicode (
      UINT32                  WordCount;
      UINT32                  i;
      int                     OutputValue;
@@ -3500,7 +3500,7 @@ Index: acpica-unix-20200214/source/components/disassembler/dmbuffer.c
  
          /* Handle values that must be escaped */
  
-@@ -973,16 +978,18 @@ AcpiDmCheckForHardwareId (
+@@ -990,16 +995,18 @@ AcpiDmCheckForHardwareId (
      ACPI_PARSE_OBJECT       *Op)
  {
      UINT32                  Name;
@@ -3521,10 +3521,10 @@ Index: acpica-unix-20200214/source/components/disassembler/dmbuffer.c
  
      NextOp = AcpiPsGetDepthNext (NULL, Op);
      if (!NextOp)
-Index: acpica-unix-20200214/source/components/disassembler/dmopcode.c
+Index: acpica-unix2-20200528/source/components/disassembler/dmopcode.c
 ===================================================================
---- acpica-unix-20200214.orig/source/components/disassembler/dmopcode.c
-+++ acpica-unix-20200214/source/components/disassembler/dmopcode.c
+--- acpica-unix2-20200528.orig/source/components/disassembler/dmopcode.c
++++ acpica-unix2-20200528/source/components/disassembler/dmopcode.c
 @@ -244,6 +244,7 @@ AcpiDmPredefinedDescription (
      char                        *NameString;
      int                         LastCharIsDigit;
@@ -3595,10 +3595,10 @@ Index: acpica-unix-20200214/source/components/disassembler/dmopcode.c
  
              Info->Level += 1;
              Info->MappingOp = Op;
-Index: acpica-unix-20200214/source/components/disassembler/dmresrcl.c
+Index: acpica-unix2-20200528/source/components/disassembler/dmresrcl.c
 ===================================================================
---- acpica-unix-20200214.orig/source/components/disassembler/dmresrcl.c
-+++ acpica-unix-20200214/source/components/disassembler/dmresrcl.c
+--- acpica-unix2-20200528.orig/source/components/disassembler/dmresrcl.c
++++ acpica-unix2-20200528/source/components/disassembler/dmresrcl.c
 @@ -141,7 +141,8 @@ AcpiDmMemoryFields (
      UINT32                  Level)
  {
@@ -3747,10 +3747,10 @@ Index: acpica-unix-20200214/source/components/disassembler/dmresrcl.c
      }
  
      AcpiDmIndent (Level);
-Index: acpica-unix-20200214/source/components/disassembler/dmresrcl2.c
+Index: acpica-unix2-20200528/source/components/disassembler/dmresrcl2.c
 ===================================================================
---- acpica-unix-20200214.orig/source/components/disassembler/dmresrcl2.c
-+++ acpica-unix-20200214/source/components/disassembler/dmresrcl2.c
+--- acpica-unix2-20200528.orig/source/components/disassembler/dmresrcl2.c
++++ acpica-unix2-20200528/source/components/disassembler/dmresrcl2.c
 @@ -191,22 +191,24 @@ AcpiDmGpioCommon (
      char                    *DeviceName = NULL;
      UINT32                  PinCount;
@@ -3974,10 +3974,10 @@ Index: acpica-unix-20200214/source/components/disassembler/dmresrcl2.c
  
      DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset);
      AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
-Index: acpica-unix-20200214/source/components/disassembler/dmresrcs.c
+Index: acpica-unix2-20200528/source/components/disassembler/dmresrcs.c
 ===================================================================
---- acpica-unix-20200214.orig/source/components/disassembler/dmresrcs.c
-+++ acpica-unix-20200214/source/components/disassembler/dmresrcs.c
+--- acpica-unix2-20200528.orig/source/components/disassembler/dmresrcs.c
++++ acpica-unix2-20200528/source/components/disassembler/dmresrcs.c
 @@ -72,6 +72,7 @@ AcpiDmIrqDescriptor (
      UINT32                  Length,
      UINT32                  Level)
@@ -4034,11 +4034,11 @@ Index: acpica-unix-20200214/source/components/disassembler/dmresrcs.c
  
      AcpiDmIndent (Level + 1);
      AcpiDmDumpInteger8 (Resource->FixedIo.AddressLength, "Length");
-Index: acpica-unix-20200214/source/components/dispatcher/dsfield.c
+Index: acpica-unix2-20200528/source/components/dispatcher/dsfield.c
 ===================================================================
---- acpica-unix-20200214.orig/source/components/dispatcher/dsfield.c
-+++ acpica-unix-20200214/source/components/dispatcher/dsfield.c
-@@ -324,6 +324,7 @@ AcpiDsGetFieldNames (
+--- acpica-unix2-20200528.orig/source/components/dispatcher/dsfield.c
++++ acpica-unix2-20200528/source/components/dispatcher/dsfield.c
+@@ -329,6 +329,7 @@ AcpiDsGetFieldNames (
      ACPI_STATUS             Status;
      UINT64                  Position;
      ACPI_PARSE_OBJECT       *Child;
@@ -4046,7 +4046,7 @@ Index: acpica-unix-20200214/source/components/dispatcher/dsfield.c
  
  #ifdef ACPI_EXEC_APP
      ACPI_OPERAND_OBJECT     *ResultDesc;
-@@ -437,10 +438,17 @@ AcpiDsGetFieldNames (
+@@ -442,10 +443,17 @@ AcpiDsGetFieldNames (
  
              /* Lookup the name, it should already exist */
  
@@ -4064,7 +4064,7 @@ Index: acpica-unix-20200214/source/components/dispatcher/dsfield.c
              if (ACPI_FAILURE (Status))
              {
                  ACPI_ERROR_NAMESPACE (WalkState->ScopeInfo,
-@@ -689,9 +697,17 @@ AcpiDsInitFieldObjects (
+@@ -703,9 +711,17 @@ AcpiDsInitFieldObjects (
           */
          if (Arg->Common.AmlOpcode == AML_INT_NAMEDFIELD_OP)
          {
@@ -4082,10 +4082,10 @@ Index: acpica-unix-20200214/source/components/dispatcher/dsfield.c
              if (ACPI_FAILURE (Status))
              {
                  ACPI_ERROR_NAMESPACE (WalkState->ScopeInfo,
-Index: acpica-unix-20200214/source/components/events/evgpeblk.c
+Index: acpica-unix2-20200528/source/components/events/evgpeblk.c
 ===================================================================
---- acpica-unix-20200214.orig/source/components/events/evgpeblk.c
-+++ acpica-unix-20200214/source/components/events/evgpeblk.c
+--- acpica-unix2-20200528.orig/source/components/events/evgpeblk.c
++++ acpica-unix2-20200528/source/components/events/evgpeblk.c
 @@ -380,6 +380,7 @@ AcpiEvCreateGpeBlock (
      ACPI_STATUS             Status;
      ACPI_GPE_BLOCK_INFO     *GpeBlock;
@@ -4118,10 +4118,10 @@ Index: acpica-unix-20200214/source/components/events/evgpeblk.c
          InterruptNumber == AcpiGbl_FADT.SciInterrupt ? " (SCI)" : ""));
  
      /* Update global count of currently available GPEs */
-Index: acpica-unix-20200214/source/components/hardware/hwregs.c
+Index: acpica-unix2-20200528/source/components/hardware/hwregs.c
 ===================================================================
---- acpica-unix-20200214.orig/source/components/hardware/hwregs.c
-+++ acpica-unix-20200214/source/components/hardware/hwregs.c
+--- acpica-unix2-20200528.orig/source/components/hardware/hwregs.c
++++ acpica-unix2-20200528/source/components/hardware/hwregs.c
 @@ -197,7 +197,7 @@ AcpiHwValidateRegister (
       * Address must not be null. A null address also indicates an optional
       * ACPI register that is not supported, so no error message.
@@ -4131,10 +4131,10 @@ Index: acpica-unix-20200214/source/components/hardware/hwregs.c
      if (!(*Address))
      {
          return (AE_BAD_ADDRESS);
-Index: acpica-unix-20200214/source/components/hardware/hwvalid.c
+Index: acpica-unix2-20200528/source/components/hardware/hwvalid.c
 ===================================================================
---- acpica-unix-20200214.orig/source/components/hardware/hwvalid.c
-+++ acpica-unix-20200214/source/components/hardware/hwvalid.c
+--- acpica-unix2-20200528.orig/source/components/hardware/hwvalid.c
++++ acpica-unix2-20200528/source/components/hardware/hwvalid.c
 @@ -135,6 +135,8 @@ AcpiHwValidateIoRequest (
      UINT32                  ByteWidth;
      ACPI_IO_ADDRESS         LastAddress;
@@ -4156,10 +4156,10 @@ Index: acpica-unix-20200214/source/components/hardware/hwvalid.c
      {
          ACPI_ERROR ((AE_INFO,
              "Illegal I/O port address/length above 64K: %8.8X%8.8X/0x%X",
-Index: acpica-unix-20200214/source/components/namespace/nsaccess.c
+Index: acpica-unix2-20200528/source/components/namespace/nsaccess.c
 ===================================================================
---- acpica-unix-20200214.orig/source/components/namespace/nsaccess.c
-+++ acpica-unix-20200214/source/components/namespace/nsaccess.c
+--- acpica-unix2-20200528.orig/source/components/namespace/nsaccess.c
++++ acpica-unix2-20200528/source/components/namespace/nsaccess.c
 @@ -349,6 +349,7 @@ AcpiNsLookup (
      UINT32                  SearchParentFlag = ACPI_NS_SEARCH_PARENT;
      UINT32                  LocalFlags;
@@ -4180,10 +4180,10 @@ Index: acpica-unix-20200214/source/components/namespace/nsaccess.c
                      AcpiUtGetTypeName (ThisNode->Type),
                      AcpiUtGetTypeName (TypeToCheckFor)));
              }
-Index: acpica-unix-20200214/source/components/namespace/nsparse.c
+Index: acpica-unix2-20200528/source/components/namespace/nsparse.c
 ===================================================================
---- acpica-unix-20200214.orig/source/components/namespace/nsparse.c
-+++ acpica-unix-20200214/source/components/namespace/nsparse.c
+--- acpica-unix2-20200528.orig/source/components/namespace/nsparse.c
++++ acpica-unix2-20200528/source/components/namespace/nsparse.c
 @@ -216,13 +216,14 @@ AcpiNsOneCompleteParse (
  
      /* Table must consist of at least a complete header */
@@ -4201,10 +4201,10 @@ Index: acpica-unix-20200214/source/components/namespace/nsparse.c
  
      Status = AcpiTbGetOwnerId (TableIndex, &OwnerId);
      if (ACPI_FAILURE (Status))
-Index: acpica-unix-20200214/source/components/tables/tbdata.c
+Index: acpica-unix2-20200528/source/components/tables/tbdata.c
 ===================================================================
---- acpica-unix-20200214.orig/source/components/tables/tbdata.c
-+++ acpica-unix-20200214/source/components/tables/tbdata.c
+--- acpica-unix2-20200528.orig/source/components/tables/tbdata.c
++++ acpica-unix2-20200528/source/components/tables/tbdata.c
 @@ -552,6 +552,7 @@ AcpiTbVerifyTempTable (
      UINT32                  *TableIndex)
  {
@@ -4223,10 +4223,10 @@ Index: acpica-unix-20200214/source/components/tables/tbdata.c
          if (ACPI_FAILURE (Status))
          {
              ACPI_EXCEPTION ((AE_INFO, AE_NO_MEMORY,
-Index: acpica-unix-20200214/source/components/tables/tbfadt.c
+Index: acpica-unix2-20200528/source/components/tables/tbfadt.c
 ===================================================================
---- acpica-unix-20200214.orig/source/components/tables/tbfadt.c
-+++ acpica-unix-20200214/source/components/tables/tbfadt.c
+--- acpica-unix2-20200528.orig/source/components/tables/tbfadt.c
++++ acpica-unix2-20200528/source/components/tables/tbfadt.c
 @@ -424,18 +424,20 @@ AcpiTbCreateLocalFadt (
      ACPI_TABLE_HEADER       *Table,
      UINT32                  Length)
@@ -4338,10 +4338,10 @@ Index: acpica-unix-20200214/source/components/tables/tbfadt.c
                  "PmRegisters", 0);
          }
      }
-Index: acpica-unix-20200214/source/components/tables/tbfind.c
+Index: acpica-unix2-20200528/source/components/tables/tbfind.c
 ===================================================================
---- acpica-unix-20200214.orig/source/components/tables/tbfind.c
-+++ acpica-unix-20200214/source/components/tables/tbfind.c
+--- acpica-unix2-20200528.orig/source/components/tables/tbfind.c
++++ acpica-unix2-20200528/source/components/tables/tbfind.c
 @@ -108,8 +108,11 @@ AcpiTbFindTable (
      (void) AcpiUtAcquireMutex (ACPI_MTX_TABLES);
      for (i = 0; i < AcpiGbl_RootTableList.CurrentTableCount; ++i)
@@ -4355,10 +4355,10 @@ Index: acpica-unix-20200214/source/components/tables/tbfind.c
          {
              /* Not the requested table */
  
-Index: acpica-unix-20200214/source/components/tables/tbprint.c
+Index: acpica-unix2-20200528/source/components/tables/tbprint.c
 ===================================================================
---- acpica-unix-20200214.orig/source/components/tables/tbprint.c
-+++ acpica-unix-20200214/source/components/tables/tbprint.c
+--- acpica-unix2-20200528.orig/source/components/tables/tbprint.c
++++ acpica-unix2-20200528/source/components/tables/tbprint.c
 @@ -143,15 +143,18 @@ AcpiTbPrintTableHeader (
      ACPI_TABLE_HEADER       *Header)
  {
@@ -4400,10 +4400,10 @@ Index: acpica-unix-20200214/source/components/tables/tbprint.c
      }
  }
  
-Index: acpica-unix-20200214/source/components/tables/tbutils.c
+Index: acpica-unix2-20200528/source/components/tables/tbutils.c
 ===================================================================
---- acpica-unix-20200214.orig/source/components/tables/tbutils.c
-+++ acpica-unix-20200214/source/components/tables/tbutils.c
+--- acpica-unix2-20200528.orig/source/components/tables/tbutils.c
++++ acpica-unix2-20200528/source/components/tables/tbutils.c
 @@ -238,7 +238,7 @@ AcpiTbGetRootTableEntry (
           * 64-bit platform, XSDT: Move (unaligned) 64-bit to local,
           *  return 64-bit
@@ -4463,10 +4463,10 @@ Index: acpica-unix-20200214/source/components/tables/tbutils.c
          {
              AcpiGbl_FadtIndex = TableIndex;
              AcpiTbParseFadt ();
-Index: acpica-unix-20200214/source/components/tables/tbxface.c
+Index: acpica-unix2-20200528/source/components/tables/tbxface.c
 ===================================================================
---- acpica-unix-20200214.orig/source/components/tables/tbxface.c
-+++ acpica-unix-20200214/source/components/tables/tbxface.c
+--- acpica-unix2-20200528.orig/source/components/tables/tbxface.c
++++ acpica-unix2-20200528/source/components/tables/tbxface.c
 @@ -293,8 +293,11 @@ AcpiGetTableHeader (
  
      for (i = 0, j = 0; i < AcpiGbl_RootTableList.CurrentTableCount; i++)
@@ -4480,10 +4480,10 @@ Index: acpica-unix-20200214/source/components/tables/tbxface.c
          {
              continue;
          }
-Index: acpica-unix-20200214/source/components/tables/tbxfload.c
+Index: acpica-unix2-20200528/source/components/tables/tbxfload.c
 ===================================================================
---- acpica-unix-20200214.orig/source/components/tables/tbxfload.c
-+++ acpica-unix-20200214/source/components/tables/tbxfload.c
+--- acpica-unix2-20200528.orig/source/components/tables/tbxfload.c
++++ acpica-unix2-20200528/source/components/tables/tbxfload.c
 @@ -153,6 +153,7 @@ AcpiTbLoadNamespace (
      ACPI_TABLE_DESC         *Table;
      UINT32                  TablesLoaded = 0;
@@ -4503,10 +4503,10 @@ Index: acpica-unix-20200214/source/components/tables/tbxfload.c
           ACPI_FAILURE (AcpiTbValidateTable (Table)))
      {
          Status = AE_NO_ACPI_TABLES;
-Index: acpica-unix-20200214/source/tools/acpiexec/aetables.c
+Index: acpica-unix2-20200528/source/tools/acpiexec/aetables.c
 ===================================================================
---- acpica-unix-20200214.orig/source/tools/acpiexec/aetables.c
-+++ acpica-unix-20200214/source/tools/acpiexec/aetables.c
+--- acpica-unix2-20200528.orig/source/tools/acpiexec/aetables.c
++++ acpica-unix2-20200528/source/tools/acpiexec/aetables.c
 @@ -146,21 +146,25 @@ AeInitializeTableHeader (
      char                    *Signature,
      UINT32                  Length)
@@ -4658,10 +4658,10 @@ Index: acpica-unix-20200214/source/tools/acpiexec/aetables.c
      }
  
      return (AE_OK);
-Index: acpica-unix-20200214/source/common/dmswitch.c
+Index: acpica-unix2-20200528/source/common/dmswitch.c
 ===================================================================
---- acpica-unix-20200214.orig/source/common/dmswitch.c
-+++ acpica-unix-20200214/source/common/dmswitch.c
+--- acpica-unix2-20200528.orig/source/common/dmswitch.c
++++ acpica-unix2-20200528/source/common/dmswitch.c
 @@ -88,13 +88,15 @@ AcpiDmProcessSwitch (
      ACPI_PARSE_OBJECT_LIST  *Current;
      ACPI_PARSE_OBJECT_LIST  *Previous;
diff --git a/f23-harden.patch b/f23-harden.patch
index eacb454..5e80d46 100644
--- a/f23-harden.patch
+++ b/f23-harden.patch
@@ -8,11 +8,11 @@ From: Al Stone <ahs3@redhat.com>
  generate/unix/iasl/Makefile   |   13 +++++++------
  2 files changed, 9 insertions(+), 6 deletions(-)
 
-Index: acpica-unix-20200214/generate/unix/Makefile.config
+Index: acpica-unix2-20200528/generate/unix/Makefile.config
 ===================================================================
---- acpica-unix-20200214.orig/generate/unix/Makefile.config
-+++ acpica-unix-20200214/generate/unix/Makefile.config
-@@ -190,6 +190,8 @@ ifneq ($(NOFORTIFY),TRUE)
+--- acpica-unix2-20200528.orig/generate/unix/Makefile.config
++++ acpica-unix2-20200528/generate/unix/Makefile.config
+@@ -189,6 +189,8 @@ ifneq ($(NOFORTIFY),TRUE)
  OPT_CFLAGS += -D_FORTIFY_SOURCE=2
  endif
  
@@ -21,10 +21,10 @@ Index: acpica-unix-20200214/generate/unix/Makefile.config
  CFLAGS += \
      -D$(ACPI_HOST)\
      -D_GNU_SOURCE\
-Index: acpica-unix-20200214/generate/unix/iasl/Makefile
+Index: acpica-unix2-20200528/generate/unix/iasl/Makefile
 ===================================================================
---- acpica-unix-20200214.orig/generate/unix/iasl/Makefile
-+++ acpica-unix-20200214/generate/unix/iasl/Makefile
+--- acpica-unix2-20200528.orig/generate/unix/iasl/Makefile
++++ acpica-unix2-20200528/generate/unix/iasl/Makefile
 @@ -358,34 +358,35 @@ $(OBJDIR)/prparserparse.c $(OBJDIR)/prpa
  # Cannot use the common compile warning flags since the C files are created
  # by the utilities above and they are not necessarily ANSI C, etc.
diff --git a/facp.patch b/facp.patch
index 8b6bef7..a8e9fe9 100644
--- a/facp.patch
+++ b/facp.patch
@@ -13,11 +13,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/common/dmtbinfo.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/source/common/dmtbinfo.c b/source/common/dmtbinfo.c
-index 2e1c54f84..07d3ce099 100644
---- a/source/common/dmtbinfo.c
-+++ b/source/common/dmtbinfo.c
-@@ -292,7 +292,7 @@ ACPI_DMTABLE_INFO           AcpiDmTableInfoFacs[] =
+Index: acpica-unix2-20200528/source/common/dmtbinfo.c
+===================================================================
+--- acpica-unix2-20200528.orig/source/common/dmtbinfo.c
++++ acpica-unix2-20200528/source/common/dmtbinfo.c
+@@ -184,7 +184,7 @@ ACPI_DMTABLE_INFO           AcpiDmTableI
  ACPI_DMTABLE_INFO           AcpiDmTableInfoFadt1[] =
  {
      {ACPI_DMT_UINT32,   ACPI_FADT_OFFSET (Facs),                    "FACS Address", 0},
@@ -26,6 +26,3 @@ index 2e1c54f84..07d3ce099 100644
      {ACPI_DMT_UINT8,    ACPI_FADT_OFFSET (Model),                   "Model", 0},
      {ACPI_DMT_FADTPM,   ACPI_FADT_OFFSET (PreferredProfile),        "PM Profile", 0},
      {ACPI_DMT_UINT16,   ACPI_FADT_OFFSET (SciInterrupt),            "SCI Interrupt", 0},
--- 
-2.20.1
-
diff --git a/int-format.patch b/int-format.patch
index bf0b05c..5cbb5c3 100644
--- a/int-format.patch
+++ b/int-format.patch
@@ -21,11 +21,11 @@ From: Al Stone <ahs3@redhat.com>
  source/components/utilities/utownerid.c |    2 +-
  18 files changed, 28 insertions(+), 28 deletions(-)
 
-Index: acpica-unix-20191018/source/compiler/aslerror.c
+Index: acpica-unix2-20200528/source/compiler/aslerror.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/aslerror.c
-+++ acpica-unix-20191018/source/compiler/aslerror.c
-@@ -898,7 +898,7 @@ AslLogNewError (
+--- acpica-unix2-20200528.orig/source/compiler/aslerror.c
++++ acpica-unix2-20200528/source/compiler/aslerror.c
+@@ -917,7 +917,7 @@ AslLogNewError (
      AslGbl_ExceptionCount[ModifiedLevel]++;
      if (!AslGbl_IgnoreErrors && AslGbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT)
      {
@@ -34,10 +34,10 @@ Index: acpica-unix-20191018/source/compiler/aslerror.c
  
          AslGbl_SourceLine = 0;
          AslGbl_NextError = AslGbl_ErrorLog;
-Index: acpica-unix-20191018/source/compiler/aslopt.c
+Index: acpica-unix2-20200528/source/compiler/aslopt.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/aslopt.c
-+++ acpica-unix-20191018/source/compiler/aslopt.c
+--- acpica-unix2-20200528.orig/source/compiler/aslopt.c
++++ acpica-unix2-20200528/source/compiler/aslopt.c
 @@ -583,7 +583,7 @@ OptOptimizeNamePath (
      }
  
@@ -47,10 +47,10 @@ Index: acpica-unix-20191018/source/compiler/aslopt.c
          Op->Asl.LogicalLineNumber,
          AcpiPsGetOpcodeName (Op->Common.Parent->Common.AmlOpcode),
          AcpiPsGetOpcodeName (Op->Common.AmlOpcode)));
-Index: acpica-unix-20191018/source/compiler/aslprepkg.c
+Index: acpica-unix2-20200528/source/compiler/aslprepkg.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/aslprepkg.c
-+++ acpica-unix-20191018/source/compiler/aslprepkg.c
+--- acpica-unix2-20200528.orig/source/compiler/aslprepkg.c
++++ acpica-unix2-20200528/source/compiler/aslprepkg.c
 @@ -309,7 +309,7 @@ ApCheckPackage (
  
          if (Count & 1)
@@ -60,10 +60,10 @@ Index: acpica-unix-20191018/source/compiler/aslprepkg.c
                  Predefined->Info.Name, Count);
  
              AslError (ASL_ERROR, ASL_MSG_RESERVED_PACKAGE_LENGTH,
-Index: acpica-unix-20191018/source/components/debugger/dbexec.c
+Index: acpica-unix2-20200528/source/components/debugger/dbexec.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/debugger/dbexec.c
-+++ acpica-unix-20191018/source/components/debugger/dbexec.c
+--- acpica-unix2-20200528.orig/source/components/debugger/dbexec.c
++++ acpica-unix2-20200528/source/components/debugger/dbexec.c
 @@ -230,7 +230,7 @@ AcpiDbExecuteMethod (
              ACPI_ERROR ((AE_INFO,
                  "Possible buffer overflow within AML Debugger "
@@ -73,10 +73,10 @@ Index: acpica-unix-20191018/source/components/debugger/dbexec.c
          }
      }
  
-Index: acpica-unix-20191018/source/components/dispatcher/dsmthdat.c
+Index: acpica-unix2-20200528/source/components/dispatcher/dsmthdat.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/dispatcher/dsmthdat.c
-+++ acpica-unix-20191018/source/components/dispatcher/dsmthdat.c
+--- acpica-unix2-20200528.orig/source/components/dispatcher/dsmthdat.c
++++ acpica-unix2-20200528/source/components/dispatcher/dsmthdat.c
 @@ -291,7 +291,7 @@ AcpiDsMethodDataGetNode (
          if (Index > ACPI_METHOD_MAX_LOCAL)
          {
@@ -95,10 +95,10 @@ Index: acpica-unix-20191018/source/components/dispatcher/dsmthdat.c
                  Index, ACPI_METHOD_MAX_ARG));
              return_ACPI_STATUS (AE_AML_INVALID_INDEX);
          }
-Index: acpica-unix-20191018/source/components/dispatcher/dsutils.c
+Index: acpica-unix2-20200528/source/components/dispatcher/dsutils.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/dispatcher/dsutils.c
-+++ acpica-unix-20191018/source/components/dispatcher/dsutils.c
+--- acpica-unix2-20200528.orig/source/components/dispatcher/dsutils.c
++++ acpica-unix2-20200528/source/components/dispatcher/dsutils.c
 @@ -786,7 +786,7 @@ AcpiDsCreateOperands (
      }
  
@@ -108,10 +108,10 @@ Index: acpica-unix-20191018/source/components/dispatcher/dsutils.c
          WalkState->NumOperands, ArgCount, Index));
  
      /* Create the interpreter arguments, in reverse order */
-Index: acpica-unix-20191018/source/components/dispatcher/dswscope.c
+Index: acpica-unix2-20200528/source/components/dispatcher/dswscope.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/dispatcher/dswscope.c
-+++ acpica-unix-20191018/source/components/dispatcher/dswscope.c
+--- acpica-unix2-20200528.orig/source/components/dispatcher/dswscope.c
++++ acpica-unix2-20200528/source/components/dispatcher/dswscope.c
 @@ -149,7 +149,7 @@ AcpiDsScopeStackPush (
      WalkState->ScopeDepth++;
  
@@ -130,10 +130,10 @@ Index: acpica-unix-20191018/source/components/dispatcher/dswscope.c
          (UINT32) WalkState->ScopeDepth,
          AcpiUtGetNodeName (ScopeInfo->Scope.Node),
          AcpiUtGetTypeName (ScopeInfo->Common.Value)));
-Index: acpica-unix-20191018/source/components/events/evgpe.c
+Index: acpica-unix2-20200528/source/components/events/evgpe.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/events/evgpe.c
-+++ acpica-unix-20191018/source/components/events/evgpe.c
+--- acpica-unix2-20200528.orig/source/components/events/evgpe.c
++++ acpica-unix2-20200528/source/components/events/evgpe.c
 @@ -488,7 +488,7 @@ AcpiEvGpeDetect (
                      "Ignore disabled registers for GPE %02X-%02X: "
                      "RunEnable=%02X, WakeEnable=%02X\n",
@@ -143,10 +143,10 @@ Index: acpica-unix-20191018/source/components/events/evgpe.c
                      GpeRegisterInfo->EnableForRun,
                      GpeRegisterInfo->EnableForWake));
                  continue;
-Index: acpica-unix-20191018/source/components/executer/exdump.c
+Index: acpica-unix2-20200528/source/components/executer/exdump.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/executer/exdump.c
-+++ acpica-unix-20191018/source/components/executer/exdump.c
+--- acpica-unix2-20200528.orig/source/components/executer/exdump.c
++++ acpica-unix2-20200528/source/components/executer/exdump.c
 @@ -678,7 +678,7 @@ AcpiExDumpOperand (
      if (Depth > 0)
      {
@@ -156,10 +156,10 @@ Index: acpica-unix-20191018/source/components/executer/exdump.c
      }
      else
      {
-Index: acpica-unix-20191018/source/components/executer/exfldio.c
+Index: acpica-unix2-20200528/source/components/executer/exfldio.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/executer/exfldio.c
-+++ acpica-unix-20191018/source/components/executer/exfldio.c
+--- acpica-unix2-20200528.orig/source/components/executer/exfldio.c
++++ acpica-unix2-20200528/source/components/executer/exfldio.c
 @@ -681,8 +681,8 @@ AcpiExWriteWithUpdateRule (
  
              ACPI_ERROR ((AE_INFO,
@@ -171,10 +171,10 @@ Index: acpica-unix-20191018/source/components/executer/exfldio.c
              return_ACPI_STATUS (AE_AML_OPERAND_VALUE);
          }
      }
-Index: acpica-unix-20191018/source/components/executer/exnames.c
+Index: acpica-unix2-20200528/source/components/executer/exnames.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/executer/exnames.c
-+++ acpica-unix-20191018/source/components/executer/exnames.c
+--- acpica-unix2-20200528.orig/source/components/executer/exnames.c
++++ acpica-unix2-20200528/source/components/executer/exnames.c
 @@ -237,7 +237,7 @@ AcpiExNameSegment (
           */
          ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
@@ -193,10 +193,10 @@ Index: acpica-unix-20191018/source/components/executer/exnames.c
      }
  
      *InAmlAddress = ACPI_CAST_PTR (UINT8, AmlAddress);
-Index: acpica-unix-20191018/source/components/hardware/hwregs.c
+Index: acpica-unix2-20200528/source/components/hardware/hwregs.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/hardware/hwregs.c
-+++ acpica-unix-20191018/source/components/hardware/hwregs.c
+--- acpica-unix2-20200528.orig/source/components/hardware/hwregs.c
++++ acpica-unix2-20200528/source/components/hardware/hwregs.c
 @@ -460,7 +460,7 @@ AcpiHwClearAcpiStatus (
  
  
@@ -206,10 +206,10 @@ Index: acpica-unix-20191018/source/components/hardware/hwregs.c
          ACPI_FORMAT_UINT64 (AcpiGbl_XPm1aStatus.Address)));
  
      LockFlags = AcpiOsAcquireLock (AcpiGbl_HardwareLock);
-Index: acpica-unix-20191018/source/components/tables/tbfadt.c
+Index: acpica-unix2-20200528/source/components/tables/tbfadt.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/tables/tbfadt.c
-+++ acpica-unix-20191018/source/components/tables/tbfadt.c
+--- acpica-unix2-20200528.orig/source/components/tables/tbfadt.c
++++ acpica-unix2-20200528/source/components/tables/tbfadt.c
 @@ -233,7 +233,7 @@ AcpiTbInitGenericAddress (
          if (!(Flags & ACPI_FADT_GPE_REGISTER))
          {
@@ -237,10 +237,10 @@ Index: acpica-unix-20191018/source/components/tables/tbfadt.c
                          Name, Address32,
                          ACPI_FORMAT_UINT64 (Address64->Address),
                          AcpiGbl_Use32BitFadtAddresses ? 32 : 64));
-Index: acpica-unix-20191018/source/components/tables/tbxfroot.c
+Index: acpica-unix2-20200528/source/components/tables/tbxfroot.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/tables/tbxfroot.c
-+++ acpica-unix-20191018/source/components/tables/tbxfroot.c
+--- acpica-unix2-20200528.orig/source/components/tables/tbxfroot.c
++++ acpica-unix2-20200528/source/components/tables/tbxfroot.c
 @@ -177,7 +177,7 @@ AcpiFindRootPointer (
      {
          ACPI_ERROR ((AE_INFO,
@@ -268,10 +268,10 @@ Index: acpica-unix-20191018/source/components/tables/tbxfroot.c
  
          return_ACPI_STATUS (AE_NO_MEMORY);
      }
-Index: acpica-unix-20191018/source/components/utilities/utownerid.c
+Index: acpica-unix2-20200528/source/components/utilities/utownerid.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/utilities/utownerid.c
-+++ acpica-unix-20191018/source/components/utilities/utownerid.c
+--- acpica-unix2-20200528.orig/source/components/utilities/utownerid.c
++++ acpica-unix2-20200528/source/components/utilities/utownerid.c
 @@ -237,7 +237,7 @@ AcpiUtReleaseOwnerId (
      else
      {
diff --git a/sources b/sources
index ef5e62e..400e9a2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (acpica-unix2-20200326.tar.gz) = 5028fae5c976593b15cf429e62de30afef3af11ddac9351d9ec0de789d495b553d459e676bc4d3e862edc0c536487a7ee63a137d95c5d1783e6a17ab9114c202
-SHA512 (acpitests-unix-20200326.tar.gz) = 332b4ed016cee48662a5f4572e6d170461f02ee1386109a3970fbe8d104f2a2b14c19235ea43ae9b26e8faf9ef9597cb3d2148e498741361aca62978d0b62189
+SHA512 (acpica-unix2-20200430.tar.gz) = e6af40eba35ae2cee976267c1cccbdbe70ef038e217ffd4335585d0ffba323b50703546cb0b32d10ffc90ba7f90f6df9a34170155d7256b9fffdd7859b40cd11
+SHA512 (acpitests-unix-20200430.tar.gz) = f0c660f1dda45b89633da47d23b3c13b3865414bfa8b12af137d7d4de0e7ccb690aeee9c5fbe480801b5dc921c96af80054608d381a47637893d82d3a003467d

From 75b40f8005504c2a9f7ab0e91aaa192e03fe8d65 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Mon, 27 Jul 2020 11:42:42 +0000
Subject: [PATCH 23/82] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 acpica-tools.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/acpica-tools.spec b/acpica-tools.spec
index 4868994..10cfdeb 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -1,6 +1,6 @@
 Name:           acpica-tools
 Version:        20200430
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        ACPICA tools for the development and debug of ACPI tables
 
 License:        GPLv2
@@ -241,6 +241,9 @@ fi
 
 
 %changelog
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20200430-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Thu Jun 8 2020 Al Stone <ahs3@redhat.com> - 202004306-1
 - Update to 202004306 source tree, including patch refreshes
 

From ed7c04b852aeebb5b1adbacda0b6a9d9ea6fa19c Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 31 Jul 2020 23:48:13 +0000
Subject: [PATCH 24/82] - Second attempt - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 acpica-tools.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/acpica-tools.spec b/acpica-tools.spec
index 10cfdeb..6c5de80 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -1,6 +1,6 @@
 Name:           acpica-tools
 Version:        20200430
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        ACPICA tools for the development and debug of ACPI tables
 
 License:        GPLv2
@@ -241,6 +241,10 @@ fi
 
 
 %changelog
+* Fri Jul 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20200430-3
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20200430-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 

From 4188296ae35d15e002bf8ecae83f03963a71fa4d Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Sun, 13 Sep 2020 15:25:15 -0600
Subject: [PATCH 25/82] Merge in some changelog and spec file updates

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 acpica-tools.spec   |  4 ++--
 big-endian-v3.patch | 20 --------------------
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/acpica-tools.spec b/acpica-tools.spec
index 6c5de80..5ca9de6 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -48,7 +48,7 @@ Patch20:	aslcodegen.patch
 Patch21:	facp.patch
 Patch24:	armv7-str-fixes.patch
 Patch25:	dbtest.patch
-#Patch27:	big-endian-v3.patch
+Patch27:	big-endian-v3.patch
 
 BuildRequires:  bison patchutils flex gcc
 
@@ -124,7 +124,7 @@ gzip -dc %{SOURCE1} | tar -x --strip-components=1 -f -
 %patch21 -p1 -b .facp
 %patch24 -p1 -b .armv7-str-fixes
 %patch25 -p1 -b .dbtest
-#%patch27 -p1 -b .big-endian-v3
+%patch27 -p1 -b .big-endian-v3
 
 cp -p %{SOURCE2} README.Fedora
 cp -p %{SOURCE3} iasl.1
diff --git a/big-endian-v3.patch b/big-endian-v3.patch
index e3db4f6..93ef67d 100644
--- a/big-endian-v3.patch
+++ b/big-endian-v3.patch
@@ -104,26 +104,6 @@ diff -Naur acpica-unix2-20200214.orig/source/compiler/dttable2.c acpica-unix2-20
              }
              break;
  
-diff -Naur acpica-unix2-20200214.orig/source/compiler/aslxref.c acpica-unix2-20200214/source/compiler/aslxref.c
---- acpica-unix2-20200214.orig/source/compiler/aslxref.c	2020-02-14 10:33:53.000000000 -0700
-+++ acpica-unix2-20200214/source/compiler/aslxref.c	2020-02-26 13:21:43.973602232 -0700
-@@ -547,8 +547,14 @@
-      */
-     AslGbl_NsLookupCount++;
- 
--    Status = AcpiNsLookup (WalkState->ScopeInfo, Path, ObjectType,
--        ACPI_IMODE_EXECUTE, Flags, WalkState, &Node);
-+    {
-+        UINT32 Tmp32;
-+
-+	ACPI_MOVE_32_TO_32(&Tmp32, Path);
-+
-+        Status = AcpiNsLookup (WalkState->ScopeInfo, (char *)&Tmp32, ObjectType,
-+            ACPI_IMODE_EXECUTE, Flags, WalkState, &Node);
-+    }
-     if (ACPI_FAILURE (Status))
-     {
-         if (Status == AE_NOT_FOUND)
 diff -Naur acpica-unix2-20200214.orig/source/compiler/aslload.c acpica-unix2-20200214/source/compiler/aslload.c
 --- acpica-unix2-20200214.orig/source/compiler/aslload.c	2020-02-14 10:33:53.000000000 -0700
 +++ acpica-unix2-20200214/source/compiler/aslload.c	2020-02-27 13:25:19.308413494 -0700

From 19a9c691f50a09b063e35cda130e771d104a74ef Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Sun, 13 Sep 2020 15:27:09 -0600
Subject: [PATCH 26/82] Update to 2020528 upstream source

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 .gitignore        | 2 ++
 acpica-tools.spec | 4 ++--
 sources           | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2e7eaf7..5ce6dab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -131,3 +131,5 @@ series
 /acpitests-unix-20200326.tar.gz
 /acpica-unix2-20200430.tar.gz
 /acpitests-unix-20200430.tar.gz
+/acpica-unix2-20200528.tar.gz
+/acpitests-unix-20200528.tar.gz
diff --git a/acpica-tools.spec b/acpica-tools.spec
index 5ca9de6..a0d0b26 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -1,6 +1,6 @@
 Name:           acpica-tools
-Version:        20200430
-Release:        3%{?dist}
+Version:        20200528
+Release:        1%{?dist}
 Summary:        ACPICA tools for the development and debug of ACPI tables
 
 License:        GPLv2
diff --git a/sources b/sources
index 400e9a2..4c6cff9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (acpica-unix2-20200430.tar.gz) = e6af40eba35ae2cee976267c1cccbdbe70ef038e217ffd4335585d0ffba323b50703546cb0b32d10ffc90ba7f90f6df9a34170155d7256b9fffdd7859b40cd11
-SHA512 (acpitests-unix-20200430.tar.gz) = f0c660f1dda45b89633da47d23b3c13b3865414bfa8b12af137d7d4de0e7ccb690aeee9c5fbe480801b5dc921c96af80054608d381a47637893d82d3a003467d
+SHA512 (acpica-unix2-20200528.tar.gz) = e1a924c2e50e84deaa409da1323dec3307aefb130a8d88e5414e29999a670ba1cd63f6c3a0efdbdb3a2423d9023b5adad4d4136d8cf5bbd66affe20c747f39bb
+SHA512 (acpitests-unix-20200528.tar.gz) = 9c4d25a8e2a358ee2251b47cff759a76c653cc89894fc6dc91cb765d0340f67abdee8f44b0e47397c2507ab6e10a2b40bb6169befcdd3384ff010bdbfdd58518

From 335268930f1d7dbc2caf36ddd8ca4c11cfae24d0 Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Sun, 13 Sep 2020 15:30:34 -0600
Subject: [PATCH 27/82] Update to 20200717 upstream source

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 .gitignore        | 2 ++
 acpica-tools.spec | 2 +-
 sources           | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5ce6dab..7997d0c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -133,3 +133,5 @@ series
 /acpitests-unix-20200430.tar.gz
 /acpica-unix2-20200528.tar.gz
 /acpitests-unix-20200528.tar.gz
+/acpica-unix2-20200717.tar.gz
+/acpitests-unix-20200717.tar.gz
diff --git a/acpica-tools.spec b/acpica-tools.spec
index a0d0b26..1c5f6dc 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -1,5 +1,5 @@
 Name:           acpica-tools
-Version:        20200528
+Version:        20200717
 Release:        1%{?dist}
 Summary:        ACPICA tools for the development and debug of ACPI tables
 
diff --git a/sources b/sources
index 4c6cff9..93122b8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (acpica-unix2-20200528.tar.gz) = e1a924c2e50e84deaa409da1323dec3307aefb130a8d88e5414e29999a670ba1cd63f6c3a0efdbdb3a2423d9023b5adad4d4136d8cf5bbd66affe20c747f39bb
-SHA512 (acpitests-unix-20200528.tar.gz) = 9c4d25a8e2a358ee2251b47cff759a76c653cc89894fc6dc91cb765d0340f67abdee8f44b0e47397c2507ab6e10a2b40bb6169befcdd3384ff010bdbfdd58518
+SHA512 (acpica-unix2-20200717.tar.gz) = d477911d9dded34e887f77f396d84b85334b66983d3104ba8ee0ade09186abacfceec9ecec96fa6fce886da5fe0d187c2cdeed62cca467cdae049e2fe011391a
+SHA512 (acpitests-unix-20200717.tar.gz) = 02c6674cbb2d98f783f25c71b1f391713de6fb3b56e5b57de9a7ccba0927453be4db8aea513e6e7ad491fcf3a0b2c14fefe8a2b82877a2ae01ea1d7832d36844

From 02a30e0c2ee5cb59b8cefaec5b82f005e78c655d Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Sun, 13 Sep 2020 15:33:00 -0600
Subject: [PATCH 28/82] Correct bad date in changelog

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 acpica-tools.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/acpica-tools.spec b/acpica-tools.spec
index 1c5f6dc..a5124d0 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -248,7 +248,7 @@ fi
 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20200430-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
-* Thu Jun 8 2020 Al Stone <ahs3@redhat.com> - 202004306-1
+* Mon Jun 8 2020 Al Stone <ahs3@redhat.com> - 202004306-1
 - Update to 202004306 source tree, including patch refreshes
 
 * Wed Apr 1 2020 Al Stone <ahs3@redhat.com> - 20200326-1

From 6337b475f00a21e629606bd28b18141d2730b05d Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Sun, 13 Sep 2020 15:49:37 -0600
Subject: [PATCH 29/82] Update expected test result

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 grammar.asl.result | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/grammar.asl.result b/grammar.asl.result
index c4b9c48..19f6e2e 100644
--- a/grammar.asl.result
+++ b/grammar.asl.result
@@ -133,21 +133,12 @@ Warning  3038 -                                    ^ Truncating 64-bit constant
 grammar.asl   1396:         if (LNotEqual (Local0, 0x1234567887654321))
 Warning  3038 -   Truncating 64-bit constant found in 32-bit table ^ 
 
-grammar.asl   1411:         Field (\_SB_.MEM.SMEM, AnyAcc, NoLock, Preserve)
-Remark   2173 -                                ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\FLDX)
-
-grammar.asl   1418:         Field (\_SB_.MEM.SMEM, AnyAcc, NoLock, Preserve)
-Remark   2173 -                                ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\FLDX)
-
 grammar.asl   1445:         Name (BUFO, Buffer (32) {})
 Remark   2173 -                     ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\OBJ2)
 
 grammar.asl   1448:         OperationRegion (OPR2, SystemMemory, Arg0, 256)
 Remark   2173 -                                ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\OBJ2)
 
-grammar.asl   1451:         Field (OPR2, ByteAcc, NoLock, Preserve)
-Remark   2173 -                      ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\OBJ2)
-
 grammar.asl   1462:         BankField (OPR2, BNK2, 0, ByteAcc, NoLock, Preserve)
 Remark   2173 -                          ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\OBJ2)
 
@@ -331,9 +322,6 @@ Warning  3175 -                                   ^ Static OperationRegion shoul
 grammar.asl   4693:             OperationRegion (RAM, SystemMemory, 0x800000, 256)
 Remark   2173 -                                   ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\XORD.TEST)
 
-grammar.asl   4694:             Field (RAM, ByteAcc, NoLock, Preserve)
-Remark   2173 -                         ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\XORD.TEST)
-
 grammar.asl   5022:     Device (CRBF)
 Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
 
@@ -343,15 +331,6 @@ Warning  3141 -                   ^ Missing dependency (Device object requires a
 grammar.asl   5117:             OperationRegion (RAM, SystemMemory, Arg0, 0x100)
 Remark   2173 -                                   ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\IDX4.MADM)
 
-grammar.asl   5118:             Field (RAM, DwordAcc, NoLock, Preserve)
-Remark   2173 -                         ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\IDX4.MADM)
-
-grammar.asl   5123:             Field (RAM, ByteAcc, NoLock, Preserve)
-Remark   2173 -                         ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\IDX4.MADM)
-
-grammar.asl   5159:             Field (RAM, ByteAcc, NoLock, Preserve)
-Remark   2173 -                         ^ Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\IDX4.MADM)
-
 grammar.asl   5639:     Device (EVNT)
 Warning  3141 -                   ^ Missing dependency (Device object requires a _HID or _ADR in same scope)
 
@@ -602,4 +581,4 @@ Ignoring all errors, forcing AML file generation
 ASL Input:     grammar.asl -  323653 bytes   4818 keywords  10284 source lines
 AML Output:    grammar.aml -   43758 bytes   4148 opcodes     670 named objects
 
-Compilation successful. 6 Errors, 93 Warnings, 99 Remarks, 1106 Optimizations
+Compilation successful. 6 Errors, 93 Warnings, 92 Remarks, 1106 Optimizations

From 97b38e48de60dcda464ba13c4571a9669a887813 Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Sun, 13 Sep 2020 16:37:40 -0600
Subject: [PATCH 30/82] Remove faulty patch from build

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 acpica-tools.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/acpica-tools.spec b/acpica-tools.spec
index a5124d0..6ae42c3 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -48,7 +48,7 @@ Patch20:	aslcodegen.patch
 Patch21:	facp.patch
 Patch24:	armv7-str-fixes.patch
 Patch25:	dbtest.patch
-Patch27:	big-endian-v3.patch
+#Patch27:	big-endian-v3.patch
 
 BuildRequires:  bison patchutils flex gcc
 
@@ -124,7 +124,7 @@ gzip -dc %{SOURCE1} | tar -x --strip-components=1 -f -
 %patch21 -p1 -b .facp
 %patch24 -p1 -b .armv7-str-fixes
 %patch25 -p1 -b .dbtest
-%patch27 -p1 -b .big-endian-v3
+#%patch27 -p1 -b .big-endian-v3
 
 cp -p %{SOURCE2} README.Fedora
 cp -p %{SOURCE3} iasl.1

From f9e9c6154d94616f56abe71120587c8f9fd85edb Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Thu, 15 Oct 2020 15:21:20 -0600
Subject: [PATCH 31/82] The acpinames command has been deprecated upstream

Remove the command and the man page.  Functionality replacing acpinames
is now found in acpiexec.

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 .gitignore        |   2 +
 acpica-tools.spec | 183 ++++++++++++++++++++++++++++++++--------------
 acpinames.1       |  49 -------------
 sources           |   4 +-
 4 files changed, 131 insertions(+), 107 deletions(-)
 delete mode 100644 acpinames.1

diff --git a/.gitignore b/.gitignore
index 7997d0c..9b16719 100644
--- a/.gitignore
+++ b/.gitignore
@@ -135,3 +135,5 @@ series
 /acpitests-unix-20200528.tar.gz
 /acpica-unix2-20200717.tar.gz
 /acpitests-unix-20200717.tar.gz
+/acpica-unix2-20200925.tar.gz
+/acpitests-unix-20200925.tar.gz
diff --git a/acpica-tools.spec b/acpica-tools.spec
index 6ae42c3..ad94d67 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -1,5 +1,5 @@
 Name:           acpica-tools
-Version:        20200717
+Version:        20200925
 Release:        1%{?dist}
 Summary:        ACPICA tools for the development and debug of ACPI tables
 
@@ -14,7 +14,6 @@ Source4:        acpibin.1
 Source5:        acpidump.1
 Source6:        acpiexec.1
 Source7:        acpihelp.1
-Source8:        acpinames.1
 Source9:        acpisrc.1
 Source10:       acpixtract.1
 Source11:       acpiexamples.1
@@ -24,31 +23,67 @@ Source14:       converterSample.asl.result
 Source15:       run-misc-tests.sh
 Source16:       COPYING
 
-Patch0:         big-endian.patch
-Patch1:         big-endian-dmtbdump.patch
-Patch2:         big-endian-dmtbdump1.patch
-Patch3:         big-endian-dmtbdump2.patch
-Patch4:         big-endian-dmtbdump3.patch
-Patch5:         unaligned.patch
-Patch6:         OPT_LDFLAGS.patch
-Patch7:         int-format.patch
-Patch8:         f23-harden.patch
-Patch9:         template.patch
-Patch10:        ppc64le.patch
-Patch11:        arm7hl.patch
-Patch12:        big-endian-v2.patch
-Patch13:        simple-64bit.patch
-Patch14:        mips-be-fix.patch
-Patch15:        cve-2017-13693.patch
-Patch16:        cve-2017-13694.patch
-Patch17:        cve-2017-13695.patch
-Patch18:        str-trunc-warn.patch
-Patch19:	ptr-cast.patch
-Patch20:	aslcodegen.patch
-Patch21:	facp.patch
-Patch24:	armv7-str-fixes.patch
-Patch25:	dbtest.patch
-#Patch27:	big-endian-v3.patch
+# the big-endian patch set
+Patch0:		0001-Add-in-basic-infrastructure-for-big-endian-support.patch
+Patch1:		0002-Modify-utility-functions-to-be-endian-agnostic.patch
+Patch2:		0003-Always-display-table-header-content-in-human-readabl.patch
+Patch3:		0004-Re-enable-support-for-big-endian-machines.patch
+Patch4:		0005-Support-MADT-aka-APIC-in-a-big-endian-world.patch
+Patch5:		0006-Support-ASF-tables-in-a-big-endian-world.patch
+Patch6:		0007-Support-CPEP-tables-in-a-big-endian-world.patch
+Patch7:		0008-Support-DBG2-table-in-a-big-endian-world.patch
+Patch8:		0009-Support-DMAR-in-a-big-endian-world.patch
+Patch9:		0010-Support-DRTM-in-a-big-endian-world.patch
+Patch10:	0011-Support-EINJ-in-a-big-endian-world.patch
+Patch11:	0012-Support-ERST-in-a-big-endian-world.patch
+Patch12:	0013-Support-FADT-aka-FACP-in-a-big-endian-world.patch
+Patch13:	0014-Support-most-FPDTs-in-a-big-endian-world.patch
+Patch14:	0015-Support-GTDT-in-a-big-endian-world.patch
+Patch15:	0016-Support-HEST-in-a-big-endian-world.patch
+Patch16:	0017-Support-RSDT-RSD-PTR-in-a-big-endian-world.patch
+Patch17:	0018-Support-XSDT-in-a-big-endian-world.patch
+Patch18:	0019-Support-SRAT-in-a-big-endian-world.patch
+Patch19:	0020-Support-SLIT-in-a-big-endian-world.patch
+Patch20:	0021-Support-MSCT-in-a-big-endian-world.patch
+Patch21:	0022-Support-MPST-in-a-big-endian-world.patch
+Patch22:	0023-Support-NFIT-in-a-big-endian-world.patch
+Patch23:	0024-Support-SDEV-in-a-big-endian-world.patch
+Patch24:	0025-Support-HMAT-in-a-big-endian-world.patch
+Patch25:	0026-Support-PDTT-in-a-big-endian-world.patch
+Patch25:	0027-Support-PPTT-in-a-big-endian-world.patch
+Patch27:	0028-Support-PCCT-in-a-big-endian-world.patch
+Patch28:	0029-Support-WDAT-in-a-big-endian-world.patch
+Patch29:	0030-Support-TCPA-in-a-big-endian-world.patch
+Patch30:	0031-Support-STAO-in-a-big-endian-world.patch
+Patch31:	0032-Support-SLIC-and-MSDM-in-a-big-endian-world.patch
+Patch32:	0033-Support-MCFG-in-a-big-endian-world.patch
+Patch33:	0034-Support-LPIT-in-a-big-endian-world.patch
+Patch34:	0035-Support-PMTT-in-a-big-endian-world.patch
+Patch35:	0036-Support-IORT-in-a-big-endian-world.patch
+Patch36:	0037-Support-IVRS-in-a-big-endian-world.patch
+Patch37:	0038-Support-TPM2-in-a-big-endian-world.patch
+Patch38:	0039-Add-partial-big-endian-support-for-WPBT-tables.patch
+Patch39:	0040-Support-DSDT-SSDT-in-a-big-endian-world.patch
+
+# other miscellaneous patch
+Patch40:	unaligned.patch
+Patch41:	OPT_LDFLAGS.patch
+Patch42:	int-format.patch
+Patch43:	f23-harden.patch
+Patch44:	template.patch
+Patch45:        ppc64le.patch
+Patch46:        arm7hl.patch
+Patch47:        simple-64bit.patch
+Patch48:        mips-be-fix.patch
+Patch49:        cve-2017-13693.patch
+Patch50:        cve-2017-13694.patch
+Patch51:        cve-2017-13695.patch
+Patch52:        str-trunc-warn.patch
+Patch53:	ptr-cast.patch
+Patch54:	aslcodegen.patch
+Patch55:	facp.patch
+Patch56:	armv7-str-fixes.patch
+Patch57:	dbtest.patch
 
 BuildRequires:  bison patchutils flex gcc
 
@@ -86,7 +121,6 @@ are installed:
    -- acpidump: write out the current contents of ACPI tables
    -- acpiexec: simulate AML execution in order to debug method definitions
    -- acpihelp: display help messages describing ASL keywords and op-codes
-   -- acpinames: display complete ACPI name space from input AML
    -- acpisrc: manipulate the ACPICA source tree and format source files
       for specific environments
    -- acpixtract: extract binary ACPI tables from acpidump output (see
@@ -98,33 +132,65 @@ This version of the tools is being released under GPLv2 license.
 %setup -q -n acpica-unix2-%{version}
 gzip -dc %{SOURCE1} | tar -x --strip-components=1 -f -
 
-%patch0  -p1 -b .big-endian
-%patch1  -p1 -b .big-endian-dmtbdump
-%patch2  -p1 -b .big-endian-dmtbdump1
-%patch3  -p1 -b .big-endian-dmtbdump2
-%patch4  -p1 -b .big-endian-dmtbdump3
-%patch5  -p1 -b .unaligned
-%patch6  -p1 -b .OPT_LDFLAGS
-%patch7  -p1 -b .int-format
-%patch8  -p1 -b .f23-harden
-# do not preserve a backup for this patch; it alters the results
-# of the template test case and forces it to fail
-%patch9  -p1
-%patch10 -p1 -b .ppc64le
-%patch11 -p1 -b .arm7hl
-%patch12 -p1 -b .big-endian-v2
-%patch13 -p1 -b .simple-64bit
-%patch14 -p1 -b .mips-be-fix
-%patch15 -p1 -b .cve-2017-13693
-%patch16 -p1 -b .cve-2017-13694
-%patch17 -p1 -b .cve-2017-13695
-%patch18 -p1 -b .str-trunc-warn
-%patch19 -p1 -b .ptr-cast
-%patch20 -p1 -b .aslcodegen
-%patch21 -p1 -b .facp
-%patch24 -p1 -b .armv7-str-fixes
-%patch25 -p1 -b .dbtest
-#%patch27 -p1 -b .big-endian-v3
+# apply all the patches
+%patch0
+%patch1
+%patch2
+%patch3
+%patch4
+%patch5
+%patch6
+%patch7
+%patch8
+%patch9
+%patch10
+%patch11
+%patch12
+%patch13
+%patch14
+%patch15
+%patch16
+%patch17
+%patch18
+%patch19
+%patch20
+%patch21
+%patch22
+%patch23
+%patch24
+%patch25
+%patch26
+%patch27
+%patch28
+%patch29
+%patch30
+%patch31
+%patch32
+%patch33
+%patch34
+%patch35
+%patch36
+%patch37
+%patch38
+%patch39
+%patch40
+%patch41
+%patch42
+%patch43
+%patch44
+%patch45
+%patch46
+%patch47
+%patch48
+%patch49
+%patch50
+%patch51
+%patch52
+%patch53
+%patch54
+%patch55
+%patch56
+%patch57
 
 cp -p %{SOURCE2} README.Fedora
 cp -p %{SOURCE3} iasl.1
@@ -132,7 +198,6 @@ cp -p %{SOURCE4} acpibin.1
 cp -p %{SOURCE5} acpidump.1
 cp -p %{SOURCE6} acpiexec.1
 cp -p %{SOURCE7} acpihelp.1
-cp -p %{SOURCE8} acpinames.1
 cp -p %{SOURCE9} acpisrc.1
 cp -p %{SOURCE10} acpixtract.1
 cp -p %{SOURCE11} acpiexamples.1
@@ -241,6 +306,12 @@ fi
 
 
 %changelog
+* Thu Oct 15 2020 Al Stone <ahs3@redhat.com> - 20200925-1
+- Update to 20200925 source tree
+- Completely revamp the old big-endian patches (maintainability was the goal)
+- The acpinames command has been deprecated upstrean; acpiexec provides 
+  replacement functionality
+
 * Fri Jul 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20200430-3
 - Second attempt - Rebuilt for
   https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
diff --git a/acpinames.1 b/acpinames.1
deleted file mode 100644
index 315d235..0000000
--- a/acpinames.1
+++ /dev/null
@@ -1,49 +0,0 @@
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH ACPINAMES 1 "January 23, 2013"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-acpinames \- ACPI name space dump utility
-.SH SYNOPSIS
-.B acpinames
-.RI <option> ...
-.RI <aml-file>
-
-.SH DESCRIPTION
-This manual page briefly documents the
-.B acpinames
-command. The option list is taken from the acpinames interactive help.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-.B acpinames
-prints out the complete ACPI name space for an AML file.
-.PP
-Much more detailed documentation may be found at
-http://www.acpica.org/documentation/.
-
-.SH OPTIONS
-
-.PP
-.TP
-.B \-? [<name-prefix>]
-Display this help message
-
-.SH AUTHOR
-acpinames was written by Robert Moore <robert.moore@intel.com>.
-.PP
-This manual page was written by Al Stone <ahs3@redhat.com> for the
-Fedora project (but may be used by others).
diff --git a/sources b/sources
index 93122b8..3e65507 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (acpica-unix2-20200717.tar.gz) = d477911d9dded34e887f77f396d84b85334b66983d3104ba8ee0ade09186abacfceec9ecec96fa6fce886da5fe0d187c2cdeed62cca467cdae049e2fe011391a
-SHA512 (acpitests-unix-20200717.tar.gz) = 02c6674cbb2d98f783f25c71b1f391713de6fb3b56e5b57de9a7ccba0927453be4db8aea513e6e7ad491fcf3a0b2c14fefe8a2b82877a2ae01ea1d7832d36844
+SHA512 (acpica-unix2-20200925.tar.gz) = e5009e6f38b145019406b2d237247f3063372bcd006371501991f338f974bf441c3de3162f5b800ff5f6eed4ab267ef4b715b2256cc9a6ae0a787eb0d0a24c68
+SHA512 (acpitests-unix-20200925.tar.gz) = 6b633b71aced285478cde2f044848b1b748f5dc0d7d9a968610f4036e21b26541c7e0cfe49c4e6298ae1c041b8a575f7969b1f2a50dbe5af88e8ffaccfd82e96

From edb6c78416617cb61568d79ba861ba6d367c653a Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Mon, 19 Oct 2020 12:24:09 -0600
Subject: [PATCH 32/82] Update to upstream 20200925 version

This update also means a major update for all of the big-endian patching
that has been done.  The older mechanism was getting to unwieldy to keep
maintained, and too sensitive to upstream changes.  Hence, redid all of
the old patches, and took the opportunity to make them more amenable to
change over time.  Ultimately, the goal is to have upstream accept these
in some form.

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 ...nfrastructure-for-big-endian-support.patch |  372 ++
 ...lity-functions-to-be-endian-agnostic.patch |  200 +
 ...able-header-content-in-human-readabl.patch |   51 +
 ...able-support-for-big-endian-machines.patch |   78 +
 ...-MADT-aka-APIC-in-a-big-endian-world.patch |   32 +
 ...ort-ASF-tables-in-a-big-endian-world.patch |   55 +
 ...rt-CPEP-tables-in-a-big-endian-world.patch |   32 +
 ...ort-DBG2-table-in-a-big-endian-world.patch |  254 +
 0009-Support-DMAR-in-a-big-endian-world.patch |  171 +
 0010-Support-DRTM-in-a-big-endian-world.patch |  112 +
 0011-Support-EINJ-in-a-big-endian-world.patch |   32 +
 0012-Support-ERST-in-a-big-endian-world.patch |   32 +
 ...-FADT-aka-FACP-in-a-big-endian-world.patch |  189 +
 ...ort-most-FPDTs-in-a-big-endian-world.patch |   85 +
 0015-Support-GTDT-in-a-big-endian-world.patch |   69 +
 0016-Support-HEST-in-a-big-endian-world.patch |   75 +
 ...t-RSDT-RSD-PTR-in-a-big-endian-world.patch |   37 +
 0018-Support-XSDT-in-a-big-endian-world.patch |   38 +
 0019-Support-SRAT-in-a-big-endian-world.patch |   52 +
 0020-Support-SLIT-in-a-big-endian-world.patch |   61 +
 0021-Support-MSCT-in-a-big-endian-world.patch |   43 +
 0022-Support-MPST-in-a-big-endian-world.patch |  152 +
 0023-Support-NFIT-in-a-big-endian-world.patch |  221 +
 0024-Support-SDEV-in-a-big-endian-world.patch |  256 +
 0025-Support-HMAT-in-a-big-endian-world.patch |  278 +
 0026-Support-PDTT-in-a-big-endian-world.patch |   43 +
 0027-Support-PPTT-in-a-big-endian-world.patch |  104 +
 0028-Support-PCCT-in-a-big-endian-world.patch |   54 +
 0029-Support-WDAT-in-a-big-endian-world.patch |   43 +
 0030-Support-TCPA-in-a-big-endian-world.patch |   76 +
 0031-Support-STAO-in-a-big-endian-world.patch |   40 +
 ...-SLIC-and-MSDM-in-a-big-endian-world.patch |   27 +
 0033-Support-MCFG-in-a-big-endian-world.patch |   50 +
 0034-Support-LPIT-in-a-big-endian-world.patch |   46 +
 0035-Support-PMTT-in-a-big-endian-world.patch |  216 +
 0036-Support-IORT-in-a-big-endian-world.patch |  365 ++
 0037-Support-IVRS-in-a-big-endian-world.patch |   96 +
 0038-Support-TPM2-in-a-big-endian-world.patch |  119 +
 ...l-big-endian-support-for-WPBT-tables.patch |   61 +
 ...port-DSDT-SSDT-in-a-big-endian-world.patch | 2682 ++++++++++
 OPT_LDFLAGS.patch                             |    6 +-
 acpica-tools.spec                             |  172 +-
 arm7hl.patch                                  |   10 +-
 armv7-str-fixes.patch                         |    9 +-
 aslcodegen.patch                              |   29 -
 big-endian-dmtbdump.patch                     |  162 -
 big-endian-dmtbdump1.patch                    |  637 ---
 big-endian-dmtbdump2.patch                    |  887 ----
 big-endian-dmtbdump3.patch                    |  250 -
 big-endian-v2.patch                           |   19 -
 big-endian-v3.patch                           |  140 -
 big-endian.patch                              | 4693 -----------------
 converterSample.asl.result                    |   17 +-
 cve-2017-13693.patch                          |    6 +-
 cve-2017-13694.patch                          |    6 +-
 cve-2017-13695.patch                          |    6 +-
 dbtest.patch                                  |   13 +-
 f23-harden.patch                              |   14 +-
 facp.patch                                    |    6 +-
 gcc9.patch                                    |   65 -
 grammar.asl.result                            |    8 +-
 int-format.patch                              |   98 +-
 mips-be-fix.patch                             |   23 +-
 ppc64le.patch                                 |   16 -
 ptr-cast.patch                                |   21 +-
 simple-64bit.patch                            |   11 +-
 str-trunc-warn.patch                          |   18 +-
 template.patch                                |    6 +-
 ull-32bit.patch                               |   12 +
 unaligned.patch                               |   12 +-
 70 files changed, 7249 insertions(+), 7122 deletions(-)
 create mode 100644 0001-Add-in-basic-infrastructure-for-big-endian-support.patch
 create mode 100644 0002-Modify-utility-functions-to-be-endian-agnostic.patch
 create mode 100644 0003-Always-display-table-header-content-in-human-readabl.patch
 create mode 100644 0004-Re-enable-support-for-big-endian-machines.patch
 create mode 100644 0005-Support-MADT-aka-APIC-in-a-big-endian-world.patch
 create mode 100644 0006-Support-ASF-tables-in-a-big-endian-world.patch
 create mode 100644 0007-Support-CPEP-tables-in-a-big-endian-world.patch
 create mode 100644 0008-Support-DBG2-table-in-a-big-endian-world.patch
 create mode 100644 0009-Support-DMAR-in-a-big-endian-world.patch
 create mode 100644 0010-Support-DRTM-in-a-big-endian-world.patch
 create mode 100644 0011-Support-EINJ-in-a-big-endian-world.patch
 create mode 100644 0012-Support-ERST-in-a-big-endian-world.patch
 create mode 100644 0013-Support-FADT-aka-FACP-in-a-big-endian-world.patch
 create mode 100644 0014-Support-most-FPDTs-in-a-big-endian-world.patch
 create mode 100644 0015-Support-GTDT-in-a-big-endian-world.patch
 create mode 100644 0016-Support-HEST-in-a-big-endian-world.patch
 create mode 100644 0017-Support-RSDT-RSD-PTR-in-a-big-endian-world.patch
 create mode 100644 0018-Support-XSDT-in-a-big-endian-world.patch
 create mode 100644 0019-Support-SRAT-in-a-big-endian-world.patch
 create mode 100644 0020-Support-SLIT-in-a-big-endian-world.patch
 create mode 100644 0021-Support-MSCT-in-a-big-endian-world.patch
 create mode 100644 0022-Support-MPST-in-a-big-endian-world.patch
 create mode 100644 0023-Support-NFIT-in-a-big-endian-world.patch
 create mode 100644 0024-Support-SDEV-in-a-big-endian-world.patch
 create mode 100644 0025-Support-HMAT-in-a-big-endian-world.patch
 create mode 100644 0026-Support-PDTT-in-a-big-endian-world.patch
 create mode 100644 0027-Support-PPTT-in-a-big-endian-world.patch
 create mode 100644 0028-Support-PCCT-in-a-big-endian-world.patch
 create mode 100644 0029-Support-WDAT-in-a-big-endian-world.patch
 create mode 100644 0030-Support-TCPA-in-a-big-endian-world.patch
 create mode 100644 0031-Support-STAO-in-a-big-endian-world.patch
 create mode 100644 0032-Support-SLIC-and-MSDM-in-a-big-endian-world.patch
 create mode 100644 0033-Support-MCFG-in-a-big-endian-world.patch
 create mode 100644 0034-Support-LPIT-in-a-big-endian-world.patch
 create mode 100644 0035-Support-PMTT-in-a-big-endian-world.patch
 create mode 100644 0036-Support-IORT-in-a-big-endian-world.patch
 create mode 100644 0037-Support-IVRS-in-a-big-endian-world.patch
 create mode 100644 0038-Support-TPM2-in-a-big-endian-world.patch
 create mode 100644 0039-Add-partial-big-endian-support-for-WPBT-tables.patch
 create mode 100644 0040-Support-DSDT-SSDT-in-a-big-endian-world.patch
 delete mode 100644 aslcodegen.patch
 delete mode 100644 big-endian-dmtbdump.patch
 delete mode 100644 big-endian-dmtbdump1.patch
 delete mode 100644 big-endian-dmtbdump2.patch
 delete mode 100644 big-endian-dmtbdump3.patch
 delete mode 100644 big-endian-v2.patch
 delete mode 100644 big-endian-v3.patch
 delete mode 100644 big-endian.patch
 delete mode 100644 gcc9.patch
 delete mode 100644 ppc64le.patch
 create mode 100644 ull-32bit.patch

diff --git a/0001-Add-in-basic-infrastructure-for-big-endian-support.patch b/0001-Add-in-basic-infrastructure-for-big-endian-support.patch
new file mode 100644
index 0000000..abd9298
--- /dev/null
+++ b/0001-Add-in-basic-infrastructure-for-big-endian-support.patch
@@ -0,0 +1,372 @@
+From bb45113bc9aed952a499cd1c53988dc81f597582 Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Thu, 15 Oct 2020 11:53:33 -0600
+Subject: [PATCH 01/40] Add in basic infrastructure for big-endian support
+
+This adds in some basic functions -- AcpiUtReadUint32(), for example,
+to read a UINT32 value in little-endian form and return it in host-native
+format -- along with AcpiUtWriteUint() that writes out an integer in
+host-native format as a little-endian value.
+
+But, to do that, I'm adding the functions in a new file: utendian.c.  So,
+the header files need fixing, and the makefiles need to be sure to compile
+the new code.
+
+However, this sets things up for the future, where endian-aware code can
+be added as the need is uncovered.  For now, these functions cover all of
+the cases I know about.
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ generate/unix/acpibin/Makefile         |   1 +
+ generate/unix/acpidump/Makefile        |   1 +
+ generate/unix/acpiexamples/Makefile    |   1 +
+ generate/unix/acpiexec/Makefile        |   1 +
+ generate/unix/acpihelp/Makefile        |   1 +
+ generate/unix/iasl/Makefile            |   1 +
+ source/components/utilities/utendian.c | 205 +++++++++++++++++++++++++
+ source/include/acutils.h               |  26 ++++
+ source/include/platform/aclinux.h      |   5 +
+ 9 files changed, 242 insertions(+)
+ create mode 100644 source/components/utilities/utendian.c
+
+Index: acpica-unix2-20200925/generate/unix/acpibin/Makefile
+===================================================================
+--- acpica-unix2-20200925.orig/generate/unix/acpibin/Makefile
++++ acpica-unix2-20200925/generate/unix/acpibin/Makefile
+@@ -37,6 +37,7 @@ OBJECTS = \
+ 	$(OBJDIR)/utcache.o\
+ 	$(OBJDIR)/utdebug.o\
+ 	$(OBJDIR)/utdecode.o\
++	$(OBJDIR)/utendian.o\
+ 	$(OBJDIR)/utexcep.o\
+ 	$(OBJDIR)/utglobal.o\
+ 	$(OBJDIR)/utlock.o\
+Index: acpica-unix2-20200925/generate/unix/acpidump/Makefile
+===================================================================
+--- acpica-unix2-20200925.orig/generate/unix/acpidump/Makefile
++++ acpica-unix2-20200925/generate/unix/acpidump/Makefile
+@@ -36,6 +36,7 @@ OBJECTS = \
+ 	$(OBJDIR)/osunixdir.o\
+ 	$(OBJDIR)/osunixmap.o\
+ 	$(OBJDIR)/osunixxf.o\
++	$(OBJDIR)/utendian.o\
+ 	$(OBJDIR)/tbprint.o\
+ 	$(OBJDIR)/tbxfroot.o\
+ 	$(OBJDIR)/utascii.o\
+Index: acpica-unix2-20200925/generate/unix/acpiexamples/Makefile
+===================================================================
+--- acpica-unix2-20200925.orig/generate/unix/acpiexamples/Makefile
++++ acpica-unix2-20200925/generate/unix/acpiexamples/Makefile
+@@ -139,6 +139,7 @@ OBJECTS = \
+ 	$(OBJDIR)/utdebug.o\
+ 	$(OBJDIR)/utdecode.o\
+ 	$(OBJDIR)/utdelete.o\
++	$(OBJDIR)/utendian.o\
+ 	$(OBJDIR)/uterror.o\
+ 	$(OBJDIR)/uteval.o\
+ 	$(OBJDIR)/utexcep.o\
+Index: acpica-unix2-20200925/generate/unix/acpiexec/Makefile
+===================================================================
+--- acpica-unix2-20200925.orig/generate/unix/acpiexec/Makefile
++++ acpica-unix2-20200925/generate/unix/acpiexec/Makefile
+@@ -214,6 +214,7 @@ OBJECTS = \
+ 	$(OBJDIR)/utdebug.o\
+ 	$(OBJDIR)/utdecode.o\
+ 	$(OBJDIR)/utdelete.o\
++	$(OBJDIR)/utendian.o\
+ 	$(OBJDIR)/uterror.o\
+ 	$(OBJDIR)/uteval.o\
+ 	$(OBJDIR)/utexcep.o\
+Index: acpica-unix2-20200925/generate/unix/acpihelp/Makefile
+===================================================================
+--- acpica-unix2-20200925.orig/generate/unix/acpihelp/Makefile
++++ acpica-unix2-20200925/generate/unix/acpihelp/Makefile
+@@ -43,6 +43,7 @@ OBJECTS = \
+ 	$(OBJDIR)/getopt.o\
+ 	$(OBJDIR)/osunixxf.o\
+ 	$(OBJDIR)/utdebug.o\
++	$(OBJDIR)/utendian.o\
+ 	$(OBJDIR)/utexcep.o\
+ 	$(OBJDIR)/utglobal.o\
+ 	$(OBJDIR)/uthex.o\
+Index: acpica-unix2-20200925/generate/unix/iasl/Makefile
+===================================================================
+--- acpica-unix2-20200925.orig/generate/unix/iasl/Makefile
++++ acpica-unix2-20200925/generate/unix/iasl/Makefile
+@@ -225,6 +225,7 @@ OBJECTS = \
+ 	$(OBJDIR)/utdebug.o\
+ 	$(OBJDIR)/utdecode.o\
+ 	$(OBJDIR)/utdelete.o\
++	$(OBJDIR)/utendian.o\
+ 	$(OBJDIR)/uterror.o\
+ 	$(OBJDIR)/utexcep.o\
+ 	$(OBJDIR)/utglobal.o\
+Index: acpica-unix2-20200925/source/components/utilities/utendian.c
+===================================================================
+--- /dev/null
++++ acpica-unix2-20200925/source/components/utilities/utendian.c
+@@ -0,0 +1,205 @@
++/******************************************************************************
++ *
++ * Module Name: utendian -- byte swapping support for other-endianness
++ *
++ *****************************************************************************/
++
++/*****************************************************************************
++ *
++ * Copyright (c) 2020, Al Stone <ahs3@redhat.com>
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions, and the following disclaimer,
++ *    without modification.
++ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
++ *    substantially similar to the "NO WARRANTY" disclaimer below
++ *    ("Disclaimer") and any redistribution must be conditioned upon
++ *    including a substantially similar Disclaimer requirement for further
++ *    binary redistribution.
++ * 3. Neither the names of the above-listed copyright holders nor the names
++ *    of any contributors may be used to endorse or promote products derived
++ *    from this software without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
++ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
++ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
++ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
++ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
++ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
++ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
++ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ *
++ * Alternatively, you may choose to be licensed under the terms of the
++ * GNU General Public License ("GPL") version 2 as published by the Free
++ * Software Foundation.
++ *
++ *****************************************************************************/
++
++#include "acpi.h"
++#include "accommon.h"
++
++#define _COMPONENT          ACPI_COMPILER
++        ACPI_MODULE_NAME    ("utendian")
++
++
++/*
++ * Endianness support functions.
++ *
++ * Ultimately, everything in ACPI tables or AML must be in little-endian
++ * format.  However, we sometimes find it necessary to run on a big-endian
++ * machine and create or read those little-endian values.  This is a small
++ * libary of functions to make that easier, and more visible.
++ *
++ */
++
++
++/*******************************************************************************
++ *
++ * FUNCTION:    AcpiUtReadUint16
++ *
++ * PARAMETERS:  Src		    - location containing the little-endian
++ *                                    value
++ *
++ * RETURN:      UINT16 value in host-native form
++ *
++ * DESCRIPTION: Read a UINT16 little-endian value from a given location
++ *              and return it in host-native form
++ *
++ ******************************************************************************/
++
++#if defined(ACPI_BIG_ENDIAN)
++UINT16 AcpiUtReadUint16 (void *SrcPtr)
++{
++    UINT16 Result = 0;
++    UINT8  *Dst = (UINT8 *)&Result;
++    UINT8  *Src = (UINT8 *)SrcPtr;
++
++    Dst[0] = Src[1];
++    Dst[1] = Src[0];
++
++    return Result;
++}
++#else
++UINT16 AcpiUtReadUint16 (void *SrcPtr) { return *(UINT16 *)SrcPtr; }
++#endif
++
++/*******************************************************************************
++ *
++ * FUNCTION:    AcpiUtReadUint32
++ *
++ * PARAMETERS:  Src		    - location containing the little-endian
++ *                                    value
++ *
++ * RETURN:      UINT32 value in host-native form
++ *
++ * DESCRIPTION: Read a UINT32 little-endian value from a given location
++ *              and return it in host-native form
++ *
++ ******************************************************************************/
++
++#if defined(ACPI_BIG_ENDIAN)
++UINT32 AcpiUtReadUint32 (void *SrcPtr)
++{
++    UINT32 Result = 0;
++    UINT8  *Dst = (UINT8 *)&Result;
++    UINT8  *Src = (UINT8 *)SrcPtr;
++
++    Dst[0] = Src[3];
++    Dst[1] = Src[2];
++    Dst[2] = Src[1];
++    Dst[3] = Src[0];
++
++    return Result;
++}
++#else
++UINT32 AcpiUtReadUint32 (void *SrcPtr) { return *(UINT32 *)SrcPtr; }
++#endif
++
++/*******************************************************************************
++ *
++ * FUNCTION:    AcpiUtReadUint64
++ *
++ * PARAMETERS:  Src		    - location containing the little-endian
++ *                                    value
++ *
++ * RETURN:      UINT64 value in host-native form
++ *
++ * DESCRIPTION: Read a UINT64 little-endian value from a given location
++ *              and return it in host-native form
++ *
++ ******************************************************************************/
++
++#if defined(ACPI_BIG_ENDIAN)
++UINT64 AcpiUtReadUint64 (void *SrcPtr)
++{
++    UINT64 Result = 0;
++    UINT8  *Dst = (UINT8 *)&Result;
++    UINT8  *Src = (UINT8 *)SrcPtr;
++
++    Dst[0] = Src[7];
++    Dst[1] = Src[6];
++    Dst[2] = Src[5];
++    Dst[3] = Src[4];
++    Dst[4] = Src[3];
++    Dst[5] = Src[2];
++    Dst[6] = Src[1];
++    Dst[7] = Src[0];
++
++    return Result;
++}
++#else
++UINT64 AcpiUtReadUint64 (void *SrcPtr) { return *(UINT64 *)SrcPtr; }
++#endif
++
++/*******************************************************************************
++ *
++ * FUNCTION:    AcpiUtWriteUint
++ *
++ * PARAMETERS:  DstPtr		- where to place the retrieved value
++ *	        DstLength	- space in bytes for this int type
++ *	        SrcPtr		- where the little-endian value lives
++ *	        SrcLength	- space in bytes for this int type
++ *
++ * RETURN:      None.
++ *
++ * DESCRIPTION: Write a host-native integer value of the given size, and
++ * 	        store it in the location specified in little-endian form.
++ * 	        Given the amount of integer type casting done, this general
++ * 	        version seems the most useful (vs 32->32, 32->16, 16->32,
++ * 	        ad infinitum)
++ *
++ ******************************************************************************/
++
++#if defined(ACPI_BIG_ENDIAN)
++void AcpiUtWriteUint (void *DstPtr, int DstLength,
++	              const void *SrcPtr, const int SrcLength)
++{
++    UINT8 *Dst = (UINT8 *)DstPtr;
++    UINT8 *Src = (UINT8 *)SrcPtr;
++    int Length;
++    int ii;
++
++    Length = SrcLength >= DstLength ? DstLength : SrcLength;
++    for (ii = 0; ii < Length; ii++)
++	    Dst[ii] = Src[SrcLength - ii - 1];
++
++}
++#else
++void AcpiUtWriteUint (void *DstPtr, int DstLength,
++	              const void *SrcPtr, const int SrcLength)
++{
++    UINT8 *Dst = (UINT8 *)DstPtr;
++    UINT8 *Src = (UINT8 *)SrcPtr;
++    uint Length;
++
++    Length = SrcLength > DstLength ? DstLength : SrcLength;
++    memcpy(Dst, Src, Length);
++}
++#endif
++
+Index: acpica-unix2-20200925/source/include/acutils.h
+===================================================================
+--- acpica-unix2-20200925.orig/source/include/acutils.h
++++ acpica-unix2-20200925/source/include/acutils.h
+@@ -1161,4 +1161,30 @@ AcpiUtConvertStringToUuid (
+     UINT8                   *UuidBuffer);
+ #endif
+ 
++/*
++ * utendian -- byte-swapping for big-endian support
++ */
++#if defined(ACPI_ASL_COMPILER) || defined(ACPI_EXEC_APP) || \
++    defined(ACPI_HELP_APP)     || defined(ACPI_DUMP_APP) || \
++    defined(ACPI_EXAMPLE_APP)  || defined(ACPI_BIN_APP)
++UINT32
++AcpiUtReadUint32 (
++    void                    *SrcPtr);
++
++UINT16
++AcpiUtReadUint16 (
++    void                    *SrcPtr);
++
++UINT64
++AcpiUtReadUint64 (
++    void                    *SrcPtr);
++
++void  
++AcpiUtWriteUint (
++    void                    *DstPtr,
++    int                     DstLength,
++    const void              *SrcPtr,
++    const int               SrcLength);
++#endif
++
+ #endif /* _ACUTILS_H */
+Index: acpica-unix2-20200925/source/include/platform/aclinux.h
+===================================================================
+--- acpica-unix2-20200925.orig/source/include/platform/aclinux.h
++++ acpica-unix2-20200925/source/include/platform/aclinux.h
+@@ -198,6 +198,7 @@
+ 
+ #ifdef ACPI_USE_STANDARD_HEADERS
+ #include <unistd.h>
++#include <endian.h>
+ #endif
+ 
+ /* Define/disable kernel-specific declarators */
+@@ -233,6 +234,10 @@
+ #define __cdecl
+ #endif
+ 
++#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
++#define ACPI_BIG_ENDIAN
++#endif
++
+ #endif /* __KERNEL__ */
+ 
+ #endif /* __ACLINUX_H__ */
diff --git a/0002-Modify-utility-functions-to-be-endian-agnostic.patch b/0002-Modify-utility-functions-to-be-endian-agnostic.patch
new file mode 100644
index 0000000..4b99375
--- /dev/null
+++ b/0002-Modify-utility-functions-to-be-endian-agnostic.patch
@@ -0,0 +1,200 @@
+From d0c879747147c24c47bae363359127d62cd0cae1 Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Fri, 18 Sep 2020 15:14:30 -0600
+Subject: [PATCH 02/40] Modify utility functions to be endian-agnostic
+
+All of the modifications here use the big-endian code previously added
+(see utendian.c) to make themselves endian-agnostic; i.e., that the code
+does not need to change further to work on both big- and little-endian
+machines.
+
+These particular files were changed to handle the reading and writing
+of files (the length is often embedded in the binary stream), and to
+handle the reading and writing of integer values.  The common cases are
+to "read" a 32-bit unsigned int in little-endian format, but convert it
+to host-native, and to write a byte, word, double word or quad word value
+as little-endian, regardless of host-native format.
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/common/acfileio.c           | 16 ++++++++++------
+ source/common/dmtable.c            |  8 ++++----
+ source/compiler/dtfield.c          |  2 +-
+ source/compiler/dtsubtable.c       |  4 ++--
+ source/components/tables/tbprint.c | 13 +++++++++----
+ 5 files changed, 26 insertions(+), 17 deletions(-)
+
+Index: acpica-unix2-20200925/source/common/acfileio.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/common/acfileio.c
++++ acpica-unix2-20200925/source/common/acfileio.c
+@@ -280,6 +280,7 @@ AcGetOneTableFromFile (
+     ACPI_TABLE_HEADER       *Table;
+     INT32                   Count;
+     long                    TableOffset;
++    UINT32		    Length;
+ 
+ 
+     *ReturnTable = NULL;
+@@ -319,7 +320,8 @@ AcGetOneTableFromFile (
+ 
+     /* Allocate a buffer for the entire table */
+ 
+-    Table = AcpiOsAllocate ((ACPI_SIZE) TableHeader.Length);
++    Length = AcpiUtReadUint32(&TableHeader.Length);
++    Table = AcpiOsAllocate ((ACPI_SIZE) Length);
+     if (!Table)
+     {
+         return (AE_NO_MEMORY);
+@@ -329,13 +331,13 @@ AcGetOneTableFromFile (
+ 
+     fseek (File, TableOffset, SEEK_SET);
+ 
+-    Count = fread (Table, 1, TableHeader.Length, File);
++    Count = fread (Table, 1, Length, File);
+ 
+     /*
+      * Checks for data table headers happen later in the execution. Only verify
+      * for Aml tables at this point in the code.
+      */
+-    if (GetOnlyAmlTables && Count != (INT32) TableHeader.Length)
++    if (GetOnlyAmlTables && Count != (INT32) Length)
+     {
+         Status = AE_ERROR;
+         goto ErrorExit;
+@@ -343,7 +345,7 @@ AcGetOneTableFromFile (
+ 
+     /* Validate the checksum (just issue a warning) */
+ 
+-    Status = AcpiTbVerifyChecksum (Table, TableHeader.Length);
++    Status = AcpiTbVerifyChecksum (Table, Length);
+     if (ACPI_FAILURE (Status))
+     {
+         Status = AcCheckTextModeCorruption (Table);
+@@ -436,6 +438,7 @@ AcValidateTableHeader (
+     long                    OriginalOffset;
+     UINT32                  FileSize;
+     UINT32                  i;
++    UINT32		    Length;
+ 
+ 
+     ACPI_FUNCTION_TRACE (AcValidateTableHeader);
+@@ -464,11 +467,12 @@ AcValidateTableHeader (
+     /* Validate table length against bytes remaining in the file */
+ 
+     FileSize = CmGetFileSize (File);
+-    if (TableHeader.Length > (UINT32) (FileSize - TableOffset))
++    Length = AcpiUtReadUint32(&TableHeader.Length);
++    if (Length > (UINT32) (FileSize - TableOffset))
+     {
+         fprintf (stderr, "Table [%4.4s] is too long for file - "
+             "needs: 0x%.2X, remaining in file: 0x%.2X\n",
+-            TableHeader.Signature, TableHeader.Length,
++            TableHeader.Signature, Length,
+             (UINT32) (FileSize - TableOffset));
+         return (AE_BAD_HEADER);
+     }
+Index: acpica-unix2-20200925/source/common/dmtable.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/common/dmtable.c
++++ acpica-unix2-20200925/source/common/dmtable.c
+@@ -534,7 +534,7 @@ AcpiDmDumpDataTable (
+         {
+             /* Dump the raw table data */
+ 
+-            Length = Table->Length;
++            Length = AcpiUtReadUint32(&Table->Length);
+ 
+             AcpiOsPrintf ("\n/*\n%s: Length %d (0x%X)\n\n",
+                 ACPI_RAW_TABLE_DATA_HEADER, Length, Length);
+@@ -551,7 +551,7 @@ AcpiDmDumpDataTable (
+      */
+     if (ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_FACS))
+     {
+-        Length = Table->Length;
++        Length = AcpiUtReadUint32(&Table->Length);
+         Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoFacs);
+         if (ACPI_FAILURE (Status))
+         {
+@@ -571,7 +571,7 @@ AcpiDmDumpDataTable (
+         /*
+          * All other tables must use the common ACPI table header, dump it now
+          */
+-        Length = Table->Length;
++        Length = AcpiUtReadUint32(&Table->Length);
+         Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoHeader);
+         if (ACPI_FAILURE (Status))
+         {
+@@ -1179,7 +1179,7 @@ AcpiDmDumpTable (
+ 
+             AcpiOsPrintf ("%2.2X", *Target);
+             Temp8 = AcpiDmGenerateChecksum (Table,
+-                ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Length,
++                AcpiUtReadUint32(&(ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Length)),
+                 ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Checksum);
+ 
+             if (Temp8 != ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Checksum)
+Index: acpica-unix2-20200925/source/compiler/dtfield.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/compiler/dtfield.c
++++ acpica-unix2-20200925/source/compiler/dtfield.c
+@@ -361,7 +361,7 @@ DtCompileInteger (
+         DtError (ASL_ERROR, ASL_MSG_INTEGER_SIZE, Field, AslGbl_MsgBuffer);
+     }
+ 
+-    memcpy (Buffer, &Value, ByteLength);
++    AcpiUtWriteUint(Buffer, ByteLength, &Value, sizeof(UINT64));
+     return;
+ }
+ 
+Index: acpica-unix2-20200925/source/compiler/dtsubtable.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/compiler/dtsubtable.c
++++ acpica-unix2-20200925/source/compiler/dtsubtable.c
+@@ -378,6 +378,6 @@ DtSetSubtableLength (
+         return;
+     }
+ 
+-    memcpy (Subtable->LengthField, &Subtable->TotalLength,
+-        Subtable->SizeOfLengthField);
++    AcpiUtWriteUint(Subtable->LengthField, Subtable->SizeOfLengthField,
++		    &Subtable->TotalLength, sizeof(Subtable->TotalLength));
+ }
+Index: acpica-unix2-20200925/source/components/tables/tbprint.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/components/tables/tbprint.c
++++ acpica-unix2-20200925/source/components/tables/tbprint.c
+@@ -44,6 +44,8 @@
+ #include "acpi.h"
+ #include "accommon.h"
+ #include "actables.h"
++#include "platform/acenv.h"
++#include "acutils.h"
+ 
+ #define _COMPONENT          ACPI_TABLES
+         ACPI_MODULE_NAME    ("tbprint")
+@@ -151,7 +153,7 @@ AcpiTbPrintTableHeader (
+ 
+         ACPI_INFO (("%-4.4s 0x%8.8X%8.8X %06X",
+             Header->Signature, ACPI_FORMAT_UINT64 (Address),
+-            Header->Length));
++            AcpiUtReadUint32(&Header->Length)));
+     }
+     else if (ACPI_VALIDATE_RSDP_SIG (Header->Signature))
+     {
+@@ -178,9 +180,12 @@ AcpiTbPrintTableHeader (
+             "%-4.4s 0x%8.8X%8.8X"
+             " %06X (v%.2d %-6.6s %-8.8s %08X %-4.4s %08X)",
+             LocalHeader.Signature, ACPI_FORMAT_UINT64 (Address),
+-            LocalHeader.Length, LocalHeader.Revision, LocalHeader.OemId,
+-            LocalHeader.OemTableId, LocalHeader.OemRevision,
+-            LocalHeader.AslCompilerId, LocalHeader.AslCompilerRevision));
++            AcpiUtReadUint32(&LocalHeader.Length),
++            LocalHeader.Revision, LocalHeader.OemId,
++            LocalHeader.OemTableId,
++            AcpiUtReadUint32(&LocalHeader.OemRevision),
++            LocalHeader.AslCompilerId,
++            AcpiUtReadUint32(&LocalHeader.AslCompilerRevision)));
+     }
+ }
+ 
diff --git a/0003-Always-display-table-header-content-in-human-readabl.patch b/0003-Always-display-table-header-content-in-human-readabl.patch
new file mode 100644
index 0000000..4ba465b
--- /dev/null
+++ b/0003-Always-display-table-header-content-in-human-readabl.patch
@@ -0,0 +1,51 @@
+From 08862d9a4be8262c045549c287adf1e6c320cbec Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Fri, 18 Sep 2020 15:20:37 -0600
+Subject: [PATCH 03/40] Always display table header content in human-readable
+ form
+
+When comparing two binary data tables, little-endian values are read
+from each table header and printed out.  Make sure they show up in a
+form that makes sense to humans.
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/tools/acpibin/abcompare.c | 13 ++++++++++---
+ 1 file changed, 10 insertions(+), 3 deletions(-)
+
+Index: acpica-unix2-20200925/source/tools/acpibin/abcompare.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/tools/acpibin/abcompare.c
++++ acpica-unix2-20200925/source/tools/acpibin/abcompare.c
+@@ -42,6 +42,7 @@
+  */
+ 
+ #include "acpibin.h"
++#include "acutils.h"
+ 
+ 
+ ACPI_TABLE_HEADER           Header1;
+@@ -179,14 +180,20 @@ AbPrintHeadersInfo (
+     /* Display header information for both headers */
+ 
+     printf ("Signature          %8.4s : %4.4s\n",    Header->Signature, Header2->Signature);
+-    printf ("Length             %8.8X : %8.8X\n",    Header->Length, Header2->Length);
++    printf ("Length             %8.8X : %8.8X\n",
++                        AcpiUtReadUint32(&Header->Length),
++                        AcpiUtReadUint32(&Header2->Length));
+     printf ("Revision           %8.2X : %2.2X\n",    Header->Revision, Header2->Revision);
+     printf ("Checksum           %8.2X : %2.2X\n",    Header->Checksum, Header2->Checksum);
+     printf ("OEM ID             %8.6s : %.6s\n",     Header->OemId, Header2->OemId);
+     printf ("OEM Table ID       %8.8s : %.8s\n",     Header->OemTableId, Header2->OemTableId);
+-    printf ("OEM Revision       %8.8X : %8.8X\n",    Header->OemRevision, Header2->OemRevision);
++    printf ("OEM Revision       %8.8X : %8.8X\n",
++                        AcpiUtReadUint32(&Header->OemRevision),
++                        AcpiUtReadUint32(&Header2->OemRevision));
+     printf ("ASL Compiler ID    %8.4s : %.4s\n",     Header->AslCompilerId, Header2->AslCompilerId);
+-    printf ("Compiler Revision  %8.8X : %8.8X\n",    Header->AslCompilerRevision, Header2->AslCompilerRevision);
++    printf ("Compiler Revision  %8.8X : %8.8X\n",
++                        AcpiUtReadUint32(&Header->AslCompilerRevision),
++                        AcpiUtReadUint32(&Header2->AslCompilerRevision));
+     printf ("\n");
+ }
+ 
diff --git a/0004-Re-enable-support-for-big-endian-machines.patch b/0004-Re-enable-support-for-big-endian-machines.patch
new file mode 100644
index 0000000..c88eee8
--- /dev/null
+++ b/0004-Re-enable-support-for-big-endian-machines.patch
@@ -0,0 +1,78 @@
+From 16c399a7e2a2c7bd8fb8f38fed202f23c3a786a9 Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Wed, 16 Sep 2020 16:27:06 -0600
+Subject: [PATCH 04/40] Re-enable support for big-endian machines
+
+First, disable the big-endian check and fail.  Then, make sure the
+namespace gets initialized properly (NB: needed even if we are only
+compiling/disassembling data tables).
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/compiler/aslmain.c             | 12 ------------
+ source/components/namespace/nsutils.c |  7 +++++--
+ 2 files changed, 5 insertions(+), 14 deletions(-)
+
+Index: acpica-unix2-20200925/source/compiler/aslmain.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/compiler/aslmain.c
++++ acpica-unix2-20200925/source/compiler/aslmain.c
+@@ -101,18 +101,6 @@ main (
+ 
+     signal (SIGINT, AslSignalHandler);
+ 
+-    /*
+-     * Big-endian machines are not currently supported. ACPI tables must
+-     * be little-endian, and support for big-endian machines needs to
+-     * be implemented.
+-     */
+-    if (UtIsBigEndianMachine ())
+-    {
+-        fprintf (stderr,
+-            "iASL is not currently supported on big-endian machines.\n");
+-        return (-1);
+-    }
+-
+     AcpiOsInitialize ();
+     ACPI_DEBUG_INITIALIZE (); /* For debug version only */
+ 
+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,6 +272,7 @@ AcpiNsBuildInternalName (
+     const char              *ExternalName = Info->NextExternalChar;
+     char                    *Result = NULL;
+     UINT32                  i;
++    char		    TmpSeg[ACPI_NAMESEG_SIZE+1];
+ 
+ 
+     ACPI_FUNCTION_TRACE (NsBuildInternalName);
+@@ -335,6 +336,7 @@ AcpiNsBuildInternalName (
+ 
+     for (; NumSegments; NumSegments--)
+     {
++        memset(TmpSeg, 0, ACPI_NAMESEG_SIZE+1);
+         for (i = 0; i < ACPI_NAMESEG_SIZE; i++)
+         {
+             if (ACPI_IS_PATH_SEPARATOR (*ExternalName) ||
+@@ -342,16 +344,17 @@ AcpiNsBuildInternalName (
+             {
+                 /* Pad the segment with underscore(s) if segment is short */
+ 
+-                Result[i] = '_';
++                TmpSeg[i] = '_';
+             }
+             else
+             {
+                 /* Convert the character to uppercase and save it */
+ 
+-                Result[i] = (char) toupper ((int) *ExternalName);
++                TmpSeg[i] = (char) toupper ((int) *ExternalName);
+                 ExternalName++;
+             }
+         }
++	AcpiUtWriteUint(Result, ACPI_NAMESEG_SIZE, TmpSeg, ACPI_NAMESEG_SIZE);
+ 
+         /* Now we must have a path separator, or the pathname is bad */
+ 
diff --git a/0005-Support-MADT-aka-APIC-in-a-big-endian-world.patch b/0005-Support-MADT-aka-APIC-in-a-big-endian-world.patch
new file mode 100644
index 0000000..cc1392b
--- /dev/null
+++ b/0005-Support-MADT-aka-APIC-in-a-big-endian-world.patch
@@ -0,0 +1,32 @@
+From f11fb1c691174eb7d236d60ad48da19e56291fef Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Thu, 15 Oct 2020 12:12:11 -0600
+Subject: [PATCH 05/40] Support MADT (aka APIC) in a big-endian world
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/common/dmtbdump2.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: acpica-unix2-20200925/source/common/dmtbdump2.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20200925/source/common/dmtbdump2.c
+@@ -607,7 +607,7 @@ AcpiDmDumpMadt (
+ {
+     ACPI_STATUS             Status;
+     ACPI_SUBTABLE_HEADER    *Subtable;
+-    UINT32                  Length = Table->Length;
++    UINT32                  Length = AcpiUtReadUint32(&Table->Length);
+     UINT32                  Offset = sizeof (ACPI_TABLE_MADT);
+     ACPI_DMTABLE_INFO       *InfoTable;
+ 
+@@ -623,7 +623,7 @@ AcpiDmDumpMadt (
+     /* Subtables */
+ 
+     Subtable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Table, Offset);
+-    while (Offset < Table->Length)
++    while (Offset < Length)
+     {
+         /* Common subtable header */
+ 
diff --git a/0006-Support-ASF-tables-in-a-big-endian-world.patch b/0006-Support-ASF-tables-in-a-big-endian-world.patch
new file mode 100644
index 0000000..194e5ca
--- /dev/null
+++ b/0006-Support-ASF-tables-in-a-big-endian-world.patch
@@ -0,0 +1,55 @@
+From 5ac8e9cca71eacd4f18dba2eb89e9b65a805f712 Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Fri, 18 Sep 2020 16:41:02 -0600
+Subject: [PATCH 06/40] Support ASF! tables in a big-endian world
+
+Read the table length properly and it all works right for big-endian.
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/common/dmtbdump1.c | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+Index: acpica-unix2-20200925/source/common/dmtbdump1.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/common/dmtbdump1.c
++++ acpica-unix2-20200925/source/common/dmtbdump1.c
+@@ -79,16 +79,18 @@ AcpiDmDumpAsf (
+     UINT32                  DataOffset = 0;
+     UINT32                  i;
+     UINT8                   Type;
++    UINT32                  TableLength;
+ 
+ 
+     /* No main table, only subtables */
+ 
+     Subtable = ACPI_ADD_PTR (ACPI_ASF_INFO, Table, Offset);
+-    while (Offset < Table->Length)
++    TableLength = AcpiUtReadUint32(&Table->Length);
++    while (Offset < TableLength)
+     {
+         /* Common subtable header */
+ 
+-        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
++        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
+             Subtable->Header.Length, AcpiDmTableInfoAsfHdr);
+         if (ACPI_FAILURE (Status))
+         {
+@@ -146,7 +148,7 @@ AcpiDmDumpAsf (
+             return;
+         }
+ 
+-        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
++        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
+             Subtable->Header.Length, InfoTable);
+         if (ACPI_FAILURE (Status))
+         {
+@@ -163,7 +165,7 @@ AcpiDmDumpAsf (
+             for (i = 0; i < DataCount; i++)
+             {
+                 AcpiOsPrintf ("\n");
+-                Status = AcpiDmDumpTable (Table->Length, DataOffset,
++                Status = AcpiDmDumpTable (TableLength, DataOffset,
+                     DataTable, DataLength, DataInfoTable);
+                 if (ACPI_FAILURE (Status))
+                 {
diff --git a/0007-Support-CPEP-tables-in-a-big-endian-world.patch b/0007-Support-CPEP-tables-in-a-big-endian-world.patch
new file mode 100644
index 0000000..f58cf61
--- /dev/null
+++ b/0007-Support-CPEP-tables-in-a-big-endian-world.patch
@@ -0,0 +1,32 @@
+From d66af65b4cd0a2719e5a06b77f8eda5e892bfc63 Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Fri, 18 Sep 2020 16:54:13 -0600
+Subject: [PATCH 07/40] Support CPEP tables in a big-endian world
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/common/dmtbdump1.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: acpica-unix2-20200925/source/common/dmtbdump1.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/common/dmtbdump1.c
++++ acpica-unix2-20200925/source/common/dmtbdump1.c
+@@ -243,7 +243,7 @@ AcpiDmDumpCpep (
+ {
+     ACPI_STATUS             Status;
+     ACPI_CPEP_POLLING       *Subtable;
+-    UINT32                  Length = Table->Length;
++    UINT32                  Length = AcpiUtReadUint32(&Table->Length);
+     UINT32                  Offset = sizeof (ACPI_TABLE_CPEP);
+ 
+ 
+@@ -258,7 +258,7 @@ AcpiDmDumpCpep (
+     /* Subtables */
+ 
+     Subtable = ACPI_ADD_PTR (ACPI_CPEP_POLLING, Table, Offset);
+-    while (Offset < Table->Length)
++    while (Offset < Length)
+     {
+         AcpiOsPrintf ("\n");
+         Status = AcpiDmDumpTable (Length, Offset, Subtable,
diff --git a/0008-Support-DBG2-table-in-a-big-endian-world.patch b/0008-Support-DBG2-table-in-a-big-endian-world.patch
new file mode 100644
index 0000000..d0dac5e
--- /dev/null
+++ b/0008-Support-DBG2-table-in-a-big-endian-world.patch
@@ -0,0 +1,254 @@
+From 2d7396fe2b270b0bed6a6436f9e3d15cfbb9abfc Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Sat, 19 Sep 2020 13:37:38 -0600
+Subject: [PATCH 08/40] Support DBG2 table in a big-endian world
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/common/dmtbdump1.c  | 35 +++++++++++++++++--------------
+ source/compiler/dttable1.c | 43 ++++++++++++++++++++++++--------------
+ 2 files changed, 46 insertions(+), 32 deletions(-)
+
+Index: acpica-unix2-20200925/source/common/dmtbdump1.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/common/dmtbdump1.c
++++ acpica-unix2-20200925/source/common/dmtbdump1.c
+@@ -298,7 +298,7 @@ AcpiDmDumpCsrt (
+     ACPI_CSRT_GROUP         *Subtable;
+     ACPI_CSRT_SHARED_INFO   *SharedInfoTable;
+     ACPI_CSRT_DESCRIPTOR    *SubSubtable;
+-    UINT32                  Length = Table->Length;
++    UINT32                  Length = AcpiUtReadUint32(&Table->Length);
+     UINT32                  Offset = sizeof (ACPI_TABLE_CSRT);
+     UINT32                  SubOffset;
+     UINT32                  SubSubOffset;
+@@ -310,7 +310,7 @@ AcpiDmDumpCsrt (
+     /* Subtables (Resource Groups) */
+ 
+     Subtable = ACPI_ADD_PTR (ACPI_CSRT_GROUP, Table, Offset);
+-    while (Offset < Table->Length)
++    while (Offset < Length)
+     {
+         /* Resource group subtable */
+ 
+@@ -344,7 +344,7 @@ AcpiDmDumpCsrt (
+             Offset + SubOffset);
+ 
+         while ((SubOffset < Subtable->Length) &&
+-              ((Offset + SubOffset) < Table->Length))
++              ((Offset + SubOffset) < Length))
+         {
+             AcpiOsPrintf ("\n");
+             Status = AcpiDmDumpTable (Length, Offset + SubOffset, SubSubtable,
+@@ -405,12 +405,13 @@ AcpiDmDumpDbg2 (
+ {
+     ACPI_STATUS             Status;
+     ACPI_DBG2_DEVICE        *Subtable;
+-    UINT32                  Length = Table->Length;
++    UINT32                  Length = AcpiUtReadUint32(&Table->Length);
+     UINT32                  Offset = sizeof (ACPI_TABLE_DBG2);
+     UINT32                  i;
+     UINT32                  ArrayOffset;
+     UINT32                  AbsoluteOffset;
+     UINT8                   *Array;
++    UINT16                  SubtableLength;
+ 
+ 
+     /* Main table */
+@@ -424,11 +425,12 @@ AcpiDmDumpDbg2 (
+     /* Subtables */
+ 
+     Subtable = ACPI_ADD_PTR (ACPI_DBG2_DEVICE, Table, Offset);
+-    while (Offset < Table->Length)
++    while (Offset < Length)
+     {
+         AcpiOsPrintf ("\n");
++	SubtableLength = AcpiUtReadUint16(&Subtable->Length);
+         Status = AcpiDmDumpTable (Length, Offset, Subtable,
+-            Subtable->Length, AcpiDmTableInfoDbg2Device);
++            SubtableLength, AcpiDmTableInfoDbg2Device);
+         if (ACPI_FAILURE (Status))
+         {
+             return;
+@@ -438,13 +440,13 @@ AcpiDmDumpDbg2 (
+ 
+         for (i = 0; i < Subtable->RegisterCount; i++)
+         {
+-            ArrayOffset = Subtable->BaseAddressOffset +
++            ArrayOffset = AcpiUtReadUint16(&Subtable->BaseAddressOffset) +
+                 (sizeof (ACPI_GENERIC_ADDRESS) * i);
+             AbsoluteOffset = Offset + ArrayOffset;
+             Array = (UINT8 *) Subtable + ArrayOffset;
+ 
+             Status = AcpiDmDumpTable (Length, AbsoluteOffset, Array,
+-                Subtable->Length, AcpiDmTableInfoDbg2Addr);
++                SubtableLength, AcpiDmTableInfoDbg2Addr);
+             if (ACPI_FAILURE (Status))
+             {
+                 return;
+@@ -455,13 +457,13 @@ AcpiDmDumpDbg2 (
+ 
+         for (i = 0; i < Subtable->RegisterCount; i++)
+         {
+-            ArrayOffset = Subtable->AddressSizeOffset +
++            ArrayOffset = AcpiUtReadUint16(&Subtable->AddressSizeOffset) +
+                 (sizeof (UINT32) * i);
+             AbsoluteOffset = Offset + ArrayOffset;
+             Array = (UINT8 *) Subtable + ArrayOffset;
+ 
+             Status = AcpiDmDumpTable (Length, AbsoluteOffset, Array,
+-                Subtable->Length, AcpiDmTableInfoDbg2Size);
++                SubtableLength, AcpiDmTableInfoDbg2Size);
+             if (ACPI_FAILURE (Status))
+             {
+                 return;
+@@ -471,12 +473,12 @@ AcpiDmDumpDbg2 (
+         /* Dump the Namestring (required) */
+ 
+         AcpiOsPrintf ("\n");
+-        ArrayOffset = Subtable->NamepathOffset;
++        ArrayOffset = AcpiUtReadUint16(&Subtable->NamepathOffset);
+         AbsoluteOffset = Offset + ArrayOffset;
+         Array = (UINT8 *) Subtable + ArrayOffset;
+ 
+         Status = AcpiDmDumpTable (Length, AbsoluteOffset, Array,
+-            Subtable->Length, AcpiDmTableInfoDbg2Name);
++            SubtableLength, AcpiDmTableInfoDbg2Name);
+         if (ACPI_FAILURE (Status))
+         {
+             return;
+@@ -486,8 +488,9 @@ AcpiDmDumpDbg2 (
+ 
+         if (Subtable->OemDataOffset)
+         {
+-            Status = AcpiDmDumpTable (Length, Offset + Subtable->OemDataOffset,
+-                Table, Subtable->OemDataLength,
++            Status = AcpiDmDumpTable (Length,
++		Offset + AcpiUtReadUint16(&Subtable->OemDataOffset),
++                Table, AcpiUtReadUint16(&Subtable->OemDataLength),
+                 AcpiDmTableInfoDbg2OemData);
+             if (ACPI_FAILURE (Status))
+             {
+@@ -497,9 +500,9 @@ AcpiDmDumpDbg2 (
+ 
+         /* Point to next subtable */
+ 
+-        Offset += Subtable->Length;
++        Offset += SubtableLength;
+         Subtable = ACPI_ADD_PTR (ACPI_DBG2_DEVICE, Subtable,
+-            Subtable->Length);
++            SubtableLength);
+     }
+ }
+ 
+Index: acpica-unix2-20200925/source/compiler/dttable1.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/compiler/dttable1.c
++++ acpica-unix2-20200925/source/compiler/dttable1.c
+@@ -281,6 +281,7 @@ DtCompileCsrt (
+     DT_FIELD                **PFieldList = (DT_FIELD **) List;
+     UINT32                  DescriptorCount;
+     UINT32                  GroupLength;
++    UINT32                  Tmp;
+ 
+ 
+     /* Subtables (Resource Groups) */
+@@ -299,12 +300,13 @@ DtCompileCsrt (
+ 
+         /* Compute the number of resource descriptors */
+ 
+-        GroupLength =
+-            (ACPI_CAST_PTR (ACPI_CSRT_GROUP,
+-                Subtable->Buffer))->Length -
+-            (ACPI_CAST_PTR (ACPI_CSRT_GROUP,
+-                Subtable->Buffer))->SharedInfoLength -
+-            sizeof (ACPI_CSRT_GROUP);
++	Tmp = AcpiUtReadUint32(&(ACPI_CAST_PTR (ACPI_CSRT_GROUP,
++                		 Subtable->Buffer))->Length);
++	GroupLength = Tmp;
++	Tmp = AcpiUtReadUint32(&(ACPI_CAST_PTR (ACPI_CSRT_GROUP,
++                		 Subtable->Buffer))->SharedInfoLength);
++        GroupLength -= Tmp;
++        GroupLength -= sizeof (ACPI_CSRT_GROUP);
+ 
+         DescriptorCount = (GroupLength  /
+             sizeof (ACPI_CSRT_DESCRIPTOR));
+@@ -392,6 +394,7 @@ DtCompileDbg2 (
+     ACPI_DBG2_DEVICE        *DeviceInfo;
+     UINT16                  CurrentOffset;
+     UINT32                  i;
++    UINT32                  Tmp;
+ 
+ 
+     /* Main table */
+@@ -408,10 +411,12 @@ DtCompileDbg2 (
+     /* Main table fields */
+ 
+     Dbg2Header = ACPI_CAST_PTR (ACPI_DBG2_HEADER, Subtable->Buffer);
+-    Dbg2Header->InfoOffset = sizeof (ACPI_TABLE_HEADER) + ACPI_PTR_DIFF (
+-        ACPI_ADD_PTR (UINT8, Dbg2Header, sizeof (ACPI_DBG2_HEADER)), Dbg2Header);
++    Tmp = sizeof (ACPI_TABLE_HEADER) + ACPI_PTR_DIFF (
++       ACPI_ADD_PTR (UINT8, Dbg2Header, sizeof (ACPI_DBG2_HEADER)), Dbg2Header);
++    AcpiUtWriteUint(&Dbg2Header->InfoOffset, sizeof(UINT32),
++		    &Tmp, sizeof(UINT32));
+ 
+-    SubtableCount = Dbg2Header->InfoCount;
++    SubtableCount = Tmp;
+     DtPushSubtable (Subtable);
+ 
+     /* Process all Device Information subtables (Count = InfoCount) */
+@@ -438,7 +443,8 @@ DtCompileDbg2 (
+ 
+         /* BaseAddressRegister GAS array (Required, size is RegisterCount) */
+ 
+-        DeviceInfo->BaseAddressOffset = CurrentOffset;
++        AcpiUtWriteUint(&DeviceInfo->BaseAddressOffset, sizeof(UINT16),
++		       	&CurrentOffset, sizeof(UINT16));
+         for (i = 0; *PFieldList && (i < DeviceInfo->RegisterCount); i++)
+         {
+             Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2Addr,
+@@ -454,7 +460,8 @@ DtCompileDbg2 (
+ 
+         /* AddressSize array (Required, size = RegisterCount) */
+ 
+-        DeviceInfo->AddressSizeOffset = CurrentOffset;
++        AcpiUtWriteUint(&DeviceInfo->AddressSizeOffset, sizeof(UINT16),
++		        &CurrentOffset, sizeof(UINT16));
+         for (i = 0; *PFieldList && (i < DeviceInfo->RegisterCount); i++)
+         {
+             Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2Size,
+@@ -470,7 +477,8 @@ DtCompileDbg2 (
+ 
+         /* NamespaceString device identifier (Required, size = NamePathLength) */
+ 
+-        DeviceInfo->NamepathOffset = CurrentOffset;
++        AcpiUtWriteUint(&DeviceInfo->NamepathOffset, sizeof(UINT16),
++			&CurrentOffset, sizeof(UINT16));
+         Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2Name,
+             &Subtable);
+         if (ACPI_FAILURE (Status))
+@@ -480,8 +488,9 @@ DtCompileDbg2 (
+ 
+         /* Update the device info header */
+ 
+-        DeviceInfo->NamepathLength = (UINT16) Subtable->Length;
+-        CurrentOffset += (UINT16) DeviceInfo->NamepathLength;
++        AcpiUtWriteUint(&DeviceInfo->NamepathLength, sizeof(UINT16),
++			&Subtable->Length, sizeof(UINT32));
++        CurrentOffset += AcpiUtReadUint16(&DeviceInfo->NamepathLength);
+         DtInsertSubtable (ParentTable, Subtable);
+ 
+         /* OemData - Variable-length data (Optional, size = OemDataLength) */
+@@ -508,8 +517,10 @@ DtCompileDbg2 (
+ 
+         if (Subtable && Subtable->Length)
+         {
+-            DeviceInfo->OemDataOffset = CurrentOffset;
+-            DeviceInfo->OemDataLength = (UINT16) Subtable->Length;
++            AcpiUtWriteUint(&DeviceInfo->OemDataOffset, sizeof(UINT16),
++			    &CurrentOffset, sizeof(UINT16));
++            AcpiUtWriteUint(&DeviceInfo->OemDataLength, sizeof(UINT16),
++			    &Subtable->Length, sizeof(UINT32));
+ 
+             DtInsertSubtable (ParentTable, Subtable);
+         }
diff --git a/0009-Support-DMAR-in-a-big-endian-world.patch b/0009-Support-DMAR-in-a-big-endian-world.patch
new file mode 100644
index 0000000..d80d519
--- /dev/null
+++ b/0009-Support-DMAR-in-a-big-endian-world.patch
@@ -0,0 +1,171 @@
+From 01aad41e59efd615ac075fcedbaab0c60f9e1e11 Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Sat, 19 Sep 2020 15:22:00 -0600
+Subject: [PATCH 09/40] Support DMAR in a big-endian world
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/common/dmtable.c    |  4 ++--
+ source/common/dmtbdump1.c  | 26 +++++++++++++++-----------
+ source/compiler/dttable1.c | 12 +++++++-----
+ 3 files changed, 24 insertions(+), 18 deletions(-)
+
+Index: acpica-unix2-20200925/source/common/dmtable.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/common/dmtable.c
++++ acpica-unix2-20200925/source/common/dmtable.c
+@@ -1244,13 +1244,13 @@ AcpiDmDumpTable (
+ 
+             /* DMAR subtable types */
+ 
+-            Temp16 = ACPI_GET16 (Target);
++            Temp16 = AcpiUtReadUint16 (Target);
+             if (Temp16 > ACPI_DMAR_TYPE_RESERVED)
+             {
+                 Temp16 = ACPI_DMAR_TYPE_RESERVED;
+             }
+ 
+-            AcpiOsPrintf (UINT16_FORMAT, ACPI_GET16 (Target),
++            AcpiOsPrintf (UINT16_FORMAT, Temp16,
+                 AcpiDmDmarSubnames[Temp16]);
+             break;
+ 
+Index: acpica-unix2-20200925/source/common/dmtbdump1.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/common/dmtbdump1.c
++++ acpica-unix2-20200925/source/common/dmtbdump1.c
+@@ -526,13 +526,15 @@ AcpiDmDumpDmar (
+ {
+     ACPI_STATUS             Status;
+     ACPI_DMAR_HEADER        *Subtable;
+-    UINT32                  Length = Table->Length;
++    UINT32                  Length = AcpiUtReadUint32(&Table->Length);
+     UINT32                  Offset = sizeof (ACPI_TABLE_DMAR);
+     ACPI_DMTABLE_INFO       *InfoTable;
+     ACPI_DMAR_DEVICE_SCOPE  *ScopeTable;
+     UINT32                  ScopeOffset;
+     UINT8                   *PciPath;
+     UINT32                  PathOffset;
++    UINT16		    SubtableType;
++    UINT16		    SubtableLength;
+ 
+ 
+     /* Main table */
+@@ -546,13 +548,14 @@ AcpiDmDumpDmar (
+     /* Subtables */
+ 
+     Subtable = ACPI_ADD_PTR (ACPI_DMAR_HEADER, Table, Offset);
+-    while (Offset < Table->Length)
++    while (Offset < Length)
+     {
+         /* Common subtable header */
+ 
+         AcpiOsPrintf ("\n");
++	SubtableLength = AcpiUtReadUint16(&Subtable->Length);
+         Status = AcpiDmDumpTable (Length, Offset, Subtable,
+-            Subtable->Length, AcpiDmTableInfoDmarHdr);
++            SubtableLength, AcpiDmTableInfoDmarHdr);
+         if (ACPI_FAILURE (Status))
+         {
+             return;
+@@ -560,7 +563,8 @@ AcpiDmDumpDmar (
+ 
+         AcpiOsPrintf ("\n");
+ 
+-        switch (Subtable->Type)
++	SubtableType = AcpiUtReadUint16(&Subtable->Type);
++        switch (SubtableType)
+         {
+         case ACPI_DMAR_TYPE_HARDWARE_UNIT:
+ 
+@@ -595,12 +599,12 @@ AcpiDmDumpDmar (
+         default:
+ 
+             AcpiOsPrintf ("\n**** Unknown DMAR subtable type 0x%X\n\n",
+-                Subtable->Type);
++                SubtableType);
+             return;
+         }
+ 
+         Status = AcpiDmDumpTable (Length, Offset, Subtable,
+-            Subtable->Length, InfoTable);
++            SubtableLength, InfoTable);
+         if (ACPI_FAILURE (Status))
+         {
+             return;
+@@ -609,8 +613,8 @@ AcpiDmDumpDmar (
+         /*
+          * Dump the optional device scope entries
+          */
+-        if ((Subtable->Type == ACPI_DMAR_TYPE_HARDWARE_AFFINITY) ||
+-            (Subtable->Type == ACPI_DMAR_TYPE_NAMESPACE))
++        if ((SubtableType == ACPI_DMAR_TYPE_HARDWARE_AFFINITY) ||
++            (SubtableType == ACPI_DMAR_TYPE_NAMESPACE))
+         {
+             /* These types do not support device scopes */
+ 
+@@ -618,7 +622,7 @@ AcpiDmDumpDmar (
+         }
+ 
+         ScopeTable = ACPI_ADD_PTR (ACPI_DMAR_DEVICE_SCOPE, Subtable, ScopeOffset);
+-        while (ScopeOffset < Subtable->Length)
++        while (ScopeOffset < SubtableLength)
+         {
+             AcpiOsPrintf ("\n");
+             Status = AcpiDmDumpTable (Length, Offset + ScopeOffset, ScopeTable,
+@@ -659,9 +663,9 @@ AcpiDmDumpDmar (
+ NextSubtable:
+         /* Point to next subtable */
+ 
+-        Offset += Subtable->Length;
++        Offset += SubtableLength;
+         Subtable = ACPI_ADD_PTR (ACPI_DMAR_HEADER, Subtable,
+-            Subtable->Length);
++            SubtableLength);
+     }
+ }
+ 
+Index: acpica-unix2-20200925/source/compiler/dttable1.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/compiler/dttable1.c
++++ acpica-unix2-20200925/source/compiler/dttable1.c
+@@ -560,6 +560,7 @@ DtCompileDmar (
+     ACPI_DMAR_DEVICE_SCOPE  *DmarDeviceScope;
+     UINT32                  DeviceScopeLength;
+     UINT32                  PciPathLength;
++    UINT16                  DmarHeaderType;
+ 
+ 
+     Status = DtCompileTable (PFieldList, AcpiDmTableInfoDmar, &Subtable);
+@@ -590,7 +591,8 @@ DtCompileDmar (
+ 
+         DmarHeader = ACPI_CAST_PTR (ACPI_DMAR_HEADER, Subtable->Buffer);
+ 
+-        switch (DmarHeader->Type)
++        DmarHeaderType = AcpiUtReadUint16(&DmarHeader->Type);
++        switch (DmarHeaderType)
+         {
+         case ACPI_DMAR_TYPE_HARDWARE_UNIT:
+ 
+@@ -637,8 +639,8 @@ DtCompileDmar (
+         /*
+          * Optional Device Scope subtables
+          */
+-        if ((DmarHeader->Type == ACPI_DMAR_TYPE_HARDWARE_AFFINITY) ||
+-            (DmarHeader->Type == ACPI_DMAR_TYPE_NAMESPACE))
++        if ((DmarHeaderType == ACPI_DMAR_TYPE_HARDWARE_AFFINITY) ||
++            (DmarHeaderType == ACPI_DMAR_TYPE_NAMESPACE))
+         {
+             /* These types do not support device scopes */
+ 
+@@ -647,8 +649,8 @@ DtCompileDmar (
+         }
+ 
+         DtPushSubtable (Subtable);
+-        DeviceScopeLength = DmarHeader->Length - Subtable->Length -
+-            ParentTable->Length;
++        DeviceScopeLength = AcpiUtReadUint16(&DmarHeader->Length) - 
++		Subtable->Length - ParentTable->Length;
+         while (DeviceScopeLength)
+         {
+             Status = DtCompileTable (PFieldList, AcpiDmTableInfoDmarScope,
diff --git a/0010-Support-DRTM-in-a-big-endian-world.patch b/0010-Support-DRTM-in-a-big-endian-world.patch
new file mode 100644
index 0000000..d4d94af
--- /dev/null
+++ b/0010-Support-DRTM-in-a-big-endian-world.patch
@@ -0,0 +1,112 @@
+From 9583e760908d4b7d2dabec82137d16f2492d2773 Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Sat, 19 Sep 2020 15:44:06 -0600
+Subject: [PATCH 10/40] Support DRTM in a big-endian world
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/common/dmtbdump1.c  | 25 +++++++++++++++----------
+ source/compiler/dttable1.c |  6 ++++--
+ 2 files changed, 19 insertions(+), 12 deletions(-)
+
+Index: acpica-unix2-20200925/source/common/dmtbdump1.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/common/dmtbdump1.c
++++ acpica-unix2-20200925/source/common/dmtbdump1.c
+@@ -692,11 +692,14 @@ AcpiDmDumpDrtm (
+     ACPI_DRTM_RESOURCE_LIST *DrtmRl;
+     ACPI_DRTM_DPS_ID        *DrtmDps;
+     UINT32                  Count;
++    UINT32                  ResourceCount;
++    UINT32                  ValidatedTableCount;
++    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
+ 
+ 
+     /* Main table */
+ 
+-    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
++    Status = AcpiDmDumpTable (TableLength, 0, Table, 0,
+         AcpiDmTableInfoDrtm);
+     if (ACPI_FAILURE (Status))
+     {
+@@ -711,7 +714,7 @@ AcpiDmDumpDrtm (
+ 
+     DrtmVtl = ACPI_ADD_PTR (ACPI_DRTM_VTABLE_LIST, Table, Offset);
+     AcpiOsPrintf ("\n");
+-    Status = AcpiDmDumpTable (Table->Length, Offset,
++    Status = AcpiDmDumpTable (TableLength, Offset,
+         DrtmVtl, ACPI_OFFSET (ACPI_DRTM_VTABLE_LIST, ValidatedTables),
+         AcpiDmTableInfoDrtm0);
+     if (ACPI_FAILURE (Status))
+@@ -724,10 +727,11 @@ AcpiDmDumpDrtm (
+     /* Dump Validated table addresses */
+ 
+     Count = 0;
+-    while ((Offset < Table->Length) &&
+-            (DrtmVtl->ValidatedTableCount > Count))
++    ValidatedTableCount = AcpiUtReadUint32(&DrtmVtl->ValidatedTableCount);
++    while ((Offset < TableLength) &&
++            (ValidatedTableCount > Count))
+     {
+-        Status = AcpiDmDumpTable (Table->Length, Offset,
++        Status = AcpiDmDumpTable (TableLength, Offset,
+             ACPI_ADD_PTR (void, Table, Offset), sizeof (UINT64),
+             AcpiDmTableInfoDrtm0a);
+         if (ACPI_FAILURE (Status))
+@@ -743,7 +747,7 @@ AcpiDmDumpDrtm (
+ 
+     DrtmRl = ACPI_ADD_PTR (ACPI_DRTM_RESOURCE_LIST, Table, Offset);
+     AcpiOsPrintf ("\n");
+-    Status = AcpiDmDumpTable (Table->Length, Offset,
++    Status = AcpiDmDumpTable (TableLength, Offset,
+         DrtmRl, ACPI_OFFSET (ACPI_DRTM_RESOURCE_LIST, Resources),
+         AcpiDmTableInfoDrtm1);
+     if (ACPI_FAILURE (Status))
+@@ -756,10 +760,11 @@ AcpiDmDumpDrtm (
+     /* Dump the Resource List */
+ 
+     Count = 0;
+-    while ((Offset < Table->Length) &&
+-           (DrtmRl->ResourceCount > Count))
++    ResourceCount = AcpiUtReadUint32(&DrtmRl->ResourceCount);
++    while ((Offset < TableLength) &&
++           (ResourceCount > Count))
+     {
+-        Status = AcpiDmDumpTable (Table->Length, Offset,
++        Status = AcpiDmDumpTable (TableLength, Offset,
+             ACPI_ADD_PTR (void, Table, Offset),
+             sizeof (ACPI_DRTM_RESOURCE), AcpiDmTableInfoDrtm1a);
+         if (ACPI_FAILURE (Status))
+@@ -775,7 +780,7 @@ AcpiDmDumpDrtm (
+ 
+     DrtmDps = ACPI_ADD_PTR (ACPI_DRTM_DPS_ID, Table, Offset);
+     AcpiOsPrintf ("\n");
+-    (void) AcpiDmDumpTable (Table->Length, Offset,
++    (void) AcpiDmDumpTable (TableLength, Offset,
+         DrtmDps, sizeof (ACPI_DRTM_DPS_ID), AcpiDmTableInfoDrtm2);
+ }
+ 
+Index: acpica-unix2-20200925/source/compiler/dttable1.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/compiler/dttable1.c
++++ acpica-unix2-20200925/source/compiler/dttable1.c
+@@ -775,7 +775,8 @@ DtCompileDrtm (
+         Count++;
+     }
+ 
+-    DrtmVtl->ValidatedTableCount = Count;
++    AcpiUtWriteUint(&DrtmVtl->ValidatedTableCount, sizeof(UINT32),
++		    &Count, sizeof(UINT32));
+     DtPopSubtable ();
+     ParentTable = DtPeekSubtable ();
+ 
+@@ -813,7 +814,8 @@ DtCompileDrtm (
+         Count++;
+     }
+ 
+-    DrtmRl->ResourceCount = Count;
++    AcpiUtWriteUint(&DrtmRl->ResourceCount, sizeof(UINT32),
++		    &Count, sizeof(UINT32));
+     DtPopSubtable ();
+     ParentTable = DtPeekSubtable ();
+ 
diff --git a/0011-Support-EINJ-in-a-big-endian-world.patch b/0011-Support-EINJ-in-a-big-endian-world.patch
new file mode 100644
index 0000000..acb64f1
--- /dev/null
+++ b/0011-Support-EINJ-in-a-big-endian-world.patch
@@ -0,0 +1,32 @@
+From b264cb9a07faa05e6d8e5e6c2381270c218d88c4 Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Sat, 19 Sep 2020 15:50:19 -0600
+Subject: [PATCH 11/40] Support EINJ in a big-endian world
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/common/dmtbdump1.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: acpica-unix2-20200925/source/common/dmtbdump1.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/common/dmtbdump1.c
++++ acpica-unix2-20200925/source/common/dmtbdump1.c
+@@ -804,7 +804,7 @@ AcpiDmDumpEinj (
+ {
+     ACPI_STATUS             Status;
+     ACPI_WHEA_HEADER        *Subtable;
+-    UINT32                  Length = Table->Length;
++    UINT32                  Length = AcpiUtReadUint32(&Table->Length);
+     UINT32                  Offset = sizeof (ACPI_TABLE_EINJ);
+ 
+ 
+@@ -819,7 +819,7 @@ AcpiDmDumpEinj (
+     /* Subtables */
+ 
+     Subtable = ACPI_ADD_PTR (ACPI_WHEA_HEADER, Table, Offset);
+-    while (Offset < Table->Length)
++    while (Offset < Length)
+     {
+         AcpiOsPrintf ("\n");
+         Status = AcpiDmDumpTable (Length, Offset, Subtable,
diff --git a/0012-Support-ERST-in-a-big-endian-world.patch b/0012-Support-ERST-in-a-big-endian-world.patch
new file mode 100644
index 0000000..2bd176e
--- /dev/null
+++ b/0012-Support-ERST-in-a-big-endian-world.patch
@@ -0,0 +1,32 @@
+From 99f27aa1a38868a716aefd9408a8cd3788644d13 Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Sat, 19 Sep 2020 15:54:56 -0600
+Subject: [PATCH 12/40] Support ERST in a big-endian world
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/common/dmtbdump1.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: acpica-unix2-20200925/source/common/dmtbdump1.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/common/dmtbdump1.c
++++ acpica-unix2-20200925/source/common/dmtbdump1.c
+@@ -857,7 +857,7 @@ AcpiDmDumpErst (
+ {
+     ACPI_STATUS             Status;
+     ACPI_WHEA_HEADER        *Subtable;
+-    UINT32                  Length = Table->Length;
++    UINT32                  Length = AcpiUtReadUint32(&Table->Length);
+     UINT32                  Offset = sizeof (ACPI_TABLE_ERST);
+ 
+ 
+@@ -872,7 +872,7 @@ AcpiDmDumpErst (
+     /* Subtables */
+ 
+     Subtable = ACPI_ADD_PTR (ACPI_WHEA_HEADER, Table, Offset);
+-    while (Offset < Table->Length)
++    while (Offset < Length)
+     {
+         AcpiOsPrintf ("\n");
+         Status = AcpiDmDumpTable (Length, Offset, Subtable,
diff --git a/0013-Support-FADT-aka-FACP-in-a-big-endian-world.patch b/0013-Support-FADT-aka-FACP-in-a-big-endian-world.patch
new file mode 100644
index 0000000..9fd3120
--- /dev/null
+++ b/0013-Support-FADT-aka-FACP-in-a-big-endian-world.patch
@@ -0,0 +1,189 @@
+From 3288b60b3ddc2df4656842d424bfc1e6a51b2ad2 Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Sun, 20 Sep 2020 11:42:21 -0600
+Subject: [PATCH 13/40] Support FADT (aka, FACP) in a big-endian world
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/common/dmtbdump.c          | 25 ++++++++++++-----------
+ source/components/tables/tbfadt.c | 34 +++++++++++++++++++++++--------
+ 2 files changed, 38 insertions(+), 21 deletions(-)
+
+Index: acpica-unix2-20200925/source/common/dmtbdump.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/common/dmtbdump.c
++++ acpica-unix2-20200925/source/common/dmtbdump.c
+@@ -358,11 +358,12 @@ AcpiDmDumpFadt (
+     ACPI_TABLE_HEADER       *Table)
+ {
+     ACPI_STATUS             Status;
++    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
+ 
+ 
+     /* Always dump the minimum FADT revision 1 fields (ACPI 1.0) */
+ 
+-    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
++    Status = AcpiDmDumpTable (TableLength, 0, Table, 0,
+         AcpiDmTableInfoFadt1);
+     if (ACPI_FAILURE (Status))
+     {
+@@ -371,10 +372,10 @@ AcpiDmDumpFadt (
+ 
+     /* Check for FADT revision 2 fields (ACPI 1.0B MS extensions) */
+ 
+-    if ((Table->Length > ACPI_FADT_V1_SIZE) &&
+-        (Table->Length <= ACPI_FADT_V2_SIZE))
++    if ((TableLength > ACPI_FADT_V1_SIZE) &&
++        (TableLength <= ACPI_FADT_V2_SIZE))
+     {
+-        Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
++        Status = AcpiDmDumpTable (TableLength, 0, Table, 0,
+             AcpiDmTableInfoFadt2);
+         if (ACPI_FAILURE (Status))
+         {
+@@ -384,9 +385,9 @@ AcpiDmDumpFadt (
+ 
+     /* Check for FADT revision 3/4 fields and up (ACPI 2.0+ extended data) */
+ 
+-    else if (Table->Length > ACPI_FADT_V2_SIZE)
++    else if (TableLength > ACPI_FADT_V2_SIZE)
+     {
+-        Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
++        Status = AcpiDmDumpTable (TableLength, 0, Table, 0,
+             AcpiDmTableInfoFadt3);
+         if (ACPI_FAILURE (Status))
+         {
+@@ -395,9 +396,9 @@ AcpiDmDumpFadt (
+ 
+         /* Check for FADT revision 5 fields and up (ACPI 5.0+) */
+ 
+-        if (Table->Length > ACPI_FADT_V3_SIZE)
++        if (TableLength > ACPI_FADT_V3_SIZE)
+         {
+-            Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
++            Status = AcpiDmDumpTable (TableLength, 0, Table, 0,
+                 AcpiDmTableInfoFadt5);
+             if (ACPI_FAILURE (Status))
+             {
+@@ -407,9 +408,9 @@ AcpiDmDumpFadt (
+ 
+         /* Check for FADT revision 6 fields and up (ACPI 6.0+) */
+ 
+-        if (Table->Length > ACPI_FADT_V3_SIZE)
++        if (TableLength > ACPI_FADT_V3_SIZE)
+         {
+-            Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
++            Status = AcpiDmDumpTable (TableLength, 0, Table, 0,
+                 AcpiDmTableInfoFadt6);
+             if (ACPI_FAILURE (Status))
+             {
+@@ -420,11 +421,11 @@ AcpiDmDumpFadt (
+ 
+     /* Validate various fields in the FADT, including length */
+ 
+-    AcpiTbCreateLocalFadt (Table, Table->Length);
++    AcpiTbCreateLocalFadt (Table, TableLength);
+ 
+     /* Validate FADT length against the revision */
+ 
+-    AcpiDmValidateFadtLength (Table->Revision, Table->Length);
++    AcpiDmValidateFadtLength (Table->Revision, TableLength);
+ }
+ 
+ 
+Index: acpica-unix2-20200925/source/components/tables/tbfadt.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/components/tables/tbfadt.c
++++ acpica-unix2-20200925/source/components/tables/tbfadt.c
+@@ -289,7 +289,6 @@ AcpiTbSelectAddress (
+     UINT32                  Address32,
+     UINT64                  Address64)
+ {
+-
+     if (!Address64)
+     {
+         /* 64-bit address is zero, use 32-bit address */
+@@ -520,6 +519,9 @@ AcpiTbConvertFadt (
+     UINT8                   Length;
+     UINT8                   Flags;
+     UINT32                  i;
++    UINT32                  Tmp;
++    UINT32                  Value32;
++    UINT64                  Value64;
+ 
+ 
+     /*
+@@ -533,7 +535,7 @@ AcpiTbConvertFadt (
+      * Note: The FADT revision value is unreliable. Only the length can be
+      * trusted.
+      */
+-    if (AcpiGbl_FADT.Header.Length <= ACPI_FADT_V2_SIZE)
++    if (AcpiUtReadUint32(&AcpiGbl_FADT.Header.Length) <= ACPI_FADT_V2_SIZE)
+     {
+         AcpiGbl_FADT.PreferredProfile = 0;
+         AcpiGbl_FADT.PstateControl = 0;
+@@ -546,14 +548,19 @@ AcpiTbConvertFadt (
+      * current FADT version as defined by the ACPI specification.
+      * Thus, we will have a common FADT internally.
+      */
+-    AcpiGbl_FADT.Header.Length = sizeof (ACPI_TABLE_FADT);
++    Tmp = sizeof (ACPI_TABLE_FADT);
++    AcpiUtWriteUint(&AcpiGbl_FADT.Header.Length, sizeof(UINT32),
++		    &Tmp,  sizeof(UINT32));
+ 
+     /*
+      * Expand the 32-bit DSDT addresses to 64-bit as necessary.
+      * Later ACPICA code will always use the X 64-bit field.
+      */
+-    AcpiGbl_FADT.XDsdt = AcpiTbSelectAddress ("DSDT",
+-        AcpiGbl_FADT.Dsdt, AcpiGbl_FADT.XDsdt);
++    Value32 = AcpiUtReadUint32(&AcpiGbl_FADT.Dsdt);
++    Value64 = AcpiUtReadUint64(&AcpiGbl_FADT.XDsdt);
++    Value64 = AcpiTbSelectAddress ("DSDT", Value32, Value64);
++    AcpiUtWriteUint(&AcpiGbl_FADT.XDsdt, sizeof(UINT64),
++		        &Value64, sizeof(UINT64));
+ 
+     /* If Hardware Reduced flag is set, we are all done */
+ 
+@@ -614,7 +621,11 @@ AcpiTbConvertFadt (
+         {
+             if (Address64->Address)
+             {
+-                if (Address64->Address != (UINT64) Address32)
++		Value32 = AcpiUtReadUint32(&Address32);
++		Value64 = AcpiUtReadUint64(&Address64->Address);
++
++                /* if (Address64->Address != (UINT64) Address32) */
++		if (Value64 != (UINT64) Value32)
+                 {
+                     /* Address mismatch */
+ 
+@@ -655,9 +666,10 @@ AcpiTbConvertFadt (
+              */
+             if (!Address64->Address || AcpiGbl_Use32BitFadtAddresses)
+             {
++		Value32 = AcpiUtReadUint32(&Address32);
+                 AcpiTbInitGenericAddress (Address64,
+                     ACPI_ADR_SPACE_SYSTEM_IO, Length,
+-                    (UINT64) Address32, Name, Flags);
++                    (UINT64) Value32, Name, Flags);
+             }
+         }
+ 
+@@ -780,10 +792,14 @@ AcpiTbSetupFadtRegisters (
+ 
+         if (Source64->Address)
+         {
++	    UINT64 Address64;
++
++	    Address64 = AcpiUtReadUint64(&Source64->Address);
++	    Address64 +=
++		    (FadtPmInfoTable[i].RegisterNum * Pm1RegisterByteWidth);
+             AcpiTbInitGenericAddress (FadtPmInfoTable[i].Target,
+                 Source64->SpaceId, Pm1RegisterByteWidth,
+-                Source64->Address +
+-                    (FadtPmInfoTable[i].RegisterNum * Pm1RegisterByteWidth),
++                Address64,
+                 "PmRegisters", 0);
+         }
+     }
diff --git a/0014-Support-most-FPDTs-in-a-big-endian-world.patch b/0014-Support-most-FPDTs-in-a-big-endian-world.patch
new file mode 100644
index 0000000..f1f9715
--- /dev/null
+++ b/0014-Support-most-FPDTs-in-a-big-endian-world.patch
@@ -0,0 +1,85 @@
+From f0cba59f1ce62095cb0a0cecdf8d661b77bf2baf Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Tue, 22 Sep 2020 17:51:45 -0600
+Subject: [PATCH 14/40] Support most FPDTs in a big-endian world
+
+NB: there is no support for vendor specific records even in
+the little-endian version.
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/common/dmtbdump1.c  | 12 +++++++-----
+ source/compiler/dttable1.c |  4 +++-
+ 2 files changed, 10 insertions(+), 6 deletions(-)
+
+Index: acpica-unix2-20200925/source/common/dmtbdump1.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/common/dmtbdump1.c
++++ acpica-unix2-20200925/source/common/dmtbdump1.c
+@@ -910,9 +910,10 @@ AcpiDmDumpFpdt (
+ {
+     ACPI_STATUS             Status;
+     ACPI_FPDT_HEADER        *Subtable;
+-    UINT32                  Length = Table->Length;
++    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
+     UINT32                  Offset = sizeof (ACPI_TABLE_FPDT);
+     ACPI_DMTABLE_INFO       *InfoTable;
++    UINT16                  SubtableType;
+ 
+ 
+     /* There is no main table (other than the standard ACPI header) */
+@@ -920,19 +921,20 @@ AcpiDmDumpFpdt (
+     /* Subtables */
+ 
+     Subtable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, Table, Offset);
+-    while (Offset < Table->Length)
++    while (Offset < TableLength)
+     {
+         /* Common subtable header */
+ 
+         AcpiOsPrintf ("\n");
+-        Status = AcpiDmDumpTable (Length, Offset, Subtable,
++        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
+             Subtable->Length, AcpiDmTableInfoFpdtHdr);
+         if (ACPI_FAILURE (Status))
+         {
+             return;
+         }
+ 
+-        switch (Subtable->Type)
++	SubtableType = AcpiUtReadUint16(&Subtable->Type);
++        switch (SubtableType)
+         {
+         case ACPI_FPDT_TYPE_BOOT:
+ 
+@@ -959,7 +961,7 @@ AcpiDmDumpFpdt (
+             goto NextSubtable;
+         }
+ 
+-        Status = AcpiDmDumpTable (Length, Offset, Subtable,
++        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
+             Subtable->Length, InfoTable);
+         if (ACPI_FAILURE (Status))
+         {
+Index: acpica-unix2-20200925/source/compiler/dttable1.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/compiler/dttable1.c
++++ acpica-unix2-20200925/source/compiler/dttable1.c
+@@ -1051,6 +1051,7 @@ DtCompileFpdt (
+     ACPI_DMTABLE_INFO       *InfoTable;
+     DT_FIELD                **PFieldList = (DT_FIELD **) List;
+     DT_FIELD                *SubtableStart;
++    UINT16                  SubtableType;
+ 
+ 
+     while (*PFieldList)
+@@ -1069,7 +1070,8 @@ DtCompileFpdt (
+ 
+         FpdtHeader = ACPI_CAST_PTR (ACPI_FPDT_HEADER, Subtable->Buffer);
+ 
+-        switch (FpdtHeader->Type)
++	SubtableType = AcpiUtReadUint16(&FpdtHeader->Type);
++        switch (SubtableType)
+         {
+         case ACPI_FPDT_TYPE_BOOT:
+ 
diff --git a/0015-Support-GTDT-in-a-big-endian-world.patch b/0015-Support-GTDT-in-a-big-endian-world.patch
new file mode 100644
index 0000000..7302133
--- /dev/null
+++ b/0015-Support-GTDT-in-a-big-endian-world.patch
@@ -0,0 +1,69 @@
+From faba93b1dd7ce4aa8983880e917d108496cd173f Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Tue, 22 Sep 2020 18:12:01 -0600
+Subject: [PATCH 15/40] Support GTDT in a big-endian world
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/common/dmtbdump1.c  | 13 +++++++++----
+ source/compiler/dttable1.c |  9 +++++++--
+ 2 files changed, 16 insertions(+), 6 deletions(-)
+
+Index: acpica-unix2-20200925/source/common/dmtbdump1.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/common/dmtbdump1.c
++++ acpica-unix2-20200925/source/common/dmtbdump1.c
+@@ -997,7 +997,7 @@ AcpiDmDumpGtdt (
+ {
+     ACPI_STATUS             Status;
+     ACPI_GTDT_HEADER        *Subtable;
+-    UINT32                  Length = Table->Length;
++    UINT32                  Length = AcpiUtReadUint32(&Table->Length);
+     UINT32                  Offset = sizeof (ACPI_TABLE_GTDT);
+     ACPI_DMTABLE_INFO       *InfoTable;
+     UINT32                  SubtableLength;
+@@ -1033,7 +1033,7 @@ AcpiDmDumpGtdt (
+ 
+     /* Subtables */
+ 
+-    while (Offset < Table->Length)
++    while (Offset < Length)
+     {
+         /* Common subtable header */
+ 
+@@ -1051,8 +1051,13 @@ AcpiDmDumpGtdt (
+         case ACPI_GTDT_TYPE_TIMER_BLOCK:
+ 
+             SubtableLength = sizeof (ACPI_GTDT_TIMER_BLOCK);
+-            GtCount = (ACPI_CAST_PTR (ACPI_GTDT_TIMER_BLOCK,
+-                Subtable))->TimerCount;
++	    {
++	        UINT32 Tmp32;
++
++                Tmp32 = (ACPI_CAST_PTR (ACPI_GTDT_TIMER_BLOCK,
++                    Subtable))->TimerCount;
++                GtCount = AcpiUtReadUint32(&Tmp32);
++	    }
+ 
+             InfoTable = AcpiDmTableInfoGtdt0;
+             break;
+Index: acpica-unix2-20200925/source/compiler/dttable1.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/compiler/dttable1.c
++++ acpica-unix2-20200925/source/compiler/dttable1.c
+@@ -997,8 +997,13 @@ DtCompileGtdt (
+             DtPushSubtable (Subtable);
+             ParentTable = DtPeekSubtable ();
+ 
+-            GtCount = (ACPI_CAST_PTR (ACPI_GTDT_TIMER_BLOCK,
+-                Subtable->Buffer - sizeof(ACPI_GTDT_HEADER)))->TimerCount;
++	    {
++	        UINT32 Tmp32;
++
++                Tmp32 = (ACPI_CAST_PTR (ACPI_GTDT_TIMER_BLOCK,
++                    Subtable->Buffer - sizeof(ACPI_GTDT_HEADER)))->TimerCount;
++                GtCount = AcpiUtReadUint32(&Tmp32);
++	    }
+ 
+             while (GtCount)
+             {
diff --git a/0016-Support-HEST-in-a-big-endian-world.patch b/0016-Support-HEST-in-a-big-endian-world.patch
new file mode 100644
index 0000000..e38456f
--- /dev/null
+++ b/0016-Support-HEST-in-a-big-endian-world.patch
@@ -0,0 +1,75 @@
+From 1104928443b11ff1c0446ed1604882c0e6ae4dc1 Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Wed, 23 Sep 2020 11:54:49 -0600
+Subject: [PATCH 16/40] Support HEST in a big-endian world
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/common/dmtbdump1.c  | 10 ++++++----
+ source/compiler/dttable1.c |  4 +++-
+ 2 files changed, 9 insertions(+), 5 deletions(-)
+
+Index: acpica-unix2-20200925/source/common/dmtbdump1.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/common/dmtbdump1.c
++++ acpica-unix2-20200925/source/common/dmtbdump1.c
+@@ -1138,12 +1138,13 @@ AcpiDmDumpHest (
+ {
+     ACPI_STATUS             Status;
+     ACPI_HEST_HEADER        *Subtable;
+-    UINT32                  Length = Table->Length;
++    UINT32                  Length = AcpiUtReadUint32(&Table->Length);
+     UINT32                  Offset = sizeof (ACPI_TABLE_HEST);
+     ACPI_DMTABLE_INFO       *InfoTable;
+     UINT32                  SubtableLength;
+     UINT32                  BankCount;
+     ACPI_HEST_IA_ERROR_BANK *BankTable;
++    UINT16                  SubtableType;
+ 
+ 
+     /* Main table */
+@@ -1157,10 +1158,11 @@ AcpiDmDumpHest (
+     /* Subtables */
+ 
+     Subtable = ACPI_ADD_PTR (ACPI_HEST_HEADER, Table, Offset);
+-    while (Offset < Table->Length)
++    while (Offset < Length)
+     {
+         BankCount = 0;
+-        switch (Subtable->Type)
++	SubtableType = Subtable->Type;
++        switch (SubtableType)
+         {
+         case ACPI_HEST_TYPE_IA32_CHECK:
+ 
+@@ -1227,7 +1229,7 @@ AcpiDmDumpHest (
+             /* Cannot continue on unknown type - no length */
+ 
+             AcpiOsPrintf ("\n**** Unknown HEST subtable type 0x%X\n",
+-                Subtable->Type);
++                SubtableType);
+             return;
+         }
+ 
+Index: acpica-unix2-20200925/source/compiler/dttable1.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/compiler/dttable1.c
++++ acpica-unix2-20200925/source/compiler/dttable1.c
+@@ -1133,6 +1133,7 @@ DtCompileHest (
+     DT_FIELD                *SubtableStart;
+     ACPI_DMTABLE_INFO       *InfoTable;
+     UINT16                  Type;
++    UINT16                  Tmp16;
+     UINT32                  BankCount;
+ 
+ 
+@@ -1151,7 +1152,8 @@ DtCompileHest (
+         /* Get subtable type */
+ 
+         SubtableStart = *PFieldList;
+-        DtCompileInteger ((UINT8 *) &Type, *PFieldList, 2, 0);
++        DtCompileInteger ((UINT8 *) &Tmp16, *PFieldList, 2, 0);
++	Type = AcpiUtReadUint32(&Tmp16);
+ 
+         switch (Type)
+         {
diff --git a/0017-Support-RSDT-RSD-PTR-in-a-big-endian-world.patch b/0017-Support-RSDT-RSD-PTR-in-a-big-endian-world.patch
new file mode 100644
index 0000000..4925302
--- /dev/null
+++ b/0017-Support-RSDT-RSD-PTR-in-a-big-endian-world.patch
@@ -0,0 +1,37 @@
+From 6565935b43c4795387aa4814d171dcd3c02bee33 Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Wed, 23 Sep 2020 12:11:46 -0600
+Subject: [PATCH 17/40] Support RSDT ('RSD PTR') in a big-endian world
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/common/dmtbdump.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+Index: acpica-unix2-20200925/source/common/dmtbdump.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/common/dmtbdump.c
++++ acpica-unix2-20200925/source/common/dmtbdump.c
+@@ -277,6 +277,7 @@ AcpiDmDumpRsdt (
+     UINT32                  Entries;
+     UINT32                  Offset;
+     UINT32                  i;
++    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
+ 
+ 
+     /* Point to start of table pointer array */
+@@ -286,12 +287,12 @@ AcpiDmDumpRsdt (
+ 
+     /* RSDT uses 32-bit pointers */
+ 
+-    Entries = (Table->Length - sizeof (ACPI_TABLE_HEADER)) / sizeof (UINT32);
++    Entries = (TableLength - sizeof (ACPI_TABLE_HEADER)) / sizeof (UINT32);
+ 
+     for (i = 0; i < Entries; i++)
+     {
+         AcpiDmLineHeader2 (Offset, sizeof (UINT32), "ACPI Table Address", i);
+-        AcpiOsPrintf ("%8.8X\n", Array[i]);
++        AcpiOsPrintf ("%8.8X\n", AcpiUtReadUint32(&Array[i]));
+         Offset += sizeof (UINT32);
+     }
+ }
diff --git a/0018-Support-XSDT-in-a-big-endian-world.patch b/0018-Support-XSDT-in-a-big-endian-world.patch
new file mode 100644
index 0000000..7ae8ea1
--- /dev/null
+++ b/0018-Support-XSDT-in-a-big-endian-world.patch
@@ -0,0 +1,38 @@
+From 8d0ea4932cebc5d13cc811eb4f78b66a5e3cfd2c Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Wed, 23 Sep 2020 12:16:37 -0600
+Subject: [PATCH 18/40] Support XSDT in a big-endian world
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/common/dmtbdump.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+Index: acpica-unix2-20200925/source/common/dmtbdump.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/common/dmtbdump.c
++++ acpica-unix2-20200925/source/common/dmtbdump.c
+@@ -318,6 +318,7 @@ AcpiDmDumpXsdt (
+     UINT32                  Entries;
+     UINT32                  Offset;
+     UINT32                  i;
++    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
+ 
+ 
+     /* Point to start of table pointer array */
+@@ -327,12 +328,13 @@ AcpiDmDumpXsdt (
+ 
+     /* XSDT uses 64-bit pointers */
+ 
+-    Entries = (Table->Length - sizeof (ACPI_TABLE_HEADER)) / sizeof (UINT64);
++    Entries = (TableLength - sizeof (ACPI_TABLE_HEADER)) / sizeof (UINT64);
+ 
+     for (i = 0; i < Entries; i++)
+     {
+         AcpiDmLineHeader2 (Offset, sizeof (UINT64), "ACPI Table Address", i);
+-        AcpiOsPrintf ("%8.8X%8.8X\n", ACPI_FORMAT_UINT64 (Array[i]));
++        AcpiOsPrintf ("%8.8X%8.8X\n",
++		     	ACPI_FORMAT_UINT64 (AcpiUtReadUint64(&Array[i])));
+         Offset += sizeof (UINT64);
+     }
+ }
diff --git a/0019-Support-SRAT-in-a-big-endian-world.patch b/0019-Support-SRAT-in-a-big-endian-world.patch
new file mode 100644
index 0000000..6bb6215
--- /dev/null
+++ b/0019-Support-SRAT-in-a-big-endian-world.patch
@@ -0,0 +1,52 @@
+From 82421dd7d534f78edf85b862b196bae256cf8f87 Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Wed, 23 Sep 2020 12:25:38 -0600
+Subject: [PATCH 19/40] Support SRAT in a big-endian world
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/common/dmtbdump3.c | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+Index: acpica-unix2-20200925/source/common/dmtbdump3.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/common/dmtbdump3.c
++++ acpica-unix2-20200925/source/common/dmtbdump3.c
+@@ -173,11 +173,12 @@ AcpiDmDumpSrat (
+     UINT32                  Offset = sizeof (ACPI_TABLE_SRAT);
+     ACPI_SUBTABLE_HEADER    *Subtable;
+     ACPI_DMTABLE_INFO       *InfoTable;
++    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
+ 
+ 
+     /* Main table */
+ 
+-    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoSrat);
++    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoSrat);
+     if (ACPI_FAILURE (Status))
+     {
+         return;
+@@ -186,12 +187,12 @@ AcpiDmDumpSrat (
+     /* Subtables */
+ 
+     Subtable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Table, Offset);
+-    while (Offset < Table->Length)
++    while (Offset < TableLength)
+     {
+         /* Common subtable header */
+ 
+         AcpiOsPrintf ("\n");
+-        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
++        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
+             Subtable->Length, AcpiDmTableInfoSratHdr);
+         if (ACPI_FAILURE (Status))
+         {
+@@ -245,7 +246,7 @@ AcpiDmDumpSrat (
+         }
+ 
+         AcpiOsPrintf ("\n");
+-        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
++        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
+             Subtable->Length, InfoTable);
+         if (ACPI_FAILURE (Status))
+         {
diff --git a/0020-Support-SLIT-in-a-big-endian-world.patch b/0020-Support-SLIT-in-a-big-endian-world.patch
new file mode 100644
index 0000000..a0e3a5e
--- /dev/null
+++ b/0020-Support-SLIT-in-a-big-endian-world.patch
@@ -0,0 +1,61 @@
+From 4e76aa1a5556f250f51a3802734fd6cb77718299 Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Wed, 23 Sep 2020 12:49:52 -0600
+Subject: [PATCH 20/40] Support SLIT in a big-endian world
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/common/dmtbdump3.c  | 8 +++++---
+ source/compiler/dttable2.c | 2 +-
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+Index: acpica-unix2-20200925/source/common/dmtbdump3.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/common/dmtbdump3.c
++++ acpica-unix2-20200925/source/common/dmtbdump3.c
+@@ -96,11 +96,12 @@ AcpiDmDumpSlit (
+     UINT32                  Localities;
+     UINT32                  i;
+     UINT32                  j;
++    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
+ 
+ 
+     /* Main table */
+ 
+-    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoSlit);
++    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoSlit);
+     if (ACPI_FAILURE (Status))
+     {
+         return;
+@@ -108,7 +109,8 @@ AcpiDmDumpSlit (
+ 
+     /* Display the Locality NxN Matrix */
+ 
+-    Localities = (UINT32) ACPI_CAST_PTR (ACPI_TABLE_SLIT, Table)->LocalityCount;
++    Localities = (UINT32) 
++        AcpiUtReadUint64(&ACPI_CAST_PTR (ACPI_TABLE_SLIT, Table)->LocalityCount);
+     Offset = ACPI_OFFSET (ACPI_TABLE_SLIT, Entry[0]);
+     Row = (UINT8 *) ACPI_CAST_PTR (ACPI_TABLE_SLIT, Table)->Entry;
+ 
+@@ -121,7 +123,7 @@ AcpiDmDumpSlit (
+         {
+             /* Check for beyond EOT */
+ 
+-            if (Offset >= Table->Length)
++            if (Offset >= TableLength)
+             {
+                 AcpiOsPrintf (
+                     "\n**** Not enough room in table for all localities\n");
+Index: acpica-unix2-20200925/source/compiler/dttable2.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/compiler/dttable2.c
++++ acpica-unix2-20200925/source/compiler/dttable2.c
+@@ -1529,7 +1529,7 @@ DtCompileSlit (
+     ParentTable = DtPeekSubtable ();
+     DtInsertSubtable (ParentTable, Subtable);
+ 
+-    Localities = *ACPI_CAST_PTR (UINT32, Subtable->Buffer);
++    Localities = (UINT32) AcpiUtReadUint64(Subtable->Buffer);
+     LocalityBuffer = UtLocalCalloc (Localities);
+     LocalityListLength = 0;
+ 
diff --git a/0021-Support-MSCT-in-a-big-endian-world.patch b/0021-Support-MSCT-in-a-big-endian-world.patch
new file mode 100644
index 0000000..3a59eaa
--- /dev/null
+++ b/0021-Support-MSCT-in-a-big-endian-world.patch
@@ -0,0 +1,43 @@
+From 4ca38d182bb40ba750d8f5ac6ff8560c40f06625 Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Wed, 23 Sep 2020 15:44:21 -0600
+Subject: [PATCH 21/40] Support MSCT in a big-endian world
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/common/dmtbdump2.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+Index: acpica-unix2-20200925/source/common/dmtbdump2.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20200925/source/common/dmtbdump2.c
+@@ -972,11 +972,12 @@ AcpiDmDumpMsct (
+     ACPI_STATUS             Status;
+     UINT32                  Offset = sizeof (ACPI_TABLE_MSCT);
+     ACPI_MSCT_PROXIMITY     *Subtable;
++    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
+ 
+ 
+     /* Main table */
+ 
+-    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoMsct);
++    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoMsct);
+     if (ACPI_FAILURE (Status))
+     {
+         return;
+@@ -985,12 +986,12 @@ AcpiDmDumpMsct (
+     /* Subtables */
+ 
+     Subtable = ACPI_ADD_PTR (ACPI_MSCT_PROXIMITY, Table, Offset);
+-    while (Offset < Table->Length)
++    while (Offset < TableLength)
+     {
+         /* Common subtable header */
+ 
+         AcpiOsPrintf ("\n");
+-        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
++        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
+             sizeof (ACPI_MSCT_PROXIMITY), AcpiDmTableInfoMsct0);
+         if (ACPI_FAILURE (Status))
+         {
diff --git a/0022-Support-MPST-in-a-big-endian-world.patch b/0022-Support-MPST-in-a-big-endian-world.patch
new file mode 100644
index 0000000..2b4c2e3
--- /dev/null
+++ b/0022-Support-MPST-in-a-big-endian-world.patch
@@ -0,0 +1,152 @@
+From dfe414b053fb9feb905271785b319afa7ba72932 Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Wed, 23 Sep 2020 16:08:24 -0600
+Subject: [PATCH 22/40] Support MPST in a big-endian world
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/common/dmtbdump2.c  | 33 +++++++++++++++++++--------------
+ source/compiler/dttable2.c |  8 ++++----
+ 2 files changed, 23 insertions(+), 18 deletions(-)
+
+Index: acpica-unix2-20200925/source/common/dmtbdump2.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20200925/source/common/dmtbdump2.c
+@@ -834,11 +834,13 @@ AcpiDmDumpMpst (
+     UINT16                  SubtableCount;
+     UINT32                  PowerStateCount;
+     UINT32                  ComponentCount;
++    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
++    UINT16                  Tmp16;
+ 
+ 
+     /* Main table */
+ 
+-    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoMpst);
++    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoMpst);
+     if (ACPI_FAILURE (Status))
+     {
+         return;
+@@ -846,13 +848,14 @@ AcpiDmDumpMpst (
+ 
+     /* Subtable: Memory Power Node(s) */
+ 
+-    SubtableCount = (ACPI_CAST_PTR (ACPI_TABLE_MPST, Table))->PowerNodeCount;
++    Tmp16 = (ACPI_CAST_PTR (ACPI_TABLE_MPST, Table))->PowerNodeCount;
++    SubtableCount = AcpiUtReadUint16(&Tmp16);
+     Subtable0 = ACPI_ADD_PTR (ACPI_MPST_POWER_NODE, Table, Offset);
+ 
+-    while ((Offset < Table->Length) && SubtableCount)
++    while ((Offset < TableLength) && SubtableCount)
+     {
+         AcpiOsPrintf ("\n");
+-        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable0,
++        Status = AcpiDmDumpTable (TableLength, Offset, Subtable0,
+             sizeof (ACPI_MPST_POWER_NODE), AcpiDmTableInfoMpst0);
+         if (ACPI_FAILURE (Status))
+         {
+@@ -861,8 +864,8 @@ AcpiDmDumpMpst (
+ 
+         /* Extract the sub-subtable counts */
+ 
+-        PowerStateCount = Subtable0->NumPowerStates;
+-        ComponentCount = Subtable0->NumPhysicalComponents;
++        PowerStateCount = AcpiUtReadUint16(&Subtable0->NumPowerStates);
++        ComponentCount = AcpiUtReadUint16(&Subtable0->NumPhysicalComponents);
+         Offset += sizeof (ACPI_MPST_POWER_NODE);
+ 
+         /* Sub-subtables - Memory Power State Structure(s) */
+@@ -873,7 +876,7 @@ AcpiDmDumpMpst (
+         while (PowerStateCount)
+         {
+             AcpiOsPrintf ("\n");
+-            Status = AcpiDmDumpTable (Table->Length, Offset, Subtable0A,
++            Status = AcpiDmDumpTable (TableLength, Offset, Subtable0A,
+                 sizeof (ACPI_MPST_POWER_STATE), AcpiDmTableInfoMpst0A);
+             if (ACPI_FAILURE (Status))
+             {
+@@ -896,7 +899,7 @@ AcpiDmDumpMpst (
+ 
+         while (ComponentCount)
+         {
+-            Status = AcpiDmDumpTable (Table->Length, Offset, Subtable0B,
++            Status = AcpiDmDumpTable (TableLength, Offset, Subtable0B,
+                 sizeof (ACPI_MPST_COMPONENT), AcpiDmTableInfoMpst0B);
+             if (ACPI_FAILURE (Status))
+             {
+@@ -913,22 +916,24 @@ AcpiDmDumpMpst (
+         SubtableCount--;
+         Subtable0 = ACPI_ADD_PTR (ACPI_MPST_POWER_NODE, Subtable0,
+             sizeof (ACPI_MPST_POWER_NODE) +
+-            (sizeof (ACPI_MPST_POWER_STATE) * Subtable0->NumPowerStates) +
+-            (sizeof (ACPI_MPST_COMPONENT) * Subtable0->NumPhysicalComponents));
++            (sizeof (ACPI_MPST_POWER_STATE) * 
++	         AcpiUtReadUint16(&Subtable0->NumPowerStates)) +
++            (sizeof (ACPI_MPST_COMPONENT) * 
++	         AcpiUtReadUint16(&Subtable0->NumPhysicalComponents)));
+     }
+ 
+     /* Subtable: Count of Memory Power State Characteristic structures */
+ 
+     AcpiOsPrintf ("\n");
+     Subtable1 = ACPI_CAST_PTR (ACPI_MPST_DATA_HDR, Subtable0);
+-    Status = AcpiDmDumpTable (Table->Length, Offset, Subtable1,
++    Status = AcpiDmDumpTable (TableLength, Offset, Subtable1,
+         sizeof (ACPI_MPST_DATA_HDR), AcpiDmTableInfoMpst1);
+     if (ACPI_FAILURE (Status))
+     {
+         return;
+     }
+ 
+-    SubtableCount = Subtable1->CharacteristicsCount;
++    SubtableCount = AcpiUtReadUint16(&Subtable1->CharacteristicsCount);
+     Offset += sizeof (ACPI_MPST_DATA_HDR);
+ 
+     /* Subtable: Memory Power State Characteristics structure(s) */
+@@ -936,10 +941,10 @@ AcpiDmDumpMpst (
+     Subtable2 = ACPI_ADD_PTR (ACPI_MPST_POWER_DATA, Subtable1,
+         sizeof (ACPI_MPST_DATA_HDR));
+ 
+-    while ((Offset < Table->Length) && SubtableCount)
++    while ((Offset < TableLength) && SubtableCount)
+     {
+         AcpiOsPrintf ("\n");
+-        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable2,
++        Status = AcpiDmDumpTable (TableLength, Offset, Subtable2,
+             sizeof (ACPI_MPST_POWER_DATA), AcpiDmTableInfoMpst2);
+         if (ACPI_FAILURE (Status))
+         {
+Index: acpica-unix2-20200925/source/compiler/dttable2.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/compiler/dttable2.c
++++ acpica-unix2-20200925/source/compiler/dttable2.c
+@@ -345,7 +345,7 @@ DtCompileMpst (
+     DtPushSubtable (Subtable);
+ 
+     MpstChannelInfo = ACPI_CAST_PTR (ACPI_MPST_CHANNEL, Subtable->Buffer);
+-    SubtableCount = MpstChannelInfo->PowerNodeCount;
++    SubtableCount = AcpiUtReadUint16(&MpstChannelInfo->PowerNodeCount);
+ 
+     while (*PFieldList && SubtableCount)
+     {
+@@ -363,8 +363,8 @@ DtCompileMpst (
+         DtPushSubtable (Subtable);
+ 
+         MpstPowerNode = ACPI_CAST_PTR (ACPI_MPST_POWER_NODE, Subtable->Buffer);
+-        PowerStateCount = MpstPowerNode->NumPowerStates;
+-        ComponentCount = MpstPowerNode->NumPhysicalComponents;
++        PowerStateCount = AcpiUtReadUint16(&MpstPowerNode->NumPowerStates);
++        ComponentCount = AcpiUtReadUint16(&MpstPowerNode->NumPhysicalComponents);
+ 
+         ParentTable = DtPeekSubtable ();
+ 
+@@ -417,7 +417,7 @@ DtCompileMpst (
+     DtPushSubtable (Subtable);
+ 
+     MpstDataHeader = ACPI_CAST_PTR (ACPI_MPST_DATA_HDR, Subtable->Buffer);
+-    SubtableCount = MpstDataHeader->CharacteristicsCount;
++    SubtableCount = AcpiUtReadUint16(&MpstDataHeader->CharacteristicsCount);
+ 
+     ParentTable = DtPeekSubtable ();
+ 
diff --git a/0023-Support-NFIT-in-a-big-endian-world.patch b/0023-Support-NFIT-in-a-big-endian-world.patch
new file mode 100644
index 0000000..42d5a7d
--- /dev/null
+++ b/0023-Support-NFIT-in-a-big-endian-world.patch
@@ -0,0 +1,221 @@
+From 2a1f049c35736ddba45300bc5aba4db9c9df3be7 Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Thu, 24 Sep 2020 15:25:53 -0600
+Subject: [PATCH 23/40] Support NFIT in a big-endian world
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/common/dmtable.c    |  4 ++--
+ source/common/dmtbdump2.c  | 47 +++++++++++++++++++++++---------------
+ source/compiler/dttable2.c | 11 ++++++---
+ 3 files changed, 38 insertions(+), 24 deletions(-)
+
+Index: acpica-unix2-20200925/source/common/dmtable.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/common/dmtable.c
++++ acpica-unix2-20200925/source/common/dmtable.c
+@@ -1429,13 +1429,13 @@ AcpiDmDumpTable (
+ 
+             /* NFIT subtable types */
+ 
+-            Temp16 = ACPI_GET16 (Target);
++            Temp16 = AcpiUtReadUint16(Target);
+             if (Temp16 > ACPI_NFIT_TYPE_RESERVED)
+             {
+                 Temp16 = ACPI_NFIT_TYPE_RESERVED;
+             }
+ 
+-            AcpiOsPrintf (UINT16_FORMAT, ACPI_GET16 (Target),
++            AcpiOsPrintf (UINT16_FORMAT, Temp16,
+                 AcpiDmNfitSubnames[Temp16]);
+             break;
+ 
+Index: acpica-unix2-20200925/source/common/dmtbdump2.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20200925/source/common/dmtbdump2.c
+@@ -1084,18 +1084,23 @@ AcpiDmDumpNfit (
+     ACPI_STATUS             Status;
+     UINT32                  Offset = sizeof (ACPI_TABLE_NFIT);
+     UINT32                  FieldOffset = 0;
+-    UINT32                  Length;
++    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
+     ACPI_NFIT_HEADER        *Subtable;
+     ACPI_DMTABLE_INFO       *InfoTable;
+     ACPI_NFIT_INTERLEAVE    *Interleave = NULL;
+     ACPI_NFIT_SMBIOS        *SmbiosInfo = NULL;
+     ACPI_NFIT_FLUSH_ADDRESS *Hint = NULL;
+     UINT32                  i;
++    UINT32                  Length;
++    UINT32                  LineCount;
++    UINT16                  SubtableLength;
++    UINT16                  SubtableType;
++    UINT16                  HintCount;
+ 
+ 
+     /* Main table */
+ 
+-    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoNfit);
++    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoNfit);
+     if (ACPI_FAILURE (Status))
+     {
+         return;
+@@ -1104,19 +1109,21 @@ AcpiDmDumpNfit (
+     /* Subtables */
+ 
+     Subtable = ACPI_ADD_PTR (ACPI_NFIT_HEADER, Table, Offset);
+-    while (Offset < Table->Length)
++    while (Offset < TableLength)
+     {
+         /* NFIT subtable header */
+ 
+         AcpiOsPrintf ("\n");
+-        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
+-            Subtable->Length, AcpiDmTableInfoNfitHdr);
++	SubtableType = AcpiUtReadUint16(&Subtable->Type);
++	SubtableLength = AcpiUtReadUint16(&Subtable->Length);
++        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
++            SubtableLength, AcpiDmTableInfoNfitHdr);
+         if (ACPI_FAILURE (Status))
+         {
+             return;
+         }
+ 
+-        switch (Subtable->Type)
++        switch (SubtableType)
+         {
+         case ACPI_NFIT_TYPE_SYSTEM_ADDRESS:
+ 
+@@ -1167,11 +1174,11 @@ AcpiDmDumpNfit (
+ 
+         default:
+             AcpiOsPrintf ("\n**** Unknown NFIT subtable type 0x%X\n",
+-                Subtable->Type);
++                SubtableType);
+ 
+             /* Attempt to continue */
+ 
+-            if (!Subtable->Length)
++            if (!SubtableLength)
+             {
+                 AcpiOsPrintf ("Invalid zero length subtable\n");
+                 return;
+@@ -1180,8 +1187,8 @@ AcpiDmDumpNfit (
+         }
+ 
+         AcpiOsPrintf ("\n");
+-        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
+-            Subtable->Length, InfoTable);
++        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
++            SubtableLength, InfoTable);
+         if (ACPI_FAILURE (Status))
+         {
+             return;
+@@ -1189,14 +1196,15 @@ AcpiDmDumpNfit (
+ 
+         /* Per-subtable variable-length fields */
+ 
+-        switch (Subtable->Type)
++        switch (SubtableType)
+         {
+         case ACPI_NFIT_TYPE_INTERLEAVE:
+ 
+             Interleave = ACPI_CAST_PTR (ACPI_NFIT_INTERLEAVE, Subtable);
+-            for (i = 0; i < Interleave->LineCount; i++)
++	    LineCount = AcpiUtReadUint32(&Interleave->LineCount);
++            for (i = 0; i < LineCount; i++)
+             {
+-                Status = AcpiDmDumpTable (Table->Length, Offset + FieldOffset,
++                Status = AcpiDmDumpTable (TableLength, Offset + FieldOffset,
+                     &Interleave->LineOffset[i],
+                     sizeof (UINT32), AcpiDmTableInfoNfit2a);
+                 if (ACPI_FAILURE (Status))
+@@ -1210,12 +1218,12 @@ AcpiDmDumpNfit (
+ 
+         case ACPI_NFIT_TYPE_SMBIOS:
+ 
+-            Length = Subtable->Length -
++            Length = SubtableLength -
+                 sizeof (ACPI_NFIT_SMBIOS) + sizeof (UINT8);
+ 
+             if (Length)
+             {
+-                Status = AcpiDmDumpTable (Table->Length,
++                Status = AcpiDmDumpTable (TableLength,
+                     sizeof (ACPI_NFIT_SMBIOS) - sizeof (UINT8),
+                     SmbiosInfo,
+                     Length, AcpiDmTableInfoNfit3a);
+@@ -1230,9 +1238,10 @@ AcpiDmDumpNfit (
+         case ACPI_NFIT_TYPE_FLUSH_ADDRESS:
+ 
+             Hint = ACPI_CAST_PTR (ACPI_NFIT_FLUSH_ADDRESS, Subtable);
+-            for (i = 0; i < Hint->HintCount; i++)
++	    HintCount = AcpiUtReadUint16(&Hint->HintCount);
++            for (i = 0; i < HintCount; i++)
+             {
+-                Status = AcpiDmDumpTable (Table->Length, Offset + FieldOffset,
++                Status = AcpiDmDumpTable (TableLength, Offset + FieldOffset,
+                     &Hint->HintAddress[i],
+                     sizeof (UINT64), AcpiDmTableInfoNfit6a);
+                 if (ACPI_FAILURE (Status))
+@@ -1251,8 +1260,8 @@ AcpiDmDumpNfit (
+ NextSubtable:
+         /* Point to next subtable */
+ 
+-        Offset += Subtable->Length;
+-        Subtable = ACPI_ADD_PTR (ACPI_NFIT_HEADER, Subtable, Subtable->Length);
++        Offset += SubtableLength;
++        Subtable = ACPI_ADD_PTR (ACPI_NFIT_HEADER, Subtable, SubtableLength);
+     }
+ }
+ 
+Index: acpica-unix2-20200925/source/compiler/dttable2.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/compiler/dttable2.c
++++ acpica-unix2-20200925/source/compiler/dttable2.c
+@@ -517,6 +517,7 @@ DtCompileNfit (
+     UINT32                  Count;
+     ACPI_NFIT_INTERLEAVE    *Interleave = NULL;
+     ACPI_NFIT_FLUSH_ADDRESS *Hint = NULL;
++    UINT16                  NfitHeaderType;
+ 
+ 
+     /* Main table */
+@@ -550,7 +551,8 @@ DtCompileNfit (
+ 
+         NfitHeader = ACPI_CAST_PTR (ACPI_NFIT_HEADER, Subtable->Buffer);
+ 
+-        switch (NfitHeader->Type)
++	NfitHeaderType = AcpiUtReadUint16(&NfitHeader->Type);
++        switch (NfitHeaderType)
+         {
+         case ACPI_NFIT_TYPE_SYSTEM_ADDRESS:
+ 
+@@ -610,7 +612,7 @@ DtCompileNfit (
+         DtInsertSubtable (ParentTable, Subtable);
+         DtPopSubtable ();
+ 
+-        switch (NfitHeader->Type)
++        switch (NfitHeaderType)
+         {
+         case ACPI_NFIT_TYPE_INTERLEAVE:
+ 
+@@ -636,7 +638,8 @@ DtCompileNfit (
+                 Count++;
+             }
+ 
+-            Interleave->LineCount = Count;
++            AcpiUtWriteUint(&Interleave->LineCount, sizeof(UINT32),
++			    &Count, sizeof(UINT32));
+             break;
+ 
+         case ACPI_NFIT_TYPE_SMBIOS:
+@@ -682,6 +685,8 @@ DtCompileNfit (
+             }
+ 
+             Hint->HintCount = (UINT16) Count;
++            AcpiUtWriteUint(&Hint->HintCount, sizeof(UINT16),
++			    &Count, sizeof(UINT32));
+             break;
+ 
+         default:
diff --git a/0024-Support-SDEV-in-a-big-endian-world.patch b/0024-Support-SDEV-in-a-big-endian-world.patch
new file mode 100644
index 0000000..f6d36bd
--- /dev/null
+++ b/0024-Support-SDEV-in-a-big-endian-world.patch
@@ -0,0 +1,256 @@
+From af44bec6c062a26034a43809d81af2a0ea17343e Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Fri, 25 Sep 2020 16:05:59 -0600
+Subject: [PATCH 24/40] Support SDEV in a big-endian world
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/common/dmtbdump2.c  | 50 +++++++++++++++++++-----------------
+ source/compiler/dttable2.c | 52 ++++++++++++++++++++++++++++----------
+ 2 files changed, 65 insertions(+), 37 deletions(-)
+
+Index: acpica-unix2-20200925/source/common/dmtbdump2.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20200925/source/common/dmtbdump2.c
+@@ -1871,17 +1871,18 @@ AcpiDmDumpSdev (
+     ACPI_SDEV_PCIE          *Pcie;
+     ACPI_SDEV_NAMESPACE     *Namesp;
+     ACPI_DMTABLE_INFO       *InfoTable;
+-    UINT32                  Length = Table->Length;
++    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
+     UINT32                  Offset = sizeof (ACPI_TABLE_SDEV);
+     UINT16                  PathOffset;
+     UINT16                  PathLength;
+     UINT16                  VendorDataOffset;
+     UINT16                  VendorDataLength;
++    UINT16                  SubtableLength;
+ 
+ 
+     /* Main table */
+ 
+-    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoSdev);
++    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoSdev);
+     if (ACPI_FAILURE (Status))
+     {
+         return;
+@@ -1890,13 +1891,14 @@ AcpiDmDumpSdev (
+     /* Subtables */
+ 
+     Subtable = ACPI_ADD_PTR (ACPI_SDEV_HEADER, Table, Offset);
+-    while (Offset < Table->Length)
++    while (Offset < TableLength)
+     {
+         /* Common subtable header */
+ 
+         AcpiOsPrintf ("\n");
+-        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
+-            Subtable->Length, AcpiDmTableInfoSdevHdr);
++	SubtableLength = AcpiUtReadUint16(&Subtable->Length);
++        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
++            SubtableLength, AcpiDmTableInfoSdevHdr);
+         if (ACPI_FAILURE (Status))
+         {
+             return;
+@@ -1919,8 +1921,8 @@ AcpiDmDumpSdev (
+         }
+ 
+         AcpiOsPrintf ("\n");
+-        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
+-            Subtable->Length, InfoTable);
++        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
++            SubtableLength, InfoTable);
+         if (ACPI_FAILURE (Status))
+         {
+             return;
+@@ -1933,12 +1935,12 @@ AcpiDmDumpSdev (
+             /* Dump the PCIe device ID(s) */
+ 
+             Namesp = ACPI_CAST_PTR (ACPI_SDEV_NAMESPACE, Subtable);
+-            PathOffset = Namesp->DeviceIdOffset;
+-            PathLength = Namesp->DeviceIdLength;
++            PathOffset = AcpiUtReadUint16(&Namesp->DeviceIdOffset);
++            PathLength = AcpiUtReadUint16(&Namesp->DeviceIdLength);
+ 
+             if (PathLength)
+             {
+-                Status = AcpiDmDumpTable (Table->Length, 0,
++                Status = AcpiDmDumpTable (TableLength, 0,
+                     ACPI_ADD_PTR (UINT8, Namesp, PathOffset),
+                     PathLength, AcpiDmTableInfoSdev0a);
+                 if (ACPI_FAILURE (Status))
+@@ -1949,14 +1951,14 @@ AcpiDmDumpSdev (
+ 
+             /* Dump the vendor-specific data */
+ 
+-            VendorDataLength =
+-                Namesp->VendorDataLength;
+-            VendorDataOffset =
+-                Namesp->DeviceIdOffset + Namesp->DeviceIdLength;
++            VendorDataLength = AcpiUtReadUint16(&Namesp->VendorDataLength);
++            VendorDataOffset = 
++		    AcpiUtReadUint16(&Namesp->DeviceIdOffset) + 
++		    AcpiUtReadUint16(&Namesp->DeviceIdLength);
+ 
+             if (VendorDataLength)
+             {
+-                Status = AcpiDmDumpTable (Table->Length, 0,
++                Status = AcpiDmDumpTable (TableLength, 0,
+                     ACPI_ADD_PTR (UINT8, Namesp, VendorDataOffset),
+                     VendorDataLength, AcpiDmTableInfoSdev1b);
+                 if (ACPI_FAILURE (Status))
+@@ -1971,12 +1973,12 @@ AcpiDmDumpSdev (
+             /* PCI path substructures */
+ 
+             Pcie = ACPI_CAST_PTR (ACPI_SDEV_PCIE, Subtable);
+-            PathOffset = Pcie->PathOffset;
+-            PathLength = Pcie->PathLength;
++            PathOffset = AcpiUtReadUint16(&Pcie->PathOffset);
++            PathLength = AcpiUtReadUint16(&Pcie->PathLength);
+ 
+             while (PathLength)
+             {
+-                Status = AcpiDmDumpTable (Table->Length,
++                Status = AcpiDmDumpTable (TableLength,
+                     PathOffset + Offset,
+                     ACPI_ADD_PTR (UINT8, Pcie, PathOffset),
+                     sizeof (ACPI_SDEV_PCIE_PATH), AcpiDmTableInfoSdev1a);
+@@ -1991,12 +1993,14 @@ AcpiDmDumpSdev (
+ 
+             /* VendorData */
+ 
+-            VendorDataLength = Pcie->VendorDataLength;
+-            VendorDataOffset = Pcie->PathOffset + Pcie->PathLength;
++            VendorDataLength = AcpiUtReadUint16(&Pcie->VendorDataLength);
++            VendorDataOffset = 
++		    AcpiUtReadUint16(&Pcie->PathOffset) + 
++		    AcpiUtReadUint16(&Pcie->PathLength);
+ 
+             if (VendorDataLength)
+             {
+-                Status = AcpiDmDumpTable (Table->Length, 0,
++                Status = AcpiDmDumpTable (TableLength, 0,
+                     ACPI_ADD_PTR (UINT8, Pcie, VendorDataOffset),
+                     VendorDataLength, AcpiDmTableInfoSdev1b);
+                 if (ACPI_FAILURE (Status))
+@@ -2013,8 +2017,8 @@ AcpiDmDumpSdev (
+ NextSubtable:
+         /* Point to next subtable */
+ 
+-        Offset += Subtable->Length;
++        Offset += SubtableLength;
+         Subtable = ACPI_ADD_PTR (ACPI_SDEV_HEADER, Subtable,
+-            Subtable->Length);
++            SubtableLength);
+     }
+ }
+Index: acpica-unix2-20200925/source/compiler/dttable2.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/compiler/dttable2.c
++++ acpica-unix2-20200925/source/compiler/dttable2.c
+@@ -1268,6 +1268,7 @@ DtCompileSdev (
+     ACPI_SDEV_PCIE          *Pcie = NULL;
+     ACPI_SDEV_NAMESPACE     *Namesp = NULL;
+     UINT32                  EntryCount;
++    UINT16                  Tmp16;
+ 
+ 
+     /* Subtables */
+@@ -1289,7 +1290,7 @@ DtCompileSdev (
+         DtPushSubtable (Subtable);
+ 
+         SdevHeader = ACPI_CAST_PTR (ACPI_SDEV_HEADER, Subtable->Buffer);
+-        SdevHeader->Length = (UINT8)(sizeof (ACPI_SDEV_HEADER));
++        SdevHeader->Length = (UINT16) (sizeof (ACPI_SDEV_HEADER));
+ 
+         switch (SdevHeader->Type)
+         {
+@@ -1345,7 +1346,7 @@ DtCompileSdev (
+             ParentTable = DtPeekSubtable ();
+             DtInsertSubtable (ParentTable, Subtable);
+ 
+-            Namesp->DeviceIdOffset = sizeof (ACPI_SDEV_NAMESPACE);
++            Namesp->DeviceIdOffset = (UINT16) sizeof (ACPI_SDEV_NAMESPACE);
+             Namesp->DeviceIdLength = (UINT16) Subtable->Length;
+ 
+             /* Append Vendor data */
+@@ -1367,18 +1368,32 @@ DtCompileSdev (
+                     ParentTable = DtPeekSubtable ();
+                     DtInsertSubtable (ParentTable, Subtable);
+ 
+-                    Namesp->VendorDataOffset =
+-                        Namesp->DeviceIdOffset + Namesp->DeviceIdLength;
+-                    Namesp->VendorDataLength =
+-                        (UINT16) Subtable->Length;
++                    Namesp->VendorDataOffset = 
++			    Namesp->DeviceIdOffset + 
++			    Namesp->DeviceIdLength;
++                    Namesp->VendorDataLength = (UINT16) Subtable->Length;
+ 
+                     /* Final size of entire namespace structure */
+ 
+-                    SdevHeader->Length = (UINT16)(sizeof(ACPI_SDEV_NAMESPACE) +
+-                        Subtable->Length + Namesp->DeviceIdLength);
++		    SdevHeader->Length = (UINT16)
++			    (sizeof(ACPI_SDEV_NAMESPACE) +
++                             Subtable->Length +
++			     Namesp->DeviceIdLength);
+                 }
+             }
+ 
++	    /* Make sure everything is now little-endian */
++	    Tmp16 = AcpiUtReadUint16(&SdevHeader->Length);
++	    SdevHeader->Length = Tmp16;
++	    Tmp16 = AcpiUtReadUint16(&Namesp->DeviceIdOffset);
++	    Namesp->DeviceIdOffset = Tmp16;
++	    Tmp16 = AcpiUtReadUint16(&Namesp->DeviceIdLength);
++	    Namesp->DeviceIdLength = Tmp16;
++	    Tmp16 = AcpiUtReadUint16(&Namesp->VendorDataOffset);
++	    Namesp->VendorDataOffset = Tmp16;
++	    Tmp16 = AcpiUtReadUint16(&Namesp->VendorDataLength);
++	    Namesp->VendorDataLength = Tmp16;
++
+             break;
+ 
+         case ACPI_SDEV_TYPE_PCIE_ENDPOINT_DEVICE:
+@@ -1408,9 +1423,9 @@ DtCompileSdev (
+ 
+             /* Path offset will point immediately after the main subtable */
+ 
+-            Pcie->PathOffset = sizeof (ACPI_SDEV_PCIE);
++	    Pcie->PathOffset = sizeof (ACPI_SDEV_PCIE);
+             Pcie->PathLength = (UINT16)
+-                (EntryCount * sizeof (ACPI_SDEV_PCIE_PATH));
++		    (EntryCount * sizeof (ACPI_SDEV_PCIE_PATH));
+ 
+             /* Append the Vendor Data last */
+ 
+@@ -1432,15 +1447,24 @@ DtCompileSdev (
+                     DtInsertSubtable (ParentTable, Subtable);
+ 
+                     Pcie->VendorDataOffset =
+-                        Pcie->PathOffset + Pcie->PathLength;
+-                    Pcie->VendorDataLength = (UINT16)
+-                        Subtable->Length;
++			    Pcie->PathOffset + Pcie->PathLength;
++                    Pcie->VendorDataLength = (UINT16) Subtable->Length;
+                 }
+             }
+ 
+             SdevHeader->Length =
+-                sizeof (ACPI_SDEV_PCIE) +
++		sizeof (ACPI_SDEV_PCIE) +
+                 Pcie->PathLength + Pcie->VendorDataLength;
++	    Tmp16 = AcpiUtReadUint16(&SdevHeader->Length);
++	    SdevHeader->Length = Tmp16;
++	    Tmp16 = AcpiUtReadUint16(&Pcie->PathOffset);
++	    Pcie->PathOffset = Tmp16;
++	    Tmp16 = AcpiUtReadUint16(&Pcie->PathLength);
++	    Pcie->PathLength = Tmp16;
++	    Tmp16 = AcpiUtReadUint16(&Pcie->VendorDataOffset);
++	    Pcie->VendorDataOffset = Tmp16;
++	    Tmp16 = AcpiUtReadUint16(&Pcie->VendorDataLength);
++	    Pcie->VendorDataLength = Tmp16;
+             break;
+ 
+         default:
diff --git a/0025-Support-HMAT-in-a-big-endian-world.patch b/0025-Support-HMAT-in-a-big-endian-world.patch
new file mode 100644
index 0000000..39ebf62
--- /dev/null
+++ b/0025-Support-HMAT-in-a-big-endian-world.patch
@@ -0,0 +1,278 @@
+From 03425774d2c19874ad4483ec6b7e13c0146e81f7 Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Fri, 25 Sep 2020 16:56:55 -0600
+Subject: [PATCH 25/40] Support HMAT in a big-endian world
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/common/dmtbdump1.c  | 70 ++++++++++++++++++++++----------------
+ source/compiler/dttable1.c | 24 ++++++++++---
+ 2 files changed, 59 insertions(+), 35 deletions(-)
+
+Index: acpica-unix2-20200925/source/common/dmtbdump1.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/common/dmtbdump1.c
++++ acpica-unix2-20200925/source/common/dmtbdump1.c
+@@ -1301,37 +1301,45 @@ AcpiDmDumpHmat (
+     UINT32                  Length;
+     ACPI_DMTABLE_INFO       *InfoTable;
+     UINT32                  i, j;
++    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
++    UINT16                  HmatStructType;
++    UINT32                  HmatStructLength;
++    UINT32                  InitPDs;
++    UINT32                  TgtPDs;
++    UINT16                  SMBIOSHandles;
+ 
+ 
+     /* Main table */
+ 
+-    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoHmat);
++    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoHmat);
+     if (ACPI_FAILURE (Status))
+     {
+         return;
+     }
+     Offset = sizeof (ACPI_TABLE_HMAT);
+ 
+-    while (Offset < Table->Length)
++    while (Offset < TableLength)
+     {
+         AcpiOsPrintf ("\n");
+ 
+         /* Dump HMAT structure header */
+ 
+         HmatStruct = ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, Table, Offset);
+-        if (HmatStruct->Length < sizeof (ACPI_HMAT_STRUCTURE))
++	HmatStructLength = AcpiUtReadUint32(&HmatStruct->Length);
++        if (HmatStructLength < sizeof (ACPI_HMAT_STRUCTURE))
+         {
+             AcpiOsPrintf ("Invalid HMAT structure length\n");
+             return;
+         }
+-        Status = AcpiDmDumpTable (Table->Length, Offset, HmatStruct,
+-            HmatStruct->Length, AcpiDmTableInfoHmatHdr);
++        Status = AcpiDmDumpTable (TableLength, Offset, HmatStruct,
++            HmatStructLength, AcpiDmTableInfoHmatHdr);
+         if (ACPI_FAILURE (Status))
+         {
+             return;
+         }
+ 
+-        switch (HmatStruct->Type)
++	HmatStructType = AcpiUtReadUint16(&HmatStruct->Type);
++        switch (HmatStructType)
+         {
+         case ACPI_HMAT_TYPE_ADDRESS_RANGE:
+ 
+@@ -1354,7 +1362,7 @@ AcpiDmDumpHmat (
+         default:
+ 
+             AcpiOsPrintf ("\n**** Unknown HMAT structure type 0x%X\n",
+-                HmatStruct->Type);
++                HmatStructType);
+ 
+             /* Attempt to continue */
+ 
+@@ -1363,13 +1371,13 @@ AcpiDmDumpHmat (
+ 
+         /* Dump HMAT structure body */
+ 
+-        if (HmatStruct->Length < Length)
++        if (HmatStructLength < Length)
+         {
+             AcpiOsPrintf ("Invalid HMAT structure length\n");
+             return;
+         }
+-        Status = AcpiDmDumpTable (Table->Length, Offset, HmatStruct,
+-            HmatStruct->Length, InfoTable);
++        Status = AcpiDmDumpTable (TableLength, Offset, HmatStruct,
++            HmatStructLength, InfoTable);
+         if (ACPI_FAILURE (Status))
+         {
+             return;
+@@ -1377,7 +1385,7 @@ AcpiDmDumpHmat (
+ 
+         /* Dump HMAT structure additionals */
+ 
+-        switch (HmatStruct->Type)
++        switch (HmatStructType)
+         {
+         case ACPI_HMAT_TYPE_LOCALITY:
+ 
+@@ -1386,15 +1394,16 @@ AcpiDmDumpHmat (
+ 
+             /* Dump initiator proximity domains */
+ 
+-            if ((UINT32)(HmatStruct->Length - SubtableOffset) <
+-                (UINT32)(HmatLocality->NumberOfInitiatorPDs * 4))
++	    InitPDs = AcpiUtReadUint32(&HmatLocality->NumberOfInitiatorPDs);
++            if ((UINT32)(HmatStructLength - SubtableOffset) <
++                (UINT32)(InitPDs * 4))
+             {
+                 AcpiOsPrintf ("Invalid initiator proximity domain number\n");
+                 return;
+             }
+-            for (i = 0; i < HmatLocality->NumberOfInitiatorPDs; i++)
++            for (i = 0; i < InitPDs; i++)
+             {
+-                Status = AcpiDmDumpTable (Table->Length, Offset + SubtableOffset,
++                Status = AcpiDmDumpTable (TableLength, Offset + SubtableOffset,
+                     ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, HmatStruct, SubtableOffset),
+                     4, AcpiDmTableInfoHmat1a);
+                 if (ACPI_FAILURE (Status))
+@@ -1407,15 +1416,16 @@ AcpiDmDumpHmat (
+ 
+             /* Dump target proximity domains */
+ 
+-            if ((UINT32)(HmatStruct->Length - SubtableOffset) <
+-                (UINT32)(HmatLocality->NumberOfTargetPDs * 4))
++	    TgtPDs = AcpiUtReadUint32(&HmatLocality->NumberOfTargetPDs);
++            if ((UINT32)(HmatStructLength - SubtableOffset) <
++                (UINT32)(TgtPDs * 4))
+             {
+                 AcpiOsPrintf ("Invalid target proximity domain number\n");
+                 return;
+             }
+-            for (i = 0; i < HmatLocality->NumberOfTargetPDs; i++)
++            for (i = 0; i < TgtPDs; i++)
+             {
+-                Status = AcpiDmDumpTable (Table->Length, Offset + SubtableOffset,
++                Status = AcpiDmDumpTable (TableLength, Offset + SubtableOffset,
+                     ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, HmatStruct, SubtableOffset),
+                     4, AcpiDmTableInfoHmat1b);
+                 if (ACPI_FAILURE (Status))
+@@ -1428,18 +1438,17 @@ AcpiDmDumpHmat (
+ 
+             /* Dump latency/bandwidth entris */
+ 
+-            if ((UINT32)(HmatStruct->Length - SubtableOffset) <
+-                (UINT32)(HmatLocality->NumberOfInitiatorPDs *
+-                         HmatLocality->NumberOfTargetPDs * 2))
++            if ((UINT32)(HmatStructLength - SubtableOffset) <
++                (UINT32)(InitPDs * TgtPDs * 2))
+             {
+                 AcpiOsPrintf ("Invalid latency/bandwidth entry number\n");
+                 return;
+             }
+-            for (i = 0; i < HmatLocality->NumberOfInitiatorPDs; i++)
++            for (i = 0; i < InitPDs; i++)
+             {
+-                for (j = 0; j < HmatLocality->NumberOfTargetPDs; j++)
++                for (j = 0; j < TgtPDs; j++)
+                 {
+-                    Status = AcpiDmDumpTable (Table->Length, Offset + SubtableOffset,
++                    Status = AcpiDmDumpTable (TableLength, Offset + SubtableOffset,
+                         ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, HmatStruct, SubtableOffset),
+                         2, AcpiDmTableInfoHmat1c);
+                     if (ACPI_FAILURE(Status))
+@@ -1459,15 +1468,16 @@ AcpiDmDumpHmat (
+ 
+             /* Dump SMBIOS handles */
+ 
+-            if ((UINT32)(HmatStruct->Length - SubtableOffset) <
+-                (UINT32)(HmatCache->NumberOfSMBIOSHandles * 2))
++	    SMBIOSHandles = AcpiUtReadUint16(&HmatCache->NumberOfSMBIOSHandles);
++            if ((UINT32)(HmatStructLength - SubtableOffset) <
++                (UINT32)(SMBIOSHandles * 2))
+             {
+                 AcpiOsPrintf ("Invalid SMBIOS handle number\n");
+                 return;
+             }
+-            for (i = 0; i < HmatCache->NumberOfSMBIOSHandles; i++)
++            for (i = 0; i < SMBIOSHandles; i++)
+             {
+-                Status = AcpiDmDumpTable (Table->Length, Offset + SubtableOffset,
++                Status = AcpiDmDumpTable (TableLength, Offset + SubtableOffset,
+                     ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, HmatStruct, SubtableOffset),
+                     2, AcpiDmTableInfoHmat2a);
+                 if (ACPI_FAILURE (Status))
+@@ -1487,6 +1497,6 @@ AcpiDmDumpHmat (
+ NextSubtable:
+         /* Point to next HMAT structure subtable */
+ 
+-        Offset += (HmatStruct->Length);
++        Offset += (HmatStructLength);
+     }
+ }
+Index: acpica-unix2-20200925/source/compiler/dttable1.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/compiler/dttable1.c
++++ acpica-unix2-20200925/source/compiler/dttable1.c
+@@ -1295,6 +1295,8 @@ DtCompileHmat (
+     UINT32                  TgtPDNumber;
+     UINT64                  EntryNumber;
+     UINT16                  SMBIOSHandleNumber;
++    UINT16                  HmatStructType;
++    UINT32                  Length;
+ 
+ 
+     ParentTable = DtPeekSubtable ();
+@@ -1325,7 +1327,8 @@ DtCompileHmat (
+ 
+         /* Compile HMAT structure body */
+ 
+-        switch (HmatStruct->Type)
++	HmatStructType = AcpiUtReadUint16(&HmatStruct->Type);
++        switch (HmatStructType)
+         {
+         case ACPI_HMAT_TYPE_ADDRESS_RANGE:
+ 
+@@ -1358,7 +1361,7 @@ DtCompileHmat (
+ 
+         /* Compile HMAT structure additionals */
+ 
+-        switch (HmatStruct->Type)
++        switch (HmatStructType)
+         {
+         case ACPI_HMAT_TYPE_LOCALITY:
+ 
+@@ -1384,7 +1387,7 @@ DtCompileHmat (
+                 HmatStruct->Length += Subtable->Length;
+                 IntPDNumber++;
+             }
+-            HmatLocality->NumberOfInitiatorPDs = IntPDNumber;
++            HmatLocality->NumberOfInitiatorPDs = AcpiUtReadUint32(&IntPDNumber);
+ 
+             /* Compile target proximity domain list */
+ 
+@@ -1405,7 +1408,7 @@ DtCompileHmat (
+                 HmatStruct->Length += Subtable->Length;
+                 TgtPDNumber++;
+             }
+-            HmatLocality->NumberOfTargetPDs = TgtPDNumber;
++            HmatLocality->NumberOfTargetPDs = AcpiUtReadUint32(&TgtPDNumber);
+ 
+             /* Save start of the entries for reporting errors */
+ 
+@@ -1430,6 +1433,9 @@ DtCompileHmat (
+                 HmatStruct->Length += Subtable->Length;
+                 EntryNumber++;
+             }
++	    
++	    Length = AcpiUtReadUint32(&HmatStruct->Length);
++	    HmatStruct->Length = Length;
+ 
+             /* Validate number of entries */
+ 
+@@ -1464,11 +1470,19 @@ DtCompileHmat (
+                 HmatStruct->Length += Subtable->Length;
+                 SMBIOSHandleNumber++;
+             }
+-            HmatCache->NumberOfSMBIOSHandles = SMBIOSHandleNumber;
++            HmatCache->NumberOfSMBIOSHandles = 
++		    AcpiUtReadUint16(&SMBIOSHandleNumber);
++
++	    Length = AcpiUtReadUint32(&HmatStruct->Length);
++	    HmatStruct->Length = Length;
++
+             break;
+ 
+         default:
+ 
++	    Length = AcpiUtReadUint32(&HmatStruct->Length);
++	    HmatStruct->Length = Length;
++
+             break;
+         }
+     }
diff --git a/0026-Support-PDTT-in-a-big-endian-world.patch b/0026-Support-PDTT-in-a-big-endian-world.patch
new file mode 100644
index 0000000..5b4269f
--- /dev/null
+++ b/0026-Support-PDTT-in-a-big-endian-world.patch
@@ -0,0 +1,43 @@
+From afaa9043357a3b8adbaa1ea389a62da48f561896 Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Fri, 25 Sep 2020 17:03:05 -0600
+Subject: [PATCH 26/40] Support PDTT in a big-endian world
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/common/dmtbdump2.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+Index: acpica-unix2-20200925/source/common/dmtbdump2.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20200925/source/common/dmtbdump2.c
+@@ -1385,13 +1385,13 @@ AcpiDmDumpPdtt (
+ {
+     ACPI_STATUS             Status;
+     ACPI_PDTT_CHANNEL       *Subtable;
+-    UINT32                  Length = Table->Length;
++    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
+     UINT32                  Offset = sizeof (ACPI_TABLE_PDTT);
+ 
+ 
+     /* Main table */
+ 
+-    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoPdtt);
++    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoPdtt);
+     if (ACPI_FAILURE (Status))
+     {
+         return;
+@@ -1400,10 +1400,10 @@ AcpiDmDumpPdtt (
+     /* Subtables. Currently there is only one type, but can be multiples */
+ 
+     Subtable = ACPI_ADD_PTR (ACPI_PDTT_CHANNEL, Table, Offset);
+-    while (Offset < Table->Length)
++    while (Offset < TableLength)
+     {
+         AcpiOsPrintf ("\n");
+-        Status = AcpiDmDumpTable (Length, Offset, Subtable,
++        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
+             sizeof (ACPI_PDTT_CHANNEL), AcpiDmTableInfoPdtt0);
+         if (ACPI_FAILURE (Status))
+         {
diff --git a/0027-Support-PPTT-in-a-big-endian-world.patch b/0027-Support-PPTT-in-a-big-endian-world.patch
new file mode 100644
index 0000000..a047d45
--- /dev/null
+++ b/0027-Support-PPTT-in-a-big-endian-world.patch
@@ -0,0 +1,104 @@
+From c5d7294c6deb7fe87eac981234d4c484313d5e40 Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Fri, 25 Sep 2020 17:16:12 -0600
+Subject: [PATCH 27/40] Support PPTT in a big-endian world
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/common/dmtbdump2.c  | 15 +++++++++------
+ source/compiler/dttable2.c |  7 +++++--
+ 2 files changed, 14 insertions(+), 8 deletions(-)
+
+Index: acpica-unix2-20200925/source/common/dmtbdump2.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20200925/source/common/dmtbdump2.c
+@@ -1649,6 +1649,8 @@ AcpiDmDumpPptt (
+     UINT32                  Offset = sizeof (ACPI_TABLE_FPDT);
+     ACPI_DMTABLE_INFO       *InfoTable;
+     UINT32                  i;
++    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
++    UINT32                  NumPrivRes;
+ 
+ 
+     /* There is no main table (other than the standard ACPI header) */
+@@ -1656,7 +1658,7 @@ AcpiDmDumpPptt (
+     /* Subtables */
+ 
+     Offset = sizeof (ACPI_TABLE_HEADER);
+-    while (Offset < Table->Length)
++    while (Offset < TableLength)
+     {
+         AcpiOsPrintf ("\n");
+ 
+@@ -1668,7 +1670,7 @@ AcpiDmDumpPptt (
+             AcpiOsPrintf ("Invalid subtable length\n");
+             return;
+         }
+-        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
++        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
+             Subtable->Length, AcpiDmTableInfoPpttHdr);
+         if (ACPI_FAILURE (Status))
+         {
+@@ -1710,7 +1712,7 @@ AcpiDmDumpPptt (
+             AcpiOsPrintf ("Invalid subtable length\n");
+             return;
+         }
+-        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
++        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
+             Subtable->Length, InfoTable);
+         if (ACPI_FAILURE (Status))
+         {
+@@ -1726,15 +1728,16 @@ AcpiDmDumpPptt (
+ 
+             /* Dump SMBIOS handles */
+ 
++	    NumPrivRes = AcpiUtReadUint32(&PpttProcessor->NumberOfPrivResources);
+             if ((UINT8)(Subtable->Length - SubtableOffset) <
+-                (UINT8)(PpttProcessor->NumberOfPrivResources * 4))
++                (UINT8)(NumPrivRes * 4))
+             {
+                 AcpiOsPrintf ("Invalid private resource number\n");
+                 return;
+             }
+-            for (i = 0; i < PpttProcessor->NumberOfPrivResources; i++)
++            for (i = 0; i < NumPrivRes; i++)
+             {
+-                Status = AcpiDmDumpTable (Table->Length, Offset + SubtableOffset,
++                Status = AcpiDmDumpTable (TableLength, Offset + SubtableOffset,
+                     ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Subtable, SubtableOffset),
+                     4, AcpiDmTableInfoPptt0a);
+                 if (ACPI_FAILURE (Status))
+Index: acpica-unix2-20200925/source/compiler/dttable2.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/compiler/dttable2.c
++++ acpica-unix2-20200925/source/compiler/dttable2.c
+@@ -1028,6 +1028,7 @@ DtCompilePptt (
+     ACPI_DMTABLE_INFO       *InfoTable;
+     DT_FIELD                **PFieldList = (DT_FIELD **) List;
+     DT_FIELD                *SubtableStart;
++    UINT32                  NumPrivRes;
+ 
+ 
+     ParentTable = DtPeekSubtable ();
+@@ -1092,7 +1093,7 @@ DtCompilePptt (
+             {
+                 /* Compile initiator proximity domain list */
+ 
+-                PpttProcessor->NumberOfPrivResources = 0;
++                NumPrivRes = 0;
+                 while (*PFieldList)
+                 {
+                     Status = DtCompileTable (PFieldList,
+@@ -1108,8 +1109,10 @@ DtCompilePptt (
+ 
+                     DtInsertSubtable (ParentTable, Subtable);
+                     PpttHeader->Length += (UINT8)(Subtable->Length);
+-                    PpttProcessor->NumberOfPrivResources++;
++                    NumPrivRes++;
+                 }
++                PpttProcessor->NumberOfPrivResources =
++			AcpiUtReadUint32(&NumPrivRes);
+             }
+             break;
+ 
diff --git a/0028-Support-PCCT-in-a-big-endian-world.patch b/0028-Support-PCCT-in-a-big-endian-world.patch
new file mode 100644
index 0000000..49607ea
--- /dev/null
+++ b/0028-Support-PCCT-in-a-big-endian-world.patch
@@ -0,0 +1,54 @@
+From 661f59c00e991553fb3f5fe7786eb0e2f640805c Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Fri, 25 Sep 2020 17:39:34 -0600
+Subject: [PATCH 28/40] Support PCCT in a big-endian world
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/common/dmtbdump2.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+Index: acpica-unix2-20200925/source/common/dmtbdump2.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20200925/source/common/dmtbdump2.c
+@@ -1286,13 +1286,13 @@ AcpiDmDumpPcct (
+     ACPI_STATUS             Status;
+     ACPI_PCCT_SUBSPACE      *Subtable;
+     ACPI_DMTABLE_INFO       *InfoTable;
+-    UINT32                  Length = Table->Length;
++    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
+     UINT32                  Offset = sizeof (ACPI_TABLE_PCCT);
+ 
+ 
+     /* Main table */
+ 
+-    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoPcct);
++    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoPcct);
+     if (ACPI_FAILURE (Status))
+     {
+         return;
+@@ -1301,12 +1301,12 @@ AcpiDmDumpPcct (
+     /* Subtables */
+ 
+     Subtable = ACPI_ADD_PTR (ACPI_PCCT_SUBSPACE, Table, Offset);
+-    while (Offset < Table->Length)
++    while (Offset < TableLength)
+     {
+         /* Common subtable header */
+ 
+         AcpiOsPrintf ("\n");
+-        Status = AcpiDmDumpTable (Length, Offset, Subtable,
++        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
+             Subtable->Header.Length, AcpiDmTableInfoPcctHdr);
+         if (ACPI_FAILURE (Status))
+         {
+@@ -1349,7 +1349,7 @@ AcpiDmDumpPcct (
+         }
+ 
+         AcpiOsPrintf ("\n");
+-        Status = AcpiDmDumpTable (Length, Offset, Subtable,
++        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
+             Subtable->Header.Length, InfoTable);
+         if (ACPI_FAILURE (Status))
+         {
diff --git a/0029-Support-WDAT-in-a-big-endian-world.patch b/0029-Support-WDAT-in-a-big-endian-world.patch
new file mode 100644
index 0000000..3e0661c
--- /dev/null
+++ b/0029-Support-WDAT-in-a-big-endian-world.patch
@@ -0,0 +1,43 @@
+From 520e143b2bacb39032c06a33f61ae05583be6b2a Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Fri, 25 Sep 2020 18:13:20 -0600
+Subject: [PATCH 29/40] Support WDAT in a big-endian world
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/common/dmtbdump3.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+Index: acpica-unix2-20200925/source/common/dmtbdump3.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/common/dmtbdump3.c
++++ acpica-unix2-20200925/source/common/dmtbdump3.c
+@@ -568,11 +568,12 @@ AcpiDmDumpWdat (
+     ACPI_STATUS             Status;
+     UINT32                  Offset = sizeof (ACPI_TABLE_WDAT);
+     ACPI_WDAT_ENTRY         *Subtable;
++    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
+ 
+ 
+     /* Main table */
+ 
+-    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoWdat);
++    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoWdat);
+     if (ACPI_FAILURE (Status))
+     {
+         return;
+@@ -581,12 +582,12 @@ AcpiDmDumpWdat (
+     /* Subtables */
+ 
+     Subtable = ACPI_ADD_PTR (ACPI_WDAT_ENTRY, Table, Offset);
+-    while (Offset < Table->Length)
++    while (Offset < TableLength)
+     {
+         /* Common subtable header */
+ 
+         AcpiOsPrintf ("\n");
+-        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
++        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
+             sizeof (ACPI_WDAT_ENTRY), AcpiDmTableInfoWdat0);
+         if (ACPI_FAILURE (Status))
+         {
diff --git a/0030-Support-TCPA-in-a-big-endian-world.patch b/0030-Support-TCPA-in-a-big-endian-world.patch
new file mode 100644
index 0000000..4c9780e
--- /dev/null
+++ b/0030-Support-TCPA-in-a-big-endian-world.patch
@@ -0,0 +1,76 @@
+From b2e9a4397077ad56fea5a8b3f9f63ce3be65ae48 Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Sun, 27 Sep 2020 12:09:28 -0600
+Subject: [PATCH 30/40] Support TCPA in a big-endian world
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/common/dmtbdump3.c  | 13 ++++++++-----
+ source/compiler/dttable2.c |  4 +++-
+ 2 files changed, 11 insertions(+), 6 deletions(-)
+
+Index: acpica-unix2-20200925/source/common/dmtbdump3.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/common/dmtbdump3.c
++++ acpica-unix2-20200925/source/common/dmtbdump3.c
+@@ -342,11 +342,13 @@ AcpiDmDumpTcpa (
+     ACPI_TABLE_TCPA_HDR     *Subtable = ACPI_ADD_PTR (
+                                 ACPI_TABLE_TCPA_HDR, Table, Offset);
+     ACPI_STATUS             Status;
++    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
++    UINT16                  PlatformClass;
+ 
+ 
+     /* Main table */
+ 
+-    Status = AcpiDmDumpTable (Table->Length, 0, Table,
++    Status = AcpiDmDumpTable (TableLength, 0, Table,
+         0, AcpiDmTableInfoTcpaHdr);
+     if (ACPI_FAILURE (Status))
+     {
+@@ -357,18 +359,19 @@ AcpiDmDumpTcpa (
+      * Examine the PlatformClass field to determine the table type.
+      * Either a client or server table. Only one.
+      */
+-    switch (CommonHeader->PlatformClass)
++    PlatformClass = AcpiUtReadUint16(&CommonHeader->PlatformClass);
++    switch (PlatformClass)
+     {
+     case ACPI_TCPA_CLIENT_TABLE:
+ 
+-        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
++        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
+             Table->Length - Offset, AcpiDmTableInfoTcpaClient);
+         break;
+ 
+     case ACPI_TCPA_SERVER_TABLE:
+ 
+-        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
+-            Table->Length - Offset, AcpiDmTableInfoTcpaServer);
++        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
++            TableLength - Offset, AcpiDmTableInfoTcpaServer);
+         break;
+ 
+     default:
+Index: acpica-unix2-20200925/source/compiler/dttable2.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/compiler/dttable2.c
++++ acpica-unix2-20200925/source/compiler/dttable2.c
+@@ -1773,6 +1773,7 @@ DtCompileTcpa (
+     ACPI_TABLE_TCPA_HDR     *TcpaHeader;
+     DT_SUBTABLE             *ParentTable;
+     ACPI_STATUS             Status;
++    UINT16                  PlatformClass;
+ 
+ 
+     /* Compile the main table */
+@@ -1793,7 +1794,8 @@ DtCompileTcpa (
+      */
+     TcpaHeader = ACPI_CAST_PTR (ACPI_TABLE_TCPA_HDR, ParentTable->Buffer);
+ 
+-    switch (TcpaHeader->PlatformClass)
++    PlatformClass = AcpiUtReadUint16(&TcpaHeader->PlatformClass);
++    switch (PlatformClass)
+     {
+     case ACPI_TCPA_CLIENT_TABLE:
+ 
diff --git a/0031-Support-STAO-in-a-big-endian-world.patch b/0031-Support-STAO-in-a-big-endian-world.patch
new file mode 100644
index 0000000..7ea55bc
--- /dev/null
+++ b/0031-Support-STAO-in-a-big-endian-world.patch
@@ -0,0 +1,40 @@
+From 63fc38478f12b8c8b0d263d25f72ff7538fba2ce Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Mon, 28 Sep 2020 11:49:42 -0600
+Subject: [PATCH 31/40] Support STAO in a big-endian world
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/common/dmtbdump3.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+Index: acpica-unix2-20200925/source/common/dmtbdump3.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/common/dmtbdump3.c
++++ acpica-unix2-20200925/source/common/dmtbdump3.c
+@@ -285,14 +285,14 @@ AcpiDmDumpStao (
+ {
+     ACPI_STATUS             Status;
+     char                    *Namepath;
+-    UINT32                  Length = Table->Length;
++    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
+     UINT32                  StringLength;
+     UINT32                  Offset = sizeof (ACPI_TABLE_STAO);
+ 
+ 
+     /* Main table */
+ 
+-    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoStao);
++    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoStao);
+     if (ACPI_FAILURE (Status))
+     {
+         return;
+@@ -300,7 +300,7 @@ AcpiDmDumpStao (
+ 
+     /* The rest of the table consists of Namepath strings */
+ 
+-    while (Offset < Table->Length)
++    while (Offset < TableLength)
+     {
+         Namepath = ACPI_ADD_PTR (char, Table, Offset);
+         StringLength = strlen (Namepath) + 1;
diff --git a/0032-Support-SLIC-and-MSDM-in-a-big-endian-world.patch b/0032-Support-SLIC-and-MSDM-in-a-big-endian-world.patch
new file mode 100644
index 0000000..bc20a15
--- /dev/null
+++ b/0032-Support-SLIC-and-MSDM-in-a-big-endian-world.patch
@@ -0,0 +1,27 @@
+From 0455d918688d9d208644d7f5f6f10d6199486e9c Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Mon, 28 Sep 2020 12:49:23 -0600
+Subject: [PATCH 32/40] Support SLIC and MSDM in a big-endian world
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/common/dmtbdump3.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+Index: acpica-unix2-20200925/source/common/dmtbdump3.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/common/dmtbdump3.c
++++ acpica-unix2-20200925/source/common/dmtbdump3.c
+@@ -68,9 +68,10 @@ void
+ AcpiDmDumpSlic (
+     ACPI_TABLE_HEADER       *Table)
+ {
++    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
+ 
+-    (void) AcpiDmDumpTable (Table->Length, sizeof (ACPI_TABLE_HEADER), Table,
+-        Table->Length - sizeof (*Table), AcpiDmTableInfoSlic);
++    (void) AcpiDmDumpTable (TableLength, sizeof (ACPI_TABLE_HEADER), Table,
++        TableLength - sizeof (*Table), AcpiDmTableInfoSlic);
+ }
+ 
+ 
diff --git a/0033-Support-MCFG-in-a-big-endian-world.patch b/0033-Support-MCFG-in-a-big-endian-world.patch
new file mode 100644
index 0000000..f50441b
--- /dev/null
+++ b/0033-Support-MCFG-in-a-big-endian-world.patch
@@ -0,0 +1,50 @@
+From 0fecc447cd64bf9da3345b2912e41e6005eb1011 Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Mon, 28 Sep 2020 13:01:18 -0600
+Subject: [PATCH 33/40] Support MCFG in a big-endian world
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/common/dmtbdump2.c | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+Index: acpica-unix2-20200925/source/common/dmtbdump2.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20200925/source/common/dmtbdump2.c
+@@ -769,11 +769,12 @@ AcpiDmDumpMcfg (
+     ACPI_STATUS             Status;
+     UINT32                  Offset = sizeof (ACPI_TABLE_MCFG);
+     ACPI_MCFG_ALLOCATION    *Subtable;
++    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
+ 
+ 
+     /* Main table */
+ 
+-    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoMcfg);
++    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoMcfg);
+     if (ACPI_FAILURE (Status))
+     {
+         return;
+@@ -782,17 +783,17 @@ AcpiDmDumpMcfg (
+     /* Subtables */
+ 
+     Subtable = ACPI_ADD_PTR (ACPI_MCFG_ALLOCATION, Table, Offset);
+-    while (Offset < Table->Length)
++    while (Offset < TableLength)
+     {
+-        if (Offset + sizeof (ACPI_MCFG_ALLOCATION) > Table->Length)
++        if (Offset + sizeof (ACPI_MCFG_ALLOCATION) > TableLength)
+         {
+             AcpiOsPrintf ("Warning: there are %u invalid trailing bytes\n",
+-                (UINT32) sizeof (ACPI_MCFG_ALLOCATION) - (Offset - Table->Length));
++                (UINT32) sizeof (ACPI_MCFG_ALLOCATION) - (Offset - TableLength));
+             return;
+         }
+ 
+         AcpiOsPrintf ("\n");
+-        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
++        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
+             sizeof (ACPI_MCFG_ALLOCATION), AcpiDmTableInfoMcfg0);
+         if (ACPI_FAILURE (Status))
+         {
diff --git a/0034-Support-LPIT-in-a-big-endian-world.patch b/0034-Support-LPIT-in-a-big-endian-world.patch
new file mode 100644
index 0000000..fd68c2a
--- /dev/null
+++ b/0034-Support-LPIT-in-a-big-endian-world.patch
@@ -0,0 +1,46 @@
+From b521edcfceab513a900a000aa462d7f86b65a040 Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Mon, 28 Sep 2020 16:49:30 -0600
+Subject: [PATCH 34/40] Support LPIT in a big-endian world
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/common/dmtbdump2.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+Index: acpica-unix2-20200925/source/common/dmtbdump2.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20200925/source/common/dmtbdump2.c
+@@ -534,7 +534,7 @@ AcpiDmDumpLpit (
+ {
+     ACPI_STATUS             Status;
+     ACPI_LPIT_HEADER        *Subtable;
+-    UINT32                  Length = Table->Length;
++    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
+     UINT32                  Offset = sizeof (ACPI_TABLE_LPIT);
+     ACPI_DMTABLE_INFO       *InfoTable;
+     UINT32                  SubtableLength;
+@@ -543,11 +543,11 @@ AcpiDmDumpLpit (
+     /* Subtables */
+ 
+     Subtable = ACPI_ADD_PTR (ACPI_LPIT_HEADER, Table, Offset);
+-    while (Offset < Table->Length)
++    while (Offset < TableLength)
+     {
+         /* Common subtable header */
+ 
+-        Status = AcpiDmDumpTable (Length, Offset, Subtable,
++        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
+             sizeof (ACPI_LPIT_HEADER), AcpiDmTableInfoLpitHdr);
+         if (ACPI_FAILURE (Status))
+         {
+@@ -571,7 +571,7 @@ AcpiDmDumpLpit (
+             return;
+         }
+ 
+-        Status = AcpiDmDumpTable (Length, Offset, Subtable,
++        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
+             SubtableLength, InfoTable);
+         if (ACPI_FAILURE (Status))
+         {
diff --git a/0035-Support-PMTT-in-a-big-endian-world.patch b/0035-Support-PMTT-in-a-big-endian-world.patch
new file mode 100644
index 0000000..b6aaee6
--- /dev/null
+++ b/0035-Support-PMTT-in-a-big-endian-world.patch
@@ -0,0 +1,216 @@
+From b55af37d2419fc5ea630774f49b4ed9b724451b3 Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Mon, 28 Sep 2020 18:37:04 -0600
+Subject: [PATCH 35/40] Support PMTT in a big-endian world
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/common/dmtbdump2.c  | 66 +++++++++++++++++++++-----------------
+ source/compiler/dttable2.c |  5 ++-
+ 2 files changed, 41 insertions(+), 30 deletions(-)
+
+Index: acpica-unix2-20200925/source/common/dmtbdump2.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20200925/source/common/dmtbdump2.c
+@@ -1442,17 +1442,21 @@ AcpiDmDumpPmtt (
+     ACPI_PMTT_HEADER        *MemSubtable;
+     ACPI_PMTT_HEADER        *DimmSubtable;
+     ACPI_PMTT_DOMAIN        *DomainArray;
+-    UINT32                  Length = Table->Length;
++    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
+     UINT32                  Offset = sizeof (ACPI_TABLE_PMTT);
+     UINT32                  MemOffset;
+     UINT32                  DimmOffset;
+     UINT32                  DomainOffset;
+     UINT32                  DomainCount;
++    UINT16                  SubtableLength;
++    UINT16                  MemSubtableLength;
++    UINT16                  DimmSubtableLength;
++    UINT16                  Tmp16;
+ 
+ 
+     /* Main table */
+ 
+-    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoPmtt);
++    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoPmtt);
+     if (ACPI_FAILURE (Status))
+     {
+         return;
+@@ -1461,13 +1465,14 @@ AcpiDmDumpPmtt (
+     /* Subtables */
+ 
+     Subtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, Table, Offset);
+-    while (Offset < Table->Length)
++    while (Offset < TableLength)
+     {
+         /* Common subtable header */
+ 
+         AcpiOsPrintf ("\n");
+-        Status = AcpiDmDumpTable (Length, Offset, Subtable,
+-            Subtable->Length, AcpiDmTableInfoPmttHdr);
++	SubtableLength = AcpiUtReadUint16(&Subtable->Length);
++        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
++            SubtableLength, AcpiDmTableInfoPmttHdr);
+         if (ACPI_FAILURE (Status))
+         {
+             return;
+@@ -1485,8 +1490,8 @@ AcpiDmDumpPmtt (
+ 
+         /* Dump the fixed-length portion of the subtable */
+ 
+-        Status = AcpiDmDumpTable (Length, Offset, Subtable,
+-            Subtable->Length, AcpiDmTableInfoPmtt0);
++        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
++            SubtableLength, AcpiDmTableInfoPmtt0);
+         if (ACPI_FAILURE (Status))
+         {
+             return;
+@@ -1498,15 +1503,16 @@ AcpiDmDumpPmtt (
+         MemSubtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, Subtable,
+             sizeof (ACPI_PMTT_SOCKET));
+ 
+-        while (((Offset + MemOffset) < Table->Length) &&
+-            (MemOffset < Subtable->Length))
++        while (((Offset + MemOffset) < TableLength) &&
++            (MemOffset < SubtableLength))
+         {
+             /* Common subtable header */
+ 
+             AcpiOsPrintf ("\n");
+-            Status = AcpiDmDumpTable (Length,
++	    MemSubtableLength = AcpiUtReadUint16(&MemSubtable->Length);
++            Status = AcpiDmDumpTable (TableLength,
+                 Offset + MemOffset, MemSubtable,
+-                MemSubtable->Length, AcpiDmTableInfoPmttHdr);
++                MemSubtableLength, AcpiDmTableInfoPmttHdr);
+             if (ACPI_FAILURE (Status))
+             {
+                 return;
+@@ -1524,9 +1530,9 @@ AcpiDmDumpPmtt (
+ 
+             /* Dump the fixed-length portion of the controller subtable */
+ 
+-            Status = AcpiDmDumpTable (Length,
++            Status = AcpiDmDumpTable (TableLength,
+                 Offset + MemOffset, MemSubtable,
+-                MemSubtable->Length, AcpiDmTableInfoPmtt1);
++                MemSubtableLength, AcpiDmTableInfoPmtt1);
+             if (ACPI_FAILURE (Status))
+             {
+                 return;
+@@ -1534,16 +1540,17 @@ AcpiDmDumpPmtt (
+ 
+             /* Walk the variable count of proximity domains */
+ 
+-            DomainCount = ((ACPI_PMTT_CONTROLLER *) MemSubtable)->DomainCount;
++            Tmp16 = ((ACPI_PMTT_CONTROLLER *) MemSubtable)->DomainCount;
++            DomainCount = AcpiUtReadUint16(&Tmp16);
+             DomainOffset = sizeof (ACPI_PMTT_CONTROLLER);
+             DomainArray = ACPI_ADD_PTR (ACPI_PMTT_DOMAIN, MemSubtable,
+                 sizeof (ACPI_PMTT_CONTROLLER));
+ 
+-            while (((Offset + MemOffset + DomainOffset) < Table->Length) &&
+-                ((MemOffset + DomainOffset) < Subtable->Length) &&
++            while (((Offset + MemOffset + DomainOffset) < TableLength) &&
++                ((MemOffset + DomainOffset) < SubtableLength) &&
+                 DomainCount)
+             {
+-                Status = AcpiDmDumpTable (Length,
++                Status = AcpiDmDumpTable (TableLength,
+                     Offset + MemOffset + DomainOffset, DomainArray,
+                     sizeof (ACPI_PMTT_DOMAIN), AcpiDmTableInfoPmtt1a);
+                 if (ACPI_FAILURE (Status))
+@@ -1568,15 +1575,16 @@ AcpiDmDumpPmtt (
+             DimmSubtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, MemSubtable,
+                 DomainOffset);
+ 
+-            while (((Offset + MemOffset + DimmOffset) < Table->Length) &&
+-                (DimmOffset < MemSubtable->Length))
++            while (((Offset + MemOffset + DimmOffset) < TableLength) &&
++                (DimmOffset < MemSubtableLength))
+             {
+                 /* Common subtable header */
+ 
+                 AcpiOsPrintf ("\n");
+-                Status = AcpiDmDumpTable (Length,
++		DimmSubtableLength = AcpiUtReadUint16(&DimmSubtable->Length);
++                Status = AcpiDmDumpTable (TableLength,
+                     Offset + MemOffset + DimmOffset, DimmSubtable,
+-                    DimmSubtable->Length, AcpiDmTableInfoPmttHdr);
++                    DimmSubtableLength, AcpiDmTableInfoPmttHdr);
+                 if (ACPI_FAILURE (Status))
+                 {
+                     return;
+@@ -1594,9 +1602,9 @@ AcpiDmDumpPmtt (
+ 
+                 /* Dump the fixed-length DIMM subtable */
+ 
+-                Status = AcpiDmDumpTable (Length,
++                Status = AcpiDmDumpTable (TableLength,
+                     Offset + MemOffset + DimmOffset, DimmSubtable,
+-                    DimmSubtable->Length, AcpiDmTableInfoPmtt2);
++                    DimmSubtableLength, AcpiDmTableInfoPmtt2);
+                 if (ACPI_FAILURE (Status))
+                 {
+                     return;
+@@ -1604,23 +1612,23 @@ AcpiDmDumpPmtt (
+ 
+                 /* Point to next DIMM subtable */
+ 
+-                DimmOffset += DimmSubtable->Length;
++                DimmOffset += DimmSubtableLength;
+                 DimmSubtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER,
+-                    DimmSubtable, DimmSubtable->Length);
++                    DimmSubtable, DimmSubtableLength);
+             }
+ 
+             /* Point to next Controller subtable */
+ 
+-            MemOffset += MemSubtable->Length;
++            MemOffset += MemSubtableLength;
+             MemSubtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER,
+-                MemSubtable, MemSubtable->Length);
++                MemSubtable, MemSubtableLength);
+         }
+ 
+         /* Point to next Socket subtable */
+ 
+-        Offset += Subtable->Length;
++        Offset += SubtableLength;
+         Subtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER,
+-            Subtable, Subtable->Length);
++            Subtable, SubtableLength);
+     }
+ }
+ 
+Index: acpica-unix2-20200925/source/compiler/dttable2.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/compiler/dttable2.c
++++ acpica-unix2-20200925/source/compiler/dttable2.c
+@@ -885,6 +885,7 @@ DtCompilePmtt (
+     ACPI_PMTT_HEADER        *PmttHeader;
+     ACPI_PMTT_CONTROLLER    *PmttController;
+     UINT16                  DomainCount;
++    UINT16                  Length;
+     UINT8                   PrevType = ACPI_PMTT_TYPE_SOCKET;
+ 
+ 
+@@ -929,6 +930,8 @@ DtCompilePmtt (
+         DtInsertSubtable (ParentTable, Subtable);
+         DtPushSubtable (Subtable);
+ 
++	Length = AcpiUtReadUint16(&PmttHeader->Length);
++	PmttHeader->Length = Length;
+         switch (PmttHeader->Type)
+         {
+         case ACPI_PMTT_TYPE_SOCKET:
+@@ -962,7 +965,7 @@ DtCompilePmtt (
+ 
+             PmttController = ACPI_CAST_PTR (ACPI_PMTT_CONTROLLER,
+                 (Subtable->Buffer - sizeof (ACPI_PMTT_HEADER)));
+-            DomainCount = PmttController->DomainCount;
++            DomainCount = AcpiUtReadUint16(&PmttController->DomainCount);
+ 
+             while (DomainCount)
+             {
diff --git a/0036-Support-IORT-in-a-big-endian-world.patch b/0036-Support-IORT-in-a-big-endian-world.patch
new file mode 100644
index 0000000..e44456e
--- /dev/null
+++ b/0036-Support-IORT-in-a-big-endian-world.patch
@@ -0,0 +1,365 @@
+From 88d16feb9d6982cc9c09f2ae9b76b26f0d9c96e0 Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Wed, 30 Sep 2020 17:48:04 -0600
+Subject: [PATCH 36/40] Support IORT in a big-endian world
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/common/dmtbdump2.c  | 73 ++++++++++++++++++++++----------------
+ source/compiler/dttable1.c | 37 ++++++++++---------
+ 2 files changed, 64 insertions(+), 46 deletions(-)
+
+Index: acpica-unix2-20200925/source/common/dmtbdump2.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20200925/source/common/dmtbdump2.c
+@@ -75,16 +75,19 @@ AcpiDmDumpIort (
+     ACPI_IORT_SMMU          *IortSmmu = NULL;
+     UINT32                  Offset;
+     UINT32                  NodeOffset;
++    UINT32                  NodeLength;
+     UINT32                  Length;
+     ACPI_DMTABLE_INFO       *InfoTable;
+     char                    *String;
+     UINT32                  i;
+     UINT32                  MappingByteLength;
++    UINT32                  MappingCount;
++    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
+ 
+ 
+     /* Main table */
+ 
+-    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoIort);
++    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoIort);
+     if (ACPI_FAILURE (Status))
+     {
+         return;
+@@ -95,25 +98,26 @@ AcpiDmDumpIort (
+ 
+     /* Dump the OptionalPadding (optional) */
+ 
+-    if (Iort->NodeOffset > Offset)
++    NodeOffset = AcpiUtReadUint32(&Iort->NodeOffset);
++    if (NodeOffset > Offset)
+     {
+-        Status = AcpiDmDumpTable (Table->Length, Offset, Table,
+-            Iort->NodeOffset - Offset, AcpiDmTableInfoIortPad);
++        Status = AcpiDmDumpTable (TableLength, Offset, Table,
++            NodeOffset - Offset, AcpiDmTableInfoIortPad);
+         if (ACPI_FAILURE (Status))
+         {
+             return;
+         }
+     }
+ 
+-    Offset = Iort->NodeOffset;
+-    while (Offset < Table->Length)
++    Offset = AcpiUtReadUint32(&Iort->NodeOffset);
++    while (Offset < TableLength)
+     {
+         /* Common subtable header */
+ 
+         IortNode = ACPI_ADD_PTR (ACPI_IORT_NODE, Table, Offset);
+         AcpiOsPrintf ("\n");
+         Length = ACPI_OFFSET (ACPI_IORT_NODE, NodeData);
+-        Status = AcpiDmDumpTable (Table->Length, Offset,
++        Status = AcpiDmDumpTable (TableLength, Offset,
+             IortNode, Length, AcpiDmTableInfoIortHdr);
+         if (ACPI_FAILURE (Status))
+         {
+@@ -142,7 +146,7 @@ AcpiDmDumpIort (
+         case ACPI_IORT_NODE_PCI_ROOT_COMPLEX:
+ 
+             InfoTable = AcpiDmTableInfoIort2;
+-            Length = IortNode->Length - NodeOffset;
++            Length = AcpiUtReadUint16(&IortNode->Length) - NodeOffset;
+             break;
+ 
+         case ACPI_IORT_NODE_SMMU:
+@@ -155,13 +159,13 @@ AcpiDmDumpIort (
+         case ACPI_IORT_NODE_SMMU_V3:
+ 
+             InfoTable = AcpiDmTableInfoIort4;
+-            Length = IortNode->Length - NodeOffset;
++            Length = AcpiUtReadUint16(&IortNode->Length) - NodeOffset;
+             break;
+ 
+         case ACPI_IORT_NODE_PMCG:
+ 
+             InfoTable = AcpiDmTableInfoIort5;
+-            Length = IortNode->Length - NodeOffset;
++            Length = AcpiUtReadUint16(&IortNode->Length) - NodeOffset;
+             break;
+ 
+         default:
+@@ -171,7 +175,7 @@ AcpiDmDumpIort (
+ 
+             /* Attempt to continue */
+ 
+-            if (!IortNode->Length)
++            if (!AcpiUtReadUint16(&IortNode->Length))
+             {
+                 AcpiOsPrintf ("Invalid zero length IORT node\n");
+                 return;
+@@ -182,7 +186,7 @@ AcpiDmDumpIort (
+         /* Dump the node subtable header */
+ 
+         AcpiOsPrintf ("\n");
+-        Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
++        Status = AcpiDmDumpTable (TableLength, Offset + NodeOffset,
+             ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
+             Length, InfoTable);
+         if (ACPI_FAILURE (Status))
+@@ -202,9 +206,11 @@ AcpiDmDumpIort (
+ 
+             if (IortItsGroup)
+             {
+-                for (i = 0; i < IortItsGroup->ItsCount; i++)
++		UINT32 ItsCount = AcpiUtReadUint32(&IortItsGroup->ItsCount);
++
++                for (i = 0; i < ItsCount; i++)
+                 {
+-                    Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
++                    Status = AcpiDmDumpTable (TableLength, Offset + NodeOffset,
+                         ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
+                         4, AcpiDmTableInfoIort0a);
+                     if (ACPI_FAILURE (Status))
+@@ -221,12 +227,14 @@ AcpiDmDumpIort (
+ 
+             /* Dump the Padding (optional) */
+ 
+-            if (IortNode->Length > NodeOffset)
++	    NodeLength = AcpiUtReadUint16(&IortNode->Length);
++            if (NodeLength > NodeOffset)
+             {
+                 MappingByteLength =
+-                    IortNode->MappingCount * sizeof (ACPI_IORT_ID_MAPPING);
+-                Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
+-                    Table, IortNode->Length - NodeOffset - MappingByteLength,
++                    AcpiUtReadUint32(&IortNode->MappingCount) *
++		    sizeof (ACPI_IORT_ID_MAPPING);
++                Status = AcpiDmDumpTable (TableLength, Offset + NodeOffset,
++                    Table, NodeLength - NodeOffset - MappingByteLength,
+                     AcpiDmTableInfoIort1a);
+                 if (ACPI_FAILURE (Status))
+                 {
+@@ -243,9 +251,11 @@ AcpiDmDumpIort (
+ 
+             if (IortSmmu)
+             {
++		UINT32 InterruptCount;
++
+                 Length = 2 * sizeof (UINT64);
+-                NodeOffset = IortSmmu->GlobalInterruptOffset;
+-                Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
++                NodeOffset = AcpiUtReadUint32(&IortSmmu->GlobalInterruptOffset);
++                Status = AcpiDmDumpTable (TableLength, Offset + NodeOffset,
+                     ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
+                     Length, AcpiDmTableInfoIort3a);
+                 if (ACPI_FAILURE (Status))
+@@ -253,10 +263,11 @@ AcpiDmDumpIort (
+                     return;
+                 }
+ 
+-                NodeOffset = IortSmmu->ContextInterruptOffset;
+-                for (i = 0; i < IortSmmu->ContextInterruptCount; i++)
++                NodeOffset = AcpiUtReadUint32(&IortSmmu->ContextInterruptOffset);
++		InterruptCount = AcpiUtReadUint32(&IortSmmu->ContextInterruptCount);
++                for (i = 0; i < InterruptCount; i++)
+                 {
+-                    Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
++                    Status = AcpiDmDumpTable (TableLength, Offset + NodeOffset,
+                         ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
+                         8, AcpiDmTableInfoIort3b);
+                     if (ACPI_FAILURE (Status))
+@@ -267,10 +278,11 @@ AcpiDmDumpIort (
+                     NodeOffset += 8;
+                 }
+ 
+-                NodeOffset = IortSmmu->PmuInterruptOffset;
+-                for (i = 0; i < IortSmmu->PmuInterruptCount; i++)
++                NodeOffset = AcpiUtReadUint32(&IortSmmu->PmuInterruptOffset);
++		InterruptCount = AcpiUtReadUint32(&IortSmmu->PmuInterruptCount);
++                for (i = 0; i < InterruptCount; i++)
+                 {
+-                    Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
++                    Status = AcpiDmDumpTable (TableLength, Offset + NodeOffset,
+                         ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
+                         8, AcpiDmTableInfoIort3c);
+                     if (ACPI_FAILURE (Status))
+@@ -290,12 +302,13 @@ AcpiDmDumpIort (
+ 
+         /* Dump the ID mappings */
+ 
+-        NodeOffset = IortNode->MappingOffset;
+-        for (i = 0; i < IortNode->MappingCount; i++)
++        NodeOffset = AcpiUtReadUint32(&IortNode->MappingOffset);
++	MappingCount = AcpiUtReadUint32(&IortNode->MappingCount);
++        for (i = 0; i < MappingCount; i++)
+         {
+             AcpiOsPrintf ("\n");
+             Length = sizeof (ACPI_IORT_ID_MAPPING);
+-            Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
++            Status = AcpiDmDumpTable (TableLength, Offset + NodeOffset,
+                 ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
+                 Length, AcpiDmTableInfoIortMap);
+             if (ACPI_FAILURE (Status))
+@@ -309,7 +322,7 @@ AcpiDmDumpIort (
+ NextSubtable:
+         /* Point to next node subtable */
+ 
+-        Offset += IortNode->Length;
++        Offset += AcpiUtReadUint16(&IortNode->Length);
+     }
+ }
+ 
+Index: acpica-unix2-20200925/source/compiler/dttable1.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/compiler/dttable1.c
++++ acpica-unix2-20200925/source/compiler/dttable1.c
+@@ -1516,6 +1516,7 @@ DtCompileIort (
+     ACPI_IORT_NODE          *IortNode;
+     ACPI_IORT_ITS_GROUP     *IortItsGroup;
+     ACPI_IORT_SMMU          *IortSmmu;
++    UINT32                  IortNodeOffset;
+     UINT32                  NodeNumber;
+     UINT32                  NodeLength;
+     UINT32                  IdMappingNumber;
+@@ -1548,7 +1549,7 @@ DtCompileIort (
+      * Optionally allows the generic data types to be used for filling
+      * this field.
+      */
+-    Iort->NodeOffset = sizeof (ACPI_TABLE_IORT);
++    IortNodeOffset = sizeof (ACPI_TABLE_IORT);
+     Status = DtCompileTable (PFieldList, AcpiDmTableInfoIortPad,
+         &Subtable);
+     if (ACPI_FAILURE (Status))
+@@ -1558,7 +1559,7 @@ DtCompileIort (
+     if (Subtable)
+     {
+         DtInsertSubtable (ParentTable, Subtable);
+-        Iort->NodeOffset += Subtable->Length;
++        IortNodeOffset += Subtable->Length;
+     }
+     else
+     {
+@@ -1568,8 +1569,9 @@ DtCompileIort (
+         {
+             return (Status);
+         }
+-        Iort->NodeOffset += PaddingLength;
++        IortNodeOffset += PaddingLength;
+     }
++    Iort->NodeOffset = AcpiUtReadUint32(&IortNodeOffset);
+ 
+     NodeNumber = 0;
+     while (*PFieldList)
+@@ -1623,7 +1625,7 @@ DtCompileIort (
+                 ItsNumber++;
+             }
+ 
+-            IortItsGroup->ItsCount = ItsNumber;
++            IortItsGroup->ItsCount = AcpiUtReadUint32(&ItsNumber);
+             break;
+ 
+         case ACPI_IORT_NODE_NAMED_COMPONENT:
+@@ -1657,15 +1659,18 @@ DtCompileIort (
+             }
+             else
+             {
+-                if (NodeLength > IortNode->MappingOffset)
++		UINT32 MappingOffset;
++
++		MappingOffset = IortNode->MappingOffset;
++                if (NodeLength > MappingOffset)
+                 {
+                     return (AE_BAD_DATA);
+                 }
+ 
+-                if (NodeLength < IortNode->MappingOffset)
++                if (NodeLength < MappingOffset)
+                 {
+                     Status = DtCompilePadding (
+-                        IortNode->MappingOffset - NodeLength,
++                        MappingOffset - NodeLength,
+                         &Subtable);
+                     if (ACPI_FAILURE (Status))
+                     {
+@@ -1673,7 +1678,7 @@ DtCompileIort (
+                     }
+ 
+                     DtInsertSubtable (ParentTable, Subtable);
+-                    NodeLength = IortNode->MappingOffset;
++                    NodeLength = MappingOffset;
+                 }
+             }
+             break;
+@@ -1706,7 +1711,7 @@ DtCompileIort (
+ 
+             /* Compile global interrupt array */
+ 
+-            IortSmmu->GlobalInterruptOffset = NodeLength;
++            IortSmmu->GlobalInterruptOffset = AcpiUtReadUint32(&NodeLength);
+             Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3a,
+                 &Subtable);
+             if (ACPI_FAILURE (Status))
+@@ -1720,7 +1725,7 @@ DtCompileIort (
+             /* Compile context interrupt array */
+ 
+             ContextIrptNumber = 0;
+-            IortSmmu->ContextInterruptOffset = NodeLength;
++            IortSmmu->ContextInterruptOffset = AcpiUtReadUint32(&NodeLength);
+             while (*PFieldList)
+             {
+                 Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3b,
+@@ -1740,12 +1745,12 @@ DtCompileIort (
+                 ContextIrptNumber++;
+             }
+ 
+-            IortSmmu->ContextInterruptCount = ContextIrptNumber;
++            IortSmmu->ContextInterruptCount = AcpiUtReadUint32(&ContextIrptNumber);
+ 
+             /* Compile PMU interrupt array */
+ 
+             PmuIrptNumber = 0;
+-            IortSmmu->PmuInterruptOffset = NodeLength;
++            IortSmmu->PmuInterruptOffset = AcpiUtReadUint32(&NodeLength);
+             while (*PFieldList)
+             {
+                 Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3c,
+@@ -1765,7 +1770,7 @@ DtCompileIort (
+                 PmuIrptNumber++;
+             }
+ 
+-            IortSmmu->PmuInterruptCount = PmuIrptNumber;
++            IortSmmu->PmuInterruptCount = AcpiUtReadUint32(&PmuIrptNumber);
+             break;
+ 
+         case ACPI_IORT_NODE_SMMU_V3:
+@@ -1802,7 +1807,7 @@ DtCompileIort (
+ 
+         /* Compile Array of ID mappings */
+ 
+-        IortNode->MappingOffset = NodeLength;
++	IortNode->MappingOffset = AcpiUtReadUint32(&NodeLength);
+         IdMappingNumber = 0;
+         while (*PFieldList)
+         {
+@@ -1823,7 +1828,7 @@ DtCompileIort (
+             IdMappingNumber++;
+         }
+ 
+-        IortNode->MappingCount = IdMappingNumber;
++        IortNode->MappingCount = AcpiUtReadUint32(&IdMappingNumber);
+         if (!IdMappingNumber)
+         {
+             IortNode->MappingOffset = 0;
+@@ -1838,7 +1843,7 @@ DtCompileIort (
+         NodeNumber++;
+     }
+ 
+-    Iort->NodeCount = NodeNumber;
++    Iort->NodeCount = AcpiUtReadUint32(&NodeNumber);
+     return (AE_OK);
+ }
+ 
diff --git a/0037-Support-IVRS-in-a-big-endian-world.patch b/0037-Support-IVRS-in-a-big-endian-world.patch
new file mode 100644
index 0000000..53f8bf2
--- /dev/null
+++ b/0037-Support-IVRS-in-a-big-endian-world.patch
@@ -0,0 +1,96 @@
+From 49b3d77990241c7216412d78e52cf15b3aa6d1ad Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Wed, 30 Sep 2020 18:18:07 -0600
+Subject: [PATCH 37/40] Support IVRS in a big-endian world
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/common/dmtbdump2.c | 25 ++++++++++++++-----------
+ 1 file changed, 14 insertions(+), 11 deletions(-)
+
+Index: acpica-unix2-20200925/source/common/dmtbdump2.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20200925/source/common/dmtbdump2.c
+@@ -353,11 +353,13 @@ AcpiDmDumpIvrs (
+     ACPI_IVRS_DE_HEADER     *DeviceEntry;
+     ACPI_IVRS_HEADER        *Subtable;
+     ACPI_DMTABLE_INFO       *InfoTable;
++    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
++    UINT16                  SubtableLength;
+ 
+ 
+     /* Main table */
+ 
+-    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoIvrs);
++    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoIvrs);
+     if (ACPI_FAILURE (Status))
+     {
+         return;
+@@ -366,13 +368,14 @@ AcpiDmDumpIvrs (
+     /* Subtables */
+ 
+     Subtable = ACPI_ADD_PTR (ACPI_IVRS_HEADER, Table, Offset);
+-    while (Offset < Table->Length)
++    while (Offset < TableLength)
+     {
+         /* Common subtable header */
+ 
+         AcpiOsPrintf ("\n");
+-        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
+-            Subtable->Length, AcpiDmTableInfoIvrsHdr);
++	SubtableLength = AcpiUtReadUint16(&Subtable->Length);
++        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
++            SubtableLength, AcpiDmTableInfoIvrsHdr);
+         if (ACPI_FAILURE (Status))
+         {
+             return;
+@@ -404,7 +407,7 @@ AcpiDmDumpIvrs (
+ 
+             /* Attempt to continue */
+ 
+-            if (!Subtable->Length)
++            if (!SubtableLength)
+             {
+                 AcpiOsPrintf ("Invalid zero length subtable\n");
+                 return;
+@@ -415,8 +418,8 @@ AcpiDmDumpIvrs (
+         /* Dump the subtable */
+ 
+         AcpiOsPrintf ("\n");
+-        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
+-            Subtable->Length, InfoTable);
++        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
++            SubtableLength, InfoTable);
+         if (ACPI_FAILURE (Status))
+         {
+             return;
+@@ -442,7 +445,7 @@ AcpiDmDumpIvrs (
+                     sizeof (ACPI_IVRS_HARDWARE2));
+             }
+ 
+-            while (EntryOffset < (Offset + Subtable->Length))
++            while (EntryOffset < (Offset + SubtableLength))
+             {
+                 AcpiOsPrintf ("\n");
+                 /*
+@@ -504,7 +507,7 @@ AcpiDmDumpIvrs (
+ 
+                 /* Dump the Device Entry */
+ 
+-                Status = AcpiDmDumpTable (Table->Length, EntryOffset,
++                Status = AcpiDmDumpTable (TableLength, EntryOffset,
+                     DeviceEntry, EntryLength, InfoTable);
+                 if (ACPI_FAILURE (Status))
+                 {
+@@ -520,8 +523,8 @@ AcpiDmDumpIvrs (
+ NextSubtable:
+         /* Point to next subtable */
+ 
+-        Offset += Subtable->Length;
+-        Subtable = ACPI_ADD_PTR (ACPI_IVRS_HEADER, Subtable, Subtable->Length);
++        Offset += SubtableLength;
++        Subtable = ACPI_ADD_PTR (ACPI_IVRS_HEADER, Subtable, SubtableLength);
+     }
+ }
+ 
diff --git a/0038-Support-TPM2-in-a-big-endian-world.patch b/0038-Support-TPM2-in-a-big-endian-world.patch
new file mode 100644
index 0000000..b0298bb
--- /dev/null
+++ b/0038-Support-TPM2-in-a-big-endian-world.patch
@@ -0,0 +1,119 @@
+From 1e1129d788087025cf31b0c3babdb9bca01f1c4e Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Wed, 30 Sep 2020 18:42:38 -0600
+Subject: [PATCH 38/40] Support TPM2 in a big-endian world
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/common/dmtbdump3.c  | 18 ++++++++++--------
+ source/compiler/dttable2.c |  8 +++++---
+ 2 files changed, 15 insertions(+), 11 deletions(-)
+
+Index: acpica-unix2-20200925/source/common/dmtbdump3.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/common/dmtbdump3.c
++++ acpica-unix2-20200925/source/common/dmtbdump3.c
+@@ -409,11 +409,12 @@ AcpiDmDumpTpm2Rev3 (
+     ACPI_TABLE_TPM23        *CommonHeader = ACPI_CAST_PTR (ACPI_TABLE_TPM23, Table);
+     ACPI_TPM23_TRAILER      *Subtable = ACPI_ADD_PTR (ACPI_TPM23_TRAILER, Table, Offset);
+     ACPI_STATUS             Status;
++    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
+ 
+ 
+     /* Main table */
+ 
+-    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoTpm23);
++    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoTpm23);
+     if (ACPI_FAILURE (Status))
+     {
+         return;
+@@ -425,8 +426,8 @@ AcpiDmDumpTpm2Rev3 (
+     {
+     case ACPI_TPM23_ACPI_START_METHOD:
+ 
+-        (void) AcpiDmDumpTable (Table->Length, Offset, Subtable,
+-            Table->Length - Offset, AcpiDmTableInfoTpm23a);
++        (void) AcpiDmDumpTable (TableLength, Offset, Subtable,
++            TableLength - Offset, AcpiDmTableInfoTpm23a);
+         break;
+ 
+     default:
+@@ -456,6 +457,7 @@ AcpiDmDumpTpm2 (
+     ACPI_TPM2_TRAILER       *Subtable = ACPI_ADD_PTR (ACPI_TPM2_TRAILER, Table, Offset);
+     ACPI_TPM2_ARM_SMC       *ArmSubtable;
+     ACPI_STATUS             Status;
++    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
+ 
+ 
+     if (Table->Revision == 3)
+@@ -466,7 +468,7 @@ AcpiDmDumpTpm2 (
+ 
+     /* Main table */
+ 
+-    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoTpm2);
++    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoTpm2);
+ 
+     if (ACPI_FAILURE (Status))
+     {
+@@ -474,8 +476,8 @@ AcpiDmDumpTpm2 (
+     }
+ 
+     AcpiOsPrintf ("\n");
+-    Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
+-        Table->Length - Offset, AcpiDmTableInfoTpm2a);
++    Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
++        TableLength - Offset, AcpiDmTableInfoTpm2a);
+     if (ACPI_FAILURE (Status))
+     {
+         return;
+@@ -490,8 +492,8 @@ AcpiDmDumpTpm2 (
+         Offset += sizeof (ACPI_TPM2_TRAILER);
+ 
+         AcpiOsPrintf ("\n");
+-        (void) AcpiDmDumpTable (Table->Length, Offset, ArmSubtable,
+-            Table->Length - Offset, AcpiDmTableInfoTpm211);
++        (void) AcpiDmDumpTable (TableLength, Offset, ArmSubtable,
++            TableLength - Offset, AcpiDmTableInfoTpm211);
+         break;
+ 
+     default:
+Index: acpica-unix2-20200925/source/compiler/dttable2.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/compiler/dttable2.c
++++ acpica-unix2-20200925/source/compiler/dttable2.c
+@@ -1904,6 +1904,7 @@ DtCompileTpm2 (
+     DT_SUBTABLE             *ParentTable;
+     ACPI_STATUS             Status = AE_OK;
+     ACPI_TABLE_HEADER       *Header;
++    UINT8                   StartMethod;
+ 
+ 
+     ParentTable = DtPeekSubtable ();
+@@ -1947,7 +1948,8 @@ DtCompileTpm2 (
+ 
+     /* Subtable type depends on the StartMethod */
+ 
+-    switch (Tpm2Header->StartMethod)
++    StartMethod = *(UINT8 *)&Tpm2Header->StartMethod;
++    switch (StartMethod)
+     {
+     case ACPI_TPM2_COMMAND_BUFFER_WITH_ARM_SMC:
+ 
+@@ -1978,7 +1980,7 @@ DtCompileTpm2 (
+     case ACPI_TPM2_RESERVED10:
+ 
+         AcpiOsPrintf ("\n**** Reserved TPM2 Start Method type 0x%X\n",
+-            Tpm2Header->StartMethod);
++            StartMethod);
+         Status = AE_ERROR;
+         break;
+ 
+@@ -1986,7 +1988,7 @@ DtCompileTpm2 (
+     default:
+ 
+         AcpiOsPrintf ("\n**** Unknown TPM2 Start Method type 0x%X\n",
+-            Tpm2Header->StartMethod);
++            StartMethod);
+         Status = AE_ERROR;
+         break;
+     }
diff --git a/0039-Add-partial-big-endian-support-for-WPBT-tables.patch b/0039-Add-partial-big-endian-support-for-WPBT-tables.patch
new file mode 100644
index 0000000..e5192e5
--- /dev/null
+++ b/0039-Add-partial-big-endian-support-for-WPBT-tables.patch
@@ -0,0 +1,61 @@
+From 9d7f9c8f4ecbee2e621d471a8c4944cebe62947d Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Wed, 30 Sep 2020 18:59:57 -0600
+Subject: [PATCH 39/40] Add partial big-endian support for WPBT tables
+
+There's some weirdness here that at present does not warrant
+further investigation; this is just a really low priority table.
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/common/dmtbdump3.c  | 8 ++++----
+ source/compiler/dttable2.c | 3 ++-
+ 2 files changed, 6 insertions(+), 5 deletions(-)
+
+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;
+-    UINT32                  Length = Table->Length;
++    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
+     UINT16                  ArgumentsLength;
+ 
+ 
+     /* Dump the main table */
+ 
+-    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoWpbt);
++    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoWpbt);
+     if (ACPI_FAILURE (Status))
+     {
+         return;
+@@ -643,10 +643,10 @@ AcpiDmDumpWpbt (
+     /* Extract the arguments buffer length from the main table */
+ 
+     Subtable = ACPI_CAST_PTR (ACPI_TABLE_WPBT, Table);
+-    ArgumentsLength = Subtable->ArgumentsLength;
++    ArgumentsLength = AcpiUtReadUint16(&Subtable->ArgumentsLength);
+ 
+     /* Dump the arguments buffer */
+ 
+-    (void) AcpiDmDumpTable (Table->Length, 0, Table, ArgumentsLength,
++    (void) AcpiDmDumpTable (TableLength, 0, Table, ArgumentsLength,
+         AcpiDmTableInfoWpbt0);
+ }
+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 */
+ 
+-    Length = (UINT16) Subtable->TotalLength;
++    AcpiUtWriteUint(&Length, sizeof(UINT16),
++		   &Subtable->TotalLength, sizeof(UINT32));
+     Table = ACPI_CAST_PTR (ACPI_TABLE_WPBT, ParentTable->Buffer);
+     Table->ArgumentsLength = Length;
+ 
diff --git a/0040-Support-DSDT-SSDT-in-a-big-endian-world.patch b/0040-Support-DSDT-SSDT-in-a-big-endian-world.patch
new file mode 100644
index 0000000..b5087dc
--- /dev/null
+++ b/0040-Support-DSDT-SSDT-in-a-big-endian-world.patch
@@ -0,0 +1,2682 @@
+From 355bbdd2ecf184e56108a2446244761895f93a62 Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Thu, 15 Oct 2020 11:35:23 -0600
+Subject: [PATCH 40/40] Support DSDT/SSDT in a big-endian world
+
+NB: this is a very large diff.  The problem is that ResourceTemplates
+are treated differently during compilation and disassembly so each of
+the resource types had code that needed to be touched directly.
+
+In general, however, just reading or writing individual AML opcodes
+wasn't that much of a change, and most of it was on the codegen side.
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/common/dmrestag.c                   |   2 +-
+ source/common/dmtables.c                   |  17 +-
+ source/common/dmtbdump.c                   |   3 +-
+ source/compiler/aslcodegen.c               |  61 +++++--
+ source/compiler/aslrestype1.c              |  44 +++--
+ source/compiler/aslrestype1i.c             |  33 ++--
+ source/compiler/aslrestype2.c              |  20 ++-
+ source/compiler/aslrestype2d.c             |  99 ++++++-----
+ source/compiler/aslrestype2e.c             |  90 ++++++----
+ source/compiler/aslrestype2q.c             |  81 ++++++---
+ source/compiler/aslrestype2s.c             | 181 ++++++++++++++++++---
+ source/compiler/aslrestype2w.c             |  94 ++++++-----
+ source/components/disassembler/dmbuffer.c  |   2 +-
+ source/components/disassembler/dmopcode.c  |   8 +-
+ source/components/disassembler/dmresrc.c   |   2 +-
+ source/components/disassembler/dmresrcl.c  |  43 +++--
+ source/components/disassembler/dmresrcl2.c |  64 +++++---
+ source/components/disassembler/dmresrcs.c  |  18 +-
+ source/components/dispatcher/dsfield.c     |  16 +-
+ source/components/namespace/nsaccess.c     |   2 +-
+ source/components/namespace/nsnames.c      |   2 +-
+ source/components/namespace/nsparse.c      |   6 +-
+ source/components/namespace/nsutils.c      |   7 +-
+ 23 files changed, 613 insertions(+), 282 deletions(-)
+
+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,
+-        (ACPI_SIZE) NextOp->Common.Value.Integer,
++        (ACPI_SIZE) NextOp->Common.Value.Size,
+         AcpiDmAddResourceToNamespace, (void **) BufferNode);
+ }
+ 
+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;
++    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
++    UINT32                  OemRevision = AcpiUtReadUint32(&Table->OemRevision);
++    UINT32                  CompilerRevision = 
++	    			AcpiUtReadUint32(&Table->AslCompilerRevision);
+ 
+ 
+     /* Reset globals for External statements */
+@@ -156,7 +160,7 @@ AdCreateTableHeader (
+ 
+     AcpiOsPrintf (" * Original Table Header:\n");
+     AcpiOsPrintf (" *     Signature        \"%4.4s\"\n",    Table->Signature);
+-    AcpiOsPrintf (" *     Length           0x%8.8X (%u)\n", Table->Length, Table->Length);
++    AcpiOsPrintf (" *     Length           0x%8.8X (%u)\n", TableLength, TableLength);
+ 
+     /* Print and validate the revision */
+ 
+@@ -188,7 +192,7 @@ AdCreateTableHeader (
+ 
+     AcpiOsPrintf ("\n *     Checksum         0x%2.2X",        Table->Checksum);
+ 
+-    Checksum = AcpiTbChecksum (ACPI_CAST_PTR (UINT8, Table), Table->Length);
++    Checksum = AcpiTbChecksum (ACPI_CAST_PTR (UINT8, Table), TableLength);
+     if (Checksum)
+     {
+         AcpiOsPrintf (" **** Incorrect checksum, should be 0x%2.2X",
+@@ -198,9 +202,9 @@ AdCreateTableHeader (
+     AcpiOsPrintf ("\n");
+     AcpiOsPrintf (" *     OEM ID           \"%.6s\"\n",     Table->OemId);
+     AcpiOsPrintf (" *     OEM Table ID     \"%.8s\"\n",     Table->OemTableId);
+-    AcpiOsPrintf (" *     OEM Revision     0x%8.8X (%u)\n", Table->OemRevision, Table->OemRevision);
++    AcpiOsPrintf (" *     OEM Revision     0x%8.8X (%u)\n", OemRevision, OemRevision);
+     AcpiOsPrintf (" *     Compiler ID      \"%.4s\"\n",     Table->AslCompilerId);
+-    AcpiOsPrintf (" *     Compiler Version 0x%8.8X (%u)\n", Table->AslCompilerRevision, Table->AslCompilerRevision);
++    AcpiOsPrintf (" *     Compiler Version 0x%8.8X (%u)\n", CompilerRevision, CompilerRevision);
+     AcpiOsPrintf (" */\n");
+ 
+     /*
+@@ -221,7 +225,7 @@ AdCreateTableHeader (
+     AcpiOsPrintf (
+         "DefinitionBlock (\"\", \"%4.4s\", %u, \"%.6s\", \"%.8s\", 0x%8.8X)\n",
+         Table->Signature, Table->Revision,
+-        Table->OemId, Table->OemTableId, Table->OemRevision);
++        Table->OemId, Table->OemTableId, OemRevision);
+ }
+ 
+ 
+@@ -396,7 +400,8 @@ AdParseTable (
+ 
+     fprintf (stderr, "Pass 1 parse of [%4.4s]\n", (char *) Table->Signature);
+ 
+-    AmlLength = Table->Length - sizeof (ACPI_TABLE_HEADER);
++    AmlLength = AcpiUtReadUint32(&Table->Length);
++    AmlLength -= sizeof (ACPI_TABLE_HEADER);
+     AmlStart = ((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER));
+ 
+     AcpiUtSetIntegerWidth (Table->Revision);
+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);
+-        AcpiOsPrintf ("%8.8X%8.8X\n",
+-		     	ACPI_FORMAT_UINT64 (AcpiUtReadUint64(&Array[i])));
++        AcpiOsPrintf ("%16.16lX\n", AcpiUtReadUint64(&Array[i]));
+         Offset += sizeof (UINT64);
+     }
+ }
+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;
++    UINT8                   Tmp8;
++    UINT16                  Tmp16;
++    UINT32                  Tmp32;
++    UINT64                  Tmp64;
+     union {
+         UINT16                  Opcode;
+         UINT8                   OpcodeBytes[2];
+@@ -305,25 +309,26 @@ CgWriteAmlOpcode (
+ 
+         /* Value is the length to be encoded (Used in field definitions) */
+ 
+-        PkgLen.Len = (UINT32) Op->Asl.Value.Integer;
++	PkgLen.Len = (UINT32) Op->Asl.Value.Integer;
+         break;
+ 
+     default:
+ 
+         /* Check for two-byte opcode */
+ 
++	Tmp16 = AcpiUtReadUint16(&Aml.Opcode);
+         if (Aml.Opcode > 0x00FF)
+         {
+             /* Write the high byte first */
+ 
+-            CgLocalWriteAmlData (Op, &Aml.OpcodeBytes[1], 1);
++            CgLocalWriteAmlData (Op, ((UINT8 *)&Tmp16)+1, 1);
+         }
+ 
+-        CgLocalWriteAmlData (Op, &Aml.OpcodeBytes[0], 1);
++        CgLocalWriteAmlData (Op, (UINT8 *)&Tmp16, 1);
+ 
+         /* Subtreelength doesn't include length of package length bytes */
+ 
+-        PkgLen.Len = Op->Asl.AmlSubtreeLength + Op->Asl.AmlPkgLenBytes;
++	PkgLen.Len = Op->Asl.AmlSubtreeLength + Op->Asl.AmlPkgLenBytes;
+         break;
+     }
+ 
+@@ -335,7 +340,8 @@ CgWriteAmlOpcode (
+         {
+             /* Simplest case -- no bytes to follow, just write the count */
+ 
+-            CgLocalWriteAmlData (Op, &PkgLen.LenBytes[0], 1);
++	    Tmp8 = (UINT8) PkgLen.Len;
++            CgLocalWriteAmlData (Op, &Tmp8, 1);
+         }
+         else if (Op->Asl.AmlPkgLenBytes != 0)
+         {
+@@ -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
+              */
++	    Tmp8 = (UINT8) PkgLen.Len;
+             PkgLenFirstByte = (UINT8)
+                 (((UINT32) (Op->Asl.AmlPkgLenBytes - 1) << 6) |
+-                (PkgLen.LenBytes[0] & 0x0F));
++                (Tmp8 & 0x0F));
+ 
+             CgLocalWriteAmlData (Op, &PkgLenFirstByte, 1);
+ 
+@@ -359,6 +366,9 @@ CgWriteAmlOpcode (
+              * Now we can write the remaining bytes -
+              * either 1, 2, or 3 bytes
+              */
++	    Tmp32 = PkgLen.Len;
++	    AcpiUtWriteUint(&PkgLen.Len, Op->Asl.AmlPkgLenBytes,
++			    &Tmp32, sizeof(UINT32));
+             for (i = 0; i < (UINT32) (Op->Asl.AmlPkgLenBytes - 1); i++)
+             {
+                 CgLocalWriteAmlData (Op, &PkgLen.LenBytes[i], 1);
+@@ -370,22 +380,30 @@ CgWriteAmlOpcode (
+     {
+     case AML_BYTE_OP:
+ 
+-        CgLocalWriteAmlData (Op, &Op->Asl.Value.Integer, 1);
++	Tmp64 = 0;
++	AcpiUtWriteUint(&Tmp64, 1, &Op->Asl.Value.Integer, 8);
++        CgLocalWriteAmlData (Op, &Tmp64, 1);
+         break;
+ 
+     case AML_WORD_OP:
+ 
+-        CgLocalWriteAmlData (Op, &Op->Asl.Value.Integer, 2);
++	Tmp64 = 0;
++	AcpiUtWriteUint(&Tmp64, 2, &Op->Asl.Value.Integer, 8);
++        CgLocalWriteAmlData (Op, &Tmp64, 2);
+        break;
+ 
+     case AML_DWORD_OP:
+ 
+-        CgLocalWriteAmlData (Op, &Op->Asl.Value.Integer, 4);
++	Tmp64 = 0;
++	AcpiUtWriteUint(&Tmp64, 4, &Op->Asl.Value.Integer, 8);
++        CgLocalWriteAmlData (Op, &Tmp64, 4);
+         break;
+ 
+     case AML_QWORD_OP:
+ 
+-        CgLocalWriteAmlData (Op, &Op->Asl.Value.Integer, 8);
++	Tmp64 = 0;
++	AcpiUtWriteUint(&Tmp64, 8, &Op->Asl.Value.Integer, 8);
++        CgLocalWriteAmlData (Op, &Tmp64, 8);
+         break;
+ 
+     case AML_STRING_OP:
+@@ -423,6 +441,7 @@ CgWriteTableHeader (
+     ACPI_PARSE_OBJECT       *Child;
+     UINT32                  CommentLength;
+     ACPI_COMMENT_NODE       *Current;
++    UINT32                  Tmp32;
+ 
+ 
+     memset (&AslGbl_TableHeader, 0, sizeof (ACPI_TABLE_HEADER));
+@@ -478,7 +497,9 @@ CgWriteTableHeader (
+     /* OEM Revision */
+ 
+     Child = Child->Asl.Next;
+-    AslGbl_TableHeader.OemRevision = (UINT32) Child->Asl.Value.Integer;
++    AcpiUtWriteUint(&Tmp32, sizeof(UINT32),
++		   &Child->Asl.Value.Integer, sizeof(Child->Asl.Value.Integer));
++    AslGbl_TableHeader.OemRevision = Tmp32;
+ 
+     /* Compiler ID */
+ 
+@@ -486,7 +507,8 @@ CgWriteTableHeader (
+ 
+     /* Compiler version */
+ 
+-    AslGbl_TableHeader.AslCompilerRevision = ACPI_CA_VERSION;
++    Tmp32 = ACPI_CA_VERSION;
++    AslGbl_TableHeader.AslCompilerRevision = AcpiUtReadUint32(&Tmp32);
+ 
+     /* Table length. Checksum zero for now, will rewrite later */
+ 
+@@ -541,6 +563,15 @@ CgWriteTableHeader (
+     AslGbl_TableHeader.Checksum = 0;
+     Op->Asl.FinalAmlOffset = ftell (AslGbl_Files[ASL_FILE_AML_OUTPUT].Handle);
+ 
++    /*
++     * Adjust the Table length; it will only change when big-endian
++     * but we have to wait until here in case there is arithmetic to
++     * be done on the length before this step in the function
++     */
++
++    Tmp32 = AslGbl_TableHeader.Length;
++    AslGbl_TableHeader.Length = AcpiUtReadUint32(&Tmp32);
++
+     /* Write entire header and clear the table header global */
+ 
+     CgLocalWriteAmlData (Op, &AslGbl_TableHeader, sizeof (ACPI_TABLE_HEADER));
+@@ -625,6 +656,7 @@ CgWriteNode (
+     ACPI_PARSE_OBJECT       *Op)
+ {
+     ASL_RESOURCE_NODE       *Rnode;
++    UINT64                  Tmp64;
+ 
+ 
+     /* Write all comments here. */
+@@ -653,7 +685,10 @@ CgWriteNode (
+     case AML_RAW_DATA_DWORD:
+     case AML_RAW_DATA_QWORD:
+ 
+-        CgLocalWriteAmlData (Op, &Op->Asl.Value.Integer, Op->Asl.AmlLength);
++	Tmp64 = 0;
++	AcpiUtWriteUint(&Tmp64, Op->Asl.AmlLength,
++			&Op->Asl.Value.Integer, sizeof(UINT64));
++        CgLocalWriteAmlData (Op, &Tmp64, Op->Asl.AmlLength);
+         return;
+ 
+ 
+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;
++    UINT16                  Tmp16;
+ 
+ 
+     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+@@ -151,7 +152,8 @@ RsDoMemory24Descriptor (
+ 
+     Descriptor = Rnode->Buffer;
+     Descriptor->Memory24.DescriptorType = ACPI_RESOURCE_NAME_MEMORY24;
+-    Descriptor->Memory24.ResourceLength = 9;
++    Tmp16 = 9;
++    Descriptor->Memory24.ResourceLength = AcpiUtReadUint16(&Tmp16);
+ 
+     /* Process all child initialization nodes */
+ 
+@@ -168,7 +170,8 @@ RsDoMemory24Descriptor (
+ 
+         case 1: /* Min Address */
+ 
+-            Descriptor->Memory24.Minimum = (UINT16) InitializerOp->Asl.Value.Integer;
++            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            Descriptor->Memory24.Minimum = AcpiUtReadUint16(&Tmp16);
+             RsCreateWordField (InitializerOp, ACPI_RESTAG_MINADDR,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Memory24.Minimum));
+             MinOp = InitializerOp;
+@@ -176,7 +179,8 @@ RsDoMemory24Descriptor (
+ 
+         case 2: /* Max Address */
+ 
+-            Descriptor->Memory24.Maximum = (UINT16) InitializerOp->Asl.Value.Integer;
++            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            Descriptor->Memory24.Maximum = AcpiUtReadUint16(&Tmp16);
+             RsCreateWordField (InitializerOp, ACPI_RESTAG_MAXADDR,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Memory24.Maximum));
+             MaxOp = InitializerOp;
+@@ -184,14 +188,16 @@ RsDoMemory24Descriptor (
+ 
+         case 3: /* Alignment */
+ 
+-            Descriptor->Memory24.Alignment = (UINT16) InitializerOp->Asl.Value.Integer;
++            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            Descriptor->Memory24.Alignment = AcpiUtReadUint16(&Tmp16);
+             RsCreateWordField (InitializerOp, ACPI_RESTAG_ALIGNMENT,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Memory24.Alignment));
+             break;
+ 
+         case 4: /* Length */
+ 
+-            Descriptor->Memory24.AddressLength = (UINT16) InitializerOp->Asl.Value.Integer;
++            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            Descriptor->Memory24.AddressLength = AcpiUtReadUint16(&Tmp16);
+             RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Memory24.AddressLength));
+             LengthOp = InitializerOp;
+@@ -249,6 +255,8 @@ RsDoMemory32Descriptor (
+     ASL_RESOURCE_NODE       *Rnode;
+     UINT32                  CurrentByteOffset;
+     UINT32                  i;
++    UINT16                  Tmp16;
++    UINT32                  Tmp32;
+ 
+ 
+     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+@@ -257,7 +265,8 @@ RsDoMemory32Descriptor (
+ 
+     Descriptor = Rnode->Buffer;
+     Descriptor->Memory32.DescriptorType = ACPI_RESOURCE_NAME_MEMORY32;
+-    Descriptor->Memory32.ResourceLength = 17;
++    Tmp16 = 17;
++    Descriptor->Memory32.ResourceLength = AcpiUtReadUint16(&Tmp16);
+ 
+     /* Process all child initialization nodes */
+ 
+@@ -274,7 +283,8 @@ RsDoMemory32Descriptor (
+ 
+         case 1:  /* Min Address */
+ 
+-            Descriptor->Memory32.Minimum = (UINT32) InitializerOp->Asl.Value.Integer;
++            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
++            Descriptor->Memory32.Minimum = AcpiUtReadUint32(&Tmp32);
+             RsCreateDwordField (InitializerOp, ACPI_RESTAG_MINADDR,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Memory32.Minimum));
+             MinOp = InitializerOp;
+@@ -282,7 +292,8 @@ RsDoMemory32Descriptor (
+ 
+         case 2: /* Max Address */
+ 
+-            Descriptor->Memory32.Maximum = (UINT32) InitializerOp->Asl.Value.Integer;
++            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
++            Descriptor->Memory32.Maximum = AcpiUtReadUint32(&Tmp32);
+             RsCreateDwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Memory32.Maximum));
+             MaxOp = InitializerOp;
+@@ -290,7 +301,8 @@ RsDoMemory32Descriptor (
+ 
+         case 3: /* Alignment */
+ 
+-            Descriptor->Memory32.Alignment = (UINT32) InitializerOp->Asl.Value.Integer;
++            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
++            Descriptor->Memory32.Alignment = AcpiUtReadUint32(&Tmp32);
+             RsCreateDwordField (InitializerOp, ACPI_RESTAG_ALIGNMENT,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Memory32.Alignment));
+             AlignOp = InitializerOp;
+@@ -298,7 +310,8 @@ RsDoMemory32Descriptor (
+ 
+         case 4: /* Length */
+ 
+-            Descriptor->Memory32.AddressLength = (UINT32) InitializerOp->Asl.Value.Integer;
++            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
++            Descriptor->Memory32.AddressLength = AcpiUtReadUint32(&Tmp32);
+             RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Memory32.AddressLength));
+             LengthOp = InitializerOp;
+@@ -352,6 +365,8 @@ RsDoMemory32FixedDescriptor (
+     ASL_RESOURCE_NODE       *Rnode;
+     UINT32                  CurrentByteOffset;
+     UINT32                  i;
++    UINT16                  Tmp16;
++    UINT32                  Tmp32;
+ 
+ 
+     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+@@ -360,7 +375,8 @@ RsDoMemory32FixedDescriptor (
+ 
+     Descriptor = Rnode->Buffer;
+     Descriptor->FixedMemory32.DescriptorType = ACPI_RESOURCE_NAME_FIXED_MEMORY32;
+-    Descriptor->FixedMemory32.ResourceLength = 9;
++    Tmp16 = 9;
++    Descriptor->FixedMemory32.ResourceLength = AcpiUtReadUint16(&Tmp16);
+ 
+     /* Process all child initialization nodes */
+ 
+@@ -377,14 +393,16 @@ RsDoMemory32FixedDescriptor (
+ 
+         case 1: /* Address */
+ 
+-            Descriptor->FixedMemory32.Address = (UINT32) InitializerOp->Asl.Value.Integer;
++            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
++            Descriptor->FixedMemory32.Address = AcpiUtReadUint32(&Tmp32);
+             RsCreateDwordField (InitializerOp, ACPI_RESTAG_BASEADDRESS,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (FixedMemory32.Address));
+             break;
+ 
+         case 2: /* Length */
+ 
+-            Descriptor->FixedMemory32.AddressLength = (UINT32) InitializerOp->Asl.Value.Integer;
++            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
++            Descriptor->FixedMemory32.AddressLength = AcpiUtReadUint32(&Tmp32);
+             RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (FixedMemory32.AddressLength));
+             break;
+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;
++    UINT16                  Tmp16;
+ 
+ 
+     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+@@ -217,14 +218,16 @@ RsDoFixedDmaDescriptor (
+         {
+         case 0: /* DMA Request Lines [WORD] (_DMA) */
+ 
+-            Descriptor->FixedDma.RequestLines = (UINT16) InitializerOp->Asl.Value.Integer;
++            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            Descriptor->FixedDma.RequestLines = AcpiUtReadUint16(&Tmp16);
+             RsCreateWordField (InitializerOp, ACPI_RESTAG_DMA,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (FixedDma.RequestLines));
+             break;
+ 
+         case 1: /* DMA Channel [WORD] (_TYP) */
+ 
+-            Descriptor->FixedDma.Channels = (UINT16) InitializerOp->Asl.Value.Integer;
++            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            Descriptor->FixedDma.Channels = AcpiUtReadUint16(&Tmp16);
+             RsCreateWordField (InitializerOp, ACPI_RESTAG_DMATYPE,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (FixedDma.Channels));
+             break;
+@@ -275,6 +278,7 @@ RsDoFixedIoDescriptor (
+     ASL_RESOURCE_NODE       *Rnode;
+     UINT32                  CurrentByteOffset;
+     UINT32                  i;
++    UINT16                  Tmp16;
+ 
+ 
+     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+@@ -293,8 +297,8 @@ RsDoFixedIoDescriptor (
+         {
+         case 0: /* Base Address */
+ 
+-            Descriptor->FixedIo.Address =
+-                (UINT16) InitializerOp->Asl.Value.Integer;
++            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            Descriptor->FixedIo.Address = AcpiUtReadUint16(&Tmp16);
+             RsCreateWordField (InitializerOp, ACPI_RESTAG_BASEADDRESS,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (FixedIo.Address));
+             AddressOp = InitializerOp;
+@@ -358,6 +362,7 @@ RsDoIoDescriptor (
+     ASL_RESOURCE_NODE       *Rnode;
+     UINT32                  CurrentByteOffset;
+     UINT32                  i;
++    UINT16                  Tmp16;
+ 
+ 
+     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+@@ -383,8 +388,8 @@ RsDoIoDescriptor (
+ 
+         case 1:  /* Min Address */
+ 
+-            Descriptor->Io.Minimum =
+-                (UINT16) InitializerOp->Asl.Value.Integer;
++            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            Descriptor->Io.Minimum = AcpiUtReadUint16(&Tmp16);
+             RsCreateWordField (InitializerOp, ACPI_RESTAG_MINADDR,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Io.Minimum));
+             MinOp = InitializerOp;
+@@ -392,8 +397,8 @@ RsDoIoDescriptor (
+ 
+         case 2: /* Max Address */
+ 
+-            Descriptor->Io.Maximum =
+-                (UINT16) InitializerOp->Asl.Value.Integer;
++            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            Descriptor->Io.Maximum = AcpiUtReadUint16(&Tmp16);
+             RsCreateWordField (InitializerOp, ACPI_RESTAG_MAXADDR,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Io.Maximum));
+             MaxOp = InitializerOp;
+@@ -434,10 +439,10 @@ RsDoIoDescriptor (
+     /* Validate the Min/Max/Len/Align values */
+ 
+     RsSmallAddressCheck (ACPI_RESOURCE_NAME_IO,
+-        Descriptor->Io.Minimum,
+-        Descriptor->Io.Maximum,
+-        Descriptor->Io.AddressLength,
+-        Descriptor->Io.Alignment,
++        (UINT32)(AcpiUtReadUint16(&Descriptor->Io.Minimum)),
++        (UINT32)(AcpiUtReadUint16(&Descriptor->Io.Maximum)),
++        (UINT32)Descriptor->Io.AddressLength,
++        (UINT32)Descriptor->Io.Alignment,
+         MinOp, MaxOp, LengthOp, AlignOp, Info->DescriptorTypeOp);
+ 
+     return (Rnode);
+@@ -561,7 +566,7 @@ RsDoIrqDescriptor (
+ 
+     /* Now we can set the channel mask */
+ 
+-    Descriptor->Irq.IrqMask = IrqMask;
++    Descriptor->Irq.IrqMask = AcpiUtReadUint16(&IrqMask);
+     return (Rnode);
+ }
+ 
+@@ -660,6 +665,6 @@ RsDoIrqNoFlagsDescriptor (
+ 
+     /* Now we can set the interrupt mask */
+ 
+-    Descriptor->Irq.IrqMask = IrqMask;
++    Descriptor->Irq.IrqMask = AcpiUtReadUint16(&IrqMask);
+     return (Rnode);
+ }
+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;
++    UINT16                  Tmp16;
++    UINT64                  Tmp64;
+ 
+ 
+     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+@@ -85,7 +87,8 @@ RsDoGeneralRegisterDescriptor (
+ 
+     Descriptor = Rnode->Buffer;
+     Descriptor->GenericReg.DescriptorType = ACPI_RESOURCE_NAME_GENERIC_REGISTER;
+-    Descriptor->GenericReg.ResourceLength = 12;
++    Tmp16 = 12;
++    Descriptor->GenericReg.ResourceLength = AcpiUtReadUint16(&Tmp16);
+ 
+     /* Process all child initialization nodes */
+ 
+@@ -116,7 +119,8 @@ RsDoGeneralRegisterDescriptor (
+ 
+         case 3: /* Register Address */
+ 
+-            Descriptor->GenericReg.Address = InitializerOp->Asl.Value.Integer;
++            Tmp64 = InitializerOp->Asl.Value.Integer;
++            Descriptor->GenericReg.Address = AcpiUtReadUint64(&Tmp64);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_ADDRESS,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (GenericReg.Address));
+             break;
+@@ -184,6 +188,8 @@ RsDoInterruptDescriptor (
+     BOOLEAN                 HasResSourceIndex = FALSE;
+     UINT8                   ResSourceIndex = 0;
+     UINT8                   *ResSourceString = NULL;
++    UINT16                  Tmp16;
++    UINT32                  Tmp32;
+ 
+ 
+     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+@@ -225,7 +231,7 @@ RsDoInterruptDescriptor (
+      * Initial descriptor length -- may be enlarged if there are
+      * optional fields present
+      */
+-    Descriptor->ExtendedIrq.ResourceLength  = 2;  /* Flags and table length byte */
++    Descriptor->ExtendedIrq.ResourceLength  = 2; /* Flags and table length byte */
+     Descriptor->ExtendedIrq.InterruptCount  = 0;
+ 
+     Rover = ACPI_CAST_PTR (AML_RESOURCE,
+@@ -333,7 +339,8 @@ RsDoInterruptDescriptor (
+ 
+             /* Save the integer and move pointer to the next one */
+ 
+-            Rover->DwordItem = (UINT32) InitializerOp->Asl.Value.Integer;
++            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
++            Rover->DwordItem = AcpiUtReadUint32(&Tmp32);
+             Rover = ACPI_ADD_PTR (AML_RESOURCE, &(Rover->DwordItem), 4);
+             Descriptor->ExtendedIrq.InterruptCount++;
+             Descriptor->ExtendedIrq.ResourceLength += 4;
+@@ -384,6 +391,8 @@ RsDoInterruptDescriptor (
+         Descriptor->ExtendedIrq.ResourceLength = (UINT16)
+             (Descriptor->ExtendedIrq.ResourceLength + StringLength);
+     }
++    Tmp16 = Descriptor->ExtendedIrq.ResourceLength;
++    Descriptor->ExtendedIrq.ResourceLength  = AcpiUtReadUint16(&Tmp16);
+ 
+     Rnode->BufferLength =
+         (ASL_RESDESC_OFFSET (ExtendedIrq.Interrupts[0]) -
+@@ -436,7 +445,8 @@ RsDoVendorLargeDescriptor (
+ 
+     Descriptor = Rnode->Buffer;
+     Descriptor->VendorLarge.DescriptorType = ACPI_RESOURCE_NAME_VENDOR_LARGE;
+-    Descriptor->VendorLarge.ResourceLength = (UINT16) i;
++    AcpiUtWriteUint(&Descriptor->VendorLarge.ResourceLength, sizeof(UINT16),
++		    &i, sizeof(UINT32));
+ 
+     /* Point to end-of-descriptor for vendor data */
+ 
+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;
++    UINT16		    Tmp16;
++    UINT32		    Tmp32;
+ 
+ 
+     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+@@ -147,8 +149,8 @@ RsDoDwordIoDescriptor (
+ 
+         case 5: /* Address Granularity */
+ 
+-            Descriptor->Address32.Granularity =
+-                (UINT32) InitializerOp->Asl.Value.Integer;
++	    Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address32.Granularity = AcpiUtReadUint32(&Tmp32);
+             RsCreateDwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Granularity));
+             GranOp = InitializerOp;
+@@ -156,8 +158,8 @@ RsDoDwordIoDescriptor (
+ 
+         case 6: /* Address Min */
+ 
+-            Descriptor->Address32.Minimum =
+-                (UINT32) InitializerOp->Asl.Value.Integer;
++	    Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address32.Minimum = AcpiUtReadUint32(&Tmp32);
+             RsCreateDwordField (InitializerOp, ACPI_RESTAG_MINADDR,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Minimum));
+             MinOp = InitializerOp;
+@@ -165,8 +167,8 @@ RsDoDwordIoDescriptor (
+ 
+         case 7: /* Address Max */
+ 
+-            Descriptor->Address32.Maximum =
+-                (UINT32) InitializerOp->Asl.Value.Integer;
++	    Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address32.Maximum = AcpiUtReadUint32(&Tmp32);
+             RsCreateDwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Maximum));
+             MaxOp = InitializerOp;
+@@ -174,16 +176,16 @@ RsDoDwordIoDescriptor (
+ 
+         case 8: /* Translation Offset */
+ 
+-            Descriptor->Address32.TranslationOffset =
+-                (UINT32) InitializerOp->Asl.Value.Integer;
++	    Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address32.TranslationOffset = AcpiUtReadUint32(&Tmp32);
+             RsCreateDwordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.TranslationOffset));
+             break;
+ 
+         case 9: /* Address Length */
+ 
+-            Descriptor->Address32.AddressLength =
+-                (UINT32) InitializerOp->Asl.Value.Integer;
++	    Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address32.AddressLength = AcpiUtReadUint32(&Tmp32);
+             RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.AddressLength));
+             LengthOp = InitializerOp;
+@@ -271,11 +273,14 @@ RsDoDwordIoDescriptor (
+ 
+     /* Validate the Min/Max/Len/Gran values */
+ 
++    Tmp16 = Descriptor->Address32.ResourceLength;
++    Descriptor->Address32.ResourceLength = AcpiUtReadUint16(&Tmp16);
++
+     RsLargeAddressCheck (
+-        (UINT64) Descriptor->Address32.Minimum,
+-        (UINT64) Descriptor->Address32.Maximum,
+-        (UINT64) Descriptor->Address32.AddressLength,
+-        (UINT64) Descriptor->Address32.Granularity,
++        (UINT64) AcpiUtReadUint32(&Descriptor->Address32.Minimum),
++        (UINT64) AcpiUtReadUint32(&Descriptor->Address32.Maximum),
++        (UINT64) AcpiUtReadUint32(&Descriptor->Address32.AddressLength),
++        (UINT64) AcpiUtReadUint32(&Descriptor->Address32.Granularity),
+         Descriptor->Address32.Flags,
+         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
+ 
+@@ -314,6 +319,8 @@ RsDoDwordMemoryDescriptor (
+     UINT32                  CurrentByteOffset;
+     UINT32                  i;
+     BOOLEAN                 ResSourceIndex = FALSE;
++    UINT16                  Tmp16;
++    UINT32                  Tmp32;
+ 
+ 
+     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+@@ -385,8 +392,8 @@ RsDoDwordMemoryDescriptor (
+ 
+         case 6: /* Address Granularity */
+ 
+-            Descriptor->Address32.Granularity =
+-                (UINT32) InitializerOp->Asl.Value.Integer;
++            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address32.Granularity = AcpiUtReadUint32(&Tmp32);
+             RsCreateDwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Granularity));
+             GranOp = InitializerOp;
+@@ -394,8 +401,8 @@ RsDoDwordMemoryDescriptor (
+ 
+         case 7: /* Min Address */
+ 
+-            Descriptor->Address32.Minimum =
+-                (UINT32) InitializerOp->Asl.Value.Integer;
++            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address32.Minimum = AcpiUtReadUint32(&Tmp32);
+             RsCreateDwordField (InitializerOp, ACPI_RESTAG_MINADDR,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Minimum));
+             MinOp = InitializerOp;
+@@ -403,8 +410,8 @@ RsDoDwordMemoryDescriptor (
+ 
+         case 8: /* Max Address */
+ 
+-            Descriptor->Address32.Maximum =
+-                (UINT32) InitializerOp->Asl.Value.Integer;
++            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address32.Maximum = AcpiUtReadUint32(&Tmp32);
+             RsCreateDwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Maximum));
+             MaxOp = InitializerOp;
+@@ -412,16 +419,16 @@ RsDoDwordMemoryDescriptor (
+ 
+         case 9: /* Translation Offset */
+ 
+-            Descriptor->Address32.TranslationOffset =
+-                (UINT32) InitializerOp->Asl.Value.Integer;
++            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address32.TranslationOffset = AcpiUtReadUint32(&Tmp32);
+             RsCreateDwordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.TranslationOffset));
+             break;
+ 
+         case 10: /* Address Length */
+ 
+-            Descriptor->Address32.AddressLength =
+-                (UINT32) InitializerOp->Asl.Value.Integer;
++            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address32.AddressLength = AcpiUtReadUint32(&Tmp32);
+             RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.AddressLength));
+             LengthOp = InitializerOp;
+@@ -506,11 +513,14 @@ RsDoDwordMemoryDescriptor (
+ 
+     /* Validate the Min/Max/Len/Gran values */
+ 
++    Tmp16 = Descriptor->Address32.ResourceLength;
++    Descriptor->Address32.ResourceLength = AcpiUtReadUint16(&Tmp16);
++
+     RsLargeAddressCheck (
+-        (UINT64) Descriptor->Address32.Minimum,
+-        (UINT64) Descriptor->Address32.Maximum,
+-        (UINT64) Descriptor->Address32.AddressLength,
+-        (UINT64) Descriptor->Address32.Granularity,
++        (UINT64) AcpiUtReadUint32(&Descriptor->Address32.Minimum),
++        (UINT64) AcpiUtReadUint32(&Descriptor->Address32.Maximum),
++        (UINT64) AcpiUtReadUint32(&Descriptor->Address32.AddressLength),
++        (UINT64) AcpiUtReadUint32(&Descriptor->Address32.Granularity),
+         Descriptor->Address32.Flags,
+         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
+ 
+@@ -549,6 +559,8 @@ RsDoDwordSpaceDescriptor (
+     UINT32                  CurrentByteOffset;
+     UINT32                  i;
+     BOOLEAN                 ResSourceIndex = FALSE;
++    UINT16                  Tmp16;
++    UINT32                  Tmp32;
+ 
+ 
+     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+@@ -616,8 +628,8 @@ RsDoDwordSpaceDescriptor (
+ 
+         case 6: /* Address Granularity */
+ 
+-            Descriptor->Address32.Granularity =
+-                (UINT32) InitializerOp->Asl.Value.Integer;
++	    Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address32.Granularity = AcpiUtReadUint32(&Tmp32);
+             RsCreateDwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Granularity));
+             GranOp = InitializerOp;
+@@ -625,8 +637,8 @@ RsDoDwordSpaceDescriptor (
+ 
+         case 7: /* Min Address */
+ 
+-            Descriptor->Address32.Minimum =
+-                (UINT32) InitializerOp->Asl.Value.Integer;
++	    Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address32.Minimum = AcpiUtReadUint32(&Tmp32);
+             RsCreateDwordField (InitializerOp, ACPI_RESTAG_MINADDR,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Minimum));
+             MinOp = InitializerOp;
+@@ -634,8 +646,8 @@ RsDoDwordSpaceDescriptor (
+ 
+         case 8: /* Max Address */
+ 
+-            Descriptor->Address32.Maximum =
+-                (UINT32) InitializerOp->Asl.Value.Integer;
++	    Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address32.Maximum = AcpiUtReadUint32(&Tmp32);
+             RsCreateDwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Maximum));
+             MaxOp = InitializerOp;
+@@ -643,16 +655,16 @@ RsDoDwordSpaceDescriptor (
+ 
+         case 9: /* Translation Offset */
+ 
+-            Descriptor->Address32.TranslationOffset =
+-                (UINT32) InitializerOp->Asl.Value.Integer;
++	    Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address32.TranslationOffset = AcpiUtReadUint32(&Tmp32);
+             RsCreateDwordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.TranslationOffset));
+             break;
+ 
+         case 10: /* Address Length */
+ 
+-            Descriptor->Address32.AddressLength =
+-                (UINT32) InitializerOp->Asl.Value.Integer;
++	    Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address32.AddressLength = AcpiUtReadUint32(&Tmp32);
+             RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.AddressLength));
+             LengthOp = InitializerOp;
+@@ -723,11 +735,14 @@ RsDoDwordSpaceDescriptor (
+ 
+     /* Validate the Min/Max/Len/Gran values */
+ 
++    Tmp16 = Descriptor->Address32.ResourceLength;
++    Descriptor->Address32.ResourceLength = AcpiUtReadUint16(&Tmp16);
++
+     RsLargeAddressCheck (
+-        (UINT64) Descriptor->Address32.Minimum,
+-        (UINT64) Descriptor->Address32.Maximum,
+-        (UINT64) Descriptor->Address32.AddressLength,
+-        (UINT64) Descriptor->Address32.Granularity,
++        (UINT64) AcpiUtReadUint32(&Descriptor->Address32.Minimum),
++        (UINT64) AcpiUtReadUint32(&Descriptor->Address32.Maximum),
++        (UINT64) AcpiUtReadUint32(&Descriptor->Address32.AddressLength),
++        (UINT64) AcpiUtReadUint32(&Descriptor->Address32.Granularity),
+         Descriptor->Address32.Flags,
+         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
+ 
+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;
++    UINT16                  Tmp16;
+ 
+ 
+     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+@@ -139,7 +140,8 @@ RsDoExtendedIoDescriptor (
+ 
+         case 5: /* Address Granularity */
+ 
+-            Descriptor->ExtAddress64.Granularity = InitializerOp->Asl.Value.Integer;
++            Descriptor->ExtAddress64.Granularity =
++		    AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Granularity));
+             GranOp = InitializerOp;
+@@ -147,7 +149,8 @@ RsDoExtendedIoDescriptor (
+ 
+         case 6: /* Address Min */
+ 
+-            Descriptor->ExtAddress64.Minimum = InitializerOp->Asl.Value.Integer;
++            Descriptor->ExtAddress64.Minimum = 
++	            AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Minimum));
+             MinOp = InitializerOp;
+@@ -155,7 +158,8 @@ RsDoExtendedIoDescriptor (
+ 
+         case 7: /* Address Max */
+ 
+-            Descriptor->ExtAddress64.Maximum = InitializerOp->Asl.Value.Integer;
++            Descriptor->ExtAddress64.Maximum = 
++	            AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Maximum));
+             MaxOp = InitializerOp;
+@@ -163,14 +167,16 @@ RsDoExtendedIoDescriptor (
+ 
+         case 8: /* Translation Offset */
+ 
+-            Descriptor->ExtAddress64.TranslationOffset = InitializerOp->Asl.Value.Integer;
++            Descriptor->ExtAddress64.TranslationOffset = 
++	            AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.TranslationOffset));
+             break;
+ 
+         case 9: /* Address Length */
+ 
+-            Descriptor->ExtAddress64.AddressLength = InitializerOp->Asl.Value.Integer;
++            Descriptor->ExtAddress64.AddressLength = 
++	            AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.AddressLength));
+             LengthOp = InitializerOp;
+@@ -178,7 +184,8 @@ RsDoExtendedIoDescriptor (
+ 
+         case 10: /* Type-Specific Attributes */
+ 
+-            Descriptor->ExtAddress64.TypeSpecific = InitializerOp->Asl.Value.Integer;
++            Descriptor->ExtAddress64.TypeSpecific = 
++	            AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_TYPESPECIFICATTRIBUTES,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.TypeSpecific));
+             break;
+@@ -213,11 +220,14 @@ RsDoExtendedIoDescriptor (
+ 
+     /* Validate the Min/Max/Len/Gran values */
+ 
++    Tmp16 = Descriptor->ExtAddress64.ResourceLength;
++    Descriptor->ExtAddress64.ResourceLength = AcpiUtReadUint16(&Tmp16);
++
+     RsLargeAddressCheck (
+-        Descriptor->ExtAddress64.Minimum,
+-        Descriptor->ExtAddress64.Maximum,
+-        Descriptor->ExtAddress64.AddressLength,
+-        Descriptor->ExtAddress64.Granularity,
++        AcpiUtReadUint64(&Descriptor->ExtAddress64.Minimum),
++        AcpiUtReadUint64(&Descriptor->ExtAddress64.Maximum),
++        AcpiUtReadUint64(&Descriptor->ExtAddress64.AddressLength),
++        AcpiUtReadUint64(&Descriptor->ExtAddress64.Granularity),
+         Descriptor->ExtAddress64.Flags,
+         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
+ 
+@@ -253,6 +263,7 @@ RsDoExtendedMemoryDescriptor (
+     UINT16                  StringLength = 0;
+     UINT32                  CurrentByteOffset;
+     UINT32                  i;
++    UINT16                  Tmp16;
+ 
+ 
+     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+@@ -319,7 +330,8 @@ RsDoExtendedMemoryDescriptor (
+ 
+         case 6: /* Address Granularity */
+ 
+-            Descriptor->ExtAddress64.Granularity = InitializerOp->Asl.Value.Integer;
++            Descriptor->ExtAddress64.Granularity = 
++		    AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Granularity));
+             GranOp = InitializerOp;
+@@ -327,7 +339,8 @@ RsDoExtendedMemoryDescriptor (
+ 
+         case 7: /* Min Address */
+ 
+-            Descriptor->ExtAddress64.Minimum = InitializerOp->Asl.Value.Integer;
++            Descriptor->ExtAddress64.Minimum = 
++	            AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Minimum));
+             MinOp = InitializerOp;
+@@ -335,7 +348,8 @@ RsDoExtendedMemoryDescriptor (
+ 
+         case 8: /* Max Address */
+ 
+-            Descriptor->ExtAddress64.Maximum = InitializerOp->Asl.Value.Integer;
++            Descriptor->ExtAddress64.Maximum = 
++	            AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Maximum));
+             MaxOp = InitializerOp;
+@@ -343,14 +357,16 @@ RsDoExtendedMemoryDescriptor (
+ 
+         case 9: /* Translation Offset */
+ 
+-            Descriptor->ExtAddress64.TranslationOffset = InitializerOp->Asl.Value.Integer;
++            Descriptor->ExtAddress64.TranslationOffset = 
++	            AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.TranslationOffset));
+             break;
+ 
+         case 10: /* Address Length */
+ 
+-            Descriptor->ExtAddress64.AddressLength = InitializerOp->Asl.Value.Integer;
++            Descriptor->ExtAddress64.AddressLength = 
++	            AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.AddressLength));
+             LengthOp = InitializerOp;
+@@ -358,7 +374,8 @@ RsDoExtendedMemoryDescriptor (
+ 
+         case 11: /* Type-Specific Attributes */
+ 
+-            Descriptor->ExtAddress64.TypeSpecific = InitializerOp->Asl.Value.Integer;
++            Descriptor->ExtAddress64.TypeSpecific = 
++	            AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_TYPESPECIFICATTRIBUTES,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.TypeSpecific));
+             break;
+@@ -394,11 +411,14 @@ RsDoExtendedMemoryDescriptor (
+ 
+     /* Validate the Min/Max/Len/Gran values */
+ 
++    Tmp16 = Descriptor->ExtAddress64.ResourceLength;
++    Descriptor->ExtAddress64.ResourceLength = AcpiUtReadUint16(&Tmp16);
++
+     RsLargeAddressCheck (
+-        Descriptor->ExtAddress64.Minimum,
+-        Descriptor->ExtAddress64.Maximum,
+-        Descriptor->ExtAddress64.AddressLength,
+-        Descriptor->ExtAddress64.Granularity,
++        AcpiUtReadUint64(&Descriptor->ExtAddress64.Minimum),
++        AcpiUtReadUint64(&Descriptor->ExtAddress64.Maximum),
++        AcpiUtReadUint64(&Descriptor->ExtAddress64.AddressLength),
++        AcpiUtReadUint64(&Descriptor->ExtAddress64.Granularity),
+         Descriptor->ExtAddress64.Flags,
+         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
+ 
+@@ -434,6 +454,7 @@ RsDoExtendedSpaceDescriptor (
+     UINT16                  StringLength = 0;
+     UINT32                  CurrentByteOffset;
+     UINT32                  i;
++    UINT16                  Tmp16;
+ 
+ 
+     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+@@ -497,7 +518,8 @@ RsDoExtendedSpaceDescriptor (
+ 
+         case 6: /* Address Granularity */
+ 
+-            Descriptor->ExtAddress64.Granularity = InitializerOp->Asl.Value.Integer;
++            Descriptor->ExtAddress64.Granularity = 
++		    AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Granularity));
+             GranOp = InitializerOp;
+@@ -505,7 +527,8 @@ RsDoExtendedSpaceDescriptor (
+ 
+         case 7: /* Min Address */
+ 
+-            Descriptor->ExtAddress64.Minimum = InitializerOp->Asl.Value.Integer;
++            Descriptor->ExtAddress64.Minimum = 
++	            AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Minimum));
+             MinOp = InitializerOp;
+@@ -513,7 +536,8 @@ RsDoExtendedSpaceDescriptor (
+ 
+         case 8: /* Max Address */
+ 
+-            Descriptor->ExtAddress64.Maximum = InitializerOp->Asl.Value.Integer;
++            Descriptor->ExtAddress64.Maximum = 
++	            AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Maximum));
+             MaxOp = InitializerOp;
+@@ -521,14 +545,16 @@ RsDoExtendedSpaceDescriptor (
+ 
+         case 9: /* Translation Offset */
+ 
+-            Descriptor->ExtAddress64.TranslationOffset = InitializerOp->Asl.Value.Integer;
++            Descriptor->ExtAddress64.TranslationOffset = 
++	            AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.TranslationOffset));
+             break;
+ 
+         case 10: /* Address Length */
+ 
+-            Descriptor->ExtAddress64.AddressLength = InitializerOp->Asl.Value.Integer;
++            Descriptor->ExtAddress64.AddressLength = 
++	            AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.AddressLength));
+             LengthOp = InitializerOp;
+@@ -536,7 +562,8 @@ RsDoExtendedSpaceDescriptor (
+ 
+         case 11: /* Type-Specific Attributes */
+ 
+-            Descriptor->ExtAddress64.TypeSpecific = InitializerOp->Asl.Value.Integer;
++            Descriptor->ExtAddress64.TypeSpecific = 
++	            AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_TYPESPECIFICATTRIBUTES,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.TypeSpecific));
+             break;
+@@ -557,11 +584,14 @@ RsDoExtendedSpaceDescriptor (
+ 
+     /* Validate the Min/Max/Len/Gran values */
+ 
++    Tmp16 = Descriptor->ExtAddress64.ResourceLength;
++    Descriptor->ExtAddress64.ResourceLength = AcpiUtReadUint16(&Tmp16);
++
+     RsLargeAddressCheck (
+-        Descriptor->ExtAddress64.Minimum,
+-        Descriptor->ExtAddress64.Maximum,
+-        Descriptor->ExtAddress64.AddressLength,
+-        Descriptor->ExtAddress64.Granularity,
++        AcpiUtReadUint64(&Descriptor->ExtAddress64.Minimum),
++        AcpiUtReadUint64(&Descriptor->ExtAddress64.Maximum),
++        AcpiUtReadUint64(&Descriptor->ExtAddress64.AddressLength),
++        AcpiUtReadUint64(&Descriptor->ExtAddress64.Granularity),
+         Descriptor->ExtAddress64.Flags,
+         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
+ 
+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;
++    UINT16                  Tmp16;
+ 
+ 
+     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+@@ -147,7 +148,8 @@ RsDoQwordIoDescriptor (
+ 
+         case 5: /* Address Granularity */
+ 
+-            Descriptor->Address64.Granularity = InitializerOp->Asl.Value.Integer;
++            Descriptor->Address64.Granularity = 
++		    AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Granularity));
+             GranOp = InitializerOp;
+@@ -155,7 +157,8 @@ RsDoQwordIoDescriptor (
+ 
+         case 6: /* Address Min */
+ 
+-            Descriptor->Address64.Minimum = InitializerOp->Asl.Value.Integer;
++            Descriptor->Address64.Minimum = 
++	            AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Minimum));
+             MinOp = InitializerOp;
+@@ -163,7 +166,8 @@ RsDoQwordIoDescriptor (
+ 
+         case 7: /* Address Max */
+ 
+-            Descriptor->Address64.Maximum = InitializerOp->Asl.Value.Integer;
++            Descriptor->Address64.Maximum = 
++	            AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Maximum));
+             MaxOp = InitializerOp;
+@@ -171,14 +175,16 @@ RsDoQwordIoDescriptor (
+ 
+         case 8: /* Translation Offset */
+ 
+-            Descriptor->Address64.TranslationOffset = InitializerOp->Asl.Value.Integer;
++            Descriptor->Address64.TranslationOffset = 
++	            AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
+             RsCreateByteField (InitializerOp, ACPI_RESTAG_TRANSLATION,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.TranslationOffset));
+             break;
+ 
+         case 9: /* Address Length */
+ 
+-            Descriptor->Address64.AddressLength = InitializerOp->Asl.Value.Integer;
++            Descriptor->Address64.AddressLength = 
++	            AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.AddressLength));
+             LengthOp = InitializerOp;
+@@ -262,11 +268,14 @@ RsDoQwordIoDescriptor (
+ 
+     /* Validate the Min/Max/Len/Gran values */
+ 
++    Tmp16 = Descriptor->Address64.ResourceLength;
++    Descriptor->Address64.ResourceLength = AcpiUtReadUint16(&Tmp16);
++
+     RsLargeAddressCheck (
+-        Descriptor->Address64.Minimum,
+-        Descriptor->Address64.Maximum,
+-        Descriptor->Address64.AddressLength,
+-        Descriptor->Address64.Granularity,
++        AcpiUtReadUint64(&Descriptor->Address64.Minimum),
++        AcpiUtReadUint64(&Descriptor->Address64.Maximum),
++        AcpiUtReadUint64(&Descriptor->Address64.AddressLength),
++        AcpiUtReadUint64(&Descriptor->Address64.Granularity),
+         Descriptor->Address64.Flags,
+         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
+ 
+@@ -305,6 +314,7 @@ RsDoQwordMemoryDescriptor (
+     UINT32                  CurrentByteOffset;
+     UINT32                  i;
+     BOOLEAN                 ResSourceIndex = FALSE;
++    UINT16                  Tmp16;
+ 
+ 
+     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+@@ -375,7 +385,8 @@ RsDoQwordMemoryDescriptor (
+ 
+         case 6: /* Address Granularity */
+ 
+-            Descriptor->Address64.Granularity = InitializerOp->Asl.Value.Integer;
++            Descriptor->Address64.Granularity = 
++		    AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Granularity));
+             GranOp = InitializerOp;
+@@ -383,7 +394,8 @@ RsDoQwordMemoryDescriptor (
+ 
+         case 7: /* Min Address */
+ 
+-            Descriptor->Address64.Minimum = InitializerOp->Asl.Value.Integer;
++            Descriptor->Address64.Minimum = 
++	            AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Minimum));
+             MinOp = InitializerOp;
+@@ -391,7 +403,8 @@ RsDoQwordMemoryDescriptor (
+ 
+         case 8: /* Max Address */
+ 
+-            Descriptor->Address64.Maximum = InitializerOp->Asl.Value.Integer;
++            Descriptor->Address64.Maximum = 
++	            AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Maximum));
+             MaxOp = InitializerOp;
+@@ -399,14 +412,16 @@ RsDoQwordMemoryDescriptor (
+ 
+         case 9: /* Translation Offset */
+ 
+-            Descriptor->Address64.TranslationOffset = InitializerOp->Asl.Value.Integer;
++            Descriptor->Address64.TranslationOffset = 
++	            AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.TranslationOffset));
+             break;
+ 
+         case 10: /* Address Length */
+ 
+-            Descriptor->Address64.AddressLength = InitializerOp->Asl.Value.Integer;
++            Descriptor->Address64.AddressLength = 
++	            AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.AddressLength));
+             LengthOp = InitializerOp;
+@@ -491,11 +506,14 @@ RsDoQwordMemoryDescriptor (
+ 
+     /* Validate the Min/Max/Len/Gran values */
+ 
++    Tmp16 = Descriptor->Address64.ResourceLength;
++    Descriptor->Address64.ResourceLength = AcpiUtReadUint16(&Tmp16);
++
+     RsLargeAddressCheck (
+-        Descriptor->Address64.Minimum,
+-        Descriptor->Address64.Maximum,
+-        Descriptor->Address64.AddressLength,
+-        Descriptor->Address64.Granularity,
++        AcpiUtReadUint64(&Descriptor->Address64.Minimum),
++        AcpiUtReadUint64(&Descriptor->Address64.Maximum),
++        AcpiUtReadUint64(&Descriptor->Address64.AddressLength),
++        AcpiUtReadUint64(&Descriptor->Address64.Granularity),
+         Descriptor->Address64.Flags,
+         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
+ 
+@@ -534,6 +552,7 @@ RsDoQwordSpaceDescriptor (
+     UINT32                  CurrentByteOffset;
+     UINT32                  i;
+     BOOLEAN                 ResSourceIndex = FALSE;
++    UINT16                  Tmp16;
+ 
+ 
+     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+@@ -601,7 +620,8 @@ RsDoQwordSpaceDescriptor (
+ 
+         case 6: /* Address Granularity */
+ 
+-            Descriptor->Address64.Granularity = InitializerOp->Asl.Value.Integer;
++            Descriptor->Address64.Granularity = 
++		    AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Granularity));
+             GranOp = InitializerOp;
+@@ -609,7 +629,8 @@ RsDoQwordSpaceDescriptor (
+ 
+         case 7: /* Min Address */
+ 
+-            Descriptor->Address64.Minimum = InitializerOp->Asl.Value.Integer;
++            Descriptor->Address64.Minimum = 
++		    AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Minimum));
+             MinOp = InitializerOp;
+@@ -617,7 +638,8 @@ RsDoQwordSpaceDescriptor (
+ 
+         case 8: /* Max Address */
+ 
+-            Descriptor->Address64.Maximum = InitializerOp->Asl.Value.Integer;
++            Descriptor->Address64.Maximum = 
++		    AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Maximum));
+             MaxOp = InitializerOp;
+@@ -625,14 +647,16 @@ RsDoQwordSpaceDescriptor (
+ 
+         case 9: /* Translation Offset */
+ 
+-            Descriptor->Address64.TranslationOffset = InitializerOp->Asl.Value.Integer;
++            Descriptor->Address64.TranslationOffset = 
++		    AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.TranslationOffset));
+             break;
+ 
+         case 10: /* Address Length */
+ 
+-            Descriptor->Address64.AddressLength = InitializerOp->Asl.Value.Integer;
++            Descriptor->Address64.AddressLength = 
++		    AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.AddressLength));
+             LengthOp = InitializerOp;
+@@ -702,11 +726,14 @@ RsDoQwordSpaceDescriptor (
+ 
+     /* Validate the Min/Max/Len/Gran values */
+ 
++    Tmp16 = Descriptor->Address64.ResourceLength;
++    Descriptor->Address64.ResourceLength = AcpiUtReadUint16(&Tmp16);
++
+     RsLargeAddressCheck (
+-        Descriptor->Address64.Minimum,
+-        Descriptor->Address64.Maximum,
+-        Descriptor->Address64.AddressLength,
+-        Descriptor->Address64.Granularity,
++        AcpiUtReadUint64(&Descriptor->Address64.Minimum),
++        AcpiUtReadUint64(&Descriptor->Address64.Maximum),
++        AcpiUtReadUint64(&Descriptor->Address64.AddressLength),
++        AcpiUtReadUint64(&Descriptor->Address64.Granularity),
+         Descriptor->Address64.Flags,
+         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
+ 
+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;
++    UINT16                  Tmp16;
+ 
+ 
+     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+@@ -485,7 +486,8 @@ RsDoGpioIntDescriptor (
+              *  (implies resource source must immediately follow the pin list.)
+              *  Name: _PIN
+              */
+-            *InterruptList = (UINT16) InitializerOp->Asl.Value.Integer;
++            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            *InterruptList = AcpiUtReadUint16(&Tmp16);
+             InterruptList++;
+             PinCount++;
+ 
+@@ -518,6 +520,27 @@ RsDoGpioIntDescriptor (
+ 
+     MpSaveGpioInfo (Info->MappingOp, Descriptor,
+         PinCount, PinList, ResourceSource);
++
++    /* correct endian-ness issues */
++    Tmp16 = Descriptor->Gpio.ResourceLength;
++    Descriptor->Gpio.ResourceLength = AcpiUtReadUint16(&Tmp16);
++    Tmp16 = Descriptor->Gpio.Flags;
++    Descriptor->Gpio.Flags = AcpiUtReadUint16(&Tmp16);
++    Tmp16 = Descriptor->Gpio.IntFlags;
++    Descriptor->Gpio.IntFlags = AcpiUtReadUint16(&Tmp16);
++    Tmp16 = Descriptor->Gpio.DriveStrength;
++    Descriptor->Gpio.DriveStrength = AcpiUtReadUint16(&Tmp16);
++    Tmp16 = Descriptor->Gpio.DebounceTimeout;
++    Descriptor->Gpio.DebounceTimeout = AcpiUtReadUint16(&Tmp16);
++    Tmp16 = Descriptor->Gpio.PinTableOffset;
++    Descriptor->Gpio.PinTableOffset = AcpiUtReadUint16(&Tmp16);
++    Tmp16 = Descriptor->Gpio.ResSourceOffset;
++    Descriptor->Gpio.ResSourceOffset = AcpiUtReadUint16(&Tmp16);
++    Tmp16 = Descriptor->Gpio.VendorOffset;
++    Descriptor->Gpio.VendorOffset = AcpiUtReadUint16(&Tmp16);
++    Tmp16 = Descriptor->Gpio.VendorLength;
++    Descriptor->Gpio.VendorLength = AcpiUtReadUint16(&Tmp16);
++
+     return (Rnode);
+ }
+ 
+@@ -552,6 +575,7 @@ RsDoGpioIoDescriptor (
+     UINT32                  CurrentByteOffset;
+     UINT32                  PinCount = 0;
+     UINT32                  i;
++    UINT16                  Tmp16;
+ 
+ 
+     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+@@ -691,7 +715,8 @@ RsDoGpioIoDescriptor (
+              *  (implies resource source must immediately follow the pin list.)
+              *  Name: _PIN
+              */
+-            *InterruptList = (UINT16) InitializerOp->Asl.Value.Integer;
++            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            *InterruptList = AcpiUtReadUint16(&Tmp16);
+             InterruptList++;
+             PinCount++;
+ 
+@@ -724,6 +749,27 @@ RsDoGpioIoDescriptor (
+ 
+     MpSaveGpioInfo (Info->MappingOp, Descriptor,
+         PinCount, PinList, ResourceSource);
++
++    /* correct endian-ness issues */
++    Tmp16 = Descriptor->Gpio.ResourceLength;
++    Descriptor->Gpio.ResourceLength = AcpiUtReadUint16(&Tmp16);
++    Tmp16 = Descriptor->Gpio.Flags;
++    Descriptor->Gpio.Flags = AcpiUtReadUint16(&Tmp16);
++    Tmp16 = Descriptor->Gpio.IntFlags;
++    Descriptor->Gpio.IntFlags = AcpiUtReadUint16(&Tmp16);
++    Tmp16 = Descriptor->Gpio.DriveStrength;
++    Descriptor->Gpio.DriveStrength = AcpiUtReadUint16(&Tmp16);
++    Tmp16 = Descriptor->Gpio.DebounceTimeout;
++    Descriptor->Gpio.DebounceTimeout = AcpiUtReadUint16(&Tmp16);
++    Tmp16 = Descriptor->Gpio.PinTableOffset;
++    Descriptor->Gpio.PinTableOffset = AcpiUtReadUint16(&Tmp16);
++    Tmp16 = Descriptor->Gpio.ResSourceOffset;
++    Descriptor->Gpio.ResSourceOffset = AcpiUtReadUint16(&Tmp16);
++    Tmp16 = Descriptor->Gpio.VendorOffset;
++    Descriptor->Gpio.VendorOffset = AcpiUtReadUint16(&Tmp16);
++    Tmp16 = Descriptor->Gpio.VendorLength;
++    Descriptor->Gpio.VendorLength = AcpiUtReadUint16(&Tmp16);
++
+     return (Rnode);
+ }
+ 
+@@ -754,6 +800,8 @@ RsDoI2cSerialBusDescriptor (
+     UINT16                  DescriptorSize;
+     UINT32                  CurrentByteOffset;
+     UINT32                  i;
++    UINT16                  Tmp16;
++    UINT32                  Tmp32;
+ 
+ 
+     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+@@ -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;
+-    Descriptor->I2cSerialBus.TypeDataLength = AML_RESOURCE_I2C_MIN_DATA_LEN + VendorLength;
++    Tmp16 = AML_RESOURCE_I2C_MIN_DATA_LEN + VendorLength;
++    Descriptor->I2cSerialBus.TypeDataLength = AcpiUtReadUint16(&Tmp16);
+ 
+     if (Info->DescriptorTypeOp->Asl.ParseOpcode == PARSEOP_I2C_SERIALBUS_V2)
+     {
+@@ -801,7 +850,8 @@ RsDoI2cSerialBusDescriptor (
+         {
+         case 0: /* Slave Address [WORD] (_ADR) */
+ 
+-            Descriptor->I2cSerialBus.SlaveAddress = (UINT16) InitializerOp->Asl.Value.Integer;
++            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            Descriptor->I2cSerialBus.SlaveAddress = AcpiUtReadUint16(&Tmp16);
+             RsCreateWordField (InitializerOp, ACPI_RESTAG_ADDRESS,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (I2cSerialBus.SlaveAddress));
+             break;
+@@ -815,7 +865,8 @@ RsDoI2cSerialBusDescriptor (
+ 
+         case 2: /* Connection Speed [DWORD] (_SPE) */
+ 
+-            Descriptor->I2cSerialBus.ConnectionSpeed = (UINT32) InitializerOp->Asl.Value.Integer;
++	    Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
++            Descriptor->I2cSerialBus.ConnectionSpeed = AcpiUtReadUint32(&Tmp32);
+             RsCreateDwordField (InitializerOp, ACPI_RESTAG_SPEED,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (I2cSerialBus.ConnectionSpeed));
+             break;
+@@ -913,6 +964,8 @@ RsDoSpiSerialBusDescriptor (
+     UINT16                  DescriptorSize;
+     UINT32                  CurrentByteOffset;
+     UINT32                  i;
++    UINT16                  Tmp16;
++    UINT32                  Tmp32;
+ 
+ 
+     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+@@ -935,12 +988,13 @@ RsDoSpiSerialBusDescriptor (
+         sizeof (AML_RESOURCE_LARGE_HEADER));
+ 
+     Descriptor = Rnode->Buffer;
+-    Descriptor->SpiSerialBus.ResourceLength = DescriptorSize;
++    Descriptor->SpiSerialBus.ResourceLength = AcpiUtReadUint16(&DescriptorSize);
+     Descriptor->SpiSerialBus.DescriptorType = ACPI_RESOURCE_NAME_SERIAL_BUS;
+     Descriptor->SpiSerialBus.RevisionId = AML_RESOURCE_SPI_REVISION;
+     Descriptor->SpiSerialBus.TypeRevisionId = AML_RESOURCE_SPI_TYPE_REVISION;
+     Descriptor->SpiSerialBus.Type = AML_RESOURCE_SPI_SERIALBUSTYPE;
+-    Descriptor->SpiSerialBus.TypeDataLength = AML_RESOURCE_SPI_MIN_DATA_LEN + VendorLength;
++    Tmp16 = AML_RESOURCE_SPI_MIN_DATA_LEN + VendorLength;
++    Descriptor->SpiSerialBus.TypeDataLength = AcpiUtReadUint16(&Tmp16);
+ 
+     if (Info->DescriptorTypeOp->Asl.ParseOpcode == PARSEOP_SPI_SERIALBUS_V2)
+     {
+@@ -961,7 +1015,8 @@ RsDoSpiSerialBusDescriptor (
+         {
+         case 0: /* Device Selection [WORD] (_ADR) */
+ 
+-            Descriptor->SpiSerialBus.DeviceSelection = (UINT16) InitializerOp->Asl.Value.Integer;
++            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            Descriptor->SpiSerialBus.DeviceSelection = AcpiUtReadUint16(&Tmp16);
+             RsCreateWordField (InitializerOp, ACPI_RESTAG_ADDRESS,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (SpiSerialBus.DeviceSelection));
+             break;
+@@ -996,7 +1051,8 @@ RsDoSpiSerialBusDescriptor (
+ 
+         case 5: /* Connection Speed [DWORD] (_SPE) */
+ 
+-            Descriptor->SpiSerialBus.ConnectionSpeed = (UINT32) InitializerOp->Asl.Value.Integer;
++	    Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
++            Descriptor->SpiSerialBus.ConnectionSpeed = AcpiUtReadUint32(&Tmp32);
+             RsCreateDwordField (InitializerOp, ACPI_RESTAG_SPEED,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (SpiSerialBus.ConnectionSpeed));
+             break;
+@@ -1101,6 +1157,8 @@ RsDoUartSerialBusDescriptor (
+     UINT16                  DescriptorSize;
+     UINT32                  CurrentByteOffset;
+     UINT32                  i;
++    UINT16                  Tmp16;
++    UINT32                  Tmp32;
+ 
+ 
+     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+@@ -1123,12 +1181,13 @@ RsDoUartSerialBusDescriptor (
+         sizeof (AML_RESOURCE_LARGE_HEADER));
+ 
+     Descriptor = Rnode->Buffer;
+-    Descriptor->UartSerialBus.ResourceLength = DescriptorSize;
++    Descriptor->UartSerialBus.ResourceLength = AcpiUtReadUint16(&DescriptorSize);
+     Descriptor->UartSerialBus.DescriptorType = ACPI_RESOURCE_NAME_SERIAL_BUS;
+     Descriptor->UartSerialBus.RevisionId = AML_RESOURCE_UART_REVISION;
+     Descriptor->UartSerialBus.TypeRevisionId = AML_RESOURCE_UART_TYPE_REVISION;
+     Descriptor->UartSerialBus.Type = AML_RESOURCE_UART_SERIALBUSTYPE;
+-    Descriptor->UartSerialBus.TypeDataLength = AML_RESOURCE_UART_MIN_DATA_LEN + VendorLength;
++    Tmp16 = AML_RESOURCE_UART_MIN_DATA_LEN + VendorLength;
++    Descriptor->UartSerialBus.TypeDataLength = AcpiUtReadUint16(&Tmp16);
+ 
+     if (Info->DescriptorTypeOp->Asl.ParseOpcode == PARSEOP_UART_SERIALBUS_V2)
+     {
+@@ -1148,7 +1207,8 @@ RsDoUartSerialBusDescriptor (
+         {
+         case 0: /* Connection Speed (Baud Rate) [DWORD] (_SPE) */
+ 
+-            Descriptor->UartSerialBus.DefaultBaudRate = (UINT32) InitializerOp->Asl.Value.Integer;
++	    Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
++            Descriptor->UartSerialBus.DefaultBaudRate = AcpiUtReadUint32(&Tmp32);
+             RsCreateDwordField (InitializerOp, ACPI_RESTAG_SPEED,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.DefaultBaudRate));
+             break;
+@@ -1197,14 +1257,16 @@ RsDoUartSerialBusDescriptor (
+ 
+         case 7: /* Rx Buffer Size [WORD] (_RXL) */
+ 
+-            Descriptor->UartSerialBus.RxFifoSize = (UINT16) InitializerOp->Asl.Value.Integer;
++	    Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            Descriptor->UartSerialBus.RxFifoSize = AcpiUtReadUint16(&Tmp16);
+             RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH_RX,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.RxFifoSize));
+             break;
+ 
+         case 8: /* Tx Buffer Size [WORD] (_TXL) */
+ 
+-            Descriptor->UartSerialBus.TxFifoSize = (UINT16) InitializerOp->Asl.Value.Integer;
++	    Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            Descriptor->UartSerialBus.TxFifoSize = AcpiUtReadUint16(&Tmp16);
+             RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH_TX,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TxFifoSize));
+             break;
+@@ -1308,6 +1370,7 @@ RsDoPinFunctionDescriptor (
+     UINT32                  CurrentByteOffset;
+     UINT32                  PinCount = 0;
+     UINT32                  i;
++    UINT16                  Tmp16;
+ 
+     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+     CurrentByteOffset = Info->CurrentByteOffset;
+@@ -1331,7 +1394,7 @@ RsDoPinFunctionDescriptor (
+         sizeof (AML_RESOURCE_LARGE_HEADER));
+ 
+     Descriptor = Rnode->Buffer;
+-    Descriptor->PinFunction.ResourceLength = DescriptorSize;
++    Descriptor->PinFunction.ResourceLength = AcpiUtReadUint16(&DescriptorSize);
+     Descriptor->PinFunction.DescriptorType = ACPI_RESOURCE_NAME_PIN_FUNCTION;
+     Descriptor->PinFunction.RevisionId = AML_RESOURCE_PIN_FUNCTION_REVISION;
+ 
+@@ -1371,7 +1434,8 @@ RsDoPinFunctionDescriptor (
+ 
+         case 2: /* Function Number [WORD] (_FUN) */
+ 
+-            Descriptor->PinFunction.FunctionNumber = (UINT16) InitializerOp->Asl.Value.Integer;
++            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            Descriptor->PinFunction.FunctionNumber = AcpiUtReadUint16(&Tmp16);
+             RsCreateDwordField (InitializerOp, ACPI_RESTAG_FUNCTION,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (PinFunction.FunctionNumber));
+             break;
+@@ -1419,6 +1483,12 @@ RsDoPinFunctionDescriptor (
+             {
+                 Descriptor->PinFunction.VendorLength = VendorLength;
+             }
++            Tmp16 = (UINT16) ACPI_PTR_DIFF (VendorData, Descriptor);
++            Descriptor->PinFunction.VendorOffset = AcpiUtReadUint16(&Tmp16);
++            
++            Tmp16 = Descriptor->PinFunction.VendorLength;
++            Descriptor->PinFunction.VendorLength = AcpiUtReadUint16(&Tmp16);
++
+             break;
+ 
+         default:
+@@ -1430,7 +1500,8 @@ RsDoPinFunctionDescriptor (
+              *  (implies resource source must immediately follow the pin list.)
+              *  Name: _PIN
+              */
+-            *PinList = (UINT16) InitializerOp->Asl.Value.Integer;
++            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            *PinList = AcpiUtReadUint16(&Tmp16);
+             PinList++;
+             PinCount++;
+ 
+@@ -1461,6 +1532,13 @@ RsDoPinFunctionDescriptor (
+         InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
+     }
+ 
++    /* correct the endian-ness of the values */
++    Tmp16 = Descriptor->PinFunction.PinTableOffset;
++    Descriptor->PinFunction.PinTableOffset = AcpiUtReadUint16(&Tmp16);
++
++    Tmp16 = Descriptor->PinFunction.ResSourceOffset;
++    Descriptor->PinFunction.ResSourceOffset = AcpiUtReadUint16(&Tmp16);
++
+     return (Rnode);
+ }
+ 
+@@ -1494,6 +1572,8 @@ RsDoPinConfigDescriptor (
+     UINT32                  CurrentByteOffset;
+     UINT32                  PinCount = 0;
+     UINT32                  i;
++    UINT16                  Tmp16;
++    UINT32                  Tmp32;
+ 
+     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+     CurrentByteOffset = Info->CurrentByteOffset;
+@@ -1517,7 +1597,7 @@ RsDoPinConfigDescriptor (
+         sizeof (AML_RESOURCE_LARGE_HEADER));
+ 
+     Descriptor = Rnode->Buffer;
+-    Descriptor->PinConfig.ResourceLength = DescriptorSize;
++    Descriptor->PinConfig.ResourceLength = AcpiUtReadUint16(&DescriptorSize);
+     Descriptor->PinConfig.DescriptorType = ACPI_RESOURCE_NAME_PIN_CONFIG;
+     Descriptor->PinConfig.RevisionId = AML_RESOURCE_PIN_CONFIG_REVISION;
+ 
+@@ -1571,7 +1651,8 @@ RsDoPinConfigDescriptor (
+ 
+         case 2: /* Pin Config Value [DWORD] (_VAL) */
+ 
+-            Descriptor->PinConfig.PinConfigValue = (UINT32) InitializerOp->Asl.Value.Integer;
++            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
++            Descriptor->PinConfig.PinConfigValue = AcpiUtReadUint32(&Tmp32);
+             RsCreateDwordField (InitializerOp, ACPI_RESTAG_PINCONFIG_VALUE,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (PinConfig.PinConfigValue));
+             break;
+@@ -1630,7 +1711,8 @@ RsDoPinConfigDescriptor (
+              *  (implies resource source must immediately follow the pin list.)
+              *  Name: _PIN
+              */
+-            *PinList = (UINT16) InitializerOp->Asl.Value.Integer;
++            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            *PinList = AcpiUtReadUint16(&Tmp16);
+             PinList++;
+             PinCount++;
+ 
+@@ -1661,6 +1743,16 @@ RsDoPinConfigDescriptor (
+         InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
+     }
+ 
++    /* correct the endianness if needed */
++    Tmp16 = Descriptor->PinConfig.PinTableOffset;
++    Descriptor->PinConfig.PinTableOffset = AcpiUtReadUint16(&Tmp16);
++    Tmp16 = Descriptor->PinConfig.ResSourceOffset;
++    Descriptor->PinConfig.ResSourceOffset = AcpiUtReadUint16(&Tmp16);
++    Tmp16 = Descriptor->PinConfig.VendorOffset;
++    Descriptor->PinConfig.VendorOffset = AcpiUtReadUint16(&Tmp16);
++    Tmp16 = Descriptor->PinConfig.VendorLength;
++    Descriptor->PinConfig.VendorLength = AcpiUtReadUint16(&Tmp16);
++
+     return (Rnode);
+ }
+ 
+@@ -1694,6 +1786,7 @@ RsDoPinGroupDescriptor (
+     UINT32                  CurrentByteOffset;
+     UINT32                  PinCount = 0;
+     UINT32                  i;
++    UINT16                  Tmp16;
+ 
+     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+     CurrentByteOffset = Info->CurrentByteOffset;
+@@ -1717,7 +1810,7 @@ RsDoPinGroupDescriptor (
+         sizeof (AML_RESOURCE_LARGE_HEADER));
+ 
+     Descriptor = Rnode->Buffer;
+-    Descriptor->PinGroup.ResourceLength = DescriptorSize;
++    Descriptor->PinGroup.ResourceLength = AcpiUtReadUint16(&DescriptorSize);
+     Descriptor->PinGroup.DescriptorType = ACPI_RESOURCE_NAME_PIN_GROUP;
+     Descriptor->PinGroup.RevisionId = AML_RESOURCE_PIN_GROUP_REVISION;
+ 
+@@ -1784,7 +1877,8 @@ RsDoPinGroupDescriptor (
+              *  (implies resource source must immediately follow the pin list.)
+              *  Name: _PIN
+              */
+-            *PinList = (UINT16) InitializerOp->Asl.Value.Integer;
++	    Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            *PinList = AcpiUtReadUint16(&Tmp16);
+             PinList++;
+             PinCount++;
+ 
+@@ -1815,6 +1909,16 @@ RsDoPinGroupDescriptor (
+         InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
+     }
+ 
++    /* correct enddianness as needed */
++    Tmp16 = Descriptor->PinGroup.PinTableOffset;
++    Descriptor->PinGroup.PinTableOffset = AcpiUtReadUint16(&Tmp16);
++    Tmp16 = Descriptor->PinGroup.LabelOffset;
++    Descriptor->PinGroup.LabelOffset = AcpiUtReadUint16(&Tmp16);
++    Tmp16 = Descriptor->PinGroup.VendorOffset;
++    Descriptor->PinGroup.VendorOffset = AcpiUtReadUint16(&Tmp16);
++    Tmp16 = Descriptor->PinGroup.VendorLength;
++    Descriptor->PinGroup.VendorLength = AcpiUtReadUint16(&Tmp16);
++
+     return (Rnode);
+ }
+ 
+@@ -1847,6 +1951,7 @@ RsDoPinGroupFunctionDescriptor (
+     UINT16                  DescriptorSize;
+     UINT32                  CurrentByteOffset;
+     UINT32                  i;
++    UINT16                  Tmp16;
+ 
+     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+     CurrentByteOffset = Info->CurrentByteOffset;
+@@ -1870,7 +1975,7 @@ RsDoPinGroupFunctionDescriptor (
+         sizeof (AML_RESOURCE_LARGE_HEADER));
+ 
+     Descriptor = Rnode->Buffer;
+-    Descriptor->PinGroupFunction.ResourceLength = DescriptorSize;
++    Descriptor->PinGroupFunction.ResourceLength = AcpiUtReadUint16(&DescriptorSize);
+     Descriptor->PinGroupFunction.DescriptorType = ACPI_RESOURCE_NAME_PIN_GROUP_FUNCTION;
+     Descriptor->PinGroupFunction.RevisionId = AML_RESOURCE_PIN_GROUP_FUNCTION_REVISION;
+ 
+@@ -1902,7 +2007,8 @@ RsDoPinGroupFunctionDescriptor (
+ 
+         case 1: /* Function Number [WORD] */
+ 
+-            Descriptor->PinGroupFunction.FunctionNumber = (UINT16) InitializerOp->Asl.Value.Integer;
++            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            Descriptor->PinGroupFunction.FunctionNumber = AcpiUtReadUint16(&Tmp16);
+             RsCreateDwordField (InitializerOp, ACPI_RESTAG_FUNCTION,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (PinGroupFunction.FunctionNumber));
+             break;
+@@ -1961,6 +2067,16 @@ RsDoPinGroupFunctionDescriptor (
+         InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
+     }
+ 
++    /* correct enddianness as needed */
++    Tmp16 = Descriptor->PinGroupFunction.ResSourceOffset;
++    Descriptor->PinGroupFunction.ResSourceOffset = AcpiUtReadUint16(&Tmp16);
++    Tmp16 = Descriptor->PinGroupFunction.ResSourceLabelOffset;
++    Descriptor->PinGroupFunction.ResSourceLabelOffset = AcpiUtReadUint16(&Tmp16);
++    Tmp16 = Descriptor->PinGroupFunction.VendorOffset;
++    Descriptor->PinGroupFunction.VendorOffset = AcpiUtReadUint16(&Tmp16);
++    Tmp16 = Descriptor->PinGroupFunction.VendorLength;
++    Descriptor->PinGroupFunction.VendorLength = AcpiUtReadUint16(&Tmp16);
++
+     return (Rnode);
+ }
+ 
+@@ -1993,6 +2109,8 @@ RsDoPinGroupConfigDescriptor (
+     UINT16                  DescriptorSize;
+     UINT32                  CurrentByteOffset;
+     UINT32                  i;
++    UINT16                  Tmp16;
++    UINT32                  Tmp32;
+ 
+     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+     CurrentByteOffset = Info->CurrentByteOffset;
+@@ -2016,7 +2134,7 @@ RsDoPinGroupConfigDescriptor (
+         sizeof (AML_RESOURCE_LARGE_HEADER));
+ 
+     Descriptor = Rnode->Buffer;
+-    Descriptor->PinGroupConfig.ResourceLength = DescriptorSize;
++    Descriptor->PinGroupConfig.ResourceLength = AcpiUtReadUint16(&DescriptorSize);
+     Descriptor->PinGroupConfig.DescriptorType = ACPI_RESOURCE_NAME_PIN_GROUP_CONFIG;
+     Descriptor->PinGroupConfig.RevisionId = AML_RESOURCE_PIN_GROUP_CONFIG_REVISION;
+ 
+@@ -2069,7 +2187,8 @@ RsDoPinGroupConfigDescriptor (
+ 
+         case 2: /* Pin Config Value [DWORD] (_VAL) */
+ 
+-            Descriptor->PinGroupConfig.PinConfigValue = (UINT32) InitializerOp->Asl.Value.Integer;
++            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
++            Descriptor->PinGroupConfig.PinConfigValue = AcpiUtReadUint32(&Tmp32);
+             RsCreateDwordField (InitializerOp, ACPI_RESTAG_PINCONFIG_VALUE,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (PinGroupConfig.PinConfigValue));
+             break;
+@@ -2130,5 +2249,15 @@ RsDoPinGroupConfigDescriptor (
+         InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
+     }
+ 
++    /* correct enddianness as needed */
++    Tmp16 = Descriptor->PinGroupConfig.ResSourceOffset;
++    Descriptor->PinGroupConfig.ResSourceOffset = AcpiUtReadUint16(&Tmp16);
++    Tmp16 = Descriptor->PinGroupConfig.ResSourceLabelOffset;
++    Descriptor->PinGroupConfig.ResSourceLabelOffset = AcpiUtReadUint16(&Tmp16);
++    Tmp16 = Descriptor->PinGroupConfig.VendorOffset;
++    Descriptor->PinGroupConfig.VendorOffset = AcpiUtReadUint16(&Tmp16);
++    Tmp16 = Descriptor->PinGroupConfig.VendorLength;
++    Descriptor->PinGroupConfig.VendorLength = AcpiUtReadUint16(&Tmp16);
++
+     return (Rnode);
+ }
+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;
++    UINT16                  Tmp16;
+ 
+ 
+     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+@@ -147,7 +148,8 @@ RsDoWordIoDescriptor (
+ 
+         case 5: /* Address Granularity */
+ 
+-            Descriptor->Address16.Granularity = (UINT16) InitializerOp->Asl.Value.Integer;
++	    Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address16.Granularity = AcpiUtReadUint16(&Tmp16);
+             RsCreateWordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Granularity));
+             GranOp = InitializerOp;
+@@ -155,7 +157,8 @@ RsDoWordIoDescriptor (
+ 
+         case 6: /* Address Min */
+ 
+-            Descriptor->Address16.Minimum = (UINT16) InitializerOp->Asl.Value.Integer;
++	    Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address16.Minimum = AcpiUtReadUint16(&Tmp16);
+             RsCreateWordField (InitializerOp, ACPI_RESTAG_MINADDR,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Minimum));
+             MinOp = InitializerOp;
+@@ -163,7 +166,8 @@ RsDoWordIoDescriptor (
+ 
+         case 7: /* Address Max */
+ 
+-            Descriptor->Address16.Maximum = (UINT16) InitializerOp->Asl.Value.Integer;
++	    Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address16.Maximum = AcpiUtReadUint16(&Tmp16);
+             RsCreateWordField (InitializerOp, ACPI_RESTAG_MAXADDR,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Maximum));
+             MaxOp = InitializerOp;
+@@ -171,14 +175,16 @@ RsDoWordIoDescriptor (
+ 
+         case 8: /* Translation Offset */
+ 
+-            Descriptor->Address16.TranslationOffset = (UINT16) InitializerOp->Asl.Value.Integer;
++	    Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address16.TranslationOffset = AcpiUtReadUint16(&Tmp16);
+             RsCreateWordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.TranslationOffset));
+             break;
+ 
+         case 9: /* Address Length */
+ 
+-            Descriptor->Address16.AddressLength = (UINT16) InitializerOp->Asl.Value.Integer;
++	    Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address16.AddressLength = AcpiUtReadUint16(&Tmp16);
+             RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH,
+                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.AddressLength));
+             LengthOp = InitializerOp;
+@@ -263,13 +269,17 @@ RsDoWordIoDescriptor (
+     /* Validate the Min/Max/Len/Gran values */
+ 
+     RsLargeAddressCheck (
+-        (UINT64) Descriptor->Address16.Minimum,
+-        (UINT64) Descriptor->Address16.Maximum,
+-        (UINT64) Descriptor->Address16.AddressLength,
+-        (UINT64) Descriptor->Address16.Granularity,
++        (UINT64) AcpiUtReadUint16(&Descriptor->Address16.Minimum),
++        (UINT64) AcpiUtReadUint16(&Descriptor->Address16.Maximum),
++        (UINT64) AcpiUtReadUint16(&Descriptor->Address16.AddressLength),
++        (UINT64) AcpiUtReadUint16(&Descriptor->Address16.Granularity),
+         Descriptor->Address16.Flags,
+         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
+ 
++    /* correct enddianness */
++    Tmp16 = Descriptor->Address16.ResourceLength;
++    Descriptor->Address16.ResourceLength = AcpiUtReadUint16(&Tmp16);
++
+     Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) +
+         OptionIndex + StringLength;
+     return (Rnode);
+@@ -305,6 +315,7 @@ RsDoWordBusNumberDescriptor (
+     UINT32                  CurrentByteOffset;
+     UINT32                  i;
+     BOOLEAN                 ResSourceIndex = FALSE;
++    UINT16                  Tmp16;
+ 
+ 
+     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+@@ -361,8 +372,8 @@ RsDoWordBusNumberDescriptor (
+ 
+         case 4: /* Address Granularity */
+ 
+-            Descriptor->Address16.Granularity =
+-                (UINT16) InitializerOp->Asl.Value.Integer;
++            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address16.Granularity = AcpiUtReadUint16(&Tmp16);
+             RsCreateWordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Granularity));
+             GranOp = InitializerOp;
+@@ -370,8 +381,8 @@ RsDoWordBusNumberDescriptor (
+ 
+         case 5: /* Min Address */
+ 
+-            Descriptor->Address16.Minimum =
+-                (UINT16) InitializerOp->Asl.Value.Integer;
++            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address16.Minimum = AcpiUtReadUint16(&Tmp16);
+             RsCreateWordField (InitializerOp, ACPI_RESTAG_MINADDR,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Minimum));
+             MinOp = InitializerOp;
+@@ -379,8 +390,8 @@ RsDoWordBusNumberDescriptor (
+ 
+         case 6: /* Max Address */
+ 
+-            Descriptor->Address16.Maximum =
+-                (UINT16) InitializerOp->Asl.Value.Integer;
++            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address16.Maximum = AcpiUtReadUint16(&Tmp16);
+             RsCreateWordField (InitializerOp, ACPI_RESTAG_MAXADDR,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Maximum));
+             MaxOp = InitializerOp;
+@@ -388,16 +399,16 @@ RsDoWordBusNumberDescriptor (
+ 
+         case 7: /* Translation Offset */
+ 
+-            Descriptor->Address16.TranslationOffset =
+-                (UINT16) InitializerOp->Asl.Value.Integer;
++            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address16.TranslationOffset = AcpiUtReadUint16(&Tmp16);
+             RsCreateWordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.TranslationOffset));
+             break;
+ 
+         case 8: /* Address Length */
+ 
+-            Descriptor->Address16.AddressLength =
+-                (UINT16) InitializerOp->Asl.Value.Integer;
++            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address16.AddressLength = AcpiUtReadUint16(&Tmp16);
+             RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH,
+                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.AddressLength));
+             LengthOp = InitializerOp;
+@@ -468,13 +479,17 @@ RsDoWordBusNumberDescriptor (
+     /* Validate the Min/Max/Len/Gran values */
+ 
+     RsLargeAddressCheck (
+-        (UINT64) Descriptor->Address16.Minimum,
+-        (UINT64) Descriptor->Address16.Maximum,
+-        (UINT64) Descriptor->Address16.AddressLength,
+-        (UINT64) Descriptor->Address16.Granularity,
++        (UINT64) AcpiUtReadUint16(&Descriptor->Address16.Minimum),
++        (UINT64) AcpiUtReadUint16(&Descriptor->Address16.Maximum),
++        (UINT64) AcpiUtReadUint16(&Descriptor->Address16.AddressLength),
++        (UINT64) AcpiUtReadUint16(&Descriptor->Address16.Granularity),
+         Descriptor->Address16.Flags,
+         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
+ 
++    /* correct enddianness */
++    Tmp16 = Descriptor->Address16.ResourceLength;
++    Descriptor->Address16.ResourceLength = AcpiUtReadUint16(&Tmp16);
++
+     Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) +
+         OptionIndex + StringLength;
+     return (Rnode);
+@@ -510,6 +525,7 @@ RsDoWordSpaceDescriptor (
+     UINT32                  CurrentByteOffset;
+     UINT32                  i;
+     BOOLEAN                 ResSourceIndex = FALSE;
++    UINT16                  Tmp16;
+ 
+ 
+     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+@@ -577,8 +593,8 @@ RsDoWordSpaceDescriptor (
+ 
+         case 6: /* Address Granularity */
+ 
+-            Descriptor->Address16.Granularity =
+-                (UINT16) InitializerOp->Asl.Value.Integer;
++	    Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address16.Granularity = AcpiUtReadUint16(&Tmp16);
+             RsCreateWordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Granularity));
+             GranOp = InitializerOp;
+@@ -586,8 +602,8 @@ RsDoWordSpaceDescriptor (
+ 
+         case 7: /* Min Address */
+ 
+-            Descriptor->Address16.Minimum =
+-                (UINT16) InitializerOp->Asl.Value.Integer;
++	    Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address16.Minimum = AcpiUtReadUint16(&Tmp16);
+             RsCreateWordField (InitializerOp, ACPI_RESTAG_MINADDR,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Minimum));
+             MinOp = InitializerOp;
+@@ -595,8 +611,8 @@ RsDoWordSpaceDescriptor (
+ 
+         case 8: /* Max Address */
+ 
+-            Descriptor->Address16.Maximum =
+-                (UINT16) InitializerOp->Asl.Value.Integer;
++	    Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address16.Maximum = AcpiUtReadUint16(&Tmp16);
+             RsCreateWordField (InitializerOp, ACPI_RESTAG_MAXADDR,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Maximum));
+             MaxOp = InitializerOp;
+@@ -604,16 +620,16 @@ RsDoWordSpaceDescriptor (
+ 
+         case 9: /* Translation Offset */
+ 
+-            Descriptor->Address16.TranslationOffset =
+-                (UINT16) InitializerOp->Asl.Value.Integer;
++	    Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address16.TranslationOffset = AcpiUtReadUint16(&Tmp16);
+             RsCreateWordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.TranslationOffset));
+             break;
+ 
+         case 10: /* Address Length */
+ 
+-            Descriptor->Address16.AddressLength =
+-                (UINT16) InitializerOp->Asl.Value.Integer;
++	    Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address16.AddressLength = AcpiUtReadUint16(&Tmp16);
+             RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.AddressLength));
+             LengthOp = InitializerOp;
+@@ -684,13 +700,17 @@ RsDoWordSpaceDescriptor (
+     /* Validate the Min/Max/Len/Gran values */
+ 
+     RsLargeAddressCheck (
+-        (UINT64) Descriptor->Address16.Minimum,
+-        (UINT64) Descriptor->Address16.Maximum,
+-        (UINT64) Descriptor->Address16.AddressLength,
+-        (UINT64) Descriptor->Address16.Granularity,
++        (UINT64) AcpiUtReadUint16(&Descriptor->Address16.Minimum),
++        (UINT64) AcpiUtReadUint16(&Descriptor->Address16.Maximum),
++        (UINT64) AcpiUtReadUint16(&Descriptor->Address16.AddressLength),
++        (UINT64) AcpiUtReadUint16(&Descriptor->Address16.Granularity),
+         Descriptor->Address16.Flags,
+         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
+ 
++    /* correct enddianness */
++    Tmp16 = Descriptor->Address16.ResourceLength;
++    Descriptor->Address16.ResourceLength = AcpiUtReadUint16(&Tmp16);
++
+     Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) +
+         OptionIndex + StringLength;
+     return (Rnode);
+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;
+-    ByteCount = (UINT32) Op->Common.Value.Integer;
++    ByteCount = (UINT32) Op->Common.Value.Size;
+ 
+     /*
+      * The byte list belongs to a buffer, and can be produced by either
+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:
+ 
+-        Length = AcpiDmDumpName (Op->Named.Name);
++        Length = AcpiDmDumpName (AcpiUtReadUint32(&Op->Named.Name));
+ 
+         AcpiOsPrintf (",");
+         ASL_CV_PRINT_ONE_COMMENT (Op, AML_NAMECOMMENT, NULL, 0);
+         AcpiOsPrintf ("%*.s  %u", (unsigned) (5 - Length), " ",
+-            (UINT32) Op->Common.Value.Integer);
++            (UINT32) Op->Common.Value.Size);
+ 
+         AcpiDmCommaIfFieldMember (Op);
+ 
+-        Info->BitOffset += (UINT32) Op->Common.Value.Integer;
++        Info->BitOffset += (UINT32) Op->Common.Value.Size;
+         break;
+ 
+     case AML_INT_RESERVEDFIELD_OP:
+ 
+         /* Offset() -- Must account for previous offsets */
+ 
+-        Offset = (UINT32) Op->Common.Value.Integer;
++        Offset = (UINT32) Op->Common.Value.Size;
+         Info->BitOffset += Offset;
+ 
+         if (Info->BitOffset % 8 == 0)
+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);
+     }
+ 
+-    DeclaredBufferLength = NextOp->Common.Value.Size;
++    DeclaredBufferLength = NextOp->Common.Value.Integer;
+ 
+     /* Get the length of the raw initialization byte list */
+ 
+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;
++    UINT16                  Tmp16;
++    UINT32                  Tmp32;
+ 
+ 
+     for (i = 0; i < 4; i++)
+@@ -151,14 +153,16 @@ AcpiDmMemoryFields (
+         {
+         case 16:
+ 
+-            AcpiDmDumpInteger16 (ACPI_CAST_PTR (UINT16, Source)[i],
+-                AcpiDmMemoryNames[i]);
++	    Tmp16 = ACPI_CAST_PTR (UINT16, Source)[i];
++            AcpiDmDumpInteger16 (AcpiUtReadUint16(&Tmp16),
++			         AcpiDmMemoryNames[i]);
+             break;
+ 
+         case 32:
+ 
+-            AcpiDmDumpInteger32 (ACPI_CAST_PTR (UINT32, Source)[i],
+-                AcpiDmMemoryNames[i]);
++	    Tmp32 = ACPI_CAST_PTR (UINT32, Source)[i];
++            AcpiDmDumpInteger32 (AcpiUtReadUint32(&Tmp32),
++			         AcpiDmMemoryNames[i]);
+             break;
+ 
+         default:
+@@ -190,6 +194,9 @@ AcpiDmAddressFields (
+     UINT32                  Level)
+ {
+     UINT32                  i;
++    UINT16                  Tmp16;
++    UINT32                  Tmp32;
++    UINT64                  Tmp64;
+ 
+ 
+     AcpiOsPrintf ("\n");
+@@ -202,20 +209,23 @@ AcpiDmAddressFields (
+         {
+         case 16:
+ 
+-            AcpiDmDumpInteger16 (ACPI_CAST_PTR (UINT16, Source)[i],
+-                AcpiDmAddressNames[i]);
++	    Tmp16 = ACPI_CAST_PTR (UINT16, Source)[i];
++            AcpiDmDumpInteger16 (AcpiUtReadUint16(&Tmp16),
++                		 AcpiDmAddressNames[i]);
+             break;
+ 
+         case 32:
+ 
+-            AcpiDmDumpInteger32 (ACPI_CAST_PTR (UINT32, Source)[i],
+-                AcpiDmAddressNames[i]);
++	    Tmp32 = ACPI_CAST_PTR (UINT32, Source)[i];
++            AcpiDmDumpInteger32 (AcpiUtReadUint32(&Tmp32),
++                		 AcpiDmAddressNames[i]);
+             break;
+ 
+         case 64:
+ 
+-            AcpiDmDumpInteger64 (ACPI_CAST_PTR (UINT64, Source)[i],
+-                AcpiDmAddressNames[i]);
++	    Tmp64 = ACPI_CAST_PTR (UINT64, Source)[i];
++            AcpiDmDumpInteger64 (AcpiUtReadUint64(&Tmp64),
++                		 AcpiDmAddressNames[i]);
+             break;
+ 
+         default:
+@@ -749,7 +759,7 @@ AcpiDmExtendedDescriptor (
+     /* Extra field for this descriptor only */
+ 
+     AcpiDmIndent (Level + 1);
+-    AcpiDmDumpInteger64 (Resource->ExtAddress64.TypeSpecific,
++    AcpiDmDumpInteger64 (AcpiUtReadUint64(&Resource->ExtAddress64.TypeSpecific),
+         "Type-Specific Attributes");
+ 
+     /* Insert a descriptor name */
+@@ -876,11 +886,11 @@ AcpiDmFixedMemory32Descriptor (
+         AcpiGbl_RwDecode [ACPI_GET_1BIT_FLAG (Resource->FixedMemory32.Flags)]);
+ 
+     AcpiDmIndent (Level + 1);
+-    AcpiDmDumpInteger32 (Resource->FixedMemory32.Address,
++    AcpiDmDumpInteger32 (AcpiUtReadUint32(&Resource->FixedMemory32.Address),
+         "Address Base");
+ 
+     AcpiDmIndent (Level + 1);
+-    AcpiDmDumpInteger32 (Resource->FixedMemory32.AddressLength,
++    AcpiDmDumpInteger32 (AcpiUtReadUint32(&Resource->FixedMemory32.AddressLength),
+         "Address Length");
+ 
+     /* Insert a descriptor name */
+@@ -926,7 +936,8 @@ AcpiDmGenericRegisterDescriptor (
+     AcpiDmDumpInteger8 (Resource->GenericReg.BitOffset, "Bit Offset");
+ 
+     AcpiDmIndent (Level + 1);
+-    AcpiDmDumpInteger64 (Resource->GenericReg.Address, "Address");
++    AcpiDmDumpInteger64 (AcpiUtReadUint64(&Resource->GenericReg.Address),
++		         "Address");
+ 
+     /* Optional field for ACPI 3.0 */
+ 
+@@ -989,7 +1000,7 @@ AcpiDmInterruptDescriptor (
+     AcpiDmResourceSource (Resource,
+         sizeof (AML_RESOURCE_EXTENDED_IRQ) +
+             ((UINT32) Resource->ExtendedIrq.InterruptCount - 1) * sizeof (UINT32),
+-        Resource->ExtendedIrq.ResourceLength);
++        AcpiUtReadUint16(&Resource->ExtendedIrq.ResourceLength));
+ 
+     /* Insert a descriptor name */
+ 
+@@ -1004,7 +1015,7 @@ AcpiDmInterruptDescriptor (
+     {
+         AcpiDmIndent (Level + 1);
+         AcpiOsPrintf ("0x%8.8X,\n",
+-            (UINT32) Resource->ExtendedIrq.Interrupts[i]);
++            AcpiUtReadUint32(&Resource->ExtendedIrq.Interrupts[i]));
+     }
+ 
+     AcpiDmIndent (Level);
+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,15 +191,19 @@ AcpiDmGpioCommon (
+     char                    *DeviceName = NULL;
+     UINT32                  PinCount;
+     UINT32                  i;
++    UINT16                  ResSourceOffset;
++    UINT16                  VendorOffset;
++    UINT16                  VendorLength;
+ 
+ 
+     /* ResourceSource, ResourceSourceIndex, ResourceType */
+ 
+     AcpiDmIndent (Level + 1);
+-    if (Resource->Gpio.ResSourceOffset)
++    ResSourceOffset = AcpiUtReadUint16(&Resource->Gpio.ResSourceOffset);
++    if (ResSourceOffset)
+     {
+         DeviceName = ACPI_ADD_PTR (char,
+-            Resource, Resource->Gpio.ResSourceOffset),
++            Resource, ResSourceOffset),
+         AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
+     }
+ 
+@@ -215,15 +219,15 @@ AcpiDmGpioCommon (
+ 
+     /* Dump the vendor data */
+ 
+-    if (Resource->Gpio.VendorOffset)
++    VendorOffset = AcpiUtReadUint16(&Resource->Gpio.VendorOffset);
++    VendorLength = AcpiUtReadUint16(&Resource->Gpio.VendorLength);
++    if (VendorOffset)
+     {
+         AcpiOsPrintf ("\n");
+         AcpiDmIndent (Level + 1);
+-        VendorData = ACPI_ADD_PTR (UINT8, Resource,
+-            Resource->Gpio.VendorOffset);
++        VendorData = ACPI_ADD_PTR (UINT8, Resource, VendorOffset);
+ 
+-        AcpiDmDumpRawDataBuffer (VendorData,
+-            Resource->Gpio.VendorLength, Level);
++        AcpiDmDumpRawDataBuffer (VendorData, VendorLength, Level);
+     }
+ 
+     AcpiOsPrintf (")\n");
+@@ -233,17 +237,21 @@ AcpiDmGpioCommon (
+     AcpiDmIndent (Level + 1);
+     AcpiOsPrintf ("{   // Pin list\n");
+ 
++    PinCount = (UINT32) AcpiUtReadUint16(&Resource->Gpio.ResSourceOffset);
++    PinCount -= (UINT32) AcpiUtReadUint16(&Resource->Gpio.PinTableOffset);
++    PinCount /= sizeof (UINT16);
++
+     PinCount = ((UINT32) (Resource->Gpio.ResSourceOffset -
+         Resource->Gpio.PinTableOffset)) /
+         sizeof (UINT16);
+ 
+     PinList = (UINT16 *) ACPI_ADD_PTR (char, Resource,
+-        Resource->Gpio.PinTableOffset);
++        AcpiUtReadUint16(&Resource->Gpio.PinTableOffset));
+ 
+     for (i = 0; i < PinCount; i++)
+     {
+         AcpiDmIndent (Level + 2);
+-        AcpiOsPrintf ("0x%4.4X%s\n", PinList[i],
++        AcpiOsPrintf ("0x%4.4X%s\n", AcpiUtReadUint16(&(PinList[i])),
+             ((i + 1) < PinCount) ? "," : "");
+     }
+ 
+@@ -299,7 +307,8 @@ AcpiDmGpioIntDescriptor (
+     {
+         AcpiOsPrintf ("0x%2.2X, ", Resource->Gpio.PinConfig);
+     }
+-    AcpiOsPrintf ("0x%4.4X,\n", Resource->Gpio.DebounceTimeout);
++    AcpiOsPrintf ("0x%4.4X,\n",
++		  AcpiUtReadUint16(&Resource->Gpio.DebounceTimeout));
+ 
+     /* Dump the GpioInt/GpioIo common portion of the descriptor */
+ 
+@@ -350,8 +359,8 @@ AcpiDmGpioIoDescriptor (
+ 
+     /* DebounceTimeout, DriveStrength, IoRestriction */
+ 
+-    AcpiOsPrintf ("0x%4.4X, ", Resource->Gpio.DebounceTimeout);
+-    AcpiOsPrintf ("0x%4.4X, ", Resource->Gpio.DriveStrength);
++    AcpiOsPrintf ("0x%4.4X, ", AcpiUtReadUint16(&Resource->Gpio.DebounceTimeout));
++    AcpiOsPrintf ("0x%4.4X, ", AcpiUtReadUint16(&Resource->Gpio.DriveStrength));
+     AcpiOsPrintf ("%s,\n",
+         AcpiGbl_IorDecode [ACPI_GET_2BIT_FLAG (Resource->Gpio.IntFlags)]);
+ 
+@@ -434,6 +443,9 @@ AcpiDmPinFunctionDescriptor (
+     char                    *DeviceName = NULL;
+     UINT32                  PinCount;
+     UINT32                  i;
++    UINT16                  ResSourceOffset;
++    UINT16                  VendorOffset;
++    UINT16                  VendorLength;
+ 
+     AcpiDmIndent (Level);
+     AcpiOsPrintf ("PinFunction (%s, ",
+@@ -451,12 +463,14 @@ AcpiDmPinFunctionDescriptor (
+ 
+     /* FunctionNumber */
+ 
+-    AcpiOsPrintf ("0x%4.4X, ", Resource->PinFunction.FunctionNumber);
++    AcpiOsPrintf ("0x%4.4X, ", 
++		  AcpiUtReadUint16(&Resource->PinFunction.FunctionNumber));
+ 
+-    if (Resource->PinFunction.ResSourceOffset)
++    ResSourceOffset = AcpiUtReadUint16(&Resource->PinFunction.ResSourceOffset);
++    if (ResSourceOffset)
+     {
+         DeviceName = ACPI_ADD_PTR (char,
+-            Resource, Resource->PinFunction.ResSourceOffset),
++            Resource, ResSourceOffset),
+         AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
+     }
+ 
+@@ -476,15 +490,15 @@ AcpiDmPinFunctionDescriptor (
+ 
+     /* Dump the vendor data */
+ 
+-    if (Resource->PinFunction.VendorLength)
++    VendorOffset = AcpiUtReadUint16(&Resource->PinFunction.VendorOffset);
++    VendorLength = AcpiUtReadUint16(&Resource->PinFunction.VendorLength);
++    if (VendorLength)
+     {
+         AcpiOsPrintf ("\n");
+         AcpiDmIndent (Level + 1);
+-        VendorData = ACPI_ADD_PTR (UINT8, Resource,
+-            Resource->PinFunction.VendorOffset);
++        VendorData = ACPI_ADD_PTR (UINT8, Resource, VendorOffset);
+ 
+-        AcpiDmDumpRawDataBuffer (VendorData,
+-            Resource->PinFunction.VendorLength, Level);
++        AcpiDmDumpRawDataBuffer (VendorData, VendorLength, Level);
+     }
+ 
+     AcpiOsPrintf (")\n");
+@@ -495,17 +509,17 @@ AcpiDmPinFunctionDescriptor (
+ 
+     AcpiOsPrintf ("{   // Pin list\n");
+ 
+-    PinCount = ((UINT32) (Resource->PinFunction.ResSourceOffset -
+-        Resource->PinFunction.PinTableOffset)) /
+-        sizeof (UINT16);
++    PinCount = AcpiUtReadUint16(&Resource->PinFunction.ResSourceOffset);
++    PinCount -= AcpiUtReadUint16(&Resource->PinFunction.PinTableOffset);
++    PinCount /= sizeof (UINT16);
+ 
+     PinList = (UINT16 *) ACPI_ADD_PTR (char, Resource,
+-        Resource->PinFunction.PinTableOffset);
++        AcpiUtReadUint16(&Resource->PinFunction.PinTableOffset));
+ 
+     for (i = 0; i < PinCount; i++)
+     {
+         AcpiDmIndent (Level + 2);
+-        AcpiOsPrintf ("0x%4.4X%s\n", PinList[i],
++        AcpiOsPrintf ("0x%4.4X%s\n", AcpiUtReadUint16(&(PinList[i])),
+             ((i + 1) < PinCount) ? "," : "");
+     }
+ 
+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);
+-    AcpiDmBitList (Resource->Irq.IrqMask);
++    AcpiDmBitList (AcpiUtReadUint16(&Resource->Irq.IrqMask));
+ }
+ 
+ 
+@@ -161,8 +161,8 @@ AcpiDmFixedDmaDescriptor (
+ 
+     AcpiDmIndent (Level);
+     AcpiOsPrintf ("FixedDMA (0x%4.4X, 0x%4.4X, ",
+-        Resource->FixedDma.RequestLines,
+-        Resource->FixedDma.Channels);
++        AcpiUtReadUint16(&Resource->FixedDma.RequestLines),
++        AcpiUtReadUint16(&Resource->FixedDma.Channels));
+ 
+     if (Resource->FixedDma.Width <= 5)
+     {
+@@ -210,10 +210,12 @@ AcpiDmIoDescriptor (
+         AcpiGbl_IoDecode [ACPI_GET_1BIT_FLAG (Resource->Io.Flags)]);
+ 
+     AcpiDmIndent (Level + 1);
+-    AcpiDmDumpInteger16 (Resource->Io.Minimum, "Range Minimum");
++    AcpiDmDumpInteger16 (AcpiUtReadUint16(&Resource->Io.Minimum),
++		         "Range Minimum");
+ 
+     AcpiDmIndent (Level + 1);
+-    AcpiDmDumpInteger16 (Resource->Io.Maximum, "Range Maximum");
++    AcpiDmDumpInteger16 (AcpiUtReadUint16(&Resource->Io.Maximum),
++		         "Range Maximum");
+ 
+     AcpiDmIndent (Level + 1);
+     AcpiDmDumpInteger8 (Resource->Io.Alignment, "Alignment");
+@@ -256,10 +258,12 @@ AcpiDmFixedIoDescriptor (
+     AcpiOsPrintf ("FixedIO (\n");
+ 
+     AcpiDmIndent (Level + 1);
+-    AcpiDmDumpInteger16 (Resource->FixedIo.Address, "Address");
++    AcpiDmDumpInteger16 (AcpiUtReadUint16(&Resource->FixedIo.Address),
++		         "Address");
+ 
+     AcpiDmIndent (Level + 1);
+-    AcpiDmDumpInteger8 (Resource->FixedIo.AddressLength, "Length");
++    AcpiDmDumpInteger8 (AcpiUtReadUint16(&Resource->FixedIo.AddressLength),
++			"Length");
+ 
+     /* Insert a descriptor name */
+ 
+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
+ 
++    char                    TmpName[ACPI_NAMESEG_SIZE+1];
++
+ 
+     ACPI_FUNCTION_TRACE_PTR (DsGetFieldNames, Info);
+ 
+@@ -442,14 +444,17 @@ AcpiDsGetFieldNames (
+ 
+             /* Lookup the name, it should already exist */
+ 
++	    memset(TmpName, 0, ACPI_NAMESEG_SIZE+1);
++	    AcpiUtWriteUint(TmpName, ACPI_NAMESEG_SIZE,
++			    &Arg->Named.Name, ACPI_NAMESEG_SIZE);
+             Status = AcpiNsLookup (WalkState->ScopeInfo,
+-                (char *) &Arg->Named.Name, Info->FieldType,
++                TmpName, Info->FieldType,
+                 ACPI_IMODE_EXECUTE, ACPI_NS_DONT_OPEN_SCOPE,
+                 WalkState, &Info->FieldNode);
+             if (ACPI_FAILURE (Status))
+             {
+                 ACPI_ERROR_NAMESPACE (WalkState->ScopeInfo,
+-                    (char *) &Arg->Named.Name, Status);
++                    TmpName, Status);
+                 return_ACPI_STATUS (Status);
+             }
+             else
+@@ -703,8 +708,13 @@ AcpiDsInitFieldObjects (
+          */
+         if (Arg->Common.AmlOpcode == AML_INT_NAMEDFIELD_OP)
+         {
++	    char Tmp[ACPI_NAMESEG_SIZE+1];
++
++	    memset(&Tmp, 0, ACPI_NAMESEG_SIZE+1);
++	    AcpiUtWriteUint(&Tmp, ACPI_NAMESEG_SIZE,
++			    &Arg->Named.Name, ACPI_NAMESEG_SIZE);
+             Status = AcpiNsLookup (WalkState->ScopeInfo,
+-                (char *) &Arg->Named.Name, Type, ACPI_IMODE_LOAD_PASS1,
++                Tmp, Type, ACPI_IMODE_LOAD_PASS1,
+                 Flags, WalkState, &Node);
+             if (ACPI_FAILURE (Status))
+             {
+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 */
+ 
+-        ACPI_MOVE_32_TO_32 (&SimpleName, Path);
++        ACPI_COPY_NAMESEG (&SimpleName, Path);
+ 
+         /* Try to find the single (4 character) ACPI name */
+ 
+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);
+         }
+ 
+-        ACPI_MOVE_32_TO_32 (Name, &NextNode->Name);
++        ACPI_COPY_NAMESEG (Name, &NextNode->Name);
+         DoNoTrailing = NoTrailing;
+         for (i = 0; i < 4; i++)
+         {
+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;
++    UINT32                  TableLength;
+ 
+ 
+     ACPI_FUNCTION_TRACE (NsOneCompleteParse);
+@@ -216,13 +217,14 @@ AcpiNsOneCompleteParse (
+ 
+     /* Table must consist of at least a complete header */
+ 
+-    if (Table->Length < sizeof (ACPI_TABLE_HEADER))
++    TableLength = AcpiUtReadUint32(&Table->Length);
++    if (TableLength < sizeof (ACPI_TABLE_HEADER))
+     {
+         return_ACPI_STATUS (AE_BAD_HEADER);
+     }
+ 
+     AmlStart = (UINT8 *) Table + sizeof (ACPI_TABLE_HEADER);
+-    AmlLength = Table->Length - sizeof (ACPI_TABLE_HEADER);
++    AmlLength = TableLength - sizeof (ACPI_TABLE_HEADER);
+ 
+     Status = AcpiTbGetOwnerId (TableIndex, &OwnerId);
+     if (ACPI_FAILURE (Status))
+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;
+-    char		    TmpSeg[ACPI_NAMESEG_SIZE+1];
+ 
+ 
+     ACPI_FUNCTION_TRACE (NsBuildInternalName);
+@@ -336,7 +335,6 @@ AcpiNsBuildInternalName (
+ 
+     for (; NumSegments; NumSegments--)
+     {
+-        memset(TmpSeg, 0, ACPI_NAMESEG_SIZE+1);
+         for (i = 0; i < ACPI_NAMESEG_SIZE; i++)
+         {
+             if (ACPI_IS_PATH_SEPARATOR (*ExternalName) ||
+@@ -344,17 +342,16 @@ AcpiNsBuildInternalName (
+             {
+                 /* Pad the segment with underscore(s) if segment is short */
+ 
+-                TmpSeg[i] = '_';
++                Result[i] = '_';
+             }
+             else
+             {
+                 /* Convert the character to uppercase and save it */
+ 
+-                TmpSeg[i] = (char) toupper ((int) *ExternalName);
++                Result[i] = (char) toupper ((int) *ExternalName);
+                 ExternalName++;
+             }
+         }
+-	AcpiUtWriteUint(Result, ACPI_NAMESEG_SIZE, TmpSeg, ACPI_NAMESEG_SIZE);
+ 
+         /* Now we must have a path separator, or the pathname is bad */
+ 
diff --git a/OPT_LDFLAGS.patch b/OPT_LDFLAGS.patch
index 610d66d..de12ce1 100644
--- a/OPT_LDFLAGS.patch
+++ b/OPT_LDFLAGS.patch
@@ -1,7 +1,7 @@
-Index: acpica-unix2-20200528/generate/unix/Makefile.config
+Index: acpica-unix2-20200925/generate/unix/Makefile.config
 ===================================================================
---- acpica-unix2-20200528.orig/generate/unix/Makefile.config
-+++ acpica-unix2-20200528/generate/unix/Makefile.config
+--- acpica-unix2-20200925.orig/generate/unix/Makefile.config
++++ acpica-unix2-20200925/generate/unix/Makefile.config
 @@ -23,6 +23,9 @@
  # OPT_CFLAGS can be overridden on the make command line by
  #   adding OPT_CFLAGS="..." to the invocation.
diff --git a/acpica-tools.spec b/acpica-tools.spec
index ad94d67..7123e29 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -50,7 +50,7 @@ Patch22:	0023-Support-NFIT-in-a-big-endian-world.patch
 Patch23:	0024-Support-SDEV-in-a-big-endian-world.patch
 Patch24:	0025-Support-HMAT-in-a-big-endian-world.patch
 Patch25:	0026-Support-PDTT-in-a-big-endian-world.patch
-Patch25:	0027-Support-PPTT-in-a-big-endian-world.patch
+Patch26:	0027-Support-PPTT-in-a-big-endian-world.patch
 Patch27:	0028-Support-PCCT-in-a-big-endian-world.patch
 Patch28:	0029-Support-WDAT-in-a-big-endian-world.patch
 Patch29:	0030-Support-TCPA-in-a-big-endian-world.patch
@@ -65,25 +65,26 @@ Patch37:	0038-Support-TPM2-in-a-big-endian-world.patch
 Patch38:	0039-Add-partial-big-endian-support-for-WPBT-tables.patch
 Patch39:	0040-Support-DSDT-SSDT-in-a-big-endian-world.patch
 
-# other miscellaneous patch
-Patch40:	unaligned.patch
-Patch41:	OPT_LDFLAGS.patch
-Patch42:	int-format.patch
-Patch43:	f23-harden.patch
-Patch44:	template.patch
-Patch45:        ppc64le.patch
-Patch46:        arm7hl.patch
-Patch47:        simple-64bit.patch
-Patch48:        mips-be-fix.patch
-Patch49:        cve-2017-13693.patch
-Patch50:        cve-2017-13694.patch
-Patch51:        cve-2017-13695.patch
-Patch52:        str-trunc-warn.patch
-Patch53:	ptr-cast.patch
-Patch54:	aslcodegen.patch
-Patch55:	facp.patch
-Patch56:	armv7-str-fixes.patch
-Patch57:	dbtest.patch
+# other miscellaneous patches
+Patch100:	unaligned.patch
+Patch101:	OPT_LDFLAGS.patch
+Patch102:	int-format.patch
+Patch103:	f23-harden.patch
+Patch104:	template.patch
+Patch105:       arm7hl.patch
+Patch106:       simple-64bit.patch
+Patch107:       mips-be-fix.patch
+Patch108:       cve-2017-13693.patch
+Patch109:       cve-2017-13694.patch
+Patch110:       cve-2017-13695.patch
+Patch111:       str-trunc-warn.patch
+Patch112:	ptr-cast.patch
+Patch113:	facp.patch
+Patch114:	armv7-str-fixes.patch
+Patch115:	dbtest.patch
+%ifarch i686 armv7hl
+Patch116:	ull-32bit.patch
+%endif
 
 BuildRequires:  bison patchutils flex gcc
 
@@ -132,65 +133,68 @@ This version of the tools is being released under GPLv2 license.
 %setup -q -n acpica-unix2-%{version}
 gzip -dc %{SOURCE1} | tar -x --strip-components=1 -f -
 
-# apply all the patches
-%patch0
-%patch1
-%patch2
-%patch3
-%patch4
-%patch5
-%patch6
-%patch7
-%patch8
-%patch9
-%patch10
-%patch11
-%patch12
-%patch13
-%patch14
-%patch15
-%patch16
-%patch17
-%patch18
-%patch19
-%patch20
-%patch21
-%patch22
-%patch23
-%patch24
-%patch25
-%patch26
-%patch27
-%patch28
-%patch29
-%patch30
-%patch31
-%patch32
-%patch33
-%patch34
-%patch35
-%patch36
-%patch37
-%patch38
-%patch39
-%patch40
-%patch41
-%patch42
-%patch43
-%patch44
-%patch45
-%patch46
-%patch47
-%patch48
-%patch49
-%patch50
-%patch51
-%patch52
-%patch53
-%patch54
-%patch55
-%patch56
-%patch57
+# apply the big-endian patches
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1
+%patch20 -p1
+%patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
+%patch25 -p1
+%patch26 -p1
+%patch27 -p1
+%patch28 -p1
+%patch29 -p1
+%patch30 -p1
+%patch31 -p1
+%patch32 -p1
+%patch33 -p1
+%patch34 -p1
+%patch35 -p1
+%patch36 -p1
+%patch37 -p1
+%patch38 -p1
+%patch39 -p1
+
+# apply the remaining patches
+%patch100 -p1
+%patch101 -p1
+%patch102 -p1
+%patch103 -p1
+%patch104 -p1
+%patch105 -p1
+%patch106 -p1
+%patch107 -p1
+%patch108 -p1
+%patch109 -p1
+%patch110 -p1
+%patch111 -p1
+%patch112 -p1
+%patch113 -p1
+%patch114 -p1
+%patch115 -p1
+%ifarch i686 armv7hl
+%patch116 -p1
+%endif
 
 cp -p %{SOURCE2} README.Fedora
 cp -p %{SOURCE3} iasl.1
@@ -306,11 +310,13 @@ fi
 
 
 %changelog
-* Thu Oct 15 2020 Al Stone <ahs3@redhat.com> - 20200925-1
+* Mon Oct 19 2020 Al Stone <ahs3@redhat.com> - 20200925-1
 - Update to 20200925 source tree
-- Completely revamp the old big-endian patches (maintainability was the goal)
-- The acpinames command has been deprecated upstrean; acpiexec provides 
-  replacement functionality
+- Completely revamp the old big-endian patches (maintainability was the goal).
+  This results in a much larger patch set, but each patch is more clearly used
+  for a specific purpose.
+- The acpinames command has been deprecated upstream; acpiexec provides 
+  replacement functionality.
 
 * Fri Jul 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20200430-3
 - Second attempt - Rebuilt for
diff --git a/arm7hl.patch b/arm7hl.patch
index 75abf45..bcac21f 100644
--- a/arm7hl.patch
+++ b/arm7hl.patch
@@ -1,8 +1,8 @@
-Index: acpica-unix-20191018/source/include/acmacros.h
+Index: acpica-unix2-20200925/source/include/acmacros.h
 ===================================================================
---- acpica-unix-20191018.orig/source/include/acmacros.h
-+++ acpica-unix-20191018/source/include/acmacros.h
-@@ -178,6 +178,8 @@
+--- acpica-unix2-20200925.orig/source/include/acmacros.h
++++ acpica-unix2-20200925/source/include/acmacros.h
+@@ -163,6 +163,8 @@
  
  /* 16-bit source, 16/32/64 destination */
  
@@ -11,7 +11,7 @@ Index: acpica-unix-20191018/source/include/acmacros.h
  #define ACPI_MOVE_16_TO_16(d, s)        {((  UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[0];\
                                           ((  UINT8 *)(void *)(d))[1] = ((UINT8 *)(void *)(s))[1];}
  
-@@ -199,6 +201,7 @@
+@@ -182,6 +184,7 @@
  
  /* 64-bit source, 16/32/64 destination */
  
diff --git a/armv7-str-fixes.patch b/armv7-str-fixes.patch
index 4de8226..fdc2434 100644
--- a/armv7-str-fixes.patch
+++ b/armv7-str-fixes.patch
@@ -1,7 +1,8 @@
-diff -Naur acpica-unix2-20200214.orig/source/include/actypes.h acpica-unix2-20200214/source/include/actypes.h
---- acpica-unix2-20200214.orig/source/include/actypes.h	2020-02-25 15:41:26.479349637 -0700
-+++ acpica-unix2-20200214/source/include/actypes.h	2020-02-25 15:44:49.519082258 -0700
-@@ -561,7 +561,7 @@
+Index: acpica-unix2-20200925/source/include/actypes.h
+===================================================================
+--- acpica-unix2-20200925.orig/source/include/actypes.h
++++ acpica-unix2-20200925/source/include/actypes.h
+@@ -561,7 +561,7 @@ typedef UINT64
  #define ACPI_COPY_NAMESEG(dest,src)     (*ACPI_CAST_PTR (UINT32, (dest)) = *ACPI_CAST_PTR (UINT32, (src)))
  #else
  #define ACPI_COMPARE_NAMESEG(a,b)       (!strncmp (ACPI_CAST_PTR (char, (a)), ACPI_CAST_PTR (char, (b)), ACPI_NAMESEG_SIZE))
diff --git a/aslcodegen.patch b/aslcodegen.patch
deleted file mode 100644
index 2e2854e..0000000
--- a/aslcodegen.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Changes in the handling of comments caused some length fields to be used
-in new ways.  The new way broke the existing adaptation for big endian
-support; this patch repairs that adaptation.
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
-
-Index: acpica-unix-20191018/source/compiler/aslcodegen.c
-===================================================================
---- acpica-unix-20191018.orig/source/compiler/aslcodegen.c
-+++ acpica-unix-20191018/source/compiler/aslcodegen.c
-@@ -497,8 +497,7 @@ CgWriteTableHeader (
- 
-     /* Table length. Checksum zero for now, will rewrite later */
- 
--    DWord = sizeof (ACPI_TABLE_HEADER) + Op->Asl.AmlSubtreeLength;
--    ACPI_MOVE_32_TO_32(&AslGbl_TableHeader.Length, &DWord);
-+    AslGbl_TableHeader.Length = sizeof (ACPI_TABLE_HEADER) + Op->Asl.AmlSubtreeLength;
- 
-     /* Calculate the comment lengths for this definition block parseOp */
- 
-@@ -544,6 +543,8 @@ CgWriteTableHeader (
-             CvDbgPrint ("    Length: %u\n", CommentLength);
-         }
-     }
-+    DWord = AslGbl_TableHeader.Length;
-+    ACPI_MOVE_32_TO_32(&AslGbl_TableHeader.Length, &DWord);
- 
-     AslGbl_TableHeader.Checksum = 0;
-     Op->Asl.FinalAmlOffset = ftell (AslGbl_Files[ASL_FILE_AML_OUTPUT].Handle);
diff --git a/big-endian-dmtbdump.patch b/big-endian-dmtbdump.patch
deleted file mode 100644
index fed81c1..0000000
--- a/big-endian-dmtbdump.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-Index: acpica-unix-20191018/source/common/dmtbdump.c
-===================================================================
---- acpica-unix-20191018.orig/source/common/dmtbdump.c
-+++ acpica-unix-20191018/source/common/dmtbdump.c
-@@ -277,6 +277,8 @@ AcpiDmDumpRsdt (
-     UINT32                  Entries;
-     UINT32                  Offset;
-     UINT32                  i;
-+    UINT32		    Length;
-+    UINT32		    Address;
- 
- 
-     /* Point to start of table pointer array */
-@@ -286,12 +288,14 @@ AcpiDmDumpRsdt (
- 
-     /* RSDT uses 32-bit pointers */
- 
--    Entries = (Table->Length - sizeof (ACPI_TABLE_HEADER)) / sizeof (UINT32);
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+    Entries = (Length - sizeof (ACPI_TABLE_HEADER)) / sizeof (UINT32);
- 
-     for (i = 0; i < Entries; i++)
-     {
-         AcpiDmLineHeader2 (Offset, sizeof (UINT32), "ACPI Table Address", i);
--        AcpiOsPrintf ("%8.8X\n", Array[i]);
-+	ACPI_MOVE_32_TO_32(&Address, &Array[i]);
-+        AcpiOsPrintf ("%8.8X\n", Address);
-         Offset += sizeof (UINT32);
-     }
- }
-@@ -317,6 +321,8 @@ AcpiDmDumpXsdt (
-     UINT32                  Entries;
-     UINT32                  Offset;
-     UINT32                  i;
-+    UINT32                  Length;
-+    UINT64		    Address;
- 
- 
-     /* Point to start of table pointer array */
-@@ -326,12 +332,14 @@ AcpiDmDumpXsdt (
- 
-     /* XSDT uses 64-bit pointers */
- 
--    Entries = (Table->Length - sizeof (ACPI_TABLE_HEADER)) / sizeof (UINT64);
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+    Entries = (Length - sizeof (ACPI_TABLE_HEADER)) / sizeof (UINT64);
- 
-     for (i = 0; i < Entries; i++)
-     {
-         AcpiDmLineHeader2 (Offset, sizeof (UINT64), "ACPI Table Address", i);
--        AcpiOsPrintf ("%8.8X%8.8X\n", ACPI_FORMAT_UINT64 (Array[i]));
-+	ACPI_MOVE_64_TO_64(&Address, &Array[i]);
-+        AcpiOsPrintf ("%8.8X%8.8X\n", ACPI_FORMAT_UINT64 (Address));
-         Offset += sizeof (UINT64);
-     }
- }
-@@ -358,12 +366,12 @@ AcpiDmDumpFadt (
-     ACPI_TABLE_HEADER       *Table)
- {
-     ACPI_STATUS             Status;
--
-+    UINT32		    Length;
- 
-     /* Always dump the minimum FADT revision 1 fields (ACPI 1.0) */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
--        AcpiDmTableInfoFadt1);
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoFadt1);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -371,11 +379,9 @@ AcpiDmDumpFadt (
- 
-     /* Check for FADT revision 2 fields (ACPI 1.0B MS extensions) */
- 
--    if ((Table->Length > ACPI_FADT_V1_SIZE) &&
--        (Table->Length <= ACPI_FADT_V2_SIZE))
-+    if ((Length > ACPI_FADT_V1_SIZE) && (Length <= ACPI_FADT_V2_SIZE))
-     {
--        Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
--            AcpiDmTableInfoFadt2);
-+        Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoFadt2);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -384,10 +390,9 @@ AcpiDmDumpFadt (
- 
-     /* Check for FADT revision 3/4 fields and up (ACPI 2.0+ extended data) */
- 
--    else if (Table->Length > ACPI_FADT_V2_SIZE)
-+    else if (Length > ACPI_FADT_V2_SIZE)
-     {
--        Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
--            AcpiDmTableInfoFadt3);
-+        Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoFadt3);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -395,9 +400,9 @@ AcpiDmDumpFadt (
- 
-         /* Check for FADT revision 5 fields and up (ACPI 5.0+) */
- 
--        if (Table->Length > ACPI_FADT_V3_SIZE)
-+        if (Length > ACPI_FADT_V3_SIZE)
-         {
--            Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
-+            Status = AcpiDmDumpTable (Length, 0, Table, 0,
-                 AcpiDmTableInfoFadt5);
-             if (ACPI_FAILURE (Status))
-             {
-@@ -407,9 +412,9 @@ AcpiDmDumpFadt (
- 
-         /* Check for FADT revision 6 fields and up (ACPI 6.0+) */
- 
--        if (Table->Length > ACPI_FADT_V3_SIZE)
-+        if (Length > ACPI_FADT_V3_SIZE)
-         {
--            Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
-+            Status = AcpiDmDumpTable (Length, 0, Table, 0,
-                 AcpiDmTableInfoFadt6);
-             if (ACPI_FAILURE (Status))
-             {
-@@ -420,11 +425,11 @@ AcpiDmDumpFadt (
- 
-     /* Validate various fields in the FADT, including length */
- 
--    AcpiTbCreateLocalFadt (Table, Table->Length);
-+    AcpiTbCreateLocalFadt (Table, Length);
- 
-     /* Validate FADT length against the revision */
- 
--    AcpiDmValidateFadtLength (Table->Revision, Table->Length);
-+    AcpiDmValidateFadtLength (Table->Revision, Length);
- }
- 
- 
-@@ -450,6 +455,7 @@ AcpiDmValidateFadtLength (
-     UINT32                  Length)
- {
-     UINT32                  ExpectedLength;
-+    UINT32		    Tmp32;
- 
- 
-     switch (Revision)
-@@ -485,7 +491,8 @@ AcpiDmValidateFadtLength (
-         return;
-     }
- 
--    if (Length == ExpectedLength)
-+    ACPI_MOVE_32_TO_32(&Tmp32, &Length);
-+    if (Tmp32 == ExpectedLength)
-     {
-         return;
-     }
-@@ -493,5 +500,5 @@ AcpiDmValidateFadtLength (
-     AcpiOsPrintf (
-         "\n// ACPI Warning: FADT revision %X does not match length: "
-         "found %X expected %X\n",
--        Revision, Length, ExpectedLength);
-+        Revision, Tmp32, ExpectedLength);
- }
diff --git a/big-endian-dmtbdump1.patch b/big-endian-dmtbdump1.patch
deleted file mode 100644
index ba37c6f..0000000
--- a/big-endian-dmtbdump1.patch
+++ /dev/null
@@ -1,637 +0,0 @@
-Index: acpica-unix-20191018/source/common/dmtbdump1.c
-===================================================================
---- acpica-unix-20191018.orig/source/common/dmtbdump1.c
-+++ acpica-unix-20191018/source/common/dmtbdump1.c
-@@ -79,17 +79,21 @@ AcpiDmDumpAsf (
-     UINT32                  DataOffset = 0;
-     UINT32                  i;
-     UINT8                   Type;
-+    UINT32		    Len;
-+    UINT16		    SubLen;
- 
- 
-     /* No main table, only subtables */
- 
-+    ACPI_MOVE_32_TO_32(&Len, &Table->Length);
-     Subtable = ACPI_ADD_PTR (ACPI_ASF_INFO, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Len)
-     {
-         /* Common subtable header */
- 
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
--            Subtable->Header.Length, AcpiDmTableInfoAsfHdr);
-+	ACPI_MOVE_16_TO_16(&SubLen, &Subtable->Header.Length);
-+        Status = AcpiDmDumpTable (Len, Offset, Subtable,
-+            SubLen, AcpiDmTableInfoAsfHdr);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -146,8 +150,7 @@ AcpiDmDumpAsf (
-             return;
-         }
- 
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
--            Subtable->Header.Length, InfoTable);
-+        Status = AcpiDmDumpTable (Len, Offset, Subtable, SubLen, InfoTable);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -163,7 +166,7 @@ AcpiDmDumpAsf (
-             for (i = 0; i < DataCount; i++)
-             {
-                 AcpiOsPrintf ("\n");
--                Status = AcpiDmDumpTable (Table->Length, DataOffset,
-+                Status = AcpiDmDumpTable (Len, DataOffset,
-                     DataTable, DataLength, DataInfoTable);
-                 if (ACPI_FAILURE (Status))
-                 {
-@@ -209,15 +212,14 @@ AcpiDmDumpAsf (
- 
-         /* Point to next subtable */
- 
--        if (!Subtable->Header.Length)
-+        if (!SubLen)
-         {
-             AcpiOsPrintf ("Invalid zero subtable header length\n");
-             return;
-         }
- 
--        Offset += Subtable->Header.Length;
--        Subtable = ACPI_ADD_PTR (ACPI_ASF_INFO, Subtable,
--            Subtable->Header.Length);
-+        Offset += SubLen;
-+        Subtable = ACPI_ADD_PTR (ACPI_ASF_INFO, Subtable, SubLen);
-     }
- }
- 
-@@ -241,12 +243,13 @@ AcpiDmDumpCpep (
- {
-     ACPI_STATUS             Status;
-     ACPI_CPEP_POLLING       *Subtable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length;
-     UINT32                  Offset = sizeof (ACPI_TABLE_CPEP);
- 
- 
-     /* Main table */
- 
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoCpep);
-     if (ACPI_FAILURE (Status))
-     {
-@@ -256,7 +259,7 @@ AcpiDmDumpCpep (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_CPEP_POLLING, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         AcpiOsPrintf ("\n");
-         Status = AcpiDmDumpTable (Length, Offset, Subtable,
-@@ -296,7 +299,10 @@ AcpiDmDumpCsrt (
-     ACPI_CSRT_GROUP         *Subtable;
-     ACPI_CSRT_SHARED_INFO   *SharedInfoTable;
-     ACPI_CSRT_DESCRIPTOR    *SubSubtable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length;
-+    UINT32                  SubLength;
-+    UINT32                  SubSubLength;
-+    UINT32                  SharedInfoLength;
-     UINT32                  Offset = sizeof (ACPI_TABLE_CSRT);
-     UINT32                  SubOffset;
-     UINT32                  SubSubOffset;
-@@ -307,14 +313,16 @@ AcpiDmDumpCsrt (
- 
-     /* Subtables (Resource Groups) */
- 
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-     Subtable = ACPI_ADD_PTR (ACPI_CSRT_GROUP, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         /* Resource group subtable */
- 
-         AcpiOsPrintf ("\n");
-+        ACPI_MOVE_32_TO_32(&SubLength, &Subtable->Length);
-         Status = AcpiDmDumpTable (Length, Offset, Subtable,
--            Subtable->Length, AcpiDmTableInfoCsrt0);
-+            SubLength, AcpiDmTableInfoCsrt0);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -334,19 +342,20 @@ AcpiDmDumpCsrt (
-             return;
-         }
- 
--        SubOffset += Subtable->SharedInfoLength;
-+	ACPI_MOVE_32_TO_32(&SharedInfoLength, &Subtable->SharedInfoLength);
-+        SubOffset += SharedInfoLength;
- 
-         /* Sub-Subtables (Resource Descriptors) */
- 
-         SubSubtable = ACPI_ADD_PTR (ACPI_CSRT_DESCRIPTOR, Table,
-             Offset + SubOffset);
- 
--        while ((SubOffset < Subtable->Length) &&
--              ((Offset + SubOffset) < Table->Length))
-+        while ((SubOffset < SubLength) && ((Offset + SubOffset) < Length))
-         {
-             AcpiOsPrintf ("\n");
-+	    ACPI_MOVE_32_TO_32(&SubSubLength, &SubSubtable->Length);
-             Status = AcpiDmDumpTable (Length, Offset + SubOffset, SubSubtable,
--                SubSubtable->Length, AcpiDmTableInfoCsrt2);
-+                SubSubLength, AcpiDmTableInfoCsrt2);
-             if (ACPI_FAILURE (Status))
-             {
-                 return;
-@@ -356,7 +365,7 @@ AcpiDmDumpCsrt (
- 
-             /* Resource-specific info buffer */
- 
--            InfoLength = SubSubtable->Length - SubSubOffset;
-+            InfoLength = SubSubLength - SubSubOffset;
-             if (InfoLength)
-             {
-                 Status = AcpiDmDumpTable (Length,
-@@ -370,16 +379,15 @@ AcpiDmDumpCsrt (
- 
-             /* Point to next sub-subtable */
- 
--            SubOffset += SubSubtable->Length;
-+            SubOffset += SubSubLength;
-             SubSubtable = ACPI_ADD_PTR (ACPI_CSRT_DESCRIPTOR, SubSubtable,
--                SubSubtable->Length);
-+                SubSubLength);
-         }
- 
-         /* Point to next subtable */
- 
--        Offset += Subtable->Length;
--        Subtable = ACPI_ADD_PTR (ACPI_CSRT_GROUP, Subtable,
--            Subtable->Length);
-+        Offset += SubLength;
-+        Subtable = ACPI_ADD_PTR (ACPI_CSRT_GROUP, Subtable, SubLength);
-     }
- }
- 
-@@ -403,16 +411,20 @@ AcpiDmDumpDbg2 (
- {
-     ACPI_STATUS             Status;
-     ACPI_DBG2_DEVICE        *Subtable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length;
-+    UINT16                  SubLength;
-     UINT32                  Offset = sizeof (ACPI_TABLE_DBG2);
-     UINT32                  i;
-     UINT32                  ArrayOffset;
-     UINT32                  AbsoluteOffset;
-     UINT8                   *Array;
-+    UINT16		    Tmp16;
-+    UINT16		    AlsoTmp16;
- 
- 
-     /* Main table */
- 
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoDbg2);
-     if (ACPI_FAILURE (Status))
-     {
-@@ -422,11 +434,12 @@ AcpiDmDumpDbg2 (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_DBG2_DEVICE, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         AcpiOsPrintf ("\n");
-+        ACPI_MOVE_16_TO_16(&SubLength, &Subtable->Length);
-         Status = AcpiDmDumpTable (Length, Offset, Subtable,
--            Subtable->Length, AcpiDmTableInfoDbg2Device);
-+            SubLength, AcpiDmTableInfoDbg2Device);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -436,13 +449,13 @@ AcpiDmDumpDbg2 (
- 
-         for (i = 0; i < Subtable->RegisterCount; i++)
-         {
--            ArrayOffset = Subtable->BaseAddressOffset +
--                (sizeof (ACPI_GENERIC_ADDRESS) * i);
-+	    ACPI_MOVE_16_TO_16(&Tmp16, &Subtable->BaseAddressOffset);
-+            ArrayOffset = Tmp16 + (sizeof (ACPI_GENERIC_ADDRESS) * i);
-             AbsoluteOffset = Offset + ArrayOffset;
-             Array = (UINT8 *) Subtable + ArrayOffset;
- 
-             Status = AcpiDmDumpTable (Length, AbsoluteOffset, Array,
--                Subtable->Length, AcpiDmTableInfoDbg2Addr);
-+                SubLength, AcpiDmTableInfoDbg2Addr);
-             if (ACPI_FAILURE (Status))
-             {
-                 return;
-@@ -453,13 +466,13 @@ AcpiDmDumpDbg2 (
- 
-         for (i = 0; i < Subtable->RegisterCount; i++)
-         {
--            ArrayOffset = Subtable->AddressSizeOffset +
--                (sizeof (UINT32) * i);
-+	    ACPI_MOVE_16_TO_16(&Tmp16, &Subtable->AddressSizeOffset);
-+            ArrayOffset = Tmp16 + (sizeof (UINT32) * i);
-             AbsoluteOffset = Offset + ArrayOffset;
-             Array = (UINT8 *) Subtable + ArrayOffset;
- 
-             Status = AcpiDmDumpTable (Length, AbsoluteOffset, Array,
--                Subtable->Length, AcpiDmTableInfoDbg2Size);
-+                SubLength, AcpiDmTableInfoDbg2Size);
-             if (ACPI_FAILURE (Status))
-             {
-                 return;
-@@ -469,12 +482,13 @@ AcpiDmDumpDbg2 (
-         /* Dump the Namestring (required) */
- 
-         AcpiOsPrintf ("\n");
--        ArrayOffset = Subtable->NamepathOffset;
-+	ACPI_MOVE_16_TO_16(&Tmp16, &Subtable->NamepathOffset);
-+        ArrayOffset = Tmp16;
-         AbsoluteOffset = Offset + ArrayOffset;
-         Array = (UINT8 *) Subtable + ArrayOffset;
- 
-         Status = AcpiDmDumpTable (Length, AbsoluteOffset, Array,
--            Subtable->Length, AcpiDmTableInfoDbg2Name);
-+            SubLength, AcpiDmTableInfoDbg2Name);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -484,9 +498,10 @@ AcpiDmDumpDbg2 (
- 
-         if (Subtable->OemDataOffset)
-         {
--            Status = AcpiDmDumpTable (Length, Offset + Subtable->OemDataOffset,
--                Table, Subtable->OemDataLength,
--                AcpiDmTableInfoDbg2OemData);
-+	    ACPI_MOVE_16_TO_16(&Tmp16, &Subtable->OemDataOffset);
-+	    ACPI_MOVE_16_TO_16(&AlsoTmp16, &Subtable->OemDataLength);
-+            Status = AcpiDmDumpTable (Length, Offset + Tmp16,
-+                Table, AlsoTmp16, AcpiDmTableInfoDbg2OemData);
-             if (ACPI_FAILURE (Status))
-             {
-                 return;
-@@ -495,9 +510,9 @@ AcpiDmDumpDbg2 (
- 
-         /* Point to next subtable */
- 
--        Offset += Subtable->Length;
-+        Offset += SubLength;
-         Subtable = ACPI_ADD_PTR (ACPI_DBG2_DEVICE, Subtable,
--            Subtable->Length);
-+            SubLength);
-     }
- }
- 
-@@ -521,17 +536,20 @@ AcpiDmDumpDmar (
- {
-     ACPI_STATUS             Status;
-     ACPI_DMAR_HEADER        *Subtable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length;
-+    UINT16                  SubLength;
-     UINT32                  Offset = sizeof (ACPI_TABLE_DMAR);
-     ACPI_DMTABLE_INFO       *InfoTable;
-     ACPI_DMAR_DEVICE_SCOPE  *ScopeTable;
-     UINT32                  ScopeOffset;
-     UINT8                   *PciPath;
-     UINT32                  PathOffset;
-+    UINT16		    SubType;
- 
- 
-     /* Main table */
- 
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoDmar);
-     if (ACPI_FAILURE (Status))
-     {
-@@ -541,13 +559,14 @@ AcpiDmDumpDmar (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_DMAR_HEADER, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         /* Common subtable header */
- 
-         AcpiOsPrintf ("\n");
-+	ACPI_MOVE_16_TO_16(&SubLength, &Subtable->Length);
-         Status = AcpiDmDumpTable (Length, Offset, Subtable,
--            Subtable->Length, AcpiDmTableInfoDmarHdr);
-+            SubLength, AcpiDmTableInfoDmarHdr);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -555,7 +574,8 @@ AcpiDmDumpDmar (
- 
-         AcpiOsPrintf ("\n");
- 
--        switch (Subtable->Type)
-+	ACPI_MOVE_16_TO_16(&SubType, &Subtable->Type);
-+        switch (SubType)
-         {
-         case ACPI_DMAR_TYPE_HARDWARE_UNIT:
- 
-@@ -590,12 +610,12 @@ AcpiDmDumpDmar (
-         default:
- 
-             AcpiOsPrintf ("\n**** Unknown DMAR subtable type 0x%X\n\n",
--                Subtable->Type);
-+                SubType);
-             return;
-         }
- 
-         Status = AcpiDmDumpTable (Length, Offset, Subtable,
--            Subtable->Length, InfoTable);
-+            SubLength, InfoTable);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -604,8 +624,8 @@ AcpiDmDumpDmar (
-         /*
-          * Dump the optional device scope entries
-          */
--        if ((Subtable->Type == ACPI_DMAR_TYPE_HARDWARE_AFFINITY) ||
--            (Subtable->Type == ACPI_DMAR_TYPE_NAMESPACE))
-+        if ((SubType == ACPI_DMAR_TYPE_HARDWARE_AFFINITY) ||
-+            (SubType == ACPI_DMAR_TYPE_NAMESPACE))
-         {
-             /* These types do not support device scopes */
- 
-@@ -613,7 +633,7 @@ AcpiDmDumpDmar (
-         }
- 
-         ScopeTable = ACPI_ADD_PTR (ACPI_DMAR_DEVICE_SCOPE, Subtable, ScopeOffset);
--        while (ScopeOffset < Subtable->Length)
-+        while (ScopeOffset < SubLength)
-         {
-             AcpiOsPrintf ("\n");
-             Status = AcpiDmDumpTable (Length, Offset + ScopeOffset, ScopeTable,
-@@ -654,9 +674,8 @@ AcpiDmDumpDmar (
- NextSubtable:
-         /* Point to next subtable */
- 
--        Offset += Subtable->Length;
--        Subtable = ACPI_ADD_PTR (ACPI_DMAR_HEADER, Subtable,
--            Subtable->Length);
-+        Offset += SubLength;
-+        Subtable = ACPI_ADD_PTR (ACPI_DMAR_HEADER, Subtable, SubLength);
-     }
- }
- 
-@@ -683,12 +702,15 @@ AcpiDmDumpDrtm (
-     ACPI_DRTM_RESOURCE_LIST *DrtmRl;
-     ACPI_DRTM_DPS_ID        *DrtmDps;
-     UINT32                  Count;
-+    UINT32                  ValidatedCount;
-+    UINT32                  ResourceCount;
-+    UINT32		    Length;
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
--        AcpiDmTableInfoDrtm);
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoDrtm);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -702,7 +724,7 @@ AcpiDmDumpDrtm (
- 
-     DrtmVtl = ACPI_ADD_PTR (ACPI_DRTM_VTABLE_LIST, Table, Offset);
-     AcpiOsPrintf ("\n");
--    Status = AcpiDmDumpTable (Table->Length, Offset,
-+    Status = AcpiDmDumpTable (Length, Offset,
-         DrtmVtl, ACPI_OFFSET (ACPI_DRTM_VTABLE_LIST, ValidatedTables),
-         AcpiDmTableInfoDrtm0);
-     if (ACPI_FAILURE (Status))
-@@ -715,10 +737,11 @@ AcpiDmDumpDrtm (
-     /* Dump Validated table addresses */
- 
-     Count = 0;
--    while ((Offset < Table->Length) &&
--            (DrtmVtl->ValidatedTableCount > Count))
-+    ACPI_MOVE_32_TO_32(&ValidatedCount, &DrtmVtl->ValidatedTableCount);
-+    while ((Offset < Length) &&
-+            (ValidatedCount > Count))
-     {
--        Status = AcpiDmDumpTable (Table->Length, Offset,
-+        Status = AcpiDmDumpTable (Length, Offset,
-             ACPI_ADD_PTR (void, Table, Offset), sizeof (UINT64),
-             AcpiDmTableInfoDrtm0a);
-         if (ACPI_FAILURE (Status))
-@@ -734,7 +757,7 @@ AcpiDmDumpDrtm (
- 
-     DrtmRl = ACPI_ADD_PTR (ACPI_DRTM_RESOURCE_LIST, Table, Offset);
-     AcpiOsPrintf ("\n");
--    Status = AcpiDmDumpTable (Table->Length, Offset,
-+    Status = AcpiDmDumpTable (Length, Offset,
-         DrtmRl, ACPI_OFFSET (ACPI_DRTM_RESOURCE_LIST, Resources),
-         AcpiDmTableInfoDrtm1);
-     if (ACPI_FAILURE (Status))
-@@ -747,10 +770,11 @@ AcpiDmDumpDrtm (
-     /* Dump the Resource List */
- 
-     Count = 0;
--    while ((Offset < Table->Length) &&
--           (DrtmRl->ResourceCount > Count))
-+    ACPI_MOVE_32_TO_32(&ResourceCount, &DrtmRl->ResourceCount);
-+    while ((Offset < Length) &&
-+           (ResourceCount > Count))
-     {
--        Status = AcpiDmDumpTable (Table->Length, Offset,
-+        Status = AcpiDmDumpTable (Length, Offset,
-             ACPI_ADD_PTR (void, Table, Offset),
-             sizeof (ACPI_DRTM_RESOURCE), AcpiDmTableInfoDrtm1a);
-         if (ACPI_FAILURE (Status))
-@@ -766,7 +790,7 @@ AcpiDmDumpDrtm (
- 
-     DrtmDps = ACPI_ADD_PTR (ACPI_DRTM_DPS_ID, Table, Offset);
-     AcpiOsPrintf ("\n");
--    (void) AcpiDmDumpTable (Table->Length, Offset,
-+    (void) AcpiDmDumpTable (Length, Offset,
-         DrtmDps, sizeof (ACPI_DRTM_DPS_ID), AcpiDmTableInfoDrtm2);
- }
- 
-@@ -790,12 +814,13 @@ AcpiDmDumpEinj (
- {
-     ACPI_STATUS             Status;
-     ACPI_WHEA_HEADER        *Subtable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length;
-     UINT32                  Offset = sizeof (ACPI_TABLE_EINJ);
- 
- 
-     /* Main table */
- 
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoEinj);
-     if (ACPI_FAILURE (Status))
-     {
-@@ -805,7 +830,7 @@ AcpiDmDumpEinj (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_WHEA_HEADER, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         AcpiOsPrintf ("\n");
-         Status = AcpiDmDumpTable (Length, Offset, Subtable,
-@@ -843,12 +868,13 @@ AcpiDmDumpErst (
- {
-     ACPI_STATUS             Status;
-     ACPI_WHEA_HEADER        *Subtable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length;
-     UINT32                  Offset = sizeof (ACPI_TABLE_ERST);
- 
- 
-     /* Main table */
- 
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoErst);
-     if (ACPI_FAILURE (Status))
-     {
-@@ -858,7 +884,7 @@ AcpiDmDumpErst (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_WHEA_HEADER, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         AcpiOsPrintf ("\n");
-         Status = AcpiDmDumpTable (Length, Offset, Subtable,
-@@ -896,17 +922,19 @@ AcpiDmDumpFpdt (
- {
-     ACPI_STATUS             Status;
-     ACPI_FPDT_HEADER        *Subtable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length;
-     UINT32                  Offset = sizeof (ACPI_TABLE_FPDT);
-     ACPI_DMTABLE_INFO       *InfoTable;
-+    UINT16		    Type;
- 
- 
-     /* There is no main table (other than the standard ACPI header) */
- 
-     /* Subtables */
- 
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-     Subtable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         /* Common subtable header */
- 
-@@ -918,7 +946,8 @@ AcpiDmDumpFpdt (
-             return;
-         }
- 
--        switch (Subtable->Type)
-+	ACPI_MOVE_16_TO_16(&Type, &Subtable->Type);
-+        switch (Type)
-         {
-         case ACPI_FPDT_TYPE_BOOT:
- 
-@@ -932,8 +961,7 @@ AcpiDmDumpFpdt (
- 
-         default:
- 
--            AcpiOsPrintf ("\n**** Unknown FPDT subtable type 0x%X\n\n",
--                Subtable->Type);
-+            AcpiOsPrintf ("\n**** Unknown FPDT subtable type 0x%X\n\n", Type);
- 
-             /* Attempt to continue */
- 
-@@ -981,16 +1009,19 @@ AcpiDmDumpGtdt (
- {
-     ACPI_STATUS             Status;
-     ACPI_GTDT_HEADER        *Subtable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length;
-+    UINT16                  SubLength;
-     UINT32                  Offset = sizeof (ACPI_TABLE_GTDT);
-     ACPI_DMTABLE_INFO       *InfoTable;
-     UINT32                  SubtableLength;
-     UINT32                  GtCount;
-+    UINT32                  Tmp32;
-     ACPI_GTDT_TIMER_ENTRY   *GtxTable;
- 
- 
-     /* Main table */
- 
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoGtdt);
-     if (ACPI_FAILURE (Status))
-     {
-@@ -1017,7 +1048,7 @@ AcpiDmDumpGtdt (
- 
-     /* Subtables */
- 
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         /* Common subtable header */
- 
-@@ -1035,8 +1066,9 @@ AcpiDmDumpGtdt (
-         case ACPI_GTDT_TYPE_TIMER_BLOCK:
- 
-             SubtableLength = sizeof (ACPI_GTDT_TIMER_BLOCK);
--            GtCount = (ACPI_CAST_PTR (ACPI_GTDT_TIMER_BLOCK,
-+            Tmp32 = (ACPI_CAST_PTR (ACPI_GTDT_TIMER_BLOCK,
-                 Subtable))->TimerCount;
-+	    ACPI_MOVE_32_TO_32(&GtCount, &Tmp32);
- 
-             InfoTable = AcpiDmTableInfoGtdt0;
-             break;
-@@ -1057,8 +1089,9 @@ AcpiDmDumpGtdt (
-             return;
-         }
- 
-+	ACPI_MOVE_16_TO_16(&SubLength, &Subtable->Length);
-         Status = AcpiDmDumpTable (Length, Offset, Subtable,
--            Subtable->Length, InfoTable);
-+            SubLength, InfoTable);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -1117,16 +1150,18 @@ AcpiDmDumpHest (
- {
-     ACPI_STATUS             Status;
-     ACPI_HEST_HEADER        *Subtable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length;
-     UINT32                  Offset = sizeof (ACPI_TABLE_HEST);
-     ACPI_DMTABLE_INFO       *InfoTable;
-     UINT32                  SubtableLength;
-     UINT32                  BankCount;
-     ACPI_HEST_IA_ERROR_BANK *BankTable;
-+    UINT16		    SubType;
- 
- 
-     /* Main table */
- 
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoHest);
-     if (ACPI_FAILURE (Status))
-     {
-@@ -1136,10 +1171,11 @@ AcpiDmDumpHest (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_HEST_HEADER, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         BankCount = 0;
--        switch (Subtable->Type)
-+	ACPI_MOVE_16_TO_16(&SubType, &Subtable->Type);
-+        switch (SubType)
-         {
-         case ACPI_HEST_TYPE_IA32_CHECK:
- 
diff --git a/big-endian-dmtbdump2.patch b/big-endian-dmtbdump2.patch
deleted file mode 100644
index 0997b5b..0000000
--- a/big-endian-dmtbdump2.patch
+++ /dev/null
@@ -1,887 +0,0 @@
-Index: acpica-unix2-20200528/source/common/dmtbdump2.c
-===================================================================
---- acpica-unix2-20200528.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20200528/source/common/dmtbdump2.c
-@@ -75,16 +75,23 @@ AcpiDmDumpIort (
-     ACPI_IORT_SMMU          *IortSmmu = NULL;
-     UINT32                  Offset;
-     UINT32                  NodeOffset;
-+    UINT16                  NodeLength;
-     UINT32                  Length;
-     ACPI_DMTABLE_INFO       *InfoTable;
-     char                    *String;
-     UINT32                  i;
-     UINT32                  MappingByteLength;
-+    UINT32                  TableLen;
-+    UINT32                  ItsCount;
-+    UINT32                  MappingCount;
-+    UINT32                  CtxIntCount;
-+    UINT32                  PmuIntCount;
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoIort);
-+    ACPI_MOVE_32_TO_32(&TableLen, &Table->Length);
-+    Status = AcpiDmDumpTable (TableLen, 0, Table, 0, AcpiDmTableInfoIort);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -95,18 +102,19 @@ AcpiDmDumpIort (
- 
-     /* Dump the OptionalPadding (optional) */
- 
--    if (Iort->NodeOffset > Offset)
-+    ACPI_MOVE_32_TO_32(&NodeOffset, &Iort->NodeOffset);
-+    if (NodeOffset > Offset)
-     {
--        Status = AcpiDmDumpTable (Table->Length, Offset, Table,
--            Iort->NodeOffset - Offset, AcpiDmTableInfoIortPad);
-+        Status = AcpiDmDumpTable (TableLen, Offset, Table,
-+            NodeOffset - Offset, AcpiDmTableInfoIortPad);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-         }
-     }
- 
--    Offset = Iort->NodeOffset;
--    while (Offset < Table->Length)
-+    ACPI_MOVE_32_TO_32(&Offset, &Iort->NodeOffset);
-+    while (Offset < TableLen)
-     {
-         /* Common subtable header */
- 
-@@ -142,7 +150,8 @@ AcpiDmDumpIort (
-         case ACPI_IORT_NODE_PCI_ROOT_COMPLEX:
- 
-             InfoTable = AcpiDmTableInfoIort2;
--            Length = IortNode->Length - NodeOffset;
-+	    ACPI_MOVE_16_TO_16(&NodeLength, &IortNode->Length);
-+            Length = NodeLength - NodeOffset;
-             break;
- 
-         case ACPI_IORT_NODE_SMMU:
-@@ -155,7 +164,8 @@ AcpiDmDumpIort (
-         case ACPI_IORT_NODE_SMMU_V3:
- 
-             InfoTable = AcpiDmTableInfoIort4;
--            Length = IortNode->Length - NodeOffset;
-+	    ACPI_MOVE_16_TO_16(&NodeLength, &IortNode->Length);
-+            Length = NodeLength - NodeOffset;
-             break;
- 
-         case ACPI_IORT_NODE_PMCG:
-@@ -171,7 +181,8 @@ AcpiDmDumpIort (
- 
-             /* Attempt to continue */
- 
--            if (!IortNode->Length)
-+	    ACPI_MOVE_16_TO_16(&NodeLength, &IortNode->Length);
-+            if (!NodeLength)
-             {
-                 AcpiOsPrintf ("Invalid zero length IORT node\n");
-                 return;
-@@ -182,7 +193,7 @@ AcpiDmDumpIort (
-         /* Dump the node subtable header */
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
-+        Status = AcpiDmDumpTable (TableLen, Offset + NodeOffset,
-             ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
-             Length, InfoTable);
-         if (ACPI_FAILURE (Status))
-@@ -202,9 +213,10 @@ AcpiDmDumpIort (
- 
-             if (IortItsGroup)
-             {
--                for (i = 0; i < IortItsGroup->ItsCount; i++)
-+	        ACPI_MOVE_32_TO_32(&ItsCount, &IortItsGroup->ItsCount);
-+                for (i = 0; i < ItsCount; i++)
-                 {
--                    Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
-+                    Status = AcpiDmDumpTable (TableLen, Offset + NodeOffset,
-                         ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
-                         4, AcpiDmTableInfoIort0a);
-                     if (ACPI_FAILURE (Status))
-@@ -221,12 +233,13 @@ AcpiDmDumpIort (
- 
-             /* Dump the Padding (optional) */
- 
--            if (IortNode->Length > NodeOffset)
-+	    ACPI_MOVE_16_TO_16(&NodeLength, &IortNode->Length);
-+            if (NodeLength > NodeOffset)
-             {
-                 MappingByteLength =
-                     IortNode->MappingCount * sizeof (ACPI_IORT_ID_MAPPING);
--                Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
--                    Table, IortNode->Length - NodeOffset - MappingByteLength,
-+                Status = AcpiDmDumpTable (TableLen, Offset + NodeOffset,
-+                    Table, NodeLength - NodeOffset - MappingByteLength,
-                     AcpiDmTableInfoIort1a);
-                 if (ACPI_FAILURE (Status))
-                 {
-@@ -244,8 +257,8 @@ AcpiDmDumpIort (
-             if (IortSmmu)
-             {
-                 Length = 2 * sizeof (UINT64);
--                NodeOffset = IortSmmu->GlobalInterruptOffset;
--                Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
-+                ACPI_MOVE_32_TO_32(&NodeOffset, &IortSmmu->GlobalInterruptOffset);
-+                Status = AcpiDmDumpTable (TableLen, Offset + NodeOffset,
-                     ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
-                     Length, AcpiDmTableInfoIort3a);
-                 if (ACPI_FAILURE (Status))
-@@ -253,10 +266,11 @@ AcpiDmDumpIort (
-                     return;
-                 }
- 
--                NodeOffset = IortSmmu->ContextInterruptOffset;
--                for (i = 0; i < IortSmmu->ContextInterruptCount; i++)
-+                ACPI_MOVE_32_TO_32(&NodeOffset, &IortSmmu->ContextInterruptOffset);
-+                ACPI_MOVE_32_TO_32(&CtxIntCount, &IortSmmu->ContextInterruptCount);
-+                for (i = 0; i < CtxIntCount; i++)
-                 {
--                    Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
-+                    Status = AcpiDmDumpTable (TableLen, Offset + NodeOffset,
-                         ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
-                         8, AcpiDmTableInfoIort3b);
-                     if (ACPI_FAILURE (Status))
-@@ -267,10 +281,11 @@ AcpiDmDumpIort (
-                     NodeOffset += 8;
-                 }
- 
--                NodeOffset = IortSmmu->PmuInterruptOffset;
--                for (i = 0; i < IortSmmu->PmuInterruptCount; i++)
-+                ACPI_MOVE_32_TO_32(&NodeOffset, &IortSmmu->PmuInterruptOffset);
-+                ACPI_MOVE_32_TO_32(&PmuIntCount, &IortSmmu->PmuInterruptCount);
-+                for (i = 0; i < PmuIntCount; i++)
-                 {
--                    Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
-+                    Status = AcpiDmDumpTable (TableLen, Offset + NodeOffset,
-                         ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
-                         8, AcpiDmTableInfoIort3c);
-                     if (ACPI_FAILURE (Status))
-@@ -290,12 +305,13 @@ AcpiDmDumpIort (
- 
-         /* Dump the ID mappings */
- 
--        NodeOffset = IortNode->MappingOffset;
--        for (i = 0; i < IortNode->MappingCount; i++)
-+        ACPI_MOVE_32_TO_32(&NodeOffset, &IortNode->MappingOffset);
-+        ACPI_MOVE_32_TO_32(&MappingCount, &IortNode->MappingCount);
-+        for (i = 0; i < MappingCount; i++)
-         {
-             AcpiOsPrintf ("\n");
-             Length = sizeof (ACPI_IORT_ID_MAPPING);
--            Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
-+            Status = AcpiDmDumpTable (TableLen, Offset + NodeOffset,
-                 ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
-                 Length, AcpiDmTableInfoIortMap);
-             if (ACPI_FAILURE (Status))
-@@ -309,7 +325,8 @@ AcpiDmDumpIort (
- NextSubtable:
-         /* Point to next node subtable */
- 
--        Offset += IortNode->Length;
-+        ACPI_MOVE_16_TO_16(&NodeLength, &IortNode->Length);
-+        Offset += NodeLength;
-     }
- }
- 
-@@ -340,11 +357,14 @@ AcpiDmDumpIvrs (
-     ACPI_IVRS_DE_HEADER     *DeviceEntry;
-     ACPI_IVRS_HEADER        *Subtable;
-     ACPI_DMTABLE_INFO       *InfoTable;
-+    UINT32		    Length;
-+    UINT16		    SubLength;
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoIvrs);
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoIvrs);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -353,13 +373,14 @@ AcpiDmDumpIvrs (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_IVRS_HEADER, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         /* Common subtable header */
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
--            Subtable->Length, AcpiDmTableInfoIvrsHdr);
-+        ACPI_MOVE_16_TO_16(&SubLength, &Subtable->Length);
-+        Status = AcpiDmDumpTable (Length, Offset, Subtable,
-+            SubLength, AcpiDmTableInfoIvrsHdr);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -391,7 +412,7 @@ AcpiDmDumpIvrs (
- 
-             /* Attempt to continue */
- 
--            if (!Subtable->Length)
-+            if (!SubLength)
-             {
-                 AcpiOsPrintf ("Invalid zero length subtable\n");
-                 return;
-@@ -402,8 +423,8 @@ AcpiDmDumpIvrs (
-         /* Dump the subtable */
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
--            Subtable->Length, InfoTable);
-+        Status = AcpiDmDumpTable (Length, Offset, Subtable,
-+            SubLength, InfoTable);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -429,7 +450,7 @@ AcpiDmDumpIvrs (
-                     sizeof (ACPI_IVRS_HARDWARE2));
-             }
- 
--            while (EntryOffset < (Offset + Subtable->Length))
-+            while (EntryOffset < (Offset + SubLength))
-             {
-                 AcpiOsPrintf ("\n");
-                 /*
-@@ -491,7 +512,7 @@ AcpiDmDumpIvrs (
- 
-                 /* Dump the Device Entry */
- 
--                Status = AcpiDmDumpTable (Table->Length, EntryOffset,
-+                Status = AcpiDmDumpTable (Length, EntryOffset,
-                     DeviceEntry, EntryLength, InfoTable);
-                 if (ACPI_FAILURE (Status))
-                 {
-@@ -507,8 +528,8 @@ AcpiDmDumpIvrs (
- NextSubtable:
-         /* Point to next subtable */
- 
--        Offset += Subtable->Length;
--        Subtable = ACPI_ADD_PTR (ACPI_IVRS_HEADER, Subtable, Subtable->Length);
-+        Offset += SubLength;
-+        Subtable = ACPI_ADD_PTR (ACPI_IVRS_HEADER, Subtable, SubLength);
-     }
- }
- 
-@@ -534,7 +555,7 @@ AcpiDmDumpLpit (
- {
-     ACPI_STATUS             Status;
-     ACPI_LPIT_HEADER        *Subtable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length;
-     UINT32                  Offset = sizeof (ACPI_TABLE_LPIT);
-     ACPI_DMTABLE_INFO       *InfoTable;
-     UINT32                  SubtableLength;
-@@ -542,8 +563,9 @@ AcpiDmDumpLpit (
- 
-     /* Subtables */
- 
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-     Subtable = ACPI_ADD_PTR (ACPI_LPIT_HEADER, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         /* Common subtable header */
- 
-@@ -607,13 +629,14 @@ AcpiDmDumpMadt (
- {
-     ACPI_STATUS             Status;
-     ACPI_SUBTABLE_HEADER    *Subtable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length;
-     UINT32                  Offset = sizeof (ACPI_TABLE_MADT);
-     ACPI_DMTABLE_INFO       *InfoTable;
- 
- 
-     /* Main table */
- 
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoMadt);
-     if (ACPI_FAILURE (Status))
-     {
-@@ -623,7 +646,7 @@ AcpiDmDumpMadt (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         /* Common subtable header */
- 
-@@ -769,11 +792,13 @@ AcpiDmDumpMcfg (
-     ACPI_STATUS             Status;
-     UINT32                  Offset = sizeof (ACPI_TABLE_MCFG);
-     ACPI_MCFG_ALLOCATION    *Subtable;
-+    UINT32		    Len;
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoMcfg);
-+    ACPI_MOVE_32_TO_32(&Len, &Table->Length);
-+    Status = AcpiDmDumpTable (Len, 0, Table, 0, AcpiDmTableInfoMcfg);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -782,17 +807,17 @@ AcpiDmDumpMcfg (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_MCFG_ALLOCATION, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Len)
-     {
--        if (Offset + sizeof (ACPI_MCFG_ALLOCATION) > Table->Length)
-+        if (Offset + sizeof (ACPI_MCFG_ALLOCATION) > Len)
-         {
-             AcpiOsPrintf ("Warning: there are %u invalid trailing bytes\n",
--                (UINT32) sizeof (ACPI_MCFG_ALLOCATION) - (Offset - Table->Length));
-+                (UINT32) sizeof (ACPI_MCFG_ALLOCATION) - (Offset - Len));
-             return;
-         }
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (Len, Offset, Subtable,
-             sizeof (ACPI_MCFG_ALLOCATION), AcpiDmTableInfoMcfg0);
-         if (ACPI_FAILURE (Status))
-         {
-@@ -826,6 +851,7 @@ AcpiDmDumpMpst (
- {
-     ACPI_STATUS             Status;
-     UINT32                  Offset = sizeof (ACPI_TABLE_MPST);
-+    ACPI_TABLE_MPST	    *Mpst;
-     ACPI_MPST_POWER_NODE    *Subtable0;
-     ACPI_MPST_POWER_STATE   *Subtable0A;
-     ACPI_MPST_COMPONENT     *Subtable0B;
-@@ -834,11 +860,13 @@ AcpiDmDumpMpst (
-     UINT16                  SubtableCount;
-     UINT32                  PowerStateCount;
-     UINT32                  ComponentCount;
-+    UINT32		    Length;
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoMpst);
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoMpst);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -846,13 +874,14 @@ AcpiDmDumpMpst (
- 
-     /* Subtable: Memory Power Node(s) */
- 
--    SubtableCount = (ACPI_CAST_PTR (ACPI_TABLE_MPST, Table))->PowerNodeCount;
-+    Mpst = ACPI_CAST_PTR (ACPI_TABLE_MPST, Table);
-+    ACPI_MOVE_16_TO_16(&SubtableCount, &Mpst->PowerNodeCount);
-     Subtable0 = ACPI_ADD_PTR (ACPI_MPST_POWER_NODE, Table, Offset);
- 
--    while ((Offset < Table->Length) && SubtableCount)
-+    while ((Offset < Length) && SubtableCount)
-     {
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable0,
-+        Status = AcpiDmDumpTable (Length, Offset, Subtable0,
-             sizeof (ACPI_MPST_POWER_NODE), AcpiDmTableInfoMpst0);
-         if (ACPI_FAILURE (Status))
-         {
-@@ -861,8 +890,8 @@ AcpiDmDumpMpst (
- 
-         /* Extract the sub-subtable counts */
- 
--        PowerStateCount = Subtable0->NumPowerStates;
--        ComponentCount = Subtable0->NumPhysicalComponents;
-+        ACPI_MOVE_32_TO_32(&PowerStateCount, &Subtable0->NumPowerStates);
-+        ACPI_MOVE_32_TO_32(&ComponentCount, &Subtable0->NumPhysicalComponents);
-         Offset += sizeof (ACPI_MPST_POWER_NODE);
- 
-         /* Sub-subtables - Memory Power State Structure(s) */
-@@ -873,7 +902,7 @@ AcpiDmDumpMpst (
-         while (PowerStateCount)
-         {
-             AcpiOsPrintf ("\n");
--            Status = AcpiDmDumpTable (Table->Length, Offset, Subtable0A,
-+            Status = AcpiDmDumpTable (Length, Offset, Subtable0A,
-                 sizeof (ACPI_MPST_POWER_STATE), AcpiDmTableInfoMpst0A);
-             if (ACPI_FAILURE (Status))
-             {
-@@ -883,7 +912,7 @@ AcpiDmDumpMpst (
-             Subtable0A++;
-             PowerStateCount--;
-             Offset += sizeof (ACPI_MPST_POWER_STATE);
--       }
-+        }
- 
-         /* Sub-subtables - Physical Component ID Structure(s) */
- 
-@@ -896,7 +925,7 @@ AcpiDmDumpMpst (
- 
-         while (ComponentCount)
-         {
--            Status = AcpiDmDumpTable (Table->Length, Offset, Subtable0B,
-+            Status = AcpiDmDumpTable (Length, Offset, Subtable0B,
-                 sizeof (ACPI_MPST_COMPONENT), AcpiDmTableInfoMpst0B);
-             if (ACPI_FAILURE (Status))
-             {
-@@ -911,17 +940,19 @@ AcpiDmDumpMpst (
-         /* Point to next Memory Power Node subtable */
- 
-         SubtableCount--;
-+        ACPI_MOVE_32_TO_32(&PowerStateCount, &Subtable0->NumPowerStates);
-+        ACPI_MOVE_32_TO_32(&ComponentCount, &Subtable0->NumPhysicalComponents);
-         Subtable0 = ACPI_ADD_PTR (ACPI_MPST_POWER_NODE, Subtable0,
-             sizeof (ACPI_MPST_POWER_NODE) +
--            (sizeof (ACPI_MPST_POWER_STATE) * Subtable0->NumPowerStates) +
--            (sizeof (ACPI_MPST_COMPONENT) * Subtable0->NumPhysicalComponents));
-+            (sizeof (ACPI_MPST_POWER_STATE) * PowerStateCount) +
-+            (sizeof (ACPI_MPST_COMPONENT) * ComponentCount));
-     }
- 
-     /* Subtable: Count of Memory Power State Characteristic structures */
- 
-     AcpiOsPrintf ("\n");
-     Subtable1 = ACPI_CAST_PTR (ACPI_MPST_DATA_HDR, Subtable0);
--    Status = AcpiDmDumpTable (Table->Length, Offset, Subtable1,
-+    Status = AcpiDmDumpTable (Length, Offset, Subtable1,
-         sizeof (ACPI_MPST_DATA_HDR), AcpiDmTableInfoMpst1);
-     if (ACPI_FAILURE (Status))
-     {
-@@ -936,10 +967,10 @@ AcpiDmDumpMpst (
-     Subtable2 = ACPI_ADD_PTR (ACPI_MPST_POWER_DATA, Subtable1,
-         sizeof (ACPI_MPST_DATA_HDR));
- 
--    while ((Offset < Table->Length) && SubtableCount)
-+    while ((Offset < Length) && SubtableCount)
-     {
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable2,
-+        Status = AcpiDmDumpTable (Length, Offset, Subtable2,
-             sizeof (ACPI_MPST_POWER_DATA), AcpiDmTableInfoMpst2);
-         if (ACPI_FAILURE (Status))
-         {
-@@ -972,11 +1003,13 @@ AcpiDmDumpMsct (
-     ACPI_STATUS             Status;
-     UINT32                  Offset = sizeof (ACPI_TABLE_MSCT);
-     ACPI_MSCT_PROXIMITY     *Subtable;
-+    UINT32		    Length;
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoMsct);
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoMsct);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -985,12 +1018,12 @@ AcpiDmDumpMsct (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_MSCT_PROXIMITY, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         /* Common subtable header */
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (Length, Offset, Subtable,
-             sizeof (ACPI_MSCT_PROXIMITY), AcpiDmTableInfoMsct0);
-         if (ACPI_FAILURE (Status))
-         {
-@@ -1025,11 +1058,13 @@ AcpiDmDumpMtmr (
-     ACPI_STATUS             Status;
-     UINT32                  Offset = sizeof (ACPI_TABLE_MTMR);
-     ACPI_MTMR_ENTRY         *Subtable;
-+    UINT32		    Length;
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoMtmr);
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoMtmr);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -1038,12 +1073,12 @@ AcpiDmDumpMtmr (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_MTMR_ENTRY, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         /* Common subtable header */
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (Length, Offset, Subtable,
-             sizeof (ACPI_MTMR_ENTRY), AcpiDmTableInfoMtmr0);
-         if (ACPI_FAILURE (Status))
-         {
-@@ -1085,11 +1120,17 @@ AcpiDmDumpNfit (
-     ACPI_NFIT_SMBIOS        *SmbiosInfo = NULL;
-     ACPI_NFIT_FLUSH_ADDRESS *Hint = NULL;
-     UINT32                  i;
-+    UINT32                  TableLength;
-+    UINT16                  SubLength;
-+    UINT16                  SubType;
-+    UINT32                  Count;
-+    UINT16                  Count16;
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoNfit);
-+    ACPI_MOVE_32_TO_32(&TableLength, &Table->Length);
-+    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoNfit);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -1098,19 +1139,21 @@ AcpiDmDumpNfit (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_NFIT_HEADER, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < TableLength)
-     {
-         /* NFIT subtable header */
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
--            Subtable->Length, AcpiDmTableInfoNfitHdr);
-+	ACPI_MOVE_16_TO_16(&SubLength, &Subtable->Length);
-+        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
-+            SubLength, AcpiDmTableInfoNfitHdr);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-         }
- 
--        switch (Subtable->Type)
-+	ACPI_MOVE_16_TO_16(&SubType, &Subtable->Type);
-+        switch (SubType)
-         {
-         case ACPI_NFIT_TYPE_SYSTEM_ADDRESS:
- 
-@@ -1165,7 +1208,7 @@ AcpiDmDumpNfit (
- 
-             /* Attempt to continue */
- 
--            if (!Subtable->Length)
-+            if (!SubLength)
-             {
-                 AcpiOsPrintf ("Invalid zero length subtable\n");
-                 return;
-@@ -1174,8 +1217,8 @@ AcpiDmDumpNfit (
-         }
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
--            Subtable->Length, InfoTable);
-+        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
-+            SubLength, InfoTable);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -1183,14 +1226,15 @@ AcpiDmDumpNfit (
- 
-         /* Per-subtable variable-length fields */
- 
--        switch (Subtable->Type)
-+        switch (SubType)
-         {
-         case ACPI_NFIT_TYPE_INTERLEAVE:
- 
-             Interleave = ACPI_CAST_PTR (ACPI_NFIT_INTERLEAVE, Subtable);
--            for (i = 0; i < Interleave->LineCount; i++)
-+	    ACPI_MOVE_32_TO_32(&Count, &Interleave->LineCount);
-+            for (i = 0; i < Count; i++)
-             {
--                Status = AcpiDmDumpTable (Table->Length, Offset + FieldOffset,
-+                Status = AcpiDmDumpTable (TableLength, Offset + FieldOffset,
-                     &Interleave->LineOffset[i],
-                     sizeof (UINT32), AcpiDmTableInfoNfit2a);
-                 if (ACPI_FAILURE (Status))
-@@ -1204,12 +1248,11 @@ AcpiDmDumpNfit (
- 
-         case ACPI_NFIT_TYPE_SMBIOS:
- 
--            Length = Subtable->Length -
--                sizeof (ACPI_NFIT_SMBIOS) + sizeof (UINT8);
-+            Length = SubLength - sizeof (ACPI_NFIT_SMBIOS) + sizeof (UINT8);
- 
-             if (Length)
-             {
--                Status = AcpiDmDumpTable (Table->Length,
-+                Status = AcpiDmDumpTable (TableLength,
-                     sizeof (ACPI_NFIT_SMBIOS) - sizeof (UINT8),
-                     SmbiosInfo,
-                     Length, AcpiDmTableInfoNfit3a);
-@@ -1224,9 +1267,10 @@ AcpiDmDumpNfit (
-         case ACPI_NFIT_TYPE_FLUSH_ADDRESS:
- 
-             Hint = ACPI_CAST_PTR (ACPI_NFIT_FLUSH_ADDRESS, Subtable);
--            for (i = 0; i < Hint->HintCount; i++)
-+	    ACPI_MOVE_16_TO_16(&Count16, &Hint->HintCount);
-+            for (i = 0; i < Count16; i++)
-             {
--                Status = AcpiDmDumpTable (Table->Length, Offset + FieldOffset,
-+                Status = AcpiDmDumpTable (TableLength, Offset + FieldOffset,
-                     &Hint->HintAddress[i],
-                     sizeof (UINT64), AcpiDmTableInfoNfit6a);
-                 if (ACPI_FAILURE (Status))
-@@ -1245,8 +1289,8 @@ AcpiDmDumpNfit (
- NextSubtable:
-         /* Point to next subtable */
- 
--        Offset += Subtable->Length;
--        Subtable = ACPI_ADD_PTR (ACPI_NFIT_HEADER, Subtable, Subtable->Length);
-+        Offset += SubLength;
-+        Subtable = ACPI_ADD_PTR (ACPI_NFIT_HEADER, Subtable, SubLength);
-     }
- }
- 
-@@ -1271,12 +1315,13 @@ AcpiDmDumpPcct (
-     ACPI_STATUS             Status;
-     ACPI_PCCT_SUBSPACE      *Subtable;
-     ACPI_DMTABLE_INFO       *InfoTable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length;
-     UINT32                  Offset = sizeof (ACPI_TABLE_PCCT);
- 
- 
-     /* Main table */
- 
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoPcct);
-     if (ACPI_FAILURE (Status))
-     {
-@@ -1286,7 +1331,7 @@ AcpiDmDumpPcct (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_PCCT_SUBSPACE, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         /* Common subtable header */
- 
-@@ -1426,16 +1471,21 @@ AcpiDmDumpPmtt (
-     ACPI_PMTT_HEADER        *MemSubtable;
-     ACPI_PMTT_HEADER        *DimmSubtable;
-     ACPI_PMTT_DOMAIN        *DomainArray;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length;
-     UINT32                  Offset = sizeof (ACPI_TABLE_PMTT);
-     UINT32                  MemOffset;
-     UINT32                  DimmOffset;
-     UINT32                  DomainOffset;
--    UINT32                  DomainCount;
-+    UINT16                  DomainCount;
-+    UINT16		    SubLength;
-+    UINT16		    Tmp16;
-+    UINT16		    MemLength;
-+    UINT16		    DimmLength;
- 
- 
-     /* Main table */
- 
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoPmtt);
-     if (ACPI_FAILURE (Status))
-     {
-@@ -1445,13 +1495,14 @@ AcpiDmDumpPmtt (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         /* Common subtable header */
- 
-         AcpiOsPrintf ("\n");
-+        ACPI_MOVE_16_TO_16(&SubLength, &Subtable->Length);
-         Status = AcpiDmDumpTable (Length, Offset, Subtable,
--            Subtable->Length, AcpiDmTableInfoPmttHdr);
-+            SubLength, AcpiDmTableInfoPmttHdr);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -1470,7 +1521,7 @@ AcpiDmDumpPmtt (
-         /* Dump the fixed-length portion of the subtable */
- 
-         Status = AcpiDmDumpTable (Length, Offset, Subtable,
--            Subtable->Length, AcpiDmTableInfoPmtt0);
-+            SubLength, AcpiDmTableInfoPmtt0);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -1482,15 +1533,16 @@ AcpiDmDumpPmtt (
-         MemSubtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, Subtable,
-             sizeof (ACPI_PMTT_SOCKET));
- 
--        while (((Offset + MemOffset) < Table->Length) &&
--            (MemOffset < Subtable->Length))
-+        while (((Offset + MemOffset) < Length) &&
-+            (MemOffset < SubLength))
-         {
-             /* Common subtable header */
- 
-             AcpiOsPrintf ("\n");
-+	    ACPI_MOVE_16_TO_16(&MemLength, &MemSubtable->Length);
-             Status = AcpiDmDumpTable (Length,
-                 Offset + MemOffset, MemSubtable,
--                MemSubtable->Length, AcpiDmTableInfoPmttHdr);
-+                MemLength, AcpiDmTableInfoPmttHdr);
-             if (ACPI_FAILURE (Status))
-             {
-                 return;
-@@ -1510,7 +1562,7 @@ AcpiDmDumpPmtt (
- 
-             Status = AcpiDmDumpTable (Length,
-                 Offset + MemOffset, MemSubtable,
--                MemSubtable->Length, AcpiDmTableInfoPmtt1);
-+                MemLength, AcpiDmTableInfoPmtt1);
-             if (ACPI_FAILURE (Status))
-             {
-                 return;
-@@ -1518,13 +1570,14 @@ AcpiDmDumpPmtt (
- 
-             /* Walk the variable count of proximity domains */
- 
--            DomainCount = ((ACPI_PMTT_CONTROLLER *) MemSubtable)->DomainCount;
-+	    Tmp16 = ((ACPI_PMTT_CONTROLLER *) MemSubtable)->DomainCount;
-+            ACPI_MOVE_16_TO_16(&DomainCount, &Tmp16);
-             DomainOffset = sizeof (ACPI_PMTT_CONTROLLER);
-             DomainArray = ACPI_ADD_PTR (ACPI_PMTT_DOMAIN, MemSubtable,
-                 sizeof (ACPI_PMTT_CONTROLLER));
- 
--            while (((Offset + MemOffset + DomainOffset) < Table->Length) &&
--                ((MemOffset + DomainOffset) < Subtable->Length) &&
-+            while (((Offset + MemOffset + DomainOffset) < Length) &&
-+                ((MemOffset + DomainOffset) < SubLength) &&
-                 DomainCount)
-             {
-                 Status = AcpiDmDumpTable (Length,
-@@ -1552,15 +1605,16 @@ AcpiDmDumpPmtt (
-             DimmSubtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, MemSubtable,
-                 DomainOffset);
- 
--            while (((Offset + MemOffset + DimmOffset) < Table->Length) &&
--                (DimmOffset < MemSubtable->Length))
-+            while (((Offset + MemOffset + DimmOffset) < Length) &&
-+                (DimmOffset < MemLength))
-             {
-                 /* Common subtable header */
- 
-                 AcpiOsPrintf ("\n");
-+		ACPI_MOVE_16_TO_16(&DimmLength, &DimmSubtable->Length);
-                 Status = AcpiDmDumpTable (Length,
-                     Offset + MemOffset + DimmOffset, DimmSubtable,
--                    DimmSubtable->Length, AcpiDmTableInfoPmttHdr);
-+                    DimmLength, AcpiDmTableInfoPmttHdr);
-                 if (ACPI_FAILURE (Status))
-                 {
-                     return;
-@@ -1580,7 +1634,7 @@ AcpiDmDumpPmtt (
- 
-                 Status = AcpiDmDumpTable (Length,
-                     Offset + MemOffset + DimmOffset, DimmSubtable,
--                    DimmSubtable->Length, AcpiDmTableInfoPmtt2);
-+                    DimmLength, AcpiDmTableInfoPmtt2);
-                 if (ACPI_FAILURE (Status))
-                 {
-                     return;
-@@ -1588,23 +1642,22 @@ AcpiDmDumpPmtt (
- 
-                 /* Point to next DIMM subtable */
- 
--                DimmOffset += DimmSubtable->Length;
-+                DimmOffset += DimmLength;
-                 DimmSubtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER,
--                    DimmSubtable, DimmSubtable->Length);
-+                    DimmSubtable, DimmLength);
-             }
- 
-             /* Point to next Controller subtable */
- 
--            MemOffset += MemSubtable->Length;
-+            MemOffset += MemLength;
-             MemSubtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER,
--                MemSubtable, MemSubtable->Length);
-+                MemSubtable, MemLength);
-         }
- 
-         /* Point to next Socket subtable */
- 
--        Offset += Subtable->Length;
--        Subtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER,
--            Subtable, Subtable->Length);
-+        Offset += SubLength;
-+        Subtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, Subtable, SubLength);
-     }
- }
- 
-@@ -1765,6 +1818,8 @@ AcpiDmDumpS3pt (
-     ACPI_FPDT_HEADER        *Subtable;
-     ACPI_DMTABLE_INFO       *InfoTable;
-     ACPI_TABLE_S3PT         *S3ptTable = ACPI_CAST_PTR (ACPI_TABLE_S3PT, Tables);
-+    UINT32		    Length;
-+    UINT16                  SubType;
- 
- 
-     /* Main table */
-@@ -1775,20 +1830,22 @@ AcpiDmDumpS3pt (
-         return 0;
-     }
- 
-+    ACPI_MOVE_32_TO_32(&Length, &S3ptTable->Length);
-     Subtable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, S3ptTable, Offset);
--    while (Offset < S3ptTable->Length)
-+    while (Offset < Length)
-     {
-         /* Common subtable header */
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (S3ptTable->Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (Length, Offset, Subtable,
-             Subtable->Length, AcpiDmTableInfoS3ptHdr);
-         if (ACPI_FAILURE (Status))
-         {
-             return 0;
-         }
- 
--        switch (Subtable->Type)
-+        ACPI_MOVE_16_TO_16(&SubType, &Subtable->Type);
-+        switch (SubType)
-         {
-         case ACPI_S3PT_TYPE_RESUME:
- 
-@@ -1803,7 +1860,7 @@ AcpiDmDumpS3pt (
-         default:
- 
-             AcpiOsPrintf ("\n**** Unknown S3PT subtable type 0x%X\n",
--                Subtable->Type);
-+                SubType);
- 
-             /* Attempt to continue */
- 
-@@ -1816,7 +1873,7 @@ AcpiDmDumpS3pt (
-         }
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (S3ptTable->Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (Length, Offset, Subtable,
-             Subtable->Length, InfoTable);
-         if (ACPI_FAILURE (Status))
-         {
diff --git a/big-endian-dmtbdump3.patch b/big-endian-dmtbdump3.patch
deleted file mode 100644
index 4daf79c..0000000
--- a/big-endian-dmtbdump3.patch
+++ /dev/null
@@ -1,250 +0,0 @@
-Index: acpica-unix-20191018/source/common/dmtbdump3.c
-===================================================================
---- acpica-unix-20191018.orig/source/common/dmtbdump3.c
-+++ acpica-unix-20191018/source/common/dmtbdump3.c
-@@ -68,9 +68,11 @@ void
- AcpiDmDumpSlic (
-     ACPI_TABLE_HEADER       *Table)
- {
-+    UINT32	Length;
- 
--    (void) AcpiDmDumpTable (Table->Length, sizeof (ACPI_TABLE_HEADER), Table,
--        Table->Length - sizeof (*Table), AcpiDmTableInfoSlic);
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+    (void) AcpiDmDumpTable (Length, sizeof (ACPI_TABLE_HEADER), Table,
-+        Length - sizeof (*Table), AcpiDmTableInfoSlic);
- }
- 
- 
-@@ -93,14 +95,17 @@ AcpiDmDumpSlit (
-     ACPI_STATUS             Status;
-     UINT32                  Offset;
-     UINT8                   *Row;
--    UINT32                  Localities;
-+    UINT64                  Localities;
-     UINT32                  i;
-     UINT32                  j;
-+    UINT32		    Length;
-+    UINT64                  Tmp64;
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoSlit);
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoSlit);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -108,7 +113,8 @@ AcpiDmDumpSlit (
- 
-     /* Display the Locality NxN Matrix */
- 
--    Localities = (UINT32) ACPI_CAST_PTR (ACPI_TABLE_SLIT, Table)->LocalityCount;
-+    Tmp64 = (UINT64) ACPI_CAST_PTR (ACPI_TABLE_SLIT, Table)->LocalityCount;
-+    ACPI_MOVE_64_TO_64(&Localities, &Tmp64);
-     Offset = ACPI_OFFSET (ACPI_TABLE_SLIT, Entry[0]);
-     Row = (UINT8 *) ACPI_CAST_PTR (ACPI_TABLE_SLIT, Table)->Entry;
- 
-@@ -121,7 +127,7 @@ AcpiDmDumpSlit (
-         {
-             /* Check for beyond EOT */
- 
--            if (Offset >= Table->Length)
-+            if (Offset >= Length)
-             {
-                 AcpiOsPrintf (
-                     "\n**** Not enough room in table for all localities\n");
-@@ -173,11 +179,13 @@ AcpiDmDumpSrat (
-     UINT32                  Offset = sizeof (ACPI_TABLE_SRAT);
-     ACPI_SUBTABLE_HEADER    *Subtable;
-     ACPI_DMTABLE_INFO       *InfoTable;
-+    UINT32		    Length;
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoSrat);
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoSrat);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -186,12 +194,12 @@ AcpiDmDumpSrat (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         /* Common subtable header */
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (Length, Offset, Subtable,
-             Subtable->Length, AcpiDmTableInfoSratHdr);
-         if (ACPI_FAILURE (Status))
-         {
-@@ -245,7 +253,7 @@ AcpiDmDumpSrat (
-         }
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (Length, Offset, Subtable,
-             Subtable->Length, InfoTable);
-         if (ACPI_FAILURE (Status))
-         {
-@@ -282,13 +290,14 @@ AcpiDmDumpStao (
- {
-     ACPI_STATUS             Status;
-     char                    *Namepath;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length;
-     UINT32                  StringLength;
-     UINT32                  Offset = sizeof (ACPI_TABLE_STAO);
- 
- 
-     /* Main table */
- 
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoStao);
-     if (ACPI_FAILURE (Status))
-     {
-@@ -297,7 +306,7 @@ AcpiDmDumpStao (
- 
-     /* The rest of the table consists of Namepath strings */
- 
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         Namepath = ACPI_ADD_PTR (char, Table, Offset);
-         StringLength = strlen (Namepath) + 1;
-@@ -339,11 +348,14 @@ AcpiDmDumpTcpa (
-     ACPI_TABLE_TCPA_HDR     *Subtable = ACPI_ADD_PTR (
-                                 ACPI_TABLE_TCPA_HDR, Table, Offset);
-     ACPI_STATUS             Status;
-+    UINT32		    Length;
-+    UINT16		    PlatformClass;
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table,
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+    Status = AcpiDmDumpTable (Length, 0, Table,
-         0, AcpiDmTableInfoTcpaHdr);
-     if (ACPI_FAILURE (Status))
-     {
-@@ -354,18 +366,19 @@ AcpiDmDumpTcpa (
-      * Examine the PlatformClass field to determine the table type.
-      * Either a client or server table. Only one.
-      */
--    switch (CommonHeader->PlatformClass)
-+    ACPI_MOVE_16_TO_16(&PlatformClass, &CommonHeader->PlatformClass);
-+    switch (PlatformClass)
-     {
-     case ACPI_TCPA_CLIENT_TABLE:
- 
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
--            Table->Length - Offset, AcpiDmTableInfoTcpaClient);
-+        Status = AcpiDmDumpTable (Length, Offset, Subtable,
-+            Length - Offset, AcpiDmTableInfoTcpaClient);
-         break;
- 
-     case ACPI_TCPA_SERVER_TABLE:
- 
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
--            Table->Length - Offset, AcpiDmTableInfoTcpaServer);
-+        Status = AcpiDmDumpTable (Length, Offset, Subtable,
-+            Length - Offset, AcpiDmTableInfoTcpaServer);
-         break;
- 
-     default:
-@@ -512,11 +525,13 @@ AcpiDmDumpVrtc (
-     ACPI_STATUS             Status;
-     UINT32                  Offset = sizeof (ACPI_TABLE_VRTC);
-     ACPI_VRTC_ENTRY         *Subtable;
-+    UINT32		    Length;
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoVrtc);
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoVrtc);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -525,12 +540,12 @@ AcpiDmDumpVrtc (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_VRTC_ENTRY, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         /* Common subtable header */
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (Length, Offset, Subtable,
-             sizeof (ACPI_VRTC_ENTRY), AcpiDmTableInfoVrtc0);
-         if (ACPI_FAILURE (Status))
-         {
-@@ -565,11 +580,13 @@ AcpiDmDumpWdat (
-     ACPI_STATUS             Status;
-     UINT32                  Offset = sizeof (ACPI_TABLE_WDAT);
-     ACPI_WDAT_ENTRY         *Subtable;
-+    UINT32		    Length;
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoWdat);
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-+    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoWdat);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -578,12 +595,12 @@ AcpiDmDumpWdat (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_WDAT_ENTRY, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         /* Common subtable header */
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (Length, Offset, Subtable,
-             sizeof (ACPI_WDAT_ENTRY), AcpiDmTableInfoWdat0);
-         if (ACPI_FAILURE (Status))
-         {
-@@ -618,12 +635,13 @@ AcpiDmDumpWpbt (
- {
-     ACPI_STATUS             Status;
-     ACPI_TABLE_WPBT         *Subtable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length;
-     UINT16                  ArgumentsLength;
- 
- 
-     /* Dump the main table */
- 
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-     Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoWpbt);
-     if (ACPI_FAILURE (Status))
-     {
-@@ -633,10 +651,10 @@ AcpiDmDumpWpbt (
-     /* Extract the arguments buffer length from the main table */
- 
-     Subtable = ACPI_CAST_PTR (ACPI_TABLE_WPBT, Table);
--    ArgumentsLength = Subtable->ArgumentsLength;
-+    ACPI_MOVE_16_TO_16(&ArgumentsLength, &Subtable->ArgumentsLength);
- 
-     /* Dump the arguments buffer */
- 
--    (void) AcpiDmDumpTable (Table->Length, 0, Table, ArgumentsLength,
-+    (void) AcpiDmDumpTable (Length, 0, Table, ArgumentsLength,
-         AcpiDmTableInfoWpbt0);
- }
diff --git a/big-endian-v2.patch b/big-endian-v2.patch
deleted file mode 100644
index 807e534..0000000
--- a/big-endian-v2.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Updated versions of upstream often contain fixes that were not seen
-in the original big-endian patch; we try to capture those here.
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
-
-Index: acpica-unix-20191018/source/compiler/asllookup.c
-===================================================================
---- acpica-unix-20191018.orig/source/compiler/asllookup.c
-+++ acpica-unix-20191018/source/compiler/asllookup.c
-@@ -249,7 +249,8 @@ LkIsObjectUsed (
-      * ACPI names and are typically not referenced since they are meant
-      * to be called by the host OS.
-      */
--    if (Node->Name.Ascii[0] == '_')
-+    ACPI_MOVE_32_TO_32(&tmp.Ascii, Node->Name.Ascii);
-+    if (tmp.Ascii[0] == '_')
-     {
-         return (AE_OK);
-     }
diff --git a/big-endian-v3.patch b/big-endian-v3.patch
deleted file mode 100644
index 93ef67d..0000000
--- a/big-endian-v3.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-diff -Naur acpica-unix2-20200214.orig/source/components/namespace/nsutils.c acpica-unix2-20200214/source/components/namespace/nsutils.c
---- acpica-unix2-20200214.orig/source/components/namespace/nsutils.c	2020-02-14 10:33:55.000000000 -0700
-+++ acpica-unix2-20200214/source/components/namespace/nsutils.c	2020-02-26 10:25:43.477022167 -0700
-@@ -363,6 +363,15 @@
- 
-         /* Move on the next segment */
- 
-+	{
-+	    /* Make sure the name segment reflects endian-ness first */
-+
-+	    UINT32 Tmp32 = 0;
-+
-+	    memcpy(&Tmp32, Result, ACPI_NAMESEG_SIZE);
-+	    ACPI_MOVE_32_TO_32(Result, &Tmp32);
-+	}
-+
-         ExternalName++;
-         Result += ACPI_NAMESEG_SIZE;
-     }
-diff -Naur acpica-unix2-20200214.orig/source/common/dmtbdump2.c acpica-unix2-20200214/source/common/dmtbdump2.c
---- acpica-unix2-20200214.orig/source/common/dmtbdump2.c	2020-02-26 11:44:13.732967820 -0700
-+++ acpica-unix2-20200214/source/common/dmtbdump2.c	2020-02-26 12:38:44.286849954 -0700
-@@ -1685,6 +1685,8 @@
-     UINT32                  Offset = sizeof (ACPI_TABLE_FPDT);
-     ACPI_DMTABLE_INFO       *InfoTable;
-     UINT32                  i;
-+    UINT32                  TableLen;
-+    UINT32                  NumPrivRes;
- 
- 
-     /* There is no main table (other than the standard ACPI header) */
-@@ -1692,7 +1694,8 @@
-     /* Subtables */
- 
-     Offset = sizeof (ACPI_TABLE_HEADER);
--    while (Offset < Table->Length)
-+    ACPI_MOVE_32_TO_32(&TableLen, &Table->Length);
-+    while (Offset < TableLen)
-     {
-         AcpiOsPrintf ("\n");
- 
-@@ -1704,7 +1707,7 @@
-             AcpiOsPrintf ("Invalid subtable length\n");
-             return;
-         }
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (TableLen, Offset, Subtable,
-             Subtable->Length, AcpiDmTableInfoPpttHdr);
-         if (ACPI_FAILURE (Status))
-         {
-@@ -1746,7 +1749,7 @@
-             AcpiOsPrintf ("Invalid subtable length\n");
-             return;
-         }
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (TableLen, Offset, Subtable,
-             Subtable->Length, InfoTable);
-         if (ACPI_FAILURE (Status))
-         {
-@@ -1762,15 +1765,16 @@
- 
-             /* Dump SMBIOS handles */
- 
-+	    ACPI_MOVE_32_TO_32(&NumPrivRes, &PpttProcessor->NumberOfPrivResources);
-             if ((UINT8)(Subtable->Length - SubtableOffset) <
--                (UINT8)(PpttProcessor->NumberOfPrivResources * 4))
-+                (UINT8)(NumPrivRes * 4))
-             {
-                 AcpiOsPrintf ("Invalid private resource number\n");
-                 return;
-             }
--            for (i = 0; i < PpttProcessor->NumberOfPrivResources; i++)
-+            for (i = 0; i < NumPrivRes; i++)
-             {
--                Status = AcpiDmDumpTable (Table->Length, Offset + SubtableOffset,
-+                Status = AcpiDmDumpTable (TableLen, Offset + SubtableOffset,
-                     ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Subtable, SubtableOffset),
-                     4, AcpiDmTableInfoPptt0a);
-                 if (ACPI_FAILURE (Status))
-diff -Naur acpica-unix2-20200214.orig/source/compiler/dttable2.c acpica-unix2-20200214/source/compiler/dttable2.c
---- acpica-unix2-20200214.orig/source/compiler/dttable2.c	2020-02-26 11:44:13.726967769 -0700
-+++ acpica-unix2-20200214/source/compiler/dttable2.c	2020-02-26 12:39:03.671014890 -0700
-@@ -1087,9 +1087,11 @@
-                 Subtable->Buffer, sizeof (ACPI_SUBTABLE_HEADER));
-             if (PpttProcessor)
-             {
-+		UINT32 NumPrivRes;
-+
-                 /* Compile initiator proximity domain list */
- 
--                PpttProcessor->NumberOfPrivResources = 0;
-+                NumPrivRes = 0;
-                 while (*PFieldList)
-                 {
-                     Status = DtCompileTable (PFieldList,
-@@ -1105,8 +1107,9 @@
- 
-                     DtInsertSubtable (ParentTable, Subtable);
-                     PpttHeader->Length += (UINT8)(Subtable->Length);
--                    PpttProcessor->NumberOfPrivResources++;
-+                    NumPrivRes++;
-                 }
-+		ACPI_MOVE_32_TO_32(&PpttProcessor->NumberOfPrivResources, &NumPrivRes);
-             }
-             break;
- 
-diff -Naur acpica-unix2-20200214.orig/source/compiler/aslload.c acpica-unix2-20200214/source/compiler/aslload.c
---- acpica-unix2-20200214.orig/source/compiler/aslload.c	2020-02-14 10:33:53.000000000 -0700
-+++ acpica-unix2-20200214/source/compiler/aslload.c	2020-02-27 13:25:19.308413494 -0700
-@@ -175,13 +175,17 @@
-     ACPI_NAMESPACE_NODE     *Node;
-     ACPI_STATUS             Status;
-     char                    *ExternalPath;
-+    char                    TmpPath[ACPI_NAMESEG_SIZE];
- 
- 
-     SourceRegion = UtGetArg (Op, 0);
-     if (SourceRegion)
-     {
--        Status = AcpiNsLookup (WalkState->ScopeInfo,
--            SourceRegion->Asl.Value.String, AmlType, ACPI_IMODE_EXECUTE,
-+	char TmpName[ACPI_NAMESEG_SIZE];
-+
-+        ACPI_MOVE_32_TO_32(TmpName, SourceRegion->Asl.Value.String);
-+        Status = AcpiNsLookup (WalkState->ScopeInfo, TmpName,
-+            AmlType, ACPI_IMODE_EXECUTE,
-             ACPI_NS_SEARCH_PARENT | ACPI_NS_DONT_OPEN_SCOPE, NULL, &Node);
-         if (Status == AE_NOT_FOUND)
-         {
-@@ -232,8 +236,9 @@
- 
-         default:
- 
-+	    ACPI_MOVE_32_TO_32(TmpPath, Child->Asl.Value.String);
-             Status = AcpiNsLookup (WalkState->ScopeInfo,
--                Child->Asl.Value.String,
-+                TmpPath,
-                 ACPI_TYPE_LOCAL_REGION_FIELD,
-                 ACPI_IMODE_LOAD_PASS1,
-                 ACPI_NS_NO_UPSEARCH | ACPI_NS_DONT_OPEN_SCOPE |
diff --git a/big-endian.patch b/big-endian.patch
deleted file mode 100644
index 284bc46..0000000
--- a/big-endian.patch
+++ /dev/null
@@ -1,4693 +0,0 @@
-Big-endian support
-
-This is a combined patch that folds all of the past and present changes
-for big-endian support into a single patch, hopefully eliminating any sort
-of redundancy but also capturing all such changes in a single location.
-
-To date, this has been critical for the s390x architecture only.
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
-
-Index: acpica-unix2-20200528/source/compiler/aslcodegen.c
-===================================================================
---- acpica-unix2-20200528.orig/source/compiler/aslcodegen.c
-+++ acpica-unix2-20200528/source/compiler/aslcodegen.c
-@@ -237,16 +237,12 @@ CgWriteAmlOpcode (
-     ACPI_PARSE_OBJECT       *Op)
- {
-     UINT8                   PkgLenFirstByte;
--    UINT32                  i;
--    union {
--        UINT16                  Opcode;
--        UINT8                   OpcodeBytes[2];
--    } Aml;
--    union {
--        UINT32                  Len;
--        UINT8                   LenBytes[4];
--    } PkgLen;
--
-+    UINT8                   Byte;
-+    UINT16                  Word;
-+    UINT32                  DWord;
-+    UINT64                  QWord;
-+    UINT16                  AmlOpcode;
-+    UINT32                  PkgLen;
- 
-     /* We expect some DEFAULT_ARGs, just ignore them */
- 
-@@ -279,51 +275,52 @@ CgWriteAmlOpcode (
- 
-         /* Special opcodes for within a field definition */
- 
--        Aml.Opcode = AML_FIELD_OFFSET_OP;
-+        AmlOpcode = AML_FIELD_OFFSET_OP;
-         break;
- 
-     case AML_INT_ACCESSFIELD_OP:
- 
--        Aml.Opcode = AML_FIELD_ACCESS_OP;
-+        AmlOpcode = AML_FIELD_ACCESS_OP;
-         break;
- 
-     case AML_INT_CONNECTION_OP:
- 
--        Aml.Opcode = AML_FIELD_CONNECTION_OP;
-+        AmlOpcode = AML_FIELD_CONNECTION_OP;
-         break;
- 
-     default:
- 
--        Aml.Opcode = Op->Asl.AmlOpcode;
-+        AmlOpcode = Op->Asl.AmlOpcode;
-         break;
-     }
- 
- 
--    switch (Aml.Opcode)
-+    switch (AmlOpcode)
-     {
-     case AML_PACKAGE_LENGTH:
- 
-         /* Value is the length to be encoded (Used in field definitions) */
- 
--        PkgLen.Len = (UINT32) Op->Asl.Value.Integer;
-+        PkgLen = (UINT32) Op->Asl.Value.Integer;
-         break;
- 
-     default:
- 
-         /* Check for two-byte opcode */
- 
--        if (Aml.Opcode > 0x00FF)
-+        if (AmlOpcode > 0x00FF)
-         {
-             /* Write the high byte first */
--
--            CgLocalWriteAmlData (Op, &Aml.OpcodeBytes[1], 1);
-+	    Byte = ACPI_HIBYTE(AmlOpcode);
-+	    CgLocalWriteAmlData (Op, &Byte, 1);
-         }
- 
--        CgLocalWriteAmlData (Op, &Aml.OpcodeBytes[0], 1);
-+	Byte = ACPI_LOBYTE(AmlOpcode);
-+        CgLocalWriteAmlData (Op, &Byte, 1);
- 
-         /* Subtreelength doesn't include length of package length bytes */
- 
--        PkgLen.Len = Op->Asl.AmlSubtreeLength + Op->Asl.AmlPkgLenBytes;
-+        PkgLen = Op->Asl.AmlSubtreeLength + Op->Asl.AmlPkgLenBytes;
-         break;
-     }
- 
-@@ -334,8 +331,8 @@ CgWriteAmlOpcode (
-         if (Op->Asl.AmlPkgLenBytes == 1)
-         {
-             /* Simplest case -- no bytes to follow, just write the count */
--
--            CgLocalWriteAmlData (Op, &PkgLen.LenBytes[0], 1);
-+            Byte = ACPI_LOBYTE(PkgLen);
-+            CgLocalWriteAmlData (Op, &Byte, 1);
-         }
-         else if (Op->Asl.AmlPkgLenBytes != 0)
-         {
-@@ -345,7 +342,7 @@ CgWriteAmlOpcode (
-              */
-             PkgLenFirstByte = (UINT8)
-                 (((UINT32) (Op->Asl.AmlPkgLenBytes - 1) << 6) |
--                (PkgLen.LenBytes[0] & 0x0F));
-+                (PkgLen & 0x0F));
- 
-             CgLocalWriteAmlData (Op, &PkgLenFirstByte, 1);
- 
-@@ -353,39 +350,47 @@ CgWriteAmlOpcode (
-              * Shift the length over by the 4 bits we just stuffed
-              * in the first byte
-              */
--            PkgLen.Len >>= 4;
-+            PkgLen >>= 4;
- 
-             /*
-              * Now we can write the remaining bytes -
-              * either 1, 2, or 3 bytes
-              */
--            for (i = 0; i < (UINT32) (Op->Asl.AmlPkgLenBytes - 1); i++)
-+            Byte = ACPI_LOBYTE(PkgLen);
-+            CgLocalWriteAmlData (Op, &Byte, 1);
-+            if (Op->Asl.AmlPkgLenBytes >= 3)
-+            {
-+                Byte = ACPI_HIBYTE(PkgLen);
-+                CgLocalWriteAmlData (Op, &Byte, 1);
-+            }
-+            if (Op->Asl.AmlPkgLenBytes >= 4)
-             {
--                CgLocalWriteAmlData (Op, &PkgLen.LenBytes[i], 1);
-+                Byte = ACPI_LOBYTE(ACPI_HIWORD(PkgLen));
-+                CgLocalWriteAmlData (Op, &Byte, 1);
-             }
-         }
-     }
- 
--    switch (Aml.Opcode)
-+    switch (AmlOpcode)
-     {
-     case AML_BYTE_OP:
--
--        CgLocalWriteAmlData (Op, &Op->Asl.Value.Integer, 1);
-+        Byte = (UINT8) Op->Asl.Value.Integer;
-+        CgLocalWriteAmlData (Op, &Byte, 1);
-         break;
- 
-     case AML_WORD_OP:
--
--        CgLocalWriteAmlData (Op, &Op->Asl.Value.Integer, 2);
-+        ACPI_MOVE_64_TO_16(&Word, &Op->Asl.Value.Integer);
-+        CgLocalWriteAmlData (Op, &Word, 2);
-        break;
- 
-     case AML_DWORD_OP:
--
--        CgLocalWriteAmlData (Op, &Op->Asl.Value.Integer, 4);
-+        ACPI_MOVE_64_TO_32(&DWord, &Op->Asl.Value.Integer);
-+        CgLocalWriteAmlData (Op, &DWord, 4);
-         break;
- 
-     case AML_QWORD_OP:
--
--        CgLocalWriteAmlData (Op, &Op->Asl.Value.Integer, 8);
-+        ACPI_MOVE_64_TO_64(&QWord, &Op->Asl.Value.Integer);
-+        CgLocalWriteAmlData (Op, &QWord, 8);
-         break;
- 
-     case AML_STRING_OP:
-@@ -421,6 +426,7 @@ CgWriteTableHeader (
-     ACPI_PARSE_OBJECT       *Op)
- {
-     ACPI_PARSE_OBJECT       *Child;
-+    UINT32                  DWord;
-     UINT32                  CommentLength;
-     ACPI_COMMENT_NODE       *Current;
- 
-@@ -478,7 +484,7 @@ CgWriteTableHeader (
-     /* OEM Revision */
- 
-     Child = Child->Asl.Next;
--    AslGbl_TableHeader.OemRevision = (UINT32) Child->Asl.Value.Integer;
-+    ACPI_MOVE_64_TO_32(&AslGbl_TableHeader.OemRevision, &Child->Asl.Value.Integer);
- 
-     /* Compiler ID */
- 
-@@ -486,12 +492,13 @@ CgWriteTableHeader (
- 
-     /* Compiler version */
- 
--    AslGbl_TableHeader.AslCompilerRevision = ACPI_CA_VERSION;
-+    DWord = ACPI_CA_VERSION;
-+    ACPI_MOVE_32_TO_32(&AslGbl_TableHeader.AslCompilerRevision, &DWord);
- 
-     /* Table length. Checksum zero for now, will rewrite later */
- 
--    AslGbl_TableHeader.Length = sizeof (ACPI_TABLE_HEADER) +
--        Op->Asl.AmlSubtreeLength;
-+    DWord = sizeof (ACPI_TABLE_HEADER) + Op->Asl.AmlSubtreeLength;
-+    ACPI_MOVE_32_TO_32(&AslGbl_TableHeader.Length, &DWord);
- 
-     /* Calculate the comment lengths for this definition block parseOp */
- 
-@@ -625,7 +632,10 @@ CgWriteNode (
-     ACPI_PARSE_OBJECT       *Op)
- {
-     ASL_RESOURCE_NODE       *Rnode;
--
-+    UINT8                   Byte;
-+    UINT16                  Word;
-+    UINT32                  DWord;
-+    UINT64                  QWord;
- 
-     /* Write all comments here. */
- 
-@@ -649,13 +659,24 @@ CgWriteNode (
-     switch (Op->Asl.AmlOpcode)
-     {
-     case AML_RAW_DATA_BYTE:
-+        Byte = (UINT8) Op->Asl.Value.Integer;
-+        CgLocalWriteAmlData (Op, &Byte, 1);
-+        return;
-+
-     case AML_RAW_DATA_WORD:
--    case AML_RAW_DATA_DWORD:
--    case AML_RAW_DATA_QWORD:
-+        ACPI_MOVE_64_TO_16(&Word, &Op->Asl.Value.Integer);
-+        CgLocalWriteAmlData (Op, &Word, 2);
-+        return;
- 
--        CgLocalWriteAmlData (Op, &Op->Asl.Value.Integer, Op->Asl.AmlLength);
-+    case AML_RAW_DATA_DWORD:
-+        ACPI_MOVE_64_TO_32(&DWord, &Op->Asl.Value.Integer);
-+        CgLocalWriteAmlData (Op, &DWord, 4);
-         return;
- 
-+    case AML_RAW_DATA_QWORD:
-+        ACPI_MOVE_64_TO_64(&QWord, &Op->Asl.Value.Integer);
-+        CgLocalWriteAmlData (Op, &QWord, 8);
-+        return;
- 
-     case AML_RAW_DATA_BUFFER:
- 
-Index: acpica-unix2-20200528/source/compiler/aslopcodes.c
-===================================================================
---- acpica-unix2-20200528.orig/source/compiler/aslopcodes.c
-+++ acpica-unix2-20200528/source/compiler/aslopcodes.c
-@@ -485,6 +485,7 @@ OpcDoUnicode (
-     UINT32                  i;
-     UINT8                   *AsciiString;
-     UINT16                  *UnicodeString;
-+    UINT16                  UChar;
-     ACPI_PARSE_OBJECT       *BufferLengthOp;
- 
- 
-@@ -511,7 +512,8 @@ OpcDoUnicode (
- 
-     for (i = 0; i < Count; i++)
-     {
--        UnicodeString[i] = (UINT16) AsciiString[i];
-+        UChar = (UINT16) AsciiString[i];
-+        ACPI_MOVE_16_TO_16(&UnicodeString[i], &UChar);
-     }
- 
-     /*
-Index: acpica-unix2-20200528/source/compiler/aslrestype1.c
-===================================================================
---- acpica-unix2-20200528.orig/source/compiler/aslrestype1.c
-+++ acpica-unix2-20200528/source/compiler/aslrestype1.c
-@@ -142,6 +142,11 @@ RsDoMemory24Descriptor (
-     ACPI_PARSE_OBJECT       *LengthOp = NULL;
-     ASL_RESOURCE_NODE       *Rnode;
-     UINT32                  CurrentByteOffset;
-+    UINT16                  Minimum = 0;
-+    UINT16                  Maximum = 0;
-+    UINT16                  AddressLength = 0;
-+    UINT16                  Alignment = 0;
-+    UINT16                  ResourceLength;
-     UINT32                  i;
- 
- 
-@@ -151,7 +156,8 @@ RsDoMemory24Descriptor (
- 
-     Descriptor = Rnode->Buffer;
-     Descriptor->Memory24.DescriptorType = ACPI_RESOURCE_NAME_MEMORY24;
--    Descriptor->Memory24.ResourceLength = 9;
-+    ResourceLength = 9;
-+    ACPI_MOVE_16_TO_16(&Descriptor->Memory24.ResourceLength, &ResourceLength);
- 
-     /* Process all child initialization nodes */
- 
-@@ -168,7 +174,7 @@ RsDoMemory24Descriptor (
- 
-         case 1: /* Min Address */
- 
--            Descriptor->Memory24.Minimum = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Minimum = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_MINADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Memory24.Minimum));
-             MinOp = InitializerOp;
-@@ -176,7 +182,7 @@ RsDoMemory24Descriptor (
- 
-         case 2: /* Max Address */
- 
--            Descriptor->Memory24.Maximum = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Maximum = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_MAXADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Memory24.Maximum));
-             MaxOp = InitializerOp;
-@@ -184,14 +190,14 @@ RsDoMemory24Descriptor (
- 
-         case 3: /* Alignment */
- 
--            Descriptor->Memory24.Alignment = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Alignment = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_ALIGNMENT,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Memory24.Alignment));
-             break;
- 
-         case 4: /* Length */
- 
--            Descriptor->Memory24.AddressLength = (UINT16) InitializerOp->Asl.Value.Integer;
-+            AddressLength = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Memory24.AddressLength));
-             LengthOp = InitializerOp;
-@@ -214,12 +220,17 @@ RsDoMemory24Descriptor (
-     /* Validate the Min/Max/Len/Align values (Alignment==0 means 64K) */
- 
-     RsSmallAddressCheck (ACPI_RESOURCE_NAME_MEMORY24,
--        Descriptor->Memory24.Minimum,
--        Descriptor->Memory24.Maximum,
--        Descriptor->Memory24.AddressLength,
--        Descriptor->Memory24.Alignment,
-+        Minimum,
-+        Maximum,
-+        AddressLength,
-+        Alignment,
-         MinOp, MaxOp, LengthOp, NULL, Info->DescriptorTypeOp);
- 
-+    ACPI_MOVE_16_TO_16(&Descriptor->Memory24.Minimum, &Minimum);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Memory24.Maximum, &Maximum);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Memory24.AddressLength, &AddressLength);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Memory24.Alignment, &Alignment);
-+
-     return (Rnode);
- }
- 
-@@ -248,6 +259,11 @@ RsDoMemory32Descriptor (
-     ACPI_PARSE_OBJECT       *AlignOp = NULL;
-     ASL_RESOURCE_NODE       *Rnode;
-     UINT32                  CurrentByteOffset;
-+    UINT32                  Minimum = 0;
-+    UINT32                  Maximum = 0;
-+    UINT32                  AddressLength = 0;
-+    UINT32                  Alignment = 0;
-+    UINT16                  ResourceLength;
-     UINT32                  i;
- 
- 
-@@ -257,7 +273,8 @@ RsDoMemory32Descriptor (
- 
-     Descriptor = Rnode->Buffer;
-     Descriptor->Memory32.DescriptorType = ACPI_RESOURCE_NAME_MEMORY32;
--    Descriptor->Memory32.ResourceLength = 17;
-+    ResourceLength = 17;
-+    ACPI_MOVE_16_TO_16(&Descriptor->Memory32.ResourceLength, &ResourceLength);
- 
-     /* Process all child initialization nodes */
- 
-@@ -274,7 +291,7 @@ RsDoMemory32Descriptor (
- 
-         case 1:  /* Min Address */
- 
--            Descriptor->Memory32.Minimum = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Minimum = (UINT32) InitializerOp->Asl.Value.Integer;
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_MINADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Memory32.Minimum));
-             MinOp = InitializerOp;
-@@ -282,7 +299,7 @@ RsDoMemory32Descriptor (
- 
-         case 2: /* Max Address */
- 
--            Descriptor->Memory32.Maximum = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Maximum = (UINT32) InitializerOp->Asl.Value.Integer;
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Memory32.Maximum));
-             MaxOp = InitializerOp;
-@@ -290,7 +307,7 @@ RsDoMemory32Descriptor (
- 
-         case 3: /* Alignment */
- 
--            Descriptor->Memory32.Alignment = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Alignment = (UINT32) InitializerOp->Asl.Value.Integer;
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_ALIGNMENT,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Memory32.Alignment));
-             AlignOp = InitializerOp;
-@@ -298,7 +315,7 @@ RsDoMemory32Descriptor (
- 
-         case 4: /* Length */
- 
--            Descriptor->Memory32.AddressLength = (UINT32) InitializerOp->Asl.Value.Integer;
-+            AddressLength = (UINT32) InitializerOp->Asl.Value.Integer;
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Memory32.AddressLength));
-             LengthOp = InitializerOp;
-@@ -321,12 +338,17 @@ RsDoMemory32Descriptor (
-     /* Validate the Min/Max/Len/Align values */
- 
-     RsSmallAddressCheck (ACPI_RESOURCE_NAME_MEMORY32,
--        Descriptor->Memory32.Minimum,
--        Descriptor->Memory32.Maximum,
--        Descriptor->Memory32.AddressLength,
--        Descriptor->Memory32.Alignment,
-+        Minimum,
-+        Maximum,
-+        AddressLength,
-+        Alignment,
-         MinOp, MaxOp, LengthOp, AlignOp, Info->DescriptorTypeOp);
- 
-+    ACPI_MOVE_32_TO_32(&Descriptor->Memory32.Minimum, &Minimum);
-+    ACPI_MOVE_32_TO_32(&Descriptor->Memory32.Maximum, &Maximum);
-+    ACPI_MOVE_32_TO_32(&Descriptor->Memory32.AddressLength, &AddressLength);
-+    ACPI_MOVE_32_TO_32(&Descriptor->Memory32.Alignment, &Alignment);
-+
-     return (Rnode);
- }
- 
-@@ -351,6 +373,7 @@ RsDoMemory32FixedDescriptor (
-     ACPI_PARSE_OBJECT       *InitializerOp;
-     ASL_RESOURCE_NODE       *Rnode;
-     UINT32                  CurrentByteOffset;
-+    UINT16                  ResourceLength;
-     UINT32                  i;
- 
- 
-@@ -360,7 +383,8 @@ RsDoMemory32FixedDescriptor (
- 
-     Descriptor = Rnode->Buffer;
-     Descriptor->FixedMemory32.DescriptorType = ACPI_RESOURCE_NAME_FIXED_MEMORY32;
--    Descriptor->FixedMemory32.ResourceLength = 9;
-+    ResourceLength = 9;
-+    ACPI_MOVE_16_TO_16(&Descriptor->FixedMemory32.ResourceLength, &ResourceLength);
- 
-     /* Process all child initialization nodes */
- 
-@@ -377,14 +401,16 @@ RsDoMemory32FixedDescriptor (
- 
-         case 1: /* Address */
- 
--            Descriptor->FixedMemory32.Address = (UINT32) InitializerOp->Asl.Value.Integer;
-+            ACPI_MOVE_64_TO_32(&Descriptor->FixedMemory32.Address,
-+                &InitializerOp->Asl.Value.Integer);
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_BASEADDRESS,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (FixedMemory32.Address));
-             break;
- 
-         case 2: /* Length */
- 
--            Descriptor->FixedMemory32.AddressLength = (UINT32) InitializerOp->Asl.Value.Integer;
-+            ACPI_MOVE_64_TO_32(&Descriptor->FixedMemory32.AddressLength,
-+                &InitializerOp->Asl.Value.Integer);
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (FixedMemory32.AddressLength));
-             break;
-Index: acpica-unix2-20200528/source/compiler/aslrestype1i.c
-===================================================================
---- acpica-unix2-20200528.orig/source/compiler/aslrestype1i.c
-+++ acpica-unix2-20200528/source/compiler/aslrestype1i.c
-@@ -198,6 +198,8 @@ RsDoFixedDmaDescriptor (
-     ACPI_PARSE_OBJECT       *InitializerOp;
-     ASL_RESOURCE_NODE       *Rnode;
-     UINT32                  CurrentByteOffset;
-+    UINT16                  RequestLines = 0;
-+    UINT16                  Channels = 0;
-     UINT32                  i;
- 
- 
-@@ -217,14 +219,14 @@ RsDoFixedDmaDescriptor (
-         {
-         case 0: /* DMA Request Lines [WORD] (_DMA) */
- 
--            Descriptor->FixedDma.RequestLines = (UINT16) InitializerOp->Asl.Value.Integer;
-+            RequestLines = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_DMA,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (FixedDma.RequestLines));
-             break;
- 
-         case 1: /* DMA Channel [WORD] (_TYP) */
- 
--            Descriptor->FixedDma.Channels = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Channels = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_DMATYPE,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (FixedDma.Channels));
-             break;
-@@ -249,6 +251,9 @@ RsDoFixedDmaDescriptor (
-         InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
-     }
- 
-+    ACPI_MOVE_16_TO_16(&Descriptor->FixedDma.RequestLines, &RequestLines);
-+    ACPI_MOVE_16_TO_16(&Descriptor->FixedDma.Channels, &Channels);
-+
-     return (Rnode);
- }
- 
-@@ -274,6 +279,7 @@ RsDoFixedIoDescriptor (
-     ACPI_PARSE_OBJECT       *AddressOp = NULL;
-     ASL_RESOURCE_NODE       *Rnode;
-     UINT32                  CurrentByteOffset;
-+    UINT16                  Address = 0;
-     UINT32                  i;
- 
- 
-@@ -293,8 +299,7 @@ RsDoFixedIoDescriptor (
-         {
-         case 0: /* Base Address */
- 
--            Descriptor->FixedIo.Address =
--                (UINT16) InitializerOp->Asl.Value.Integer;
-+            Address = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_BASEADDRESS,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (FixedIo.Address));
-             AddressOp = InitializerOp;
-@@ -324,11 +329,13 @@ RsDoFixedIoDescriptor (
- 
-     /* Error checks */
- 
--    if (Descriptor->FixedIo.Address > 0x03FF)
-+    if (Address > 0x03FF)
-     {
-         AslError (ASL_WARNING, ASL_MSG_ISA_ADDRESS, AddressOp, NULL);
-     }
- 
-+    ACPI_MOVE_16_TO_16(&Descriptor->FixedIo.Address, &Address);
-+
-     return (Rnode);
- }
- 
-@@ -357,6 +364,8 @@ RsDoIoDescriptor (
-     ACPI_PARSE_OBJECT       *AlignOp = NULL;
-     ASL_RESOURCE_NODE       *Rnode;
-     UINT32                  CurrentByteOffset;
-+    UINT16                  Minimum = 0;
-+    UINT16                  Maximum = 0;
-     UINT32                  i;
- 
- 
-@@ -383,8 +392,7 @@ RsDoIoDescriptor (
- 
-         case 1:  /* Min Address */
- 
--            Descriptor->Io.Minimum =
--                (UINT16) InitializerOp->Asl.Value.Integer;
-+            Minimum = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_MINADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Io.Minimum));
-             MinOp = InitializerOp;
-@@ -392,8 +400,7 @@ RsDoIoDescriptor (
- 
-         case 2: /* Max Address */
- 
--            Descriptor->Io.Maximum =
--                (UINT16) InitializerOp->Asl.Value.Integer;
-+            Maximum = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_MAXADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Io.Maximum));
-             MaxOp = InitializerOp;
-@@ -434,12 +441,15 @@ RsDoIoDescriptor (
-     /* Validate the Min/Max/Len/Align values */
- 
-     RsSmallAddressCheck (ACPI_RESOURCE_NAME_IO,
--        Descriptor->Io.Minimum,
--        Descriptor->Io.Maximum,
-+        Minimum,
-+        Maximum,
-         Descriptor->Io.AddressLength,
-         Descriptor->Io.Alignment,
-         MinOp, MaxOp, LengthOp, AlignOp, Info->DescriptorTypeOp);
- 
-+    ACPI_MOVE_16_TO_16(&Descriptor->Io.Minimum, &Minimum);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Io.Maximum, &Maximum);
-+
-     return (Rnode);
- }
- 
-@@ -559,9 +569,9 @@ RsDoIrqDescriptor (
-         InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
-     }
- 
--    /* Now we can set the channel mask */
-+    /* Now we can set the interrupt mask */
- 
--    Descriptor->Irq.IrqMask = IrqMask;
-+    ACPI_MOVE_16_TO_16(&Descriptor->Irq.IrqMask, &IrqMask);
-     return (Rnode);
- }
- 
-@@ -660,6 +670,6 @@ RsDoIrqNoFlagsDescriptor (
- 
-     /* Now we can set the interrupt mask */
- 
--    Descriptor->Irq.IrqMask = IrqMask;
-+    ACPI_MOVE_16_TO_16(&Descriptor->Irq.IrqMask, &IrqMask);
-     return (Rnode);
- }
-Index: acpica-unix2-20200528/source/compiler/aslrestype2.c
-===================================================================
---- acpica-unix2-20200528.orig/source/compiler/aslrestype2.c
-+++ acpica-unix2-20200528/source/compiler/aslrestype2.c
-@@ -76,6 +76,7 @@ RsDoGeneralRegisterDescriptor (
-     ACPI_PARSE_OBJECT       *InitializerOp;
-     ASL_RESOURCE_NODE       *Rnode;
-     UINT32                  CurrentByteOffset;
-+    UINT16                  ResourceLength;
-     UINT32                  i;
- 
- 
-@@ -85,7 +86,9 @@ RsDoGeneralRegisterDescriptor (
- 
-     Descriptor = Rnode->Buffer;
-     Descriptor->GenericReg.DescriptorType = ACPI_RESOURCE_NAME_GENERIC_REGISTER;
--    Descriptor->GenericReg.ResourceLength = 12;
-+    ResourceLength = 12;
-+    ACPI_MOVE_16_TO_16(&Descriptor->GenericReg.ResourceLength,
-+		    &ResourceLength);
- 
-     /* Process all child initialization nodes */
- 
-@@ -95,35 +98,52 @@ RsDoGeneralRegisterDescriptor (
-         {
-         case 0: /* Address space */
- 
-+	    /*
-             Descriptor->GenericReg.AddressSpaceId = (UINT8) InitializerOp->Asl.Value.Integer;
-+	    */
-+            ACPI_MOVE_64_TO_8(&Descriptor->GenericReg.AddressSpaceId,
-+			      &InitializerOp->Asl.Value.Integer);
-             RsCreateByteField (InitializerOp, ACPI_RESTAG_ADDRESSSPACE,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (GenericReg.AddressSpaceId));
-            break;
- 
-         case 1: /* Register Bit Width */
- 
-+	    /*
-             Descriptor->GenericReg.BitWidth = (UINT8) InitializerOp->Asl.Value.Integer;
-+	    */
-+            ACPI_MOVE_64_TO_8(&Descriptor->GenericReg.BitWidth,
-+			      &InitializerOp->Asl.Value.Integer);
-             RsCreateByteField (InitializerOp, ACPI_RESTAG_REGISTERBITWIDTH,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (GenericReg.BitWidth));
-             break;
- 
-         case 2: /* Register Bit Offset */
- 
-+	    /*
-             Descriptor->GenericReg.BitOffset = (UINT8) InitializerOp->Asl.Value.Integer;
-+	    */
-+            ACPI_MOVE_64_TO_8(&Descriptor->GenericReg.BitOffset,
-+			      &InitializerOp->Asl.Value.Integer);
-             RsCreateByteField (InitializerOp, ACPI_RESTAG_REGISTERBITOFFSET,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (GenericReg.BitOffset));
-             break;
- 
-         case 3: /* Register Address */
- 
--            Descriptor->GenericReg.Address = InitializerOp->Asl.Value.Integer;
-+	    ACPI_MOVE_64_TO_64(&Descriptor->GenericReg.Address,
-+			    &InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_ADDRESS,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (GenericReg.Address));
-             break;
- 
-         case 4: /* Access Size (ACPI 3.0) */
- 
-+	    /*
-             Descriptor->GenericReg.AccessSize = (UINT8) InitializerOp->Asl.Value.Integer;
-+	    */
-+	    ACPI_MOVE_64_TO_8(&Descriptor->GenericReg.AccessSize,
-+			      &InitializerOp->Asl.Value.Integer);
-             RsCreateByteField (InitializerOp, ACPI_RESTAG_ACCESSSIZE,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (GenericReg.AccessSize));
- 
-@@ -177,6 +197,7 @@ RsDoInterruptDescriptor (
-     AML_RESOURCE            *Rover = NULL;
-     ACPI_PARSE_OBJECT       *InitializerOp;
-     ASL_RESOURCE_NODE       *Rnode;
-+    UINT16                  ResourceLength = 0;
-     UINT16                  StringLength = 0;
-     UINT32                  OptionIndex = 0;
-     UINT32                  CurrentByteOffset;
-@@ -225,7 +246,7 @@ RsDoInterruptDescriptor (
-      * Initial descriptor length -- may be enlarged if there are
-      * optional fields present
-      */
--    Descriptor->ExtendedIrq.ResourceLength  = 2;  /* Flags and table length byte */
-+    ResourceLength  = 2;  /* Flags and table length byte */
-     Descriptor->ExtendedIrq.InterruptCount  = 0;
- 
-     Rover = ACPI_CAST_PTR (AML_RESOURCE,
-@@ -333,10 +354,11 @@ RsDoInterruptDescriptor (
- 
-             /* Save the integer and move pointer to the next one */
- 
--            Rover->DwordItem = (UINT32) InitializerOp->Asl.Value.Integer;
-+            ACPI_MOVE_64_TO_32(&Rover->DwordItem,
-+                &InitializerOp->Asl.Value.Integer);
-             Rover = ACPI_ADD_PTR (AML_RESOURCE, &(Rover->DwordItem), 4);
-             Descriptor->ExtendedIrq.InterruptCount++;
--            Descriptor->ExtendedIrq.ResourceLength += 4;
-+            ResourceLength += 4;
- 
-             /* Case 7: First interrupt number in list */
- 
-@@ -372,7 +394,7 @@ RsDoInterruptDescriptor (
-     {
-         Rover->ByteItem = ResSourceIndex;
-         Rover = ACPI_ADD_PTR (AML_RESOURCE, &(Rover->ByteItem), 1);
--        Descriptor->ExtendedIrq.ResourceLength += 1;
-+        ResourceLength += 1;
-     }
- 
-     /* Add optional ResSource string if present */
-@@ -381,14 +403,15 @@ RsDoInterruptDescriptor (
-     {
-         strcpy ((char *) Rover, (char *) ResSourceString);
- 
--        Descriptor->ExtendedIrq.ResourceLength = (UINT16)
--            (Descriptor->ExtendedIrq.ResourceLength + StringLength);
-+        ResourceLength = (UINT16) (ResourceLength + StringLength);
-     }
- 
-     Rnode->BufferLength =
-         (ASL_RESDESC_OFFSET (ExtendedIrq.Interrupts[0]) -
-         ASL_RESDESC_OFFSET (ExtendedIrq.DescriptorType))
-         + OptionIndex + StringLength;
-+    ACPI_MOVE_16_TO_16(&Descriptor->ExtendedIrq.ResourceLength,
-+		    &ResourceLength);
-     return (Rnode);
- }
- 
-@@ -436,7 +459,7 @@ RsDoVendorLargeDescriptor (
- 
-     Descriptor = Rnode->Buffer;
-     Descriptor->VendorLarge.DescriptorType = ACPI_RESOURCE_NAME_VENDOR_LARGE;
--    Descriptor->VendorLarge.ResourceLength = (UINT16) i;
-+    ACPI_MOVE_32_TO_16(&Descriptor->VendorLarge.ResourceLength, &i);
- 
-     /* Point to end-of-descriptor for vendor data */
- 
-Index: acpica-unix2-20200528/source/compiler/aslrestype2d.c
-===================================================================
---- acpica-unix2-20200528.orig/source/compiler/aslrestype2d.c
-+++ acpica-unix2-20200528/source/compiler/aslrestype2d.c
-@@ -79,7 +79,13 @@ RsDoDwordIoDescriptor (
-     ACPI_PARSE_OBJECT       *GranOp = NULL;
-     ASL_RESOURCE_NODE       *Rnode;
-     UINT16                  StringLength = 0;
-+    UINT16                  ResourceLength = 0;
-     UINT32                  OptionIndex = 0;
-+    UINT32                  Minimum = 0;
-+    UINT32                  Maximum = 0;
-+    UINT32                  AddressLength = 0;
-+    UINT32                  Granularity = 0;
-+    UINT32                  TranslationOffset = 0;
-     UINT8                   *OptionalFields;
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-@@ -102,8 +108,7 @@ RsDoDwordIoDescriptor (
-      * optional fields present
-      */
-     OptionalFields = ((UINT8 *) Descriptor) + sizeof (AML_RESOURCE_ADDRESS32);
--    Descriptor->Address32.ResourceLength = (UINT16)
--        (sizeof (AML_RESOURCE_ADDRESS32) -
-+    ResourceLength = (UINT16) (sizeof (AML_RESOURCE_ADDRESS32) -
-          sizeof (AML_RESOURCE_LARGE_HEADER));
- 
-     /* Process all child initialization nodes */
-@@ -147,8 +152,7 @@ RsDoDwordIoDescriptor (
- 
-         case 5: /* Address Granularity */
- 
--            Descriptor->Address32.Granularity =
--                (UINT32) InitializerOp->Asl.Value.Integer;
-+            Granularity = (UINT32) InitializerOp->Asl.Value.Integer;
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Granularity));
-             GranOp = InitializerOp;
-@@ -156,8 +160,7 @@ RsDoDwordIoDescriptor (
- 
-         case 6: /* Address Min */
- 
--            Descriptor->Address32.Minimum =
--                (UINT32) InitializerOp->Asl.Value.Integer;
-+            Minimum = (UINT32) InitializerOp->Asl.Value.Integer;
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_MINADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Minimum));
-             MinOp = InitializerOp;
-@@ -165,8 +168,7 @@ RsDoDwordIoDescriptor (
- 
-         case 7: /* Address Max */
- 
--            Descriptor->Address32.Maximum =
--                (UINT32) InitializerOp->Asl.Value.Integer;
-+            Maximum = (UINT32) InitializerOp->Asl.Value.Integer;
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Maximum));
-             MaxOp = InitializerOp;
-@@ -174,16 +176,14 @@ RsDoDwordIoDescriptor (
- 
-         case 8: /* Translation Offset */
- 
--            Descriptor->Address32.TranslationOffset =
--                (UINT32) InitializerOp->Asl.Value.Integer;
-+            TranslationOffset = (UINT32) InitializerOp->Asl.Value.Integer;
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.TranslationOffset));
-             break;
- 
-         case 9: /* Address Length */
- 
--            Descriptor->Address32.AddressLength =
--                (UINT32) InitializerOp->Asl.Value.Integer;
-+            AddressLength = (UINT32) InitializerOp->Asl.Value.Integer;
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.AddressLength));
-             LengthOp = InitializerOp;
-@@ -197,7 +197,7 @@ RsDoDwordIoDescriptor (
- 
-                 OptionalFields[0] = (UINT8) InitializerOp->Asl.Value.Integer;
-                 OptionIndex++;
--                Descriptor->Address32.ResourceLength++;
-+                ResourceLength++;
-                 ResSourceIndex = TRUE;
-             }
-             break;
-@@ -211,8 +211,7 @@ RsDoDwordIoDescriptor (
-                 {
-                     /* Found a valid ResourceSource */
- 
--                    Descriptor->Address32.ResourceLength = (UINT16)
--                        (Descriptor->Address32.ResourceLength + StringLength);
-+                    ResourceLength = (UINT16) (ResourceLength + StringLength);
- 
-                     strcpy ((char *)
-                         &OptionalFields[OptionIndex],
-@@ -272,13 +271,20 @@ RsDoDwordIoDescriptor (
-     /* Validate the Min/Max/Len/Gran values */
- 
-     RsLargeAddressCheck (
--        (UINT64) Descriptor->Address32.Minimum,
--        (UINT64) Descriptor->Address32.Maximum,
--        (UINT64) Descriptor->Address32.AddressLength,
--        (UINT64) Descriptor->Address32.Granularity,
-+        Minimum,
-+        Maximum,
-+        AddressLength,
-+        Granularity,
-         Descriptor->Address32.Flags,
-         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
- 
-+    ACPI_MOVE_16_TO_16(&Descriptor->Address32.ResourceLength, &ResourceLength);
-+    ACPI_MOVE_32_TO_32(&Descriptor->Address32.Minimum, &Minimum);
-+    ACPI_MOVE_32_TO_32(&Descriptor->Address32.Maximum, &Maximum);
-+    ACPI_MOVE_32_TO_32(&Descriptor->Address32.AddressLength, &AddressLength);
-+    ACPI_MOVE_32_TO_32(&Descriptor->Address32.Granularity, &Granularity);
-+    ACPI_MOVE_32_TO_32(&Descriptor->Address32.TranslationOffset, &TranslationOffset);
-+
-     Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS32) +
-         OptionIndex + StringLength;
-     return (Rnode);
-@@ -310,7 +316,13 @@ RsDoDwordMemoryDescriptor (
-     ASL_RESOURCE_NODE       *Rnode;
-     UINT8                   *OptionalFields;
-     UINT16                  StringLength = 0;
-+    UINT16                  ResourceLength = 0;
-     UINT32                  OptionIndex = 0;
-+    UINT32                  Minimum = 0;
-+    UINT32                  Maximum = 0;
-+    UINT32                  AddressLength = 0;
-+    UINT32                  Granularity = 0;
-+    UINT32                  TranslationOffset = 0;
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-     BOOLEAN                 ResSourceIndex = FALSE;
-@@ -332,11 +344,9 @@ RsDoDwordMemoryDescriptor (
-      * optional fields present
-      */
-     OptionalFields = ((UINT8 *) Descriptor) + sizeof (AML_RESOURCE_ADDRESS32);
--    Descriptor->Address32.ResourceLength = (UINT16)
--        (sizeof (AML_RESOURCE_ADDRESS32) -
-+    ResourceLength = (UINT16) (sizeof (AML_RESOURCE_ADDRESS32) -
-          sizeof (AML_RESOURCE_LARGE_HEADER));
- 
--
-     /* Process all child initialization nodes */
- 
-     for (i = 0; InitializerOp; i++)
-@@ -385,8 +395,7 @@ RsDoDwordMemoryDescriptor (
- 
-         case 6: /* Address Granularity */
- 
--            Descriptor->Address32.Granularity =
--                (UINT32) InitializerOp->Asl.Value.Integer;
-+            Granularity = (UINT32) InitializerOp->Asl.Value.Integer;
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Granularity));
-             GranOp = InitializerOp;
-@@ -394,8 +403,7 @@ RsDoDwordMemoryDescriptor (
- 
-         case 7: /* Min Address */
- 
--            Descriptor->Address32.Minimum =
--                (UINT32) InitializerOp->Asl.Value.Integer;
-+            Minimum = (UINT32) InitializerOp->Asl.Value.Integer;
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_MINADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Minimum));
-             MinOp = InitializerOp;
-@@ -403,8 +411,7 @@ RsDoDwordMemoryDescriptor (
- 
-         case 8: /* Max Address */
- 
--            Descriptor->Address32.Maximum =
--                (UINT32) InitializerOp->Asl.Value.Integer;
-+            Maximum = (UINT32) InitializerOp->Asl.Value.Integer;
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Maximum));
-             MaxOp = InitializerOp;
-@@ -412,16 +419,14 @@ RsDoDwordMemoryDescriptor (
- 
-         case 9: /* Translation Offset */
- 
--            Descriptor->Address32.TranslationOffset =
--                (UINT32) InitializerOp->Asl.Value.Integer;
-+            TranslationOffset = (UINT32) InitializerOp->Asl.Value.Integer;
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.TranslationOffset));
-             break;
- 
-         case 10: /* Address Length */
- 
--            Descriptor->Address32.AddressLength =
--                (UINT32) InitializerOp->Asl.Value.Integer;
-+            AddressLength = (UINT32) InitializerOp->Asl.Value.Integer;
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.AddressLength));
-             LengthOp = InitializerOp;
-@@ -433,7 +438,7 @@ RsDoDwordMemoryDescriptor (
-             {
-                 OptionalFields[0] = (UINT8) InitializerOp->Asl.Value.Integer;
-                 OptionIndex++;
--                Descriptor->Address32.ResourceLength++;
-+                ResourceLength++;
-                 ResSourceIndex = TRUE;
-             }
-             break;
-@@ -445,8 +450,8 @@ RsDoDwordMemoryDescriptor (
-             {
-                 if (StringLength)
-                 {
--                    Descriptor->Address32.ResourceLength = (UINT16)
--                        (Descriptor->Address32.ResourceLength + StringLength);
-+
-+                    ResourceLength = (UINT16) (ResourceLength + StringLength);
- 
-                     strcpy ((char *)
-                         &OptionalFields[OptionIndex],
-@@ -507,13 +512,20 @@ RsDoDwordMemoryDescriptor (
-     /* Validate the Min/Max/Len/Gran values */
- 
-     RsLargeAddressCheck (
--        (UINT64) Descriptor->Address32.Minimum,
--        (UINT64) Descriptor->Address32.Maximum,
--        (UINT64) Descriptor->Address32.AddressLength,
--        (UINT64) Descriptor->Address32.Granularity,
-+        Minimum,
-+        Maximum,
-+        AddressLength,
-+        Granularity,
-         Descriptor->Address32.Flags,
-         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
- 
-+    ACPI_MOVE_16_TO_16(&Descriptor->Address32.ResourceLength, &ResourceLength);
-+    ACPI_MOVE_32_TO_32(&Descriptor->Address32.Minimum, &Minimum);
-+    ACPI_MOVE_32_TO_32(&Descriptor->Address32.Maximum, &Maximum);
-+    ACPI_MOVE_32_TO_32(&Descriptor->Address32.AddressLength, &AddressLength);
-+    ACPI_MOVE_32_TO_32(&Descriptor->Address32.Granularity, &Granularity);
-+    ACPI_MOVE_32_TO_32(&Descriptor->Address32.TranslationOffset, &TranslationOffset);
-+
-     Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS32) +
-         OptionIndex + StringLength;
-     return (Rnode);
-@@ -545,7 +557,13 @@ RsDoDwordSpaceDescriptor (
-     ASL_RESOURCE_NODE       *Rnode;
-     UINT8                   *OptionalFields;
-     UINT16                  StringLength = 0;
-+    UINT16                  ResourceLength = 0;
-     UINT32                  OptionIndex = 0;
-+    UINT32                  Minimum = 0;
-+    UINT32                  Maximum = 0;
-+    UINT32                  AddressLength = 0;
-+    UINT32                  Granularity = 0;
-+    UINT32                  TranslationOffset = 0;
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-     BOOLEAN                 ResSourceIndex = FALSE;
-@@ -566,8 +584,7 @@ RsDoDwordSpaceDescriptor (
-      * optional fields present
-      */
-     OptionalFields = ((UINT8 *) Descriptor) + sizeof (AML_RESOURCE_ADDRESS32);
--    Descriptor->Address32.ResourceLength = (UINT16)
--        (sizeof (AML_RESOURCE_ADDRESS32) -
-+    ResourceLength = (UINT16) (sizeof (AML_RESOURCE_ADDRESS32) -
-          sizeof (AML_RESOURCE_LARGE_HEADER));
- 
-     /* Process all child initialization nodes */
-@@ -616,8 +633,7 @@ RsDoDwordSpaceDescriptor (
- 
-         case 6: /* Address Granularity */
- 
--            Descriptor->Address32.Granularity =
--                (UINT32) InitializerOp->Asl.Value.Integer;
-+            Granularity = (UINT32) InitializerOp->Asl.Value.Integer;
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Granularity));
-             GranOp = InitializerOp;
-@@ -625,8 +641,7 @@ RsDoDwordSpaceDescriptor (
- 
-         case 7: /* Min Address */
- 
--            Descriptor->Address32.Minimum =
--                (UINT32) InitializerOp->Asl.Value.Integer;
-+            Minimum = (UINT32) InitializerOp->Asl.Value.Integer;
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_MINADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Minimum));
-             MinOp = InitializerOp;
-@@ -634,8 +649,7 @@ RsDoDwordSpaceDescriptor (
- 
-         case 8: /* Max Address */
- 
--            Descriptor->Address32.Maximum =
--                (UINT32) InitializerOp->Asl.Value.Integer;
-+            Maximum = (UINT32) InitializerOp->Asl.Value.Integer;
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Maximum));
-             MaxOp = InitializerOp;
-@@ -643,16 +657,14 @@ RsDoDwordSpaceDescriptor (
- 
-         case 9: /* Translation Offset */
- 
--            Descriptor->Address32.TranslationOffset =
--                (UINT32) InitializerOp->Asl.Value.Integer;
-+            TranslationOffset = (UINT32) InitializerOp->Asl.Value.Integer;
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.TranslationOffset));
-             break;
- 
-         case 10: /* Address Length */
- 
--            Descriptor->Address32.AddressLength =
--                (UINT32) InitializerOp->Asl.Value.Integer;
-+            AddressLength = (UINT32) InitializerOp->Asl.Value.Integer;
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.AddressLength));
-             LengthOp = InitializerOp;
-@@ -664,7 +676,7 @@ RsDoDwordSpaceDescriptor (
-             {
-                 OptionalFields[0] = (UINT8) InitializerOp->Asl.Value.Integer;
-                 OptionIndex++;
--                Descriptor->Address32.ResourceLength++;
-+                ResourceLength++;
-                 ResSourceIndex = TRUE;
-             }
-             break;
-@@ -676,8 +688,7 @@ RsDoDwordSpaceDescriptor (
-             {
-                 if (StringLength)
-                 {
--                    Descriptor->Address32.ResourceLength = (UINT16)
--                        (Descriptor->Address32.ResourceLength + StringLength);
-+                    ResourceLength = (UINT16) (ResourceLength + StringLength);
- 
-                     strcpy ((char *)
-                         &OptionalFields[OptionIndex],
-@@ -724,13 +735,20 @@ RsDoDwordSpaceDescriptor (
-     /* Validate the Min/Max/Len/Gran values */
- 
-     RsLargeAddressCheck (
--        (UINT64) Descriptor->Address32.Minimum,
--        (UINT64) Descriptor->Address32.Maximum,
--        (UINT64) Descriptor->Address32.AddressLength,
--        (UINT64) Descriptor->Address32.Granularity,
-+        Minimum,
-+        Maximum,
-+        AddressLength,
-+        Granularity,
-         Descriptor->Address32.Flags,
-         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
- 
-+    ACPI_MOVE_16_TO_16(&Descriptor->Address32.ResourceLength, &ResourceLength);
-+    ACPI_MOVE_32_TO_32(&Descriptor->Address32.Minimum, &Minimum);
-+    ACPI_MOVE_32_TO_32(&Descriptor->Address32.Maximum, &Maximum);
-+    ACPI_MOVE_32_TO_32(&Descriptor->Address32.AddressLength, &AddressLength);
-+    ACPI_MOVE_32_TO_32(&Descriptor->Address32.Granularity, &Granularity);
-+    ACPI_MOVE_32_TO_32(&Descriptor->Address32.TranslationOffset, &TranslationOffset);
-+
-     Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS32) +
-         OptionIndex + StringLength;
-     return (Rnode);
-Index: acpica-unix2-20200528/source/compiler/aslrestype2e.c
-===================================================================
---- acpica-unix2-20200528.orig/source/compiler/aslrestype2e.c
-+++ acpica-unix2-20200528/source/compiler/aslrestype2e.c
-@@ -78,6 +78,13 @@ RsDoExtendedIoDescriptor (
-     ACPI_PARSE_OBJECT       *GranOp = NULL;
-     ASL_RESOURCE_NODE       *Rnode;
-     UINT16                  StringLength = 0;
-+    UINT16                  ResourceLength = 0;
-+    UINT64                  Minimum = 0;
-+    UINT64                  Maximum = 0;
-+    UINT64                  AddressLength = 0;
-+    UINT64                  Granularity = 0;
-+    UINT64                  TranslationOffset = 0;
-+    UINT64                  TypeSpecific = 0;
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
- 
-@@ -94,9 +101,10 @@ RsDoExtendedIoDescriptor (
-     Descriptor->ExtAddress64.ResourceType = ACPI_ADDRESS_TYPE_IO_RANGE;
-     Descriptor->ExtAddress64.RevisionID = AML_RESOURCE_EXTENDED_ADDRESS_REVISION;
- 
--    Descriptor->ExtAddress64.ResourceLength = (UINT16)
--        (sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) -
-+    ResourceLength  = (UINT16) (sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) -
-          sizeof (AML_RESOURCE_LARGE_HEADER));
-+    ACPI_MOVE_16_TO_16(&Descriptor->ExtAddress64.ResourceLength,
-+        &ResourceLength);
- 
-     /* Process all child initialization nodes */
- 
-@@ -139,7 +147,7 @@ RsDoExtendedIoDescriptor (
- 
-         case 5: /* Address Granularity */
- 
--            Descriptor->ExtAddress64.Granularity = InitializerOp->Asl.Value.Integer;
-+            Granularity = InitializerOp->Asl.Value.Integer;
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Granularity));
-             GranOp = InitializerOp;
-@@ -147,7 +155,7 @@ RsDoExtendedIoDescriptor (
- 
-         case 6: /* Address Min */
- 
--            Descriptor->ExtAddress64.Minimum = InitializerOp->Asl.Value.Integer;
-+            Minimum = InitializerOp->Asl.Value.Integer;
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Minimum));
-             MinOp = InitializerOp;
-@@ -155,7 +163,7 @@ RsDoExtendedIoDescriptor (
- 
-         case 7: /* Address Max */
- 
--            Descriptor->ExtAddress64.Maximum = InitializerOp->Asl.Value.Integer;
-+            Maximum = InitializerOp->Asl.Value.Integer;
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Maximum));
-             MaxOp = InitializerOp;
-@@ -163,14 +171,14 @@ RsDoExtendedIoDescriptor (
- 
-         case 8: /* Translation Offset */
- 
--            Descriptor->ExtAddress64.TranslationOffset = InitializerOp->Asl.Value.Integer;
-+            TranslationOffset = InitializerOp->Asl.Value.Integer;
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.TranslationOffset));
-             break;
- 
-         case 9: /* Address Length */
- 
--            Descriptor->ExtAddress64.AddressLength = InitializerOp->Asl.Value.Integer;
-+            AddressLength = InitializerOp->Asl.Value.Integer;
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.AddressLength));
-             LengthOp = InitializerOp;
-@@ -178,7 +186,7 @@ RsDoExtendedIoDescriptor (
- 
-         case 10: /* Type-Specific Attributes */
- 
--            Descriptor->ExtAddress64.TypeSpecific = InitializerOp->Asl.Value.Integer;
-+            TypeSpecific = InitializerOp->Asl.Value.Integer;
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_TYPESPECIFICATTRIBUTES,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.TypeSpecific));
-             break;
-@@ -214,13 +222,20 @@ RsDoExtendedIoDescriptor (
-     /* Validate the Min/Max/Len/Gran values */
- 
-     RsLargeAddressCheck (
--        Descriptor->ExtAddress64.Minimum,
--        Descriptor->ExtAddress64.Maximum,
--        Descriptor->ExtAddress64.AddressLength,
--        Descriptor->ExtAddress64.Granularity,
-+        Minimum,
-+        Maximum,
-+        AddressLength,
-+        Granularity,
-         Descriptor->ExtAddress64.Flags,
-         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
- 
-+    ACPI_MOVE_64_TO_64(&Descriptor->ExtAddress64.Minimum, &Minimum);
-+    ACPI_MOVE_64_TO_64(&Descriptor->ExtAddress64.Maximum, &Maximum);
-+    ACPI_MOVE_64_TO_64(&Descriptor->ExtAddress64.AddressLength, &AddressLength);
-+    ACPI_MOVE_64_TO_64(&Descriptor->ExtAddress64.Granularity, &Granularity);
-+    ACPI_MOVE_64_TO_64(&Descriptor->ExtAddress64.TranslationOffset, &TranslationOffset);
-+    ACPI_MOVE_64_TO_64(&Descriptor->ExtAddress64.TypeSpecific, &TypeSpecific);
-+
-     Rnode->BufferLength = sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) +
-         StringLength;
-     return (Rnode);
-Index: acpica-unix2-20200528/source/compiler/aslrestype2q.c
-===================================================================
---- acpica-unix2-20200528.orig/source/compiler/aslrestype2q.c
-+++ acpica-unix2-20200528/source/compiler/aslrestype2q.c
-@@ -80,7 +80,13 @@ RsDoQwordIoDescriptor (
-     ASL_RESOURCE_NODE       *Rnode;
-     UINT8                   *OptionalFields;
-     UINT16                  StringLength = 0;
-+    UINT16                  ResourceLength = 0;
-     UINT32                  OptionIndex = 0;
-+    UINT64                  Minimum = 0;
-+    UINT64                  Maximum = 0;
-+    UINT64                  AddressLength = 0;
-+    UINT64                  Granularity = 0;
-+    UINT64                  TranslationOffset = 0;
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-     BOOLEAN                 ResSourceIndex = FALSE;
-@@ -102,8 +108,7 @@ RsDoQwordIoDescriptor (
-      * optional fields present
-      */
-     OptionalFields = ((UINT8 *) Descriptor) + sizeof (AML_RESOURCE_ADDRESS64);
--    Descriptor->Address64.ResourceLength = (UINT16)
--        (sizeof (AML_RESOURCE_ADDRESS64) -
-+    ResourceLength = (UINT16) (sizeof (AML_RESOURCE_ADDRESS64) -
-          sizeof (AML_RESOURCE_LARGE_HEADER));
- 
-     /* Process all child initialization nodes */
-@@ -147,7 +152,7 @@ RsDoQwordIoDescriptor (
- 
-         case 5: /* Address Granularity */
- 
--            Descriptor->Address64.Granularity = InitializerOp->Asl.Value.Integer;
-+            Granularity = InitializerOp->Asl.Value.Integer;
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Granularity));
-             GranOp = InitializerOp;
-@@ -155,7 +160,7 @@ RsDoQwordIoDescriptor (
- 
-         case 6: /* Address Min */
- 
--            Descriptor->Address64.Minimum = InitializerOp->Asl.Value.Integer;
-+            Minimum = InitializerOp->Asl.Value.Integer;
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Minimum));
-             MinOp = InitializerOp;
-@@ -163,7 +168,7 @@ RsDoQwordIoDescriptor (
- 
-         case 7: /* Address Max */
- 
--            Descriptor->Address64.Maximum = InitializerOp->Asl.Value.Integer;
-+            Maximum = InitializerOp->Asl.Value.Integer;
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Maximum));
-             MaxOp = InitializerOp;
-@@ -171,14 +176,14 @@ RsDoQwordIoDescriptor (
- 
-         case 8: /* Translation Offset */
- 
--            Descriptor->Address64.TranslationOffset = InitializerOp->Asl.Value.Integer;
-+            TranslationOffset = InitializerOp->Asl.Value.Integer;
-             RsCreateByteField (InitializerOp, ACPI_RESTAG_TRANSLATION,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.TranslationOffset));
-             break;
- 
-         case 9: /* Address Length */
- 
--            Descriptor->Address64.AddressLength = InitializerOp->Asl.Value.Integer;
-+            AddressLength = InitializerOp->Asl.Value.Integer;
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.AddressLength));
-             LengthOp = InitializerOp;
-@@ -190,7 +195,7 @@ RsDoQwordIoDescriptor (
-             {
-                 OptionalFields[0] = (UINT8) InitializerOp->Asl.Value.Integer;
-                 OptionIndex++;
--                Descriptor->Address64.ResourceLength++;
-+                ResourceLength++;
-                 ResSourceIndex = TRUE;
-             }
-             break;
-@@ -202,8 +207,7 @@ RsDoQwordIoDescriptor (
-             {
-                 if (StringLength)
-                 {
--                    Descriptor->Address64.ResourceLength = (UINT16)
--                        (Descriptor->Address64.ResourceLength + StringLength);
-+                    ResourceLength = (UINT16) (ResourceLength + StringLength);
- 
-                     strcpy ((char *)
-                         &OptionalFields[OptionIndex],
-@@ -263,13 +267,20 @@ RsDoQwordIoDescriptor (
-     /* Validate the Min/Max/Len/Gran values */
- 
-     RsLargeAddressCheck (
--        Descriptor->Address64.Minimum,
--        Descriptor->Address64.Maximum,
--        Descriptor->Address64.AddressLength,
--        Descriptor->Address64.Granularity,
-+        Minimum,
-+        Maximum,
-+        AddressLength,
-+        Granularity,
-         Descriptor->Address64.Flags,
-         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
- 
-+    ACPI_MOVE_16_TO_16(&Descriptor->Address64.ResourceLength, &ResourceLength);
-+    ACPI_MOVE_64_TO_64(&Descriptor->Address64.Minimum, &Minimum);
-+    ACPI_MOVE_64_TO_64(&Descriptor->Address64.Maximum, &Maximum);
-+    ACPI_MOVE_64_TO_64(&Descriptor->Address64.AddressLength, &AddressLength);
-+    ACPI_MOVE_64_TO_64(&Descriptor->Address64.Granularity, &Granularity);
-+    ACPI_MOVE_64_TO_64(&Descriptor->Address64.TranslationOffset, &TranslationOffset);
-+
-     Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS64) +
-         OptionIndex + StringLength;
-     return (Rnode);
-@@ -301,7 +312,13 @@ RsDoQwordMemoryDescriptor (
-     ASL_RESOURCE_NODE       *Rnode;
-     UINT8                   *OptionalFields;
-     UINT16                  StringLength = 0;
-+    UINT16                  ResourceLength = 0;
-     UINT32                  OptionIndex = 0;
-+    UINT64                  Minimum = 0;
-+    UINT64                  Maximum = 0;
-+    UINT64                  AddressLength = 0;
-+    UINT64                  Granularity = 0;
-+    UINT64                  TranslationOffset = 0;
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-     BOOLEAN                 ResSourceIndex = FALSE;
-@@ -323,8 +340,7 @@ RsDoQwordMemoryDescriptor (
-      * optional fields present
-      */
-     OptionalFields = ((UINT8 *) Descriptor) + sizeof (AML_RESOURCE_ADDRESS64);
--    Descriptor->Address64.ResourceLength = (UINT16)
--        (sizeof (AML_RESOURCE_ADDRESS64) -
-+    ResourceLength = (UINT16) (sizeof (AML_RESOURCE_ADDRESS64) -
-          sizeof (AML_RESOURCE_LARGE_HEADER));
- 
-     /* Process all child initialization nodes */
-@@ -375,7 +391,7 @@ RsDoQwordMemoryDescriptor (
- 
-         case 6: /* Address Granularity */
- 
--            Descriptor->Address64.Granularity = InitializerOp->Asl.Value.Integer;
-+            Granularity = InitializerOp->Asl.Value.Integer;
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Granularity));
-             GranOp = InitializerOp;
-@@ -383,7 +399,7 @@ RsDoQwordMemoryDescriptor (
- 
-         case 7: /* Min Address */
- 
--            Descriptor->Address64.Minimum = InitializerOp->Asl.Value.Integer;
-+            Minimum = InitializerOp->Asl.Value.Integer;
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Minimum));
-             MinOp = InitializerOp;
-@@ -391,7 +407,7 @@ RsDoQwordMemoryDescriptor (
- 
-         case 8: /* Max Address */
- 
--            Descriptor->Address64.Maximum = InitializerOp->Asl.Value.Integer;
-+            Maximum = InitializerOp->Asl.Value.Integer;
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Maximum));
-             MaxOp = InitializerOp;
-@@ -399,14 +415,14 @@ RsDoQwordMemoryDescriptor (
- 
-         case 9: /* Translation Offset */
- 
--            Descriptor->Address64.TranslationOffset = InitializerOp->Asl.Value.Integer;
-+            TranslationOffset = InitializerOp->Asl.Value.Integer;
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.TranslationOffset));
-             break;
- 
-         case 10: /* Address Length */
- 
--            Descriptor->Address64.AddressLength = InitializerOp->Asl.Value.Integer;
-+            AddressLength = InitializerOp->Asl.Value.Integer;
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.AddressLength));
-             LengthOp = InitializerOp;
-@@ -418,7 +434,7 @@ RsDoQwordMemoryDescriptor (
-             {
-                 OptionalFields[0] = (UINT8) InitializerOp->Asl.Value.Integer;
-                 OptionIndex++;
--                Descriptor->Address64.ResourceLength++;
-+                ResourceLength++;
-                 ResSourceIndex = TRUE;
-             }
-             break;
-@@ -430,8 +446,7 @@ RsDoQwordMemoryDescriptor (
-             {
-                 if (StringLength)
-                 {
--                    Descriptor->Address64.ResourceLength = (UINT16)
--                        (Descriptor->Address64.ResourceLength + StringLength);
-+                    ResourceLength = (UINT16) (ResourceLength + StringLength);
- 
-                     strcpy ((char *)
-                         &OptionalFields[OptionIndex],
-@@ -492,13 +507,20 @@ RsDoQwordMemoryDescriptor (
-     /* Validate the Min/Max/Len/Gran values */
- 
-     RsLargeAddressCheck (
--        Descriptor->Address64.Minimum,
--        Descriptor->Address64.Maximum,
--        Descriptor->Address64.AddressLength,
--        Descriptor->Address64.Granularity,
-+        Minimum,
-+        Maximum,
-+        AddressLength,
-+        Granularity,
-         Descriptor->Address64.Flags,
-         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
- 
-+    ACPI_MOVE_16_TO_16(&Descriptor->Address64.ResourceLength, &ResourceLength);
-+    ACPI_MOVE_64_TO_64(&Descriptor->Address64.Minimum, &Minimum);
-+    ACPI_MOVE_64_TO_64(&Descriptor->Address64.Maximum, &Maximum);
-+    ACPI_MOVE_64_TO_64(&Descriptor->Address64.AddressLength, &AddressLength);
-+    ACPI_MOVE_64_TO_64(&Descriptor->Address64.Granularity, &Granularity);
-+    ACPI_MOVE_64_TO_64(&Descriptor->Address64.TranslationOffset, &TranslationOffset);
-+
-     Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS64) +
-         OptionIndex + StringLength;
-     return (Rnode);
-@@ -530,9 +552,15 @@ RsDoQwordSpaceDescriptor (
-     ASL_RESOURCE_NODE       *Rnode;
-     UINT8                   *OptionalFields;
-     UINT16                  StringLength = 0;
-+    UINT16                  ResourceLength = 0;
-     UINT32                  OptionIndex = 0;
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-+    UINT64                  Minimum = 0;
-+    UINT64                  Maximum = 0;
-+    UINT64                  AddressLength = 0;
-+    UINT64                  Granularity = 0;
-+    UINT64                  TranslationOffset = 0;
-     BOOLEAN                 ResSourceIndex = FALSE;
- 
- 
-@@ -551,8 +579,7 @@ RsDoQwordSpaceDescriptor (
-      * optional fields present
-      */
-     OptionalFields = ((UINT8 *) Descriptor) + sizeof (AML_RESOURCE_ADDRESS64);
--    Descriptor->Address64.ResourceLength = (UINT16)
--        (sizeof (AML_RESOURCE_ADDRESS64) -
-+    ResourceLength = (UINT16) (sizeof (AML_RESOURCE_ADDRESS64) -
-          sizeof (AML_RESOURCE_LARGE_HEADER));
- 
-     /* Process all child initialization nodes */
-@@ -601,7 +628,7 @@ RsDoQwordSpaceDescriptor (
- 
-         case 6: /* Address Granularity */
- 
--            Descriptor->Address64.Granularity = InitializerOp->Asl.Value.Integer;
-+            Granularity = InitializerOp->Asl.Value.Integer;
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Granularity));
-             GranOp = InitializerOp;
-@@ -609,7 +636,7 @@ RsDoQwordSpaceDescriptor (
- 
-         case 7: /* Min Address */
- 
--            Descriptor->Address64.Minimum = InitializerOp->Asl.Value.Integer;
-+            Minimum = InitializerOp->Asl.Value.Integer;
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Minimum));
-             MinOp = InitializerOp;
-@@ -617,7 +644,7 @@ RsDoQwordSpaceDescriptor (
- 
-         case 8: /* Max Address */
- 
--            Descriptor->Address64.Maximum = InitializerOp->Asl.Value.Integer;
-+            Maximum = InitializerOp->Asl.Value.Integer;
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Maximum));
-             MaxOp = InitializerOp;
-@@ -625,14 +652,14 @@ RsDoQwordSpaceDescriptor (
- 
-         case 9: /* Translation Offset */
- 
--            Descriptor->Address64.TranslationOffset = InitializerOp->Asl.Value.Integer;
-+            TranslationOffset = InitializerOp->Asl.Value.Integer;
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.TranslationOffset));
-             break;
- 
-         case 10: /* Address Length */
- 
--            Descriptor->Address64.AddressLength = InitializerOp->Asl.Value.Integer;
-+            AddressLength = InitializerOp->Asl.Value.Integer;
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.AddressLength));
-             LengthOp = InitializerOp;
-@@ -644,7 +671,7 @@ RsDoQwordSpaceDescriptor (
-             {
-                 OptionalFields[0] = (UINT8) InitializerOp->Asl.Value.Integer;
-                 OptionIndex++;
--                Descriptor->Address64.ResourceLength++;
-+                ResourceLength++;
-                 ResSourceIndex = TRUE;
-             }
-             break;
-@@ -656,8 +683,7 @@ RsDoQwordSpaceDescriptor (
-             {
-                 if (StringLength)
-                 {
--                    Descriptor->Address64.ResourceLength = (UINT16)
--                        (Descriptor->Address64.ResourceLength + StringLength);
-+                    ResourceLength = (UINT16) (ResourceLength + StringLength);
- 
-                     strcpy ((char *)
-                         &OptionalFields[OptionIndex],
-@@ -703,13 +729,20 @@ RsDoQwordSpaceDescriptor (
-     /* Validate the Min/Max/Len/Gran values */
- 
-     RsLargeAddressCheck (
--        Descriptor->Address64.Minimum,
--        Descriptor->Address64.Maximum,
--        Descriptor->Address64.AddressLength,
--        Descriptor->Address64.Granularity,
-+        Minimum,
-+        Maximum,
-+        AddressLength,
-+        Granularity,
-         Descriptor->Address64.Flags,
-         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
- 
-+    ACPI_MOVE_16_TO_16(&Descriptor->Address64.ResourceLength, &ResourceLength);
-+    ACPI_MOVE_64_TO_64(&Descriptor->Address64.Minimum, &Minimum);
-+    ACPI_MOVE_64_TO_64(&Descriptor->Address64.Maximum, &Maximum);
-+    ACPI_MOVE_64_TO_64(&Descriptor->Address64.AddressLength, &AddressLength);
-+    ACPI_MOVE_64_TO_64(&Descriptor->Address64.Granularity, &Granularity);
-+    ACPI_MOVE_64_TO_64(&Descriptor->Address64.TranslationOffset, &TranslationOffset);
-+
-     Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS64) +
-         OptionIndex + StringLength;
-     return (Rnode);
-Index: acpica-unix2-20200528/source/compiler/aslrestype2s.c
-===================================================================
---- acpica-unix2-20200528.orig/source/compiler/aslrestype2s.c
-+++ acpica-unix2-20200528/source/compiler/aslrestype2s.c
-@@ -340,9 +340,14 @@ RsDoGpioIntDescriptor (
-     UINT16                  VendorLength;
-     UINT16                  InterruptLength;
-     UINT16                  DescriptorSize;
-+    UINT16                  IntFlags = 0;
-+    UINT16                  DebounceTimeout = 0;
-+    UINT16                  Flags = 0;
-     UINT32                  CurrentByteOffset;
-     UINT32                  PinCount = 0;
-     UINT32                  i;
-+    UINT16		    Tmp16;
-+    UINT16		    Val16;
- 
- 
-     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -367,7 +372,7 @@ RsDoGpioIntDescriptor (
-         sizeof (AML_RESOURCE_LARGE_HEADER));
- 
-     Descriptor = Rnode->Buffer;
--    Descriptor->Gpio.ResourceLength = DescriptorSize;
-+    ACPI_MOVE_16_TO_16(&Descriptor->Gpio.ResourceLength, &DescriptorSize);
-     Descriptor->Gpio.DescriptorType = ACPI_RESOURCE_NAME_GPIO;
-     Descriptor->Gpio.RevisionId = AML_RESOURCE_GPIO_REVISION;
-     Descriptor->Gpio.ConnectionType = AML_RESOURCE_GPIO_TYPE_INT;
-@@ -382,11 +387,11 @@ RsDoGpioIntDescriptor (
- 
-     /* Setup offsets within the descriptor */
- 
--    Descriptor->Gpio.PinTableOffset = (UINT16)
--        ACPI_PTR_DIFF (InterruptList, Descriptor);
-+    Tmp16 = (UINT16) ACPI_PTR_DIFF (InterruptList, Descriptor);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Gpio.PinTableOffset, &Tmp16);
- 
--    Descriptor->Gpio.ResSourceOffset = (UINT16)
--        ACPI_PTR_DIFF (ResourceSource, Descriptor);
-+    Tmp16 = (UINT16) ACPI_PTR_DIFF (ResourceSource, Descriptor);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Gpio.ResSourceOffset, &Tmp16);
- 
-     /* Process all child initialization nodes */
- 
-@@ -396,21 +401,21 @@ RsDoGpioIntDescriptor (
-         {
-         case 0: /* Interrupt Mode - edge/level [Flag] (_MOD) */
- 
--            RsSetFlagBits16 (&Descriptor->Gpio.IntFlags, InitializerOp, 0, 0);
-+            RsSetFlagBits16 (&IntFlags, InitializerOp, 0, 0);
-             RsCreateBitField (InitializerOp, ACPI_RESTAG_MODE,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Gpio.IntFlags), 0);
-             break;
- 
-         case 1: /* Interrupt Polarity - Active high/low [Flags] (_POL) */
- 
--            RsSetFlagBits16 (&Descriptor->Gpio.IntFlags, InitializerOp, 1, 0);
-+            RsSetFlagBits16 (&IntFlags, InitializerOp, 1, 0);
-             RsCreateMultiBitField (InitializerOp, ACPI_RESTAG_POLARITY,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Gpio.IntFlags), 1, 2);
-             break;
- 
-         case 2: /* Share Type - Default: exclusive (0) [Flags] (_SHR) */
- 
--            RsSetFlagBits16 (&Descriptor->Gpio.IntFlags, InitializerOp, 3, 0);
-+            RsSetFlagBits16 (&IntFlags, InitializerOp, 3, 0);
-             RsCreateMultiBitField (InitializerOp, ACPI_RESTAG_INTERRUPTSHARE,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Gpio.IntFlags), 3, 2);
-             break;
-@@ -424,7 +429,7 @@ RsDoGpioIntDescriptor (
- 
-         case 4: /* Debounce Timeout [WORD] (_DBT) */
- 
--            Descriptor->Gpio.DebounceTimeout = (UINT16) InitializerOp->Asl.Value.Integer;
-+            DebounceTimeout = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_DEBOUNCETIME,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Gpio.DebounceTimeout));
-             break;
-@@ -451,7 +456,7 @@ RsDoGpioIntDescriptor (
- 
-         case 7: /* Resource Usage (consumer/producer) */
- 
--            RsSetFlagBits16 (&Descriptor->Gpio.Flags, InitializerOp, 0, 1);
-+            RsSetFlagBits16 (&Flags, InitializerOp, 0, 1);
-             break;
- 
-         case 8: /* Resource Tag (Descriptor Name) */
-@@ -466,13 +471,14 @@ RsDoGpioIntDescriptor (
-              * This field is required in order to calculate the length
-              * of the ResourceSource at runtime.
-              */
--            Descriptor->Gpio.VendorOffset = (UINT16)
--                ACPI_PTR_DIFF (VendorData, Descriptor);
-+            Tmp16 = (UINT16) ACPI_PTR_DIFF (VendorData, Descriptor);
-+            ACPI_MOVE_16_TO_16(&Descriptor->Gpio.VendorOffset, &Tmp16);
- 
-             if (RsGetVendorData (InitializerOp, VendorData,
--                (CurrentByteOffset +  Descriptor->Gpio.VendorOffset)))
-+                (CurrentByteOffset + Tmp16)))
-             {
--                Descriptor->Gpio.VendorLength = VendorLength;
-+                ACPI_MOVE_16_TO_16(&Descriptor->Gpio.VendorLength,
-+				   &VendorLength);
-             }
-             break;
- 
-@@ -485,7 +491,9 @@ RsDoGpioIntDescriptor (
-              *  (implies resource source must immediately follow the pin list.)
-              *  Name: _PIN
-              */
--            *InterruptList = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            ACPI_MOVE_16_TO_16(&Val16, &Tmp16);
-+            *InterruptList = Val16;
-             InterruptList++;
-             PinCount++;
- 
-@@ -507,8 +515,10 @@ RsDoGpioIntDescriptor (
- 
-                 /* Create a named field at the start of the list */
- 
--                RsCreateWordField (InitializerOp, ACPI_RESTAG_PIN,
--                    CurrentByteOffset + Descriptor->Gpio.PinTableOffset);
-+		ACPI_MOVE_16_TO_16(&Tmp16, &Descriptor->Gpio.PinTableOffset);
-+		Tmp16 += CurrentByteOffset;
-+	        ACPI_MOVE_16_TO_16(&Val16, &Tmp16);
-+                RsCreateWordField (InitializerOp, ACPI_RESTAG_PIN, Val16);
-             }
-             break;
-         }
-@@ -516,6 +526,10 @@ RsDoGpioIntDescriptor (
-         InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
-     }
- 
-+    ACPI_MOVE_16_TO_16(&Descriptor->Gpio.IntFlags, &IntFlags);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Gpio.DebounceTimeout, &DebounceTimeout);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Gpio.Flags, &Flags);
-+
-     MpSaveGpioInfo (Info->MappingOp, Descriptor,
-         PinCount, PinList, ResourceSource);
-     return (Rnode);
-@@ -549,9 +563,15 @@ RsDoGpioIoDescriptor (
-     UINT16                  VendorLength;
-     UINT16                  InterruptLength;
-     UINT16                  DescriptorSize;
-+    UINT16                  IntFlags = 0;
-+    UINT16                  DebounceTimeout = 0;
-+    UINT16                  DriveStrength = 0;
-+    UINT16                  Flags = 0;
-     UINT32                  CurrentByteOffset;
-     UINT32                  PinCount = 0;
-     UINT32                  i;
-+    UINT16		    Tmp16;
-+    UINT16		    Val16;
- 
- 
-     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -576,7 +596,7 @@ RsDoGpioIoDescriptor (
-         sizeof (AML_RESOURCE_LARGE_HEADER));
- 
-     Descriptor = Rnode->Buffer;
--    Descriptor->Gpio.ResourceLength = DescriptorSize;
-+    ACPI_MOVE_16_TO_16(&Descriptor->Gpio.ResourceLength, &DescriptorSize);
-     Descriptor->Gpio.DescriptorType = ACPI_RESOURCE_NAME_GPIO;
-     Descriptor->Gpio.RevisionId = AML_RESOURCE_GPIO_REVISION;
-     Descriptor->Gpio.ConnectionType = AML_RESOURCE_GPIO_TYPE_IO;
-@@ -590,11 +610,11 @@ RsDoGpioIoDescriptor (
- 
-     /* Setup offsets within the descriptor */
- 
--    Descriptor->Gpio.PinTableOffset = (UINT16)
--        ACPI_PTR_DIFF (InterruptList, Descriptor);
-+    Tmp16 = (UINT16) ACPI_PTR_DIFF (InterruptList, Descriptor);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Gpio.PinTableOffset, &Tmp16);
- 
--    Descriptor->Gpio.ResSourceOffset = (UINT16)
--        ACPI_PTR_DIFF (ResourceSource, Descriptor);
-+    Tmp16 = (UINT16) ACPI_PTR_DIFF (ResourceSource, Descriptor);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Gpio.ResSourceOffset, &Tmp16);
- 
-     /* Process all child initialization nodes */
- 
-@@ -604,7 +624,7 @@ RsDoGpioIoDescriptor (
-         {
-         case 0: /* Share Type [Flags] (_SHR) */
- 
--            RsSetFlagBits16 (&Descriptor->Gpio.IntFlags, InitializerOp, 3, 0);
-+            RsSetFlagBits16 (&IntFlags, InitializerOp, 3, 0);
-             RsCreateBitField (InitializerOp, ACPI_RESTAG_INTERRUPTSHARE,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Gpio.IntFlags), 3);
-             break;
-@@ -618,21 +638,21 @@ RsDoGpioIoDescriptor (
- 
-         case 2: /* Debounce Timeout [WORD] (_DBT) */
- 
--            Descriptor->Gpio.DebounceTimeout = (UINT16) InitializerOp->Asl.Value.Integer;
-+            DebounceTimeout = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_DEBOUNCETIME,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Gpio.DebounceTimeout));
-             break;
- 
-         case 3: /* Drive Strength [WORD] (_DRS) */
- 
--            Descriptor->Gpio.DriveStrength = (UINT16) InitializerOp->Asl.Value.Integer;
-+            DriveStrength = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_DRIVESTRENGTH,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Gpio.DriveStrength));
-             break;
- 
-         case 4: /* I/O Restriction [Flag] (_IOR) */
- 
--            RsSetFlagBits16 (&Descriptor->Gpio.IntFlags, InitializerOp, 0, 0);
-+            RsSetFlagBits16 (&IntFlags, InitializerOp, 0, 0);
-             RsCreateMultiBitField (InitializerOp, ACPI_RESTAG_IORESTRICTION,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Gpio.IntFlags), 0, 2);
-             break;
-@@ -658,7 +678,7 @@ RsDoGpioIoDescriptor (
- 
-         case 7: /* Resource Usage (consumer/producer) */
- 
--            RsSetFlagBits16 (&Descriptor->Gpio.Flags, InitializerOp, 0, 1);
-+            RsSetFlagBits16 (&Flags, InitializerOp, 0, 1);
-             break;
- 
-         case 8: /* Resource Tag (Descriptor Name) */
-@@ -672,13 +692,14 @@ RsDoGpioIoDescriptor (
-              * This field is required in order to calculate the length
-              * of the ResourceSource at runtime.
-              */
--            Descriptor->Gpio.VendorOffset = (UINT16)
--                ACPI_PTR_DIFF (VendorData, Descriptor);
-+            Tmp16 = (UINT16) ACPI_PTR_DIFF (VendorData, Descriptor);
-+            ACPI_MOVE_16_TO_16(&Descriptor->Gpio.VendorOffset, &Tmp16);
- 
-             if (RsGetVendorData (InitializerOp, VendorData,
-                 (CurrentByteOffset + Descriptor->Gpio.VendorOffset)))
-             {
--                Descriptor->Gpio.VendorLength = VendorLength;
-+                ACPI_MOVE_16_TO_16(&Descriptor->Gpio.VendorLength,
-+				   &VendorLength);
-             }
-             break;
- 
-@@ -691,7 +712,9 @@ RsDoGpioIoDescriptor (
-              *  (implies resource source must immediately follow the pin list.)
-              *  Name: _PIN
-              */
--            *InterruptList = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+	    ACPI_MOVE_16_TO_16(&Val16, &Tmp16);
-+            *InterruptList = Val16;
-             InterruptList++;
-             PinCount++;
- 
-@@ -722,6 +745,11 @@ RsDoGpioIoDescriptor (
-         InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
-     }
- 
-+    ACPI_MOVE_16_TO_16(&Descriptor->Gpio.IntFlags, &IntFlags);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Gpio.DebounceTimeout, &DebounceTimeout);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Gpio.DriveStrength, &DriveStrength);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Gpio.Flags, &Flags);
-+
-     MpSaveGpioInfo (Info->MappingOp, Descriptor,
-         PinCount, PinList, ResourceSource);
-     return (Rnode);
-@@ -752,8 +780,12 @@ RsDoI2cSerialBusDescriptor (
-     UINT16                  ResSourceLength;
-     UINT16                  VendorLength;
-     UINT16                  DescriptorSize;
-+    UINT16                  SlaveAddress = 0;
-+    UINT32                  ConnectionSpeed = 0;
-+    UINT16                  TypeSpecificFlags = 0;
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-+    UINT16		    Tmp16;
- 
- 
-     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -776,12 +808,14 @@ RsDoI2cSerialBusDescriptor (
-         sizeof (AML_RESOURCE_LARGE_HEADER));
- 
-     Descriptor = Rnode->Buffer;
--    Descriptor->I2cSerialBus.ResourceLength = DescriptorSize;
-+    ACPI_MOVE_16_TO_16(&Descriptor->I2cSerialBus.ResourceLength,
-+		       &DescriptorSize);
-     Descriptor->I2cSerialBus.DescriptorType = ACPI_RESOURCE_NAME_SERIAL_BUS;
-     Descriptor->I2cSerialBus.RevisionId = AML_RESOURCE_I2C_REVISION;
-     Descriptor->I2cSerialBus.TypeRevisionId = AML_RESOURCE_I2C_TYPE_REVISION;
-     Descriptor->I2cSerialBus.Type = AML_RESOURCE_I2C_SERIALBUSTYPE;
--    Descriptor->I2cSerialBus.TypeDataLength = AML_RESOURCE_I2C_MIN_DATA_LEN + VendorLength;
-+    Tmp16 = AML_RESOURCE_I2C_MIN_DATA_LEN + VendorLength;
-+    ACPI_MOVE_16_TO_16(&Descriptor->I2cSerialBus.TypeDataLength, &Tmp16);
- 
-     if (Info->DescriptorTypeOp->Asl.ParseOpcode == PARSEOP_I2C_SERIALBUS_V2)
-     {
-@@ -801,7 +835,7 @@ RsDoI2cSerialBusDescriptor (
-         {
-         case 0: /* Slave Address [WORD] (_ADR) */
- 
--            Descriptor->I2cSerialBus.SlaveAddress = (UINT16) InitializerOp->Asl.Value.Integer;
-+            SlaveAddress = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_ADDRESS,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (I2cSerialBus.SlaveAddress));
-             break;
-@@ -815,14 +849,14 @@ RsDoI2cSerialBusDescriptor (
- 
-         case 2: /* Connection Speed [DWORD] (_SPE) */
- 
--            Descriptor->I2cSerialBus.ConnectionSpeed = (UINT32) InitializerOp->Asl.Value.Integer;
-+            ConnectionSpeed = (UINT32) InitializerOp->Asl.Value.Integer;
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_SPEED,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (I2cSerialBus.ConnectionSpeed));
-             break;
- 
-         case 3: /* Addressing Mode [Flag] (_MOD) */
- 
--            RsSetFlagBits16 (&Descriptor->I2cSerialBus.TypeSpecificFlags, InitializerOp, 0, 0);
-+            RsSetFlagBits16 (&TypeSpecificFlags, InitializerOp, 0, 0);
-             RsCreateBitField (InitializerOp, ACPI_RESTAG_MODE,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (I2cSerialBus.TypeSpecificFlags), 0);
-             break;
-@@ -882,6 +916,9 @@ RsDoI2cSerialBusDescriptor (
-         InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
-     }
- 
-+    ACPI_MOVE_16_TO_16(&Descriptor->I2cSerialBus.SlaveAddress, &SlaveAddress);
-+    ACPI_MOVE_32_TO_32(&Descriptor->I2cSerialBus.ConnectionSpeed, &ConnectionSpeed);
-+    ACPI_MOVE_16_TO_16(&Descriptor->I2cSerialBus.TypeSpecificFlags, &TypeSpecificFlags);
-     MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource);
-     return (Rnode);
- }
-@@ -911,6 +948,9 @@ RsDoSpiSerialBusDescriptor (
-     UINT16                  ResSourceLength;
-     UINT16                  VendorLength;
-     UINT16                  DescriptorSize;
-+    UINT16                  DeviceSelection = 0;
-+    UINT32                  ConnectionSpeed = 0;
-+    UINT16                  TypeSpecificFlags = 0;
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
- 
-@@ -961,21 +1001,21 @@ RsDoSpiSerialBusDescriptor (
-         {
-         case 0: /* Device Selection [WORD] (_ADR) */
- 
--            Descriptor->SpiSerialBus.DeviceSelection = (UINT16) InitializerOp->Asl.Value.Integer;
-+            DeviceSelection = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_ADDRESS,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (SpiSerialBus.DeviceSelection));
-             break;
- 
-         case 1: /* Device Polarity [Flag] (_DPL) */
- 
--            RsSetFlagBits16 (&Descriptor->SpiSerialBus.TypeSpecificFlags, InitializerOp, 1, 0);
-+            RsSetFlagBits16 (&TypeSpecificFlags, InitializerOp, 1, 0);
-             RsCreateBitField (InitializerOp, ACPI_RESTAG_DEVICEPOLARITY,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (SpiSerialBus.TypeSpecificFlags), 1);
-             break;
- 
-         case 2: /* Wire Mode [Flag] (_MOD) */
- 
--            RsSetFlagBits16 (&Descriptor->SpiSerialBus.TypeSpecificFlags, InitializerOp, 0, 0);
-+            RsSetFlagBits16 (&TypeSpecificFlags, InitializerOp, 0, 0);
-             RsCreateBitField (InitializerOp, ACPI_RESTAG_MODE,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (SpiSerialBus.TypeSpecificFlags), 0);
-             break;
-@@ -996,7 +1036,7 @@ RsDoSpiSerialBusDescriptor (
- 
-         case 5: /* Connection Speed [DWORD] (_SPE) */
- 
--            Descriptor->SpiSerialBus.ConnectionSpeed = (UINT32) InitializerOp->Asl.Value.Integer;
-+            ConnectionSpeed = (UINT32) InitializerOp->Asl.Value.Integer;
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_SPEED,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (SpiSerialBus.ConnectionSpeed));
-             break;
-@@ -1070,6 +1110,10 @@ RsDoSpiSerialBusDescriptor (
-         InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
-     }
- 
-+    ACPI_MOVE_16_TO_16(&Descriptor->SpiSerialBus.DeviceSelection, &DeviceSelection);
-+    ACPI_MOVE_32_TO_32(&Descriptor->SpiSerialBus.ConnectionSpeed, &ConnectionSpeed);
-+    ACPI_MOVE_16_TO_16(&Descriptor->SpiSerialBus.TypeSpecificFlags, &TypeSpecificFlags);
-+
-     MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource);
-     return (Rnode);
- }
-@@ -1099,6 +1143,10 @@ RsDoUartSerialBusDescriptor (
-     UINT16                  ResSourceLength;
-     UINT16                  VendorLength;
-     UINT16                  DescriptorSize;
-+    UINT32                  DefaultBaudRate = 0;
-+    UINT16                  TypeSpecificFlags = 0;
-+    UINT16                  RxFifoSize = 0;
-+    UINT16                  TxFifoSize = 0;
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
- 
-@@ -1148,21 +1196,21 @@ RsDoUartSerialBusDescriptor (
-         {
-         case 0: /* Connection Speed (Baud Rate) [DWORD] (_SPE) */
- 
--            Descriptor->UartSerialBus.DefaultBaudRate = (UINT32) InitializerOp->Asl.Value.Integer;
-+            DefaultBaudRate = (UINT32) InitializerOp->Asl.Value.Integer;
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_SPEED,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.DefaultBaudRate));
-             break;
- 
-         case 1: /* Bits Per Byte [Flags] (_LEN) */
- 
--            RsSetFlagBits16 (&Descriptor->UartSerialBus.TypeSpecificFlags, InitializerOp, 4, 3);
-+            RsSetFlagBits16 (&TypeSpecificFlags, InitializerOp, 4, 3);
-             RsCreateMultiBitField (InitializerOp, ACPI_RESTAG_LENGTH,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TypeSpecificFlags), 4, 3);
-             break;
- 
-         case 2: /* Stop Bits [Flags] (_STB) */
- 
--            RsSetFlagBits16 (&Descriptor->UartSerialBus.TypeSpecificFlags, InitializerOp, 2, 1);
-+            RsSetFlagBits16 (&TypeSpecificFlags, InitializerOp, 2, 1);
-             RsCreateMultiBitField (InitializerOp, ACPI_RESTAG_STOPBITS,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TypeSpecificFlags), 2, 2);
-             break;
-@@ -1176,7 +1224,7 @@ RsDoUartSerialBusDescriptor (
- 
-         case 4: /* Endianness [Flag] (_END) */
- 
--            RsSetFlagBits16 (&Descriptor->UartSerialBus.TypeSpecificFlags, InitializerOp, 7, 0);
-+            RsSetFlagBits16 (&TypeSpecificFlags, InitializerOp, 7, 0);
-             RsCreateBitField (InitializerOp, ACPI_RESTAG_ENDIANNESS,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TypeSpecificFlags), 7);
-             break;
-@@ -1190,21 +1238,21 @@ RsDoUartSerialBusDescriptor (
- 
-         case 6: /* Flow Control [Flags] (_FLC) */
- 
--            RsSetFlagBits16 (&Descriptor->UartSerialBus.TypeSpecificFlags, InitializerOp, 0, 0);
-+            RsSetFlagBits16 (&TypeSpecificFlags, InitializerOp, 0, 0);
-             RsCreateMultiBitField (InitializerOp, ACPI_RESTAG_FLOWCONTROL,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TypeSpecificFlags), 0, 2);
-             break;
- 
-         case 7: /* Rx Buffer Size [WORD] (_RXL) */
- 
--            Descriptor->UartSerialBus.RxFifoSize = (UINT16) InitializerOp->Asl.Value.Integer;
-+            RxFifoSize = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH_RX,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.RxFifoSize));
-             break;
- 
-         case 8: /* Tx Buffer Size [WORD] (_TXL) */
- 
--            Descriptor->UartSerialBus.TxFifoSize = (UINT16) InitializerOp->Asl.Value.Integer;
-+            TxFifoSize = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH_TX,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TxFifoSize));
-             break;
-@@ -1274,6 +1322,11 @@ RsDoUartSerialBusDescriptor (
-         InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
-     }
- 
-+    ACPI_MOVE_32_TO_32(&Descriptor->UartSerialBus.DefaultBaudRate, &DefaultBaudRate);
-+    ACPI_MOVE_16_TO_16(&Descriptor->UartSerialBus.TypeSpecificFlags, &TypeSpecificFlags);
-+    ACPI_MOVE_16_TO_16(&Descriptor->UartSerialBus.RxFifoSize, &RxFifoSize);
-+    ACPI_MOVE_16_TO_16(&Descriptor->UartSerialBus.TxFifoSize, &TxFifoSize);
-+
-     MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource);
-     return (Rnode);
- }
-Index: acpica-unix2-20200528/source/compiler/aslrestype2w.c
-===================================================================
---- acpica-unix2-20200528.orig/source/compiler/aslrestype2w.c
-+++ acpica-unix2-20200528/source/compiler/aslrestype2w.c
-@@ -81,6 +81,12 @@ RsDoWordIoDescriptor (
-     UINT8                   *OptionalFields;
-     UINT16                  StringLength = 0;
-     UINT32                  OptionIndex = 0;
-+    UINT16                  ResourceLength = 0;
-+    UINT16                  Minimum = 0;
-+    UINT16                  Maximum = 0;
-+    UINT16                  AddressLength = 0;
-+    UINT16                  Granularity = 0;
-+    UINT16                  TranslationOffset = 0;
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-     BOOLEAN                 ResSourceIndex = FALSE;
-@@ -102,8 +108,7 @@ RsDoWordIoDescriptor (
-      * optional fields present
-      */
-     OptionalFields = ((UINT8 *) Descriptor) + sizeof (AML_RESOURCE_ADDRESS16);
--    Descriptor->Address16.ResourceLength = (UINT16)
--        (sizeof (AML_RESOURCE_ADDRESS16) -
-+    ResourceLength = (UINT16) (sizeof (AML_RESOURCE_ADDRESS16) -
-          sizeof (AML_RESOURCE_LARGE_HEADER));
- 
-     /* Process all child initialization nodes */
-@@ -147,7 +152,7 @@ RsDoWordIoDescriptor (
- 
-         case 5: /* Address Granularity */
- 
--            Descriptor->Address16.Granularity = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Granularity = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Granularity));
-             GranOp = InitializerOp;
-@@ -155,7 +160,7 @@ RsDoWordIoDescriptor (
- 
-         case 6: /* Address Min */
- 
--            Descriptor->Address16.Minimum = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Minimum = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_MINADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Minimum));
-             MinOp = InitializerOp;
-@@ -163,7 +168,7 @@ RsDoWordIoDescriptor (
- 
-         case 7: /* Address Max */
- 
--            Descriptor->Address16.Maximum = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Maximum = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_MAXADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Maximum));
-             MaxOp = InitializerOp;
-@@ -171,14 +176,14 @@ RsDoWordIoDescriptor (
- 
-         case 8: /* Translation Offset */
- 
--            Descriptor->Address16.TranslationOffset = (UINT16) InitializerOp->Asl.Value.Integer;
-+            TranslationOffset = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.TranslationOffset));
-             break;
- 
-         case 9: /* Address Length */
- 
--            Descriptor->Address16.AddressLength = (UINT16) InitializerOp->Asl.Value.Integer;
-+            AddressLength = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH,
-                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.AddressLength));
-             LengthOp = InitializerOp;
-@@ -190,7 +195,7 @@ RsDoWordIoDescriptor (
-             {
-                 OptionalFields[0] = (UINT8) InitializerOp->Asl.Value.Integer;
-                 OptionIndex++;
--                Descriptor->Address16.ResourceLength++;
-+                ResourceLength++;
-                 ResSourceIndex = TRUE;
-             }
-             break;
-@@ -202,8 +207,7 @@ RsDoWordIoDescriptor (
-             {
-                 if (StringLength)
-                 {
--                    Descriptor->Address16.ResourceLength = (UINT16)
--                        (Descriptor->Address16.ResourceLength + StringLength);
-+                    ResourceLength = (UINT16) (ResourceLength + StringLength);
- 
-                     strcpy ((char *)
-                         &OptionalFields[OptionIndex],
-@@ -263,13 +267,20 @@ RsDoWordIoDescriptor (
-     /* Validate the Min/Max/Len/Gran values */
- 
-     RsLargeAddressCheck (
--        (UINT64) Descriptor->Address16.Minimum,
--        (UINT64) Descriptor->Address16.Maximum,
--        (UINT64) Descriptor->Address16.AddressLength,
--        (UINT64) Descriptor->Address16.Granularity,
-+        Minimum,
-+        Maximum,
-+        AddressLength,
-+        Granularity,
-         Descriptor->Address16.Flags,
-         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
- 
-+    ACPI_MOVE_16_TO_16(&Descriptor->Address16.ResourceLength, &ResourceLength);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Address16.Minimum, &Minimum);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Address16.Maximum, &Maximum);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Address16.AddressLength, &AddressLength);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Address16.Granularity, &Granularity);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Address16.TranslationOffset, &TranslationOffset);
-+
-     Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) +
-         OptionIndex + StringLength;
-     return (Rnode);
-@@ -302,6 +313,12 @@ RsDoWordBusNumberDescriptor (
-     UINT8                   *OptionalFields;
-     UINT16                  StringLength = 0;
-     UINT32                  OptionIndex = 0;
-+    UINT16                  ResourceLength = 0;
-+    UINT16                  Minimum = 0;
-+    UINT16                  Maximum = 0;
-+    UINT16                  AddressLength = 0;
-+    UINT16                  Granularity = 0;
-+    UINT16                  TranslationOffset = 0;
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-     BOOLEAN                 ResSourceIndex = FALSE;
-@@ -323,8 +340,7 @@ RsDoWordBusNumberDescriptor (
-      * optional fields present
-      */
-     OptionalFields = ((UINT8 *) Descriptor) + sizeof (AML_RESOURCE_ADDRESS16);
--    Descriptor->Address16.ResourceLength = (UINT16)
--        (sizeof (AML_RESOURCE_ADDRESS16) -
-+    ResourceLength = (UINT16) (sizeof (AML_RESOURCE_ADDRESS16) -
-          sizeof (AML_RESOURCE_LARGE_HEADER));
- 
-     /* Process all child initialization nodes */
-@@ -361,8 +377,7 @@ RsDoWordBusNumberDescriptor (
- 
-         case 4: /* Address Granularity */
- 
--            Descriptor->Address16.Granularity =
--                (UINT16) InitializerOp->Asl.Value.Integer;
-+            Granularity = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Granularity));
-             GranOp = InitializerOp;
-@@ -370,8 +385,7 @@ RsDoWordBusNumberDescriptor (
- 
-         case 5: /* Min Address */
- 
--            Descriptor->Address16.Minimum =
--                (UINT16) InitializerOp->Asl.Value.Integer;
-+            Minimum = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_MINADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Minimum));
-             MinOp = InitializerOp;
-@@ -379,8 +393,7 @@ RsDoWordBusNumberDescriptor (
- 
-         case 6: /* Max Address */
- 
--            Descriptor->Address16.Maximum =
--                (UINT16) InitializerOp->Asl.Value.Integer;
-+            Maximum = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_MAXADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Maximum));
-             MaxOp = InitializerOp;
-@@ -388,16 +401,14 @@ RsDoWordBusNumberDescriptor (
- 
-         case 7: /* Translation Offset */
- 
--            Descriptor->Address16.TranslationOffset =
--                (UINT16) InitializerOp->Asl.Value.Integer;
-+            TranslationOffset = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.TranslationOffset));
-             break;
- 
-         case 8: /* Address Length */
- 
--            Descriptor->Address16.AddressLength =
--                (UINT16) InitializerOp->Asl.Value.Integer;
-+            AddressLength = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH,
-                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.AddressLength));
-             LengthOp = InitializerOp;
-@@ -409,7 +420,7 @@ RsDoWordBusNumberDescriptor (
-             {
-                 OptionalFields[0] = (UINT8) InitializerOp->Asl.Value.Integer;
-                 OptionIndex++;
--                Descriptor->Address16.ResourceLength++;
-+                ResourceLength++;
-                 ResSourceIndex = TRUE;
-             }
-             break;
-@@ -421,8 +432,7 @@ RsDoWordBusNumberDescriptor (
-             {
-                 if (StringLength)
-                 {
--                    Descriptor->Address16.ResourceLength = (UINT16)
--                        (Descriptor->Address16.ResourceLength + StringLength);
-+                    ResourceLength = (UINT16) (ResourceLength + StringLength);
- 
-                     strcpy ((char *)
-                         &OptionalFields[OptionIndex],
-@@ -468,13 +478,20 @@ RsDoWordBusNumberDescriptor (
-     /* Validate the Min/Max/Len/Gran values */
- 
-     RsLargeAddressCheck (
--        (UINT64) Descriptor->Address16.Minimum,
--        (UINT64) Descriptor->Address16.Maximum,
--        (UINT64) Descriptor->Address16.AddressLength,
--        (UINT64) Descriptor->Address16.Granularity,
-+        Minimum,
-+        Maximum,
-+        AddressLength,
-+        Granularity,
-         Descriptor->Address16.Flags,
-         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
- 
-+    ACPI_MOVE_16_TO_16(&Descriptor->Address16.ResourceLength, &ResourceLength);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Address16.Minimum, &Minimum);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Address16.Maximum, &Maximum);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Address16.AddressLength, &AddressLength);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Address16.Granularity, &Granularity);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Address16.TranslationOffset, &TranslationOffset);
-+
-     Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) +
-         OptionIndex + StringLength;
-     return (Rnode);
-@@ -507,6 +524,12 @@ RsDoWordSpaceDescriptor (
-     UINT8                   *OptionalFields;
-     UINT16                  StringLength = 0;
-     UINT32                  OptionIndex = 0;
-+    UINT16                  Minimum = 0;
-+    UINT16                  Maximum = 0;
-+    UINT16                  AddressLength = 0;
-+    UINT16                  Granularity = 0;
-+    UINT16                  TranslationOffset = 0;
-+    UINT16                  ResourceLength = 0;
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-     BOOLEAN                 ResSourceIndex = FALSE;
-@@ -527,8 +550,7 @@ RsDoWordSpaceDescriptor (
-      * optional fields present
-      */
-     OptionalFields = ((UINT8 *) Descriptor) + sizeof (AML_RESOURCE_ADDRESS16);
--    Descriptor->Address16.ResourceLength = (UINT16)
--        (sizeof (AML_RESOURCE_ADDRESS16) -
-+    ResourceLength = (UINT16) (sizeof (AML_RESOURCE_ADDRESS16) -
-          sizeof (AML_RESOURCE_LARGE_HEADER));
- 
-     /* Process all child initialization nodes */
-@@ -577,8 +599,7 @@ RsDoWordSpaceDescriptor (
- 
-         case 6: /* Address Granularity */
- 
--            Descriptor->Address16.Granularity =
--                (UINT16) InitializerOp->Asl.Value.Integer;
-+            Granularity = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Granularity));
-             GranOp = InitializerOp;
-@@ -586,8 +607,7 @@ RsDoWordSpaceDescriptor (
- 
-         case 7: /* Min Address */
- 
--            Descriptor->Address16.Minimum =
--                (UINT16) InitializerOp->Asl.Value.Integer;
-+            Minimum = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_MINADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Minimum));
-             MinOp = InitializerOp;
-@@ -595,8 +615,7 @@ RsDoWordSpaceDescriptor (
- 
-         case 8: /* Max Address */
- 
--            Descriptor->Address16.Maximum =
--                (UINT16) InitializerOp->Asl.Value.Integer;
-+            Maximum = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_MAXADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Maximum));
-             MaxOp = InitializerOp;
-@@ -604,16 +623,14 @@ RsDoWordSpaceDescriptor (
- 
-         case 9: /* Translation Offset */
- 
--            Descriptor->Address16.TranslationOffset =
--                (UINT16) InitializerOp->Asl.Value.Integer;
-+            TranslationOffset = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.TranslationOffset));
-             break;
- 
-         case 10: /* Address Length */
- 
--            Descriptor->Address16.AddressLength =
--                (UINT16) InitializerOp->Asl.Value.Integer;
-+            AddressLength = (UINT16) InitializerOp->Asl.Value.Integer;
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.AddressLength));
-             LengthOp = InitializerOp;
-@@ -625,7 +642,7 @@ RsDoWordSpaceDescriptor (
-             {
-                 OptionalFields[0] = (UINT8) InitializerOp->Asl.Value.Integer;
-                 OptionIndex++;
--                Descriptor->Address16.ResourceLength++;
-+                ResourceLength++;
-                 ResSourceIndex = TRUE;
-             }
-             break;
-@@ -637,8 +654,7 @@ RsDoWordSpaceDescriptor (
-             {
-                 if (StringLength)
-                 {
--                    Descriptor->Address16.ResourceLength = (UINT16)
--                        (Descriptor->Address16.ResourceLength + StringLength);
-+                    ResourceLength = (UINT16) (ResourceLength + StringLength);
- 
-                     strcpy ((char *)
-                         &OptionalFields[OptionIndex],
-@@ -684,13 +700,20 @@ RsDoWordSpaceDescriptor (
-     /* Validate the Min/Max/Len/Gran values */
- 
-     RsLargeAddressCheck (
--        (UINT64) Descriptor->Address16.Minimum,
--        (UINT64) Descriptor->Address16.Maximum,
--        (UINT64) Descriptor->Address16.AddressLength,
--        (UINT64) Descriptor->Address16.Granularity,
-+        Minimum,
-+        Maximum,
-+        AddressLength,
-+        Granularity,
-         Descriptor->Address16.Flags,
-         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
- 
-+    ACPI_MOVE_16_TO_16(&Descriptor->Address16.ResourceLength, &ResourceLength);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Address16.Minimum, &Minimum);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Address16.Maximum, &Maximum);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Address16.AddressLength, &AddressLength);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Address16.Granularity, &Granularity);
-+    ACPI_MOVE_16_TO_16(&Descriptor->Address16.TranslationOffset, &TranslationOffset);
-+
-     Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) +
-         OptionIndex + StringLength;
-     return (Rnode);
-Index: acpica-unix2-20200528/source/include/acmacros.h
-===================================================================
---- acpica-unix2-20200528.orig/source/include/acmacros.h
-+++ acpica-unix2-20200528/source/include/acmacros.h
-@@ -98,9 +98,12 @@
-                                            ((UINT8 *)(void *)(d))[6] = ((UINT8 *)(void *)(s))[1];\
-                                            ((UINT8 *)(void *)(d))[7] = ((UINT8 *)(void *)(s))[0];}
- 
--/* 32-bit source, 16/32/64 destination */
-+/* 32-bit source, 8/16/32/64 destination */
- 
--#define ACPI_MOVE_32_TO_16(d, s)        ACPI_MOVE_16_TO_16(d, s)    /* Truncate to 16 */
-+#define ACPI_MOVE_32_TO_8(d, s)        {((  UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[3];}
-+
-+#define ACPI_MOVE_32_TO_16(d, s)        {((  UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[3];\
-+                                         ((  UINT8 *)(void *)(d))[1] = ((UINT8 *)(void *)(s))[2];}
- 
- #define ACPI_MOVE_32_TO_32(d, s)        {((  UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[3];\
-                                          ((  UINT8 *)(void *)(d))[1] = ((UINT8 *)(void *)(s))[2];\
-@@ -113,11 +116,17 @@
-                                            ((UINT8 *)(void *)(d))[6] = ((UINT8 *)(void *)(s))[1];\
-                                            ((UINT8 *)(void *)(d))[7] = ((UINT8 *)(void *)(s))[0];}
- 
--/* 64-bit source, 16/32/64 destination */
-+/* 64-bit source, 8/16/32/64 destination */
- 
--#define ACPI_MOVE_64_TO_16(d, s)        ACPI_MOVE_16_TO_16(d, s)    /* Truncate to 16 */
-+#define ACPI_MOVE_64_TO_8(d, s)        {((  UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[7];}
- 
--#define ACPI_MOVE_64_TO_32(d, s)        ACPI_MOVE_32_TO_32(d, s)    /* Truncate to 32 */
-+#define ACPI_MOVE_64_TO_16(d, s)        {((  UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[7];\
-+                                         ((  UINT8 *)(void *)(d))[1] = ((UINT8 *)(void *)(s))[6];}
-+
-+#define ACPI_MOVE_64_TO_32(d, s)        {((  UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[7];\
-+                                         ((  UINT8 *)(void *)(d))[1] = ((UINT8 *)(void *)(s))[6];\
-+                                         ((  UINT8 *)(void *)(d))[2] = ((UINT8 *)(void *)(s))[5];\
-+                                         ((  UINT8 *)(void *)(d))[3] = ((UINT8 *)(void *)(s))[4];}
- 
- #define ACPI_MOVE_64_TO_64(d, s)        {((  UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[7];\
-                                          ((  UINT8 *)(void *)(d))[1] = ((UINT8 *)(void *)(s))[6];\
-@@ -136,20 +145,26 @@
- 
- /* The hardware supports unaligned transfers, just do the little-endian move */
- 
--/* 16-bit source, 16/32/64 destination */
-+/* 16-bit source, 8/16/32/64 destination */
- 
-+#define ACPI_MOVE_16_TO_8(d, s)         *(UINT8 *)(void *)(d) = *(UINT16 *)(void *)(s)
- #define ACPI_MOVE_16_TO_16(d, s)        *(UINT16 *)(void *)(d) = *(UINT16 *)(void *)(s)
- #define ACPI_MOVE_16_TO_32(d, s)        *(UINT32 *)(void *)(d) = *(UINT16 *)(void *)(s)
- #define ACPI_MOVE_16_TO_64(d, s)        *(UINT64 *)(void *)(d) = *(UINT16 *)(void *)(s)
- 
--/* 32-bit source, 16/32/64 destination */
-+/* 32-bit source, 8/16/32/64 destination */
-+
-+#define ACPI_MOVE_32_TO_8(d, s)        {((  UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[0];}
-+
-+#define ACPI_MOVE_32_TO_16(d, s)        {((  UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[0];\
-+                                         ((  UINT8 *)(void *)(d))[1] = ((UINT8 *)(void *)(s))[1];}
- 
--#define ACPI_MOVE_32_TO_16(d, s)        ACPI_MOVE_16_TO_16(d, s)    /* Truncate to 16 */
- #define ACPI_MOVE_32_TO_32(d, s)        *(UINT32 *)(void *)(d) = *(UINT32 *)(void *)(s)
- #define ACPI_MOVE_32_TO_64(d, s)        *(UINT64 *)(void *)(d) = *(UINT32 *)(void *)(s)
- 
--/* 64-bit source, 16/32/64 destination */
-+/* 64-bit source, 8/16/32/64 destination */
- 
-+#define ACPI_MOVE_64_TO_8(d, s)         ACPI_MOVE_16_TO_8(d, s)    /* Truncate to 8 */
- #define ACPI_MOVE_64_TO_16(d, s)        ACPI_MOVE_16_TO_16(d, s)    /* Truncate to 16 */
- #define ACPI_MOVE_64_TO_32(d, s)        ACPI_MOVE_32_TO_32(d, s)    /* Truncate to 32 */
- #define ACPI_MOVE_64_TO_64(d, s)        *(UINT64 *)(void *)(d) = *(UINT64 *)(void *)(s)
-@@ -169,7 +184,9 @@
- #define ACPI_MOVE_16_TO_32(d, s)        {(*(UINT32 *)(void *)(d)) = 0; ACPI_MOVE_16_TO_16(d, s);}
- #define ACPI_MOVE_16_TO_64(d, s)        {(*(UINT64 *)(void *)(d)) = 0; ACPI_MOVE_16_TO_16(d, s);}
- 
--/* 32-bit source, 16/32/64 destination */
-+/* 32-bit source, 8/16/32/64 destination */
-+
-+#define ACPI_MOVE_32_TO_8(d, s)         ACPI_MOVE_16_TO_8(d, s)    /* Truncate to 8 */
- 
- #define ACPI_MOVE_32_TO_16(d, s)        ACPI_MOVE_16_TO_16(d, s)    /* Truncate to 16 */
- 
-Index: acpica-unix2-20200528/source/include/platform/aclinux.h
-===================================================================
---- acpica-unix2-20200528.orig/source/include/platform/aclinux.h
-+++ acpica-unix2-20200528/source/include/platform/aclinux.h
-@@ -198,6 +198,7 @@
- 
- #ifdef ACPI_USE_STANDARD_HEADERS
- #include <unistd.h>
-+#include <endian.h>
- #endif
- 
- /* Define/disable kernel-specific declarators */
-@@ -232,6 +233,10 @@
- #define __cdecl
- #endif
- 
-+#if defined(__PPC64__) || defined(__s390x__)
-+#define ACPI_BIG_ENDIAN
-+#endif
-+
- #endif /* __KERNEL__ */
- 
- #endif /* __ACLINUX_H__ */
-Index: acpica-unix2-20200528/source/compiler/aslanalyze.c
-===================================================================
---- acpica-unix2-20200528.orig/source/compiler/aslanalyze.c
-+++ acpica-unix2-20200528/source/compiler/aslanalyze.c
-@@ -469,7 +469,7 @@ ApCheckForGpeNameConflict (
- 
-     /* Need a null-terminated string version of NameSeg */
- 
--    ACPI_MOVE_32_TO_32 (Name, Op->Asl.NameSeg);
-+    ACPI_COPY_NAMESEG (Name, Op->Asl.NameSeg);
-     Name[ACPI_NAMESEG_SIZE] = 0;
- 
-     /*
-@@ -496,7 +496,7 @@ ApCheckForGpeNameConflict (
-      * We are now sure we have an _Lxx or _Exx.
-      * Create the target name that would cause collision (Flip E/L)
-      */
--    ACPI_MOVE_32_TO_32 (Target, Name);
-+    ACPI_COPY_NAMESEG (Target, Name);
- 
-     /* Inject opposite letter ("L" versus "E") */
- 
-Index: acpica-unix2-20200528/source/compiler/asllookup.c
-===================================================================
---- acpica-unix2-20200528.orig/source/compiler/asllookup.c
-+++ acpica-unix2-20200528/source/compiler/asllookup.c
-@@ -119,6 +119,7 @@ LkIsObjectUsed (
- {
-     ACPI_NAMESPACE_NODE     *Node = ACPI_CAST_PTR (ACPI_NAMESPACE_NODE, ObjHandle);
-     ACPI_NAMESPACE_NODE     *Next;
-+    ACPI_NAME_UNION         tmp, tmp2;
-     ASL_METHOD_LOCAL        *MethodLocals;
-     ASL_METHOD_LOCAL        *MethodArgs;
-     UINT32                  i;
-@@ -175,7 +176,8 @@ LkIsObjectUsed (
-                  * We ignore the predefined methods since often, not
-                  * all arguments are needed or used.
-                  */
--                if ((Node->Name.Ascii[0] != '_') &&
-+                ACPI_MOVE_32_TO_32(&tmp.Ascii, Node->Name.Ascii);
-+                if ((tmp.Ascii[0] != '_') &&
-                     (!(MethodArgs[i].Flags & ASL_ARG_REFERENCED)))
-                 {
-                     sprintf (AslGbl_MsgBuffer, "Arg%u", i);
-@@ -228,8 +230,10 @@ LkIsObjectUsed (
-              * Issue a remark even if it is a reserved name (starts
-              * with an underscore).
-              */
-+            ACPI_MOVE_32_TO_32(&tmp.Ascii, Node->Name.Ascii);
-+            ACPI_MOVE_32_TO_32(&tmp2.Ascii, Next->Name.Ascii);
-             sprintf (AslGbl_MsgBuffer, "Name [%4.4s] is within a method [%4.4s]",
--                Node->Name.Ascii, Next->Name.Ascii);
-+                tmp.Ascii, tmp2.Ascii);
-             AslError (ASL_REMARK, ASL_MSG_NOT_REFERENCED,
-                 LkGetNameOp (Node->Op), AslGbl_MsgBuffer);
-             return (AE_OK);
-Index: acpica-unix2-20200528/source/compiler/aslmain.c
-===================================================================
---- acpica-unix2-20200528.orig/source/compiler/aslmain.c
-+++ acpica-unix2-20200528/source/compiler/aslmain.c
-@@ -101,18 +101,6 @@ main (
- 
-     signal (SIGINT, AslSignalHandler);
- 
--    /*
--     * Big-endian machines are not currently supported. ACPI tables must
--     * be little-endian, and support for big-endian machines needs to
--     * be implemented.
--     */
--    if (UtIsBigEndianMachine ())
--    {
--        fprintf (stderr,
--            "iASL is not currently supported on big-endian machines.\n");
--        return (-1);
--    }
--
-     AcpiOsInitialize ();
-     ACPI_DEBUG_INITIALIZE (); /* For debug version only */
- 
-Index: acpica-unix2-20200528/source/common/acfileio.c
-===================================================================
---- acpica-unix2-20200528.orig/source/common/acfileio.c
-+++ acpica-unix2-20200528/source/common/acfileio.c
-@@ -280,6 +280,7 @@ AcGetOneTableFromFile (
-     ACPI_TABLE_HEADER       *Table;
-     INT32                   Count;
-     long                    TableOffset;
-+    UINT32		    TableLen;
- 
- 
-     *ReturnTable = NULL;
-@@ -319,7 +320,8 @@ AcGetOneTableFromFile (
- 
-     /* Allocate a buffer for the entire table */
- 
--    Table = AcpiOsAllocate ((ACPI_SIZE) TableHeader.Length);
-+    ACPI_MOVE_32_TO_32(&TableLen, &TableHeader.Length);
-+    Table = AcpiOsAllocate ((ACPI_SIZE) TableLen);
-     if (!Table)
-     {
-         return (AE_NO_MEMORY);
-@@ -329,13 +331,13 @@ AcGetOneTableFromFile (
- 
-     fseek (File, TableOffset, SEEK_SET);
- 
--    Count = fread (Table, 1, TableHeader.Length, File);
-+    Count = fread (Table, 1, TableLen, File);
- 
-     /*
-      * Checks for data table headers happen later in the execution. Only verify
-      * for Aml tables at this point in the code.
-      */
--    if (GetOnlyAmlTables && Count != (INT32) TableHeader.Length)
-+    if (GetOnlyAmlTables && Count != TableLen)
-     {
-         Status = AE_ERROR;
-         goto ErrorExit;
-@@ -343,7 +345,7 @@ AcGetOneTableFromFile (
- 
-     /* Validate the checksum (just issue a warning) */
- 
--    Status = AcpiTbVerifyChecksum (Table, TableHeader.Length);
-+    Status = AcpiTbVerifyChecksum (Table, TableLen);
-     if (ACPI_FAILURE (Status))
-     {
-         Status = AcCheckTextModeCorruption (Table);
-@@ -435,6 +437,7 @@ AcValidateTableHeader (
-     ACPI_SIZE               Actual;
-     long                    OriginalOffset;
-     UINT32                  FileSize;
-+    UINT32                  TableLength;
-     UINT32                  i;
- 
- 
-@@ -464,11 +467,12 @@ AcValidateTableHeader (
-     /* Validate table length against bytes remaining in the file */
- 
-     FileSize = CmGetFileSize (File);
--    if (TableHeader.Length > (UINT32) (FileSize - TableOffset))
-+    ACPI_MOVE_32_TO_32(&TableLength, &TableHeader.Length);
-+    if (TableLength > (UINT32) (FileSize - TableOffset))
-     {
-         fprintf (stderr, "Table [%4.4s] is too long for file - "
-             "needs: 0x%.2X, remaining in file: 0x%.2X\n",
--            TableHeader.Signature, TableHeader.Length,
-+            TableHeader.Signature, TableLength,
-             (UINT32) (FileSize - TableOffset));
-         return (AE_BAD_HEADER);
-     }
-Index: acpica-unix2-20200528/source/common/dmtable.c
-===================================================================
---- acpica-unix2-20200528.orig/source/common/dmtable.c
-+++ acpica-unix2-20200528/source/common/dmtable.c
-@@ -551,7 +551,7 @@ AcpiDmDumpDataTable (
-      */
-     if (ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_FACS))
-     {
--        Length = Table->Length;
-+        ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-         Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoFacs);
-         if (ACPI_FAILURE (Status))
-         {
-@@ -565,13 +565,14 @@ AcpiDmDumpDataTable (
-     else if (ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_S3PT))
-     {
-         Length = AcpiDmDumpS3pt (Table);
-+        ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-     }
-     else
-     {
-         /*
-          * All other tables must use the common ACPI table header, dump it now
-          */
--        Length = Table->Length;
-+        ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-         Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoHeader);
-         if (ACPI_FAILURE (Status))
-         {
-@@ -782,6 +783,7 @@ AcpiDmDumpTable (
-     BOOLEAN                 LastOutputBlankLine = FALSE;
-     ACPI_STATUS             Status;
-     char                    RepairedName[8];
-+    UINT16		    Val16;
- 
- 
-     if (!Info)
-@@ -1178,8 +1180,9 @@ AcpiDmDumpTable (
-             /* Checksum, display and validate */
- 
-             AcpiOsPrintf ("%2.2X", *Target);
--            Temp8 = AcpiDmGenerateChecksum (Table,
--                ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Length,
-+	    ACPI_MOVE_32_TO_32(&Temp32,
-+			&ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Length);
-+            Temp8 = AcpiDmGenerateChecksum (Table, Temp32,
-                 ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Checksum);
- 
-             if (Temp8 != ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Checksum)
-@@ -1244,14 +1247,14 @@ AcpiDmDumpTable (
- 
-             /* DMAR subtable types */
- 
--            Temp16 = ACPI_GET16 (Target);
-+            Val16 = ACPI_GET16 (Target);
-+	    ACPI_MOVE_16_TO_16(&Temp16, &Val16);
-             if (Temp16 > ACPI_DMAR_TYPE_RESERVED)
-             {
-                 Temp16 = ACPI_DMAR_TYPE_RESERVED;
-             }
- 
--            AcpiOsPrintf (UINT16_FORMAT, ACPI_GET16 (Target),
--                AcpiDmDmarSubnames[Temp16]);
-+            AcpiOsPrintf (UINT16_FORMAT, Temp16, AcpiDmDmarSubnames[Temp16]);
-             break;
- 
-         case ACPI_DMT_DMAR_SCOPE:
-@@ -1342,14 +1345,14 @@ AcpiDmDumpTable (
- 
-             /* HEST subtable types */
- 
--            Temp16 = ACPI_GET16 (Target);
-+            Val16 = ACPI_GET16 (Target);
-+	    ACPI_MOVE_16_TO_16(&Temp16, &Val16);
-             if (Temp16 > ACPI_HEST_TYPE_RESERVED)
-             {
-                 Temp16 = ACPI_HEST_TYPE_RESERVED;
-             }
- 
--            AcpiOsPrintf (UINT16_FORMAT, ACPI_GET16 (Target),
--                AcpiDmHestSubnames[Temp16]);
-+            AcpiOsPrintf (UINT16_FORMAT, Temp16, AcpiDmHestSubnames[Temp16]);
-             break;
- 
-         case ACPI_DMT_HESTNTFY:
-@@ -1429,13 +1432,14 @@ AcpiDmDumpTable (
- 
-             /* NFIT subtable types */
- 
--            Temp16 = ACPI_GET16 (Target);
-+            Val16 = ACPI_GET16 (Target);
-+            ACPI_MOVE_16_TO_16(&Temp16, &Val16);
-             if (Temp16 > ACPI_NFIT_TYPE_RESERVED)
-             {
-                 Temp16 = ACPI_NFIT_TYPE_RESERVED;
-             }
- 
--            AcpiOsPrintf (UINT16_FORMAT, ACPI_GET16 (Target),
-+            AcpiOsPrintf (UINT16_FORMAT, Temp16,
-                 AcpiDmNfitSubnames[Temp16]);
-             break;
- 
-Index: acpica-unix2-20200528/source/common/dmtables.c
-===================================================================
---- acpica-unix2-20200528.orig/source/common/dmtables.c
-+++ acpica-unix2-20200528/source/common/dmtables.c
-@@ -142,7 +142,9 @@ AdCreateTableHeader (
-     ACPI_TABLE_HEADER       *Table)
- {
-     UINT8                   Checksum;
--
-+    UINT32		    TableLen;
-+    UINT32		    OemRev;
-+    UINT32		    CompilerRev;
- 
-     /* Reset globals for External statements */
- 
-@@ -154,9 +156,10 @@ AdCreateTableHeader (
-      */
-     AdDisassemblerHeader (Filename, ACPI_IS_AML_TABLE);
- 
-+    ACPI_MOVE_32_TO_32(&TableLen, &Table->Length);
-     AcpiOsPrintf (" * Original Table Header:\n");
-     AcpiOsPrintf (" *     Signature        \"%4.4s\"\n",    Table->Signature);
--    AcpiOsPrintf (" *     Length           0x%8.8X (%u)\n", Table->Length, Table->Length);
-+    AcpiOsPrintf (" *     Length           0x%8.8X (%u)\n", TableLen, TableLen);
- 
-     /* Print and validate the revision */
- 
-@@ -188,7 +191,7 @@ AdCreateTableHeader (
- 
-     AcpiOsPrintf ("\n *     Checksum         0x%2.2X",        Table->Checksum);
- 
--    Checksum = AcpiTbChecksum (ACPI_CAST_PTR (UINT8, Table), Table->Length);
-+    Checksum = AcpiTbChecksum (ACPI_CAST_PTR (UINT8, Table), TableLen);
-     if (Checksum)
-     {
-         AcpiOsPrintf (" **** Incorrect checksum, should be 0x%2.2X",
-@@ -198,9 +201,11 @@ AdCreateTableHeader (
-     AcpiOsPrintf ("\n");
-     AcpiOsPrintf (" *     OEM ID           \"%.6s\"\n",     Table->OemId);
-     AcpiOsPrintf (" *     OEM Table ID     \"%.8s\"\n",     Table->OemTableId);
--    AcpiOsPrintf (" *     OEM Revision     0x%8.8X (%u)\n", Table->OemRevision, Table->OemRevision);
-+    ACPI_MOVE_32_TO_32(&OemRev, &Table->OemRevision);
-+    AcpiOsPrintf (" *     OEM Revision     0x%8.8X (%u)\n", OemRev, OemRev);
-     AcpiOsPrintf (" *     Compiler ID      \"%.4s\"\n",     Table->AslCompilerId);
--    AcpiOsPrintf (" *     Compiler Version 0x%8.8X (%u)\n", Table->AslCompilerRevision, Table->AslCompilerRevision);
-+    ACPI_MOVE_32_TO_32(&CompilerRev, &Table->AslCompilerRevision);
-+    AcpiOsPrintf (" *     Compiler Version 0x%8.8X (%u)\n", CompilerRev, CompilerRev);
-     AcpiOsPrintf (" */\n");
- 
-     /*
-@@ -221,7 +226,7 @@ AdCreateTableHeader (
-     AcpiOsPrintf (
-         "DefinitionBlock (\"\", \"%4.4s\", %u, \"%.6s\", \"%.8s\", 0x%8.8X)\n",
-         Table->Signature, Table->Revision,
--        Table->OemId, Table->OemTableId, Table->OemRevision);
-+        Table->OemId, Table->OemTableId, OemRev);
- }
- 
- 
-@@ -396,7 +401,8 @@ AdParseTable (
- 
-     fprintf (stderr, "Pass 1 parse of [%4.4s]\n", (char *) Table->Signature);
- 
--    AmlLength = Table->Length - sizeof (ACPI_TABLE_HEADER);
-+    ACPI_MOVE_32_TO_32(&AmlLength, &Table->Length);
-+    AmlLength -= sizeof (ACPI_TABLE_HEADER);
-     AmlStart = ((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER));
- 
-     AcpiUtSetIntegerWidth (Table->Revision);
-Index: acpica-unix2-20200528/source/compiler/dtfield.c
-===================================================================
---- acpica-unix2-20200528.orig/source/compiler/dtfield.c
-+++ acpica-unix2-20200528/source/compiler/dtfield.c
-@@ -361,7 +361,27 @@ DtCompileInteger (
-         DtError (ASL_ERROR, ASL_MSG_INTEGER_SIZE, Field, AslGbl_MsgBuffer);
-     }
- 
--    memcpy (Buffer, &Value, ByteLength);
-+    switch (ByteLength) {
-+    case 1:
-+	ACPI_MOVE_64_TO_8(Buffer, &Value);
-+	break;
-+
-+    case 2:
-+	ACPI_MOVE_64_TO_16(Buffer, &Value);
-+	break;
-+
-+    case 4:
-+	ACPI_MOVE_64_TO_32(Buffer, &Value);
-+	break;
-+
-+    case 8:
-+	ACPI_MOVE_64_TO_64(Buffer, &Value);
-+	break;
-+
-+    default:
-+	memcpy (Buffer, &Value, ByteLength);
-+	break;
-+    }
-     return;
- }
- 
-Index: acpica-unix2-20200528/source/compiler/dtsubtable.c
-===================================================================
---- acpica-unix2-20200528.orig/source/compiler/dtsubtable.c
-+++ acpica-unix2-20200528/source/compiler/dtsubtable.c
-@@ -378,6 +378,21 @@ DtSetSubtableLength (
-         return;
-     }
- 
--    memcpy (Subtable->LengthField, &Subtable->TotalLength,
--        Subtable->SizeOfLengthField);
-+    switch(Subtable->SizeOfLengthField) {
-+    case 1:
-+	ACPI_MOVE_32_TO_8(Subtable->LengthField, &Subtable->TotalLength);
-+	break;
-+
-+    case 2:
-+	ACPI_MOVE_32_TO_16(Subtable->LengthField, &Subtable->TotalLength);
-+	break;
-+
-+    case 4:
-+	ACPI_MOVE_32_TO_32(Subtable->LengthField, &Subtable->TotalLength);
-+	break;
-+
-+    default:
-+    	memcpy (Subtable->LengthField, &Subtable->TotalLength,
-+        	Subtable->SizeOfLengthField);
-+    }
- }
-Index: acpica-unix2-20200528/source/compiler/dttable1.c
-===================================================================
---- acpica-unix2-20200528.orig/source/compiler/dttable1.c
-+++ acpica-unix2-20200528/source/compiler/dttable1.c
-@@ -281,6 +281,8 @@ DtCompileCsrt (
-     DT_FIELD                **PFieldList = (DT_FIELD **) List;
-     UINT32                  DescriptorCount;
-     UINT32                  GroupLength;
-+    ACPI_CSRT_GROUP	    *Pgrp;
-+    UINT32		    Tmp32;
- 
- 
-     /* Subtables (Resource Groups) */
-@@ -299,12 +301,20 @@ DtCompileCsrt (
- 
-         /* Compute the number of resource descriptors */
- 
-+	/*
-         GroupLength =
-             (ACPI_CAST_PTR (ACPI_CSRT_GROUP,
-                 Subtable->Buffer))->Length -
-             (ACPI_CAST_PTR (ACPI_CSRT_GROUP,
-                 Subtable->Buffer))->SharedInfoLength -
-             sizeof (ACPI_CSRT_GROUP);
-+	*/
-+	Pgrp = ACPI_CAST_PTR(ACPI_CSRT_GROUP, Subtable->Buffer);
-+	ACPI_MOVE_32_TO_32(&Tmp32, &Pgrp->Length);
-+	GroupLength = Tmp32;
-+	ACPI_MOVE_32_TO_32(&Tmp32, &Pgrp->SharedInfoLength);
-+	GroupLength -= Tmp32;
-+        GroupLength -= sizeof (ACPI_CSRT_GROUP);
- 
-         DescriptorCount = (GroupLength  /
-             sizeof (ACPI_CSRT_DESCRIPTOR));
-@@ -392,6 +402,8 @@ DtCompileDbg2 (
-     ACPI_DBG2_DEVICE        *DeviceInfo;
-     UINT16                  CurrentOffset;
-     UINT32                  i;
-+    UINT16                  Tmp16;
-+    UINT32                  Tmp32;
- 
- 
-     /* Main table */
-@@ -408,10 +420,11 @@ DtCompileDbg2 (
-     /* Main table fields */
- 
-     Dbg2Header = ACPI_CAST_PTR (ACPI_DBG2_HEADER, Subtable->Buffer);
--    Dbg2Header->InfoOffset = sizeof (ACPI_TABLE_HEADER) + ACPI_PTR_DIFF (
-+    Tmp32 = sizeof (ACPI_TABLE_HEADER) + ACPI_PTR_DIFF (
-         ACPI_ADD_PTR (UINT8, Dbg2Header, sizeof (ACPI_DBG2_HEADER)), Dbg2Header);
-+    ACPI_MOVE_32_TO_32(&Dbg2Header->InfoOffset, &Tmp32);
- 
--    SubtableCount = Dbg2Header->InfoCount;
-+    ACPI_MOVE_32_TO_32(&SubtableCount, &Dbg2Header->InfoCount);
-     DtPushSubtable (Subtable);
- 
-     /* Process all Device Information subtables (Count = InfoCount) */
-@@ -438,7 +451,7 @@ DtCompileDbg2 (
- 
-         /* BaseAddressRegister GAS array (Required, size is RegisterCount) */
- 
--        DeviceInfo->BaseAddressOffset = CurrentOffset;
-+        ACPI_MOVE_16_TO_16(&DeviceInfo->BaseAddressOffset, &CurrentOffset);
-         for (i = 0; *PFieldList && (i < DeviceInfo->RegisterCount); i++)
-         {
-             Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2Addr,
-@@ -454,7 +467,7 @@ DtCompileDbg2 (
- 
-         /* AddressSize array (Required, size = RegisterCount) */
- 
--        DeviceInfo->AddressSizeOffset = CurrentOffset;
-+        ACPI_MOVE_16_TO_16(&DeviceInfo->AddressSizeOffset, &CurrentOffset);
-         for (i = 0; *PFieldList && (i < DeviceInfo->RegisterCount); i++)
-         {
-             Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2Size,
-@@ -470,7 +483,7 @@ DtCompileDbg2 (
- 
-         /* NamespaceString device identifier (Required, size = NamePathLength) */
- 
--        DeviceInfo->NamepathOffset = CurrentOffset;
-+        ACPI_MOVE_16_TO_16(&DeviceInfo->NamepathOffset, &CurrentOffset);
-         Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2Name,
-             &Subtable);
-         if (ACPI_FAILURE (Status))
-@@ -480,8 +493,9 @@ DtCompileDbg2 (
- 
-         /* Update the device info header */
- 
--        DeviceInfo->NamepathLength = (UINT16) Subtable->Length;
--        CurrentOffset += (UINT16) DeviceInfo->NamepathLength;
-+        ACPI_MOVE_32_TO_16(&DeviceInfo->NamepathLength, &Subtable->Length);
-+        ACPI_MOVE_16_TO_16(&Tmp16, &DeviceInfo->NamepathLength);
-+        CurrentOffset += Tmp16;
-         DtInsertSubtable (ParentTable, Subtable);
- 
-         /* OemData - Variable-length data (Optional, size = OemDataLength) */
-@@ -508,8 +522,8 @@ DtCompileDbg2 (
- 
-         if (Subtable && Subtable->Length)
-         {
--            DeviceInfo->OemDataOffset = CurrentOffset;
--            DeviceInfo->OemDataLength = (UINT16) Subtable->Length;
-+            ACPI_MOVE_16_TO_16(&DeviceInfo->OemDataOffset, &CurrentOffset);
-+            ACPI_MOVE_32_TO_16(&DeviceInfo->OemDataLength, &Subtable->Length);
- 
-             DtInsertSubtable (ParentTable, Subtable);
-         }
-@@ -549,6 +563,8 @@ DtCompileDmar (
-     ACPI_DMAR_DEVICE_SCOPE  *DmarDeviceScope;
-     UINT32                  DeviceScopeLength;
-     UINT32                  PciPathLength;
-+    UINT16		    Tmp16;
-+    UINT16		    HdrType;
- 
- 
-     Status = DtCompileTable (PFieldList, AcpiDmTableInfoDmar, &Subtable);
-@@ -578,8 +594,11 @@ DtCompileDmar (
-         DtPushSubtable (Subtable);
- 
-         DmarHeader = ACPI_CAST_PTR (ACPI_DMAR_HEADER, Subtable->Buffer);
-+	ACPI_MOVE_16_TO_16(&Tmp16, &DmarHeader->Length);
-+	DmarHeader->Length = Tmp16;
- 
--        switch (DmarHeader->Type)
-+	ACPI_MOVE_16_TO_16(&HdrType, &DmarHeader->Type);
-+        switch (HdrType)
-         {
-         case ACPI_DMAR_TYPE_HARDWARE_UNIT:
- 
-@@ -626,8 +645,8 @@ DtCompileDmar (
-         /*
-          * Optional Device Scope subtables
-          */
--        if ((DmarHeader->Type == ACPI_DMAR_TYPE_HARDWARE_AFFINITY) ||
--            (DmarHeader->Type == ACPI_DMAR_TYPE_NAMESPACE))
-+        if ((HdrType == ACPI_DMAR_TYPE_HARDWARE_AFFINITY) ||
-+            (HdrType == ACPI_DMAR_TYPE_NAMESPACE))
-         {
-             /* These types do not support device scopes */
- 
-@@ -637,7 +656,7 @@ DtCompileDmar (
- 
-         DtPushSubtable (Subtable);
-         DeviceScopeLength = DmarHeader->Length - Subtable->Length -
--            ParentTable->Length;
-+		ParentTable->Length;
-         while (DeviceScopeLength)
-         {
-             Status = DtCompileTable (PFieldList, AcpiDmTableInfoDmarScope,
-@@ -762,7 +781,7 @@ DtCompileDrtm (
-         Count++;
-     }
- 
--    DrtmVtl->ValidatedTableCount = Count;
-+    ACPI_MOVE_32_TO_32(&DrtmVtl->ValidatedTableCount, &Count);
-     DtPopSubtable ();
-     ParentTable = DtPeekSubtable ();
- 
-@@ -800,7 +819,7 @@ DtCompileDrtm (
-         Count++;
-     }
- 
--    DrtmRl->ResourceCount = Count;
-+    ACPI_MOVE_32_TO_32(&DrtmRl->ResourceCount, &Count);
-     DtPopSubtable ();
-     ParentTable = DtPeekSubtable ();
- 
-@@ -895,6 +914,7 @@ DtCompileGtdt (
-     ACPI_DMTABLE_INFO       *InfoTable;
-     UINT32                  GtCount;
-     ACPI_TABLE_HEADER       *Header;
-+    ACPI_GTDT_TIMER_BLOCK   *TimerBlock;
- 
- 
-     ParentTable = DtPeekSubtable ();
-@@ -982,8 +1002,9 @@ DtCompileGtdt (
-             DtPushSubtable (Subtable);
-             ParentTable = DtPeekSubtable ();
- 
--            GtCount = (ACPI_CAST_PTR (ACPI_GTDT_TIMER_BLOCK,
--                Subtable->Buffer - sizeof(ACPI_GTDT_HEADER)))->TimerCount;
-+	    TimerBlock = ACPI_CAST_PTR (ACPI_GTDT_TIMER_BLOCK,
-+                Subtable->Buffer - sizeof(ACPI_GTDT_HEADER));
-+	    ACPI_MOVE_32_TO_32(&GtCount, &TimerBlock->TimerCount);
- 
-             while (GtCount)
-             {
-@@ -1036,6 +1057,7 @@ DtCompileFpdt (
-     ACPI_DMTABLE_INFO       *InfoTable;
-     DT_FIELD                **PFieldList = (DT_FIELD **) List;
-     DT_FIELD                *SubtableStart;
-+    UINT16		    HdrType;
- 
- 
-     while (*PFieldList)
-@@ -1054,7 +1076,8 @@ DtCompileFpdt (
- 
-         FpdtHeader = ACPI_CAST_PTR (ACPI_FPDT_HEADER, Subtable->Buffer);
- 
--        switch (FpdtHeader->Type)
-+	ACPI_MOVE_16_TO_16(&HdrType, &FpdtHeader->Type);
-+        switch (HdrType)
-         {
-         case ACPI_FPDT_TYPE_BOOT:
- 
-@@ -1112,6 +1135,7 @@ DtCompileHest (
-     ACPI_DMTABLE_INFO       *InfoTable;
-     UINT16                  Type;
-     UINT32                  BankCount;
-+    UINT16		    Tmp16;
- 
- 
-     Status = DtCompileTable (PFieldList, AcpiDmTableInfoHest,
-@@ -1129,8 +1153,9 @@ DtCompileHest (
-         /* Get subtable type */
- 
-         SubtableStart = *PFieldList;
--        DtCompileInteger ((UINT8 *) &Type, *PFieldList, 2, 0);
-+        DtCompileInteger ((UINT8 *) &Tmp16, *PFieldList, 2, 0);
- 
-+	ACPI_MOVE_16_TO_16(&Type, &Tmp16);
-         switch (Type)
-         {
-         case ACPI_HEST_TYPE_IA32_CHECK:
-@@ -1480,11 +1505,13 @@ DtCompileIort (
-     ACPI_IORT_SMMU          *IortSmmu;
-     UINT32                  NodeNumber;
-     UINT32                  NodeLength;
-+    UINT32                  NodeOffset;
-     UINT32                  IdMappingNumber;
-     UINT32                  ItsNumber;
-     UINT32                  ContextIrptNumber;
-     UINT32                  PmuIrptNumber;
-     UINT32                  PaddingLength;
-+    UINT32                  MappingOffset;
- 
- 
-     ParentTable = DtPeekSubtable ();
-@@ -1510,7 +1537,7 @@ DtCompileIort (
-      * Optionally allows the generic data types to be used for filling
-      * this field.
-      */
--    Iort->NodeOffset = sizeof (ACPI_TABLE_IORT);
-+    NodeOffset = sizeof (ACPI_TABLE_IORT);
-     Status = DtCompileTable (PFieldList, AcpiDmTableInfoIortPad,
-         &Subtable);
-     if (ACPI_FAILURE (Status))
-@@ -1520,7 +1547,7 @@ DtCompileIort (
-     if (Subtable)
-     {
-         DtInsertSubtable (ParentTable, Subtable);
--        Iort->NodeOffset += Subtable->Length;
-+        NodeOffset += Subtable->Length;
-     }
-     else
-     {
-@@ -1530,8 +1557,9 @@ DtCompileIort (
-         {
-             return (Status);
-         }
--        Iort->NodeOffset += PaddingLength;
-+        NodeOffset += PaddingLength;
-     }
-+    ACPI_MOVE_32_TO_32(&Iort->NodeOffset, &NodeOffset);
- 
-     NodeNumber = 0;
-     while (*PFieldList)
-@@ -1585,7 +1613,7 @@ DtCompileIort (
-                 ItsNumber++;
-             }
- 
--            IortItsGroup->ItsCount = ItsNumber;
-+            ACPI_MOVE_32_TO_32(&IortItsGroup->ItsCount, &ItsNumber);
-             break;
- 
-         case ACPI_IORT_NODE_NAMED_COMPONENT:
-@@ -1619,15 +1647,16 @@ DtCompileIort (
-             }
-             else
-             {
--                if (NodeLength > IortNode->MappingOffset)
-+		ACPI_MOVE_32_TO_32(&MappingOffset, &IortNode->MappingOffset);
-+                if (NodeLength > MappingOffset)
-                 {
-                     return (AE_BAD_DATA);
-                 }
- 
--                if (NodeLength < IortNode->MappingOffset)
-+                if (NodeLength < MappingOffset)
-                 {
-                     Status = DtCompilePadding (
--                        IortNode->MappingOffset - NodeLength,
-+                        MappingOffset - NodeLength,
-                         &Subtable);
-                     if (ACPI_FAILURE (Status))
-                     {
-@@ -1635,7 +1664,8 @@ DtCompileIort (
-                     }
- 
-                     DtInsertSubtable (ParentTable, Subtable);
--                    NodeLength = IortNode->MappingOffset;
-+		    ACPI_MOVE_32_TO_32(&MappingOffset, &IortNode->MappingOffset);
-+                    NodeLength = MappingOffset;
-                 }
-             }
-             break;
-@@ -1668,7 +1698,7 @@ DtCompileIort (
- 
-             /* Compile global interrupt array */
- 
--            IortSmmu->GlobalInterruptOffset = NodeLength;
-+            ACPI_MOVE_32_TO_32(&IortSmmu->GlobalInterruptOffset, &NodeLength);
-             Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3a,
-                 &Subtable);
-             if (ACPI_FAILURE (Status))
-@@ -1682,7 +1712,7 @@ DtCompileIort (
-             /* Compile context interrupt array */
- 
-             ContextIrptNumber = 0;
--            IortSmmu->ContextInterruptOffset = NodeLength;
-+            ACPI_MOVE_32_TO_32(&IortSmmu->ContextInterruptOffset, &NodeLength);
-             while (*PFieldList)
-             {
-                 Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3b,
-@@ -1702,12 +1732,12 @@ DtCompileIort (
-                 ContextIrptNumber++;
-             }
- 
--            IortSmmu->ContextInterruptCount = ContextIrptNumber;
-+            ACPI_MOVE_32_TO_32(&IortSmmu->ContextInterruptCount, &ContextIrptNumber);
- 
-             /* Compile PMU interrupt array */
- 
-             PmuIrptNumber = 0;
--            IortSmmu->PmuInterruptOffset = NodeLength;
-+            ACPI_MOVE_32_TO_32(&IortSmmu->PmuInterruptOffset, &NodeLength);
-             while (*PFieldList)
-             {
-                 Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3c,
-@@ -1727,7 +1757,7 @@ DtCompileIort (
-                 PmuIrptNumber++;
-             }
- 
--            IortSmmu->PmuInterruptCount = PmuIrptNumber;
-+            ACPI_MOVE_32_TO_32(&IortSmmu->PmuInterruptCount, &PmuIrptNumber);
-             break;
- 
-         case ACPI_IORT_NODE_SMMU_V3:
-@@ -1764,7 +1794,7 @@ DtCompileIort (
- 
-         /* Compile Array of ID mappings */
- 
--        IortNode->MappingOffset = NodeLength;
-+        ACPI_MOVE_32_TO_32(&IortNode->MappingOffset, &NodeLength);
-         IdMappingNumber = 0;
-         while (*PFieldList)
-         {
-@@ -1785,7 +1815,7 @@ DtCompileIort (
-             IdMappingNumber++;
-         }
- 
--        IortNode->MappingCount = IdMappingNumber;
-+        ACPI_MOVE_32_TO_32(&IortNode->MappingCount, &IdMappingNumber);
-         if (!IdMappingNumber)
-         {
-             IortNode->MappingOffset = 0;
-@@ -1800,7 +1830,7 @@ DtCompileIort (
-         NodeNumber++;
-     }
- 
--    Iort->NodeCount = NodeNumber;
-+    ACPI_MOVE_32_TO_32(&Iort->NodeCount, &NodeNumber);
-     return (AE_OK);
- }
- 
-Index: acpica-unix2-20200528/source/compiler/dttable2.c
-===================================================================
---- acpica-unix2-20200528.orig/source/compiler/dttable2.c
-+++ acpica-unix2-20200528/source/compiler/dttable2.c
-@@ -345,7 +345,7 @@ DtCompileMpst (
-     DtPushSubtable (Subtable);
- 
-     MpstChannelInfo = ACPI_CAST_PTR (ACPI_MPST_CHANNEL, Subtable->Buffer);
--    SubtableCount = MpstChannelInfo->PowerNodeCount;
-+    ACPI_MOVE_16_TO_16(&SubtableCount, &MpstChannelInfo->PowerNodeCount);
- 
-     while (*PFieldList && SubtableCount)
-     {
-@@ -363,8 +363,8 @@ DtCompileMpst (
-         DtPushSubtable (Subtable);
- 
-         MpstPowerNode = ACPI_CAST_PTR (ACPI_MPST_POWER_NODE, Subtable->Buffer);
--        PowerStateCount = MpstPowerNode->NumPowerStates;
--        ComponentCount = MpstPowerNode->NumPhysicalComponents;
-+        ACPI_MOVE_32_TO_32(&PowerStateCount, &MpstPowerNode->NumPowerStates);
-+        ACPI_MOVE_32_TO_32(&ComponentCount, &MpstPowerNode->NumPhysicalComponents);
- 
-         ParentTable = DtPeekSubtable ();
- 
-@@ -517,6 +517,7 @@ DtCompileNfit (
-     UINT32                  Count;
-     ACPI_NFIT_INTERLEAVE    *Interleave = NULL;
-     ACPI_NFIT_FLUSH_ADDRESS *Hint = NULL;
-+    UINT16		    SubType;
- 
- 
-     /* Main table */
-@@ -550,7 +551,8 @@ DtCompileNfit (
- 
-         NfitHeader = ACPI_CAST_PTR (ACPI_NFIT_HEADER, Subtable->Buffer);
- 
--        switch (NfitHeader->Type)
-+	ACPI_MOVE_16_TO_16(&SubType, &NfitHeader->Type);
-+        switch (SubType)
-         {
-         case ACPI_NFIT_TYPE_SYSTEM_ADDRESS:
- 
-@@ -610,7 +612,7 @@ DtCompileNfit (
-         DtInsertSubtable (ParentTable, Subtable);
-         DtPopSubtable ();
- 
--        switch (NfitHeader->Type)
-+        switch (SubType)
-         {
-         case ACPI_NFIT_TYPE_INTERLEAVE:
- 
-@@ -636,7 +638,7 @@ DtCompileNfit (
-                 Count++;
-             }
- 
--            Interleave->LineCount = Count;
-+            ACPI_MOVE_32_TO_32(&Interleave->LineCount, &Count);
-             break;
- 
-         case ACPI_NFIT_TYPE_SMBIOS:
-@@ -681,7 +683,7 @@ DtCompileNfit (
-                 Count++;
-             }
- 
--            Hint->HintCount = (UINT16) Count;
-+            ACPI_MOVE_32_TO_16(&Hint->HintCount, &Count);
-             break;
- 
-         default:
-@@ -957,7 +959,7 @@ DtCompilePmtt (
- 
-             PmttController = ACPI_CAST_PTR (ACPI_PMTT_CONTROLLER,
-                 (Subtable->Buffer - sizeof (ACPI_PMTT_HEADER)));
--            DomainCount = PmttController->DomainCount;
-+            ACPI_MOVE_16_TO_16(&DomainCount, &PmttController->DomainCount);
- 
-             while (DomainCount)
-             {
-@@ -1177,6 +1179,7 @@ DtCompileS3pt (
-     DT_SUBTABLE             *ParentTable;
-     ACPI_DMTABLE_INFO       *InfoTable;
-     DT_FIELD                *SubtableStart;
-+    UINT16		    HdrType;
- 
- 
-     Status = DtCompileTable (PFieldList, AcpiDmTableInfoS3pt,
-@@ -1204,7 +1207,8 @@ DtCompileS3pt (
- 
-         S3ptHeader = ACPI_CAST_PTR (ACPI_FPDT_HEADER, Subtable->Buffer);
- 
--        switch (S3ptHeader->Type)
-+	ACPI_MOVE_16_TO_16(&HdrType, &S3ptHeader->Type);
-+        switch (HdrType)
-         {
-         case ACPI_S3PT_TYPE_RESUME:
- 
-@@ -1517,6 +1521,7 @@ DtCompileSlit (
-     UINT32                  Localities;
-     UINT32                  LocalityListLength;
-     UINT8                   *LocalityBuffer;
-+    UINT32		    Tmp;
- 
- 
-     Status = DtCompileTable (PFieldList, AcpiDmTableInfoSlit,
-@@ -1529,7 +1534,8 @@ DtCompileSlit (
-     ParentTable = DtPeekSubtable ();
-     DtInsertSubtable (ParentTable, Subtable);
- 
--    Localities = *ACPI_CAST_PTR (UINT32, Subtable->Buffer);
-+    Tmp = *ACPI_CAST_PTR (UINT32, Subtable->Buffer);
-+    ACPI_MOVE_32_TO_32(&Localities, &Tmp);
-     LocalityBuffer = UtLocalCalloc (Localities);
-     LocalityListLength = 0;
- 
-@@ -1741,6 +1747,7 @@ DtCompileTcpa (
-     ACPI_TABLE_TCPA_HDR     *TcpaHeader;
-     DT_SUBTABLE             *ParentTable;
-     ACPI_STATUS             Status;
-+    UINT16		    PlatClass;
- 
- 
-     /* Compile the main table */
-@@ -1761,7 +1768,8 @@ DtCompileTcpa (
-      */
-     TcpaHeader = ACPI_CAST_PTR (ACPI_TABLE_TCPA_HDR, ParentTable->Buffer);
- 
--    switch (TcpaHeader->PlatformClass)
-+    ACPI_MOVE_16_TO_16(&PlatClass, &TcpaHeader->PlatformClass);
-+    switch (PlatClass)
-     {
-     case ACPI_TCPA_CLIENT_TABLE:
- 
-@@ -1809,6 +1817,7 @@ DtCompileTpm2Rev3 (
-     ACPI_TABLE_TPM23        *Tpm23Header;
-     DT_SUBTABLE             *ParentTable;
-     ACPI_STATUS             Status = AE_OK;
-+    UINT32		    Tmp32;
- 
- 
-     Status = DtCompileTable (PFieldList, AcpiDmTableInfoTpm23,
-@@ -1820,7 +1829,8 @@ DtCompileTpm2Rev3 (
- 
-     /* Subtable type depends on the StartMethod */
- 
--    switch (Tpm23Header->StartMethod)
-+    ACPI_MOVE_32_TO_32(&Tmp32, &Tpm23Header->StartMethod);
-+    switch (Tmp32)
-     {
-     case ACPI_TPM23_ACPI_START_METHOD:
- 
-@@ -1867,6 +1877,7 @@ DtCompileTpm2 (
-     DT_SUBTABLE             *ParentTable;
-     ACPI_STATUS             Status = AE_OK;
-     ACPI_TABLE_HEADER       *Header;
-+    UINT32		    Tmp32;
- 
- 
-     ParentTable = DtPeekSubtable ();
-@@ -1910,7 +1921,8 @@ DtCompileTpm2 (
- 
-     /* Subtable type depends on the StartMethod */
- 
--    switch (Tpm2Header->StartMethod)
-+    ACPI_MOVE_32_TO_32(&Tmp32, &Tpm2Header->StartMethod);
-+    switch (Tmp32)
-     {
-     case ACPI_TPM2_COMMAND_BUFFER_WITH_ARM_SMC:
- 
-@@ -2126,6 +2138,9 @@ DtCompileWpbt (
-     ACPI_TABLE_WPBT         *Table;
-     ACPI_STATUS             Status;
-     UINT16                  Length;
-+    UINT16                  Tmp16;
-+    UINT16		    *Ptr16;
-+    UINT32		    ii;
- 
- 
-     /* Compile the main table */
-@@ -2153,7 +2168,16 @@ DtCompileWpbt (
- 
-     Length = (UINT16) Subtable->TotalLength;
-     Table = ACPI_CAST_PTR (ACPI_TABLE_WPBT, ParentTable->Buffer);
--    Table->ArgumentsLength = Length;
-+    ACPI_MOVE_16_TO_16(&Table->ArgumentsLength, &Length);
-+
-+    /* The arguments are in Unicode, so make sure the byte order is correct */
-+    Ptr16 = (UINT16 *)Subtable->Buffer;
-+    for (ii = 0; ii < Length; ii++)
-+    {
-+	ACPI_MOVE_16_TO_16(&Tmp16, Ptr16);
-+	*Ptr16 = Tmp16;
-+        Ptr16++;
-+    }
- 
-     ParentTable = DtPeekSubtable ();
-     DtInsertSubtable (ParentTable, Subtable);
-Index: acpica-unix2-20200528/source/components/disassembler/dmbuffer.c
-===================================================================
---- acpica-unix2-20200528.orig/source/components/disassembler/dmbuffer.c
-+++ acpica-unix2-20200528/source/components/disassembler/dmbuffer.c
-@@ -204,7 +204,7 @@ AcpiDmByteList (
- 
- 
-     ByteData = Op->Named.Data;
--    ByteCount = (UINT32) Op->Common.Value.Integer;
-+    ByteCount = (UINT32) Op->Common.Value.Size;
- 
-     /*
-      * The byte list belongs to a buffer, and can be produced by either
-@@ -308,7 +308,8 @@ AcpiDmIsUuidBuffer (
-     /* Extract the byte list info */
- 
-     ByteData = NextOp->Named.Data;
--    ByteCount = (UINT32) NextOp->Common.Value.Integer;
-+    /* ByteCount = (UINT32) NextOp->Common.Value.Integer; */
-+    ByteCount = (UINT32) NextOp->Common.Value.Size;
- 
-     /* Byte count must be exactly 16 */
- 
-@@ -432,7 +433,8 @@ AcpiDmIsUnicodeBuffer (
-     /* Extract the byte list info */
- 
-     ByteData = NextOp->Named.Data;
--    ByteCount = (UINT32) NextOp->Common.Value.Integer;
-+    /* ByteCount = (UINT32) NextOp->Common.Value.Integer; */
-+    ByteCount = (UINT32) NextOp->Common.Value.Size;
-     WordCount = ACPI_DIV_2 (ByteCount);
- 
-     /*
-@@ -869,19 +871,22 @@ AcpiDmUnicode (
-     UINT32                  WordCount;
-     UINT32                  i;
-     int                     OutputValue;
-+    UINT16		    Tmp16;
- 
- 
-     /* Extract the buffer info as a WORD buffer */
- 
-     WordData = ACPI_CAST_PTR (UINT16, Op->Named.Data);
--    WordCount = ACPI_DIV_2 (((UINT32) Op->Common.Value.Integer));
-+    WordCount = ACPI_DIV_2 (((UINT32) Op->Common.Value.Size));
- 
-     /* Write every other byte as an ASCII character */
- 
-     AcpiOsPrintf ("\"");
-     for (i = 0; i < (WordCount - 1); i++)
-     {
--        OutputValue = (int) WordData[i];
-+        /* OutputValue = (int) WordData[i]; */
-+	ACPI_MOVE_16_TO_16(&Tmp16, &WordData[i]);
-+	OutputValue = (int) Tmp16;
- 
-         /* Handle values that must be escaped */
- 
-@@ -990,16 +995,18 @@ AcpiDmCheckForHardwareId (
-     ACPI_PARSE_OBJECT       *Op)
- {
-     UINT32                  Name;
-+    UINT32                  TmpName;
-     ACPI_PARSE_OBJECT       *NextOp;
- 
- 
-     /* Get the NameSegment */
- 
--    Name = AcpiPsGetName (Op);
--    if (!Name)
-+    TmpName = AcpiPsGetName (Op);
-+    if (!TmpName)
-     {
-         return;
-     }
-+    ACPI_MOVE_32_TO_32(&Name, &TmpName);
- 
-     NextOp = AcpiPsGetDepthNext (NULL, Op);
-     if (!NextOp)
-Index: acpica-unix2-20200528/source/components/disassembler/dmopcode.c
-===================================================================
---- acpica-unix2-20200528.orig/source/components/disassembler/dmopcode.c
-+++ acpica-unix2-20200528/source/components/disassembler/dmopcode.c
-@@ -244,6 +244,7 @@ AcpiDmPredefinedDescription (
-     char                        *NameString;
-     int                         LastCharIsDigit;
-     int                         LastCharsAreHex;
-+    char			TmpName[ACPI_NAMESEG_SIZE + 1];
- 
- 
-     if (!Op)
-@@ -261,7 +262,9 @@ AcpiDmPredefinedDescription (
- 
-     /* Predefined name must start with an underscore */
- 
--    NameString = ACPI_CAST_PTR (char, &Op->Named.Name);
-+    memset(TmpName, 0, ACPI_NAMESEG_SIZE + 1);
-+    ACPI_MOVE_32_TO_32(TmpName, &Op->Named.Name);
-+    NameString = TmpName;
-     if (NameString[0] != '_')
-     {
-         return;
-@@ -880,25 +883,29 @@ AcpiDmDisassembleOneOp (
-         AcpiDmNamestring (Op->Common.Value.Name);
-         break;
- 
--    case AML_INT_NAMEDFIELD_OP:
-+    case AML_INT_NAMEDFIELD_OP: {
- 
--        Length = AcpiDmDumpName (Op->Named.Name);
-+	UINT32 TmpName;
-+
-+	ACPI_MOVE_32_TO_32(&TmpName, &Op->Named.Name);
-+        Length = AcpiDmDumpName (TmpName);
- 
-         AcpiOsPrintf (",");
-         ASL_CV_PRINT_ONE_COMMENT (Op, AML_NAMECOMMENT, NULL, 0);
-         AcpiOsPrintf ("%*.s  %u", (unsigned) (5 - Length), " ",
--            (UINT32) Op->Common.Value.Integer);
-+            (UINT32) Op->Common.Value.Size);
- 
-         AcpiDmCommaIfFieldMember (Op);
- 
--        Info->BitOffset += (UINT32) Op->Common.Value.Integer;
-+        Info->BitOffset += (UINT32) Op->Common.Value.Size;
-         break;
-+    }
- 
-     case AML_INT_RESERVEDFIELD_OP:
- 
-         /* Offset() -- Must account for previous offsets */
- 
--        Offset = (UINT32) Op->Common.Value.Integer;
-+        Offset = Op->Common.Value.Size;
-         Info->BitOffset += Offset;
- 
-         if (Info->BitOffset % 8 == 0)
-@@ -942,10 +949,15 @@ AcpiDmDisassembleOneOp (
- 
-         if (Child->Common.AmlOpcode == AML_INT_BYTELIST_OP)
-         {
-+	    /* UINT64 Tmp64; */
-+
-             AcpiOsPrintf ("\n");
- 
-             Aml = Child->Named.Data;
-+	    /*
-             Length = (UINT32) Child->Common.Value.Integer;
-+	    */
-+            Length = (UINT32) Child->Common.Value.Size;
- 
-             Info->Level += 1;
-             Info->MappingOp = Op;
-Index: acpica-unix2-20200528/source/components/disassembler/dmresrcl.c
-===================================================================
---- acpica-unix2-20200528.orig/source/components/disassembler/dmresrcl.c
-+++ acpica-unix2-20200528/source/components/disassembler/dmresrcl.c
-@@ -141,7 +141,8 @@ AcpiDmMemoryFields (
-     UINT32                  Level)
- {
-     UINT32                  i;
--
-+    UINT16		    Tmp16;
-+    UINT32		    Tmp32;
- 
-     for (i = 0; i < 4; i++)
-     {
-@@ -151,14 +152,14 @@ AcpiDmMemoryFields (
-         {
-         case 16:
- 
--            AcpiDmDumpInteger16 (ACPI_CAST_PTR (UINT16, Source)[i],
--                AcpiDmMemoryNames[i]);
-+	    ACPI_MOVE_16_TO_16(&Tmp16, &(ACPI_CAST_PTR (UINT16, Source)[i]));
-+            AcpiDmDumpInteger16 (Tmp16, AcpiDmMemoryNames[i]);
-             break;
- 
-         case 32:
- 
--            AcpiDmDumpInteger32 (ACPI_CAST_PTR (UINT32, Source)[i],
--                AcpiDmMemoryNames[i]);
-+	    ACPI_MOVE_32_TO_32(&Tmp32, &(ACPI_CAST_PTR (UINT32, Source)[i]));
-+            AcpiDmDumpInteger32 (Tmp32, AcpiDmMemoryNames[i]);
-             break;
- 
-         default:
-@@ -190,7 +191,9 @@ AcpiDmAddressFields (
-     UINT32                  Level)
- {
-     UINT32                  i;
--
-+    UINT16		    Tmp16;
-+    UINT32		    Tmp32;
-+    UINT64		    Tmp64;
- 
-     AcpiOsPrintf ("\n");
- 
-@@ -202,20 +205,20 @@ AcpiDmAddressFields (
-         {
-         case 16:
- 
--            AcpiDmDumpInteger16 (ACPI_CAST_PTR (UINT16, Source)[i],
--                AcpiDmAddressNames[i]);
-+	    ACPI_MOVE_16_TO_16(&Tmp16, &(ACPI_CAST_PTR (UINT16, Source)[i]));
-+            AcpiDmDumpInteger16 (Tmp16, AcpiDmAddressNames[i]);
-             break;
- 
-         case 32:
- 
--            AcpiDmDumpInteger32 (ACPI_CAST_PTR (UINT32, Source)[i],
--                AcpiDmAddressNames[i]);
-+	    ACPI_MOVE_32_TO_32(&Tmp32, &(ACPI_CAST_PTR (UINT32, Source)[i]));
-+            AcpiDmDumpInteger32 (Tmp32, AcpiDmAddressNames[i]);
-             break;
- 
-         case 64:
- 
--            AcpiDmDumpInteger64 (ACPI_CAST_PTR (UINT64, Source)[i],
--                AcpiDmAddressNames[i]);
-+	    ACPI_MOVE_64_TO_64(&Tmp64, &(ACPI_CAST_PTR (UINT64, Source)[i]));
-+            AcpiDmDumpInteger64 (Tmp64, AcpiDmAddressNames[i]);
-             break;
- 
-         default:
-@@ -868,6 +871,7 @@ AcpiDmFixedMemory32Descriptor (
-     UINT32                  Length,
-     UINT32                  Level)
- {
-+    UINT32 Tmp;
- 
-     /* Dump name and read/write flag */
- 
-@@ -876,12 +880,12 @@ AcpiDmFixedMemory32Descriptor (
-         AcpiGbl_RwDecode [ACPI_GET_1BIT_FLAG (Resource->FixedMemory32.Flags)]);
- 
-     AcpiDmIndent (Level + 1);
--    AcpiDmDumpInteger32 (Resource->FixedMemory32.Address,
--        "Address Base");
-+    ACPI_MOVE_32_TO_32(&Tmp, &Resource->FixedMemory32.Address);
-+    AcpiDmDumpInteger32 (Tmp, "Address Base");
- 
-     AcpiDmIndent (Level + 1);
--    AcpiDmDumpInteger32 (Resource->FixedMemory32.AddressLength,
--        "Address Length");
-+    ACPI_MOVE_32_TO_32(&Tmp, &Resource->FixedMemory32.AddressLength);
-+    AcpiDmDumpInteger32 (Tmp, "Address Length");
- 
-     /* Insert a descriptor name */
- 
-@@ -913,6 +917,7 @@ AcpiDmGenericRegisterDescriptor (
-     UINT32                  Length,
-     UINT32                  Level)
- {
-+    UINT64		    Tmp64;
- 
-     AcpiDmIndent (Level);
-     AcpiOsPrintf ("Register (");
-@@ -926,7 +931,9 @@ AcpiDmGenericRegisterDescriptor (
-     AcpiDmDumpInteger8 (Resource->GenericReg.BitOffset, "Bit Offset");
- 
-     AcpiDmIndent (Level + 1);
--    AcpiDmDumpInteger64 (Resource->GenericReg.Address, "Address");
-+    /* AcpiDmDumpInteger64 (Resource->GenericReg.Address, "Address"); */
-+    ACPI_MOVE_64_TO_64(&Tmp64, &Resource->GenericReg.Address);
-+    AcpiDmDumpInteger64 (Tmp64, "Address");
- 
-     /* Optional field for ACPI 3.0 */
- 
-@@ -972,7 +979,7 @@ AcpiDmInterruptDescriptor (
-     UINT32                  Level)
- {
-     UINT32                  i;
--
-+    UINT16		    Tmp16;
- 
-     AcpiDmIndent (Level);
-     AcpiOsPrintf ("Interrupt (%s, %s, %s, %s, ",
-@@ -986,10 +993,11 @@ AcpiDmInterruptDescriptor (
-      * list. Must compute length based on length of the list. First xrupt
-      * is included in the struct (reason for -1 below)
-      */
-+    ACPI_MOVE_16_TO_16(&Tmp16, &Resource->ExtendedIrq.ResourceLength);
-     AcpiDmResourceSource (Resource,
-         sizeof (AML_RESOURCE_EXTENDED_IRQ) +
-             ((UINT32) Resource->ExtendedIrq.InterruptCount - 1) * sizeof (UINT32),
--        Resource->ExtendedIrq.ResourceLength);
-+        Tmp16);
- 
-     /* Insert a descriptor name */
- 
-@@ -1002,9 +1010,12 @@ AcpiDmInterruptDescriptor (
-     AcpiOsPrintf ("{\n");
-     for (i = 0; i < Resource->ExtendedIrq.InterruptCount; i++)
-     {
-+	UINT32 Tmp32, Val32;
-+
-         AcpiDmIndent (Level + 1);
--        AcpiOsPrintf ("0x%8.8X,\n",
--            (UINT32) Resource->ExtendedIrq.Interrupts[i]);
-+	Val32 = (UINT32) Resource->ExtendedIrq.Interrupts[i];
-+	ACPI_MOVE_32_TO_32(&Tmp32, &Val32);
-+        AcpiOsPrintf ("0x%8.8X,\n", Tmp32);
-     }
- 
-     AcpiDmIndent (Level);
-Index: acpica-unix2-20200528/source/components/disassembler/dmresrcl2.c
-===================================================================
---- acpica-unix2-20200528.orig/source/components/disassembler/dmresrcl2.c
-+++ acpica-unix2-20200528/source/components/disassembler/dmresrcl2.c
-@@ -191,22 +191,24 @@ AcpiDmGpioCommon (
-     char                    *DeviceName = NULL;
-     UINT32                  PinCount;
-     UINT32                  i;
-+    UINT16		    Tmp16;
- 
- 
-     /* ResourceSource, ResourceSourceIndex, ResourceType */
- 
-     AcpiDmIndent (Level + 1);
--    if (Resource->Gpio.ResSourceOffset)
-+    ACPI_MOVE_16_TO_16(&Tmp16, &Resource->Gpio.ResSourceOffset);
-+    if (Tmp16)
-     {
--        DeviceName = ACPI_ADD_PTR (char,
--            Resource, Resource->Gpio.ResSourceOffset),
-+        DeviceName = ACPI_ADD_PTR (char, Resource, Tmp16),
-         AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
-     }
- 
-     AcpiOsPrintf (", ");
-     AcpiOsPrintf ("0x%2.2X, ", Resource->Gpio.ResSourceIndex);
-+    ACPI_MOVE_16_TO_16(&Tmp16, &Resource->Gpio.Flags);
-     AcpiOsPrintf ("%s, ",
--        AcpiGbl_ConsumeDecode [ACPI_GET_1BIT_FLAG (Resource->Gpio.Flags)]);
-+        AcpiGbl_ConsumeDecode [ACPI_GET_1BIT_FLAG (Tmp16)]);
- 
-     /* Insert a descriptor name */
- 
-@@ -215,15 +217,16 @@ AcpiDmGpioCommon (
- 
-     /* Dump the vendor data */
- 
--    if (Resource->Gpio.VendorOffset)
-+    ACPI_MOVE_16_TO_16(&Tmp16, &Resource->Gpio.VendorOffset);
-+    if (Tmp16)
-     {
-         AcpiOsPrintf ("\n");
-         AcpiDmIndent (Level + 1);
--        VendorData = ACPI_ADD_PTR (UINT8, Resource,
--            Resource->Gpio.VendorOffset);
-+	ACPI_MOVE_16_TO_16(&Tmp16, &Resource->Gpio.VendorOffset);
-+        VendorData = ACPI_ADD_PTR (UINT8, Resource, Tmp16);
- 
--        AcpiDmDumpRawDataBuffer (VendorData,
--            Resource->Gpio.VendorLength, Level);
-+	ACPI_MOVE_16_TO_16(&Tmp16, &Resource->Gpio.VendorLength);
-+        AcpiDmDumpRawDataBuffer (VendorData, Tmp16, Level);
-     }
- 
-     AcpiOsPrintf (")\n");
-@@ -233,17 +236,25 @@ AcpiDmGpioCommon (
-     AcpiDmIndent (Level + 1);
-     AcpiOsPrintf ("{   // Pin list\n");
- 
-+    /*
-     PinCount = ((UINT32) (Resource->Gpio.ResSourceOffset -
-         Resource->Gpio.PinTableOffset)) /
-         sizeof (UINT16);
-+    */
-+    ACPI_MOVE_16_TO_16(&Tmp16, &Resource->Gpio.ResSourceOffset);
-+    PinCount = (UINT32) Tmp16;
-+    ACPI_MOVE_16_TO_16(&Tmp16, &Resource->Gpio.PinTableOffset);
-+    PinCount -= (UINT32) Tmp16;
-+    PinCount /= sizeof (UINT16);
- 
--    PinList = (UINT16 *) ACPI_ADD_PTR (char, Resource,
--        Resource->Gpio.PinTableOffset);
-+    ACPI_MOVE_16_TO_16(&Tmp16, &Resource->Gpio.PinTableOffset);
-+    PinList = (UINT16 *) ACPI_ADD_PTR (char, Resource, Tmp16);
- 
-     for (i = 0; i < PinCount; i++)
-     {
-         AcpiDmIndent (Level + 2);
--        AcpiOsPrintf ("0x%4.4X%s\n", PinList[i],
-+	ACPI_MOVE_16_TO_16(&Tmp16, &PinList[i]);
-+        AcpiOsPrintf ("0x%4.4X%s\n", Tmp16,
-             ((i + 1) < PinCount) ? "," : "");
-     }
- 
-@@ -277,16 +288,18 @@ AcpiDmGpioIntDescriptor (
-     UINT32                  Length,
-     UINT32                  Level)
- {
-+    UINT16		    Tmp16;
- 
-     /* Dump the GpioInt-specific portion of the descriptor */
- 
-     /* EdgeLevel, ActiveLevel, Shared */
- 
-     AcpiDmIndent (Level);
-+    ACPI_MOVE_16_TO_16(&Tmp16, &Resource->Gpio.IntFlags);
-     AcpiOsPrintf ("GpioInt (%s, %s, %s, ",
--        AcpiGbl_HeDecode [ACPI_GET_1BIT_FLAG (Resource->Gpio.IntFlags)],
--        AcpiGbl_LlDecode [ACPI_EXTRACT_2BIT_FLAG (Resource->Gpio.IntFlags, 1)],
--        AcpiGbl_ShrDecode [ACPI_EXTRACT_2BIT_FLAG (Resource->Gpio.IntFlags, 3)]);
-+        AcpiGbl_HeDecode [ACPI_GET_1BIT_FLAG (Tmp16)],
-+        AcpiGbl_LlDecode [ACPI_EXTRACT_2BIT_FLAG (Tmp16, 1)],
-+        AcpiGbl_ShrDecode [ACPI_EXTRACT_2BIT_FLAG (Tmp16, 3)]);
- 
-     /* PinConfig, DebounceTimeout */
- 
-@@ -299,7 +312,8 @@ AcpiDmGpioIntDescriptor (
-     {
-         AcpiOsPrintf ("0x%2.2X, ", Resource->Gpio.PinConfig);
-     }
--    AcpiOsPrintf ("0x%4.4X,\n", Resource->Gpio.DebounceTimeout);
-+    ACPI_MOVE_16_TO_16(&Tmp16, &Resource->Gpio.DebounceTimeout);
-+    AcpiOsPrintf ("0x%4.4X,\n", Tmp16);
- 
-     /* Dump the GpioInt/GpioIo common portion of the descriptor */
- 
-@@ -329,14 +343,16 @@ AcpiDmGpioIoDescriptor (
-     UINT32                  Length,
-     UINT32                  Level)
- {
-+    UINT16		    Tmp16;
- 
-     /* Dump the GpioIo-specific portion of the descriptor */
- 
-     /* Shared, PinConfig */
- 
-     AcpiDmIndent (Level);
-+    ACPI_MOVE_16_TO_16(&Tmp16, &Resource->Gpio.IntFlags);
-     AcpiOsPrintf ("GpioIo (%s, ",
--        AcpiGbl_ShrDecode [ACPI_EXTRACT_2BIT_FLAG (Resource->Gpio.IntFlags, 3)]);
-+        AcpiGbl_ShrDecode [ACPI_EXTRACT_2BIT_FLAG (Tmp16, 3)]);
- 
-     if (Resource->Gpio.PinConfig <= 3)
-     {
-@@ -350,10 +366,13 @@ AcpiDmGpioIoDescriptor (
- 
-     /* DebounceTimeout, DriveStrength, IoRestriction */
- 
--    AcpiOsPrintf ("0x%4.4X, ", Resource->Gpio.DebounceTimeout);
--    AcpiOsPrintf ("0x%4.4X, ", Resource->Gpio.DriveStrength);
-+    ACPI_MOVE_16_TO_16(&Tmp16, &Resource->Gpio.DebounceTimeout);
-+    AcpiOsPrintf ("0x%4.4X, ", Tmp16);
-+    ACPI_MOVE_16_TO_16(&Tmp16, &Resource->Gpio.DriveStrength);
-+    AcpiOsPrintf ("0x%4.4X, ", Tmp16);
-+    ACPI_MOVE_16_TO_16(&Tmp16, &Resource->Gpio.IntFlags);
-     AcpiOsPrintf ("%s,\n",
--        AcpiGbl_IorDecode [ACPI_GET_2BIT_FLAG (Resource->Gpio.IntFlags)]);
-+        AcpiGbl_IorDecode [ACPI_GET_2BIT_FLAG (Tmp16)]);
- 
-     /* Dump the GpioInt/GpioIo common portion of the descriptor */
- 
-@@ -533,6 +552,7 @@ AcpiDmDumpSerialBusVendorData (
- {
-     UINT8                   *VendorData;
-     UINT32                  VendorLength;
-+    UINT16                  Tmp16;
- 
- 
-     /* Get the (optional) vendor data and length */
-@@ -541,8 +561,8 @@ AcpiDmDumpSerialBusVendorData (
-     {
-     case AML_RESOURCE_I2C_SERIALBUSTYPE:
- 
--        VendorLength = Resource->CommonSerialBus.TypeDataLength -
--            AML_RESOURCE_I2C_MIN_DATA_LEN;
-+	ACPI_MOVE_16_TO_16(&Tmp16, &Resource->CommonSerialBus.TypeDataLength);
-+        VendorLength = Tmp16 - AML_RESOURCE_I2C_MIN_DATA_LEN;
- 
-         VendorData = ACPI_ADD_PTR (UINT8, Resource,
-             sizeof (AML_RESOURCE_I2C_SERIALBUS));
-@@ -550,8 +570,8 @@ AcpiDmDumpSerialBusVendorData (
- 
-     case AML_RESOURCE_SPI_SERIALBUSTYPE:
- 
--        VendorLength = Resource->CommonSerialBus.TypeDataLength -
--            AML_RESOURCE_SPI_MIN_DATA_LEN;
-+	ACPI_MOVE_16_TO_16(&Tmp16, &Resource->CommonSerialBus.TypeDataLength);
-+        VendorLength = Tmp16 - AML_RESOURCE_SPI_MIN_DATA_LEN;
- 
-         VendorData = ACPI_ADD_PTR (UINT8, Resource,
-             sizeof (AML_RESOURCE_SPI_SERIALBUS));
-@@ -559,8 +579,8 @@ AcpiDmDumpSerialBusVendorData (
- 
-     case AML_RESOURCE_UART_SERIALBUSTYPE:
- 
--        VendorLength = Resource->CommonSerialBus.TypeDataLength -
--            AML_RESOURCE_UART_MIN_DATA_LEN;
-+	ACPI_MOVE_16_TO_16(&Tmp16, &Resource->CommonSerialBus.TypeDataLength);
-+        VendorLength = Tmp16 - AML_RESOURCE_UART_MIN_DATA_LEN;
- 
-         VendorData = ACPI_ADD_PTR (UINT8, Resource,
-             sizeof (AML_RESOURCE_UART_SERIALBUS));
-@@ -601,24 +621,29 @@ AcpiDmI2cSerialBusDescriptor (
- {
-     UINT32                  ResourceSourceOffset;
-     char                    *DeviceName;
-+    UINT16		    Tmp16;
-+    UINT32		    Tmp32;
- 
- 
-     /* SlaveAddress, SlaveMode, ConnectionSpeed, AddressingMode */
- 
-+    ACPI_MOVE_16_TO_16(&Tmp16, &Resource->I2cSerialBus.SlaveAddress);
-+    ACPI_MOVE_32_TO_32(&Tmp32, &Resource->I2cSerialBus.ConnectionSpeed);
-     AcpiDmIndent (Level);
-     AcpiOsPrintf ("I2cSerialBusV2 (0x%4.4X, %s, 0x%8.8X,\n",
--        Resource->I2cSerialBus.SlaveAddress,
-+        Tmp16,
-         AcpiGbl_SmDecode [ACPI_GET_1BIT_FLAG (Resource->I2cSerialBus.Flags)],
--        Resource->I2cSerialBus.ConnectionSpeed);
-+        Tmp32);
- 
-     AcpiDmIndent (Level + 1);
-+    ACPI_MOVE_16_TO_16(&Tmp16, &Resource->I2cSerialBus.TypeSpecificFlags);
-     AcpiOsPrintf ("%s, ",
--        AcpiGbl_AmDecode [ACPI_GET_1BIT_FLAG (Resource->I2cSerialBus.TypeSpecificFlags)]);
-+        AcpiGbl_AmDecode [ACPI_GET_1BIT_FLAG (Tmp16)]);
- 
-     /* ResourceSource is a required field */
- 
--    ResourceSourceOffset = sizeof (AML_RESOURCE_COMMON_SERIALBUS) +
--        Resource->CommonSerialBus.TypeDataLength;
-+    ACPI_MOVE_16_TO_16(&Tmp16, &Resource->CommonSerialBus.TypeDataLength);
-+    ResourceSourceOffset = sizeof (AML_RESOURCE_COMMON_SERIALBUS) + Tmp16;
- 
-     DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset);
-     AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
-Index: acpica-unix2-20200528/source/components/disassembler/dmresrcs.c
-===================================================================
---- acpica-unix2-20200528.orig/source/components/disassembler/dmresrcs.c
-+++ acpica-unix2-20200528/source/components/disassembler/dmresrcs.c
-@@ -72,6 +72,7 @@ AcpiDmIrqDescriptor (
-     UINT32                  Length,
-     UINT32                  Level)
- {
-+    UINT16 Tmp;
- 
-     AcpiDmIndent (Level);
-     AcpiOsPrintf ("%s (",
-@@ -93,7 +94,8 @@ AcpiDmIrqDescriptor (
-     AcpiOsPrintf (")\n");
- 
-     AcpiDmIndent (Level + 1);
--    AcpiDmBitList (Resource->Irq.IrqMask);
-+    ACPI_MOVE_16_TO_16(&Tmp, &Resource->Irq.IrqMask);
-+    AcpiDmBitList (Tmp);
- }
- 
- 
-@@ -204,16 +206,19 @@ AcpiDmIoDescriptor (
-     UINT32                  Length,
-     UINT32                  Level)
- {
-+    UINT16 Tmp16;
- 
-     AcpiDmIndent (Level);
-     AcpiOsPrintf ("IO (%s,\n",
-         AcpiGbl_IoDecode [ACPI_GET_1BIT_FLAG (Resource->Io.Flags)]);
- 
-     AcpiDmIndent (Level + 1);
--    AcpiDmDumpInteger16 (Resource->Io.Minimum, "Range Minimum");
-+    ACPI_MOVE_16_TO_16(&Tmp16, &Resource->Io.Minimum);
-+    AcpiDmDumpInteger16 (Tmp16, "Range Minimum");
- 
-     AcpiDmIndent (Level + 1);
--    AcpiDmDumpInteger16 (Resource->Io.Maximum, "Range Maximum");
-+    ACPI_MOVE_16_TO_16(&Tmp16, &Resource->Io.Maximum);
-+    AcpiDmDumpInteger16 (Tmp16, "Range Maximum");
- 
-     AcpiDmIndent (Level + 1);
-     AcpiDmDumpInteger8 (Resource->Io.Alignment, "Alignment");
-@@ -251,12 +256,14 @@ AcpiDmFixedIoDescriptor (
-     UINT32                  Length,
-     UINT32                  Level)
- {
-+    UINT16                  Tmp16;
- 
-     AcpiDmIndent (Level);
-     AcpiOsPrintf ("FixedIO (\n");
- 
-     AcpiDmIndent (Level + 1);
--    AcpiDmDumpInteger16 (Resource->FixedIo.Address, "Address");
-+    ACPI_MOVE_16_TO_16(&Tmp16, &Resource->FixedIo.Address);
-+    AcpiDmDumpInteger16 (Tmp16, "Address");
- 
-     AcpiDmIndent (Level + 1);
-     AcpiDmDumpInteger8 (Resource->FixedIo.AddressLength, "Length");
-Index: acpica-unix2-20200528/source/components/dispatcher/dsfield.c
-===================================================================
---- acpica-unix2-20200528.orig/source/components/dispatcher/dsfield.c
-+++ acpica-unix2-20200528/source/components/dispatcher/dsfield.c
-@@ -329,6 +329,7 @@ AcpiDsGetFieldNames (
-     ACPI_STATUS             Status;
-     UINT64                  Position;
-     ACPI_PARSE_OBJECT       *Child;
-+    UINT32 TmpName;
- 
- #ifdef ACPI_EXEC_APP
-     ACPI_OPERAND_OBJECT     *ResultDesc;
-@@ -442,10 +443,17 @@ AcpiDsGetFieldNames (
- 
-             /* Lookup the name, it should already exist */
- 
-+	    ACPI_MOVE_32_TO_32(&TmpName, &Arg->Named.Name);
-+            Status = AcpiNsLookup (WalkState->ScopeInfo,
-+                (char *) &TmpName, Info->FieldType,
-+                ACPI_IMODE_EXECUTE, ACPI_NS_DONT_OPEN_SCOPE,
-+                WalkState, &Info->FieldNode);
-+	/*
-             Status = AcpiNsLookup (WalkState->ScopeInfo,
-                 (char *) &Arg->Named.Name, Info->FieldType,
-                 ACPI_IMODE_EXECUTE, ACPI_NS_DONT_OPEN_SCOPE,
-                 WalkState, &Info->FieldNode);
-+	*/
-             if (ACPI_FAILURE (Status))
-             {
-                 ACPI_ERROR_NAMESPACE (WalkState->ScopeInfo,
-@@ -703,9 +711,17 @@ AcpiDsInitFieldObjects (
-          */
-         if (Arg->Common.AmlOpcode == AML_INT_NAMEDFIELD_OP)
-         {
-+	    UINT32 TmpName;
-+
-+            ACPI_MOVE_32_TO_32(&TmpName, &Arg->Named.Name);
-+            Status = AcpiNsLookup (WalkState->ScopeInfo,
-+                (char *) &TmpName, Type, ACPI_IMODE_LOAD_PASS1,
-+                Flags, WalkState, &Node);
-+	/*
-             Status = AcpiNsLookup (WalkState->ScopeInfo,
-                 (char *) &Arg->Named.Name, Type, ACPI_IMODE_LOAD_PASS1,
-                 Flags, WalkState, &Node);
-+	*/
-             if (ACPI_FAILURE (Status))
-             {
-                 ACPI_ERROR_NAMESPACE (WalkState->ScopeInfo,
-Index: acpica-unix2-20200528/source/components/events/evgpeblk.c
-===================================================================
---- acpica-unix2-20200528.orig/source/components/events/evgpeblk.c
-+++ acpica-unix2-20200528/source/components/events/evgpeblk.c
-@@ -380,6 +380,7 @@ AcpiEvCreateGpeBlock (
-     ACPI_STATUS             Status;
-     ACPI_GPE_BLOCK_INFO     *GpeBlock;
-     ACPI_GPE_WALK_INFO      WalkInfo;
-+    char		    Name[ACPI_NAMESEG_SIZE + 1];
- 
- 
-     ACPI_FUNCTION_TRACE (EvCreateGpeBlock);
-@@ -400,7 +401,7 @@ AcpiEvCreateGpeBlock (
- 
-     /* Initialize the new GPE block */
- 
--    GpeBlock->Address = Address;
-+    ACPI_MOVE_64_TO_64(&GpeBlock->Address, &Address);
-     GpeBlock->SpaceId = SpaceId;
-     GpeBlock->Node = GpeDevice;
-     GpeBlock->GpeCount = (UINT16) (RegisterCount * ACPI_GPE_REGISTER_WIDTH);
-@@ -449,11 +450,13 @@ AcpiEvCreateGpeBlock (
-         (*ReturnGpeBlock) = GpeBlock;
-     }
- 
-+    memset(&Name, 0, ACPI_NAMESEG_SIZE + 1);
-+    ACPI_MOVE_32_TO_32(&Name, &GpeDevice->Name.Ascii);
-     ACPI_DEBUG_PRINT_RAW ((ACPI_DB_INIT,
-         "    Initialized GPE %02X to %02X [%4.4s] %u regs on interrupt 0x%X%s\n",
-         (UINT32) GpeBlock->BlockBaseNumber,
-         (UINT32) (GpeBlock->BlockBaseNumber + (GpeBlock->GpeCount - 1)),
--        GpeDevice->Name.Ascii, GpeBlock->RegisterCount, InterruptNumber,
-+        Name, GpeBlock->RegisterCount, InterruptNumber,
-         InterruptNumber == AcpiGbl_FADT.SciInterrupt ? " (SCI)" : ""));
- 
-     /* Update global count of currently available GPEs */
-Index: acpica-unix2-20200528/source/components/hardware/hwregs.c
-===================================================================
---- acpica-unix2-20200528.orig/source/components/hardware/hwregs.c
-+++ acpica-unix2-20200528/source/components/hardware/hwregs.c
-@@ -197,7 +197,7 @@ AcpiHwValidateRegister (
-      * Address must not be null. A null address also indicates an optional
-      * ACPI register that is not supported, so no error message.
-      */
--    ACPI_MOVE_64_TO_64 (Address, &Reg->Address);
-+    *Address =  Reg->Address;
-     if (!(*Address))
-     {
-         return (AE_BAD_ADDRESS);
-Index: acpica-unix2-20200528/source/components/hardware/hwvalid.c
-===================================================================
---- acpica-unix2-20200528.orig/source/components/hardware/hwvalid.c
-+++ acpica-unix2-20200528/source/components/hardware/hwvalid.c
-@@ -135,6 +135,8 @@ AcpiHwValidateIoRequest (
-     UINT32                  ByteWidth;
-     ACPI_IO_ADDRESS         LastAddress;
-     const ACPI_PORT_INFO    *PortInfo;
-+    UINT64                  Max16;
-+    UINT64                  Tmp64;
- 
- 
-     ACPI_FUNCTION_TRACE (HwValidateIoRequest);
-@@ -162,7 +164,10 @@ AcpiHwValidateIoRequest (
- 
-     /* Maximum 16-bit address in I/O space */
- 
--    if (LastAddress > ACPI_UINT16_MAX)
-+    Max16 = (UINT64) ACPI_UINT16_MAX;
-+    ACPI_MOVE_64_TO_64(&Tmp64, &Max16);
-+
-+    if ((UINT64)LastAddress > Tmp64)
-     {
-         ACPI_ERROR ((AE_INFO,
-             "Illegal I/O port address/length above 64K: %8.8X%8.8X/0x%X",
-Index: acpica-unix2-20200528/source/components/namespace/nsaccess.c
-===================================================================
---- acpica-unix2-20200528.orig/source/components/namespace/nsaccess.c
-+++ acpica-unix2-20200528/source/components/namespace/nsaccess.c
-@@ -349,6 +349,7 @@ AcpiNsLookup (
-     UINT32                  SearchParentFlag = ACPI_NS_SEARCH_PARENT;
-     UINT32                  LocalFlags;
-     ACPI_INTERPRETER_MODE   LocalInterpreterMode;
-+    UINT32		    Tmp32;
- 
- 
-     ACPI_FUNCTION_TRACE (NsLookup);
-@@ -758,9 +759,10 @@ AcpiNsLookup (
-             {
-                 /* Complain about a type mismatch */
- 
-+		ACPI_MOVE_32_TO_32(&Tmp32, &SimpleName);
-                 ACPI_WARNING ((AE_INFO,
-                     "NsLookup: Type mismatch on %4.4s (%s), searching for (%s)",
--                    ACPI_CAST_PTR (char, &SimpleName),
-+                    ACPI_CAST_PTR (char, &Tmp32),
-                     AcpiUtGetTypeName (ThisNode->Type),
-                     AcpiUtGetTypeName (TypeToCheckFor)));
-             }
-Index: acpica-unix2-20200528/source/components/namespace/nsparse.c
-===================================================================
---- acpica-unix2-20200528.orig/source/components/namespace/nsparse.c
-+++ acpica-unix2-20200528/source/components/namespace/nsparse.c
-@@ -216,13 +216,14 @@ AcpiNsOneCompleteParse (
- 
-     /* Table must consist of at least a complete header */
- 
--    if (Table->Length < sizeof (ACPI_TABLE_HEADER))
-+    ACPI_MOVE_32_TO_32(&AmlLength, &Table->Length);
-+    if (AmlLength < sizeof (ACPI_TABLE_HEADER))
-     {
-         return_ACPI_STATUS (AE_BAD_HEADER);
-     }
- 
-     AmlStart = (UINT8 *) Table + sizeof (ACPI_TABLE_HEADER);
--    AmlLength = Table->Length - sizeof (ACPI_TABLE_HEADER);
-+    AmlLength -= sizeof (ACPI_TABLE_HEADER);
- 
-     Status = AcpiTbGetOwnerId (TableIndex, &OwnerId);
-     if (ACPI_FAILURE (Status))
-Index: acpica-unix2-20200528/source/components/tables/tbdata.c
-===================================================================
---- acpica-unix2-20200528.orig/source/components/tables/tbdata.c
-+++ acpica-unix2-20200528/source/components/tables/tbdata.c
-@@ -552,6 +552,7 @@ AcpiTbVerifyTempTable (
-     UINT32                  *TableIndex)
- {
-     ACPI_STATUS             Status = AE_OK;
-+    UINT32		    Length;
- 
- 
-     ACPI_FUNCTION_TRACE (TbVerifyTempTable);
-@@ -581,7 +582,8 @@ AcpiTbVerifyTempTable (
-     {
-         /* Verify the checksum */
- 
--        Status = AcpiTbVerifyChecksum (TableDesc->Pointer, TableDesc->Length);
-+        ACPI_MOVE_32_TO_32(&Length, &TableDesc->Length);
-+        Status = AcpiTbVerifyChecksum (TableDesc->Pointer, Length);
-         if (ACPI_FAILURE (Status))
-         {
-             ACPI_EXCEPTION ((AE_INFO, AE_NO_MEMORY,
-Index: acpica-unix2-20200528/source/components/tables/tbfadt.c
-===================================================================
---- acpica-unix2-20200528.orig/source/components/tables/tbfadt.c
-+++ acpica-unix2-20200528/source/components/tables/tbfadt.c
-@@ -424,18 +424,20 @@ AcpiTbCreateLocalFadt (
-     ACPI_TABLE_HEADER       *Table,
-     UINT32                  Length)
- {
-+    UINT32 Tmp32;
- 
-     /*
-      * Check if the FADT is larger than the largest table that we expect
-      * (typically the current ACPI specification version). If so, truncate
-      * the table, and issue a warning.
-      */
--    if (Length > sizeof (ACPI_TABLE_FADT))
-+    ACPI_MOVE_32_TO_32(&Tmp32, &Length);
-+    if (Tmp32 > sizeof (ACPI_TABLE_FADT))
-     {
-         ACPI_BIOS_WARNING ((AE_INFO,
-             "FADT (revision %u) is longer than %s length, "
-             "truncating length %u to %u",
--            Table->Revision, ACPI_FADT_CONFORMANCE, Length,
-+            Table->Revision, ACPI_FADT_CONFORMANCE, Tmp32,
-             (UINT32) sizeof (ACPI_TABLE_FADT)));
-     }
- 
-@@ -446,7 +448,7 @@ AcpiTbCreateLocalFadt (
-     /* Copy the original FADT, up to sizeof (ACPI_TABLE_FADT) */
- 
-     memcpy (&AcpiGbl_FADT, Table,
--        ACPI_MIN (Length, sizeof (ACPI_TABLE_FADT)));
-+        ACPI_MIN (Tmp32, sizeof (ACPI_TABLE_FADT)));
- 
-     /* Take a copy of the Hardware Reduced flag */
- 
-@@ -520,6 +522,8 @@ AcpiTbConvertFadt (
-     UINT8                   Length;
-     UINT8                   Flags;
-     UINT32                  i;
-+    UINT32		    Tmp32;
-+    UINT64		    Tmp64;
- 
- 
-     /*
-@@ -533,7 +537,8 @@ AcpiTbConvertFadt (
-      * Note: The FADT revision value is unreliable. Only the length can be
-      * trusted.
-      */
--    if (AcpiGbl_FADT.Header.Length <= ACPI_FADT_V2_SIZE)
-+    ACPI_MOVE_32_TO_32(&Tmp32, &AcpiGbl_FADT.Header.Length);
-+    if (Tmp32 <= ACPI_FADT_V2_SIZE)
-     {
-         AcpiGbl_FADT.PreferredProfile = 0;
-         AcpiGbl_FADT.PstateControl = 0;
-@@ -546,14 +551,15 @@ AcpiTbConvertFadt (
-      * current FADT version as defined by the ACPI specification.
-      * Thus, we will have a common FADT internally.
-      */
--    AcpiGbl_FADT.Header.Length = sizeof (ACPI_TABLE_FADT);
-+    Tmp32 = sizeof (ACPI_TABLE_FADT);
-+    ACPI_MOVE_32_TO_32(&AcpiGbl_FADT.Header.Length, &Tmp32);
- 
-     /*
-      * Expand the 32-bit DSDT addresses to 64-bit as necessary.
-      * Later ACPICA code will always use the X 64-bit field.
-      */
--    AcpiGbl_FADT.XDsdt = AcpiTbSelectAddress ("DSDT",
--        AcpiGbl_FADT.Dsdt, AcpiGbl_FADT.XDsdt);
-+    Tmp64 = AcpiTbSelectAddress ("DSDT", AcpiGbl_FADT.Dsdt, AcpiGbl_FADT.XDsdt);
-+    ACPI_MOVE_64_TO_64(&AcpiGbl_FADT.XDsdt, &Tmp64);
- 
-     /* If Hardware Reduced flag is set, we are all done */
- 
-@@ -614,7 +620,9 @@ AcpiTbConvertFadt (
-         {
-             if (Address64->Address)
-             {
--                if (Address64->Address != (UINT64) Address32)
-+		ACPI_MOVE_32_TO_32(&Tmp32, &Address32);
-+		ACPI_MOVE_64_TO_64(&Tmp64, &Address64->Address);
-+                if (Tmp64 != (UINT64) Tmp32)
-                 {
-                     /* Address mismatch */
- 
-@@ -655,9 +663,11 @@ AcpiTbConvertFadt (
-              */
-             if (!Address64->Address || AcpiGbl_Use32BitFadtAddresses)
-             {
-+		ACPI_MOVE_32_TO_32(&Tmp32, &Address32); /* back to host order */
-+		Tmp64 = (UINT64) Tmp32;			/* promote only */
-                 AcpiTbInitGenericAddress (Address64,
-                     ACPI_ADR_SPACE_SYSTEM_IO, Length,
--                    (UINT64) Address32, Name, Flags);
-+                    Tmp64, Name, Flags);
-             }
-         }
- 
-@@ -780,10 +790,14 @@ AcpiTbSetupFadtRegisters (
- 
-         if (Source64->Address)
-         {
-+	    UINT64 Tmp64, Addr64;
-+
-+	    ACPI_MOVE_64_TO_64(&Tmp64, &Source64->Address);
-+	    Tmp64 += (FadtPmInfoTable[i].RegisterNum * Pm1RegisterByteWidth);
-+	    ACPI_MOVE_64_TO_64(&Addr64, &Tmp64);
-             AcpiTbInitGenericAddress (FadtPmInfoTable[i].Target,
-                 Source64->SpaceId, Pm1RegisterByteWidth,
--                Source64->Address +
--                    (FadtPmInfoTable[i].RegisterNum * Pm1RegisterByteWidth),
-+                Addr64,
-                 "PmRegisters", 0);
-         }
-     }
-Index: acpica-unix2-20200528/source/components/tables/tbfind.c
-===================================================================
---- acpica-unix2-20200528.orig/source/components/tables/tbfind.c
-+++ acpica-unix2-20200528/source/components/tables/tbfind.c
-@@ -108,8 +108,11 @@ AcpiTbFindTable (
-     (void) AcpiUtAcquireMutex (ACPI_MTX_TABLES);
-     for (i = 0; i < AcpiGbl_RootTableList.CurrentTableCount; ++i)
-     {
-+        UINT32 Tmp32;
-+
-+        ACPI_MOVE_32_TO_32(&Tmp32, &Header.Signature);
-         if (memcmp (&(AcpiGbl_RootTableList.Tables[i].Signature),
--            Header.Signature, ACPI_NAMESEG_SIZE))
-+            &Tmp32, ACPI_NAMESEG_SIZE))
-         {
-             /* Not the requested table */
- 
-Index: acpica-unix2-20200528/source/components/tables/tbprint.c
-===================================================================
---- acpica-unix2-20200528.orig/source/components/tables/tbprint.c
-+++ acpica-unix2-20200528/source/components/tables/tbprint.c
-@@ -143,15 +143,18 @@ AcpiTbPrintTableHeader (
-     ACPI_TABLE_HEADER       *Header)
- {
-     ACPI_TABLE_HEADER       LocalHeader;
-+    UINT32		    Len;
-+    UINT32		    OemRev;
-+    UINT32		    CompilerRev;
- 
- 
-     if (ACPI_COMPARE_NAMESEG (Header->Signature, ACPI_SIG_FACS))
-     {
-         /* FACS only has signature and length fields */
- 
-+	ACPI_MOVE_32_TO_32(&Len, &Header->Length);
-         ACPI_INFO (("%-4.4s 0x%8.8X%8.8X %06X",
--            Header->Signature, ACPI_FORMAT_UINT64 (Address),
--            Header->Length));
-+            Header->Signature, ACPI_FORMAT_UINT64 (Address), Len));
-     }
-     else if (ACPI_VALIDATE_RSDP_SIG (Header->Signature))
-     {
-@@ -174,13 +177,16 @@ AcpiTbPrintTableHeader (
- 
-         AcpiTbCleanupTableHeader (&LocalHeader, Header);
- 
-+	ACPI_MOVE_32_TO_32(&Len, &LocalHeader.Length);
-+	ACPI_MOVE_32_TO_32(&OemRev, &LocalHeader.OemRevision);
-+	ACPI_MOVE_32_TO_32(&CompilerRev, &LocalHeader.AslCompilerRevision);
-         ACPI_INFO ((
-             "%-4.4s 0x%8.8X%8.8X"
-             " %06X (v%.2d %-6.6s %-8.8s %08X %-4.4s %08X)",
-             LocalHeader.Signature, ACPI_FORMAT_UINT64 (Address),
--            LocalHeader.Length, LocalHeader.Revision, LocalHeader.OemId,
--            LocalHeader.OemTableId, LocalHeader.OemRevision,
--            LocalHeader.AslCompilerId, LocalHeader.AslCompilerRevision));
-+            Len, LocalHeader.Revision, LocalHeader.OemId,
-+            LocalHeader.OemTableId, OemRev,
-+            LocalHeader.AslCompilerId, CompilerRev));
-     }
- }
- 
-Index: acpica-unix2-20200528/source/components/tables/tbutils.c
-===================================================================
---- acpica-unix2-20200528.orig/source/components/tables/tbutils.c
-+++ acpica-unix2-20200528/source/components/tables/tbutils.c
-@@ -238,7 +238,7 @@ AcpiTbGetRootTableEntry (
-          * 64-bit platform, XSDT: Move (unaligned) 64-bit to local,
-          *  return 64-bit
-          */
--        ACPI_MOVE_64_TO_64 (&Address64, TableEntry);
-+	Address64 = (UINT64) TableEntry;
- 
- #if ACPI_MACHINE_WIDTH == 32
-         if (Address64 > ACPI_UINT32_MAX)
-@@ -251,7 +251,8 @@ AcpiTbGetRootTableEntry (
-                 ACPI_FORMAT_UINT64 (Address64)));
-         }
- #endif
--        return ((ACPI_PHYSICAL_ADDRESS) (Address64));
-+        return ((ACPI_PHYSICAL_ADDRESS) (*ACPI_CAST_PTR (
-+            UINT64, Address64)));
-     }
- }
- 
-@@ -287,6 +288,7 @@ AcpiTbParseRootTable (
-     UINT8                   *TableEntry;
-     ACPI_STATUS             Status;
-     UINT32                  TableIndex;
-+    UINT32                  Tmp32;
- 
- 
-     ACPI_FUNCTION_TRACE (TbParseRootTable);
-@@ -345,7 +347,7 @@ AcpiTbParseRootTable (
-      * Validate length of the table, and map entire table.
-      * Minimum length table must contain at least one entry.
-      */
--    Length = Table->Length;
-+    ACPI_MOVE_32_TO_32(&Length, &Table->Length);
-     AcpiOsUnmapMemory (Table, sizeof (ACPI_TABLE_HEADER));
- 
-     if (Length < (sizeof (ACPI_TABLE_HEADER) + TableEntrySize))
-@@ -372,7 +374,7 @@ AcpiTbParseRootTable (
- 
-     /* Get the number of entries and pointer to first entry */
- 
--    TableCount = (UINT32) ((Table->Length - sizeof (ACPI_TABLE_HEADER)) /
-+    TableCount = (UINT32) ((Length - sizeof (ACPI_TABLE_HEADER)) /
-         TableEntrySize);
-     TableEntry = ACPI_ADD_PTR (UINT8, Table, sizeof (ACPI_TABLE_HEADER));
- 
-@@ -394,10 +396,10 @@ AcpiTbParseRootTable (
-         Status = AcpiTbInstallStandardTable (Address,
-             ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL, FALSE, TRUE, &TableIndex);
- 
-+	ACPI_MOVE_32_TO_32(&Tmp32,
-+			   &AcpiGbl_RootTableList.Tables[TableIndex].Signature);
-         if (ACPI_SUCCESS (Status) &&
--            ACPI_COMPARE_NAMESEG (
--                &AcpiGbl_RootTableList.Tables[TableIndex].Signature,
--                ACPI_SIG_FADT))
-+            ACPI_COMPARE_NAMESEG (&Tmp32, ACPI_SIG_FADT))
-         {
-             AcpiGbl_FadtIndex = TableIndex;
-             AcpiTbParseFadt ();
-Index: acpica-unix2-20200528/source/components/tables/tbxface.c
-===================================================================
---- acpica-unix2-20200528.orig/source/components/tables/tbxface.c
-+++ acpica-unix2-20200528/source/components/tables/tbxface.c
-@@ -293,8 +293,11 @@ AcpiGetTableHeader (
- 
-     for (i = 0, j = 0; i < AcpiGbl_RootTableList.CurrentTableCount; i++)
-     {
-+	UINT32 Tmp32;
-+
-+	ACPI_MOVE_32_TO_32(&Tmp32, (UINT32 *)Signature);
-         if (!ACPI_COMPARE_NAMESEG (
--                &(AcpiGbl_RootTableList.Tables[i].Signature), Signature))
-+                &(AcpiGbl_RootTableList.Tables[i].Signature), &Tmp32))
-         {
-             continue;
-         }
-Index: acpica-unix2-20200528/source/components/tables/tbxfload.c
-===================================================================
---- acpica-unix2-20200528.orig/source/components/tables/tbxfload.c
-+++ acpica-unix2-20200528/source/components/tables/tbxfload.c
-@@ -153,6 +153,7 @@ AcpiTbLoadNamespace (
-     ACPI_TABLE_DESC         *Table;
-     UINT32                  TablesLoaded = 0;
-     UINT32                  TablesFailed = 0;
-+    UINT32		    Tmp32;
- 
- 
-     ACPI_FUNCTION_TRACE (TbLoadNamespace);
-@@ -166,8 +167,9 @@ AcpiTbLoadNamespace (
-      */
-     Table = &AcpiGbl_RootTableList.Tables[AcpiGbl_DsdtIndex];
- 
-+    ACPI_MOVE_32_TO_32(&Tmp32, &Table->Signature.Ascii);
-     if (!AcpiGbl_RootTableList.CurrentTableCount ||
--        !ACPI_COMPARE_NAMESEG (Table->Signature.Ascii, ACPI_SIG_DSDT) ||
-+        !ACPI_COMPARE_NAMESEG (&Tmp32, ACPI_SIG_DSDT) ||
-          ACPI_FAILURE (AcpiTbValidateTable (Table)))
-     {
-         Status = AE_NO_ACPI_TABLES;
-Index: acpica-unix2-20200528/source/tools/acpiexec/aetables.c
-===================================================================
---- acpica-unix2-20200528.orig/source/tools/acpiexec/aetables.c
-+++ acpica-unix2-20200528/source/tools/acpiexec/aetables.c
-@@ -146,21 +146,25 @@ AeInitializeTableHeader (
-     char                    *Signature,
-     UINT32                  Length)
- {
-+    UINT16		    Tmp16;
-+    UINT32		    Tmp32;
- 
-     ACPI_COPY_NAMESEG (Header->Signature, Signature);
--    Header->Length = Length;
-+    ACPI_MOVE_32_TO_32(&Header->Length, &Length);
- 
--    Header->OemRevision = 0x1001;
-+    Tmp16 = 0x1001;
-+    ACPI_MOVE_16_TO_16(&Header->OemRevision, &Tmp16);
-     memcpy (Header->OemId, "Intel ", ACPI_OEM_ID_SIZE);
-     memcpy (Header->OemTableId, "AcpiExec", ACPI_OEM_TABLE_ID_SIZE);
-     ACPI_COPY_NAMESEG (Header->AslCompilerId, "INTL");
--    Header->AslCompilerRevision = ACPI_CA_VERSION;
-+    Tmp32 = ACPI_CA_VERSION;
-+    ACPI_MOVE_32_TO_32(&Header->AslCompilerRevision, &Tmp32);
- 
-     /* Set the checksum, must set to zero first */
- 
-     Header->Checksum = 0;
-     Header->Checksum = (UINT8) -AcpiTbChecksum (
--        (void *) Header, Header->Length);
-+        (void *) Header, Length);
- }
- 
- 
-@@ -188,6 +192,7 @@ AeBuildLocalTables (
-     ACPI_NEW_TABLE_DESC     *NextTable;
-     UINT32                  NextIndex;
-     ACPI_TABLE_FADT         *ExternalFadt = NULL;
-+    UINT32		    Tmp32;
- 
- 
-     /*
-@@ -374,6 +379,8 @@ AeBuildLocalTables (
-     }
-     else
-     {
-+        UINT64		    Tmp64;
-+
-         /*
-          * Build a local FADT so we can test the hardware/event init
-          */
-@@ -385,34 +392,44 @@ AeBuildLocalTables (
-         LocalFADT.Facs = 0;
- 
-         LocalFADT.XDsdt = DsdtAddress;
--        LocalFADT.XFacs = ACPI_PTR_TO_PHYSADDR (&LocalFACS);
-+        Tmp64 = ACPI_PTR_TO_PHYSADDR (&LocalFACS);
-+        ACPI_MOVE_64_TO_64(&LocalFADT.XFacs, &Tmp64);
- 
-         /* Miscellaneous FADT fields */
- 
-         LocalFADT.Gpe0BlockLength = 0x20;
--        LocalFADT.Gpe0Block = 0x00003210;
-+        Tmp32 = 0x00003210;
-+        ACPI_MOVE_32_TO_32(&LocalFADT.Gpe0Block, &Tmp32);
- 
-         LocalFADT.Gpe1BlockLength = 0x20;
--        LocalFADT.Gpe1Block = 0x0000BA98;
-+        Tmp32 = 0x0000BA98;
-+        ACPI_MOVE_32_TO_32(&LocalFADT.Gpe1Block, &Tmp32);
-         LocalFADT.Gpe1Base = 0x80;
- 
-         LocalFADT.Pm1EventLength = 4;
--        LocalFADT.Pm1aEventBlock = 0x00001aaa;
--        LocalFADT.Pm1bEventBlock = 0x00001bbb;
-+        Tmp32 = 0x00001aaa;
-+        ACPI_MOVE_32_TO_32(&LocalFADT.Pm1aEventBlock, &Tmp32);
-+        Tmp32 = 0x00001bbb;
-+        ACPI_MOVE_32_TO_32(&LocalFADT.Pm1bEventBlock, &Tmp32);
- 
-         LocalFADT.Pm1ControlLength = 2;
--        LocalFADT.Pm1aControlBlock = 0xB0;
-+        Tmp32 = 0xB0;
-+        ACPI_MOVE_32_TO_32(&LocalFADT.Pm1aControlBlock, &Tmp32);
- 
-         LocalFADT.PmTimerLength = 4;
--        LocalFADT.PmTimerBlock = 0xA0;
-+        Tmp32 = 0xA0;
-+        ACPI_MOVE_32_TO_32(&LocalFADT.PmTimerBlock, &Tmp32);
- 
--        LocalFADT.Pm2ControlBlock = 0xC0;
-+        Tmp32 = 0xC0;
-+        ACPI_MOVE_32_TO_32(&LocalFADT.Pm2ControlBlock, &Tmp32);
-         LocalFADT.Pm2ControlLength = 1;
- 
-         /* Setup one example X-64 GAS field */
- 
-         LocalFADT.XPm1bEventBlock.SpaceId = ACPI_ADR_SPACE_SYSTEM_IO;
--        LocalFADT.XPm1bEventBlock.Address = LocalFADT.Pm1bEventBlock;
-+	ACPI_MOVE_32_TO_32(&Tmp32, &LocalFADT.Pm1bEventBlock);
-+	Tmp64 = (UINT64)Tmp32;
-+        ACPI_MOVE_64_TO_64(&LocalFADT.XPm1bEventBlock.Address, &Tmp64);
-         LocalFADT.XPm1bEventBlock.BitWidth = (UINT8)
-             ACPI_MUL_8 (LocalFADT.Pm1EventLength);
-     }
-@@ -425,13 +442,17 @@ AeBuildLocalTables (
-     memset (&LocalFACS, 0, sizeof (ACPI_TABLE_FACS));
-     ACPI_COPY_NAMESEG (LocalFACS.Signature, ACPI_SIG_FACS);
- 
--    LocalFACS.Length = sizeof (ACPI_TABLE_FACS);
--    LocalFACS.GlobalLock = 0x11AA0011;
-+    Tmp32 = sizeof (ACPI_TABLE_FACS);
-+    ACPI_MOVE_32_TO_32(&LocalFACS.Length, &Tmp32);
-+    Tmp32 = 0x11AA0011;
-+    ACPI_MOVE_32_TO_32(&LocalFACS.GlobalLock, &Tmp32);
- 
-     /* Build the optional local tables */
- 
-     if (AcpiGbl_LoadTestTables)
-     {
-+	UINT32 Tmp32;
-+
-         /*
-          * Build a fake table [TEST] so that we make sure that the
-          * ACPICA core ignores it
-@@ -440,11 +461,12 @@ AeBuildLocalTables (
-         ACPI_COPY_NAMESEG (LocalTEST.Signature, "TEST");
- 
-         LocalTEST.Revision = 1;
--        LocalTEST.Length = sizeof (ACPI_TABLE_HEADER);
-+        Tmp32 = sizeof (ACPI_TABLE_HEADER);
-+        ACPI_MOVE_32_TO_32(&LocalTEST.Length, &Tmp32);
- 
-         LocalTEST.Checksum = 0;
-         LocalTEST.Checksum = (UINT8) -AcpiTbChecksum (
--            (void *) &LocalTEST, LocalTEST.Length);
-+            (void *) &LocalTEST, Tmp32);
- 
-         /*
-          * Build a fake table with a bad signature [BAD!] so that we make
-@@ -454,11 +476,12 @@ AeBuildLocalTables (
-         ACPI_COPY_NAMESEG (LocalBADTABLE.Signature, "BAD!");
- 
-         LocalBADTABLE.Revision = 1;
--        LocalBADTABLE.Length = sizeof (ACPI_TABLE_HEADER);
-+        Tmp32 = sizeof (ACPI_TABLE_HEADER);
-+        ACPI_MOVE_32_TO_32(&LocalBADTABLE.Length, &Tmp32);
- 
-         LocalBADTABLE.Checksum = 0;
-         LocalBADTABLE.Checksum = (UINT8) -AcpiTbChecksum (
--            (void *) &LocalBADTABLE, LocalBADTABLE.Length);
-+            (void *) &LocalBADTABLE, Tmp32);
-     }
- 
-     return (AE_OK);
-Index: acpica-unix2-20200528/source/common/dmswitch.c
-===================================================================
---- acpica-unix2-20200528.orig/source/common/dmswitch.c
-+++ acpica-unix2-20200528/source/common/dmswitch.c
-@@ -88,13 +88,15 @@ AcpiDmProcessSwitch (
-     ACPI_PARSE_OBJECT_LIST  *Current;
-     ACPI_PARSE_OBJECT_LIST  *Previous;
-     BOOLEAN                 FoundTemp = FALSE;
-+    UINT32		    Tmp32;
- 
- 
-     switch (Op->Common.AmlOpcode)
-     {
-     case AML_NAME_OP:
- 
--        Temp = (char *) (&Op->Named.Name);
-+	ACPI_MOVE_32_TO_32(&Tmp32, &Op->Named.Name);
-+        Temp = (char *) (&Tmp32);
- 
-         if (!strncmp(Temp, "_T_", 3))
-         {
-@@ -138,7 +140,10 @@ AcpiDmProcessSwitch (
-         {
-             /* Note, if we get here Temp is not NULL */
- 
--            if (!strncmp(Temp, (char *) (&Current->Op->Named.Name), 4))
-+   	    ACPI_MOVE_32_TO_32(&Tmp32, &Current->Op->Named.Name);
-+
-+            /* if (!strncmp(Temp, (char *) (&Current->Op->Named.Name), 4)) */
-+            if (!strncmp(Temp, (char *) &Tmp32, 4))
-             {
-                 /* Match found. Ignore disassembly */
- 
diff --git a/converterSample.asl.result b/converterSample.asl.result
index 47c532c..064ef5f 100644
--- a/converterSample.asl.result
+++ b/converterSample.asl.result
@@ -1,12 +1,27 @@
+converterSample.asl     15:     Name (b, 5)
+Remark   2182 -                      ^ At least one lower case letter found in NameSeg, ASL is case insensitive - converting to upper case (B___)
+
+converterSample.asl     16:     Name(p008, Package()
+Remark   2182 -                        ^ At least one lower case letter found in NameSeg, ASL is case insensitive - converting to upper case (P008)
+
 converterSample.asl     37:     Method(MAIN) {
 Remark   2120 -                          ^ Control Method should be made Serialized due to creation of named objects within (\MAIN)
 
+converterSample.asl     48:             Name(b,0);
+Remark   2182 -                             ^ At least one lower case letter found in NameSeg, ASL is case insensitive - converting to upper case (B___)
+
 converterSample.asl     48:             Name(b,0);
 Remark   2089 -    Object is not referenced ^  (Name [B___] is within a method [MAIN])
 
+converterSample.asl     53:    Name (a,
+Remark   2182 -                     ^ At least one lower case letter found in NameSeg, ASL is case insensitive - converting to upper case (A___)
+
 converterSample.asl     65:     Method(SCOP)
 Remark   2120 -                          ^ Control Method should be made Serialized due to creation of named objects within (\SCOP)
 
+converterSample.asl     68:         Name (a1, 0x04)
+Remark   2182 -                           ^ At least one lower case letter found in NameSeg, ASL is case insensitive - converting to upper case (A1__)
+
 converterSample.asl     68:         Name (a1, 0x04)
 Remark   2089 -  Object is not referenced ^  (Name [A1__] is within a method [SCOP])
 
@@ -23,4 +38,4 @@ Ignoring all errors, forcing AML file generation
 ASL Input:     converterSample.asl -    1968 bytes     11 keywords     85 source lines
 AML Output:    converterSample.aml -     182 bytes      2 opcodes       9 named objects
 
-Compilation successful. 0 Errors, 0 Warnings, 5 Remarks, 10 Optimizations
+Compilation successful. 0 Errors, 0 Warnings, 10 Remarks, 10 Optimizations
diff --git a/cve-2017-13693.patch b/cve-2017-13693.patch
index b0af7a6..fcda493 100644
--- a/cve-2017-13693.patch
+++ b/cve-2017-13693.patch
@@ -63,10 +63,10 @@ Github-Location: https://github.com/acpica/acpica/pull/295/commits/987a3b5cf7175
  source/components/dispatcher/dsutils.c | 9 ++++++++-
  1 file changed, 8 insertions(+), 1 deletion(-)
 
-Index: acpica-unix-20191018/source/components/dispatcher/dsutils.c
+Index: acpica-unix2-20200925/source/components/dispatcher/dsutils.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/dispatcher/dsutils.c
-+++ acpica-unix-20191018/source/components/dispatcher/dsutils.c
+--- acpica-unix2-20200925.orig/source/components/dispatcher/dsutils.c
++++ acpica-unix2-20200925/source/components/dispatcher/dsutils.c
 @@ -759,6 +759,8 @@ AcpiDsCreateOperands (
      ACPI_PARSE_OBJECT       *Arguments[ACPI_OBJ_NUM_OPERANDS];
      UINT32                  ArgCount = 0;
diff --git a/cve-2017-13694.patch b/cve-2017-13694.patch
index 8d582e0..40c1c08 100644
--- a/cve-2017-13694.patch
+++ b/cve-2017-13694.patch
@@ -130,10 +130,10 @@ Github-Location: https://github.com/acpica/acpica/pull/278/commits/4a0243ecb4c94
  source/components/parser/psobject.c | 44 ++++++++++++++-----------------------
  1 file changed, 16 insertions(+), 28 deletions(-)
 
-Index: acpica-unix-20191018/source/components/parser/psobject.c
+Index: acpica-unix2-20200925/source/components/parser/psobject.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/parser/psobject.c
-+++ acpica-unix-20191018/source/components/parser/psobject.c
+--- acpica-unix2-20200925.orig/source/components/parser/psobject.c
++++ acpica-unix2-20200925/source/components/parser/psobject.c
 @@ -707,7 +707,8 @@ AcpiPsCompleteFinalOp (
      ACPI_PARSE_OBJECT       *Op,
      ACPI_STATUS             Status)
diff --git a/cve-2017-13695.patch b/cve-2017-13695.patch
index 5f77aaf..f521a16 100644
--- a/cve-2017-13695.patch
+++ b/cve-2017-13695.patch
@@ -67,10 +67,10 @@ Github-Location: https://github.com/acpica/acpica/pull/296/commits/37f2c716f2c6a
  source/components/namespace/nseval.c | 10 ++++++++++
  1 file changed, 10 insertions(+)
 
-Index: acpica-unix-20191018/source/components/namespace/nseval.c
+Index: acpica-unix2-20200925/source/components/namespace/nseval.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/namespace/nseval.c
-+++ acpica-unix-20191018/source/components/namespace/nseval.c
+--- acpica-unix2-20200925.orig/source/components/namespace/nseval.c
++++ acpica-unix2-20200925/source/components/namespace/nseval.c
 @@ -329,6 +329,16 @@ AcpiNsEvaluate (
              Info->ReturnObject = NULL;
          }
diff --git a/dbtest.patch b/dbtest.patch
index eb8086e..6cf7f28 100644
--- a/dbtest.patch
+++ b/dbtest.patch
@@ -4,10 +4,11 @@ into an ACPI_OBJECT instead of just the pointer (see the use in the call
 to memcpy()).  So, move the init so GCC recognizes that ValueToWrite is
 only a pointer, and not a whole string that needs to be moved.
 
-diff -Naur acpica-unix2-20200214.orig/source/components/debugger/dbtest.c acpica-unix2-20200214/source/components/debugger/dbtest.c
---- acpica-unix2-20200214.orig/source/components/debugger/dbtest.c	2020-02-14 10:33:54.000000000 -0700
-+++ acpica-unix2-20200214/source/components/debugger/dbtest.c	2020-02-25 10:50:42.793372070 -0700
-@@ -719,9 +719,10 @@
+Index: acpica-unix2-20200925/source/components/debugger/dbtest.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/components/debugger/dbtest.c
++++ acpica-unix2-20200925/source/components/debugger/dbtest.c
+@@ -719,9 +719,10 @@ AcpiDbTestStringType (
      ACPI_OBJECT             *Temp1 = NULL;
      ACPI_OBJECT             *Temp2 = NULL;
      ACPI_OBJECT             *Temp3 = NULL;
@@ -19,7 +20,7 @@ diff -Naur acpica-unix2-20200214.orig/source/components/debugger/dbtest.c acpica
  
  
      /* Read the original value */
-@@ -737,6 +738,9 @@
+@@ -737,6 +738,9 @@ AcpiDbTestStringType (
  
      /* Write a new value */
  
@@ -29,7 +30,7 @@ diff -Naur acpica-unix2-20200214.orig/source/components/debugger/dbtest.c acpica
      WriteValue.Type = ACPI_TYPE_STRING;
      WriteValue.String.Length = strlen (ValueToWrite);
      WriteValue.String.Pointer = ValueToWrite;
-@@ -790,6 +794,7 @@
+@@ -790,6 +794,7 @@ Exit:
      if (Temp1) {AcpiOsFree (Temp1);}
      if (Temp2) {AcpiOsFree (Temp2);}
      if (Temp3) {AcpiOsFree (Temp3);}
diff --git a/f23-harden.patch b/f23-harden.patch
index 5e80d46..e1fbbbd 100644
--- a/f23-harden.patch
+++ b/f23-harden.patch
@@ -8,10 +8,10 @@ From: Al Stone <ahs3@redhat.com>
  generate/unix/iasl/Makefile   |   13 +++++++------
  2 files changed, 9 insertions(+), 6 deletions(-)
 
-Index: acpica-unix2-20200528/generate/unix/Makefile.config
+Index: acpica-unix2-20200925/generate/unix/Makefile.config
 ===================================================================
---- acpica-unix2-20200528.orig/generate/unix/Makefile.config
-+++ acpica-unix2-20200528/generate/unix/Makefile.config
+--- acpica-unix2-20200925.orig/generate/unix/Makefile.config
++++ acpica-unix2-20200925/generate/unix/Makefile.config
 @@ -189,6 +189,8 @@ ifneq ($(NOFORTIFY),TRUE)
  OPT_CFLAGS += -D_FORTIFY_SOURCE=2
  endif
@@ -21,11 +21,11 @@ Index: acpica-unix2-20200528/generate/unix/Makefile.config
  CFLAGS += \
      -D$(ACPI_HOST)\
      -D_GNU_SOURCE\
-Index: acpica-unix2-20200528/generate/unix/iasl/Makefile
+Index: acpica-unix2-20200925/generate/unix/iasl/Makefile
 ===================================================================
---- acpica-unix2-20200528.orig/generate/unix/iasl/Makefile
-+++ acpica-unix2-20200528/generate/unix/iasl/Makefile
-@@ -358,34 +358,35 @@ $(OBJDIR)/prparserparse.c $(OBJDIR)/prpa
+--- acpica-unix2-20200925.orig/generate/unix/iasl/Makefile
++++ acpica-unix2-20200925/generate/unix/iasl/Makefile
+@@ -359,34 +359,35 @@ $(OBJDIR)/prparserparse.c $(OBJDIR)/prpa
  # Cannot use the common compile warning flags since the C files are created
  # by the utilities above and they are not necessarily ANSI C, etc.
  #
diff --git a/facp.patch b/facp.patch
index a8e9fe9..1d7ffee 100644
--- a/facp.patch
+++ b/facp.patch
@@ -13,10 +13,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/common/dmtbinfo.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: acpica-unix2-20200528/source/common/dmtbinfo.c
+Index: acpica-unix2-20200925/source/common/dmtbinfo.c
 ===================================================================
---- acpica-unix2-20200528.orig/source/common/dmtbinfo.c
-+++ acpica-unix2-20200528/source/common/dmtbinfo.c
+--- acpica-unix2-20200925.orig/source/common/dmtbinfo.c
++++ acpica-unix2-20200925/source/common/dmtbinfo.c
 @@ -184,7 +184,7 @@ ACPI_DMTABLE_INFO           AcpiDmTableI
  ACPI_DMTABLE_INFO           AcpiDmTableInfoFadt1[] =
  {
diff --git a/gcc9.patch b/gcc9.patch
deleted file mode 100644
index cd190a6..0000000
--- a/gcc9.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -Naur acpica-unix2-20190108/source/common/dmrestag.c acpica-unix2-20190108-patch/source/common/dmrestag.c
---- acpica-unix2-20190108/source/common/dmrestag.c	2019-01-08 14:10:31.000000000 -0700
-+++ acpica-unix2-20190108-patch/source/common/dmrestag.c	2019-05-10 13:57:10.768398838 -0600
-@@ -710,10 +710,25 @@
-      * end up in the final compiled AML, it's just an appearance issue for the
-      * disassembled code.
-      */
--    Pathname[strlen (Pathname) - ACPI_NAME_SIZE] = 0;
--    strncat (Pathname, ResourceNode->Name.Ascii, ACPI_NAME_SIZE);
--    strcat (Pathname, ".");
--    strncat (Pathname, Tag, ACPI_NAME_SIZE);
-+    {
-+    	/* 
-+	 * GCC9 forces some contortions when non-null-terminated char
-+	 * strings are being used; using strncat() might be simpler,
-+	 * but the assumption that the string is null-terminated gets
-+	 * checked and AML does not always guarantee that is true.
-+	 */
-+    	char *tmp;
-+	unsigned char dot = '.';
-+
-+    	Pathname[strlen (Pathname) - ACPI_NAME_SIZE] = 0;
-+	tmp = Pathname + strlen(Pathname);
-+	memcpy (tmp, ResourceNode->Name.Ascii, ACPI_NAME_SIZE);
-+	tmp += ACPI_NAME_SIZE;
-+	memcpy (tmp, &dot, 1);
-+	tmp++;
-+        memcpy (tmp, Tag, ACPI_NAME_SIZE);
-+	tmp += ACPI_NAME_SIZE;
-+    }
- 
-     /* Internalize the namepath to AML format */
- 
-diff -Naur acpica-unix2-20190108/source/compiler/aslcodegen.c acpica-unix2-20190108-patch/source/compiler/aslcodegen.c
---- acpica-unix2-20190108/source/compiler/aslcodegen.c	2019-05-10 13:40:12.827411487 -0600
-+++ acpica-unix2-20190108-patch/source/compiler/aslcodegen.c	2019-05-10 13:25:34.667850614 -0600
-@@ -450,11 +450,11 @@
-      */
-     if (AcpiGbl_CaptureComments)
-     {
--        strncpy(AcpiGbl_TableSig, Child->Asl.Value.String, ACPI_NAME_SIZE);
-+        memcpy(AcpiGbl_TableSig, Child->Asl.Value.String, ACPI_NAME_SIZE);
-         Child->Asl.Value.String = ACPI_SIG_XXXX;
-     }
- 
--    strncpy (AslGbl_TableHeader.Signature, Child->Asl.Value.String, ACPI_NAME_SIZE);
-+    memcpy (AslGbl_TableHeader.Signature, Child->Asl.Value.String, ACPI_NAME_SIZE);
- 
-     /* Revision */
- 
-@@ -471,12 +471,12 @@
-     /* OEMID */
- 
-     Child = Child->Asl.Next;
--    strncpy (AslGbl_TableHeader.OemId, Child->Asl.Value.String, ACPI_OEM_ID_SIZE);
-+    memcpy (AslGbl_TableHeader.OemId, Child->Asl.Value.String, ACPI_OEM_ID_SIZE);
- 
-     /* OEM TableID */
- 
-     Child = Child->Asl.Next;
--    strncpy (AslGbl_TableHeader.OemTableId, Child->Asl.Value.String, ACPI_OEM_TABLE_ID_SIZE);
-+    memcpy (AslGbl_TableHeader.OemTableId, Child->Asl.Value.String, ACPI_OEM_TABLE_ID_SIZE);
- 
-     /* OEM Revision */
- 
diff --git a/grammar.asl.result b/grammar.asl.result
index 19f6e2e..97fae9a 100644
--- a/grammar.asl.result
+++ b/grammar.asl.result
@@ -40,6 +40,12 @@ Warning  3055 -                                ^ Invalid Hex/Octal Escape - Non-
 grammar.asl    523:     NAME (ESC2, "abcdefg\000hijklmn")
 Warning  3055 -                                ^ Invalid Hex/Octal Escape - Non-ASCII or NULL
 
+grammar.asl    552:         IRQNoFlags(xxxt){3,4,10,11}
+Remark   2182 -                          ^ At least one lower case letter found in NameSeg, ASL is case insensitive - converting to upper case (XXXT)
+
+grammar.asl    566:         Name(Bxxx,0xFFFFFFFF)
+Remark   2182 -                    ^ At least one lower case letter found in NameSeg, ASL is case insensitive - converting to upper case (BXXX)
+
 grammar.asl    620:         RCIV (Subtract (Arg0, 1))
 Remark   2098 -               ^ Recursive method call (RCIV)
 
@@ -581,4 +587,4 @@ Ignoring all errors, forcing AML file generation
 ASL Input:     grammar.asl -  323653 bytes   4818 keywords  10284 source lines
 AML Output:    grammar.aml -   43758 bytes   4148 opcodes     670 named objects
 
-Compilation successful. 6 Errors, 93 Warnings, 92 Remarks, 1106 Optimizations
+Compilation successful. 6 Errors, 93 Warnings, 94 Remarks, 1106 Optimizations
diff --git a/int-format.patch b/int-format.patch
index 5cbb5c3..f98906b 100644
--- a/int-format.patch
+++ b/int-format.patch
@@ -21,10 +21,10 @@ From: Al Stone <ahs3@redhat.com>
  source/components/utilities/utownerid.c |    2 +-
  18 files changed, 28 insertions(+), 28 deletions(-)
 
-Index: acpica-unix2-20200528/source/compiler/aslerror.c
+Index: acpica-unix2-20200925/source/compiler/aslerror.c
 ===================================================================
---- acpica-unix2-20200528.orig/source/compiler/aslerror.c
-+++ acpica-unix2-20200528/source/compiler/aslerror.c
+--- acpica-unix2-20200925.orig/source/compiler/aslerror.c
++++ acpica-unix2-20200925/source/compiler/aslerror.c
 @@ -917,7 +917,7 @@ AslLogNewError (
      AslGbl_ExceptionCount[ModifiedLevel]++;
      if (!AslGbl_IgnoreErrors && AslGbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT)
@@ -34,10 +34,10 @@ Index: acpica-unix2-20200528/source/compiler/aslerror.c
  
          AslGbl_SourceLine = 0;
          AslGbl_NextError = AslGbl_ErrorLog;
-Index: acpica-unix2-20200528/source/compiler/aslopt.c
+Index: acpica-unix2-20200925/source/compiler/aslopt.c
 ===================================================================
---- acpica-unix2-20200528.orig/source/compiler/aslopt.c
-+++ acpica-unix2-20200528/source/compiler/aslopt.c
+--- acpica-unix2-20200925.orig/source/compiler/aslopt.c
++++ acpica-unix2-20200925/source/compiler/aslopt.c
 @@ -583,7 +583,7 @@ OptOptimizeNamePath (
      }
  
@@ -47,11 +47,11 @@ Index: acpica-unix2-20200528/source/compiler/aslopt.c
          Op->Asl.LogicalLineNumber,
          AcpiPsGetOpcodeName (Op->Common.Parent->Common.AmlOpcode),
          AcpiPsGetOpcodeName (Op->Common.AmlOpcode)));
-Index: acpica-unix2-20200528/source/compiler/aslprepkg.c
+Index: acpica-unix2-20200925/source/compiler/aslprepkg.c
 ===================================================================
---- acpica-unix2-20200528.orig/source/compiler/aslprepkg.c
-+++ acpica-unix2-20200528/source/compiler/aslprepkg.c
-@@ -309,7 +309,7 @@ ApCheckPackage (
+--- acpica-unix2-20200925.orig/source/compiler/aslprepkg.c
++++ acpica-unix2-20200925/source/compiler/aslprepkg.c
+@@ -320,7 +320,7 @@ ApCheckPackage (
  
          if (Count & 1)
          {
@@ -60,11 +60,11 @@ Index: acpica-unix2-20200528/source/compiler/aslprepkg.c
                  Predefined->Info.Name, Count);
  
              AslError (ASL_ERROR, ASL_MSG_RESERVED_PACKAGE_LENGTH,
-Index: acpica-unix2-20200528/source/components/debugger/dbexec.c
+Index: acpica-unix2-20200925/source/components/debugger/dbexec.c
 ===================================================================
---- acpica-unix2-20200528.orig/source/components/debugger/dbexec.c
-+++ acpica-unix2-20200528/source/components/debugger/dbexec.c
-@@ -230,7 +230,7 @@ AcpiDbExecuteMethod (
+--- acpica-unix2-20200925.orig/source/components/debugger/dbexec.c
++++ acpica-unix2-20200925/source/components/debugger/dbexec.c
+@@ -231,7 +231,7 @@ AcpiDbExecuteMethod (
              ACPI_ERROR ((AE_INFO,
                  "Possible buffer overflow within AML Debugger "
                  "buffer (size 0x%X needed 0x%X)",
@@ -73,10 +73,10 @@ Index: acpica-unix2-20200528/source/components/debugger/dbexec.c
          }
      }
  
-Index: acpica-unix2-20200528/source/components/dispatcher/dsmthdat.c
+Index: acpica-unix2-20200925/source/components/dispatcher/dsmthdat.c
 ===================================================================
---- acpica-unix2-20200528.orig/source/components/dispatcher/dsmthdat.c
-+++ acpica-unix2-20200528/source/components/dispatcher/dsmthdat.c
+--- acpica-unix2-20200925.orig/source/components/dispatcher/dsmthdat.c
++++ acpica-unix2-20200925/source/components/dispatcher/dsmthdat.c
 @@ -291,7 +291,7 @@ AcpiDsMethodDataGetNode (
          if (Index > ACPI_METHOD_MAX_LOCAL)
          {
@@ -95,10 +95,10 @@ Index: acpica-unix2-20200528/source/components/dispatcher/dsmthdat.c
                  Index, ACPI_METHOD_MAX_ARG));
              return_ACPI_STATUS (AE_AML_INVALID_INDEX);
          }
-Index: acpica-unix2-20200528/source/components/dispatcher/dsutils.c
+Index: acpica-unix2-20200925/source/components/dispatcher/dsutils.c
 ===================================================================
---- acpica-unix2-20200528.orig/source/components/dispatcher/dsutils.c
-+++ acpica-unix2-20200528/source/components/dispatcher/dsutils.c
+--- acpica-unix2-20200925.orig/source/components/dispatcher/dsutils.c
++++ acpica-unix2-20200925/source/components/dispatcher/dsutils.c
 @@ -786,7 +786,7 @@ AcpiDsCreateOperands (
      }
  
@@ -108,10 +108,10 @@ Index: acpica-unix2-20200528/source/components/dispatcher/dsutils.c
          WalkState->NumOperands, ArgCount, Index));
  
      /* Create the interpreter arguments, in reverse order */
-Index: acpica-unix2-20200528/source/components/dispatcher/dswscope.c
+Index: acpica-unix2-20200925/source/components/dispatcher/dswscope.c
 ===================================================================
---- acpica-unix2-20200528.orig/source/components/dispatcher/dswscope.c
-+++ acpica-unix2-20200528/source/components/dispatcher/dswscope.c
+--- acpica-unix2-20200925.orig/source/components/dispatcher/dswscope.c
++++ acpica-unix2-20200925/source/components/dispatcher/dswscope.c
 @@ -149,7 +149,7 @@ AcpiDsScopeStackPush (
      WalkState->ScopeDepth++;
  
@@ -130,10 +130,10 @@ Index: acpica-unix2-20200528/source/components/dispatcher/dswscope.c
          (UINT32) WalkState->ScopeDepth,
          AcpiUtGetNodeName (ScopeInfo->Scope.Node),
          AcpiUtGetTypeName (ScopeInfo->Common.Value)));
-Index: acpica-unix2-20200528/source/components/events/evgpe.c
+Index: acpica-unix2-20200925/source/components/events/evgpe.c
 ===================================================================
---- acpica-unix2-20200528.orig/source/components/events/evgpe.c
-+++ acpica-unix2-20200528/source/components/events/evgpe.c
+--- acpica-unix2-20200925.orig/source/components/events/evgpe.c
++++ acpica-unix2-20200925/source/components/events/evgpe.c
 @@ -488,7 +488,7 @@ AcpiEvGpeDetect (
                      "Ignore disabled registers for GPE %02X-%02X: "
                      "RunEnable=%02X, WakeEnable=%02X\n",
@@ -143,10 +143,10 @@ Index: acpica-unix2-20200528/source/components/events/evgpe.c
                      GpeRegisterInfo->EnableForRun,
                      GpeRegisterInfo->EnableForWake));
                  continue;
-Index: acpica-unix2-20200528/source/components/executer/exdump.c
+Index: acpica-unix2-20200925/source/components/executer/exdump.c
 ===================================================================
---- acpica-unix2-20200528.orig/source/components/executer/exdump.c
-+++ acpica-unix2-20200528/source/components/executer/exdump.c
+--- acpica-unix2-20200925.orig/source/components/executer/exdump.c
++++ acpica-unix2-20200925/source/components/executer/exdump.c
 @@ -678,7 +678,7 @@ AcpiExDumpOperand (
      if (Depth > 0)
      {
@@ -156,10 +156,10 @@ Index: acpica-unix2-20200528/source/components/executer/exdump.c
      }
      else
      {
-Index: acpica-unix2-20200528/source/components/executer/exfldio.c
+Index: acpica-unix2-20200925/source/components/executer/exfldio.c
 ===================================================================
---- acpica-unix2-20200528.orig/source/components/executer/exfldio.c
-+++ acpica-unix2-20200528/source/components/executer/exfldio.c
+--- acpica-unix2-20200925.orig/source/components/executer/exfldio.c
++++ acpica-unix2-20200925/source/components/executer/exfldio.c
 @@ -681,8 +681,8 @@ AcpiExWriteWithUpdateRule (
  
              ACPI_ERROR ((AE_INFO,
@@ -171,10 +171,10 @@ Index: acpica-unix2-20200528/source/components/executer/exfldio.c
              return_ACPI_STATUS (AE_AML_OPERAND_VALUE);
          }
      }
-Index: acpica-unix2-20200528/source/components/executer/exnames.c
+Index: acpica-unix2-20200925/source/components/executer/exnames.c
 ===================================================================
---- acpica-unix2-20200528.orig/source/components/executer/exnames.c
-+++ acpica-unix2-20200528/source/components/executer/exnames.c
+--- acpica-unix2-20200925.orig/source/components/executer/exnames.c
++++ acpica-unix2-20200925/source/components/executer/exnames.c
 @@ -237,7 +237,7 @@ AcpiExNameSegment (
           */
          ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
@@ -193,10 +193,10 @@ Index: acpica-unix2-20200528/source/components/executer/exnames.c
      }
  
      *InAmlAddress = ACPI_CAST_PTR (UINT8, AmlAddress);
-Index: acpica-unix2-20200528/source/components/hardware/hwregs.c
+Index: acpica-unix2-20200925/source/components/hardware/hwregs.c
 ===================================================================
---- acpica-unix2-20200528.orig/source/components/hardware/hwregs.c
-+++ acpica-unix2-20200528/source/components/hardware/hwregs.c
+--- acpica-unix2-20200925.orig/source/components/hardware/hwregs.c
++++ acpica-unix2-20200925/source/components/hardware/hwregs.c
 @@ -460,7 +460,7 @@ AcpiHwClearAcpiStatus (
  
  
@@ -206,10 +206,10 @@ Index: acpica-unix2-20200528/source/components/hardware/hwregs.c
          ACPI_FORMAT_UINT64 (AcpiGbl_XPm1aStatus.Address)));
  
      LockFlags = AcpiOsAcquireLock (AcpiGbl_HardwareLock);
-Index: acpica-unix2-20200528/source/components/tables/tbfadt.c
+Index: acpica-unix2-20200925/source/components/tables/tbfadt.c
 ===================================================================
---- acpica-unix2-20200528.orig/source/components/tables/tbfadt.c
-+++ acpica-unix2-20200528/source/components/tables/tbfadt.c
+--- acpica-unix2-20200925.orig/source/components/tables/tbfadt.c
++++ acpica-unix2-20200925/source/components/tables/tbfadt.c
 @@ -233,7 +233,7 @@ AcpiTbInitGenericAddress (
          if (!(Flags & ACPI_FADT_GPE_REGISTER))
          {
@@ -219,7 +219,7 @@ Index: acpica-unix2-20200528/source/components/tables/tbfadt.c
                  "to convert to GAS struct - 255 bits max, truncating",
                  RegisterName, ByteWidth, (ByteWidth * 8)));
          }
-@@ -304,7 +304,7 @@ AcpiTbSelectAddress (
+@@ -303,7 +303,7 @@ AcpiTbSelectAddress (
  
          ACPI_BIOS_WARNING ((AE_INFO,
              "32/64X %s address mismatch in FADT: "
@@ -228,7 +228,7 @@ Index: acpica-unix2-20200528/source/components/tables/tbfadt.c
              RegisterName, Address32, ACPI_FORMAT_UINT64 (Address64),
              AcpiGbl_Use32BitFadtAddresses ? 32 : 64));
  
-@@ -628,7 +628,7 @@ AcpiTbConvertFadt (
+@@ -631,7 +631,7 @@ AcpiTbConvertFadt (
  
                      ACPI_BIOS_WARNING ((AE_INFO,
                          "32/64X address mismatch in FADT/%s: "
@@ -237,10 +237,10 @@ Index: acpica-unix2-20200528/source/components/tables/tbfadt.c
                          Name, Address32,
                          ACPI_FORMAT_UINT64 (Address64->Address),
                          AcpiGbl_Use32BitFadtAddresses ? 32 : 64));
-Index: acpica-unix2-20200528/source/components/tables/tbxfroot.c
+Index: acpica-unix2-20200925/source/components/tables/tbxfroot.c
 ===================================================================
---- acpica-unix2-20200528.orig/source/components/tables/tbxfroot.c
-+++ acpica-unix2-20200528/source/components/tables/tbxfroot.c
+--- acpica-unix2-20200925.orig/source/components/tables/tbxfroot.c
++++ acpica-unix2-20200925/source/components/tables/tbxfroot.c
 @@ -177,7 +177,7 @@ AcpiFindRootPointer (
      {
          ACPI_ERROR ((AE_INFO,
@@ -268,10 +268,10 @@ Index: acpica-unix2-20200528/source/components/tables/tbxfroot.c
  
          return_ACPI_STATUS (AE_NO_MEMORY);
      }
-Index: acpica-unix2-20200528/source/components/utilities/utownerid.c
+Index: acpica-unix2-20200925/source/components/utilities/utownerid.c
 ===================================================================
---- acpica-unix2-20200528.orig/source/components/utilities/utownerid.c
-+++ acpica-unix2-20200528/source/components/utilities/utownerid.c
+--- acpica-unix2-20200925.orig/source/components/utilities/utownerid.c
++++ acpica-unix2-20200925/source/components/utilities/utownerid.c
 @@ -237,7 +237,7 @@ AcpiUtReleaseOwnerId (
      else
      {
diff --git a/mips-be-fix.patch b/mips-be-fix.patch
index 0e7fa91..485fb77 100644
--- a/mips-be-fix.patch
+++ b/mips-be-fix.patch
@@ -1,8 +1,8 @@
-Index: acpica-unix-20191018/source/compiler/aslparseop.c
+Index: acpica-unix2-20200925/source/compiler/aslparseop.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/aslparseop.c
-+++ acpica-unix-20191018/source/compiler/aslparseop.c
-@@ -283,7 +283,16 @@ TrCreateValuedLeafOp (
+--- acpica-unix2-20200925.orig/source/compiler/aslparseop.c
++++ acpica-unix2-20200925/source/compiler/aslparseop.c
+@@ -285,7 +285,16 @@ TrCreateValuedLeafOp (
  
  
      Op = TrAllocateOp (ParseOpcode);
@@ -20,18 +20,3 @@ Index: acpica-unix-20191018/source/compiler/aslparseop.c
  
      DbgPrint (ASL_PARSE_OUTPUT,
          "\nCreateValuedLeafOp  Ln/Col %u/%u NewOp %p  "
-Index: acpica-unix-20191018/source/include/platform/aclinux.h
-===================================================================
---- acpica-unix-20191018.orig/source/include/platform/aclinux.h
-+++ acpica-unix-20191018/source/include/platform/aclinux.h
-@@ -232,10 +232,8 @@
- #endif
- 
- #if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
--#if defined(__PPC64__) || defined(__s390x__)
- #define ACPI_BIG_ENDIAN
- #endif
--#endif
- 
- #endif /* __KERNEL__ */
- 
diff --git a/ppc64le.patch b/ppc64le.patch
deleted file mode 100644
index 228f9d9..0000000
--- a/ppc64le.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: acpica-unix-20191018/source/include/platform/aclinux.h
-===================================================================
---- acpica-unix-20191018.orig/source/include/platform/aclinux.h
-+++ acpica-unix-20191018/source/include/platform/aclinux.h
-@@ -233,9 +233,11 @@
- #define __cdecl
- #endif
- 
-+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
- #if defined(__PPC64__) || defined(__s390x__)
- #define ACPI_BIG_ENDIAN
- #endif
-+#endif
- 
- #endif /* __KERNEL__ */
- 
diff --git a/ptr-cast.patch b/ptr-cast.patch
index d052057..8f32d8c 100644
--- a/ptr-cast.patch
+++ b/ptr-cast.patch
@@ -1,12 +1,12 @@
-Index: acpica-unix-20191018/source/components/tables/tbutils.c
+Index: acpica-unix2-20200925/source/components/tables/tbutils.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/tables/tbutils.c
-+++ acpica-unix-20191018/source/components/tables/tbutils.c
+--- acpica-unix2-20200925.orig/source/components/tables/tbutils.c
++++ acpica-unix2-20200925/source/components/tables/tbutils.c
 @@ -238,9 +238,11 @@ AcpiTbGetRootTableEntry (
           * 64-bit platform, XSDT: Move (unaligned) 64-bit to local,
           *  return 64-bit
           */
--	Address64 = (UINT64) TableEntry;
+-        ACPI_MOVE_64_TO_64 (&Address64, TableEntry);
  
  #if ACPI_MACHINE_WIDTH == 32
 +	UINT32 Tmp32 = (UINT32) TableEntry;
@@ -15,7 +15,7 @@ Index: acpica-unix-20191018/source/components/tables/tbutils.c
          if (Address64 > ACPI_UINT32_MAX)
          {
              /* Will truncate 64-bit address to 32 bits, issue warning */
-@@ -250,9 +252,15 @@ AcpiTbGetRootTableEntry (
+@@ -250,8 +252,14 @@ AcpiTbGetRootTableEntry (
                  " truncating",
                  ACPI_FORMAT_UINT64 (Address64)));
          }
@@ -26,17 +26,16 @@ Index: acpica-unix-20191018/source/components/tables/tbutils.c
 +#else
 +	Address64 = (UINT64) TableEntry;
 +
-         return ((ACPI_PHYSICAL_ADDRESS) (*ACPI_CAST_PTR (
-             UINT64, Address64)));
+         return ((ACPI_PHYSICAL_ADDRESS) (Address64));
 +#endif
      }
  }
  
-Index: acpica-unix-20191018/source/compiler/aslparseop.c
+Index: acpica-unix2-20200925/source/compiler/aslparseop.c
 ===================================================================
---- acpica-unix-20191018.orig/source/compiler/aslparseop.c
-+++ acpica-unix-20191018/source/compiler/aslparseop.c
-@@ -287,7 +287,11 @@ TrCreateValuedLeafOp (
+--- acpica-unix2-20200925.orig/source/compiler/aslparseop.c
++++ acpica-unix2-20200925/source/compiler/aslparseop.c
+@@ -289,7 +289,11 @@ TrCreateValuedLeafOp (
          ParseOpcode == PARSEOP_NAMESEG ||
          ParseOpcode == PARSEOP_STRING_LITERAL)
      {
diff --git a/simple-64bit.patch b/simple-64bit.patch
index 80c771f..aeead35 100644
--- a/simple-64bit.patch
+++ b/simple-64bit.patch
@@ -3,17 +3,18 @@ Description: Stop listing all 64bit architectures
  64bit architectures.
 Author: Adrian Bunk <bunk@debian.org>
 
-Index: acpica-unix-20191018/source/include/platform/aclinux.h
+Index: acpica-unix2-20200925/source/include/platform/aclinux.h
 ===================================================================
---- acpica-unix-20191018.orig/source/include/platform/aclinux.h
-+++ acpica-unix-20191018/source/include/platform/aclinux.h
-@@ -215,9 +215,7 @@
+--- acpica-unix2-20200925.orig/source/include/platform/aclinux.h
++++ acpica-unix2-20200925/source/include/platform/aclinux.h
+@@ -215,10 +215,7 @@
  #define ACPI_FLUSH_CPU_CACHE()
  #define ACPI_CAST_PTHREAD_T(Pthread) ((ACPI_THREAD_ID) (Pthread))
  
 -#if defined(__ia64__)    || (defined(__x86_64__) && !defined(__ILP32__)) ||\
 -    defined(__aarch64__) || defined(__PPC64__) ||\
--    defined(__s390x__)
+-    defined(__s390x__) ||\
+-    (defined(__riscv) && (defined(__LP64__) || defined(_LP64)))
 +#if defined(__LP64__)
  #define ACPI_MACHINE_WIDTH          64
  #define COMPILER_DEPENDENT_INT64    long
diff --git a/str-trunc-warn.patch b/str-trunc-warn.patch
index 763ae68..1355b0c 100644
--- a/str-trunc-warn.patch
+++ b/str-trunc-warn.patch
@@ -1,7 +1,7 @@
-Index: acpica-unix-20200214/source/compiler/aslanalyze.c
+Index: acpica-unix2-20200925/source/compiler/aslanalyze.c
 ===================================================================
---- acpica-unix-20200214.orig/source/compiler/aslanalyze.c
-+++ acpica-unix-20200214/source/compiler/aslanalyze.c
+--- acpica-unix2-20200925.orig/source/compiler/aslanalyze.c
++++ acpica-unix2-20200925/source/compiler/aslanalyze.c
 @@ -358,11 +358,16 @@ AnCheckMethodReturnValue (
           */
          if (ThisNodeBtype != 0)
@@ -21,10 +21,10 @@ Index: acpica-unix-20200214/source/compiler/aslanalyze.c
          }
      }
  
-Index: acpica-unix-20200214/source/compiler/aslpredef.c
+Index: acpica-unix2-20200925/source/compiler/aslpredef.c
 ===================================================================
---- acpica-unix-20200214.orig/source/compiler/aslpredef.c
-+++ acpica-unix-20200214/source/compiler/aslpredef.c
+--- acpica-unix2-20200925.orig/source/compiler/aslpredef.c
++++ acpica-unix2-20200925/source/compiler/aslpredef.c
 @@ -159,14 +159,19 @@ ApCheckForPredefinedMethod (
          if (MethodInfo->NumReturnNoValue &&
              ThisName->Info.ExpectedBtypes)
@@ -84,10 +84,10 @@ Index: acpica-unix-20200214/source/compiler/aslpredef.c
      return (AE_TYPE);
  }
  
-Index: acpica-unix-20200214/source/compiler/aslwalks.c
+Index: acpica-unix2-20200925/source/compiler/aslwalks.c
 ===================================================================
---- acpica-unix-20200214.orig/source/compiler/aslwalks.c
-+++ acpica-unix-20200214/source/compiler/aslwalks.c
+--- acpica-unix2-20200925.orig/source/compiler/aslwalks.c
++++ acpica-unix2-20200925/source/compiler/aslwalks.c
 @@ -515,15 +515,19 @@ AnOperandTypecheckWalkEnd (
              else if (!CommonBtypes)
              {
diff --git a/template.patch b/template.patch
index 662216a..408541a 100644
--- a/template.patch
+++ b/template.patch
@@ -7,10 +7,10 @@ From: Al Stone <ahs3@redhat.com>
  tests/templates/Makefile |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: acpica-unix-20191018/tests/templates/Makefile
+Index: acpica-unix2-20200925/tests/templates/Makefile
 ===================================================================
---- acpica-unix-20191018.orig/tests/templates/Makefile
-+++ acpica-unix-20191018/tests/templates/Makefile
+--- acpica-unix2-20200925.orig/tests/templates/Makefile
++++ acpica-unix2-20200925/tests/templates/Makefile
 @@ -26,7 +26,7 @@ $(aml_obj): %.aml:  %.asl
  
  
diff --git a/ull-32bit.patch b/ull-32bit.patch
new file mode 100644
index 0000000..0568e11
--- /dev/null
+++ b/ull-32bit.patch
@@ -0,0 +1,12 @@
+diff -Naur acpica-unix2-20200925.orig/source/common/dmtbdump.c acpica-unix2-20200925/source/common/dmtbdump.c
+--- acpica-unix2-20200925.orig/source/common/dmtbdump.c	2020-10-16 18:33:41.108600489 -0600
++++ acpica-unix2-20200925/source/common/dmtbdump.c	2020-10-16 18:35:01.970316862 -0600
+@@ -333,7 +333,7 @@
+     for (i = 0; i < Entries; i++)
+     {
+         AcpiDmLineHeader2 (Offset, sizeof (UINT64), "ACPI Table Address", i);
+-        AcpiOsPrintf ("%16.16lX\n", AcpiUtReadUint64(&Array[i]));
++        AcpiOsPrintf ("%16.16llX\n", AcpiUtReadUint64(&Array[i]));
+         Offset += sizeof (UINT64);
+     }
+ }
diff --git a/unaligned.patch b/unaligned.patch
index f1f35a0..6d3f9c6 100644
--- a/unaligned.patch
+++ b/unaligned.patch
@@ -14,10 +14,10 @@ Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
  source/include/actypes.h              |   26 +++++++++++++-------------
  3 files changed, 32 insertions(+), 21 deletions(-)
 
-Index: acpica-unix-20191018/source/components/executer/exoparg2.c
+Index: acpica-unix2-20200925/source/components/executer/exoparg2.c
 ===================================================================
---- acpica-unix-20191018.orig/source/components/executer/exoparg2.c
-+++ acpica-unix-20191018/source/components/executer/exoparg2.c
+--- acpica-unix2-20200925.orig/source/components/executer/exoparg2.c
++++ acpica-unix2-20200925/source/components/executer/exoparg2.c
 @@ -172,6 +172,8 @@ AcpiExOpcode_2A_2T_1R (
      ACPI_OPERAND_OBJECT     **Operand = &WalkState->Operands[0];
      ACPI_OPERAND_OBJECT     *ReturnDesc1 = NULL;
@@ -58,10 +58,10 @@ Index: acpica-unix-20191018/source/components/executer/exoparg2.c
          break;
  
      case AML_CONCATENATE_OP: /* Concatenate (Data1, Data2, Result) */
-Index: acpica-unix-20191018/source/include/actypes.h
+Index: acpica-unix2-20200925/source/include/actypes.h
 ===================================================================
---- acpica-unix-20191018.orig/source/include/actypes.h
-+++ acpica-unix-20191018/source/include/actypes.h
+--- acpica-unix2-20200925.orig/source/include/actypes.h
++++ acpica-unix2-20200925/source/include/actypes.h
 @@ -143,6 +143,19 @@ typedef COMPILER_DEPENDENT_INT64
   */
  #define ACPI_THREAD_ID                  UINT64

From 17d826f180de62ba31303b919cf69d5f411692e9 Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Mon, 19 Oct 2020 12:38:41 -0600
Subject: [PATCH 33/82] Minor fix to spec file

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 acpica-tools.spec | 2 --
 1 file changed, 2 deletions(-)

diff --git a/acpica-tools.spec b/acpica-tools.spec
index 7123e29..2a6d3e5 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -82,9 +82,7 @@ Patch112:	ptr-cast.patch
 Patch113:	facp.patch
 Patch114:	armv7-str-fixes.patch
 Patch115:	dbtest.patch
-%ifarch i686 armv7hl
 Patch116:	ull-32bit.patch
-%endif
 
 BuildRequires:  bison patchutils flex gcc
 

From 249abc074a65613c3303687151979a4b4065dd1f Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Fri, 23 Oct 2020 13:04:26 -0600
Subject: [PATCH 34/82] Add big-endian support for three additional tables:
 MTMR, VRTC and S3PT

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 0041-Support-MTMR-in-a-big-endian-world.patch | 46 +++++++++
 0042-Support-VRTC-in-a-big-endian-world.patch | 45 +++++++++
 0043-Support-S3PT-in-a-big-endian-world.patch | 99 +++++++++++++++++++
 acpica-tools.spec                             |  6 ++
 4 files changed, 196 insertions(+)
 create mode 100644 0041-Support-MTMR-in-a-big-endian-world.patch
 create mode 100644 0042-Support-VRTC-in-a-big-endian-world.patch
 create mode 100644 0043-Support-S3PT-in-a-big-endian-world.patch

diff --git a/0041-Support-MTMR-in-a-big-endian-world.patch b/0041-Support-MTMR-in-a-big-endian-world.patch
new file mode 100644
index 0000000..dc4ad0b
--- /dev/null
+++ b/0041-Support-MTMR-in-a-big-endian-world.patch
@@ -0,0 +1,46 @@
+From 902266037614bc0b3ff31c1dfeb350c80e517d90 Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Fri, 16 Oct 2020 20:52:43 -0400
+Subject: [PATCH 1/4] Support MTMR in a big-endian world
+
+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 (
+     ACPI_STATUS             Status;
+     UINT32                  Offset = sizeof (ACPI_TABLE_MTMR);
+     ACPI_MTMR_ENTRY         *Subtable;
++    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
+ 
+ 
+     /* Main table */
+ 
+-    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoMtmr);
++    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoMtmr);
+     if (ACPI_FAILURE (Status))
+     {
+         return;
+@@ -1169,12 +1170,12 @@ AcpiDmDumpMtmr (
+     /* Subtables */
+ 
+     Subtable = ACPI_ADD_PTR (ACPI_MTMR_ENTRY, Table, Offset);
+-    while (Offset < Table->Length)
++    while (Offset < TableLength)
+     {
+         /* Common subtable header */
+ 
+         AcpiOsPrintf ("\n");
+-        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
++        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
+             sizeof (ACPI_MTMR_ENTRY), AcpiDmTableInfoMtmr0);
+         if (ACPI_FAILURE (Status))
+         {
+-- 
+2.28.0
+
diff --git a/0042-Support-VRTC-in-a-big-endian-world.patch b/0042-Support-VRTC-in-a-big-endian-world.patch
new file mode 100644
index 0000000..24e50c2
--- /dev/null
+++ b/0042-Support-VRTC-in-a-big-endian-world.patch
@@ -0,0 +1,45 @@
+From b8d25df79205c128057dba4112b34a7b714a7c43 Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Mon, 19 Oct 2020 17:17:40 -0400
+Subject: [PATCH 2/4] 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 (
+     ACPI_STATUS             Status;
+     UINT32                  Offset = sizeof (ACPI_TABLE_VRTC);
+     ACPI_VRTC_ENTRY         *Subtable;
++    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
+ 
+ 
+     /* Main table */
+ 
+-    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoVrtc);
++    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoVrtc);
+     if (ACPI_FAILURE (Status))
+     {
+         return;
+@@ -642,12 +643,12 @@ AcpiDmDumpVrtc (
+     /* Subtables */
+ 
+     Subtable = ACPI_ADD_PTR (ACPI_VRTC_ENTRY, Table, Offset);
+-    while (Offset < Table->Length)
++    while (Offset < TableLength)
+     {
+         /* Common subtable header */
+ 
+         AcpiOsPrintf ("\n");
+-        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
++        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
+             sizeof (ACPI_VRTC_ENTRY), AcpiDmTableInfoVrtc0);
+         if (ACPI_FAILURE (Status))
+         {
+-- 
+2.28.0
+
diff --git a/0043-Support-S3PT-in-a-big-endian-world.patch b/0043-Support-S3PT-in-a-big-endian-world.patch
new file mode 100644
index 0000000..bf1be6f
--- /dev/null
+++ b/0043-Support-S3PT-in-a-big-endian-world.patch
@@ -0,0 +1,99 @@
+From 1652084e864a8048b44486548d9df40eb64cd8de Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Mon, 19 Oct 2020 17:30:30 -0400
+Subject: [PATCH 3/4] Support S3PT in a big-endian world
+
+---
+ source/common/dmtbdump2.c  | 15 +++++++++------
+ 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 (
+     ACPI_FPDT_HEADER        *Subtable;
+     ACPI_DMTABLE_INFO       *InfoTable;
+     ACPI_TABLE_S3PT         *S3ptTable = ACPI_CAST_PTR (ACPI_TABLE_S3PT, Tables);
++    UINT32                  S3ptTableLength = AcpiUtReadUint32(&S3ptTable->Length);
++    UINT16                  SubtableType;
+ 
+ 
+     /* Main table */
+@@ -1928,19 +1930,20 @@ AcpiDmDumpS3pt (
+     }
+ 
+     Subtable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, S3ptTable, Offset);
+-    while (Offset < S3ptTable->Length)
++    while (Offset < S3ptTableLength)
+     {
+         /* Common subtable header */
+ 
+         AcpiOsPrintf ("\n");
+-        Status = AcpiDmDumpTable (S3ptTable->Length, Offset, Subtable,
++        Status = AcpiDmDumpTable (S3ptTableLength, Offset, Subtable,
+             Subtable->Length, AcpiDmTableInfoS3ptHdr);
+         if (ACPI_FAILURE (Status))
+         {
+             return 0;
+         }
+ 
+-        switch (Subtable->Type)
++	SubtableType = AcpiUtReadUint16(&Subtable->Type);
++        switch (SubtableType)
+         {
+         case ACPI_S3PT_TYPE_RESUME:
+ 
+@@ -1955,7 +1958,7 @@ AcpiDmDumpS3pt (
+         default:
+ 
+             AcpiOsPrintf ("\n**** Unknown S3PT subtable type 0x%X\n",
+-                Subtable->Type);
++                SubtableType);
+ 
+             /* Attempt to continue */
+ 
+@@ -1968,7 +1971,7 @@ AcpiDmDumpS3pt (
+         }
+ 
+         AcpiOsPrintf ("\n");
+-        Status = AcpiDmDumpTable (S3ptTable->Length, Offset, Subtable,
++        Status = AcpiDmDumpTable (S3ptTableLength, Offset, Subtable,
+             Subtable->Length, InfoTable);
+         if (ACPI_FAILURE (Status))
+         {
+@@ -1982,7 +1985,7 @@ NextSubtable:
+         Subtable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, Subtable, Subtable->Length);
+     }
+ 
+-    return (S3ptTable->Length);
++    return (S3ptTableLength);
+ }
+ 
+ 
+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 (
+     DT_SUBTABLE             *ParentTable;
+     ACPI_DMTABLE_INFO       *InfoTable;
+     DT_FIELD                *SubtableStart;
++    UINT16                  S3ptHeaderType;
+ 
+ 
+     Status = DtCompileTable (PFieldList, AcpiDmTableInfoS3pt,
+@@ -1323,7 +1324,8 @@ DtCompileS3pt (
+ 
+         S3ptHeader = ACPI_CAST_PTR (ACPI_FPDT_HEADER, Subtable->Buffer);
+ 
+-        switch (S3ptHeader->Type)
++        S3ptHeaderType = AcpiUtReadUint16(&S3ptHeader->Type);
++        switch (S3ptHeaderType)
+         {
+         case ACPI_S3PT_TYPE_RESUME:
+ 
+-- 
+2.28.0
+
diff --git a/acpica-tools.spec b/acpica-tools.spec
index 2a6d3e5..5409cda 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -64,6 +64,9 @@ Patch36:	0037-Support-IVRS-in-a-big-endian-world.patch
 Patch37:	0038-Support-TPM2-in-a-big-endian-world.patch
 Patch38:	0039-Add-partial-big-endian-support-for-WPBT-tables.patch
 Patch39:	0040-Support-DSDT-SSDT-in-a-big-endian-world.patch
+Patch40:	0041-Support-MTMR-in-a-big-endian-world.patch
+Patch41:	0042-Support-VRTC-in-a-big-endian-world.patch
+Patch42:	0043-Support-S3PT-in-a-big-endian-world.patch
 
 # other miscellaneous patches
 Patch100:	unaligned.patch
@@ -172,6 +175,9 @@ gzip -dc %{SOURCE1} | tar -x --strip-components=1 -f -
 %patch37 -p1
 %patch38 -p1
 %patch39 -p1
+%patch40 -p1
+%patch41 -p1
+%patch42 -p1
 
 # apply the remaining patches
 %patch100 -p1

From 6c29d6805886b3c4efc53e39596ac8496b3f4122 Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Fri, 23 Oct 2020 18:40:24 -0600
Subject: [PATCH 35/82] Update some of the big-endian patches with corrections

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 ...l-big-endian-support-for-WPBT-tables.patch |  27 +-
 ...port-DSDT-SSDT-in-a-big-endian-world.patch | 983 ++++++++++++------
 0041-Support-MTMR-in-a-big-endian-world.patch |   6 +-
 0042-Support-VRTC-in-a-big-endian-world.patch |   6 +-
 0043-Support-S3PT-in-a-big-endian-world.patch |   6 +-
 5 files changed, 694 insertions(+), 334 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 e5192e5..071d600 100644
--- a/0039-Add-partial-big-endian-support-for-WPBT-tables.patch
+++ b/0039-Add-partial-big-endian-support-for-WPBT-tables.patch
@@ -1,7 +1,7 @@
 From 9d7f9c8f4ecbee2e621d471a8c4944cebe62947d Mon Sep 17 00:00:00 2001
 From: Al Stone <ahs3@redhat.com>
 Date: Wed, 30 Sep 2020 18:59:57 -0600
-Subject: [PATCH 39/40] Add partial big-endian support for WPBT tables
+Subject: [PATCH 1/5] Add partial big-endian support for WPBT tables
 
 There's some weirdness here that at present does not warrant
 further investigation; this is just a really low priority table.
@@ -12,11 +12,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/compiler/dttable2.c | 3 ++-
  2 files changed, 6 insertions(+), 5 deletions(-)
 
-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 (
+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 (
  {
      ACPI_STATUS             Status;
      ACPI_TABLE_WPBT         *Subtable;
@@ -32,7 +32,7 @@ Index: acpica-unix2-20200925/source/common/dmtbdump3.c
      if (ACPI_FAILURE (Status))
      {
          return;
-@@ -643,10 +643,10 @@ AcpiDmDumpWpbt (
+@@ -751,10 +751,10 @@ AcpiDmDumpWpbt (
      /* Extract the arguments buffer length from the main table */
  
      Subtable = ACPI_CAST_PTR (ACPI_TABLE_WPBT, Table);
@@ -45,11 +45,11 @@ Index: acpica-unix2-20200925/source/common/dmtbdump3.c
 +    (void) AcpiDmDumpTable (TableLength, 0, Table, ArgumentsLength,
          AcpiDmTableInfoWpbt0);
  }
-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 (
+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 (
  
      /* Extract the length of the Arguments buffer, insert into main table */
  
@@ -59,3 +59,6 @@ Index: acpica-unix2-20200925/source/compiler/dttable2.c
      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 b5087dc..43b4114 100644
--- a/0040-Support-DSDT-SSDT-in-a-big-endian-world.patch
+++ b/0040-Support-DSDT-SSDT-in-a-big-endian-world.patch
@@ -1,7 +1,7 @@
-From 355bbdd2ecf184e56108a2446244761895f93a62 Mon Sep 17 00:00:00 2001
+From a11c0a997dca2b40d1bcff68368d9d5d5297b781 Mon Sep 17 00:00:00 2001
 From: Al Stone <ahs3@redhat.com>
 Date: Thu, 15 Oct 2020 11:35:23 -0600
-Subject: [PATCH 40/40] Support DSDT/SSDT in a big-endian world
+Subject: [PATCH 2/5] Support DSDT/SSDT in a big-endian world
 
 NB: this is a very large diff.  The problem is that ResourceTemplates
 are treated differently during compilation and disassembly so each of
@@ -15,33 +15,35 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/common/dmrestag.c                   |   2 +-
  source/common/dmtables.c                   |  17 +-
  source/common/dmtbdump.c                   |   3 +-
- source/compiler/aslcodegen.c               |  61 +++++--
+ source/compiler/aslcodegen.c               |  61 ++++--
+ source/compiler/aslopcodes.c               |   3 +-
  source/compiler/aslrestype1.c              |  44 +++--
  source/compiler/aslrestype1i.c             |  33 ++--
- source/compiler/aslrestype2.c              |  20 ++-
- source/compiler/aslrestype2d.c             |  99 ++++++-----
- source/compiler/aslrestype2e.c             |  90 ++++++----
- source/compiler/aslrestype2q.c             |  81 ++++++---
- source/compiler/aslrestype2s.c             | 181 ++++++++++++++++++---
- source/compiler/aslrestype2w.c             |  94 ++++++-----
- source/components/disassembler/dmbuffer.c  |   2 +-
+ source/compiler/aslrestype2.c              |  20 +-
+ source/compiler/aslrestype2d.c             |  99 ++++++----
+ source/compiler/aslrestype2e.c             |  90 ++++++---
+ source/compiler/aslrestype2q.c             |  81 +++++---
+ source/compiler/aslrestype2s.c             | 214 +++++++++++++++++----
+ source/compiler/aslrestype2w.c             |  94 +++++----
+ source/components/disassembler/dmbuffer.c  |  10 +-
  source/components/disassembler/dmopcode.c  |   8 +-
  source/components/disassembler/dmresrc.c   |   2 +-
  source/components/disassembler/dmresrcl.c  |  43 +++--
- source/components/disassembler/dmresrcl2.c |  64 +++++---
+ source/components/disassembler/dmresrcl2.c | 128 +++++++-----
  source/components/disassembler/dmresrcs.c  |  18 +-
+ source/components/disassembler/dmwalk.c    |   2 +-
  source/components/dispatcher/dsfield.c     |  16 +-
  source/components/namespace/nsaccess.c     |   2 +-
  source/components/namespace/nsnames.c      |   2 +-
  source/components/namespace/nsparse.c      |   6 +-
  source/components/namespace/nsutils.c      |   7 +-
- 23 files changed, 613 insertions(+), 282 deletions(-)
+ 25 files changed, 682 insertions(+), 323 deletions(-)
 
-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 (
+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 (
       * NextOp contains the Aml pointer and the Aml length
       */
      AcpiUtWalkAmlResources (NULL, (UINT8 *) NextOp->Named.Data,
@@ -50,11 +52,11 @@ Index: acpica-unix2-20200925/source/common/dmrestag.c
          AcpiDmAddResourceToNamespace, (void **) BufferNode);
  }
  
-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 (
+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 (
      ACPI_TABLE_HEADER       *Table)
  {
      UINT8                   Checksum;
@@ -65,7 +67,7 @@ Index: acpica-unix2-20200925/source/common/dmtables.c
  
  
      /* Reset globals for External statements */
-@@ -156,7 +160,7 @@ AdCreateTableHeader (
+@@ -264,7 +268,7 @@ AdCreateTableHeader (
  
      AcpiOsPrintf (" * Original Table Header:\n");
      AcpiOsPrintf (" *     Signature        \"%4.4s\"\n",    Table->Signature);
@@ -74,7 +76,7 @@ Index: acpica-unix2-20200925/source/common/dmtables.c
  
      /* Print and validate the revision */
  
-@@ -188,7 +192,7 @@ AdCreateTableHeader (
+@@ -296,7 +300,7 @@ AdCreateTableHeader (
  
      AcpiOsPrintf ("\n *     Checksum         0x%2.2X",        Table->Checksum);
  
@@ -83,7 +85,7 @@ Index: acpica-unix2-20200925/source/common/dmtables.c
      if (Checksum)
      {
          AcpiOsPrintf (" **** Incorrect checksum, should be 0x%2.2X",
-@@ -198,9 +202,9 @@ AdCreateTableHeader (
+@@ -306,9 +310,9 @@ AdCreateTableHeader (
      AcpiOsPrintf ("\n");
      AcpiOsPrintf (" *     OEM ID           \"%.6s\"\n",     Table->OemId);
      AcpiOsPrintf (" *     OEM Table ID     \"%.8s\"\n",     Table->OemTableId);
@@ -95,7 +97,7 @@ Index: acpica-unix2-20200925/source/common/dmtables.c
      AcpiOsPrintf (" */\n");
  
      /*
-@@ -221,7 +225,7 @@ AdCreateTableHeader (
+@@ -329,7 +333,7 @@ AdCreateTableHeader (
      AcpiOsPrintf (
          "DefinitionBlock (\"\", \"%4.4s\", %u, \"%.6s\", \"%.8s\", 0x%8.8X)\n",
          Table->Signature, Table->Revision,
@@ -104,7 +106,7 @@ Index: acpica-unix2-20200925/source/common/dmtables.c
  }
  
  
-@@ -396,7 +400,8 @@ AdParseTable (
+@@ -504,7 +508,8 @@ AdParseTable (
  
      fprintf (stderr, "Pass 1 parse of [%4.4s]\n", (char *) Table->Signature);
  
@@ -114,11 +116,11 @@ Index: acpica-unix2-20200925/source/common/dmtables.c
      AmlStart = ((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER));
  
      AcpiUtSetIntegerWidth (Table->Revision);
-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 (
+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 (
      for (i = 0; i < Entries; i++)
      {
          AcpiDmLineHeader2 (Offset, sizeof (UINT64), "ACPI Table Address", i);
@@ -128,11 +130,11 @@ Index: acpica-unix2-20200925/source/common/dmtbdump.c
          Offset += sizeof (UINT64);
      }
  }
-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 (
+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 (
  {
      UINT8                   PkgLenFirstByte;
      UINT32                  i;
@@ -143,7 +145,7 @@ Index: acpica-unix2-20200925/source/compiler/aslcodegen.c
      union {
          UINT16                  Opcode;
          UINT8                   OpcodeBytes[2];
-@@ -305,25 +309,26 @@ CgWriteAmlOpcode (
+@@ -413,25 +417,26 @@ CgWriteAmlOpcode (
  
          /* Value is the length to be encoded (Used in field definitions) */
  
@@ -174,7 +176,7 @@ Index: acpica-unix2-20200925/source/compiler/aslcodegen.c
          break;
      }
  
-@@ -335,7 +340,8 @@ CgWriteAmlOpcode (
+@@ -443,7 +448,8 @@ CgWriteAmlOpcode (
          {
              /* Simplest case -- no bytes to follow, just write the count */
  
@@ -184,7 +186,7 @@ Index: acpica-unix2-20200925/source/compiler/aslcodegen.c
          }
          else if (Op->Asl.AmlPkgLenBytes != 0)
          {
-@@ -343,9 +349,10 @@ CgWriteAmlOpcode (
+@@ -451,9 +457,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
               */
@@ -196,7 +198,7 @@ Index: acpica-unix2-20200925/source/compiler/aslcodegen.c
  
              CgLocalWriteAmlData (Op, &PkgLenFirstByte, 1);
  
-@@ -359,6 +366,9 @@ CgWriteAmlOpcode (
+@@ -467,6 +474,9 @@ CgWriteAmlOpcode (
               * Now we can write the remaining bytes -
               * either 1, 2, or 3 bytes
               */
@@ -206,7 +208,7 @@ Index: acpica-unix2-20200925/source/compiler/aslcodegen.c
              for (i = 0; i < (UINT32) (Op->Asl.AmlPkgLenBytes - 1); i++)
              {
                  CgLocalWriteAmlData (Op, &PkgLen.LenBytes[i], 1);
-@@ -370,22 +380,30 @@ CgWriteAmlOpcode (
+@@ -478,22 +488,30 @@ CgWriteAmlOpcode (
      {
      case AML_BYTE_OP:
  
@@ -241,7 +243,7 @@ Index: acpica-unix2-20200925/source/compiler/aslcodegen.c
          break;
  
      case AML_STRING_OP:
-@@ -423,6 +441,7 @@ CgWriteTableHeader (
+@@ -531,6 +549,7 @@ CgWriteTableHeader (
      ACPI_PARSE_OBJECT       *Child;
      UINT32                  CommentLength;
      ACPI_COMMENT_NODE       *Current;
@@ -249,7 +251,7 @@ Index: acpica-unix2-20200925/source/compiler/aslcodegen.c
  
  
      memset (&AslGbl_TableHeader, 0, sizeof (ACPI_TABLE_HEADER));
-@@ -478,7 +497,9 @@ CgWriteTableHeader (
+@@ -586,7 +605,9 @@ CgWriteTableHeader (
      /* OEM Revision */
  
      Child = Child->Asl.Next;
@@ -260,7 +262,7 @@ Index: acpica-unix2-20200925/source/compiler/aslcodegen.c
  
      /* Compiler ID */
  
-@@ -486,7 +507,8 @@ CgWriteTableHeader (
+@@ -594,7 +615,8 @@ CgWriteTableHeader (
  
      /* Compiler version */
  
@@ -270,7 +272,7 @@ Index: acpica-unix2-20200925/source/compiler/aslcodegen.c
  
      /* Table length. Checksum zero for now, will rewrite later */
  
-@@ -541,6 +563,15 @@ CgWriteTableHeader (
+@@ -649,6 +671,15 @@ CgWriteTableHeader (
      AslGbl_TableHeader.Checksum = 0;
      Op->Asl.FinalAmlOffset = ftell (AslGbl_Files[ASL_FILE_AML_OUTPUT].Handle);
  
@@ -286,7 +288,7 @@ Index: acpica-unix2-20200925/source/compiler/aslcodegen.c
      /* Write entire header and clear the table header global */
  
      CgLocalWriteAmlData (Op, &AslGbl_TableHeader, sizeof (ACPI_TABLE_HEADER));
-@@ -625,6 +656,7 @@ CgWriteNode (
+@@ -733,6 +764,7 @@ CgWriteNode (
      ACPI_PARSE_OBJECT       *Op)
  {
      ASL_RESOURCE_NODE       *Rnode;
@@ -294,7 +296,7 @@ Index: acpica-unix2-20200925/source/compiler/aslcodegen.c
  
  
      /* Write all comments here. */
-@@ -653,7 +685,10 @@ CgWriteNode (
+@@ -761,7 +793,10 @@ CgWriteNode (
      case AML_RAW_DATA_DWORD:
      case AML_RAW_DATA_QWORD:
  
@@ -306,11 +308,25 @@ Index: acpica-unix2-20200925/source/compiler/aslcodegen.c
          return;
  
  
-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 (
+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 (
+ 
+     for (i = 0; i < Count; i++)
+     {
+-        UnicodeString[i] = (UINT16) AsciiString[i];
++        AcpiUtWriteUint(&UnicodeString[i], sizeof(UINT16),
++		       	&AsciiString[i], sizeof(UINT8));
+     }
+ 
+     /*
+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 (
      ASL_RESOURCE_NODE       *Rnode;
      UINT32                  CurrentByteOffset;
      UINT32                  i;
@@ -318,7 +334,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype1.c
  
  
      InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -151,7 +152,8 @@ RsDoMemory24Descriptor (
+@@ -259,7 +260,8 @@ RsDoMemory24Descriptor (
  
      Descriptor = Rnode->Buffer;
      Descriptor->Memory24.DescriptorType = ACPI_RESOURCE_NAME_MEMORY24;
@@ -328,7 +344,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype1.c
  
      /* Process all child initialization nodes */
  
-@@ -168,7 +170,8 @@ RsDoMemory24Descriptor (
+@@ -276,7 +278,8 @@ RsDoMemory24Descriptor (
  
          case 1: /* Min Address */
  
@@ -338,7 +354,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype1.c
              RsCreateWordField (InitializerOp, ACPI_RESTAG_MINADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Memory24.Minimum));
              MinOp = InitializerOp;
-@@ -176,7 +179,8 @@ RsDoMemory24Descriptor (
+@@ -284,7 +287,8 @@ RsDoMemory24Descriptor (
  
          case 2: /* Max Address */
  
@@ -348,7 +364,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype1.c
              RsCreateWordField (InitializerOp, ACPI_RESTAG_MAXADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Memory24.Maximum));
              MaxOp = InitializerOp;
-@@ -184,14 +188,16 @@ RsDoMemory24Descriptor (
+@@ -292,14 +296,16 @@ RsDoMemory24Descriptor (
  
          case 3: /* Alignment */
  
@@ -367,7 +383,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype1.c
              RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Memory24.AddressLength));
              LengthOp = InitializerOp;
-@@ -249,6 +255,8 @@ RsDoMemory32Descriptor (
+@@ -357,6 +363,8 @@ RsDoMemory32Descriptor (
      ASL_RESOURCE_NODE       *Rnode;
      UINT32                  CurrentByteOffset;
      UINT32                  i;
@@ -376,7 +392,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype1.c
  
  
      InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -257,7 +265,8 @@ RsDoMemory32Descriptor (
+@@ -365,7 +373,8 @@ RsDoMemory32Descriptor (
  
      Descriptor = Rnode->Buffer;
      Descriptor->Memory32.DescriptorType = ACPI_RESOURCE_NAME_MEMORY32;
@@ -386,7 +402,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype1.c
  
      /* Process all child initialization nodes */
  
-@@ -274,7 +283,8 @@ RsDoMemory32Descriptor (
+@@ -382,7 +391,8 @@ RsDoMemory32Descriptor (
  
          case 1:  /* Min Address */
  
@@ -396,7 +412,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype1.c
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_MINADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Memory32.Minimum));
              MinOp = InitializerOp;
-@@ -282,7 +292,8 @@ RsDoMemory32Descriptor (
+@@ -390,7 +400,8 @@ RsDoMemory32Descriptor (
  
          case 2: /* Max Address */
  
@@ -406,7 +422,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype1.c
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Memory32.Maximum));
              MaxOp = InitializerOp;
-@@ -290,7 +301,8 @@ RsDoMemory32Descriptor (
+@@ -398,7 +409,8 @@ RsDoMemory32Descriptor (
  
          case 3: /* Alignment */
  
@@ -416,7 +432,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype1.c
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_ALIGNMENT,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Memory32.Alignment));
              AlignOp = InitializerOp;
-@@ -298,7 +310,8 @@ RsDoMemory32Descriptor (
+@@ -406,7 +418,8 @@ RsDoMemory32Descriptor (
  
          case 4: /* Length */
  
@@ -426,7 +442,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype1.c
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Memory32.AddressLength));
              LengthOp = InitializerOp;
-@@ -352,6 +365,8 @@ RsDoMemory32FixedDescriptor (
+@@ -460,6 +473,8 @@ RsDoMemory32FixedDescriptor (
      ASL_RESOURCE_NODE       *Rnode;
      UINT32                  CurrentByteOffset;
      UINT32                  i;
@@ -435,7 +451,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype1.c
  
  
      InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -360,7 +375,8 @@ RsDoMemory32FixedDescriptor (
+@@ -468,7 +483,8 @@ RsDoMemory32FixedDescriptor (
  
      Descriptor = Rnode->Buffer;
      Descriptor->FixedMemory32.DescriptorType = ACPI_RESOURCE_NAME_FIXED_MEMORY32;
@@ -445,7 +461,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype1.c
  
      /* Process all child initialization nodes */
  
-@@ -377,14 +393,16 @@ RsDoMemory32FixedDescriptor (
+@@ -485,14 +501,16 @@ RsDoMemory32FixedDescriptor (
  
          case 1: /* Address */
  
@@ -464,11 +480,11 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype1.c
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (FixedMemory32.AddressLength));
              break;
-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 (
+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 (
      ASL_RESOURCE_NODE       *Rnode;
      UINT32                  CurrentByteOffset;
      UINT32                  i;
@@ -476,7 +492,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype1i.c
  
  
      InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -217,14 +218,16 @@ RsDoFixedDmaDescriptor (
+@@ -325,14 +326,16 @@ RsDoFixedDmaDescriptor (
          {
          case 0: /* DMA Request Lines [WORD] (_DMA) */
  
@@ -495,7 +511,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype1i.c
              RsCreateWordField (InitializerOp, ACPI_RESTAG_DMATYPE,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (FixedDma.Channels));
              break;
-@@ -275,6 +278,7 @@ RsDoFixedIoDescriptor (
+@@ -383,6 +386,7 @@ RsDoFixedIoDescriptor (
      ASL_RESOURCE_NODE       *Rnode;
      UINT32                  CurrentByteOffset;
      UINT32                  i;
@@ -503,7 +519,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype1i.c
  
  
      InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -293,8 +297,8 @@ RsDoFixedIoDescriptor (
+@@ -401,8 +405,8 @@ RsDoFixedIoDescriptor (
          {
          case 0: /* Base Address */
  
@@ -514,7 +530,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype1i.c
              RsCreateWordField (InitializerOp, ACPI_RESTAG_BASEADDRESS,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (FixedIo.Address));
              AddressOp = InitializerOp;
-@@ -358,6 +362,7 @@ RsDoIoDescriptor (
+@@ -466,6 +470,7 @@ RsDoIoDescriptor (
      ASL_RESOURCE_NODE       *Rnode;
      UINT32                  CurrentByteOffset;
      UINT32                  i;
@@ -522,7 +538,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype1i.c
  
  
      InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -383,8 +388,8 @@ RsDoIoDescriptor (
+@@ -491,8 +496,8 @@ RsDoIoDescriptor (
  
          case 1:  /* Min Address */
  
@@ -533,7 +549,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype1i.c
              RsCreateWordField (InitializerOp, ACPI_RESTAG_MINADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Io.Minimum));
              MinOp = InitializerOp;
-@@ -392,8 +397,8 @@ RsDoIoDescriptor (
+@@ -500,8 +505,8 @@ RsDoIoDescriptor (
  
          case 2: /* Max Address */
  
@@ -544,7 +560,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype1i.c
              RsCreateWordField (InitializerOp, ACPI_RESTAG_MAXADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Io.Maximum));
              MaxOp = InitializerOp;
-@@ -434,10 +439,10 @@ RsDoIoDescriptor (
+@@ -542,10 +547,10 @@ RsDoIoDescriptor (
      /* Validate the Min/Max/Len/Align values */
  
      RsSmallAddressCheck (ACPI_RESOURCE_NAME_IO,
@@ -559,7 +575,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype1i.c
          MinOp, MaxOp, LengthOp, AlignOp, Info->DescriptorTypeOp);
  
      return (Rnode);
-@@ -561,7 +566,7 @@ RsDoIrqDescriptor (
+@@ -669,7 +674,7 @@ RsDoIrqDescriptor (
  
      /* Now we can set the channel mask */
  
@@ -568,7 +584,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype1i.c
      return (Rnode);
  }
  
-@@ -660,6 +665,6 @@ RsDoIrqNoFlagsDescriptor (
+@@ -768,6 +773,6 @@ RsDoIrqNoFlagsDescriptor (
  
      /* Now we can set the interrupt mask */
  
@@ -576,11 +592,11 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype1i.c
 +    Descriptor->Irq.IrqMask = AcpiUtReadUint16(&IrqMask);
      return (Rnode);
  }
-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 (
+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 (
      ASL_RESOURCE_NODE       *Rnode;
      UINT32                  CurrentByteOffset;
      UINT32                  i;
@@ -589,7 +605,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2.c
  
  
      InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -85,7 +87,8 @@ RsDoGeneralRegisterDescriptor (
+@@ -193,7 +195,8 @@ RsDoGeneralRegisterDescriptor (
  
      Descriptor = Rnode->Buffer;
      Descriptor->GenericReg.DescriptorType = ACPI_RESOURCE_NAME_GENERIC_REGISTER;
@@ -599,7 +615,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2.c
  
      /* Process all child initialization nodes */
  
-@@ -116,7 +119,8 @@ RsDoGeneralRegisterDescriptor (
+@@ -224,7 +227,8 @@ RsDoGeneralRegisterDescriptor (
  
          case 3: /* Register Address */
  
@@ -609,7 +625,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2.c
              RsCreateQwordField (InitializerOp, ACPI_RESTAG_ADDRESS,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (GenericReg.Address));
              break;
-@@ -184,6 +188,8 @@ RsDoInterruptDescriptor (
+@@ -292,6 +296,8 @@ RsDoInterruptDescriptor (
      BOOLEAN                 HasResSourceIndex = FALSE;
      UINT8                   ResSourceIndex = 0;
      UINT8                   *ResSourceString = NULL;
@@ -618,7 +634,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2.c
  
  
      InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -225,7 +231,7 @@ RsDoInterruptDescriptor (
+@@ -333,7 +339,7 @@ RsDoInterruptDescriptor (
       * Initial descriptor length -- may be enlarged if there are
       * optional fields present
       */
@@ -627,7 +643,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2.c
      Descriptor->ExtendedIrq.InterruptCount  = 0;
  
      Rover = ACPI_CAST_PTR (AML_RESOURCE,
-@@ -333,7 +339,8 @@ RsDoInterruptDescriptor (
+@@ -441,7 +447,8 @@ RsDoInterruptDescriptor (
  
              /* Save the integer and move pointer to the next one */
  
@@ -637,7 +653,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2.c
              Rover = ACPI_ADD_PTR (AML_RESOURCE, &(Rover->DwordItem), 4);
              Descriptor->ExtendedIrq.InterruptCount++;
              Descriptor->ExtendedIrq.ResourceLength += 4;
-@@ -384,6 +391,8 @@ RsDoInterruptDescriptor (
+@@ -492,6 +499,8 @@ RsDoInterruptDescriptor (
          Descriptor->ExtendedIrq.ResourceLength = (UINT16)
              (Descriptor->ExtendedIrq.ResourceLength + StringLength);
      }
@@ -646,7 +662,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2.c
  
      Rnode->BufferLength =
          (ASL_RESDESC_OFFSET (ExtendedIrq.Interrupts[0]) -
-@@ -436,7 +445,8 @@ RsDoVendorLargeDescriptor (
+@@ -544,7 +553,8 @@ RsDoVendorLargeDescriptor (
  
      Descriptor = Rnode->Buffer;
      Descriptor->VendorLarge.DescriptorType = ACPI_RESOURCE_NAME_VENDOR_LARGE;
@@ -656,11 +672,11 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2.c
  
      /* Point to end-of-descriptor for vendor data */
  
-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 (
+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 (
      UINT32                  CurrentByteOffset;
      UINT32                  i;
      BOOLEAN                 ResSourceIndex = FALSE;
@@ -669,7 +685,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2d.c
  
  
      InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -147,8 +149,8 @@ RsDoDwordIoDescriptor (
+@@ -255,8 +257,8 @@ RsDoDwordIoDescriptor (
  
          case 5: /* Address Granularity */
  
@@ -680,7 +696,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2d.c
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Granularity));
              GranOp = InitializerOp;
-@@ -156,8 +158,8 @@ RsDoDwordIoDescriptor (
+@@ -264,8 +266,8 @@ RsDoDwordIoDescriptor (
  
          case 6: /* Address Min */
  
@@ -691,7 +707,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2d.c
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_MINADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Minimum));
              MinOp = InitializerOp;
-@@ -165,8 +167,8 @@ RsDoDwordIoDescriptor (
+@@ -273,8 +275,8 @@ RsDoDwordIoDescriptor (
  
          case 7: /* Address Max */
  
@@ -702,7 +718,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2d.c
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Maximum));
              MaxOp = InitializerOp;
-@@ -174,16 +176,16 @@ RsDoDwordIoDescriptor (
+@@ -282,16 +284,16 @@ RsDoDwordIoDescriptor (
  
          case 8: /* Translation Offset */
  
@@ -723,7 +739,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2d.c
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.AddressLength));
              LengthOp = InitializerOp;
-@@ -271,11 +273,14 @@ RsDoDwordIoDescriptor (
+@@ -379,11 +381,14 @@ RsDoDwordIoDescriptor (
  
      /* Validate the Min/Max/Len/Gran values */
  
@@ -742,7 +758,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2d.c
          Descriptor->Address32.Flags,
          MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
  
-@@ -314,6 +319,8 @@ RsDoDwordMemoryDescriptor (
+@@ -422,6 +427,8 @@ RsDoDwordMemoryDescriptor (
      UINT32                  CurrentByteOffset;
      UINT32                  i;
      BOOLEAN                 ResSourceIndex = FALSE;
@@ -751,7 +767,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2d.c
  
  
      InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -385,8 +392,8 @@ RsDoDwordMemoryDescriptor (
+@@ -493,8 +500,8 @@ RsDoDwordMemoryDescriptor (
  
          case 6: /* Address Granularity */
  
@@ -762,7 +778,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2d.c
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Granularity));
              GranOp = InitializerOp;
-@@ -394,8 +401,8 @@ RsDoDwordMemoryDescriptor (
+@@ -502,8 +509,8 @@ RsDoDwordMemoryDescriptor (
  
          case 7: /* Min Address */
  
@@ -773,7 +789,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2d.c
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_MINADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Minimum));
              MinOp = InitializerOp;
-@@ -403,8 +410,8 @@ RsDoDwordMemoryDescriptor (
+@@ -511,8 +518,8 @@ RsDoDwordMemoryDescriptor (
  
          case 8: /* Max Address */
  
@@ -784,7 +800,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2d.c
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Maximum));
              MaxOp = InitializerOp;
-@@ -412,16 +419,16 @@ RsDoDwordMemoryDescriptor (
+@@ -520,16 +527,16 @@ RsDoDwordMemoryDescriptor (
  
          case 9: /* Translation Offset */
  
@@ -805,7 +821,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2d.c
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.AddressLength));
              LengthOp = InitializerOp;
-@@ -506,11 +513,14 @@ RsDoDwordMemoryDescriptor (
+@@ -614,11 +621,14 @@ RsDoDwordMemoryDescriptor (
  
      /* Validate the Min/Max/Len/Gran values */
  
@@ -824,7 +840,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2d.c
          Descriptor->Address32.Flags,
          MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
  
-@@ -549,6 +559,8 @@ RsDoDwordSpaceDescriptor (
+@@ -657,6 +667,8 @@ RsDoDwordSpaceDescriptor (
      UINT32                  CurrentByteOffset;
      UINT32                  i;
      BOOLEAN                 ResSourceIndex = FALSE;
@@ -833,7 +849,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2d.c
  
  
      InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -616,8 +628,8 @@ RsDoDwordSpaceDescriptor (
+@@ -724,8 +736,8 @@ RsDoDwordSpaceDescriptor (
  
          case 6: /* Address Granularity */
  
@@ -844,7 +860,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2d.c
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Granularity));
              GranOp = InitializerOp;
-@@ -625,8 +637,8 @@ RsDoDwordSpaceDescriptor (
+@@ -733,8 +745,8 @@ RsDoDwordSpaceDescriptor (
  
          case 7: /* Min Address */
  
@@ -855,7 +871,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2d.c
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_MINADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Minimum));
              MinOp = InitializerOp;
-@@ -634,8 +646,8 @@ RsDoDwordSpaceDescriptor (
+@@ -742,8 +754,8 @@ RsDoDwordSpaceDescriptor (
  
          case 8: /* Max Address */
  
@@ -866,7 +882,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2d.c
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Maximum));
              MaxOp = InitializerOp;
-@@ -643,16 +655,16 @@ RsDoDwordSpaceDescriptor (
+@@ -751,16 +763,16 @@ RsDoDwordSpaceDescriptor (
  
          case 9: /* Translation Offset */
  
@@ -887,7 +903,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2d.c
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.AddressLength));
              LengthOp = InitializerOp;
-@@ -723,11 +735,14 @@ RsDoDwordSpaceDescriptor (
+@@ -831,11 +843,14 @@ RsDoDwordSpaceDescriptor (
  
      /* Validate the Min/Max/Len/Gran values */
  
@@ -906,11 +922,11 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2d.c
          Descriptor->Address32.Flags,
          MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
  
-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 (
+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 (
      UINT16                  StringLength = 0;
      UINT32                  CurrentByteOffset;
      UINT32                  i;
@@ -918,7 +934,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2e.c
  
  
      InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -139,7 +140,8 @@ RsDoExtendedIoDescriptor (
+@@ -247,7 +248,8 @@ RsDoExtendedIoDescriptor (
  
          case 5: /* Address Granularity */
  
@@ -928,7 +944,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2e.c
              RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Granularity));
              GranOp = InitializerOp;
-@@ -147,7 +149,8 @@ RsDoExtendedIoDescriptor (
+@@ -255,7 +257,8 @@ RsDoExtendedIoDescriptor (
  
          case 6: /* Address Min */
  
@@ -938,7 +954,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2e.c
              RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Minimum));
              MinOp = InitializerOp;
-@@ -155,7 +158,8 @@ RsDoExtendedIoDescriptor (
+@@ -263,7 +266,8 @@ RsDoExtendedIoDescriptor (
  
          case 7: /* Address Max */
  
@@ -948,7 +964,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2e.c
              RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Maximum));
              MaxOp = InitializerOp;
-@@ -163,14 +167,16 @@ RsDoExtendedIoDescriptor (
+@@ -271,14 +275,16 @@ RsDoExtendedIoDescriptor (
  
          case 8: /* Translation Offset */
  
@@ -967,7 +983,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2e.c
              RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.AddressLength));
              LengthOp = InitializerOp;
-@@ -178,7 +184,8 @@ RsDoExtendedIoDescriptor (
+@@ -286,7 +292,8 @@ RsDoExtendedIoDescriptor (
  
          case 10: /* Type-Specific Attributes */
  
@@ -977,7 +993,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2e.c
              RsCreateQwordField (InitializerOp, ACPI_RESTAG_TYPESPECIFICATTRIBUTES,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.TypeSpecific));
              break;
-@@ -213,11 +220,14 @@ RsDoExtendedIoDescriptor (
+@@ -321,11 +328,14 @@ RsDoExtendedIoDescriptor (
  
      /* Validate the Min/Max/Len/Gran values */
  
@@ -996,7 +1012,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2e.c
          Descriptor->ExtAddress64.Flags,
          MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
  
-@@ -253,6 +263,7 @@ RsDoExtendedMemoryDescriptor (
+@@ -361,6 +371,7 @@ RsDoExtendedMemoryDescriptor (
      UINT16                  StringLength = 0;
      UINT32                  CurrentByteOffset;
      UINT32                  i;
@@ -1004,7 +1020,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2e.c
  
  
      InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -319,7 +330,8 @@ RsDoExtendedMemoryDescriptor (
+@@ -427,7 +438,8 @@ RsDoExtendedMemoryDescriptor (
  
          case 6: /* Address Granularity */
  
@@ -1014,7 +1030,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2e.c
              RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Granularity));
              GranOp = InitializerOp;
-@@ -327,7 +339,8 @@ RsDoExtendedMemoryDescriptor (
+@@ -435,7 +447,8 @@ RsDoExtendedMemoryDescriptor (
  
          case 7: /* Min Address */
  
@@ -1024,7 +1040,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2e.c
              RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Minimum));
              MinOp = InitializerOp;
-@@ -335,7 +348,8 @@ RsDoExtendedMemoryDescriptor (
+@@ -443,7 +456,8 @@ RsDoExtendedMemoryDescriptor (
  
          case 8: /* Max Address */
  
@@ -1034,7 +1050,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2e.c
              RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Maximum));
              MaxOp = InitializerOp;
-@@ -343,14 +357,16 @@ RsDoExtendedMemoryDescriptor (
+@@ -451,14 +465,16 @@ RsDoExtendedMemoryDescriptor (
  
          case 9: /* Translation Offset */
  
@@ -1053,7 +1069,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2e.c
              RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.AddressLength));
              LengthOp = InitializerOp;
-@@ -358,7 +374,8 @@ RsDoExtendedMemoryDescriptor (
+@@ -466,7 +482,8 @@ RsDoExtendedMemoryDescriptor (
  
          case 11: /* Type-Specific Attributes */
  
@@ -1063,7 +1079,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2e.c
              RsCreateQwordField (InitializerOp, ACPI_RESTAG_TYPESPECIFICATTRIBUTES,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.TypeSpecific));
              break;
-@@ -394,11 +411,14 @@ RsDoExtendedMemoryDescriptor (
+@@ -502,11 +519,14 @@ RsDoExtendedMemoryDescriptor (
  
      /* Validate the Min/Max/Len/Gran values */
  
@@ -1082,7 +1098,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2e.c
          Descriptor->ExtAddress64.Flags,
          MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
  
-@@ -434,6 +454,7 @@ RsDoExtendedSpaceDescriptor (
+@@ -542,6 +562,7 @@ RsDoExtendedSpaceDescriptor (
      UINT16                  StringLength = 0;
      UINT32                  CurrentByteOffset;
      UINT32                  i;
@@ -1090,7 +1106,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2e.c
  
  
      InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -497,7 +518,8 @@ RsDoExtendedSpaceDescriptor (
+@@ -605,7 +626,8 @@ RsDoExtendedSpaceDescriptor (
  
          case 6: /* Address Granularity */
  
@@ -1100,7 +1116,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2e.c
              RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Granularity));
              GranOp = InitializerOp;
-@@ -505,7 +527,8 @@ RsDoExtendedSpaceDescriptor (
+@@ -613,7 +635,8 @@ RsDoExtendedSpaceDescriptor (
  
          case 7: /* Min Address */
  
@@ -1110,7 +1126,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2e.c
              RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Minimum));
              MinOp = InitializerOp;
-@@ -513,7 +536,8 @@ RsDoExtendedSpaceDescriptor (
+@@ -621,7 +644,8 @@ RsDoExtendedSpaceDescriptor (
  
          case 8: /* Max Address */
  
@@ -1120,7 +1136,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2e.c
              RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Maximum));
              MaxOp = InitializerOp;
-@@ -521,14 +545,16 @@ RsDoExtendedSpaceDescriptor (
+@@ -629,14 +653,16 @@ RsDoExtendedSpaceDescriptor (
  
          case 9: /* Translation Offset */
  
@@ -1139,7 +1155,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2e.c
              RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.AddressLength));
              LengthOp = InitializerOp;
-@@ -536,7 +562,8 @@ RsDoExtendedSpaceDescriptor (
+@@ -644,7 +670,8 @@ RsDoExtendedSpaceDescriptor (
  
          case 11: /* Type-Specific Attributes */
  
@@ -1149,7 +1165,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2e.c
              RsCreateQwordField (InitializerOp, ACPI_RESTAG_TYPESPECIFICATTRIBUTES,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.TypeSpecific));
              break;
-@@ -557,11 +584,14 @@ RsDoExtendedSpaceDescriptor (
+@@ -665,11 +692,14 @@ RsDoExtendedSpaceDescriptor (
  
      /* Validate the Min/Max/Len/Gran values */
  
@@ -1168,11 +1184,11 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2e.c
          Descriptor->ExtAddress64.Flags,
          MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
  
-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 (
+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 (
      UINT32                  CurrentByteOffset;
      UINT32                  i;
      BOOLEAN                 ResSourceIndex = FALSE;
@@ -1180,7 +1196,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2q.c
  
  
      InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -147,7 +148,8 @@ RsDoQwordIoDescriptor (
+@@ -255,7 +256,8 @@ RsDoQwordIoDescriptor (
  
          case 5: /* Address Granularity */
  
@@ -1190,7 +1206,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2q.c
              RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Granularity));
              GranOp = InitializerOp;
-@@ -155,7 +157,8 @@ RsDoQwordIoDescriptor (
+@@ -263,7 +265,8 @@ RsDoQwordIoDescriptor (
  
          case 6: /* Address Min */
  
@@ -1200,7 +1216,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2q.c
              RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Minimum));
              MinOp = InitializerOp;
-@@ -163,7 +166,8 @@ RsDoQwordIoDescriptor (
+@@ -271,7 +274,8 @@ RsDoQwordIoDescriptor (
  
          case 7: /* Address Max */
  
@@ -1210,7 +1226,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2q.c
              RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Maximum));
              MaxOp = InitializerOp;
-@@ -171,14 +175,16 @@ RsDoQwordIoDescriptor (
+@@ -279,14 +283,16 @@ RsDoQwordIoDescriptor (
  
          case 8: /* Translation Offset */
  
@@ -1229,7 +1245,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2q.c
              RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.AddressLength));
              LengthOp = InitializerOp;
-@@ -262,11 +268,14 @@ RsDoQwordIoDescriptor (
+@@ -370,11 +376,14 @@ RsDoQwordIoDescriptor (
  
      /* Validate the Min/Max/Len/Gran values */
  
@@ -1248,7 +1264,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2q.c
          Descriptor->Address64.Flags,
          MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
  
-@@ -305,6 +314,7 @@ RsDoQwordMemoryDescriptor (
+@@ -413,6 +422,7 @@ RsDoQwordMemoryDescriptor (
      UINT32                  CurrentByteOffset;
      UINT32                  i;
      BOOLEAN                 ResSourceIndex = FALSE;
@@ -1256,7 +1272,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2q.c
  
  
      InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -375,7 +385,8 @@ RsDoQwordMemoryDescriptor (
+@@ -483,7 +493,8 @@ RsDoQwordMemoryDescriptor (
  
          case 6: /* Address Granularity */
  
@@ -1266,7 +1282,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2q.c
              RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Granularity));
              GranOp = InitializerOp;
-@@ -383,7 +394,8 @@ RsDoQwordMemoryDescriptor (
+@@ -491,7 +502,8 @@ RsDoQwordMemoryDescriptor (
  
          case 7: /* Min Address */
  
@@ -1276,7 +1292,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2q.c
              RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Minimum));
              MinOp = InitializerOp;
-@@ -391,7 +403,8 @@ RsDoQwordMemoryDescriptor (
+@@ -499,7 +511,8 @@ RsDoQwordMemoryDescriptor (
  
          case 8: /* Max Address */
  
@@ -1286,7 +1302,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2q.c
              RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Maximum));
              MaxOp = InitializerOp;
-@@ -399,14 +412,16 @@ RsDoQwordMemoryDescriptor (
+@@ -507,14 +520,16 @@ RsDoQwordMemoryDescriptor (
  
          case 9: /* Translation Offset */
  
@@ -1305,7 +1321,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2q.c
              RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.AddressLength));
              LengthOp = InitializerOp;
-@@ -491,11 +506,14 @@ RsDoQwordMemoryDescriptor (
+@@ -599,11 +614,14 @@ RsDoQwordMemoryDescriptor (
  
      /* Validate the Min/Max/Len/Gran values */
  
@@ -1324,7 +1340,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2q.c
          Descriptor->Address64.Flags,
          MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
  
-@@ -534,6 +552,7 @@ RsDoQwordSpaceDescriptor (
+@@ -642,6 +660,7 @@ RsDoQwordSpaceDescriptor (
      UINT32                  CurrentByteOffset;
      UINT32                  i;
      BOOLEAN                 ResSourceIndex = FALSE;
@@ -1332,7 +1348,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2q.c
  
  
      InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -601,7 +620,8 @@ RsDoQwordSpaceDescriptor (
+@@ -709,7 +728,8 @@ RsDoQwordSpaceDescriptor (
  
          case 6: /* Address Granularity */
  
@@ -1342,7 +1358,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2q.c
              RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Granularity));
              GranOp = InitializerOp;
-@@ -609,7 +629,8 @@ RsDoQwordSpaceDescriptor (
+@@ -717,7 +737,8 @@ RsDoQwordSpaceDescriptor (
  
          case 7: /* Min Address */
  
@@ -1352,7 +1368,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2q.c
              RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Minimum));
              MinOp = InitializerOp;
-@@ -617,7 +638,8 @@ RsDoQwordSpaceDescriptor (
+@@ -725,7 +746,8 @@ RsDoQwordSpaceDescriptor (
  
          case 8: /* Max Address */
  
@@ -1362,7 +1378,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2q.c
              RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Maximum));
              MaxOp = InitializerOp;
-@@ -625,14 +647,16 @@ RsDoQwordSpaceDescriptor (
+@@ -733,14 +755,16 @@ RsDoQwordSpaceDescriptor (
  
          case 9: /* Translation Offset */
  
@@ -1381,7 +1397,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2q.c
              RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.AddressLength));
              LengthOp = InitializerOp;
-@@ -702,11 +726,14 @@ RsDoQwordSpaceDescriptor (
+@@ -810,11 +834,14 @@ RsDoQwordSpaceDescriptor (
  
      /* Validate the Min/Max/Len/Gran values */
  
@@ -1400,11 +1416,11 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2q.c
          Descriptor->Address64.Flags,
          MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
  
-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 (
+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 (
      UINT32                  CurrentByteOffset;
      UINT32                  PinCount = 0;
      UINT32                  i;
@@ -1412,7 +1428,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2s.c
  
  
      InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -485,7 +486,8 @@ RsDoGpioIntDescriptor (
+@@ -593,7 +594,8 @@ RsDoGpioIntDescriptor (
               *  (implies resource source must immediately follow the pin list.)
               *  Name: _PIN
               */
@@ -1422,7 +1438,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2s.c
              InterruptList++;
              PinCount++;
  
-@@ -518,6 +520,27 @@ RsDoGpioIntDescriptor (
+@@ -626,6 +628,27 @@ RsDoGpioIntDescriptor (
  
      MpSaveGpioInfo (Info->MappingOp, Descriptor,
          PinCount, PinList, ResourceSource);
@@ -1450,7 +1466,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2s.c
      return (Rnode);
  }
  
-@@ -552,6 +575,7 @@ RsDoGpioIoDescriptor (
+@@ -660,6 +683,7 @@ RsDoGpioIoDescriptor (
      UINT32                  CurrentByteOffset;
      UINT32                  PinCount = 0;
      UINT32                  i;
@@ -1458,7 +1474,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2s.c
  
  
      InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -691,7 +715,8 @@ RsDoGpioIoDescriptor (
+@@ -799,7 +823,8 @@ RsDoGpioIoDescriptor (
               *  (implies resource source must immediately follow the pin list.)
               *  Name: _PIN
               */
@@ -1468,7 +1484,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2s.c
              InterruptList++;
              PinCount++;
  
-@@ -724,6 +749,27 @@ RsDoGpioIoDescriptor (
+@@ -832,6 +857,27 @@ RsDoGpioIoDescriptor (
  
      MpSaveGpioInfo (Info->MappingOp, Descriptor,
          PinCount, PinList, ResourceSource);
@@ -1496,7 +1512,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2s.c
      return (Rnode);
  }
  
-@@ -754,6 +800,8 @@ RsDoI2cSerialBusDescriptor (
+@@ -862,6 +908,8 @@ RsDoI2cSerialBusDescriptor (
      UINT16                  DescriptorSize;
      UINT32                  CurrentByteOffset;
      UINT32                  i;
@@ -1505,7 +1521,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2s.c
  
  
      InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -781,7 +829,8 @@ RsDoI2cSerialBusDescriptor (
+@@ -889,7 +937,8 @@ RsDoI2cSerialBusDescriptor (
      Descriptor->I2cSerialBus.RevisionId = AML_RESOURCE_I2C_REVISION;
      Descriptor->I2cSerialBus.TypeRevisionId = AML_RESOURCE_I2C_TYPE_REVISION;
      Descriptor->I2cSerialBus.Type = AML_RESOURCE_I2C_SERIALBUSTYPE;
@@ -1515,7 +1531,14 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2s.c
  
      if (Info->DescriptorTypeOp->Asl.ParseOpcode == PARSEOP_I2C_SERIALBUS_V2)
      {
-@@ -801,7 +850,8 @@ RsDoI2cSerialBusDescriptor (
+@@ -903,13 +952,15 @@ RsDoI2cSerialBusDescriptor (
+ 
+     /* Process all child initialization nodes */
+ 
++    Descriptor->I2cSerialBus.TypeSpecificFlags = 0;
+     for (i = 0; InitializerOp; i++)
+     {
+         switch (i)
          {
          case 0: /* Slave Address [WORD] (_ADR) */
  
@@ -1525,7 +1548,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2s.c
              RsCreateWordField (InitializerOp, ACPI_RESTAG_ADDRESS,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (I2cSerialBus.SlaveAddress));
              break;
-@@ -815,7 +865,8 @@ RsDoI2cSerialBusDescriptor (
+@@ -923,16 +974,19 @@ RsDoI2cSerialBusDescriptor (
  
          case 2: /* Connection Speed [DWORD] (_SPE) */
  
@@ -1535,7 +1558,28 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2s.c
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_SPEED,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (I2cSerialBus.ConnectionSpeed));
              break;
-@@ -913,6 +964,8 @@ RsDoSpiSerialBusDescriptor (
+ 
+         case 3: /* Addressing Mode [Flag] (_MOD) */
+ 
+-            RsSetFlagBits16 (&Descriptor->I2cSerialBus.TypeSpecificFlags, InitializerOp, 0, 0);
++	    Tmp16 = AcpiUtReadUint16(&Descriptor->I2cSerialBus.TypeSpecificFlags);
++            RsSetFlagBits16 (&Tmp16, InitializerOp, 0, 0);
+             RsCreateBitField (InitializerOp, ACPI_RESTAG_MODE,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (I2cSerialBus.TypeSpecificFlags), 0);
++	    Descriptor->I2cSerialBus.TypeSpecificFlags = AcpiUtReadUint16(&Tmp16);
+             break;
+ 
+         case 4: /* ResSource [Optional Field - STRING] */
+@@ -990,6 +1044,8 @@ RsDoI2cSerialBusDescriptor (
+         InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
+     }
+ 
++    Tmp16 = Descriptor->I2cSerialBus.ResourceLength;
++    Descriptor->I2cSerialBus.ResourceLength = AcpiUtReadUint16(&Tmp16);
+     MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource);
+     return (Rnode);
+ }
+@@ -1021,6 +1077,8 @@ RsDoSpiSerialBusDescriptor (
      UINT16                  DescriptorSize;
      UINT32                  CurrentByteOffset;
      UINT32                  i;
@@ -1544,7 +1588,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2s.c
  
  
      InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -935,12 +988,13 @@ RsDoSpiSerialBusDescriptor (
+@@ -1043,12 +1101,13 @@ RsDoSpiSerialBusDescriptor (
          sizeof (AML_RESOURCE_LARGE_HEADER));
  
      Descriptor = Rnode->Buffer;
@@ -1560,7 +1604,14 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2s.c
  
      if (Info->DescriptorTypeOp->Asl.ParseOpcode == PARSEOP_SPI_SERIALBUS_V2)
      {
-@@ -961,7 +1015,8 @@ RsDoSpiSerialBusDescriptor (
+@@ -1063,29 +1122,35 @@ RsDoSpiSerialBusDescriptor (
+ 
+     /* Process all child initialization nodes */
+ 
++    Descriptor->SpiSerialBus.TypeSpecificFlags = 0;
+     for (i = 0; InitializerOp; i++)
+     {
+         switch (i)
          {
          case 0: /* Device Selection [WORD] (_ADR) */
  
@@ -1570,7 +1621,29 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2s.c
              RsCreateWordField (InitializerOp, ACPI_RESTAG_ADDRESS,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (SpiSerialBus.DeviceSelection));
              break;
-@@ -996,7 +1051,8 @@ RsDoSpiSerialBusDescriptor (
+ 
+         case 1: /* Device Polarity [Flag] (_DPL) */
+ 
+-            RsSetFlagBits16 (&Descriptor->SpiSerialBus.TypeSpecificFlags, InitializerOp, 1, 0);
++	    Tmp16 = AcpiUtReadUint16(&Descriptor->SpiSerialBus.TypeSpecificFlags);
++            RsSetFlagBits16 (&Tmp16, InitializerOp, 1, 0);
+             RsCreateBitField (InitializerOp, ACPI_RESTAG_DEVICEPOLARITY,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (SpiSerialBus.TypeSpecificFlags), 1);
++	    Descriptor->SpiSerialBus.TypeSpecificFlags = AcpiUtReadUint16(&Tmp16);
+             break;
+ 
+         case 2: /* Wire Mode [Flag] (_MOD) */
+ 
+-            RsSetFlagBits16 (&Descriptor->SpiSerialBus.TypeSpecificFlags, InitializerOp, 0, 0);
++	    Tmp16 = AcpiUtReadUint16(&Descriptor->SpiSerialBus.TypeSpecificFlags);
++            RsSetFlagBits16 (&Tmp16, InitializerOp, 0, 0);
+             RsCreateBitField (InitializerOp, ACPI_RESTAG_MODE,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (SpiSerialBus.TypeSpecificFlags), 0);
++	    Descriptor->SpiSerialBus.TypeSpecificFlags = AcpiUtReadUint16(&Tmp16);
+             break;
+ 
+         case 3: /* Device Bit Length [BYTE] (_LEN) */
+@@ -1104,7 +1169,8 @@ RsDoSpiSerialBusDescriptor (
  
          case 5: /* Connection Speed [DWORD] (_SPE) */
  
@@ -1580,7 +1653,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2s.c
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_SPEED,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (SpiSerialBus.ConnectionSpeed));
              break;
-@@ -1101,6 +1157,8 @@ RsDoUartSerialBusDescriptor (
+@@ -1209,6 +1275,8 @@ RsDoUartSerialBusDescriptor (
      UINT16                  DescriptorSize;
      UINT32                  CurrentByteOffset;
      UINT32                  i;
@@ -1589,7 +1662,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2s.c
  
  
      InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -1123,12 +1181,13 @@ RsDoUartSerialBusDescriptor (
+@@ -1231,12 +1299,13 @@ RsDoUartSerialBusDescriptor (
          sizeof (AML_RESOURCE_LARGE_HEADER));
  
      Descriptor = Rnode->Buffer;
@@ -1605,7 +1678,14 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2s.c
  
      if (Info->DescriptorTypeOp->Asl.ParseOpcode == PARSEOP_UART_SERIALBUS_V2)
      {
-@@ -1148,7 +1207,8 @@ RsDoUartSerialBusDescriptor (
+@@ -1250,29 +1319,35 @@ RsDoUartSerialBusDescriptor (
+ 
+     /* Process all child initialization nodes */
+ 
++    Descriptor->UartSerialBus.TypeSpecificFlags = 0;
+     for (i = 0; InitializerOp; i++)
+     {
+         switch (i)
          {
          case 0: /* Connection Speed (Baud Rate) [DWORD] (_SPE) */
  
@@ -1615,7 +1695,52 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2s.c
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_SPEED,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.DefaultBaudRate));
              break;
-@@ -1197,14 +1257,16 @@ RsDoUartSerialBusDescriptor (
+ 
+         case 1: /* Bits Per Byte [Flags] (_LEN) */
+ 
+-            RsSetFlagBits16 (&Descriptor->UartSerialBus.TypeSpecificFlags, InitializerOp, 4, 3);
++	    Tmp16 = AcpiUtReadUint16(&Descriptor->UartSerialBus.TypeSpecificFlags);
++            RsSetFlagBits16 (&Tmp16, InitializerOp, 4, 3);
+             RsCreateMultiBitField (InitializerOp, ACPI_RESTAG_LENGTH,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TypeSpecificFlags), 4, 3);
++	    Descriptor->UartSerialBus.TypeSpecificFlags = AcpiUtReadUint16(&Tmp16);;
+             break;
+ 
+         case 2: /* Stop Bits [Flags] (_STB) */
+ 
+-            RsSetFlagBits16 (&Descriptor->UartSerialBus.TypeSpecificFlags, InitializerOp, 2, 1);
++	    Tmp16 = AcpiUtReadUint16(&Descriptor->UartSerialBus.TypeSpecificFlags);
++            RsSetFlagBits16 (&Tmp16, InitializerOp, 2, 1);
+             RsCreateMultiBitField (InitializerOp, ACPI_RESTAG_STOPBITS,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TypeSpecificFlags), 2, 2);
++	    Descriptor->UartSerialBus.TypeSpecificFlags = AcpiUtReadUint16(&Tmp16);;
+             break;
+ 
+         case 3: /* Lines In Use [BYTE] (_LIN) */
+@@ -1284,9 +1359,11 @@ RsDoUartSerialBusDescriptor (
+ 
+         case 4: /* Endianness [Flag] (_END) */
+ 
+-            RsSetFlagBits16 (&Descriptor->UartSerialBus.TypeSpecificFlags, InitializerOp, 7, 0);
++	    Tmp16 = AcpiUtReadUint16(&Descriptor->UartSerialBus.TypeSpecificFlags);
++            RsSetFlagBits16 (&Tmp16, InitializerOp, 7, 0);
+             RsCreateBitField (InitializerOp, ACPI_RESTAG_ENDIANNESS,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TypeSpecificFlags), 7);
++	    Descriptor->UartSerialBus.TypeSpecificFlags = AcpiUtReadUint16(&Tmp16);;
+             break;
+ 
+         case 5: /* Parity [BYTE] (_PAR) */
+@@ -1298,21 +1375,25 @@ RsDoUartSerialBusDescriptor (
+ 
+         case 6: /* Flow Control [Flags] (_FLC) */
+ 
+-            RsSetFlagBits16 (&Descriptor->UartSerialBus.TypeSpecificFlags, InitializerOp, 0, 0);
++	    Tmp16 = AcpiUtReadUint16(&Descriptor->UartSerialBus.TypeSpecificFlags);
++            RsSetFlagBits16 (&Tmp16, InitializerOp, 0, 0);
+             RsCreateMultiBitField (InitializerOp, ACPI_RESTAG_FLOWCONTROL,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TypeSpecificFlags), 0, 2);
++	    Descriptor->UartSerialBus.TypeSpecificFlags = AcpiUtReadUint16(&Tmp16);;
+             break;
  
          case 7: /* Rx Buffer Size [WORD] (_RXL) */
  
@@ -1634,7 +1759,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2s.c
              RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH_TX,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TxFifoSize));
              break;
-@@ -1308,6 +1370,7 @@ RsDoPinFunctionDescriptor (
+@@ -1416,6 +1497,7 @@ RsDoPinFunctionDescriptor (
      UINT32                  CurrentByteOffset;
      UINT32                  PinCount = 0;
      UINT32                  i;
@@ -1642,7 +1767,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2s.c
  
      InitializerOp = Info->DescriptorTypeOp->Asl.Child;
      CurrentByteOffset = Info->CurrentByteOffset;
-@@ -1331,7 +1394,7 @@ RsDoPinFunctionDescriptor (
+@@ -1439,7 +1521,7 @@ RsDoPinFunctionDescriptor (
          sizeof (AML_RESOURCE_LARGE_HEADER));
  
      Descriptor = Rnode->Buffer;
@@ -1651,7 +1776,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2s.c
      Descriptor->PinFunction.DescriptorType = ACPI_RESOURCE_NAME_PIN_FUNCTION;
      Descriptor->PinFunction.RevisionId = AML_RESOURCE_PIN_FUNCTION_REVISION;
  
-@@ -1371,7 +1434,8 @@ RsDoPinFunctionDescriptor (
+@@ -1479,7 +1561,8 @@ RsDoPinFunctionDescriptor (
  
          case 2: /* Function Number [WORD] (_FUN) */
  
@@ -1661,7 +1786,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2s.c
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_FUNCTION,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (PinFunction.FunctionNumber));
              break;
-@@ -1419,6 +1483,12 @@ RsDoPinFunctionDescriptor (
+@@ -1527,6 +1610,12 @@ RsDoPinFunctionDescriptor (
              {
                  Descriptor->PinFunction.VendorLength = VendorLength;
              }
@@ -1674,7 +1799,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2s.c
              break;
  
          default:
-@@ -1430,7 +1500,8 @@ RsDoPinFunctionDescriptor (
+@@ -1538,7 +1627,8 @@ RsDoPinFunctionDescriptor (
               *  (implies resource source must immediately follow the pin list.)
               *  Name: _PIN
               */
@@ -1684,7 +1809,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2s.c
              PinList++;
              PinCount++;
  
-@@ -1461,6 +1532,13 @@ RsDoPinFunctionDescriptor (
+@@ -1569,6 +1659,13 @@ RsDoPinFunctionDescriptor (
          InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
      }
  
@@ -1698,7 +1823,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2s.c
      return (Rnode);
  }
  
-@@ -1494,6 +1572,8 @@ RsDoPinConfigDescriptor (
+@@ -1602,6 +1699,8 @@ RsDoPinConfigDescriptor (
      UINT32                  CurrentByteOffset;
      UINT32                  PinCount = 0;
      UINT32                  i;
@@ -1707,7 +1832,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2s.c
  
      InitializerOp = Info->DescriptorTypeOp->Asl.Child;
      CurrentByteOffset = Info->CurrentByteOffset;
-@@ -1517,7 +1597,7 @@ RsDoPinConfigDescriptor (
+@@ -1625,7 +1724,7 @@ RsDoPinConfigDescriptor (
          sizeof (AML_RESOURCE_LARGE_HEADER));
  
      Descriptor = Rnode->Buffer;
@@ -1716,7 +1841,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2s.c
      Descriptor->PinConfig.DescriptorType = ACPI_RESOURCE_NAME_PIN_CONFIG;
      Descriptor->PinConfig.RevisionId = AML_RESOURCE_PIN_CONFIG_REVISION;
  
-@@ -1571,7 +1651,8 @@ RsDoPinConfigDescriptor (
+@@ -1679,7 +1778,8 @@ RsDoPinConfigDescriptor (
  
          case 2: /* Pin Config Value [DWORD] (_VAL) */
  
@@ -1726,7 +1851,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2s.c
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_PINCONFIG_VALUE,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (PinConfig.PinConfigValue));
              break;
-@@ -1630,7 +1711,8 @@ RsDoPinConfigDescriptor (
+@@ -1738,7 +1838,8 @@ RsDoPinConfigDescriptor (
               *  (implies resource source must immediately follow the pin list.)
               *  Name: _PIN
               */
@@ -1736,7 +1861,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2s.c
              PinList++;
              PinCount++;
  
-@@ -1661,6 +1743,16 @@ RsDoPinConfigDescriptor (
+@@ -1769,6 +1870,16 @@ RsDoPinConfigDescriptor (
          InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
      }
  
@@ -1753,7 +1878,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2s.c
      return (Rnode);
  }
  
-@@ -1694,6 +1786,7 @@ RsDoPinGroupDescriptor (
+@@ -1802,6 +1913,7 @@ RsDoPinGroupDescriptor (
      UINT32                  CurrentByteOffset;
      UINT32                  PinCount = 0;
      UINT32                  i;
@@ -1761,7 +1886,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2s.c
  
      InitializerOp = Info->DescriptorTypeOp->Asl.Child;
      CurrentByteOffset = Info->CurrentByteOffset;
-@@ -1717,7 +1810,7 @@ RsDoPinGroupDescriptor (
+@@ -1825,7 +1937,7 @@ RsDoPinGroupDescriptor (
          sizeof (AML_RESOURCE_LARGE_HEADER));
  
      Descriptor = Rnode->Buffer;
@@ -1770,7 +1895,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2s.c
      Descriptor->PinGroup.DescriptorType = ACPI_RESOURCE_NAME_PIN_GROUP;
      Descriptor->PinGroup.RevisionId = AML_RESOURCE_PIN_GROUP_REVISION;
  
-@@ -1784,7 +1877,8 @@ RsDoPinGroupDescriptor (
+@@ -1892,7 +2004,8 @@ RsDoPinGroupDescriptor (
               *  (implies resource source must immediately follow the pin list.)
               *  Name: _PIN
               */
@@ -1780,7 +1905,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2s.c
              PinList++;
              PinCount++;
  
-@@ -1815,6 +1909,16 @@ RsDoPinGroupDescriptor (
+@@ -1923,6 +2036,16 @@ RsDoPinGroupDescriptor (
          InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
      }
  
@@ -1797,7 +1922,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2s.c
      return (Rnode);
  }
  
-@@ -1847,6 +1951,7 @@ RsDoPinGroupFunctionDescriptor (
+@@ -1955,6 +2078,7 @@ RsDoPinGroupFunctionDescriptor (
      UINT16                  DescriptorSize;
      UINT32                  CurrentByteOffset;
      UINT32                  i;
@@ -1805,7 +1930,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2s.c
  
      InitializerOp = Info->DescriptorTypeOp->Asl.Child;
      CurrentByteOffset = Info->CurrentByteOffset;
-@@ -1870,7 +1975,7 @@ RsDoPinGroupFunctionDescriptor (
+@@ -1978,7 +2102,7 @@ RsDoPinGroupFunctionDescriptor (
          sizeof (AML_RESOURCE_LARGE_HEADER));
  
      Descriptor = Rnode->Buffer;
@@ -1814,7 +1939,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2s.c
      Descriptor->PinGroupFunction.DescriptorType = ACPI_RESOURCE_NAME_PIN_GROUP_FUNCTION;
      Descriptor->PinGroupFunction.RevisionId = AML_RESOURCE_PIN_GROUP_FUNCTION_REVISION;
  
-@@ -1902,7 +2007,8 @@ RsDoPinGroupFunctionDescriptor (
+@@ -2010,7 +2134,8 @@ RsDoPinGroupFunctionDescriptor (
  
          case 1: /* Function Number [WORD] */
  
@@ -1824,7 +1949,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2s.c
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_FUNCTION,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (PinGroupFunction.FunctionNumber));
              break;
-@@ -1961,6 +2067,16 @@ RsDoPinGroupFunctionDescriptor (
+@@ -2069,6 +2194,16 @@ RsDoPinGroupFunctionDescriptor (
          InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
      }
  
@@ -1841,7 +1966,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2s.c
      return (Rnode);
  }
  
-@@ -1993,6 +2109,8 @@ RsDoPinGroupConfigDescriptor (
+@@ -2101,6 +2236,8 @@ RsDoPinGroupConfigDescriptor (
      UINT16                  DescriptorSize;
      UINT32                  CurrentByteOffset;
      UINT32                  i;
@@ -1850,7 +1975,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2s.c
  
      InitializerOp = Info->DescriptorTypeOp->Asl.Child;
      CurrentByteOffset = Info->CurrentByteOffset;
-@@ -2016,7 +2134,7 @@ RsDoPinGroupConfigDescriptor (
+@@ -2124,7 +2261,7 @@ RsDoPinGroupConfigDescriptor (
          sizeof (AML_RESOURCE_LARGE_HEADER));
  
      Descriptor = Rnode->Buffer;
@@ -1859,7 +1984,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2s.c
      Descriptor->PinGroupConfig.DescriptorType = ACPI_RESOURCE_NAME_PIN_GROUP_CONFIG;
      Descriptor->PinGroupConfig.RevisionId = AML_RESOURCE_PIN_GROUP_CONFIG_REVISION;
  
-@@ -2069,7 +2187,8 @@ RsDoPinGroupConfigDescriptor (
+@@ -2177,7 +2314,8 @@ RsDoPinGroupConfigDescriptor (
  
          case 2: /* Pin Config Value [DWORD] (_VAL) */
  
@@ -1869,7 +1994,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2s.c
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_PINCONFIG_VALUE,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (PinGroupConfig.PinConfigValue));
              break;
-@@ -2130,5 +2249,15 @@ RsDoPinGroupConfigDescriptor (
+@@ -2238,5 +2376,15 @@ RsDoPinGroupConfigDescriptor (
          InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
      }
  
@@ -1885,11 +2010,11 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2s.c
 +
      return (Rnode);
  }
-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 (
+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 (
      UINT32                  CurrentByteOffset;
      UINT32                  i;
      BOOLEAN                 ResSourceIndex = FALSE;
@@ -1897,7 +2022,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2w.c
  
  
      InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -147,7 +148,8 @@ RsDoWordIoDescriptor (
+@@ -255,7 +256,8 @@ RsDoWordIoDescriptor (
  
          case 5: /* Address Granularity */
  
@@ -1907,7 +2032,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2w.c
              RsCreateWordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Granularity));
              GranOp = InitializerOp;
-@@ -155,7 +157,8 @@ RsDoWordIoDescriptor (
+@@ -263,7 +265,8 @@ RsDoWordIoDescriptor (
  
          case 6: /* Address Min */
  
@@ -1917,7 +2042,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2w.c
              RsCreateWordField (InitializerOp, ACPI_RESTAG_MINADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Minimum));
              MinOp = InitializerOp;
-@@ -163,7 +166,8 @@ RsDoWordIoDescriptor (
+@@ -271,7 +274,8 @@ RsDoWordIoDescriptor (
  
          case 7: /* Address Max */
  
@@ -1927,7 +2052,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2w.c
              RsCreateWordField (InitializerOp, ACPI_RESTAG_MAXADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Maximum));
              MaxOp = InitializerOp;
-@@ -171,14 +175,16 @@ RsDoWordIoDescriptor (
+@@ -279,14 +283,16 @@ RsDoWordIoDescriptor (
  
          case 8: /* Translation Offset */
  
@@ -1946,7 +2071,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2w.c
              RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH,
                   CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.AddressLength));
              LengthOp = InitializerOp;
-@@ -263,13 +269,17 @@ RsDoWordIoDescriptor (
+@@ -371,13 +377,17 @@ RsDoWordIoDescriptor (
      /* Validate the Min/Max/Len/Gran values */
  
      RsLargeAddressCheck (
@@ -1968,7 +2093,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2w.c
      Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) +
          OptionIndex + StringLength;
      return (Rnode);
-@@ -305,6 +315,7 @@ RsDoWordBusNumberDescriptor (
+@@ -413,6 +423,7 @@ RsDoWordBusNumberDescriptor (
      UINT32                  CurrentByteOffset;
      UINT32                  i;
      BOOLEAN                 ResSourceIndex = FALSE;
@@ -1976,7 +2101,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2w.c
  
  
      InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -361,8 +372,8 @@ RsDoWordBusNumberDescriptor (
+@@ -469,8 +480,8 @@ RsDoWordBusNumberDescriptor (
  
          case 4: /* Address Granularity */
  
@@ -1987,7 +2112,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2w.c
              RsCreateWordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Granularity));
              GranOp = InitializerOp;
-@@ -370,8 +381,8 @@ RsDoWordBusNumberDescriptor (
+@@ -478,8 +489,8 @@ RsDoWordBusNumberDescriptor (
  
          case 5: /* Min Address */
  
@@ -1998,7 +2123,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2w.c
              RsCreateWordField (InitializerOp, ACPI_RESTAG_MINADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Minimum));
              MinOp = InitializerOp;
-@@ -379,8 +390,8 @@ RsDoWordBusNumberDescriptor (
+@@ -487,8 +498,8 @@ RsDoWordBusNumberDescriptor (
  
          case 6: /* Max Address */
  
@@ -2009,7 +2134,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2w.c
              RsCreateWordField (InitializerOp, ACPI_RESTAG_MAXADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Maximum));
              MaxOp = InitializerOp;
-@@ -388,16 +399,16 @@ RsDoWordBusNumberDescriptor (
+@@ -496,16 +507,16 @@ RsDoWordBusNumberDescriptor (
  
          case 7: /* Translation Offset */
  
@@ -2030,7 +2155,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2w.c
              RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH,
                   CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.AddressLength));
              LengthOp = InitializerOp;
-@@ -468,13 +479,17 @@ RsDoWordBusNumberDescriptor (
+@@ -576,13 +587,17 @@ RsDoWordBusNumberDescriptor (
      /* Validate the Min/Max/Len/Gran values */
  
      RsLargeAddressCheck (
@@ -2052,7 +2177,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2w.c
      Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) +
          OptionIndex + StringLength;
      return (Rnode);
-@@ -510,6 +525,7 @@ RsDoWordSpaceDescriptor (
+@@ -618,6 +633,7 @@ RsDoWordSpaceDescriptor (
      UINT32                  CurrentByteOffset;
      UINT32                  i;
      BOOLEAN                 ResSourceIndex = FALSE;
@@ -2060,7 +2185,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2w.c
  
  
      InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -577,8 +593,8 @@ RsDoWordSpaceDescriptor (
+@@ -685,8 +701,8 @@ RsDoWordSpaceDescriptor (
  
          case 6: /* Address Granularity */
  
@@ -2071,7 +2196,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2w.c
              RsCreateWordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Granularity));
              GranOp = InitializerOp;
-@@ -586,8 +602,8 @@ RsDoWordSpaceDescriptor (
+@@ -694,8 +710,8 @@ RsDoWordSpaceDescriptor (
  
          case 7: /* Min Address */
  
@@ -2082,7 +2207,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2w.c
              RsCreateWordField (InitializerOp, ACPI_RESTAG_MINADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Minimum));
              MinOp = InitializerOp;
-@@ -595,8 +611,8 @@ RsDoWordSpaceDescriptor (
+@@ -703,8 +719,8 @@ RsDoWordSpaceDescriptor (
  
          case 8: /* Max Address */
  
@@ -2093,7 +2218,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2w.c
              RsCreateWordField (InitializerOp, ACPI_RESTAG_MAXADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Maximum));
              MaxOp = InitializerOp;
-@@ -604,16 +620,16 @@ RsDoWordSpaceDescriptor (
+@@ -712,16 +728,16 @@ RsDoWordSpaceDescriptor (
  
          case 9: /* Translation Offset */
  
@@ -2114,7 +2239,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2w.c
              RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.AddressLength));
              LengthOp = InitializerOp;
-@@ -684,13 +700,17 @@ RsDoWordSpaceDescriptor (
+@@ -792,13 +808,17 @@ RsDoWordSpaceDescriptor (
      /* Validate the Min/Max/Len/Gran values */
  
      RsLargeAddressCheck (
@@ -2136,11 +2261,11 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2w.c
      Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) +
          OptionIndex + StringLength;
      return (Rnode);
-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 (
+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 (
  
  
      ByteData = Op->Named.Data;
@@ -2149,11 +2274,46 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmbuffer.c
  
      /*
       * The byte list belongs to a buffer, and can be produced by either
-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 (
+@@ -416,7 +416,7 @@ AcpiDmIsUuidBuffer (
+     /* Extract the byte list info */
+ 
+     ByteData = NextOp->Named.Data;
+-    ByteCount = (UINT32) NextOp->Common.Value.Integer;
++    ByteCount = (UINT32) NextOp->Common.Value.Size;
+ 
+     /* Byte count must be exactly 16 */
+ 
+@@ -544,7 +544,7 @@ AcpiDmIsUnicodeBuffer (
+     /* Extract the byte list info */
+ 
+     ByteData = NextOp->Named.Data;
+-    ByteCount = (UINT32) NextOp->Common.Value.Integer;
++    ByteCount = (UINT32) NextOp->Common.Value.Size;
+     WordCount = ACPI_DIV_2 (ByteCount);
+ 
+     /*
+@@ -986,14 +986,14 @@ AcpiDmUnicode (
+     /* Extract the buffer info as a WORD buffer */
+ 
+     WordData = ACPI_CAST_PTR (UINT16, Op->Named.Data);
+-    WordCount = ACPI_DIV_2 (((UINT32) Op->Common.Value.Integer));
++    WordCount = ACPI_DIV_2 (((UINT32) Op->Common.Value.Size));
+ 
+     /* Write every other byte as an ASCII character */
+ 
+     AcpiOsPrintf ("\"");
+     for (i = 0; i < (WordCount - 1); i++)
+     {
+-        OutputValue = (int) WordData[i];
++        OutputValue = (int) AcpiUtReadUint16(&WordData[i]);
+ 
+         /* 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 (
  
      case AML_INT_NAMEDFIELD_OP:
  
@@ -2181,11 +2341,11 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmopcode.c
          Info->BitOffset += Offset;
  
          if (Info->BitOffset % 8 == 0)
-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 (
+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 (
          return (AE_TYPE);
      }
  
@@ -2194,11 +2354,11 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmresrc.c
  
      /* Get the length of the raw initialization byte list */
  
-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 (
+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 (
      UINT32                  Level)
  {
      UINT32                  i;
@@ -2207,7 +2367,7 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmresrcl.c
  
  
      for (i = 0; i < 4; i++)
-@@ -151,14 +153,16 @@ AcpiDmMemoryFields (
+@@ -259,14 +261,16 @@ AcpiDmMemoryFields (
          {
          case 16:
  
@@ -2228,7 +2388,7 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmresrcl.c
              break;
  
          default:
-@@ -190,6 +194,9 @@ AcpiDmAddressFields (
+@@ -298,6 +302,9 @@ AcpiDmAddressFields (
      UINT32                  Level)
  {
      UINT32                  i;
@@ -2238,7 +2398,7 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmresrcl.c
  
  
      AcpiOsPrintf ("\n");
-@@ -202,20 +209,23 @@ AcpiDmAddressFields (
+@@ -310,20 +317,23 @@ AcpiDmAddressFields (
          {
          case 16:
  
@@ -2268,7 +2428,7 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmresrcl.c
              break;
  
          default:
-@@ -749,7 +759,7 @@ AcpiDmExtendedDescriptor (
+@@ -857,7 +867,7 @@ AcpiDmExtendedDescriptor (
      /* Extra field for this descriptor only */
  
      AcpiDmIndent (Level + 1);
@@ -2277,7 +2437,7 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmresrcl.c
          "Type-Specific Attributes");
  
      /* Insert a descriptor name */
-@@ -876,11 +886,11 @@ AcpiDmFixedMemory32Descriptor (
+@@ -984,11 +994,11 @@ AcpiDmFixedMemory32Descriptor (
          AcpiGbl_RwDecode [ACPI_GET_1BIT_FLAG (Resource->FixedMemory32.Flags)]);
  
      AcpiDmIndent (Level + 1);
@@ -2291,7 +2451,7 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmresrcl.c
          "Address Length");
  
      /* Insert a descriptor name */
-@@ -926,7 +936,8 @@ AcpiDmGenericRegisterDescriptor (
+@@ -1034,7 +1044,8 @@ AcpiDmGenericRegisterDescriptor (
      AcpiDmDumpInteger8 (Resource->GenericReg.BitOffset, "Bit Offset");
  
      AcpiDmIndent (Level + 1);
@@ -2301,7 +2461,7 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmresrcl.c
  
      /* Optional field for ACPI 3.0 */
  
-@@ -989,7 +1000,7 @@ AcpiDmInterruptDescriptor (
+@@ -1097,7 +1108,7 @@ AcpiDmInterruptDescriptor (
      AcpiDmResourceSource (Resource,
          sizeof (AML_RESOURCE_EXTENDED_IRQ) +
              ((UINT32) Resource->ExtendedIrq.InterruptCount - 1) * sizeof (UINT32),
@@ -2310,7 +2470,7 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmresrcl.c
  
      /* Insert a descriptor name */
  
-@@ -1004,7 +1015,7 @@ AcpiDmInterruptDescriptor (
+@@ -1112,7 +1123,7 @@ AcpiDmInterruptDescriptor (
      {
          AcpiDmIndent (Level + 1);
          AcpiOsPrintf ("0x%8.8X,\n",
@@ -2319,17 +2479,18 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmresrcl.c
      }
  
      AcpiDmIndent (Level);
-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,15 +191,19 @@ AcpiDmGpioCommon (
+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 (
      char                    *DeviceName = NULL;
      UINT32                  PinCount;
      UINT32                  i;
 +    UINT16                  ResSourceOffset;
 +    UINT16                  VendorOffset;
 +    UINT16                  VendorLength;
++    UINT16                  Tmp16;
  
  
      /* ResourceSource, ResourceSourceIndex, ResourceType */
@@ -2345,7 +2506,16 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmresrcl2.c
          AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
      }
  
-@@ -215,15 +219,15 @@ AcpiDmGpioCommon (
+     AcpiOsPrintf (", ");
+     AcpiOsPrintf ("0x%2.2X, ", Resource->Gpio.ResSourceIndex);
+-    AcpiOsPrintf ("%s, ",
+-        AcpiGbl_ConsumeDecode [ACPI_GET_1BIT_FLAG (Resource->Gpio.Flags)]);
++    Tmp16 = AcpiUtReadUint16(&Resource->Gpio.Flags);
++    AcpiOsPrintf ("%s, ", AcpiGbl_ConsumeDecode [ACPI_GET_1BIT_FLAG (Tmp16)]);
+ 
+     /* Insert a descriptor name */
+ 
+@@ -323,15 +328,15 @@ AcpiDmGpioCommon (
  
      /* Dump the vendor data */
  
@@ -2366,17 +2536,16 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmresrcl2.c
      }
  
      AcpiOsPrintf (")\n");
-@@ -233,17 +237,21 @@ AcpiDmGpioCommon (
+@@ -341,17 +346,17 @@ AcpiDmGpioCommon (
      AcpiDmIndent (Level + 1);
      AcpiOsPrintf ("{   // Pin list\n");
  
+-    PinCount = ((UINT32) (Resource->Gpio.ResSourceOffset -
+-        Resource->Gpio.PinTableOffset)) /
+-        sizeof (UINT16);
 +    PinCount = (UINT32) AcpiUtReadUint16(&Resource->Gpio.ResSourceOffset);
 +    PinCount -= (UINT32) AcpiUtReadUint16(&Resource->Gpio.PinTableOffset);
 +    PinCount /= sizeof (UINT16);
-+
-     PinCount = ((UINT32) (Resource->Gpio.ResSourceOffset -
-         Resource->Gpio.PinTableOffset)) /
-         sizeof (UINT16);
  
      PinList = (UINT16 *) ACPI_ADD_PTR (char, Resource,
 -        Resource->Gpio.PinTableOffset);
@@ -2390,7 +2559,29 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmresrcl2.c
              ((i + 1) < PinCount) ? "," : "");
      }
  
-@@ -299,7 +307,8 @@ AcpiDmGpioIntDescriptor (
+@@ -385,16 +390,18 @@ AcpiDmGpioIntDescriptor (
+     UINT32                  Length,
+     UINT32                  Level)
+ {
++    UINT16                  Tmp16;
+ 
+     /* Dump the GpioInt-specific portion of the descriptor */
+ 
+     /* EdgeLevel, ActiveLevel, Shared */
+ 
+     AcpiDmIndent (Level);
++    Tmp16 = AcpiUtReadUint16(&Resource->Gpio.IntFlags);
+     AcpiOsPrintf ("GpioInt (%s, %s, %s, ",
+-        AcpiGbl_HeDecode [ACPI_GET_1BIT_FLAG (Resource->Gpio.IntFlags)],
+-        AcpiGbl_LlDecode [ACPI_EXTRACT_2BIT_FLAG (Resource->Gpio.IntFlags, 1)],
+-        AcpiGbl_ShrDecode [ACPI_EXTRACT_2BIT_FLAG (Resource->Gpio.IntFlags, 3)]);
++        AcpiGbl_HeDecode [ACPI_GET_1BIT_FLAG (Tmp16)],
++        AcpiGbl_LlDecode [ACPI_EXTRACT_2BIT_FLAG (Tmp16, 1)],
++        AcpiGbl_ShrDecode [ACPI_EXTRACT_2BIT_FLAG (Tmp16, 3)]);
+ 
+     /* PinConfig, DebounceTimeout */
+ 
+@@ -407,7 +414,8 @@ AcpiDmGpioIntDescriptor (
      {
          AcpiOsPrintf ("0x%2.2X, ", Resource->Gpio.PinConfig);
      }
@@ -2400,18 +2591,40 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmresrcl2.c
  
      /* Dump the GpioInt/GpioIo common portion of the descriptor */
  
-@@ -350,8 +359,8 @@ AcpiDmGpioIoDescriptor (
+@@ -437,14 +445,16 @@ AcpiDmGpioIoDescriptor (
+     UINT32                  Length,
+     UINT32                  Level)
+ {
++    UINT16                  Tmp16;
+ 
+     /* Dump the GpioIo-specific portion of the descriptor */
+ 
+     /* Shared, PinConfig */
+ 
+     AcpiDmIndent (Level);
++    Tmp16 = AcpiUtReadUint16(&Resource->Gpio.IntFlags);
+     AcpiOsPrintf ("GpioIo (%s, ",
+-        AcpiGbl_ShrDecode [ACPI_EXTRACT_2BIT_FLAG (Resource->Gpio.IntFlags, 3)]);
++        AcpiGbl_ShrDecode [ACPI_EXTRACT_2BIT_FLAG (Tmp16, 3)]);
+ 
+     if (Resource->Gpio.PinConfig <= 3)
+     {
+@@ -458,10 +468,10 @@ AcpiDmGpioIoDescriptor (
  
      /* DebounceTimeout, DriveStrength, IoRestriction */
  
 -    AcpiOsPrintf ("0x%4.4X, ", Resource->Gpio.DebounceTimeout);
 -    AcpiOsPrintf ("0x%4.4X, ", Resource->Gpio.DriveStrength);
+-    AcpiOsPrintf ("%s,\n",
+-        AcpiGbl_IorDecode [ACPI_GET_2BIT_FLAG (Resource->Gpio.IntFlags)]);
 +    AcpiOsPrintf ("0x%4.4X, ", AcpiUtReadUint16(&Resource->Gpio.DebounceTimeout));
 +    AcpiOsPrintf ("0x%4.4X, ", AcpiUtReadUint16(&Resource->Gpio.DriveStrength));
-     AcpiOsPrintf ("%s,\n",
-         AcpiGbl_IorDecode [ACPI_GET_2BIT_FLAG (Resource->Gpio.IntFlags)]);
++    Tmp16 = AcpiUtReadUint16(&Resource->Gpio.IntFlags);
++    AcpiOsPrintf ("%s,\n", AcpiGbl_IorDecode [ACPI_GET_2BIT_FLAG (Tmp16)]);
  
-@@ -434,6 +443,9 @@ AcpiDmPinFunctionDescriptor (
+     /* Dump the GpioInt/GpioIo common portion of the descriptor */
+ 
+@@ -542,6 +552,9 @@ AcpiDmPinFunctionDescriptor (
      char                    *DeviceName = NULL;
      UINT32                  PinCount;
      UINT32                  i;
@@ -2421,7 +2634,7 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmresrcl2.c
  
      AcpiDmIndent (Level);
      AcpiOsPrintf ("PinFunction (%s, ",
-@@ -451,12 +463,14 @@ AcpiDmPinFunctionDescriptor (
+@@ -559,12 +572,14 @@ AcpiDmPinFunctionDescriptor (
  
      /* FunctionNumber */
  
@@ -2439,7 +2652,7 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmresrcl2.c
          AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
      }
  
-@@ -476,15 +490,15 @@ AcpiDmPinFunctionDescriptor (
+@@ -584,15 +599,15 @@ AcpiDmPinFunctionDescriptor (
  
      /* Dump the vendor data */
  
@@ -2460,7 +2673,7 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmresrcl2.c
      }
  
      AcpiOsPrintf (")\n");
-@@ -495,17 +509,17 @@ AcpiDmPinFunctionDescriptor (
+@@ -603,17 +618,17 @@ AcpiDmPinFunctionDescriptor (
  
      AcpiOsPrintf ("{   // Pin list\n");
  
@@ -2483,11 +2696,139 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmresrcl2.c
              ((i + 1) < PinCount) ? "," : "");
      }
  
-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 (
+@@ -649,7 +664,8 @@ AcpiDmDumpSerialBusVendorData (
+     {
+     case AML_RESOURCE_I2C_SERIALBUSTYPE:
+ 
+-        VendorLength = Resource->CommonSerialBus.TypeDataLength -
++        VendorLength = 
++	    AcpiUtReadUint16(&Resource->CommonSerialBus.TypeDataLength) -
+             AML_RESOURCE_I2C_MIN_DATA_LEN;
+ 
+         VendorData = ACPI_ADD_PTR (UINT8, Resource,
+@@ -658,7 +674,8 @@ AcpiDmDumpSerialBusVendorData (
+ 
+     case AML_RESOURCE_SPI_SERIALBUSTYPE:
+ 
+-        VendorLength = Resource->CommonSerialBus.TypeDataLength -
++        VendorLength = 
++	    AcpiUtReadUint16(&Resource->CommonSerialBus.TypeDataLength) -
+             AML_RESOURCE_SPI_MIN_DATA_LEN;
+ 
+         VendorData = ACPI_ADD_PTR (UINT8, Resource,
+@@ -667,7 +684,8 @@ AcpiDmDumpSerialBusVendorData (
+ 
+     case AML_RESOURCE_UART_SERIALBUSTYPE:
+ 
+-        VendorLength = Resource->CommonSerialBus.TypeDataLength -
++        VendorLength = 
++	    AcpiUtReadUint16(&Resource->CommonSerialBus.TypeDataLength) -
+             AML_RESOURCE_UART_MIN_DATA_LEN;
+ 
+         VendorData = ACPI_ADD_PTR (UINT8, Resource,
+@@ -715,9 +733,9 @@ AcpiDmI2cSerialBusDescriptor (
+ 
+     AcpiDmIndent (Level);
+     AcpiOsPrintf ("I2cSerialBusV2 (0x%4.4X, %s, 0x%8.8X,\n",
+-        Resource->I2cSerialBus.SlaveAddress,
++        AcpiUtReadUint16(&Resource->I2cSerialBus.SlaveAddress),
+         AcpiGbl_SmDecode [ACPI_GET_1BIT_FLAG (Resource->I2cSerialBus.Flags)],
+-        Resource->I2cSerialBus.ConnectionSpeed);
++        AcpiUtReadUint32(&Resource->I2cSerialBus.ConnectionSpeed));
+ 
+     AcpiDmIndent (Level + 1);
+     AcpiOsPrintf ("%s, ",
+@@ -726,7 +744,7 @@ AcpiDmI2cSerialBusDescriptor (
+     /* ResourceSource is a required field */
+ 
+     ResourceSourceOffset = sizeof (AML_RESOURCE_COMMON_SERIALBUS) +
+-        Resource->CommonSerialBus.TypeDataLength;
++        AcpiUtReadUint16(&Resource->CommonSerialBus.TypeDataLength);
+ 
+     DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset);
+     AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
+@@ -783,15 +801,17 @@ AcpiDmSpiSerialBusDescriptor (
+ {
+     UINT32                  ResourceSourceOffset;
+     char                    *DeviceName;
++    UINT16                  Tmp16;
+ 
+ 
+     /* DeviceSelection, DeviceSelectionPolarity, WireMode, DataBitLength */
+ 
+     AcpiDmIndent (Level);
++    Tmp16 = AcpiUtReadUint16(&Resource->SpiSerialBus.TypeSpecificFlags);
+     AcpiOsPrintf ("SpiSerialBusV2 (0x%4.4X, %s, %s, 0x%2.2X,\n",
+-        Resource->SpiSerialBus.DeviceSelection,
+-        AcpiGbl_DpDecode [ACPI_EXTRACT_1BIT_FLAG (Resource->SpiSerialBus.TypeSpecificFlags, 1)],
+-        AcpiGbl_WmDecode [ACPI_GET_1BIT_FLAG (Resource->SpiSerialBus.TypeSpecificFlags)],
++        AcpiUtReadUint16(&Resource->SpiSerialBus.DeviceSelection),
++        AcpiGbl_DpDecode [ACPI_EXTRACT_1BIT_FLAG (Tmp16, 1)],
++        AcpiGbl_WmDecode [ACPI_GET_1BIT_FLAG (Tmp16)],
+         Resource->SpiSerialBus.DataBitLength);
+ 
+     /* SlaveMode, ConnectionSpeed, ClockPolarity, ClockPhase */
+@@ -799,7 +819,7 @@ AcpiDmSpiSerialBusDescriptor (
+     AcpiDmIndent (Level + 1);
+     AcpiOsPrintf ("%s, 0x%8.8X, %s,\n",
+         AcpiGbl_SmDecode [ACPI_GET_1BIT_FLAG (Resource->SpiSerialBus.Flags)],
+-        Resource->SpiSerialBus.ConnectionSpeed,
++        AcpiUtReadUint32(&Resource->SpiSerialBus.ConnectionSpeed),
+         AcpiGbl_CpoDecode [ACPI_GET_1BIT_FLAG (Resource->SpiSerialBus.ClockPolarity)]);
+ 
+     AcpiDmIndent (Level + 1);
+@@ -809,7 +829,7 @@ AcpiDmSpiSerialBusDescriptor (
+     /* ResourceSource is a required field */
+ 
+     ResourceSourceOffset = sizeof (AML_RESOURCE_COMMON_SERIALBUS) +
+-        Resource->CommonSerialBus.TypeDataLength;
++        AcpiUtReadUint16(&Resource->CommonSerialBus.TypeDataLength);
+ 
+     DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset);
+     AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
+@@ -866,15 +886,17 @@ AcpiDmUartSerialBusDescriptor (
+ {
+     UINT32                  ResourceSourceOffset;
+     char                    *DeviceName;
++    UINT16                  Tmp16;
+ 
+ 
+     /* ConnectionSpeed, BitsPerByte, StopBits */
+ 
+     AcpiDmIndent (Level);
++    Tmp16 = AcpiUtReadUint16(&Resource->UartSerialBus.TypeSpecificFlags);
+     AcpiOsPrintf ("UartSerialBusV2 (0x%8.8X, %s, %s,\n",
+-        Resource->UartSerialBus.DefaultBaudRate,
+-        AcpiGbl_BpbDecode [ACPI_EXTRACT_3BIT_FLAG (Resource->UartSerialBus.TypeSpecificFlags, 4)],
+-        AcpiGbl_SbDecode [ACPI_EXTRACT_2BIT_FLAG (Resource->UartSerialBus.TypeSpecificFlags, 2)]);
++        AcpiUtReadUint32(&Resource->UartSerialBus.DefaultBaudRate),
++        AcpiGbl_BpbDecode [ACPI_EXTRACT_3BIT_FLAG (Tmp16, 4)],
++        AcpiGbl_SbDecode [ACPI_EXTRACT_2BIT_FLAG (Tmp16, 2)]);
+ 
+     /* LinesInUse, IsBigEndian, Parity, FlowControl */
+ 
+@@ -889,13 +911,13 @@ AcpiDmUartSerialBusDescriptor (
+ 
+     AcpiDmIndent (Level + 1);
+     AcpiOsPrintf ("0x%4.4X, 0x%4.4X, ",
+-        Resource->UartSerialBus.RxFifoSize,
+-        Resource->UartSerialBus.TxFifoSize);
++        AcpiUtReadUint16(&Resource->UartSerialBus.RxFifoSize),
++        AcpiUtReadUint16(&Resource->UartSerialBus.TxFifoSize));
+ 
+     /* ResourceSource is a required field */
+ 
+     ResourceSourceOffset = sizeof (AML_RESOURCE_COMMON_SERIALBUS) +
+-        Resource->CommonSerialBus.TypeDataLength;
++        AcpiUtReadUint16(&Resource->CommonSerialBus.TypeDataLength);
+ 
+     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 (
      AcpiOsPrintf (")\n");
  
      AcpiDmIndent (Level + 1);
@@ -2496,7 +2837,7 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmresrcs.c
  }
  
  
-@@ -161,8 +161,8 @@ AcpiDmFixedDmaDescriptor (
+@@ -269,8 +269,8 @@ AcpiDmFixedDmaDescriptor (
  
      AcpiDmIndent (Level);
      AcpiOsPrintf ("FixedDMA (0x%4.4X, 0x%4.4X, ",
@@ -2507,7 +2848,7 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmresrcs.c
  
      if (Resource->FixedDma.Width <= 5)
      {
-@@ -210,10 +210,12 @@ AcpiDmIoDescriptor (
+@@ -318,10 +318,12 @@ AcpiDmIoDescriptor (
          AcpiGbl_IoDecode [ACPI_GET_1BIT_FLAG (Resource->Io.Flags)]);
  
      AcpiDmIndent (Level + 1);
@@ -2522,7 +2863,7 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmresrcs.c
  
      AcpiDmIndent (Level + 1);
      AcpiDmDumpInteger8 (Resource->Io.Alignment, "Alignment");
-@@ -256,10 +258,12 @@ AcpiDmFixedIoDescriptor (
+@@ -364,10 +366,12 @@ AcpiDmFixedIoDescriptor (
      AcpiOsPrintf ("FixedIO (\n");
  
      AcpiDmIndent (Level + 1);
@@ -2537,11 +2878,24 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmresrcs.c
  
      /* Insert a descriptor name */
  
-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 (
+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 (
+         {
+             ParentOp->Common.DisasmFlags |= ACPI_PARSEOP_EMPTY_TERMLIST;
+             ASL_CV_CLOSE_PAREN (Op, Level);
+-            AcpiOsPrintf ("{");
++            AcpiOsPrintf (" {");
+         }
+     }
+ 
+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 (
      char                    *NamePath;
  #endif
  
@@ -2550,7 +2904,7 @@ Index: acpica-unix2-20200925/source/components/dispatcher/dsfield.c
  
      ACPI_FUNCTION_TRACE_PTR (DsGetFieldNames, Info);
  
-@@ -442,14 +444,17 @@ AcpiDsGetFieldNames (
+@@ -550,14 +552,17 @@ AcpiDsGetFieldNames (
  
              /* Lookup the name, it should already exist */
  
@@ -2570,7 +2924,7 @@ Index: acpica-unix2-20200925/source/components/dispatcher/dsfield.c
                  return_ACPI_STATUS (Status);
              }
              else
-@@ -703,8 +708,13 @@ AcpiDsInitFieldObjects (
+@@ -811,8 +816,13 @@ AcpiDsInitFieldObjects (
           */
          if (Arg->Common.AmlOpcode == AML_INT_NAMEDFIELD_OP)
          {
@@ -2585,11 +2939,11 @@ Index: acpica-unix2-20200925/source/components/dispatcher/dsfield.c
                  Flags, WalkState, &Node);
              if (ACPI_FAILURE (Status))
              {
-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 (
+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 (
  
          /* Extract one ACPI name from the front of the pathname */
  
@@ -2598,11 +2952,11 @@ Index: acpica-unix2-20200925/source/components/namespace/nsaccess.c
  
          /* Try to find the single (4 character) ACPI name */
  
-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 (
+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 (
              ACPI_PATH_PUT8(FullPath, PathSize, AML_DUAL_NAME_PREFIX, Length);
          }
  
@@ -2611,11 +2965,11 @@ Index: acpica-unix2-20200925/source/components/namespace/nsnames.c
          DoNoTrailing = NoTrailing;
          for (i = 0; i < 4; i++)
          {
-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 (
+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 (
      ACPI_WALK_STATE         *WalkState;
      ACPI_TABLE_HEADER       *Table;
      ACPI_OWNER_ID           OwnerId;
@@ -2623,7 +2977,7 @@ Index: acpica-unix2-20200925/source/components/namespace/nsparse.c
  
  
      ACPI_FUNCTION_TRACE (NsOneCompleteParse);
-@@ -216,13 +217,14 @@ AcpiNsOneCompleteParse (
+@@ -324,13 +325,14 @@ AcpiNsOneCompleteParse (
  
      /* Table must consist of at least a complete header */
  
@@ -2640,11 +2994,11 @@ Index: acpica-unix2-20200925/source/components/namespace/nsparse.c
  
      Status = AcpiTbGetOwnerId (TableIndex, &OwnerId);
      if (ACPI_FAILURE (Status))
-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 (
+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 (
      const char              *ExternalName = Info->NextExternalChar;
      char                    *Result = NULL;
      UINT32                  i;
@@ -2652,7 +3006,7 @@ Index: acpica-unix2-20200925/source/components/namespace/nsutils.c
  
  
      ACPI_FUNCTION_TRACE (NsBuildInternalName);
-@@ -336,7 +335,6 @@ AcpiNsBuildInternalName (
+@@ -444,7 +443,6 @@ AcpiNsBuildInternalName (
  
      for (; NumSegments; NumSegments--)
      {
@@ -2660,7 +3014,7 @@ Index: acpica-unix2-20200925/source/components/namespace/nsutils.c
          for (i = 0; i < ACPI_NAMESEG_SIZE; i++)
          {
              if (ACPI_IS_PATH_SEPARATOR (*ExternalName) ||
-@@ -344,17 +342,16 @@ AcpiNsBuildInternalName (
+@@ -452,17 +450,16 @@ AcpiNsBuildInternalName (
              {
                  /* Pad the segment with underscore(s) if segment is short */
  
@@ -2680,3 +3034,6 @@ Index: acpica-unix2-20200925/source/components/namespace/nsutils.c
  
          /* 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 dc4ad0b..afb4976 100644
--- a/0041-Support-MTMR-in-a-big-endian-world.patch
+++ b/0041-Support-MTMR-in-a-big-endian-world.patch
@@ -1,7 +1,7 @@
-From 902266037614bc0b3ff31c1dfeb350c80e517d90 Mon Sep 17 00:00:00 2001
+From 62c6c5b94772b7f8f5de6136a2ba61e31d0c7b3c Mon Sep 17 00:00:00 2001
 From: Al Stone <ahs3@redhat.com>
 Date: Fri, 16 Oct 2020 20:52:43 -0400
-Subject: [PATCH 1/4] Support MTMR in a big-endian world
+Subject: [PATCH 3/5] Support MTMR in a big-endian world
 
 Signed-off-by: Al Stone <ahs3@redhat.com>
 ---
@@ -42,5 +42,5 @@ index 285fd30d7..7450ca3f7 100644
          if (ACPI_FAILURE (Status))
          {
 -- 
-2.28.0
+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 24e50c2..6bd6d62 100644
--- a/0042-Support-VRTC-in-a-big-endian-world.patch
+++ b/0042-Support-VRTC-in-a-big-endian-world.patch
@@ -1,7 +1,7 @@
-From b8d25df79205c128057dba4112b34a7b714a7c43 Mon Sep 17 00:00:00 2001
+From 19eefeadf92a471f1c4fbc6dd4d035e45fa76dcd Mon Sep 17 00:00:00 2001
 From: Al Stone <ahs3@redhat.com>
 Date: Mon, 19 Oct 2020 17:17:40 -0400
-Subject: [PATCH 2/4] Support VRTC in a big-endian world
+Subject: [PATCH 4/5] Support VRTC in a big-endian world
 
 ---
  source/common/dmtbdump3.c | 7 ++++---
@@ -41,5 +41,5 @@ index da9b81c92..db2f54ffb 100644
          if (ACPI_FAILURE (Status))
          {
 -- 
-2.28.0
+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 bf1be6f..3e41bfe 100644
--- a/0043-Support-S3PT-in-a-big-endian-world.patch
+++ b/0043-Support-S3PT-in-a-big-endian-world.patch
@@ -1,7 +1,7 @@
-From 1652084e864a8048b44486548d9df40eb64cd8de Mon Sep 17 00:00:00 2001
+From 5805d42c0cec5366daa12e0f4caed7a58b13fe5b Mon Sep 17 00:00:00 2001
 From: Al Stone <ahs3@redhat.com>
 Date: Mon, 19 Oct 2020 17:30:30 -0400
-Subject: [PATCH 3/4] Support S3PT in a big-endian world
+Subject: [PATCH 5/5] Support S3PT in a big-endian world
 
 ---
  source/common/dmtbdump2.c  | 15 +++++++++------
@@ -95,5 +95,5 @@ index 48729b48f..1ac063795 100644
          case ACPI_S3PT_TYPE_RESUME:
  
 -- 
-2.28.0
+2.26.2
 

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 36/82] 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
-

From c6ecf612fe865089147297d1ad62345030147601 Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Tue, 27 Oct 2020 17:54:15 -0600
Subject: [PATCH 37/82] Add a patch to correct for endianness when converting
 ASL to ASL+

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 ...n-ness-problem-when-converting-ASL-t.patch | 43 +++++++++++++++++++
 acpica-tools.spec                             |  2 +
 2 files changed, 45 insertions(+)
 create mode 100644 0044-Correct-an-endian-ness-problem-when-converting-ASL-t.patch

diff --git a/0044-Correct-an-endian-ness-problem-when-converting-ASL-t.patch b/0044-Correct-an-endian-ness-problem-when-converting-ASL-t.patch
new file mode 100644
index 0000000..5d7da5b
--- /dev/null
+++ b/0044-Correct-an-endian-ness-problem-when-converting-ASL-t.patch
@@ -0,0 +1,43 @@
+From 9dc82e99776b18fe19314695d7d83e79c7fea934 Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Tue, 27 Oct 2020 17:50:52 -0600
+Subject: [PATCH] Correct an endian-ness problem when converting ASL to ASL+
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/compiler/cvparser.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/source/compiler/cvparser.c b/source/compiler/cvparser.c
+index 370b80361..7311e031a 100644
+--- a/source/compiler/cvparser.c
++++ b/source/compiler/cvparser.c
+@@ -144,6 +144,7 @@ CvInitFileTree (
+     char                    *ChildFilename = NULL;
+     UINT8                   *AmlStart;
+     UINT32                  AmlLength;
++    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
+ 
+ 
+     if (!AcpiGbl_CaptureComments)
+@@ -152,7 +153,7 @@ CvInitFileTree (
+     }
+ 
+ 
+-    AmlLength = Table->Length - sizeof (ACPI_TABLE_HEADER);
++    AmlLength = TableLength - sizeof (ACPI_TABLE_HEADER);
+     AmlStart = ((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER));
+ 
+     CvDbgPrint ("AmlLength: %x\n", AmlLength);
+@@ -162,7 +163,7 @@ CvInitFileTree (
+     AcpiGbl_FileTreeRoot = AcpiOsAcquireObject (AcpiGbl_FileCache);
+ 
+     AcpiGbl_FileTreeRoot->FileStart = (char *)(AmlStart);
+-    AcpiGbl_FileTreeRoot->FileEnd = (char *)(AmlStart + Table->Length);
++    AcpiGbl_FileTreeRoot->FileEnd = (char *)(AmlStart + TableLength);
+     AcpiGbl_FileTreeRoot->Next = NULL;
+     AcpiGbl_FileTreeRoot->Parent = NULL;
+     AcpiGbl_FileTreeRoot->Filename = (char *)(AmlStart+2);
+-- 
+2.26.2
+
diff --git a/acpica-tools.spec b/acpica-tools.spec
index 5409cda..0dcf7e8 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -67,6 +67,7 @@ Patch39:	0040-Support-DSDT-SSDT-in-a-big-endian-world.patch
 Patch40:	0041-Support-MTMR-in-a-big-endian-world.patch
 Patch41:	0042-Support-VRTC-in-a-big-endian-world.patch
 Patch42:	0043-Support-S3PT-in-a-big-endian-world.patch
+Patch43:	0044-Correct-an-endian-ness-problem-when-converting-ASL-t.patch
 
 # other miscellaneous patches
 Patch100:	unaligned.patch
@@ -178,6 +179,7 @@ gzip -dc %{SOURCE1} | tar -x --strip-components=1 -f -
 %patch40 -p1
 %patch41 -p1
 %patch42 -p1
+%patch43 -p1
 
 # apply the remaining patches
 %patch100 -p1

From 41d9121d77c38828eef8dddb190394fd36ef02b1 Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Wed, 28 Oct 2020 15:27:56 -0600
Subject: [PATCH 38/82] Fixed two more obscure endian problems

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 ...-of-endianness-issues-previously-uns.patch | 67 +++++++++++++++++++
 acpica-tools.spec                             |  2 +
 2 files changed, 69 insertions(+)
 create mode 100644 0045-Correct-a-couple-of-endianness-issues-previously-uns.patch

diff --git a/0045-Correct-a-couple-of-endianness-issues-previously-uns.patch b/0045-Correct-a-couple-of-endianness-issues-previously-uns.patch
new file mode 100644
index 0000000..76d5fa5
--- /dev/null
+++ b/0045-Correct-a-couple-of-endianness-issues-previously-uns.patch
@@ -0,0 +1,67 @@
+From 71357f9d65334b1667a87a940a3ac06049c9aedb Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Wed, 28 Oct 2020 12:53:34 -0600
+Subject: [PATCH] Correct a couple of endianness issues previously unseen
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/compiler/aslanalyze.c  |  4 ++--
+ source/compiler/aslrestype1.c | 16 ++++++++--------
+ 2 files changed, 10 insertions(+), 10 deletions(-)
+
+Index: acpica-unix2-20200925/source/compiler/aslanalyze.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/compiler/aslanalyze.c
++++ acpica-unix2-20200925/source/compiler/aslanalyze.c
+@@ -469,7 +469,7 @@ ApCheckForGpeNameConflict (
+ 
+     /* Need a null-terminated string version of NameSeg */
+ 
+-    ACPI_MOVE_32_TO_32 (Name, Op->Asl.NameSeg);
++    ACPI_COPY_NAMESEG (Name, Op->Asl.NameSeg);
+     Name[ACPI_NAMESEG_SIZE] = 0;
+ 
+     /*
+@@ -496,7 +496,7 @@ ApCheckForGpeNameConflict (
+      * We are now sure we have an _Lxx or _Exx.
+      * Create the target name that would cause collision (Flip E/L)
+      */
+-    ACPI_MOVE_32_TO_32 (Target, Name);
++    ACPI_COPY_NAMESEG (Target, Name);
+ 
+     /* Inject opposite letter ("L" versus "E") */
+ 
+Index: acpica-unix2-20200925/source/compiler/aslrestype1.c
+===================================================================
+--- acpica-unix2-20200925.orig/source/compiler/aslrestype1.c
++++ acpica-unix2-20200925/source/compiler/aslrestype1.c
+@@ -220,10 +220,10 @@ RsDoMemory24Descriptor (
+     /* Validate the Min/Max/Len/Align values (Alignment==0 means 64K) */
+ 
+     RsSmallAddressCheck (ACPI_RESOURCE_NAME_MEMORY24,
+-        Descriptor->Memory24.Minimum,
+-        Descriptor->Memory24.Maximum,
+-        Descriptor->Memory24.AddressLength,
+-        Descriptor->Memory24.Alignment,
++        AcpiUtReadUint32(&Descriptor->Memory24.Minimum),
++        AcpiUtReadUint32(&Descriptor->Memory24.Maximum),
++        AcpiUtReadUint32(&Descriptor->Memory24.AddressLength),
++        AcpiUtReadUint32(&Descriptor->Memory24.Alignment),
+         MinOp, MaxOp, LengthOp, NULL, Info->DescriptorTypeOp);
+ 
+     return (Rnode);
+@@ -334,10 +334,10 @@ RsDoMemory32Descriptor (
+     /* Validate the Min/Max/Len/Align values */
+ 
+     RsSmallAddressCheck (ACPI_RESOURCE_NAME_MEMORY32,
+-        Descriptor->Memory32.Minimum,
+-        Descriptor->Memory32.Maximum,
+-        Descriptor->Memory32.AddressLength,
+-        Descriptor->Memory32.Alignment,
++        AcpiUtReadUint32(&Descriptor->Memory32.Minimum),
++        AcpiUtReadUint32(&Descriptor->Memory32.Maximum),
++        AcpiUtReadUint32(&Descriptor->Memory32.AddressLength),
++        AcpiUtReadUint32(&Descriptor->Memory32.Alignment),
+         MinOp, MaxOp, LengthOp, AlignOp, Info->DescriptorTypeOp);
+ 
+     return (Rnode);
diff --git a/acpica-tools.spec b/acpica-tools.spec
index 0dcf7e8..e492c77 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -68,6 +68,7 @@ Patch40:	0041-Support-MTMR-in-a-big-endian-world.patch
 Patch41:	0042-Support-VRTC-in-a-big-endian-world.patch
 Patch42:	0043-Support-S3PT-in-a-big-endian-world.patch
 Patch43:	0044-Correct-an-endian-ness-problem-when-converting-ASL-t.patch
+Patch44:	0045-Correct-a-couple-of-endianness-issues-previously-uns.patch
 
 # other miscellaneous patches
 Patch100:	unaligned.patch
@@ -180,6 +181,7 @@ gzip -dc %{SOURCE1} | tar -x --strip-components=1 -f -
 %patch41 -p1
 %patch42 -p1
 %patch43 -p1
+%patch44 -p1
 
 # apply the remaining patches
 %patch100 -p1

From 7ae04aaa722084b5b75aeeaa45d50b5dc4356c89 Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Thu, 29 Oct 2020 10:46:20 -0600
Subject: [PATCH 39/82] Use %autopatch in the spec file

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 acpica-tools.spec | 68 +----------------------------------------------
 ull-32bit.patch   | 11 +++++---
 2 files changed, 8 insertions(+), 71 deletions(-)

diff --git a/acpica-tools.spec b/acpica-tools.spec
index e492c77..265b3b8 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -136,73 +136,7 @@ This version of the tools is being released under GPLv2 license.
 %setup -q -n acpica-unix2-%{version}
 gzip -dc %{SOURCE1} | tar -x --strip-components=1 -f -
 
-# apply the big-endian patches
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
-%patch28 -p1
-%patch29 -p1
-%patch30 -p1
-%patch31 -p1
-%patch32 -p1
-%patch33 -p1
-%patch34 -p1
-%patch35 -p1
-%patch36 -p1
-%patch37 -p1
-%patch38 -p1
-%patch39 -p1
-%patch40 -p1
-%patch41 -p1
-%patch42 -p1
-%patch43 -p1
-%patch44 -p1
-
-# apply the remaining patches
-%patch100 -p1
-%patch101 -p1
-%patch102 -p1
-%patch103 -p1
-%patch104 -p1
-%patch105 -p1
-%patch106 -p1
-%patch107 -p1
-%patch108 -p1
-%patch109 -p1
-%patch110 -p1
-%patch111 -p1
-%patch112 -p1
-%patch113 -p1
-%patch114 -p1
-%patch115 -p1
-%ifarch i686 armv7hl
-%patch116 -p1
-%endif
+%autopatch -p1
 
 cp -p %{SOURCE2} README.Fedora
 cp -p %{SOURCE3} iasl.1
diff --git a/ull-32bit.patch b/ull-32bit.patch
index 0568e11..3d8fe39 100644
--- a/ull-32bit.patch
+++ b/ull-32bit.patch
@@ -1,12 +1,15 @@
 diff -Naur acpica-unix2-20200925.orig/source/common/dmtbdump.c acpica-unix2-20200925/source/common/dmtbdump.c
---- acpica-unix2-20200925.orig/source/common/dmtbdump.c	2020-10-16 18:33:41.108600489 -0600
-+++ acpica-unix2-20200925/source/common/dmtbdump.c	2020-10-16 18:35:01.970316862 -0600
-@@ -333,7 +333,7 @@
+--- acpica-unix2-20200925.orig/source/common/dmtbdump.c 2020-10-27 08:50:34.949398104 -0500
++++ acpica-unix2-20200925/source/common/dmtbdump.c      2020-10-27 08:54:27.609955141 -0500
+@@ -333,7 +333,11 @@
      for (i = 0; i < Entries; i++)
      {
          AcpiDmLineHeader2 (Offset, sizeof (UINT64), "ACPI Table Address", i);
--        AcpiOsPrintf ("%16.16lX\n", AcpiUtReadUint64(&Array[i]));
++#if ACPI_MACHINE_WIDTH == 32
 +        AcpiOsPrintf ("%16.16llX\n", AcpiUtReadUint64(&Array[i]));
++#else
+         AcpiOsPrintf ("%16.16lX\n", AcpiUtReadUint64(&Array[i]));
++#endif
          Offset += sizeof (UINT64);
      }
  }

From defe2b64332fc44bf9915c8f57d2614c529cdb43 Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Thu, 29 Oct 2020 14:13:33 -0600
Subject: [PATCH 40/82] Missed a couple of minor endianness corrections

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 ...-of-endianness-issues-previously-uns.patch | 59 ++++++++++++-------
 1 file changed, 39 insertions(+), 20 deletions(-)

diff --git a/0045-Correct-a-couple-of-endianness-issues-previously-uns.patch b/0045-Correct-a-couple-of-endianness-issues-previously-uns.patch
index 76d5fa5..471ab55 100644
--- a/0045-Correct-a-couple-of-endianness-issues-previously-uns.patch
+++ b/0045-Correct-a-couple-of-endianness-issues-previously-uns.patch
@@ -1,19 +1,22 @@
-From 71357f9d65334b1667a87a940a3ac06049c9aedb Mon Sep 17 00:00:00 2001
+From e942e785b3ec47693029e3841075becba31f2635 Mon Sep 17 00:00:00 2001
 From: Al Stone <ahs3@redhat.com>
 Date: Wed, 28 Oct 2020 12:53:34 -0600
 Subject: [PATCH] Correct a couple of endianness issues previously unseen
 
+Just odds and ends of some resource types and ASL analysis
+
 Signed-off-by: Al Stone <ahs3@redhat.com>
 ---
- source/compiler/aslanalyze.c  |  4 ++--
- source/compiler/aslrestype1.c | 16 ++++++++--------
- 2 files changed, 10 insertions(+), 10 deletions(-)
+ source/compiler/aslanalyze.c   |  4 ++--
+ source/compiler/aslrestype1.c  | 16 ++++++++--------
+ source/compiler/aslrestype1i.c |  2 +-
+ 3 files changed, 11 insertions(+), 11 deletions(-)
 
-Index: acpica-unix2-20200925/source/compiler/aslanalyze.c
-===================================================================
---- acpica-unix2-20200925.orig/source/compiler/aslanalyze.c
-+++ acpica-unix2-20200925/source/compiler/aslanalyze.c
-@@ -469,7 +469,7 @@ ApCheckForGpeNameConflict (
+diff --git a/source/compiler/aslanalyze.c b/source/compiler/aslanalyze.c
+index 63feba2b1..f76a8c3cd 100644
+--- a/source/compiler/aslanalyze.c
++++ b/source/compiler/aslanalyze.c
+@@ -577,7 +577,7 @@ ApCheckForGpeNameConflict (
  
      /* Need a null-terminated string version of NameSeg */
  
@@ -22,7 +25,7 @@ Index: acpica-unix2-20200925/source/compiler/aslanalyze.c
      Name[ACPI_NAMESEG_SIZE] = 0;
  
      /*
-@@ -496,7 +496,7 @@ ApCheckForGpeNameConflict (
+@@ -604,7 +604,7 @@ ApCheckForGpeNameConflict (
       * We are now sure we have an _Lxx or _Exx.
       * Create the target name that would cause collision (Flip E/L)
       */
@@ -31,11 +34,11 @@ Index: acpica-unix2-20200925/source/compiler/aslanalyze.c
  
      /* Inject opposite letter ("L" versus "E") */
  
-Index: acpica-unix2-20200925/source/compiler/aslrestype1.c
-===================================================================
---- acpica-unix2-20200925.orig/source/compiler/aslrestype1.c
-+++ acpica-unix2-20200925/source/compiler/aslrestype1.c
-@@ -220,10 +220,10 @@ RsDoMemory24Descriptor (
+diff --git a/source/compiler/aslrestype1.c b/source/compiler/aslrestype1.c
+index e7639c0bb..fd4428aab 100644
+--- a/source/compiler/aslrestype1.c
++++ b/source/compiler/aslrestype1.c
+@@ -328,10 +328,10 @@ RsDoMemory24Descriptor (
      /* Validate the Min/Max/Len/Align values (Alignment==0 means 64K) */
  
      RsSmallAddressCheck (ACPI_RESOURCE_NAME_MEMORY24,
@@ -43,14 +46,14 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype1.c
 -        Descriptor->Memory24.Maximum,
 -        Descriptor->Memory24.AddressLength,
 -        Descriptor->Memory24.Alignment,
-+        AcpiUtReadUint32(&Descriptor->Memory24.Minimum),
-+        AcpiUtReadUint32(&Descriptor->Memory24.Maximum),
-+        AcpiUtReadUint32(&Descriptor->Memory24.AddressLength),
-+        AcpiUtReadUint32(&Descriptor->Memory24.Alignment),
++        (UINT32) AcpiUtReadUint16(&Descriptor->Memory24.Minimum),
++        (UINT32) AcpiUtReadUint16(&Descriptor->Memory24.Maximum),
++        (UINT32) AcpiUtReadUint16(&Descriptor->Memory24.AddressLength),
++        (UINT32) AcpiUtReadUint16(&Descriptor->Memory24.Alignment),
          MinOp, MaxOp, LengthOp, NULL, Info->DescriptorTypeOp);
  
      return (Rnode);
-@@ -334,10 +334,10 @@ RsDoMemory32Descriptor (
+@@ -442,10 +442,10 @@ RsDoMemory32Descriptor (
      /* Validate the Min/Max/Len/Align values */
  
      RsSmallAddressCheck (ACPI_RESOURCE_NAME_MEMORY32,
@@ -65,3 +68,19 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype1.c
          MinOp, MaxOp, LengthOp, AlignOp, Info->DescriptorTypeOp);
  
      return (Rnode);
+diff --git a/source/compiler/aslrestype1i.c b/source/compiler/aslrestype1i.c
+index 532553c4b..d41e3a1e8 100644
+--- a/source/compiler/aslrestype1i.c
++++ b/source/compiler/aslrestype1i.c
+@@ -436,7 +436,7 @@ RsDoFixedIoDescriptor (
+ 
+     /* Error checks */
+ 
+-    if (Descriptor->FixedIo.Address > 0x03FF)
++    if (AcpiUtReadUint16(&Descriptor->FixedIo.Address) > 0x03FF)
+     {
+         AslError (ASL_WARNING, ASL_MSG_ISA_ADDRESS, AddressOp, NULL);
+     }
+-- 
+2.26.2
+

From 21acab9abc051b7136b0f578d07c852c3a54aa7e Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
Date: Wed, 13 Jan 2021 01:02:25 +0000
Subject: [PATCH 41/82] Add BuildRequires: make

https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
---
 acpica-tools.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/acpica-tools.spec b/acpica-tools.spec
index 265b3b8..d36a612 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -89,6 +89,7 @@ Patch114:	armv7-str-fixes.patch
 Patch115:	dbtest.patch
 Patch116:	ull-32bit.patch
 
+BuildRequires: make
 BuildRequires:  bison patchutils flex gcc
 
 # The previous iasl package contained only a very small subset of these tools

From 630afe986a9149df5ea2a3a374db4b223b560177 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Mon, 25 Jan 2021 23:46:26 +0000
Subject: [PATCH 42/82] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 acpica-tools.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/acpica-tools.spec b/acpica-tools.spec
index d36a612..312f052 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -1,6 +1,6 @@
 Name:           acpica-tools
 Version:        20200925
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        ACPICA tools for the development and debug of ACPI tables
 
 License:        GPLv2
@@ -253,6 +253,9 @@ fi
 
 
 %changelog
+* Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20200925-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Mon Oct 19 2020 Al Stone <ahs3@redhat.com> - 20200925-1
 - Update to 20200925 source tree
 - Completely revamp the old big-endian patches (maintainability was the goal).

From 0eba164ee5311e9a05943e40ab8d756696f2c3a5 Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Sat, 10 Jul 2021 16:39:01 -0600
Subject: [PATCH 43/82] Upload 20201113 source files for archival purposes only

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 .gitignore | 2 ++
 sources    | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9b16719..d084c2d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -137,3 +137,5 @@ series
 /acpitests-unix-20200717.tar.gz
 /acpica-unix2-20200925.tar.gz
 /acpitests-unix-20200925.tar.gz
+/acpica-unix2-20201113.tar.gz
+/acpitests-unix-20201113.tar.gz
diff --git a/sources b/sources
index 3e65507..aaefe3e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (acpica-unix2-20200925.tar.gz) = e5009e6f38b145019406b2d237247f3063372bcd006371501991f338f974bf441c3de3162f5b800ff5f6eed4ab267ef4b715b2256cc9a6ae0a787eb0d0a24c68
-SHA512 (acpitests-unix-20200925.tar.gz) = 6b633b71aced285478cde2f044848b1b748f5dc0d7d9a968610f4036e21b26541c7e0cfe49c4e6298ae1c041b8a575f7969b1f2a50dbe5af88e8ffaccfd82e96
+SHA512 (acpica-unix2-20201113.tar.gz) = 5419f64bde47049df53191585adfe20ce94730f239e11486b95b35fab433c3be99bdeea7f8b60cdf69a2020e7586f20ded06d75e841801ba8eb31f714fcb8bb4
+SHA512 (acpitests-unix-20201113.tar.gz) = 4b353d7719786ef83fe12984a1fa6cd244650f532a904dcead587db21e6e5846a9f91c2798a9fc9fec83af701eb8a40ccd0b45f9cebfa97557806e90c5251e63

From 245633aae58cbbb580b5c6682fad6edb23c8245f Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Sat, 10 Jul 2021 16:41:33 -0600
Subject: [PATCH 44/82] Upload 20201217 source files for archival purposes only

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 .gitignore | 2 ++
 sources    | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index d084c2d..a7b6565 100644
--- a/.gitignore
+++ b/.gitignore
@@ -139,3 +139,5 @@ series
 /acpitests-unix-20200925.tar.gz
 /acpica-unix2-20201113.tar.gz
 /acpitests-unix-20201113.tar.gz
+/acpica-unix2-20201217.tar.gz
+/acpitests-unix-20201217.tar.gz
diff --git a/sources b/sources
index aaefe3e..151b9e9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (acpica-unix2-20201113.tar.gz) = 5419f64bde47049df53191585adfe20ce94730f239e11486b95b35fab433c3be99bdeea7f8b60cdf69a2020e7586f20ded06d75e841801ba8eb31f714fcb8bb4
-SHA512 (acpitests-unix-20201113.tar.gz) = 4b353d7719786ef83fe12984a1fa6cd244650f532a904dcead587db21e6e5846a9f91c2798a9fc9fec83af701eb8a40ccd0b45f9cebfa97557806e90c5251e63
+SHA512 (acpica-unix2-20201217.tar.gz) = f0069b807e7c2da7db64742bb0a0131c636796c782403dd205e008530df83df76ef8f4a80aa4f28910c14c732d529929ad78c81ebb48067fedd3394d12b72ec6
+SHA512 (acpitests-unix-20201217.tar.gz) = 7d83be03cf58633e62b9ce0171e1942835c03ded963c5824320cbb0f331ede5fa163ad4d5a1a3b1ada502f88f49a0212e71ee08e34acba1f4b404bd3770e0b2a

From e51802b3657d0aada027aa3e5ab6eca857a94d95 Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Sat, 10 Jul 2021 16:42:57 -0600
Subject: [PATCH 45/82] Upload 20210105 source files for archival purposes only

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 .gitignore | 2 ++
 sources    | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index a7b6565..175bbf6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -141,3 +141,5 @@ series
 /acpitests-unix-20201113.tar.gz
 /acpica-unix2-20201217.tar.gz
 /acpitests-unix-20201217.tar.gz
+/acpica-unix2-20210105.tar.gz
+/acpitests-unix-20210105.tar.gz
diff --git a/sources b/sources
index 151b9e9..bb0ae33 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (acpica-unix2-20201217.tar.gz) = f0069b807e7c2da7db64742bb0a0131c636796c782403dd205e008530df83df76ef8f4a80aa4f28910c14c732d529929ad78c81ebb48067fedd3394d12b72ec6
-SHA512 (acpitests-unix-20201217.tar.gz) = 7d83be03cf58633e62b9ce0171e1942835c03ded963c5824320cbb0f331ede5fa163ad4d5a1a3b1ada502f88f49a0212e71ee08e34acba1f4b404bd3770e0b2a
+SHA512 (acpica-unix2-20210105.tar.gz) = 83eb3cc7c2637e7cb3cf792c30e50566c8e678b9170765ac4fa7537fddd94b7686ad759edd355cd7578fadf2f45456b421e7be0861c5d1b656f2894de0832e3a
+SHA512 (acpitests-unix-20210105.tar.gz) = 676562ce46fe1f6c71fde7ccda49cefed50d81641f6ec69effa72e5d70e4f60ac8d0be28ce4b74d0b99c639d058c5f6a50759a6f76f126f80ab4cbb9152ec935

From 3bed39446c57f23c5f0870ccd87c133cbfe4a3a8 Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Sat, 10 Jul 2021 16:45:26 -0600
Subject: [PATCH 46/82] Upload 20210331 source files for archival purposes only

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 .gitignore | 2 ++
 sources    | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 175bbf6..260e8c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -143,3 +143,5 @@ series
 /acpitests-unix-20201217.tar.gz
 /acpica-unix2-20210105.tar.gz
 /acpitests-unix-20210105.tar.gz
+/acpica-unix2-20210331.tar.gz
+/acpitests-unix-20210331.tar.gz
diff --git a/sources b/sources
index bb0ae33..ec304de 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (acpica-unix2-20210105.tar.gz) = 83eb3cc7c2637e7cb3cf792c30e50566c8e678b9170765ac4fa7537fddd94b7686ad759edd355cd7578fadf2f45456b421e7be0861c5d1b656f2894de0832e3a
-SHA512 (acpitests-unix-20210105.tar.gz) = 676562ce46fe1f6c71fde7ccda49cefed50d81641f6ec69effa72e5d70e4f60ac8d0be28ce4b74d0b99c639d058c5f6a50759a6f76f126f80ab4cbb9152ec935
+SHA512 (acpica-unix2-20210331.tar.gz) = acebf149870093c11e5bf87f234a334651f51826d78e82882373aff2a01f8dd6b26da23eecfbb4c6b31e7607aa8e533e8e6386c8b6fc774f53a2ba7ff24fc86a
+SHA512 (acpitests-unix-20210331.tar.gz) = 2b82c32a38d444eb53221da235a7cd0d886b2fbd122713b4c6bada2d2f2a49fddd1d0decc8fe5fd0332faed8ef8aab74f5ccb386436502aca4e71d25779f85af

From 691cca69d9984716e26d928ea2891edc81936505 Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Sat, 10 Jul 2021 16:47:50 -0600
Subject: [PATCH 47/82] Upload 20210604 source files

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 .gitignore | 2 ++
 sources    | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 260e8c7..c2bda52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -145,3 +145,5 @@ series
 /acpitests-unix-20210105.tar.gz
 /acpica-unix2-20210331.tar.gz
 /acpitests-unix-20210331.tar.gz
+/acpica-unix2-20210604.tar_0.gz
+/acpitests-unix-20210604.tar.gz
diff --git a/sources b/sources
index ec304de..d19a27f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (acpica-unix2-20210331.tar.gz) = acebf149870093c11e5bf87f234a334651f51826d78e82882373aff2a01f8dd6b26da23eecfbb4c6b31e7607aa8e533e8e6386c8b6fc774f53a2ba7ff24fc86a
-SHA512 (acpitests-unix-20210331.tar.gz) = 2b82c32a38d444eb53221da235a7cd0d886b2fbd122713b4c6bada2d2f2a49fddd1d0decc8fe5fd0332faed8ef8aab74f5ccb386436502aca4e71d25779f85af
+SHA512 (acpica-unix2-20210604.tar_0.gz) = f7f6e3c1964ffae186fe3d34b64a6251dd2e4423244c08c7e4301fd38396eac1af6e562956984a37af803ac11d5a46dd2dce88540787df353fc268002710dc62
+SHA512 (acpitests-unix-20210604.tar.gz) = 71c1a1e485b36ece5b58c2efd14d328e451acd3721755548c7ef0d6c1a20aa6925be9f892331853e699761ec3b4ffed4d17fce7a303f5f3abece31b52b5625e2

From 1f5bfe9b39ef34c4bf7f3e0d891ea8cd7968eeea Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Sat, 10 Jul 2021 16:59:58 -0600
Subject: [PATCH 48/82] Rename acpica-unix2-20210604.tar_0.gz to a proper name

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 .gitignore        |  1 +
 acpica-tools.spec | 10 ++++++++--
 sources           |  3 +--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index c2bda52..5942001 100644
--- a/.gitignore
+++ b/.gitignore
@@ -147,3 +147,4 @@ series
 /acpitests-unix-20210331.tar.gz
 /acpica-unix2-20210604.tar_0.gz
 /acpitests-unix-20210604.tar.gz
+/acpica-unix2-20210604.tar.gz
diff --git a/acpica-tools.spec b/acpica-tools.spec
index 312f052..9480424 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -1,6 +1,6 @@
 Name:           acpica-tools
-Version:        20200925
-Release:        2%{?dist}
+Version:        20210604
+Release:        1%{?dist}
 Summary:        ACPICA tools for the development and debug of ACPI tables
 
 License:        GPLv2
@@ -253,6 +253,12 @@ fi
 
 
 %changelog
+* Sat Jul 7 2021 Al Stone <ahs3@redhat.com> - 20210604-1
+- Update to 20210604 source tree (please note that tarballs for versions
+  between 20200925 and 20210604 have been uploaded for archival reasons
+  but no packaged version of these has been commited to the Fedora project)
+- Bring the big-endian patches up-to-date.
+
 * Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20200925-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/sources b/sources
index d19a27f..74f0625 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (acpica-unix2-20210604.tar_0.gz) = f7f6e3c1964ffae186fe3d34b64a6251dd2e4423244c08c7e4301fd38396eac1af6e562956984a37af803ac11d5a46dd2dce88540787df353fc268002710dc62
-SHA512 (acpitests-unix-20210604.tar.gz) = 71c1a1e485b36ece5b58c2efd14d328e451acd3721755548c7ef0d6c1a20aa6925be9f892331853e699761ec3b4ffed4d17fce7a303f5f3abece31b52b5625e2
+SHA512 (acpica-unix2-20210604.tar.gz) = f7f6e3c1964ffae186fe3d34b64a6251dd2e4423244c08c7e4301fd38396eac1af6e562956984a37af803ac11d5a46dd2dce88540787df353fc268002710dc62

From 416465f9d4e043c9a3302ad860ac8177a21115fc Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Sun, 11 Jul 2021 21:22:10 -0600
Subject: [PATCH 49/82] Update to 20210604 upstream source

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 ...nfrastructure-for-big-endian-support.patch |  374 ++-
 ...lity-functions-to-be-endian-agnostic.patch |   72 +-
 ...able-header-content-in-human-readabl.patch |   28 +-
 ...able-support-for-big-endian-machines.patch |   22 +-
 ...n-ness-problem-when-converting-ASL-t.patch |   18 +-
 ...e-ACPI_COPY_NAMSEG-in-GPE-name-check.patch |   32 +
 ...ing-Unicode-properly-when-big-endian.patch |   53 +
 ...-MADT-aka-APIC-in-a-big-endian-world.patch |   16 +-
 ...ort-ASF-tables-in-a-big-endian-world.patch |   12 +-
 ...rt-CPEP-tables-in-a-big-endian-world.patch |   16 +-
 ...ort-DBG2-table-in-a-big-endian-world.patch |  116 +-
 ...2-Support-DMAR-in-a-big-endian-world.patch |   62 +-
 ...3-Support-DRTM-in-a-big-endian-world.patch |   44 +-
 ...4-Support-EINJ-in-a-big-endian-world.patch |   16 +-
 ...5-Support-ERST-in-a-big-endian-world.patch |   16 +-
 ...-FADT-aka-FACP-in-a-big-endian-world.patch |   60 +-
 ...ort-most-FPDTs-in-a-big-endian-world.patch |   32 +-
 ...8-Support-GTDT-in-a-big-endian-world.patch |   44 +-
 ...9-Support-HEST-in-a-big-endian-world.patch |   32 +-
 ...t-RSDT-RSD-PTR-in-a-big-endian-world.patch |   18 +-
 ...1-Support-XSDT-in-a-big-endian-world.patch |   18 +-
 ...2-Support-SRAT-in-a-big-endian-world.patch |   12 +-
 ...3-Support-SLIT-in-a-big-endian-world.patch |   26 +-
 ...4-Support-MSCT-in-a-big-endian-world.patch |   16 +-
 0024-Support-SDEV-in-a-big-endian-world.patch |  256 --
 ...5-Support-MPST-in-a-big-endian-world.patch |   60 +-
 ...6-Support-NFIT-in-a-big-endian-world.patch |   84 +-
 0027-Support-SDEV-in-a-big-endian-world.patch |  206 ++
 ...8-Support-HMAT-in-a-big-endian-world.patch |  102 +-
 ...9-Support-PDTT-in-a-big-endian-world.patch |   16 +-
 ...0-Support-PPTT-in-a-big-endian-world.patch |   49 +-
 ...1-Support-PCCT-in-a-big-endian-world.patch |   18 +-
 ...-SLIC-and-MSDM-in-a-big-endian-world.patch |   27 -
 ...2-Support-WDAT-in-a-big-endian-world.patch |   16 +-
 ...3-Support-TCPA-in-a-big-endian-world.patch |   30 +-
 ...4-Support-STAO-in-a-big-endian-world.patch |   12 +-
 0035-Support-PMTT-in-a-big-endian-world.patch |  216 --
 ...-SLIC-and-MSDM-in-a-big-endian-world.patch |   33 +
 ...6-Support-MCFG-in-a-big-endian-world.patch |   16 +-
 0037-Support-IVRS-in-a-big-endian-world.patch |   96 -
 ...7-Support-LPIT-in-a-big-endian-world.patch |   18 +-
 0038-Support-PMTT-in-a-big-endian-world.patch |   85 +
 ...l-big-endian-support-for-WPBT-tables.patch |   61 -
 ...9-Support-TPM2-in-a-big-endian-world.patch |   42 +-
 ...0-Support-S3PT-in-a-big-endian-world.patch |   36 +-
 ...1-Support-IORT-in-a-big-endian-world.patch |  213 +-
 0041-Support-MTMR-in-a-big-endian-world.patch |   43 -
 0042-Support-IVRS-in-a-big-endian-world.patch |  138 +
 0042-Support-VRTC-in-a-big-endian-world.patch |   42 -
 ...port-DSDT-SSDT-in-a-big-endian-world.patch | 2719 +++++++++--------
 ...rt-for-WPBT-in-big-endian-needs-more.patch |   23 +
 ...T-fixed-use-of-optional-ResourceInfo.patch |  213 ++
 ...-of-endianness-issues-previously-uns.patch |   86 -
 acpica-tools.spec                             |   87 +-
 arm7hl.patch                                  |   10 +-
 badcode.asl.result                            |    2 +-
 converterSample.asl.result                    |    2 +-
 grammar.asl.result                            |    2 +-
 str-trunc-warn.patch                          |    4 +-
 ull-32bit.patch                               |   13 +-
 60 files changed, 3265 insertions(+), 2966 deletions(-)
 rename 0044-Correct-an-endian-ness-problem-when-converting-ASL-t.patch => 0005-Correct-an-endian-ness-problem-when-converting-ASL-t.patch (71%)
 create mode 100644 0006-Use-more-reliable-ACPI_COPY_NAMSEG-in-GPE-name-check.patch
 create mode 100644 0007-Handle-dumping-Unicode-properly-when-big-endian.patch
 rename 0005-Support-MADT-aka-APIC-in-a-big-endian-world.patch => 0008-Support-MADT-aka-APIC-in-a-big-endian-world.patch (62%)
 rename 0006-Support-ASF-tables-in-a-big-endian-world.patch => 0009-Support-ASF-tables-in-a-big-endian-world.patch (83%)
 rename 0007-Support-CPEP-tables-in-a-big-endian-world.patch => 0010-Support-CPEP-tables-in-a-big-endian-world.patch (62%)
 rename 0008-Support-DBG2-table-in-a-big-endian-world.patch => 0011-Support-DBG2-table-in-a-big-endian-world.patch (69%)
 rename 0009-Support-DMAR-in-a-big-endian-world.patch => 0012-Support-DMAR-in-a-big-endian-world.patch (74%)
 rename 0010-Support-DRTM-in-a-big-endian-world.patch => 0013-Support-DRTM-in-a-big-endian-world.patch (73%)
 rename 0011-Support-EINJ-in-a-big-endian-world.patch => 0014-Support-EINJ-in-a-big-endian-world.patch (62%)
 rename 0012-Support-ERST-in-a-big-endian-world.patch => 0015-Support-ERST-in-a-big-endian-world.patch (62%)
 rename 0013-Support-FADT-aka-FACP-in-a-big-endian-world.patch => 0016-Support-FADT-aka-FACP-in-a-big-endian-world.patch (76%)
 rename 0014-Support-most-FPDTs-in-a-big-endian-world.patch => 0017-Support-most-FPDTs-in-a-big-endian-world.patch (71%)
 rename 0015-Support-GTDT-in-a-big-endian-world.patch => 0018-Support-GTDT-in-a-big-endian-world.patch (60%)
 rename 0016-Support-HEST-in-a-big-endian-world.patch => 0019-Support-HEST-in-a-big-endian-world.patch (69%)
 rename 0017-Support-RSDT-RSD-PTR-in-a-big-endian-world.patch => 0020-Support-RSDT-RSD-PTR-in-a-big-endian-world.patch (62%)
 rename 0018-Support-XSDT-in-a-big-endian-world.patch => 0021-Support-XSDT-in-a-big-endian-world.patch (64%)
 rename 0019-Support-SRAT-in-a-big-endian-world.patch => 0022-Support-SRAT-in-a-big-endian-world.patch (80%)
 rename 0020-Support-SLIT-in-a-big-endian-world.patch => 0023-Support-SLIT-in-a-big-endian-world.patch (68%)
 rename 0021-Support-MSCT-in-a-big-endian-world.patch => 0024-Support-MSCT-in-a-big-endian-world.patch (72%)
 delete mode 100644 0024-Support-SDEV-in-a-big-endian-world.patch
 rename 0022-Support-MPST-in-a-big-endian-world.patch => 0025-Support-MPST-in-a-big-endian-world.patch (73%)
 rename 0023-Support-NFIT-in-a-big-endian-world.patch => 0026-Support-NFIT-in-a-big-endian-world.patch (72%)
 create mode 100644 0027-Support-SDEV-in-a-big-endian-world.patch
 rename 0025-Support-HMAT-in-a-big-endian-world.patch => 0028-Support-HMAT-in-a-big-endian-world.patch (75%)
 rename 0026-Support-PDTT-in-a-big-endian-world.patch => 0029-Support-PDTT-in-a-big-endian-world.patch (73%)
 rename 0027-Support-PPTT-in-a-big-endian-world.patch => 0030-Support-PPTT-in-a-big-endian-world.patch (69%)
 rename 0028-Support-PCCT-in-a-big-endian-world.patch => 0031-Support-PCCT-in-a-big-endian-world.patch (75%)
 delete mode 100644 0032-Support-SLIC-and-MSDM-in-a-big-endian-world.patch
 rename 0029-Support-WDAT-in-a-big-endian-world.patch => 0032-Support-WDAT-in-a-big-endian-world.patch (72%)
 rename 0030-Support-TCPA-in-a-big-endian-world.patch => 0033-Support-TCPA-in-a-big-endian-world.patch (70%)
 rename 0031-Support-STAO-in-a-big-endian-world.patch => 0034-Support-STAO-in-a-big-endian-world.patch (74%)
 delete mode 100644 0035-Support-PMTT-in-a-big-endian-world.patch
 create mode 100644 0035-Support-SLIC-and-MSDM-in-a-big-endian-world.patch
 rename 0033-Support-MCFG-in-a-big-endian-world.patch => 0036-Support-MCFG-in-a-big-endian-world.patch (77%)
 delete mode 100644 0037-Support-IVRS-in-a-big-endian-world.patch
 rename 0034-Support-LPIT-in-a-big-endian-world.patch => 0037-Support-LPIT-in-a-big-endian-world.patch (72%)
 create mode 100644 0038-Support-PMTT-in-a-big-endian-world.patch
 delete mode 100644 0039-Add-partial-big-endian-support-for-WPBT-tables.patch
 rename 0038-Support-TPM2-in-a-big-endian-world.patch => 0039-Support-TPM2-in-a-big-endian-world.patch (74%)
 rename 0043-Support-S3PT-in-a-big-endian-world.patch => 0040-Support-S3PT-in-a-big-endian-world.patch (71%)
 rename 0036-Support-IORT-in-a-big-endian-world.patch => 0041-Support-IORT-in-a-big-endian-world.patch (61%)
 delete mode 100644 0041-Support-MTMR-in-a-big-endian-world.patch
 create mode 100644 0042-Support-IVRS-in-a-big-endian-world.patch
 delete mode 100644 0042-Support-VRTC-in-a-big-endian-world.patch
 rename 0040-Support-DSDT-SSDT-in-a-big-endian-world.patch => 0043-Support-DSDT-SSDT-in-a-big-endian-world.patch (71%)
 create mode 100644 0044-Initial-support-for-WPBT-in-big-endian-needs-more.patch
 create mode 100644 0045-CSRT-fixed-use-of-optional-ResourceInfo.patch
 delete mode 100644 0045-Correct-a-couple-of-endianness-issues-previously-uns.patch

diff --git a/0001-Add-in-basic-infrastructure-for-big-endian-support.patch b/0001-Add-in-basic-infrastructure-for-big-endian-support.patch
index abd9298..3a667ea 100644
--- a/0001-Add-in-basic-infrastructure-for-big-endian-support.patch
+++ b/0001-Add-in-basic-infrastructure-for-big-endian-support.patch
@@ -1,7 +1,7 @@
-From bb45113bc9aed952a499cd1c53988dc81f597582 Mon Sep 17 00:00:00 2001
+From 4594630ec2e6a33efce3047a86b08fa170b75848 Mon Sep 17 00:00:00 2001
 From: Al Stone <ahs3@redhat.com>
 Date: Thu, 15 Oct 2020 11:53:33 -0600
-Subject: [PATCH 01/40] Add in basic infrastructure for big-endian support
+Subject: [PATCH 01/45] Add in basic infrastructure for big-endian support
 
 This adds in some basic functions -- AcpiUtReadUint32(), for example,
 to read a UINT32 value in little-endian form and return it in host-native
@@ -10,7 +10,9 @@ host-native format as a little-endian value.
 
 But, to do that, I'm adding the functions in a new file: utendian.c.  So,
 the header files need fixing, and the makefiles need to be sure to compile
-the new code.
+the new code.  Further, UtIsBigEndianMachine() needed to be moved out of
+compiler/aslutils.c so it could be used in the new functions and avoid
+having to do some conditional compilation depending on endian-ness.
 
 However, this sets things up for the future, where endian-aware code can
 be added as the need is uncovered.  For now, these functions cover all of
@@ -24,16 +26,19 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  generate/unix/acpiexec/Makefile        |   1 +
  generate/unix/acpihelp/Makefile        |   1 +
  generate/unix/iasl/Makefile            |   1 +
- source/components/utilities/utendian.c | 205 +++++++++++++++++++++++++
- source/include/acutils.h               |  26 ++++
- source/include/platform/aclinux.h      |   5 +
- 9 files changed, 242 insertions(+)
+ source/compiler/aslcompiler.h          |   4 -
+ source/compiler/aslutils.c             |  27 ---
+ source/components/utilities/utendian.c | 236 +++++++++++++++++++++++++
+ source/include/acmacros.h              |  56 ------
+ source/include/acutils.h               |  32 ++++
+ source/include/platform/aclinux.h      |   1 +
+ 12 files changed, 275 insertions(+), 87 deletions(-)
  create mode 100644 source/components/utilities/utendian.c
 
-Index: acpica-unix2-20200925/generate/unix/acpibin/Makefile
+Index: acpica-unix2-20210604/generate/unix/acpibin/Makefile
 ===================================================================
---- acpica-unix2-20200925.orig/generate/unix/acpibin/Makefile
-+++ acpica-unix2-20200925/generate/unix/acpibin/Makefile
+--- acpica-unix2-20210604.orig/generate/unix/acpibin/Makefile
++++ acpica-unix2-20210604/generate/unix/acpibin/Makefile
 @@ -37,6 +37,7 @@ OBJECTS = \
  	$(OBJDIR)/utcache.o\
  	$(OBJDIR)/utdebug.o\
@@ -42,10 +47,10 @@ Index: acpica-unix2-20200925/generate/unix/acpibin/Makefile
  	$(OBJDIR)/utexcep.o\
  	$(OBJDIR)/utglobal.o\
  	$(OBJDIR)/utlock.o\
-Index: acpica-unix2-20200925/generate/unix/acpidump/Makefile
+Index: acpica-unix2-20210604/generate/unix/acpidump/Makefile
 ===================================================================
---- acpica-unix2-20200925.orig/generate/unix/acpidump/Makefile
-+++ acpica-unix2-20200925/generate/unix/acpidump/Makefile
+--- acpica-unix2-20210604.orig/generate/unix/acpidump/Makefile
++++ acpica-unix2-20210604/generate/unix/acpidump/Makefile
 @@ -36,6 +36,7 @@ OBJECTS = \
  	$(OBJDIR)/osunixdir.o\
  	$(OBJDIR)/osunixmap.o\
@@ -54,10 +59,10 @@ Index: acpica-unix2-20200925/generate/unix/acpidump/Makefile
  	$(OBJDIR)/tbprint.o\
  	$(OBJDIR)/tbxfroot.o\
  	$(OBJDIR)/utascii.o\
-Index: acpica-unix2-20200925/generate/unix/acpiexamples/Makefile
+Index: acpica-unix2-20210604/generate/unix/acpiexamples/Makefile
 ===================================================================
---- acpica-unix2-20200925.orig/generate/unix/acpiexamples/Makefile
-+++ acpica-unix2-20200925/generate/unix/acpiexamples/Makefile
+--- acpica-unix2-20210604.orig/generate/unix/acpiexamples/Makefile
++++ acpica-unix2-20210604/generate/unix/acpiexamples/Makefile
 @@ -139,6 +139,7 @@ OBJECTS = \
  	$(OBJDIR)/utdebug.o\
  	$(OBJDIR)/utdecode.o\
@@ -66,10 +71,10 @@ Index: acpica-unix2-20200925/generate/unix/acpiexamples/Makefile
  	$(OBJDIR)/uterror.o\
  	$(OBJDIR)/uteval.o\
  	$(OBJDIR)/utexcep.o\
-Index: acpica-unix2-20200925/generate/unix/acpiexec/Makefile
+Index: acpica-unix2-20210604/generate/unix/acpiexec/Makefile
 ===================================================================
---- acpica-unix2-20200925.orig/generate/unix/acpiexec/Makefile
-+++ acpica-unix2-20200925/generate/unix/acpiexec/Makefile
+--- acpica-unix2-20210604.orig/generate/unix/acpiexec/Makefile
++++ acpica-unix2-20210604/generate/unix/acpiexec/Makefile
 @@ -214,6 +214,7 @@ OBJECTS = \
  	$(OBJDIR)/utdebug.o\
  	$(OBJDIR)/utdecode.o\
@@ -78,11 +83,11 @@ Index: acpica-unix2-20200925/generate/unix/acpiexec/Makefile
  	$(OBJDIR)/uterror.o\
  	$(OBJDIR)/uteval.o\
  	$(OBJDIR)/utexcep.o\
-Index: acpica-unix2-20200925/generate/unix/acpihelp/Makefile
+Index: acpica-unix2-20210604/generate/unix/acpihelp/Makefile
 ===================================================================
---- acpica-unix2-20200925.orig/generate/unix/acpihelp/Makefile
-+++ acpica-unix2-20200925/generate/unix/acpihelp/Makefile
-@@ -43,6 +43,7 @@ OBJECTS = \
+--- acpica-unix2-20210604.orig/generate/unix/acpihelp/Makefile
++++ acpica-unix2-20210604/generate/unix/acpihelp/Makefile
+@@ -45,6 +45,7 @@ OBJECTS = \
  	$(OBJDIR)/getopt.o\
  	$(OBJDIR)/osunixxf.o\
  	$(OBJDIR)/utdebug.o\
@@ -90,10 +95,10 @@ Index: acpica-unix2-20200925/generate/unix/acpihelp/Makefile
  	$(OBJDIR)/utexcep.o\
  	$(OBJDIR)/utglobal.o\
  	$(OBJDIR)/uthex.o\
-Index: acpica-unix2-20200925/generate/unix/iasl/Makefile
+Index: acpica-unix2-20210604/generate/unix/iasl/Makefile
 ===================================================================
---- acpica-unix2-20200925.orig/generate/unix/iasl/Makefile
-+++ acpica-unix2-20200925/generate/unix/iasl/Makefile
+--- acpica-unix2-20210604.orig/generate/unix/iasl/Makefile
++++ acpica-unix2-20210604/generate/unix/iasl/Makefile
 @@ -225,6 +225,7 @@ OBJECTS = \
  	$(OBJDIR)/utdebug.o\
  	$(OBJDIR)/utdecode.o\
@@ -102,11 +107,64 @@ Index: acpica-unix2-20200925/generate/unix/iasl/Makefile
  	$(OBJDIR)/uterror.o\
  	$(OBJDIR)/utexcep.o\
  	$(OBJDIR)/utglobal.o\
-Index: acpica-unix2-20200925/source/components/utilities/utendian.c
+Index: acpica-unix2-20210604/source/compiler/aslcompiler.h
+===================================================================
+--- acpica-unix2-20210604.orig/source/compiler/aslcompiler.h
++++ acpica-unix2-20210604/source/compiler/aslcompiler.h
+@@ -1120,10 +1120,6 @@ BOOLEAN
+ UtIsIdInteger (
+     UINT8                   *Target);
+ 
+-UINT8
+-UtIsBigEndianMachine (
+-    void);
+-
+ BOOLEAN
+ UtQueryForOverwrite (
+     char                    *Pathname);
+Index: acpica-unix2-20210604/source/compiler/aslutils.c
+===================================================================
+--- acpica-unix2-20210604.orig/source/compiler/aslutils.c
++++ acpica-unix2-20210604/source/compiler/aslutils.c
+@@ -73,33 +73,6 @@ UtDisplayErrorSummary (
+ 
+ /*******************************************************************************
+  *
+- * FUNCTION:    UtIsBigEndianMachine
+- *
+- * PARAMETERS:  None
+- *
+- * RETURN:      TRUE if machine is big endian
+- *              FALSE if machine is little endian
+- *
+- * DESCRIPTION: Detect whether machine is little endian or big endian.
+- *
+- ******************************************************************************/
+-
+-UINT8
+-UtIsBigEndianMachine (
+-    void)
+-{
+-    union {
+-        UINT32              Integer;
+-        UINT8               Bytes[4];
+-    } Overlay =                 {0xFF000000};
+-
+-
+-    return (Overlay.Bytes[0]); /* Returns 0xFF (TRUE) for big endian */
+-}
+-
+-
+-/*******************************************************************************
+- *
+  * FUNCTION:    UtIsIdInteger
+  *
+  * PARAMETERS:  Pointer to an ACPI ID (HID, CID) string
+Index: acpica-unix2-20210604/source/components/utilities/utendian.c
 ===================================================================
 --- /dev/null
-+++ acpica-unix2-20200925/source/components/utilities/utendian.c
-@@ -0,0 +1,205 @@
++++ acpica-unix2-20210604/source/components/utilities/utendian.c
+@@ -0,0 +1,236 @@
 +/******************************************************************************
 + *
 + * Module Name: utendian -- byte swapping support for other-endianness
@@ -156,7 +214,6 @@ Index: acpica-unix2-20200925/source/components/utilities/utendian.c
 +#define _COMPONENT          ACPI_COMPILER
 +        ACPI_MODULE_NAME    ("utendian")
 +
-+
 +/*
 + * Endianness support functions.
 + *
@@ -167,12 +224,38 @@ Index: acpica-unix2-20200925/source/components/utilities/utendian.c
 + *
 + */
 +
++/*******************************************************************************
++ *
++ * FUNCTION:    UtIsBigEndianMachine
++ *
++ * PARAMETERS:  None
++ *
++ * RETURN:      TRUE if machine is big endian
++ *              FALSE if machine is little endian
++ *
++ * DESCRIPTION: Detect whether machine is little endian or big endian.
++ *
++ ******************************************************************************/
++
++UINT8
++UtIsBigEndianMachine (
++    void)
++{
++    union {
++        UINT32              Integer;
++        UINT8               Bytes[4];
++    } Overlay =                 {0xFF000000};
++
++
++    return (Overlay.Bytes[0]); /* Returns 0xFF (TRUE) for big endian */
++}
++
 +
 +/*******************************************************************************
 + *
 + * FUNCTION:    AcpiUtReadUint16
 + *
-+ * PARAMETERS:  Src		    - location containing the little-endian
++ * PARAMETERS:  Src         - location containing the little-endian
 + *                                    value
 + *
 + * RETURN:      UINT16 value in host-native form
@@ -182,27 +265,30 @@ Index: acpica-unix2-20200925/source/components/utilities/utendian.c
 + *
 + ******************************************************************************/
 +
-+#if defined(ACPI_BIG_ENDIAN)
-+UINT16 AcpiUtReadUint16 (void *SrcPtr)
++UINT16
++AcpiUtReadUint16 (
++    void                    *SrcPtr)
 +{
-+    UINT16 Result = 0;
-+    UINT8  *Dst = (UINT8 *)&Result;
-+    UINT8  *Src = (UINT8 *)SrcPtr;
++    UINT16                  Result = 0;
++    UINT8                   *Dst = (UINT8 *) &Result;
++    UINT8                   *Src = (UINT8 *) SrcPtr;
++
++    if (!UtIsBigEndianMachine())
++    {
++        return (*(UINT16 *) SrcPtr);
++    }
 +
 +    Dst[0] = Src[1];
 +    Dst[1] = Src[0];
 +
-+    return Result;
++    return (Result);
 +}
-+#else
-+UINT16 AcpiUtReadUint16 (void *SrcPtr) { return *(UINT16 *)SrcPtr; }
-+#endif
 +
 +/*******************************************************************************
 + *
 + * FUNCTION:    AcpiUtReadUint32
 + *
-+ * PARAMETERS:  Src		    - location containing the little-endian
++ * PARAMETERS:  Src         - location containing the little-endian
 + *                                    value
 + *
 + * RETURN:      UINT32 value in host-native form
@@ -212,29 +298,32 @@ Index: acpica-unix2-20200925/source/components/utilities/utendian.c
 + *
 + ******************************************************************************/
 +
-+#if defined(ACPI_BIG_ENDIAN)
-+UINT32 AcpiUtReadUint32 (void *SrcPtr)
++UINT32
++AcpiUtReadUint32 (
++    void                    *SrcPtr)
 +{
-+    UINT32 Result = 0;
-+    UINT8  *Dst = (UINT8 *)&Result;
-+    UINT8  *Src = (UINT8 *)SrcPtr;
++    UINT32                  Result = 0;
++    UINT8                   *Dst = (UINT8 *) &Result;
++    UINT8                   *Src = (UINT8 *) SrcPtr;
++
++    if (!UtIsBigEndianMachine())
++    {
++        return (*(UINT32 *) SrcPtr);
++    }
 +
 +    Dst[0] = Src[3];
 +    Dst[1] = Src[2];
 +    Dst[2] = Src[1];
 +    Dst[3] = Src[0];
 +
-+    return Result;
++    return (Result);
 +}
-+#else
-+UINT32 AcpiUtReadUint32 (void *SrcPtr) { return *(UINT32 *)SrcPtr; }
-+#endif
 +
 +/*******************************************************************************
 + *
 + * FUNCTION:    AcpiUtReadUint64
 + *
-+ * PARAMETERS:  Src		    - location containing the little-endian
++ * PARAMETERS:  Src         - location containing the little-endian
 + *                                    value
 + *
 + * RETURN:      UINT64 value in host-native form
@@ -244,12 +333,18 @@ Index: acpica-unix2-20200925/source/components/utilities/utendian.c
 + *
 + ******************************************************************************/
 +
-+#if defined(ACPI_BIG_ENDIAN)
-+UINT64 AcpiUtReadUint64 (void *SrcPtr)
++UINT64
++AcpiUtReadUint64 (
++    void                    *SrcPtr)
 +{
-+    UINT64 Result = 0;
-+    UINT8  *Dst = (UINT8 *)&Result;
-+    UINT8  *Src = (UINT8 *)SrcPtr;
++    UINT64                  Result = 0;
++    UINT8                   *Dst = (UINT8 *) &Result;
++    UINT8                   *Src = (UINT8 *) SrcPtr;
++
++    if (!UtIsBigEndianMachine())
++    {
++        return (*(UINT64 *) SrcPtr);
++    }
 +
 +    Dst[0] = Src[7];
 +    Dst[1] = Src[6];
@@ -260,69 +355,143 @@ Index: acpica-unix2-20200925/source/components/utilities/utendian.c
 +    Dst[6] = Src[1];
 +    Dst[7] = Src[0];
 +
-+    return Result;
++    return (Result);
 +}
-+#else
-+UINT64 AcpiUtReadUint64 (void *SrcPtr) { return *(UINT64 *)SrcPtr; }
-+#endif
 +
 +/*******************************************************************************
 + *
 + * FUNCTION:    AcpiUtWriteUint
 + *
-+ * PARAMETERS:  DstPtr		- where to place the retrieved value
-+ *	        DstLength	- space in bytes for this int type
-+ *	        SrcPtr		- where the little-endian value lives
-+ *	        SrcLength	- space in bytes for this int type
++ * PARAMETERS:  DstPtr      - where to place the retrieved value
++ *              DstLength   - space in bytes for this int type
++ *              SrcPtr      - where the little-endian value lives
++ *              SrcLength   - space in bytes for this int type
 + *
 + * RETURN:      None.
 + *
 + * DESCRIPTION: Write a host-native integer value of the given size, and
-+ * 	        store it in the location specified in little-endian form.
-+ * 	        Given the amount of integer type casting done, this general
-+ * 	        version seems the most useful (vs 32->32, 32->16, 16->32,
-+ * 	        ad infinitum)
++ *              store it in the location specified in little-endian form.
++ *              Given the amount of integer type casting done, this general
++ *              version seems the most useful (vs 32->32, 32->16, 16->32,
++ *              ad infinitum)
 + *
 + ******************************************************************************/
 +
-+#if defined(ACPI_BIG_ENDIAN)
-+void AcpiUtWriteUint (void *DstPtr, int DstLength,
-+	              const void *SrcPtr, const int SrcLength)
++void
++AcpiUtWriteUint (
++    void                    *DstPtr,
++    int                     DstLength,
++    const void              *SrcPtr,
++    const int               SrcLength)
 +{
-+    UINT8 *Dst = (UINT8 *)DstPtr;
-+    UINT8 *Src = (UINT8 *)SrcPtr;
-+    int Length;
-+    int ii;
++    UINT8                   *Dst = (UINT8 *) DstPtr;
++    UINT8                   *Src = (UINT8 *) SrcPtr;
++    int                      Length;
++    int                      ii;
++
++    if (!UtIsBigEndianMachine())
++    {
++        Length = SrcLength > DstLength ? DstLength : SrcLength;
++        memcpy (Dst, Src, Length);
++	return;
++    }
 +
 +    Length = SrcLength >= DstLength ? DstLength : SrcLength;
 +    for (ii = 0; ii < Length; ii++)
-+	    Dst[ii] = Src[SrcLength - ii - 1];
++        Dst[ii] = Src[SrcLength - ii - 1];
 +
 +}
-+#else
-+void AcpiUtWriteUint (void *DstPtr, int DstLength,
-+	              const void *SrcPtr, const int SrcLength)
-+{
-+    UINT8 *Dst = (UINT8 *)DstPtr;
-+    UINT8 *Src = (UINT8 *)SrcPtr;
-+    uint Length;
-+
-+    Length = SrcLength > DstLength ? DstLength : SrcLength;
-+    memcpy(Dst, Src, Length);
-+}
-+#endif
-+
-Index: acpica-unix2-20200925/source/include/acutils.h
+Index: acpica-unix2-20210604/source/include/acmacros.h
 ===================================================================
---- acpica-unix2-20200925.orig/source/include/acutils.h
-+++ acpica-unix2-20200925/source/include/acutils.h
-@@ -1161,4 +1161,30 @@ AcpiUtConvertStringToUuid (
-     UINT8                   *UuidBuffer);
+--- acpica-unix2-20210604.orig/source/include/acmacros.h
++++ acpica-unix2-20210604/source/include/acmacros.h
+@@ -76,61 +76,6 @@
+  * If the hardware supports the transfer of unaligned data, just do the store.
+  * Otherwise, we have to move one byte at a time.
+  */
+-#ifdef ACPI_BIG_ENDIAN
+-/*
+- * Macros for big-endian machines
+- */
+-
+-/* These macros reverse the bytes during the move, converting little-endian to big endian */
+-
+-                                                     /* Big Endian      <==        Little Endian */
+-                                                     /*  Hi...Lo                     Lo...Hi     */
+-/* 16-bit source, 16/32/64 destination */
+-
+-#define ACPI_MOVE_16_TO_16(d, s)        {((  UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[1];\
+-                                         ((  UINT8 *)(void *)(d))[1] = ((UINT8 *)(void *)(s))[0];}
+-
+-#define ACPI_MOVE_16_TO_32(d, s)        {(*(UINT32 *)(void *)(d))=0;\
+-                                           ((UINT8 *)(void *)(d))[2] = ((UINT8 *)(void *)(s))[1];\
+-                                           ((UINT8 *)(void *)(d))[3] = ((UINT8 *)(void *)(s))[0];}
+-
+-#define ACPI_MOVE_16_TO_64(d, s)        {(*(UINT64 *)(void *)(d))=0;\
+-                                           ((UINT8 *)(void *)(d))[6] = ((UINT8 *)(void *)(s))[1];\
+-                                           ((UINT8 *)(void *)(d))[7] = ((UINT8 *)(void *)(s))[0];}
+-
+-/* 32-bit source, 16/32/64 destination */
+-
+-#define ACPI_MOVE_32_TO_16(d, s)        ACPI_MOVE_16_TO_16(d, s)    /* Truncate to 16 */
+-
+-#define ACPI_MOVE_32_TO_32(d, s)        {((  UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[3];\
+-                                         ((  UINT8 *)(void *)(d))[1] = ((UINT8 *)(void *)(s))[2];\
+-                                         ((  UINT8 *)(void *)(d))[2] = ((UINT8 *)(void *)(s))[1];\
+-                                         ((  UINT8 *)(void *)(d))[3] = ((UINT8 *)(void *)(s))[0];}
+-
+-#define ACPI_MOVE_32_TO_64(d, s)        {(*(UINT64 *)(void *)(d))=0;\
+-                                           ((UINT8 *)(void *)(d))[4] = ((UINT8 *)(void *)(s))[3];\
+-                                           ((UINT8 *)(void *)(d))[5] = ((UINT8 *)(void *)(s))[2];\
+-                                           ((UINT8 *)(void *)(d))[6] = ((UINT8 *)(void *)(s))[1];\
+-                                           ((UINT8 *)(void *)(d))[7] = ((UINT8 *)(void *)(s))[0];}
+-
+-/* 64-bit source, 16/32/64 destination */
+-
+-#define ACPI_MOVE_64_TO_16(d, s)        ACPI_MOVE_16_TO_16(d, s)    /* Truncate to 16 */
+-
+-#define ACPI_MOVE_64_TO_32(d, s)        ACPI_MOVE_32_TO_32(d, s)    /* Truncate to 32 */
+-
+-#define ACPI_MOVE_64_TO_64(d, s)        {((  UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[7];\
+-                                         ((  UINT8 *)(void *)(d))[1] = ((UINT8 *)(void *)(s))[6];\
+-                                         ((  UINT8 *)(void *)(d))[2] = ((UINT8 *)(void *)(s))[5];\
+-                                         ((  UINT8 *)(void *)(d))[3] = ((UINT8 *)(void *)(s))[4];\
+-                                         ((  UINT8 *)(void *)(d))[4] = ((UINT8 *)(void *)(s))[3];\
+-                                         ((  UINT8 *)(void *)(d))[5] = ((UINT8 *)(void *)(s))[2];\
+-                                         ((  UINT8 *)(void *)(d))[6] = ((UINT8 *)(void *)(s))[1];\
+-                                         ((  UINT8 *)(void *)(d))[7] = ((UINT8 *)(void *)(s))[0];}
+-#else
+-/*
+- * Macros for little-endian machines
+- */
+ 
+ #ifndef ACPI_MISALIGNMENT_NOT_SUPPORTED
+ 
+@@ -193,7 +138,6 @@
+                                          ((  UINT8 *)(void *)(d))[6] = ((UINT8 *)(void *)(s))[6];\
+                                          ((  UINT8 *)(void *)(d))[7] = ((UINT8 *)(void *)(s))[7];}
+ #endif
+-#endif
+ 
+ 
+ /*
+Index: acpica-unix2-20210604/source/include/acutils.h
+===================================================================
+--- acpica-unix2-20210604.orig/source/include/acutils.h
++++ acpica-unix2-20210604/source/include/acutils.h
+@@ -1167,4 +1167,36 @@ AcpiUtConvertUuidToString (
+     char                    *OutString);
  #endif
  
++
 +/*
 + * utendian -- byte-swapping for big-endian support
 + */
++
++UINT8
++UtIsBigEndianMachine (
++    void);
++
 +#if defined(ACPI_ASL_COMPILER) || defined(ACPI_EXEC_APP) || \
 +    defined(ACPI_HELP_APP)     || defined(ACPI_DUMP_APP) || \
 +    defined(ACPI_EXAMPLE_APP)  || defined(ACPI_BIN_APP)
@@ -347,10 +516,10 @@ Index: acpica-unix2-20200925/source/include/acutils.h
 +#endif
 +
  #endif /* _ACUTILS_H */
-Index: acpica-unix2-20200925/source/include/platform/aclinux.h
+Index: acpica-unix2-20210604/source/include/platform/aclinux.h
 ===================================================================
---- acpica-unix2-20200925.orig/source/include/platform/aclinux.h
-+++ acpica-unix2-20200925/source/include/platform/aclinux.h
+--- acpica-unix2-20210604.orig/source/include/platform/aclinux.h
++++ acpica-unix2-20210604/source/include/platform/aclinux.h
 @@ -198,6 +198,7 @@
  
  #ifdef ACPI_USE_STANDARD_HEADERS
@@ -359,14 +528,3 @@ Index: acpica-unix2-20200925/source/include/platform/aclinux.h
  #endif
  
  /* Define/disable kernel-specific declarators */
-@@ -233,6 +234,10 @@
- #define __cdecl
- #endif
- 
-+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-+#define ACPI_BIG_ENDIAN
-+#endif
-+
- #endif /* __KERNEL__ */
- 
- #endif /* __ACLINUX_H__ */
diff --git a/0002-Modify-utility-functions-to-be-endian-agnostic.patch b/0002-Modify-utility-functions-to-be-endian-agnostic.patch
index 4b99375..2f3f51e 100644
--- a/0002-Modify-utility-functions-to-be-endian-agnostic.patch
+++ b/0002-Modify-utility-functions-to-be-endian-agnostic.patch
@@ -1,7 +1,7 @@
-From d0c879747147c24c47bae363359127d62cd0cae1 Mon Sep 17 00:00:00 2001
+From 51b0d06c0a6c4d4e19432ebf930299855c8fcf23 Mon Sep 17 00:00:00 2001
 From: Al Stone <ahs3@redhat.com>
 Date: Fri, 18 Sep 2020 15:14:30 -0600
-Subject: [PATCH 02/40] Modify utility functions to be endian-agnostic
+Subject: [PATCH 02/45] Modify utility functions to be endian-agnostic
 
 All of the modifications here use the big-endian code previously added
 (see utendian.c) to make themselves endian-agnostic; i.e., that the code
@@ -24,15 +24,15 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/components/tables/tbprint.c | 13 +++++++++----
  5 files changed, 26 insertions(+), 17 deletions(-)
 
-Index: acpica-unix2-20200925/source/common/acfileio.c
+Index: acpica-unix2-20210604/source/common/acfileio.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/common/acfileio.c
-+++ acpica-unix2-20200925/source/common/acfileio.c
+--- acpica-unix2-20210604.orig/source/common/acfileio.c
++++ acpica-unix2-20210604/source/common/acfileio.c
 @@ -280,6 +280,7 @@ AcGetOneTableFromFile (
      ACPI_TABLE_HEADER       *Table;
      INT32                   Count;
      long                    TableOffset;
-+    UINT32		    Length;
++    UINT32                  Length;
  
  
      *ReturnTable = NULL;
@@ -41,7 +41,7 @@ Index: acpica-unix2-20200925/source/common/acfileio.c
      /* Allocate a buffer for the entire table */
  
 -    Table = AcpiOsAllocate ((ACPI_SIZE) TableHeader.Length);
-+    Length = AcpiUtReadUint32(&TableHeader.Length);
++    Length = AcpiUtReadUint32 (&TableHeader.Length);
 +    Table = AcpiOsAllocate ((ACPI_SIZE) Length);
      if (!Table)
      {
@@ -75,16 +75,16 @@ Index: acpica-unix2-20200925/source/common/acfileio.c
      long                    OriginalOffset;
      UINT32                  FileSize;
      UINT32                  i;
-+    UINT32		    Length;
++    UINT32                  Length;
  
  
      ACPI_FUNCTION_TRACE (AcValidateTableHeader);
-@@ -464,11 +467,12 @@ AcValidateTableHeader (
+@@ -467,11 +470,12 @@ AcValidateTableHeader (
      /* Validate table length against bytes remaining in the file */
  
      FileSize = CmGetFileSize (File);
 -    if (TableHeader.Length > (UINT32) (FileSize - TableOffset))
-+    Length = AcpiUtReadUint32(&TableHeader.Length);
++    Length = AcpiUtReadUint32 (&TableHeader.Length);
 +    if (Length > (UINT32) (FileSize - TableOffset))
      {
          fprintf (stderr, "Table [%4.4s] is too long for file - "
@@ -94,29 +94,29 @@ Index: acpica-unix2-20200925/source/common/acfileio.c
              (UINT32) (FileSize - TableOffset));
          return (AE_BAD_HEADER);
      }
-Index: acpica-unix2-20200925/source/common/dmtable.c
+Index: acpica-unix2-20210604/source/common/dmtable.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/common/dmtable.c
-+++ acpica-unix2-20200925/source/common/dmtable.c
-@@ -534,7 +534,7 @@ AcpiDmDumpDataTable (
+--- acpica-unix2-20210604.orig/source/common/dmtable.c
++++ acpica-unix2-20210604/source/common/dmtable.c
+@@ -591,7 +591,7 @@ AcpiDmDumpDataTable (
          {
              /* Dump the raw table data */
  
 -            Length = Table->Length;
-+            Length = AcpiUtReadUint32(&Table->Length);
++            Length = AcpiUtReadUint32 (&Table->Length);
  
              AcpiOsPrintf ("\n/*\n%s: Length %d (0x%X)\n\n",
                  ACPI_RAW_TABLE_DATA_HEADER, Length, Length);
-@@ -551,7 +551,7 @@ AcpiDmDumpDataTable (
+@@ -608,7 +608,7 @@ AcpiDmDumpDataTable (
       */
      if (ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_FACS))
      {
 -        Length = Table->Length;
-+        Length = AcpiUtReadUint32(&Table->Length);
++        Length = AcpiUtReadUint32 (&Table->Length);
          Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoFacs);
          if (ACPI_FAILURE (Status))
          {
-@@ -571,7 +571,7 @@ AcpiDmDumpDataTable (
+@@ -628,7 +628,7 @@ AcpiDmDumpDataTable (
          /*
           * All other tables must use the common ACPI table header, dump it now
           */
@@ -125,45 +125,45 @@ Index: acpica-unix2-20200925/source/common/dmtable.c
          Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoHeader);
          if (ACPI_FAILURE (Status))
          {
-@@ -1179,7 +1179,7 @@ AcpiDmDumpTable (
+@@ -1262,7 +1262,7 @@ AcpiDmDumpTable (
  
              AcpiOsPrintf ("%2.2X", *Target);
              Temp8 = AcpiDmGenerateChecksum (Table,
 -                ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Length,
-+                AcpiUtReadUint32(&(ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Length)),
++                AcpiUtReadUint32 (&(ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Length)),
                  ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Checksum);
  
              if (Temp8 != ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Checksum)
-Index: acpica-unix2-20200925/source/compiler/dtfield.c
+Index: acpica-unix2-20210604/source/compiler/dtfield.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/compiler/dtfield.c
-+++ acpica-unix2-20200925/source/compiler/dtfield.c
+--- acpica-unix2-20210604.orig/source/compiler/dtfield.c
++++ acpica-unix2-20210604/source/compiler/dtfield.c
 @@ -361,7 +361,7 @@ DtCompileInteger (
          DtError (ASL_ERROR, ASL_MSG_INTEGER_SIZE, Field, AslGbl_MsgBuffer);
      }
  
 -    memcpy (Buffer, &Value, ByteLength);
-+    AcpiUtWriteUint(Buffer, ByteLength, &Value, sizeof(UINT64));
++    AcpiUtWriteUint (Buffer, ByteLength, &Value, sizeof (UINT64));
      return;
  }
  
-Index: acpica-unix2-20200925/source/compiler/dtsubtable.c
+Index: acpica-unix2-20210604/source/compiler/dtsubtable.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/compiler/dtsubtable.c
-+++ acpica-unix2-20200925/source/compiler/dtsubtable.c
+--- acpica-unix2-20210604.orig/source/compiler/dtsubtable.c
++++ acpica-unix2-20210604/source/compiler/dtsubtable.c
 @@ -378,6 +378,6 @@ DtSetSubtableLength (
          return;
      }
  
 -    memcpy (Subtable->LengthField, &Subtable->TotalLength,
 -        Subtable->SizeOfLengthField);
-+    AcpiUtWriteUint(Subtable->LengthField, Subtable->SizeOfLengthField,
-+		    &Subtable->TotalLength, sizeof(Subtable->TotalLength));
++    AcpiUtWriteUint (Subtable->LengthField, Subtable->SizeOfLengthField,
++                     &Subtable->TotalLength, sizeof (Subtable->TotalLength));
  }
-Index: acpica-unix2-20200925/source/components/tables/tbprint.c
+Index: acpica-unix2-20210604/source/components/tables/tbprint.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/components/tables/tbprint.c
-+++ acpica-unix2-20200925/source/components/tables/tbprint.c
+--- acpica-unix2-20210604.orig/source/components/tables/tbprint.c
++++ acpica-unix2-20210604/source/components/tables/tbprint.c
 @@ -44,6 +44,8 @@
  #include "acpi.h"
  #include "accommon.h"
@@ -178,7 +178,7 @@ Index: acpica-unix2-20200925/source/components/tables/tbprint.c
          ACPI_INFO (("%-4.4s 0x%8.8X%8.8X %06X",
              Header->Signature, ACPI_FORMAT_UINT64 (Address),
 -            Header->Length));
-+            AcpiUtReadUint32(&Header->Length)));
++            AcpiUtReadUint32 (&Header->Length)));
      }
      else if (ACPI_VALIDATE_RSDP_SIG (Header->Signature))
      {
@@ -189,12 +189,12 @@ Index: acpica-unix2-20200925/source/components/tables/tbprint.c
 -            LocalHeader.Length, LocalHeader.Revision, LocalHeader.OemId,
 -            LocalHeader.OemTableId, LocalHeader.OemRevision,
 -            LocalHeader.AslCompilerId, LocalHeader.AslCompilerRevision));
-+            AcpiUtReadUint32(&LocalHeader.Length),
++            AcpiUtReadUint32 (&LocalHeader.Length),
 +            LocalHeader.Revision, LocalHeader.OemId,
 +            LocalHeader.OemTableId,
-+            AcpiUtReadUint32(&LocalHeader.OemRevision),
++            AcpiUtReadUint32 (&LocalHeader.OemRevision),
 +            LocalHeader.AslCompilerId,
-+            AcpiUtReadUint32(&LocalHeader.AslCompilerRevision)));
++            AcpiUtReadUint32 (&LocalHeader.AslCompilerRevision)));
      }
  }
  
diff --git a/0003-Always-display-table-header-content-in-human-readabl.patch b/0003-Always-display-table-header-content-in-human-readabl.patch
index 4ba465b..6dddba1 100644
--- a/0003-Always-display-table-header-content-in-human-readabl.patch
+++ b/0003-Always-display-table-header-content-in-human-readabl.patch
@@ -1,7 +1,7 @@
-From 08862d9a4be8262c045549c287adf1e6c320cbec Mon Sep 17 00:00:00 2001
+From 62cc2f4ae212bd0fad83f643921ac216ebb9a986 Mon Sep 17 00:00:00 2001
 From: Al Stone <ahs3@redhat.com>
 Date: Fri, 18 Sep 2020 15:20:37 -0600
-Subject: [PATCH 03/40] Always display table header content in human-readable
+Subject: [PATCH 03/45] Always display table header content in human-readable
  form
 
 When comparing two binary data tables, little-endian values are read
@@ -10,13 +10,13 @@ form that makes sense to humans.
 
 Signed-off-by: Al Stone <ahs3@redhat.com>
 ---
- source/tools/acpibin/abcompare.c | 13 ++++++++++---
- 1 file changed, 10 insertions(+), 3 deletions(-)
+ source/tools/acpibin/abcompare.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
 
-Index: acpica-unix2-20200925/source/tools/acpibin/abcompare.c
+Index: acpica-unix2-20210604/source/tools/acpibin/abcompare.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/tools/acpibin/abcompare.c
-+++ acpica-unix2-20200925/source/tools/acpibin/abcompare.c
+--- acpica-unix2-20210604.orig/source/tools/acpibin/abcompare.c
++++ acpica-unix2-20210604/source/tools/acpibin/abcompare.c
 @@ -42,6 +42,7 @@
   */
  
@@ -25,27 +25,21 @@ Index: acpica-unix2-20200925/source/tools/acpibin/abcompare.c
  
  
  ACPI_TABLE_HEADER           Header1;
-@@ -179,14 +180,20 @@ AbPrintHeadersInfo (
+@@ -179,14 +180,14 @@ AbPrintHeadersInfo (
      /* Display header information for both headers */
  
      printf ("Signature          %8.4s : %4.4s\n",    Header->Signature, Header2->Signature);
 -    printf ("Length             %8.8X : %8.8X\n",    Header->Length, Header2->Length);
-+    printf ("Length             %8.8X : %8.8X\n",
-+                        AcpiUtReadUint32(&Header->Length),
-+                        AcpiUtReadUint32(&Header2->Length));
++    printf ("Length             %8.8X : %8.8X\n",    AcpiUtReadUint32 (&Header->Length), AcpiUtReadUint32 (&Header2->Length));
      printf ("Revision           %8.2X : %2.2X\n",    Header->Revision, Header2->Revision);
      printf ("Checksum           %8.2X : %2.2X\n",    Header->Checksum, Header2->Checksum);
      printf ("OEM ID             %8.6s : %.6s\n",     Header->OemId, Header2->OemId);
      printf ("OEM Table ID       %8.8s : %.8s\n",     Header->OemTableId, Header2->OemTableId);
 -    printf ("OEM Revision       %8.8X : %8.8X\n",    Header->OemRevision, Header2->OemRevision);
-+    printf ("OEM Revision       %8.8X : %8.8X\n",
-+                        AcpiUtReadUint32(&Header->OemRevision),
-+                        AcpiUtReadUint32(&Header2->OemRevision));
++    printf ("OEM Revision       %8.8X : %8.8X\n",    AcpiUtReadUint32 (&Header->OemRevision), AcpiUtReadUint32 (&Header2->OemRevision));
      printf ("ASL Compiler ID    %8.4s : %.4s\n",     Header->AslCompilerId, Header2->AslCompilerId);
 -    printf ("Compiler Revision  %8.8X : %8.8X\n",    Header->AslCompilerRevision, Header2->AslCompilerRevision);
-+    printf ("Compiler Revision  %8.8X : %8.8X\n",
-+                        AcpiUtReadUint32(&Header->AslCompilerRevision),
-+                        AcpiUtReadUint32(&Header2->AslCompilerRevision));
++    printf ("Compiler Revision  %8.8X : %8.8X\n",    AcpiUtReadUint32 (&Header->AslCompilerRevision), AcpiUtReadUint32 (&Header2->AslCompilerRevision));
      printf ("\n");
  }
  
diff --git a/0004-Re-enable-support-for-big-endian-machines.patch b/0004-Re-enable-support-for-big-endian-machines.patch
index c88eee8..1422b26 100644
--- a/0004-Re-enable-support-for-big-endian-machines.patch
+++ b/0004-Re-enable-support-for-big-endian-machines.patch
@@ -1,7 +1,7 @@
-From 16c399a7e2a2c7bd8fb8f38fed202f23c3a786a9 Mon Sep 17 00:00:00 2001
+From 16734feab4204d6930c1ede62e527920607daace Mon Sep 17 00:00:00 2001
 From: Al Stone <ahs3@redhat.com>
 Date: Wed, 16 Sep 2020 16:27:06 -0600
-Subject: [PATCH 04/40] Re-enable support for big-endian machines
+Subject: [PATCH 04/45] Re-enable support for big-endian machines
 
 First, disable the big-endian check and fail.  Then, make sure the
 namespace gets initialized properly (NB: needed even if we are only
@@ -13,10 +13,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/components/namespace/nsutils.c |  7 +++++--
  2 files changed, 5 insertions(+), 14 deletions(-)
 
-Index: acpica-unix2-20200925/source/compiler/aslmain.c
+Index: acpica-unix2-20210604/source/compiler/aslmain.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/compiler/aslmain.c
-+++ acpica-unix2-20200925/source/compiler/aslmain.c
+--- acpica-unix2-20210604.orig/source/compiler/aslmain.c
++++ acpica-unix2-20210604/source/compiler/aslmain.c
 @@ -101,18 +101,6 @@ main (
  
      signal (SIGINT, AslSignalHandler);
@@ -36,15 +36,15 @@ Index: acpica-unix2-20200925/source/compiler/aslmain.c
      AcpiOsInitialize ();
      ACPI_DEBUG_INITIALIZE (); /* For debug version only */
  
-Index: acpica-unix2-20200925/source/components/namespace/nsutils.c
+Index: acpica-unix2-20210604/source/components/namespace/nsutils.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/components/namespace/nsutils.c
-+++ acpica-unix2-20200925/source/components/namespace/nsutils.c
+--- acpica-unix2-20210604.orig/source/components/namespace/nsutils.c
++++ acpica-unix2-20210604/source/components/namespace/nsutils.c
 @@ -272,6 +272,7 @@ AcpiNsBuildInternalName (
      const char              *ExternalName = Info->NextExternalChar;
      char                    *Result = NULL;
      UINT32                  i;
-+    char		    TmpSeg[ACPI_NAMESEG_SIZE+1];
++    char                    TmpSeg[ACPI_NAMESEG_SIZE+1];
  
  
      ACPI_FUNCTION_TRACE (NsBuildInternalName);
@@ -52,7 +52,7 @@ Index: acpica-unix2-20200925/source/components/namespace/nsutils.c
  
      for (; NumSegments; NumSegments--)
      {
-+        memset(TmpSeg, 0, ACPI_NAMESEG_SIZE+1);
++        memset (TmpSeg, 0, ACPI_NAMESEG_SIZE+1);
          for (i = 0; i < ACPI_NAMESEG_SIZE; i++)
          {
              if (ACPI_IS_PATH_SEPARATOR (*ExternalName) ||
@@ -72,7 +72,7 @@ Index: acpica-unix2-20200925/source/components/namespace/nsutils.c
                  ExternalName++;
              }
          }
-+	AcpiUtWriteUint(Result, ACPI_NAMESEG_SIZE, TmpSeg, ACPI_NAMESEG_SIZE);
++    AcpiUtWriteUint (Result, ACPI_NAMESEG_SIZE, TmpSeg, ACPI_NAMESEG_SIZE);
  
          /* Now we must have a path separator, or the pathname is bad */
  
diff --git a/0044-Correct-an-endian-ness-problem-when-converting-ASL-t.patch b/0005-Correct-an-endian-ness-problem-when-converting-ASL-t.patch
similarity index 71%
rename from 0044-Correct-an-endian-ness-problem-when-converting-ASL-t.patch
rename to 0005-Correct-an-endian-ness-problem-when-converting-ASL-t.patch
index 5d7da5b..3074e05 100644
--- a/0044-Correct-an-endian-ness-problem-when-converting-ASL-t.patch
+++ b/0005-Correct-an-endian-ness-problem-when-converting-ASL-t.patch
@@ -1,22 +1,23 @@
-From 9dc82e99776b18fe19314695d7d83e79c7fea934 Mon Sep 17 00:00:00 2001
+From 055fee09d8f9244b6c437ad18b98edb81a87e8bc Mon Sep 17 00:00:00 2001
 From: Al Stone <ahs3@redhat.com>
 Date: Tue, 27 Oct 2020 17:50:52 -0600
-Subject: [PATCH] Correct an endian-ness problem when converting ASL to ASL+
+Subject: [PATCH 05/45] Correct an endian-ness problem when converting ASL to
+ ASL+
 
 Signed-off-by: Al Stone <ahs3@redhat.com>
 ---
  source/compiler/cvparser.c | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
-diff --git a/source/compiler/cvparser.c b/source/compiler/cvparser.c
-index 370b80361..7311e031a 100644
---- a/source/compiler/cvparser.c
-+++ b/source/compiler/cvparser.c
+Index: acpica-unix2-20210604/source/compiler/cvparser.c
+===================================================================
+--- acpica-unix2-20210604.orig/source/compiler/cvparser.c
++++ acpica-unix2-20210604/source/compiler/cvparser.c
 @@ -144,6 +144,7 @@ CvInitFileTree (
      char                    *ChildFilename = NULL;
      UINT8                   *AmlStart;
      UINT32                  AmlLength;
-+    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
++    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
  
  
      if (!AcpiGbl_CaptureComments)
@@ -38,6 +39,3 @@ index 370b80361..7311e031a 100644
      AcpiGbl_FileTreeRoot->Next = NULL;
      AcpiGbl_FileTreeRoot->Parent = NULL;
      AcpiGbl_FileTreeRoot->Filename = (char *)(AmlStart+2);
--- 
-2.26.2
-
diff --git a/0006-Use-more-reliable-ACPI_COPY_NAMSEG-in-GPE-name-check.patch b/0006-Use-more-reliable-ACPI_COPY_NAMSEG-in-GPE-name-check.patch
new file mode 100644
index 0000000..7b7ed81
--- /dev/null
+++ b/0006-Use-more-reliable-ACPI_COPY_NAMSEG-in-GPE-name-check.patch
@@ -0,0 +1,32 @@
+From 790c016107e98ded2d0ae579f84dd4cd3fa06587 Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Tue, 29 Jun 2021 17:48:31 -0600
+Subject: [PATCH 06/45] Use more reliable ACPI_COPY_NAMSEG in GPE name checks
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/compiler/aslanalyze.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: acpica-unix2-20210604/source/compiler/aslanalyze.c
+===================================================================
+--- acpica-unix2-20210604.orig/source/compiler/aslanalyze.c
++++ acpica-unix2-20210604/source/compiler/aslanalyze.c
+@@ -469,7 +469,7 @@ ApCheckForGpeNameConflict (
+ 
+     /* Need a null-terminated string version of NameSeg */
+ 
+-    ACPI_MOVE_32_TO_32 (Name, Op->Asl.NameSeg);
++    ACPI_COPY_NAMESEG (Name, Op->Asl.NameSeg);
+     Name[ACPI_NAMESEG_SIZE] = 0;
+ 
+     /*
+@@ -496,7 +496,7 @@ ApCheckForGpeNameConflict (
+      * We are now sure we have an _Lxx or _Exx.
+      * Create the target name that would cause collision (Flip E/L)
+      */
+-    ACPI_MOVE_32_TO_32 (Target, Name);
++    ACPI_COPY_NAMESEG (Target, Name);
+ 
+     /* Inject opposite letter ("L" versus "E") */
+ 
diff --git a/0007-Handle-dumping-Unicode-properly-when-big-endian.patch b/0007-Handle-dumping-Unicode-properly-when-big-endian.patch
new file mode 100644
index 0000000..ade4c9a
--- /dev/null
+++ b/0007-Handle-dumping-Unicode-properly-when-big-endian.patch
@@ -0,0 +1,53 @@
+From 9a4a32c597fcdfa8a3bc33230c40a18e39c3449d Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Thu, 1 Jul 2021 17:46:19 -0600
+Subject: [PATCH 07/45] Handle dumping Unicode properly when big-endian
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/common/dmtbdump.c | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+Index: acpica-unix2-20210604/source/common/dmtbdump.c
+===================================================================
+--- acpica-unix2-20210604.orig/source/common/dmtbdump.c
++++ acpica-unix2-20210604/source/common/dmtbdump.c
+@@ -146,6 +146,8 @@ AcpiDmDumpUnicode (
+     UINT8                   *Buffer;
+     UINT32                  Length;
+     UINT32                  i;
++    UINT16		    Tmp16;
++    UINT32                  start;
+ 
+ 
+     Buffer = ((UINT8 *) Table) + BufferOffset;
+@@ -155,7 +157,8 @@ AcpiDmDumpUnicode (
+ 
+     for (i = 0; i < Length; i += 2)
+     {
+-        if (!isprint (Buffer[i]))
++        Tmp16 = AcpiUtReadUint16 (&Buffer[i]);
++        if (!isprint (Tmp16))
+         {
+             goto DumpRawBuffer;
+         }
+@@ -163,7 +166,8 @@ AcpiDmDumpUnicode (
+ 
+     /* Ensure all high bytes are zero */
+ 
+-    for (i = 1; i < Length; i += 2)
++    start = UtIsBigEndianMachine() ? 0 : 1;
++    for (i = start; i < Length; i += 2)
+     {
+         if (Buffer[i])
+         {
+@@ -176,7 +180,8 @@ AcpiDmDumpUnicode (
+     AcpiOsPrintf ("\"");
+     for (i = 0; i < Length; i += 2)
+     {
+-        AcpiOsPrintf ("%c", Buffer[i]);
++        Tmp16 = AcpiUtReadUint16 (&Buffer[i]);
++        AcpiOsPrintf ("%c", Tmp16);
+     }
+ 
+     AcpiOsPrintf ("\"\n");
diff --git a/0005-Support-MADT-aka-APIC-in-a-big-endian-world.patch b/0008-Support-MADT-aka-APIC-in-a-big-endian-world.patch
similarity index 62%
rename from 0005-Support-MADT-aka-APIC-in-a-big-endian-world.patch
rename to 0008-Support-MADT-aka-APIC-in-a-big-endian-world.patch
index cc1392b..ad4214d 100644
--- a/0005-Support-MADT-aka-APIC-in-a-big-endian-world.patch
+++ b/0008-Support-MADT-aka-APIC-in-a-big-endian-world.patch
@@ -1,27 +1,27 @@
-From f11fb1c691174eb7d236d60ad48da19e56291fef Mon Sep 17 00:00:00 2001
+From 7b107ab7348d903108140f6033e90596b12325c4 Mon Sep 17 00:00:00 2001
 From: Al Stone <ahs3@redhat.com>
 Date: Thu, 15 Oct 2020 12:12:11 -0600
-Subject: [PATCH 05/40] Support MADT (aka APIC) in a big-endian world
+Subject: [PATCH 08/45] Support MADT (aka APIC) in a big-endian world
 
 Signed-off-by: Al Stone <ahs3@redhat.com>
 ---
  source/common/dmtbdump2.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-Index: acpica-unix2-20200925/source/common/dmtbdump2.c
+Index: acpica-unix2-20210604/source/common/dmtbdump2.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20200925/source/common/dmtbdump2.c
-@@ -607,7 +607,7 @@ AcpiDmDumpMadt (
+--- acpica-unix2-20210604.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20210604/source/common/dmtbdump2.c
+@@ -763,7 +763,7 @@ AcpiDmDumpMadt (
  {
      ACPI_STATUS             Status;
      ACPI_SUBTABLE_HEADER    *Subtable;
 -    UINT32                  Length = Table->Length;
-+    UINT32                  Length = AcpiUtReadUint32(&Table->Length);
++    UINT32                  Length = AcpiUtReadUint32 (&Table->Length);
      UINT32                  Offset = sizeof (ACPI_TABLE_MADT);
      ACPI_DMTABLE_INFO       *InfoTable;
  
-@@ -623,7 +623,7 @@ AcpiDmDumpMadt (
+@@ -779,7 +779,7 @@ AcpiDmDumpMadt (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Table, Offset);
diff --git a/0006-Support-ASF-tables-in-a-big-endian-world.patch b/0009-Support-ASF-tables-in-a-big-endian-world.patch
similarity index 83%
rename from 0006-Support-ASF-tables-in-a-big-endian-world.patch
rename to 0009-Support-ASF-tables-in-a-big-endian-world.patch
index 194e5ca..5e21344 100644
--- a/0006-Support-ASF-tables-in-a-big-endian-world.patch
+++ b/0009-Support-ASF-tables-in-a-big-endian-world.patch
@@ -1,7 +1,7 @@
-From 5ac8e9cca71eacd4f18dba2eb89e9b65a805f712 Mon Sep 17 00:00:00 2001
+From ce811b4c38b9a09533ee8bafa22813f6e43c023d Mon Sep 17 00:00:00 2001
 From: Al Stone <ahs3@redhat.com>
 Date: Fri, 18 Sep 2020 16:41:02 -0600
-Subject: [PATCH 06/40] Support ASF! tables in a big-endian world
+Subject: [PATCH 09/45] Support ASF! tables in a big-endian world
 
 Read the table length properly and it all works right for big-endian.
 
@@ -10,10 +10,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/common/dmtbdump1.c | 10 ++++++----
  1 file changed, 6 insertions(+), 4 deletions(-)
 
-Index: acpica-unix2-20200925/source/common/dmtbdump1.c
+Index: acpica-unix2-20210604/source/common/dmtbdump1.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/common/dmtbdump1.c
-+++ acpica-unix2-20200925/source/common/dmtbdump1.c
+--- acpica-unix2-20210604.orig/source/common/dmtbdump1.c
++++ acpica-unix2-20210604/source/common/dmtbdump1.c
 @@ -79,16 +79,18 @@ AcpiDmDumpAsf (
      UINT32                  DataOffset = 0;
      UINT32                  i;
@@ -25,7 +25,7 @@ Index: acpica-unix2-20200925/source/common/dmtbdump1.c
  
      Subtable = ACPI_ADD_PTR (ACPI_ASF_INFO, Table, Offset);
 -    while (Offset < Table->Length)
-+    TableLength = AcpiUtReadUint32(&Table->Length);
++    TableLength = AcpiUtReadUint32 (&Table->Length);
 +    while (Offset < TableLength)
      {
          /* Common subtable header */
diff --git a/0007-Support-CPEP-tables-in-a-big-endian-world.patch b/0010-Support-CPEP-tables-in-a-big-endian-world.patch
similarity index 62%
rename from 0007-Support-CPEP-tables-in-a-big-endian-world.patch
rename to 0010-Support-CPEP-tables-in-a-big-endian-world.patch
index f58cf61..aa677b7 100644
--- a/0007-Support-CPEP-tables-in-a-big-endian-world.patch
+++ b/0010-Support-CPEP-tables-in-a-big-endian-world.patch
@@ -1,27 +1,27 @@
-From d66af65b4cd0a2719e5a06b77f8eda5e892bfc63 Mon Sep 17 00:00:00 2001
+From 0c4be57a5e0e45b4197c2d9a0b26462d3b1a9b80 Mon Sep 17 00:00:00 2001
 From: Al Stone <ahs3@redhat.com>
 Date: Fri, 18 Sep 2020 16:54:13 -0600
-Subject: [PATCH 07/40] Support CPEP tables in a big-endian world
+Subject: [PATCH 10/45] Support CPEP tables in a big-endian world
 
 Signed-off-by: Al Stone <ahs3@redhat.com>
 ---
  source/common/dmtbdump1.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-Index: acpica-unix2-20200925/source/common/dmtbdump1.c
+Index: acpica-unix2-20210604/source/common/dmtbdump1.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/common/dmtbdump1.c
-+++ acpica-unix2-20200925/source/common/dmtbdump1.c
-@@ -243,7 +243,7 @@ AcpiDmDumpCpep (
+--- acpica-unix2-20210604.orig/source/common/dmtbdump1.c
++++ acpica-unix2-20210604/source/common/dmtbdump1.c
+@@ -319,7 +319,7 @@ AcpiDmDumpCpep (
  {
      ACPI_STATUS             Status;
      ACPI_CPEP_POLLING       *Subtable;
 -    UINT32                  Length = Table->Length;
-+    UINT32                  Length = AcpiUtReadUint32(&Table->Length);
++    UINT32                  Length = AcpiUtReadUint32 (&Table->Length);
      UINT32                  Offset = sizeof (ACPI_TABLE_CPEP);
  
  
-@@ -258,7 +258,7 @@ AcpiDmDumpCpep (
+@@ -334,7 +334,7 @@ AcpiDmDumpCpep (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_CPEP_POLLING, Table, Offset);
diff --git a/0008-Support-DBG2-table-in-a-big-endian-world.patch b/0011-Support-DBG2-table-in-a-big-endian-world.patch
similarity index 69%
rename from 0008-Support-DBG2-table-in-a-big-endian-world.patch
rename to 0011-Support-DBG2-table-in-a-big-endian-world.patch
index d0dac5e..cc613fc 100644
--- a/0008-Support-DBG2-table-in-a-big-endian-world.patch
+++ b/0011-Support-DBG2-table-in-a-big-endian-world.patch
@@ -1,28 +1,28 @@
-From 2d7396fe2b270b0bed6a6436f9e3d15cfbb9abfc Mon Sep 17 00:00:00 2001
+From 2cb0b87a15682da4f19f707fa3ffece504f94b5a Mon Sep 17 00:00:00 2001
 From: Al Stone <ahs3@redhat.com>
 Date: Sat, 19 Sep 2020 13:37:38 -0600
-Subject: [PATCH 08/40] Support DBG2 table in a big-endian world
+Subject: [PATCH 11/45] Support DBG2 table in a big-endian world
 
 Signed-off-by: Al Stone <ahs3@redhat.com>
 ---
- source/common/dmtbdump1.c  | 35 +++++++++++++++++--------------
+ source/common/dmtbdump1.c  | 37 ++++++++++++++++++--------------
  source/compiler/dttable1.c | 43 ++++++++++++++++++++++++--------------
- 2 files changed, 46 insertions(+), 32 deletions(-)
+ 2 files changed, 48 insertions(+), 32 deletions(-)
 
-Index: acpica-unix2-20200925/source/common/dmtbdump1.c
+Index: acpica-unix2-20210604/source/common/dmtbdump1.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/common/dmtbdump1.c
-+++ acpica-unix2-20200925/source/common/dmtbdump1.c
-@@ -298,7 +298,7 @@ AcpiDmDumpCsrt (
+--- acpica-unix2-20210604.orig/source/common/dmtbdump1.c
++++ acpica-unix2-20210604/source/common/dmtbdump1.c
+@@ -374,7 +374,7 @@ AcpiDmDumpCsrt (
      ACPI_CSRT_GROUP         *Subtable;
      ACPI_CSRT_SHARED_INFO   *SharedInfoTable;
      ACPI_CSRT_DESCRIPTOR    *SubSubtable;
 -    UINT32                  Length = Table->Length;
-+    UINT32                  Length = AcpiUtReadUint32(&Table->Length);
++    UINT32                  Length = AcpiUtReadUint32 (&Table->Length);
      UINT32                  Offset = sizeof (ACPI_TABLE_CSRT);
      UINT32                  SubOffset;
      UINT32                  SubSubOffset;
-@@ -310,7 +310,7 @@ AcpiDmDumpCsrt (
+@@ -386,7 +386,7 @@ AcpiDmDumpCsrt (
      /* Subtables (Resource Groups) */
  
      Subtable = ACPI_ADD_PTR (ACPI_CSRT_GROUP, Table, Offset);
@@ -31,7 +31,7 @@ Index: acpica-unix2-20200925/source/common/dmtbdump1.c
      {
          /* Resource group subtable */
  
-@@ -344,7 +344,7 @@ AcpiDmDumpCsrt (
+@@ -420,7 +420,7 @@ AcpiDmDumpCsrt (
              Offset + SubOffset);
  
          while ((SubOffset < Subtable->Length) &&
@@ -40,12 +40,12 @@ Index: acpica-unix2-20200925/source/common/dmtbdump1.c
          {
              AcpiOsPrintf ("\n");
              Status = AcpiDmDumpTable (Length, Offset + SubOffset, SubSubtable,
-@@ -405,12 +405,13 @@ AcpiDmDumpDbg2 (
+@@ -481,12 +481,13 @@ AcpiDmDumpDbg2 (
  {
      ACPI_STATUS             Status;
      ACPI_DBG2_DEVICE        *Subtable;
 -    UINT32                  Length = Table->Length;
-+    UINT32                  Length = AcpiUtReadUint32(&Table->Length);
++    UINT32                  Length = AcpiUtReadUint32 (&Table->Length);
      UINT32                  Offset = sizeof (ACPI_TABLE_DBG2);
      UINT32                  i;
      UINT32                  ArrayOffset;
@@ -55,7 +55,7 @@ Index: acpica-unix2-20200925/source/common/dmtbdump1.c
  
  
      /* Main table */
-@@ -424,11 +425,12 @@ AcpiDmDumpDbg2 (
+@@ -500,11 +501,12 @@ AcpiDmDumpDbg2 (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_DBG2_DEVICE, Table, Offset);
@@ -63,19 +63,19 @@ Index: acpica-unix2-20200925/source/common/dmtbdump1.c
 +    while (Offset < Length)
      {
          AcpiOsPrintf ("\n");
-+	SubtableLength = AcpiUtReadUint16(&Subtable->Length);
++        SubtableLength = AcpiUtReadUint16 (&Subtable->Length);
          Status = AcpiDmDumpTable (Length, Offset, Subtable,
 -            Subtable->Length, AcpiDmTableInfoDbg2Device);
 +            SubtableLength, AcpiDmTableInfoDbg2Device);
          if (ACPI_FAILURE (Status))
          {
              return;
-@@ -438,13 +440,13 @@ AcpiDmDumpDbg2 (
+@@ -514,13 +516,13 @@ AcpiDmDumpDbg2 (
  
          for (i = 0; i < Subtable->RegisterCount; i++)
          {
 -            ArrayOffset = Subtable->BaseAddressOffset +
-+            ArrayOffset = AcpiUtReadUint16(&Subtable->BaseAddressOffset) +
++            ArrayOffset = AcpiUtReadUint16 (&Subtable->BaseAddressOffset) +
                  (sizeof (ACPI_GENERIC_ADDRESS) * i);
              AbsoluteOffset = Offset + ArrayOffset;
              Array = (UINT8 *) Subtable + ArrayOffset;
@@ -86,12 +86,12 @@ Index: acpica-unix2-20200925/source/common/dmtbdump1.c
              if (ACPI_FAILURE (Status))
              {
                  return;
-@@ -455,13 +457,13 @@ AcpiDmDumpDbg2 (
+@@ -531,13 +533,13 @@ AcpiDmDumpDbg2 (
  
          for (i = 0; i < Subtable->RegisterCount; i++)
          {
 -            ArrayOffset = Subtable->AddressSizeOffset +
-+            ArrayOffset = AcpiUtReadUint16(&Subtable->AddressSizeOffset) +
++            ArrayOffset = AcpiUtReadUint16 (&Subtable->AddressSizeOffset) +
                  (sizeof (UINT32) * i);
              AbsoluteOffset = Offset + ArrayOffset;
              Array = (UINT8 *) Subtable + ArrayOffset;
@@ -102,12 +102,12 @@ Index: acpica-unix2-20200925/source/common/dmtbdump1.c
              if (ACPI_FAILURE (Status))
              {
                  return;
-@@ -471,12 +473,12 @@ AcpiDmDumpDbg2 (
+@@ -547,12 +549,12 @@ AcpiDmDumpDbg2 (
          /* Dump the Namestring (required) */
  
          AcpiOsPrintf ("\n");
 -        ArrayOffset = Subtable->NamepathOffset;
-+        ArrayOffset = AcpiUtReadUint16(&Subtable->NamepathOffset);
++        ArrayOffset = AcpiUtReadUint16 (&Subtable->NamepathOffset);
          AbsoluteOffset = Offset + ArrayOffset;
          Array = (UINT8 *) Subtable + ArrayOffset;
  
@@ -117,19 +117,21 @@ Index: acpica-unix2-20200925/source/common/dmtbdump1.c
          if (ACPI_FAILURE (Status))
          {
              return;
-@@ -486,8 +488,9 @@ AcpiDmDumpDbg2 (
+@@ -562,8 +564,11 @@ AcpiDmDumpDbg2 (
  
          if (Subtable->OemDataOffset)
          {
 -            Status = AcpiDmDumpTable (Length, Offset + Subtable->OemDataOffset,
 -                Table, Subtable->OemDataLength,
++            Array = (UINT8 *) Subtable + AcpiUtReadUint16 (&Subtable->OemDataOffset);
++
 +            Status = AcpiDmDumpTable (Length,
-+		Offset + AcpiUtReadUint16(&Subtable->OemDataOffset),
-+                Table, AcpiUtReadUint16(&Subtable->OemDataLength),
++                Offset + AcpiUtReadUint16 (&Subtable->OemDataOffset),
++                Array, AcpiUtReadUint16 (&Subtable->OemDataLength),
                  AcpiDmTableInfoDbg2OemData);
              if (ACPI_FAILURE (Status))
              {
-@@ -497,9 +500,9 @@ AcpiDmDumpDbg2 (
+@@ -573,9 +578,9 @@ AcpiDmDumpDbg2 (
  
          /* Point to next subtable */
  
@@ -141,11 +143,11 @@ Index: acpica-unix2-20200925/source/common/dmtbdump1.c
      }
  }
  
-Index: acpica-unix2-20200925/source/compiler/dttable1.c
+Index: acpica-unix2-20210604/source/compiler/dttable1.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/compiler/dttable1.c
-+++ acpica-unix2-20200925/source/compiler/dttable1.c
-@@ -281,6 +281,7 @@ DtCompileCsrt (
+--- acpica-unix2-20210604.orig/source/compiler/dttable1.c
++++ acpica-unix2-20210604/source/compiler/dttable1.c
+@@ -355,6 +355,7 @@ DtCompileCsrt (
      DT_FIELD                **PFieldList = (DT_FIELD **) List;
      UINT32                  DescriptorCount;
      UINT32                  GroupLength;
@@ -153,7 +155,7 @@ Index: acpica-unix2-20200925/source/compiler/dttable1.c
  
  
      /* Subtables (Resource Groups) */
-@@ -299,12 +300,13 @@ DtCompileCsrt (
+@@ -373,12 +374,13 @@ DtCompileCsrt (
  
          /* Compute the number of resource descriptors */
  
@@ -163,17 +165,17 @@ Index: acpica-unix2-20200925/source/compiler/dttable1.c
 -            (ACPI_CAST_PTR (ACPI_CSRT_GROUP,
 -                Subtable->Buffer))->SharedInfoLength -
 -            sizeof (ACPI_CSRT_GROUP);
-+	Tmp = AcpiUtReadUint32(&(ACPI_CAST_PTR (ACPI_CSRT_GROUP,
-+                		 Subtable->Buffer))->Length);
-+	GroupLength = Tmp;
-+	Tmp = AcpiUtReadUint32(&(ACPI_CAST_PTR (ACPI_CSRT_GROUP,
-+                		 Subtable->Buffer))->SharedInfoLength);
++        Tmp = AcpiUtReadUint32 (&(ACPI_CAST_PTR (ACPI_CSRT_GROUP,
++                                Subtable->Buffer))->Length);
++        GroupLength = Tmp;
++        Tmp = AcpiUtReadUint32 (&(ACPI_CAST_PTR (ACPI_CSRT_GROUP,
++                                Subtable->Buffer))->SharedInfoLength);
 +        GroupLength -= Tmp;
 +        GroupLength -= sizeof (ACPI_CSRT_GROUP);
  
          DescriptorCount = (GroupLength  /
              sizeof (ACPI_CSRT_DESCRIPTOR));
-@@ -392,6 +394,7 @@ DtCompileDbg2 (
+@@ -466,6 +468,7 @@ DtCompileDbg2 (
      ACPI_DBG2_DEVICE        *DeviceInfo;
      UINT16                  CurrentOffset;
      UINT32                  i;
@@ -181,7 +183,7 @@ Index: acpica-unix2-20200925/source/compiler/dttable1.c
  
  
      /* Main table */
-@@ -408,10 +411,12 @@ DtCompileDbg2 (
+@@ -482,10 +485,12 @@ DtCompileDbg2 (
      /* Main table fields */
  
      Dbg2Header = ACPI_CAST_PTR (ACPI_DBG2_HEADER, Subtable->Buffer);
@@ -189,66 +191,66 @@ Index: acpica-unix2-20200925/source/compiler/dttable1.c
 -        ACPI_ADD_PTR (UINT8, Dbg2Header, sizeof (ACPI_DBG2_HEADER)), Dbg2Header);
 +    Tmp = sizeof (ACPI_TABLE_HEADER) + ACPI_PTR_DIFF (
 +       ACPI_ADD_PTR (UINT8, Dbg2Header, sizeof (ACPI_DBG2_HEADER)), Dbg2Header);
-+    AcpiUtWriteUint(&Dbg2Header->InfoOffset, sizeof(UINT32),
-+		    &Tmp, sizeof(UINT32));
++    AcpiUtWriteUint (&Dbg2Header->InfoOffset, sizeof (UINT32),
++            &Tmp, sizeof (UINT32));
  
 -    SubtableCount = Dbg2Header->InfoCount;
 +    SubtableCount = Tmp;
      DtPushSubtable (Subtable);
  
      /* Process all Device Information subtables (Count = InfoCount) */
-@@ -438,7 +443,8 @@ DtCompileDbg2 (
+@@ -512,7 +517,8 @@ DtCompileDbg2 (
  
          /* BaseAddressRegister GAS array (Required, size is RegisterCount) */
  
 -        DeviceInfo->BaseAddressOffset = CurrentOffset;
-+        AcpiUtWriteUint(&DeviceInfo->BaseAddressOffset, sizeof(UINT16),
-+		       	&CurrentOffset, sizeof(UINT16));
++        AcpiUtWriteUint (&DeviceInfo->BaseAddressOffset, sizeof (UINT16),
++                &CurrentOffset, sizeof (UINT16));
          for (i = 0; *PFieldList && (i < DeviceInfo->RegisterCount); i++)
          {
              Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2Addr,
-@@ -454,7 +460,8 @@ DtCompileDbg2 (
+@@ -528,7 +534,8 @@ DtCompileDbg2 (
  
          /* AddressSize array (Required, size = RegisterCount) */
  
 -        DeviceInfo->AddressSizeOffset = CurrentOffset;
-+        AcpiUtWriteUint(&DeviceInfo->AddressSizeOffset, sizeof(UINT16),
-+		        &CurrentOffset, sizeof(UINT16));
++        AcpiUtWriteUint (&DeviceInfo->AddressSizeOffset, sizeof (UINT16),
++                &CurrentOffset, sizeof (UINT16));
          for (i = 0; *PFieldList && (i < DeviceInfo->RegisterCount); i++)
          {
              Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2Size,
-@@ -470,7 +477,8 @@ DtCompileDbg2 (
+@@ -544,7 +551,8 @@ DtCompileDbg2 (
  
          /* NamespaceString device identifier (Required, size = NamePathLength) */
  
 -        DeviceInfo->NamepathOffset = CurrentOffset;
-+        AcpiUtWriteUint(&DeviceInfo->NamepathOffset, sizeof(UINT16),
-+			&CurrentOffset, sizeof(UINT16));
++        AcpiUtWriteUint (&DeviceInfo->NamepathOffset, sizeof (UINT16),
++            &CurrentOffset, sizeof (UINT16));
          Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2Name,
              &Subtable);
          if (ACPI_FAILURE (Status))
-@@ -480,8 +488,9 @@ DtCompileDbg2 (
+@@ -554,8 +562,9 @@ DtCompileDbg2 (
  
          /* Update the device info header */
  
 -        DeviceInfo->NamepathLength = (UINT16) Subtable->Length;
 -        CurrentOffset += (UINT16) DeviceInfo->NamepathLength;
-+        AcpiUtWriteUint(&DeviceInfo->NamepathLength, sizeof(UINT16),
-+			&Subtable->Length, sizeof(UINT32));
-+        CurrentOffset += AcpiUtReadUint16(&DeviceInfo->NamepathLength);
++        AcpiUtWriteUint (&DeviceInfo->NamepathLength, sizeof (UINT16),
++            &Subtable->Length, sizeof (UINT32));
++        CurrentOffset += AcpiUtReadUint16 (&DeviceInfo->NamepathLength);
          DtInsertSubtable (ParentTable, Subtable);
  
          /* OemData - Variable-length data (Optional, size = OemDataLength) */
-@@ -508,8 +517,10 @@ DtCompileDbg2 (
+@@ -582,8 +591,10 @@ DtCompileDbg2 (
  
          if (Subtable && Subtable->Length)
          {
 -            DeviceInfo->OemDataOffset = CurrentOffset;
 -            DeviceInfo->OemDataLength = (UINT16) Subtable->Length;
-+            AcpiUtWriteUint(&DeviceInfo->OemDataOffset, sizeof(UINT16),
-+			    &CurrentOffset, sizeof(UINT16));
-+            AcpiUtWriteUint(&DeviceInfo->OemDataLength, sizeof(UINT16),
-+			    &Subtable->Length, sizeof(UINT32));
++            AcpiUtWriteUint (&DeviceInfo->OemDataOffset, sizeof (UINT16),
++                &CurrentOffset, sizeof (UINT16));
++            AcpiUtWriteUint (&DeviceInfo->OemDataLength, sizeof (UINT16),
++                &Subtable->Length, sizeof (UINT32));
  
              DtInsertSubtable (ParentTable, Subtable);
          }
diff --git a/0009-Support-DMAR-in-a-big-endian-world.patch b/0012-Support-DMAR-in-a-big-endian-world.patch
similarity index 74%
rename from 0009-Support-DMAR-in-a-big-endian-world.patch
rename to 0012-Support-DMAR-in-a-big-endian-world.patch
index d80d519..3a3f33b 100644
--- a/0009-Support-DMAR-in-a-big-endian-world.patch
+++ b/0012-Support-DMAR-in-a-big-endian-world.patch
@@ -1,7 +1,7 @@
-From 01aad41e59efd615ac075fcedbaab0c60f9e1e11 Mon Sep 17 00:00:00 2001
+From 06623392351dfea54bd69507b6672c933a5e3fd2 Mon Sep 17 00:00:00 2001
 From: Al Stone <ahs3@redhat.com>
 Date: Sat, 19 Sep 2020 15:22:00 -0600
-Subject: [PATCH 09/40] Support DMAR in a big-endian world
+Subject: [PATCH 12/45] Support DMAR in a big-endian world
 
 Signed-off-by: Al Stone <ahs3@redhat.com>
 ---
@@ -10,11 +10,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/compiler/dttable1.c | 12 +++++++-----
  3 files changed, 24 insertions(+), 18 deletions(-)
 
-Index: acpica-unix2-20200925/source/common/dmtable.c
+Index: acpica-unix2-20210604/source/common/dmtable.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/common/dmtable.c
-+++ acpica-unix2-20200925/source/common/dmtable.c
-@@ -1244,13 +1244,13 @@ AcpiDmDumpTable (
+--- acpica-unix2-20210604.orig/source/common/dmtable.c
++++ acpica-unix2-20210604/source/common/dmtable.c
+@@ -1341,13 +1341,13 @@ AcpiDmDumpTable (
  
              /* DMAR subtable types */
  
@@ -30,28 +30,28 @@ Index: acpica-unix2-20200925/source/common/dmtable.c
                  AcpiDmDmarSubnames[Temp16]);
              break;
  
-Index: acpica-unix2-20200925/source/common/dmtbdump1.c
+Index: acpica-unix2-20210604/source/common/dmtbdump1.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/common/dmtbdump1.c
-+++ acpica-unix2-20200925/source/common/dmtbdump1.c
-@@ -526,13 +526,15 @@ AcpiDmDumpDmar (
+--- acpica-unix2-20210604.orig/source/common/dmtbdump1.c
++++ acpica-unix2-20210604/source/common/dmtbdump1.c
+@@ -604,13 +604,15 @@ AcpiDmDumpDmar (
  {
      ACPI_STATUS             Status;
      ACPI_DMAR_HEADER        *Subtable;
 -    UINT32                  Length = Table->Length;
-+    UINT32                  Length = AcpiUtReadUint32(&Table->Length);
++    UINT32                  Length = AcpiUtReadUint32 (&Table->Length);
      UINT32                  Offset = sizeof (ACPI_TABLE_DMAR);
      ACPI_DMTABLE_INFO       *InfoTable;
      ACPI_DMAR_DEVICE_SCOPE  *ScopeTable;
      UINT32                  ScopeOffset;
      UINT8                   *PciPath;
      UINT32                  PathOffset;
-+    UINT16		    SubtableType;
-+    UINT16		    SubtableLength;
++    UINT16                  SubtableType;
++    UINT16                  SubtableLength;
  
  
      /* Main table */
-@@ -546,13 +548,14 @@ AcpiDmDumpDmar (
+@@ -624,13 +626,14 @@ AcpiDmDumpDmar (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_DMAR_HEADER, Table, Offset);
@@ -61,24 +61,24 @@ Index: acpica-unix2-20200925/source/common/dmtbdump1.c
          /* Common subtable header */
  
          AcpiOsPrintf ("\n");
-+	SubtableLength = AcpiUtReadUint16(&Subtable->Length);
++        SubtableLength = AcpiUtReadUint16 (&Subtable->Length);
          Status = AcpiDmDumpTable (Length, Offset, Subtable,
 -            Subtable->Length, AcpiDmTableInfoDmarHdr);
 +            SubtableLength, AcpiDmTableInfoDmarHdr);
          if (ACPI_FAILURE (Status))
          {
              return;
-@@ -560,7 +563,8 @@ AcpiDmDumpDmar (
+@@ -638,7 +641,8 @@ AcpiDmDumpDmar (
  
          AcpiOsPrintf ("\n");
  
 -        switch (Subtable->Type)
-+	SubtableType = AcpiUtReadUint16(&Subtable->Type);
++        SubtableType = AcpiUtReadUint16 (&Subtable->Type);
 +        switch (SubtableType)
          {
          case ACPI_DMAR_TYPE_HARDWARE_UNIT:
  
-@@ -595,12 +599,12 @@ AcpiDmDumpDmar (
+@@ -673,12 +677,12 @@ AcpiDmDumpDmar (
          default:
  
              AcpiOsPrintf ("\n**** Unknown DMAR subtable type 0x%X\n\n",
@@ -93,7 +93,7 @@ Index: acpica-unix2-20200925/source/common/dmtbdump1.c
          if (ACPI_FAILURE (Status))
          {
              return;
-@@ -609,8 +613,8 @@ AcpiDmDumpDmar (
+@@ -687,8 +691,8 @@ AcpiDmDumpDmar (
          /*
           * Dump the optional device scope entries
           */
@@ -104,7 +104,7 @@ Index: acpica-unix2-20200925/source/common/dmtbdump1.c
          {
              /* These types do not support device scopes */
  
-@@ -618,7 +622,7 @@ AcpiDmDumpDmar (
+@@ -696,7 +700,7 @@ AcpiDmDumpDmar (
          }
  
          ScopeTable = ACPI_ADD_PTR (ACPI_DMAR_DEVICE_SCOPE, Subtable, ScopeOffset);
@@ -113,7 +113,7 @@ Index: acpica-unix2-20200925/source/common/dmtbdump1.c
          {
              AcpiOsPrintf ("\n");
              Status = AcpiDmDumpTable (Length, Offset + ScopeOffset, ScopeTable,
-@@ -659,9 +663,9 @@ AcpiDmDumpDmar (
+@@ -737,9 +741,9 @@ AcpiDmDumpDmar (
  NextSubtable:
          /* Point to next subtable */
  
@@ -125,11 +125,11 @@ Index: acpica-unix2-20200925/source/common/dmtbdump1.c
      }
  }
  
-Index: acpica-unix2-20200925/source/compiler/dttable1.c
+Index: acpica-unix2-20210604/source/compiler/dttable1.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/compiler/dttable1.c
-+++ acpica-unix2-20200925/source/compiler/dttable1.c
-@@ -560,6 +560,7 @@ DtCompileDmar (
+--- acpica-unix2-20210604.orig/source/compiler/dttable1.c
++++ acpica-unix2-20210604/source/compiler/dttable1.c
+@@ -634,6 +634,7 @@ DtCompileDmar (
      ACPI_DMAR_DEVICE_SCOPE  *DmarDeviceScope;
      UINT32                  DeviceScopeLength;
      UINT32                  PciPathLength;
@@ -137,17 +137,17 @@ Index: acpica-unix2-20200925/source/compiler/dttable1.c
  
  
      Status = DtCompileTable (PFieldList, AcpiDmTableInfoDmar, &Subtable);
-@@ -590,7 +591,8 @@ DtCompileDmar (
+@@ -664,7 +665,8 @@ DtCompileDmar (
  
          DmarHeader = ACPI_CAST_PTR (ACPI_DMAR_HEADER, Subtable->Buffer);
  
 -        switch (DmarHeader->Type)
-+        DmarHeaderType = AcpiUtReadUint16(&DmarHeader->Type);
++        DmarHeaderType = AcpiUtReadUint16 (&DmarHeader->Type);
 +        switch (DmarHeaderType)
          {
          case ACPI_DMAR_TYPE_HARDWARE_UNIT:
  
-@@ -637,8 +639,8 @@ DtCompileDmar (
+@@ -711,8 +713,8 @@ DtCompileDmar (
          /*
           * Optional Device Scope subtables
           */
@@ -158,14 +158,14 @@ Index: acpica-unix2-20200925/source/compiler/dttable1.c
          {
              /* These types do not support device scopes */
  
-@@ -647,8 +649,8 @@ DtCompileDmar (
+@@ -721,8 +723,8 @@ DtCompileDmar (
          }
  
          DtPushSubtable (Subtable);
 -        DeviceScopeLength = DmarHeader->Length - Subtable->Length -
 -            ParentTable->Length;
-+        DeviceScopeLength = AcpiUtReadUint16(&DmarHeader->Length) - 
-+		Subtable->Length - ParentTable->Length;
++        DeviceScopeLength = AcpiUtReadUint16 (&DmarHeader->Length) -
++                Subtable->Length - ParentTable->Length;
          while (DeviceScopeLength)
          {
              Status = DtCompileTable (PFieldList, AcpiDmTableInfoDmarScope,
diff --git a/0010-Support-DRTM-in-a-big-endian-world.patch b/0013-Support-DRTM-in-a-big-endian-world.patch
similarity index 73%
rename from 0010-Support-DRTM-in-a-big-endian-world.patch
rename to 0013-Support-DRTM-in-a-big-endian-world.patch
index d4d94af..ac21497 100644
--- a/0010-Support-DRTM-in-a-big-endian-world.patch
+++ b/0013-Support-DRTM-in-a-big-endian-world.patch
@@ -1,7 +1,7 @@
-From 9583e760908d4b7d2dabec82137d16f2492d2773 Mon Sep 17 00:00:00 2001
+From bcdec27f562b0df37546b5e8ad2eab76348062eb Mon Sep 17 00:00:00 2001
 From: Al Stone <ahs3@redhat.com>
 Date: Sat, 19 Sep 2020 15:44:06 -0600
-Subject: [PATCH 10/40] Support DRTM in a big-endian world
+Subject: [PATCH 13/45] Support DRTM in a big-endian world
 
 Signed-off-by: Al Stone <ahs3@redhat.com>
 ---
@@ -9,17 +9,17 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/compiler/dttable1.c |  6 ++++--
  2 files changed, 19 insertions(+), 12 deletions(-)
 
-Index: acpica-unix2-20200925/source/common/dmtbdump1.c
+Index: acpica-unix2-20210604/source/common/dmtbdump1.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/common/dmtbdump1.c
-+++ acpica-unix2-20200925/source/common/dmtbdump1.c
-@@ -692,11 +692,14 @@ AcpiDmDumpDrtm (
+--- acpica-unix2-20210604.orig/source/common/dmtbdump1.c
++++ acpica-unix2-20210604/source/common/dmtbdump1.c
+@@ -770,11 +770,14 @@ AcpiDmDumpDrtm (
      ACPI_DRTM_RESOURCE_LIST *DrtmRl;
      ACPI_DRTM_DPS_ID        *DrtmDps;
      UINT32                  Count;
 +    UINT32                  ResourceCount;
 +    UINT32                  ValidatedTableCount;
-+    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
++    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
  
  
      /* Main table */
@@ -29,7 +29,7 @@ Index: acpica-unix2-20200925/source/common/dmtbdump1.c
          AcpiDmTableInfoDrtm);
      if (ACPI_FAILURE (Status))
      {
-@@ -711,7 +714,7 @@ AcpiDmDumpDrtm (
+@@ -789,7 +792,7 @@ AcpiDmDumpDrtm (
  
      DrtmVtl = ACPI_ADD_PTR (ACPI_DRTM_VTABLE_LIST, Table, Offset);
      AcpiOsPrintf ("\n");
@@ -38,13 +38,13 @@ Index: acpica-unix2-20200925/source/common/dmtbdump1.c
          DrtmVtl, ACPI_OFFSET (ACPI_DRTM_VTABLE_LIST, ValidatedTables),
          AcpiDmTableInfoDrtm0);
      if (ACPI_FAILURE (Status))
-@@ -724,10 +727,11 @@ AcpiDmDumpDrtm (
+@@ -802,10 +805,11 @@ AcpiDmDumpDrtm (
      /* Dump Validated table addresses */
  
      Count = 0;
 -    while ((Offset < Table->Length) &&
 -            (DrtmVtl->ValidatedTableCount > Count))
-+    ValidatedTableCount = AcpiUtReadUint32(&DrtmVtl->ValidatedTableCount);
++    ValidatedTableCount = AcpiUtReadUint32 (&DrtmVtl->ValidatedTableCount);
 +    while ((Offset < TableLength) &&
 +            (ValidatedTableCount > Count))
      {
@@ -53,7 +53,7 @@ Index: acpica-unix2-20200925/source/common/dmtbdump1.c
              ACPI_ADD_PTR (void, Table, Offset), sizeof (UINT64),
              AcpiDmTableInfoDrtm0a);
          if (ACPI_FAILURE (Status))
-@@ -743,7 +747,7 @@ AcpiDmDumpDrtm (
+@@ -821,7 +825,7 @@ AcpiDmDumpDrtm (
  
      DrtmRl = ACPI_ADD_PTR (ACPI_DRTM_RESOURCE_LIST, Table, Offset);
      AcpiOsPrintf ("\n");
@@ -62,13 +62,13 @@ Index: acpica-unix2-20200925/source/common/dmtbdump1.c
          DrtmRl, ACPI_OFFSET (ACPI_DRTM_RESOURCE_LIST, Resources),
          AcpiDmTableInfoDrtm1);
      if (ACPI_FAILURE (Status))
-@@ -756,10 +760,11 @@ AcpiDmDumpDrtm (
+@@ -834,10 +838,11 @@ AcpiDmDumpDrtm (
      /* Dump the Resource List */
  
      Count = 0;
 -    while ((Offset < Table->Length) &&
 -           (DrtmRl->ResourceCount > Count))
-+    ResourceCount = AcpiUtReadUint32(&DrtmRl->ResourceCount);
++    ResourceCount = AcpiUtReadUint32 (&DrtmRl->ResourceCount);
 +    while ((Offset < TableLength) &&
 +           (ResourceCount > Count))
      {
@@ -77,7 +77,7 @@ Index: acpica-unix2-20200925/source/common/dmtbdump1.c
              ACPI_ADD_PTR (void, Table, Offset),
              sizeof (ACPI_DRTM_RESOURCE), AcpiDmTableInfoDrtm1a);
          if (ACPI_FAILURE (Status))
-@@ -775,7 +780,7 @@ AcpiDmDumpDrtm (
+@@ -853,7 +858,7 @@ AcpiDmDumpDrtm (
  
      DrtmDps = ACPI_ADD_PTR (ACPI_DRTM_DPS_ID, Table, Offset);
      AcpiOsPrintf ("\n");
@@ -86,27 +86,27 @@ Index: acpica-unix2-20200925/source/common/dmtbdump1.c
          DrtmDps, sizeof (ACPI_DRTM_DPS_ID), AcpiDmTableInfoDrtm2);
  }
  
-Index: acpica-unix2-20200925/source/compiler/dttable1.c
+Index: acpica-unix2-20210604/source/compiler/dttable1.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/compiler/dttable1.c
-+++ acpica-unix2-20200925/source/compiler/dttable1.c
-@@ -775,7 +775,8 @@ DtCompileDrtm (
+--- acpica-unix2-20210604.orig/source/compiler/dttable1.c
++++ acpica-unix2-20210604/source/compiler/dttable1.c
+@@ -849,7 +849,8 @@ DtCompileDrtm (
          Count++;
      }
  
 -    DrtmVtl->ValidatedTableCount = Count;
-+    AcpiUtWriteUint(&DrtmVtl->ValidatedTableCount, sizeof(UINT32),
-+		    &Count, sizeof(UINT32));
++    AcpiUtWriteUint (&DrtmVtl->ValidatedTableCount, sizeof (UINT32),
++            &Count, sizeof (UINT32));
      DtPopSubtable ();
      ParentTable = DtPeekSubtable ();
  
-@@ -813,7 +814,8 @@ DtCompileDrtm (
+@@ -887,7 +888,8 @@ DtCompileDrtm (
          Count++;
      }
  
 -    DrtmRl->ResourceCount = Count;
 +    AcpiUtWriteUint(&DrtmRl->ResourceCount, sizeof(UINT32),
-+		    &Count, sizeof(UINT32));
++            &Count, sizeof(UINT32));
      DtPopSubtable ();
      ParentTable = DtPeekSubtable ();
  
diff --git a/0011-Support-EINJ-in-a-big-endian-world.patch b/0014-Support-EINJ-in-a-big-endian-world.patch
similarity index 62%
rename from 0011-Support-EINJ-in-a-big-endian-world.patch
rename to 0014-Support-EINJ-in-a-big-endian-world.patch
index acb64f1..b28a42e 100644
--- a/0011-Support-EINJ-in-a-big-endian-world.patch
+++ b/0014-Support-EINJ-in-a-big-endian-world.patch
@@ -1,27 +1,27 @@
-From b264cb9a07faa05e6d8e5e6c2381270c218d88c4 Mon Sep 17 00:00:00 2001
+From 70d1047abe010c80c2dd74f6afdc7005b91e6163 Mon Sep 17 00:00:00 2001
 From: Al Stone <ahs3@redhat.com>
 Date: Sat, 19 Sep 2020 15:50:19 -0600
-Subject: [PATCH 11/40] Support EINJ in a big-endian world
+Subject: [PATCH 14/45] Support EINJ in a big-endian world
 
 Signed-off-by: Al Stone <ahs3@redhat.com>
 ---
  source/common/dmtbdump1.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-Index: acpica-unix2-20200925/source/common/dmtbdump1.c
+Index: acpica-unix2-20210604/source/common/dmtbdump1.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/common/dmtbdump1.c
-+++ acpica-unix2-20200925/source/common/dmtbdump1.c
-@@ -804,7 +804,7 @@ AcpiDmDumpEinj (
+--- acpica-unix2-20210604.orig/source/common/dmtbdump1.c
++++ acpica-unix2-20210604/source/common/dmtbdump1.c
+@@ -882,7 +882,7 @@ AcpiDmDumpEinj (
  {
      ACPI_STATUS             Status;
      ACPI_WHEA_HEADER        *Subtable;
 -    UINT32                  Length = Table->Length;
-+    UINT32                  Length = AcpiUtReadUint32(&Table->Length);
++    UINT32                  Length = AcpiUtReadUint32 (&Table->Length);
      UINT32                  Offset = sizeof (ACPI_TABLE_EINJ);
  
  
-@@ -819,7 +819,7 @@ AcpiDmDumpEinj (
+@@ -897,7 +897,7 @@ AcpiDmDumpEinj (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_WHEA_HEADER, Table, Offset);
diff --git a/0012-Support-ERST-in-a-big-endian-world.patch b/0015-Support-ERST-in-a-big-endian-world.patch
similarity index 62%
rename from 0012-Support-ERST-in-a-big-endian-world.patch
rename to 0015-Support-ERST-in-a-big-endian-world.patch
index 2bd176e..1438b85 100644
--- a/0012-Support-ERST-in-a-big-endian-world.patch
+++ b/0015-Support-ERST-in-a-big-endian-world.patch
@@ -1,27 +1,27 @@
-From 99f27aa1a38868a716aefd9408a8cd3788644d13 Mon Sep 17 00:00:00 2001
+From e588961ca36e70c24aa1c49e96bcd1997bf98f89 Mon Sep 17 00:00:00 2001
 From: Al Stone <ahs3@redhat.com>
 Date: Sat, 19 Sep 2020 15:54:56 -0600
-Subject: [PATCH 12/40] Support ERST in a big-endian world
+Subject: [PATCH 15/45] Support ERST in a big-endian world
 
 Signed-off-by: Al Stone <ahs3@redhat.com>
 ---
  source/common/dmtbdump1.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-Index: acpica-unix2-20200925/source/common/dmtbdump1.c
+Index: acpica-unix2-20210604/source/common/dmtbdump1.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/common/dmtbdump1.c
-+++ acpica-unix2-20200925/source/common/dmtbdump1.c
-@@ -857,7 +857,7 @@ AcpiDmDumpErst (
+--- acpica-unix2-20210604.orig/source/common/dmtbdump1.c
++++ acpica-unix2-20210604/source/common/dmtbdump1.c
+@@ -935,7 +935,7 @@ AcpiDmDumpErst (
  {
      ACPI_STATUS             Status;
      ACPI_WHEA_HEADER        *Subtable;
 -    UINT32                  Length = Table->Length;
-+    UINT32                  Length = AcpiUtReadUint32(&Table->Length);
++    UINT32                  Length = AcpiUtReadUint32 (&Table->Length);
      UINT32                  Offset = sizeof (ACPI_TABLE_ERST);
  
  
-@@ -872,7 +872,7 @@ AcpiDmDumpErst (
+@@ -950,7 +950,7 @@ AcpiDmDumpErst (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_WHEA_HEADER, Table, Offset);
diff --git a/0013-Support-FADT-aka-FACP-in-a-big-endian-world.patch b/0016-Support-FADT-aka-FACP-in-a-big-endian-world.patch
similarity index 76%
rename from 0013-Support-FADT-aka-FACP-in-a-big-endian-world.patch
rename to 0016-Support-FADT-aka-FACP-in-a-big-endian-world.patch
index 9fd3120..51e4257 100644
--- a/0013-Support-FADT-aka-FACP-in-a-big-endian-world.patch
+++ b/0016-Support-FADT-aka-FACP-in-a-big-endian-world.patch
@@ -1,7 +1,7 @@
-From 3288b60b3ddc2df4656842d424bfc1e6a51b2ad2 Mon Sep 17 00:00:00 2001
+From b3051bc2bad8988f3ad81a8307de6f1d0eef4ace Mon Sep 17 00:00:00 2001
 From: Al Stone <ahs3@redhat.com>
 Date: Sun, 20 Sep 2020 11:42:21 -0600
-Subject: [PATCH 13/40] Support FADT (aka, FACP) in a big-endian world
+Subject: [PATCH 16/45] Support FADT (aka, FACP) in a big-endian world
 
 Signed-off-by: Al Stone <ahs3@redhat.com>
 ---
@@ -9,15 +9,15 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/components/tables/tbfadt.c | 34 +++++++++++++++++++++++--------
  2 files changed, 38 insertions(+), 21 deletions(-)
 
-Index: acpica-unix2-20200925/source/common/dmtbdump.c
+Index: acpica-unix2-20210604/source/common/dmtbdump.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/common/dmtbdump.c
-+++ acpica-unix2-20200925/source/common/dmtbdump.c
-@@ -358,11 +358,12 @@ AcpiDmDumpFadt (
+--- acpica-unix2-20210604.orig/source/common/dmtbdump.c
++++ acpica-unix2-20210604/source/common/dmtbdump.c
+@@ -363,11 +363,12 @@ AcpiDmDumpFadt (
      ACPI_TABLE_HEADER       *Table)
  {
      ACPI_STATUS             Status;
-+    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
++    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
  
  
      /* Always dump the minimum FADT revision 1 fields (ACPI 1.0) */
@@ -27,7 +27,7 @@ Index: acpica-unix2-20200925/source/common/dmtbdump.c
          AcpiDmTableInfoFadt1);
      if (ACPI_FAILURE (Status))
      {
-@@ -371,10 +372,10 @@ AcpiDmDumpFadt (
+@@ -376,10 +377,10 @@ AcpiDmDumpFadt (
  
      /* Check for FADT revision 2 fields (ACPI 1.0B MS extensions) */
  
@@ -41,7 +41,7 @@ Index: acpica-unix2-20200925/source/common/dmtbdump.c
              AcpiDmTableInfoFadt2);
          if (ACPI_FAILURE (Status))
          {
-@@ -384,9 +385,9 @@ AcpiDmDumpFadt (
+@@ -389,9 +390,9 @@ AcpiDmDumpFadt (
  
      /* Check for FADT revision 3/4 fields and up (ACPI 2.0+ extended data) */
  
@@ -53,7 +53,7 @@ Index: acpica-unix2-20200925/source/common/dmtbdump.c
              AcpiDmTableInfoFadt3);
          if (ACPI_FAILURE (Status))
          {
-@@ -395,9 +396,9 @@ AcpiDmDumpFadt (
+@@ -400,9 +401,9 @@ AcpiDmDumpFadt (
  
          /* Check for FADT revision 5 fields and up (ACPI 5.0+) */
  
@@ -65,7 +65,7 @@ Index: acpica-unix2-20200925/source/common/dmtbdump.c
                  AcpiDmTableInfoFadt5);
              if (ACPI_FAILURE (Status))
              {
-@@ -407,9 +408,9 @@ AcpiDmDumpFadt (
+@@ -412,9 +413,9 @@ AcpiDmDumpFadt (
  
          /* Check for FADT revision 6 fields and up (ACPI 6.0+) */
  
@@ -77,7 +77,7 @@ Index: acpica-unix2-20200925/source/common/dmtbdump.c
                  AcpiDmTableInfoFadt6);
              if (ACPI_FAILURE (Status))
              {
-@@ -420,11 +421,11 @@ AcpiDmDumpFadt (
+@@ -425,11 +426,11 @@ AcpiDmDumpFadt (
  
      /* Validate various fields in the FADT, including length */
  
@@ -91,10 +91,10 @@ Index: acpica-unix2-20200925/source/common/dmtbdump.c
  }
  
  
-Index: acpica-unix2-20200925/source/components/tables/tbfadt.c
+Index: acpica-unix2-20210604/source/components/tables/tbfadt.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/components/tables/tbfadt.c
-+++ acpica-unix2-20200925/source/components/tables/tbfadt.c
+--- acpica-unix2-20210604.orig/source/components/tables/tbfadt.c
++++ acpica-unix2-20210604/source/components/tables/tbfadt.c
 @@ -289,7 +289,6 @@ AcpiTbSelectAddress (
      UINT32                  Address32,
      UINT64                  Address64)
@@ -118,7 +118,7 @@ Index: acpica-unix2-20200925/source/components/tables/tbfadt.c
       * trusted.
       */
 -    if (AcpiGbl_FADT.Header.Length <= ACPI_FADT_V2_SIZE)
-+    if (AcpiUtReadUint32(&AcpiGbl_FADT.Header.Length) <= ACPI_FADT_V2_SIZE)
++    if (AcpiUtReadUint32 (&AcpiGbl_FADT.Header.Length) <= ACPI_FADT_V2_SIZE)
      {
          AcpiGbl_FADT.PreferredProfile = 0;
          AcpiGbl_FADT.PstateControl = 0;
@@ -128,8 +128,8 @@ Index: acpica-unix2-20200925/source/components/tables/tbfadt.c
       */
 -    AcpiGbl_FADT.Header.Length = sizeof (ACPI_TABLE_FADT);
 +    Tmp = sizeof (ACPI_TABLE_FADT);
-+    AcpiUtWriteUint(&AcpiGbl_FADT.Header.Length, sizeof(UINT32),
-+		    &Tmp,  sizeof(UINT32));
++    AcpiUtWriteUint (&AcpiGbl_FADT.Header.Length, sizeof (UINT32),
++            &Tmp, sizeof (UINT32));
  
      /*
       * Expand the 32-bit DSDT addresses to 64-bit as necessary.
@@ -137,11 +137,11 @@ Index: acpica-unix2-20200925/source/components/tables/tbfadt.c
       */
 -    AcpiGbl_FADT.XDsdt = AcpiTbSelectAddress ("DSDT",
 -        AcpiGbl_FADT.Dsdt, AcpiGbl_FADT.XDsdt);
-+    Value32 = AcpiUtReadUint32(&AcpiGbl_FADT.Dsdt);
-+    Value64 = AcpiUtReadUint64(&AcpiGbl_FADT.XDsdt);
++    Value32 = AcpiUtReadUint32 (&AcpiGbl_FADT.Dsdt);
++    Value64 = AcpiUtReadUint64 (&AcpiGbl_FADT.XDsdt);
 +    Value64 = AcpiTbSelectAddress ("DSDT", Value32, Value64);
-+    AcpiUtWriteUint(&AcpiGbl_FADT.XDsdt, sizeof(UINT64),
-+		        &Value64, sizeof(UINT64));
++    AcpiUtWriteUint (&AcpiGbl_FADT.XDsdt, sizeof (UINT64),
++                &Value64, sizeof (UINT64));
  
      /* If Hardware Reduced flag is set, we are all done */
  
@@ -150,11 +150,11 @@ Index: acpica-unix2-20200925/source/components/tables/tbfadt.c
              if (Address64->Address)
              {
 -                if (Address64->Address != (UINT64) Address32)
-+		Value32 = AcpiUtReadUint32(&Address32);
-+		Value64 = AcpiUtReadUint64(&Address64->Address);
++                Value32 = AcpiUtReadUint32 (&Address32);
++                Value64 = AcpiUtReadUint64 (&Address64->Address);
 +
 +                /* if (Address64->Address != (UINT64) Address32) */
-+		if (Value64 != (UINT64) Value32)
++                if (Value64 != (UINT64) Value32)
                  {
                      /* Address mismatch */
  
@@ -162,7 +162,7 @@ Index: acpica-unix2-20200925/source/components/tables/tbfadt.c
               */
              if (!Address64->Address || AcpiGbl_Use32BitFadtAddresses)
              {
-+		Value32 = AcpiUtReadUint32(&Address32);
++                Value32 = AcpiUtReadUint32 (&Address32);
                  AcpiTbInitGenericAddress (Address64,
                      ACPI_ADR_SPACE_SYSTEM_IO, Length,
 -                    (UINT64) Address32, Name, Flags);
@@ -174,11 +174,11 @@ Index: acpica-unix2-20200925/source/components/tables/tbfadt.c
  
          if (Source64->Address)
          {
-+	    UINT64 Address64;
++            UINT64 Address64;
 +
-+	    Address64 = AcpiUtReadUint64(&Source64->Address);
-+	    Address64 +=
-+		    (FadtPmInfoTable[i].RegisterNum * Pm1RegisterByteWidth);
++            Address64 = AcpiUtReadUint64 (&Source64->Address);
++            Address64 +=
++                (FadtPmInfoTable[i].RegisterNum * Pm1RegisterByteWidth);
              AcpiTbInitGenericAddress (FadtPmInfoTable[i].Target,
                  Source64->SpaceId, Pm1RegisterByteWidth,
 -                Source64->Address +
diff --git a/0014-Support-most-FPDTs-in-a-big-endian-world.patch b/0017-Support-most-FPDTs-in-a-big-endian-world.patch
similarity index 71%
rename from 0014-Support-most-FPDTs-in-a-big-endian-world.patch
rename to 0017-Support-most-FPDTs-in-a-big-endian-world.patch
index f1f9715..abeed59 100644
--- a/0014-Support-most-FPDTs-in-a-big-endian-world.patch
+++ b/0017-Support-most-FPDTs-in-a-big-endian-world.patch
@@ -1,7 +1,7 @@
-From f0cba59f1ce62095cb0a0cecdf8d661b77bf2baf Mon Sep 17 00:00:00 2001
+From 35f533074fb78d52e87c5a14406a136480a6fe62 Mon Sep 17 00:00:00 2001
 From: Al Stone <ahs3@redhat.com>
 Date: Tue, 22 Sep 2020 17:51:45 -0600
-Subject: [PATCH 14/40] Support most FPDTs in a big-endian world
+Subject: [PATCH 17/45] Support most FPDTs in a big-endian world
 
 NB: there is no support for vendor specific records even in
 the little-endian version.
@@ -12,23 +12,23 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/compiler/dttable1.c |  4 +++-
  2 files changed, 10 insertions(+), 6 deletions(-)
 
-Index: acpica-unix2-20200925/source/common/dmtbdump1.c
+Index: acpica-unix2-20210604/source/common/dmtbdump1.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/common/dmtbdump1.c
-+++ acpica-unix2-20200925/source/common/dmtbdump1.c
-@@ -910,9 +910,10 @@ AcpiDmDumpFpdt (
+--- acpica-unix2-20210604.orig/source/common/dmtbdump1.c
++++ acpica-unix2-20210604/source/common/dmtbdump1.c
+@@ -988,9 +988,10 @@ AcpiDmDumpFpdt (
  {
      ACPI_STATUS             Status;
      ACPI_FPDT_HEADER        *Subtable;
 -    UINT32                  Length = Table->Length;
-+    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
++    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
      UINT32                  Offset = sizeof (ACPI_TABLE_FPDT);
      ACPI_DMTABLE_INFO       *InfoTable;
 +    UINT16                  SubtableType;
  
  
      /* There is no main table (other than the standard ACPI header) */
-@@ -920,19 +921,20 @@ AcpiDmDumpFpdt (
+@@ -998,19 +999,20 @@ AcpiDmDumpFpdt (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, Table, Offset);
@@ -47,12 +47,12 @@ Index: acpica-unix2-20200925/source/common/dmtbdump1.c
          }
  
 -        switch (Subtable->Type)
-+	SubtableType = AcpiUtReadUint16(&Subtable->Type);
++        SubtableType = AcpiUtReadUint16 (&Subtable->Type);
 +        switch (SubtableType)
          {
          case ACPI_FPDT_TYPE_BOOT:
  
-@@ -959,7 +961,7 @@ AcpiDmDumpFpdt (
+@@ -1037,7 +1039,7 @@ AcpiDmDumpFpdt (
              goto NextSubtable;
          }
  
@@ -61,11 +61,11 @@ Index: acpica-unix2-20200925/source/common/dmtbdump1.c
              Subtable->Length, InfoTable);
          if (ACPI_FAILURE (Status))
          {
-Index: acpica-unix2-20200925/source/compiler/dttable1.c
+Index: acpica-unix2-20210604/source/compiler/dttable1.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/compiler/dttable1.c
-+++ acpica-unix2-20200925/source/compiler/dttable1.c
-@@ -1051,6 +1051,7 @@ DtCompileFpdt (
+--- acpica-unix2-20210604.orig/source/compiler/dttable1.c
++++ acpica-unix2-20210604/source/compiler/dttable1.c
+@@ -1125,6 +1125,7 @@ DtCompileFpdt (
      ACPI_DMTABLE_INFO       *InfoTable;
      DT_FIELD                **PFieldList = (DT_FIELD **) List;
      DT_FIELD                *SubtableStart;
@@ -73,12 +73,12 @@ Index: acpica-unix2-20200925/source/compiler/dttable1.c
  
  
      while (*PFieldList)
-@@ -1069,7 +1070,8 @@ DtCompileFpdt (
+@@ -1143,7 +1144,8 @@ DtCompileFpdt (
  
          FpdtHeader = ACPI_CAST_PTR (ACPI_FPDT_HEADER, Subtable->Buffer);
  
 -        switch (FpdtHeader->Type)
-+	SubtableType = AcpiUtReadUint16(&FpdtHeader->Type);
++        SubtableType = AcpiUtReadUint16 (&FpdtHeader->Type);
 +        switch (SubtableType)
          {
          case ACPI_FPDT_TYPE_BOOT:
diff --git a/0015-Support-GTDT-in-a-big-endian-world.patch b/0018-Support-GTDT-in-a-big-endian-world.patch
similarity index 60%
rename from 0015-Support-GTDT-in-a-big-endian-world.patch
rename to 0018-Support-GTDT-in-a-big-endian-world.patch
index 7302133..df3f181 100644
--- a/0015-Support-GTDT-in-a-big-endian-world.patch
+++ b/0018-Support-GTDT-in-a-big-endian-world.patch
@@ -1,7 +1,7 @@
-From faba93b1dd7ce4aa8983880e917d108496cd173f Mon Sep 17 00:00:00 2001
+From 492e41a24fd088c7ab609ee8ad518f69c9cd29e3 Mon Sep 17 00:00:00 2001
 From: Al Stone <ahs3@redhat.com>
 Date: Tue, 22 Sep 2020 18:12:01 -0600
-Subject: [PATCH 15/40] Support GTDT in a big-endian world
+Subject: [PATCH 18/45] Support GTDT in a big-endian world
 
 Signed-off-by: Al Stone <ahs3@redhat.com>
 ---
@@ -9,20 +9,20 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/compiler/dttable1.c |  9 +++++++--
  2 files changed, 16 insertions(+), 6 deletions(-)
 
-Index: acpica-unix2-20200925/source/common/dmtbdump1.c
+Index: acpica-unix2-20210604/source/common/dmtbdump1.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/common/dmtbdump1.c
-+++ acpica-unix2-20200925/source/common/dmtbdump1.c
-@@ -997,7 +997,7 @@ AcpiDmDumpGtdt (
+--- acpica-unix2-20210604.orig/source/common/dmtbdump1.c
++++ acpica-unix2-20210604/source/common/dmtbdump1.c
+@@ -1075,7 +1075,7 @@ AcpiDmDumpGtdt (
  {
      ACPI_STATUS             Status;
      ACPI_GTDT_HEADER        *Subtable;
 -    UINT32                  Length = Table->Length;
-+    UINT32                  Length = AcpiUtReadUint32(&Table->Length);
++    UINT32                  Length = AcpiUtReadUint32 (&Table->Length);
      UINT32                  Offset = sizeof (ACPI_TABLE_GTDT);
      ACPI_DMTABLE_INFO       *InfoTable;
      UINT32                  SubtableLength;
-@@ -1033,7 +1033,7 @@ AcpiDmDumpGtdt (
+@@ -1111,7 +1111,7 @@ AcpiDmDumpGtdt (
  
      /* Subtables */
  
@@ -31,39 +31,39 @@ Index: acpica-unix2-20200925/source/common/dmtbdump1.c
      {
          /* Common subtable header */
  
-@@ -1051,8 +1051,13 @@ AcpiDmDumpGtdt (
+@@ -1129,8 +1129,13 @@ AcpiDmDumpGtdt (
          case ACPI_GTDT_TYPE_TIMER_BLOCK:
  
              SubtableLength = sizeof (ACPI_GTDT_TIMER_BLOCK);
 -            GtCount = (ACPI_CAST_PTR (ACPI_GTDT_TIMER_BLOCK,
 -                Subtable))->TimerCount;
-+	    {
-+	        UINT32 Tmp32;
++            {
++                UINT32 Tmp32;
 +
 +                Tmp32 = (ACPI_CAST_PTR (ACPI_GTDT_TIMER_BLOCK,
 +                    Subtable))->TimerCount;
-+                GtCount = AcpiUtReadUint32(&Tmp32);
-+	    }
++                GtCount = AcpiUtReadUint32 (&Tmp32);
++            }
  
              InfoTable = AcpiDmTableInfoGtdt0;
              break;
-Index: acpica-unix2-20200925/source/compiler/dttable1.c
+Index: acpica-unix2-20210604/source/compiler/dttable1.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/compiler/dttable1.c
-+++ acpica-unix2-20200925/source/compiler/dttable1.c
-@@ -997,8 +997,13 @@ DtCompileGtdt (
+--- acpica-unix2-20210604.orig/source/compiler/dttable1.c
++++ acpica-unix2-20210604/source/compiler/dttable1.c
+@@ -1071,8 +1071,13 @@ DtCompileGtdt (
              DtPushSubtable (Subtable);
              ParentTable = DtPeekSubtable ();
  
 -            GtCount = (ACPI_CAST_PTR (ACPI_GTDT_TIMER_BLOCK,
 -                Subtable->Buffer - sizeof(ACPI_GTDT_HEADER)))->TimerCount;
-+	    {
-+	        UINT32 Tmp32;
++            {
++                UINT32 Tmp32;
 +
 +                Tmp32 = (ACPI_CAST_PTR (ACPI_GTDT_TIMER_BLOCK,
-+                    Subtable->Buffer - sizeof(ACPI_GTDT_HEADER)))->TimerCount;
-+                GtCount = AcpiUtReadUint32(&Tmp32);
-+	    }
++                    Subtable->Buffer - sizeof (ACPI_GTDT_HEADER)))->TimerCount;
++                GtCount = AcpiUtReadUint32 (&Tmp32);
++            }
  
              while (GtCount)
              {
diff --git a/0016-Support-HEST-in-a-big-endian-world.patch b/0019-Support-HEST-in-a-big-endian-world.patch
similarity index 69%
rename from 0016-Support-HEST-in-a-big-endian-world.patch
rename to 0019-Support-HEST-in-a-big-endian-world.patch
index e38456f..baad30e 100644
--- a/0016-Support-HEST-in-a-big-endian-world.patch
+++ b/0019-Support-HEST-in-a-big-endian-world.patch
@@ -1,7 +1,7 @@
-From 1104928443b11ff1c0446ed1604882c0e6ae4dc1 Mon Sep 17 00:00:00 2001
+From 6b73a4881e436bb8cf86c05c1cc4b5360efe1c7f Mon Sep 17 00:00:00 2001
 From: Al Stone <ahs3@redhat.com>
 Date: Wed, 23 Sep 2020 11:54:49 -0600
-Subject: [PATCH 16/40] Support HEST in a big-endian world
+Subject: [PATCH 19/45] Support HEST in a big-endian world
 
 Signed-off-by: Al Stone <ahs3@redhat.com>
 ---
@@ -9,16 +9,16 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/compiler/dttable1.c |  4 +++-
  2 files changed, 9 insertions(+), 5 deletions(-)
 
-Index: acpica-unix2-20200925/source/common/dmtbdump1.c
+Index: acpica-unix2-20210604/source/common/dmtbdump1.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/common/dmtbdump1.c
-+++ acpica-unix2-20200925/source/common/dmtbdump1.c
-@@ -1138,12 +1138,13 @@ AcpiDmDumpHest (
+--- acpica-unix2-20210604.orig/source/common/dmtbdump1.c
++++ acpica-unix2-20210604/source/common/dmtbdump1.c
+@@ -1216,12 +1216,13 @@ AcpiDmDumpHest (
  {
      ACPI_STATUS             Status;
      ACPI_HEST_HEADER        *Subtable;
 -    UINT32                  Length = Table->Length;
-+    UINT32                  Length = AcpiUtReadUint32(&Table->Length);
++    UINT32                  Length = AcpiUtReadUint32 (&Table->Length);
      UINT32                  Offset = sizeof (ACPI_TABLE_HEST);
      ACPI_DMTABLE_INFO       *InfoTable;
      UINT32                  SubtableLength;
@@ -28,7 +28,7 @@ Index: acpica-unix2-20200925/source/common/dmtbdump1.c
  
  
      /* Main table */
-@@ -1157,10 +1158,11 @@ AcpiDmDumpHest (
+@@ -1235,10 +1236,11 @@ AcpiDmDumpHest (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_HEST_HEADER, Table, Offset);
@@ -37,12 +37,12 @@ Index: acpica-unix2-20200925/source/common/dmtbdump1.c
      {
          BankCount = 0;
 -        switch (Subtable->Type)
-+	SubtableType = Subtable->Type;
++        SubtableType = Subtable->Type;
 +        switch (SubtableType)
          {
          case ACPI_HEST_TYPE_IA32_CHECK:
  
-@@ -1227,7 +1229,7 @@ AcpiDmDumpHest (
+@@ -1305,7 +1307,7 @@ AcpiDmDumpHest (
              /* Cannot continue on unknown type - no length */
  
              AcpiOsPrintf ("\n**** Unknown HEST subtable type 0x%X\n",
@@ -51,11 +51,11 @@ Index: acpica-unix2-20200925/source/common/dmtbdump1.c
              return;
          }
  
-Index: acpica-unix2-20200925/source/compiler/dttable1.c
+Index: acpica-unix2-20210604/source/compiler/dttable1.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/compiler/dttable1.c
-+++ acpica-unix2-20200925/source/compiler/dttable1.c
-@@ -1133,6 +1133,7 @@ DtCompileHest (
+--- acpica-unix2-20210604.orig/source/compiler/dttable1.c
++++ acpica-unix2-20210604/source/compiler/dttable1.c
+@@ -1207,6 +1207,7 @@ DtCompileHest (
      DT_FIELD                *SubtableStart;
      ACPI_DMTABLE_INFO       *InfoTable;
      UINT16                  Type;
@@ -63,13 +63,13 @@ Index: acpica-unix2-20200925/source/compiler/dttable1.c
      UINT32                  BankCount;
  
  
-@@ -1151,7 +1152,8 @@ DtCompileHest (
+@@ -1225,7 +1226,8 @@ DtCompileHest (
          /* Get subtable type */
  
          SubtableStart = *PFieldList;
 -        DtCompileInteger ((UINT8 *) &Type, *PFieldList, 2, 0);
 +        DtCompileInteger ((UINT8 *) &Tmp16, *PFieldList, 2, 0);
-+	Type = AcpiUtReadUint32(&Tmp16);
++        Type = AcpiUtReadUint32 (&Tmp16);
  
          switch (Type)
          {
diff --git a/0017-Support-RSDT-RSD-PTR-in-a-big-endian-world.patch b/0020-Support-RSDT-RSD-PTR-in-a-big-endian-world.patch
similarity index 62%
rename from 0017-Support-RSDT-RSD-PTR-in-a-big-endian-world.patch
rename to 0020-Support-RSDT-RSD-PTR-in-a-big-endian-world.patch
index 4925302..6c2d0f0 100644
--- a/0017-Support-RSDT-RSD-PTR-in-a-big-endian-world.patch
+++ b/0020-Support-RSDT-RSD-PTR-in-a-big-endian-world.patch
@@ -1,26 +1,26 @@
-From 6565935b43c4795387aa4814d171dcd3c02bee33 Mon Sep 17 00:00:00 2001
+From 198abe6e9fcb03676513146bf2f9b8ccc49e5827 Mon Sep 17 00:00:00 2001
 From: Al Stone <ahs3@redhat.com>
 Date: Wed, 23 Sep 2020 12:11:46 -0600
-Subject: [PATCH 17/40] Support RSDT ('RSD PTR') in a big-endian world
+Subject: [PATCH 20/45] Support RSDT ('RSD PTR') in a big-endian world
 
 Signed-off-by: Al Stone <ahs3@redhat.com>
 ---
  source/common/dmtbdump.c | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
-Index: acpica-unix2-20200925/source/common/dmtbdump.c
+Index: acpica-unix2-20210604/source/common/dmtbdump.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/common/dmtbdump.c
-+++ acpica-unix2-20200925/source/common/dmtbdump.c
-@@ -277,6 +277,7 @@ AcpiDmDumpRsdt (
+--- acpica-unix2-20210604.orig/source/common/dmtbdump.c
++++ acpica-unix2-20210604/source/common/dmtbdump.c
+@@ -282,6 +282,7 @@ AcpiDmDumpRsdt (
      UINT32                  Entries;
      UINT32                  Offset;
      UINT32                  i;
-+    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
++    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
  
  
      /* Point to start of table pointer array */
-@@ -286,12 +287,12 @@ AcpiDmDumpRsdt (
+@@ -291,12 +292,12 @@ AcpiDmDumpRsdt (
  
      /* RSDT uses 32-bit pointers */
  
@@ -31,7 +31,7 @@ Index: acpica-unix2-20200925/source/common/dmtbdump.c
      {
          AcpiDmLineHeader2 (Offset, sizeof (UINT32), "ACPI Table Address", i);
 -        AcpiOsPrintf ("%8.8X\n", Array[i]);
-+        AcpiOsPrintf ("%8.8X\n", AcpiUtReadUint32(&Array[i]));
++        AcpiOsPrintf ("%8.8X\n", AcpiUtReadUint32 (&Array[i]));
          Offset += sizeof (UINT32);
      }
  }
diff --git a/0018-Support-XSDT-in-a-big-endian-world.patch b/0021-Support-XSDT-in-a-big-endian-world.patch
similarity index 64%
rename from 0018-Support-XSDT-in-a-big-endian-world.patch
rename to 0021-Support-XSDT-in-a-big-endian-world.patch
index 7ae8ea1..83877c5 100644
--- a/0018-Support-XSDT-in-a-big-endian-world.patch
+++ b/0021-Support-XSDT-in-a-big-endian-world.patch
@@ -1,26 +1,26 @@
-From 8d0ea4932cebc5d13cc811eb4f78b66a5e3cfd2c Mon Sep 17 00:00:00 2001
+From 75d974e42fefabfd6684d62f58bff678b55f396b Mon Sep 17 00:00:00 2001
 From: Al Stone <ahs3@redhat.com>
 Date: Wed, 23 Sep 2020 12:16:37 -0600
-Subject: [PATCH 18/40] Support XSDT in a big-endian world
+Subject: [PATCH 21/45] Support XSDT in a big-endian world
 
 Signed-off-by: Al Stone <ahs3@redhat.com>
 ---
  source/common/dmtbdump.c | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
-Index: acpica-unix2-20200925/source/common/dmtbdump.c
+Index: acpica-unix2-20210604/source/common/dmtbdump.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/common/dmtbdump.c
-+++ acpica-unix2-20200925/source/common/dmtbdump.c
-@@ -318,6 +318,7 @@ AcpiDmDumpXsdt (
+--- acpica-unix2-20210604.orig/source/common/dmtbdump.c
++++ acpica-unix2-20210604/source/common/dmtbdump.c
+@@ -323,6 +323,7 @@ AcpiDmDumpXsdt (
      UINT32                  Entries;
      UINT32                  Offset;
      UINT32                  i;
-+    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
++    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
  
  
      /* Point to start of table pointer array */
-@@ -327,12 +328,13 @@ AcpiDmDumpXsdt (
+@@ -332,12 +333,13 @@ AcpiDmDumpXsdt (
  
      /* XSDT uses 64-bit pointers */
  
@@ -32,7 +32,7 @@ Index: acpica-unix2-20200925/source/common/dmtbdump.c
          AcpiDmLineHeader2 (Offset, sizeof (UINT64), "ACPI Table Address", i);
 -        AcpiOsPrintf ("%8.8X%8.8X\n", ACPI_FORMAT_UINT64 (Array[i]));
 +        AcpiOsPrintf ("%8.8X%8.8X\n",
-+		     	ACPI_FORMAT_UINT64 (AcpiUtReadUint64(&Array[i])));
++                ACPI_FORMAT_UINT64 (AcpiUtReadUint64 (&Array[i])));
          Offset += sizeof (UINT64);
      }
  }
diff --git a/0019-Support-SRAT-in-a-big-endian-world.patch b/0022-Support-SRAT-in-a-big-endian-world.patch
similarity index 80%
rename from 0019-Support-SRAT-in-a-big-endian-world.patch
rename to 0022-Support-SRAT-in-a-big-endian-world.patch
index 6bb6215..75bcc04 100644
--- a/0019-Support-SRAT-in-a-big-endian-world.patch
+++ b/0022-Support-SRAT-in-a-big-endian-world.patch
@@ -1,22 +1,22 @@
-From 82421dd7d534f78edf85b862b196bae256cf8f87 Mon Sep 17 00:00:00 2001
+From 724fcc83d359e4c8abbd2a48755e96049afa06d6 Mon Sep 17 00:00:00 2001
 From: Al Stone <ahs3@redhat.com>
 Date: Wed, 23 Sep 2020 12:25:38 -0600
-Subject: [PATCH 19/40] Support SRAT in a big-endian world
+Subject: [PATCH 22/45] Support SRAT in a big-endian world
 
 Signed-off-by: Al Stone <ahs3@redhat.com>
 ---
  source/common/dmtbdump3.c | 9 +++++----
  1 file changed, 5 insertions(+), 4 deletions(-)
 
-Index: acpica-unix2-20200925/source/common/dmtbdump3.c
+Index: acpica-unix2-20210604/source/common/dmtbdump3.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/common/dmtbdump3.c
-+++ acpica-unix2-20200925/source/common/dmtbdump3.c
+--- acpica-unix2-20210604.orig/source/common/dmtbdump3.c
++++ acpica-unix2-20210604/source/common/dmtbdump3.c
 @@ -173,11 +173,12 @@ AcpiDmDumpSrat (
      UINT32                  Offset = sizeof (ACPI_TABLE_SRAT);
      ACPI_SUBTABLE_HEADER    *Subtable;
      ACPI_DMTABLE_INFO       *InfoTable;
-+    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
++    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
  
  
      /* Main table */
diff --git a/0020-Support-SLIT-in-a-big-endian-world.patch b/0023-Support-SLIT-in-a-big-endian-world.patch
similarity index 68%
rename from 0020-Support-SLIT-in-a-big-endian-world.patch
rename to 0023-Support-SLIT-in-a-big-endian-world.patch
index a0e3a5e..e0e324f 100644
--- a/0020-Support-SLIT-in-a-big-endian-world.patch
+++ b/0023-Support-SLIT-in-a-big-endian-world.patch
@@ -1,7 +1,7 @@
-From 4e76aa1a5556f250f51a3802734fd6cb77718299 Mon Sep 17 00:00:00 2001
+From b11d50752feb9f1b52db076d1fb4753b30a53642 Mon Sep 17 00:00:00 2001
 From: Al Stone <ahs3@redhat.com>
 Date: Wed, 23 Sep 2020 12:49:52 -0600
-Subject: [PATCH 20/40] Support SLIT in a big-endian world
+Subject: [PATCH 23/45] Support SLIT in a big-endian world
 
 Signed-off-by: Al Stone <ahs3@redhat.com>
 ---
@@ -9,15 +9,15 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/compiler/dttable2.c | 2 +-
  2 files changed, 6 insertions(+), 4 deletions(-)
 
-Index: acpica-unix2-20200925/source/common/dmtbdump3.c
+Index: acpica-unix2-20210604/source/common/dmtbdump3.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/common/dmtbdump3.c
-+++ acpica-unix2-20200925/source/common/dmtbdump3.c
+--- acpica-unix2-20210604.orig/source/common/dmtbdump3.c
++++ acpica-unix2-20210604/source/common/dmtbdump3.c
 @@ -96,11 +96,12 @@ AcpiDmDumpSlit (
      UINT32                  Localities;
      UINT32                  i;
      UINT32                  j;
-+    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
++    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
  
  
      /* Main table */
@@ -32,8 +32,8 @@ Index: acpica-unix2-20200925/source/common/dmtbdump3.c
      /* Display the Locality NxN Matrix */
  
 -    Localities = (UINT32) ACPI_CAST_PTR (ACPI_TABLE_SLIT, Table)->LocalityCount;
-+    Localities = (UINT32) 
-+        AcpiUtReadUint64(&ACPI_CAST_PTR (ACPI_TABLE_SLIT, Table)->LocalityCount);
++    Localities = (UINT32)
++        AcpiUtReadUint64 (&ACPI_CAST_PTR (ACPI_TABLE_SLIT, Table)->LocalityCount);
      Offset = ACPI_OFFSET (ACPI_TABLE_SLIT, Entry[0]);
      Row = (UINT8 *) ACPI_CAST_PTR (ACPI_TABLE_SLIT, Table)->Entry;
  
@@ -46,16 +46,16 @@ Index: acpica-unix2-20200925/source/common/dmtbdump3.c
              {
                  AcpiOsPrintf (
                      "\n**** Not enough room in table for all localities\n");
-Index: acpica-unix2-20200925/source/compiler/dttable2.c
+Index: acpica-unix2-20210604/source/compiler/dttable2.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/compiler/dttable2.c
-+++ acpica-unix2-20200925/source/compiler/dttable2.c
-@@ -1529,7 +1529,7 @@ DtCompileSlit (
+--- acpica-unix2-20210604.orig/source/compiler/dttable2.c
++++ acpica-unix2-20210604/source/compiler/dttable2.c
+@@ -1837,7 +1837,7 @@ DtCompileSlit (
      ParentTable = DtPeekSubtable ();
      DtInsertSubtable (ParentTable, Subtable);
  
 -    Localities = *ACPI_CAST_PTR (UINT32, Subtable->Buffer);
-+    Localities = (UINT32) AcpiUtReadUint64(Subtable->Buffer);
++    Localities = (UINT32) AcpiUtReadUint64 (Subtable->Buffer);
      LocalityBuffer = UtLocalCalloc (Localities);
      LocalityListLength = 0;
  
diff --git a/0021-Support-MSCT-in-a-big-endian-world.patch b/0024-Support-MSCT-in-a-big-endian-world.patch
similarity index 72%
rename from 0021-Support-MSCT-in-a-big-endian-world.patch
rename to 0024-Support-MSCT-in-a-big-endian-world.patch
index 3a59eaa..bb93fe2 100644
--- a/0021-Support-MSCT-in-a-big-endian-world.patch
+++ b/0024-Support-MSCT-in-a-big-endian-world.patch
@@ -1,22 +1,22 @@
-From 4ca38d182bb40ba750d8f5ac6ff8560c40f06625 Mon Sep 17 00:00:00 2001
+From ae38e1578d18abf41330bb3dbaef9ea56a52f49b Mon Sep 17 00:00:00 2001
 From: Al Stone <ahs3@redhat.com>
 Date: Wed, 23 Sep 2020 15:44:21 -0600
-Subject: [PATCH 21/40] Support MSCT in a big-endian world
+Subject: [PATCH 24/45] Support MSCT in a big-endian world
 
 Signed-off-by: Al Stone <ahs3@redhat.com>
 ---
  source/common/dmtbdump2.c | 7 ++++---
  1 file changed, 4 insertions(+), 3 deletions(-)
 
-Index: acpica-unix2-20200925/source/common/dmtbdump2.c
+Index: acpica-unix2-20210604/source/common/dmtbdump2.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20200925/source/common/dmtbdump2.c
-@@ -972,11 +972,12 @@ AcpiDmDumpMsct (
+--- acpica-unix2-20210604.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20210604/source/common/dmtbdump2.c
+@@ -1133,11 +1133,12 @@ AcpiDmDumpMsct (
      ACPI_STATUS             Status;
      UINT32                  Offset = sizeof (ACPI_TABLE_MSCT);
      ACPI_MSCT_PROXIMITY     *Subtable;
-+    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
++    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
  
  
      /* Main table */
@@ -26,7 +26,7 @@ Index: acpica-unix2-20200925/source/common/dmtbdump2.c
      if (ACPI_FAILURE (Status))
      {
          return;
-@@ -985,12 +986,12 @@ AcpiDmDumpMsct (
+@@ -1146,12 +1147,12 @@ AcpiDmDumpMsct (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_MSCT_PROXIMITY, Table, Offset);
diff --git a/0024-Support-SDEV-in-a-big-endian-world.patch b/0024-Support-SDEV-in-a-big-endian-world.patch
deleted file mode 100644
index f6d36bd..0000000
--- a/0024-Support-SDEV-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,256 +0,0 @@
-From af44bec6c062a26034a43809d81af2a0ea17343e Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Fri, 25 Sep 2020 16:05:59 -0600
-Subject: [PATCH 24/40] Support SDEV in a big-endian world
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/common/dmtbdump2.c  | 50 +++++++++++++++++++-----------------
- source/compiler/dttable2.c | 52 ++++++++++++++++++++++++++++----------
- 2 files changed, 65 insertions(+), 37 deletions(-)
-
-Index: acpica-unix2-20200925/source/common/dmtbdump2.c
-===================================================================
---- acpica-unix2-20200925.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20200925/source/common/dmtbdump2.c
-@@ -1871,17 +1871,18 @@ AcpiDmDumpSdev (
-     ACPI_SDEV_PCIE          *Pcie;
-     ACPI_SDEV_NAMESPACE     *Namesp;
-     ACPI_DMTABLE_INFO       *InfoTable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
-     UINT32                  Offset = sizeof (ACPI_TABLE_SDEV);
-     UINT16                  PathOffset;
-     UINT16                  PathLength;
-     UINT16                  VendorDataOffset;
-     UINT16                  VendorDataLength;
-+    UINT16                  SubtableLength;
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoSdev);
-+    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoSdev);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -1890,13 +1891,14 @@ AcpiDmDumpSdev (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_SDEV_HEADER, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < TableLength)
-     {
-         /* Common subtable header */
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
--            Subtable->Length, AcpiDmTableInfoSdevHdr);
-+	SubtableLength = AcpiUtReadUint16(&Subtable->Length);
-+        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
-+            SubtableLength, AcpiDmTableInfoSdevHdr);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -1919,8 +1921,8 @@ AcpiDmDumpSdev (
-         }
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
--            Subtable->Length, InfoTable);
-+        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
-+            SubtableLength, InfoTable);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -1933,12 +1935,12 @@ AcpiDmDumpSdev (
-             /* Dump the PCIe device ID(s) */
- 
-             Namesp = ACPI_CAST_PTR (ACPI_SDEV_NAMESPACE, Subtable);
--            PathOffset = Namesp->DeviceIdOffset;
--            PathLength = Namesp->DeviceIdLength;
-+            PathOffset = AcpiUtReadUint16(&Namesp->DeviceIdOffset);
-+            PathLength = AcpiUtReadUint16(&Namesp->DeviceIdLength);
- 
-             if (PathLength)
-             {
--                Status = AcpiDmDumpTable (Table->Length, 0,
-+                Status = AcpiDmDumpTable (TableLength, 0,
-                     ACPI_ADD_PTR (UINT8, Namesp, PathOffset),
-                     PathLength, AcpiDmTableInfoSdev0a);
-                 if (ACPI_FAILURE (Status))
-@@ -1949,14 +1951,14 @@ AcpiDmDumpSdev (
- 
-             /* Dump the vendor-specific data */
- 
--            VendorDataLength =
--                Namesp->VendorDataLength;
--            VendorDataOffset =
--                Namesp->DeviceIdOffset + Namesp->DeviceIdLength;
-+            VendorDataLength = AcpiUtReadUint16(&Namesp->VendorDataLength);
-+            VendorDataOffset = 
-+		    AcpiUtReadUint16(&Namesp->DeviceIdOffset) + 
-+		    AcpiUtReadUint16(&Namesp->DeviceIdLength);
- 
-             if (VendorDataLength)
-             {
--                Status = AcpiDmDumpTable (Table->Length, 0,
-+                Status = AcpiDmDumpTable (TableLength, 0,
-                     ACPI_ADD_PTR (UINT8, Namesp, VendorDataOffset),
-                     VendorDataLength, AcpiDmTableInfoSdev1b);
-                 if (ACPI_FAILURE (Status))
-@@ -1971,12 +1973,12 @@ AcpiDmDumpSdev (
-             /* PCI path substructures */
- 
-             Pcie = ACPI_CAST_PTR (ACPI_SDEV_PCIE, Subtable);
--            PathOffset = Pcie->PathOffset;
--            PathLength = Pcie->PathLength;
-+            PathOffset = AcpiUtReadUint16(&Pcie->PathOffset);
-+            PathLength = AcpiUtReadUint16(&Pcie->PathLength);
- 
-             while (PathLength)
-             {
--                Status = AcpiDmDumpTable (Table->Length,
-+                Status = AcpiDmDumpTable (TableLength,
-                     PathOffset + Offset,
-                     ACPI_ADD_PTR (UINT8, Pcie, PathOffset),
-                     sizeof (ACPI_SDEV_PCIE_PATH), AcpiDmTableInfoSdev1a);
-@@ -1991,12 +1993,14 @@ AcpiDmDumpSdev (
- 
-             /* VendorData */
- 
--            VendorDataLength = Pcie->VendorDataLength;
--            VendorDataOffset = Pcie->PathOffset + Pcie->PathLength;
-+            VendorDataLength = AcpiUtReadUint16(&Pcie->VendorDataLength);
-+            VendorDataOffset = 
-+		    AcpiUtReadUint16(&Pcie->PathOffset) + 
-+		    AcpiUtReadUint16(&Pcie->PathLength);
- 
-             if (VendorDataLength)
-             {
--                Status = AcpiDmDumpTable (Table->Length, 0,
-+                Status = AcpiDmDumpTable (TableLength, 0,
-                     ACPI_ADD_PTR (UINT8, Pcie, VendorDataOffset),
-                     VendorDataLength, AcpiDmTableInfoSdev1b);
-                 if (ACPI_FAILURE (Status))
-@@ -2013,8 +2017,8 @@ AcpiDmDumpSdev (
- NextSubtable:
-         /* Point to next subtable */
- 
--        Offset += Subtable->Length;
-+        Offset += SubtableLength;
-         Subtable = ACPI_ADD_PTR (ACPI_SDEV_HEADER, Subtable,
--            Subtable->Length);
-+            SubtableLength);
-     }
- }
-Index: acpica-unix2-20200925/source/compiler/dttable2.c
-===================================================================
---- acpica-unix2-20200925.orig/source/compiler/dttable2.c
-+++ acpica-unix2-20200925/source/compiler/dttable2.c
-@@ -1268,6 +1268,7 @@ DtCompileSdev (
-     ACPI_SDEV_PCIE          *Pcie = NULL;
-     ACPI_SDEV_NAMESPACE     *Namesp = NULL;
-     UINT32                  EntryCount;
-+    UINT16                  Tmp16;
- 
- 
-     /* Subtables */
-@@ -1289,7 +1290,7 @@ DtCompileSdev (
-         DtPushSubtable (Subtable);
- 
-         SdevHeader = ACPI_CAST_PTR (ACPI_SDEV_HEADER, Subtable->Buffer);
--        SdevHeader->Length = (UINT8)(sizeof (ACPI_SDEV_HEADER));
-+        SdevHeader->Length = (UINT16) (sizeof (ACPI_SDEV_HEADER));
- 
-         switch (SdevHeader->Type)
-         {
-@@ -1345,7 +1346,7 @@ DtCompileSdev (
-             ParentTable = DtPeekSubtable ();
-             DtInsertSubtable (ParentTable, Subtable);
- 
--            Namesp->DeviceIdOffset = sizeof (ACPI_SDEV_NAMESPACE);
-+            Namesp->DeviceIdOffset = (UINT16) sizeof (ACPI_SDEV_NAMESPACE);
-             Namesp->DeviceIdLength = (UINT16) Subtable->Length;
- 
-             /* Append Vendor data */
-@@ -1367,18 +1368,32 @@ DtCompileSdev (
-                     ParentTable = DtPeekSubtable ();
-                     DtInsertSubtable (ParentTable, Subtable);
- 
--                    Namesp->VendorDataOffset =
--                        Namesp->DeviceIdOffset + Namesp->DeviceIdLength;
--                    Namesp->VendorDataLength =
--                        (UINT16) Subtable->Length;
-+                    Namesp->VendorDataOffset = 
-+			    Namesp->DeviceIdOffset + 
-+			    Namesp->DeviceIdLength;
-+                    Namesp->VendorDataLength = (UINT16) Subtable->Length;
- 
-                     /* Final size of entire namespace structure */
- 
--                    SdevHeader->Length = (UINT16)(sizeof(ACPI_SDEV_NAMESPACE) +
--                        Subtable->Length + Namesp->DeviceIdLength);
-+		    SdevHeader->Length = (UINT16)
-+			    (sizeof(ACPI_SDEV_NAMESPACE) +
-+                             Subtable->Length +
-+			     Namesp->DeviceIdLength);
-                 }
-             }
- 
-+	    /* Make sure everything is now little-endian */
-+	    Tmp16 = AcpiUtReadUint16(&SdevHeader->Length);
-+	    SdevHeader->Length = Tmp16;
-+	    Tmp16 = AcpiUtReadUint16(&Namesp->DeviceIdOffset);
-+	    Namesp->DeviceIdOffset = Tmp16;
-+	    Tmp16 = AcpiUtReadUint16(&Namesp->DeviceIdLength);
-+	    Namesp->DeviceIdLength = Tmp16;
-+	    Tmp16 = AcpiUtReadUint16(&Namesp->VendorDataOffset);
-+	    Namesp->VendorDataOffset = Tmp16;
-+	    Tmp16 = AcpiUtReadUint16(&Namesp->VendorDataLength);
-+	    Namesp->VendorDataLength = Tmp16;
-+
-             break;
- 
-         case ACPI_SDEV_TYPE_PCIE_ENDPOINT_DEVICE:
-@@ -1408,9 +1423,9 @@ DtCompileSdev (
- 
-             /* Path offset will point immediately after the main subtable */
- 
--            Pcie->PathOffset = sizeof (ACPI_SDEV_PCIE);
-+	    Pcie->PathOffset = sizeof (ACPI_SDEV_PCIE);
-             Pcie->PathLength = (UINT16)
--                (EntryCount * sizeof (ACPI_SDEV_PCIE_PATH));
-+		    (EntryCount * sizeof (ACPI_SDEV_PCIE_PATH));
- 
-             /* Append the Vendor Data last */
- 
-@@ -1432,15 +1447,24 @@ DtCompileSdev (
-                     DtInsertSubtable (ParentTable, Subtable);
- 
-                     Pcie->VendorDataOffset =
--                        Pcie->PathOffset + Pcie->PathLength;
--                    Pcie->VendorDataLength = (UINT16)
--                        Subtable->Length;
-+			    Pcie->PathOffset + Pcie->PathLength;
-+                    Pcie->VendorDataLength = (UINT16) Subtable->Length;
-                 }
-             }
- 
-             SdevHeader->Length =
--                sizeof (ACPI_SDEV_PCIE) +
-+		sizeof (ACPI_SDEV_PCIE) +
-                 Pcie->PathLength + Pcie->VendorDataLength;
-+	    Tmp16 = AcpiUtReadUint16(&SdevHeader->Length);
-+	    SdevHeader->Length = Tmp16;
-+	    Tmp16 = AcpiUtReadUint16(&Pcie->PathOffset);
-+	    Pcie->PathOffset = Tmp16;
-+	    Tmp16 = AcpiUtReadUint16(&Pcie->PathLength);
-+	    Pcie->PathLength = Tmp16;
-+	    Tmp16 = AcpiUtReadUint16(&Pcie->VendorDataOffset);
-+	    Pcie->VendorDataOffset = Tmp16;
-+	    Tmp16 = AcpiUtReadUint16(&Pcie->VendorDataLength);
-+	    Pcie->VendorDataLength = Tmp16;
-             break;
- 
-         default:
diff --git a/0022-Support-MPST-in-a-big-endian-world.patch b/0025-Support-MPST-in-a-big-endian-world.patch
similarity index 73%
rename from 0022-Support-MPST-in-a-big-endian-world.patch
rename to 0025-Support-MPST-in-a-big-endian-world.patch
index 2b4c2e3..600c6ec 100644
--- a/0022-Support-MPST-in-a-big-endian-world.patch
+++ b/0025-Support-MPST-in-a-big-endian-world.patch
@@ -1,7 +1,7 @@
-From dfe414b053fb9feb905271785b319afa7ba72932 Mon Sep 17 00:00:00 2001
+From 0a25688f36df62579f4dd0444ceba33a0f8d4dcc Mon Sep 17 00:00:00 2001
 From: Al Stone <ahs3@redhat.com>
 Date: Wed, 23 Sep 2020 16:08:24 -0600
-Subject: [PATCH 22/40] Support MPST in a big-endian world
+Subject: [PATCH 25/45] Support MPST in a big-endian world
 
 Signed-off-by: Al Stone <ahs3@redhat.com>
 ---
@@ -9,15 +9,15 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/compiler/dttable2.c |  8 ++++----
  2 files changed, 23 insertions(+), 18 deletions(-)
 
-Index: acpica-unix2-20200925/source/common/dmtbdump2.c
+Index: acpica-unix2-20210604/source/common/dmtbdump2.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20200925/source/common/dmtbdump2.c
-@@ -834,11 +834,13 @@ AcpiDmDumpMpst (
+--- acpica-unix2-20210604.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20210604/source/common/dmtbdump2.c
+@@ -995,11 +995,13 @@ AcpiDmDumpMpst (
      UINT16                  SubtableCount;
      UINT32                  PowerStateCount;
      UINT32                  ComponentCount;
-+    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
++    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
 +    UINT16                  Tmp16;
  
  
@@ -28,13 +28,13 @@ Index: acpica-unix2-20200925/source/common/dmtbdump2.c
      if (ACPI_FAILURE (Status))
      {
          return;
-@@ -846,13 +848,14 @@ AcpiDmDumpMpst (
+@@ -1007,13 +1009,14 @@ AcpiDmDumpMpst (
  
      /* Subtable: Memory Power Node(s) */
  
 -    SubtableCount = (ACPI_CAST_PTR (ACPI_TABLE_MPST, Table))->PowerNodeCount;
 +    Tmp16 = (ACPI_CAST_PTR (ACPI_TABLE_MPST, Table))->PowerNodeCount;
-+    SubtableCount = AcpiUtReadUint16(&Tmp16);
++    SubtableCount = AcpiUtReadUint16 (&Tmp16);
      Subtable0 = ACPI_ADD_PTR (ACPI_MPST_POWER_NODE, Table, Offset);
  
 -    while ((Offset < Table->Length) && SubtableCount)
@@ -46,18 +46,18 @@ Index: acpica-unix2-20200925/source/common/dmtbdump2.c
              sizeof (ACPI_MPST_POWER_NODE), AcpiDmTableInfoMpst0);
          if (ACPI_FAILURE (Status))
          {
-@@ -861,8 +864,8 @@ AcpiDmDumpMpst (
+@@ -1022,8 +1025,8 @@ AcpiDmDumpMpst (
  
          /* Extract the sub-subtable counts */
  
 -        PowerStateCount = Subtable0->NumPowerStates;
 -        ComponentCount = Subtable0->NumPhysicalComponents;
-+        PowerStateCount = AcpiUtReadUint16(&Subtable0->NumPowerStates);
-+        ComponentCount = AcpiUtReadUint16(&Subtable0->NumPhysicalComponents);
++        PowerStateCount = AcpiUtReadUint16 (&Subtable0->NumPowerStates);
++        ComponentCount = AcpiUtReadUint16 (&Subtable0->NumPhysicalComponents);
          Offset += sizeof (ACPI_MPST_POWER_NODE);
  
          /* Sub-subtables - Memory Power State Structure(s) */
-@@ -873,7 +876,7 @@ AcpiDmDumpMpst (
+@@ -1034,7 +1037,7 @@ AcpiDmDumpMpst (
          while (PowerStateCount)
          {
              AcpiOsPrintf ("\n");
@@ -66,7 +66,7 @@ Index: acpica-unix2-20200925/source/common/dmtbdump2.c
                  sizeof (ACPI_MPST_POWER_STATE), AcpiDmTableInfoMpst0A);
              if (ACPI_FAILURE (Status))
              {
-@@ -896,7 +899,7 @@ AcpiDmDumpMpst (
+@@ -1057,7 +1060,7 @@ AcpiDmDumpMpst (
  
          while (ComponentCount)
          {
@@ -75,16 +75,16 @@ Index: acpica-unix2-20200925/source/common/dmtbdump2.c
                  sizeof (ACPI_MPST_COMPONENT), AcpiDmTableInfoMpst0B);
              if (ACPI_FAILURE (Status))
              {
-@@ -913,22 +916,24 @@ AcpiDmDumpMpst (
+@@ -1074,22 +1077,24 @@ AcpiDmDumpMpst (
          SubtableCount--;
          Subtable0 = ACPI_ADD_PTR (ACPI_MPST_POWER_NODE, Subtable0,
              sizeof (ACPI_MPST_POWER_NODE) +
 -            (sizeof (ACPI_MPST_POWER_STATE) * Subtable0->NumPowerStates) +
 -            (sizeof (ACPI_MPST_COMPONENT) * Subtable0->NumPhysicalComponents));
-+            (sizeof (ACPI_MPST_POWER_STATE) * 
-+	         AcpiUtReadUint16(&Subtable0->NumPowerStates)) +
-+            (sizeof (ACPI_MPST_COMPONENT) * 
-+	         AcpiUtReadUint16(&Subtable0->NumPhysicalComponents)));
++            (sizeof (ACPI_MPST_POWER_STATE) *
++                AcpiUtReadUint16 (&Subtable0->NumPowerStates)) +
++            (sizeof (ACPI_MPST_COMPONENT) *
++                AcpiUtReadUint16 (&Subtable0->NumPhysicalComponents)));
      }
  
      /* Subtable: Count of Memory Power State Characteristic structures */
@@ -100,11 +100,11 @@ Index: acpica-unix2-20200925/source/common/dmtbdump2.c
      }
  
 -    SubtableCount = Subtable1->CharacteristicsCount;
-+    SubtableCount = AcpiUtReadUint16(&Subtable1->CharacteristicsCount);
++    SubtableCount = AcpiUtReadUint16 (&Subtable1->CharacteristicsCount);
      Offset += sizeof (ACPI_MPST_DATA_HDR);
  
      /* Subtable: Memory Power State Characteristics structure(s) */
-@@ -936,10 +941,10 @@ AcpiDmDumpMpst (
+@@ -1097,10 +1102,10 @@ AcpiDmDumpMpst (
      Subtable2 = ACPI_ADD_PTR (ACPI_MPST_POWER_DATA, Subtable1,
          sizeof (ACPI_MPST_DATA_HDR));
  
@@ -117,31 +117,31 @@ Index: acpica-unix2-20200925/source/common/dmtbdump2.c
              sizeof (ACPI_MPST_POWER_DATA), AcpiDmTableInfoMpst2);
          if (ACPI_FAILURE (Status))
          {
-Index: acpica-unix2-20200925/source/compiler/dttable2.c
+Index: acpica-unix2-20210604/source/compiler/dttable2.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/compiler/dttable2.c
-+++ acpica-unix2-20200925/source/compiler/dttable2.c
-@@ -345,7 +345,7 @@ DtCompileMpst (
+--- acpica-unix2-20210604.orig/source/compiler/dttable2.c
++++ acpica-unix2-20210604/source/compiler/dttable2.c
+@@ -350,7 +350,7 @@ DtCompileMpst (
      DtPushSubtable (Subtable);
  
      MpstChannelInfo = ACPI_CAST_PTR (ACPI_MPST_CHANNEL, Subtable->Buffer);
 -    SubtableCount = MpstChannelInfo->PowerNodeCount;
-+    SubtableCount = AcpiUtReadUint16(&MpstChannelInfo->PowerNodeCount);
++    SubtableCount = AcpiUtReadUint16 (&MpstChannelInfo->PowerNodeCount);
  
      while (*PFieldList && SubtableCount)
      {
-@@ -363,8 +363,8 @@ DtCompileMpst (
+@@ -368,8 +368,8 @@ DtCompileMpst (
          DtPushSubtable (Subtable);
  
          MpstPowerNode = ACPI_CAST_PTR (ACPI_MPST_POWER_NODE, Subtable->Buffer);
 -        PowerStateCount = MpstPowerNode->NumPowerStates;
 -        ComponentCount = MpstPowerNode->NumPhysicalComponents;
-+        PowerStateCount = AcpiUtReadUint16(&MpstPowerNode->NumPowerStates);
-+        ComponentCount = AcpiUtReadUint16(&MpstPowerNode->NumPhysicalComponents);
++        PowerStateCount = AcpiUtReadUint16 (&MpstPowerNode->NumPowerStates);
++        ComponentCount = AcpiUtReadUint16 (&MpstPowerNode->NumPhysicalComponents);
  
          ParentTable = DtPeekSubtable ();
  
-@@ -417,7 +417,7 @@ DtCompileMpst (
+@@ -422,7 +422,7 @@ DtCompileMpst (
      DtPushSubtable (Subtable);
  
      MpstDataHeader = ACPI_CAST_PTR (ACPI_MPST_DATA_HDR, Subtable->Buffer);
diff --git a/0023-Support-NFIT-in-a-big-endian-world.patch b/0026-Support-NFIT-in-a-big-endian-world.patch
similarity index 72%
rename from 0023-Support-NFIT-in-a-big-endian-world.patch
rename to 0026-Support-NFIT-in-a-big-endian-world.patch
index 42d5a7d..cf5267d 100644
--- a/0023-Support-NFIT-in-a-big-endian-world.patch
+++ b/0026-Support-NFIT-in-a-big-endian-world.patch
@@ -1,25 +1,28 @@
-From 2a1f049c35736ddba45300bc5aba4db9c9df3be7 Mon Sep 17 00:00:00 2001
+From 5aec8511fc433a71cb8b6d26be464355d0c3f5cc Mon Sep 17 00:00:00 2001
 From: Al Stone <ahs3@redhat.com>
 Date: Thu, 24 Sep 2020 15:25:53 -0600
-Subject: [PATCH 23/40] Support NFIT in a big-endian world
+Subject: [PATCH 26/45] Support NFIT in a big-endian world
+
+NB: this required correcting the starting pointer for the NFIT
+SMBIOS subtable; otherwise, disassembly did not work properly.
 
 Signed-off-by: Al Stone <ahs3@redhat.com>
 ---
  source/common/dmtable.c    |  4 ++--
- source/common/dmtbdump2.c  | 47 +++++++++++++++++++++++---------------
+ source/common/dmtbdump2.c  | 49 ++++++++++++++++++++++----------------
  source/compiler/dttable2.c | 11 ++++++---
- 3 files changed, 38 insertions(+), 24 deletions(-)
+ 3 files changed, 39 insertions(+), 25 deletions(-)
 
-Index: acpica-unix2-20200925/source/common/dmtable.c
+Index: acpica-unix2-20210604/source/common/dmtable.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/common/dmtable.c
-+++ acpica-unix2-20200925/source/common/dmtable.c
-@@ -1429,13 +1429,13 @@ AcpiDmDumpTable (
+--- acpica-unix2-20210604.orig/source/common/dmtable.c
++++ acpica-unix2-20210604/source/common/dmtable.c
+@@ -1526,13 +1526,13 @@ AcpiDmDumpTable (
  
              /* NFIT subtable types */
  
 -            Temp16 = ACPI_GET16 (Target);
-+            Temp16 = AcpiUtReadUint16(Target);
++            Temp16 = AcpiUtReadUint16 (Target);
              if (Temp16 > ACPI_NFIT_TYPE_RESERVED)
              {
                  Temp16 = ACPI_NFIT_TYPE_RESERVED;
@@ -30,16 +33,16 @@ Index: acpica-unix2-20200925/source/common/dmtable.c
                  AcpiDmNfitSubnames[Temp16]);
              break;
  
-Index: acpica-unix2-20200925/source/common/dmtbdump2.c
+Index: acpica-unix2-20210604/source/common/dmtbdump2.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20200925/source/common/dmtbdump2.c
-@@ -1084,18 +1084,23 @@ AcpiDmDumpNfit (
+--- acpica-unix2-20210604.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20210604/source/common/dmtbdump2.c
+@@ -1192,18 +1192,23 @@ AcpiDmDumpNfit (
      ACPI_STATUS             Status;
      UINT32                  Offset = sizeof (ACPI_TABLE_NFIT);
      UINT32                  FieldOffset = 0;
 -    UINT32                  Length;
-+    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
++    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
      ACPI_NFIT_HEADER        *Subtable;
      ACPI_DMTABLE_INFO       *InfoTable;
      ACPI_NFIT_INTERLEAVE    *Interleave = NULL;
@@ -60,7 +63,7 @@ Index: acpica-unix2-20200925/source/common/dmtbdump2.c
      if (ACPI_FAILURE (Status))
      {
          return;
-@@ -1104,19 +1109,21 @@ AcpiDmDumpNfit (
+@@ -1212,19 +1217,21 @@ AcpiDmDumpNfit (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_NFIT_HEADER, Table, Offset);
@@ -72,8 +75,8 @@ Index: acpica-unix2-20200925/source/common/dmtbdump2.c
          AcpiOsPrintf ("\n");
 -        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
 -            Subtable->Length, AcpiDmTableInfoNfitHdr);
-+	SubtableType = AcpiUtReadUint16(&Subtable->Type);
-+	SubtableLength = AcpiUtReadUint16(&Subtable->Length);
++        SubtableType = AcpiUtReadUint16 (&Subtable->Type);
++        SubtableLength = AcpiUtReadUint16 (&Subtable->Length);
 +        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
 +            SubtableLength, AcpiDmTableInfoNfitHdr);
          if (ACPI_FAILURE (Status))
@@ -86,7 +89,7 @@ Index: acpica-unix2-20200925/source/common/dmtbdump2.c
          {
          case ACPI_NFIT_TYPE_SYSTEM_ADDRESS:
  
-@@ -1167,11 +1174,11 @@ AcpiDmDumpNfit (
+@@ -1275,11 +1282,11 @@ AcpiDmDumpNfit (
  
          default:
              AcpiOsPrintf ("\n**** Unknown NFIT subtable type 0x%X\n",
@@ -100,7 +103,7 @@ Index: acpica-unix2-20200925/source/common/dmtbdump2.c
              {
                  AcpiOsPrintf ("Invalid zero length subtable\n");
                  return;
-@@ -1180,8 +1187,8 @@ AcpiDmDumpNfit (
+@@ -1288,8 +1295,8 @@ AcpiDmDumpNfit (
          }
  
          AcpiOsPrintf ("\n");
@@ -111,7 +114,7 @@ Index: acpica-unix2-20200925/source/common/dmtbdump2.c
          if (ACPI_FAILURE (Status))
          {
              return;
-@@ -1189,14 +1196,15 @@ AcpiDmDumpNfit (
+@@ -1297,14 +1304,15 @@ AcpiDmDumpNfit (
  
          /* Per-subtable variable-length fields */
  
@@ -122,7 +125,7 @@ Index: acpica-unix2-20200925/source/common/dmtbdump2.c
  
              Interleave = ACPI_CAST_PTR (ACPI_NFIT_INTERLEAVE, Subtable);
 -            for (i = 0; i < Interleave->LineCount; i++)
-+	    LineCount = AcpiUtReadUint32(&Interleave->LineCount);
++            LineCount = AcpiUtReadUint32 (&Interleave->LineCount);
 +            for (i = 0; i < LineCount; i++)
              {
 -                Status = AcpiDmDumpTable (Table->Length, Offset + FieldOffset,
@@ -130,7 +133,7 @@ Index: acpica-unix2-20200925/source/common/dmtbdump2.c
                      &Interleave->LineOffset[i],
                      sizeof (UINT32), AcpiDmTableInfoNfit2a);
                  if (ACPI_FAILURE (Status))
-@@ -1210,12 +1218,12 @@ AcpiDmDumpNfit (
+@@ -1318,14 +1326,14 @@ AcpiDmDumpNfit (
  
          case ACPI_NFIT_TYPE_SMBIOS:
  
@@ -143,14 +146,17 @@ Index: acpica-unix2-20200925/source/common/dmtbdump2.c
 -                Status = AcpiDmDumpTable (Table->Length,
 +                Status = AcpiDmDumpTable (TableLength,
                      sizeof (ACPI_NFIT_SMBIOS) - sizeof (UINT8),
-                     SmbiosInfo,
+-                    SmbiosInfo,
++                    SmbiosInfo + Offset,
                      Length, AcpiDmTableInfoNfit3a);
-@@ -1230,9 +1238,10 @@ AcpiDmDumpNfit (
+                 if (ACPI_FAILURE (Status))
+                 {
+@@ -1338,9 +1346,10 @@ AcpiDmDumpNfit (
          case ACPI_NFIT_TYPE_FLUSH_ADDRESS:
  
              Hint = ACPI_CAST_PTR (ACPI_NFIT_FLUSH_ADDRESS, Subtable);
 -            for (i = 0; i < Hint->HintCount; i++)
-+	    HintCount = AcpiUtReadUint16(&Hint->HintCount);
++            HintCount = AcpiUtReadUint16 (&Hint->HintCount);
 +            for (i = 0; i < HintCount; i++)
              {
 -                Status = AcpiDmDumpTable (Table->Length, Offset + FieldOffset,
@@ -158,7 +164,7 @@ Index: acpica-unix2-20200925/source/common/dmtbdump2.c
                      &Hint->HintAddress[i],
                      sizeof (UINT64), AcpiDmTableInfoNfit6a);
                  if (ACPI_FAILURE (Status))
-@@ -1251,8 +1260,8 @@ AcpiDmDumpNfit (
+@@ -1359,8 +1368,8 @@ AcpiDmDumpNfit (
  NextSubtable:
          /* Point to next subtable */
  
@@ -169,11 +175,11 @@ Index: acpica-unix2-20200925/source/common/dmtbdump2.c
      }
  }
  
-Index: acpica-unix2-20200925/source/compiler/dttable2.c
+Index: acpica-unix2-20210604/source/compiler/dttable2.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/compiler/dttable2.c
-+++ acpica-unix2-20200925/source/compiler/dttable2.c
-@@ -517,6 +517,7 @@ DtCompileNfit (
+--- acpica-unix2-20210604.orig/source/compiler/dttable2.c
++++ acpica-unix2-20210604/source/compiler/dttable2.c
+@@ -497,6 +497,7 @@ DtCompileNfit (
      UINT32                  Count;
      ACPI_NFIT_INTERLEAVE    *Interleave = NULL;
      ACPI_NFIT_FLUSH_ADDRESS *Hint = NULL;
@@ -181,17 +187,17 @@ Index: acpica-unix2-20200925/source/compiler/dttable2.c
  
  
      /* Main table */
-@@ -550,7 +551,8 @@ DtCompileNfit (
+@@ -530,7 +531,8 @@ DtCompileNfit (
  
          NfitHeader = ACPI_CAST_PTR (ACPI_NFIT_HEADER, Subtable->Buffer);
  
 -        switch (NfitHeader->Type)
-+	NfitHeaderType = AcpiUtReadUint16(&NfitHeader->Type);
++        NfitHeaderType = AcpiUtReadUint16 (&NfitHeader->Type);
 +        switch (NfitHeaderType)
          {
          case ACPI_NFIT_TYPE_SYSTEM_ADDRESS:
  
-@@ -610,7 +612,7 @@ DtCompileNfit (
+@@ -590,7 +592,7 @@ DtCompileNfit (
          DtInsertSubtable (ParentTable, Subtable);
          DtPopSubtable ();
  
@@ -200,22 +206,22 @@ Index: acpica-unix2-20200925/source/compiler/dttable2.c
          {
          case ACPI_NFIT_TYPE_INTERLEAVE:
  
-@@ -636,7 +638,8 @@ DtCompileNfit (
+@@ -616,7 +618,8 @@ DtCompileNfit (
                  Count++;
              }
  
 -            Interleave->LineCount = Count;
-+            AcpiUtWriteUint(&Interleave->LineCount, sizeof(UINT32),
-+			    &Count, sizeof(UINT32));
++            AcpiUtWriteUint (&Interleave->LineCount, sizeof (UINT32),
++                &Count, sizeof (UINT32));
              break;
  
          case ACPI_NFIT_TYPE_SMBIOS:
-@@ -682,6 +685,8 @@ DtCompileNfit (
+@@ -662,6 +665,8 @@ DtCompileNfit (
              }
  
              Hint->HintCount = (UINT16) Count;
-+            AcpiUtWriteUint(&Hint->HintCount, sizeof(UINT16),
-+			    &Count, sizeof(UINT32));
++            AcpiUtWriteUint (&Hint->HintCount, sizeof (UINT16),
++                &Count, sizeof (UINT32));
              break;
  
          default:
diff --git a/0027-Support-SDEV-in-a-big-endian-world.patch b/0027-Support-SDEV-in-a-big-endian-world.patch
new file mode 100644
index 0000000..800098e
--- /dev/null
+++ b/0027-Support-SDEV-in-a-big-endian-world.patch
@@ -0,0 +1,206 @@
+From 3d1ac6e76ad0c0d6454671b190ccbbfafb0cb4cc Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Tue, 29 Jun 2021 16:03:36 -0600
+Subject: [PATCH 27/45] Support SDEV in a big-endian world
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/common/dmtbdump2.c  | 48 +++++++++++++++++++++-----------------
+ source/compiler/dttable2.c | 27 ++++++++++++++++++++-
+ 2 files changed, 52 insertions(+), 23 deletions(-)
+
+Index: acpica-unix2-20210604/source/common/dmtbdump2.c
+===================================================================
+--- acpica-unix2-20210604.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20210604/source/common/dmtbdump2.c
+@@ -2125,7 +2125,7 @@ AcpiDmDumpSdev (
+     ACPI_SDEV_NAMESPACE         *Namesp;
+     ACPI_DMTABLE_INFO           *InfoTable;
+     ACPI_DMTABLE_INFO           *SecureComponentInfoTable;
+-    UINT32                      Length = Table->Length;
++    UINT32                      TableLength = AcpiUtReadUint32 (&Table->Length);
+     UINT32                      Offset = sizeof (ACPI_TABLE_SDEV);
+     UINT16                      PathOffset;
+     UINT16                      PathLength;
+@@ -2133,11 +2133,12 @@ AcpiDmDumpSdev (
+     UINT16                      VendorDataLength;
+     ACPI_SDEV_SECURE_COMPONENT  *SecureComponent = NULL;
+     UINT32                      CurrentOffset = 0;
++    UINT16                      SubtableLength;
+ 
+ 
+     /* Main table */
+ 
+-    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoSdev);
++    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoSdev);
+     if (ACPI_FAILURE (Status))
+     {
+         return;
+@@ -2146,13 +2147,14 @@ AcpiDmDumpSdev (
+     /* Subtables */
+ 
+     Subtable = ACPI_ADD_PTR (ACPI_SDEV_HEADER, Table, Offset);
+-    while (Offset < Table->Length)
++    while (Offset < TableLength)
+     {
+         /* Common subtable header */
+ 
+         AcpiOsPrintf ("\n");
+-        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
+-            Subtable->Length, AcpiDmTableInfoSdevHdr);
++	SubtableLength = AcpiUtReadUint16 (&Subtable->Length);
++        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
++            SubtableLength, AcpiDmTableInfoSdevHdr);
+         if (ACPI_FAILURE (Status))
+         {
+             return;
+@@ -2175,8 +2177,8 @@ AcpiDmDumpSdev (
+         }
+ 
+         AcpiOsPrintf ("\n");
+-        Status = AcpiDmDumpTable (Table->Length, 0, Subtable,
+-            Subtable->Length, InfoTable);
++        Status = AcpiDmDumpTable (TableLength, 0, Subtable,
++            SubtableLength, InfoTable);
+         if (ACPI_FAILURE (Status))
+         {
+             return;
+@@ -2235,12 +2237,12 @@ AcpiDmDumpSdev (
+             /* Dump the PCIe device ID(s) */
+ 
+             Namesp = ACPI_CAST_PTR (ACPI_SDEV_NAMESPACE, Subtable);
+-            PathOffset = Namesp->DeviceIdOffset;
+-            PathLength = Namesp->DeviceIdLength;
++            PathOffset = AcpiUtReadUint16 (&Namesp->DeviceIdOffset);
++            PathLength = AcpiUtReadUint16 (&Namesp->DeviceIdLength);
+ 
+             if (PathLength)
+             {
+-                Status = AcpiDmDumpTable (Table->Length, CurrentOffset,
++                Status = AcpiDmDumpTable (TableLength, CurrentOffset,
+                     ACPI_ADD_PTR (UINT8, Namesp, PathOffset),
+                     PathLength, AcpiDmTableInfoSdev0a);
+                 if (ACPI_FAILURE (Status))
+@@ -2252,14 +2254,14 @@ AcpiDmDumpSdev (
+ 
+             /* Dump the vendor-specific data */
+ 
+-            VendorDataLength =
+-                Namesp->VendorDataLength;
++            VendorDataLength = AcpiUtReadUint16 (&Namesp->VendorDataLength);
+             VendorDataOffset =
+-                Namesp->DeviceIdOffset + Namesp->DeviceIdLength;
++                AcpiUtReadUint16 (&Namesp->DeviceIdOffset) +
++		AcpiUtReadUint16 (&Namesp->DeviceIdLength);
+ 
+             if (VendorDataLength)
+             {
+-                Status = AcpiDmDumpTable (Table->Length, 0,
++                Status = AcpiDmDumpTable (TableLength, 0,
+                     ACPI_ADD_PTR (UINT8, Namesp, VendorDataOffset),
+                     VendorDataLength, AcpiDmTableInfoSdev1b);
+                 if (ACPI_FAILURE (Status))
+@@ -2274,12 +2276,12 @@ AcpiDmDumpSdev (
+             /* PCI path substructures */
+ 
+             Pcie = ACPI_CAST_PTR (ACPI_SDEV_PCIE, Subtable);
+-            PathOffset = Pcie->PathOffset;
+-            PathLength = Pcie->PathLength;
++            PathOffset = AcpiUtReadUint16 (&Pcie->PathOffset);
++            PathLength = AcpiUtReadUint16 (&Pcie->PathLength);
+ 
+             while (PathLength)
+             {
+-                Status = AcpiDmDumpTable (Table->Length,
++                Status = AcpiDmDumpTable (TableLength,
+                     PathOffset + Offset,
+                     ACPI_ADD_PTR (UINT8, Pcie, PathOffset),
+                     sizeof (ACPI_SDEV_PCIE_PATH), AcpiDmTableInfoSdev1a);
+@@ -2294,12 +2296,14 @@ AcpiDmDumpSdev (
+ 
+             /* VendorData */
+ 
+-            VendorDataLength = Pcie->VendorDataLength;
+-            VendorDataOffset = Pcie->PathOffset + Pcie->PathLength;
++            VendorDataLength = AcpiUtReadUint16 (&Pcie->VendorDataLength);
++            VendorDataOffset = 
++	            AcpiUtReadUint16 (&Pcie->PathOffset) +
++	            AcpiUtReadUint16 (&Pcie->PathLength);
+ 
+             if (VendorDataLength)
+             {
+-                Status = AcpiDmDumpTable (Table->Length, 0,
++                Status = AcpiDmDumpTable (TableLength, 0,
+                     ACPI_ADD_PTR (UINT8, Pcie, VendorDataOffset),
+                     VendorDataLength, AcpiDmTableInfoSdev1b);
+                 if (ACPI_FAILURE (Status))
+@@ -2316,8 +2320,8 @@ AcpiDmDumpSdev (
+ NextSubtable:
+         /* Point to next subtable */
+ 
+-        Offset += Subtable->Length;
++        Offset += SubtableLength;
+         Subtable = ACPI_ADD_PTR (ACPI_SDEV_HEADER, Subtable,
+-            Subtable->Length);
++            SubtableLength);
+     }
+ }
+Index: acpica-unix2-20210604/source/compiler/dttable2.c
+===================================================================
+--- acpica-unix2-20210604.orig/source/compiler/dttable2.c
++++ acpica-unix2-20210604/source/compiler/dttable2.c
+@@ -1493,6 +1493,7 @@ DtCompileSdev (
+     UINT32                      EntryCount;
+     ACPI_SDEV_SECURE_COMPONENT  *SecureComponent = NULL;
+     UINT16                      ComponentLength = 0;
++    UINT16                      Tmp16;
+ 
+ 
+     /* Subtables */
+@@ -1514,7 +1515,7 @@ DtCompileSdev (
+         DtPushSubtable (Subtable);
+ 
+         SdevHeader = ACPI_CAST_PTR (ACPI_SDEV_HEADER, Subtable->Buffer);
+-        SdevHeader->Length = (UINT8)(sizeof (ACPI_SDEV_HEADER));
++        SdevHeader->Length = (UINT16) (sizeof (ACPI_SDEV_HEADER));
+ 
+         switch (SdevHeader->Type)
+         {
+@@ -1687,6 +1688,18 @@ DtCompileSdev (
+                 }
+             }
+ 
++            /* Make sure everything is now little-endian */
++            Tmp16 = AcpiUtReadUint16 (&SdevHeader->Length);
++            SdevHeader->Length = Tmp16;
++            Tmp16 = AcpiUtReadUint16 (&Namesp->DeviceIdOffset);
++            Namesp->DeviceIdOffset = Tmp16;
++            Tmp16 = AcpiUtReadUint16 (&Namesp->DeviceIdLength);
++            Namesp->DeviceIdLength = Tmp16;
++            Tmp16 = AcpiUtReadUint16 (&Namesp->VendorDataOffset);
++            Namesp->VendorDataOffset = Tmp16;
++            Tmp16 = AcpiUtReadUint16 (&Namesp->VendorDataLength);
++            Namesp->VendorDataLength = Tmp16;
++
+             break;
+ 
+         case ACPI_SDEV_TYPE_PCIE_ENDPOINT_DEVICE:
+@@ -1749,6 +1762,18 @@ DtCompileSdev (
+             SdevHeader->Length =
+                 sizeof (ACPI_SDEV_PCIE) +
+                 Pcie->PathLength + Pcie->VendorDataLength;
++
++            Tmp16 = AcpiUtReadUint16 (&SdevHeader->Length);
++            SdevHeader->Length = Tmp16;
++            Tmp16 = AcpiUtReadUint16 (&Pcie->PathOffset);
++            Pcie->PathOffset = Tmp16;
++            Tmp16 = AcpiUtReadUint16 (&Pcie->PathLength);
++            Pcie->PathLength = Tmp16;
++            Tmp16 = AcpiUtReadUint16 (&Pcie->VendorDataOffset);
++            Pcie->VendorDataOffset = Tmp16;
++            Tmp16 = AcpiUtReadUint16 (&Pcie->VendorDataLength);
++            Pcie->VendorDataLength = Tmp16;
++		
+             break;
+ 
+         default:
diff --git a/0025-Support-HMAT-in-a-big-endian-world.patch b/0028-Support-HMAT-in-a-big-endian-world.patch
similarity index 75%
rename from 0025-Support-HMAT-in-a-big-endian-world.patch
rename to 0028-Support-HMAT-in-a-big-endian-world.patch
index 39ebf62..eb37f70 100644
--- a/0025-Support-HMAT-in-a-big-endian-world.patch
+++ b/0028-Support-HMAT-in-a-big-endian-world.patch
@@ -1,7 +1,7 @@
-From 03425774d2c19874ad4483ec6b7e13c0146e81f7 Mon Sep 17 00:00:00 2001
+From 915b8b70726fd01befdeac0c8630db528ac40552 Mon Sep 17 00:00:00 2001
 From: Al Stone <ahs3@redhat.com>
 Date: Fri, 25 Sep 2020 16:56:55 -0600
-Subject: [PATCH 25/40] Support HMAT in a big-endian world
+Subject: [PATCH 28/45] Support HMAT in a big-endian world
 
 Signed-off-by: Al Stone <ahs3@redhat.com>
 ---
@@ -9,15 +9,15 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/compiler/dttable1.c | 24 ++++++++++---
  2 files changed, 59 insertions(+), 35 deletions(-)
 
-Index: acpica-unix2-20200925/source/common/dmtbdump1.c
+Index: acpica-unix2-20210604/source/common/dmtbdump1.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/common/dmtbdump1.c
-+++ acpica-unix2-20200925/source/common/dmtbdump1.c
-@@ -1301,37 +1301,45 @@ AcpiDmDumpHmat (
+--- acpica-unix2-20210604.orig/source/common/dmtbdump1.c
++++ acpica-unix2-20210604/source/common/dmtbdump1.c
+@@ -1379,37 +1379,45 @@ AcpiDmDumpHmat (
      UINT32                  Length;
      ACPI_DMTABLE_INFO       *InfoTable;
      UINT32                  i, j;
-+    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
++    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
 +    UINT16                  HmatStructType;
 +    UINT32                  HmatStructLength;
 +    UINT32                  InitPDs;
@@ -44,7 +44,7 @@ Index: acpica-unix2-20200925/source/common/dmtbdump1.c
  
          HmatStruct = ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, Table, Offset);
 -        if (HmatStruct->Length < sizeof (ACPI_HMAT_STRUCTURE))
-+	HmatStructLength = AcpiUtReadUint32(&HmatStruct->Length);
++        HmatStructLength = AcpiUtReadUint32 (&HmatStruct->Length);
 +        if (HmatStructLength < sizeof (ACPI_HMAT_STRUCTURE))
          {
              AcpiOsPrintf ("Invalid HMAT structure length\n");
@@ -60,12 +60,12 @@ Index: acpica-unix2-20200925/source/common/dmtbdump1.c
          }
  
 -        switch (HmatStruct->Type)
-+	HmatStructType = AcpiUtReadUint16(&HmatStruct->Type);
++        HmatStructType = AcpiUtReadUint16 (&HmatStruct->Type);
 +        switch (HmatStructType)
          {
          case ACPI_HMAT_TYPE_ADDRESS_RANGE:
  
-@@ -1354,7 +1362,7 @@ AcpiDmDumpHmat (
+@@ -1432,7 +1440,7 @@ AcpiDmDumpHmat (
          default:
  
              AcpiOsPrintf ("\n**** Unknown HMAT structure type 0x%X\n",
@@ -74,7 +74,7 @@ Index: acpica-unix2-20200925/source/common/dmtbdump1.c
  
              /* Attempt to continue */
  
-@@ -1363,13 +1371,13 @@ AcpiDmDumpHmat (
+@@ -1441,13 +1449,13 @@ AcpiDmDumpHmat (
  
          /* Dump HMAT structure body */
  
@@ -91,7 +91,7 @@ Index: acpica-unix2-20200925/source/common/dmtbdump1.c
          if (ACPI_FAILURE (Status))
          {
              return;
-@@ -1377,7 +1385,7 @@ AcpiDmDumpHmat (
+@@ -1455,7 +1463,7 @@ AcpiDmDumpHmat (
  
          /* Dump HMAT structure additionals */
  
@@ -100,15 +100,15 @@ Index: acpica-unix2-20200925/source/common/dmtbdump1.c
          {
          case ACPI_HMAT_TYPE_LOCALITY:
  
-@@ -1386,15 +1394,16 @@ AcpiDmDumpHmat (
+@@ -1464,15 +1472,16 @@ AcpiDmDumpHmat (
  
              /* Dump initiator proximity domains */
  
 -            if ((UINT32)(HmatStruct->Length - SubtableOffset) <
 -                (UINT32)(HmatLocality->NumberOfInitiatorPDs * 4))
-+	    InitPDs = AcpiUtReadUint32(&HmatLocality->NumberOfInitiatorPDs);
-+            if ((UINT32)(HmatStructLength - SubtableOffset) <
-+                (UINT32)(InitPDs * 4))
++            InitPDs = AcpiUtReadUint32 (&HmatLocality->NumberOfInitiatorPDs);
++            if ((UINT32) (HmatStructLength - SubtableOffset) <
++                (UINT32) (InitPDs * 4))
              {
                  AcpiOsPrintf ("Invalid initiator proximity domain number\n");
                  return;
@@ -121,15 +121,15 @@ Index: acpica-unix2-20200925/source/common/dmtbdump1.c
                      ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, HmatStruct, SubtableOffset),
                      4, AcpiDmTableInfoHmat1a);
                  if (ACPI_FAILURE (Status))
-@@ -1407,15 +1416,16 @@ AcpiDmDumpHmat (
+@@ -1485,15 +1494,16 @@ AcpiDmDumpHmat (
  
              /* Dump target proximity domains */
  
 -            if ((UINT32)(HmatStruct->Length - SubtableOffset) <
 -                (UINT32)(HmatLocality->NumberOfTargetPDs * 4))
-+	    TgtPDs = AcpiUtReadUint32(&HmatLocality->NumberOfTargetPDs);
-+            if ((UINT32)(HmatStructLength - SubtableOffset) <
-+                (UINT32)(TgtPDs * 4))
++            TgtPDs = AcpiUtReadUint32 (&HmatLocality->NumberOfTargetPDs);
++            if ((UINT32) (HmatStructLength - SubtableOffset) <
++                (UINT32) (TgtPDs * 4))
              {
                  AcpiOsPrintf ("Invalid target proximity domain number\n");
                  return;
@@ -142,15 +142,15 @@ Index: acpica-unix2-20200925/source/common/dmtbdump1.c
                      ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, HmatStruct, SubtableOffset),
                      4, AcpiDmTableInfoHmat1b);
                  if (ACPI_FAILURE (Status))
-@@ -1428,18 +1438,17 @@ AcpiDmDumpHmat (
+@@ -1506,18 +1516,17 @@ AcpiDmDumpHmat (
  
              /* Dump latency/bandwidth entris */
  
 -            if ((UINT32)(HmatStruct->Length - SubtableOffset) <
 -                (UINT32)(HmatLocality->NumberOfInitiatorPDs *
 -                         HmatLocality->NumberOfTargetPDs * 2))
-+            if ((UINT32)(HmatStructLength - SubtableOffset) <
-+                (UINT32)(InitPDs * TgtPDs * 2))
++            if ((UINT32) (HmatStructLength - SubtableOffset) <
++                (UINT32) (InitPDs * TgtPDs * 2))
              {
                  AcpiOsPrintf ("Invalid latency/bandwidth entry number\n");
                  return;
@@ -166,15 +166,15 @@ Index: acpica-unix2-20200925/source/common/dmtbdump1.c
                          ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, HmatStruct, SubtableOffset),
                          2, AcpiDmTableInfoHmat1c);
                      if (ACPI_FAILURE(Status))
-@@ -1459,15 +1468,16 @@ AcpiDmDumpHmat (
+@@ -1537,15 +1546,16 @@ AcpiDmDumpHmat (
  
              /* Dump SMBIOS handles */
  
 -            if ((UINT32)(HmatStruct->Length - SubtableOffset) <
 -                (UINT32)(HmatCache->NumberOfSMBIOSHandles * 2))
-+	    SMBIOSHandles = AcpiUtReadUint16(&HmatCache->NumberOfSMBIOSHandles);
-+            if ((UINT32)(HmatStructLength - SubtableOffset) <
-+                (UINT32)(SMBIOSHandles * 2))
++            SMBIOSHandles = AcpiUtReadUint16 (&HmatCache->NumberOfSMBIOSHandles);
++            if ((UINT32) (HmatStructLength - SubtableOffset) <
++                (UINT32) (SMBIOSHandles * 2))
              {
                  AcpiOsPrintf ("Invalid SMBIOS handle number\n");
                  return;
@@ -187,7 +187,7 @@ Index: acpica-unix2-20200925/source/common/dmtbdump1.c
                      ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, HmatStruct, SubtableOffset),
                      2, AcpiDmTableInfoHmat2a);
                  if (ACPI_FAILURE (Status))
-@@ -1487,6 +1497,6 @@ AcpiDmDumpHmat (
+@@ -1565,6 +1575,6 @@ AcpiDmDumpHmat (
  NextSubtable:
          /* Point to next HMAT structure subtable */
  
@@ -195,11 +195,11 @@ Index: acpica-unix2-20200925/source/common/dmtbdump1.c
 +        Offset += (HmatStructLength);
      }
  }
-Index: acpica-unix2-20200925/source/compiler/dttable1.c
+Index: acpica-unix2-20210604/source/compiler/dttable1.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/compiler/dttable1.c
-+++ acpica-unix2-20200925/source/compiler/dttable1.c
-@@ -1295,6 +1295,8 @@ DtCompileHmat (
+--- acpica-unix2-20210604.orig/source/compiler/dttable1.c
++++ acpica-unix2-20210604/source/compiler/dttable1.c
+@@ -1369,6 +1369,8 @@ DtCompileHmat (
      UINT32                  TgtPDNumber;
      UINT64                  EntryNumber;
      UINT16                  SMBIOSHandleNumber;
@@ -208,17 +208,17 @@ Index: acpica-unix2-20200925/source/compiler/dttable1.c
  
  
      ParentTable = DtPeekSubtable ();
-@@ -1325,7 +1327,8 @@ DtCompileHmat (
+@@ -1399,7 +1401,8 @@ DtCompileHmat (
  
          /* Compile HMAT structure body */
  
 -        switch (HmatStruct->Type)
-+	HmatStructType = AcpiUtReadUint16(&HmatStruct->Type);
++        HmatStructType = AcpiUtReadUint16 (&HmatStruct->Type);
 +        switch (HmatStructType)
          {
          case ACPI_HMAT_TYPE_ADDRESS_RANGE:
  
-@@ -1358,7 +1361,7 @@ DtCompileHmat (
+@@ -1432,7 +1435,7 @@ DtCompileHmat (
  
          /* Compile HMAT structure additionals */
  
@@ -227,51 +227,51 @@ Index: acpica-unix2-20200925/source/compiler/dttable1.c
          {
          case ACPI_HMAT_TYPE_LOCALITY:
  
-@@ -1384,7 +1387,7 @@ DtCompileHmat (
+@@ -1458,7 +1461,7 @@ DtCompileHmat (
                  HmatStruct->Length += Subtable->Length;
                  IntPDNumber++;
              }
 -            HmatLocality->NumberOfInitiatorPDs = IntPDNumber;
-+            HmatLocality->NumberOfInitiatorPDs = AcpiUtReadUint32(&IntPDNumber);
++            HmatLocality->NumberOfInitiatorPDs = AcpiUtReadUint32 (&IntPDNumber);
  
              /* Compile target proximity domain list */
  
-@@ -1405,7 +1408,7 @@ DtCompileHmat (
+@@ -1479,7 +1482,7 @@ DtCompileHmat (
                  HmatStruct->Length += Subtable->Length;
                  TgtPDNumber++;
              }
 -            HmatLocality->NumberOfTargetPDs = TgtPDNumber;
-+            HmatLocality->NumberOfTargetPDs = AcpiUtReadUint32(&TgtPDNumber);
++            HmatLocality->NumberOfTargetPDs = AcpiUtReadUint32 (&TgtPDNumber);
  
              /* Save start of the entries for reporting errors */
  
-@@ -1430,6 +1433,9 @@ DtCompileHmat (
-                 HmatStruct->Length += Subtable->Length;
+@@ -1505,6 +1508,9 @@ DtCompileHmat (
                  EntryNumber++;
              }
-+	    
-+	    Length = AcpiUtReadUint32(&HmatStruct->Length);
-+	    HmatStruct->Length = Length;
  
++            Length = AcpiUtReadUint32 (&HmatStruct->Length);
++            HmatStruct->Length = Length;
++
              /* Validate number of entries */
  
-@@ -1464,11 +1470,19 @@ DtCompileHmat (
+             if (EntryNumber !=
+@@ -1538,11 +1544,19 @@ DtCompileHmat (
                  HmatStruct->Length += Subtable->Length;
                  SMBIOSHandleNumber++;
              }
 -            HmatCache->NumberOfSMBIOSHandles = SMBIOSHandleNumber;
-+            HmatCache->NumberOfSMBIOSHandles = 
-+		    AcpiUtReadUint16(&SMBIOSHandleNumber);
++            HmatCache->NumberOfSMBIOSHandles =
++                    AcpiUtReadUint16 (&SMBIOSHandleNumber);
 +
-+	    Length = AcpiUtReadUint32(&HmatStruct->Length);
-+	    HmatStruct->Length = Length;
++            Length = AcpiUtReadUint32 (&HmatStruct->Length);
++            HmatStruct->Length = Length;
 +
              break;
  
          default:
  
-+	    Length = AcpiUtReadUint32(&HmatStruct->Length);
-+	    HmatStruct->Length = Length;
++        Length = AcpiUtReadUint32(&HmatStruct->Length);
++        HmatStruct->Length = Length;
 +
              break;
          }
diff --git a/0026-Support-PDTT-in-a-big-endian-world.patch b/0029-Support-PDTT-in-a-big-endian-world.patch
similarity index 73%
rename from 0026-Support-PDTT-in-a-big-endian-world.patch
rename to 0029-Support-PDTT-in-a-big-endian-world.patch
index 5b4269f..8511288 100644
--- a/0026-Support-PDTT-in-a-big-endian-world.patch
+++ b/0029-Support-PDTT-in-a-big-endian-world.patch
@@ -1,23 +1,23 @@
-From afaa9043357a3b8adbaa1ea389a62da48f561896 Mon Sep 17 00:00:00 2001
+From 253fe3545e7d4eaa9cb93c771c9619f410109a02 Mon Sep 17 00:00:00 2001
 From: Al Stone <ahs3@redhat.com>
 Date: Fri, 25 Sep 2020 17:03:05 -0600
-Subject: [PATCH 26/40] Support PDTT in a big-endian world
+Subject: [PATCH 29/45] Support PDTT in a big-endian world
 
 Signed-off-by: Al Stone <ahs3@redhat.com>
 ---
  source/common/dmtbdump2.c | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
-Index: acpica-unix2-20200925/source/common/dmtbdump2.c
+Index: acpica-unix2-20210604/source/common/dmtbdump2.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20200925/source/common/dmtbdump2.c
-@@ -1385,13 +1385,13 @@ AcpiDmDumpPdtt (
+--- acpica-unix2-20210604.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20210604/source/common/dmtbdump2.c
+@@ -1498,13 +1498,13 @@ AcpiDmDumpPdtt (
  {
      ACPI_STATUS             Status;
      ACPI_PDTT_CHANNEL       *Subtable;
 -    UINT32                  Length = Table->Length;
-+    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
++    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
      UINT32                  Offset = sizeof (ACPI_TABLE_PDTT);
  
  
@@ -28,7 +28,7 @@ Index: acpica-unix2-20200925/source/common/dmtbdump2.c
      if (ACPI_FAILURE (Status))
      {
          return;
-@@ -1400,10 +1400,10 @@ AcpiDmDumpPdtt (
+@@ -1513,10 +1513,10 @@ AcpiDmDumpPdtt (
      /* Subtables. Currently there is only one type, but can be multiples */
  
      Subtable = ACPI_ADD_PTR (ACPI_PDTT_CHANNEL, Table, Offset);
diff --git a/0027-Support-PPTT-in-a-big-endian-world.patch b/0030-Support-PPTT-in-a-big-endian-world.patch
similarity index 69%
rename from 0027-Support-PPTT-in-a-big-endian-world.patch
rename to 0030-Support-PPTT-in-a-big-endian-world.patch
index a047d45..c4d062a 100644
--- a/0027-Support-PPTT-in-a-big-endian-world.patch
+++ b/0030-Support-PPTT-in-a-big-endian-world.patch
@@ -1,28 +1,28 @@
-From c5d7294c6deb7fe87eac981234d4c484313d5e40 Mon Sep 17 00:00:00 2001
+From 8923211d8bc1b0e4d3af6ff31ed6479057f612f6 Mon Sep 17 00:00:00 2001
 From: Al Stone <ahs3@redhat.com>
 Date: Fri, 25 Sep 2020 17:16:12 -0600
-Subject: [PATCH 27/40] Support PPTT in a big-endian world
+Subject: [PATCH 30/45] Support PPTT in a big-endian world
 
 Signed-off-by: Al Stone <ahs3@redhat.com>
 ---
- source/common/dmtbdump2.c  | 15 +++++++++------
+ source/common/dmtbdump2.c  | 17 ++++++++++-------
  source/compiler/dttable2.c |  7 +++++--
- 2 files changed, 14 insertions(+), 8 deletions(-)
+ 2 files changed, 15 insertions(+), 9 deletions(-)
 
-Index: acpica-unix2-20200925/source/common/dmtbdump2.c
+Index: acpica-unix2-20210604/source/common/dmtbdump2.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20200925/source/common/dmtbdump2.c
-@@ -1649,6 +1649,8 @@ AcpiDmDumpPptt (
+--- acpica-unix2-20210604.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20210604/source/common/dmtbdump2.c
+@@ -1785,6 +1785,8 @@ AcpiDmDumpPptt (
      UINT32                  Offset = sizeof (ACPI_TABLE_FPDT);
      ACPI_DMTABLE_INFO       *InfoTable;
      UINT32                  i;
-+    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
++    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
 +    UINT32                  NumPrivRes;
  
  
      /* There is no main table (other than the standard ACPI header) */
-@@ -1656,7 +1658,7 @@ AcpiDmDumpPptt (
+@@ -1792,7 +1794,7 @@ AcpiDmDumpPptt (
      /* Subtables */
  
      Offset = sizeof (ACPI_TABLE_HEADER);
@@ -31,7 +31,7 @@ Index: acpica-unix2-20200925/source/common/dmtbdump2.c
      {
          AcpiOsPrintf ("\n");
  
-@@ -1668,7 +1670,7 @@ AcpiDmDumpPptt (
+@@ -1804,7 +1806,7 @@ AcpiDmDumpPptt (
              AcpiOsPrintf ("Invalid subtable length\n");
              return;
          }
@@ -40,7 +40,7 @@ Index: acpica-unix2-20200925/source/common/dmtbdump2.c
              Subtable->Length, AcpiDmTableInfoPpttHdr);
          if (ACPI_FAILURE (Status))
          {
-@@ -1710,7 +1712,7 @@ AcpiDmDumpPptt (
+@@ -1846,7 +1848,7 @@ AcpiDmDumpPptt (
              AcpiOsPrintf ("Invalid subtable length\n");
              return;
          }
@@ -49,14 +49,15 @@ Index: acpica-unix2-20200925/source/common/dmtbdump2.c
              Subtable->Length, InfoTable);
          if (ACPI_FAILURE (Status))
          {
-@@ -1726,15 +1728,16 @@ AcpiDmDumpPptt (
+@@ -1862,15 +1864,16 @@ AcpiDmDumpPptt (
  
              /* Dump SMBIOS handles */
  
-+	    NumPrivRes = AcpiUtReadUint32(&PpttProcessor->NumberOfPrivResources);
-             if ((UINT8)(Subtable->Length - SubtableOffset) <
+-            if ((UINT8)(Subtable->Length - SubtableOffset) <
 -                (UINT8)(PpttProcessor->NumberOfPrivResources * 4))
-+                (UINT8)(NumPrivRes * 4))
++            NumPrivRes = AcpiUtReadUint32 (&PpttProcessor->NumberOfPrivResources);
++            if ((UINT8) (Subtable->Length - SubtableOffset) <
++                (UINT8) (NumPrivRes * 4))
              {
                  AcpiOsPrintf ("Invalid private resource number\n");
                  return;
@@ -69,19 +70,19 @@ Index: acpica-unix2-20200925/source/common/dmtbdump2.c
                      ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Subtable, SubtableOffset),
                      4, AcpiDmTableInfoPptt0a);
                  if (ACPI_FAILURE (Status))
-Index: acpica-unix2-20200925/source/compiler/dttable2.c
+Index: acpica-unix2-20210604/source/compiler/dttable2.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/compiler/dttable2.c
-+++ acpica-unix2-20200925/source/compiler/dttable2.c
-@@ -1028,6 +1028,7 @@ DtCompilePptt (
-     ACPI_DMTABLE_INFO       *InfoTable;
+--- acpica-unix2-20210604.orig/source/compiler/dttable2.c
++++ acpica-unix2-20210604/source/compiler/dttable2.c
+@@ -1123,6 +1123,7 @@ DtCompilePptt (
      DT_FIELD                **PFieldList = (DT_FIELD **) List;
      DT_FIELD                *SubtableStart;
+     ACPI_TABLE_HEADER       *PpttAcpiHeader;
 +    UINT32                  NumPrivRes;
  
  
      ParentTable = DtPeekSubtable ();
-@@ -1092,7 +1093,7 @@ DtCompilePptt (
+@@ -1187,7 +1188,7 @@ DtCompilePptt (
              {
                  /* Compile initiator proximity domain list */
  
@@ -90,7 +91,7 @@ Index: acpica-unix2-20200925/source/compiler/dttable2.c
                  while (*PFieldList)
                  {
                      Status = DtCompileTable (PFieldList,
-@@ -1108,8 +1109,10 @@ DtCompilePptt (
+@@ -1203,8 +1204,10 @@ DtCompilePptt (
  
                      DtInsertSubtable (ParentTable, Subtable);
                      PpttHeader->Length += (UINT8)(Subtable->Length);
@@ -98,7 +99,7 @@ Index: acpica-unix2-20200925/source/compiler/dttable2.c
 +                    NumPrivRes++;
                  }
 +                PpttProcessor->NumberOfPrivResources =
-+			AcpiUtReadUint32(&NumPrivRes);
++                        AcpiUtReadUint32 (&NumPrivRes);
              }
              break;
  
diff --git a/0028-Support-PCCT-in-a-big-endian-world.patch b/0031-Support-PCCT-in-a-big-endian-world.patch
similarity index 75%
rename from 0028-Support-PCCT-in-a-big-endian-world.patch
rename to 0031-Support-PCCT-in-a-big-endian-world.patch
index 49607ea..00d908e 100644
--- a/0028-Support-PCCT-in-a-big-endian-world.patch
+++ b/0031-Support-PCCT-in-a-big-endian-world.patch
@@ -1,23 +1,23 @@
-From 661f59c00e991553fb3f5fe7786eb0e2f640805c Mon Sep 17 00:00:00 2001
+From a58ff76fc6e68488d93b55016a7aeb257971a252 Mon Sep 17 00:00:00 2001
 From: Al Stone <ahs3@redhat.com>
 Date: Fri, 25 Sep 2020 17:39:34 -0600
-Subject: [PATCH 28/40] Support PCCT in a big-endian world
+Subject: [PATCH 31/45] Support PCCT in a big-endian world
 
 Signed-off-by: Al Stone <ahs3@redhat.com>
 ---
  source/common/dmtbdump2.c | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
-Index: acpica-unix2-20200925/source/common/dmtbdump2.c
+Index: acpica-unix2-20210604/source/common/dmtbdump2.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20200925/source/common/dmtbdump2.c
-@@ -1286,13 +1286,13 @@ AcpiDmDumpPcct (
+--- acpica-unix2-20210604.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20210604/source/common/dmtbdump2.c
+@@ -1394,13 +1394,13 @@ AcpiDmDumpPcct (
      ACPI_STATUS             Status;
      ACPI_PCCT_SUBSPACE      *Subtable;
      ACPI_DMTABLE_INFO       *InfoTable;
 -    UINT32                  Length = Table->Length;
-+    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
++    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
      UINT32                  Offset = sizeof (ACPI_TABLE_PCCT);
  
  
@@ -28,7 +28,7 @@ Index: acpica-unix2-20200925/source/common/dmtbdump2.c
      if (ACPI_FAILURE (Status))
      {
          return;
-@@ -1301,12 +1301,12 @@ AcpiDmDumpPcct (
+@@ -1409,12 +1409,12 @@ AcpiDmDumpPcct (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_PCCT_SUBSPACE, Table, Offset);
@@ -43,7 +43,7 @@ Index: acpica-unix2-20200925/source/common/dmtbdump2.c
              Subtable->Header.Length, AcpiDmTableInfoPcctHdr);
          if (ACPI_FAILURE (Status))
          {
-@@ -1349,7 +1349,7 @@ AcpiDmDumpPcct (
+@@ -1462,7 +1462,7 @@ AcpiDmDumpPcct (
          }
  
          AcpiOsPrintf ("\n");
diff --git a/0032-Support-SLIC-and-MSDM-in-a-big-endian-world.patch b/0032-Support-SLIC-and-MSDM-in-a-big-endian-world.patch
deleted file mode 100644
index bc20a15..0000000
--- a/0032-Support-SLIC-and-MSDM-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 0455d918688d9d208644d7f5f6f10d6199486e9c Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Mon, 28 Sep 2020 12:49:23 -0600
-Subject: [PATCH 32/40] Support SLIC and MSDM in a big-endian world
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/common/dmtbdump3.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-Index: acpica-unix2-20200925/source/common/dmtbdump3.c
-===================================================================
---- acpica-unix2-20200925.orig/source/common/dmtbdump3.c
-+++ acpica-unix2-20200925/source/common/dmtbdump3.c
-@@ -68,9 +68,10 @@ void
- AcpiDmDumpSlic (
-     ACPI_TABLE_HEADER       *Table)
- {
-+    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
- 
--    (void) AcpiDmDumpTable (Table->Length, sizeof (ACPI_TABLE_HEADER), Table,
--        Table->Length - sizeof (*Table), AcpiDmTableInfoSlic);
-+    (void) AcpiDmDumpTable (TableLength, sizeof (ACPI_TABLE_HEADER), Table,
-+        TableLength - sizeof (*Table), AcpiDmTableInfoSlic);
- }
- 
- 
diff --git a/0029-Support-WDAT-in-a-big-endian-world.patch b/0032-Support-WDAT-in-a-big-endian-world.patch
similarity index 72%
rename from 0029-Support-WDAT-in-a-big-endian-world.patch
rename to 0032-Support-WDAT-in-a-big-endian-world.patch
index 3e0661c..d28ec57 100644
--- a/0029-Support-WDAT-in-a-big-endian-world.patch
+++ b/0032-Support-WDAT-in-a-big-endian-world.patch
@@ -1,22 +1,22 @@
-From 520e143b2bacb39032c06a33f61ae05583be6b2a Mon Sep 17 00:00:00 2001
+From ff1449919ee7d395d301e3a56a4ba333604d0458 Mon Sep 17 00:00:00 2001
 From: Al Stone <ahs3@redhat.com>
 Date: Fri, 25 Sep 2020 18:13:20 -0600
-Subject: [PATCH 29/40] Support WDAT in a big-endian world
+Subject: [PATCH 32/45] Support WDAT in a big-endian world
 
 Signed-off-by: Al Stone <ahs3@redhat.com>
 ---
  source/common/dmtbdump3.c | 7 ++++---
  1 file changed, 4 insertions(+), 3 deletions(-)
 
-Index: acpica-unix2-20200925/source/common/dmtbdump3.c
+Index: acpica-unix2-20210604/source/common/dmtbdump3.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/common/dmtbdump3.c
-+++ acpica-unix2-20200925/source/common/dmtbdump3.c
-@@ -568,11 +568,12 @@ AcpiDmDumpWdat (
+--- acpica-unix2-20210604.orig/source/common/dmtbdump3.c
++++ acpica-unix2-20210604/source/common/dmtbdump3.c
+@@ -675,11 +675,12 @@ AcpiDmDumpWdat (
      ACPI_STATUS             Status;
      UINT32                  Offset = sizeof (ACPI_TABLE_WDAT);
      ACPI_WDAT_ENTRY         *Subtable;
-+    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
++    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
  
  
      /* Main table */
@@ -26,7 +26,7 @@ Index: acpica-unix2-20200925/source/common/dmtbdump3.c
      if (ACPI_FAILURE (Status))
      {
          return;
-@@ -581,12 +582,12 @@ AcpiDmDumpWdat (
+@@ -688,12 +689,12 @@ AcpiDmDumpWdat (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_WDAT_ENTRY, Table, Offset);
diff --git a/0030-Support-TCPA-in-a-big-endian-world.patch b/0033-Support-TCPA-in-a-big-endian-world.patch
similarity index 70%
rename from 0030-Support-TCPA-in-a-big-endian-world.patch
rename to 0033-Support-TCPA-in-a-big-endian-world.patch
index 4c9780e..21e8818 100644
--- a/0030-Support-TCPA-in-a-big-endian-world.patch
+++ b/0033-Support-TCPA-in-a-big-endian-world.patch
@@ -1,7 +1,7 @@
-From b2e9a4397077ad56fea5a8b3f9f63ce3be65ae48 Mon Sep 17 00:00:00 2001
+From b69b833f5a9205080b27d83379a31fad7fca1575 Mon Sep 17 00:00:00 2001
 From: Al Stone <ahs3@redhat.com>
 Date: Sun, 27 Sep 2020 12:09:28 -0600
-Subject: [PATCH 30/40] Support TCPA in a big-endian world
+Subject: [PATCH 33/45] Support TCPA in a big-endian world
 
 Signed-off-by: Al Stone <ahs3@redhat.com>
 ---
@@ -9,15 +9,15 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/compiler/dttable2.c |  4 +++-
  2 files changed, 11 insertions(+), 6 deletions(-)
 
-Index: acpica-unix2-20200925/source/common/dmtbdump3.c
+Index: acpica-unix2-20210604/source/common/dmtbdump3.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/common/dmtbdump3.c
-+++ acpica-unix2-20200925/source/common/dmtbdump3.c
-@@ -342,11 +342,13 @@ AcpiDmDumpTcpa (
+--- acpica-unix2-20210604.orig/source/common/dmtbdump3.c
++++ acpica-unix2-20210604/source/common/dmtbdump3.c
+@@ -401,11 +401,13 @@ AcpiDmDumpTcpa (
      ACPI_TABLE_TCPA_HDR     *Subtable = ACPI_ADD_PTR (
                                  ACPI_TABLE_TCPA_HDR, Table, Offset);
      ACPI_STATUS             Status;
-+    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
++    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
 +    UINT16                  PlatformClass;
  
  
@@ -28,12 +28,12 @@ Index: acpica-unix2-20200925/source/common/dmtbdump3.c
          0, AcpiDmTableInfoTcpaHdr);
      if (ACPI_FAILURE (Status))
      {
-@@ -357,18 +359,19 @@ AcpiDmDumpTcpa (
+@@ -416,18 +418,19 @@ AcpiDmDumpTcpa (
       * Examine the PlatformClass field to determine the table type.
       * Either a client or server table. Only one.
       */
 -    switch (CommonHeader->PlatformClass)
-+    PlatformClass = AcpiUtReadUint16(&CommonHeader->PlatformClass);
++    PlatformClass = AcpiUtReadUint16 (&CommonHeader->PlatformClass);
 +    switch (PlatformClass)
      {
      case ACPI_TCPA_CLIENT_TABLE:
@@ -52,11 +52,11 @@ Index: acpica-unix2-20200925/source/common/dmtbdump3.c
          break;
  
      default:
-Index: acpica-unix2-20200925/source/compiler/dttable2.c
+Index: acpica-unix2-20210604/source/compiler/dttable2.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/compiler/dttable2.c
-+++ acpica-unix2-20200925/source/compiler/dttable2.c
-@@ -1773,6 +1773,7 @@ DtCompileTcpa (
+--- acpica-unix2-20210604.orig/source/compiler/dttable2.c
++++ acpica-unix2-20210604/source/compiler/dttable2.c
+@@ -2139,6 +2139,7 @@ DtCompileTcpa (
      ACPI_TABLE_TCPA_HDR     *TcpaHeader;
      DT_SUBTABLE             *ParentTable;
      ACPI_STATUS             Status;
@@ -64,12 +64,12 @@ Index: acpica-unix2-20200925/source/compiler/dttable2.c
  
  
      /* Compile the main table */
-@@ -1793,7 +1794,8 @@ DtCompileTcpa (
+@@ -2159,7 +2160,8 @@ DtCompileTcpa (
       */
      TcpaHeader = ACPI_CAST_PTR (ACPI_TABLE_TCPA_HDR, ParentTable->Buffer);
  
 -    switch (TcpaHeader->PlatformClass)
-+    PlatformClass = AcpiUtReadUint16(&TcpaHeader->PlatformClass);
++    PlatformClass = AcpiUtReadUint16 (&TcpaHeader->PlatformClass);
 +    switch (PlatformClass)
      {
      case ACPI_TCPA_CLIENT_TABLE:
diff --git a/0031-Support-STAO-in-a-big-endian-world.patch b/0034-Support-STAO-in-a-big-endian-world.patch
similarity index 74%
rename from 0031-Support-STAO-in-a-big-endian-world.patch
rename to 0034-Support-STAO-in-a-big-endian-world.patch
index 7ea55bc..e338c5f 100644
--- a/0031-Support-STAO-in-a-big-endian-world.patch
+++ b/0034-Support-STAO-in-a-big-endian-world.patch
@@ -1,23 +1,23 @@
-From 63fc38478f12b8c8b0d263d25f72ff7538fba2ce Mon Sep 17 00:00:00 2001
+From c313a76ce818135f02ab158a9f0c8e4b8e96698a Mon Sep 17 00:00:00 2001
 From: Al Stone <ahs3@redhat.com>
 Date: Mon, 28 Sep 2020 11:49:42 -0600
-Subject: [PATCH 31/40] Support STAO in a big-endian world
+Subject: [PATCH 34/45] Support STAO in a big-endian world
 
 Signed-off-by: Al Stone <ahs3@redhat.com>
 ---
  source/common/dmtbdump3.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
-Index: acpica-unix2-20200925/source/common/dmtbdump3.c
+Index: acpica-unix2-20210604/source/common/dmtbdump3.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/common/dmtbdump3.c
-+++ acpica-unix2-20200925/source/common/dmtbdump3.c
+--- acpica-unix2-20210604.orig/source/common/dmtbdump3.c
++++ acpica-unix2-20210604/source/common/dmtbdump3.c
 @@ -285,14 +285,14 @@ AcpiDmDumpStao (
  {
      ACPI_STATUS             Status;
      char                    *Namepath;
 -    UINT32                  Length = Table->Length;
-+    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
++    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
      UINT32                  StringLength;
      UINT32                  Offset = sizeof (ACPI_TABLE_STAO);
  
diff --git a/0035-Support-PMTT-in-a-big-endian-world.patch b/0035-Support-PMTT-in-a-big-endian-world.patch
deleted file mode 100644
index b6aaee6..0000000
--- a/0035-Support-PMTT-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-From b55af37d2419fc5ea630774f49b4ed9b724451b3 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Mon, 28 Sep 2020 18:37:04 -0600
-Subject: [PATCH 35/40] Support PMTT in a big-endian world
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/common/dmtbdump2.c  | 66 +++++++++++++++++++++-----------------
- source/compiler/dttable2.c |  5 ++-
- 2 files changed, 41 insertions(+), 30 deletions(-)
-
-Index: acpica-unix2-20200925/source/common/dmtbdump2.c
-===================================================================
---- acpica-unix2-20200925.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20200925/source/common/dmtbdump2.c
-@@ -1442,17 +1442,21 @@ AcpiDmDumpPmtt (
-     ACPI_PMTT_HEADER        *MemSubtable;
-     ACPI_PMTT_HEADER        *DimmSubtable;
-     ACPI_PMTT_DOMAIN        *DomainArray;
--    UINT32                  Length = Table->Length;
-+    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
-     UINT32                  Offset = sizeof (ACPI_TABLE_PMTT);
-     UINT32                  MemOffset;
-     UINT32                  DimmOffset;
-     UINT32                  DomainOffset;
-     UINT32                  DomainCount;
-+    UINT16                  SubtableLength;
-+    UINT16                  MemSubtableLength;
-+    UINT16                  DimmSubtableLength;
-+    UINT16                  Tmp16;
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoPmtt);
-+    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoPmtt);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -1461,13 +1465,14 @@ AcpiDmDumpPmtt (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < TableLength)
-     {
-         /* Common subtable header */
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Length, Offset, Subtable,
--            Subtable->Length, AcpiDmTableInfoPmttHdr);
-+	SubtableLength = AcpiUtReadUint16(&Subtable->Length);
-+        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
-+            SubtableLength, AcpiDmTableInfoPmttHdr);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -1485,8 +1490,8 @@ AcpiDmDumpPmtt (
- 
-         /* Dump the fixed-length portion of the subtable */
- 
--        Status = AcpiDmDumpTable (Length, Offset, Subtable,
--            Subtable->Length, AcpiDmTableInfoPmtt0);
-+        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
-+            SubtableLength, AcpiDmTableInfoPmtt0);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -1498,15 +1503,16 @@ AcpiDmDumpPmtt (
-         MemSubtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, Subtable,
-             sizeof (ACPI_PMTT_SOCKET));
- 
--        while (((Offset + MemOffset) < Table->Length) &&
--            (MemOffset < Subtable->Length))
-+        while (((Offset + MemOffset) < TableLength) &&
-+            (MemOffset < SubtableLength))
-         {
-             /* Common subtable header */
- 
-             AcpiOsPrintf ("\n");
--            Status = AcpiDmDumpTable (Length,
-+	    MemSubtableLength = AcpiUtReadUint16(&MemSubtable->Length);
-+            Status = AcpiDmDumpTable (TableLength,
-                 Offset + MemOffset, MemSubtable,
--                MemSubtable->Length, AcpiDmTableInfoPmttHdr);
-+                MemSubtableLength, AcpiDmTableInfoPmttHdr);
-             if (ACPI_FAILURE (Status))
-             {
-                 return;
-@@ -1524,9 +1530,9 @@ AcpiDmDumpPmtt (
- 
-             /* Dump the fixed-length portion of the controller subtable */
- 
--            Status = AcpiDmDumpTable (Length,
-+            Status = AcpiDmDumpTable (TableLength,
-                 Offset + MemOffset, MemSubtable,
--                MemSubtable->Length, AcpiDmTableInfoPmtt1);
-+                MemSubtableLength, AcpiDmTableInfoPmtt1);
-             if (ACPI_FAILURE (Status))
-             {
-                 return;
-@@ -1534,16 +1540,17 @@ AcpiDmDumpPmtt (
- 
-             /* Walk the variable count of proximity domains */
- 
--            DomainCount = ((ACPI_PMTT_CONTROLLER *) MemSubtable)->DomainCount;
-+            Tmp16 = ((ACPI_PMTT_CONTROLLER *) MemSubtable)->DomainCount;
-+            DomainCount = AcpiUtReadUint16(&Tmp16);
-             DomainOffset = sizeof (ACPI_PMTT_CONTROLLER);
-             DomainArray = ACPI_ADD_PTR (ACPI_PMTT_DOMAIN, MemSubtable,
-                 sizeof (ACPI_PMTT_CONTROLLER));
- 
--            while (((Offset + MemOffset + DomainOffset) < Table->Length) &&
--                ((MemOffset + DomainOffset) < Subtable->Length) &&
-+            while (((Offset + MemOffset + DomainOffset) < TableLength) &&
-+                ((MemOffset + DomainOffset) < SubtableLength) &&
-                 DomainCount)
-             {
--                Status = AcpiDmDumpTable (Length,
-+                Status = AcpiDmDumpTable (TableLength,
-                     Offset + MemOffset + DomainOffset, DomainArray,
-                     sizeof (ACPI_PMTT_DOMAIN), AcpiDmTableInfoPmtt1a);
-                 if (ACPI_FAILURE (Status))
-@@ -1568,15 +1575,16 @@ AcpiDmDumpPmtt (
-             DimmSubtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, MemSubtable,
-                 DomainOffset);
- 
--            while (((Offset + MemOffset + DimmOffset) < Table->Length) &&
--                (DimmOffset < MemSubtable->Length))
-+            while (((Offset + MemOffset + DimmOffset) < TableLength) &&
-+                (DimmOffset < MemSubtableLength))
-             {
-                 /* Common subtable header */
- 
-                 AcpiOsPrintf ("\n");
--                Status = AcpiDmDumpTable (Length,
-+		DimmSubtableLength = AcpiUtReadUint16(&DimmSubtable->Length);
-+                Status = AcpiDmDumpTable (TableLength,
-                     Offset + MemOffset + DimmOffset, DimmSubtable,
--                    DimmSubtable->Length, AcpiDmTableInfoPmttHdr);
-+                    DimmSubtableLength, AcpiDmTableInfoPmttHdr);
-                 if (ACPI_FAILURE (Status))
-                 {
-                     return;
-@@ -1594,9 +1602,9 @@ AcpiDmDumpPmtt (
- 
-                 /* Dump the fixed-length DIMM subtable */
- 
--                Status = AcpiDmDumpTable (Length,
-+                Status = AcpiDmDumpTable (TableLength,
-                     Offset + MemOffset + DimmOffset, DimmSubtable,
--                    DimmSubtable->Length, AcpiDmTableInfoPmtt2);
-+                    DimmSubtableLength, AcpiDmTableInfoPmtt2);
-                 if (ACPI_FAILURE (Status))
-                 {
-                     return;
-@@ -1604,23 +1612,23 @@ AcpiDmDumpPmtt (
- 
-                 /* Point to next DIMM subtable */
- 
--                DimmOffset += DimmSubtable->Length;
-+                DimmOffset += DimmSubtableLength;
-                 DimmSubtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER,
--                    DimmSubtable, DimmSubtable->Length);
-+                    DimmSubtable, DimmSubtableLength);
-             }
- 
-             /* Point to next Controller subtable */
- 
--            MemOffset += MemSubtable->Length;
-+            MemOffset += MemSubtableLength;
-             MemSubtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER,
--                MemSubtable, MemSubtable->Length);
-+                MemSubtable, MemSubtableLength);
-         }
- 
-         /* Point to next Socket subtable */
- 
--        Offset += Subtable->Length;
-+        Offset += SubtableLength;
-         Subtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER,
--            Subtable, Subtable->Length);
-+            Subtable, SubtableLength);
-     }
- }
- 
-Index: acpica-unix2-20200925/source/compiler/dttable2.c
-===================================================================
---- acpica-unix2-20200925.orig/source/compiler/dttable2.c
-+++ acpica-unix2-20200925/source/compiler/dttable2.c
-@@ -885,6 +885,7 @@ DtCompilePmtt (
-     ACPI_PMTT_HEADER        *PmttHeader;
-     ACPI_PMTT_CONTROLLER    *PmttController;
-     UINT16                  DomainCount;
-+    UINT16                  Length;
-     UINT8                   PrevType = ACPI_PMTT_TYPE_SOCKET;
- 
- 
-@@ -929,6 +930,8 @@ DtCompilePmtt (
-         DtInsertSubtable (ParentTable, Subtable);
-         DtPushSubtable (Subtable);
- 
-+	Length = AcpiUtReadUint16(&PmttHeader->Length);
-+	PmttHeader->Length = Length;
-         switch (PmttHeader->Type)
-         {
-         case ACPI_PMTT_TYPE_SOCKET:
-@@ -962,7 +965,7 @@ DtCompilePmtt (
- 
-             PmttController = ACPI_CAST_PTR (ACPI_PMTT_CONTROLLER,
-                 (Subtable->Buffer - sizeof (ACPI_PMTT_HEADER)));
--            DomainCount = PmttController->DomainCount;
-+            DomainCount = AcpiUtReadUint16(&PmttController->DomainCount);
- 
-             while (DomainCount)
-             {
diff --git a/0035-Support-SLIC-and-MSDM-in-a-big-endian-world.patch b/0035-Support-SLIC-and-MSDM-in-a-big-endian-world.patch
new file mode 100644
index 0000000..3f8fa6d
--- /dev/null
+++ b/0035-Support-SLIC-and-MSDM-in-a-big-endian-world.patch
@@ -0,0 +1,33 @@
+From 948bebd1a0999bc3481641d3fc996c49432709c6 Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Mon, 28 Sep 2020 12:49:23 -0600
+Subject: [PATCH 35/45] Support SLIC and MSDM in a big-endian world
+
+When dumping the SLIC table, it was also found that the code was
+not starting at the proper offset on disassembly.  Set the offset
+to the first byte after the header instead of the very beginning
+of the table.
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/common/dmtbdump3.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+Index: acpica-unix2-20210604/source/common/dmtbdump3.c
+===================================================================
+--- acpica-unix2-20210604.orig/source/common/dmtbdump3.c
++++ acpica-unix2-20210604/source/common/dmtbdump3.c
+@@ -68,9 +68,11 @@ void
+ AcpiDmDumpSlic (
+     ACPI_TABLE_HEADER       *Table)
+ {
++    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
+ 
+-    (void) AcpiDmDumpTable (Table->Length, sizeof (ACPI_TABLE_HEADER), Table,
+-        Table->Length - sizeof (*Table), AcpiDmTableInfoSlic);
++    (void) AcpiDmDumpTable (TableLength, sizeof (ACPI_TABLE_HEADER),
++        (void *) (Table + sizeof (*Table)),
++        TableLength - sizeof (*Table), AcpiDmTableInfoSlic);
+ }
+ 
+ 
diff --git a/0033-Support-MCFG-in-a-big-endian-world.patch b/0036-Support-MCFG-in-a-big-endian-world.patch
similarity index 77%
rename from 0033-Support-MCFG-in-a-big-endian-world.patch
rename to 0036-Support-MCFG-in-a-big-endian-world.patch
index f50441b..c5a30da 100644
--- a/0033-Support-MCFG-in-a-big-endian-world.patch
+++ b/0036-Support-MCFG-in-a-big-endian-world.patch
@@ -1,22 +1,22 @@
-From 0fecc447cd64bf9da3345b2912e41e6005eb1011 Mon Sep 17 00:00:00 2001
+From 0fb79a24fb70ab1e1e4879220af82a9fa00af586 Mon Sep 17 00:00:00 2001
 From: Al Stone <ahs3@redhat.com>
 Date: Mon, 28 Sep 2020 13:01:18 -0600
-Subject: [PATCH 33/40] Support MCFG in a big-endian world
+Subject: [PATCH 36/45] Support MCFG in a big-endian world
 
 Signed-off-by: Al Stone <ahs3@redhat.com>
 ---
  source/common/dmtbdump2.c | 11 ++++++-----
  1 file changed, 6 insertions(+), 5 deletions(-)
 
-Index: acpica-unix2-20200925/source/common/dmtbdump2.c
+Index: acpica-unix2-20210604/source/common/dmtbdump2.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20200925/source/common/dmtbdump2.c
-@@ -769,11 +769,12 @@ AcpiDmDumpMcfg (
+--- acpica-unix2-20210604.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20210604/source/common/dmtbdump2.c
+@@ -930,11 +930,12 @@ AcpiDmDumpMcfg (
      ACPI_STATUS             Status;
      UINT32                  Offset = sizeof (ACPI_TABLE_MCFG);
      ACPI_MCFG_ALLOCATION    *Subtable;
-+    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
++    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
  
  
      /* Main table */
@@ -26,7 +26,7 @@ Index: acpica-unix2-20200925/source/common/dmtbdump2.c
      if (ACPI_FAILURE (Status))
      {
          return;
-@@ -782,17 +783,17 @@ AcpiDmDumpMcfg (
+@@ -943,17 +944,17 @@ AcpiDmDumpMcfg (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_MCFG_ALLOCATION, Table, Offset);
diff --git a/0037-Support-IVRS-in-a-big-endian-world.patch b/0037-Support-IVRS-in-a-big-endian-world.patch
deleted file mode 100644
index 53f8bf2..0000000
--- a/0037-Support-IVRS-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 49b3d77990241c7216412d78e52cf15b3aa6d1ad Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Wed, 30 Sep 2020 18:18:07 -0600
-Subject: [PATCH 37/40] Support IVRS in a big-endian world
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/common/dmtbdump2.c | 25 ++++++++++++++-----------
- 1 file changed, 14 insertions(+), 11 deletions(-)
-
-Index: acpica-unix2-20200925/source/common/dmtbdump2.c
-===================================================================
---- acpica-unix2-20200925.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20200925/source/common/dmtbdump2.c
-@@ -353,11 +353,13 @@ AcpiDmDumpIvrs (
-     ACPI_IVRS_DE_HEADER     *DeviceEntry;
-     ACPI_IVRS_HEADER        *Subtable;
-     ACPI_DMTABLE_INFO       *InfoTable;
-+    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
-+    UINT16                  SubtableLength;
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoIvrs);
-+    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoIvrs);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -366,13 +368,14 @@ AcpiDmDumpIvrs (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_IVRS_HEADER, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < TableLength)
-     {
-         /* Common subtable header */
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
--            Subtable->Length, AcpiDmTableInfoIvrsHdr);
-+	SubtableLength = AcpiUtReadUint16(&Subtable->Length);
-+        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
-+            SubtableLength, AcpiDmTableInfoIvrsHdr);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -404,7 +407,7 @@ AcpiDmDumpIvrs (
- 
-             /* Attempt to continue */
- 
--            if (!Subtable->Length)
-+            if (!SubtableLength)
-             {
-                 AcpiOsPrintf ("Invalid zero length subtable\n");
-                 return;
-@@ -415,8 +418,8 @@ AcpiDmDumpIvrs (
-         /* Dump the subtable */
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
--            Subtable->Length, InfoTable);
-+        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
-+            SubtableLength, InfoTable);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -442,7 +445,7 @@ AcpiDmDumpIvrs (
-                     sizeof (ACPI_IVRS_HARDWARE2));
-             }
- 
--            while (EntryOffset < (Offset + Subtable->Length))
-+            while (EntryOffset < (Offset + SubtableLength))
-             {
-                 AcpiOsPrintf ("\n");
-                 /*
-@@ -504,7 +507,7 @@ AcpiDmDumpIvrs (
- 
-                 /* Dump the Device Entry */
- 
--                Status = AcpiDmDumpTable (Table->Length, EntryOffset,
-+                Status = AcpiDmDumpTable (TableLength, EntryOffset,
-                     DeviceEntry, EntryLength, InfoTable);
-                 if (ACPI_FAILURE (Status))
-                 {
-@@ -520,8 +523,8 @@ AcpiDmDumpIvrs (
- NextSubtable:
-         /* Point to next subtable */
- 
--        Offset += Subtable->Length;
--        Subtable = ACPI_ADD_PTR (ACPI_IVRS_HEADER, Subtable, Subtable->Length);
-+        Offset += SubtableLength;
-+        Subtable = ACPI_ADD_PTR (ACPI_IVRS_HEADER, Subtable, SubtableLength);
-     }
- }
- 
diff --git a/0034-Support-LPIT-in-a-big-endian-world.patch b/0037-Support-LPIT-in-a-big-endian-world.patch
similarity index 72%
rename from 0034-Support-LPIT-in-a-big-endian-world.patch
rename to 0037-Support-LPIT-in-a-big-endian-world.patch
index fd68c2a..e5e83d3 100644
--- a/0034-Support-LPIT-in-a-big-endian-world.patch
+++ b/0037-Support-LPIT-in-a-big-endian-world.patch
@@ -1,27 +1,27 @@
-From b521edcfceab513a900a000aa462d7f86b65a040 Mon Sep 17 00:00:00 2001
+From d10bfd67b5352ff5587e06fc1f82b896bab49614 Mon Sep 17 00:00:00 2001
 From: Al Stone <ahs3@redhat.com>
 Date: Mon, 28 Sep 2020 16:49:30 -0600
-Subject: [PATCH 34/40] Support LPIT in a big-endian world
+Subject: [PATCH 37/45] Support LPIT in a big-endian world
 
 Signed-off-by: Al Stone <ahs3@redhat.com>
 ---
  source/common/dmtbdump2.c | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
-Index: acpica-unix2-20200925/source/common/dmtbdump2.c
+Index: acpica-unix2-20210604/source/common/dmtbdump2.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20200925/source/common/dmtbdump2.c
-@@ -534,7 +534,7 @@ AcpiDmDumpLpit (
+--- acpica-unix2-20210604.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20210604/source/common/dmtbdump2.c
+@@ -690,7 +690,7 @@ AcpiDmDumpLpit (
  {
      ACPI_STATUS             Status;
      ACPI_LPIT_HEADER        *Subtable;
 -    UINT32                  Length = Table->Length;
-+    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
++    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
      UINT32                  Offset = sizeof (ACPI_TABLE_LPIT);
      ACPI_DMTABLE_INFO       *InfoTable;
      UINT32                  SubtableLength;
-@@ -543,11 +543,11 @@ AcpiDmDumpLpit (
+@@ -699,11 +699,11 @@ AcpiDmDumpLpit (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_LPIT_HEADER, Table, Offset);
@@ -35,7 +35,7 @@ Index: acpica-unix2-20200925/source/common/dmtbdump2.c
              sizeof (ACPI_LPIT_HEADER), AcpiDmTableInfoLpitHdr);
          if (ACPI_FAILURE (Status))
          {
-@@ -571,7 +571,7 @@ AcpiDmDumpLpit (
+@@ -727,7 +727,7 @@ AcpiDmDumpLpit (
              return;
          }
  
diff --git a/0038-Support-PMTT-in-a-big-endian-world.patch b/0038-Support-PMTT-in-a-big-endian-world.patch
new file mode 100644
index 0000000..4c6338c
--- /dev/null
+++ b/0038-Support-PMTT-in-a-big-endian-world.patch
@@ -0,0 +1,85 @@
+From bd19995fa268ed3e93c071162d0e9c2d35ada0d4 Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Tue, 29 Jun 2021 16:23:30 -0600
+Subject: [PATCH 38/45] Support PMTT in a big-endian world
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/common/dmtbdump2.c | 18 ++++++++++--------
+ 1 file changed, 10 insertions(+), 8 deletions(-)
+
+Index: acpica-unix2-20210604/source/common/dmtbdump2.c
+===================================================================
+--- acpica-unix2-20210604.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20210604/source/common/dmtbdump2.c
+@@ -1686,8 +1686,9 @@ AcpiDmDumpPmtt (
+ {
+     ACPI_STATUS             Status;
+     ACPI_PMTT_HEADER        *Subtable;
+-    UINT32                  Length = Table->Length;
++    UINT32                  Length = AcpiUtReadUint32 (&Table->Length);
+     UINT32                  Offset = sizeof (ACPI_TABLE_PMTT);
++    UINT16                  SubtableLength;
+ 
+ 
+     /* Main table */
+@@ -1701,17 +1702,18 @@ AcpiDmDumpPmtt (
+     /* Subtables */
+ 
+     Subtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, Table, Offset);
+-    while (Offset < Table->Length)
++    while (Offset < Length)
+     {
+         /* Each of the types below contain the common subtable header */
+ 
+         AcpiOsPrintf ("\n");
++	SubtableLength = AcpiUtReadUint16 (&Subtable->Length);
+         switch (Subtable->Type)
+         {
+         case ACPI_PMTT_TYPE_SOCKET:
+ 
+             Status = AcpiDmDumpTable (Length, Offset, Subtable,
+-                Subtable->Length, AcpiDmTableInfoPmtt0);
++                SubtableLength, AcpiDmTableInfoPmtt0);
+             if (ACPI_FAILURE (Status))
+             {
+                 return;
+@@ -1720,7 +1722,7 @@ AcpiDmDumpPmtt (
+ 
+         case ACPI_PMTT_TYPE_CONTROLLER:
+             Status = AcpiDmDumpTable (Length, Offset, Subtable,
+-                Subtable->Length, AcpiDmTableInfoPmtt1);
++                SubtableLength, AcpiDmTableInfoPmtt1);
+             if (ACPI_FAILURE (Status))
+             {
+                 return;
+@@ -1729,7 +1731,7 @@ AcpiDmDumpPmtt (
+ 
+        case ACPI_PMTT_TYPE_DIMM:
+             Status = AcpiDmDumpTable (Length, Offset, Subtable,
+-                Subtable->Length, AcpiDmTableInfoPmtt2);
++                SubtableLength, AcpiDmTableInfoPmtt2);
+             if (ACPI_FAILURE (Status))
+             {
+                 return;
+@@ -1738,7 +1740,7 @@ AcpiDmDumpPmtt (
+ 
+         case ACPI_PMTT_TYPE_VENDOR:
+             Status = AcpiDmDumpTable (Length, Offset, Subtable,
+-                Subtable->Length, AcpiDmTableInfoPmttVendor);
++                SubtableLength, AcpiDmTableInfoPmttVendor);
+             if (ACPI_FAILURE (Status))
+             {
+                 return;
+@@ -1754,9 +1756,9 @@ AcpiDmDumpPmtt (
+ 
+         /* Point to next subtable */
+ 
+-        Offset += Subtable->Length;
++        Offset += SubtableLength;
+         Subtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER,
+-            Subtable, Subtable->Length);
++            Subtable, SubtableLength);
+     }
+ }
+ 
diff --git a/0039-Add-partial-big-endian-support-for-WPBT-tables.patch b/0039-Add-partial-big-endian-support-for-WPBT-tables.patch
deleted file mode 100644
index 3207b7d..0000000
--- a/0039-Add-partial-big-endian-support-for-WPBT-tables.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 9d7f9c8f4ecbee2e621d471a8c4944cebe62947d Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Wed, 30 Sep 2020 18:59:57 -0600
-Subject: [PATCH 1/5] Add partial big-endian support for WPBT tables
-
-There's some weirdness here that at present does not warrant
-further investigation; this is just a really low priority table.
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/common/dmtbdump3.c  | 8 ++++----
- source/compiler/dttable2.c | 3 ++-
- 2 files changed, 6 insertions(+), 5 deletions(-)
-
-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;
--    UINT32                  Length = Table->Length;
-+    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
-     UINT16                  ArgumentsLength;
- 
- 
-     /* Dump the main table */
- 
--    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoWpbt);
-+    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoWpbt);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -643,10 +643,10 @@ AcpiDmDumpWpbt (
-     /* Extract the arguments buffer length from the main table */
- 
-     Subtable = ACPI_CAST_PTR (ACPI_TABLE_WPBT, Table);
--    ArgumentsLength = Subtable->ArgumentsLength;
-+    ArgumentsLength = AcpiUtReadUint16(&Subtable->ArgumentsLength);
- 
-     /* Dump the arguments buffer */
- 
--    (void) AcpiDmDumpTable (Table->Length, 0, Table, ArgumentsLength,
-+    (void) AcpiDmDumpTable (TableLength, 0, Table, ArgumentsLength,
-         AcpiDmTableInfoWpbt0);
- }
-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 */
- 
--    Length = (UINT16) Subtable->TotalLength;
-+    AcpiUtWriteUint(&Length, sizeof(UINT16),
-+		   &Subtable->TotalLength, sizeof(UINT32));
-     Table = ACPI_CAST_PTR (ACPI_TABLE_WPBT, ParentTable->Buffer);
-     Table->ArgumentsLength = Length;
- 
diff --git a/0038-Support-TPM2-in-a-big-endian-world.patch b/0039-Support-TPM2-in-a-big-endian-world.patch
similarity index 74%
rename from 0038-Support-TPM2-in-a-big-endian-world.patch
rename to 0039-Support-TPM2-in-a-big-endian-world.patch
index b0298bb..08e3522 100644
--- a/0038-Support-TPM2-in-a-big-endian-world.patch
+++ b/0039-Support-TPM2-in-a-big-endian-world.patch
@@ -1,7 +1,7 @@
-From 1e1129d788087025cf31b0c3babdb9bca01f1c4e Mon Sep 17 00:00:00 2001
+From c240ab3af6a4ad4405def7188e3d64da06a69f37 Mon Sep 17 00:00:00 2001
 From: Al Stone <ahs3@redhat.com>
 Date: Wed, 30 Sep 2020 18:42:38 -0600
-Subject: [PATCH 38/40] Support TPM2 in a big-endian world
+Subject: [PATCH 39/45] Support TPM2 in a big-endian world
 
 Signed-off-by: Al Stone <ahs3@redhat.com>
 ---
@@ -9,15 +9,15 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/compiler/dttable2.c |  8 +++++---
  2 files changed, 15 insertions(+), 11 deletions(-)
 
-Index: acpica-unix2-20200925/source/common/dmtbdump3.c
+Index: acpica-unix2-20210604/source/common/dmtbdump3.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/common/dmtbdump3.c
-+++ acpica-unix2-20200925/source/common/dmtbdump3.c
-@@ -409,11 +409,12 @@ AcpiDmDumpTpm2Rev3 (
+--- acpica-unix2-20210604.orig/source/common/dmtbdump3.c
++++ acpica-unix2-20210604/source/common/dmtbdump3.c
+@@ -470,11 +470,12 @@ AcpiDmDumpTpm2Rev3 (
      ACPI_TABLE_TPM23        *CommonHeader = ACPI_CAST_PTR (ACPI_TABLE_TPM23, Table);
      ACPI_TPM23_TRAILER      *Subtable = ACPI_ADD_PTR (ACPI_TPM23_TRAILER, Table, Offset);
      ACPI_STATUS             Status;
-+    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
++    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
  
  
      /* Main table */
@@ -27,7 +27,7 @@ Index: acpica-unix2-20200925/source/common/dmtbdump3.c
      if (ACPI_FAILURE (Status))
      {
          return;
-@@ -425,8 +426,8 @@ AcpiDmDumpTpm2Rev3 (
+@@ -486,8 +487,8 @@ AcpiDmDumpTpm2Rev3 (
      {
      case ACPI_TPM23_ACPI_START_METHOD:
  
@@ -38,15 +38,15 @@ Index: acpica-unix2-20200925/source/common/dmtbdump3.c
          break;
  
      default:
-@@ -456,6 +457,7 @@ AcpiDmDumpTpm2 (
+@@ -517,6 +518,7 @@ AcpiDmDumpTpm2 (
      ACPI_TPM2_TRAILER       *Subtable = ACPI_ADD_PTR (ACPI_TPM2_TRAILER, Table, Offset);
      ACPI_TPM2_ARM_SMC       *ArmSubtable;
      ACPI_STATUS             Status;
-+    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
++    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
  
  
      if (Table->Revision == 3)
-@@ -466,7 +468,7 @@ AcpiDmDumpTpm2 (
+@@ -527,7 +529,7 @@ AcpiDmDumpTpm2 (
  
      /* Main table */
  
@@ -55,7 +55,7 @@ Index: acpica-unix2-20200925/source/common/dmtbdump3.c
  
      if (ACPI_FAILURE (Status))
      {
-@@ -474,8 +476,8 @@ AcpiDmDumpTpm2 (
+@@ -535,8 +537,8 @@ AcpiDmDumpTpm2 (
      }
  
      AcpiOsPrintf ("\n");
@@ -66,7 +66,7 @@ Index: acpica-unix2-20200925/source/common/dmtbdump3.c
      if (ACPI_FAILURE (Status))
      {
          return;
-@@ -490,8 +492,8 @@ AcpiDmDumpTpm2 (
+@@ -551,8 +553,8 @@ AcpiDmDumpTpm2 (
          Offset += sizeof (ACPI_TPM2_TRAILER);
  
          AcpiOsPrintf ("\n");
@@ -77,11 +77,11 @@ Index: acpica-unix2-20200925/source/common/dmtbdump3.c
          break;
  
      default:
-Index: acpica-unix2-20200925/source/compiler/dttable2.c
+Index: acpica-unix2-20210604/source/compiler/dttable2.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/compiler/dttable2.c
-+++ acpica-unix2-20200925/source/compiler/dttable2.c
-@@ -1904,6 +1904,7 @@ DtCompileTpm2 (
+--- acpica-unix2-20210604.orig/source/compiler/dttable2.c
++++ acpica-unix2-20210604/source/compiler/dttable2.c
+@@ -2267,6 +2267,7 @@ DtCompileTpm2 (
      DT_SUBTABLE             *ParentTable;
      ACPI_STATUS             Status = AE_OK;
      ACPI_TABLE_HEADER       *Header;
@@ -89,17 +89,17 @@ Index: acpica-unix2-20200925/source/compiler/dttable2.c
  
  
      ParentTable = DtPeekSubtable ();
-@@ -1947,7 +1948,8 @@ DtCompileTpm2 (
+@@ -2310,7 +2311,8 @@ DtCompileTpm2 (
  
      /* Subtable type depends on the StartMethod */
  
 -    switch (Tpm2Header->StartMethod)
-+    StartMethod = *(UINT8 *)&Tpm2Header->StartMethod;
++    StartMethod = *(UINT8 *) &Tpm2Header->StartMethod;
 +    switch (StartMethod)
      {
      case ACPI_TPM2_COMMAND_BUFFER_WITH_ARM_SMC:
  
-@@ -1978,7 +1980,7 @@ DtCompileTpm2 (
+@@ -2341,7 +2343,7 @@ DtCompileTpm2 (
      case ACPI_TPM2_RESERVED10:
  
          AcpiOsPrintf ("\n**** Reserved TPM2 Start Method type 0x%X\n",
@@ -108,7 +108,7 @@ Index: acpica-unix2-20200925/source/compiler/dttable2.c
          Status = AE_ERROR;
          break;
  
-@@ -1986,7 +1988,7 @@ DtCompileTpm2 (
+@@ -2349,7 +2351,7 @@ DtCompileTpm2 (
      default:
  
          AcpiOsPrintf ("\n**** Unknown TPM2 Start Method type 0x%X\n",
diff --git a/0043-Support-S3PT-in-a-big-endian-world.patch b/0040-Support-S3PT-in-a-big-endian-world.patch
similarity index 71%
rename from 0043-Support-S3PT-in-a-big-endian-world.patch
rename to 0040-Support-S3PT-in-a-big-endian-world.patch
index b8c804e..07e0a24 100644
--- a/0043-Support-S3PT-in-a-big-endian-world.patch
+++ b/0040-Support-S3PT-in-a-big-endian-world.patch
@@ -1,27 +1,27 @@
-From 5805d42c0cec5366daa12e0f4caed7a58b13fe5b Mon Sep 17 00:00:00 2001
+From 9fc0e46189feb926b13713422ea2722e273a31b5 Mon Sep 17 00:00:00 2001
 From: Al Stone <ahs3@redhat.com>
 Date: Mon, 19 Oct 2020 17:30:30 -0400
-Subject: [PATCH 5/5] Support S3PT in a big-endian world
+Subject: [PATCH 40/45] Support S3PT in a big-endian world
 
 ---
  source/common/dmtbdump2.c  | 15 +++++++++------
  source/compiler/dttable2.c |  4 +++-
  2 files changed, 12 insertions(+), 7 deletions(-)
 
-Index: acpica-unix2-20200925/source/common/dmtbdump2.c
+Index: acpica-unix2-20210604/source/common/dmtbdump2.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20200925/source/common/dmtbdump2.c
-@@ -1809,6 +1809,8 @@ AcpiDmDumpS3pt (
+--- acpica-unix2-20210604.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20210604/source/common/dmtbdump2.c
+@@ -2039,6 +2039,8 @@ AcpiDmDumpS3pt (
      ACPI_FPDT_HEADER        *Subtable;
      ACPI_DMTABLE_INFO       *InfoTable;
      ACPI_TABLE_S3PT         *S3ptTable = ACPI_CAST_PTR (ACPI_TABLE_S3PT, Tables);
-+    UINT32                  S3ptTableLength = AcpiUtReadUint32(&S3ptTable->Length);
++    UINT32                  S3ptTableLength = AcpiUtReadUint32 (&S3ptTable->Length);
 +    UINT16                  SubtableType;
  
  
      /* Main table */
-@@ -1820,19 +1822,20 @@ AcpiDmDumpS3pt (
+@@ -2050,19 +2052,20 @@ AcpiDmDumpS3pt (
      }
  
      Subtable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, S3ptTable, Offset);
@@ -40,12 +40,12 @@ Index: acpica-unix2-20200925/source/common/dmtbdump2.c
          }
  
 -        switch (Subtable->Type)
-+	SubtableType = AcpiUtReadUint16(&Subtable->Type);
++        SubtableType = AcpiUtReadUint16 (&Subtable->Type);
 +        switch (SubtableType)
          {
          case ACPI_S3PT_TYPE_RESUME:
  
-@@ -1847,7 +1850,7 @@ AcpiDmDumpS3pt (
+@@ -2077,7 +2080,7 @@ AcpiDmDumpS3pt (
          default:
  
              AcpiOsPrintf ("\n**** Unknown S3PT subtable type 0x%X\n",
@@ -54,7 +54,7 @@ Index: acpica-unix2-20200925/source/common/dmtbdump2.c
  
              /* Attempt to continue */
  
-@@ -1860,7 +1863,7 @@ AcpiDmDumpS3pt (
+@@ -2090,7 +2093,7 @@ AcpiDmDumpS3pt (
          }
  
          AcpiOsPrintf ("\n");
@@ -63,7 +63,7 @@ Index: acpica-unix2-20200925/source/common/dmtbdump2.c
              Subtable->Length, InfoTable);
          if (ACPI_FAILURE (Status))
          {
-@@ -1874,7 +1877,7 @@ NextSubtable:
+@@ -2104,7 +2107,7 @@ NextSubtable:
          Subtable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, Subtable, Subtable->Length);
      }
  
@@ -72,11 +72,11 @@ Index: acpica-unix2-20200925/source/common/dmtbdump2.c
  }
  
  
-Index: acpica-unix2-20200925/source/compiler/dttable2.c
+Index: acpica-unix2-20210604/source/compiler/dttable2.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/compiler/dttable2.c
-+++ acpica-unix2-20200925/source/compiler/dttable2.c
-@@ -1188,6 +1188,7 @@ DtCompileS3pt (
+--- acpica-unix2-20210604.orig/source/compiler/dttable2.c
++++ acpica-unix2-20210604/source/compiler/dttable2.c
+@@ -1406,6 +1406,7 @@ DtCompileS3pt (
      DT_SUBTABLE             *ParentTable;
      ACPI_DMTABLE_INFO       *InfoTable;
      DT_FIELD                *SubtableStart;
@@ -84,12 +84,12 @@ Index: acpica-unix2-20200925/source/compiler/dttable2.c
  
  
      Status = DtCompileTable (PFieldList, AcpiDmTableInfoS3pt,
-@@ -1215,7 +1216,8 @@ DtCompileS3pt (
+@@ -1433,7 +1434,8 @@ DtCompileS3pt (
  
          S3ptHeader = ACPI_CAST_PTR (ACPI_FPDT_HEADER, Subtable->Buffer);
  
 -        switch (S3ptHeader->Type)
-+        S3ptHeaderType = AcpiUtReadUint16(&S3ptHeader->Type);
++        S3ptHeaderType = AcpiUtReadUint16 (&S3ptHeader->Type);
 +        switch (S3ptHeaderType)
          {
          case ACPI_S3PT_TYPE_RESUME:
diff --git a/0036-Support-IORT-in-a-big-endian-world.patch b/0041-Support-IORT-in-a-big-endian-world.patch
similarity index 61%
rename from 0036-Support-IORT-in-a-big-endian-world.patch
rename to 0041-Support-IORT-in-a-big-endian-world.patch
index e44456e..ccc6e77 100644
--- a/0036-Support-IORT-in-a-big-endian-world.patch
+++ b/0041-Support-IORT-in-a-big-endian-world.patch
@@ -1,20 +1,20 @@
-From 88d16feb9d6982cc9c09f2ae9b76b26f0d9c96e0 Mon Sep 17 00:00:00 2001
+From 5bd43bca1708a56d32e63da0278e04caf2865927 Mon Sep 17 00:00:00 2001
 From: Al Stone <ahs3@redhat.com>
-Date: Wed, 30 Sep 2020 17:48:04 -0600
-Subject: [PATCH 36/40] Support IORT in a big-endian world
+Date: Tue, 29 Jun 2021 17:38:20 -0600
+Subject: [PATCH 41/45] Support IORT in a big-endian world
 
 Signed-off-by: Al Stone <ahs3@redhat.com>
 ---
- source/common/dmtbdump2.c  | 73 ++++++++++++++++++++++----------------
- source/compiler/dttable1.c | 37 ++++++++++---------
- 2 files changed, 64 insertions(+), 46 deletions(-)
+ source/common/dmtbdump2.c  | 85 ++++++++++++++++++++++----------------
+ source/compiler/dttable1.c | 40 ++++++++++--------
+ 2 files changed, 72 insertions(+), 53 deletions(-)
 
-Index: acpica-unix2-20200925/source/common/dmtbdump2.c
+Index: acpica-unix2-20210604/source/common/dmtbdump2.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20200925/source/common/dmtbdump2.c
-@@ -75,16 +75,19 @@ AcpiDmDumpIort (
-     ACPI_IORT_SMMU          *IortSmmu = NULL;
+--- acpica-unix2-20210604.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20210604/source/common/dmtbdump2.c
+@@ -77,17 +77,20 @@ AcpiDmDumpIort (
+     ACPI_IORT_RMR           *IortRmr = NULL;
      UINT32                  Offset;
      UINT32                  NodeOffset;
 +    UINT32                  NodeLength;
@@ -23,8 +23,9 @@ Index: acpica-unix2-20200925/source/common/dmtbdump2.c
      char                    *String;
      UINT32                  i;
      UINT32                  MappingByteLength;
+     UINT8                   Revision;
 +    UINT32                  MappingCount;
-+    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
++    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
  
  
      /* Main table */
@@ -34,12 +35,12 @@ Index: acpica-unix2-20200925/source/common/dmtbdump2.c
      if (ACPI_FAILURE (Status))
      {
          return;
-@@ -95,25 +98,26 @@ AcpiDmDumpIort (
+@@ -109,18 +112,19 @@ AcpiDmDumpIort (
  
      /* Dump the OptionalPadding (optional) */
  
 -    if (Iort->NodeOffset > Offset)
-+    NodeOffset = AcpiUtReadUint32(&Iort->NodeOffset);
++    NodeOffset = AcpiUtReadUint32 (&Iort->NodeOffset);
 +    if (NodeOffset > Offset)
      {
 -        Status = AcpiDmDumpTable (Table->Length, Offset, Table,
@@ -54,54 +55,68 @@ Index: acpica-unix2-20200925/source/common/dmtbdump2.c
  
 -    Offset = Iort->NodeOffset;
 -    while (Offset < Table->Length)
-+    Offset = AcpiUtReadUint32(&Iort->NodeOffset);
++    Offset = AcpiUtReadUint32 (&Iort->NodeOffset);
 +    while (Offset < TableLength)
      {
          /* Common subtable header */
  
-         IortNode = ACPI_ADD_PTR (ACPI_IORT_NODE, Table, Offset);
-         AcpiOsPrintf ("\n");
-         Length = ACPI_OFFSET (ACPI_IORT_NODE, NodeData);
--        Status = AcpiDmDumpTable (Table->Length, Offset,
-+        Status = AcpiDmDumpTable (TableLength, Offset,
-             IortNode, Length, AcpiDmTableInfoIortHdr);
-         if (ACPI_FAILURE (Status))
+@@ -130,12 +134,12 @@ AcpiDmDumpIort (
+ 
+         if (Revision == 0)
          {
-@@ -142,7 +146,7 @@ AcpiDmDumpIort (
+-            Status = AcpiDmDumpTable (Table->Length, Offset,
++            Status = AcpiDmDumpTable (TableLength, Offset,
+                 IortNode, Length, AcpiDmTableInfoIortHdr);
+         }
+         else if (Revision >= 3)
+         {
+-            Status = AcpiDmDumpTable (Table->Length, Offset,
++            Status = AcpiDmDumpTable (TableLength, Offset,
+                 IortNode, Length, AcpiDmTableInfoIortHdr3);
+         }
+ 
+@@ -166,7 +170,7 @@ AcpiDmDumpIort (
          case ACPI_IORT_NODE_PCI_ROOT_COMPLEX:
  
              InfoTable = AcpiDmTableInfoIort2;
 -            Length = IortNode->Length - NodeOffset;
-+            Length = AcpiUtReadUint16(&IortNode->Length) - NodeOffset;
++            Length = AcpiUtReadUint16 (&IortNode->Length) - NodeOffset;
              break;
  
          case ACPI_IORT_NODE_SMMU:
-@@ -155,13 +159,13 @@ AcpiDmDumpIort (
+@@ -179,19 +183,19 @@ AcpiDmDumpIort (
          case ACPI_IORT_NODE_SMMU_V3:
  
              InfoTable = AcpiDmTableInfoIort4;
 -            Length = IortNode->Length - NodeOffset;
-+            Length = AcpiUtReadUint16(&IortNode->Length) - NodeOffset;
++            Length = AcpiUtReadUint16 (&IortNode->Length) - NodeOffset;
              break;
  
          case ACPI_IORT_NODE_PMCG:
  
              InfoTable = AcpiDmTableInfoIort5;
 -            Length = IortNode->Length - NodeOffset;
-+            Length = AcpiUtReadUint16(&IortNode->Length) - NodeOffset;
++            Length = AcpiUtReadUint16 (&IortNode->Length) - NodeOffset;
              break;
  
-         default:
-@@ -171,7 +175,7 @@ AcpiDmDumpIort (
+         case ACPI_IORT_NODE_RMR:
+ 
+             InfoTable = AcpiDmTableInfoIort6;
+-            Length = IortNode->Length - NodeOffset;
++            Length = AcpiUtReadUint16 (&IortNode->Length) - NodeOffset;
+             IortRmr = ACPI_ADD_PTR (ACPI_IORT_RMR, IortNode, NodeOffset);
+             break;
+ 
+@@ -202,7 +206,7 @@ AcpiDmDumpIort (
  
              /* Attempt to continue */
  
 -            if (!IortNode->Length)
-+            if (!AcpiUtReadUint16(&IortNode->Length))
++            if (!AcpiUtReadUint16 (&IortNode->Length))
              {
                  AcpiOsPrintf ("Invalid zero length IORT node\n");
                  return;
-@@ -182,7 +186,7 @@ AcpiDmDumpIort (
+@@ -213,7 +217,7 @@ AcpiDmDumpIort (
          /* Dump the node subtable header */
  
          AcpiOsPrintf ("\n");
@@ -110,13 +125,12 @@ Index: acpica-unix2-20200925/source/common/dmtbdump2.c
              ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
              Length, InfoTable);
          if (ACPI_FAILURE (Status))
-@@ -202,9 +206,11 @@ AcpiDmDumpIort (
+@@ -233,9 +237,10 @@ AcpiDmDumpIort (
  
              if (IortItsGroup)
              {
 -                for (i = 0; i < IortItsGroup->ItsCount; i++)
-+		UINT32 ItsCount = AcpiUtReadUint32(&IortItsGroup->ItsCount);
-+
++	        UINT32 ItsCount = AcpiUtReadUint32 (&IortItsGroup->ItsCount);
 +                for (i = 0; i < ItsCount; i++)
                  {
 -                    Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
@@ -124,47 +138,47 @@ Index: acpica-unix2-20200925/source/common/dmtbdump2.c
                          ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
                          4, AcpiDmTableInfoIort0a);
                      if (ACPI_FAILURE (Status))
-@@ -221,12 +227,14 @@ AcpiDmDumpIort (
+@@ -252,12 +257,14 @@ AcpiDmDumpIort (
  
              /* Dump the Padding (optional) */
  
 -            if (IortNode->Length > NodeOffset)
-+	    NodeLength = AcpiUtReadUint16(&IortNode->Length);
++            NodeLength = AcpiUtReadUint16 (&IortNode->Length);
 +            if (NodeLength > NodeOffset)
              {
                  MappingByteLength =
 -                    IortNode->MappingCount * sizeof (ACPI_IORT_ID_MAPPING);
 -                Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
 -                    Table, IortNode->Length - NodeOffset - MappingByteLength,
-+                    AcpiUtReadUint32(&IortNode->MappingCount) *
++                    AcpiUtReadUint32 (&IortNode->MappingCount) *
 +		    sizeof (ACPI_IORT_ID_MAPPING);
 +                Status = AcpiDmDumpTable (TableLength, Offset + NodeOffset,
 +                    Table, NodeLength - NodeOffset - MappingByteLength,
                      AcpiDmTableInfoIort1a);
                  if (ACPI_FAILURE (Status))
                  {
-@@ -243,9 +251,11 @@ AcpiDmDumpIort (
+@@ -274,9 +281,11 @@ AcpiDmDumpIort (
  
              if (IortSmmu)
              {
-+		UINT32 InterruptCount;
++	        UINT32 InterruptCount;
 +
                  Length = 2 * sizeof (UINT64);
 -                NodeOffset = IortSmmu->GlobalInterruptOffset;
 -                Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
-+                NodeOffset = AcpiUtReadUint32(&IortSmmu->GlobalInterruptOffset);
++                NodeOffset = AcpiUtReadUint32 (&IortSmmu->GlobalInterruptOffset);
 +                Status = AcpiDmDumpTable (TableLength, Offset + NodeOffset,
                      ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
                      Length, AcpiDmTableInfoIort3a);
                  if (ACPI_FAILURE (Status))
-@@ -253,10 +263,11 @@ AcpiDmDumpIort (
+@@ -284,10 +293,11 @@ AcpiDmDumpIort (
                      return;
                  }
  
 -                NodeOffset = IortSmmu->ContextInterruptOffset;
 -                for (i = 0; i < IortSmmu->ContextInterruptCount; i++)
-+                NodeOffset = AcpiUtReadUint32(&IortSmmu->ContextInterruptOffset);
-+		InterruptCount = AcpiUtReadUint32(&IortSmmu->ContextInterruptCount);
++                NodeOffset = AcpiUtReadUint32 (&IortSmmu->ContextInterruptOffset);
++                InterruptCount = AcpiUtReadUint32 (&IortSmmu->ContextInterruptCount);
 +                for (i = 0; i < InterruptCount; i++)
                  {
 -                    Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
@@ -172,14 +186,14 @@ Index: acpica-unix2-20200925/source/common/dmtbdump2.c
                          ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
                          8, AcpiDmTableInfoIort3b);
                      if (ACPI_FAILURE (Status))
-@@ -267,10 +278,11 @@ AcpiDmDumpIort (
+@@ -298,10 +308,11 @@ AcpiDmDumpIort (
                      NodeOffset += 8;
                  }
  
 -                NodeOffset = IortSmmu->PmuInterruptOffset;
 -                for (i = 0; i < IortSmmu->PmuInterruptCount; i++)
-+                NodeOffset = AcpiUtReadUint32(&IortSmmu->PmuInterruptOffset);
-+		InterruptCount = AcpiUtReadUint32(&IortSmmu->PmuInterruptCount);
++                NodeOffset = AcpiUtReadUint32 (&IortSmmu->PmuInterruptOffset);
++                InterruptCount = AcpiUtReadUint32 (&IortSmmu->PmuInterruptCount);
 +                for (i = 0; i < InterruptCount; i++)
                  {
 -                    Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
@@ -187,14 +201,33 @@ Index: acpica-unix2-20200925/source/common/dmtbdump2.c
                          ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
                          8, AcpiDmTableInfoIort3c);
                      if (ACPI_FAILURE (Status))
-@@ -290,12 +302,13 @@ AcpiDmDumpIort (
+@@ -319,12 +330,15 @@ AcpiDmDumpIort (
+             /* Validate IortRmr to avoid compiler warnings */
+             if (IortRmr)
+             {
+-                NodeOffset = IortRmr->RmrOffset;
++	        UINT32 RmrCount;
++
++                NodeOffset = AcpiUtReadUint32 (&IortRmr->RmrOffset);
++                RmrCount = AcpiUtReadUint32 (&IortRmr->RmrCount);
+                 Length = sizeof (ACPI_IORT_RMR_DESC);
+-                for (i = 0; i < IortRmr->RmrCount; i++)
++                for (i = 0; i < RmrCount; i++)
+                 {
+                     AcpiOsPrintf ("\n");
+-                    Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
++                    Status = AcpiDmDumpTable (TableLength, Offset + NodeOffset,
+                         ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
+                         Length, AcpiDmTableInfoIort6a);
+                     if (ACPI_FAILURE (Status))
+@@ -344,12 +358,13 @@ AcpiDmDumpIort (
  
          /* Dump the ID mappings */
  
 -        NodeOffset = IortNode->MappingOffset;
 -        for (i = 0; i < IortNode->MappingCount; i++)
-+        NodeOffset = AcpiUtReadUint32(&IortNode->MappingOffset);
-+	MappingCount = AcpiUtReadUint32(&IortNode->MappingCount);
++        NodeOffset = AcpiUtReadUint32 (&IortNode->MappingOffset);
++        MappingCount = AcpiUtReadUint32 (&IortNode->MappingCount);
 +        for (i = 0; i < MappingCount; i++)
          {
              AcpiOsPrintf ("\n");
@@ -204,28 +237,28 @@ Index: acpica-unix2-20200925/source/common/dmtbdump2.c
                  ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
                  Length, AcpiDmTableInfoIortMap);
              if (ACPI_FAILURE (Status))
-@@ -309,7 +322,7 @@ AcpiDmDumpIort (
+@@ -363,7 +378,7 @@ AcpiDmDumpIort (
  NextSubtable:
          /* Point to next node subtable */
  
 -        Offset += IortNode->Length;
-+        Offset += AcpiUtReadUint16(&IortNode->Length);
++        Offset += AcpiUtReadUint16 (&IortNode->Length);
      }
  }
  
-Index: acpica-unix2-20200925/source/compiler/dttable1.c
+Index: acpica-unix2-20210604/source/compiler/dttable1.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/compiler/dttable1.c
-+++ acpica-unix2-20200925/source/compiler/dttable1.c
-@@ -1516,6 +1516,7 @@ DtCompileIort (
-     ACPI_IORT_NODE          *IortNode;
+--- acpica-unix2-20210604.orig/source/compiler/dttable1.c
++++ acpica-unix2-20210604/source/compiler/dttable1.c
+@@ -1592,6 +1592,7 @@ DtCompileIort (
      ACPI_IORT_ITS_GROUP     *IortItsGroup;
      ACPI_IORT_SMMU          *IortSmmu;
+     ACPI_IORT_RMR           *IortRmr;
 +    UINT32                  IortNodeOffset;
      UINT32                  NodeNumber;
      UINT32                  NodeLength;
      UINT32                  IdMappingNumber;
-@@ -1548,7 +1549,7 @@ DtCompileIort (
+@@ -1637,7 +1638,7 @@ DtCompileIort (
       * Optionally allows the generic data types to be used for filling
       * this field.
       */
@@ -234,7 +267,7 @@ Index: acpica-unix2-20200925/source/compiler/dttable1.c
      Status = DtCompileTable (PFieldList, AcpiDmTableInfoIortPad,
          &Subtable);
      if (ACPI_FAILURE (Status))
-@@ -1558,7 +1559,7 @@ DtCompileIort (
+@@ -1647,7 +1648,7 @@ DtCompileIort (
      if (Subtable)
      {
          DtInsertSubtable (ParentTable, Subtable);
@@ -243,34 +276,32 @@ Index: acpica-unix2-20200925/source/compiler/dttable1.c
      }
      else
      {
-@@ -1568,8 +1569,9 @@ DtCompileIort (
+@@ -1657,7 +1658,7 @@ DtCompileIort (
          {
              return (Status);
          }
 -        Iort->NodeOffset += PaddingLength;
 +        IortNodeOffset += PaddingLength;
      }
-+    Iort->NodeOffset = AcpiUtReadUint32(&IortNodeOffset);
  
      NodeNumber = 0;
-     while (*PFieldList)
-@@ -1623,7 +1625,7 @@ DtCompileIort (
+@@ -1721,7 +1722,7 @@ DtCompileIort (
                  ItsNumber++;
              }
  
 -            IortItsGroup->ItsCount = ItsNumber;
-+            IortItsGroup->ItsCount = AcpiUtReadUint32(&ItsNumber);
++            IortItsGroup->ItsCount = AcpiUtReadUint32 (&ItsNumber);
              break;
  
          case ACPI_IORT_NODE_NAMED_COMPONENT:
-@@ -1657,15 +1659,18 @@ DtCompileIort (
+@@ -1755,15 +1756,18 @@ DtCompileIort (
              }
              else
              {
 -                if (NodeLength > IortNode->MappingOffset)
-+		UINT32 MappingOffset;
++	        UINT32 MappingOffset;
 +
-+		MappingOffset = IortNode->MappingOffset;
++                MappingOffset = IortNode->MappingOffset;
 +                if (NodeLength > MappingOffset)
                  {
                      return (AE_BAD_DATA);
@@ -285,7 +316,7 @@ Index: acpica-unix2-20200925/source/compiler/dttable1.c
                          &Subtable);
                      if (ACPI_FAILURE (Status))
                      {
-@@ -1673,7 +1678,7 @@ DtCompileIort (
+@@ -1771,7 +1775,7 @@ DtCompileIort (
                      }
  
                      DtInsertSubtable (ParentTable, Subtable);
@@ -294,72 +325,90 @@ Index: acpica-unix2-20200925/source/compiler/dttable1.c
                  }
              }
              break;
-@@ -1706,7 +1711,7 @@ DtCompileIort (
+@@ -1804,7 +1808,7 @@ DtCompileIort (
  
              /* Compile global interrupt array */
  
 -            IortSmmu->GlobalInterruptOffset = NodeLength;
-+            IortSmmu->GlobalInterruptOffset = AcpiUtReadUint32(&NodeLength);
++            IortSmmu->GlobalInterruptOffset = AcpiUtReadUint32 (&NodeLength);
              Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3a,
                  &Subtable);
              if (ACPI_FAILURE (Status))
-@@ -1720,7 +1725,7 @@ DtCompileIort (
+@@ -1818,7 +1822,7 @@ DtCompileIort (
              /* Compile context interrupt array */
  
              ContextIrptNumber = 0;
 -            IortSmmu->ContextInterruptOffset = NodeLength;
-+            IortSmmu->ContextInterruptOffset = AcpiUtReadUint32(&NodeLength);
++            IortSmmu->ContextInterruptOffset = AcpiUtReadUint32 (&NodeLength);
              while (*PFieldList)
              {
                  Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3b,
-@@ -1740,12 +1745,12 @@ DtCompileIort (
+@@ -1838,12 +1842,12 @@ DtCompileIort (
                  ContextIrptNumber++;
              }
  
 -            IortSmmu->ContextInterruptCount = ContextIrptNumber;
-+            IortSmmu->ContextInterruptCount = AcpiUtReadUint32(&ContextIrptNumber);
++            IortSmmu->ContextInterruptCount = AcpiUtReadUint32 (&ContextIrptNumber);
  
              /* Compile PMU interrupt array */
  
              PmuIrptNumber = 0;
 -            IortSmmu->PmuInterruptOffset = NodeLength;
-+            IortSmmu->PmuInterruptOffset = AcpiUtReadUint32(&NodeLength);
++            IortSmmu->PmuInterruptOffset = AcpiUtReadUint32 (&NodeLength);
              while (*PFieldList)
              {
                  Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3c,
-@@ -1765,7 +1770,7 @@ DtCompileIort (
+@@ -1863,7 +1867,7 @@ DtCompileIort (
                  PmuIrptNumber++;
              }
  
 -            IortSmmu->PmuInterruptCount = PmuIrptNumber;
-+            IortSmmu->PmuInterruptCount = AcpiUtReadUint32(&PmuIrptNumber);
++            IortSmmu->PmuInterruptCount = AcpiUtReadUint32 (&PmuIrptNumber);
              break;
  
          case ACPI_IORT_NODE_SMMU_V3:
-@@ -1802,7 +1807,7 @@ DtCompileIort (
+@@ -1908,7 +1912,7 @@ DtCompileIort (
+             /* Compile RMR Descriptors */
+ 
+             RmrCount = 0;
+-            IortRmr->RmrOffset = NodeLength;
++            IortRmr->RmrOffset = AcpiUtReadUint32 (&NodeLength);
+             while (*PFieldList)
+             {
+                 Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort6a,
+@@ -1928,7 +1932,7 @@ DtCompileIort (
+                 RmrCount++;
+             }
+ 
+-            IortRmr->RmrCount = RmrCount;
++            IortRmr->RmrCount = AcpiUtReadUint32 (&RmrCount);
+             break;
+ 
+ 	default:
+@@ -1939,7 +1943,7 @@ DtCompileIort (
  
          /* Compile Array of ID mappings */
  
 -        IortNode->MappingOffset = NodeLength;
-+	IortNode->MappingOffset = AcpiUtReadUint32(&NodeLength);
++        IortNode->MappingOffset = AcpiUtReadUint32 (&NodeLength);
          IdMappingNumber = 0;
          while (*PFieldList)
          {
-@@ -1823,7 +1828,7 @@ DtCompileIort (
+@@ -1960,7 +1964,7 @@ DtCompileIort (
              IdMappingNumber++;
          }
  
 -        IortNode->MappingCount = IdMappingNumber;
-+        IortNode->MappingCount = AcpiUtReadUint32(&IdMappingNumber);
++        IortNode->MappingCount = AcpiUtReadUint32 (&IdMappingNumber);
          if (!IdMappingNumber)
          {
              IortNode->MappingOffset = 0;
-@@ -1838,7 +1843,7 @@ DtCompileIort (
+@@ -1975,7 +1979,7 @@ DtCompileIort (
          NodeNumber++;
      }
  
 -    Iort->NodeCount = NodeNumber;
-+    Iort->NodeCount = AcpiUtReadUint32(&NodeNumber);
++    Iort->NodeCount = AcpiUtReadUint32 (&NodeNumber);
      return (AE_OK);
  }
  
diff --git a/0041-Support-MTMR-in-a-big-endian-world.patch b/0041-Support-MTMR-in-a-big-endian-world.patch
deleted file mode 100644
index c1245bd..0000000
--- a/0041-Support-MTMR-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 62c6c5b94772b7f8f5de6136a2ba61e31d0c7b3c Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Fri, 16 Oct 2020 20:52:43 -0400
-Subject: [PATCH 3/5] Support MTMR in a big-endian world
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/common/dmtbdump2.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-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;
-+    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoMtmr);
-+    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoMtmr);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -1061,12 +1062,12 @@ AcpiDmDumpMtmr (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_MTMR_ENTRY, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < TableLength)
-     {
-         /* Common subtable header */
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
-             sizeof (ACPI_MTMR_ENTRY), AcpiDmTableInfoMtmr0);
-         if (ACPI_FAILURE (Status))
-         {
diff --git a/0042-Support-IVRS-in-a-big-endian-world.patch b/0042-Support-IVRS-in-a-big-endian-world.patch
new file mode 100644
index 0000000..6d8bab7
--- /dev/null
+++ b/0042-Support-IVRS-in-a-big-endian-world.patch
@@ -0,0 +1,138 @@
+From b64cff82b2b33ed659826d777d2db039f64fd198 Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Tue, 29 Jun 2021 17:45:24 -0600
+Subject: [PATCH 42/45] Support IVRS in a big-endian world
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/common/dmtbdump2.c | 34 +++++++++++++++++++---------------
+ 1 file changed, 19 insertions(+), 15 deletions(-)
+
+Index: acpica-unix2-20210604/source/common/dmtbdump2.c
+===================================================================
+--- acpica-unix2-20210604.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20210604/source/common/dmtbdump2.c
+@@ -419,11 +419,14 @@ AcpiDmDumpIvrs (
+     ACPI_IVRS_DE_HEADER     *DeviceEntry;
+     ACPI_IVRS_HEADER        *Subtable;
+     ACPI_DMTABLE_INFO       *InfoTable;
++    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
++    UINT16                  SubtableLength;
++
+ 
+ 
+     /* Main table */
+ 
+-    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoIvrs);
++    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoIvrs);
+     if (ACPI_FAILURE (Status))
+     {
+         return;
+@@ -433,8 +436,9 @@ AcpiDmDumpIvrs (
+ 
+     Subtable = ACPI_ADD_PTR (ACPI_IVRS_HEADER, Table, Offset);
+ 
+-    while (Offset < Table->Length)
++    while (Offset < TableLength)
+     {
++        SubtableLength = AcpiUtReadUint16 (&Subtable->Length);
+         switch (Subtable->Type)
+         {
+         /* Type 10h, IVHD (I/O Virtualization Hardware Definition) */
+@@ -471,7 +475,7 @@ AcpiDmDumpIvrs (
+ 
+             /* Attempt to continue */
+ 
+-            if (!Subtable->Length)
++            if (!SubtableLength)
+             {
+                 AcpiOsPrintf ("Invalid zero length subtable\n");
+                 return;
+@@ -481,8 +485,8 @@ AcpiDmDumpIvrs (
+ 
+         /* Dump the subtable */
+ 
+-        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
+-            Subtable->Length, InfoTable);
++        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
++            SubtableLength, InfoTable);
+         if (ACPI_FAILURE (Status))
+         {
+             return;
+@@ -511,7 +515,7 @@ AcpiDmDumpIvrs (
+ 
+             /* Process all of the Device Entries */
+ 
+-            while (EntryOffset < (Offset + Subtable->Length))
++            while (EntryOffset < (Offset + SubtableLength))
+             {
+                 AcpiOsPrintf ("\n");
+ 
+@@ -581,7 +585,7 @@ AcpiDmDumpIvrs (
+ 
+                 /* Dump the Device Entry */
+ 
+-                Status = AcpiDmDumpTable (Table->Length, EntryOffset,
++                Status = AcpiDmDumpTable (TableLength, EntryOffset,
+                     DeviceEntry, EntryLength, InfoTable);
+                 if (ACPI_FAILURE (Status))
+                 {
+@@ -605,12 +609,12 @@ AcpiDmDumpIvrs (
+                      */
+                     if (UtIsIdInteger ((UINT8 *) &HidSubtable->AcpiHid))
+                     {
+-                        Status = AcpiDmDumpTable (Table->Length, EntryOffset,
++                        Status = AcpiDmDumpTable (TableLength, EntryOffset,
+                             &HidSubtable->AcpiHid, 8, AcpiDmTableInfoIvrsHidInteger);
+                     }
+                     else
+                     {
+-                        Status = AcpiDmDumpTable (Table->Length, EntryOffset,
++                        Status = AcpiDmDumpTable (TableLength, EntryOffset,
+                             &HidSubtable->AcpiHid, 8, AcpiDmTableInfoIvrsHidString);
+                     }
+                     if (ACPI_FAILURE (Status))
+@@ -628,12 +632,12 @@ AcpiDmDumpIvrs (
+                      */
+                     if (UtIsIdInteger ((UINT8 *) &HidSubtable->AcpiCid))
+                     {
+-                        Status = AcpiDmDumpTable (Table->Length, EntryOffset,
++                        Status = AcpiDmDumpTable (TableLength, EntryOffset,
+                             &HidSubtable->AcpiCid, 8, AcpiDmTableInfoIvrsCidInteger);
+                     }
+                     else
+                     {
+-                        Status = AcpiDmDumpTable (Table->Length, EntryOffset,
++                        Status = AcpiDmDumpTable (TableLength, EntryOffset,
+                             &HidSubtable->AcpiCid, 8, AcpiDmTableInfoIvrsCidString);
+                     }
+                     if (ACPI_FAILURE (Status))
+@@ -650,7 +654,7 @@ AcpiDmDumpIvrs (
+ 
+                         if (HidSubtable->UidType == ACPI_IVRS_UID_IS_STRING)
+                         {
+-                            Status = AcpiDmDumpTable (Table->Length, EntryOffset,
++                            Status = AcpiDmDumpTable (TableLength, EntryOffset,
+                                 &HidSubtable->UidType, EntryLength, AcpiDmTableInfoIvrsUidString);
+                             if (ACPI_FAILURE (Status))
+                             {
+@@ -659,7 +663,7 @@ AcpiDmDumpIvrs (
+                         }
+                         else /* ACPI_IVRS_UID_IS_INTEGER */
+                         {
+-                            Status = AcpiDmDumpTable (Table->Length, EntryOffset,
++                            Status = AcpiDmDumpTable (TableLength, EntryOffset,
+                                 &HidSubtable->UidType, EntryLength, AcpiDmTableInfoIvrsUidInteger);
+                             if (ACPI_FAILURE (Status))
+                             {
+@@ -678,8 +682,8 @@ AcpiDmDumpIvrs (
+ NextSubtable:
+         /* Point to next subtable */
+ 
+-        Offset += Subtable->Length;
+-        Subtable = ACPI_ADD_PTR (ACPI_IVRS_HEADER, Subtable, Subtable->Length);
++        Offset += SubtableLength;
++        Subtable = ACPI_ADD_PTR (ACPI_IVRS_HEADER, Subtable, SubtableLength);
+     }
+ }
+ 
diff --git a/0042-Support-VRTC-in-a-big-endian-world.patch b/0042-Support-VRTC-in-a-big-endian-world.patch
deleted file mode 100644
index e66d27e..0000000
--- a/0042-Support-VRTC-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 19eefeadf92a471f1c4fbc6dd4d035e45fa76dcd Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Mon, 19 Oct 2020 17:17:40 -0400
-Subject: [PATCH 4/5] Support VRTC in a big-endian world
-
----
- source/common/dmtbdump3.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-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;
-+    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoVrtc);
-+    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoVrtc);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -534,12 +535,12 @@ AcpiDmDumpVrtc (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_VRTC_ENTRY, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < TableLength)
-     {
-         /* Common subtable header */
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
-             sizeof (ACPI_VRTC_ENTRY), AcpiDmTableInfoVrtc0);
-         if (ACPI_FAILURE (Status))
-         {
diff --git a/0040-Support-DSDT-SSDT-in-a-big-endian-world.patch b/0043-Support-DSDT-SSDT-in-a-big-endian-world.patch
similarity index 71%
rename from 0040-Support-DSDT-SSDT-in-a-big-endian-world.patch
rename to 0043-Support-DSDT-SSDT-in-a-big-endian-world.patch
index bfa106b..60a1e72 100644
--- a/0040-Support-DSDT-SSDT-in-a-big-endian-world.patch
+++ b/0043-Support-DSDT-SSDT-in-a-big-endian-world.patch
@@ -1,7 +1,7 @@
-From a11c0a997dca2b40d1bcff68368d9d5d5297b781 Mon Sep 17 00:00:00 2001
+From 14d220a34462e61fe69141c86f4c3cd2ae68c279 Mon Sep 17 00:00:00 2001
 From: Al Stone <ahs3@redhat.com>
-Date: Thu, 15 Oct 2020 11:35:23 -0600
-Subject: [PATCH 2/5] Support DSDT/SSDT in a big-endian world
+Date: Wed, 30 Sep 2020 18:59:57 -0600
+Subject: [PATCH 43/45] Support DSDT/SSDT in a big-endian world.
 
 NB: this is a very large diff.  The problem is that ResourceTemplates
 are treated differently during compilation and disassembly so each of
@@ -12,38 +12,55 @@ wasn't that much of a change, and most of it was on the codegen side.
 
 Signed-off-by: Al Stone <ahs3@redhat.com>
 ---
+ source/common/adwalk.c                     |   3 +-
  source/common/dmrestag.c                   |   2 +-
  source/common/dmtables.c                   |  17 +-
  source/common/dmtbdump.c                   |   3 +-
- source/compiler/aslcodegen.c               |  61 ++++--
+ source/common/dmtbdump3.c                  |   8 +-
+ source/compiler/aslcodegen.c               |  59 ++++--
  source/compiler/aslopcodes.c               |   3 +-
- source/compiler/aslrestype1.c              |  44 +++--
- source/compiler/aslrestype1i.c             |  33 ++--
+ source/compiler/aslrestype1.c              |  60 ++++--
+ source/compiler/aslrestype1i.c             |  35 ++--
  source/compiler/aslrestype2.c              |  20 +-
  source/compiler/aslrestype2d.c             |  99 ++++++----
  source/compiler/aslrestype2e.c             |  90 ++++++---
  source/compiler/aslrestype2q.c             |  81 +++++---
  source/compiler/aslrestype2s.c             | 214 +++++++++++++++++----
  source/compiler/aslrestype2w.c             |  94 +++++----
- source/components/disassembler/dmbuffer.c  |  10 +-
- source/components/disassembler/dmopcode.c  |   8 +-
+ source/compiler/dttable2.c                 |   3 +-
+ source/components/disassembler/dmbuffer.c  |  37 +++-
+ source/components/disassembler/dmopcode.c  |  21 +-
  source/components/disassembler/dmresrc.c   |   2 +-
  source/components/disassembler/dmresrcl.c  |  43 +++--
  source/components/disassembler/dmresrcl2.c | 128 +++++++-----
  source/components/disassembler/dmresrcs.c  |  18 +-
  source/components/disassembler/dmwalk.c    |   2 +-
- source/components/dispatcher/dsfield.c     |  16 +-
  source/components/namespace/nsaccess.c     |   2 +-
- source/components/namespace/nsnames.c      |   2 +-
+ source/components/namespace/nsnames.c      |   4 +-
  source/components/namespace/nsparse.c      |   6 +-
  source/components/namespace/nsutils.c      |   7 +-
- 25 files changed, 682 insertions(+), 323 deletions(-)
+ source/components/utilities/utresrc.c      |   2 +-
+ 28 files changed, 721 insertions(+), 341 deletions(-)
 
-Index: acpica-unix2-20200925/source/common/dmrestag.c
+Index: acpica-unix2-20210604/source/common/adwalk.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/common/dmrestag.c
-+++ acpica-unix2-20200925/source/common/dmrestag.c
-@@ -1038,7 +1038,7 @@ AcpiDmAddResourcesToNamespace (
+--- acpica-unix2-20210604.orig/source/common/adwalk.c
++++ acpica-unix2-20210604/source/common/adwalk.c
+@@ -679,7 +679,8 @@ AcpiDmLoadDescendingOp (
+ 
+         if (!Path && Op->Common.AmlOpcode == AML_INT_NAMEDFIELD_OP)
+         {
+-            *ACPI_CAST_PTR (UINT32, &FieldPath[0]) = Op->Named.Name;
++            AcpiUtWriteUint (FieldPath, ACPI_NAMESEG_SIZE,
++		             &Op->Named.Name, ACPI_NAMESEG_SIZE);
+             FieldPath[4] = 0;
+             Path = FieldPath;
+         }
+Index: acpica-unix2-20210604/source/common/dmrestag.c
+===================================================================
+--- acpica-unix2-20210604.orig/source/common/dmrestag.c
++++ acpica-unix2-20210604/source/common/dmrestag.c
+@@ -1048,7 +1048,7 @@ AcpiDmAddResourcesToNamespace (
       * NextOp contains the Aml pointer and the Aml length
       */
      AcpiUtWalkAmlResources (NULL, (UINT8 *) NextOp->Named.Data,
@@ -52,18 +69,18 @@ Index: acpica-unix2-20200925/source/common/dmrestag.c
          AcpiDmAddResourceToNamespace, (void **) BufferNode);
  }
  
-Index: acpica-unix2-20200925/source/common/dmtables.c
+Index: acpica-unix2-20210604/source/common/dmtables.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/common/dmtables.c
-+++ acpica-unix2-20200925/source/common/dmtables.c
+--- acpica-unix2-20210604.orig/source/common/dmtables.c
++++ acpica-unix2-20210604/source/common/dmtables.c
 @@ -142,6 +142,10 @@ AdCreateTableHeader (
      ACPI_TABLE_HEADER       *Table)
  {
      UINT8                   Checksum;
-+    UINT32                  TableLength = AcpiUtReadUint32(&Table->Length);
-+    UINT32                  OemRevision = AcpiUtReadUint32(&Table->OemRevision);
-+    UINT32                  CompilerRevision = 
-+	    			AcpiUtReadUint32(&Table->AslCompilerRevision);
++    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
++    UINT32                  OemRevision = AcpiUtReadUint32 (&Table->OemRevision);
++    UINT32                  CompilerRevision =
++                                AcpiUtReadUint32 (&Table->AslCompilerRevision);
  
  
      /* Reset globals for External statements */
@@ -111,29 +128,62 @@ Index: acpica-unix2-20200925/source/common/dmtables.c
      fprintf (stderr, "Pass 1 parse of [%4.4s]\n", (char *) Table->Signature);
  
 -    AmlLength = Table->Length - sizeof (ACPI_TABLE_HEADER);
-+    AmlLength = AcpiUtReadUint32(&Table->Length);
++    AmlLength = AcpiUtReadUint32 (&Table->Length);
 +    AmlLength -= sizeof (ACPI_TABLE_HEADER);
      AmlStart = ((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER));
  
      AcpiUtSetIntegerWidth (Table->Revision);
-Index: acpica-unix2-20200925/source/common/dmtbdump.c
+Index: acpica-unix2-20210604/source/common/dmtbdump.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/common/dmtbdump.c
-+++ acpica-unix2-20200925/source/common/dmtbdump.c
-@@ -333,8 +333,7 @@ AcpiDmDumpXsdt (
+--- acpica-unix2-20210604.orig/source/common/dmtbdump.c
++++ acpica-unix2-20210604/source/common/dmtbdump.c
+@@ -338,8 +338,7 @@ AcpiDmDumpXsdt (
      for (i = 0; i < Entries; i++)
      {
          AcpiDmLineHeader2 (Offset, sizeof (UINT64), "ACPI Table Address", i);
 -        AcpiOsPrintf ("%8.8X%8.8X\n",
--		     	ACPI_FORMAT_UINT64 (AcpiUtReadUint64(&Array[i])));
-+        AcpiOsPrintf ("%16.16lX\n", AcpiUtReadUint64(&Array[i]));
+-                ACPI_FORMAT_UINT64 (AcpiUtReadUint64 (&Array[i])));
++        AcpiOsPrintf ("%16.16lX\n", AcpiUtReadUint64 (&Array[i]));
          Offset += sizeof (UINT64);
      }
  }
-Index: acpica-unix2-20200925/source/compiler/aslcodegen.c
+Index: acpica-unix2-20210604/source/common/dmtbdump3.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/compiler/aslcodegen.c
-+++ acpica-unix2-20200925/source/compiler/aslcodegen.c
+--- acpica-unix2-20210604.orig/source/common/dmtbdump3.c
++++ acpica-unix2-20210604/source/common/dmtbdump3.c
+@@ -736,13 +736,13 @@ AcpiDmDumpWpbt (
+ {
+     ACPI_STATUS             Status;
+     ACPI_TABLE_WPBT         *Subtable;
+-    UINT32                  Length = Table->Length;
++    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
+     UINT16                  ArgumentsLength;
+ 
+ 
+     /* Dump the main table */
+ 
+-    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoWpbt);
++    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoWpbt);
+     if (ACPI_FAILURE (Status))
+     {
+         return;
+@@ -751,10 +751,10 @@ AcpiDmDumpWpbt (
+     /* Extract the arguments buffer length from the main table */
+ 
+     Subtable = ACPI_CAST_PTR (ACPI_TABLE_WPBT, Table);
+-    ArgumentsLength = Subtable->ArgumentsLength;
++    ArgumentsLength = AcpiUtReadUint16 (&Subtable->ArgumentsLength);
+ 
+     /* Dump the arguments buffer */
+ 
+-    (void) AcpiDmDumpTable (Table->Length, 0, Table, ArgumentsLength,
++    (void) AcpiDmDumpTable (TableLength, 0, Table, ArgumentsLength,
+         AcpiDmTableInfoWpbt0);
+ }
+Index: acpica-unix2-20210604/source/compiler/aslcodegen.c
+===================================================================
+--- acpica-unix2-20210604.orig/source/compiler/aslcodegen.c
++++ acpica-unix2-20210604/source/compiler/aslcodegen.c
 @@ -238,6 +238,10 @@ CgWriteAmlOpcode (
  {
      UINT8                   PkgLenFirstByte;
@@ -145,43 +195,30 @@ Index: acpica-unix2-20200925/source/compiler/aslcodegen.c
      union {
          UINT16                  Opcode;
          UINT8                   OpcodeBytes[2];
-@@ -305,25 +309,26 @@ CgWriteAmlOpcode (
- 
-         /* Value is the length to be encoded (Used in field definitions) */
- 
--        PkgLen.Len = (UINT32) Op->Asl.Value.Integer;
-+	PkgLen.Len = (UINT32) Op->Asl.Value.Integer;
-         break;
- 
-     default:
+@@ -312,14 +316,15 @@ CgWriteAmlOpcode (
  
          /* Check for two-byte opcode */
  
-+	Tmp16 = AcpiUtReadUint16(&Aml.Opcode);
++        Tmp16 = AcpiUtReadUint16 (&Aml.Opcode);
          if (Aml.Opcode > 0x00FF)
          {
              /* Write the high byte first */
  
 -            CgLocalWriteAmlData (Op, &Aml.OpcodeBytes[1], 1);
-+            CgLocalWriteAmlData (Op, ((UINT8 *)&Tmp16)+1, 1);
++            CgLocalWriteAmlData (Op, ((UINT8 *) &Tmp16)+1, 1);
          }
  
 -        CgLocalWriteAmlData (Op, &Aml.OpcodeBytes[0], 1);
-+        CgLocalWriteAmlData (Op, (UINT8 *)&Tmp16, 1);
++        CgLocalWriteAmlData (Op, (UINT8 *) &Tmp16, 1);
  
          /* Subtreelength doesn't include length of package length bytes */
  
--        PkgLen.Len = Op->Asl.AmlSubtreeLength + Op->Asl.AmlPkgLenBytes;
-+	PkgLen.Len = Op->Asl.AmlSubtreeLength + Op->Asl.AmlPkgLenBytes;
-         break;
-     }
- 
 @@ -335,7 +340,8 @@ CgWriteAmlOpcode (
          {
              /* Simplest case -- no bytes to follow, just write the count */
  
 -            CgLocalWriteAmlData (Op, &PkgLen.LenBytes[0], 1);
-+	    Tmp8 = (UINT8) PkgLen.Len;
++            Tmp8 = (UINT8) PkgLen.Len;
 +            CgLocalWriteAmlData (Op, &Tmp8, 1);
          }
          else if (Op->Asl.AmlPkgLenBytes != 0)
@@ -190,7 +227,7 @@ Index: acpica-unix2-20200925/source/compiler/aslcodegen.c
               * 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
               */
-+	    Tmp8 = (UINT8) PkgLen.Len;
++            Tmp8 = (UINT8) PkgLen.Len;
              PkgLenFirstByte = (UINT8)
                  (((UINT32) (Op->Asl.AmlPkgLenBytes - 1) << 6) |
 -                (PkgLen.LenBytes[0] & 0x0F));
@@ -202,9 +239,9 @@ Index: acpica-unix2-20200925/source/compiler/aslcodegen.c
               * Now we can write the remaining bytes -
               * either 1, 2, or 3 bytes
               */
-+	    Tmp32 = PkgLen.Len;
-+	    AcpiUtWriteUint(&PkgLen.Len, Op->Asl.AmlPkgLenBytes,
-+			    &Tmp32, sizeof(UINT32));
++            Tmp32 = PkgLen.Len;
++            AcpiUtWriteUint (&PkgLen.Len, Op->Asl.AmlPkgLenBytes,
++                &Tmp32, sizeof (UINT32));
              for (i = 0; i < (UINT32) (Op->Asl.AmlPkgLenBytes - 1); i++)
              {
                  CgLocalWriteAmlData (Op, &PkgLen.LenBytes[i], 1);
@@ -213,32 +250,33 @@ Index: acpica-unix2-20200925/source/compiler/aslcodegen.c
      case AML_BYTE_OP:
  
 -        CgLocalWriteAmlData (Op, &Op->Asl.Value.Integer, 1);
-+	Tmp64 = 0;
-+	AcpiUtWriteUint(&Tmp64, 1, &Op->Asl.Value.Integer, 8);
++        Tmp64 = 0;
++        AcpiUtWriteUint (&Tmp64, 1, &Op->Asl.Value.Integer, 8);
 +        CgLocalWriteAmlData (Op, &Tmp64, 1);
          break;
  
      case AML_WORD_OP:
  
 -        CgLocalWriteAmlData (Op, &Op->Asl.Value.Integer, 2);
-+	Tmp64 = 0;
-+	AcpiUtWriteUint(&Tmp64, 2, &Op->Asl.Value.Integer, 8);
+-       break;
++        Tmp64 = 0;
++        AcpiUtWriteUint (&Tmp64, 2, &Op->Asl.Value.Integer, 8);
 +        CgLocalWriteAmlData (Op, &Tmp64, 2);
-        break;
++        break;
  
      case AML_DWORD_OP:
  
 -        CgLocalWriteAmlData (Op, &Op->Asl.Value.Integer, 4);
-+	Tmp64 = 0;
-+	AcpiUtWriteUint(&Tmp64, 4, &Op->Asl.Value.Integer, 8);
++        Tmp64 = 0;
++        AcpiUtWriteUint (&Tmp64, 4, &Op->Asl.Value.Integer, 8);
 +        CgLocalWriteAmlData (Op, &Tmp64, 4);
          break;
  
      case AML_QWORD_OP:
  
 -        CgLocalWriteAmlData (Op, &Op->Asl.Value.Integer, 8);
-+	Tmp64 = 0;
-+	AcpiUtWriteUint(&Tmp64, 8, &Op->Asl.Value.Integer, 8);
++        Tmp64 = 0;
++        AcpiUtWriteUint (&Tmp64, 8, &Op->Asl.Value.Integer, 8);
 +        CgLocalWriteAmlData (Op, &Tmp64, 8);
          break;
  
@@ -256,8 +294,8 @@ Index: acpica-unix2-20200925/source/compiler/aslcodegen.c
  
      Child = Child->Asl.Next;
 -    AslGbl_TableHeader.OemRevision = (UINT32) Child->Asl.Value.Integer;
-+    AcpiUtWriteUint(&Tmp32, sizeof(UINT32),
-+		   &Child->Asl.Value.Integer, sizeof(Child->Asl.Value.Integer));
++    AcpiUtWriteUint (&Tmp32, sizeof (UINT32),
++           &Child->Asl.Value.Integer, sizeof (Child->Asl.Value.Integer));
 +    AslGbl_TableHeader.OemRevision = Tmp32;
  
      /* Compiler ID */
@@ -268,7 +306,7 @@ Index: acpica-unix2-20200925/source/compiler/aslcodegen.c
  
 -    AslGbl_TableHeader.AslCompilerRevision = ACPI_CA_VERSION;
 +    Tmp32 = ACPI_CA_VERSION;
-+    AslGbl_TableHeader.AslCompilerRevision = AcpiUtReadUint32(&Tmp32);
++    AslGbl_TableHeader.AslCompilerRevision = AcpiUtReadUint32 (&Tmp32);
  
      /* Table length. Checksum zero for now, will rewrite later */
  
@@ -283,7 +321,7 @@ Index: acpica-unix2-20200925/source/compiler/aslcodegen.c
 +     */
 +
 +    Tmp32 = AslGbl_TableHeader.Length;
-+    AslGbl_TableHeader.Length = AcpiUtReadUint32(&Tmp32);
++    AslGbl_TableHeader.Length = AcpiUtReadUint32 (&Tmp32);
 +
      /* Write entire header and clear the table header global */
  
@@ -301,31 +339,31 @@ Index: acpica-unix2-20200925/source/compiler/aslcodegen.c
      case AML_RAW_DATA_QWORD:
  
 -        CgLocalWriteAmlData (Op, &Op->Asl.Value.Integer, Op->Asl.AmlLength);
-+	Tmp64 = 0;
-+	AcpiUtWriteUint(&Tmp64, Op->Asl.AmlLength,
-+			&Op->Asl.Value.Integer, sizeof(UINT64));
++        Tmp64 = 0;
++        AcpiUtWriteUint (&Tmp64, Op->Asl.AmlLength,
++            &Op->Asl.Value.Integer, sizeof (UINT64));
 +        CgLocalWriteAmlData (Op, &Tmp64, Op->Asl.AmlLength);
          return;
  
  
-Index: acpica-unix2-20200925/source/compiler/aslopcodes.c
+Index: acpica-unix2-20210604/source/compiler/aslopcodes.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/compiler/aslopcodes.c
-+++ acpica-unix2-20200925/source/compiler/aslopcodes.c
+--- acpica-unix2-20210604.orig/source/compiler/aslopcodes.c
++++ acpica-unix2-20210604/source/compiler/aslopcodes.c
 @@ -511,7 +511,8 @@ OpcDoUnicode (
  
      for (i = 0; i < Count; i++)
      {
 -        UnicodeString[i] = (UINT16) AsciiString[i];
-+        AcpiUtWriteUint(&UnicodeString[i], sizeof(UINT16),
-+		       	&AsciiString[i], sizeof(UINT8));
++        AcpiUtWriteUint (&UnicodeString[i], sizeof (UINT16),
++                &AsciiString[i], sizeof (UINT8));
      }
  
      /*
-Index: acpica-unix2-20200925/source/compiler/aslrestype1.c
+Index: acpica-unix2-20210604/source/compiler/aslrestype1.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/compiler/aslrestype1.c
-+++ acpica-unix2-20200925/source/compiler/aslrestype1.c
+--- acpica-unix2-20210604.orig/source/compiler/aslrestype1.c
++++ acpica-unix2-20210604/source/compiler/aslrestype1.c
 @@ -143,6 +143,7 @@ RsDoMemory24Descriptor (
      ASL_RESOURCE_NODE       *Rnode;
      UINT32                  CurrentByteOffset;
@@ -340,7 +378,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype1.c
      Descriptor->Memory24.DescriptorType = ACPI_RESOURCE_NAME_MEMORY24;
 -    Descriptor->Memory24.ResourceLength = 9;
 +    Tmp16 = 9;
-+    Descriptor->Memory24.ResourceLength = AcpiUtReadUint16(&Tmp16);
++    Descriptor->Memory24.ResourceLength = AcpiUtReadUint16 (&Tmp16);
  
      /* Process all child initialization nodes */
  
@@ -350,7 +388,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype1.c
  
 -            Descriptor->Memory24.Minimum = (UINT16) InitializerOp->Asl.Value.Integer;
 +            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Memory24.Minimum = AcpiUtReadUint16(&Tmp16);
++            Descriptor->Memory24.Minimum = AcpiUtReadUint16 (&Tmp16);
              RsCreateWordField (InitializerOp, ACPI_RESTAG_MINADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Memory24.Minimum));
              MinOp = InitializerOp;
@@ -360,7 +398,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype1.c
  
 -            Descriptor->Memory24.Maximum = (UINT16) InitializerOp->Asl.Value.Integer;
 +            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Memory24.Maximum = AcpiUtReadUint16(&Tmp16);
++            Descriptor->Memory24.Maximum = AcpiUtReadUint16 (&Tmp16);
              RsCreateWordField (InitializerOp, ACPI_RESTAG_MAXADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Memory24.Maximum));
              MaxOp = InitializerOp;
@@ -370,7 +408,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype1.c
  
 -            Descriptor->Memory24.Alignment = (UINT16) InitializerOp->Asl.Value.Integer;
 +            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Memory24.Alignment = AcpiUtReadUint16(&Tmp16);
++            Descriptor->Memory24.Alignment = AcpiUtReadUint16 (&Tmp16);
              RsCreateWordField (InitializerOp, ACPI_RESTAG_ALIGNMENT,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Memory24.Alignment));
              break;
@@ -379,10 +417,25 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype1.c
  
 -            Descriptor->Memory24.AddressLength = (UINT16) InitializerOp->Asl.Value.Integer;
 +            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Memory24.AddressLength = AcpiUtReadUint16(&Tmp16);
++            Descriptor->Memory24.AddressLength = AcpiUtReadUint16 (&Tmp16);
              RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Memory24.AddressLength));
              LengthOp = InitializerOp;
+@@ -214,10 +220,10 @@ RsDoMemory24Descriptor (
+     /* Validate the Min/Max/Len/Align values (Alignment==0 means 64K) */
+ 
+     RsSmallAddressCheck (ACPI_RESOURCE_NAME_MEMORY24,
+-        Descriptor->Memory24.Minimum,
+-        Descriptor->Memory24.Maximum,
+-        Descriptor->Memory24.AddressLength,
+-        Descriptor->Memory24.Alignment,
++        (UINT32) AcpiUtReadUint16 (&Descriptor->Memory24.Minimum),
++        (UINT32) AcpiUtReadUint16 (&Descriptor->Memory24.Maximum),
++        (UINT32) AcpiUtReadUint16 (&Descriptor->Memory24.AddressLength),
++        (UINT32) AcpiUtReadUint16 (&Descriptor->Memory24.Alignment),
+         MinOp, MaxOp, LengthOp, NULL, Info->DescriptorTypeOp);
+ 
+     return (Rnode);
 @@ -249,6 +255,8 @@ RsDoMemory32Descriptor (
      ASL_RESOURCE_NODE       *Rnode;
      UINT32                  CurrentByteOffset;
@@ -398,7 +451,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype1.c
      Descriptor->Memory32.DescriptorType = ACPI_RESOURCE_NAME_MEMORY32;
 -    Descriptor->Memory32.ResourceLength = 17;
 +    Tmp16 = 17;
-+    Descriptor->Memory32.ResourceLength = AcpiUtReadUint16(&Tmp16);
++    Descriptor->Memory32.ResourceLength = AcpiUtReadUint16 (&Tmp16);
  
      /* Process all child initialization nodes */
  
@@ -408,7 +461,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype1.c
  
 -            Descriptor->Memory32.Minimum = (UINT32) InitializerOp->Asl.Value.Integer;
 +            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Memory32.Minimum = AcpiUtReadUint32(&Tmp32);
++            Descriptor->Memory32.Minimum = AcpiUtReadUint32 (&Tmp32);
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_MINADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Memory32.Minimum));
              MinOp = InitializerOp;
@@ -418,7 +471,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype1.c
  
 -            Descriptor->Memory32.Maximum = (UINT32) InitializerOp->Asl.Value.Integer;
 +            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Memory32.Maximum = AcpiUtReadUint32(&Tmp32);
++            Descriptor->Memory32.Maximum = AcpiUtReadUint32 (&Tmp32);
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Memory32.Maximum));
              MaxOp = InitializerOp;
@@ -428,7 +481,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype1.c
  
 -            Descriptor->Memory32.Alignment = (UINT32) InitializerOp->Asl.Value.Integer;
 +            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Memory32.Alignment = AcpiUtReadUint32(&Tmp32);
++            Descriptor->Memory32.Alignment = AcpiUtReadUint32 (&Tmp32);
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_ALIGNMENT,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Memory32.Alignment));
              AlignOp = InitializerOp;
@@ -438,10 +491,25 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype1.c
  
 -            Descriptor->Memory32.AddressLength = (UINT32) InitializerOp->Asl.Value.Integer;
 +            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Memory32.AddressLength = AcpiUtReadUint32(&Tmp32);
++            Descriptor->Memory32.AddressLength = AcpiUtReadUint32 (&Tmp32);
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Memory32.AddressLength));
              LengthOp = InitializerOp;
+@@ -321,10 +334,10 @@ RsDoMemory32Descriptor (
+     /* Validate the Min/Max/Len/Align values */
+ 
+     RsSmallAddressCheck (ACPI_RESOURCE_NAME_MEMORY32,
+-        Descriptor->Memory32.Minimum,
+-        Descriptor->Memory32.Maximum,
+-        Descriptor->Memory32.AddressLength,
+-        Descriptor->Memory32.Alignment,
++        AcpiUtReadUint32 (&Descriptor->Memory32.Minimum),
++        AcpiUtReadUint32 (&Descriptor->Memory32.Maximum),
++        AcpiUtReadUint32 (&Descriptor->Memory32.AddressLength),
++        AcpiUtReadUint32 (&Descriptor->Memory32.Alignment),
+         MinOp, MaxOp, LengthOp, AlignOp, Info->DescriptorTypeOp);
+ 
+     return (Rnode);
 @@ -352,6 +365,8 @@ RsDoMemory32FixedDescriptor (
      ASL_RESOURCE_NODE       *Rnode;
      UINT32                  CurrentByteOffset;
@@ -457,7 +525,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype1.c
      Descriptor->FixedMemory32.DescriptorType = ACPI_RESOURCE_NAME_FIXED_MEMORY32;
 -    Descriptor->FixedMemory32.ResourceLength = 9;
 +    Tmp16 = 9;
-+    Descriptor->FixedMemory32.ResourceLength = AcpiUtReadUint16(&Tmp16);
++    Descriptor->FixedMemory32.ResourceLength = AcpiUtReadUint16 (&Tmp16);
  
      /* Process all child initialization nodes */
  
@@ -467,7 +535,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype1.c
  
 -            Descriptor->FixedMemory32.Address = (UINT32) InitializerOp->Asl.Value.Integer;
 +            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->FixedMemory32.Address = AcpiUtReadUint32(&Tmp32);
++            Descriptor->FixedMemory32.Address = AcpiUtReadUint32 (&Tmp32);
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_BASEADDRESS,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (FixedMemory32.Address));
              break;
@@ -476,14 +544,14 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype1.c
  
 -            Descriptor->FixedMemory32.AddressLength = (UINT32) InitializerOp->Asl.Value.Integer;
 +            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->FixedMemory32.AddressLength = AcpiUtReadUint32(&Tmp32);
++            Descriptor->FixedMemory32.AddressLength = AcpiUtReadUint32 (&Tmp32);
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (FixedMemory32.AddressLength));
              break;
-Index: acpica-unix2-20200925/source/compiler/aslrestype1i.c
+Index: acpica-unix2-20210604/source/compiler/aslrestype1i.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/compiler/aslrestype1i.c
-+++ acpica-unix2-20200925/source/compiler/aslrestype1i.c
+--- acpica-unix2-20210604.orig/source/compiler/aslrestype1i.c
++++ acpica-unix2-20210604/source/compiler/aslrestype1i.c
 @@ -199,6 +199,7 @@ RsDoFixedDmaDescriptor (
      ASL_RESOURCE_NODE       *Rnode;
      UINT32                  CurrentByteOffset;
@@ -498,7 +566,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype1i.c
  
 -            Descriptor->FixedDma.RequestLines = (UINT16) InitializerOp->Asl.Value.Integer;
 +            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->FixedDma.RequestLines = AcpiUtReadUint16(&Tmp16);
++            Descriptor->FixedDma.RequestLines = AcpiUtReadUint16 (&Tmp16);
              RsCreateWordField (InitializerOp, ACPI_RESTAG_DMA,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (FixedDma.RequestLines));
              break;
@@ -507,7 +575,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype1i.c
  
 -            Descriptor->FixedDma.Channels = (UINT16) InitializerOp->Asl.Value.Integer;
 +            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->FixedDma.Channels = AcpiUtReadUint16(&Tmp16);
++            Descriptor->FixedDma.Channels = AcpiUtReadUint16 (&Tmp16);
              RsCreateWordField (InitializerOp, ACPI_RESTAG_DMATYPE,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (FixedDma.Channels));
              break;
@@ -526,10 +594,19 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype1i.c
 -            Descriptor->FixedIo.Address =
 -                (UINT16) InitializerOp->Asl.Value.Integer;
 +            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->FixedIo.Address = AcpiUtReadUint16(&Tmp16);
++            Descriptor->FixedIo.Address = AcpiUtReadUint16 (&Tmp16);
              RsCreateWordField (InitializerOp, ACPI_RESTAG_BASEADDRESS,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (FixedIo.Address));
              AddressOp = InitializerOp;
+@@ -324,7 +328,7 @@ RsDoFixedIoDescriptor (
+ 
+     /* Error checks */
+ 
+-    if (Descriptor->FixedIo.Address > 0x03FF)
++    if (AcpiUtReadUint16 (&Descriptor->FixedIo.Address) > 0x03FF)
+     {
+         AslError (ASL_WARNING, ASL_MSG_ISA_ADDRESS, AddressOp, NULL);
+     }
 @@ -358,6 +362,7 @@ RsDoIoDescriptor (
      ASL_RESOURCE_NODE       *Rnode;
      UINT32                  CurrentByteOffset;
@@ -545,7 +622,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype1i.c
 -            Descriptor->Io.Minimum =
 -                (UINT16) InitializerOp->Asl.Value.Integer;
 +            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Io.Minimum = AcpiUtReadUint16(&Tmp16);
++            Descriptor->Io.Minimum = AcpiUtReadUint16 (&Tmp16);
              RsCreateWordField (InitializerOp, ACPI_RESTAG_MINADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Io.Minimum));
              MinOp = InitializerOp;
@@ -556,7 +633,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype1i.c
 -            Descriptor->Io.Maximum =
 -                (UINT16) InitializerOp->Asl.Value.Integer;
 +            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Io.Maximum = AcpiUtReadUint16(&Tmp16);
++            Descriptor->Io.Maximum = AcpiUtReadUint16 (&Tmp16);
              RsCreateWordField (InitializerOp, ACPI_RESTAG_MAXADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Io.Maximum));
              MaxOp = InitializerOp;
@@ -568,10 +645,10 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype1i.c
 -        Descriptor->Io.Maximum,
 -        Descriptor->Io.AddressLength,
 -        Descriptor->Io.Alignment,
-+        (UINT32)(AcpiUtReadUint16(&Descriptor->Io.Minimum)),
-+        (UINT32)(AcpiUtReadUint16(&Descriptor->Io.Maximum)),
-+        (UINT32)Descriptor->Io.AddressLength,
-+        (UINT32)Descriptor->Io.Alignment,
++        (UINT32) (AcpiUtReadUint16 (&Descriptor->Io.Minimum)),
++        (UINT32) (AcpiUtReadUint16 (&Descriptor->Io.Maximum)),
++        (UINT32) Descriptor->Io.AddressLength,
++        (UINT32) Descriptor->Io.Alignment,
          MinOp, MaxOp, LengthOp, AlignOp, Info->DescriptorTypeOp);
  
      return (Rnode);
@@ -580,7 +657,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype1i.c
      /* Now we can set the channel mask */
  
 -    Descriptor->Irq.IrqMask = IrqMask;
-+    Descriptor->Irq.IrqMask = AcpiUtReadUint16(&IrqMask);
++    Descriptor->Irq.IrqMask = AcpiUtReadUint16 (&IrqMask);
      return (Rnode);
  }
  
@@ -592,10 +669,10 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype1i.c
 +    Descriptor->Irq.IrqMask = AcpiUtReadUint16(&IrqMask);
      return (Rnode);
  }
-Index: acpica-unix2-20200925/source/compiler/aslrestype2.c
+Index: acpica-unix2-20210604/source/compiler/aslrestype2.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/compiler/aslrestype2.c
-+++ acpica-unix2-20200925/source/compiler/aslrestype2.c
+--- acpica-unix2-20210604.orig/source/compiler/aslrestype2.c
++++ acpica-unix2-20210604/source/compiler/aslrestype2.c
 @@ -77,6 +77,8 @@ RsDoGeneralRegisterDescriptor (
      ASL_RESOURCE_NODE       *Rnode;
      UINT32                  CurrentByteOffset;
@@ -611,7 +688,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2.c
      Descriptor->GenericReg.DescriptorType = ACPI_RESOURCE_NAME_GENERIC_REGISTER;
 -    Descriptor->GenericReg.ResourceLength = 12;
 +    Tmp16 = 12;
-+    Descriptor->GenericReg.ResourceLength = AcpiUtReadUint16(&Tmp16);
++    Descriptor->GenericReg.ResourceLength = AcpiUtReadUint16 (&Tmp16);
  
      /* Process all child initialization nodes */
  
@@ -621,7 +698,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2.c
  
 -            Descriptor->GenericReg.Address = InitializerOp->Asl.Value.Integer;
 +            Tmp64 = InitializerOp->Asl.Value.Integer;
-+            Descriptor->GenericReg.Address = AcpiUtReadUint64(&Tmp64);
++            Descriptor->GenericReg.Address = AcpiUtReadUint64 (&Tmp64);
              RsCreateQwordField (InitializerOp, ACPI_RESTAG_ADDRESS,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (GenericReg.Address));
              break;
@@ -649,7 +726,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2.c
  
 -            Rover->DwordItem = (UINT32) InitializerOp->Asl.Value.Integer;
 +            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Rover->DwordItem = AcpiUtReadUint32(&Tmp32);
++            Rover->DwordItem = AcpiUtReadUint32 (&Tmp32);
              Rover = ACPI_ADD_PTR (AML_RESOURCE, &(Rover->DwordItem), 4);
              Descriptor->ExtendedIrq.InterruptCount++;
              Descriptor->ExtendedIrq.ResourceLength += 4;
@@ -658,7 +735,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2.c
              (Descriptor->ExtendedIrq.ResourceLength + StringLength);
      }
 +    Tmp16 = Descriptor->ExtendedIrq.ResourceLength;
-+    Descriptor->ExtendedIrq.ResourceLength  = AcpiUtReadUint16(&Tmp16);
++    Descriptor->ExtendedIrq.ResourceLength  = AcpiUtReadUint16 (&Tmp16);
  
      Rnode->BufferLength =
          (ASL_RESDESC_OFFSET (ExtendedIrq.Interrupts[0]) -
@@ -667,21 +744,21 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2.c
      Descriptor = Rnode->Buffer;
      Descriptor->VendorLarge.DescriptorType = ACPI_RESOURCE_NAME_VENDOR_LARGE;
 -    Descriptor->VendorLarge.ResourceLength = (UINT16) i;
-+    AcpiUtWriteUint(&Descriptor->VendorLarge.ResourceLength, sizeof(UINT16),
-+		    &i, sizeof(UINT32));
++    AcpiUtWriteUint (&Descriptor->VendorLarge.ResourceLength, sizeof (UINT16),
++            &i, sizeof (UINT32));
  
      /* Point to end-of-descriptor for vendor data */
  
-Index: acpica-unix2-20200925/source/compiler/aslrestype2d.c
+Index: acpica-unix2-20210604/source/compiler/aslrestype2d.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/compiler/aslrestype2d.c
-+++ acpica-unix2-20200925/source/compiler/aslrestype2d.c
+--- acpica-unix2-20210604.orig/source/compiler/aslrestype2d.c
++++ acpica-unix2-20210604/source/compiler/aslrestype2d.c
 @@ -84,6 +84,8 @@ RsDoDwordIoDescriptor (
      UINT32                  CurrentByteOffset;
      UINT32                  i;
      BOOLEAN                 ResSourceIndex = FALSE;
-+    UINT16		    Tmp16;
-+    UINT32		    Tmp32;
++    UINT16                  Tmp16;
++    UINT32                  Tmp32;
  
  
      InitializerOp = Info->DescriptorTypeOp->Asl.Child;
@@ -691,8 +768,8 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2d.c
  
 -            Descriptor->Address32.Granularity =
 -                (UINT32) InitializerOp->Asl.Value.Integer;
-+	    Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address32.Granularity = AcpiUtReadUint32(&Tmp32);
++            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address32.Granularity = AcpiUtReadUint32 (&Tmp32);
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Granularity));
              GranOp = InitializerOp;
@@ -702,8 +779,8 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2d.c
  
 -            Descriptor->Address32.Minimum =
 -                (UINT32) InitializerOp->Asl.Value.Integer;
-+	    Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address32.Minimum = AcpiUtReadUint32(&Tmp32);
++            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address32.Minimum = AcpiUtReadUint32 (&Tmp32);
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_MINADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Minimum));
              MinOp = InitializerOp;
@@ -713,8 +790,8 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2d.c
  
 -            Descriptor->Address32.Maximum =
 -                (UINT32) InitializerOp->Asl.Value.Integer;
-+	    Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address32.Maximum = AcpiUtReadUint32(&Tmp32);
++            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address32.Maximum = AcpiUtReadUint32 (&Tmp32);
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Maximum));
              MaxOp = InitializerOp;
@@ -724,8 +801,8 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2d.c
  
 -            Descriptor->Address32.TranslationOffset =
 -                (UINT32) InitializerOp->Asl.Value.Integer;
-+	    Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address32.TranslationOffset = AcpiUtReadUint32(&Tmp32);
++            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address32.TranslationOffset = AcpiUtReadUint32 (&Tmp32);
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.TranslationOffset));
              break;
@@ -734,8 +811,8 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2d.c
  
 -            Descriptor->Address32.AddressLength =
 -                (UINT32) InitializerOp->Asl.Value.Integer;
-+	    Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address32.AddressLength = AcpiUtReadUint32(&Tmp32);
++            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address32.AddressLength = AcpiUtReadUint32 (&Tmp32);
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.AddressLength));
              LengthOp = InitializerOp;
@@ -744,17 +821,17 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2d.c
      /* Validate the Min/Max/Len/Gran values */
  
 +    Tmp16 = Descriptor->Address32.ResourceLength;
-+    Descriptor->Address32.ResourceLength = AcpiUtReadUint16(&Tmp16);
++    Descriptor->Address32.ResourceLength = AcpiUtReadUint16 (&Tmp16);
 +
      RsLargeAddressCheck (
 -        (UINT64) Descriptor->Address32.Minimum,
 -        (UINT64) Descriptor->Address32.Maximum,
 -        (UINT64) Descriptor->Address32.AddressLength,
 -        (UINT64) Descriptor->Address32.Granularity,
-+        (UINT64) AcpiUtReadUint32(&Descriptor->Address32.Minimum),
-+        (UINT64) AcpiUtReadUint32(&Descriptor->Address32.Maximum),
-+        (UINT64) AcpiUtReadUint32(&Descriptor->Address32.AddressLength),
-+        (UINT64) AcpiUtReadUint32(&Descriptor->Address32.Granularity),
++        (UINT64) AcpiUtReadUint32 (&Descriptor->Address32.Minimum),
++        (UINT64) AcpiUtReadUint32 (&Descriptor->Address32.Maximum),
++        (UINT64) AcpiUtReadUint32 (&Descriptor->Address32.AddressLength),
++        (UINT64) AcpiUtReadUint32 (&Descriptor->Address32.Granularity),
          Descriptor->Address32.Flags,
          MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
  
@@ -774,7 +851,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2d.c
 -            Descriptor->Address32.Granularity =
 -                (UINT32) InitializerOp->Asl.Value.Integer;
 +            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address32.Granularity = AcpiUtReadUint32(&Tmp32);
++            Descriptor->Address32.Granularity = AcpiUtReadUint32 (&Tmp32);
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Granularity));
              GranOp = InitializerOp;
@@ -785,7 +862,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2d.c
 -            Descriptor->Address32.Minimum =
 -                (UINT32) InitializerOp->Asl.Value.Integer;
 +            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address32.Minimum = AcpiUtReadUint32(&Tmp32);
++            Descriptor->Address32.Minimum = AcpiUtReadUint32 (&Tmp32);
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_MINADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Minimum));
              MinOp = InitializerOp;
@@ -796,7 +873,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2d.c
 -            Descriptor->Address32.Maximum =
 -                (UINT32) InitializerOp->Asl.Value.Integer;
 +            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address32.Maximum = AcpiUtReadUint32(&Tmp32);
++            Descriptor->Address32.Maximum = AcpiUtReadUint32 (&Tmp32);
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Maximum));
              MaxOp = InitializerOp;
@@ -807,7 +884,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2d.c
 -            Descriptor->Address32.TranslationOffset =
 -                (UINT32) InitializerOp->Asl.Value.Integer;
 +            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address32.TranslationOffset = AcpiUtReadUint32(&Tmp32);
++            Descriptor->Address32.TranslationOffset = AcpiUtReadUint32 (&Tmp32);
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.TranslationOffset));
              break;
@@ -817,7 +894,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2d.c
 -            Descriptor->Address32.AddressLength =
 -                (UINT32) InitializerOp->Asl.Value.Integer;
 +            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address32.AddressLength = AcpiUtReadUint32(&Tmp32);
++            Descriptor->Address32.AddressLength = AcpiUtReadUint32 (&Tmp32);
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.AddressLength));
              LengthOp = InitializerOp;
@@ -826,17 +903,17 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2d.c
      /* Validate the Min/Max/Len/Gran values */
  
 +    Tmp16 = Descriptor->Address32.ResourceLength;
-+    Descriptor->Address32.ResourceLength = AcpiUtReadUint16(&Tmp16);
++    Descriptor->Address32.ResourceLength = AcpiUtReadUint16 (&Tmp16);
 +
      RsLargeAddressCheck (
 -        (UINT64) Descriptor->Address32.Minimum,
 -        (UINT64) Descriptor->Address32.Maximum,
 -        (UINT64) Descriptor->Address32.AddressLength,
 -        (UINT64) Descriptor->Address32.Granularity,
-+        (UINT64) AcpiUtReadUint32(&Descriptor->Address32.Minimum),
-+        (UINT64) AcpiUtReadUint32(&Descriptor->Address32.Maximum),
-+        (UINT64) AcpiUtReadUint32(&Descriptor->Address32.AddressLength),
-+        (UINT64) AcpiUtReadUint32(&Descriptor->Address32.Granularity),
++        (UINT64) AcpiUtReadUint32 (&Descriptor->Address32.Minimum),
++        (UINT64) AcpiUtReadUint32 (&Descriptor->Address32.Maximum),
++        (UINT64) AcpiUtReadUint32 (&Descriptor->Address32.AddressLength),
++        (UINT64) AcpiUtReadUint32 (&Descriptor->Address32.Granularity),
          Descriptor->Address32.Flags,
          MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
  
@@ -855,8 +932,8 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2d.c
  
 -            Descriptor->Address32.Granularity =
 -                (UINT32) InitializerOp->Asl.Value.Integer;
-+	    Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address32.Granularity = AcpiUtReadUint32(&Tmp32);
++            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address32.Granularity = AcpiUtReadUint32 (&Tmp32);
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Granularity));
              GranOp = InitializerOp;
@@ -866,8 +943,8 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2d.c
  
 -            Descriptor->Address32.Minimum =
 -                (UINT32) InitializerOp->Asl.Value.Integer;
-+	    Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address32.Minimum = AcpiUtReadUint32(&Tmp32);
++            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address32.Minimum = AcpiUtReadUint32 (&Tmp32);
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_MINADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Minimum));
              MinOp = InitializerOp;
@@ -877,8 +954,8 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2d.c
  
 -            Descriptor->Address32.Maximum =
 -                (UINT32) InitializerOp->Asl.Value.Integer;
-+	    Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address32.Maximum = AcpiUtReadUint32(&Tmp32);
++            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address32.Maximum = AcpiUtReadUint32 (&Tmp32);
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Maximum));
              MaxOp = InitializerOp;
@@ -888,8 +965,8 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2d.c
  
 -            Descriptor->Address32.TranslationOffset =
 -                (UINT32) InitializerOp->Asl.Value.Integer;
-+	    Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address32.TranslationOffset = AcpiUtReadUint32(&Tmp32);
++            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address32.TranslationOffset = AcpiUtReadUint32 (&Tmp32);
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.TranslationOffset));
              break;
@@ -898,8 +975,8 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2d.c
  
 -            Descriptor->Address32.AddressLength =
 -                (UINT32) InitializerOp->Asl.Value.Integer;
-+	    Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address32.AddressLength = AcpiUtReadUint32(&Tmp32);
++            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address32.AddressLength = AcpiUtReadUint32 (&Tmp32);
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.AddressLength));
              LengthOp = InitializerOp;
@@ -908,286 +985,24 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2d.c
      /* Validate the Min/Max/Len/Gran values */
  
 +    Tmp16 = Descriptor->Address32.ResourceLength;
-+    Descriptor->Address32.ResourceLength = AcpiUtReadUint16(&Tmp16);
++    Descriptor->Address32.ResourceLength = AcpiUtReadUint16 (&Tmp16);
 +
      RsLargeAddressCheck (
 -        (UINT64) Descriptor->Address32.Minimum,
 -        (UINT64) Descriptor->Address32.Maximum,
 -        (UINT64) Descriptor->Address32.AddressLength,
 -        (UINT64) Descriptor->Address32.Granularity,
-+        (UINT64) AcpiUtReadUint32(&Descriptor->Address32.Minimum),
-+        (UINT64) AcpiUtReadUint32(&Descriptor->Address32.Maximum),
-+        (UINT64) AcpiUtReadUint32(&Descriptor->Address32.AddressLength),
-+        (UINT64) AcpiUtReadUint32(&Descriptor->Address32.Granularity),
++        (UINT64) AcpiUtReadUint32 (&Descriptor->Address32.Minimum),
++        (UINT64) AcpiUtReadUint32 (&Descriptor->Address32.Maximum),
++        (UINT64) AcpiUtReadUint32 (&Descriptor->Address32.AddressLength),
++        (UINT64) AcpiUtReadUint32 (&Descriptor->Address32.Granularity),
          Descriptor->Address32.Flags,
          MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
  
-Index: acpica-unix2-20200925/source/compiler/aslrestype2e.c
+Index: acpica-unix2-20210604/source/compiler/aslrestype2q.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;
-+    UINT16                  Tmp16;
- 
- 
-     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -139,7 +140,8 @@ RsDoExtendedIoDescriptor (
- 
-         case 5: /* Address Granularity */
- 
--            Descriptor->ExtAddress64.Granularity = InitializerOp->Asl.Value.Integer;
-+            Descriptor->ExtAddress64.Granularity =
-+		    AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Granularity));
-             GranOp = InitializerOp;
-@@ -147,7 +149,8 @@ RsDoExtendedIoDescriptor (
- 
-         case 6: /* Address Min */
- 
--            Descriptor->ExtAddress64.Minimum = InitializerOp->Asl.Value.Integer;
-+            Descriptor->ExtAddress64.Minimum = 
-+	            AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Minimum));
-             MinOp = InitializerOp;
-@@ -155,7 +158,8 @@ RsDoExtendedIoDescriptor (
- 
-         case 7: /* Address Max */
- 
--            Descriptor->ExtAddress64.Maximum = InitializerOp->Asl.Value.Integer;
-+            Descriptor->ExtAddress64.Maximum = 
-+	            AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Maximum));
-             MaxOp = InitializerOp;
-@@ -163,14 +167,16 @@ RsDoExtendedIoDescriptor (
- 
-         case 8: /* Translation Offset */
- 
--            Descriptor->ExtAddress64.TranslationOffset = InitializerOp->Asl.Value.Integer;
-+            Descriptor->ExtAddress64.TranslationOffset = 
-+	            AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.TranslationOffset));
-             break;
- 
-         case 9: /* Address Length */
- 
--            Descriptor->ExtAddress64.AddressLength = InitializerOp->Asl.Value.Integer;
-+            Descriptor->ExtAddress64.AddressLength = 
-+	            AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.AddressLength));
-             LengthOp = InitializerOp;
-@@ -178,7 +184,8 @@ RsDoExtendedIoDescriptor (
- 
-         case 10: /* Type-Specific Attributes */
- 
--            Descriptor->ExtAddress64.TypeSpecific = InitializerOp->Asl.Value.Integer;
-+            Descriptor->ExtAddress64.TypeSpecific = 
-+	            AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_TYPESPECIFICATTRIBUTES,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.TypeSpecific));
-             break;
-@@ -213,11 +220,14 @@ RsDoExtendedIoDescriptor (
- 
-     /* Validate the Min/Max/Len/Gran values */
- 
-+    Tmp16 = Descriptor->ExtAddress64.ResourceLength;
-+    Descriptor->ExtAddress64.ResourceLength = AcpiUtReadUint16(&Tmp16);
-+
-     RsLargeAddressCheck (
--        Descriptor->ExtAddress64.Minimum,
--        Descriptor->ExtAddress64.Maximum,
--        Descriptor->ExtAddress64.AddressLength,
--        Descriptor->ExtAddress64.Granularity,
-+        AcpiUtReadUint64(&Descriptor->ExtAddress64.Minimum),
-+        AcpiUtReadUint64(&Descriptor->ExtAddress64.Maximum),
-+        AcpiUtReadUint64(&Descriptor->ExtAddress64.AddressLength),
-+        AcpiUtReadUint64(&Descriptor->ExtAddress64.Granularity),
-         Descriptor->ExtAddress64.Flags,
-         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
- 
-@@ -253,6 +263,7 @@ RsDoExtendedMemoryDescriptor (
-     UINT16                  StringLength = 0;
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-+    UINT16                  Tmp16;
- 
- 
-     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -319,7 +330,8 @@ RsDoExtendedMemoryDescriptor (
- 
-         case 6: /* Address Granularity */
- 
--            Descriptor->ExtAddress64.Granularity = InitializerOp->Asl.Value.Integer;
-+            Descriptor->ExtAddress64.Granularity = 
-+		    AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Granularity));
-             GranOp = InitializerOp;
-@@ -327,7 +339,8 @@ RsDoExtendedMemoryDescriptor (
- 
-         case 7: /* Min Address */
- 
--            Descriptor->ExtAddress64.Minimum = InitializerOp->Asl.Value.Integer;
-+            Descriptor->ExtAddress64.Minimum = 
-+	            AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Minimum));
-             MinOp = InitializerOp;
-@@ -335,7 +348,8 @@ RsDoExtendedMemoryDescriptor (
- 
-         case 8: /* Max Address */
- 
--            Descriptor->ExtAddress64.Maximum = InitializerOp->Asl.Value.Integer;
-+            Descriptor->ExtAddress64.Maximum = 
-+	            AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Maximum));
-             MaxOp = InitializerOp;
-@@ -343,14 +357,16 @@ RsDoExtendedMemoryDescriptor (
- 
-         case 9: /* Translation Offset */
- 
--            Descriptor->ExtAddress64.TranslationOffset = InitializerOp->Asl.Value.Integer;
-+            Descriptor->ExtAddress64.TranslationOffset = 
-+	            AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.TranslationOffset));
-             break;
- 
-         case 10: /* Address Length */
- 
--            Descriptor->ExtAddress64.AddressLength = InitializerOp->Asl.Value.Integer;
-+            Descriptor->ExtAddress64.AddressLength = 
-+	            AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.AddressLength));
-             LengthOp = InitializerOp;
-@@ -358,7 +374,8 @@ RsDoExtendedMemoryDescriptor (
- 
-         case 11: /* Type-Specific Attributes */
- 
--            Descriptor->ExtAddress64.TypeSpecific = InitializerOp->Asl.Value.Integer;
-+            Descriptor->ExtAddress64.TypeSpecific = 
-+	            AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_TYPESPECIFICATTRIBUTES,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.TypeSpecific));
-             break;
-@@ -394,11 +411,14 @@ RsDoExtendedMemoryDescriptor (
- 
-     /* Validate the Min/Max/Len/Gran values */
- 
-+    Tmp16 = Descriptor->ExtAddress64.ResourceLength;
-+    Descriptor->ExtAddress64.ResourceLength = AcpiUtReadUint16(&Tmp16);
-+
-     RsLargeAddressCheck (
--        Descriptor->ExtAddress64.Minimum,
--        Descriptor->ExtAddress64.Maximum,
--        Descriptor->ExtAddress64.AddressLength,
--        Descriptor->ExtAddress64.Granularity,
-+        AcpiUtReadUint64(&Descriptor->ExtAddress64.Minimum),
-+        AcpiUtReadUint64(&Descriptor->ExtAddress64.Maximum),
-+        AcpiUtReadUint64(&Descriptor->ExtAddress64.AddressLength),
-+        AcpiUtReadUint64(&Descriptor->ExtAddress64.Granularity),
-         Descriptor->ExtAddress64.Flags,
-         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
- 
-@@ -434,6 +454,7 @@ RsDoExtendedSpaceDescriptor (
-     UINT16                  StringLength = 0;
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-+    UINT16                  Tmp16;
- 
- 
-     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -497,7 +518,8 @@ RsDoExtendedSpaceDescriptor (
- 
-         case 6: /* Address Granularity */
- 
--            Descriptor->ExtAddress64.Granularity = InitializerOp->Asl.Value.Integer;
-+            Descriptor->ExtAddress64.Granularity = 
-+		    AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Granularity));
-             GranOp = InitializerOp;
-@@ -505,7 +527,8 @@ RsDoExtendedSpaceDescriptor (
- 
-         case 7: /* Min Address */
- 
--            Descriptor->ExtAddress64.Minimum = InitializerOp->Asl.Value.Integer;
-+            Descriptor->ExtAddress64.Minimum = 
-+	            AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Minimum));
-             MinOp = InitializerOp;
-@@ -513,7 +536,8 @@ RsDoExtendedSpaceDescriptor (
- 
-         case 8: /* Max Address */
- 
--            Descriptor->ExtAddress64.Maximum = InitializerOp->Asl.Value.Integer;
-+            Descriptor->ExtAddress64.Maximum = 
-+	            AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Maximum));
-             MaxOp = InitializerOp;
-@@ -521,14 +545,16 @@ RsDoExtendedSpaceDescriptor (
- 
-         case 9: /* Translation Offset */
- 
--            Descriptor->ExtAddress64.TranslationOffset = InitializerOp->Asl.Value.Integer;
-+            Descriptor->ExtAddress64.TranslationOffset = 
-+	            AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.TranslationOffset));
-             break;
- 
-         case 10: /* Address Length */
- 
--            Descriptor->ExtAddress64.AddressLength = InitializerOp->Asl.Value.Integer;
-+            Descriptor->ExtAddress64.AddressLength = 
-+	            AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.AddressLength));
-             LengthOp = InitializerOp;
-@@ -536,7 +562,8 @@ RsDoExtendedSpaceDescriptor (
- 
-         case 11: /* Type-Specific Attributes */
- 
--            Descriptor->ExtAddress64.TypeSpecific = InitializerOp->Asl.Value.Integer;
-+            Descriptor->ExtAddress64.TypeSpecific = 
-+	            AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_TYPESPECIFICATTRIBUTES,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.TypeSpecific));
-             break;
-@@ -557,11 +584,14 @@ RsDoExtendedSpaceDescriptor (
- 
-     /* Validate the Min/Max/Len/Gran values */
- 
-+    Tmp16 = Descriptor->ExtAddress64.ResourceLength;
-+    Descriptor->ExtAddress64.ResourceLength = AcpiUtReadUint16(&Tmp16);
-+
-     RsLargeAddressCheck (
--        Descriptor->ExtAddress64.Minimum,
--        Descriptor->ExtAddress64.Maximum,
--        Descriptor->ExtAddress64.AddressLength,
--        Descriptor->ExtAddress64.Granularity,
-+        AcpiUtReadUint64(&Descriptor->ExtAddress64.Minimum),
-+        AcpiUtReadUint64(&Descriptor->ExtAddress64.Maximum),
-+        AcpiUtReadUint64(&Descriptor->ExtAddress64.AddressLength),
-+        AcpiUtReadUint64(&Descriptor->ExtAddress64.Granularity),
-         Descriptor->ExtAddress64.Flags,
-         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
- 
-Index: acpica-unix2-20200925/source/compiler/aslrestype2q.c
-===================================================================
---- acpica-unix2-20200925.orig/source/compiler/aslrestype2q.c
-+++ acpica-unix2-20200925/source/compiler/aslrestype2q.c
+--- acpica-unix2-20210604.orig/source/compiler/aslrestype2q.c
++++ acpica-unix2-20210604/source/compiler/aslrestype2q.c
 @@ -84,6 +84,7 @@ RsDoQwordIoDescriptor (
      UINT32                  CurrentByteOffset;
      UINT32                  i;
@@ -1201,8 +1016,8 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2q.c
          case 5: /* Address Granularity */
  
 -            Descriptor->Address64.Granularity = InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address64.Granularity = 
-+		    AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
++            Descriptor->Address64.Granularity =
++                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
              RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Granularity));
              GranOp = InitializerOp;
@@ -1211,8 +1026,8 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2q.c
          case 6: /* Address Min */
  
 -            Descriptor->Address64.Minimum = InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address64.Minimum = 
-+	            AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
++            Descriptor->Address64.Minimum =
++                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
              RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Minimum));
              MinOp = InitializerOp;
@@ -1221,8 +1036,8 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2q.c
          case 7: /* Address Max */
  
 -            Descriptor->Address64.Maximum = InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address64.Maximum = 
-+	            AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
++            Descriptor->Address64.Maximum =
++                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
              RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Maximum));
              MaxOp = InitializerOp;
@@ -1231,8 +1046,8 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2q.c
          case 8: /* Translation Offset */
  
 -            Descriptor->Address64.TranslationOffset = InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address64.TranslationOffset = 
-+	            AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
++            Descriptor->Address64.TranslationOffset =
++                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
              RsCreateByteField (InitializerOp, ACPI_RESTAG_TRANSLATION,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.TranslationOffset));
              break;
@@ -1240,8 +1055,8 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2q.c
          case 9: /* Address Length */
  
 -            Descriptor->Address64.AddressLength = InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address64.AddressLength = 
-+	            AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
++            Descriptor->Address64.AddressLength =
++                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
              RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.AddressLength));
              LengthOp = InitializerOp;
@@ -1250,17 +1065,17 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2q.c
      /* Validate the Min/Max/Len/Gran values */
  
 +    Tmp16 = Descriptor->Address64.ResourceLength;
-+    Descriptor->Address64.ResourceLength = AcpiUtReadUint16(&Tmp16);
++    Descriptor->Address64.ResourceLength = AcpiUtReadUint16 (&Tmp16);
 +
      RsLargeAddressCheck (
 -        Descriptor->Address64.Minimum,
 -        Descriptor->Address64.Maximum,
 -        Descriptor->Address64.AddressLength,
 -        Descriptor->Address64.Granularity,
-+        AcpiUtReadUint64(&Descriptor->Address64.Minimum),
-+        AcpiUtReadUint64(&Descriptor->Address64.Maximum),
-+        AcpiUtReadUint64(&Descriptor->Address64.AddressLength),
-+        AcpiUtReadUint64(&Descriptor->Address64.Granularity),
++        AcpiUtReadUint64 (&Descriptor->Address64.Minimum),
++        AcpiUtReadUint64 (&Descriptor->Address64.Maximum),
++        AcpiUtReadUint64 (&Descriptor->Address64.AddressLength),
++        AcpiUtReadUint64 (&Descriptor->Address64.Granularity),
          Descriptor->Address64.Flags,
          MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
  
@@ -1277,8 +1092,8 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2q.c
          case 6: /* Address Granularity */
  
 -            Descriptor->Address64.Granularity = InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address64.Granularity = 
-+		    AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
++            Descriptor->Address64.Granularity =
++                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
              RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Granularity));
              GranOp = InitializerOp;
@@ -1287,8 +1102,8 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2q.c
          case 7: /* Min Address */
  
 -            Descriptor->Address64.Minimum = InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address64.Minimum = 
-+	            AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
++            Descriptor->Address64.Minimum =
++                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
              RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Minimum));
              MinOp = InitializerOp;
@@ -1297,8 +1112,8 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2q.c
          case 8: /* Max Address */
  
 -            Descriptor->Address64.Maximum = InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address64.Maximum = 
-+	            AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
++            Descriptor->Address64.Maximum =
++                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
              RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Maximum));
              MaxOp = InitializerOp;
@@ -1307,8 +1122,8 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2q.c
          case 9: /* Translation Offset */
  
 -            Descriptor->Address64.TranslationOffset = InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address64.TranslationOffset = 
-+	            AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
++            Descriptor->Address64.TranslationOffset =
++                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
              RsCreateQwordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.TranslationOffset));
              break;
@@ -1316,8 +1131,8 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2q.c
          case 10: /* Address Length */
  
 -            Descriptor->Address64.AddressLength = InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address64.AddressLength = 
-+	            AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
++            Descriptor->Address64.AddressLength =
++                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
              RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.AddressLength));
              LengthOp = InitializerOp;
@@ -1326,17 +1141,17 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2q.c
      /* Validate the Min/Max/Len/Gran values */
  
 +    Tmp16 = Descriptor->Address64.ResourceLength;
-+    Descriptor->Address64.ResourceLength = AcpiUtReadUint16(&Tmp16);
++    Descriptor->Address64.ResourceLength = AcpiUtReadUint16 (&Tmp16);
 +
      RsLargeAddressCheck (
 -        Descriptor->Address64.Minimum,
 -        Descriptor->Address64.Maximum,
 -        Descriptor->Address64.AddressLength,
 -        Descriptor->Address64.Granularity,
-+        AcpiUtReadUint64(&Descriptor->Address64.Minimum),
-+        AcpiUtReadUint64(&Descriptor->Address64.Maximum),
-+        AcpiUtReadUint64(&Descriptor->Address64.AddressLength),
-+        AcpiUtReadUint64(&Descriptor->Address64.Granularity),
++        AcpiUtReadUint64 (&Descriptor->Address64.Minimum),
++        AcpiUtReadUint64 (&Descriptor->Address64.Maximum),
++        AcpiUtReadUint64 (&Descriptor->Address64.AddressLength),
++        AcpiUtReadUint64 (&Descriptor->Address64.Granularity),
          Descriptor->Address64.Flags,
          MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
  
@@ -1353,8 +1168,8 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2q.c
          case 6: /* Address Granularity */
  
 -            Descriptor->Address64.Granularity = InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address64.Granularity = 
-+		    AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
++            Descriptor->Address64.Granularity =
++                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
              RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Granularity));
              GranOp = InitializerOp;
@@ -1363,8 +1178,8 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2q.c
          case 7: /* Min Address */
  
 -            Descriptor->Address64.Minimum = InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address64.Minimum = 
-+		    AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
++            Descriptor->Address64.Minimum =
++                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
              RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Minimum));
              MinOp = InitializerOp;
@@ -1373,8 +1188,8 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2q.c
          case 8: /* Max Address */
  
 -            Descriptor->Address64.Maximum = InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address64.Maximum = 
-+		    AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
++            Descriptor->Address64.Maximum =
++                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
              RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Maximum));
              MaxOp = InitializerOp;
@@ -1383,8 +1198,8 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2q.c
          case 9: /* Translation Offset */
  
 -            Descriptor->Address64.TranslationOffset = InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address64.TranslationOffset = 
-+		    AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
++            Descriptor->Address64.TranslationOffset =
++                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
              RsCreateQwordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.TranslationOffset));
              break;
@@ -1392,8 +1207,8 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2q.c
          case 10: /* Address Length */
  
 -            Descriptor->Address64.AddressLength = InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address64.AddressLength = 
-+		    AcpiUtReadUint64(&InitializerOp->Asl.Value.Integer);
++            Descriptor->Address64.AddressLength =
++                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
              RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.AddressLength));
              LengthOp = InitializerOp;
@@ -1402,618 +1217,24 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2q.c
      /* Validate the Min/Max/Len/Gran values */
  
 +    Tmp16 = Descriptor->Address64.ResourceLength;
-+    Descriptor->Address64.ResourceLength = AcpiUtReadUint16(&Tmp16);
++    Descriptor->Address64.ResourceLength = AcpiUtReadUint16 (&Tmp16);
 +
      RsLargeAddressCheck (
 -        Descriptor->Address64.Minimum,
 -        Descriptor->Address64.Maximum,
 -        Descriptor->Address64.AddressLength,
 -        Descriptor->Address64.Granularity,
-+        AcpiUtReadUint64(&Descriptor->Address64.Minimum),
-+        AcpiUtReadUint64(&Descriptor->Address64.Maximum),
-+        AcpiUtReadUint64(&Descriptor->Address64.AddressLength),
-+        AcpiUtReadUint64(&Descriptor->Address64.Granularity),
++        AcpiUtReadUint64 (&Descriptor->Address64.Minimum),
++        AcpiUtReadUint64 (&Descriptor->Address64.Maximum),
++        AcpiUtReadUint64 (&Descriptor->Address64.AddressLength),
++        AcpiUtReadUint64 (&Descriptor->Address64.Granularity),
          Descriptor->Address64.Flags,
          MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
  
-Index: acpica-unix2-20200925/source/compiler/aslrestype2s.c
+Index: acpica-unix2-20210604/source/compiler/aslrestype2w.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;
-+    UINT16                  Tmp16;
- 
- 
-     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -485,7 +486,8 @@ RsDoGpioIntDescriptor (
-              *  (implies resource source must immediately follow the pin list.)
-              *  Name: _PIN
-              */
--            *InterruptList = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            *InterruptList = AcpiUtReadUint16(&Tmp16);
-             InterruptList++;
-             PinCount++;
- 
-@@ -518,6 +520,27 @@ RsDoGpioIntDescriptor (
- 
-     MpSaveGpioInfo (Info->MappingOp, Descriptor,
-         PinCount, PinList, ResourceSource);
-+
-+    /* correct endian-ness issues */
-+    Tmp16 = Descriptor->Gpio.ResourceLength;
-+    Descriptor->Gpio.ResourceLength = AcpiUtReadUint16(&Tmp16);
-+    Tmp16 = Descriptor->Gpio.Flags;
-+    Descriptor->Gpio.Flags = AcpiUtReadUint16(&Tmp16);
-+    Tmp16 = Descriptor->Gpio.IntFlags;
-+    Descriptor->Gpio.IntFlags = AcpiUtReadUint16(&Tmp16);
-+    Tmp16 = Descriptor->Gpio.DriveStrength;
-+    Descriptor->Gpio.DriveStrength = AcpiUtReadUint16(&Tmp16);
-+    Tmp16 = Descriptor->Gpio.DebounceTimeout;
-+    Descriptor->Gpio.DebounceTimeout = AcpiUtReadUint16(&Tmp16);
-+    Tmp16 = Descriptor->Gpio.PinTableOffset;
-+    Descriptor->Gpio.PinTableOffset = AcpiUtReadUint16(&Tmp16);
-+    Tmp16 = Descriptor->Gpio.ResSourceOffset;
-+    Descriptor->Gpio.ResSourceOffset = AcpiUtReadUint16(&Tmp16);
-+    Tmp16 = Descriptor->Gpio.VendorOffset;
-+    Descriptor->Gpio.VendorOffset = AcpiUtReadUint16(&Tmp16);
-+    Tmp16 = Descriptor->Gpio.VendorLength;
-+    Descriptor->Gpio.VendorLength = AcpiUtReadUint16(&Tmp16);
-+
-     return (Rnode);
- }
- 
-@@ -552,6 +575,7 @@ RsDoGpioIoDescriptor (
-     UINT32                  CurrentByteOffset;
-     UINT32                  PinCount = 0;
-     UINT32                  i;
-+    UINT16                  Tmp16;
- 
- 
-     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -691,7 +715,8 @@ RsDoGpioIoDescriptor (
-              *  (implies resource source must immediately follow the pin list.)
-              *  Name: _PIN
-              */
--            *InterruptList = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            *InterruptList = AcpiUtReadUint16(&Tmp16);
-             InterruptList++;
-             PinCount++;
- 
-@@ -724,6 +749,27 @@ RsDoGpioIoDescriptor (
- 
-     MpSaveGpioInfo (Info->MappingOp, Descriptor,
-         PinCount, PinList, ResourceSource);
-+
-+    /* correct endian-ness issues */
-+    Tmp16 = Descriptor->Gpio.ResourceLength;
-+    Descriptor->Gpio.ResourceLength = AcpiUtReadUint16(&Tmp16);
-+    Tmp16 = Descriptor->Gpio.Flags;
-+    Descriptor->Gpio.Flags = AcpiUtReadUint16(&Tmp16);
-+    Tmp16 = Descriptor->Gpio.IntFlags;
-+    Descriptor->Gpio.IntFlags = AcpiUtReadUint16(&Tmp16);
-+    Tmp16 = Descriptor->Gpio.DriveStrength;
-+    Descriptor->Gpio.DriveStrength = AcpiUtReadUint16(&Tmp16);
-+    Tmp16 = Descriptor->Gpio.DebounceTimeout;
-+    Descriptor->Gpio.DebounceTimeout = AcpiUtReadUint16(&Tmp16);
-+    Tmp16 = Descriptor->Gpio.PinTableOffset;
-+    Descriptor->Gpio.PinTableOffset = AcpiUtReadUint16(&Tmp16);
-+    Tmp16 = Descriptor->Gpio.ResSourceOffset;
-+    Descriptor->Gpio.ResSourceOffset = AcpiUtReadUint16(&Tmp16);
-+    Tmp16 = Descriptor->Gpio.VendorOffset;
-+    Descriptor->Gpio.VendorOffset = AcpiUtReadUint16(&Tmp16);
-+    Tmp16 = Descriptor->Gpio.VendorLength;
-+    Descriptor->Gpio.VendorLength = AcpiUtReadUint16(&Tmp16);
-+
-     return (Rnode);
- }
- 
-@@ -754,6 +800,8 @@ RsDoI2cSerialBusDescriptor (
-     UINT16                  DescriptorSize;
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-+    UINT16                  Tmp16;
-+    UINT32                  Tmp32;
- 
- 
-     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -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;
--    Descriptor->I2cSerialBus.TypeDataLength = AML_RESOURCE_I2C_MIN_DATA_LEN + VendorLength;
-+    Tmp16 = AML_RESOURCE_I2C_MIN_DATA_LEN + VendorLength;
-+    Descriptor->I2cSerialBus.TypeDataLength = AcpiUtReadUint16(&Tmp16);
- 
-     if (Info->DescriptorTypeOp->Asl.ParseOpcode == PARSEOP_I2C_SERIALBUS_V2)
-     {
-@@ -795,13 +844,15 @@ RsDoI2cSerialBusDescriptor (
- 
-     /* Process all child initialization nodes */
- 
-+    Descriptor->I2cSerialBus.TypeSpecificFlags = 0;
-     for (i = 0; InitializerOp; i++)
-     {
-         switch (i)
-         {
-         case 0: /* Slave Address [WORD] (_ADR) */
- 
--            Descriptor->I2cSerialBus.SlaveAddress = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->I2cSerialBus.SlaveAddress = AcpiUtReadUint16(&Tmp16);
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_ADDRESS,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (I2cSerialBus.SlaveAddress));
-             break;
-@@ -815,16 +866,19 @@ RsDoI2cSerialBusDescriptor (
- 
-         case 2: /* Connection Speed [DWORD] (_SPE) */
- 
--            Descriptor->I2cSerialBus.ConnectionSpeed = (UINT32) InitializerOp->Asl.Value.Integer;
-+	    Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->I2cSerialBus.ConnectionSpeed = AcpiUtReadUint32(&Tmp32);
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_SPEED,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (I2cSerialBus.ConnectionSpeed));
-             break;
- 
-         case 3: /* Addressing Mode [Flag] (_MOD) */
- 
--            RsSetFlagBits16 (&Descriptor->I2cSerialBus.TypeSpecificFlags, InitializerOp, 0, 0);
-+	    Tmp16 = AcpiUtReadUint16(&Descriptor->I2cSerialBus.TypeSpecificFlags);
-+            RsSetFlagBits16 (&Tmp16, InitializerOp, 0, 0);
-             RsCreateBitField (InitializerOp, ACPI_RESTAG_MODE,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (I2cSerialBus.TypeSpecificFlags), 0);
-+	    Descriptor->I2cSerialBus.TypeSpecificFlags = AcpiUtReadUint16(&Tmp16);
-             break;
- 
-         case 4: /* ResSource [Optional Field - STRING] */
-@@ -882,6 +936,8 @@ RsDoI2cSerialBusDescriptor (
-         InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
-     }
- 
-+    Tmp16 = Descriptor->I2cSerialBus.ResourceLength;
-+    Descriptor->I2cSerialBus.ResourceLength = AcpiUtReadUint16(&Tmp16);
-     MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource);
-     return (Rnode);
- }
-@@ -913,6 +969,8 @@ RsDoSpiSerialBusDescriptor (
-     UINT16                  DescriptorSize;
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-+    UINT16                  Tmp16;
-+    UINT32                  Tmp32;
- 
- 
-     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -935,12 +993,13 @@ RsDoSpiSerialBusDescriptor (
-         sizeof (AML_RESOURCE_LARGE_HEADER));
- 
-     Descriptor = Rnode->Buffer;
--    Descriptor->SpiSerialBus.ResourceLength = DescriptorSize;
-+    Descriptor->SpiSerialBus.ResourceLength = AcpiUtReadUint16(&DescriptorSize);
-     Descriptor->SpiSerialBus.DescriptorType = ACPI_RESOURCE_NAME_SERIAL_BUS;
-     Descriptor->SpiSerialBus.RevisionId = AML_RESOURCE_SPI_REVISION;
-     Descriptor->SpiSerialBus.TypeRevisionId = AML_RESOURCE_SPI_TYPE_REVISION;
-     Descriptor->SpiSerialBus.Type = AML_RESOURCE_SPI_SERIALBUSTYPE;
--    Descriptor->SpiSerialBus.TypeDataLength = AML_RESOURCE_SPI_MIN_DATA_LEN + VendorLength;
-+    Tmp16 = AML_RESOURCE_SPI_MIN_DATA_LEN + VendorLength;
-+    Descriptor->SpiSerialBus.TypeDataLength = AcpiUtReadUint16(&Tmp16);
- 
-     if (Info->DescriptorTypeOp->Asl.ParseOpcode == PARSEOP_SPI_SERIALBUS_V2)
-     {
-@@ -955,29 +1014,35 @@ RsDoSpiSerialBusDescriptor (
- 
-     /* Process all child initialization nodes */
- 
-+    Descriptor->SpiSerialBus.TypeSpecificFlags = 0;
-     for (i = 0; InitializerOp; i++)
-     {
-         switch (i)
-         {
-         case 0: /* Device Selection [WORD] (_ADR) */
- 
--            Descriptor->SpiSerialBus.DeviceSelection = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->SpiSerialBus.DeviceSelection = AcpiUtReadUint16(&Tmp16);
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_ADDRESS,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (SpiSerialBus.DeviceSelection));
-             break;
- 
-         case 1: /* Device Polarity [Flag] (_DPL) */
- 
--            RsSetFlagBits16 (&Descriptor->SpiSerialBus.TypeSpecificFlags, InitializerOp, 1, 0);
-+	    Tmp16 = AcpiUtReadUint16(&Descriptor->SpiSerialBus.TypeSpecificFlags);
-+            RsSetFlagBits16 (&Tmp16, InitializerOp, 1, 0);
-             RsCreateBitField (InitializerOp, ACPI_RESTAG_DEVICEPOLARITY,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (SpiSerialBus.TypeSpecificFlags), 1);
-+	    Descriptor->SpiSerialBus.TypeSpecificFlags = AcpiUtReadUint16(&Tmp16);
-             break;
- 
-         case 2: /* Wire Mode [Flag] (_MOD) */
- 
--            RsSetFlagBits16 (&Descriptor->SpiSerialBus.TypeSpecificFlags, InitializerOp, 0, 0);
-+	    Tmp16 = AcpiUtReadUint16(&Descriptor->SpiSerialBus.TypeSpecificFlags);
-+            RsSetFlagBits16 (&Tmp16, InitializerOp, 0, 0);
-             RsCreateBitField (InitializerOp, ACPI_RESTAG_MODE,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (SpiSerialBus.TypeSpecificFlags), 0);
-+	    Descriptor->SpiSerialBus.TypeSpecificFlags = AcpiUtReadUint16(&Tmp16);
-             break;
- 
-         case 3: /* Device Bit Length [BYTE] (_LEN) */
-@@ -996,7 +1061,8 @@ RsDoSpiSerialBusDescriptor (
- 
-         case 5: /* Connection Speed [DWORD] (_SPE) */
- 
--            Descriptor->SpiSerialBus.ConnectionSpeed = (UINT32) InitializerOp->Asl.Value.Integer;
-+	    Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->SpiSerialBus.ConnectionSpeed = AcpiUtReadUint32(&Tmp32);
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_SPEED,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (SpiSerialBus.ConnectionSpeed));
-             break;
-@@ -1101,6 +1167,8 @@ RsDoUartSerialBusDescriptor (
-     UINT16                  DescriptorSize;
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-+    UINT16                  Tmp16;
-+    UINT32                  Tmp32;
- 
- 
-     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -1123,12 +1191,13 @@ RsDoUartSerialBusDescriptor (
-         sizeof (AML_RESOURCE_LARGE_HEADER));
- 
-     Descriptor = Rnode->Buffer;
--    Descriptor->UartSerialBus.ResourceLength = DescriptorSize;
-+    Descriptor->UartSerialBus.ResourceLength = AcpiUtReadUint16(&DescriptorSize);
-     Descriptor->UartSerialBus.DescriptorType = ACPI_RESOURCE_NAME_SERIAL_BUS;
-     Descriptor->UartSerialBus.RevisionId = AML_RESOURCE_UART_REVISION;
-     Descriptor->UartSerialBus.TypeRevisionId = AML_RESOURCE_UART_TYPE_REVISION;
-     Descriptor->UartSerialBus.Type = AML_RESOURCE_UART_SERIALBUSTYPE;
--    Descriptor->UartSerialBus.TypeDataLength = AML_RESOURCE_UART_MIN_DATA_LEN + VendorLength;
-+    Tmp16 = AML_RESOURCE_UART_MIN_DATA_LEN + VendorLength;
-+    Descriptor->UartSerialBus.TypeDataLength = AcpiUtReadUint16(&Tmp16);
- 
-     if (Info->DescriptorTypeOp->Asl.ParseOpcode == PARSEOP_UART_SERIALBUS_V2)
-     {
-@@ -1142,29 +1211,35 @@ RsDoUartSerialBusDescriptor (
- 
-     /* Process all child initialization nodes */
- 
-+    Descriptor->UartSerialBus.TypeSpecificFlags = 0;
-     for (i = 0; InitializerOp; i++)
-     {
-         switch (i)
-         {
-         case 0: /* Connection Speed (Baud Rate) [DWORD] (_SPE) */
- 
--            Descriptor->UartSerialBus.DefaultBaudRate = (UINT32) InitializerOp->Asl.Value.Integer;
-+	    Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->UartSerialBus.DefaultBaudRate = AcpiUtReadUint32(&Tmp32);
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_SPEED,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.DefaultBaudRate));
-             break;
- 
-         case 1: /* Bits Per Byte [Flags] (_LEN) */
- 
--            RsSetFlagBits16 (&Descriptor->UartSerialBus.TypeSpecificFlags, InitializerOp, 4, 3);
-+	    Tmp16 = AcpiUtReadUint16(&Descriptor->UartSerialBus.TypeSpecificFlags);
-+            RsSetFlagBits16 (&Tmp16, InitializerOp, 4, 3);
-             RsCreateMultiBitField (InitializerOp, ACPI_RESTAG_LENGTH,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TypeSpecificFlags), 4, 3);
-+	    Descriptor->UartSerialBus.TypeSpecificFlags = AcpiUtReadUint16(&Tmp16);;
-             break;
- 
-         case 2: /* Stop Bits [Flags] (_STB) */
- 
--            RsSetFlagBits16 (&Descriptor->UartSerialBus.TypeSpecificFlags, InitializerOp, 2, 1);
-+	    Tmp16 = AcpiUtReadUint16(&Descriptor->UartSerialBus.TypeSpecificFlags);
-+            RsSetFlagBits16 (&Tmp16, InitializerOp, 2, 1);
-             RsCreateMultiBitField (InitializerOp, ACPI_RESTAG_STOPBITS,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TypeSpecificFlags), 2, 2);
-+	    Descriptor->UartSerialBus.TypeSpecificFlags = AcpiUtReadUint16(&Tmp16);;
-             break;
- 
-         case 3: /* Lines In Use [BYTE] (_LIN) */
-@@ -1176,9 +1251,11 @@ RsDoUartSerialBusDescriptor (
- 
-         case 4: /* Endianness [Flag] (_END) */
- 
--            RsSetFlagBits16 (&Descriptor->UartSerialBus.TypeSpecificFlags, InitializerOp, 7, 0);
-+	    Tmp16 = AcpiUtReadUint16(&Descriptor->UartSerialBus.TypeSpecificFlags);
-+            RsSetFlagBits16 (&Tmp16, InitializerOp, 7, 0);
-             RsCreateBitField (InitializerOp, ACPI_RESTAG_ENDIANNESS,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TypeSpecificFlags), 7);
-+	    Descriptor->UartSerialBus.TypeSpecificFlags = AcpiUtReadUint16(&Tmp16);;
-             break;
- 
-         case 5: /* Parity [BYTE] (_PAR) */
-@@ -1190,21 +1267,25 @@ RsDoUartSerialBusDescriptor (
- 
-         case 6: /* Flow Control [Flags] (_FLC) */
- 
--            RsSetFlagBits16 (&Descriptor->UartSerialBus.TypeSpecificFlags, InitializerOp, 0, 0);
-+	    Tmp16 = AcpiUtReadUint16(&Descriptor->UartSerialBus.TypeSpecificFlags);
-+            RsSetFlagBits16 (&Tmp16, InitializerOp, 0, 0);
-             RsCreateMultiBitField (InitializerOp, ACPI_RESTAG_FLOWCONTROL,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TypeSpecificFlags), 0, 2);
-+	    Descriptor->UartSerialBus.TypeSpecificFlags = AcpiUtReadUint16(&Tmp16);;
-             break;
- 
-         case 7: /* Rx Buffer Size [WORD] (_RXL) */
- 
--            Descriptor->UartSerialBus.RxFifoSize = (UINT16) InitializerOp->Asl.Value.Integer;
-+	    Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->UartSerialBus.RxFifoSize = AcpiUtReadUint16(&Tmp16);
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH_RX,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.RxFifoSize));
-             break;
- 
-         case 8: /* Tx Buffer Size [WORD] (_TXL) */
- 
--            Descriptor->UartSerialBus.TxFifoSize = (UINT16) InitializerOp->Asl.Value.Integer;
-+	    Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->UartSerialBus.TxFifoSize = AcpiUtReadUint16(&Tmp16);
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH_TX,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TxFifoSize));
-             break;
-@@ -1308,6 +1389,7 @@ RsDoPinFunctionDescriptor (
-     UINT32                  CurrentByteOffset;
-     UINT32                  PinCount = 0;
-     UINT32                  i;
-+    UINT16                  Tmp16;
- 
-     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-     CurrentByteOffset = Info->CurrentByteOffset;
-@@ -1331,7 +1413,7 @@ RsDoPinFunctionDescriptor (
-         sizeof (AML_RESOURCE_LARGE_HEADER));
- 
-     Descriptor = Rnode->Buffer;
--    Descriptor->PinFunction.ResourceLength = DescriptorSize;
-+    Descriptor->PinFunction.ResourceLength = AcpiUtReadUint16(&DescriptorSize);
-     Descriptor->PinFunction.DescriptorType = ACPI_RESOURCE_NAME_PIN_FUNCTION;
-     Descriptor->PinFunction.RevisionId = AML_RESOURCE_PIN_FUNCTION_REVISION;
- 
-@@ -1371,7 +1453,8 @@ RsDoPinFunctionDescriptor (
- 
-         case 2: /* Function Number [WORD] (_FUN) */
- 
--            Descriptor->PinFunction.FunctionNumber = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->PinFunction.FunctionNumber = AcpiUtReadUint16(&Tmp16);
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_FUNCTION,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (PinFunction.FunctionNumber));
-             break;
-@@ -1419,6 +1502,12 @@ RsDoPinFunctionDescriptor (
-             {
-                 Descriptor->PinFunction.VendorLength = VendorLength;
-             }
-+            Tmp16 = (UINT16) ACPI_PTR_DIFF (VendorData, Descriptor);
-+            Descriptor->PinFunction.VendorOffset = AcpiUtReadUint16(&Tmp16);
-+            
-+            Tmp16 = Descriptor->PinFunction.VendorLength;
-+            Descriptor->PinFunction.VendorLength = AcpiUtReadUint16(&Tmp16);
-+
-             break;
- 
-         default:
-@@ -1430,7 +1519,8 @@ RsDoPinFunctionDescriptor (
-              *  (implies resource source must immediately follow the pin list.)
-              *  Name: _PIN
-              */
--            *PinList = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            *PinList = AcpiUtReadUint16(&Tmp16);
-             PinList++;
-             PinCount++;
- 
-@@ -1461,6 +1551,13 @@ RsDoPinFunctionDescriptor (
-         InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
-     }
- 
-+    /* correct the endian-ness of the values */
-+    Tmp16 = Descriptor->PinFunction.PinTableOffset;
-+    Descriptor->PinFunction.PinTableOffset = AcpiUtReadUint16(&Tmp16);
-+
-+    Tmp16 = Descriptor->PinFunction.ResSourceOffset;
-+    Descriptor->PinFunction.ResSourceOffset = AcpiUtReadUint16(&Tmp16);
-+
-     return (Rnode);
- }
- 
-@@ -1494,6 +1591,8 @@ RsDoPinConfigDescriptor (
-     UINT32                  CurrentByteOffset;
-     UINT32                  PinCount = 0;
-     UINT32                  i;
-+    UINT16                  Tmp16;
-+    UINT32                  Tmp32;
- 
-     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-     CurrentByteOffset = Info->CurrentByteOffset;
-@@ -1517,7 +1616,7 @@ RsDoPinConfigDescriptor (
-         sizeof (AML_RESOURCE_LARGE_HEADER));
- 
-     Descriptor = Rnode->Buffer;
--    Descriptor->PinConfig.ResourceLength = DescriptorSize;
-+    Descriptor->PinConfig.ResourceLength = AcpiUtReadUint16(&DescriptorSize);
-     Descriptor->PinConfig.DescriptorType = ACPI_RESOURCE_NAME_PIN_CONFIG;
-     Descriptor->PinConfig.RevisionId = AML_RESOURCE_PIN_CONFIG_REVISION;
- 
-@@ -1571,7 +1670,8 @@ RsDoPinConfigDescriptor (
- 
-         case 2: /* Pin Config Value [DWORD] (_VAL) */
- 
--            Descriptor->PinConfig.PinConfigValue = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->PinConfig.PinConfigValue = AcpiUtReadUint32(&Tmp32);
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_PINCONFIG_VALUE,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (PinConfig.PinConfigValue));
-             break;
-@@ -1630,7 +1730,8 @@ RsDoPinConfigDescriptor (
-              *  (implies resource source must immediately follow the pin list.)
-              *  Name: _PIN
-              */
--            *PinList = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            *PinList = AcpiUtReadUint16(&Tmp16);
-             PinList++;
-             PinCount++;
- 
-@@ -1661,6 +1762,16 @@ RsDoPinConfigDescriptor (
-         InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
-     }
- 
-+    /* correct the endianness if needed */
-+    Tmp16 = Descriptor->PinConfig.PinTableOffset;
-+    Descriptor->PinConfig.PinTableOffset = AcpiUtReadUint16(&Tmp16);
-+    Tmp16 = Descriptor->PinConfig.ResSourceOffset;
-+    Descriptor->PinConfig.ResSourceOffset = AcpiUtReadUint16(&Tmp16);
-+    Tmp16 = Descriptor->PinConfig.VendorOffset;
-+    Descriptor->PinConfig.VendorOffset = AcpiUtReadUint16(&Tmp16);
-+    Tmp16 = Descriptor->PinConfig.VendorLength;
-+    Descriptor->PinConfig.VendorLength = AcpiUtReadUint16(&Tmp16);
-+
-     return (Rnode);
- }
- 
-@@ -1694,6 +1805,7 @@ RsDoPinGroupDescriptor (
-     UINT32                  CurrentByteOffset;
-     UINT32                  PinCount = 0;
-     UINT32                  i;
-+    UINT16                  Tmp16;
- 
-     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-     CurrentByteOffset = Info->CurrentByteOffset;
-@@ -1717,7 +1829,7 @@ RsDoPinGroupDescriptor (
-         sizeof (AML_RESOURCE_LARGE_HEADER));
- 
-     Descriptor = Rnode->Buffer;
--    Descriptor->PinGroup.ResourceLength = DescriptorSize;
-+    Descriptor->PinGroup.ResourceLength = AcpiUtReadUint16(&DescriptorSize);
-     Descriptor->PinGroup.DescriptorType = ACPI_RESOURCE_NAME_PIN_GROUP;
-     Descriptor->PinGroup.RevisionId = AML_RESOURCE_PIN_GROUP_REVISION;
- 
-@@ -1784,7 +1896,8 @@ RsDoPinGroupDescriptor (
-              *  (implies resource source must immediately follow the pin list.)
-              *  Name: _PIN
-              */
--            *PinList = (UINT16) InitializerOp->Asl.Value.Integer;
-+	    Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            *PinList = AcpiUtReadUint16(&Tmp16);
-             PinList++;
-             PinCount++;
- 
-@@ -1815,6 +1928,16 @@ RsDoPinGroupDescriptor (
-         InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
-     }
- 
-+    /* correct enddianness as needed */
-+    Tmp16 = Descriptor->PinGroup.PinTableOffset;
-+    Descriptor->PinGroup.PinTableOffset = AcpiUtReadUint16(&Tmp16);
-+    Tmp16 = Descriptor->PinGroup.LabelOffset;
-+    Descriptor->PinGroup.LabelOffset = AcpiUtReadUint16(&Tmp16);
-+    Tmp16 = Descriptor->PinGroup.VendorOffset;
-+    Descriptor->PinGroup.VendorOffset = AcpiUtReadUint16(&Tmp16);
-+    Tmp16 = Descriptor->PinGroup.VendorLength;
-+    Descriptor->PinGroup.VendorLength = AcpiUtReadUint16(&Tmp16);
-+
-     return (Rnode);
- }
- 
-@@ -1847,6 +1970,7 @@ RsDoPinGroupFunctionDescriptor (
-     UINT16                  DescriptorSize;
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-+    UINT16                  Tmp16;
- 
-     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-     CurrentByteOffset = Info->CurrentByteOffset;
-@@ -1870,7 +1994,7 @@ RsDoPinGroupFunctionDescriptor (
-         sizeof (AML_RESOURCE_LARGE_HEADER));
- 
-     Descriptor = Rnode->Buffer;
--    Descriptor->PinGroupFunction.ResourceLength = DescriptorSize;
-+    Descriptor->PinGroupFunction.ResourceLength = AcpiUtReadUint16(&DescriptorSize);
-     Descriptor->PinGroupFunction.DescriptorType = ACPI_RESOURCE_NAME_PIN_GROUP_FUNCTION;
-     Descriptor->PinGroupFunction.RevisionId = AML_RESOURCE_PIN_GROUP_FUNCTION_REVISION;
- 
-@@ -1902,7 +2026,8 @@ RsDoPinGroupFunctionDescriptor (
- 
-         case 1: /* Function Number [WORD] */
- 
--            Descriptor->PinGroupFunction.FunctionNumber = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->PinGroupFunction.FunctionNumber = AcpiUtReadUint16(&Tmp16);
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_FUNCTION,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (PinGroupFunction.FunctionNumber));
-             break;
-@@ -1961,6 +2086,16 @@ RsDoPinGroupFunctionDescriptor (
-         InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
-     }
- 
-+    /* correct enddianness as needed */
-+    Tmp16 = Descriptor->PinGroupFunction.ResSourceOffset;
-+    Descriptor->PinGroupFunction.ResSourceOffset = AcpiUtReadUint16(&Tmp16);
-+    Tmp16 = Descriptor->PinGroupFunction.ResSourceLabelOffset;
-+    Descriptor->PinGroupFunction.ResSourceLabelOffset = AcpiUtReadUint16(&Tmp16);
-+    Tmp16 = Descriptor->PinGroupFunction.VendorOffset;
-+    Descriptor->PinGroupFunction.VendorOffset = AcpiUtReadUint16(&Tmp16);
-+    Tmp16 = Descriptor->PinGroupFunction.VendorLength;
-+    Descriptor->PinGroupFunction.VendorLength = AcpiUtReadUint16(&Tmp16);
-+
-     return (Rnode);
- }
- 
-@@ -1993,6 +2128,8 @@ RsDoPinGroupConfigDescriptor (
-     UINT16                  DescriptorSize;
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-+    UINT16                  Tmp16;
-+    UINT32                  Tmp32;
- 
-     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-     CurrentByteOffset = Info->CurrentByteOffset;
-@@ -2016,7 +2153,7 @@ RsDoPinGroupConfigDescriptor (
-         sizeof (AML_RESOURCE_LARGE_HEADER));
- 
-     Descriptor = Rnode->Buffer;
--    Descriptor->PinGroupConfig.ResourceLength = DescriptorSize;
-+    Descriptor->PinGroupConfig.ResourceLength = AcpiUtReadUint16(&DescriptorSize);
-     Descriptor->PinGroupConfig.DescriptorType = ACPI_RESOURCE_NAME_PIN_GROUP_CONFIG;
-     Descriptor->PinGroupConfig.RevisionId = AML_RESOURCE_PIN_GROUP_CONFIG_REVISION;
- 
-@@ -2069,7 +2206,8 @@ RsDoPinGroupConfigDescriptor (
- 
-         case 2: /* Pin Config Value [DWORD] (_VAL) */
- 
--            Descriptor->PinGroupConfig.PinConfigValue = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->PinGroupConfig.PinConfigValue = AcpiUtReadUint32(&Tmp32);
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_PINCONFIG_VALUE,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (PinGroupConfig.PinConfigValue));
-             break;
-@@ -2130,5 +2268,15 @@ RsDoPinGroupConfigDescriptor (
-         InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
-     }
- 
-+    /* correct enddianness as needed */
-+    Tmp16 = Descriptor->PinGroupConfig.ResSourceOffset;
-+    Descriptor->PinGroupConfig.ResSourceOffset = AcpiUtReadUint16(&Tmp16);
-+    Tmp16 = Descriptor->PinGroupConfig.ResSourceLabelOffset;
-+    Descriptor->PinGroupConfig.ResSourceLabelOffset = AcpiUtReadUint16(&Tmp16);
-+    Tmp16 = Descriptor->PinGroupConfig.VendorOffset;
-+    Descriptor->PinGroupConfig.VendorOffset = AcpiUtReadUint16(&Tmp16);
-+    Tmp16 = Descriptor->PinGroupConfig.VendorLength;
-+    Descriptor->PinGroupConfig.VendorLength = AcpiUtReadUint16(&Tmp16);
-+
-     return (Rnode);
- }
-Index: acpica-unix2-20200925/source/compiler/aslrestype2w.c
-===================================================================
---- acpica-unix2-20200925.orig/source/compiler/aslrestype2w.c
-+++ acpica-unix2-20200925/source/compiler/aslrestype2w.c
+--- acpica-unix2-20210604.orig/source/compiler/aslrestype2w.c
++++ acpica-unix2-20210604/source/compiler/aslrestype2w.c
 @@ -84,6 +84,7 @@ RsDoWordIoDescriptor (
      UINT32                  CurrentByteOffset;
      UINT32                  i;
@@ -2027,8 +1248,8 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2w.c
          case 5: /* Address Granularity */
  
 -            Descriptor->Address16.Granularity = (UINT16) InitializerOp->Asl.Value.Integer;
-+	    Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address16.Granularity = AcpiUtReadUint16(&Tmp16);
++            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address16.Granularity = AcpiUtReadUint16 (&Tmp16);
              RsCreateWordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Granularity));
              GranOp = InitializerOp;
@@ -2037,8 +1258,8 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2w.c
          case 6: /* Address Min */
  
 -            Descriptor->Address16.Minimum = (UINT16) InitializerOp->Asl.Value.Integer;
-+	    Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address16.Minimum = AcpiUtReadUint16(&Tmp16);
++            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address16.Minimum = AcpiUtReadUint16 (&Tmp16);
              RsCreateWordField (InitializerOp, ACPI_RESTAG_MINADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Minimum));
              MinOp = InitializerOp;
@@ -2047,8 +1268,8 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2w.c
          case 7: /* Address Max */
  
 -            Descriptor->Address16.Maximum = (UINT16) InitializerOp->Asl.Value.Integer;
-+	    Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address16.Maximum = AcpiUtReadUint16(&Tmp16);
++            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address16.Maximum = AcpiUtReadUint16 (&Tmp16);
              RsCreateWordField (InitializerOp, ACPI_RESTAG_MAXADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Maximum));
              MaxOp = InitializerOp;
@@ -2057,8 +1278,8 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2w.c
          case 8: /* Translation Offset */
  
 -            Descriptor->Address16.TranslationOffset = (UINT16) InitializerOp->Asl.Value.Integer;
-+	    Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address16.TranslationOffset = AcpiUtReadUint16(&Tmp16);
++            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address16.TranslationOffset = AcpiUtReadUint16 (&Tmp16);
              RsCreateWordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.TranslationOffset));
              break;
@@ -2066,8 +1287,8 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2w.c
          case 9: /* Address Length */
  
 -            Descriptor->Address16.AddressLength = (UINT16) InitializerOp->Asl.Value.Integer;
-+	    Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address16.AddressLength = AcpiUtReadUint16(&Tmp16);
++            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address16.AddressLength = AcpiUtReadUint16 (&Tmp16);
              RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH,
                   CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.AddressLength));
              LengthOp = InitializerOp;
@@ -2079,16 +1300,16 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2w.c
 -        (UINT64) Descriptor->Address16.Maximum,
 -        (UINT64) Descriptor->Address16.AddressLength,
 -        (UINT64) Descriptor->Address16.Granularity,
-+        (UINT64) AcpiUtReadUint16(&Descriptor->Address16.Minimum),
-+        (UINT64) AcpiUtReadUint16(&Descriptor->Address16.Maximum),
-+        (UINT64) AcpiUtReadUint16(&Descriptor->Address16.AddressLength),
-+        (UINT64) AcpiUtReadUint16(&Descriptor->Address16.Granularity),
++        (UINT64) AcpiUtReadUint16 (&Descriptor->Address16.Minimum),
++        (UINT64) AcpiUtReadUint16 (&Descriptor->Address16.Maximum),
++        (UINT64) AcpiUtReadUint16 (&Descriptor->Address16.AddressLength),
++        (UINT64) AcpiUtReadUint16 (&Descriptor->Address16.Granularity),
          Descriptor->Address16.Flags,
          MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
  
 +    /* correct enddianness */
 +    Tmp16 = Descriptor->Address16.ResourceLength;
-+    Descriptor->Address16.ResourceLength = AcpiUtReadUint16(&Tmp16);
++    Descriptor->Address16.ResourceLength = AcpiUtReadUint16 (&Tmp16);
 +
      Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) +
          OptionIndex + StringLength;
@@ -2108,7 +1329,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2w.c
 -            Descriptor->Address16.Granularity =
 -                (UINT16) InitializerOp->Asl.Value.Integer;
 +            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address16.Granularity = AcpiUtReadUint16(&Tmp16);
++            Descriptor->Address16.Granularity = AcpiUtReadUint16 (&Tmp16);
              RsCreateWordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Granularity));
              GranOp = InitializerOp;
@@ -2119,7 +1340,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2w.c
 -            Descriptor->Address16.Minimum =
 -                (UINT16) InitializerOp->Asl.Value.Integer;
 +            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address16.Minimum = AcpiUtReadUint16(&Tmp16);
++            Descriptor->Address16.Minimum = AcpiUtReadUint16 (&Tmp16);
              RsCreateWordField (InitializerOp, ACPI_RESTAG_MINADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Minimum));
              MinOp = InitializerOp;
@@ -2130,7 +1351,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2w.c
 -            Descriptor->Address16.Maximum =
 -                (UINT16) InitializerOp->Asl.Value.Integer;
 +            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address16.Maximum = AcpiUtReadUint16(&Tmp16);
++            Descriptor->Address16.Maximum = AcpiUtReadUint16 (&Tmp16);
              RsCreateWordField (InitializerOp, ACPI_RESTAG_MAXADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Maximum));
              MaxOp = InitializerOp;
@@ -2141,7 +1362,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2w.c
 -            Descriptor->Address16.TranslationOffset =
 -                (UINT16) InitializerOp->Asl.Value.Integer;
 +            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address16.TranslationOffset = AcpiUtReadUint16(&Tmp16);
++            Descriptor->Address16.TranslationOffset = AcpiUtReadUint16 (&Tmp16);
              RsCreateWordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.TranslationOffset));
              break;
@@ -2151,7 +1372,7 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2w.c
 -            Descriptor->Address16.AddressLength =
 -                (UINT16) InitializerOp->Asl.Value.Integer;
 +            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address16.AddressLength = AcpiUtReadUint16(&Tmp16);
++            Descriptor->Address16.AddressLength = AcpiUtReadUint16 (&Tmp16);
              RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH,
                   CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.AddressLength));
              LengthOp = InitializerOp;
@@ -2163,16 +1384,16 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2w.c
 -        (UINT64) Descriptor->Address16.Maximum,
 -        (UINT64) Descriptor->Address16.AddressLength,
 -        (UINT64) Descriptor->Address16.Granularity,
-+        (UINT64) AcpiUtReadUint16(&Descriptor->Address16.Minimum),
-+        (UINT64) AcpiUtReadUint16(&Descriptor->Address16.Maximum),
-+        (UINT64) AcpiUtReadUint16(&Descriptor->Address16.AddressLength),
-+        (UINT64) AcpiUtReadUint16(&Descriptor->Address16.Granularity),
++        (UINT64) AcpiUtReadUint16 (&Descriptor->Address16.Minimum),
++        (UINT64) AcpiUtReadUint16 (&Descriptor->Address16.Maximum),
++        (UINT64) AcpiUtReadUint16 (&Descriptor->Address16.AddressLength),
++        (UINT64) AcpiUtReadUint16 (&Descriptor->Address16.Granularity),
          Descriptor->Address16.Flags,
          MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
  
 +    /* correct enddianness */
 +    Tmp16 = Descriptor->Address16.ResourceLength;
-+    Descriptor->Address16.ResourceLength = AcpiUtReadUint16(&Tmp16);
++    Descriptor->Address16.ResourceLength = AcpiUtReadUint16 (&Tmp16);
 +
      Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) +
          OptionIndex + StringLength;
@@ -2191,8 +1412,8 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2w.c
  
 -            Descriptor->Address16.Granularity =
 -                (UINT16) InitializerOp->Asl.Value.Integer;
-+	    Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address16.Granularity = AcpiUtReadUint16(&Tmp16);
++            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address16.Granularity = AcpiUtReadUint16 (&Tmp16);
              RsCreateWordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Granularity));
              GranOp = InitializerOp;
@@ -2202,8 +1423,8 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2w.c
  
 -            Descriptor->Address16.Minimum =
 -                (UINT16) InitializerOp->Asl.Value.Integer;
-+	    Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address16.Minimum = AcpiUtReadUint16(&Tmp16);
++            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address16.Minimum = AcpiUtReadUint16 (&Tmp16);
              RsCreateWordField (InitializerOp, ACPI_RESTAG_MINADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Minimum));
              MinOp = InitializerOp;
@@ -2213,8 +1434,8 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2w.c
  
 -            Descriptor->Address16.Maximum =
 -                (UINT16) InitializerOp->Asl.Value.Integer;
-+	    Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address16.Maximum = AcpiUtReadUint16(&Tmp16);
++            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address16.Maximum = AcpiUtReadUint16 (&Tmp16);
              RsCreateWordField (InitializerOp, ACPI_RESTAG_MAXADDR,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Maximum));
              MaxOp = InitializerOp;
@@ -2224,8 +1445,8 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2w.c
  
 -            Descriptor->Address16.TranslationOffset =
 -                (UINT16) InitializerOp->Asl.Value.Integer;
-+	    Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address16.TranslationOffset = AcpiUtReadUint16(&Tmp16);
++            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address16.TranslationOffset = AcpiUtReadUint16 (&Tmp16);
              RsCreateWordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.TranslationOffset));
              break;
@@ -2234,8 +1455,8 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2w.c
  
 -            Descriptor->Address16.AddressLength =
 -                (UINT16) InitializerOp->Asl.Value.Integer;
-+	    Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address16.AddressLength = AcpiUtReadUint16(&Tmp16);
++            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            Descriptor->Address16.AddressLength = AcpiUtReadUint16 (&Tmp16);
              RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.AddressLength));
              LengthOp = InitializerOp;
@@ -2247,24 +1468,38 @@ Index: acpica-unix2-20200925/source/compiler/aslrestype2w.c
 -        (UINT64) Descriptor->Address16.Maximum,
 -        (UINT64) Descriptor->Address16.AddressLength,
 -        (UINT64) Descriptor->Address16.Granularity,
-+        (UINT64) AcpiUtReadUint16(&Descriptor->Address16.Minimum),
-+        (UINT64) AcpiUtReadUint16(&Descriptor->Address16.Maximum),
-+        (UINT64) AcpiUtReadUint16(&Descriptor->Address16.AddressLength),
-+        (UINT64) AcpiUtReadUint16(&Descriptor->Address16.Granularity),
++        (UINT64) AcpiUtReadUint16 (&Descriptor->Address16.Minimum),
++        (UINT64) AcpiUtReadUint16 (&Descriptor->Address16.Maximum),
++        (UINT64) AcpiUtReadUint16 (&Descriptor->Address16.AddressLength),
++        (UINT64) AcpiUtReadUint16 (&Descriptor->Address16.Granularity),
          Descriptor->Address16.Flags,
          MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
  
 +    /* correct enddianness */
 +    Tmp16 = Descriptor->Address16.ResourceLength;
-+    Descriptor->Address16.ResourceLength = AcpiUtReadUint16(&Tmp16);
++    Descriptor->Address16.ResourceLength = AcpiUtReadUint16 (&Tmp16);
 +
      Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) +
          OptionIndex + StringLength;
      return (Rnode);
-Index: acpica-unix2-20200925/source/components/disassembler/dmbuffer.c
+Index: acpica-unix2-20210604/source/compiler/dttable2.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/components/disassembler/dmbuffer.c
-+++ acpica-unix2-20200925/source/components/disassembler/dmbuffer.c
+--- acpica-unix2-20210604.orig/source/compiler/dttable2.c
++++ acpica-unix2-20210604/source/compiler/dttable2.c
+@@ -2635,7 +2635,8 @@ DtCompileWpbt (
+ 
+     /* Extract the length of the Arguments buffer, insert into main table */
+ 
+-    Length = (UINT16) Subtable->TotalLength;
++    AcpiUtWriteUint (&Length, sizeof (UINT16),
++           &Subtable->TotalLength, sizeof (UINT32));
+     Table = ACPI_CAST_PTR (ACPI_TABLE_WPBT, ParentTable->Buffer);
+     Table->ArgumentsLength = Length;
+ 
+Index: acpica-unix2-20210604/source/components/disassembler/dmbuffer.c
+===================================================================
+--- acpica-unix2-20210604.orig/source/components/disassembler/dmbuffer.c
++++ acpica-unix2-20210604/source/components/disassembler/dmbuffer.c
 @@ -204,7 +204,7 @@ AcpiDmByteList (
  
  
@@ -2305,21 +1540,94 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmbuffer.c
      for (i = 0; i < (WordCount - 1); i++)
      {
 -        OutputValue = (int) WordData[i];
-+        OutputValue = (int) AcpiUtReadUint16(&WordData[i]);
++        OutputValue = (int) AcpiUtReadUint16 (&WordData[i]);
  
          /* Handle values that must be escaped */
  
-Index: acpica-unix2-20200925/source/components/disassembler/dmopcode.c
+@@ -947,7 +947,29 @@ AcpiDmGetHardwareIdType (
+ 
+         /* Swap from little-endian to big-endian to simplify conversion */
+ 
+-        BigEndianId = AcpiUtDwordByteSwap ((UINT32) Op->Common.Value.Integer);
++        BigEndianId = (UINT32) Op->Common.Value.Integer;
++        if (UtIsBigEndianMachine())
++        {
++            /*
++             * We'll need to store the bytes in little-endian order
++             * so they can be re-used properly later since everything is
++             * assumed to be in little-endian form.
++             */
++
++	     UINT32 *Ptr = (UINT32 *)(&Op->Common.Value.Integer);
++	     *Ptr = AcpiUtDwordByteSwap (BigEndianId);
++        }
++        else
++        {
++            /*
++             * We'll need to just use the bytes in big-endian order;
++             * they're already in little-endian order.
++             */
++
++            UINT32 Tmp32 = BigEndianId;
++
++            BigEndianId = AcpiUtDwordByteSwap ((UINT32) Tmp32);
++        }
+ 
+         /* Create the 3 leading ASCII letters */
+ 
+@@ -1073,11 +1095,12 @@ AcpiDmDecompressEisaId (
+ {
+     char                    IdBuffer[ACPI_EISAID_STRING_SIZE];
+     const AH_DEVICE_ID      *Info;
++    UINT32                  Tmp32 = EncodedId;
+ 
+ 
+     /* Convert EISAID to a string an emit the statement */
+ 
+-    AcpiExEisaIdToString (IdBuffer, EncodedId);
++    AcpiExEisaIdToString (IdBuffer, AcpiUtReadUint32 (&Tmp32));
+     AcpiOsPrintf ("EisaId (\"%s\")", IdBuffer);
+ 
+     /* If we know about the ID, emit the description */
+Index: acpica-unix2-20210604/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 (
+--- acpica-unix2-20210604.orig/source/components/disassembler/dmopcode.c
++++ acpica-unix2-20210604/source/components/disassembler/dmopcode.c
+@@ -778,7 +778,9 @@ AcpiDmDisassembleOneOp (
+         }
+         else
+         {
+-            AcpiOsPrintf ("0x%4.4X", (UINT32) Op->Common.Value.Integer);
++            UINT16 Tmp16 = (UINT16) Op->Common.Value.Integer;
++
++            AcpiOsPrintf ("0x%4.4X", (UINT32) AcpiUtReadUint16 (&Tmp16));
+         }
+         break;
  
-     case AML_INT_NAMEDFIELD_OP:
+@@ -790,14 +792,19 @@ AcpiDmDisassembleOneOp (
+         }
+         else
+         {
+-            AcpiOsPrintf ("0x%8.8X", (UINT32) Op->Common.Value.Integer);
++            UINT32 Tmp32 = (UINT32) Op->Common.Value.Integer;
++
++            AcpiOsPrintf ("0x%8.8X", (UINT32) AcpiUtReadUint32 (&Tmp32));
+         }
+         break;
  
--        Length = AcpiDmDumpName (Op->Named.Name);
-+        Length = AcpiDmDumpName (AcpiUtReadUint32(&Op->Named.Name));
+     case AML_QWORD_OP:
  
+-        AcpiOsPrintf ("0x%8.8X%8.8X",
+-            ACPI_FORMAT_UINT64 (Op->Common.Value.Integer));
++        {
++	    UINT64 Tmp64 = AcpiUtReadUint64 (&Op->Common.Value.Integer);
++
++            AcpiOsPrintf ("0x%8.8X%8.8X", ACPI_FORMAT_UINT64 (Tmp64));
++        }
+         break;
+ 
+     case AML_STRING_OP:
+@@ -887,18 +894,18 @@ AcpiDmDisassembleOneOp (
          AcpiOsPrintf (",");
          ASL_CV_PRINT_ONE_COMMENT (Op, AML_NAMECOMMENT, NULL, 0);
          AcpiOsPrintf ("%*.s  %u", (unsigned) (5 - Length), " ",
@@ -2341,10 +1649,10 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmopcode.c
          Info->BitOffset += Offset;
  
          if (Info->BitOffset % 8 == 0)
-Index: acpica-unix2-20200925/source/components/disassembler/dmresrc.c
+Index: acpica-unix2-20210604/source/components/disassembler/dmresrc.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/components/disassembler/dmresrc.c
-+++ acpica-unix2-20200925/source/components/disassembler/dmresrc.c
+--- acpica-unix2-20210604.orig/source/components/disassembler/dmresrc.c
++++ acpica-unix2-20210604/source/components/disassembler/dmresrc.c
 @@ -417,7 +417,7 @@ AcpiDmIsResourceTemplate (
          return (AE_TYPE);
      }
@@ -2354,10 +1662,10 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmresrc.c
  
      /* Get the length of the raw initialization byte list */
  
-Index: acpica-unix2-20200925/source/components/disassembler/dmresrcl.c
+Index: acpica-unix2-20210604/source/components/disassembler/dmresrcl.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/components/disassembler/dmresrcl.c
-+++ acpica-unix2-20200925/source/components/disassembler/dmresrcl.c
+--- acpica-unix2-20210604.orig/source/components/disassembler/dmresrcl.c
++++ acpica-unix2-20210604/source/components/disassembler/dmresrcl.c
 @@ -141,6 +141,8 @@ AcpiDmMemoryFields (
      UINT32                  Level)
  {
@@ -2373,18 +1681,18 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmresrcl.c
  
 -            AcpiDmDumpInteger16 (ACPI_CAST_PTR (UINT16, Source)[i],
 -                AcpiDmMemoryNames[i]);
-+	    Tmp16 = ACPI_CAST_PTR (UINT16, Source)[i];
-+            AcpiDmDumpInteger16 (AcpiUtReadUint16(&Tmp16),
-+			         AcpiDmMemoryNames[i]);
++            Tmp16 = ACPI_CAST_PTR (UINT16, Source)[i];
++            AcpiDmDumpInteger16 (AcpiUtReadUint16 (&Tmp16),
++                     AcpiDmMemoryNames[i]);
              break;
  
          case 32:
  
 -            AcpiDmDumpInteger32 (ACPI_CAST_PTR (UINT32, Source)[i],
 -                AcpiDmMemoryNames[i]);
-+	    Tmp32 = ACPI_CAST_PTR (UINT32, Source)[i];
-+            AcpiDmDumpInteger32 (AcpiUtReadUint32(&Tmp32),
-+			         AcpiDmMemoryNames[i]);
++            Tmp32 = ACPI_CAST_PTR (UINT32, Source)[i];
++            AcpiDmDumpInteger32 (AcpiUtReadUint32 (&Tmp32),
++                     AcpiDmMemoryNames[i]);
              break;
  
          default:
@@ -2404,27 +1712,27 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmresrcl.c
  
 -            AcpiDmDumpInteger16 (ACPI_CAST_PTR (UINT16, Source)[i],
 -                AcpiDmAddressNames[i]);
-+	    Tmp16 = ACPI_CAST_PTR (UINT16, Source)[i];
-+            AcpiDmDumpInteger16 (AcpiUtReadUint16(&Tmp16),
-+                		 AcpiDmAddressNames[i]);
++            Tmp16 = ACPI_CAST_PTR (UINT16, Source)[i];
++            AcpiDmDumpInteger16 (AcpiUtReadUint16 (&Tmp16),
++                         AcpiDmAddressNames[i]);
              break;
  
          case 32:
  
 -            AcpiDmDumpInteger32 (ACPI_CAST_PTR (UINT32, Source)[i],
 -                AcpiDmAddressNames[i]);
-+	    Tmp32 = ACPI_CAST_PTR (UINT32, Source)[i];
-+            AcpiDmDumpInteger32 (AcpiUtReadUint32(&Tmp32),
-+                		 AcpiDmAddressNames[i]);
++            Tmp32 = ACPI_CAST_PTR (UINT32, Source)[i];
++            AcpiDmDumpInteger32 (AcpiUtReadUint32 (&Tmp32),
++                         AcpiDmAddressNames[i]);
              break;
  
          case 64:
  
 -            AcpiDmDumpInteger64 (ACPI_CAST_PTR (UINT64, Source)[i],
 -                AcpiDmAddressNames[i]);
-+	    Tmp64 = ACPI_CAST_PTR (UINT64, Source)[i];
-+            AcpiDmDumpInteger64 (AcpiUtReadUint64(&Tmp64),
-+                		 AcpiDmAddressNames[i]);
++            Tmp64 = ACPI_CAST_PTR (UINT64, Source)[i];
++            AcpiDmDumpInteger64 (AcpiUtReadUint64 (&Tmp64),
++                         AcpiDmAddressNames[i]);
              break;
  
          default:
@@ -2433,7 +1741,7 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmresrcl.c
  
      AcpiDmIndent (Level + 1);
 -    AcpiDmDumpInteger64 (Resource->ExtAddress64.TypeSpecific,
-+    AcpiDmDumpInteger64 (AcpiUtReadUint64(&Resource->ExtAddress64.TypeSpecific),
++    AcpiDmDumpInteger64 (AcpiUtReadUint64 (&Resource->ExtAddress64.TypeSpecific),
          "Type-Specific Attributes");
  
      /* Insert a descriptor name */
@@ -2442,12 +1750,12 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmresrcl.c
  
      AcpiDmIndent (Level + 1);
 -    AcpiDmDumpInteger32 (Resource->FixedMemory32.Address,
-+    AcpiDmDumpInteger32 (AcpiUtReadUint32(&Resource->FixedMemory32.Address),
++    AcpiDmDumpInteger32 (AcpiUtReadUint32 (&Resource->FixedMemory32.Address),
          "Address Base");
  
      AcpiDmIndent (Level + 1);
 -    AcpiDmDumpInteger32 (Resource->FixedMemory32.AddressLength,
-+    AcpiDmDumpInteger32 (AcpiUtReadUint32(&Resource->FixedMemory32.AddressLength),
++    AcpiDmDumpInteger32 (AcpiUtReadUint32 (&Resource->FixedMemory32.AddressLength),
          "Address Length");
  
      /* Insert a descriptor name */
@@ -2456,8 +1764,8 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmresrcl.c
  
      AcpiDmIndent (Level + 1);
 -    AcpiDmDumpInteger64 (Resource->GenericReg.Address, "Address");
-+    AcpiDmDumpInteger64 (AcpiUtReadUint64(&Resource->GenericReg.Address),
-+		         "Address");
++    AcpiDmDumpInteger64 (AcpiUtReadUint64 (&Resource->GenericReg.Address),
++                 "Address");
  
      /* Optional field for ACPI 3.0 */
  
@@ -2466,7 +1774,7 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmresrcl.c
          sizeof (AML_RESOURCE_EXTENDED_IRQ) +
              ((UINT32) Resource->ExtendedIrq.InterruptCount - 1) * sizeof (UINT32),
 -        Resource->ExtendedIrq.ResourceLength);
-+        AcpiUtReadUint16(&Resource->ExtendedIrq.ResourceLength));
++            AcpiUtReadUint16 (&Resource->ExtendedIrq.ResourceLength));
  
      /* Insert a descriptor name */
  
@@ -2475,15 +1783,15 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmresrcl.c
          AcpiDmIndent (Level + 1);
          AcpiOsPrintf ("0x%8.8X,\n",
 -            (UINT32) Resource->ExtendedIrq.Interrupts[i]);
-+            AcpiUtReadUint32(&Resource->ExtendedIrq.Interrupts[i]));
++            AcpiUtReadUint32 (&Resource->ExtendedIrq.Interrupts[i]));
      }
  
      AcpiDmIndent (Level);
-Index: acpica-unix2-20200925/source/components/disassembler/dmresrcl2.c
+Index: acpica-unix2-20210604/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 (
+--- acpica-unix2-20210604.orig/source/components/disassembler/dmresrcl2.c
++++ acpica-unix2-20210604/source/components/disassembler/dmresrcl2.c
+@@ -199,22 +199,27 @@ AcpiDmGpioCommon (
      char                    *DeviceName = NULL;
      UINT32                  PinCount;
      UINT32                  i;
@@ -2497,7 +1805,7 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmresrcl2.c
  
      AcpiDmIndent (Level + 1);
 -    if (Resource->Gpio.ResSourceOffset)
-+    ResSourceOffset = AcpiUtReadUint16(&Resource->Gpio.ResSourceOffset);
++    ResSourceOffset = AcpiUtReadUint16 (&Resource->Gpio.ResSourceOffset);
 +    if (ResSourceOffset)
      {
          DeviceName = ACPI_ADD_PTR (char,
@@ -2510,18 +1818,18 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmresrcl2.c
      AcpiOsPrintf ("0x%2.2X, ", Resource->Gpio.ResSourceIndex);
 -    AcpiOsPrintf ("%s, ",
 -        AcpiGbl_ConsumeDecode [ACPI_GET_1BIT_FLAG (Resource->Gpio.Flags)]);
-+    Tmp16 = AcpiUtReadUint16(&Resource->Gpio.Flags);
++    Tmp16 = AcpiUtReadUint16 (&Resource->Gpio.Flags);
 +    AcpiOsPrintf ("%s, ", AcpiGbl_ConsumeDecode [ACPI_GET_1BIT_FLAG (Tmp16)]);
  
      /* Insert a descriptor name */
  
-@@ -215,15 +220,15 @@ AcpiDmGpioCommon (
+@@ -223,15 +228,15 @@ AcpiDmGpioCommon (
  
      /* Dump the vendor data */
  
 -    if (Resource->Gpio.VendorOffset)
-+    VendorOffset = AcpiUtReadUint16(&Resource->Gpio.VendorOffset);
-+    VendorLength = AcpiUtReadUint16(&Resource->Gpio.VendorLength);
++    VendorOffset = AcpiUtReadUint16 (&Resource->Gpio.VendorOffset);
++    VendorLength = AcpiUtReadUint16 (&Resource->Gpio.VendorLength);
 +    if (VendorOffset)
      {
          AcpiOsPrintf ("\n");
@@ -2536,30 +1844,30 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmresrcl2.c
      }
  
      AcpiOsPrintf (")\n");
-@@ -233,17 +238,17 @@ AcpiDmGpioCommon (
+@@ -241,17 +246,17 @@ AcpiDmGpioCommon (
      AcpiDmIndent (Level + 1);
      AcpiOsPrintf ("{   // Pin list\n");
  
 -    PinCount = ((UINT32) (Resource->Gpio.ResSourceOffset -
 -        Resource->Gpio.PinTableOffset)) /
 -        sizeof (UINT16);
-+    PinCount = (UINT32) AcpiUtReadUint16(&Resource->Gpio.ResSourceOffset);
-+    PinCount -= (UINT32) AcpiUtReadUint16(&Resource->Gpio.PinTableOffset);
++    PinCount = (UINT32) AcpiUtReadUint16 (&Resource->Gpio.ResSourceOffset);
++    PinCount -= (UINT32) AcpiUtReadUint16 (&Resource->Gpio.PinTableOffset);
 +    PinCount /= sizeof (UINT16);
  
      PinList = (UINT16 *) ACPI_ADD_PTR (char, Resource,
 -        Resource->Gpio.PinTableOffset);
-+        AcpiUtReadUint16(&Resource->Gpio.PinTableOffset));
++        AcpiUtReadUint16 (&Resource->Gpio.PinTableOffset));
  
      for (i = 0; i < PinCount; i++)
      {
          AcpiDmIndent (Level + 2);
 -        AcpiOsPrintf ("0x%4.4X%s\n", PinList[i],
-+        AcpiOsPrintf ("0x%4.4X%s\n", AcpiUtReadUint16(&(PinList[i])),
++        AcpiOsPrintf ("0x%4.4X%s\n", AcpiUtReadUint16 (&(PinList[i])),
              ((i + 1) < PinCount) ? "," : "");
      }
  
-@@ -277,16 +282,18 @@ AcpiDmGpioIntDescriptor (
+@@ -285,16 +290,18 @@ AcpiDmGpioIntDescriptor (
      UINT32                  Length,
      UINT32                  Level)
  {
@@ -2570,7 +1878,7 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmresrcl2.c
      /* EdgeLevel, ActiveLevel, Shared */
  
      AcpiDmIndent (Level);
-+    Tmp16 = AcpiUtReadUint16(&Resource->Gpio.IntFlags);
++    Tmp16 = AcpiUtReadUint16 (&Resource->Gpio.IntFlags);
      AcpiOsPrintf ("GpioInt (%s, %s, %s, ",
 -        AcpiGbl_HeDecode [ACPI_GET_1BIT_FLAG (Resource->Gpio.IntFlags)],
 -        AcpiGbl_LlDecode [ACPI_EXTRACT_2BIT_FLAG (Resource->Gpio.IntFlags, 1)],
@@ -2581,17 +1889,17 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmresrcl2.c
  
      /* PinConfig, DebounceTimeout */
  
-@@ -299,7 +306,8 @@ AcpiDmGpioIntDescriptor (
+@@ -307,7 +314,8 @@ AcpiDmGpioIntDescriptor (
      {
          AcpiOsPrintf ("0x%2.2X, ", Resource->Gpio.PinConfig);
      }
 -    AcpiOsPrintf ("0x%4.4X,\n", Resource->Gpio.DebounceTimeout);
 +    AcpiOsPrintf ("0x%4.4X,\n",
-+		  AcpiUtReadUint16(&Resource->Gpio.DebounceTimeout));
++          AcpiUtReadUint16 (&Resource->Gpio.DebounceTimeout));
  
      /* Dump the GpioInt/GpioIo common portion of the descriptor */
  
-@@ -329,14 +337,16 @@ AcpiDmGpioIoDescriptor (
+@@ -337,14 +345,16 @@ AcpiDmGpioIoDescriptor (
      UINT32                  Length,
      UINT32                  Level)
  {
@@ -2602,14 +1910,14 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmresrcl2.c
      /* Shared, PinConfig */
  
      AcpiDmIndent (Level);
-+    Tmp16 = AcpiUtReadUint16(&Resource->Gpio.IntFlags);
++    Tmp16 = AcpiUtReadUint16 (&Resource->Gpio.IntFlags);
      AcpiOsPrintf ("GpioIo (%s, ",
 -        AcpiGbl_ShrDecode [ACPI_EXTRACT_2BIT_FLAG (Resource->Gpio.IntFlags, 3)]);
 +        AcpiGbl_ShrDecode [ACPI_EXTRACT_2BIT_FLAG (Tmp16, 3)]);
  
      if (Resource->Gpio.PinConfig <= 3)
      {
-@@ -350,10 +360,10 @@ AcpiDmGpioIoDescriptor (
+@@ -358,10 +368,10 @@ AcpiDmGpioIoDescriptor (
  
      /* DebounceTimeout, DriveStrength, IoRestriction */
  
@@ -2617,14 +1925,14 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmresrcl2.c
 -    AcpiOsPrintf ("0x%4.4X, ", Resource->Gpio.DriveStrength);
 -    AcpiOsPrintf ("%s,\n",
 -        AcpiGbl_IorDecode [ACPI_GET_2BIT_FLAG (Resource->Gpio.IntFlags)]);
-+    AcpiOsPrintf ("0x%4.4X, ", AcpiUtReadUint16(&Resource->Gpio.DebounceTimeout));
-+    AcpiOsPrintf ("0x%4.4X, ", AcpiUtReadUint16(&Resource->Gpio.DriveStrength));
-+    Tmp16 = AcpiUtReadUint16(&Resource->Gpio.IntFlags);
++    AcpiOsPrintf ("0x%4.4X, ", AcpiUtReadUint16 (&Resource->Gpio.DebounceTimeout));
++    AcpiOsPrintf ("0x%4.4X, ", AcpiUtReadUint16 (&Resource->Gpio.DriveStrength));
++    Tmp16 = AcpiUtReadUint16 (&Resource->Gpio.IntFlags);
 +    AcpiOsPrintf ("%s,\n", AcpiGbl_IorDecode [ACPI_GET_2BIT_FLAG (Tmp16)]);
  
      /* Dump the GpioInt/GpioIo common portion of the descriptor */
  
-@@ -434,6 +444,9 @@ AcpiDmPinFunctionDescriptor (
+@@ -442,6 +452,9 @@ AcpiDmPinFunctionDescriptor (
      char                    *DeviceName = NULL;
      UINT32                  PinCount;
      UINT32                  i;
@@ -2634,16 +1942,16 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmresrcl2.c
  
      AcpiDmIndent (Level);
      AcpiOsPrintf ("PinFunction (%s, ",
-@@ -451,12 +464,14 @@ AcpiDmPinFunctionDescriptor (
+@@ -459,12 +472,14 @@ AcpiDmPinFunctionDescriptor (
  
      /* FunctionNumber */
  
 -    AcpiOsPrintf ("0x%4.4X, ", Resource->PinFunction.FunctionNumber);
-+    AcpiOsPrintf ("0x%4.4X, ", 
-+		  AcpiUtReadUint16(&Resource->PinFunction.FunctionNumber));
++    AcpiOsPrintf ("0x%4.4X, ",
++          AcpiUtReadUint16 (&Resource->PinFunction.FunctionNumber));
  
 -    if (Resource->PinFunction.ResSourceOffset)
-+    ResSourceOffset = AcpiUtReadUint16(&Resource->PinFunction.ResSourceOffset);
++    ResSourceOffset = AcpiUtReadUint16 (&Resource->PinFunction.ResSourceOffset);
 +    if (ResSourceOffset)
      {
          DeviceName = ACPI_ADD_PTR (char,
@@ -2652,13 +1960,13 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmresrcl2.c
          AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
      }
  
-@@ -476,15 +491,15 @@ AcpiDmPinFunctionDescriptor (
+@@ -484,15 +499,15 @@ AcpiDmPinFunctionDescriptor (
  
      /* Dump the vendor data */
  
 -    if (Resource->PinFunction.VendorLength)
-+    VendorOffset = AcpiUtReadUint16(&Resource->PinFunction.VendorOffset);
-+    VendorLength = AcpiUtReadUint16(&Resource->PinFunction.VendorLength);
++    VendorOffset = AcpiUtReadUint16 (&Resource->PinFunction.VendorOffset);
++    VendorLength = AcpiUtReadUint16 (&Resource->PinFunction.VendorLength);
 +    if (VendorLength)
      {
          AcpiOsPrintf ("\n");
@@ -2673,81 +1981,81 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmresrcl2.c
      }
  
      AcpiOsPrintf (")\n");
-@@ -495,17 +510,17 @@ AcpiDmPinFunctionDescriptor (
+@@ -503,17 +518,17 @@ AcpiDmPinFunctionDescriptor (
  
      AcpiOsPrintf ("{   // Pin list\n");
  
 -    PinCount = ((UINT32) (Resource->PinFunction.ResSourceOffset -
 -        Resource->PinFunction.PinTableOffset)) /
 -        sizeof (UINT16);
-+    PinCount = AcpiUtReadUint16(&Resource->PinFunction.ResSourceOffset);
-+    PinCount -= AcpiUtReadUint16(&Resource->PinFunction.PinTableOffset);
++    PinCount = AcpiUtReadUint16 (&Resource->PinFunction.ResSourceOffset);
++    PinCount -= AcpiUtReadUint16 (&Resource->PinFunction.PinTableOffset);
 +    PinCount /= sizeof (UINT16);
  
      PinList = (UINT16 *) ACPI_ADD_PTR (char, Resource,
 -        Resource->PinFunction.PinTableOffset);
-+        AcpiUtReadUint16(&Resource->PinFunction.PinTableOffset));
++        AcpiUtReadUint16 (&Resource->PinFunction.PinTableOffset));
  
      for (i = 0; i < PinCount; i++)
      {
          AcpiDmIndent (Level + 2);
 -        AcpiOsPrintf ("0x%4.4X%s\n", PinList[i],
-+        AcpiOsPrintf ("0x%4.4X%s\n", AcpiUtReadUint16(&(PinList[i])),
++        AcpiOsPrintf ("0x%4.4X%s\n", AcpiUtReadUint16 (&(PinList[i])),
              ((i + 1) < PinCount) ? "," : "");
      }
  
-@@ -541,7 +556,8 @@ AcpiDmDumpSerialBusVendorData (
+@@ -549,7 +564,8 @@ AcpiDmDumpSerialBusVendorData (
      {
      case AML_RESOURCE_I2C_SERIALBUSTYPE:
  
 -        VendorLength = Resource->CommonSerialBus.TypeDataLength -
-+        VendorLength = 
-+	    AcpiUtReadUint16(&Resource->CommonSerialBus.TypeDataLength) -
++        VendorLength =
++            AcpiUtReadUint16 (&Resource->CommonSerialBus.TypeDataLength) -
              AML_RESOURCE_I2C_MIN_DATA_LEN;
  
          VendorData = ACPI_ADD_PTR (UINT8, Resource,
-@@ -550,7 +566,8 @@ AcpiDmDumpSerialBusVendorData (
+@@ -558,7 +574,8 @@ AcpiDmDumpSerialBusVendorData (
  
      case AML_RESOURCE_SPI_SERIALBUSTYPE:
  
 -        VendorLength = Resource->CommonSerialBus.TypeDataLength -
-+        VendorLength = 
-+	    AcpiUtReadUint16(&Resource->CommonSerialBus.TypeDataLength) -
++        VendorLength =
++            AcpiUtReadUint16 (&Resource->CommonSerialBus.TypeDataLength) -
              AML_RESOURCE_SPI_MIN_DATA_LEN;
  
          VendorData = ACPI_ADD_PTR (UINT8, Resource,
-@@ -559,7 +576,8 @@ AcpiDmDumpSerialBusVendorData (
+@@ -567,7 +584,8 @@ AcpiDmDumpSerialBusVendorData (
  
      case AML_RESOURCE_UART_SERIALBUSTYPE:
  
 -        VendorLength = Resource->CommonSerialBus.TypeDataLength -
-+        VendorLength = 
-+	    AcpiUtReadUint16(&Resource->CommonSerialBus.TypeDataLength) -
++        VendorLength =
++            AcpiUtReadUint16 (&Resource->CommonSerialBus.TypeDataLength) -
              AML_RESOURCE_UART_MIN_DATA_LEN;
  
          VendorData = ACPI_ADD_PTR (UINT8, Resource,
-@@ -607,9 +625,9 @@ AcpiDmI2cSerialBusDescriptor (
+@@ -693,9 +711,9 @@ AcpiDmI2cSerialBusDescriptor (
  
      AcpiDmIndent (Level);
      AcpiOsPrintf ("I2cSerialBusV2 (0x%4.4X, %s, 0x%8.8X,\n",
 -        Resource->I2cSerialBus.SlaveAddress,
-+        AcpiUtReadUint16(&Resource->I2cSerialBus.SlaveAddress),
++        AcpiUtReadUint16 (&Resource->I2cSerialBus.SlaveAddress),
          AcpiGbl_SmDecode [ACPI_GET_1BIT_FLAG (Resource->I2cSerialBus.Flags)],
 -        Resource->I2cSerialBus.ConnectionSpeed);
-+        AcpiUtReadUint32(&Resource->I2cSerialBus.ConnectionSpeed));
++        AcpiUtReadUint32 (&Resource->I2cSerialBus.ConnectionSpeed));
  
      AcpiDmIndent (Level + 1);
      AcpiOsPrintf ("%s, ",
-@@ -618,7 +636,7 @@ AcpiDmI2cSerialBusDescriptor (
+@@ -704,7 +722,7 @@ AcpiDmI2cSerialBusDescriptor (
      /* ResourceSource is a required field */
  
      ResourceSourceOffset = sizeof (AML_RESOURCE_COMMON_SERIALBUS) +
 -        Resource->CommonSerialBus.TypeDataLength;
-+        AcpiUtReadUint16(&Resource->CommonSerialBus.TypeDataLength);
++        AcpiUtReadUint16 (&Resource->CommonSerialBus.TypeDataLength);
  
      DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset);
      AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
-@@ -675,15 +693,17 @@ AcpiDmSpiSerialBusDescriptor (
+@@ -761,15 +779,17 @@ AcpiDmSpiSerialBusDescriptor (
  {
      UINT32                  ResourceSourceOffset;
      char                    *DeviceName;
@@ -2757,36 +2065,36 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmresrcl2.c
      /* DeviceSelection, DeviceSelectionPolarity, WireMode, DataBitLength */
  
      AcpiDmIndent (Level);
-+    Tmp16 = AcpiUtReadUint16(&Resource->SpiSerialBus.TypeSpecificFlags);
++    Tmp16 = AcpiUtReadUint16 (&Resource->SpiSerialBus.TypeSpecificFlags);
      AcpiOsPrintf ("SpiSerialBusV2 (0x%4.4X, %s, %s, 0x%2.2X,\n",
 -        Resource->SpiSerialBus.DeviceSelection,
 -        AcpiGbl_DpDecode [ACPI_EXTRACT_1BIT_FLAG (Resource->SpiSerialBus.TypeSpecificFlags, 1)],
 -        AcpiGbl_WmDecode [ACPI_GET_1BIT_FLAG (Resource->SpiSerialBus.TypeSpecificFlags)],
-+        AcpiUtReadUint16(&Resource->SpiSerialBus.DeviceSelection),
++        AcpiUtReadUint16 (&Resource->SpiSerialBus.DeviceSelection),
 +        AcpiGbl_DpDecode [ACPI_EXTRACT_1BIT_FLAG (Tmp16, 1)],
 +        AcpiGbl_WmDecode [ACPI_GET_1BIT_FLAG (Tmp16)],
          Resource->SpiSerialBus.DataBitLength);
  
      /* SlaveMode, ConnectionSpeed, ClockPolarity, ClockPhase */
-@@ -691,7 +711,7 @@ AcpiDmSpiSerialBusDescriptor (
+@@ -777,7 +797,7 @@ AcpiDmSpiSerialBusDescriptor (
      AcpiDmIndent (Level + 1);
      AcpiOsPrintf ("%s, 0x%8.8X, %s,\n",
          AcpiGbl_SmDecode [ACPI_GET_1BIT_FLAG (Resource->SpiSerialBus.Flags)],
 -        Resource->SpiSerialBus.ConnectionSpeed,
-+        AcpiUtReadUint32(&Resource->SpiSerialBus.ConnectionSpeed),
++        AcpiUtReadUint32 (&Resource->SpiSerialBus.ConnectionSpeed),
          AcpiGbl_CpoDecode [ACPI_GET_1BIT_FLAG (Resource->SpiSerialBus.ClockPolarity)]);
  
      AcpiDmIndent (Level + 1);
-@@ -701,7 +721,7 @@ AcpiDmSpiSerialBusDescriptor (
+@@ -787,7 +807,7 @@ AcpiDmSpiSerialBusDescriptor (
      /* ResourceSource is a required field */
  
      ResourceSourceOffset = sizeof (AML_RESOURCE_COMMON_SERIALBUS) +
 -        Resource->CommonSerialBus.TypeDataLength;
-+        AcpiUtReadUint16(&Resource->CommonSerialBus.TypeDataLength);
++        AcpiUtReadUint16 (&Resource->CommonSerialBus.TypeDataLength);
  
      DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset);
      AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
-@@ -758,15 +778,17 @@ AcpiDmUartSerialBusDescriptor (
+@@ -844,15 +864,17 @@ AcpiDmUartSerialBusDescriptor (
  {
      UINT32                  ResourceSourceOffset;
      char                    *DeviceName;
@@ -2796,44 +2104,44 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmresrcl2.c
      /* ConnectionSpeed, BitsPerByte, StopBits */
  
      AcpiDmIndent (Level);
-+    Tmp16 = AcpiUtReadUint16(&Resource->UartSerialBus.TypeSpecificFlags);
++    Tmp16 = AcpiUtReadUint16 (&Resource->UartSerialBus.TypeSpecificFlags);
      AcpiOsPrintf ("UartSerialBusV2 (0x%8.8X, %s, %s,\n",
 -        Resource->UartSerialBus.DefaultBaudRate,
 -        AcpiGbl_BpbDecode [ACPI_EXTRACT_3BIT_FLAG (Resource->UartSerialBus.TypeSpecificFlags, 4)],
 -        AcpiGbl_SbDecode [ACPI_EXTRACT_2BIT_FLAG (Resource->UartSerialBus.TypeSpecificFlags, 2)]);
-+        AcpiUtReadUint32(&Resource->UartSerialBus.DefaultBaudRate),
++        AcpiUtReadUint32 (&Resource->UartSerialBus.DefaultBaudRate),
 +        AcpiGbl_BpbDecode [ACPI_EXTRACT_3BIT_FLAG (Tmp16, 4)],
 +        AcpiGbl_SbDecode [ACPI_EXTRACT_2BIT_FLAG (Tmp16, 2)]);
  
      /* LinesInUse, IsBigEndian, Parity, FlowControl */
  
-@@ -781,13 +803,13 @@ AcpiDmUartSerialBusDescriptor (
+@@ -867,13 +889,13 @@ AcpiDmUartSerialBusDescriptor (
  
      AcpiDmIndent (Level + 1);
      AcpiOsPrintf ("0x%4.4X, 0x%4.4X, ",
 -        Resource->UartSerialBus.RxFifoSize,
 -        Resource->UartSerialBus.TxFifoSize);
-+        AcpiUtReadUint16(&Resource->UartSerialBus.RxFifoSize),
-+        AcpiUtReadUint16(&Resource->UartSerialBus.TxFifoSize));
++        AcpiUtReadUint16 (&Resource->UartSerialBus.RxFifoSize),
++        AcpiUtReadUint16 (&Resource->UartSerialBus.TxFifoSize));
  
      /* ResourceSource is a required field */
  
      ResourceSourceOffset = sizeof (AML_RESOURCE_COMMON_SERIALBUS) +
 -        Resource->CommonSerialBus.TypeDataLength;
-+        AcpiUtReadUint16(&Resource->CommonSerialBus.TypeDataLength);
++        AcpiUtReadUint16 (&Resource->CommonSerialBus.TypeDataLength);
  
      DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset);
      AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
-Index: acpica-unix2-20200925/source/components/disassembler/dmresrcs.c
+Index: acpica-unix2-20210604/source/components/disassembler/dmresrcs.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/components/disassembler/dmresrcs.c
-+++ acpica-unix2-20200925/source/components/disassembler/dmresrcs.c
+--- acpica-unix2-20210604.orig/source/components/disassembler/dmresrcs.c
++++ acpica-unix2-20210604/source/components/disassembler/dmresrcs.c
 @@ -93,7 +93,7 @@ AcpiDmIrqDescriptor (
      AcpiOsPrintf (")\n");
  
      AcpiDmIndent (Level + 1);
 -    AcpiDmBitList (Resource->Irq.IrqMask);
-+    AcpiDmBitList (AcpiUtReadUint16(&Resource->Irq.IrqMask));
++    AcpiDmBitList (AcpiUtReadUint16 (&Resource->Irq.IrqMask));
  }
  
  
@@ -2843,8 +2151,8 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmresrcs.c
      AcpiOsPrintf ("FixedDMA (0x%4.4X, 0x%4.4X, ",
 -        Resource->FixedDma.RequestLines,
 -        Resource->FixedDma.Channels);
-+        AcpiUtReadUint16(&Resource->FixedDma.RequestLines),
-+        AcpiUtReadUint16(&Resource->FixedDma.Channels));
++        AcpiUtReadUint16 (&Resource->FixedDma.RequestLines),
++        AcpiUtReadUint16 (&Resource->FixedDma.Channels));
  
      if (Resource->FixedDma.Width <= 5)
      {
@@ -2853,13 +2161,13 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmresrcs.c
  
      AcpiDmIndent (Level + 1);
 -    AcpiDmDumpInteger16 (Resource->Io.Minimum, "Range Minimum");
-+    AcpiDmDumpInteger16 (AcpiUtReadUint16(&Resource->Io.Minimum),
-+		         "Range Minimum");
++    AcpiDmDumpInteger16 (AcpiUtReadUint16 (&Resource->Io.Minimum),
++                 "Range Minimum");
  
      AcpiDmIndent (Level + 1);
 -    AcpiDmDumpInteger16 (Resource->Io.Maximum, "Range Maximum");
-+    AcpiDmDumpInteger16 (AcpiUtReadUint16(&Resource->Io.Maximum),
-+		         "Range Maximum");
++    AcpiDmDumpInteger16 (AcpiUtReadUint16 (&Resource->Io.Maximum),
++                 "Range Maximum");
  
      AcpiDmIndent (Level + 1);
      AcpiDmDumpInteger8 (Resource->Io.Alignment, "Alignment");
@@ -2868,20 +2176,20 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmresrcs.c
  
      AcpiDmIndent (Level + 1);
 -    AcpiDmDumpInteger16 (Resource->FixedIo.Address, "Address");
-+    AcpiDmDumpInteger16 (AcpiUtReadUint16(&Resource->FixedIo.Address),
-+		         "Address");
++    AcpiDmDumpInteger16 (AcpiUtReadUint16 (&Resource->FixedIo.Address),
++                 "Address");
  
      AcpiDmIndent (Level + 1);
 -    AcpiDmDumpInteger8 (Resource->FixedIo.AddressLength, "Length");
-+    AcpiDmDumpInteger8 (AcpiUtReadUint16(&Resource->FixedIo.AddressLength),
-+			"Length");
++    AcpiDmDumpInteger8 (AcpiUtReadUint16 (&Resource->FixedIo.AddressLength),
++            "Length");
  
      /* Insert a descriptor name */
  
-Index: acpica-unix2-20200925/source/components/disassembler/dmwalk.c
+Index: acpica-unix2-20210604/source/components/disassembler/dmwalk.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/components/disassembler/dmwalk.c
-+++ acpica-unix2-20200925/source/components/disassembler/dmwalk.c
+--- acpica-unix2-20210604.orig/source/components/disassembler/dmwalk.c
++++ acpica-unix2-20210604/source/components/disassembler/dmwalk.c
 @@ -1155,7 +1155,7 @@ AcpiDmAscendingOp (
          {
              ParentOp->Common.DisasmFlags |= ACPI_PARSEOP_EMPTY_TERMLIST;
@@ -2891,59 +2199,11 @@ Index: acpica-unix2-20200925/source/components/disassembler/dmwalk.c
          }
      }
  
-Index: acpica-unix2-20200925/source/components/dispatcher/dsfield.c
+Index: acpica-unix2-20210604/source/components/namespace/nsaccess.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
- 
-+    char                    TmpName[ACPI_NAMESEG_SIZE+1];
-+
- 
-     ACPI_FUNCTION_TRACE_PTR (DsGetFieldNames, Info);
- 
-@@ -442,14 +444,17 @@ AcpiDsGetFieldNames (
- 
-             /* Lookup the name, it should already exist */
- 
-+	    memset(TmpName, 0, ACPI_NAMESEG_SIZE+1);
-+	    AcpiUtWriteUint(TmpName, ACPI_NAMESEG_SIZE,
-+			    &Arg->Named.Name, ACPI_NAMESEG_SIZE);
-             Status = AcpiNsLookup (WalkState->ScopeInfo,
--                (char *) &Arg->Named.Name, Info->FieldType,
-+                TmpName, Info->FieldType,
-                 ACPI_IMODE_EXECUTE, ACPI_NS_DONT_OPEN_SCOPE,
-                 WalkState, &Info->FieldNode);
-             if (ACPI_FAILURE (Status))
-             {
-                 ACPI_ERROR_NAMESPACE (WalkState->ScopeInfo,
--                    (char *) &Arg->Named.Name, Status);
-+                    TmpName, Status);
-                 return_ACPI_STATUS (Status);
-             }
-             else
-@@ -703,8 +708,13 @@ AcpiDsInitFieldObjects (
-          */
-         if (Arg->Common.AmlOpcode == AML_INT_NAMEDFIELD_OP)
-         {
-+	    char Tmp[ACPI_NAMESEG_SIZE+1];
-+
-+	    memset(&Tmp, 0, ACPI_NAMESEG_SIZE+1);
-+	    AcpiUtWriteUint(&Tmp, ACPI_NAMESEG_SIZE,
-+			    &Arg->Named.Name, ACPI_NAMESEG_SIZE);
-             Status = AcpiNsLookup (WalkState->ScopeInfo,
--                (char *) &Arg->Named.Name, Type, ACPI_IMODE_LOAD_PASS1,
-+                Tmp, Type, ACPI_IMODE_LOAD_PASS1,
-                 Flags, WalkState, &Node);
-             if (ACPI_FAILURE (Status))
-             {
-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 (
+--- acpica-unix2-20210604.orig/source/components/namespace/nsaccess.c
++++ acpica-unix2-20210604/source/components/namespace/nsaccess.c
+@@ -644,7 +644,7 @@ AcpiNsLookup (
  
          /* Extract one ACPI name from the front of the pathname */
  
@@ -2952,12 +2212,16 @@ Index: acpica-unix2-20200925/source/components/namespace/nsaccess.c
  
          /* Try to find the single (4 character) ACPI name */
  
-Index: acpica-unix2-20200925/source/components/namespace/nsnames.c
+Index: acpica-unix2-20210604/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);
+--- acpica-unix2-20210604.orig/source/components/namespace/nsnames.c
++++ acpica-unix2-20210604/source/components/namespace/nsnames.c
+@@ -297,10 +297,10 @@ AcpiNsBuildNormalizedPath (
+     {
+         if (NextNode != Node)
+         {
+-            ACPI_PATH_PUT8(FullPath, PathSize, AML_DUAL_NAME_PREFIX, Length);
++            ACPI_PATH_PUT8 (FullPath, PathSize, AML_DUAL_NAME_PREFIX, Length);
          }
  
 -        ACPI_MOVE_32_TO_32 (Name, &NextNode->Name);
@@ -2965,10 +2229,10 @@ Index: acpica-unix2-20200925/source/components/namespace/nsnames.c
          DoNoTrailing = NoTrailing;
          for (i = 0; i < 4; i++)
          {
-Index: acpica-unix2-20200925/source/components/namespace/nsparse.c
+Index: acpica-unix2-20210604/source/components/namespace/nsparse.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/components/namespace/nsparse.c
-+++ acpica-unix2-20200925/source/components/namespace/nsparse.c
+--- acpica-unix2-20210604.orig/source/components/namespace/nsparse.c
++++ acpica-unix2-20210604/source/components/namespace/nsparse.c
 @@ -203,6 +203,7 @@ AcpiNsOneCompleteParse (
      ACPI_WALK_STATE         *WalkState;
      ACPI_TABLE_HEADER       *Table;
@@ -2982,7 +2246,7 @@ Index: acpica-unix2-20200925/source/components/namespace/nsparse.c
      /* Table must consist of at least a complete header */
  
 -    if (Table->Length < sizeof (ACPI_TABLE_HEADER))
-+    TableLength = AcpiUtReadUint32(&Table->Length);
++    TableLength = AcpiUtReadUint32 (&Table->Length);
 +    if (TableLength < sizeof (ACPI_TABLE_HEADER))
      {
          return_ACPI_STATUS (AE_BAD_HEADER);
@@ -2994,15 +2258,15 @@ Index: acpica-unix2-20200925/source/components/namespace/nsparse.c
  
      Status = AcpiTbGetOwnerId (TableIndex, &OwnerId);
      if (ACPI_FAILURE (Status))
-Index: acpica-unix2-20200925/source/components/namespace/nsutils.c
+Index: acpica-unix2-20210604/source/components/namespace/nsutils.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/components/namespace/nsutils.c
-+++ acpica-unix2-20200925/source/components/namespace/nsutils.c
+--- acpica-unix2-20210604.orig/source/components/namespace/nsutils.c
++++ acpica-unix2-20210604/source/components/namespace/nsutils.c
 @@ -272,7 +272,6 @@ AcpiNsBuildInternalName (
      const char              *ExternalName = Info->NextExternalChar;
      char                    *Result = NULL;
      UINT32                  i;
--    char		    TmpSeg[ACPI_NAMESEG_SIZE+1];
+-    char                    TmpSeg[ACPI_NAMESEG_SIZE+1];
  
  
      ACPI_FUNCTION_TRACE (NsBuildInternalName);
@@ -3010,7 +2274,7 @@ Index: acpica-unix2-20200925/source/components/namespace/nsutils.c
  
      for (; NumSegments; NumSegments--)
      {
--        memset(TmpSeg, 0, ACPI_NAMESEG_SIZE+1);
+-        memset (TmpSeg, 0, ACPI_NAMESEG_SIZE+1);
          for (i = 0; i < ACPI_NAMESEG_SIZE; i++)
          {
              if (ACPI_IS_PATH_SEPARATOR (*ExternalName) ||
@@ -3030,7 +2294,876 @@ Index: acpica-unix2-20200925/source/components/namespace/nsutils.c
                  ExternalName++;
              }
          }
--	AcpiUtWriteUint(Result, ACPI_NAMESEG_SIZE, TmpSeg, ACPI_NAMESEG_SIZE);
+-    AcpiUtWriteUint (Result, ACPI_NAMESEG_SIZE, TmpSeg, ACPI_NAMESEG_SIZE);
  
          /* Now we must have a path separator, or the pathname is bad */
  
+Index: acpica-unix2-20210604/source/components/utilities/utresrc.c
+===================================================================
+--- acpica-unix2-20210604.orig/source/components/utilities/utresrc.c
++++ acpica-unix2-20210604/source/components/utilities/utresrc.c
+@@ -541,7 +541,7 @@ AcpiUtGetResourceLength (
+     {
+         /* Large Resource type -- bytes 1-2 contain the 16-bit length */
+ 
+-        ACPI_MOVE_16_TO_16 (&ResourceLength, ACPI_ADD_PTR (UINT8, Aml, 1));
++        ResourceLength = AcpiUtReadUint16 (ACPI_ADD_PTR (UINT8, Aml, 1));
+ 
+     }
+     else
+Index: acpica-unix2-20210604/source/compiler/aslrestype2e.c
+===================================================================
+--- acpica-unix2-20210604.orig/source/compiler/aslrestype2e.c
++++ acpica-unix2-20210604/source/compiler/aslrestype2e.c
+@@ -80,6 +80,7 @@ RsDoExtendedIoDescriptor (
+     UINT16                  StringLength = 0;
+     UINT32                  CurrentByteOffset;
+     UINT32                  i;
++    UINT16                  Tmp16;
+ 
+ 
+     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+@@ -139,7 +140,8 @@ RsDoExtendedIoDescriptor (
+ 
+         case 5: /* Address Granularity */
+ 
+-            Descriptor->ExtAddress64.Granularity = InitializerOp->Asl.Value.Integer;
++            Descriptor->ExtAddress64.Granularity =
++                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Granularity));
+             GranOp = InitializerOp;
+@@ -147,7 +149,8 @@ RsDoExtendedIoDescriptor (
+ 
+         case 6: /* Address Min */
+ 
+-            Descriptor->ExtAddress64.Minimum = InitializerOp->Asl.Value.Integer;
++            Descriptor->ExtAddress64.Minimum =
++                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Minimum));
+             MinOp = InitializerOp;
+@@ -155,7 +158,8 @@ RsDoExtendedIoDescriptor (
+ 
+         case 7: /* Address Max */
+ 
+-            Descriptor->ExtAddress64.Maximum = InitializerOp->Asl.Value.Integer;
++            Descriptor->ExtAddress64.Maximum =
++                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Maximum));
+             MaxOp = InitializerOp;
+@@ -163,14 +167,16 @@ RsDoExtendedIoDescriptor (
+ 
+         case 8: /* Translation Offset */
+ 
+-            Descriptor->ExtAddress64.TranslationOffset = InitializerOp->Asl.Value.Integer;
++            Descriptor->ExtAddress64.TranslationOffset =
++                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.TranslationOffset));
+             break;
+ 
+         case 9: /* Address Length */
+ 
+-            Descriptor->ExtAddress64.AddressLength = InitializerOp->Asl.Value.Integer;
++            Descriptor->ExtAddress64.AddressLength =
++                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.AddressLength));
+             LengthOp = InitializerOp;
+@@ -178,7 +184,8 @@ RsDoExtendedIoDescriptor (
+ 
+         case 10: /* Type-Specific Attributes */
+ 
+-            Descriptor->ExtAddress64.TypeSpecific = InitializerOp->Asl.Value.Integer;
++            Descriptor->ExtAddress64.TypeSpecific =
++                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_TYPESPECIFICATTRIBUTES,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.TypeSpecific));
+             break;
+@@ -213,11 +220,14 @@ RsDoExtendedIoDescriptor (
+ 
+     /* Validate the Min/Max/Len/Gran values */
+ 
++    Tmp16 = Descriptor->ExtAddress64.ResourceLength;
++    Descriptor->ExtAddress64.ResourceLength = AcpiUtReadUint16 (&Tmp16);
++
+     RsLargeAddressCheck (
+-        Descriptor->ExtAddress64.Minimum,
+-        Descriptor->ExtAddress64.Maximum,
+-        Descriptor->ExtAddress64.AddressLength,
+-        Descriptor->ExtAddress64.Granularity,
++        AcpiUtReadUint64 (&Descriptor->ExtAddress64.Minimum),
++        AcpiUtReadUint64 (&Descriptor->ExtAddress64.Maximum),
++        AcpiUtReadUint64 (&Descriptor->ExtAddress64.AddressLength),
++        AcpiUtReadUint64 (&Descriptor->ExtAddress64.Granularity),
+         Descriptor->ExtAddress64.Flags,
+         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
+ 
+@@ -253,6 +263,7 @@ RsDoExtendedMemoryDescriptor (
+     UINT16                  StringLength = 0;
+     UINT32                  CurrentByteOffset;
+     UINT32                  i;
++    UINT16                  Tmp16;
+ 
+ 
+     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+@@ -319,7 +330,8 @@ RsDoExtendedMemoryDescriptor (
+ 
+         case 6: /* Address Granularity */
+ 
+-            Descriptor->ExtAddress64.Granularity = InitializerOp->Asl.Value.Integer;
++            Descriptor->ExtAddress64.Granularity =
++                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Granularity));
+             GranOp = InitializerOp;
+@@ -327,7 +339,8 @@ RsDoExtendedMemoryDescriptor (
+ 
+         case 7: /* Min Address */
+ 
+-            Descriptor->ExtAddress64.Minimum = InitializerOp->Asl.Value.Integer;
++            Descriptor->ExtAddress64.Minimum =
++                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Minimum));
+             MinOp = InitializerOp;
+@@ -335,7 +348,8 @@ RsDoExtendedMemoryDescriptor (
+ 
+         case 8: /* Max Address */
+ 
+-            Descriptor->ExtAddress64.Maximum = InitializerOp->Asl.Value.Integer;
++            Descriptor->ExtAddress64.Maximum =
++                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Maximum));
+             MaxOp = InitializerOp;
+@@ -343,14 +357,16 @@ RsDoExtendedMemoryDescriptor (
+ 
+         case 9: /* Translation Offset */
+ 
+-            Descriptor->ExtAddress64.TranslationOffset = InitializerOp->Asl.Value.Integer;
++            Descriptor->ExtAddress64.TranslationOffset =
++                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.TranslationOffset));
+             break;
+ 
+         case 10: /* Address Length */
+ 
+-            Descriptor->ExtAddress64.AddressLength = InitializerOp->Asl.Value.Integer;
++            Descriptor->ExtAddress64.AddressLength =
++                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.AddressLength));
+             LengthOp = InitializerOp;
+@@ -358,7 +374,8 @@ RsDoExtendedMemoryDescriptor (
+ 
+         case 11: /* Type-Specific Attributes */
+ 
+-            Descriptor->ExtAddress64.TypeSpecific = InitializerOp->Asl.Value.Integer;
++            Descriptor->ExtAddress64.TypeSpecific =
++                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_TYPESPECIFICATTRIBUTES,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.TypeSpecific));
+             break;
+@@ -394,11 +411,14 @@ RsDoExtendedMemoryDescriptor (
+ 
+     /* Validate the Min/Max/Len/Gran values */
+ 
++    Tmp16 = Descriptor->ExtAddress64.ResourceLength;
++    Descriptor->ExtAddress64.ResourceLength = AcpiUtReadUint16 (&Tmp16);
++
+     RsLargeAddressCheck (
+-        Descriptor->ExtAddress64.Minimum,
+-        Descriptor->ExtAddress64.Maximum,
+-        Descriptor->ExtAddress64.AddressLength,
+-        Descriptor->ExtAddress64.Granularity,
++        AcpiUtReadUint64 (&Descriptor->ExtAddress64.Minimum),
++        AcpiUtReadUint64 (&Descriptor->ExtAddress64.Maximum),
++        AcpiUtReadUint64 (&Descriptor->ExtAddress64.AddressLength),
++        AcpiUtReadUint64 (&Descriptor->ExtAddress64.Granularity),
+         Descriptor->ExtAddress64.Flags,
+         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
+ 
+@@ -434,6 +454,7 @@ RsDoExtendedSpaceDescriptor (
+     UINT16                  StringLength = 0;
+     UINT32                  CurrentByteOffset;
+     UINT32                  i;
++    UINT16                  Tmp16;
+ 
+ 
+     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+@@ -497,7 +518,8 @@ RsDoExtendedSpaceDescriptor (
+ 
+         case 6: /* Address Granularity */
+ 
+-            Descriptor->ExtAddress64.Granularity = InitializerOp->Asl.Value.Integer;
++            Descriptor->ExtAddress64.Granularity =
++                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Granularity));
+             GranOp = InitializerOp;
+@@ -505,7 +527,8 @@ RsDoExtendedSpaceDescriptor (
+ 
+         case 7: /* Min Address */
+ 
+-            Descriptor->ExtAddress64.Minimum = InitializerOp->Asl.Value.Integer;
++            Descriptor->ExtAddress64.Minimum =
++                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Minimum));
+             MinOp = InitializerOp;
+@@ -513,7 +536,8 @@ RsDoExtendedSpaceDescriptor (
+ 
+         case 8: /* Max Address */
+ 
+-            Descriptor->ExtAddress64.Maximum = InitializerOp->Asl.Value.Integer;
++            Descriptor->ExtAddress64.Maximum =
++                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Maximum));
+             MaxOp = InitializerOp;
+@@ -521,14 +545,16 @@ RsDoExtendedSpaceDescriptor (
+ 
+         case 9: /* Translation Offset */
+ 
+-            Descriptor->ExtAddress64.TranslationOffset = InitializerOp->Asl.Value.Integer;
++            Descriptor->ExtAddress64.TranslationOffset =
++                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.TranslationOffset));
+             break;
+ 
+         case 10: /* Address Length */
+ 
+-            Descriptor->ExtAddress64.AddressLength = InitializerOp->Asl.Value.Integer;
++            Descriptor->ExtAddress64.AddressLength =
++                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.AddressLength));
+             LengthOp = InitializerOp;
+@@ -536,7 +562,8 @@ RsDoExtendedSpaceDescriptor (
+ 
+         case 11: /* Type-Specific Attributes */
+ 
+-            Descriptor->ExtAddress64.TypeSpecific = InitializerOp->Asl.Value.Integer;
++            Descriptor->ExtAddress64.TypeSpecific =
++                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
+             RsCreateQwordField (InitializerOp, ACPI_RESTAG_TYPESPECIFICATTRIBUTES,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.TypeSpecific));
+             break;
+@@ -557,11 +584,14 @@ RsDoExtendedSpaceDescriptor (
+ 
+     /* Validate the Min/Max/Len/Gran values */
+ 
++    Tmp16 = Descriptor->ExtAddress64.ResourceLength;
++    Descriptor->ExtAddress64.ResourceLength = AcpiUtReadUint16 (&Tmp16);
++
+     RsLargeAddressCheck (
+-        Descriptor->ExtAddress64.Minimum,
+-        Descriptor->ExtAddress64.Maximum,
+-        Descriptor->ExtAddress64.AddressLength,
+-        Descriptor->ExtAddress64.Granularity,
++        AcpiUtReadUint64 (&Descriptor->ExtAddress64.Minimum),
++        AcpiUtReadUint64 (&Descriptor->ExtAddress64.Maximum),
++        AcpiUtReadUint64 (&Descriptor->ExtAddress64.AddressLength),
++        AcpiUtReadUint64 (&Descriptor->ExtAddress64.Granularity),
+         Descriptor->ExtAddress64.Flags,
+         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
+ 
+Index: acpica-unix2-20210604/source/compiler/aslrestype2s.c
+===================================================================
+--- acpica-unix2-20210604.orig/source/compiler/aslrestype2s.c
++++ acpica-unix2-20210604/source/compiler/aslrestype2s.c
+@@ -343,6 +343,7 @@ RsDoGpioIntDescriptor (
+     UINT32                  CurrentByteOffset;
+     UINT32                  PinCount = 0;
+     UINT32                  i;
++    UINT16                  Tmp16;
+ 
+ 
+     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+@@ -485,7 +486,8 @@ RsDoGpioIntDescriptor (
+              *  (implies resource source must immediately follow the pin list.)
+              *  Name: _PIN
+              */
+-            *InterruptList = (UINT16) InitializerOp->Asl.Value.Integer;
++            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            *InterruptList = AcpiUtReadUint16 (&Tmp16);
+             InterruptList++;
+             PinCount++;
+ 
+@@ -518,6 +520,27 @@ RsDoGpioIntDescriptor (
+ 
+     MpSaveGpioInfo (Info->MappingOp, Descriptor,
+         PinCount, PinList, ResourceSource);
++
++    /* correct endian-ness issues */
++    Tmp16 = Descriptor->Gpio.ResourceLength;
++    Descriptor->Gpio.ResourceLength = AcpiUtReadUint16 (&Tmp16);
++    Tmp16 = Descriptor->Gpio.Flags;
++    Descriptor->Gpio.Flags = AcpiUtReadUint16 (&Tmp16);
++    Tmp16 = Descriptor->Gpio.IntFlags;
++    Descriptor->Gpio.IntFlags = AcpiUtReadUint16 (&Tmp16);
++    Tmp16 = Descriptor->Gpio.DriveStrength;
++    Descriptor->Gpio.DriveStrength = AcpiUtReadUint16 (&Tmp16);
++    Tmp16 = Descriptor->Gpio.DebounceTimeout;
++    Descriptor->Gpio.DebounceTimeout = AcpiUtReadUint16 (&Tmp16);
++    Tmp16 = Descriptor->Gpio.PinTableOffset;
++    Descriptor->Gpio.PinTableOffset = AcpiUtReadUint16 (&Tmp16);
++    Tmp16 = Descriptor->Gpio.ResSourceOffset;
++    Descriptor->Gpio.ResSourceOffset = AcpiUtReadUint16 (&Tmp16);
++    Tmp16 = Descriptor->Gpio.VendorOffset;
++    Descriptor->Gpio.VendorOffset = AcpiUtReadUint16 (&Tmp16);
++    Tmp16 = Descriptor->Gpio.VendorLength;
++    Descriptor->Gpio.VendorLength = AcpiUtReadUint16 (&Tmp16);
++
+     return (Rnode);
+ }
+ 
+@@ -552,6 +575,7 @@ RsDoGpioIoDescriptor (
+     UINT32                  CurrentByteOffset;
+     UINT32                  PinCount = 0;
+     UINT32                  i;
++    UINT16                  Tmp16;
+ 
+ 
+     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+@@ -691,7 +715,8 @@ RsDoGpioIoDescriptor (
+              *  (implies resource source must immediately follow the pin list.)
+              *  Name: _PIN
+              */
+-            *InterruptList = (UINT16) InitializerOp->Asl.Value.Integer;
++            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            *InterruptList = AcpiUtReadUint16 (&Tmp16);
+             InterruptList++;
+             PinCount++;
+ 
+@@ -724,6 +749,27 @@ RsDoGpioIoDescriptor (
+ 
+     MpSaveGpioInfo (Info->MappingOp, Descriptor,
+         PinCount, PinList, ResourceSource);
++
++    /* correct endian-ness issues */
++    Tmp16 = Descriptor->Gpio.ResourceLength;
++    Descriptor->Gpio.ResourceLength = AcpiUtReadUint16 (&Tmp16);
++    Tmp16 = Descriptor->Gpio.Flags;
++    Descriptor->Gpio.Flags = AcpiUtReadUint16 (&Tmp16);
++    Tmp16 = Descriptor->Gpio.IntFlags;
++    Descriptor->Gpio.IntFlags = AcpiUtReadUint16 (&Tmp16);
++    Tmp16 = Descriptor->Gpio.DriveStrength;
++    Descriptor->Gpio.DriveStrength = AcpiUtReadUint16 (&Tmp16);
++    Tmp16 = Descriptor->Gpio.DebounceTimeout;
++    Descriptor->Gpio.DebounceTimeout = AcpiUtReadUint16 (&Tmp16);
++    Tmp16 = Descriptor->Gpio.PinTableOffset;
++    Descriptor->Gpio.PinTableOffset = AcpiUtReadUint16 (&Tmp16);
++    Tmp16 = Descriptor->Gpio.ResSourceOffset;
++    Descriptor->Gpio.ResSourceOffset = AcpiUtReadUint16 (&Tmp16);
++    Tmp16 = Descriptor->Gpio.VendorOffset;
++    Descriptor->Gpio.VendorOffset = AcpiUtReadUint16 (&Tmp16);
++    Tmp16 = Descriptor->Gpio.VendorLength;
++    Descriptor->Gpio.VendorLength = AcpiUtReadUint16 (&Tmp16);
++
+     return (Rnode);
+ }
+ 
+@@ -754,6 +800,8 @@ RsDoI2cSerialBusDescriptor (
+     UINT16                  DescriptorSize;
+     UINT32                  CurrentByteOffset;
+     UINT32                  i;
++    UINT16                  Tmp16;
++    UINT32                  Tmp32;
+ 
+ 
+     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+@@ -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;
+-    Descriptor->I2cSerialBus.TypeDataLength = AML_RESOURCE_I2C_MIN_DATA_LEN + VendorLength;
++    Tmp16 = AML_RESOURCE_I2C_MIN_DATA_LEN + VendorLength;
++    Descriptor->I2cSerialBus.TypeDataLength = AcpiUtReadUint16 (&Tmp16);
+ 
+     if (Info->DescriptorTypeOp->Asl.ParseOpcode == PARSEOP_I2C_SERIALBUS_V2)
+     {
+@@ -795,13 +844,15 @@ RsDoI2cSerialBusDescriptor (
+ 
+     /* Process all child initialization nodes */
+ 
++    Descriptor->I2cSerialBus.TypeSpecificFlags = 0;
+     for (i = 0; InitializerOp; i++)
+     {
+         switch (i)
+         {
+         case 0: /* Slave Address [WORD] (_ADR) */
+ 
+-            Descriptor->I2cSerialBus.SlaveAddress = (UINT16) InitializerOp->Asl.Value.Integer;
++            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            Descriptor->I2cSerialBus.SlaveAddress = AcpiUtReadUint16 (&Tmp16);
+             RsCreateWordField (InitializerOp, ACPI_RESTAG_ADDRESS,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (I2cSerialBus.SlaveAddress));
+             break;
+@@ -815,16 +866,19 @@ RsDoI2cSerialBusDescriptor (
+ 
+         case 2: /* Connection Speed [DWORD] (_SPE) */
+ 
+-            Descriptor->I2cSerialBus.ConnectionSpeed = (UINT32) InitializerOp->Asl.Value.Integer;
++            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
++            Descriptor->I2cSerialBus.ConnectionSpeed = AcpiUtReadUint32 (&Tmp32);
+             RsCreateDwordField (InitializerOp, ACPI_RESTAG_SPEED,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (I2cSerialBus.ConnectionSpeed));
+             break;
+ 
+         case 3: /* Addressing Mode [Flag] (_MOD) */
+ 
+-            RsSetFlagBits16 (&Descriptor->I2cSerialBus.TypeSpecificFlags, InitializerOp, 0, 0);
++            Tmp16 = AcpiUtReadUint16 (&Descriptor->I2cSerialBus.TypeSpecificFlags);
++            RsSetFlagBits16 (&Tmp16, InitializerOp, 0, 0);
+             RsCreateBitField (InitializerOp, ACPI_RESTAG_MODE,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (I2cSerialBus.TypeSpecificFlags), 0);
++            Descriptor->I2cSerialBus.TypeSpecificFlags = AcpiUtReadUint16 (&Tmp16);
+             break;
+ 
+         case 4: /* ResSource [Optional Field - STRING] */
+@@ -882,6 +936,8 @@ RsDoI2cSerialBusDescriptor (
+         InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
+     }
+ 
++    Tmp16 = Descriptor->I2cSerialBus.ResourceLength;
++    Descriptor->I2cSerialBus.ResourceLength = AcpiUtReadUint16 (&Tmp16);
+     MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource);
+     return (Rnode);
+ }
+@@ -913,6 +969,8 @@ RsDoSpiSerialBusDescriptor (
+     UINT16                  DescriptorSize;
+     UINT32                  CurrentByteOffset;
+     UINT32                  i;
++    UINT16                  Tmp16;
++    UINT32                  Tmp32;
+ 
+ 
+     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+@@ -935,12 +993,13 @@ RsDoSpiSerialBusDescriptor (
+         sizeof (AML_RESOURCE_LARGE_HEADER));
+ 
+     Descriptor = Rnode->Buffer;
+-    Descriptor->SpiSerialBus.ResourceLength = DescriptorSize;
++    Descriptor->SpiSerialBus.ResourceLength = AcpiUtReadUint16 (&DescriptorSize);
+     Descriptor->SpiSerialBus.DescriptorType = ACPI_RESOURCE_NAME_SERIAL_BUS;
+     Descriptor->SpiSerialBus.RevisionId = AML_RESOURCE_SPI_REVISION;
+     Descriptor->SpiSerialBus.TypeRevisionId = AML_RESOURCE_SPI_TYPE_REVISION;
+     Descriptor->SpiSerialBus.Type = AML_RESOURCE_SPI_SERIALBUSTYPE;
+-    Descriptor->SpiSerialBus.TypeDataLength = AML_RESOURCE_SPI_MIN_DATA_LEN + VendorLength;
++    Tmp16 = AML_RESOURCE_SPI_MIN_DATA_LEN + VendorLength;
++    Descriptor->SpiSerialBus.TypeDataLength = AcpiUtReadUint16 (&Tmp16);
+ 
+     if (Info->DescriptorTypeOp->Asl.ParseOpcode == PARSEOP_SPI_SERIALBUS_V2)
+     {
+@@ -955,29 +1014,35 @@ RsDoSpiSerialBusDescriptor (
+ 
+     /* Process all child initialization nodes */
+ 
++    Descriptor->SpiSerialBus.TypeSpecificFlags = 0;
+     for (i = 0; InitializerOp; i++)
+     {
+         switch (i)
+         {
+         case 0: /* Device Selection [WORD] (_ADR) */
+ 
+-            Descriptor->SpiSerialBus.DeviceSelection = (UINT16) InitializerOp->Asl.Value.Integer;
++            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            Descriptor->SpiSerialBus.DeviceSelection = AcpiUtReadUint16 (&Tmp16);
+             RsCreateWordField (InitializerOp, ACPI_RESTAG_ADDRESS,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (SpiSerialBus.DeviceSelection));
+             break;
+ 
+         case 1: /* Device Polarity [Flag] (_DPL) */
+ 
+-            RsSetFlagBits16 (&Descriptor->SpiSerialBus.TypeSpecificFlags, InitializerOp, 1, 0);
++            Tmp16 = AcpiUtReadUint16 (&Descriptor->SpiSerialBus.TypeSpecificFlags);
++            RsSetFlagBits16 (&Tmp16, InitializerOp, 1, 0);
+             RsCreateBitField (InitializerOp, ACPI_RESTAG_DEVICEPOLARITY,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (SpiSerialBus.TypeSpecificFlags), 1);
++            Descriptor->SpiSerialBus.TypeSpecificFlags = AcpiUtReadUint16 (&Tmp16);
+             break;
+ 
+         case 2: /* Wire Mode [Flag] (_MOD) */
+ 
+-            RsSetFlagBits16 (&Descriptor->SpiSerialBus.TypeSpecificFlags, InitializerOp, 0, 0);
++            Tmp16 = AcpiUtReadUint16 (&Descriptor->SpiSerialBus.TypeSpecificFlags);
++            RsSetFlagBits16 (&Tmp16, InitializerOp, 0, 0);
+             RsCreateBitField (InitializerOp, ACPI_RESTAG_MODE,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (SpiSerialBus.TypeSpecificFlags), 0);
++            Descriptor->SpiSerialBus.TypeSpecificFlags = AcpiUtReadUint16 (&Tmp16);
+             break;
+ 
+         case 3: /* Device Bit Length [BYTE] (_LEN) */
+@@ -996,7 +1061,8 @@ RsDoSpiSerialBusDescriptor (
+ 
+         case 5: /* Connection Speed [DWORD] (_SPE) */
+ 
+-            Descriptor->SpiSerialBus.ConnectionSpeed = (UINT32) InitializerOp->Asl.Value.Integer;
++            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
++            Descriptor->SpiSerialBus.ConnectionSpeed = AcpiUtReadUint32 (&Tmp32);
+             RsCreateDwordField (InitializerOp, ACPI_RESTAG_SPEED,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (SpiSerialBus.ConnectionSpeed));
+             break;
+@@ -1101,6 +1167,8 @@ RsDoUartSerialBusDescriptor (
+     UINT16                  DescriptorSize;
+     UINT32                  CurrentByteOffset;
+     UINT32                  i;
++    UINT16                  Tmp16;
++    UINT32                  Tmp32;
+ 
+ 
+     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+@@ -1123,12 +1191,13 @@ RsDoUartSerialBusDescriptor (
+         sizeof (AML_RESOURCE_LARGE_HEADER));
+ 
+     Descriptor = Rnode->Buffer;
+-    Descriptor->UartSerialBus.ResourceLength = DescriptorSize;
++    Descriptor->UartSerialBus.ResourceLength = AcpiUtReadUint16 (&DescriptorSize);
+     Descriptor->UartSerialBus.DescriptorType = ACPI_RESOURCE_NAME_SERIAL_BUS;
+     Descriptor->UartSerialBus.RevisionId = AML_RESOURCE_UART_REVISION;
+     Descriptor->UartSerialBus.TypeRevisionId = AML_RESOURCE_UART_TYPE_REVISION;
+     Descriptor->UartSerialBus.Type = AML_RESOURCE_UART_SERIALBUSTYPE;
+-    Descriptor->UartSerialBus.TypeDataLength = AML_RESOURCE_UART_MIN_DATA_LEN + VendorLength;
++    Tmp16 = AML_RESOURCE_UART_MIN_DATA_LEN + VendorLength;
++    Descriptor->UartSerialBus.TypeDataLength = AcpiUtReadUint16 (&Tmp16);
+ 
+     if (Info->DescriptorTypeOp->Asl.ParseOpcode == PARSEOP_UART_SERIALBUS_V2)
+     {
+@@ -1142,29 +1211,35 @@ RsDoUartSerialBusDescriptor (
+ 
+     /* Process all child initialization nodes */
+ 
++    Descriptor->UartSerialBus.TypeSpecificFlags = 0;
+     for (i = 0; InitializerOp; i++)
+     {
+         switch (i)
+         {
+         case 0: /* Connection Speed (Baud Rate) [DWORD] (_SPE) */
+ 
+-            Descriptor->UartSerialBus.DefaultBaudRate = (UINT32) InitializerOp->Asl.Value.Integer;
++            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
++            Descriptor->UartSerialBus.DefaultBaudRate = AcpiUtReadUint32 (&Tmp32);
+             RsCreateDwordField (InitializerOp, ACPI_RESTAG_SPEED,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.DefaultBaudRate));
+             break;
+ 
+         case 1: /* Bits Per Byte [Flags] (_LEN) */
+ 
+-            RsSetFlagBits16 (&Descriptor->UartSerialBus.TypeSpecificFlags, InitializerOp, 4, 3);
++            Tmp16 = AcpiUtReadUint16 (&Descriptor->UartSerialBus.TypeSpecificFlags);
++            RsSetFlagBits16 (&Tmp16, InitializerOp, 4, 3);
+             RsCreateMultiBitField (InitializerOp, ACPI_RESTAG_LENGTH,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TypeSpecificFlags), 4, 3);
++            Descriptor->UartSerialBus.TypeSpecificFlags = AcpiUtReadUint16 (&Tmp16);;
+             break;
+ 
+         case 2: /* Stop Bits [Flags] (_STB) */
+ 
+-            RsSetFlagBits16 (&Descriptor->UartSerialBus.TypeSpecificFlags, InitializerOp, 2, 1);
++            Tmp16 = AcpiUtReadUint16 (&Descriptor->UartSerialBus.TypeSpecificFlags);
++            RsSetFlagBits16 (&Tmp16, InitializerOp, 2, 1);
+             RsCreateMultiBitField (InitializerOp, ACPI_RESTAG_STOPBITS,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TypeSpecificFlags), 2, 2);
++            Descriptor->UartSerialBus.TypeSpecificFlags = AcpiUtReadUint16 (&Tmp16);;
+             break;
+ 
+         case 3: /* Lines In Use [BYTE] (_LIN) */
+@@ -1176,9 +1251,11 @@ RsDoUartSerialBusDescriptor (
+ 
+         case 4: /* Endianness [Flag] (_END) */
+ 
+-            RsSetFlagBits16 (&Descriptor->UartSerialBus.TypeSpecificFlags, InitializerOp, 7, 0);
++            Tmp16 = AcpiUtReadUint16 (&Descriptor->UartSerialBus.TypeSpecificFlags);
++            RsSetFlagBits16 (&Tmp16, InitializerOp, 7, 0);
+             RsCreateBitField (InitializerOp, ACPI_RESTAG_ENDIANNESS,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TypeSpecificFlags), 7);
++            Descriptor->UartSerialBus.TypeSpecificFlags = AcpiUtReadUint16 (&Tmp16);;
+             break;
+ 
+         case 5: /* Parity [BYTE] (_PAR) */
+@@ -1190,21 +1267,25 @@ RsDoUartSerialBusDescriptor (
+ 
+         case 6: /* Flow Control [Flags] (_FLC) */
+ 
+-            RsSetFlagBits16 (&Descriptor->UartSerialBus.TypeSpecificFlags, InitializerOp, 0, 0);
++            Tmp16 = AcpiUtReadUint16 (&Descriptor->UartSerialBus.TypeSpecificFlags);
++            RsSetFlagBits16 (&Tmp16, InitializerOp, 0, 0);
+             RsCreateMultiBitField (InitializerOp, ACPI_RESTAG_FLOWCONTROL,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TypeSpecificFlags), 0, 2);
++            Descriptor->UartSerialBus.TypeSpecificFlags = AcpiUtReadUint16 (&Tmp16);;
+             break;
+ 
+         case 7: /* Rx Buffer Size [WORD] (_RXL) */
+ 
+-            Descriptor->UartSerialBus.RxFifoSize = (UINT16) InitializerOp->Asl.Value.Integer;
++            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            Descriptor->UartSerialBus.RxFifoSize = AcpiUtReadUint16 (&Tmp16);
+             RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH_RX,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.RxFifoSize));
+             break;
+ 
+         case 8: /* Tx Buffer Size [WORD] (_TXL) */
+ 
+-            Descriptor->UartSerialBus.TxFifoSize = (UINT16) InitializerOp->Asl.Value.Integer;
++            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            Descriptor->UartSerialBus.TxFifoSize = AcpiUtReadUint16 (&Tmp16);
+             RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH_TX,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TxFifoSize));
+             break;
+@@ -1444,6 +1525,7 @@ RsDoPinFunctionDescriptor (
+     UINT32                  CurrentByteOffset;
+     UINT32                  PinCount = 0;
+     UINT32                  i;
++    UINT16                  Tmp16;
+ 
+     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+     CurrentByteOffset = Info->CurrentByteOffset;
+@@ -1467,7 +1549,7 @@ RsDoPinFunctionDescriptor (
+         sizeof (AML_RESOURCE_LARGE_HEADER));
+ 
+     Descriptor = Rnode->Buffer;
+-    Descriptor->PinFunction.ResourceLength = DescriptorSize;
++    Descriptor->PinFunction.ResourceLength = AcpiUtReadUint16 (&DescriptorSize);
+     Descriptor->PinFunction.DescriptorType = ACPI_RESOURCE_NAME_PIN_FUNCTION;
+     Descriptor->PinFunction.RevisionId = AML_RESOURCE_PIN_FUNCTION_REVISION;
+ 
+@@ -1507,7 +1589,8 @@ RsDoPinFunctionDescriptor (
+ 
+         case 2: /* Function Number [WORD] (_FUN) */
+ 
+-            Descriptor->PinFunction.FunctionNumber = (UINT16) InitializerOp->Asl.Value.Integer;
++            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            Descriptor->PinFunction.FunctionNumber = AcpiUtReadUint16 (&Tmp16);
+             RsCreateDwordField (InitializerOp, ACPI_RESTAG_FUNCTION,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (PinFunction.FunctionNumber));
+             break;
+@@ -1555,6 +1638,12 @@ RsDoPinFunctionDescriptor (
+             {
+                 Descriptor->PinFunction.VendorLength = VendorLength;
+             }
++            Tmp16 = (UINT16) ACPI_PTR_DIFF (VendorData, Descriptor);
++            Descriptor->PinFunction.VendorOffset = AcpiUtReadUint16 (&Tmp16);
++
++            Tmp16 = Descriptor->PinFunction.VendorLength;
++            Descriptor->PinFunction.VendorLength = AcpiUtReadUint16 (&Tmp16);
++
+             break;
+ 
+         default:
+@@ -1566,7 +1655,8 @@ RsDoPinFunctionDescriptor (
+              *  (implies resource source must immediately follow the pin list.)
+              *  Name: _PIN
+              */
+-            *PinList = (UINT16) InitializerOp->Asl.Value.Integer;
++            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            *PinList = AcpiUtReadUint16 (&Tmp16);
+             PinList++;
+             PinCount++;
+ 
+@@ -1597,6 +1687,13 @@ RsDoPinFunctionDescriptor (
+         InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
+     }
+ 
++    /* correct the endian-ness of the values */
++    Tmp16 = Descriptor->PinFunction.PinTableOffset;
++    Descriptor->PinFunction.PinTableOffset = AcpiUtReadUint16 (&Tmp16);
++
++    Tmp16 = Descriptor->PinFunction.ResSourceOffset;
++    Descriptor->PinFunction.ResSourceOffset = AcpiUtReadUint16 (&Tmp16);
++
+     return (Rnode);
+ }
+ 
+@@ -1630,6 +1727,8 @@ RsDoPinConfigDescriptor (
+     UINT32                  CurrentByteOffset;
+     UINT32                  PinCount = 0;
+     UINT32                  i;
++    UINT16                  Tmp16;
++    UINT32                  Tmp32;
+ 
+     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+     CurrentByteOffset = Info->CurrentByteOffset;
+@@ -1653,7 +1752,7 @@ RsDoPinConfigDescriptor (
+         sizeof (AML_RESOURCE_LARGE_HEADER));
+ 
+     Descriptor = Rnode->Buffer;
+-    Descriptor->PinConfig.ResourceLength = DescriptorSize;
++    Descriptor->PinConfig.ResourceLength = AcpiUtReadUint16 (&DescriptorSize);
+     Descriptor->PinConfig.DescriptorType = ACPI_RESOURCE_NAME_PIN_CONFIG;
+     Descriptor->PinConfig.RevisionId = AML_RESOURCE_PIN_CONFIG_REVISION;
+ 
+@@ -1707,7 +1806,8 @@ RsDoPinConfigDescriptor (
+ 
+         case 2: /* Pin Config Value [DWORD] (_VAL) */
+ 
+-            Descriptor->PinConfig.PinConfigValue = (UINT32) InitializerOp->Asl.Value.Integer;
++            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
++            Descriptor->PinConfig.PinConfigValue = AcpiUtReadUint32 (&Tmp32);
+             RsCreateDwordField (InitializerOp, ACPI_RESTAG_PINCONFIG_VALUE,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (PinConfig.PinConfigValue));
+             break;
+@@ -1766,7 +1866,8 @@ RsDoPinConfigDescriptor (
+              *  (implies resource source must immediately follow the pin list.)
+              *  Name: _PIN
+              */
+-            *PinList = (UINT16) InitializerOp->Asl.Value.Integer;
++            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            *PinList = AcpiUtReadUint16 (&Tmp16);
+             PinList++;
+             PinCount++;
+ 
+@@ -1797,6 +1898,16 @@ RsDoPinConfigDescriptor (
+         InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
+     }
+ 
++    /* correct the endianness if needed */
++    Tmp16 = Descriptor->PinConfig.PinTableOffset;
++    Descriptor->PinConfig.PinTableOffset = AcpiUtReadUint16 (&Tmp16);
++    Tmp16 = Descriptor->PinConfig.ResSourceOffset;
++    Descriptor->PinConfig.ResSourceOffset = AcpiUtReadUint16 (&Tmp16);
++    Tmp16 = Descriptor->PinConfig.VendorOffset;
++    Descriptor->PinConfig.VendorOffset = AcpiUtReadUint16 (&Tmp16);
++    Tmp16 = Descriptor->PinConfig.VendorLength;
++    Descriptor->PinConfig.VendorLength = AcpiUtReadUint16 (&Tmp16);
++
+     return (Rnode);
+ }
+ 
+@@ -1830,6 +1941,7 @@ RsDoPinGroupDescriptor (
+     UINT32                  CurrentByteOffset;
+     UINT32                  PinCount = 0;
+     UINT32                  i;
++    UINT16                  Tmp16;
+ 
+     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+     CurrentByteOffset = Info->CurrentByteOffset;
+@@ -1853,7 +1965,7 @@ RsDoPinGroupDescriptor (
+         sizeof (AML_RESOURCE_LARGE_HEADER));
+ 
+     Descriptor = Rnode->Buffer;
+-    Descriptor->PinGroup.ResourceLength = DescriptorSize;
++    Descriptor->PinGroup.ResourceLength = AcpiUtReadUint16 (&DescriptorSize);
+     Descriptor->PinGroup.DescriptorType = ACPI_RESOURCE_NAME_PIN_GROUP;
+     Descriptor->PinGroup.RevisionId = AML_RESOURCE_PIN_GROUP_REVISION;
+ 
+@@ -1920,7 +2032,8 @@ RsDoPinGroupDescriptor (
+              *  (implies resource source must immediately follow the pin list.)
+              *  Name: _PIN
+              */
+-            *PinList = (UINT16) InitializerOp->Asl.Value.Integer;
++        Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            *PinList = AcpiUtReadUint16 (&Tmp16);
+             PinList++;
+             PinCount++;
+ 
+@@ -1951,6 +2064,16 @@ RsDoPinGroupDescriptor (
+         InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
+     }
+ 
++    /* correct enddianness as needed */
++    Tmp16 = Descriptor->PinGroup.PinTableOffset;
++    Descriptor->PinGroup.PinTableOffset = AcpiUtReadUint16 (&Tmp16);
++    Tmp16 = Descriptor->PinGroup.LabelOffset;
++    Descriptor->PinGroup.LabelOffset = AcpiUtReadUint16 (&Tmp16);
++    Tmp16 = Descriptor->PinGroup.VendorOffset;
++    Descriptor->PinGroup.VendorOffset = AcpiUtReadUint16 (&Tmp16);
++    Tmp16 = Descriptor->PinGroup.VendorLength;
++    Descriptor->PinGroup.VendorLength = AcpiUtReadUint16 (&Tmp16);
++
+     return (Rnode);
+ }
+ 
+@@ -1983,6 +2106,7 @@ RsDoPinGroupFunctionDescriptor (
+     UINT16                  DescriptorSize;
+     UINT32                  CurrentByteOffset;
+     UINT32                  i;
++    UINT16                  Tmp16;
+ 
+     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+     CurrentByteOffset = Info->CurrentByteOffset;
+@@ -2006,7 +2130,7 @@ RsDoPinGroupFunctionDescriptor (
+         sizeof (AML_RESOURCE_LARGE_HEADER));
+ 
+     Descriptor = Rnode->Buffer;
+-    Descriptor->PinGroupFunction.ResourceLength = DescriptorSize;
++    Descriptor->PinGroupFunction.ResourceLength = AcpiUtReadUint16 (&DescriptorSize);
+     Descriptor->PinGroupFunction.DescriptorType = ACPI_RESOURCE_NAME_PIN_GROUP_FUNCTION;
+     Descriptor->PinGroupFunction.RevisionId = AML_RESOURCE_PIN_GROUP_FUNCTION_REVISION;
+ 
+@@ -2038,7 +2162,8 @@ RsDoPinGroupFunctionDescriptor (
+ 
+         case 1: /* Function Number [WORD] */
+ 
+-            Descriptor->PinGroupFunction.FunctionNumber = (UINT16) InitializerOp->Asl.Value.Integer;
++            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
++            Descriptor->PinGroupFunction.FunctionNumber = AcpiUtReadUint16 (&Tmp16);
+             RsCreateDwordField (InitializerOp, ACPI_RESTAG_FUNCTION,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (PinGroupFunction.FunctionNumber));
+             break;
+@@ -2097,6 +2222,16 @@ RsDoPinGroupFunctionDescriptor (
+         InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
+     }
+ 
++    /* correct enddianness as needed */
++    Tmp16 = Descriptor->PinGroupFunction.ResSourceOffset;
++    Descriptor->PinGroupFunction.ResSourceOffset = AcpiUtReadUint16 (&Tmp16);
++    Tmp16 = Descriptor->PinGroupFunction.ResSourceLabelOffset;
++    Descriptor->PinGroupFunction.ResSourceLabelOffset = AcpiUtReadUint16 (&Tmp16);
++    Tmp16 = Descriptor->PinGroupFunction.VendorOffset;
++    Descriptor->PinGroupFunction.VendorOffset = AcpiUtReadUint16 (&Tmp16);
++    Tmp16 = Descriptor->PinGroupFunction.VendorLength;
++    Descriptor->PinGroupFunction.VendorLength = AcpiUtReadUint16 (&Tmp16);
++
+     return (Rnode);
+ }
+ 
+@@ -2129,6 +2264,8 @@ RsDoPinGroupConfigDescriptor (
+     UINT16                  DescriptorSize;
+     UINT32                  CurrentByteOffset;
+     UINT32                  i;
++    UINT16                  Tmp16;
++    UINT32                  Tmp32;
+ 
+     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
+     CurrentByteOffset = Info->CurrentByteOffset;
+@@ -2152,7 +2289,7 @@ RsDoPinGroupConfigDescriptor (
+         sizeof (AML_RESOURCE_LARGE_HEADER));
+ 
+     Descriptor = Rnode->Buffer;
+-    Descriptor->PinGroupConfig.ResourceLength = DescriptorSize;
++    Descriptor->PinGroupConfig.ResourceLength = AcpiUtReadUint16 (&DescriptorSize);
+     Descriptor->PinGroupConfig.DescriptorType = ACPI_RESOURCE_NAME_PIN_GROUP_CONFIG;
+     Descriptor->PinGroupConfig.RevisionId = AML_RESOURCE_PIN_GROUP_CONFIG_REVISION;
+ 
+@@ -2205,7 +2342,8 @@ RsDoPinGroupConfigDescriptor (
+ 
+         case 2: /* Pin Config Value [DWORD] (_VAL) */
+ 
+-            Descriptor->PinGroupConfig.PinConfigValue = (UINT32) InitializerOp->Asl.Value.Integer;
++            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
++            Descriptor->PinGroupConfig.PinConfigValue = AcpiUtReadUint32 (&Tmp32);
+             RsCreateDwordField (InitializerOp, ACPI_RESTAG_PINCONFIG_VALUE,
+                 CurrentByteOffset + ASL_RESDESC_OFFSET (PinGroupConfig.PinConfigValue));
+             break;
+@@ -2266,5 +2404,15 @@ RsDoPinGroupConfigDescriptor (
+         InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
+     }
+ 
++    /* correct enddianness as needed */
++    Tmp16 = Descriptor->PinGroupConfig.ResSourceOffset;
++    Descriptor->PinGroupConfig.ResSourceOffset = AcpiUtReadUint16 (&Tmp16);
++    Tmp16 = Descriptor->PinGroupConfig.ResSourceLabelOffset;
++    Descriptor->PinGroupConfig.ResSourceLabelOffset = AcpiUtReadUint16 (&Tmp16);
++    Tmp16 = Descriptor->PinGroupConfig.VendorOffset;
++    Descriptor->PinGroupConfig.VendorOffset = AcpiUtReadUint16 (&Tmp16);
++    Tmp16 = Descriptor->PinGroupConfig.VendorLength;
++    Descriptor->PinGroupConfig.VendorLength = AcpiUtReadUint16 (&Tmp16);
++
+     return (Rnode);
+ }
diff --git a/0044-Initial-support-for-WPBT-in-big-endian-needs-more.patch b/0044-Initial-support-for-WPBT-in-big-endian-needs-more.patch
new file mode 100644
index 0000000..1a2b1a2
--- /dev/null
+++ b/0044-Initial-support-for-WPBT-in-big-endian-needs-more.patch
@@ -0,0 +1,23 @@
+From bd137d3712e6bc7e4d2d11350a208a36750e4063 Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Tue, 6 Jul 2021 18:26:41 -0600
+Subject: [PATCH 44/45] Initial support for WPBT in big-endian, needs more
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/compiler/dttable2.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: acpica-unix2-20210604/source/compiler/dttable2.c
+===================================================================
+--- acpica-unix2-20210604.orig/source/compiler/dttable2.c
++++ acpica-unix2-20210604/source/compiler/dttable2.c
+@@ -2638,7 +2638,7 @@ DtCompileWpbt (
+     AcpiUtWriteUint (&Length, sizeof (UINT16),
+            &Subtable->TotalLength, sizeof (UINT32));
+     Table = ACPI_CAST_PTR (ACPI_TABLE_WPBT, ParentTable->Buffer);
+-    Table->ArgumentsLength = Length;
++    Table->ArgumentsLength = AcpiUtReadUint16 (&Length);
+ 
+     ParentTable = DtPeekSubtable ();
+     DtInsertSubtable (ParentTable, Subtable);
diff --git a/0045-CSRT-fixed-use-of-optional-ResourceInfo.patch b/0045-CSRT-fixed-use-of-optional-ResourceInfo.patch
new file mode 100644
index 0000000..45bfbb5
--- /dev/null
+++ b/0045-CSRT-fixed-use-of-optional-ResourceInfo.patch
@@ -0,0 +1,213 @@
+From 0d87ee42adda7837bec3cc0ff86e40c2f2e8dc4f Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Fri, 9 Jul 2021 14:52:55 -0600
+Subject: [PATCH 45/45] CSRT: fixed use of optional ResourceInfo
+
+In a resource sub-sub-table, there may be a ResourceInfo entry.  Neither
+the compiler nor disassembler accounted for that possibility properly.
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/common/dmtbdump1.c  | 43 +++++++++++++++++++++-----------------
+ source/compiler/dttable1.c | 28 +++++++++++++------------
+ 2 files changed, 39 insertions(+), 32 deletions(-)
+
+Index: acpica-unix2-20210604/source/common/dmtbdump1.c
+===================================================================
+--- acpica-unix2-20210604.orig/source/common/dmtbdump1.c
++++ acpica-unix2-20210604/source/common/dmtbdump1.c
+@@ -374,11 +374,13 @@ AcpiDmDumpCsrt (
+     ACPI_CSRT_GROUP         *Subtable;
+     ACPI_CSRT_SHARED_INFO   *SharedInfoTable;
+     ACPI_CSRT_DESCRIPTOR    *SubSubtable;
+-    UINT32                  Length = AcpiUtReadUint32 (&Table->Length);
++    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
+     UINT32                  Offset = sizeof (ACPI_TABLE_CSRT);
+     UINT32                  SubOffset;
+     UINT32                  SubSubOffset;
+     UINT32                  InfoLength;
++    UINT32                  SubtableLength;
++    UINT32                  SubSubtableLength;
+ 
+ 
+     /* The main table only contains the ACPI header, thus already handled */
+@@ -386,13 +388,14 @@ AcpiDmDumpCsrt (
+     /* Subtables (Resource Groups) */
+ 
+     Subtable = ACPI_ADD_PTR (ACPI_CSRT_GROUP, Table, Offset);
+-    while (Offset < Length)
++    while (Offset < TableLength)
+     {
+         /* Resource group subtable */
+ 
++        SubtableLength = AcpiUtReadUint32 (&Subtable->Length);
+         AcpiOsPrintf ("\n");
+-        Status = AcpiDmDumpTable (Length, Offset, Subtable,
+-            Subtable->Length, AcpiDmTableInfoCsrt0);
++        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
++            SubtableLength, AcpiDmTableInfoCsrt0);
+         if (ACPI_FAILURE (Status))
+         {
+             return;
+@@ -405,26 +408,28 @@ AcpiDmDumpCsrt (
+             Offset + SubOffset);
+ 
+         AcpiOsPrintf ("\n");
+-        Status = AcpiDmDumpTable (Length, Offset + SubOffset, SharedInfoTable,
+-            sizeof (ACPI_CSRT_SHARED_INFO), AcpiDmTableInfoCsrt1);
++        Status = AcpiDmDumpTable (TableLength, Offset + SubOffset,
++	    SharedInfoTable, sizeof (ACPI_CSRT_SHARED_INFO),
++	    AcpiDmTableInfoCsrt1);
+         if (ACPI_FAILURE (Status))
+         {
+             return;
+         }
+ 
+-        SubOffset += Subtable->SharedInfoLength;
++        SubOffset += AcpiUtReadUint32 (&Subtable->SharedInfoLength);
+ 
+         /* Sub-Subtables (Resource Descriptors) */
+ 
+         SubSubtable = ACPI_ADD_PTR (ACPI_CSRT_DESCRIPTOR, Table,
+             Offset + SubOffset);
+ 
+-        while ((SubOffset < Subtable->Length) &&
+-              ((Offset + SubOffset) < Length))
++        while ((SubOffset < SubtableLength) &&
++              ((Offset + SubOffset) < TableLength))
+         {
++	    SubSubtableLength = AcpiUtReadUint32 (&SubSubtable->Length);
+             AcpiOsPrintf ("\n");
+-            Status = AcpiDmDumpTable (Length, Offset + SubOffset, SubSubtable,
+-                SubSubtable->Length, AcpiDmTableInfoCsrt2);
++            Status = AcpiDmDumpTable (TableLength, Offset + SubOffset,
++	        SubSubtable, SubSubtableLength, AcpiDmTableInfoCsrt2);
+             if (ACPI_FAILURE (Status))
+             {
+                 return;
+@@ -434,11 +439,12 @@ AcpiDmDumpCsrt (
+ 
+             /* Resource-specific info buffer */
+ 
+-            InfoLength = SubSubtable->Length - SubSubOffset;
++            InfoLength = SubSubtableLength - SubSubOffset;
+             if (InfoLength)
+             {
+-                Status = AcpiDmDumpTable (Length,
+-                    Offset + SubOffset + SubSubOffset, Table,
++                Status = AcpiDmDumpTable (TableLength,
++		    Offset + SubOffset + SubSubOffset,
++		    (UINT8 *)SubSubtable + SubSubOffset,
+                     InfoLength, AcpiDmTableInfoCsrt2a);
+                 if (ACPI_FAILURE (Status))
+                 {
+@@ -448,16 +454,15 @@ AcpiDmDumpCsrt (
+ 
+             /* Point to next sub-subtable */
+ 
+-            SubOffset += SubSubtable->Length;
++            SubOffset += SubSubtableLength;
+             SubSubtable = ACPI_ADD_PTR (ACPI_CSRT_DESCRIPTOR, SubSubtable,
+-                SubSubtable->Length);
++                SubSubtableLength);
+         }
+ 
+         /* Point to next subtable */
+ 
+-        Offset += Subtable->Length;
+-        Subtable = ACPI_ADD_PTR (ACPI_CSRT_GROUP, Subtable,
+-            Subtable->Length);
++        Offset += SubtableLength;
++        Subtable = ACPI_ADD_PTR (ACPI_CSRT_GROUP, Subtable, SubtableLength);
+     }
+ }
+ 
+Index: acpica-unix2-20210604/source/compiler/dttable1.c
+===================================================================
+--- acpica-unix2-20210604.orig/source/compiler/dttable1.c
++++ acpica-unix2-20210604/source/compiler/dttable1.c
+@@ -353,14 +353,16 @@ DtCompileCsrt (
+     DT_SUBTABLE             *Subtable;
+     DT_SUBTABLE             *ParentTable;
+     DT_FIELD                **PFieldList = (DT_FIELD **) List;
+-    UINT32                  DescriptorCount;
++    UINT32                  DescriptorLength;
+     UINT32                  GroupLength;
+     UINT32                  Tmp;
++    UINT32                  Offset;
+ 
+ 
+     /* Subtables (Resource Groups) */
+ 
+     ParentTable = DtPeekSubtable ();
++                               
+     while (*PFieldList)
+     {
+         /* Resource group subtable */
+@@ -375,16 +377,13 @@ DtCompileCsrt (
+         /* Compute the number of resource descriptors */
+ 
+         Tmp = AcpiUtReadUint32 (&(ACPI_CAST_PTR (ACPI_CSRT_GROUP,
+-                                Subtable->Buffer))->Length);
++                  Subtable->Buffer))->Length);
+         GroupLength = Tmp;
+         Tmp = AcpiUtReadUint32 (&(ACPI_CAST_PTR (ACPI_CSRT_GROUP,
+-                                Subtable->Buffer))->SharedInfoLength);
++                  Subtable->Buffer))->SharedInfoLength);
+         GroupLength -= Tmp;
+         GroupLength -= sizeof (ACPI_CSRT_GROUP);
+ 
+-        DescriptorCount = (GroupLength  /
+-            sizeof (ACPI_CSRT_DESCRIPTOR));
+-
+         DtInsertSubtable (ParentTable, Subtable);
+         DtPushSubtable (Subtable);
+         ParentTable = DtPeekSubtable ();
+@@ -399,10 +398,13 @@ DtCompileCsrt (
+         }
+ 
+         DtInsertSubtable (ParentTable, Subtable);
++        DtPushSubtable (Subtable);
++        ParentTable = DtPeekSubtable ();
+ 
+         /* Sub-Subtables (Resource Descriptors) */
+ 
+-        while (*PFieldList && DescriptorCount)
++        Offset = 0;
++        while (*PFieldList && (Offset < GroupLength))
+         {
+ 
+             Status = DtCompileTable (PFieldList, AcpiDmTableInfoCsrt2,
+@@ -411,6 +413,10 @@ DtCompileCsrt (
+             {
+                 return (Status);
+             }
++	    DescriptorLength = AcpiUtReadUint32 (
++	                           &(ACPI_CAST_PTR (ACPI_CSRT_GROUP,
++                                   Subtable->Buffer))->Length);
++
+ 
+             DtInsertSubtable (ParentTable, Subtable);
+ 
+@@ -420,11 +426,7 @@ DtCompileCsrt (
+             {
+                 Status = DtCompileTable (PFieldList, AcpiDmTableInfoCsrt2a,
+                     &Subtable);
+-                if (ACPI_FAILURE (Status))
+-                {
+-                    return (Status);
+-                }
+-                if (Subtable)
++                if (ACPI_SUCCESS (Status) && Subtable)
+                 {
+                     DtInsertSubtable (ParentTable, Subtable);
+                 }
+@@ -432,7 +434,7 @@ DtCompileCsrt (
+ 
+             DtPopSubtable ();
+             ParentTable = DtPeekSubtable ();
+-            DescriptorCount--;
++            Offset += DescriptorLength;
+         }
+ 
+         DtPopSubtable ();
diff --git a/0045-Correct-a-couple-of-endianness-issues-previously-uns.patch b/0045-Correct-a-couple-of-endianness-issues-previously-uns.patch
deleted file mode 100644
index 471ab55..0000000
--- a/0045-Correct-a-couple-of-endianness-issues-previously-uns.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From e942e785b3ec47693029e3841075becba31f2635 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Wed, 28 Oct 2020 12:53:34 -0600
-Subject: [PATCH] Correct a couple of endianness issues previously unseen
-
-Just odds and ends of some resource types and ASL analysis
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/compiler/aslanalyze.c   |  4 ++--
- source/compiler/aslrestype1.c  | 16 ++++++++--------
- source/compiler/aslrestype1i.c |  2 +-
- 3 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/source/compiler/aslanalyze.c b/source/compiler/aslanalyze.c
-index 63feba2b1..f76a8c3cd 100644
---- a/source/compiler/aslanalyze.c
-+++ b/source/compiler/aslanalyze.c
-@@ -577,7 +577,7 @@ ApCheckForGpeNameConflict (
- 
-     /* Need a null-terminated string version of NameSeg */
- 
--    ACPI_MOVE_32_TO_32 (Name, Op->Asl.NameSeg);
-+    ACPI_COPY_NAMESEG (Name, Op->Asl.NameSeg);
-     Name[ACPI_NAMESEG_SIZE] = 0;
- 
-     /*
-@@ -604,7 +604,7 @@ ApCheckForGpeNameConflict (
-      * We are now sure we have an _Lxx or _Exx.
-      * Create the target name that would cause collision (Flip E/L)
-      */
--    ACPI_MOVE_32_TO_32 (Target, Name);
-+    ACPI_COPY_NAMESEG (Target, Name);
- 
-     /* Inject opposite letter ("L" versus "E") */
- 
-diff --git a/source/compiler/aslrestype1.c b/source/compiler/aslrestype1.c
-index e7639c0bb..fd4428aab 100644
---- a/source/compiler/aslrestype1.c
-+++ b/source/compiler/aslrestype1.c
-@@ -328,10 +328,10 @@ RsDoMemory24Descriptor (
-     /* Validate the Min/Max/Len/Align values (Alignment==0 means 64K) */
- 
-     RsSmallAddressCheck (ACPI_RESOURCE_NAME_MEMORY24,
--        Descriptor->Memory24.Minimum,
--        Descriptor->Memory24.Maximum,
--        Descriptor->Memory24.AddressLength,
--        Descriptor->Memory24.Alignment,
-+        (UINT32) AcpiUtReadUint16(&Descriptor->Memory24.Minimum),
-+        (UINT32) AcpiUtReadUint16(&Descriptor->Memory24.Maximum),
-+        (UINT32) AcpiUtReadUint16(&Descriptor->Memory24.AddressLength),
-+        (UINT32) AcpiUtReadUint16(&Descriptor->Memory24.Alignment),
-         MinOp, MaxOp, LengthOp, NULL, Info->DescriptorTypeOp);
- 
-     return (Rnode);
-@@ -442,10 +442,10 @@ RsDoMemory32Descriptor (
-     /* Validate the Min/Max/Len/Align values */
- 
-     RsSmallAddressCheck (ACPI_RESOURCE_NAME_MEMORY32,
--        Descriptor->Memory32.Minimum,
--        Descriptor->Memory32.Maximum,
--        Descriptor->Memory32.AddressLength,
--        Descriptor->Memory32.Alignment,
-+        AcpiUtReadUint32(&Descriptor->Memory32.Minimum),
-+        AcpiUtReadUint32(&Descriptor->Memory32.Maximum),
-+        AcpiUtReadUint32(&Descriptor->Memory32.AddressLength),
-+        AcpiUtReadUint32(&Descriptor->Memory32.Alignment),
-         MinOp, MaxOp, LengthOp, AlignOp, Info->DescriptorTypeOp);
- 
-     return (Rnode);
-diff --git a/source/compiler/aslrestype1i.c b/source/compiler/aslrestype1i.c
-index 532553c4b..d41e3a1e8 100644
---- a/source/compiler/aslrestype1i.c
-+++ b/source/compiler/aslrestype1i.c
-@@ -436,7 +436,7 @@ RsDoFixedIoDescriptor (
- 
-     /* Error checks */
- 
--    if (Descriptor->FixedIo.Address > 0x03FF)
-+    if (AcpiUtReadUint16(&Descriptor->FixedIo.Address) > 0x03FF)
-     {
-         AslError (ASL_WARNING, ASL_MSG_ISA_ADDRESS, AddressOp, NULL);
-     }
--- 
-2.26.2
-
diff --git a/acpica-tools.spec b/acpica-tools.spec
index 9480424..e7722b6 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -28,47 +28,47 @@ Patch0:		0001-Add-in-basic-infrastructure-for-big-endian-support.patch
 Patch1:		0002-Modify-utility-functions-to-be-endian-agnostic.patch
 Patch2:		0003-Always-display-table-header-content-in-human-readabl.patch
 Patch3:		0004-Re-enable-support-for-big-endian-machines.patch
-Patch4:		0005-Support-MADT-aka-APIC-in-a-big-endian-world.patch
-Patch5:		0006-Support-ASF-tables-in-a-big-endian-world.patch
-Patch6:		0007-Support-CPEP-tables-in-a-big-endian-world.patch
-Patch7:		0008-Support-DBG2-table-in-a-big-endian-world.patch
-Patch8:		0009-Support-DMAR-in-a-big-endian-world.patch
-Patch9:		0010-Support-DRTM-in-a-big-endian-world.patch
-Patch10:	0011-Support-EINJ-in-a-big-endian-world.patch
-Patch11:	0012-Support-ERST-in-a-big-endian-world.patch
-Patch12:	0013-Support-FADT-aka-FACP-in-a-big-endian-world.patch
-Patch13:	0014-Support-most-FPDTs-in-a-big-endian-world.patch
-Patch14:	0015-Support-GTDT-in-a-big-endian-world.patch
-Patch15:	0016-Support-HEST-in-a-big-endian-world.patch
-Patch16:	0017-Support-RSDT-RSD-PTR-in-a-big-endian-world.patch
-Patch17:	0018-Support-XSDT-in-a-big-endian-world.patch
-Patch18:	0019-Support-SRAT-in-a-big-endian-world.patch
-Patch19:	0020-Support-SLIT-in-a-big-endian-world.patch
-Patch20:	0021-Support-MSCT-in-a-big-endian-world.patch
-Patch21:	0022-Support-MPST-in-a-big-endian-world.patch
-Patch22:	0023-Support-NFIT-in-a-big-endian-world.patch
-Patch23:	0024-Support-SDEV-in-a-big-endian-world.patch
-Patch24:	0025-Support-HMAT-in-a-big-endian-world.patch
-Patch25:	0026-Support-PDTT-in-a-big-endian-world.patch
-Patch26:	0027-Support-PPTT-in-a-big-endian-world.patch
-Patch27:	0028-Support-PCCT-in-a-big-endian-world.patch
-Patch28:	0029-Support-WDAT-in-a-big-endian-world.patch
-Patch29:	0030-Support-TCPA-in-a-big-endian-world.patch
-Patch30:	0031-Support-STAO-in-a-big-endian-world.patch
-Patch31:	0032-Support-SLIC-and-MSDM-in-a-big-endian-world.patch
-Patch32:	0033-Support-MCFG-in-a-big-endian-world.patch
-Patch33:	0034-Support-LPIT-in-a-big-endian-world.patch
-Patch34:	0035-Support-PMTT-in-a-big-endian-world.patch
-Patch35:	0036-Support-IORT-in-a-big-endian-world.patch
-Patch36:	0037-Support-IVRS-in-a-big-endian-world.patch
-Patch37:	0038-Support-TPM2-in-a-big-endian-world.patch
-Patch38:	0039-Add-partial-big-endian-support-for-WPBT-tables.patch
-Patch39:	0040-Support-DSDT-SSDT-in-a-big-endian-world.patch
-Patch40:	0041-Support-MTMR-in-a-big-endian-world.patch
-Patch41:	0042-Support-VRTC-in-a-big-endian-world.patch
-Patch42:	0043-Support-S3PT-in-a-big-endian-world.patch
-Patch43:	0044-Correct-an-endian-ness-problem-when-converting-ASL-t.patch
-Patch44:	0045-Correct-a-couple-of-endianness-issues-previously-uns.patch
+Patch4:		0005-Correct-an-endian-ness-problem-when-converting-ASL-t.patch
+Patch5:		0006-Use-more-reliable-ACPI_COPY_NAMSEG-in-GPE-name-check.patch
+Patch6:		0007-Handle-dumping-Unicode-properly-when-big-endian.patch
+Patch7:		0008-Support-MADT-aka-APIC-in-a-big-endian-world.patch
+Patch8:		0009-Support-ASF-tables-in-a-big-endian-world.patch
+Patch9:		0010-Support-CPEP-tables-in-a-big-endian-world.patch
+Patch10:	0011-Support-DBG2-table-in-a-big-endian-world.patch
+Patch11:	0012-Support-DMAR-in-a-big-endian-world.patch
+Patch12:	0013-Support-DRTM-in-a-big-endian-world.patch
+Patch13:	0014-Support-EINJ-in-a-big-endian-world.patch
+Patch14:	0015-Support-ERST-in-a-big-endian-world.patch
+Patch15:	0016-Support-FADT-aka-FACP-in-a-big-endian-world.patch
+Patch16:	0017-Support-most-FPDTs-in-a-big-endian-world.patch
+Patch17:	0018-Support-GTDT-in-a-big-endian-world.patch
+Patch18:	0019-Support-HEST-in-a-big-endian-world.patch
+Patch19:	0020-Support-RSDT-RSD-PTR-in-a-big-endian-world.patch
+Patch20:	0021-Support-XSDT-in-a-big-endian-world.patch
+Patch21:	0022-Support-SRAT-in-a-big-endian-world.patch
+Patch22:	0023-Support-SLIT-in-a-big-endian-world.patch
+Patch23:	0024-Support-MSCT-in-a-big-endian-world.patch
+Patch24:	0025-Support-MPST-in-a-big-endian-world.patch
+Patch25:	0026-Support-NFIT-in-a-big-endian-world.patch
+Patch26:	0027-Support-SDEV-in-a-big-endian-world.patch
+Patch27:	0028-Support-HMAT-in-a-big-endian-world.patch
+Patch28:	0029-Support-PDTT-in-a-big-endian-world.patch
+Patch29:	0030-Support-PPTT-in-a-big-endian-world.patch
+Patch30:	0031-Support-PCCT-in-a-big-endian-world.patch
+Patch31:	0032-Support-WDAT-in-a-big-endian-world.patch
+Patch32:	0033-Support-TCPA-in-a-big-endian-world.patch
+Patch33:	0034-Support-STAO-in-a-big-endian-world.patch
+Patch34:	0035-Support-SLIC-and-MSDM-in-a-big-endian-world.patch
+Patch35:	0036-Support-MCFG-in-a-big-endian-world.patch
+Patch36:	0037-Support-LPIT-in-a-big-endian-world.patch
+Patch37:	0038-Support-PMTT-in-a-big-endian-world.patch
+Patch38:	0039-Support-TPM2-in-a-big-endian-world.patch
+Patch39:	0040-Support-S3PT-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
+Patch42:	0043-Support-DSDT-SSDT-in-a-big-endian-world.patch
+Patch43:	0044-Initial-support-for-WPBT-in-big-endian-needs-more.patch
+Patch44:	0045-CSRT-fixed-use-of-optional-ResourceInfo.patch
 
 # other miscellaneous patches
 Patch100:	unaligned.patch
@@ -253,11 +253,12 @@ fi
 
 
 %changelog
-* Sat Jul 7 2021 Al Stone <ahs3@redhat.com> - 20210604-1
+* Sun Jul 11 2021 Al Stone <ahs3@redhat.com> - 20210604-1
 - Update to 20210604 source tree (please note that tarballs for versions
   between 20200925 and 20210604 have been uploaded for archival reasons
   but no packaged version of these has been commited to the Fedora project)
-- Bring the big-endian patches up-to-date.
+- Bring the big-endian patches up-to-date with what has been submitted
+  upstream (not accepted currently).
 
 * Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20200925-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
diff --git a/arm7hl.patch b/arm7hl.patch
index bcac21f..55d4aef 100644
--- a/arm7hl.patch
+++ b/arm7hl.patch
@@ -1,8 +1,8 @@
-Index: acpica-unix2-20200925/source/include/acmacros.h
+Index: acpica-unix2-20210604/source/include/acmacros.h
 ===================================================================
---- acpica-unix2-20200925.orig/source/include/acmacros.h
-+++ acpica-unix2-20200925/source/include/acmacros.h
-@@ -163,6 +163,8 @@
+--- acpica-unix2-20210604.orig/source/include/acmacros.h
++++ acpica-unix2-20210604/source/include/acmacros.h
+@@ -108,6 +108,8 @@
  
  /* 16-bit source, 16/32/64 destination */
  
@@ -11,7 +11,7 @@ Index: acpica-unix2-20200925/source/include/acmacros.h
  #define ACPI_MOVE_16_TO_16(d, s)        {((  UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[0];\
                                           ((  UINT8 *)(void *)(d))[1] = ((UINT8 *)(void *)(s))[1];}
  
-@@ -182,6 +184,7 @@
+@@ -127,6 +129,7 @@
  
  /* 64-bit source, 16/32/64 destination */
  
diff --git a/badcode.asl.result b/badcode.asl.result
index 7f3e923..100cd4b 100644
--- a/badcode.asl.result
+++ b/badcode.asl.result
@@ -256,7 +256,7 @@ Warning  3144 -                            ^ Method Local is set but never used
 
 Intel ACPI Component Architecture
 ASL+ Optimizing Compiler/Disassembler version VVVVVVVV
-Copyright (c) 2000 - 2020 Intel Corporation
+Copyright (c) 2000 - 2021 Intel Corporation
 
 Ignoring all errors, forcing AML file generation
 
diff --git a/converterSample.asl.result b/converterSample.asl.result
index 064ef5f..a3b6ca1 100644
--- a/converterSample.asl.result
+++ b/converterSample.asl.result
@@ -31,7 +31,7 @@ Remark   2158 -                           ^ Unnecessary/redundant use of Offset
 
 Intel ACPI Component Architecture
 ASL+ Optimizing Compiler/Disassembler version VVVVVVVV
-Copyright (c) 2000 - 2020 Intel Corporation
+Copyright (c) 2000 - 2021 Intel Corporation
 
 Ignoring all errors, forcing AML file generation
 
diff --git a/grammar.asl.result b/grammar.asl.result
index 97fae9a..5269983 100644
--- a/grammar.asl.result
+++ b/grammar.asl.result
@@ -580,7 +580,7 @@ Warning  3141 -   Missing dependency ^  (Device object requires a _HID or _ADR i
 
 Intel ACPI Component Architecture
 ASL+ Optimizing Compiler/Disassembler version VVVVVVVV
-Copyright (c) 2000 - 2020 Intel Corporation
+Copyright (c) 2000 - 2021 Intel Corporation
 
 Ignoring all errors, forcing AML file generation
 
diff --git a/str-trunc-warn.patch b/str-trunc-warn.patch
index 1355b0c..eeb47c3 100644
--- a/str-trunc-warn.patch
+++ b/str-trunc-warn.patch
@@ -14,8 +14,8 @@ Index: acpica-unix2-20200925/source/compiler/aslanalyze.c
                  "Method returns [%s], %s operator requires [%s]",
                  AslGbl_StringBuffer, OpInfo->Name, AslGbl_StringBuffer2);
  
--            AslError (ASL_ERROR, ASL_MSG_INVALID_TYPE, ArgOp, AslGbl_MsgBuffer);
-+            AslError (ASL_ERROR, ASL_MSG_INVALID_TYPE, ArgOp, strp);
+-            AslError (ASL_WARNING, ASL_MSG_INVALID_TYPE, ArgOp, AslGbl_MsgBuffer);
++            AslError (ASL_WARNING, ASL_MSG_INVALID_TYPE, ArgOp, strp);
 +	     if (cnt > 0)
 +	         free(strp);
          }
diff --git a/ull-32bit.patch b/ull-32bit.patch
index 3d8fe39..7d0580b 100644
--- a/ull-32bit.patch
+++ b/ull-32bit.patch
@@ -1,14 +1,15 @@
-diff -Naur acpica-unix2-20200925.orig/source/common/dmtbdump.c acpica-unix2-20200925/source/common/dmtbdump.c
---- acpica-unix2-20200925.orig/source/common/dmtbdump.c 2020-10-27 08:50:34.949398104 -0500
-+++ acpica-unix2-20200925/source/common/dmtbdump.c      2020-10-27 08:54:27.609955141 -0500
-@@ -333,7 +333,11 @@
+Index: acpica-unix2-20210604/source/common/dmtbdump.c
+===================================================================
+--- acpica-unix2-20210604.orig/source/common/dmtbdump.c
++++ acpica-unix2-20210604/source/common/dmtbdump.c
+@@ -338,7 +338,11 @@ AcpiDmDumpXsdt (
      for (i = 0; i < Entries; i++)
      {
          AcpiDmLineHeader2 (Offset, sizeof (UINT64), "ACPI Table Address", i);
 +#if ACPI_MACHINE_WIDTH == 32
-+        AcpiOsPrintf ("%16.16llX\n", AcpiUtReadUint64(&Array[i]));
++        AcpiOsPrintf ("%16.16llX\n", AcpiUtReadUint64 (&Array[i]));
 +#else
-         AcpiOsPrintf ("%16.16lX\n", AcpiUtReadUint64(&Array[i]));
+         AcpiOsPrintf ("%16.16lX\n", AcpiUtReadUint64 (&Array[i]));
 +#endif
          Offset += sizeof (UINT64);
      }

From 4f99fff578ee96d4fbc73ca62fef63d10c77ad36 Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Mon, 12 Jul 2021 09:19:58 -0600
Subject: [PATCH 50/82] Forgot to commit sources file

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 sources | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sources b/sources
index 74f0625..caad461 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (acpica-unix2-20210604.tar.gz) = f7f6e3c1964ffae186fe3d34b64a6251dd2e4423244c08c7e4301fd38396eac1af6e562956984a37af803ac11d5a46dd2dce88540787df353fc268002710dc62
+SHA512 (acpitests-unix-20210604.tar.gz) = 71c1a1e485b36ece5b58c2efd14d328e451acd3721755548c7ef0d6c1a20aa6925be9f892331853e699761ec3b4ffed4d17fce7a303f5f3abece31b52b5625e2

From 77d39bce5f0d1c7afcbd1b2cead5ed45dc927912 Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Mon, 12 Jul 2021 17:51:04 -0600
Subject: [PATCH 51/82] Correct big-endian problems with PHAT

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 0046-Support-PHAT-in-a-big-endian-world.patch | 181 ++++++++++++++++++
 acpica-tools.spec                             |   1 +
 2 files changed, 182 insertions(+)
 create mode 100644 0046-Support-PHAT-in-a-big-endian-world.patch

diff --git a/0046-Support-PHAT-in-a-big-endian-world.patch b/0046-Support-PHAT-in-a-big-endian-world.patch
new file mode 100644
index 0000000..973286b
--- /dev/null
+++ b/0046-Support-PHAT-in-a-big-endian-world.patch
@@ -0,0 +1,181 @@
+From 5fd729c8f6c4ce295edd142fc41e03e831ba4afb Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@redhat.com>
+Date: Mon, 12 Jul 2021 09:39:38 -0600
+Subject: [PATCH] Support PHAT in a big-endian world
+
+Signed-off-by: Al Stone <ahs3@redhat.com>
+---
+ source/common/dmtbdump2.c  | 36 ++++++++++++++++++++----------------
+ source/compiler/dttable2.c | 12 +++++++++---
+ 2 files changed, 29 insertions(+), 19 deletions(-)
+
+Index: acpica-unix2-20210604/source/common/dmtbdump2.c
+===================================================================
+--- acpica-unix2-20210604.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20210604/source/common/dmtbdump2.c
+@@ -1573,39 +1573,43 @@ AcpiDmDumpPhat (
+     ACPI_PHAT_HEADER        *Subtable;
+     ACPI_PHAT_VERSION_DATA  *VersionData;
+     UINT32                  RecordCount;
+-    UINT32                  Length = Table->Length;
++    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
+     UINT32                  Offset = sizeof (ACPI_TABLE_PHAT);
+     UINT32                  SubtableLength;
+     UINT32                  PathLength;
+     UINT32                  VendorLength;
++    UINT16                  SubtableType;
+ 
+ 
+     Subtable = ACPI_ADD_PTR (ACPI_PHAT_HEADER, Table, sizeof (ACPI_TABLE_PHAT));
+ 
+-    while (Offset < Table->Length)
++    while (Offset < TableLength)
+     {
+         /* Common subtable header */
+ 
++        SubtableType = AcpiUtReadUint16 (&Subtable->Type);
++	Subtable->Type = SubtableType;
++        SubtableLength = AcpiUtReadUint16 (&Subtable->Length);
++	Subtable->Length = SubtableLength;
++
+         AcpiOsPrintf ("\n");
+-        Status = AcpiDmDumpTable (Length, 0, Subtable,
++        Status = AcpiDmDumpTable (TableLength, 0, Subtable,
+             sizeof (ACPI_PHAT_HEADER), AcpiDmTableInfoPhatHdr);
+         if (ACPI_FAILURE (Status))
+         {
+             return;
+         }
+ 
+-        switch (Subtable->Type)
++        switch (SubtableType)
+         {
+         case ACPI_PHAT_TYPE_FW_VERSION_DATA:
+ 
+             InfoTable = AcpiDmTableInfoPhat0;
+-            SubtableLength = sizeof (ACPI_PHAT_VERSION_DATA);
+             break;
+ 
+         case ACPI_PHAT_TYPE_FW_HEALTH_DATA:
+ 
+             InfoTable = AcpiDmTableInfoPhat1;
+-            SubtableLength = sizeof (ACPI_PHAT_HEALTH_DATA);
+             break;
+ 
+         default:
+@@ -1616,22 +1620,22 @@ AcpiDmDumpPhat (
+             return;
+         }
+ 
+-        Status = AcpiDmDumpTable (Length, 0, Subtable,
++        Status = AcpiDmDumpTable (TableLength, 0, Subtable,
+             SubtableLength, InfoTable);
+         if (ACPI_FAILURE (Status))
+         {
+             return;
+         }
+ 
+-        switch (Subtable->Type)
++        switch (SubtableType)
+         {
+         case ACPI_PHAT_TYPE_FW_VERSION_DATA:
+ 
+             VersionData = ACPI_CAST_PTR (ACPI_PHAT_VERSION_DATA, Subtable);
+-            RecordCount = VersionData->ElementCount;
++            RecordCount = AcpiUtReadUint32 (&VersionData->ElementCount);
+             while (RecordCount)
+             {
+-                Status = AcpiDmDumpTable (Length, Offset,
++                Status = AcpiDmDumpTable (TableLength, Offset,
+                     ACPI_ADD_PTR (ACPI_PHAT_HEADER, Subtable, sizeof (ACPI_PHAT_VERSION_DATA)),
+                     sizeof (ACPI_PHAT_VERSION_ELEMENT), AcpiDmTableInfoPhat0a);
+                 if (ACPI_FAILURE (Status))
+@@ -1649,7 +1653,7 @@ AcpiDmDumpPhat (
+             /* account for the null terminator */
+ 
+             PathLength = strlen (ACPI_ADD_PTR (char, Subtable, sizeof (ACPI_PHAT_HEALTH_DATA))) + 1;
+-            Status = AcpiDmDumpTable (Length, Offset,
++            Status = AcpiDmDumpTable (TableLength, Offset,
+                 ACPI_ADD_PTR (ACPI_PHAT_HEADER, Subtable, sizeof (ACPI_PHAT_HEALTH_DATA)),
+                 PathLength, AcpiDmTableInfoPhat1a);
+             if (ACPI_FAILURE (Status))
+@@ -1660,8 +1664,8 @@ AcpiDmDumpPhat (
+             /* Get vendor data - data length is the remaining subtable length */
+ 
+             VendorLength =
+-                Subtable->Length - sizeof (ACPI_PHAT_HEALTH_DATA) - PathLength;
+-            Status = AcpiDmDumpTable (Length, 0,
++                SubtableLength - sizeof (ACPI_PHAT_HEALTH_DATA) - PathLength;
++            Status = AcpiDmDumpTable (TableLength, 0,
+                 ACPI_ADD_PTR (ACPI_PHAT_HEADER, Subtable, sizeof (ACPI_PHAT_HEALTH_DATA) + PathLength),
+                 VendorLength, AcpiDmTableInfoPhat1b);
+             if (ACPI_FAILURE (Status))
+@@ -1673,15 +1677,15 @@ AcpiDmDumpPhat (
+         default:
+ 
+             AcpiOsPrintf ("\n**** Unknown PHAT subtable type 0x%X\n\n",
+-                Subtable->Type);
++                SubtableType);
+             return;
+         }
+ 
+         /* Next subtable */
+ 
+-        Offset += Subtable->Length;
++        Offset += SubtableLength;
+         Subtable = ACPI_ADD_PTR (ACPI_PHAT_HEADER, Subtable,
+-            Subtable->Length);
++            SubtableLength);
+     }
+ }
+ 
+Index: acpica-unix2-20210604/source/compiler/dttable2.c
+===================================================================
+--- acpica-unix2-20210604.orig/source/compiler/dttable2.c
++++ acpica-unix2-20210604/source/compiler/dttable2.c
+@@ -870,6 +870,8 @@ DtCompilePhat (
+     ACPI_DMTABLE_INFO       *Info;
+     ACPI_PHAT_VERSION_DATA  *VersionData;
+     UINT32                  RecordCount;
++    UINT16                  SubtableType;
++    UINT16                  Tmp16;
+ 
+ 
+     /* The table consist of subtables */
+@@ -887,8 +889,9 @@ DtCompilePhat (
+         DtPushSubtable (Subtable);
+ 
+         PhatHeader = ACPI_CAST_PTR (ACPI_PHAT_HEADER, Subtable->Buffer);
++	SubtableType = AcpiUtReadUint16 (&PhatHeader->Type);
+ 
+-        switch (PhatHeader->Type)
++        switch (SubtableType)
+         {
+         case ACPI_PHAT_TYPE_FW_VERSION_DATA:
+ 
+@@ -919,13 +922,13 @@ DtCompilePhat (
+         ParentTable = DtPeekSubtable ();
+         DtInsertSubtable (ParentTable, Subtable);
+ 
+-        switch (PhatHeader->Type)
++        switch (SubtableType)
+         {
+         case ACPI_PHAT_TYPE_FW_VERSION_DATA:
+ 
+             VersionData = ACPI_CAST_PTR (ACPI_PHAT_VERSION_DATA,
+                 (Subtable->Buffer - sizeof (ACPI_PHAT_HEADER)));
+-            RecordCount = VersionData->ElementCount;
++            RecordCount = AcpiUtReadUint32 (&VersionData->ElementCount);
+ 
+             while (RecordCount)
+             {
+@@ -976,6 +979,9 @@ DtCompilePhat (
+             DtFatal (ASL_MSG_UNKNOWN_SUBTABLE, *PFieldList, "PHAT");
+             return (AE_ERROR);
+         }
++
++	Tmp16 = AcpiUtReadUint16 (&PhatHeader->Length);
++	PhatHeader->Length = Tmp16;
+     }
+ 
+     return (Status);
diff --git a/acpica-tools.spec b/acpica-tools.spec
index e7722b6..afdb855 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -69,6 +69,7 @@ Patch41:	0042-Support-IVRS-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
 Patch44:	0045-CSRT-fixed-use-of-optional-ResourceInfo.patch
+Patch45:	0046-Support-PHAT-in-a-big-endian-world.patch
 
 # other miscellaneous patches
 Patch100:	unaligned.patch

From ee9acad4cb5cc8d6fb3b1e809378c5f1cac0ef1a Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Mon, 12 Jul 2021 18:01:44 -0600
Subject: [PATCH 52/82] Removed the iASL compiler manual

Somehow a copy of the iASL compiler manual crept into the acpitests
tarball in an obscure location.  Since the license is not FOSS friendly,
remove it so that it does not get distributed.

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 sources | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sources b/sources
index caad461..5aead27 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (acpitests-unix-20210604.tar.gz) = 71c1a1e485b36ece5b58c2efd14d328e451acd3721755548c7ef0d6c1a20aa6925be9f892331853e699761ec3b4ffed4d17fce7a303f5f3abece31b52b5625e2
+SHA512 (acpitests-unix-20210604.tar.gz) = 80b4676f1a9e11a7c1962eb8f292400322bbcfc91718749138c7807c7bbc38e52dd88c8e42096752e491298f4b07f6a68fa9ff2c49450be1de3abef56e8ba08a

From 59852bc27d51b72ec83f49175b65a021d59a6e1e Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Mon, 12 Jul 2021 18:08:02 -0600
Subject: [PATCH 53/82] Commit the updated sources file

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 sources | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sources b/sources
index 5aead27..74f0625 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (acpitests-unix-20210604.tar.gz) = 80b4676f1a9e11a7c1962eb8f292400322bbcfc91718749138c7807c7bbc38e52dd88c8e42096752e491298f4b07f6a68fa9ff2c49450be1de3abef56e8ba08a
+SHA512 (acpica-unix2-20210604.tar.gz) = f7f6e3c1964ffae186fe3d34b64a6251dd2e4423244c08c7e4301fd38396eac1af6e562956984a37af803ac11d5a46dd2dce88540787df353fc268002710dc62

From b457eb3d129c28def157261f8aea9d5de0f0b04a Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Mon, 12 Jul 2021 18:15:05 -0600
Subject: [PATCH 54/82] Correct a tarball name

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 acpica-tools.spec | 2 +-
 sources           | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/acpica-tools.spec b/acpica-tools.spec
index afdb855..1ba9b54 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -6,7 +6,7 @@ Summary:        ACPICA tools for the development and debug of ACPI tables
 License:        GPLv2
 URL:            https://www.acpica.org/
 
-Source0:        https://acpica.org/sites/acpica/files/acpica-unix2-%{version}.tar.gz
+Source0:        https://acpica.org/sites/acpica/files/acpica-unix2-%{version}.tar_0.gz
 Source1:        https://acpica.org/sites/acpica/files/acpitests-unix-%{version}.tar.gz
 Source2:        README.Fedora
 Source3:        iasl.1
diff --git a/sources b/sources
index 74f0625..75beb94 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-SHA512 (acpica-unix2-20210604.tar.gz) = f7f6e3c1964ffae186fe3d34b64a6251dd2e4423244c08c7e4301fd38396eac1af6e562956984a37af803ac11d5a46dd2dce88540787df353fc268002710dc62
+SHA512 (acpica-unix2-20210604.tar_0.gz) = f7f6e3c1964ffae186fe3d34b64a6251dd2e4423244c08c7e4301fd38396eac1af6e562956984a37af803ac11d5a46dd2dce88540787df353fc268002710dc62
+SHA512 (acpitests-unix-20210604.tar.gz) = 80b4676f1a9e11a7c1962eb8f292400322bbcfc91718749138c7807c7bbc38e52dd88c8e42096752e491298f4b07f6a68fa9ff2c49450be1de3abef56e8ba08a

From d9b84e63e09e25f6c132be385bae519592faf20e Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 21 Jul 2021 12:18:32 +0000
Subject: [PATCH 55/82] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

From 7f8779a500b0362f11bbd0142427709ae8720b28 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 21 Jul 2021 17:13:39 +0000
Subject: [PATCH 56/82] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 acpica-tools.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/acpica-tools.spec b/acpica-tools.spec
index 1ba9b54..23d867a 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -1,6 +1,6 @@
 Name:           acpica-tools
 Version:        20210604
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        ACPICA tools for the development and debug of ACPI tables
 
 License:        GPLv2
@@ -254,6 +254,9 @@ fi
 
 
 %changelog
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20210604-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Sun Jul 11 2021 Al Stone <ahs3@redhat.com> - 20210604-1
 - Update to 20210604 source tree (please note that tarballs for versions
   between 20200925 and 20210604 have been uploaded for archival reasons

From 3ccfccfec1fe9280ae17e878fe817a69dfa886f5 Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Tue, 27 Jul 2021 16:47:53 -0600
Subject: [PATCH 57/82] Running 'iasl -T all' would segfault

Dumping all the templates worked fine until the PHAT dump, which
caused the segfault; removing extraneous assignments from big-endian
patch for the table fixes the problem.

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 0046-Support-PHAT-in-a-big-endian-world.patch | 15 +++++++--------
 acpica-tools.spec                             |  6 +++++-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/0046-Support-PHAT-in-a-big-endian-world.patch b/0046-Support-PHAT-in-a-big-endian-world.patch
index 973286b..011e519 100644
--- a/0046-Support-PHAT-in-a-big-endian-world.patch
+++ b/0046-Support-PHAT-in-a-big-endian-world.patch
@@ -13,14 +13,15 @@ Index: acpica-unix2-20210604/source/common/dmtbdump2.c
 ===================================================================
 --- acpica-unix2-20210604.orig/source/common/dmtbdump2.c
 +++ acpica-unix2-20210604/source/common/dmtbdump2.c
-@@ -1573,39 +1573,43 @@ AcpiDmDumpPhat (
+@@ -1573,39 +1573,41 @@ AcpiDmDumpPhat (
      ACPI_PHAT_HEADER        *Subtable;
      ACPI_PHAT_VERSION_DATA  *VersionData;
      UINT32                  RecordCount;
 -    UINT32                  Length = Table->Length;
 +    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
      UINT32                  Offset = sizeof (ACPI_TABLE_PHAT);
-     UINT32                  SubtableLength;
+-    UINT32                  SubtableLength;
++    UINT16                  SubtableLength;
      UINT32                  PathLength;
      UINT32                  VendorLength;
 +    UINT16                  SubtableType;
@@ -34,9 +35,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump2.c
          /* Common subtable header */
  
 +        SubtableType = AcpiUtReadUint16 (&Subtable->Type);
-+	Subtable->Type = SubtableType;
 +        SubtableLength = AcpiUtReadUint16 (&Subtable->Length);
-+	Subtable->Length = SubtableLength;
 +
          AcpiOsPrintf ("\n");
 -        Status = AcpiDmDumpTable (Length, 0, Subtable,
@@ -63,7 +62,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump2.c
              break;
  
          default:
-@@ -1616,22 +1620,22 @@ AcpiDmDumpPhat (
+@@ -1616,22 +1618,22 @@ AcpiDmDumpPhat (
              return;
          }
  
@@ -90,7 +89,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump2.c
                      ACPI_ADD_PTR (ACPI_PHAT_HEADER, Subtable, sizeof (ACPI_PHAT_VERSION_DATA)),
                      sizeof (ACPI_PHAT_VERSION_ELEMENT), AcpiDmTableInfoPhat0a);
                  if (ACPI_FAILURE (Status))
-@@ -1649,7 +1653,7 @@ AcpiDmDumpPhat (
+@@ -1649,7 +1651,7 @@ AcpiDmDumpPhat (
              /* account for the null terminator */
  
              PathLength = strlen (ACPI_ADD_PTR (char, Subtable, sizeof (ACPI_PHAT_HEALTH_DATA))) + 1;
@@ -99,7 +98,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump2.c
                  ACPI_ADD_PTR (ACPI_PHAT_HEADER, Subtable, sizeof (ACPI_PHAT_HEALTH_DATA)),
                  PathLength, AcpiDmTableInfoPhat1a);
              if (ACPI_FAILURE (Status))
-@@ -1660,8 +1664,8 @@ AcpiDmDumpPhat (
+@@ -1660,8 +1662,8 @@ AcpiDmDumpPhat (
              /* Get vendor data - data length is the remaining subtable length */
  
              VendorLength =
@@ -110,7 +109,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump2.c
                  ACPI_ADD_PTR (ACPI_PHAT_HEADER, Subtable, sizeof (ACPI_PHAT_HEALTH_DATA) + PathLength),
                  VendorLength, AcpiDmTableInfoPhat1b);
              if (ACPI_FAILURE (Status))
-@@ -1673,15 +1677,15 @@ AcpiDmDumpPhat (
+@@ -1673,15 +1675,15 @@ AcpiDmDumpPhat (
          default:
  
              AcpiOsPrintf ("\n**** Unknown PHAT subtable type 0x%X\n\n",
diff --git a/acpica-tools.spec b/acpica-tools.spec
index 23d867a..be43d74 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -1,6 +1,6 @@
 Name:           acpica-tools
 Version:        20210604
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        ACPICA tools for the development and debug of ACPI tables
 
 License:        GPLv2
@@ -254,6 +254,10 @@ fi
 
 
 %changelog
+* Tue Jul 27 2021 Al Stone <ahs3@redhat.com> - 20210604-3
+- Running 'iasl -T all' would segfault when dumping the PHAT template;
+  fixed AcpiDmDumpPhat() by removing unnecessary assignments from patch
+
 * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20210604-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 

From 22a74012102aab80414b3c879322b6b3f2745315 Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Tue, 27 Jul 2021 18:04:30 -0600
Subject: [PATCH 58/82] Fix WPBT processing of zero-length argument lists

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 acpica-tools.spec  |   2 +
 wpbt-unicode.patch | 196 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 198 insertions(+)
 create mode 100644 wpbt-unicode.patch

diff --git a/acpica-tools.spec b/acpica-tools.spec
index be43d74..f0db397 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -89,6 +89,7 @@ Patch113:	facp.patch
 Patch114:	armv7-str-fixes.patch
 Patch115:	dbtest.patch
 Patch116:	ull-32bit.patch
+Patch117:	wpbt-unicode.patch
 
 BuildRequires: make
 BuildRequires:  bison patchutils flex gcc
@@ -257,6 +258,7 @@ fi
 * Tue Jul 27 2021 Al Stone <ahs3@redhat.com> - 20210604-3
 - Running 'iasl -T all' would segfault when dumping the PHAT template;
   fixed AcpiDmDumpPhat() by removing unnecessary assignments from patch
+- Borrowed a patch from upstream to fix Unicode usage in WPBTs
 
 * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20210604-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
diff --git a/wpbt-unicode.patch b/wpbt-unicode.patch
new file mode 100644
index 0000000..1d9c38d
--- /dev/null
+++ b/wpbt-unicode.patch
@@ -0,0 +1,196 @@
+Index: acpica-unix2-20210604/source/common/dmtable.c
+===================================================================
+--- acpica-unix2-20210604.orig/source/common/dmtable.c
++++ acpica-unix2-20210604/source/common/dmtable.c
+@@ -979,6 +979,12 @@ AcpiDmDumpTable (
+             ByteLength = 128;
+             break;
+ 
++        case ACPI_DMT_WPBT_UNICODE:
++
++            ByteLength = SubtableLength;
++            CurrentOffset = sizeof (ACPI_TABLE_WPBT);
++            break;
++
+         case ACPI_DMT_UNICODE:
+         case ACPI_DMT_BUFFER:
+         case ACPI_DMT_RAW_BUFFER:
+@@ -1596,6 +1602,7 @@ AcpiDmDumpTable (
+             break;
+ 
+         case ACPI_DMT_UNICODE:
++        case ACPI_DMT_WPBT_UNICODE:
+ 
+             if (ByteLength == 0)
+             {
+Index: acpica-unix2-20210604/source/common/dmtbdump3.c
+===================================================================
+--- acpica-unix2-20210604.orig/source/common/dmtbdump3.c
++++ acpica-unix2-20210604/source/common/dmtbdump3.c
+@@ -753,8 +753,11 @@ AcpiDmDumpWpbt (
+     Subtable = ACPI_CAST_PTR (ACPI_TABLE_WPBT, Table);
+     ArgumentsLength = AcpiUtReadUint16 (&Subtable->ArgumentsLength);
+ 
+-    /* Dump the arguments buffer */
++    /* Dump the arguments buffer if present */
+ 
+-    (void) AcpiDmDumpTable (TableLength, 0, Table, ArgumentsLength,
+-        AcpiDmTableInfoWpbt0);
++    if (ArgumentsLength)
++    {
++        (void) AcpiDmDumpTable (Table->Length, 0, Table, ArgumentsLength,
++            AcpiDmTableInfoWpbt0);
++    }
+ }
+Index: acpica-unix2-20210604/source/common/dmtbinfo3.c
+===================================================================
+--- acpica-unix2-20210604.orig/source/common/dmtbinfo3.c
++++ acpica-unix2-20210604/source/common/dmtbinfo3.c
+@@ -651,7 +651,7 @@ ACPI_DMTABLE_INFO           AcpiDmTableI
+ 
+ ACPI_DMTABLE_INFO           AcpiDmTableInfoWpbt0[] =
+ {
+-    {ACPI_DMT_UNICODE,     sizeof (ACPI_TABLE_WPBT),                "Command-line Arguments", 0},
++    {ACPI_DMT_WPBT_UNICODE, ACPI_WPBT2_OFFSET (UnicodeString),      "Command-line Arguments", DT_DESCRIBES_OPTIONAL},
+     ACPI_DMT_TERMINATOR
+ };
+ 
+Index: acpica-unix2-20210604/source/compiler/dttable2.c
+===================================================================
+--- acpica-unix2-20210604.orig/source/compiler/dttable2.c
++++ acpica-unix2-20210604/source/compiler/dttable2.c
+@@ -2615,13 +2615,11 @@ DtCompileWpbt (
+     DT_SUBTABLE             *ParentTable;
+     ACPI_TABLE_WPBT         *Table;
+     ACPI_STATUS             Status;
+-    UINT16                  Length;
+ 
+ 
+     /* Compile the main table */
+ 
+-    Status = DtCompileTable (PFieldList, AcpiDmTableInfoWpbt,
+-        &Subtable);
++    Status = DtCompileTable (PFieldList, AcpiDmTableInfoWpbt, &Subtable);
+     if (ACPI_FAILURE (Status))
+     {
+         return (Status);
+@@ -2629,11 +2627,23 @@ DtCompileWpbt (
+ 
+     ParentTable = DtPeekSubtable ();
+     DtInsertSubtable (ParentTable, Subtable);
++    Table = ACPI_CAST_PTR (ACPI_TABLE_WPBT, ParentTable->Buffer);
++
++    /*
++     * Exit now if there are no arguments specified. This is indicated by:
++     * The "Command-line Arguments" field has not been specified (if specified,
++     * it will be the last field in the field list -- after the main table).
++     * Set the Argument Length in the main table to zero.
++     */
++    if (!*PFieldList)
++    {
++        Table->ArgumentsLength = 0;
++        return (AE_OK);
++    }
+ 
+     /* Compile the argument list subtable */
+ 
+-    Status = DtCompileTable (PFieldList, AcpiDmTableInfoWpbt0,
+-        &Subtable);
++    Status = DtCompileTable (PFieldList, AcpiDmTableInfoWpbt0, &Subtable);
+     if (ACPI_FAILURE (Status))
+     {
+         return (Status);
+@@ -2641,12 +2651,8 @@ DtCompileWpbt (
+ 
+     /* Extract the length of the Arguments buffer, insert into main table */
+ 
+-    AcpiUtWriteUint (&Length, sizeof (UINT16),
++    AcpiUtWriteUint (&Table->ArgumentsLength, sizeof (UINT16),
+            &Subtable->TotalLength, sizeof (UINT32));
+-    Table = ACPI_CAST_PTR (ACPI_TABLE_WPBT, ParentTable->Buffer);
+-    Table->ArgumentsLength = AcpiUtReadUint16 (&Length);
+-
+-    ParentTable = DtPeekSubtable ();
+     DtInsertSubtable (ParentTable, Subtable);
+     return (AE_OK);
+ }
+Index: acpica-unix2-20210604/source/compiler/dtutils.c
+===================================================================
+--- acpica-unix2-20210604.orig/source/compiler/dtutils.c
++++ acpica-unix2-20210604/source/compiler/dtutils.c
+@@ -344,6 +344,7 @@ DtGetFieldType (
+         break;
+ 
+     case ACPI_DMT_UNICODE:
++    case ACPI_DMT_WPBT_UNICODE:
+ 
+         Type = DT_FIELD_TYPE_UNICODE;
+         break;
+@@ -626,12 +627,13 @@ DtGetFieldLength (
+         break;
+ 
+     case ACPI_DMT_UNICODE:
++    case ACPI_DMT_WPBT_UNICODE:
+ 
+         Value = DtGetFieldValue (Field);
+ 
+         /* TBD: error if Value is NULL? (as below?) */
+ 
+-        ByteLength = (strlen (Value) + 1) * sizeof(UINT16);
++        ByteLength = (strlen (Value) + 1) * sizeof (UINT16);
+         break;
+ 
+     default:
+Index: acpica-unix2-20210604/source/include/acdisasm.h
+===================================================================
+--- acpica-unix2-20210604.orig/source/include/acdisasm.h
++++ acpica-unix2-20210604/source/include/acdisasm.h
+@@ -175,6 +175,7 @@ typedef enum
+     ACPI_DMT_SRAT,
+     ACPI_DMT_TPM2,
+     ACPI_DMT_VIOT,
++    ACPI_DMT_WPBT_UNICODE,
+ 
+     /* Special opcodes */
+ 
+Index: acpica-unix2-20210604/source/include/actbinfo.h
+===================================================================
+--- acpica-unix2-20210604.orig/source/include/actbinfo.h
++++ acpica-unix2-20210604/source/include/actbinfo.h
+@@ -97,6 +97,7 @@
+ #define ACPI_WDDT_OFFSET(f)             (UINT16) ACPI_OFFSET (ACPI_TABLE_WDDT,f)
+ #define ACPI_WDRT_OFFSET(f)             (UINT16) ACPI_OFFSET (ACPI_TABLE_WDRT,f)
+ #define ACPI_WPBT_OFFSET(f)             (UINT16) ACPI_OFFSET (ACPI_TABLE_WPBT,f)
++#define ACPI_WPBT2_OFFSET(f)            (UINT16) ACPI_OFFSET (ACPI_WPBT_UNICODE,f)
+ #define ACPI_WSMT_OFFSET(f)             (UINT16) ACPI_OFFSET (ACPI_TABLE_WSMT,f)
+ #define ACPI_XENV_OFFSET(f)             (UINT16) ACPI_OFFSET (ACPI_TABLE_XENV,f)
+ 
+Index: acpica-unix2-20210604/source/include/actbl3.h
+===================================================================
+--- acpica-unix2-20210604.orig/source/include/actbl3.h
++++ acpica-unix2-20210604/source/include/actbl3.h
+@@ -847,6 +847,12 @@ typedef struct acpi_table_wpbt
+ 
+ } ACPI_TABLE_WPBT;
+ 
++typedef struct acpi_wpbt_unicode
++{
++    UINT16                  *UnicodeString;
++
++} ACPI_WPBT_UNICODE;
++
+ 
+ /*******************************************************************************
+  *
+Index: acpica-unix2-20210604/source/tools/acpisrc/astable.c
+===================================================================
+--- acpica-unix2-20210604.orig/source/tools/acpisrc/astable.c
++++ acpica-unix2-20210604/source/tools/acpisrc/astable.c
+@@ -772,6 +772,7 @@ ACPI_TYPED_IDENTIFIER_TABLE           Ac
+     {"ACPI_VIOT_VIRTIO_IOMMU_PCI",          SRC_TYPE_STRUCT},
+     {"ACPI_VIOT_VIRTIO_IOMMU_MMIO",         SRC_TYPE_STRUCT},
+     {"ACPI_WDAT_ENTRY",                     SRC_TYPE_STRUCT},
++    {"ACPI_WPBT_UNICODE",                   SRC_TYPE_STRUCT},
+ 
+     /* Data Table compiler */
+ 

From 6c32bdbf156a78eaf002e49028ad5be05ca672dc Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 19 Jan 2022 20:53:44 +0000
Subject: [PATCH 59/82] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 acpica-tools.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/acpica-tools.spec b/acpica-tools.spec
index f0db397..07e7481 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -1,6 +1,6 @@
 Name:           acpica-tools
 Version:        20210604
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        ACPICA tools for the development and debug of ACPI tables
 
 License:        GPLv2
@@ -255,6 +255,9 @@ fi
 
 
 %changelog
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 20210604-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Tue Jul 27 2021 Al Stone <ahs3@redhat.com> - 20210604-3
 - Running 'iasl -T all' would segfault when dumping the PHAT template;
   fixed AcpiDmDumpPhat() by removing unnecessary assignments from patch

From 5a8256ff737606227881bdb755b4a70ffca60f7d Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Wed, 9 Mar 2022 19:45:13 -0700
Subject: [PATCH 60/82] Update the patches so they apply

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 .gitignore                                    |   2 +
 ...nfrastructure-for-big-endian-support.patch |  70 +++----
 ...lity-functions-to-be-endian-agnostic.patch |  38 ++--
 ...able-header-content-in-human-readabl.patch |   6 +-
 ...able-support-for-big-endian-machines.patch |  12 +-
 ...n-ness-problem-when-converting-ASL-t.patch |   6 +-
 ...e-ACPI_COPY_NAMSEG-in-GPE-name-check.patch |   6 +-
 ...ing-Unicode-properly-when-big-endian.patch |   6 +-
 ...-MADT-aka-APIC-in-a-big-endian-world.patch |   6 +-
 ...ort-ASF-tables-in-a-big-endian-world.patch |  12 +-
 ...rt-CPEP-tables-in-a-big-endian-world.patch |  10 +-
 ...ort-DBG2-table-in-a-big-endian-world.patch |  50 ++---
 0012-Support-DMAR-in-a-big-endian-world.patch |  42 ++--
 0013-Support-DRTM-in-a-big-endian-world.patch |  28 +--
 0014-Support-EINJ-in-a-big-endian-world.patch |  10 +-
 0015-Support-ERST-in-a-big-endian-world.patch |  10 +-
 ...-FADT-aka-FACP-in-a-big-endian-world.patch |  12 +-
 ...ort-most-FPDTs-in-a-big-endian-world.patch |  22 +-
 0018-Support-GTDT-in-a-big-endian-world.patch |  20 +-
 0019-Support-HEST-in-a-big-endian-world.patch |  22 +-
 ...t-RSDT-RSD-PTR-in-a-big-endian-world.patch |   6 +-
 0021-Support-XSDT-in-a-big-endian-world.patch |   6 +-
 0022-Support-SRAT-in-a-big-endian-world.patch |   6 +-
 0023-Support-SLIT-in-a-big-endian-world.patch |  12 +-
 0024-Support-MSCT-in-a-big-endian-world.patch |   6 +-
 0025-Support-MPST-in-a-big-endian-world.patch |  12 +-
 0026-Support-NFIT-in-a-big-endian-world.patch |  20 +-
 0027-Support-SDEV-in-a-big-endian-world.patch |  12 +-
 0028-Support-HMAT-in-a-big-endian-world.patch |  44 ++--
 0029-Support-PDTT-in-a-big-endian-world.patch |   6 +-
 0030-Support-PPTT-in-a-big-endian-world.patch |  12 +-
 0031-Support-PCCT-in-a-big-endian-world.patch |   6 +-
 0032-Support-WDAT-in-a-big-endian-world.patch |   6 +-
 0033-Support-TCPA-in-a-big-endian-world.patch |  12 +-
 0034-Support-STAO-in-a-big-endian-world.patch |   6 +-
 ...-SLIC-and-MSDM-in-a-big-endian-world.patch |   6 +-
 0036-Support-MCFG-in-a-big-endian-world.patch |   6 +-
 0037-Support-LPIT-in-a-big-endian-world.patch |   6 +-
 0038-Support-PMTT-in-a-big-endian-world.patch |   6 +-
 0039-Support-TPM2-in-a-big-endian-world.patch |  12 +-
 0040-Support-S3PT-in-a-big-endian-world.patch |  12 +-
 0041-Support-IORT-in-a-big-endian-world.patch |  44 ++--
 0042-Support-IVRS-in-a-big-endian-world.patch |   6 +-
 ...port-DSDT-SSDT-in-a-big-endian-world.patch | 198 +++++++++---------
 ...T-fixed-use-of-optional-ResourceInfo.patch |  34 +--
 acpica-tools.spec                             |  15 +-
 sources                                       |   4 +-
 47 files changed, 458 insertions(+), 453 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5942001..bd2f67d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -148,3 +148,5 @@ series
 /acpica-unix2-20210604.tar_0.gz
 /acpitests-unix-20210604.tar.gz
 /acpica-unix2-20210604.tar.gz
+/acpica-unix2-20210730.tar.gz
+/acpitests-unix-20210730.tar.gz
diff --git a/0001-Add-in-basic-infrastructure-for-big-endian-support.patch b/0001-Add-in-basic-infrastructure-for-big-endian-support.patch
index 3a667ea..27278a6 100644
--- a/0001-Add-in-basic-infrastructure-for-big-endian-support.patch
+++ b/0001-Add-in-basic-infrastructure-for-big-endian-support.patch
@@ -35,10 +35,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  12 files changed, 275 insertions(+), 87 deletions(-)
  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-20210604/generate/unix/acpibin/Makefile
+--- acpica-unix2-20210730.orig/generate/unix/acpibin/Makefile
++++ acpica-unix2-20210730/generate/unix/acpibin/Makefile
 @@ -37,6 +37,7 @@ OBJECTS = \
  	$(OBJDIR)/utcache.o\
  	$(OBJDIR)/utdebug.o\
@@ -47,10 +47,10 @@ Index: acpica-unix2-20210604/generate/unix/acpibin/Makefile
  	$(OBJDIR)/utexcep.o\
  	$(OBJDIR)/utglobal.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-20210604/generate/unix/acpidump/Makefile
+--- acpica-unix2-20210730.orig/generate/unix/acpidump/Makefile
++++ acpica-unix2-20210730/generate/unix/acpidump/Makefile
 @@ -36,6 +36,7 @@ OBJECTS = \
  	$(OBJDIR)/osunixdir.o\
  	$(OBJDIR)/osunixmap.o\
@@ -59,10 +59,10 @@ Index: acpica-unix2-20210604/generate/unix/acpidump/Makefile
  	$(OBJDIR)/tbprint.o\
  	$(OBJDIR)/tbxfroot.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-20210604/generate/unix/acpiexamples/Makefile
+--- acpica-unix2-20210730.orig/generate/unix/acpiexamples/Makefile
++++ acpica-unix2-20210730/generate/unix/acpiexamples/Makefile
 @@ -139,6 +139,7 @@ OBJECTS = \
  	$(OBJDIR)/utdebug.o\
  	$(OBJDIR)/utdecode.o\
@@ -71,10 +71,10 @@ Index: acpica-unix2-20210604/generate/unix/acpiexamples/Makefile
  	$(OBJDIR)/uterror.o\
  	$(OBJDIR)/uteval.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-20210604/generate/unix/acpiexec/Makefile
+--- acpica-unix2-20210730.orig/generate/unix/acpiexec/Makefile
++++ acpica-unix2-20210730/generate/unix/acpiexec/Makefile
 @@ -214,6 +214,7 @@ OBJECTS = \
  	$(OBJDIR)/utdebug.o\
  	$(OBJDIR)/utdecode.o\
@@ -83,10 +83,10 @@ Index: acpica-unix2-20210604/generate/unix/acpiexec/Makefile
  	$(OBJDIR)/uterror.o\
  	$(OBJDIR)/uteval.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-20210604/generate/unix/acpihelp/Makefile
+--- acpica-unix2-20210730.orig/generate/unix/acpihelp/Makefile
++++ acpica-unix2-20210730/generate/unix/acpihelp/Makefile
 @@ -45,6 +45,7 @@ OBJECTS = \
  	$(OBJDIR)/getopt.o\
  	$(OBJDIR)/osunixxf.o\
@@ -95,10 +95,10 @@ Index: acpica-unix2-20210604/generate/unix/acpihelp/Makefile
  	$(OBJDIR)/utexcep.o\
  	$(OBJDIR)/utglobal.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-20210604/generate/unix/iasl/Makefile
+--- acpica-unix2-20210730.orig/generate/unix/iasl/Makefile
++++ acpica-unix2-20210730/generate/unix/iasl/Makefile
 @@ -225,6 +225,7 @@ OBJECTS = \
  	$(OBJDIR)/utdebug.o\
  	$(OBJDIR)/utdecode.o\
@@ -107,10 +107,10 @@ Index: acpica-unix2-20210604/generate/unix/iasl/Makefile
  	$(OBJDIR)/uterror.o\
  	$(OBJDIR)/utexcep.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-20210604/source/compiler/aslcompiler.h
+--- acpica-unix2-20210730.orig/source/compiler/aslcompiler.h
++++ acpica-unix2-20210730/source/compiler/aslcompiler.h
 @@ -1120,10 +1120,6 @@ BOOLEAN
  UtIsIdInteger (
      UINT8                   *Target);
@@ -122,10 +122,10 @@ Index: acpica-unix2-20210604/source/compiler/aslcompiler.h
  BOOLEAN
  UtQueryForOverwrite (
      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-20210604/source/compiler/aslutils.c
+--- acpica-unix2-20210730.orig/source/compiler/aslutils.c
++++ acpica-unix2-20210730/source/compiler/aslutils.c
 @@ -73,33 +73,6 @@ UtDisplayErrorSummary (
  
  /*******************************************************************************
@@ -160,10 +160,10 @@ Index: acpica-unix2-20210604/source/compiler/aslutils.c
   * FUNCTION:    UtIsIdInteger
   *
   * 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
-+++ acpica-unix2-20210604/source/components/utilities/utendian.c
++++ acpica-unix2-20210730/source/components/utilities/utendian.c
 @@ -0,0 +1,236 @@
 +/******************************************************************************
 + *
@@ -401,10 +401,10 @@ Index: acpica-unix2-20210604/source/components/utilities/utendian.c
 +        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-20210604/source/include/acmacros.h
+--- acpica-unix2-20210730.orig/source/include/acmacros.h
++++ acpica-unix2-20210730/source/include/acmacros.h
 @@ -76,61 +76,6 @@
   * If the hardware supports the transfer of unaligned data, just do the store.
   * 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-20210604/source/include/acutils.h
+--- acpica-unix2-20210730.orig/source/include/acutils.h
++++ acpica-unix2-20210730/source/include/acutils.h
 @@ -1167,4 +1167,36 @@ AcpiUtConvertUuidToString (
      char                    *OutString);
  #endif
@@ -516,10 +516,10 @@ Index: acpica-unix2-20210604/source/include/acutils.h
 +#endif
 +
  #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-20210604/source/include/platform/aclinux.h
+--- acpica-unix2-20210730.orig/source/include/platform/aclinux.h
++++ acpica-unix2-20210730/source/include/platform/aclinux.h
 @@ -198,6 +198,7 @@
  
  #ifdef ACPI_USE_STANDARD_HEADERS
diff --git a/0002-Modify-utility-functions-to-be-endian-agnostic.patch b/0002-Modify-utility-functions-to-be-endian-agnostic.patch
index 2f3f51e..ff08d2e 100644
--- a/0002-Modify-utility-functions-to-be-endian-agnostic.patch
+++ b/0002-Modify-utility-functions-to-be-endian-agnostic.patch
@@ -24,10 +24,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/components/tables/tbprint.c | 13 +++++++++----
  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-20210604/source/common/acfileio.c
+--- acpica-unix2-20210730.orig/source/common/acfileio.c
++++ acpica-unix2-20210730/source/common/acfileio.c
 @@ -280,6 +280,7 @@ AcGetOneTableFromFile (
      ACPI_TABLE_HEADER       *Table;
      INT32                   Count;
@@ -94,11 +94,11 @@ Index: acpica-unix2-20210604/source/common/acfileio.c
              (UINT32) (FileSize - TableOffset));
          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-20210604/source/common/dmtable.c
-@@ -591,7 +591,7 @@ AcpiDmDumpDataTable (
+--- acpica-unix2-20210730.orig/source/common/dmtable.c
++++ acpica-unix2-20210730/source/common/dmtable.c
+@@ -641,7 +641,7 @@ AcpiDmDumpDataTable (
          {
              /* 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",
                  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))
      {
@@ -116,7 +116,7 @@ Index: acpica-unix2-20210604/source/common/dmtable.c
          Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoFacs);
          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
           */
@@ -125,7 +125,7 @@ Index: acpica-unix2-20210604/source/common/dmtable.c
          Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoHeader);
          if (ACPI_FAILURE (Status))
          {
-@@ -1262,7 +1262,7 @@ AcpiDmDumpTable (
+@@ -1324,7 +1324,7 @@ AcpiDmDumpTable (
  
              AcpiOsPrintf ("%2.2X", *Target);
              Temp8 = AcpiDmGenerateChecksum (Table,
@@ -134,10 +134,10 @@ Index: acpica-unix2-20210604/source/common/dmtable.c
                  ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Checksum);
  
              if (Temp8 != ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Checksum)
-Index: acpica-unix2-20210604/source/compiler/dtfield.c
+Index: acpica-unix2-20210730/source/compiler/dtfield.c
 ===================================================================
---- acpica-unix2-20210604.orig/source/compiler/dtfield.c
-+++ acpica-unix2-20210604/source/compiler/dtfield.c
+--- acpica-unix2-20210730.orig/source/compiler/dtfield.c
++++ acpica-unix2-20210730/source/compiler/dtfield.c
 @@ -361,7 +361,7 @@ DtCompileInteger (
          DtError (ASL_ERROR, ASL_MSG_INTEGER_SIZE, Field, AslGbl_MsgBuffer);
      }
@@ -147,10 +147,10 @@ Index: acpica-unix2-20210604/source/compiler/dtfield.c
      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-20210604/source/compiler/dtsubtable.c
+--- acpica-unix2-20210730.orig/source/compiler/dtsubtable.c
++++ acpica-unix2-20210730/source/compiler/dtsubtable.c
 @@ -378,6 +378,6 @@ DtSetSubtableLength (
          return;
      }
@@ -160,10 +160,10 @@ Index: acpica-unix2-20210604/source/compiler/dtsubtable.c
 +    AcpiUtWriteUint (Subtable->LengthField, Subtable->SizeOfLengthField,
 +                     &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-20210604/source/components/tables/tbprint.c
+--- acpica-unix2-20210730.orig/source/components/tables/tbprint.c
++++ acpica-unix2-20210730/source/components/tables/tbprint.c
 @@ -44,6 +44,8 @@
  #include "acpi.h"
  #include "accommon.h"
diff --git a/0003-Always-display-table-header-content-in-human-readabl.patch b/0003-Always-display-table-header-content-in-human-readabl.patch
index 6dddba1..b1bd847 100644
--- a/0003-Always-display-table-header-content-in-human-readabl.patch
+++ b/0003-Always-display-table-header-content-in-human-readabl.patch
@@ -13,10 +13,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/tools/acpibin/abcompare.c | 7 ++++---
  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-20210604/source/tools/acpibin/abcompare.c
+--- acpica-unix2-20210730.orig/source/tools/acpibin/abcompare.c
++++ acpica-unix2-20210730/source/tools/acpibin/abcompare.c
 @@ -42,6 +42,7 @@
   */
  
diff --git a/0004-Re-enable-support-for-big-endian-machines.patch b/0004-Re-enable-support-for-big-endian-machines.patch
index 1422b26..4686ed2 100644
--- a/0004-Re-enable-support-for-big-endian-machines.patch
+++ b/0004-Re-enable-support-for-big-endian-machines.patch
@@ -13,10 +13,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/components/namespace/nsutils.c |  7 +++++--
  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-20210604/source/compiler/aslmain.c
+--- acpica-unix2-20210730.orig/source/compiler/aslmain.c
++++ acpica-unix2-20210730/source/compiler/aslmain.c
 @@ -101,18 +101,6 @@ main (
  
      signal (SIGINT, AslSignalHandler);
@@ -36,10 +36,10 @@ Index: acpica-unix2-20210604/source/compiler/aslmain.c
      AcpiOsInitialize ();
      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-20210604/source/components/namespace/nsutils.c
+--- acpica-unix2-20210730.orig/source/components/namespace/nsutils.c
++++ acpica-unix2-20210730/source/components/namespace/nsutils.c
 @@ -272,6 +272,7 @@ AcpiNsBuildInternalName (
      const char              *ExternalName = Info->NextExternalChar;
      char                    *Result = NULL;
diff --git a/0005-Correct-an-endian-ness-problem-when-converting-ASL-t.patch b/0005-Correct-an-endian-ness-problem-when-converting-ASL-t.patch
index 3074e05..6293206 100644
--- a/0005-Correct-an-endian-ness-problem-when-converting-ASL-t.patch
+++ b/0005-Correct-an-endian-ness-problem-when-converting-ASL-t.patch
@@ -9,10 +9,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/compiler/cvparser.c | 5 +++--
  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-20210604/source/compiler/cvparser.c
+--- acpica-unix2-20210730.orig/source/compiler/cvparser.c
++++ acpica-unix2-20210730/source/compiler/cvparser.c
 @@ -144,6 +144,7 @@ CvInitFileTree (
      char                    *ChildFilename = NULL;
      UINT8                   *AmlStart;
diff --git a/0006-Use-more-reliable-ACPI_COPY_NAMSEG-in-GPE-name-check.patch b/0006-Use-more-reliable-ACPI_COPY_NAMSEG-in-GPE-name-check.patch
index 7b7ed81..1ed3be3 100644
--- a/0006-Use-more-reliable-ACPI_COPY_NAMSEG-in-GPE-name-check.patch
+++ b/0006-Use-more-reliable-ACPI_COPY_NAMSEG-in-GPE-name-check.patch
@@ -8,10 +8,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/compiler/aslanalyze.c | 4 ++--
  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-20210604/source/compiler/aslanalyze.c
+--- acpica-unix2-20210730.orig/source/compiler/aslanalyze.c
++++ acpica-unix2-20210730/source/compiler/aslanalyze.c
 @@ -469,7 +469,7 @@ ApCheckForGpeNameConflict (
  
      /* Need a null-terminated string version of NameSeg */
diff --git a/0007-Handle-dumping-Unicode-properly-when-big-endian.patch b/0007-Handle-dumping-Unicode-properly-when-big-endian.patch
index ade4c9a..9fe820a 100644
--- a/0007-Handle-dumping-Unicode-properly-when-big-endian.patch
+++ b/0007-Handle-dumping-Unicode-properly-when-big-endian.patch
@@ -8,10 +8,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/common/dmtbdump.c | 11 ++++++++---
  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-20210604/source/common/dmtbdump.c
+--- acpica-unix2-20210730.orig/source/common/dmtbdump.c
++++ acpica-unix2-20210730/source/common/dmtbdump.c
 @@ -146,6 +146,8 @@ AcpiDmDumpUnicode (
      UINT8                   *Buffer;
      UINT32                  Length;
diff --git a/0008-Support-MADT-aka-APIC-in-a-big-endian-world.patch b/0008-Support-MADT-aka-APIC-in-a-big-endian-world.patch
index ad4214d..63fa133 100644
--- a/0008-Support-MADT-aka-APIC-in-a-big-endian-world.patch
+++ b/0008-Support-MADT-aka-APIC-in-a-big-endian-world.patch
@@ -8,10 +8,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/common/dmtbdump2.c | 4 ++--
  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-20210604/source/common/dmtbdump2.c
+--- acpica-unix2-20210730.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20210730/source/common/dmtbdump2.c
 @@ -763,7 +763,7 @@ AcpiDmDumpMadt (
  {
      ACPI_STATUS             Status;
diff --git a/0009-Support-ASF-tables-in-a-big-endian-world.patch b/0009-Support-ASF-tables-in-a-big-endian-world.patch
index 5e21344..1010c29 100644
--- a/0009-Support-ASF-tables-in-a-big-endian-world.patch
+++ b/0009-Support-ASF-tables-in-a-big-endian-world.patch
@@ -10,11 +10,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/common/dmtbdump1.c | 10 ++++++----
  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-20210604/source/common/dmtbdump1.c
-@@ -79,16 +79,18 @@ AcpiDmDumpAsf (
+--- acpica-unix2-20210730.orig/source/common/dmtbdump1.c
++++ acpica-unix2-20210730/source/common/dmtbdump1.c
+@@ -298,16 +298,18 @@ AcpiDmDumpAsf (
      UINT32                  DataOffset = 0;
      UINT32                  i;
      UINT8                   Type;
@@ -35,7 +35,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
              Subtable->Header.Length, AcpiDmTableInfoAsfHdr);
          if (ACPI_FAILURE (Status))
          {
-@@ -146,7 +148,7 @@ AcpiDmDumpAsf (
+@@ -365,7 +367,7 @@ AcpiDmDumpAsf (
              return;
          }
  
@@ -44,7 +44,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
              Subtable->Header.Length, InfoTable);
          if (ACPI_FAILURE (Status))
          {
-@@ -163,7 +165,7 @@ AcpiDmDumpAsf (
+@@ -382,7 +384,7 @@ AcpiDmDumpAsf (
              for (i = 0; i < DataCount; i++)
              {
                  AcpiOsPrintf ("\n");
diff --git a/0010-Support-CPEP-tables-in-a-big-endian-world.patch b/0010-Support-CPEP-tables-in-a-big-endian-world.patch
index aa677b7..9247b9b 100644
--- a/0010-Support-CPEP-tables-in-a-big-endian-world.patch
+++ b/0010-Support-CPEP-tables-in-a-big-endian-world.patch
@@ -8,11 +8,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/common/dmtbdump1.c | 4 ++--
  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-20210604/source/common/dmtbdump1.c
-@@ -319,7 +319,7 @@ AcpiDmDumpCpep (
+--- acpica-unix2-20210730.orig/source/common/dmtbdump1.c
++++ acpica-unix2-20210730/source/common/dmtbdump1.c
+@@ -538,7 +538,7 @@ AcpiDmDumpCpep (
  {
      ACPI_STATUS             Status;
      ACPI_CPEP_POLLING       *Subtable;
@@ -21,7 +21,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
      UINT32                  Offset = sizeof (ACPI_TABLE_CPEP);
  
  
-@@ -334,7 +334,7 @@ AcpiDmDumpCpep (
+@@ -553,7 +553,7 @@ AcpiDmDumpCpep (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_CPEP_POLLING, Table, Offset);
diff --git a/0011-Support-DBG2-table-in-a-big-endian-world.patch b/0011-Support-DBG2-table-in-a-big-endian-world.patch
index cc613fc..7c22228 100644
--- a/0011-Support-DBG2-table-in-a-big-endian-world.patch
+++ b/0011-Support-DBG2-table-in-a-big-endian-world.patch
@@ -9,11 +9,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/compiler/dttable1.c | 43 ++++++++++++++++++++++++--------------
  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-20210604/source/common/dmtbdump1.c
-@@ -374,7 +374,7 @@ AcpiDmDumpCsrt (
+--- acpica-unix2-20210730.orig/source/common/dmtbdump1.c
++++ acpica-unix2-20210730/source/common/dmtbdump1.c
+@@ -593,7 +593,7 @@ AcpiDmDumpCsrt (
      ACPI_CSRT_GROUP         *Subtable;
      ACPI_CSRT_SHARED_INFO   *SharedInfoTable;
      ACPI_CSRT_DESCRIPTOR    *SubSubtable;
@@ -22,7 +22,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
      UINT32                  Offset = sizeof (ACPI_TABLE_CSRT);
      UINT32                  SubOffset;
      UINT32                  SubSubOffset;
-@@ -386,7 +386,7 @@ AcpiDmDumpCsrt (
+@@ -605,7 +605,7 @@ AcpiDmDumpCsrt (
      /* Subtables (Resource Groups) */
  
      Subtable = ACPI_ADD_PTR (ACPI_CSRT_GROUP, Table, Offset);
@@ -31,7 +31,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
      {
          /* Resource group subtable */
  
-@@ -420,7 +420,7 @@ AcpiDmDumpCsrt (
+@@ -639,7 +639,7 @@ AcpiDmDumpCsrt (
              Offset + SubOffset);
  
          while ((SubOffset < Subtable->Length) &&
@@ -40,7 +40,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
          {
              AcpiOsPrintf ("\n");
              Status = AcpiDmDumpTable (Length, Offset + SubOffset, SubSubtable,
-@@ -481,12 +481,13 @@ AcpiDmDumpDbg2 (
+@@ -700,12 +700,13 @@ AcpiDmDumpDbg2 (
  {
      ACPI_STATUS             Status;
      ACPI_DBG2_DEVICE        *Subtable;
@@ -55,7 +55,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
  
  
      /* Main table */
-@@ -500,11 +501,12 @@ AcpiDmDumpDbg2 (
+@@ -719,11 +720,12 @@ AcpiDmDumpDbg2 (
      /* Subtables */
  
      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))
          {
              return;
-@@ -514,13 +516,13 @@ AcpiDmDumpDbg2 (
+@@ -733,13 +735,13 @@ AcpiDmDumpDbg2 (
  
          for (i = 0; i < Subtable->RegisterCount; i++)
          {
@@ -86,7 +86,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
              if (ACPI_FAILURE (Status))
              {
                  return;
-@@ -531,13 +533,13 @@ AcpiDmDumpDbg2 (
+@@ -750,13 +752,13 @@ AcpiDmDumpDbg2 (
  
          for (i = 0; i < Subtable->RegisterCount; i++)
          {
@@ -102,7 +102,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
              if (ACPI_FAILURE (Status))
              {
                  return;
-@@ -547,12 +549,12 @@ AcpiDmDumpDbg2 (
+@@ -766,12 +768,12 @@ AcpiDmDumpDbg2 (
          /* Dump the Namestring (required) */
  
          AcpiOsPrintf ("\n");
@@ -117,7 +117,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
          if (ACPI_FAILURE (Status))
          {
              return;
-@@ -562,8 +564,11 @@ AcpiDmDumpDbg2 (
+@@ -781,8 +783,11 @@ AcpiDmDumpDbg2 (
  
          if (Subtable->OemDataOffset)
          {
@@ -131,7 +131,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
                  AcpiDmTableInfoDbg2OemData);
              if (ACPI_FAILURE (Status))
              {
-@@ -573,9 +578,9 @@ AcpiDmDumpDbg2 (
+@@ -792,9 +797,9 @@ AcpiDmDumpDbg2 (
  
          /* 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-20210604/source/compiler/dttable1.c
-@@ -355,6 +355,7 @@ DtCompileCsrt (
+--- acpica-unix2-20210730.orig/source/compiler/dttable1.c
++++ acpica-unix2-20210730/source/compiler/dttable1.c
+@@ -572,6 +572,7 @@ DtCompileCsrt (
      DT_FIELD                **PFieldList = (DT_FIELD **) List;
      UINT32                  DescriptorCount;
      UINT32                  GroupLength;
@@ -155,7 +155,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
  
  
      /* Subtables (Resource Groups) */
-@@ -373,12 +374,13 @@ DtCompileCsrt (
+@@ -590,12 +591,13 @@ DtCompileCsrt (
  
          /* Compute the number of resource descriptors */
  
@@ -175,7 +175,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
  
          DescriptorCount = (GroupLength  /
              sizeof (ACPI_CSRT_DESCRIPTOR));
-@@ -466,6 +468,7 @@ DtCompileDbg2 (
+@@ -683,6 +685,7 @@ DtCompileDbg2 (
      ACPI_DBG2_DEVICE        *DeviceInfo;
      UINT16                  CurrentOffset;
      UINT32                  i;
@@ -183,7 +183,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
  
  
      /* Main table */
-@@ -482,10 +485,12 @@ DtCompileDbg2 (
+@@ -699,10 +702,12 @@ DtCompileDbg2 (
      /* Main table fields */
  
      Dbg2Header = ACPI_CAST_PTR (ACPI_DBG2_HEADER, Subtable->Buffer);
@@ -199,7 +199,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
      DtPushSubtable (Subtable);
  
      /* Process all Device Information subtables (Count = InfoCount) */
-@@ -512,7 +517,8 @@ DtCompileDbg2 (
+@@ -729,7 +734,8 @@ DtCompileDbg2 (
  
          /* 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++)
          {
              Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2Addr,
-@@ -528,7 +534,8 @@ DtCompileDbg2 (
+@@ -745,7 +751,8 @@ DtCompileDbg2 (
  
          /* 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++)
          {
              Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2Size,
-@@ -544,7 +551,8 @@ DtCompileDbg2 (
+@@ -761,7 +768,8 @@ DtCompileDbg2 (
  
          /* NamespaceString device identifier (Required, size = NamePathLength) */
  
@@ -229,7 +229,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
          Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2Name,
              &Subtable);
          if (ACPI_FAILURE (Status))
-@@ -554,8 +562,9 @@ DtCompileDbg2 (
+@@ -771,8 +779,9 @@ DtCompileDbg2 (
  
          /* Update the device info header */
  
@@ -241,7 +241,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
          DtInsertSubtable (ParentTable, Subtable);
  
          /* OemData - Variable-length data (Optional, size = OemDataLength) */
-@@ -582,8 +591,10 @@ DtCompileDbg2 (
+@@ -799,8 +808,10 @@ DtCompileDbg2 (
  
          if (Subtable && Subtable->Length)
          {
diff --git a/0012-Support-DMAR-in-a-big-endian-world.patch b/0012-Support-DMAR-in-a-big-endian-world.patch
index 3a3f33b..f083ef8 100644
--- a/0012-Support-DMAR-in-a-big-endian-world.patch
+++ b/0012-Support-DMAR-in-a-big-endian-world.patch
@@ -10,11 +10,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/compiler/dttable1.c | 12 +++++++-----
  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-20210604/source/common/dmtable.c
-@@ -1341,13 +1341,13 @@ AcpiDmDumpTable (
+--- acpica-unix2-20210730.orig/source/common/dmtable.c
++++ acpica-unix2-20210730/source/common/dmtable.c
+@@ -1487,13 +1487,13 @@ AcpiDmDumpTable (
  
              /* DMAR subtable types */
  
@@ -30,11 +30,11 @@ Index: acpica-unix2-20210604/source/common/dmtable.c
                  AcpiDmDmarSubnames[Temp16]);
              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-20210604/source/common/dmtbdump1.c
-@@ -604,13 +604,15 @@ AcpiDmDumpDmar (
+--- acpica-unix2-20210730.orig/source/common/dmtbdump1.c
++++ acpica-unix2-20210730/source/common/dmtbdump1.c
+@@ -823,13 +823,15 @@ AcpiDmDumpDmar (
  {
      ACPI_STATUS             Status;
      ACPI_DMAR_HEADER        *Subtable;
@@ -51,7 +51,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
  
  
      /* Main table */
-@@ -624,13 +626,14 @@ AcpiDmDumpDmar (
+@@ -843,13 +845,14 @@ AcpiDmDumpDmar (
      /* Subtables */
  
      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))
          {
              return;
-@@ -638,7 +641,8 @@ AcpiDmDumpDmar (
+@@ -857,7 +860,8 @@ AcpiDmDumpDmar (
  
          AcpiOsPrintf ("\n");
  
@@ -78,7 +78,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
          {
          case ACPI_DMAR_TYPE_HARDWARE_UNIT:
  
-@@ -673,12 +677,12 @@ AcpiDmDumpDmar (
+@@ -892,12 +896,12 @@ AcpiDmDumpDmar (
          default:
  
              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))
          {
              return;
-@@ -687,8 +691,8 @@ AcpiDmDumpDmar (
+@@ -906,8 +910,8 @@ AcpiDmDumpDmar (
          /*
           * 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 */
  
-@@ -696,7 +700,7 @@ AcpiDmDumpDmar (
+@@ -915,7 +919,7 @@ AcpiDmDumpDmar (
          }
  
          ScopeTable = ACPI_ADD_PTR (ACPI_DMAR_DEVICE_SCOPE, Subtable, ScopeOffset);
@@ -113,7 +113,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
          {
              AcpiOsPrintf ("\n");
              Status = AcpiDmDumpTable (Length, Offset + ScopeOffset, ScopeTable,
-@@ -737,9 +741,9 @@ AcpiDmDumpDmar (
+@@ -956,9 +960,9 @@ AcpiDmDumpDmar (
  NextSubtable:
          /* 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-20210604/source/compiler/dttable1.c
-@@ -634,6 +634,7 @@ DtCompileDmar (
+--- acpica-unix2-20210730.orig/source/compiler/dttable1.c
++++ acpica-unix2-20210730/source/compiler/dttable1.c
+@@ -851,6 +851,7 @@ DtCompileDmar (
      ACPI_DMAR_DEVICE_SCOPE  *DmarDeviceScope;
      UINT32                  DeviceScopeLength;
      UINT32                  PciPathLength;
@@ -137,7 +137,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
  
  
      Status = DtCompileTable (PFieldList, AcpiDmTableInfoDmar, &Subtable);
-@@ -664,7 +665,8 @@ DtCompileDmar (
+@@ -881,7 +882,8 @@ DtCompileDmar (
  
          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:
  
-@@ -711,8 +713,8 @@ DtCompileDmar (
+@@ -928,8 +930,8 @@ DtCompileDmar (
          /*
           * Optional Device Scope subtables
           */
@@ -158,7 +158,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
          {
              /* These types do not support device scopes */
  
-@@ -721,8 +723,8 @@ DtCompileDmar (
+@@ -938,8 +940,8 @@ DtCompileDmar (
          }
  
          DtPushSubtable (Subtable);
diff --git a/0013-Support-DRTM-in-a-big-endian-world.patch b/0013-Support-DRTM-in-a-big-endian-world.patch
index ac21497..e7bdcd8 100644
--- a/0013-Support-DRTM-in-a-big-endian-world.patch
+++ b/0013-Support-DRTM-in-a-big-endian-world.patch
@@ -9,11 +9,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/compiler/dttable1.c |  6 ++++--
  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-20210604/source/common/dmtbdump1.c
-@@ -770,11 +770,14 @@ AcpiDmDumpDrtm (
+--- acpica-unix2-20210730.orig/source/common/dmtbdump1.c
++++ acpica-unix2-20210730/source/common/dmtbdump1.c
+@@ -989,11 +989,14 @@ AcpiDmDumpDrtm (
      ACPI_DRTM_RESOURCE_LIST *DrtmRl;
      ACPI_DRTM_DPS_ID        *DrtmDps;
      UINT32                  Count;
@@ -29,7 +29,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
          AcpiDmTableInfoDrtm);
      if (ACPI_FAILURE (Status))
      {
-@@ -789,7 +792,7 @@ AcpiDmDumpDrtm (
+@@ -1008,7 +1011,7 @@ AcpiDmDumpDrtm (
  
      DrtmVtl = ACPI_ADD_PTR (ACPI_DRTM_VTABLE_LIST, Table, Offset);
      AcpiOsPrintf ("\n");
@@ -38,7 +38,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
          DrtmVtl, ACPI_OFFSET (ACPI_DRTM_VTABLE_LIST, ValidatedTables),
          AcpiDmTableInfoDrtm0);
      if (ACPI_FAILURE (Status))
-@@ -802,10 +805,11 @@ AcpiDmDumpDrtm (
+@@ -1021,10 +1024,11 @@ AcpiDmDumpDrtm (
      /* Dump Validated table addresses */
  
      Count = 0;
@@ -53,7 +53,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
              ACPI_ADD_PTR (void, Table, Offset), sizeof (UINT64),
              AcpiDmTableInfoDrtm0a);
          if (ACPI_FAILURE (Status))
-@@ -821,7 +825,7 @@ AcpiDmDumpDrtm (
+@@ -1040,7 +1044,7 @@ AcpiDmDumpDrtm (
  
      DrtmRl = ACPI_ADD_PTR (ACPI_DRTM_RESOURCE_LIST, Table, Offset);
      AcpiOsPrintf ("\n");
@@ -62,7 +62,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
          DrtmRl, ACPI_OFFSET (ACPI_DRTM_RESOURCE_LIST, Resources),
          AcpiDmTableInfoDrtm1);
      if (ACPI_FAILURE (Status))
-@@ -834,10 +838,11 @@ AcpiDmDumpDrtm (
+@@ -1053,10 +1057,11 @@ AcpiDmDumpDrtm (
      /* Dump the Resource List */
  
      Count = 0;
@@ -77,7 +77,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
              ACPI_ADD_PTR (void, Table, Offset),
              sizeof (ACPI_DRTM_RESOURCE), AcpiDmTableInfoDrtm1a);
          if (ACPI_FAILURE (Status))
-@@ -853,7 +858,7 @@ AcpiDmDumpDrtm (
+@@ -1072,7 +1077,7 @@ AcpiDmDumpDrtm (
  
      DrtmDps = ACPI_ADD_PTR (ACPI_DRTM_DPS_ID, Table, Offset);
      AcpiOsPrintf ("\n");
@@ -86,11 +86,11 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
          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-20210604/source/compiler/dttable1.c
-@@ -849,7 +849,8 @@ DtCompileDrtm (
+--- acpica-unix2-20210730.orig/source/compiler/dttable1.c
++++ acpica-unix2-20210730/source/compiler/dttable1.c
+@@ -1066,7 +1066,8 @@ DtCompileDrtm (
          Count++;
      }
  
@@ -100,7 +100,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
      DtPopSubtable ();
      ParentTable = DtPeekSubtable ();
  
-@@ -887,7 +888,8 @@ DtCompileDrtm (
+@@ -1104,7 +1105,8 @@ DtCompileDrtm (
          Count++;
      }
  
diff --git a/0014-Support-EINJ-in-a-big-endian-world.patch b/0014-Support-EINJ-in-a-big-endian-world.patch
index b28a42e..157cce7 100644
--- a/0014-Support-EINJ-in-a-big-endian-world.patch
+++ b/0014-Support-EINJ-in-a-big-endian-world.patch
@@ -8,11 +8,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/common/dmtbdump1.c | 4 ++--
  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-20210604/source/common/dmtbdump1.c
-@@ -882,7 +882,7 @@ AcpiDmDumpEinj (
+--- acpica-unix2-20210730.orig/source/common/dmtbdump1.c
++++ acpica-unix2-20210730/source/common/dmtbdump1.c
+@@ -1101,7 +1101,7 @@ AcpiDmDumpEinj (
  {
      ACPI_STATUS             Status;
      ACPI_WHEA_HEADER        *Subtable;
@@ -21,7 +21,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
      UINT32                  Offset = sizeof (ACPI_TABLE_EINJ);
  
  
-@@ -897,7 +897,7 @@ AcpiDmDumpEinj (
+@@ -1116,7 +1116,7 @@ AcpiDmDumpEinj (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_WHEA_HEADER, Table, Offset);
diff --git a/0015-Support-ERST-in-a-big-endian-world.patch b/0015-Support-ERST-in-a-big-endian-world.patch
index 1438b85..3e19334 100644
--- a/0015-Support-ERST-in-a-big-endian-world.patch
+++ b/0015-Support-ERST-in-a-big-endian-world.patch
@@ -8,11 +8,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/common/dmtbdump1.c | 4 ++--
  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-20210604/source/common/dmtbdump1.c
-@@ -935,7 +935,7 @@ AcpiDmDumpErst (
+--- acpica-unix2-20210730.orig/source/common/dmtbdump1.c
++++ acpica-unix2-20210730/source/common/dmtbdump1.c
+@@ -1154,7 +1154,7 @@ AcpiDmDumpErst (
  {
      ACPI_STATUS             Status;
      ACPI_WHEA_HEADER        *Subtable;
@@ -21,7 +21,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
      UINT32                  Offset = sizeof (ACPI_TABLE_ERST);
  
  
-@@ -950,7 +950,7 @@ AcpiDmDumpErst (
+@@ -1169,7 +1169,7 @@ AcpiDmDumpErst (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_WHEA_HEADER, Table, Offset);
diff --git a/0016-Support-FADT-aka-FACP-in-a-big-endian-world.patch b/0016-Support-FADT-aka-FACP-in-a-big-endian-world.patch
index 51e4257..9aa875f 100644
--- a/0016-Support-FADT-aka-FACP-in-a-big-endian-world.patch
+++ b/0016-Support-FADT-aka-FACP-in-a-big-endian-world.patch
@@ -9,10 +9,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/components/tables/tbfadt.c | 34 +++++++++++++++++++++++--------
  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-20210604/source/common/dmtbdump.c
+--- acpica-unix2-20210730.orig/source/common/dmtbdump.c
++++ acpica-unix2-20210730/source/common/dmtbdump.c
 @@ -363,11 +363,12 @@ AcpiDmDumpFadt (
      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-20210604/source/components/tables/tbfadt.c
+--- acpica-unix2-20210730.orig/source/components/tables/tbfadt.c
++++ acpica-unix2-20210730/source/components/tables/tbfadt.c
 @@ -289,7 +289,6 @@ AcpiTbSelectAddress (
      UINT32                  Address32,
      UINT64                  Address64)
diff --git a/0017-Support-most-FPDTs-in-a-big-endian-world.patch b/0017-Support-most-FPDTs-in-a-big-endian-world.patch
index abeed59..bd43520 100644
--- a/0017-Support-most-FPDTs-in-a-big-endian-world.patch
+++ b/0017-Support-most-FPDTs-in-a-big-endian-world.patch
@@ -12,11 +12,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/compiler/dttable1.c |  4 +++-
  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-20210604/source/common/dmtbdump1.c
-@@ -988,9 +988,10 @@ AcpiDmDumpFpdt (
+--- acpica-unix2-20210730.orig/source/common/dmtbdump1.c
++++ acpica-unix2-20210730/source/common/dmtbdump1.c
+@@ -1207,9 +1207,10 @@ AcpiDmDumpFpdt (
  {
      ACPI_STATUS             Status;
      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) */
-@@ -998,19 +999,20 @@ AcpiDmDumpFpdt (
+@@ -1217,19 +1218,20 @@ AcpiDmDumpFpdt (
      /* Subtables */
  
      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:
  
-@@ -1037,7 +1039,7 @@ AcpiDmDumpFpdt (
+@@ -1256,7 +1258,7 @@ AcpiDmDumpFpdt (
              goto NextSubtable;
          }
  
@@ -61,11 +61,11 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
              Subtable->Length, InfoTable);
          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-20210604/source/compiler/dttable1.c
-@@ -1125,6 +1125,7 @@ DtCompileFpdt (
+--- acpica-unix2-20210730.orig/source/compiler/dttable1.c
++++ acpica-unix2-20210730/source/compiler/dttable1.c
+@@ -1342,6 +1342,7 @@ DtCompileFpdt (
      ACPI_DMTABLE_INFO       *InfoTable;
      DT_FIELD                **PFieldList = (DT_FIELD **) List;
      DT_FIELD                *SubtableStart;
@@ -73,7 +73,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
  
  
      while (*PFieldList)
-@@ -1143,7 +1144,8 @@ DtCompileFpdt (
+@@ -1360,7 +1361,8 @@ DtCompileFpdt (
  
          FpdtHeader = ACPI_CAST_PTR (ACPI_FPDT_HEADER, Subtable->Buffer);
  
diff --git a/0018-Support-GTDT-in-a-big-endian-world.patch b/0018-Support-GTDT-in-a-big-endian-world.patch
index df3f181..8017791 100644
--- a/0018-Support-GTDT-in-a-big-endian-world.patch
+++ b/0018-Support-GTDT-in-a-big-endian-world.patch
@@ -9,11 +9,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/compiler/dttable1.c |  9 +++++++--
  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-20210604/source/common/dmtbdump1.c
-@@ -1075,7 +1075,7 @@ AcpiDmDumpGtdt (
+--- acpica-unix2-20210730.orig/source/common/dmtbdump1.c
++++ acpica-unix2-20210730/source/common/dmtbdump1.c
+@@ -1294,7 +1294,7 @@ AcpiDmDumpGtdt (
  {
      ACPI_STATUS             Status;
      ACPI_GTDT_HEADER        *Subtable;
@@ -22,7 +22,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
      UINT32                  Offset = sizeof (ACPI_TABLE_GTDT);
      ACPI_DMTABLE_INFO       *InfoTable;
      UINT32                  SubtableLength;
-@@ -1111,7 +1111,7 @@ AcpiDmDumpGtdt (
+@@ -1330,7 +1330,7 @@ AcpiDmDumpGtdt (
  
      /* Subtables */
  
@@ -31,7 +31,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
      {
          /* Common subtable header */
  
-@@ -1129,8 +1129,13 @@ AcpiDmDumpGtdt (
+@@ -1348,8 +1348,13 @@ AcpiDmDumpGtdt (
          case ACPI_GTDT_TYPE_TIMER_BLOCK:
  
              SubtableLength = sizeof (ACPI_GTDT_TIMER_BLOCK);
@@ -47,11 +47,11 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
  
              InfoTable = AcpiDmTableInfoGtdt0;
              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-20210604/source/compiler/dttable1.c
-@@ -1071,8 +1071,13 @@ DtCompileGtdt (
+--- acpica-unix2-20210730.orig/source/compiler/dttable1.c
++++ acpica-unix2-20210730/source/compiler/dttable1.c
+@@ -1288,8 +1288,13 @@ DtCompileGtdt (
              DtPushSubtable (Subtable);
              ParentTable = DtPeekSubtable ();
  
diff --git a/0019-Support-HEST-in-a-big-endian-world.patch b/0019-Support-HEST-in-a-big-endian-world.patch
index baad30e..8fcc14c 100644
--- a/0019-Support-HEST-in-a-big-endian-world.patch
+++ b/0019-Support-HEST-in-a-big-endian-world.patch
@@ -9,11 +9,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/compiler/dttable1.c |  4 +++-
  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-20210604/source/common/dmtbdump1.c
-@@ -1216,12 +1216,13 @@ AcpiDmDumpHest (
+--- acpica-unix2-20210730.orig/source/common/dmtbdump1.c
++++ acpica-unix2-20210730/source/common/dmtbdump1.c
+@@ -1435,12 +1435,13 @@ AcpiDmDumpHest (
  {
      ACPI_STATUS             Status;
      ACPI_HEST_HEADER        *Subtable;
@@ -28,7 +28,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
  
  
      /* Main table */
-@@ -1235,10 +1236,11 @@ AcpiDmDumpHest (
+@@ -1454,10 +1455,11 @@ AcpiDmDumpHest (
      /* Subtables */
  
      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:
  
-@@ -1305,7 +1307,7 @@ AcpiDmDumpHest (
+@@ -1524,7 +1526,7 @@ AcpiDmDumpHest (
              /* Cannot continue on unknown type - no length */
  
              AcpiOsPrintf ("\n**** Unknown HEST subtable type 0x%X\n",
@@ -51,11 +51,11 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
              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-20210604/source/compiler/dttable1.c
-@@ -1207,6 +1207,7 @@ DtCompileHest (
+--- acpica-unix2-20210730.orig/source/compiler/dttable1.c
++++ acpica-unix2-20210730/source/compiler/dttable1.c
+@@ -1424,6 +1424,7 @@ DtCompileHest (
      DT_FIELD                *SubtableStart;
      ACPI_DMTABLE_INFO       *InfoTable;
      UINT16                  Type;
@@ -63,7 +63,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
      UINT32                  BankCount;
  
  
-@@ -1225,7 +1226,8 @@ DtCompileHest (
+@@ -1442,7 +1443,8 @@ DtCompileHest (
          /* Get subtable type */
  
          SubtableStart = *PFieldList;
diff --git a/0020-Support-RSDT-RSD-PTR-in-a-big-endian-world.patch b/0020-Support-RSDT-RSD-PTR-in-a-big-endian-world.patch
index 6c2d0f0..b6f1812 100644
--- a/0020-Support-RSDT-RSD-PTR-in-a-big-endian-world.patch
+++ b/0020-Support-RSDT-RSD-PTR-in-a-big-endian-world.patch
@@ -8,10 +8,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/common/dmtbdump.c | 5 +++--
  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-20210604/source/common/dmtbdump.c
+--- acpica-unix2-20210730.orig/source/common/dmtbdump.c
++++ acpica-unix2-20210730/source/common/dmtbdump.c
 @@ -282,6 +282,7 @@ AcpiDmDumpRsdt (
      UINT32                  Entries;
      UINT32                  Offset;
diff --git a/0021-Support-XSDT-in-a-big-endian-world.patch b/0021-Support-XSDT-in-a-big-endian-world.patch
index 83877c5..d3bd2b7 100644
--- a/0021-Support-XSDT-in-a-big-endian-world.patch
+++ b/0021-Support-XSDT-in-a-big-endian-world.patch
@@ -8,10 +8,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/common/dmtbdump.c | 6 ++++--
  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-20210604/source/common/dmtbdump.c
+--- acpica-unix2-20210730.orig/source/common/dmtbdump.c
++++ acpica-unix2-20210730/source/common/dmtbdump.c
 @@ -323,6 +323,7 @@ AcpiDmDumpXsdt (
      UINT32                  Entries;
      UINT32                  Offset;
diff --git a/0022-Support-SRAT-in-a-big-endian-world.patch b/0022-Support-SRAT-in-a-big-endian-world.patch
index 75bcc04..123d2db 100644
--- a/0022-Support-SRAT-in-a-big-endian-world.patch
+++ b/0022-Support-SRAT-in-a-big-endian-world.patch
@@ -8,10 +8,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/common/dmtbdump3.c | 9 +++++----
  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-20210604/source/common/dmtbdump3.c
+--- acpica-unix2-20210730.orig/source/common/dmtbdump3.c
++++ acpica-unix2-20210730/source/common/dmtbdump3.c
 @@ -173,11 +173,12 @@ AcpiDmDumpSrat (
      UINT32                  Offset = sizeof (ACPI_TABLE_SRAT);
      ACPI_SUBTABLE_HEADER    *Subtable;
diff --git a/0023-Support-SLIT-in-a-big-endian-world.patch b/0023-Support-SLIT-in-a-big-endian-world.patch
index e0e324f..9f56350 100644
--- a/0023-Support-SLIT-in-a-big-endian-world.patch
+++ b/0023-Support-SLIT-in-a-big-endian-world.patch
@@ -9,10 +9,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/compiler/dttable2.c | 2 +-
  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-20210604/source/common/dmtbdump3.c
+--- acpica-unix2-20210730.orig/source/common/dmtbdump3.c
++++ acpica-unix2-20210730/source/common/dmtbdump3.c
 @@ -96,11 +96,12 @@ AcpiDmDumpSlit (
      UINT32                  Localities;
      UINT32                  i;
@@ -46,10 +46,10 @@ Index: acpica-unix2-20210604/source/common/dmtbdump3.c
              {
                  AcpiOsPrintf (
                      "\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-20210604/source/compiler/dttable2.c
+--- acpica-unix2-20210730.orig/source/compiler/dttable2.c
++++ acpica-unix2-20210730/source/compiler/dttable2.c
 @@ -1837,7 +1837,7 @@ DtCompileSlit (
      ParentTable = DtPeekSubtable ();
      DtInsertSubtable (ParentTable, Subtable);
diff --git a/0024-Support-MSCT-in-a-big-endian-world.patch b/0024-Support-MSCT-in-a-big-endian-world.patch
index bb93fe2..4f972b0 100644
--- a/0024-Support-MSCT-in-a-big-endian-world.patch
+++ b/0024-Support-MSCT-in-a-big-endian-world.patch
@@ -8,10 +8,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/common/dmtbdump2.c | 7 ++++---
  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-20210604/source/common/dmtbdump2.c
+--- acpica-unix2-20210730.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20210730/source/common/dmtbdump2.c
 @@ -1133,11 +1133,12 @@ AcpiDmDumpMsct (
      ACPI_STATUS             Status;
      UINT32                  Offset = sizeof (ACPI_TABLE_MSCT);
diff --git a/0025-Support-MPST-in-a-big-endian-world.patch b/0025-Support-MPST-in-a-big-endian-world.patch
index 600c6ec..5a12316 100644
--- a/0025-Support-MPST-in-a-big-endian-world.patch
+++ b/0025-Support-MPST-in-a-big-endian-world.patch
@@ -9,10 +9,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/compiler/dttable2.c |  8 ++++----
  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-20210604/source/common/dmtbdump2.c
+--- acpica-unix2-20210730.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20210730/source/common/dmtbdump2.c
 @@ -995,11 +995,13 @@ AcpiDmDumpMpst (
      UINT16                  SubtableCount;
      UINT32                  PowerStateCount;
@@ -117,10 +117,10 @@ Index: acpica-unix2-20210604/source/common/dmtbdump2.c
              sizeof (ACPI_MPST_POWER_DATA), AcpiDmTableInfoMpst2);
          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-20210604/source/compiler/dttable2.c
+--- acpica-unix2-20210730.orig/source/compiler/dttable2.c
++++ acpica-unix2-20210730/source/compiler/dttable2.c
 @@ -350,7 +350,7 @@ DtCompileMpst (
      DtPushSubtable (Subtable);
  
diff --git a/0026-Support-NFIT-in-a-big-endian-world.patch b/0026-Support-NFIT-in-a-big-endian-world.patch
index cf5267d..c774903 100644
--- a/0026-Support-NFIT-in-a-big-endian-world.patch
+++ b/0026-Support-NFIT-in-a-big-endian-world.patch
@@ -13,11 +13,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/compiler/dttable2.c | 11 ++++++---
  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-20210604/source/common/dmtable.c
-@@ -1526,13 +1526,13 @@ AcpiDmDumpTable (
+--- acpica-unix2-20210730.orig/source/common/dmtable.c
++++ acpica-unix2-20210730/source/common/dmtable.c
+@@ -1672,13 +1672,13 @@ AcpiDmDumpTable (
  
              /* NFIT subtable types */
  
@@ -33,10 +33,10 @@ Index: acpica-unix2-20210604/source/common/dmtable.c
                  AcpiDmNfitSubnames[Temp16]);
              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-20210604/source/common/dmtbdump2.c
+--- acpica-unix2-20210730.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20210730/source/common/dmtbdump2.c
 @@ -1192,18 +1192,23 @@ AcpiDmDumpNfit (
      ACPI_STATUS             Status;
      UINT32                  Offset = sizeof (ACPI_TABLE_NFIT);
@@ -175,10 +175,10 @@ Index: acpica-unix2-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-20210604/source/compiler/dttable2.c
+--- acpica-unix2-20210730.orig/source/compiler/dttable2.c
++++ acpica-unix2-20210730/source/compiler/dttable2.c
 @@ -497,6 +497,7 @@ DtCompileNfit (
      UINT32                  Count;
      ACPI_NFIT_INTERLEAVE    *Interleave = NULL;
diff --git a/0027-Support-SDEV-in-a-big-endian-world.patch b/0027-Support-SDEV-in-a-big-endian-world.patch
index 800098e..d933b58 100644
--- a/0027-Support-SDEV-in-a-big-endian-world.patch
+++ b/0027-Support-SDEV-in-a-big-endian-world.patch
@@ -9,10 +9,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/compiler/dttable2.c | 27 ++++++++++++++++++++-
  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-20210604/source/common/dmtbdump2.c
+--- acpica-unix2-20210730.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20210730/source/common/dmtbdump2.c
 @@ -2125,7 +2125,7 @@ AcpiDmDumpSdev (
      ACPI_SDEV_NAMESPACE         *Namesp;
      ACPI_DMTABLE_INFO           *InfoTable;
@@ -145,10 +145,10 @@ Index: acpica-unix2-20210604/source/common/dmtbdump2.c
 +            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-20210604/source/compiler/dttable2.c
+--- acpica-unix2-20210730.orig/source/compiler/dttable2.c
++++ acpica-unix2-20210730/source/compiler/dttable2.c
 @@ -1493,6 +1493,7 @@ DtCompileSdev (
      UINT32                      EntryCount;
      ACPI_SDEV_SECURE_COMPONENT  *SecureComponent = NULL;
diff --git a/0028-Support-HMAT-in-a-big-endian-world.patch b/0028-Support-HMAT-in-a-big-endian-world.patch
index eb37f70..4ee8edf 100644
--- a/0028-Support-HMAT-in-a-big-endian-world.patch
+++ b/0028-Support-HMAT-in-a-big-endian-world.patch
@@ -9,11 +9,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/compiler/dttable1.c | 24 ++++++++++---
  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-20210604/source/common/dmtbdump1.c
-@@ -1379,37 +1379,45 @@ AcpiDmDumpHmat (
+--- acpica-unix2-20210730.orig/source/common/dmtbdump1.c
++++ acpica-unix2-20210730/source/common/dmtbdump1.c
+@@ -1598,37 +1598,45 @@ AcpiDmDumpHmat (
      UINT32                  Length;
      ACPI_DMTABLE_INFO       *InfoTable;
      UINT32                  i, j;
@@ -65,7 +65,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
          {
          case ACPI_HMAT_TYPE_ADDRESS_RANGE:
  
-@@ -1432,7 +1440,7 @@ AcpiDmDumpHmat (
+@@ -1651,7 +1659,7 @@ AcpiDmDumpHmat (
          default:
  
              AcpiOsPrintf ("\n**** Unknown HMAT structure type 0x%X\n",
@@ -74,7 +74,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
  
              /* Attempt to continue */
  
-@@ -1441,13 +1449,13 @@ AcpiDmDumpHmat (
+@@ -1660,13 +1668,13 @@ AcpiDmDumpHmat (
  
          /* Dump HMAT structure body */
  
@@ -91,7 +91,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
          if (ACPI_FAILURE (Status))
          {
              return;
-@@ -1455,7 +1463,7 @@ AcpiDmDumpHmat (
+@@ -1674,7 +1682,7 @@ AcpiDmDumpHmat (
  
          /* Dump HMAT structure additionals */
  
@@ -100,7 +100,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
          {
          case ACPI_HMAT_TYPE_LOCALITY:
  
-@@ -1464,15 +1472,16 @@ AcpiDmDumpHmat (
+@@ -1683,15 +1691,16 @@ AcpiDmDumpHmat (
  
              /* Dump initiator proximity domains */
  
@@ -121,7 +121,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
                      ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, HmatStruct, SubtableOffset),
                      4, AcpiDmTableInfoHmat1a);
                  if (ACPI_FAILURE (Status))
-@@ -1485,15 +1494,16 @@ AcpiDmDumpHmat (
+@@ -1704,15 +1713,16 @@ AcpiDmDumpHmat (
  
              /* Dump target proximity domains */
  
@@ -142,7 +142,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
                      ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, HmatStruct, SubtableOffset),
                      4, AcpiDmTableInfoHmat1b);
                  if (ACPI_FAILURE (Status))
-@@ -1506,18 +1516,17 @@ AcpiDmDumpHmat (
+@@ -1725,18 +1735,17 @@ AcpiDmDumpHmat (
  
              /* Dump latency/bandwidth entris */
  
@@ -166,7 +166,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
                          ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, HmatStruct, SubtableOffset),
                          2, AcpiDmTableInfoHmat1c);
                      if (ACPI_FAILURE(Status))
-@@ -1537,15 +1546,16 @@ AcpiDmDumpHmat (
+@@ -1756,15 +1765,16 @@ AcpiDmDumpHmat (
  
              /* Dump SMBIOS handles */
  
@@ -187,7 +187,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
                      ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, HmatStruct, SubtableOffset),
                      2, AcpiDmTableInfoHmat2a);
                  if (ACPI_FAILURE (Status))
-@@ -1565,6 +1575,6 @@ AcpiDmDumpHmat (
+@@ -1784,6 +1794,6 @@ AcpiDmDumpHmat (
  NextSubtable:
          /* Point to next HMAT structure subtable */
  
@@ -195,11 +195,11 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
 +        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-20210604/source/compiler/dttable1.c
-@@ -1369,6 +1369,8 @@ DtCompileHmat (
+--- acpica-unix2-20210730.orig/source/compiler/dttable1.c
++++ acpica-unix2-20210730/source/compiler/dttable1.c
+@@ -1586,6 +1586,8 @@ DtCompileHmat (
      UINT32                  TgtPDNumber;
      UINT64                  EntryNumber;
      UINT16                  SMBIOSHandleNumber;
@@ -208,7 +208,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
  
  
      ParentTable = DtPeekSubtable ();
-@@ -1399,7 +1401,8 @@ DtCompileHmat (
+@@ -1616,7 +1618,8 @@ DtCompileHmat (
  
          /* Compile HMAT structure body */
  
@@ -218,7 +218,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
          {
          case ACPI_HMAT_TYPE_ADDRESS_RANGE:
  
-@@ -1432,7 +1435,7 @@ DtCompileHmat (
+@@ -1649,7 +1652,7 @@ DtCompileHmat (
  
          /* Compile HMAT structure additionals */
  
@@ -227,7 +227,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
          {
          case ACPI_HMAT_TYPE_LOCALITY:
  
-@@ -1458,7 +1461,7 @@ DtCompileHmat (
+@@ -1675,7 +1678,7 @@ DtCompileHmat (
                  HmatStruct->Length += Subtable->Length;
                  IntPDNumber++;
              }
@@ -236,7 +236,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
  
              /* Compile target proximity domain list */
  
-@@ -1479,7 +1482,7 @@ DtCompileHmat (
+@@ -1696,7 +1699,7 @@ DtCompileHmat (
                  HmatStruct->Length += Subtable->Length;
                  TgtPDNumber++;
              }
@@ -245,7 +245,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
  
              /* Save start of the entries for reporting errors */
  
-@@ -1505,6 +1508,9 @@ DtCompileHmat (
+@@ -1722,6 +1725,9 @@ DtCompileHmat (
                  EntryNumber++;
              }
  
@@ -255,7 +255,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
              /* Validate number of entries */
  
              if (EntryNumber !=
-@@ -1538,11 +1544,19 @@ DtCompileHmat (
+@@ -1755,11 +1761,19 @@ DtCompileHmat (
                  HmatStruct->Length += Subtable->Length;
                  SMBIOSHandleNumber++;
              }
diff --git a/0029-Support-PDTT-in-a-big-endian-world.patch b/0029-Support-PDTT-in-a-big-endian-world.patch
index 8511288..c1a0144 100644
--- a/0029-Support-PDTT-in-a-big-endian-world.patch
+++ b/0029-Support-PDTT-in-a-big-endian-world.patch
@@ -8,10 +8,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/common/dmtbdump2.c | 8 ++++----
  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-20210604/source/common/dmtbdump2.c
+--- acpica-unix2-20210730.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20210730/source/common/dmtbdump2.c
 @@ -1498,13 +1498,13 @@ AcpiDmDumpPdtt (
  {
      ACPI_STATUS             Status;
diff --git a/0030-Support-PPTT-in-a-big-endian-world.patch b/0030-Support-PPTT-in-a-big-endian-world.patch
index c4d062a..4e63eeb 100644
--- a/0030-Support-PPTT-in-a-big-endian-world.patch
+++ b/0030-Support-PPTT-in-a-big-endian-world.patch
@@ -9,10 +9,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/compiler/dttable2.c |  7 +++++--
  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-20210604/source/common/dmtbdump2.c
+--- acpica-unix2-20210730.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20210730/source/common/dmtbdump2.c
 @@ -1785,6 +1785,8 @@ AcpiDmDumpPptt (
      UINT32                  Offset = sizeof (ACPI_TABLE_FPDT);
      ACPI_DMTABLE_INFO       *InfoTable;
@@ -70,10 +70,10 @@ Index: acpica-unix2-20210604/source/common/dmtbdump2.c
                      ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Subtable, SubtableOffset),
                      4, AcpiDmTableInfoPptt0a);
                  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-20210604/source/compiler/dttable2.c
+--- acpica-unix2-20210730.orig/source/compiler/dttable2.c
++++ acpica-unix2-20210730/source/compiler/dttable2.c
 @@ -1123,6 +1123,7 @@ DtCompilePptt (
      DT_FIELD                **PFieldList = (DT_FIELD **) List;
      DT_FIELD                *SubtableStart;
diff --git a/0031-Support-PCCT-in-a-big-endian-world.patch b/0031-Support-PCCT-in-a-big-endian-world.patch
index 00d908e..7a51793 100644
--- a/0031-Support-PCCT-in-a-big-endian-world.patch
+++ b/0031-Support-PCCT-in-a-big-endian-world.patch
@@ -8,10 +8,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/common/dmtbdump2.c | 10 +++++-----
  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-20210604/source/common/dmtbdump2.c
+--- acpica-unix2-20210730.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20210730/source/common/dmtbdump2.c
 @@ -1394,13 +1394,13 @@ AcpiDmDumpPcct (
      ACPI_STATUS             Status;
      ACPI_PCCT_SUBSPACE      *Subtable;
diff --git a/0032-Support-WDAT-in-a-big-endian-world.patch b/0032-Support-WDAT-in-a-big-endian-world.patch
index d28ec57..401f038 100644
--- a/0032-Support-WDAT-in-a-big-endian-world.patch
+++ b/0032-Support-WDAT-in-a-big-endian-world.patch
@@ -8,10 +8,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/common/dmtbdump3.c | 7 ++++---
  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-20210604/source/common/dmtbdump3.c
+--- acpica-unix2-20210730.orig/source/common/dmtbdump3.c
++++ acpica-unix2-20210730/source/common/dmtbdump3.c
 @@ -675,11 +675,12 @@ AcpiDmDumpWdat (
      ACPI_STATUS             Status;
      UINT32                  Offset = sizeof (ACPI_TABLE_WDAT);
diff --git a/0033-Support-TCPA-in-a-big-endian-world.patch b/0033-Support-TCPA-in-a-big-endian-world.patch
index 21e8818..b10373a 100644
--- a/0033-Support-TCPA-in-a-big-endian-world.patch
+++ b/0033-Support-TCPA-in-a-big-endian-world.patch
@@ -9,10 +9,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/compiler/dttable2.c |  4 +++-
  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-20210604/source/common/dmtbdump3.c
+--- acpica-unix2-20210730.orig/source/common/dmtbdump3.c
++++ acpica-unix2-20210730/source/common/dmtbdump3.c
 @@ -401,11 +401,13 @@ AcpiDmDumpTcpa (
      ACPI_TABLE_TCPA_HDR     *Subtable = ACPI_ADD_PTR (
                                  ACPI_TABLE_TCPA_HDR, Table, Offset);
@@ -52,10 +52,10 @@ Index: acpica-unix2-20210604/source/common/dmtbdump3.c
          break;
  
      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-20210604/source/compiler/dttable2.c
+--- acpica-unix2-20210730.orig/source/compiler/dttable2.c
++++ acpica-unix2-20210730/source/compiler/dttable2.c
 @@ -2139,6 +2139,7 @@ DtCompileTcpa (
      ACPI_TABLE_TCPA_HDR     *TcpaHeader;
      DT_SUBTABLE             *ParentTable;
diff --git a/0034-Support-STAO-in-a-big-endian-world.patch b/0034-Support-STAO-in-a-big-endian-world.patch
index e338c5f..2fcb5e8 100644
--- a/0034-Support-STAO-in-a-big-endian-world.patch
+++ b/0034-Support-STAO-in-a-big-endian-world.patch
@@ -8,10 +8,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/common/dmtbdump3.c | 6 +++---
  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-20210604/source/common/dmtbdump3.c
+--- acpica-unix2-20210730.orig/source/common/dmtbdump3.c
++++ acpica-unix2-20210730/source/common/dmtbdump3.c
 @@ -285,14 +285,14 @@ AcpiDmDumpStao (
  {
      ACPI_STATUS             Status;
diff --git a/0035-Support-SLIC-and-MSDM-in-a-big-endian-world.patch b/0035-Support-SLIC-and-MSDM-in-a-big-endian-world.patch
index 3f8fa6d..a9f0b5b 100644
--- a/0035-Support-SLIC-and-MSDM-in-a-big-endian-world.patch
+++ b/0035-Support-SLIC-and-MSDM-in-a-big-endian-world.patch
@@ -13,10 +13,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/common/dmtbdump3.c | 6 ++++--
  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-20210604/source/common/dmtbdump3.c
+--- acpica-unix2-20210730.orig/source/common/dmtbdump3.c
++++ acpica-unix2-20210730/source/common/dmtbdump3.c
 @@ -68,9 +68,11 @@ void
  AcpiDmDumpSlic (
      ACPI_TABLE_HEADER       *Table)
diff --git a/0036-Support-MCFG-in-a-big-endian-world.patch b/0036-Support-MCFG-in-a-big-endian-world.patch
index c5a30da..634e9b8 100644
--- a/0036-Support-MCFG-in-a-big-endian-world.patch
+++ b/0036-Support-MCFG-in-a-big-endian-world.patch
@@ -8,10 +8,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/common/dmtbdump2.c | 11 ++++++-----
  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-20210604/source/common/dmtbdump2.c
+--- acpica-unix2-20210730.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20210730/source/common/dmtbdump2.c
 @@ -930,11 +930,12 @@ AcpiDmDumpMcfg (
      ACPI_STATUS             Status;
      UINT32                  Offset = sizeof (ACPI_TABLE_MCFG);
diff --git a/0037-Support-LPIT-in-a-big-endian-world.patch b/0037-Support-LPIT-in-a-big-endian-world.patch
index e5e83d3..d53a3a2 100644
--- a/0037-Support-LPIT-in-a-big-endian-world.patch
+++ b/0037-Support-LPIT-in-a-big-endian-world.patch
@@ -8,10 +8,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/common/dmtbdump2.c | 8 ++++----
  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-20210604/source/common/dmtbdump2.c
+--- acpica-unix2-20210730.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20210730/source/common/dmtbdump2.c
 @@ -690,7 +690,7 @@ AcpiDmDumpLpit (
  {
      ACPI_STATUS             Status;
diff --git a/0038-Support-PMTT-in-a-big-endian-world.patch b/0038-Support-PMTT-in-a-big-endian-world.patch
index 4c6338c..7e2bd91 100644
--- a/0038-Support-PMTT-in-a-big-endian-world.patch
+++ b/0038-Support-PMTT-in-a-big-endian-world.patch
@@ -8,10 +8,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/common/dmtbdump2.c | 18 ++++++++++--------
  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-20210604/source/common/dmtbdump2.c
+--- acpica-unix2-20210730.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20210730/source/common/dmtbdump2.c
 @@ -1686,8 +1686,9 @@ AcpiDmDumpPmtt (
  {
      ACPI_STATUS             Status;
diff --git a/0039-Support-TPM2-in-a-big-endian-world.patch b/0039-Support-TPM2-in-a-big-endian-world.patch
index 08e3522..99bdf64 100644
--- a/0039-Support-TPM2-in-a-big-endian-world.patch
+++ b/0039-Support-TPM2-in-a-big-endian-world.patch
@@ -9,10 +9,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/compiler/dttable2.c |  8 +++++---
  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-20210604/source/common/dmtbdump3.c
+--- acpica-unix2-20210730.orig/source/common/dmtbdump3.c
++++ acpica-unix2-20210730/source/common/dmtbdump3.c
 @@ -470,11 +470,12 @@ AcpiDmDumpTpm2Rev3 (
      ACPI_TABLE_TPM23        *CommonHeader = ACPI_CAST_PTR (ACPI_TABLE_TPM23, Table);
      ACPI_TPM23_TRAILER      *Subtable = ACPI_ADD_PTR (ACPI_TPM23_TRAILER, Table, Offset);
@@ -77,10 +77,10 @@ Index: acpica-unix2-20210604/source/common/dmtbdump3.c
          break;
  
      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-20210604/source/compiler/dttable2.c
+--- acpica-unix2-20210730.orig/source/compiler/dttable2.c
++++ acpica-unix2-20210730/source/compiler/dttable2.c
 @@ -2267,6 +2267,7 @@ DtCompileTpm2 (
      DT_SUBTABLE             *ParentTable;
      ACPI_STATUS             Status = AE_OK;
diff --git a/0040-Support-S3PT-in-a-big-endian-world.patch b/0040-Support-S3PT-in-a-big-endian-world.patch
index 07e0a24..9f5782d 100644
--- a/0040-Support-S3PT-in-a-big-endian-world.patch
+++ b/0040-Support-S3PT-in-a-big-endian-world.patch
@@ -8,10 +8,10 @@ Subject: [PATCH 40/45] Support S3PT in a big-endian world
  source/compiler/dttable2.c |  4 +++-
  2 files changed, 12 insertions(+), 7 deletions(-)
 
-Index: acpica-unix2-20210604/source/common/dmtbdump2.c
+Index: acpica-unix2-20210730/source/common/dmtbdump2.c
 ===================================================================
---- acpica-unix2-20210604.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20210604/source/common/dmtbdump2.c
+--- acpica-unix2-20210730.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20210730/source/common/dmtbdump2.c
 @@ -2039,6 +2039,8 @@ AcpiDmDumpS3pt (
      ACPI_FPDT_HEADER        *Subtable;
      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-20210604/source/compiler/dttable2.c
+--- acpica-unix2-20210730.orig/source/compiler/dttable2.c
++++ acpica-unix2-20210730/source/compiler/dttable2.c
 @@ -1406,6 +1406,7 @@ DtCompileS3pt (
      DT_SUBTABLE             *ParentTable;
      ACPI_DMTABLE_INFO       *InfoTable;
diff --git a/0041-Support-IORT-in-a-big-endian-world.patch b/0041-Support-IORT-in-a-big-endian-world.patch
index ccc6e77..6e10da6 100644
--- a/0041-Support-IORT-in-a-big-endian-world.patch
+++ b/0041-Support-IORT-in-a-big-endian-world.patch
@@ -9,10 +9,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/compiler/dttable1.c | 40 ++++++++++--------
  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-20210604/source/common/dmtbdump2.c
+--- acpica-unix2-20210730.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20210730/source/common/dmtbdump2.c
 @@ -77,17 +77,20 @@ AcpiDmDumpIort (
      ACPI_IORT_RMR           *IortRmr = NULL;
      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-20210604/source/compiler/dttable1.c
-@@ -1592,6 +1592,7 @@ DtCompileIort (
+--- acpica-unix2-20210730.orig/source/compiler/dttable1.c
++++ acpica-unix2-20210730/source/compiler/dttable1.c
+@@ -1809,6 +1809,7 @@ DtCompileIort (
      ACPI_IORT_ITS_GROUP     *IortItsGroup;
      ACPI_IORT_SMMU          *IortSmmu;
      ACPI_IORT_RMR           *IortRmr;
@@ -258,7 +258,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
      UINT32                  NodeNumber;
      UINT32                  NodeLength;
      UINT32                  IdMappingNumber;
-@@ -1637,7 +1638,7 @@ DtCompileIort (
+@@ -1854,7 +1855,7 @@ DtCompileIort (
       * Optionally allows the generic data types to be used for filling
       * this field.
       */
@@ -267,7 +267,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
      Status = DtCompileTable (PFieldList, AcpiDmTableInfoIortPad,
          &Subtable);
      if (ACPI_FAILURE (Status))
-@@ -1647,7 +1648,7 @@ DtCompileIort (
+@@ -1864,7 +1865,7 @@ DtCompileIort (
      if (Subtable)
      {
          DtInsertSubtable (ParentTable, Subtable);
@@ -276,7 +276,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
      }
      else
      {
-@@ -1657,7 +1658,7 @@ DtCompileIort (
+@@ -1874,7 +1875,7 @@ DtCompileIort (
          {
              return (Status);
          }
@@ -285,7 +285,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
      }
  
      NodeNumber = 0;
-@@ -1721,7 +1722,7 @@ DtCompileIort (
+@@ -1938,7 +1939,7 @@ DtCompileIort (
                  ItsNumber++;
              }
  
@@ -294,7 +294,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
              break;
  
          case ACPI_IORT_NODE_NAMED_COMPONENT:
-@@ -1755,15 +1756,18 @@ DtCompileIort (
+@@ -1972,15 +1973,18 @@ DtCompileIort (
              }
              else
              {
@@ -316,7 +316,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
                          &Subtable);
                      if (ACPI_FAILURE (Status))
                      {
-@@ -1771,7 +1775,7 @@ DtCompileIort (
+@@ -1988,7 +1992,7 @@ DtCompileIort (
                      }
  
                      DtInsertSubtable (ParentTable, Subtable);
@@ -325,7 +325,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
                  }
              }
              break;
-@@ -1804,7 +1808,7 @@ DtCompileIort (
+@@ -2021,7 +2025,7 @@ DtCompileIort (
  
              /* Compile global interrupt array */
  
@@ -334,7 +334,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
              Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3a,
                  &Subtable);
              if (ACPI_FAILURE (Status))
-@@ -1818,7 +1822,7 @@ DtCompileIort (
+@@ -2035,7 +2039,7 @@ DtCompileIort (
              /* Compile context interrupt array */
  
              ContextIrptNumber = 0;
@@ -343,7 +343,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
              while (*PFieldList)
              {
                  Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3b,
-@@ -1838,12 +1842,12 @@ DtCompileIort (
+@@ -2055,12 +2059,12 @@ DtCompileIort (
                  ContextIrptNumber++;
              }
  
@@ -358,7 +358,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
              while (*PFieldList)
              {
                  Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3c,
-@@ -1863,7 +1867,7 @@ DtCompileIort (
+@@ -2080,7 +2084,7 @@ DtCompileIort (
                  PmuIrptNumber++;
              }
  
@@ -367,7 +367,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
              break;
  
          case ACPI_IORT_NODE_SMMU_V3:
-@@ -1908,7 +1912,7 @@ DtCompileIort (
+@@ -2125,7 +2129,7 @@ DtCompileIort (
              /* Compile RMR Descriptors */
  
              RmrCount = 0;
@@ -376,7 +376,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
              while (*PFieldList)
              {
                  Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort6a,
-@@ -1928,7 +1932,7 @@ DtCompileIort (
+@@ -2145,7 +2149,7 @@ DtCompileIort (
                  RmrCount++;
              }
  
@@ -385,7 +385,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
              break;
  
  	default:
-@@ -1939,7 +1943,7 @@ DtCompileIort (
+@@ -2156,7 +2160,7 @@ DtCompileIort (
  
          /* Compile Array of ID mappings */
  
@@ -394,7 +394,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
          IdMappingNumber = 0;
          while (*PFieldList)
          {
-@@ -1960,7 +1964,7 @@ DtCompileIort (
+@@ -2177,7 +2181,7 @@ DtCompileIort (
              IdMappingNumber++;
          }
  
@@ -403,7 +403,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
          if (!IdMappingNumber)
          {
              IortNode->MappingOffset = 0;
-@@ -1975,7 +1979,7 @@ DtCompileIort (
+@@ -2192,7 +2196,7 @@ DtCompileIort (
          NodeNumber++;
      }
  
diff --git a/0042-Support-IVRS-in-a-big-endian-world.patch b/0042-Support-IVRS-in-a-big-endian-world.patch
index 6d8bab7..c9b31ef 100644
--- a/0042-Support-IVRS-in-a-big-endian-world.patch
+++ b/0042-Support-IVRS-in-a-big-endian-world.patch
@@ -8,10 +8,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/common/dmtbdump2.c | 34 +++++++++++++++++++---------------
  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-20210604/source/common/dmtbdump2.c
+--- acpica-unix2-20210730.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20210730/source/common/dmtbdump2.c
 @@ -419,11 +419,14 @@ AcpiDmDumpIvrs (
      ACPI_IVRS_DE_HEADER     *DeviceEntry;
      ACPI_IVRS_HEADER        *Subtable;
diff --git a/0043-Support-DSDT-SSDT-in-a-big-endian-world.patch b/0043-Support-DSDT-SSDT-in-a-big-endian-world.patch
index 60a1e72..1f5c3dd 100644
--- a/0043-Support-DSDT-SSDT-in-a-big-endian-world.patch
+++ b/0043-Support-DSDT-SSDT-in-a-big-endian-world.patch
@@ -42,10 +42,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/components/utilities/utresrc.c      |   2 +-
  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-20210604/source/common/adwalk.c
+--- acpica-unix2-20210730.orig/source/common/adwalk.c
++++ acpica-unix2-20210730/source/common/adwalk.c
 @@ -679,7 +679,8 @@ AcpiDmLoadDescendingOp (
  
          if (!Path && Op->Common.AmlOpcode == AML_INT_NAMEDFIELD_OP)
@@ -56,10 +56,10 @@ Index: acpica-unix2-20210604/source/common/adwalk.c
              FieldPath[4] = 0;
              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-20210604/source/common/dmrestag.c
+--- acpica-unix2-20210730.orig/source/common/dmrestag.c
++++ acpica-unix2-20210730/source/common/dmrestag.c
 @@ -1048,7 +1048,7 @@ AcpiDmAddResourcesToNamespace (
       * NextOp contains the Aml pointer and the Aml length
       */
@@ -69,10 +69,10 @@ Index: acpica-unix2-20210604/source/common/dmrestag.c
          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-20210604/source/common/dmtables.c
+--- acpica-unix2-20210730.orig/source/common/dmtables.c
++++ acpica-unix2-20210730/source/common/dmtables.c
 @@ -142,6 +142,10 @@ AdCreateTableHeader (
      ACPI_TABLE_HEADER       *Table)
  {
@@ -133,10 +133,10 @@ Index: acpica-unix2-20210604/source/common/dmtables.c
      AmlStart = ((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER));
  
      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-20210604/source/common/dmtbdump.c
+--- acpica-unix2-20210730.orig/source/common/dmtbdump.c
++++ acpica-unix2-20210730/source/common/dmtbdump.c
 @@ -338,8 +338,7 @@ AcpiDmDumpXsdt (
      for (i = 0; i < Entries; i++)
      {
@@ -147,43 +147,45 @@ Index: acpica-unix2-20210604/source/common/dmtbdump.c
          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-20210604/source/common/dmtbdump3.c
-@@ -736,13 +736,13 @@ AcpiDmDumpWpbt (
+--- acpica-unix2-20210730.orig/source/common/dmtbdump3.c
++++ acpica-unix2-20210730/source/common/dmtbdump3.c
+@@ -736,12 +736,13 @@ AcpiDmDumpWpbt (
  {
      ACPI_STATUS             Status;
      ACPI_TABLE_WPBT         *Subtable;
--    UINT32                  Length = Table->Length;
 +    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
      UINT16                  ArgumentsLength;
  
  
      /* 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);
      if (ACPI_FAILURE (Status))
      {
          return;
-@@ -751,10 +751,10 @@ AcpiDmDumpWpbt (
+@@ -750,13 +751,13 @@ AcpiDmDumpWpbt (
      /* Extract the arguments buffer length from the main table */
  
      Subtable = ACPI_CAST_PTR (ACPI_TABLE_WPBT, Table);
 -    ArgumentsLength = Subtable->ArgumentsLength;
 +    ArgumentsLength = AcpiUtReadUint16 (&Subtable->ArgumentsLength);
  
-     /* Dump the arguments buffer */
+     /* Dump the arguments buffer if present */
  
--    (void) AcpiDmDumpTable (Table->Length, 0, Table, ArgumentsLength,
-+    (void) AcpiDmDumpTable (TableLength, 0, Table, ArgumentsLength,
-         AcpiDmTableInfoWpbt0);
+     if (ArgumentsLength)
+     {
+-        (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-20210604/source/compiler/aslcodegen.c
+--- acpica-unix2-20210730.orig/source/compiler/aslcodegen.c
++++ acpica-unix2-20210730/source/compiler/aslcodegen.c
 @@ -238,6 +238,10 @@ CgWriteAmlOpcode (
  {
      UINT8                   PkgLenFirstByte;
@@ -346,10 +348,10 @@ Index: acpica-unix2-20210604/source/compiler/aslcodegen.c
          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-20210604/source/compiler/aslopcodes.c
+--- acpica-unix2-20210730.orig/source/compiler/aslopcodes.c
++++ acpica-unix2-20210730/source/compiler/aslopcodes.c
 @@ -511,7 +511,8 @@ OpcDoUnicode (
  
      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-20210604/source/compiler/aslrestype1.c
+--- acpica-unix2-20210730.orig/source/compiler/aslrestype1.c
++++ acpica-unix2-20210730/source/compiler/aslrestype1.c
 @@ -143,6 +143,7 @@ RsDoMemory24Descriptor (
      ASL_RESOURCE_NODE       *Rnode;
      UINT32                  CurrentByteOffset;
@@ -548,10 +550,10 @@ Index: acpica-unix2-20210604/source/compiler/aslrestype1.c
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (FixedMemory32.AddressLength));
              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-20210604/source/compiler/aslrestype1i.c
+--- acpica-unix2-20210730.orig/source/compiler/aslrestype1i.c
++++ acpica-unix2-20210730/source/compiler/aslrestype1i.c
 @@ -199,6 +199,7 @@ RsDoFixedDmaDescriptor (
      ASL_RESOURCE_NODE       *Rnode;
      UINT32                  CurrentByteOffset;
@@ -669,10 +671,10 @@ Index: acpica-unix2-20210604/source/compiler/aslrestype1i.c
 +    Descriptor->Irq.IrqMask = AcpiUtReadUint16(&IrqMask);
      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-20210604/source/compiler/aslrestype2.c
+--- acpica-unix2-20210730.orig/source/compiler/aslrestype2.c
++++ acpica-unix2-20210730/source/compiler/aslrestype2.c
 @@ -77,6 +77,8 @@ RsDoGeneralRegisterDescriptor (
      ASL_RESOURCE_NODE       *Rnode;
      UINT32                  CurrentByteOffset;
@@ -749,10 +751,10 @@ Index: acpica-unix2-20210604/source/compiler/aslrestype2.c
  
      /* 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-20210604/source/compiler/aslrestype2d.c
+--- acpica-unix2-20210730.orig/source/compiler/aslrestype2d.c
++++ acpica-unix2-20210730/source/compiler/aslrestype2d.c
 @@ -84,6 +84,8 @@ RsDoDwordIoDescriptor (
      UINT32                  CurrentByteOffset;
      UINT32                  i;
@@ -999,10 +1001,10 @@ Index: acpica-unix2-20210604/source/compiler/aslrestype2d.c
          Descriptor->Address32.Flags,
          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-20210604/source/compiler/aslrestype2q.c
+--- acpica-unix2-20210730.orig/source/compiler/aslrestype2q.c
++++ acpica-unix2-20210730/source/compiler/aslrestype2q.c
 @@ -84,6 +84,7 @@ RsDoQwordIoDescriptor (
      UINT32                  CurrentByteOffset;
      UINT32                  i;
@@ -1231,10 +1233,10 @@ Index: acpica-unix2-20210604/source/compiler/aslrestype2q.c
          Descriptor->Address64.Flags,
          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-20210604/source/compiler/aslrestype2w.c
+--- acpica-unix2-20210730.orig/source/compiler/aslrestype2w.c
++++ acpica-unix2-20210730/source/compiler/aslrestype2w.c
 @@ -84,6 +84,7 @@ RsDoWordIoDescriptor (
      UINT32                  CurrentByteOffset;
      UINT32                  i;
@@ -1482,24 +1484,24 @@ Index: acpica-unix2-20210604/source/compiler/aslrestype2w.c
      Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) +
          OptionIndex + StringLength;
      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-20210604/source/compiler/dttable2.c
-@@ -2635,7 +2635,8 @@ DtCompileWpbt (
+--- acpica-unix2-20210730.orig/source/compiler/dttable2.c
++++ acpica-unix2-20210730/source/compiler/dttable2.c
+@@ -2645,7 +2645,8 @@ DtCompileWpbt (
  
      /* Extract the length of the Arguments buffer, insert into main table */
  
--    Length = (UINT16) Subtable->TotalLength;
-+    AcpiUtWriteUint (&Length, sizeof (UINT16),
+-    Table->ArgumentsLength = (UINT16) Subtable->TotalLength;
++    AcpiUtWriteUint (&Table->ArgumentsLength, sizeof (UINT16),
 +           &Subtable->TotalLength, sizeof (UINT32));
-     Table = ACPI_CAST_PTR (ACPI_TABLE_WPBT, ParentTable->Buffer);
-     Table->ArgumentsLength = Length;
- 
-Index: acpica-unix2-20210604/source/components/disassembler/dmbuffer.c
+     DtInsertSubtable (ParentTable, Subtable);
+     return (AE_OK);
+ }
+Index: acpica-unix2-20210730/source/components/disassembler/dmbuffer.c
 ===================================================================
---- acpica-unix2-20210604.orig/source/components/disassembler/dmbuffer.c
-+++ acpica-unix2-20210604/source/components/disassembler/dmbuffer.c
+--- acpica-unix2-20210730.orig/source/components/disassembler/dmbuffer.c
++++ acpica-unix2-20210730/source/components/disassembler/dmbuffer.c
 @@ -204,7 +204,7 @@ AcpiDmByteList (
  
  
@@ -1589,10 +1591,10 @@ Index: acpica-unix2-20210604/source/components/disassembler/dmbuffer.c
      AcpiOsPrintf ("EisaId (\"%s\")", IdBuffer);
  
      /* 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-20210604/source/components/disassembler/dmopcode.c
+--- acpica-unix2-20210730.orig/source/components/disassembler/dmopcode.c
++++ acpica-unix2-20210730/source/components/disassembler/dmopcode.c
 @@ -778,7 +778,9 @@ AcpiDmDisassembleOneOp (
          }
          else
@@ -1649,10 +1651,10 @@ Index: acpica-unix2-20210604/source/components/disassembler/dmopcode.c
          Info->BitOffset += Offset;
  
          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-20210604/source/components/disassembler/dmresrc.c
+--- acpica-unix2-20210730.orig/source/components/disassembler/dmresrc.c
++++ acpica-unix2-20210730/source/components/disassembler/dmresrc.c
 @@ -417,7 +417,7 @@ AcpiDmIsResourceTemplate (
          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 */
  
-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-20210604/source/components/disassembler/dmresrcl.c
+--- acpica-unix2-20210730.orig/source/components/disassembler/dmresrcl.c
++++ acpica-unix2-20210730/source/components/disassembler/dmresrcl.c
 @@ -141,6 +141,8 @@ AcpiDmMemoryFields (
      UINT32                  Level)
  {
@@ -1787,10 +1789,10 @@ Index: acpica-unix2-20210604/source/components/disassembler/dmresrcl.c
      }
  
      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-20210604/source/components/disassembler/dmresrcl2.c
+--- acpica-unix2-20210730.orig/source/components/disassembler/dmresrcl2.c
++++ acpica-unix2-20210730/source/components/disassembler/dmresrcl2.c
 @@ -199,22 +199,27 @@ AcpiDmGpioCommon (
      char                    *DeviceName = NULL;
      UINT32                  PinCount;
@@ -2132,10 +2134,10 @@ Index: acpica-unix2-20210604/source/components/disassembler/dmresrcl2.c
  
      DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset);
      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-20210604/source/components/disassembler/dmresrcs.c
+--- acpica-unix2-20210730.orig/source/components/disassembler/dmresrcs.c
++++ acpica-unix2-20210730/source/components/disassembler/dmresrcs.c
 @@ -93,7 +93,7 @@ AcpiDmIrqDescriptor (
      AcpiOsPrintf (")\n");
  
@@ -2186,10 +2188,10 @@ Index: acpica-unix2-20210604/source/components/disassembler/dmresrcs.c
  
      /* 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-20210604/source/components/disassembler/dmwalk.c
+--- acpica-unix2-20210730.orig/source/components/disassembler/dmwalk.c
++++ acpica-unix2-20210730/source/components/disassembler/dmwalk.c
 @@ -1155,7 +1155,7 @@ AcpiDmAscendingOp (
          {
              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-20210604/source/components/namespace/nsaccess.c
+--- acpica-unix2-20210730.orig/source/components/namespace/nsaccess.c
++++ acpica-unix2-20210730/source/components/namespace/nsaccess.c
 @@ -644,7 +644,7 @@ AcpiNsLookup (
  
          /* 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 */
  
-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-20210604/source/components/namespace/nsnames.c
+--- acpica-unix2-20210730.orig/source/components/namespace/nsnames.c
++++ acpica-unix2-20210730/source/components/namespace/nsnames.c
 @@ -297,10 +297,10 @@ AcpiNsBuildNormalizedPath (
      {
          if (NextNode != Node)
@@ -2229,10 +2231,10 @@ Index: acpica-unix2-20210604/source/components/namespace/nsnames.c
          DoNoTrailing = NoTrailing;
          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-20210604/source/components/namespace/nsparse.c
+--- acpica-unix2-20210730.orig/source/components/namespace/nsparse.c
++++ acpica-unix2-20210730/source/components/namespace/nsparse.c
 @@ -203,6 +203,7 @@ AcpiNsOneCompleteParse (
      ACPI_WALK_STATE         *WalkState;
      ACPI_TABLE_HEADER       *Table;
@@ -2258,10 +2260,10 @@ Index: acpica-unix2-20210604/source/components/namespace/nsparse.c
  
      Status = AcpiTbGetOwnerId (TableIndex, &OwnerId);
      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-20210604/source/components/namespace/nsutils.c
+--- acpica-unix2-20210730.orig/source/components/namespace/nsutils.c
++++ acpica-unix2-20210730/source/components/namespace/nsutils.c
 @@ -272,7 +272,6 @@ AcpiNsBuildInternalName (
      const char              *ExternalName = Info->NextExternalChar;
      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 */
  
-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-20210604/source/components/utilities/utresrc.c
+--- acpica-unix2-20210730.orig/source/components/utilities/utresrc.c
++++ acpica-unix2-20210730/source/components/utilities/utresrc.c
 @@ -541,7 +541,7 @@ AcpiUtGetResourceLength (
      {
          /* 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
-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-20210604/source/compiler/aslrestype2e.c
+--- acpica-unix2-20210730.orig/source/compiler/aslrestype2e.c
++++ acpica-unix2-20210730/source/compiler/aslrestype2e.c
 @@ -80,6 +80,7 @@ RsDoExtendedIoDescriptor (
      UINT16                  StringLength = 0;
      UINT32                  CurrentByteOffset;
@@ -2573,10 +2575,10 @@ Index: acpica-unix2-20210604/source/compiler/aslrestype2e.c
          Descriptor->ExtAddress64.Flags,
          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-20210604/source/compiler/aslrestype2s.c
+--- acpica-unix2-20210730.orig/source/compiler/aslrestype2s.c
++++ acpica-unix2-20210730/source/compiler/aslrestype2s.c
 @@ -343,6 +343,7 @@ RsDoGpioIntDescriptor (
      UINT32                  CurrentByteOffset;
      UINT32                  PinCount = 0;
diff --git a/0045-CSRT-fixed-use-of-optional-ResourceInfo.patch b/0045-CSRT-fixed-use-of-optional-ResourceInfo.patch
index 45bfbb5..62866f4 100644
--- a/0045-CSRT-fixed-use-of-optional-ResourceInfo.patch
+++ b/0045-CSRT-fixed-use-of-optional-ResourceInfo.patch
@@ -12,11 +12,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/compiler/dttable1.c | 28 +++++++++++++------------
  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-20210604/source/common/dmtbdump1.c
-@@ -374,11 +374,13 @@ AcpiDmDumpCsrt (
+--- acpica-unix2-20210730.orig/source/common/dmtbdump1.c
++++ acpica-unix2-20210730/source/common/dmtbdump1.c
+@@ -593,11 +593,13 @@ AcpiDmDumpCsrt (
      ACPI_CSRT_GROUP         *Subtable;
      ACPI_CSRT_SHARED_INFO   *SharedInfoTable;
      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 */
-@@ -386,13 +388,14 @@ AcpiDmDumpCsrt (
+@@ -605,13 +607,14 @@ AcpiDmDumpCsrt (
      /* Subtables (Resource Groups) */
  
      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))
          {
              return;
-@@ -405,26 +408,28 @@ AcpiDmDumpCsrt (
+@@ -624,26 +627,28 @@ AcpiDmDumpCsrt (
              Offset + SubOffset);
  
          AcpiOsPrintf ("\n");
@@ -85,7 +85,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
              if (ACPI_FAILURE (Status))
              {
                  return;
-@@ -434,11 +439,12 @@ AcpiDmDumpCsrt (
+@@ -653,11 +658,12 @@ AcpiDmDumpCsrt (
  
              /* Resource-specific info buffer */
  
@@ -101,7 +101,7 @@ Index: acpica-unix2-20210604/source/common/dmtbdump1.c
                      InfoLength, AcpiDmTableInfoCsrt2a);
                  if (ACPI_FAILURE (Status))
                  {
-@@ -448,16 +454,15 @@ AcpiDmDumpCsrt (
+@@ -667,16 +673,15 @@ AcpiDmDumpCsrt (
  
              /* 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-20210604/source/compiler/dttable1.c
-@@ -353,14 +353,16 @@ DtCompileCsrt (
+--- acpica-unix2-20210730.orig/source/compiler/dttable1.c
++++ acpica-unix2-20210730/source/compiler/dttable1.c
+@@ -570,14 +570,16 @@ DtCompileCsrt (
      DT_SUBTABLE             *Subtable;
      DT_SUBTABLE             *ParentTable;
      DT_FIELD                **PFieldList = (DT_FIELD **) List;
@@ -144,7 +144,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
      while (*PFieldList)
      {
          /* Resource group subtable */
-@@ -375,16 +377,13 @@ DtCompileCsrt (
+@@ -592,16 +594,13 @@ DtCompileCsrt (
          /* Compute the number of resource descriptors */
  
          Tmp = AcpiUtReadUint32 (&(ACPI_CAST_PTR (ACPI_CSRT_GROUP,
@@ -163,7 +163,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
          DtInsertSubtable (ParentTable, Subtable);
          DtPushSubtable (Subtable);
          ParentTable = DtPeekSubtable ();
-@@ -399,10 +398,13 @@ DtCompileCsrt (
+@@ -616,10 +615,13 @@ DtCompileCsrt (
          }
  
          DtInsertSubtable (ParentTable, Subtable);
@@ -178,7 +178,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
          {
  
              Status = DtCompileTable (PFieldList, AcpiDmTableInfoCsrt2,
-@@ -411,6 +413,10 @@ DtCompileCsrt (
+@@ -628,6 +630,10 @@ DtCompileCsrt (
              {
                  return (Status);
              }
@@ -189,7 +189,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
  
              DtInsertSubtable (ParentTable, Subtable);
  
-@@ -420,11 +426,7 @@ DtCompileCsrt (
+@@ -637,11 +643,7 @@ DtCompileCsrt (
              {
                  Status = DtCompileTable (PFieldList, AcpiDmTableInfoCsrt2a,
                      &Subtable);
@@ -202,7 +202,7 @@ Index: acpica-unix2-20210604/source/compiler/dttable1.c
                  {
                      DtInsertSubtable (ParentTable, Subtable);
                  }
-@@ -432,7 +434,7 @@ DtCompileCsrt (
+@@ -649,7 +651,7 @@ DtCompileCsrt (
  
              DtPopSubtable ();
              ParentTable = DtPeekSubtable ();
diff --git a/acpica-tools.spec b/acpica-tools.spec
index 07e7481..4ae3f29 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -1,12 +1,12 @@
 Name:           acpica-tools
-Version:        20210604
-Release:        4%{?dist}
+Version:        20210730
+Release:        1%{?dist}
 Summary:        ACPICA tools for the development and debug of ACPI tables
 
 License:        GPLv2
 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
 Source2:        README.Fedora
 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
 Patch41:	0042-Support-IVRS-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
-Patch44:	0045-CSRT-fixed-use-of-optional-ResourceInfo.patch
-Patch45:	0046-Support-PHAT-in-a-big-endian-world.patch
+Patch43:	0045-CSRT-fixed-use-of-optional-ResourceInfo.patch
+Patch44:	0046-Support-PHAT-in-a-big-endian-world.patch
 
 # other miscellaneous patches
 Patch100:	unaligned.patch
@@ -89,7 +88,6 @@ Patch113:	facp.patch
 Patch114:	armv7-str-fixes.patch
 Patch115:	dbtest.patch
 Patch116:	ull-32bit.patch
-Patch117:	wpbt-unicode.patch
 
 BuildRequires: make
 BuildRequires:  bison patchutils flex gcc
@@ -258,6 +256,9 @@ fi
 * Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 20210604-4
 - 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
 - Running 'iasl -T all' would segfault when dumping the PHAT template;
   fixed AcpiDmDumpPhat() by removing unnecessary assignments from patch
diff --git a/sources b/sources
index 75beb94..4b7a504 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (acpica-unix2-20210604.tar_0.gz) = f7f6e3c1964ffae186fe3d34b64a6251dd2e4423244c08c7e4301fd38396eac1af6e562956984a37af803ac11d5a46dd2dce88540787df353fc268002710dc62
-SHA512 (acpitests-unix-20210604.tar.gz) = 80b4676f1a9e11a7c1962eb8f292400322bbcfc91718749138c7807c7bbc38e52dd88c8e42096752e491298f4b07f6a68fa9ff2c49450be1de3abef56e8ba08a
+SHA512 (acpica-unix2-20210730.tar.gz) = 9a8b88e44029a241cd3f26714b244723a59b7235662ecdf0c042b816495f140722aeb3897424c6f43bdddc81c141b1fa09c9645a6e0c4d860159001a65e08483
+SHA512 (acpitests-unix-20210730.tar.gz) = 4d01574f05ec1fd22d3fcdf6b5245c5670245c4edb11e8ce44fdcac73296552095539eab854cfb271abfd6409507951f0e8512ff57a74caa0e8609fef5f2035e

From da0952d3816054a01c76778255a5a6ea55012c78 Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Wed, 9 Mar 2022 20:00:17 -0700
Subject: [PATCH 61/82] Update source tarballs

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 .gitignore | 2 ++
 sources    | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index bd2f67d..7be0935 100644
--- a/.gitignore
+++ b/.gitignore
@@ -150,3 +150,5 @@ series
 /acpica-unix2-20210604.tar.gz
 /acpica-unix2-20210730.tar.gz
 /acpitests-unix-20210730.tar.gz
+/acpica-unix2-20210930.tar.gz
+/acpitests-unix-20210930.tar.gz
diff --git a/sources b/sources
index 4b7a504..391c577 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (acpica-unix2-20210730.tar.gz) = 9a8b88e44029a241cd3f26714b244723a59b7235662ecdf0c042b816495f140722aeb3897424c6f43bdddc81c141b1fa09c9645a6e0c4d860159001a65e08483
-SHA512 (acpitests-unix-20210730.tar.gz) = 4d01574f05ec1fd22d3fcdf6b5245c5670245c4edb11e8ce44fdcac73296552095539eab854cfb271abfd6409507951f0e8512ff57a74caa0e8609fef5f2035e
+SHA512 (acpica-unix2-20210930.tar.gz) = c60b744e1176530c2a6460ddf5c65b6b7acd5adda90df06747186e75ee3d83a1e86c11832aa0b4d929a0e5143a5304ab17a96bc2a77b7f13a2fc39dd1bb9b01a
+SHA512 (acpitests-unix-20210930.tar.gz) = 0f1811b21f0c1983c6608151722ce975f5ed8dd6e4f3243f6ab472a71689fcee2efe8b3072b14f796ae09506e3df388187e87047ad26c539a04811b2b601de53

From b0419b13c7d56f0af12aff1f8b312c3a50302238 Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Wed, 9 Mar 2022 20:05:58 -0700
Subject: [PATCH 62/82] Update 20211217 tarballs

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 .gitignore | 2 ++
 sources    | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7be0935..f0d850d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -152,3 +152,5 @@ series
 /acpitests-unix-20210730.tar.gz
 /acpica-unix2-20210930.tar.gz
 /acpitests-unix-20210930.tar.gz
+/acpica-unix2-20211217.tar.gz
+/acpitests-unix-20211217.tar.gz
diff --git a/sources b/sources
index 391c577..ad07293 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (acpica-unix2-20210930.tar.gz) = c60b744e1176530c2a6460ddf5c65b6b7acd5adda90df06747186e75ee3d83a1e86c11832aa0b4d929a0e5143a5304ab17a96bc2a77b7f13a2fc39dd1bb9b01a
-SHA512 (acpitests-unix-20210930.tar.gz) = 0f1811b21f0c1983c6608151722ce975f5ed8dd6e4f3243f6ab472a71689fcee2efe8b3072b14f796ae09506e3df388187e87047ad26c539a04811b2b601de53
+SHA512 (acpica-unix2-20211217.tar.gz) = e8e6e4f4543205d2ed9c8fe2b49c8952272d4a1b066018327660c6a4e0fd018d3144e18a759784b6b4a37efe726ec0c61ff36026a1021cdcba6c7627e105385d
+SHA512 (acpitests-unix-20211217.tar.gz) = 1dd73746accc78118477d57b01c43d60df02c8a3cea4ebba8ea2dac85871193debe359437f4cd25a3662520063f5f4a28f5e3fdfc3bc979fdd8a136fee7e43ac

From 97df1c2ef7772c22f4e1a09978886167dfbdbb73 Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Fri, 18 Mar 2022 16:08:40 -0600
Subject: [PATCH 63/82] Update all patches to match upstream 20211217 release

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 ...lity-functions-to-be-endian-agnostic.patch |  46 ++---
 ...ing-Unicode-properly-when-big-endian.patch |  14 +-
 ...ort-ASF-tables-in-a-big-endian-world.patch |  12 +-
 ...rt-CPEP-tables-in-a-big-endian-world.patch |  10 +-
 ...ort-DBG2-table-in-a-big-endian-world.patch |  32 ++--
 0012-Support-DMAR-in-a-big-endian-world.patch |  34 ++--
 0013-Support-DRTM-in-a-big-endian-world.patch |  24 +--
 0014-Support-EINJ-in-a-big-endian-world.patch |  10 +-
 0015-Support-ERST-in-a-big-endian-world.patch |  10 +-
 ...-FADT-aka-FACP-in-a-big-endian-world.patch |  24 +--
 ...ort-most-FPDTs-in-a-big-endian-world.patch |  18 +-
 0018-Support-GTDT-in-a-big-endian-world.patch |  18 +-
 0019-Support-HEST-in-a-big-endian-world.patch |  18 +-
 ...t-RSDT-RSD-PTR-in-a-big-endian-world.patch |  10 +-
 0021-Support-XSDT-in-a-big-endian-world.patch |  10 +-
 0022-Support-SRAT-in-a-big-endian-world.patch |   8 +-
 0023-Support-SLIT-in-a-big-endian-world.patch |  14 +-
 0024-Support-MSCT-in-a-big-endian-world.patch |   6 +-
 0026-Support-NFIT-in-a-big-endian-world.patch |  20 +-
 0027-Support-SDEV-in-a-big-endian-world.patch |  38 ++--
 0028-Support-HMAT-in-a-big-endian-world.patch |  30 +--
 0029-Support-PDTT-in-a-big-endian-world.patch |  10 +-
 0030-Support-PPTT-in-a-big-endian-world.patch |  28 +--
 0031-Support-PCCT-in-a-big-endian-world.patch |  12 +-
 0032-Support-WDAT-in-a-big-endian-world.patch |  10 +-
 0033-Support-TCPA-in-a-big-endian-world.patch |  20 +-
 0034-Support-STAO-in-a-big-endian-world.patch |  10 +-
 ...-SLIC-and-MSDM-in-a-big-endian-world.patch |   6 +-
 0038-Support-PMTT-in-a-big-endian-world.patch |  18 +-
 0039-Support-TPM2-in-a-big-endian-world.patch |  32 ++--
 0040-Support-S3PT-in-a-big-endian-world.patch |  26 +--
 ...port-DSDT-SSDT-in-a-big-endian-world.patch | 176 +++++++++---------
 ...T-fixed-use-of-optional-ResourceInfo.patch |  22 +--
 0046-Support-PHAT-in-a-big-endian-world.patch |  30 +--
 acpica-tools.spec                             |  21 ++-
 armv7-str-fixes.patch                         |   8 +-
 badcode.asl.result                            |   4 +-
 facp.patch                                    |  28 ---
 grammar.asl.result                            | 125 +++++++------
 ull-32bit.patch                               |   8 +-
 40 files changed, 498 insertions(+), 502 deletions(-)
 delete mode 100644 facp.patch

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

From b8d03463ff688f3eafbac20e5a1e9f11a522f2f0 Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Fri, 18 Mar 2022 16:09:50 -0600
Subject: [PATCH 64/82] Add two new patches to correct compilation errors in
 rawhide

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 dangling-ptr.patch | 24 ++++++++++++++++++++++++
 uuid-len.patch     | 12 ++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 dangling-ptr.patch
 create mode 100644 uuid-len.patch

diff --git a/dangling-ptr.patch b/dangling-ptr.patch
new file mode 100644
index 0000000..582fb9e
--- /dev/null
+++ b/dangling-ptr.patch
@@ -0,0 +1,24 @@
+diff -Naur acpica-unix2-20211217/source/components/utilities/utdebug.c acpica-unix2-20211217.orig/source/components/utilities/utdebug.c
+--- acpica-unix2-20211217/source/components/utilities/utdebug.c	2022-03-15 17:05:07.992387565 -0600
++++ acpica-unix2-20211217.orig/source/components/utilities/utdebug.c	2021-12-17 10:48:16.000000000 -0700
+@@ -58,6 +58,10 @@
+ static const char           *AcpiGbl_FunctionExitPrefix  = "----Exit-";
+ 
+ 
++#if defined(__GNUC__) && (__GNUC__ > 11)
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wdangling-pointer"
++#endif
+ /*******************************************************************************
+  *
+  * FUNCTION:    AcpiUtInitStackPtrTrace
+@@ -114,6 +110,9 @@
+         AcpiGbl_DeepestNesting = AcpiGbl_NestingLevel;
+     }
+ }
++#if defined(__GNUC__) && (__GNUC__ > 11)
++#pragma GCC diagnostic pop
++#endif
+ 
+ 
+ /*******************************************************************************
diff --git a/uuid-len.patch b/uuid-len.patch
new file mode 100644
index 0000000..26fd798
--- /dev/null
+++ b/uuid-len.patch
@@ -0,0 +1,12 @@
+diff -Naur acpica-unix2-20211217.orig/source/tools/acpiexec/aeregion.c acpica-unix2-20211217/source/tools/acpiexec/aeregion.c
+--- acpica-unix2-20211217.orig/source/tools/acpiexec/aeregion.c	2021-12-17 10:48:17.000000000 -0700
++++ acpica-unix2-20211217/source/tools/acpiexec/aeregion.c	2022-03-18 15:53:25.032687782 -0600
+@@ -97,7 +97,7 @@
+     UINT32                  Value1;
+     UINT32                  Value2;
+     ACPI_RESOURCE           *Resource;
+-    char                    Uuid[ACPI_PRM_INPUT_BUFFER_SIZE + 1];
++    char                    Uuid[UUID_STRING_LENGTH + 1];
+ 
+ 
+     ACPI_FUNCTION_NAME (AeRegionHandler);

From cf71d6aebb24950c029c6ecbbf253a33d924db08 Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Mon, 28 Mar 2022 20:37:18 -0600
Subject: [PATCH 65/82] Stop supporting i686 architecture

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 acpica-tools.spec | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/acpica-tools.spec b/acpica-tools.spec
index 0af4295..a2c8772 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -1,11 +1,13 @@
 Name:           acpica-tools
 Version:        20211217
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        ACPICA tools for the development and debug of ACPI tables
 
 License:        GPLv2
 URL:            https://www.acpica.org/
 
+ExcludeArch:	i686
+
 Source0:        https://acpica.org/sites/acpica/files/acpica-unix2-%{version}.tar.gz
 Source1:        https://acpica.org/sites/acpica/files/acpitests-unix-%{version}.tar.gz
 Source2:        README.Fedora
@@ -254,6 +256,11 @@ fi
 
 
 %changelog
+* Mon Mar 28 2022 Al Stone <ahs3@redhat.com> - 20211217-2
+- Stop building i686; it is the only Arch that stumbles across a problem
+  in using varargs but since the Arch has been essentially deprecated,
+  take this as an opportunity to finally drop support for it.
+
 * Fri Mar 18 2022 Al Stone <ahs3@redhat.com> - 20211217-1
 - Update to 20211217 upstream source.  Bring all the patches up to date.
 - Rawhide use of GCC 12 introduces a new check for dangling pointers which

From fc3eef63e813ae93feb4ceb7316ceab1ea3f1f35 Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Sun, 3 Apr 2022 15:18:02 -0600
Subject: [PATCH 66/82] Update to 20220331 upstream sources

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

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 .gitignore                                    |   2 +
 ...nfrastructure-for-big-endian-support.patch |  72 ++++----
 ...lity-functions-to-be-endian-agnostic.patch |  38 ++--
 ...able-header-content-in-human-readabl.patch |   6 +-
 ...able-support-for-big-endian-machines.patch |  12 +-
 ...n-ness-problem-when-converting-ASL-t.patch |   6 +-
 ...e-ACPI_COPY_NAMSEG-in-GPE-name-check.patch |   6 +-
 ...ing-Unicode-properly-when-big-endian.patch |   6 +-
 ...-MADT-aka-APIC-in-a-big-endian-world.patch |  12 +-
 ...ort-ASF-tables-in-a-big-endian-world.patch |  12 +-
 ...rt-CPEP-tables-in-a-big-endian-world.patch |  10 +-
 ...ort-DBG2-table-in-a-big-endian-world.patch |  50 ++---
 0012-Support-DMAR-in-a-big-endian-world.patch |  42 ++---
 0013-Support-DRTM-in-a-big-endian-world.patch |  28 +--
 0014-Support-EINJ-in-a-big-endian-world.patch |  10 +-
 0015-Support-ERST-in-a-big-endian-world.patch |  10 +-
 ...-FADT-aka-FACP-in-a-big-endian-world.patch |  12 +-
 ...ort-most-FPDTs-in-a-big-endian-world.patch |  22 +--
 0018-Support-GTDT-in-a-big-endian-world.patch |  20 +-
 0019-Support-HEST-in-a-big-endian-world.patch |  22 +--
 ...t-RSDT-RSD-PTR-in-a-big-endian-world.patch |   6 +-
 0021-Support-XSDT-in-a-big-endian-world.patch |   6 +-
 0022-Support-SRAT-in-a-big-endian-world.patch |   6 +-
 0023-Support-SLIT-in-a-big-endian-world.patch |  14 +-
 0024-Support-MSCT-in-a-big-endian-world.patch |  10 +-
 0025-Support-MPST-in-a-big-endian-world.patch |  32 ++--
 0026-Support-NFIT-in-a-big-endian-world.patch |  46 ++---
 0027-Support-SDEV-in-a-big-endian-world.patch |  38 ++--
 0028-Support-HMAT-in-a-big-endian-world.patch |  44 ++---
 0029-Support-PDTT-in-a-big-endian-world.patch |  10 +-
 0030-Support-PPTT-in-a-big-endian-world.patch |  28 +--
 0031-Support-PCCT-in-a-big-endian-world.patch |  12 +-
 0032-Support-WDAT-in-a-big-endian-world.patch |   6 +-
 0033-Support-TCPA-in-a-big-endian-world.patch |  16 +-
 0034-Support-STAO-in-a-big-endian-world.patch |   6 +-
 ...-SLIC-and-MSDM-in-a-big-endian-world.patch |   6 +-
 0036-Support-MCFG-in-a-big-endian-world.patch |  10 +-
 0037-Support-LPIT-in-a-big-endian-world.patch |   6 +-
 0038-Support-PMTT-in-a-big-endian-world.patch |  18 +-
 0039-Support-TPM2-in-a-big-endian-world.patch |  20 +-
 0040-Support-S3PT-in-a-big-endian-world.patch |  26 +--
 0041-Support-IORT-in-a-big-endian-world.patch |  46 ++---
 0042-Support-IVRS-in-a-big-endian-world.patch |   6 +-
 ...port-DSDT-SSDT-in-a-big-endian-world.patch | 172 +++++++++---------
 ...T-fixed-use-of-optional-ResourceInfo.patch |  34 ++--
 0046-Support-PHAT-in-a-big-endian-world.patch |  30 +--
 0047-Support-PRMT-in-a-big-endian-world.patch |  51 ++++++
 0048-Support-RGRT-in-a-big-endian-world.patch |  35 ++++
 0049-Support-SVKL-in-a-big-endian-world.patch |  42 +++++
 OPT_LDFLAGS.patch                             |   6 +-
 acpica-tools.spec                             |  12 +-
 arm7hl.patch                                  |   6 +-
 armv7-str-fixes.patch                         |   8 +-
 badcode.asl.result                            |   4 +-
 converterSample.asl.result                    |   9 +-
 cve-2017-13693.patch                          |   6 +-
 cve-2017-13694.patch                          |   6 +-
 cve-2017-13695.patch                          |   6 +-
 dbtest.patch                                  |   6 +-
 f23-harden.patch                              |  12 +-
 grammar.asl.result                            |   4 +-
 int-format.patch                              |  94 +++++-----
 mips-be-fix.patch                             |   6 +-
 ptr-cast.patch                                |  12 +-
 simple-64bit.patch                            |   8 +-
 sources                                       |   4 +-
 str-trunc-warn.patch                          |  18 +-
 template.patch                                |   6 +-
 ull-32bit.patch                               |   6 +-
 unaligned.patch                               |  12 +-
 70 files changed, 783 insertions(+), 648 deletions(-)
 create mode 100644 0047-Support-PRMT-in-a-big-endian-world.patch
 create mode 100644 0048-Support-RGRT-in-a-big-endian-world.patch
 create mode 100644 0049-Support-SVKL-in-a-big-endian-world.patch

diff --git a/.gitignore b/.gitignore
index f0d850d..8d6a67f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -154,3 +154,5 @@ series
 /acpitests-unix-20210930.tar.gz
 /acpica-unix2-20211217.tar.gz
 /acpitests-unix-20211217.tar.gz
+/acpica-unix2-20220331.tar.gz
+/acpitests-unix-20220331.tar.gz
diff --git a/0001-Add-in-basic-infrastructure-for-big-endian-support.patch b/0001-Add-in-basic-infrastructure-for-big-endian-support.patch
index 27278a6..4e12c34 100644
--- a/0001-Add-in-basic-infrastructure-for-big-endian-support.patch
+++ b/0001-Add-in-basic-infrastructure-for-big-endian-support.patch
@@ -35,10 +35,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  12 files changed, 275 insertions(+), 87 deletions(-)
  create mode 100644 source/components/utilities/utendian.c
 
-Index: acpica-unix2-20210730/generate/unix/acpibin/Makefile
+Index: acpica-unix2-20220331/generate/unix/acpibin/Makefile
 ===================================================================
---- acpica-unix2-20210730.orig/generate/unix/acpibin/Makefile
-+++ acpica-unix2-20210730/generate/unix/acpibin/Makefile
+--- acpica-unix2-20220331.orig/generate/unix/acpibin/Makefile
++++ acpica-unix2-20220331/generate/unix/acpibin/Makefile
 @@ -37,6 +37,7 @@ OBJECTS = \
  	$(OBJDIR)/utcache.o\
  	$(OBJDIR)/utdebug.o\
@@ -47,10 +47,10 @@ Index: acpica-unix2-20210730/generate/unix/acpibin/Makefile
  	$(OBJDIR)/utexcep.o\
  	$(OBJDIR)/utglobal.o\
  	$(OBJDIR)/utlock.o\
-Index: acpica-unix2-20210730/generate/unix/acpidump/Makefile
+Index: acpica-unix2-20220331/generate/unix/acpidump/Makefile
 ===================================================================
---- acpica-unix2-20210730.orig/generate/unix/acpidump/Makefile
-+++ acpica-unix2-20210730/generate/unix/acpidump/Makefile
+--- acpica-unix2-20220331.orig/generate/unix/acpidump/Makefile
++++ acpica-unix2-20220331/generate/unix/acpidump/Makefile
 @@ -36,6 +36,7 @@ OBJECTS = \
  	$(OBJDIR)/osunixdir.o\
  	$(OBJDIR)/osunixmap.o\
@@ -59,10 +59,10 @@ Index: acpica-unix2-20210730/generate/unix/acpidump/Makefile
  	$(OBJDIR)/tbprint.o\
  	$(OBJDIR)/tbxfroot.o\
  	$(OBJDIR)/utascii.o\
-Index: acpica-unix2-20210730/generate/unix/acpiexamples/Makefile
+Index: acpica-unix2-20220331/generate/unix/acpiexamples/Makefile
 ===================================================================
---- acpica-unix2-20210730.orig/generate/unix/acpiexamples/Makefile
-+++ acpica-unix2-20210730/generate/unix/acpiexamples/Makefile
+--- acpica-unix2-20220331.orig/generate/unix/acpiexamples/Makefile
++++ acpica-unix2-20220331/generate/unix/acpiexamples/Makefile
 @@ -139,6 +139,7 @@ OBJECTS = \
  	$(OBJDIR)/utdebug.o\
  	$(OBJDIR)/utdecode.o\
@@ -71,10 +71,10 @@ Index: acpica-unix2-20210730/generate/unix/acpiexamples/Makefile
  	$(OBJDIR)/uterror.o\
  	$(OBJDIR)/uteval.o\
  	$(OBJDIR)/utexcep.o\
-Index: acpica-unix2-20210730/generate/unix/acpiexec/Makefile
+Index: acpica-unix2-20220331/generate/unix/acpiexec/Makefile
 ===================================================================
---- acpica-unix2-20210730.orig/generate/unix/acpiexec/Makefile
-+++ acpica-unix2-20210730/generate/unix/acpiexec/Makefile
+--- acpica-unix2-20220331.orig/generate/unix/acpiexec/Makefile
++++ acpica-unix2-20220331/generate/unix/acpiexec/Makefile
 @@ -214,6 +214,7 @@ OBJECTS = \
  	$(OBJDIR)/utdebug.o\
  	$(OBJDIR)/utdecode.o\
@@ -83,10 +83,10 @@ Index: acpica-unix2-20210730/generate/unix/acpiexec/Makefile
  	$(OBJDIR)/uterror.o\
  	$(OBJDIR)/uteval.o\
  	$(OBJDIR)/utexcep.o\
-Index: acpica-unix2-20210730/generate/unix/acpihelp/Makefile
+Index: acpica-unix2-20220331/generate/unix/acpihelp/Makefile
 ===================================================================
---- acpica-unix2-20210730.orig/generate/unix/acpihelp/Makefile
-+++ acpica-unix2-20210730/generate/unix/acpihelp/Makefile
+--- acpica-unix2-20220331.orig/generate/unix/acpihelp/Makefile
++++ acpica-unix2-20220331/generate/unix/acpihelp/Makefile
 @@ -45,6 +45,7 @@ OBJECTS = \
  	$(OBJDIR)/getopt.o\
  	$(OBJDIR)/osunixxf.o\
@@ -95,10 +95,10 @@ Index: acpica-unix2-20210730/generate/unix/acpihelp/Makefile
  	$(OBJDIR)/utexcep.o\
  	$(OBJDIR)/utglobal.o\
  	$(OBJDIR)/uthex.o\
-Index: acpica-unix2-20210730/generate/unix/iasl/Makefile
+Index: acpica-unix2-20220331/generate/unix/iasl/Makefile
 ===================================================================
---- acpica-unix2-20210730.orig/generate/unix/iasl/Makefile
-+++ acpica-unix2-20210730/generate/unix/iasl/Makefile
+--- acpica-unix2-20220331.orig/generate/unix/iasl/Makefile
++++ acpica-unix2-20220331/generate/unix/iasl/Makefile
 @@ -225,6 +225,7 @@ OBJECTS = \
  	$(OBJDIR)/utdebug.o\
  	$(OBJDIR)/utdecode.o\
@@ -107,10 +107,10 @@ Index: acpica-unix2-20210730/generate/unix/iasl/Makefile
  	$(OBJDIR)/uterror.o\
  	$(OBJDIR)/utexcep.o\
  	$(OBJDIR)/utglobal.o\
-Index: acpica-unix2-20210730/source/compiler/aslcompiler.h
+Index: acpica-unix2-20220331/source/compiler/aslcompiler.h
 ===================================================================
---- acpica-unix2-20210730.orig/source/compiler/aslcompiler.h
-+++ acpica-unix2-20210730/source/compiler/aslcompiler.h
+--- acpica-unix2-20220331.orig/source/compiler/aslcompiler.h
++++ acpica-unix2-20220331/source/compiler/aslcompiler.h
 @@ -1120,10 +1120,6 @@ BOOLEAN
  UtIsIdInteger (
      UINT8                   *Target);
@@ -122,10 +122,10 @@ Index: acpica-unix2-20210730/source/compiler/aslcompiler.h
  BOOLEAN
  UtQueryForOverwrite (
      char                    *Pathname);
-Index: acpica-unix2-20210730/source/compiler/aslutils.c
+Index: acpica-unix2-20220331/source/compiler/aslutils.c
 ===================================================================
---- acpica-unix2-20210730.orig/source/compiler/aslutils.c
-+++ acpica-unix2-20210730/source/compiler/aslutils.c
+--- acpica-unix2-20220331.orig/source/compiler/aslutils.c
++++ acpica-unix2-20220331/source/compiler/aslutils.c
 @@ -73,33 +73,6 @@ UtDisplayErrorSummary (
  
  /*******************************************************************************
@@ -160,10 +160,10 @@ Index: acpica-unix2-20210730/source/compiler/aslutils.c
   * FUNCTION:    UtIsIdInteger
   *
   * PARAMETERS:  Pointer to an ACPI ID (HID, CID) string
-Index: acpica-unix2-20210730/source/components/utilities/utendian.c
+Index: acpica-unix2-20220331/source/components/utilities/utendian.c
 ===================================================================
 --- /dev/null
-+++ acpica-unix2-20210730/source/components/utilities/utendian.c
++++ acpica-unix2-20220331/source/components/utilities/utendian.c
 @@ -0,0 +1,236 @@
 +/******************************************************************************
 + *
@@ -401,10 +401,10 @@ Index: acpica-unix2-20210730/source/components/utilities/utendian.c
 +        Dst[ii] = Src[SrcLength - ii - 1];
 +
 +}
-Index: acpica-unix2-20210730/source/include/acmacros.h
+Index: acpica-unix2-20220331/source/include/acmacros.h
 ===================================================================
---- acpica-unix2-20210730.orig/source/include/acmacros.h
-+++ acpica-unix2-20210730/source/include/acmacros.h
+--- acpica-unix2-20220331.orig/source/include/acmacros.h
++++ acpica-unix2-20220331/source/include/acmacros.h
 @@ -76,61 +76,6 @@
   * If the hardware supports the transfer of unaligned data, just do the store.
   * Otherwise, we have to move one byte at a time.
@@ -475,10 +475,10 @@ Index: acpica-unix2-20210730/source/include/acmacros.h
  
  
  /*
-Index: acpica-unix2-20210730/source/include/acutils.h
+Index: acpica-unix2-20220331/source/include/acutils.h
 ===================================================================
---- acpica-unix2-20210730.orig/source/include/acutils.h
-+++ acpica-unix2-20210730/source/include/acutils.h
+--- acpica-unix2-20220331.orig/source/include/acutils.h
++++ acpica-unix2-20220331/source/include/acutils.h
 @@ -1167,4 +1167,36 @@ AcpiUtConvertUuidToString (
      char                    *OutString);
  #endif
@@ -516,11 +516,11 @@ Index: acpica-unix2-20210730/source/include/acutils.h
 +#endif
 +
  #endif /* _ACUTILS_H */
-Index: acpica-unix2-20210730/source/include/platform/aclinux.h
+Index: acpica-unix2-20220331/source/include/platform/aclinux.h
 ===================================================================
---- acpica-unix2-20210730.orig/source/include/platform/aclinux.h
-+++ acpica-unix2-20210730/source/include/platform/aclinux.h
-@@ -198,6 +198,7 @@
+--- acpica-unix2-20220331.orig/source/include/platform/aclinux.h
++++ acpica-unix2-20220331/source/include/platform/aclinux.h
+@@ -203,6 +203,7 @@
  
  #ifdef ACPI_USE_STANDARD_HEADERS
  #include <unistd.h>
diff --git a/0002-Modify-utility-functions-to-be-endian-agnostic.patch b/0002-Modify-utility-functions-to-be-endian-agnostic.patch
index 8c06f05..a328096 100644
--- a/0002-Modify-utility-functions-to-be-endian-agnostic.patch
+++ b/0002-Modify-utility-functions-to-be-endian-agnostic.patch
@@ -24,10 +24,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/components/tables/tbprint.c | 13 +++++++++----
  5 files changed, 26 insertions(+), 17 deletions(-)
 
-Index: acpica-unix2-20211217/source/common/acfileio.c
+Index: acpica-unix2-20220331/source/common/acfileio.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/common/acfileio.c
-+++ acpica-unix2-20211217/source/common/acfileio.c
+--- acpica-unix2-20220331.orig/source/common/acfileio.c
++++ acpica-unix2-20220331/source/common/acfileio.c
 @@ -280,6 +280,7 @@ AcGetOneTableFromFile (
      ACPI_TABLE_HEADER       *Table;
      INT32                   Count;
@@ -94,11 +94,11 @@ Index: acpica-unix2-20211217/source/common/acfileio.c
              (UINT32) (FileSize - TableOffset));
          return (AE_BAD_HEADER);
      }
-Index: acpica-unix2-20211217/source/common/dmtable.c
+Index: acpica-unix2-20220331/source/common/dmtable.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/common/dmtable.c
-+++ acpica-unix2-20211217/source/common/dmtable.c
-@@ -710,7 +710,7 @@ AcpiDmDumpDataTable (
+--- acpica-unix2-20220331.orig/source/common/dmtable.c
++++ acpica-unix2-20220331/source/common/dmtable.c
+@@ -713,7 +713,7 @@ AcpiDmDumpDataTable (
          {
              /* Dump the raw table data */
  
@@ -107,7 +107,7 @@ Index: acpica-unix2-20211217/source/common/dmtable.c
  
              AcpiOsPrintf ("\n/*\n%s: Length %d (0x%X)\n\n",
                  ACPI_RAW_TABLE_DATA_HEADER, Length, Length);
-@@ -727,7 +727,7 @@ AcpiDmDumpDataTable (
+@@ -730,7 +730,7 @@ AcpiDmDumpDataTable (
       */
      if (ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_FACS))
      {
@@ -116,7 +116,7 @@ Index: acpica-unix2-20211217/source/common/dmtable.c
          Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoFacs);
          if (ACPI_FAILURE (Status))
          {
-@@ -748,7 +748,7 @@ AcpiDmDumpDataTable (
+@@ -751,7 +751,7 @@ AcpiDmDumpDataTable (
          /*
           * All other tables must use the common ACPI table header, dump it now
           */
@@ -125,7 +125,7 @@ Index: acpica-unix2-20211217/source/common/dmtable.c
          Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoHeader);
          if (ACPI_FAILURE (Status))
          {
-@@ -1407,7 +1407,7 @@ AcpiDmDumpTable (
+@@ -1415,7 +1415,7 @@ AcpiDmDumpTable (
  
              AcpiOsPrintf ("%2.2X", *Target);
              Temp8 = AcpiDmGenerateChecksum (Table,
@@ -134,10 +134,10 @@ Index: acpica-unix2-20211217/source/common/dmtable.c
                  ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Checksum);
  
              if (Temp8 != ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Checksum)
-Index: acpica-unix2-20211217/source/compiler/dtfield.c
+Index: acpica-unix2-20220331/source/compiler/dtfield.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/compiler/dtfield.c
-+++ acpica-unix2-20211217/source/compiler/dtfield.c
+--- acpica-unix2-20220331.orig/source/compiler/dtfield.c
++++ acpica-unix2-20220331/source/compiler/dtfield.c
 @@ -361,7 +361,7 @@ DtCompileInteger (
          DtError (ASL_ERROR, ASL_MSG_INTEGER_SIZE, Field, AslGbl_MsgBuffer);
      }
@@ -147,10 +147,10 @@ Index: acpica-unix2-20211217/source/compiler/dtfield.c
      return;
  }
  
-Index: acpica-unix2-20211217/source/compiler/dtsubtable.c
+Index: acpica-unix2-20220331/source/compiler/dtsubtable.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/compiler/dtsubtable.c
-+++ acpica-unix2-20211217/source/compiler/dtsubtable.c
+--- acpica-unix2-20220331.orig/source/compiler/dtsubtable.c
++++ acpica-unix2-20220331/source/compiler/dtsubtable.c
 @@ -378,6 +378,6 @@ DtSetSubtableLength (
          return;
      }
@@ -160,10 +160,10 @@ Index: acpica-unix2-20211217/source/compiler/dtsubtable.c
 +    AcpiUtWriteUint (Subtable->LengthField, Subtable->SizeOfLengthField,
 +                     &Subtable->TotalLength, sizeof (Subtable->TotalLength));
  }
-Index: acpica-unix2-20211217/source/components/tables/tbprint.c
+Index: acpica-unix2-20220331/source/components/tables/tbprint.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/components/tables/tbprint.c
-+++ acpica-unix2-20211217/source/components/tables/tbprint.c
+--- acpica-unix2-20220331.orig/source/components/tables/tbprint.c
++++ acpica-unix2-20220331/source/components/tables/tbprint.c
 @@ -44,6 +44,8 @@
  #include "acpi.h"
  #include "accommon.h"
diff --git a/0003-Always-display-table-header-content-in-human-readabl.patch b/0003-Always-display-table-header-content-in-human-readabl.patch
index b1bd847..f540ac1 100644
--- a/0003-Always-display-table-header-content-in-human-readabl.patch
+++ b/0003-Always-display-table-header-content-in-human-readabl.patch
@@ -13,10 +13,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/tools/acpibin/abcompare.c | 7 ++++---
  1 file changed, 4 insertions(+), 3 deletions(-)
 
-Index: acpica-unix2-20210730/source/tools/acpibin/abcompare.c
+Index: acpica-unix2-20220331/source/tools/acpibin/abcompare.c
 ===================================================================
---- acpica-unix2-20210730.orig/source/tools/acpibin/abcompare.c
-+++ acpica-unix2-20210730/source/tools/acpibin/abcompare.c
+--- acpica-unix2-20220331.orig/source/tools/acpibin/abcompare.c
++++ acpica-unix2-20220331/source/tools/acpibin/abcompare.c
 @@ -42,6 +42,7 @@
   */
  
diff --git a/0004-Re-enable-support-for-big-endian-machines.patch b/0004-Re-enable-support-for-big-endian-machines.patch
index 4686ed2..d2dc432 100644
--- a/0004-Re-enable-support-for-big-endian-machines.patch
+++ b/0004-Re-enable-support-for-big-endian-machines.patch
@@ -13,10 +13,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/components/namespace/nsutils.c |  7 +++++--
  2 files changed, 5 insertions(+), 14 deletions(-)
 
-Index: acpica-unix2-20210730/source/compiler/aslmain.c
+Index: acpica-unix2-20220331/source/compiler/aslmain.c
 ===================================================================
---- acpica-unix2-20210730.orig/source/compiler/aslmain.c
-+++ acpica-unix2-20210730/source/compiler/aslmain.c
+--- acpica-unix2-20220331.orig/source/compiler/aslmain.c
++++ acpica-unix2-20220331/source/compiler/aslmain.c
 @@ -101,18 +101,6 @@ main (
  
      signal (SIGINT, AslSignalHandler);
@@ -36,10 +36,10 @@ Index: acpica-unix2-20210730/source/compiler/aslmain.c
      AcpiOsInitialize ();
      ACPI_DEBUG_INITIALIZE (); /* For debug version only */
  
-Index: acpica-unix2-20210730/source/components/namespace/nsutils.c
+Index: acpica-unix2-20220331/source/components/namespace/nsutils.c
 ===================================================================
---- acpica-unix2-20210730.orig/source/components/namespace/nsutils.c
-+++ acpica-unix2-20210730/source/components/namespace/nsutils.c
+--- acpica-unix2-20220331.orig/source/components/namespace/nsutils.c
++++ acpica-unix2-20220331/source/components/namespace/nsutils.c
 @@ -272,6 +272,7 @@ AcpiNsBuildInternalName (
      const char              *ExternalName = Info->NextExternalChar;
      char                    *Result = NULL;
diff --git a/0005-Correct-an-endian-ness-problem-when-converting-ASL-t.patch b/0005-Correct-an-endian-ness-problem-when-converting-ASL-t.patch
index 6293206..e5a9dc5 100644
--- a/0005-Correct-an-endian-ness-problem-when-converting-ASL-t.patch
+++ b/0005-Correct-an-endian-ness-problem-when-converting-ASL-t.patch
@@ -9,10 +9,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/compiler/cvparser.c | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
-Index: acpica-unix2-20210730/source/compiler/cvparser.c
+Index: acpica-unix2-20220331/source/compiler/cvparser.c
 ===================================================================
---- acpica-unix2-20210730.orig/source/compiler/cvparser.c
-+++ acpica-unix2-20210730/source/compiler/cvparser.c
+--- acpica-unix2-20220331.orig/source/compiler/cvparser.c
++++ acpica-unix2-20220331/source/compiler/cvparser.c
 @@ -144,6 +144,7 @@ CvInitFileTree (
      char                    *ChildFilename = NULL;
      UINT8                   *AmlStart;
diff --git a/0006-Use-more-reliable-ACPI_COPY_NAMSEG-in-GPE-name-check.patch b/0006-Use-more-reliable-ACPI_COPY_NAMSEG-in-GPE-name-check.patch
index 1ed3be3..5893e93 100644
--- a/0006-Use-more-reliable-ACPI_COPY_NAMSEG-in-GPE-name-check.patch
+++ b/0006-Use-more-reliable-ACPI_COPY_NAMSEG-in-GPE-name-check.patch
@@ -8,10 +8,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/compiler/aslanalyze.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-Index: acpica-unix2-20210730/source/compiler/aslanalyze.c
+Index: acpica-unix2-20220331/source/compiler/aslanalyze.c
 ===================================================================
---- acpica-unix2-20210730.orig/source/compiler/aslanalyze.c
-+++ acpica-unix2-20210730/source/compiler/aslanalyze.c
+--- acpica-unix2-20220331.orig/source/compiler/aslanalyze.c
++++ acpica-unix2-20220331/source/compiler/aslanalyze.c
 @@ -469,7 +469,7 @@ ApCheckForGpeNameConflict (
  
      /* Need a null-terminated string version of NameSeg */
diff --git a/0007-Handle-dumping-Unicode-properly-when-big-endian.patch b/0007-Handle-dumping-Unicode-properly-when-big-endian.patch
index a046fe9..70d83d6 100644
--- a/0007-Handle-dumping-Unicode-properly-when-big-endian.patch
+++ b/0007-Handle-dumping-Unicode-properly-when-big-endian.patch
@@ -8,10 +8,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/common/dmtbdump.c | 11 ++++++++---
  1 file changed, 8 insertions(+), 3 deletions(-)
 
-Index: acpica-unix2-20211217/source/common/dmtbdump.c
+Index: acpica-unix2-20220331/source/common/dmtbdump.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/common/dmtbdump.c
-+++ acpica-unix2-20211217/source/common/dmtbdump.c
+--- acpica-unix2-20220331.orig/source/common/dmtbdump.c
++++ acpica-unix2-20220331/source/common/dmtbdump.c
 @@ -200,6 +200,8 @@ AcpiDmDumpUnicode (
      UINT8                   *Buffer;
      UINT32                  Length;
diff --git a/0008-Support-MADT-aka-APIC-in-a-big-endian-world.patch b/0008-Support-MADT-aka-APIC-in-a-big-endian-world.patch
index 63fa133..9121ab8 100644
--- a/0008-Support-MADT-aka-APIC-in-a-big-endian-world.patch
+++ b/0008-Support-MADT-aka-APIC-in-a-big-endian-world.patch
@@ -8,10 +8,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/common/dmtbdump2.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-Index: acpica-unix2-20210730/source/common/dmtbdump2.c
+Index: acpica-unix2-20220331/source/common/dmtbdump2.c
 ===================================================================
---- acpica-unix2-20210730.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20210730/source/common/dmtbdump2.c
+--- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20220331/source/common/dmtbdump2.c
 @@ -763,7 +763,7 @@ AcpiDmDumpMadt (
  {
      ACPI_STATUS             Status;
@@ -21,10 +21,10 @@ Index: acpica-unix2-20210730/source/common/dmtbdump2.c
      UINT32                  Offset = sizeof (ACPI_TABLE_MADT);
      ACPI_DMTABLE_INFO       *InfoTable;
  
-@@ -779,7 +779,7 @@ AcpiDmDumpMadt (
-     /* Subtables */
- 
+@@ -781,7 +781,7 @@ AcpiDmDumpMadt (
      Subtable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Table, Offset);
+     DbgPrint (ASL_PARSE_OUTPUT, "//0B) Offset %X, from table start: 0x%8.8X%8.8X\n",
+         Offset, ACPI_FORMAT_UINT64 (ACPI_CAST_PTR (char, Subtable) - ACPI_CAST_PTR (char, Table)));
 -    while (Offset < Table->Length)
 +    while (Offset < Length)
      {
diff --git a/0009-Support-ASF-tables-in-a-big-endian-world.patch b/0009-Support-ASF-tables-in-a-big-endian-world.patch
index a0cdeb7..a3f815d 100644
--- a/0009-Support-ASF-tables-in-a-big-endian-world.patch
+++ b/0009-Support-ASF-tables-in-a-big-endian-world.patch
@@ -10,11 +10,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/common/dmtbdump1.c | 10 ++++++----
  1 file changed, 6 insertions(+), 4 deletions(-)
 
-Index: acpica-unix2-20211217/source/common/dmtbdump1.c
+Index: acpica-unix2-20220331/source/common/dmtbdump1.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/common/dmtbdump1.c
-+++ acpica-unix2-20211217/source/common/dmtbdump1.c
-@@ -296,16 +296,18 @@ AcpiDmDumpAsf (
+--- acpica-unix2-20220331.orig/source/common/dmtbdump1.c
++++ acpica-unix2-20220331/source/common/dmtbdump1.c
+@@ -358,16 +358,18 @@ AcpiDmDumpAsf (
      UINT32                  DataOffset = 0;
      UINT32                  i;
      UINT8                   Type;
@@ -35,7 +35,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
              Subtable->Header.Length, AcpiDmTableInfoAsfHdr);
          if (ACPI_FAILURE (Status))
          {
-@@ -363,7 +365,7 @@ AcpiDmDumpAsf (
+@@ -425,7 +427,7 @@ AcpiDmDumpAsf (
              return;
          }
  
@@ -44,7 +44,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
              Subtable->Header.Length, InfoTable);
          if (ACPI_FAILURE (Status))
          {
-@@ -380,7 +382,7 @@ AcpiDmDumpAsf (
+@@ -442,7 +444,7 @@ AcpiDmDumpAsf (
              for (i = 0; i < DataCount; i++)
              {
                  AcpiOsPrintf ("\n");
diff --git a/0010-Support-CPEP-tables-in-a-big-endian-world.patch b/0010-Support-CPEP-tables-in-a-big-endian-world.patch
index a27a312..e9451cd 100644
--- a/0010-Support-CPEP-tables-in-a-big-endian-world.patch
+++ b/0010-Support-CPEP-tables-in-a-big-endian-world.patch
@@ -8,11 +8,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/common/dmtbdump1.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-Index: acpica-unix2-20211217/source/common/dmtbdump1.c
+Index: acpica-unix2-20220331/source/common/dmtbdump1.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/common/dmtbdump1.c
-+++ acpica-unix2-20211217/source/common/dmtbdump1.c
-@@ -536,7 +536,7 @@ AcpiDmDumpCpep (
+--- acpica-unix2-20220331.orig/source/common/dmtbdump1.c
++++ acpica-unix2-20220331/source/common/dmtbdump1.c
+@@ -614,7 +614,7 @@ AcpiDmDumpCpep (
  {
      ACPI_STATUS             Status;
      ACPI_CPEP_POLLING       *Subtable;
@@ -21,7 +21,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
      UINT32                  Offset = sizeof (ACPI_TABLE_CPEP);
  
  
-@@ -551,7 +551,7 @@ AcpiDmDumpCpep (
+@@ -629,7 +629,7 @@ AcpiDmDumpCpep (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_CPEP_POLLING, Table, Offset);
diff --git a/0011-Support-DBG2-table-in-a-big-endian-world.patch b/0011-Support-DBG2-table-in-a-big-endian-world.patch
index 5a2c9dd..76cb7ac 100644
--- a/0011-Support-DBG2-table-in-a-big-endian-world.patch
+++ b/0011-Support-DBG2-table-in-a-big-endian-world.patch
@@ -9,11 +9,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/compiler/dttable1.c | 43 ++++++++++++++++++++++++--------------
  2 files changed, 48 insertions(+), 32 deletions(-)
 
-Index: acpica-unix2-20211217/source/common/dmtbdump1.c
+Index: acpica-unix2-20220331/source/common/dmtbdump1.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/common/dmtbdump1.c
-+++ acpica-unix2-20211217/source/common/dmtbdump1.c
-@@ -591,7 +591,7 @@ AcpiDmDumpCsrt (
+--- acpica-unix2-20220331.orig/source/common/dmtbdump1.c
++++ acpica-unix2-20220331/source/common/dmtbdump1.c
+@@ -669,7 +669,7 @@ AcpiDmDumpCsrt (
      ACPI_CSRT_GROUP         *Subtable;
      ACPI_CSRT_SHARED_INFO   *SharedInfoTable;
      ACPI_CSRT_DESCRIPTOR    *SubSubtable;
@@ -22,7 +22,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
      UINT32                  Offset = sizeof (ACPI_TABLE_CSRT);
      UINT32                  SubOffset;
      UINT32                  SubSubOffset;
-@@ -603,7 +603,7 @@ AcpiDmDumpCsrt (
+@@ -681,7 +681,7 @@ AcpiDmDumpCsrt (
      /* Subtables (Resource Groups) */
  
      Subtable = ACPI_ADD_PTR (ACPI_CSRT_GROUP, Table, Offset);
@@ -31,7 +31,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
      {
          /* Resource group subtable */
  
-@@ -637,7 +637,7 @@ AcpiDmDumpCsrt (
+@@ -715,7 +715,7 @@ AcpiDmDumpCsrt (
              Offset + SubOffset);
  
          while ((SubOffset < Subtable->Length) &&
@@ -40,7 +40,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
          {
              AcpiOsPrintf ("\n");
              Status = AcpiDmDumpTable (Length, Offset + SubOffset, SubSubtable,
-@@ -698,12 +698,13 @@ AcpiDmDumpDbg2 (
+@@ -776,12 +776,13 @@ AcpiDmDumpDbg2 (
  {
      ACPI_STATUS             Status;
      ACPI_DBG2_DEVICE        *Subtable;
@@ -55,7 +55,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
  
  
      /* Main table */
-@@ -717,11 +718,12 @@ AcpiDmDumpDbg2 (
+@@ -795,11 +796,12 @@ AcpiDmDumpDbg2 (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_DBG2_DEVICE, Table, Offset);
@@ -70,7 +70,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
          if (ACPI_FAILURE (Status))
          {
              return;
-@@ -731,13 +733,13 @@ AcpiDmDumpDbg2 (
+@@ -809,13 +811,13 @@ AcpiDmDumpDbg2 (
  
          for (i = 0; i < Subtable->RegisterCount; i++)
          {
@@ -86,7 +86,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
              if (ACPI_FAILURE (Status))
              {
                  return;
-@@ -748,13 +750,13 @@ AcpiDmDumpDbg2 (
+@@ -826,13 +828,13 @@ AcpiDmDumpDbg2 (
  
          for (i = 0; i < Subtable->RegisterCount; i++)
          {
@@ -102,7 +102,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
              if (ACPI_FAILURE (Status))
              {
                  return;
-@@ -764,12 +766,12 @@ AcpiDmDumpDbg2 (
+@@ -842,12 +844,12 @@ AcpiDmDumpDbg2 (
          /* Dump the Namestring (required) */
  
          AcpiOsPrintf ("\n");
@@ -117,7 +117,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
          if (ACPI_FAILURE (Status))
          {
              return;
-@@ -779,8 +781,11 @@ AcpiDmDumpDbg2 (
+@@ -857,8 +859,11 @@ AcpiDmDumpDbg2 (
  
          if (Subtable->OemDataOffset)
          {
@@ -131,7 +131,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
                  AcpiDmTableInfoDbg2OemData);
              if (ACPI_FAILURE (Status))
              {
-@@ -790,9 +795,9 @@ AcpiDmDumpDbg2 (
+@@ -868,9 +873,9 @@ AcpiDmDumpDbg2 (
  
          /* Point to next subtable */
  
@@ -143,11 +143,11 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
      }
  }
  
-Index: acpica-unix2-20211217/source/compiler/dttable1.c
+Index: acpica-unix2-20220331/source/compiler/dttable1.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/compiler/dttable1.c
-+++ acpica-unix2-20211217/source/compiler/dttable1.c
-@@ -572,6 +572,7 @@ DtCompileCsrt (
+--- acpica-unix2-20220331.orig/source/compiler/dttable1.c
++++ acpica-unix2-20220331/source/compiler/dttable1.c
+@@ -718,6 +718,7 @@ DtCompileCsrt (
      DT_FIELD                **PFieldList = (DT_FIELD **) List;
      UINT32                  DescriptorCount;
      UINT32                  GroupLength;
@@ -155,7 +155,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
  
  
      /* Subtables (Resource Groups) */
-@@ -590,12 +591,13 @@ DtCompileCsrt (
+@@ -736,12 +737,13 @@ DtCompileCsrt (
  
          /* Compute the number of resource descriptors */
  
@@ -175,7 +175,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
  
          DescriptorCount = (GroupLength  /
              sizeof (ACPI_CSRT_DESCRIPTOR));
-@@ -683,6 +685,7 @@ DtCompileDbg2 (
+@@ -829,6 +831,7 @@ DtCompileDbg2 (
      ACPI_DBG2_DEVICE        *DeviceInfo;
      UINT16                  CurrentOffset;
      UINT32                  i;
@@ -183,7 +183,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
  
  
      /* Main table */
-@@ -699,10 +702,12 @@ DtCompileDbg2 (
+@@ -845,10 +848,12 @@ DtCompileDbg2 (
      /* Main table fields */
  
      Dbg2Header = ACPI_CAST_PTR (ACPI_DBG2_HEADER, Subtable->Buffer);
@@ -199,7 +199,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
      DtPushSubtable (Subtable);
  
      /* Process all Device Information subtables (Count = InfoCount) */
-@@ -729,7 +734,8 @@ DtCompileDbg2 (
+@@ -875,7 +880,8 @@ DtCompileDbg2 (
  
          /* BaseAddressRegister GAS array (Required, size is RegisterCount) */
  
@@ -209,7 +209,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
          for (i = 0; *PFieldList && (i < DeviceInfo->RegisterCount); i++)
          {
              Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2Addr,
-@@ -745,7 +751,8 @@ DtCompileDbg2 (
+@@ -891,7 +897,8 @@ DtCompileDbg2 (
  
          /* AddressSize array (Required, size = RegisterCount) */
  
@@ -219,7 +219,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
          for (i = 0; *PFieldList && (i < DeviceInfo->RegisterCount); i++)
          {
              Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2Size,
-@@ -761,7 +768,8 @@ DtCompileDbg2 (
+@@ -907,7 +914,8 @@ DtCompileDbg2 (
  
          /* NamespaceString device identifier (Required, size = NamePathLength) */
  
@@ -229,7 +229,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
          Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2Name,
              &Subtable);
          if (ACPI_FAILURE (Status))
-@@ -771,8 +779,9 @@ DtCompileDbg2 (
+@@ -917,8 +925,9 @@ DtCompileDbg2 (
  
          /* Update the device info header */
  
@@ -241,7 +241,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
          DtInsertSubtable (ParentTable, Subtable);
  
          /* OemData - Variable-length data (Optional, size = OemDataLength) */
-@@ -799,8 +808,10 @@ DtCompileDbg2 (
+@@ -945,8 +954,10 @@ DtCompileDbg2 (
  
          if (Subtable && Subtable->Length)
          {
diff --git a/0012-Support-DMAR-in-a-big-endian-world.patch b/0012-Support-DMAR-in-a-big-endian-world.patch
index 895f65f..3d54025 100644
--- a/0012-Support-DMAR-in-a-big-endian-world.patch
+++ b/0012-Support-DMAR-in-a-big-endian-world.patch
@@ -10,11 +10,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/compiler/dttable1.c | 12 +++++++-----
  3 files changed, 24 insertions(+), 18 deletions(-)
 
-Index: acpica-unix2-20211217/source/common/dmtable.c
+Index: acpica-unix2-20220331/source/common/dmtable.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/common/dmtable.c
-+++ acpica-unix2-20211217/source/common/dmtable.c
-@@ -1570,13 +1570,13 @@ AcpiDmDumpTable (
+--- acpica-unix2-20220331.orig/source/common/dmtable.c
++++ acpica-unix2-20220331/source/common/dmtable.c
+@@ -1578,13 +1578,13 @@ AcpiDmDumpTable (
  
              /* DMAR subtable types */
  
@@ -30,11 +30,11 @@ Index: acpica-unix2-20211217/source/common/dmtable.c
                  AcpiDmDmarSubnames[Temp16]);
              break;
  
-Index: acpica-unix2-20211217/source/common/dmtbdump1.c
+Index: acpica-unix2-20220331/source/common/dmtbdump1.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/common/dmtbdump1.c
-+++ acpica-unix2-20211217/source/common/dmtbdump1.c
-@@ -821,13 +821,15 @@ AcpiDmDumpDmar (
+--- acpica-unix2-20220331.orig/source/common/dmtbdump1.c
++++ acpica-unix2-20220331/source/common/dmtbdump1.c
+@@ -899,13 +899,15 @@ AcpiDmDumpDmar (
  {
      ACPI_STATUS             Status;
      ACPI_DMAR_HEADER        *Subtable;
@@ -51,7 +51,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
  
  
      /* Main table */
-@@ -841,13 +843,14 @@ AcpiDmDumpDmar (
+@@ -919,13 +921,14 @@ AcpiDmDumpDmar (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_DMAR_HEADER, Table, Offset);
@@ -68,7 +68,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
          if (ACPI_FAILURE (Status))
          {
              return;
-@@ -855,7 +858,8 @@ AcpiDmDumpDmar (
+@@ -933,7 +936,8 @@ AcpiDmDumpDmar (
  
          AcpiOsPrintf ("\n");
  
@@ -78,7 +78,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
          {
          case ACPI_DMAR_TYPE_HARDWARE_UNIT:
  
-@@ -890,12 +894,12 @@ AcpiDmDumpDmar (
+@@ -974,12 +978,12 @@ AcpiDmDumpDmar (
          default:
  
              AcpiOsPrintf ("\n**** Unknown DMAR subtable type 0x%X\n\n",
@@ -93,7 +93,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
          if (ACPI_FAILURE (Status))
          {
              return;
-@@ -904,8 +908,8 @@ AcpiDmDumpDmar (
+@@ -988,8 +992,8 @@ AcpiDmDumpDmar (
          /*
           * Dump the optional device scope entries
           */
@@ -104,7 +104,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
          {
              /* These types do not support device scopes */
  
-@@ -913,7 +917,7 @@ AcpiDmDumpDmar (
+@@ -997,7 +1001,7 @@ AcpiDmDumpDmar (
          }
  
          ScopeTable = ACPI_ADD_PTR (ACPI_DMAR_DEVICE_SCOPE, Subtable, ScopeOffset);
@@ -113,7 +113,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
          {
              AcpiOsPrintf ("\n");
              Status = AcpiDmDumpTable (Length, Offset + ScopeOffset, ScopeTable,
-@@ -954,9 +958,9 @@ AcpiDmDumpDmar (
+@@ -1038,9 +1042,9 @@ AcpiDmDumpDmar (
  NextSubtable:
          /* Point to next subtable */
  
@@ -125,11 +125,11 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
      }
  }
  
-Index: acpica-unix2-20211217/source/compiler/dttable1.c
+Index: acpica-unix2-20220331/source/compiler/dttable1.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/compiler/dttable1.c
-+++ acpica-unix2-20211217/source/compiler/dttable1.c
-@@ -851,6 +851,7 @@ DtCompileDmar (
+--- acpica-unix2-20220331.orig/source/compiler/dttable1.c
++++ acpica-unix2-20220331/source/compiler/dttable1.c
+@@ -997,6 +997,7 @@ DtCompileDmar (
      ACPI_DMAR_DEVICE_SCOPE  *DmarDeviceScope;
      UINT32                  DeviceScopeLength;
      UINT32                  PciPathLength;
@@ -137,7 +137,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
  
  
      Status = DtCompileTable (PFieldList, AcpiDmTableInfoDmar, &Subtable);
-@@ -881,7 +882,8 @@ DtCompileDmar (
+@@ -1027,7 +1028,8 @@ DtCompileDmar (
  
          DmarHeader = ACPI_CAST_PTR (ACPI_DMAR_HEADER, Subtable->Buffer);
  
@@ -147,7 +147,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
          {
          case ACPI_DMAR_TYPE_HARDWARE_UNIT:
  
-@@ -928,8 +930,8 @@ DtCompileDmar (
+@@ -1079,8 +1081,8 @@ DtCompileDmar (
          /*
           * Optional Device Scope subtables
           */
@@ -158,7 +158,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
          {
              /* These types do not support device scopes */
  
-@@ -938,8 +940,8 @@ DtCompileDmar (
+@@ -1089,8 +1091,8 @@ DtCompileDmar (
          }
  
          DtPushSubtable (Subtable);
diff --git a/0013-Support-DRTM-in-a-big-endian-world.patch b/0013-Support-DRTM-in-a-big-endian-world.patch
index 02fa91e..02725bb 100644
--- a/0013-Support-DRTM-in-a-big-endian-world.patch
+++ b/0013-Support-DRTM-in-a-big-endian-world.patch
@@ -9,11 +9,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/compiler/dttable1.c |  6 ++++--
  2 files changed, 19 insertions(+), 12 deletions(-)
 
-Index: acpica-unix2-20211217/source/common/dmtbdump1.c
+Index: acpica-unix2-20220331/source/common/dmtbdump1.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/common/dmtbdump1.c
-+++ acpica-unix2-20211217/source/common/dmtbdump1.c
-@@ -987,11 +987,14 @@ AcpiDmDumpDrtm (
+--- acpica-unix2-20220331.orig/source/common/dmtbdump1.c
++++ acpica-unix2-20220331/source/common/dmtbdump1.c
+@@ -1071,11 +1071,14 @@ AcpiDmDumpDrtm (
      ACPI_DRTM_RESOURCE_LIST *DrtmRl;
      ACPI_DRTM_DPS_ID        *DrtmDps;
      UINT32                  Count;
@@ -29,7 +29,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
          AcpiDmTableInfoDrtm);
      if (ACPI_FAILURE (Status))
      {
-@@ -1006,7 +1009,7 @@ AcpiDmDumpDrtm (
+@@ -1090,7 +1093,7 @@ AcpiDmDumpDrtm (
  
      DrtmVtl = ACPI_ADD_PTR (ACPI_DRTM_VTABLE_LIST, Table, Offset);
      AcpiOsPrintf ("\n");
@@ -38,7 +38,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
          DrtmVtl, ACPI_OFFSET (ACPI_DRTM_VTABLE_LIST, ValidatedTables),
          AcpiDmTableInfoDrtm0);
      if (ACPI_FAILURE (Status))
-@@ -1019,10 +1022,11 @@ AcpiDmDumpDrtm (
+@@ -1103,10 +1106,11 @@ AcpiDmDumpDrtm (
      /* Dump Validated table addresses */
  
      Count = 0;
@@ -53,7 +53,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
              ACPI_ADD_PTR (void, Table, Offset), sizeof (UINT64),
              AcpiDmTableInfoDrtm0a);
          if (ACPI_FAILURE (Status))
-@@ -1038,7 +1042,7 @@ AcpiDmDumpDrtm (
+@@ -1122,7 +1126,7 @@ AcpiDmDumpDrtm (
  
      DrtmRl = ACPI_ADD_PTR (ACPI_DRTM_RESOURCE_LIST, Table, Offset);
      AcpiOsPrintf ("\n");
@@ -62,7 +62,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
          DrtmRl, ACPI_OFFSET (ACPI_DRTM_RESOURCE_LIST, Resources),
          AcpiDmTableInfoDrtm1);
      if (ACPI_FAILURE (Status))
-@@ -1051,10 +1055,11 @@ AcpiDmDumpDrtm (
+@@ -1135,10 +1139,11 @@ AcpiDmDumpDrtm (
      /* Dump the Resource List */
  
      Count = 0;
@@ -77,7 +77,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
              ACPI_ADD_PTR (void, Table, Offset),
              sizeof (ACPI_DRTM_RESOURCE), AcpiDmTableInfoDrtm1a);
          if (ACPI_FAILURE (Status))
-@@ -1070,7 +1075,7 @@ AcpiDmDumpDrtm (
+@@ -1154,7 +1159,7 @@ AcpiDmDumpDrtm (
  
      DrtmDps = ACPI_ADD_PTR (ACPI_DRTM_DPS_ID, Table, Offset);
      AcpiOsPrintf ("\n");
@@ -86,11 +86,11 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
          DrtmDps, sizeof (ACPI_DRTM_DPS_ID), AcpiDmTableInfoDrtm2);
  }
  
-Index: acpica-unix2-20211217/source/compiler/dttable1.c
+Index: acpica-unix2-20220331/source/compiler/dttable1.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/compiler/dttable1.c
-+++ acpica-unix2-20211217/source/compiler/dttable1.c
-@@ -1066,7 +1066,8 @@ DtCompileDrtm (
+--- acpica-unix2-20220331.orig/source/compiler/dttable1.c
++++ acpica-unix2-20220331/source/compiler/dttable1.c
+@@ -1217,7 +1217,8 @@ DtCompileDrtm (
          Count++;
      }
  
@@ -100,7 +100,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
      DtPopSubtable ();
      ParentTable = DtPeekSubtable ();
  
-@@ -1104,7 +1105,8 @@ DtCompileDrtm (
+@@ -1255,7 +1256,8 @@ DtCompileDrtm (
          Count++;
      }
  
diff --git a/0014-Support-EINJ-in-a-big-endian-world.patch b/0014-Support-EINJ-in-a-big-endian-world.patch
index 5e360a1..f65e6ff 100644
--- a/0014-Support-EINJ-in-a-big-endian-world.patch
+++ b/0014-Support-EINJ-in-a-big-endian-world.patch
@@ -8,11 +8,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/common/dmtbdump1.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-Index: acpica-unix2-20211217/source/common/dmtbdump1.c
+Index: acpica-unix2-20220331/source/common/dmtbdump1.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/common/dmtbdump1.c
-+++ acpica-unix2-20211217/source/common/dmtbdump1.c
-@@ -1099,7 +1099,7 @@ AcpiDmDumpEinj (
+--- acpica-unix2-20220331.orig/source/common/dmtbdump1.c
++++ acpica-unix2-20220331/source/common/dmtbdump1.c
+@@ -1183,7 +1183,7 @@ AcpiDmDumpEinj (
  {
      ACPI_STATUS             Status;
      ACPI_WHEA_HEADER        *Subtable;
@@ -21,7 +21,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
      UINT32                  Offset = sizeof (ACPI_TABLE_EINJ);
  
  
-@@ -1114,7 +1114,7 @@ AcpiDmDumpEinj (
+@@ -1198,7 +1198,7 @@ AcpiDmDumpEinj (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_WHEA_HEADER, Table, Offset);
diff --git a/0015-Support-ERST-in-a-big-endian-world.patch b/0015-Support-ERST-in-a-big-endian-world.patch
index db9cade..a6146e2 100644
--- a/0015-Support-ERST-in-a-big-endian-world.patch
+++ b/0015-Support-ERST-in-a-big-endian-world.patch
@@ -8,11 +8,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/common/dmtbdump1.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-Index: acpica-unix2-20211217/source/common/dmtbdump1.c
+Index: acpica-unix2-20220331/source/common/dmtbdump1.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/common/dmtbdump1.c
-+++ acpica-unix2-20211217/source/common/dmtbdump1.c
-@@ -1152,7 +1152,7 @@ AcpiDmDumpErst (
+--- acpica-unix2-20220331.orig/source/common/dmtbdump1.c
++++ acpica-unix2-20220331/source/common/dmtbdump1.c
+@@ -1236,7 +1236,7 @@ AcpiDmDumpErst (
  {
      ACPI_STATUS             Status;
      ACPI_WHEA_HEADER        *Subtable;
@@ -21,7 +21,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
      UINT32                  Offset = sizeof (ACPI_TABLE_ERST);
  
  
-@@ -1167,7 +1167,7 @@ AcpiDmDumpErst (
+@@ -1251,7 +1251,7 @@ AcpiDmDumpErst (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_WHEA_HEADER, Table, Offset);
diff --git a/0016-Support-FADT-aka-FACP-in-a-big-endian-world.patch b/0016-Support-FADT-aka-FACP-in-a-big-endian-world.patch
index f74a041..1b9b3aa 100644
--- a/0016-Support-FADT-aka-FACP-in-a-big-endian-world.patch
+++ b/0016-Support-FADT-aka-FACP-in-a-big-endian-world.patch
@@ -9,10 +9,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/components/tables/tbfadt.c | 34 +++++++++++++++++++++++--------
  2 files changed, 38 insertions(+), 21 deletions(-)
 
-Index: acpica-unix2-20211217/source/common/dmtbdump.c
+Index: acpica-unix2-20220331/source/common/dmtbdump.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/common/dmtbdump.c
-+++ acpica-unix2-20211217/source/common/dmtbdump.c
+--- acpica-unix2-20220331.orig/source/common/dmtbdump.c
++++ acpica-unix2-20220331/source/common/dmtbdump.c
 @@ -417,11 +417,12 @@ AcpiDmDumpFadt (
      ACPI_TABLE_HEADER       *Table)
  {
@@ -91,10 +91,10 @@ Index: acpica-unix2-20211217/source/common/dmtbdump.c
  }
  
  
-Index: acpica-unix2-20211217/source/components/tables/tbfadt.c
+Index: acpica-unix2-20220331/source/components/tables/tbfadt.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/components/tables/tbfadt.c
-+++ acpica-unix2-20211217/source/components/tables/tbfadt.c
+--- acpica-unix2-20220331.orig/source/components/tables/tbfadt.c
++++ acpica-unix2-20220331/source/components/tables/tbfadt.c
 @@ -289,7 +289,6 @@ AcpiTbSelectAddress (
      UINT32                  Address32,
      UINT64                  Address64)
diff --git a/0017-Support-most-FPDTs-in-a-big-endian-world.patch b/0017-Support-most-FPDTs-in-a-big-endian-world.patch
index 058f86a..41c0019 100644
--- a/0017-Support-most-FPDTs-in-a-big-endian-world.patch
+++ b/0017-Support-most-FPDTs-in-a-big-endian-world.patch
@@ -12,11 +12,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/compiler/dttable1.c |  4 +++-
  2 files changed, 10 insertions(+), 6 deletions(-)
 
-Index: acpica-unix2-20211217/source/common/dmtbdump1.c
+Index: acpica-unix2-20220331/source/common/dmtbdump1.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/common/dmtbdump1.c
-+++ acpica-unix2-20211217/source/common/dmtbdump1.c
-@@ -1205,9 +1205,10 @@ AcpiDmDumpFpdt (
+--- acpica-unix2-20220331.orig/source/common/dmtbdump1.c
++++ acpica-unix2-20220331/source/common/dmtbdump1.c
+@@ -1289,9 +1289,10 @@ AcpiDmDumpFpdt (
  {
      ACPI_STATUS             Status;
      ACPI_FPDT_HEADER        *Subtable;
@@ -28,7 +28,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
  
  
      /* There is no main table (other than the standard ACPI header) */
-@@ -1215,19 +1216,20 @@ AcpiDmDumpFpdt (
+@@ -1299,19 +1300,20 @@ AcpiDmDumpFpdt (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, Table, Offset);
@@ -52,7 +52,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
          {
          case ACPI_FPDT_TYPE_BOOT:
  
-@@ -1254,7 +1256,7 @@ AcpiDmDumpFpdt (
+@@ -1338,7 +1340,7 @@ AcpiDmDumpFpdt (
              goto NextSubtable;
          }
  
@@ -61,11 +61,11 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
              Subtable->Length, InfoTable);
          if (ACPI_FAILURE (Status))
          {
-Index: acpica-unix2-20211217/source/compiler/dttable1.c
+Index: acpica-unix2-20220331/source/compiler/dttable1.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/compiler/dttable1.c
-+++ acpica-unix2-20211217/source/compiler/dttable1.c
-@@ -1342,6 +1342,7 @@ DtCompileFpdt (
+--- acpica-unix2-20220331.orig/source/compiler/dttable1.c
++++ acpica-unix2-20220331/source/compiler/dttable1.c
+@@ -1493,6 +1493,7 @@ DtCompileFpdt (
      ACPI_DMTABLE_INFO       *InfoTable;
      DT_FIELD                **PFieldList = (DT_FIELD **) List;
      DT_FIELD                *SubtableStart;
@@ -73,7 +73,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
  
  
      while (*PFieldList)
-@@ -1360,7 +1361,8 @@ DtCompileFpdt (
+@@ -1511,7 +1512,8 @@ DtCompileFpdt (
  
          FpdtHeader = ACPI_CAST_PTR (ACPI_FPDT_HEADER, Subtable->Buffer);
  
diff --git a/0018-Support-GTDT-in-a-big-endian-world.patch b/0018-Support-GTDT-in-a-big-endian-world.patch
index fdfcd8d..4bdb9bc 100644
--- a/0018-Support-GTDT-in-a-big-endian-world.patch
+++ b/0018-Support-GTDT-in-a-big-endian-world.patch
@@ -9,11 +9,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/compiler/dttable1.c |  9 +++++++--
  2 files changed, 16 insertions(+), 6 deletions(-)
 
-Index: acpica-unix2-20211217/source/common/dmtbdump1.c
+Index: acpica-unix2-20220331/source/common/dmtbdump1.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/common/dmtbdump1.c
-+++ acpica-unix2-20211217/source/common/dmtbdump1.c
-@@ -1292,7 +1292,7 @@ AcpiDmDumpGtdt (
+--- acpica-unix2-20220331.orig/source/common/dmtbdump1.c
++++ acpica-unix2-20220331/source/common/dmtbdump1.c
+@@ -1376,7 +1376,7 @@ AcpiDmDumpGtdt (
  {
      ACPI_STATUS             Status;
      ACPI_GTDT_HEADER        *Subtable;
@@ -22,7 +22,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
      UINT32                  Offset = sizeof (ACPI_TABLE_GTDT);
      ACPI_DMTABLE_INFO       *InfoTable;
      UINT32                  SubtableLength;
-@@ -1328,7 +1328,7 @@ AcpiDmDumpGtdt (
+@@ -1412,7 +1412,7 @@ AcpiDmDumpGtdt (
  
      /* Subtables */
  
@@ -31,7 +31,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
      {
          /* Common subtable header */
  
-@@ -1346,8 +1346,13 @@ AcpiDmDumpGtdt (
+@@ -1430,8 +1430,13 @@ AcpiDmDumpGtdt (
          case ACPI_GTDT_TYPE_TIMER_BLOCK:
  
              SubtableLength = sizeof (ACPI_GTDT_TIMER_BLOCK);
@@ -47,11 +47,11 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
  
              InfoTable = AcpiDmTableInfoGtdt0;
              break;
-Index: acpica-unix2-20211217/source/compiler/dttable1.c
+Index: acpica-unix2-20220331/source/compiler/dttable1.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/compiler/dttable1.c
-+++ acpica-unix2-20211217/source/compiler/dttable1.c
-@@ -1288,8 +1288,13 @@ DtCompileGtdt (
+--- acpica-unix2-20220331.orig/source/compiler/dttable1.c
++++ acpica-unix2-20220331/source/compiler/dttable1.c
+@@ -1439,8 +1439,13 @@ DtCompileGtdt (
              DtPushSubtable (Subtable);
              ParentTable = DtPeekSubtable ();
  
diff --git a/0019-Support-HEST-in-a-big-endian-world.patch b/0019-Support-HEST-in-a-big-endian-world.patch
index 611e052..e54f2ed 100644
--- a/0019-Support-HEST-in-a-big-endian-world.patch
+++ b/0019-Support-HEST-in-a-big-endian-world.patch
@@ -9,11 +9,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/compiler/dttable1.c |  4 +++-
  2 files changed, 9 insertions(+), 5 deletions(-)
 
-Index: acpica-unix2-20211217/source/common/dmtbdump1.c
+Index: acpica-unix2-20220331/source/common/dmtbdump1.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/common/dmtbdump1.c
-+++ acpica-unix2-20211217/source/common/dmtbdump1.c
-@@ -1433,12 +1433,13 @@ AcpiDmDumpHest (
+--- acpica-unix2-20220331.orig/source/common/dmtbdump1.c
++++ acpica-unix2-20220331/source/common/dmtbdump1.c
+@@ -1517,12 +1517,13 @@ AcpiDmDumpHest (
  {
      ACPI_STATUS             Status;
      ACPI_HEST_HEADER        *Subtable;
@@ -28,7 +28,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
  
  
      /* Main table */
-@@ -1452,10 +1453,11 @@ AcpiDmDumpHest (
+@@ -1536,10 +1537,11 @@ AcpiDmDumpHest (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_HEST_HEADER, Table, Offset);
@@ -42,7 +42,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
          {
          case ACPI_HEST_TYPE_IA32_CHECK:
  
-@@ -1522,7 +1524,7 @@ AcpiDmDumpHest (
+@@ -1606,7 +1608,7 @@ AcpiDmDumpHest (
              /* Cannot continue on unknown type - no length */
  
              AcpiOsPrintf ("\n**** Unknown HEST subtable type 0x%X\n",
@@ -51,11 +51,11 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
              return;
          }
  
-Index: acpica-unix2-20211217/source/compiler/dttable1.c
+Index: acpica-unix2-20220331/source/compiler/dttable1.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/compiler/dttable1.c
-+++ acpica-unix2-20211217/source/compiler/dttable1.c
-@@ -1424,6 +1424,7 @@ DtCompileHest (
+--- acpica-unix2-20220331.orig/source/compiler/dttable1.c
++++ acpica-unix2-20220331/source/compiler/dttable1.c
+@@ -1575,6 +1575,7 @@ DtCompileHest (
      DT_FIELD                *SubtableStart;
      ACPI_DMTABLE_INFO       *InfoTable;
      UINT16                  Type;
@@ -63,7 +63,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
      UINT32                  BankCount;
  
  
-@@ -1442,7 +1443,8 @@ DtCompileHest (
+@@ -1593,7 +1594,8 @@ DtCompileHest (
          /* Get subtable type */
  
          SubtableStart = *PFieldList;
diff --git a/0020-Support-RSDT-RSD-PTR-in-a-big-endian-world.patch b/0020-Support-RSDT-RSD-PTR-in-a-big-endian-world.patch
index 0df5881..e47951d 100644
--- a/0020-Support-RSDT-RSD-PTR-in-a-big-endian-world.patch
+++ b/0020-Support-RSDT-RSD-PTR-in-a-big-endian-world.patch
@@ -8,10 +8,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/common/dmtbdump.c | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
-Index: acpica-unix2-20211217/source/common/dmtbdump.c
+Index: acpica-unix2-20220331/source/common/dmtbdump.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/common/dmtbdump.c
-+++ acpica-unix2-20211217/source/common/dmtbdump.c
+--- acpica-unix2-20220331.orig/source/common/dmtbdump.c
++++ acpica-unix2-20220331/source/common/dmtbdump.c
 @@ -336,6 +336,7 @@ AcpiDmDumpRsdt (
      UINT32                  Entries;
      UINT32                  Offset;
diff --git a/0021-Support-XSDT-in-a-big-endian-world.patch b/0021-Support-XSDT-in-a-big-endian-world.patch
index 40639d6..86ca379 100644
--- a/0021-Support-XSDT-in-a-big-endian-world.patch
+++ b/0021-Support-XSDT-in-a-big-endian-world.patch
@@ -8,10 +8,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/common/dmtbdump.c | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
-Index: acpica-unix2-20211217/source/common/dmtbdump.c
+Index: acpica-unix2-20220331/source/common/dmtbdump.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/common/dmtbdump.c
-+++ acpica-unix2-20211217/source/common/dmtbdump.c
+--- acpica-unix2-20220331.orig/source/common/dmtbdump.c
++++ acpica-unix2-20220331/source/common/dmtbdump.c
 @@ -377,6 +377,7 @@ AcpiDmDumpXsdt (
      UINT32                  Entries;
      UINT32                  Offset;
diff --git a/0022-Support-SRAT-in-a-big-endian-world.patch b/0022-Support-SRAT-in-a-big-endian-world.patch
index 896efe9..0993d26 100644
--- a/0022-Support-SRAT-in-a-big-endian-world.patch
+++ b/0022-Support-SRAT-in-a-big-endian-world.patch
@@ -8,10 +8,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/common/dmtbdump3.c | 9 +++++----
  1 file changed, 5 insertions(+), 4 deletions(-)
 
-Index: acpica-unix2-20211217/source/common/dmtbdump3.c
+Index: acpica-unix2-20220331/source/common/dmtbdump3.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/common/dmtbdump3.c
-+++ acpica-unix2-20211217/source/common/dmtbdump3.c
+--- acpica-unix2-20220331.orig/source/common/dmtbdump3.c
++++ acpica-unix2-20220331/source/common/dmtbdump3.c
 @@ -173,11 +173,12 @@ AcpiDmDumpSrat (
      UINT32                  Offset = sizeof (ACPI_TABLE_SRAT);
      ACPI_SUBTABLE_HEADER    *Subtable;
diff --git a/0023-Support-SLIT-in-a-big-endian-world.patch b/0023-Support-SLIT-in-a-big-endian-world.patch
index c546b1d..15936a4 100644
--- a/0023-Support-SLIT-in-a-big-endian-world.patch
+++ b/0023-Support-SLIT-in-a-big-endian-world.patch
@@ -9,10 +9,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/compiler/dttable2.c | 2 +-
  2 files changed, 6 insertions(+), 4 deletions(-)
 
-Index: acpica-unix2-20211217/source/common/dmtbdump3.c
+Index: acpica-unix2-20220331/source/common/dmtbdump3.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/common/dmtbdump3.c
-+++ acpica-unix2-20211217/source/common/dmtbdump3.c
+--- acpica-unix2-20220331.orig/source/common/dmtbdump3.c
++++ acpica-unix2-20220331/source/common/dmtbdump3.c
 @@ -96,11 +96,12 @@ AcpiDmDumpSlit (
      UINT32                  Localities;
      UINT32                  i;
@@ -46,11 +46,11 @@ Index: acpica-unix2-20211217/source/common/dmtbdump3.c
              {
                  AcpiOsPrintf (
                      "\n**** Not enough room in table for all localities\n");
-Index: acpica-unix2-20211217/source/compiler/dttable2.c
+Index: acpica-unix2-20220331/source/compiler/dttable2.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/compiler/dttable2.c
-+++ acpica-unix2-20211217/source/compiler/dttable2.c
-@@ -2221,7 +2221,7 @@ DtCompileSlit (
+--- acpica-unix2-20220331.orig/source/compiler/dttable2.c
++++ acpica-unix2-20220331/source/compiler/dttable2.c
+@@ -2234,7 +2234,7 @@ DtCompileSlit (
      ParentTable = DtPeekSubtable ();
      DtInsertSubtable (ParentTable, Subtable);
  
diff --git a/0024-Support-MSCT-in-a-big-endian-world.patch b/0024-Support-MSCT-in-a-big-endian-world.patch
index 43dae55..5ee3854 100644
--- a/0024-Support-MSCT-in-a-big-endian-world.patch
+++ b/0024-Support-MSCT-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(-)
 
-Index: acpica-unix2-20211217/source/common/dmtbdump2.c
+Index: acpica-unix2-20220331/source/common/dmtbdump2.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20211217/source/common/dmtbdump2.c
-@@ -1133,11 +1133,12 @@ AcpiDmDumpMsct (
+--- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20220331/source/common/dmtbdump2.c
+@@ -1185,11 +1185,12 @@ AcpiDmDumpMsct (
      ACPI_STATUS             Status;
      UINT32                  Offset = sizeof (ACPI_TABLE_MSCT);
      ACPI_MSCT_PROXIMITY     *Subtable;
@@ -26,7 +26,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
      if (ACPI_FAILURE (Status))
      {
          return;
-@@ -1146,12 +1147,12 @@ AcpiDmDumpMsct (
+@@ -1198,12 +1199,12 @@ AcpiDmDumpMsct (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_MSCT_PROXIMITY, Table, Offset);
diff --git a/0025-Support-MPST-in-a-big-endian-world.patch b/0025-Support-MPST-in-a-big-endian-world.patch
index 5a12316..ef704b7 100644
--- a/0025-Support-MPST-in-a-big-endian-world.patch
+++ b/0025-Support-MPST-in-a-big-endian-world.patch
@@ -9,11 +9,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/compiler/dttable2.c |  8 ++++----
  2 files changed, 23 insertions(+), 18 deletions(-)
 
-Index: acpica-unix2-20210730/source/common/dmtbdump2.c
+Index: acpica-unix2-20220331/source/common/dmtbdump2.c
 ===================================================================
---- acpica-unix2-20210730.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20210730/source/common/dmtbdump2.c
-@@ -995,11 +995,13 @@ AcpiDmDumpMpst (
+--- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20220331/source/common/dmtbdump2.c
+@@ -1047,11 +1047,13 @@ AcpiDmDumpMpst (
      UINT16                  SubtableCount;
      UINT32                  PowerStateCount;
      UINT32                  ComponentCount;
@@ -28,7 +28,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump2.c
      if (ACPI_FAILURE (Status))
      {
          return;
-@@ -1007,13 +1009,14 @@ AcpiDmDumpMpst (
+@@ -1059,13 +1061,14 @@ AcpiDmDumpMpst (
  
      /* Subtable: Memory Power Node(s) */
  
@@ -46,7 +46,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump2.c
              sizeof (ACPI_MPST_POWER_NODE), AcpiDmTableInfoMpst0);
          if (ACPI_FAILURE (Status))
          {
-@@ -1022,8 +1025,8 @@ AcpiDmDumpMpst (
+@@ -1074,8 +1077,8 @@ AcpiDmDumpMpst (
  
          /* Extract the sub-subtable counts */
  
@@ -57,7 +57,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump2.c
          Offset += sizeof (ACPI_MPST_POWER_NODE);
  
          /* Sub-subtables - Memory Power State Structure(s) */
-@@ -1034,7 +1037,7 @@ AcpiDmDumpMpst (
+@@ -1086,7 +1089,7 @@ AcpiDmDumpMpst (
          while (PowerStateCount)
          {
              AcpiOsPrintf ("\n");
@@ -66,7 +66,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump2.c
                  sizeof (ACPI_MPST_POWER_STATE), AcpiDmTableInfoMpst0A);
              if (ACPI_FAILURE (Status))
              {
-@@ -1057,7 +1060,7 @@ AcpiDmDumpMpst (
+@@ -1109,7 +1112,7 @@ AcpiDmDumpMpst (
  
          while (ComponentCount)
          {
@@ -75,7 +75,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump2.c
                  sizeof (ACPI_MPST_COMPONENT), AcpiDmTableInfoMpst0B);
              if (ACPI_FAILURE (Status))
              {
-@@ -1074,22 +1077,24 @@ AcpiDmDumpMpst (
+@@ -1126,22 +1129,24 @@ AcpiDmDumpMpst (
          SubtableCount--;
          Subtable0 = ACPI_ADD_PTR (ACPI_MPST_POWER_NODE, Subtable0,
              sizeof (ACPI_MPST_POWER_NODE) +
@@ -104,7 +104,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump2.c
      Offset += sizeof (ACPI_MPST_DATA_HDR);
  
      /* Subtable: Memory Power State Characteristics structure(s) */
-@@ -1097,10 +1102,10 @@ AcpiDmDumpMpst (
+@@ -1149,10 +1154,10 @@ AcpiDmDumpMpst (
      Subtable2 = ACPI_ADD_PTR (ACPI_MPST_POWER_DATA, Subtable1,
          sizeof (ACPI_MPST_DATA_HDR));
  
@@ -117,11 +117,11 @@ Index: acpica-unix2-20210730/source/common/dmtbdump2.c
              sizeof (ACPI_MPST_POWER_DATA), AcpiDmTableInfoMpst2);
          if (ACPI_FAILURE (Status))
          {
-Index: acpica-unix2-20210730/source/compiler/dttable2.c
+Index: acpica-unix2-20220331/source/compiler/dttable2.c
 ===================================================================
---- acpica-unix2-20210730.orig/source/compiler/dttable2.c
-+++ acpica-unix2-20210730/source/compiler/dttable2.c
-@@ -350,7 +350,7 @@ DtCompileMpst (
+--- acpica-unix2-20220331.orig/source/compiler/dttable2.c
++++ acpica-unix2-20220331/source/compiler/dttable2.c
+@@ -359,7 +359,7 @@ DtCompileMpst (
      DtPushSubtable (Subtable);
  
      MpstChannelInfo = ACPI_CAST_PTR (ACPI_MPST_CHANNEL, Subtable->Buffer);
@@ -130,7 +130,7 @@ Index: acpica-unix2-20210730/source/compiler/dttable2.c
  
      while (*PFieldList && SubtableCount)
      {
-@@ -368,8 +368,8 @@ DtCompileMpst (
+@@ -377,8 +377,8 @@ DtCompileMpst (
          DtPushSubtable (Subtable);
  
          MpstPowerNode = ACPI_CAST_PTR (ACPI_MPST_POWER_NODE, Subtable->Buffer);
@@ -141,7 +141,7 @@ Index: acpica-unix2-20210730/source/compiler/dttable2.c
  
          ParentTable = DtPeekSubtable ();
  
-@@ -422,7 +422,7 @@ DtCompileMpst (
+@@ -431,7 +431,7 @@ DtCompileMpst (
      DtPushSubtable (Subtable);
  
      MpstDataHeader = ACPI_CAST_PTR (ACPI_MPST_DATA_HDR, Subtable->Buffer);
diff --git a/0026-Support-NFIT-in-a-big-endian-world.patch b/0026-Support-NFIT-in-a-big-endian-world.patch
index 5089e09..6b85634 100644
--- a/0026-Support-NFIT-in-a-big-endian-world.patch
+++ b/0026-Support-NFIT-in-a-big-endian-world.patch
@@ -13,11 +13,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/compiler/dttable2.c | 11 ++++++---
  3 files changed, 39 insertions(+), 25 deletions(-)
 
-Index: acpica-unix2-20211217/source/common/dmtable.c
+Index: acpica-unix2-20220331/source/common/dmtable.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/common/dmtable.c
-+++ acpica-unix2-20211217/source/common/dmtable.c
-@@ -1755,13 +1755,13 @@ AcpiDmDumpTable (
+--- acpica-unix2-20220331.orig/source/common/dmtable.c
++++ acpica-unix2-20220331/source/common/dmtable.c
+@@ -1766,13 +1766,13 @@ AcpiDmDumpTable (
  
              /* NFIT subtable types */
  
@@ -33,11 +33,11 @@ Index: acpica-unix2-20211217/source/common/dmtable.c
                  AcpiDmNfitSubnames[Temp16]);
              break;
  
-Index: acpica-unix2-20211217/source/common/dmtbdump2.c
+Index: acpica-unix2-20220331/source/common/dmtbdump2.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20211217/source/common/dmtbdump2.c
-@@ -1192,18 +1192,23 @@ AcpiDmDumpNfit (
+--- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20220331/source/common/dmtbdump2.c
+@@ -1244,18 +1244,23 @@ AcpiDmDumpNfit (
      ACPI_STATUS             Status;
      UINT32                  Offset = sizeof (ACPI_TABLE_NFIT);
      UINT32                  FieldOffset = 0;
@@ -63,7 +63,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
      if (ACPI_FAILURE (Status))
      {
          return;
-@@ -1212,19 +1217,21 @@ AcpiDmDumpNfit (
+@@ -1264,19 +1269,21 @@ AcpiDmDumpNfit (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_NFIT_HEADER, Table, Offset);
@@ -89,7 +89,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
          {
          case ACPI_NFIT_TYPE_SYSTEM_ADDRESS:
  
-@@ -1275,11 +1282,11 @@ AcpiDmDumpNfit (
+@@ -1327,11 +1334,11 @@ AcpiDmDumpNfit (
  
          default:
              AcpiOsPrintf ("\n**** Unknown NFIT subtable type 0x%X\n",
@@ -103,7 +103,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
              {
                  AcpiOsPrintf ("Invalid zero length subtable\n");
                  return;
-@@ -1288,8 +1295,8 @@ AcpiDmDumpNfit (
+@@ -1340,8 +1347,8 @@ AcpiDmDumpNfit (
          }
  
          AcpiOsPrintf ("\n");
@@ -114,7 +114,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
          if (ACPI_FAILURE (Status))
          {
              return;
-@@ -1297,14 +1304,15 @@ AcpiDmDumpNfit (
+@@ -1349,14 +1356,15 @@ AcpiDmDumpNfit (
  
          /* Per-subtable variable-length fields */
  
@@ -133,7 +133,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
                      &Interleave->LineOffset[i],
                      sizeof (UINT32), AcpiDmTableInfoNfit2a);
                  if (ACPI_FAILURE (Status))
-@@ -1318,14 +1326,14 @@ AcpiDmDumpNfit (
+@@ -1370,14 +1378,14 @@ AcpiDmDumpNfit (
  
          case ACPI_NFIT_TYPE_SMBIOS:
  
@@ -151,7 +151,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
                      Length, AcpiDmTableInfoNfit3a);
                  if (ACPI_FAILURE (Status))
                  {
-@@ -1338,9 +1346,10 @@ AcpiDmDumpNfit (
+@@ -1390,9 +1398,10 @@ AcpiDmDumpNfit (
          case ACPI_NFIT_TYPE_FLUSH_ADDRESS:
  
              Hint = ACPI_CAST_PTR (ACPI_NFIT_FLUSH_ADDRESS, Subtable);
@@ -164,7 +164,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
                      &Hint->HintAddress[i],
                      sizeof (UINT64), AcpiDmTableInfoNfit6a);
                  if (ACPI_FAILURE (Status))
-@@ -1359,8 +1368,8 @@ AcpiDmDumpNfit (
+@@ -1411,8 +1420,8 @@ AcpiDmDumpNfit (
  NextSubtable:
          /* Point to next subtable */
  
@@ -175,11 +175,11 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
      }
  }
  
-Index: acpica-unix2-20211217/source/compiler/dttable2.c
+Index: acpica-unix2-20220331/source/compiler/dttable2.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/compiler/dttable2.c
-+++ acpica-unix2-20211217/source/compiler/dttable2.c
-@@ -497,6 +497,7 @@ DtCompileNfit (
+--- acpica-unix2-20220331.orig/source/compiler/dttable2.c
++++ acpica-unix2-20220331/source/compiler/dttable2.c
+@@ -506,6 +506,7 @@ DtCompileNfit (
      UINT32                  Count;
      ACPI_NFIT_INTERLEAVE    *Interleave = NULL;
      ACPI_NFIT_FLUSH_ADDRESS *Hint = NULL;
@@ -187,7 +187,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable2.c
  
  
      /* Main table */
-@@ -530,7 +531,8 @@ DtCompileNfit (
+@@ -539,7 +540,8 @@ DtCompileNfit (
  
          NfitHeader = ACPI_CAST_PTR (ACPI_NFIT_HEADER, Subtable->Buffer);
  
@@ -197,7 +197,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable2.c
          {
          case ACPI_NFIT_TYPE_SYSTEM_ADDRESS:
  
-@@ -590,7 +592,7 @@ DtCompileNfit (
+@@ -599,7 +601,7 @@ DtCompileNfit (
          DtInsertSubtable (ParentTable, Subtable);
          DtPopSubtable ();
  
@@ -206,7 +206,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable2.c
          {
          case ACPI_NFIT_TYPE_INTERLEAVE:
  
-@@ -616,7 +618,8 @@ DtCompileNfit (
+@@ -625,7 +627,8 @@ DtCompileNfit (
                  Count++;
              }
  
@@ -216,7 +216,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable2.c
              break;
  
          case ACPI_NFIT_TYPE_SMBIOS:
-@@ -662,6 +665,8 @@ DtCompileNfit (
+@@ -671,6 +674,8 @@ DtCompileNfit (
              }
  
              Hint->HintCount = (UINT16) Count;
diff --git a/0027-Support-SDEV-in-a-big-endian-world.patch b/0027-Support-SDEV-in-a-big-endian-world.patch
index 11adeb5..680961e 100644
--- a/0027-Support-SDEV-in-a-big-endian-world.patch
+++ b/0027-Support-SDEV-in-a-big-endian-world.patch
@@ -9,11 +9,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/compiler/dttable2.c | 27 ++++++++++++++++++++-
  2 files changed, 52 insertions(+), 23 deletions(-)
 
-Index: acpica-unix2-20211217/source/common/dmtbdump2.c
+Index: acpica-unix2-20220331/source/common/dmtbdump2.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20211217/source/common/dmtbdump2.c
-@@ -2534,7 +2534,7 @@ AcpiDmDumpSdev (
+--- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20220331/source/common/dmtbdump2.c
+@@ -2581,7 +2581,7 @@ AcpiDmDumpSdev (
      ACPI_SDEV_NAMESPACE         *Namesp;
      ACPI_DMTABLE_INFO           *InfoTable;
      ACPI_DMTABLE_INFO           *SecureComponentInfoTable;
@@ -22,7 +22,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
      UINT32                      Offset = sizeof (ACPI_TABLE_SDEV);
      UINT16                      PathOffset;
      UINT16                      PathLength;
-@@ -2542,11 +2542,12 @@ AcpiDmDumpSdev (
+@@ -2589,11 +2589,12 @@ AcpiDmDumpSdev (
      UINT16                      VendorDataLength;
      ACPI_SDEV_SECURE_COMPONENT  *SecureComponent = NULL;
      UINT32                      CurrentOffset = 0;
@@ -36,7 +36,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
      if (ACPI_FAILURE (Status))
      {
          return;
-@@ -2555,13 +2556,14 @@ AcpiDmDumpSdev (
+@@ -2602,13 +2603,14 @@ AcpiDmDumpSdev (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_SDEV_HEADER, Table, Offset);
@@ -54,7 +54,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
          if (ACPI_FAILURE (Status))
          {
              return;
-@@ -2584,8 +2586,8 @@ AcpiDmDumpSdev (
+@@ -2631,8 +2633,8 @@ AcpiDmDumpSdev (
          }
  
          AcpiOsPrintf ("\n");
@@ -65,7 +65,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
          if (ACPI_FAILURE (Status))
          {
              return;
-@@ -2644,12 +2646,12 @@ AcpiDmDumpSdev (
+@@ -2691,12 +2693,12 @@ AcpiDmDumpSdev (
              /* Dump the PCIe device ID(s) */
  
              Namesp = ACPI_CAST_PTR (ACPI_SDEV_NAMESPACE, Subtable);
@@ -81,7 +81,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
                      ACPI_ADD_PTR (UINT8, Namesp, PathOffset),
                      PathLength, AcpiDmTableInfoSdev0a);
                  if (ACPI_FAILURE (Status))
-@@ -2661,14 +2663,14 @@ AcpiDmDumpSdev (
+@@ -2708,14 +2710,14 @@ AcpiDmDumpSdev (
  
              /* Dump the vendor-specific data */
  
@@ -100,7 +100,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
                      ACPI_ADD_PTR (UINT8, Namesp, VendorDataOffset),
                      VendorDataLength, AcpiDmTableInfoSdev1b);
                  if (ACPI_FAILURE (Status))
-@@ -2683,12 +2685,12 @@ AcpiDmDumpSdev (
+@@ -2730,12 +2732,12 @@ AcpiDmDumpSdev (
              /* PCI path substructures */
  
              Pcie = ACPI_CAST_PTR (ACPI_SDEV_PCIE, Subtable);
@@ -116,7 +116,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
                      PathOffset + Offset,
                      ACPI_ADD_PTR (UINT8, Pcie, PathOffset),
                      sizeof (ACPI_SDEV_PCIE_PATH), AcpiDmTableInfoSdev1a);
-@@ -2703,12 +2705,14 @@ AcpiDmDumpSdev (
+@@ -2750,12 +2752,14 @@ AcpiDmDumpSdev (
  
              /* VendorData */
  
@@ -134,7 +134,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
                      ACPI_ADD_PTR (UINT8, Pcie, VendorDataOffset),
                      VendorDataLength, AcpiDmTableInfoSdev1b);
                  if (ACPI_FAILURE (Status))
-@@ -2725,8 +2729,8 @@ AcpiDmDumpSdev (
+@@ -2772,8 +2776,8 @@ AcpiDmDumpSdev (
  NextSubtable:
          /* Point to next subtable */
  
@@ -145,11 +145,11 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
 +            SubtableLength);
      }
  }
-Index: acpica-unix2-20211217/source/compiler/dttable2.c
+Index: acpica-unix2-20220331/source/compiler/dttable2.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/compiler/dttable2.c
-+++ acpica-unix2-20211217/source/compiler/dttable2.c
-@@ -1877,6 +1877,7 @@ DtCompileSdev (
+--- acpica-unix2-20220331.orig/source/compiler/dttable2.c
++++ acpica-unix2-20220331/source/compiler/dttable2.c
+@@ -1890,6 +1890,7 @@ DtCompileSdev (
      UINT32                      EntryCount;
      ACPI_SDEV_SECURE_COMPONENT  *SecureComponent = NULL;
      UINT16                      ComponentLength = 0;
@@ -157,7 +157,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable2.c
  
  
      /* Subtables */
-@@ -1898,7 +1899,7 @@ DtCompileSdev (
+@@ -1911,7 +1912,7 @@ DtCompileSdev (
          DtPushSubtable (Subtable);
  
          SdevHeader = ACPI_CAST_PTR (ACPI_SDEV_HEADER, Subtable->Buffer);
@@ -166,7 +166,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable2.c
  
          switch (SdevHeader->Type)
          {
-@@ -2071,6 +2072,18 @@ DtCompileSdev (
+@@ -2084,6 +2085,18 @@ DtCompileSdev (
                  }
              }
  
@@ -185,7 +185,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable2.c
              break;
  
          case ACPI_SDEV_TYPE_PCIE_ENDPOINT_DEVICE:
-@@ -2133,6 +2146,18 @@ DtCompileSdev (
+@@ -2146,6 +2159,18 @@ DtCompileSdev (
              SdevHeader->Length =
                  sizeof (ACPI_SDEV_PCIE) +
                  Pcie->PathLength + Pcie->VendorDataLength;
diff --git a/0028-Support-HMAT-in-a-big-endian-world.patch b/0028-Support-HMAT-in-a-big-endian-world.patch
index 9cbb611..386db57 100644
--- a/0028-Support-HMAT-in-a-big-endian-world.patch
+++ b/0028-Support-HMAT-in-a-big-endian-world.patch
@@ -9,11 +9,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/compiler/dttable1.c | 24 ++++++++++---
  2 files changed, 59 insertions(+), 35 deletions(-)
 
-Index: acpica-unix2-20211217/source/common/dmtbdump1.c
+Index: acpica-unix2-20220331/source/common/dmtbdump1.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/common/dmtbdump1.c
-+++ acpica-unix2-20211217/source/common/dmtbdump1.c
-@@ -1596,37 +1596,45 @@ AcpiDmDumpHmat (
+--- acpica-unix2-20220331.orig/source/common/dmtbdump1.c
++++ acpica-unix2-20220331/source/common/dmtbdump1.c
+@@ -1680,37 +1680,45 @@ AcpiDmDumpHmat (
      UINT32                  Length;
      ACPI_DMTABLE_INFO       *InfoTable;
      UINT32                  i, j;
@@ -65,7 +65,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
          {
          case ACPI_HMAT_TYPE_ADDRESS_RANGE:
  
-@@ -1649,7 +1657,7 @@ AcpiDmDumpHmat (
+@@ -1733,7 +1741,7 @@ AcpiDmDumpHmat (
          default:
  
              AcpiOsPrintf ("\n**** Unknown HMAT structure type 0x%X\n",
@@ -74,7 +74,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
  
              /* Attempt to continue */
  
-@@ -1658,13 +1666,13 @@ AcpiDmDumpHmat (
+@@ -1742,13 +1750,13 @@ AcpiDmDumpHmat (
  
          /* Dump HMAT structure body */
  
@@ -91,7 +91,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
          if (ACPI_FAILURE (Status))
          {
              return;
-@@ -1672,7 +1680,7 @@ AcpiDmDumpHmat (
+@@ -1756,7 +1764,7 @@ AcpiDmDumpHmat (
  
          /* Dump HMAT structure additionals */
  
@@ -100,7 +100,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
          {
          case ACPI_HMAT_TYPE_LOCALITY:
  
-@@ -1681,15 +1689,16 @@ AcpiDmDumpHmat (
+@@ -1765,15 +1773,16 @@ AcpiDmDumpHmat (
  
              /* Dump initiator proximity domains */
  
@@ -121,7 +121,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
                      ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, HmatStruct, SubtableOffset),
                      4, AcpiDmTableInfoHmat1a);
                  if (ACPI_FAILURE (Status))
-@@ -1702,15 +1711,16 @@ AcpiDmDumpHmat (
+@@ -1786,15 +1795,16 @@ AcpiDmDumpHmat (
  
              /* Dump target proximity domains */
  
@@ -142,7 +142,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
                      ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, HmatStruct, SubtableOffset),
                      4, AcpiDmTableInfoHmat1b);
                  if (ACPI_FAILURE (Status))
-@@ -1723,18 +1733,17 @@ AcpiDmDumpHmat (
+@@ -1807,18 +1817,17 @@ AcpiDmDumpHmat (
  
              /* Dump latency/bandwidth entris */
  
@@ -166,7 +166,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
                          ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, HmatStruct, SubtableOffset),
                          2, AcpiDmTableInfoHmat1c);
                      if (ACPI_FAILURE(Status))
-@@ -1754,15 +1763,16 @@ AcpiDmDumpHmat (
+@@ -1838,15 +1847,16 @@ AcpiDmDumpHmat (
  
              /* Dump SMBIOS handles */
  
@@ -187,7 +187,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
                      ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, HmatStruct, SubtableOffset),
                      2, AcpiDmTableInfoHmat2a);
                  if (ACPI_FAILURE (Status))
-@@ -1782,6 +1792,6 @@ AcpiDmDumpHmat (
+@@ -1866,6 +1876,6 @@ AcpiDmDumpHmat (
  NextSubtable:
          /* Point to next HMAT structure subtable */
  
@@ -195,11 +195,11 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
 +        Offset += (HmatStructLength);
      }
  }
-Index: acpica-unix2-20211217/source/compiler/dttable1.c
+Index: acpica-unix2-20220331/source/compiler/dttable1.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/compiler/dttable1.c
-+++ acpica-unix2-20211217/source/compiler/dttable1.c
-@@ -1586,6 +1586,8 @@ DtCompileHmat (
+--- acpica-unix2-20220331.orig/source/compiler/dttable1.c
++++ acpica-unix2-20220331/source/compiler/dttable1.c
+@@ -1737,6 +1737,8 @@ DtCompileHmat (
      UINT32                  TgtPDNumber;
      UINT64                  EntryNumber;
      UINT16                  SMBIOSHandleNumber;
@@ -208,7 +208,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
  
  
      ParentTable = DtPeekSubtable ();
-@@ -1616,7 +1618,8 @@ DtCompileHmat (
+@@ -1767,7 +1769,8 @@ DtCompileHmat (
  
          /* Compile HMAT structure body */
  
@@ -218,7 +218,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
          {
          case ACPI_HMAT_TYPE_ADDRESS_RANGE:
  
-@@ -1649,7 +1652,7 @@ DtCompileHmat (
+@@ -1800,7 +1803,7 @@ DtCompileHmat (
  
          /* Compile HMAT structure additionals */
  
@@ -227,7 +227,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
          {
          case ACPI_HMAT_TYPE_LOCALITY:
  
-@@ -1675,7 +1678,7 @@ DtCompileHmat (
+@@ -1826,7 +1829,7 @@ DtCompileHmat (
                  HmatStruct->Length += Subtable->Length;
                  IntPDNumber++;
              }
@@ -236,7 +236,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
  
              /* Compile target proximity domain list */
  
-@@ -1696,7 +1699,7 @@ DtCompileHmat (
+@@ -1847,7 +1850,7 @@ DtCompileHmat (
                  HmatStruct->Length += Subtable->Length;
                  TgtPDNumber++;
              }
@@ -245,7 +245,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
  
              /* Save start of the entries for reporting errors */
  
-@@ -1722,6 +1725,9 @@ DtCompileHmat (
+@@ -1873,6 +1876,9 @@ DtCompileHmat (
                  EntryNumber++;
              }
  
@@ -255,7 +255,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
              /* Validate number of entries */
  
              if (EntryNumber !=
-@@ -1755,11 +1761,19 @@ DtCompileHmat (
+@@ -1906,11 +1912,19 @@ DtCompileHmat (
                  HmatStruct->Length += Subtable->Length;
                  SMBIOSHandleNumber++;
              }
diff --git a/0029-Support-PDTT-in-a-big-endian-world.patch b/0029-Support-PDTT-in-a-big-endian-world.patch
index 3ddabc9..51e41d1 100644
--- a/0029-Support-PDTT-in-a-big-endian-world.patch
+++ b/0029-Support-PDTT-in-a-big-endian-world.patch
@@ -8,11 +8,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/common/dmtbdump2.c | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
-Index: acpica-unix2-20211217/source/common/dmtbdump2.c
+Index: acpica-unix2-20220331/source/common/dmtbdump2.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20211217/source/common/dmtbdump2.c
-@@ -1907,13 +1907,13 @@ AcpiDmDumpPdtt (
+--- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20220331/source/common/dmtbdump2.c
+@@ -1954,13 +1954,13 @@ AcpiDmDumpPdtt (
  {
      ACPI_STATUS             Status;
      ACPI_PDTT_CHANNEL       *Subtable;
@@ -28,7 +28,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
      if (ACPI_FAILURE (Status))
      {
          return;
-@@ -1922,10 +1922,10 @@ AcpiDmDumpPdtt (
+@@ -1969,10 +1969,10 @@ AcpiDmDumpPdtt (
      /* Subtables. Currently there is only one type, but can be multiples */
  
      Subtable = ACPI_ADD_PTR (ACPI_PDTT_CHANNEL, Table, Offset);
diff --git a/0030-Support-PPTT-in-a-big-endian-world.patch b/0030-Support-PPTT-in-a-big-endian-world.patch
index e1fd491..86fb5cd 100644
--- a/0030-Support-PPTT-in-a-big-endian-world.patch
+++ b/0030-Support-PPTT-in-a-big-endian-world.patch
@@ -9,11 +9,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/compiler/dttable2.c |  7 +++++--
  2 files changed, 15 insertions(+), 9 deletions(-)
 
-Index: acpica-unix2-20211217/source/common/dmtbdump2.c
+Index: acpica-unix2-20220331/source/common/dmtbdump2.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20211217/source/common/dmtbdump2.c
-@@ -2194,6 +2194,8 @@ AcpiDmDumpPptt (
+--- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20220331/source/common/dmtbdump2.c
+@@ -2241,6 +2241,8 @@ AcpiDmDumpPptt (
      UINT32                  Offset = sizeof (ACPI_TABLE_FPDT);
      ACPI_DMTABLE_INFO       *InfoTable;
      UINT32                  i;
@@ -22,7 +22,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
  
  
      /* There is no main table (other than the standard ACPI header) */
-@@ -2201,7 +2203,7 @@ AcpiDmDumpPptt (
+@@ -2248,7 +2250,7 @@ AcpiDmDumpPptt (
      /* Subtables */
  
      Offset = sizeof (ACPI_TABLE_HEADER);
@@ -31,7 +31,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
      {
          AcpiOsPrintf ("\n");
  
-@@ -2213,7 +2215,7 @@ AcpiDmDumpPptt (
+@@ -2260,7 +2262,7 @@ AcpiDmDumpPptt (
              AcpiOsPrintf ("Invalid subtable length\n");
              return;
          }
@@ -40,7 +40,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
              Subtable->Length, AcpiDmTableInfoPpttHdr);
          if (ACPI_FAILURE (Status))
          {
-@@ -2255,7 +2257,7 @@ AcpiDmDumpPptt (
+@@ -2302,7 +2304,7 @@ AcpiDmDumpPptt (
              AcpiOsPrintf ("Invalid subtable length\n");
              return;
          }
@@ -49,7 +49,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
              Subtable->Length, InfoTable);
          if (ACPI_FAILURE (Status))
          {
-@@ -2271,15 +2273,16 @@ AcpiDmDumpPptt (
+@@ -2318,15 +2320,16 @@ AcpiDmDumpPptt (
  
              /* Dump SMBIOS handles */
  
@@ -70,11 +70,11 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
                      ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Subtable, SubtableOffset),
                      4, AcpiDmTableInfoPptt0a);
                  if (ACPI_FAILURE (Status))
-Index: acpica-unix2-20211217/source/compiler/dttable2.c
+Index: acpica-unix2-20220331/source/compiler/dttable2.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/compiler/dttable2.c
-+++ acpica-unix2-20211217/source/compiler/dttable2.c
-@@ -1507,6 +1507,7 @@ DtCompilePptt (
+--- acpica-unix2-20220331.orig/source/compiler/dttable2.c
++++ acpica-unix2-20220331/source/compiler/dttable2.c
+@@ -1520,6 +1520,7 @@ DtCompilePptt (
      DT_FIELD                **PFieldList = (DT_FIELD **) List;
      DT_FIELD                *SubtableStart;
      ACPI_TABLE_HEADER       *PpttAcpiHeader;
@@ -82,7 +82,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable2.c
  
  
      ParentTable = DtPeekSubtable ();
-@@ -1571,7 +1572,7 @@ DtCompilePptt (
+@@ -1584,7 +1585,7 @@ DtCompilePptt (
              {
                  /* Compile initiator proximity domain list */
  
@@ -91,7 +91,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable2.c
                  while (*PFieldList)
                  {
                      Status = DtCompileTable (PFieldList,
-@@ -1587,8 +1588,10 @@ DtCompilePptt (
+@@ -1600,8 +1601,10 @@ DtCompilePptt (
  
                      DtInsertSubtable (ParentTable, Subtable);
                      PpttHeader->Length += (UINT8)(Subtable->Length);
diff --git a/0031-Support-PCCT-in-a-big-endian-world.patch b/0031-Support-PCCT-in-a-big-endian-world.patch
index 970958c..6400618 100644
--- a/0031-Support-PCCT-in-a-big-endian-world.patch
+++ b/0031-Support-PCCT-in-a-big-endian-world.patch
@@ -8,11 +8,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/common/dmtbdump2.c | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
-Index: acpica-unix2-20211217/source/common/dmtbdump2.c
+Index: acpica-unix2-20220331/source/common/dmtbdump2.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20211217/source/common/dmtbdump2.c
-@@ -1803,13 +1803,13 @@ AcpiDmDumpPcct (
+--- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20220331/source/common/dmtbdump2.c
+@@ -1850,13 +1850,13 @@ AcpiDmDumpPcct (
      ACPI_STATUS             Status;
      ACPI_PCCT_SUBSPACE      *Subtable;
      ACPI_DMTABLE_INFO       *InfoTable;
@@ -28,7 +28,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
      if (ACPI_FAILURE (Status))
      {
          return;
-@@ -1818,12 +1818,12 @@ AcpiDmDumpPcct (
+@@ -1865,12 +1865,12 @@ AcpiDmDumpPcct (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_PCCT_SUBSPACE, Table, Offset);
@@ -43,7 +43,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
              Subtable->Header.Length, AcpiDmTableInfoPcctHdr);
          if (ACPI_FAILURE (Status))
          {
-@@ -1871,7 +1871,7 @@ AcpiDmDumpPcct (
+@@ -1918,7 +1918,7 @@ AcpiDmDumpPcct (
          }
  
          AcpiOsPrintf ("\n");
diff --git a/0032-Support-WDAT-in-a-big-endian-world.patch b/0032-Support-WDAT-in-a-big-endian-world.patch
index 83a9c05..9bf59a7 100644
--- a/0032-Support-WDAT-in-a-big-endian-world.patch
+++ b/0032-Support-WDAT-in-a-big-endian-world.patch
@@ -8,10 +8,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/common/dmtbdump3.c | 7 ++++---
  1 file changed, 4 insertions(+), 3 deletions(-)
 
-Index: acpica-unix2-20211217/source/common/dmtbdump3.c
+Index: acpica-unix2-20220331/source/common/dmtbdump3.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/common/dmtbdump3.c
-+++ acpica-unix2-20211217/source/common/dmtbdump3.c
+--- acpica-unix2-20220331.orig/source/common/dmtbdump3.c
++++ acpica-unix2-20220331/source/common/dmtbdump3.c
 @@ -680,11 +680,12 @@ AcpiDmDumpWdat (
      ACPI_STATUS             Status;
      UINT32                  Offset = sizeof (ACPI_TABLE_WDAT);
diff --git a/0033-Support-TCPA-in-a-big-endian-world.patch b/0033-Support-TCPA-in-a-big-endian-world.patch
index 806ea8e..bccfb52 100644
--- a/0033-Support-TCPA-in-a-big-endian-world.patch
+++ b/0033-Support-TCPA-in-a-big-endian-world.patch
@@ -9,10 +9,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/compiler/dttable2.c |  4 +++-
  2 files changed, 11 insertions(+), 6 deletions(-)
 
-Index: acpica-unix2-20211217/source/common/dmtbdump3.c
+Index: acpica-unix2-20220331/source/common/dmtbdump3.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/common/dmtbdump3.c
-+++ acpica-unix2-20211217/source/common/dmtbdump3.c
+--- acpica-unix2-20220331.orig/source/common/dmtbdump3.c
++++ acpica-unix2-20220331/source/common/dmtbdump3.c
 @@ -406,11 +406,13 @@ AcpiDmDumpTcpa (
      ACPI_TABLE_TCPA_HDR     *Subtable = ACPI_ADD_PTR (
                                  ACPI_TABLE_TCPA_HDR, Table, Offset);
@@ -52,11 +52,11 @@ Index: acpica-unix2-20211217/source/common/dmtbdump3.c
          break;
  
      default:
-Index: acpica-unix2-20211217/source/compiler/dttable2.c
+Index: acpica-unix2-20220331/source/compiler/dttable2.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/compiler/dttable2.c
-+++ acpica-unix2-20211217/source/compiler/dttable2.c
-@@ -2527,6 +2527,7 @@ DtCompileTcpa (
+--- acpica-unix2-20220331.orig/source/compiler/dttable2.c
++++ acpica-unix2-20220331/source/compiler/dttable2.c
+@@ -2540,6 +2540,7 @@ DtCompileTcpa (
      ACPI_TABLE_TCPA_HDR     *TcpaHeader;
      DT_SUBTABLE             *ParentTable;
      ACPI_STATUS             Status;
@@ -64,7 +64,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable2.c
  
  
      /* Compile the main table */
-@@ -2547,7 +2548,8 @@ DtCompileTcpa (
+@@ -2560,7 +2561,8 @@ DtCompileTcpa (
       */
      TcpaHeader = ACPI_CAST_PTR (ACPI_TABLE_TCPA_HDR, ParentTable->Buffer);
  
diff --git a/0034-Support-STAO-in-a-big-endian-world.patch b/0034-Support-STAO-in-a-big-endian-world.patch
index 120f915..45edf5e 100644
--- a/0034-Support-STAO-in-a-big-endian-world.patch
+++ b/0034-Support-STAO-in-a-big-endian-world.patch
@@ -8,10 +8,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/common/dmtbdump3.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
-Index: acpica-unix2-20211217/source/common/dmtbdump3.c
+Index: acpica-unix2-20220331/source/common/dmtbdump3.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/common/dmtbdump3.c
-+++ acpica-unix2-20211217/source/common/dmtbdump3.c
+--- acpica-unix2-20220331.orig/source/common/dmtbdump3.c
++++ acpica-unix2-20220331/source/common/dmtbdump3.c
 @@ -290,14 +290,14 @@ AcpiDmDumpStao (
  {
      ACPI_STATUS             Status;
diff --git a/0035-Support-SLIC-and-MSDM-in-a-big-endian-world.patch b/0035-Support-SLIC-and-MSDM-in-a-big-endian-world.patch
index c961086..d30b3d6 100644
--- a/0035-Support-SLIC-and-MSDM-in-a-big-endian-world.patch
+++ b/0035-Support-SLIC-and-MSDM-in-a-big-endian-world.patch
@@ -13,10 +13,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/common/dmtbdump3.c | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
-Index: acpica-unix2-20211217/source/common/dmtbdump3.c
+Index: acpica-unix2-20220331/source/common/dmtbdump3.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/common/dmtbdump3.c
-+++ acpica-unix2-20211217/source/common/dmtbdump3.c
+--- acpica-unix2-20220331.orig/source/common/dmtbdump3.c
++++ acpica-unix2-20220331/source/common/dmtbdump3.c
 @@ -68,9 +68,11 @@ void
  AcpiDmDumpSlic (
      ACPI_TABLE_HEADER       *Table)
diff --git a/0036-Support-MCFG-in-a-big-endian-world.patch b/0036-Support-MCFG-in-a-big-endian-world.patch
index 634e9b8..b8b09eb 100644
--- a/0036-Support-MCFG-in-a-big-endian-world.patch
+++ b/0036-Support-MCFG-in-a-big-endian-world.patch
@@ -8,11 +8,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/common/dmtbdump2.c | 11 ++++++-----
  1 file changed, 6 insertions(+), 5 deletions(-)
 
-Index: acpica-unix2-20210730/source/common/dmtbdump2.c
+Index: acpica-unix2-20220331/source/common/dmtbdump2.c
 ===================================================================
---- acpica-unix2-20210730.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20210730/source/common/dmtbdump2.c
-@@ -930,11 +930,12 @@ AcpiDmDumpMcfg (
+--- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20220331/source/common/dmtbdump2.c
+@@ -982,11 +982,12 @@ AcpiDmDumpMcfg (
      ACPI_STATUS             Status;
      UINT32                  Offset = sizeof (ACPI_TABLE_MCFG);
      ACPI_MCFG_ALLOCATION    *Subtable;
@@ -26,7 +26,7 @@ Index: acpica-unix2-20210730/source/common/dmtbdump2.c
      if (ACPI_FAILURE (Status))
      {
          return;
-@@ -943,17 +944,17 @@ AcpiDmDumpMcfg (
+@@ -995,17 +996,17 @@ AcpiDmDumpMcfg (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_MCFG_ALLOCATION, Table, Offset);
diff --git a/0037-Support-LPIT-in-a-big-endian-world.patch b/0037-Support-LPIT-in-a-big-endian-world.patch
index d53a3a2..11f3ebc 100644
--- a/0037-Support-LPIT-in-a-big-endian-world.patch
+++ b/0037-Support-LPIT-in-a-big-endian-world.patch
@@ -8,10 +8,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/common/dmtbdump2.c | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
-Index: acpica-unix2-20210730/source/common/dmtbdump2.c
+Index: acpica-unix2-20220331/source/common/dmtbdump2.c
 ===================================================================
---- acpica-unix2-20210730.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20210730/source/common/dmtbdump2.c
+--- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20220331/source/common/dmtbdump2.c
 @@ -690,7 +690,7 @@ AcpiDmDumpLpit (
  {
      ACPI_STATUS             Status;
diff --git a/0038-Support-PMTT-in-a-big-endian-world.patch b/0038-Support-PMTT-in-a-big-endian-world.patch
index f5853ee..ca3ddc3 100644
--- a/0038-Support-PMTT-in-a-big-endian-world.patch
+++ b/0038-Support-PMTT-in-a-big-endian-world.patch
@@ -8,11 +8,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/common/dmtbdump2.c | 18 ++++++++++--------
  1 file changed, 10 insertions(+), 8 deletions(-)
 
-Index: acpica-unix2-20211217/source/common/dmtbdump2.c
+Index: acpica-unix2-20220331/source/common/dmtbdump2.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20211217/source/common/dmtbdump2.c
-@@ -2095,8 +2095,9 @@ AcpiDmDumpPmtt (
+--- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20220331/source/common/dmtbdump2.c
+@@ -2142,8 +2142,9 @@ AcpiDmDumpPmtt (
  {
      ACPI_STATUS             Status;
      ACPI_PMTT_HEADER        *Subtable;
@@ -23,7 +23,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
  
  
      /* Main table */
-@@ -2110,17 +2111,18 @@ AcpiDmDumpPmtt (
+@@ -2157,17 +2158,18 @@ AcpiDmDumpPmtt (
      /* Subtables */
  
      Subtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, Table, Offset);
@@ -44,7 +44,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
              if (ACPI_FAILURE (Status))
              {
                  return;
-@@ -2129,7 +2131,7 @@ AcpiDmDumpPmtt (
+@@ -2176,7 +2178,7 @@ AcpiDmDumpPmtt (
  
          case ACPI_PMTT_TYPE_CONTROLLER:
              Status = AcpiDmDumpTable (Length, Offset, Subtable,
@@ -53,7 +53,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
              if (ACPI_FAILURE (Status))
              {
                  return;
-@@ -2138,7 +2140,7 @@ AcpiDmDumpPmtt (
+@@ -2185,7 +2187,7 @@ AcpiDmDumpPmtt (
  
         case ACPI_PMTT_TYPE_DIMM:
              Status = AcpiDmDumpTable (Length, Offset, Subtable,
@@ -62,7 +62,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
              if (ACPI_FAILURE (Status))
              {
                  return;
-@@ -2147,7 +2149,7 @@ AcpiDmDumpPmtt (
+@@ -2194,7 +2196,7 @@ AcpiDmDumpPmtt (
  
          case ACPI_PMTT_TYPE_VENDOR:
              Status = AcpiDmDumpTable (Length, Offset, Subtable,
@@ -71,7 +71,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
              if (ACPI_FAILURE (Status))
              {
                  return;
-@@ -2163,9 +2165,9 @@ AcpiDmDumpPmtt (
+@@ -2210,9 +2212,9 @@ AcpiDmDumpPmtt (
  
          /* Point to next subtable */
  
diff --git a/0039-Support-TPM2-in-a-big-endian-world.patch b/0039-Support-TPM2-in-a-big-endian-world.patch
index 177f908..1e26343 100644
--- a/0039-Support-TPM2-in-a-big-endian-world.patch
+++ b/0039-Support-TPM2-in-a-big-endian-world.patch
@@ -9,10 +9,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/compiler/dttable2.c |  8 +++++---
  2 files changed, 15 insertions(+), 11 deletions(-)
 
-Index: acpica-unix2-20211217/source/common/dmtbdump3.c
+Index: acpica-unix2-20220331/source/common/dmtbdump3.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/common/dmtbdump3.c
-+++ acpica-unix2-20211217/source/common/dmtbdump3.c
+--- acpica-unix2-20220331.orig/source/common/dmtbdump3.c
++++ acpica-unix2-20220331/source/common/dmtbdump3.c
 @@ -475,11 +475,12 @@ AcpiDmDumpTpm2Rev3 (
      ACPI_TABLE_TPM23        *CommonHeader = ACPI_CAST_PTR (ACPI_TABLE_TPM23, Table);
      ACPI_TPM23_TRAILER      *Subtable = ACPI_ADD_PTR (ACPI_TPM23_TRAILER, Table, Offset);
@@ -77,11 +77,11 @@ Index: acpica-unix2-20211217/source/common/dmtbdump3.c
          break;
  
      default:
-Index: acpica-unix2-20211217/source/compiler/dttable2.c
+Index: acpica-unix2-20220331/source/compiler/dttable2.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/compiler/dttable2.c
-+++ acpica-unix2-20211217/source/compiler/dttable2.c
-@@ -2655,6 +2655,7 @@ DtCompileTpm2 (
+--- acpica-unix2-20220331.orig/source/compiler/dttable2.c
++++ acpica-unix2-20220331/source/compiler/dttable2.c
+@@ -2668,6 +2668,7 @@ DtCompileTpm2 (
      DT_SUBTABLE             *ParentTable;
      ACPI_STATUS             Status = AE_OK;
      ACPI_TABLE_HEADER       *Header;
@@ -89,7 +89,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable2.c
  
  
      ParentTable = DtPeekSubtable ();
-@@ -2698,7 +2699,8 @@ DtCompileTpm2 (
+@@ -2711,7 +2712,8 @@ DtCompileTpm2 (
  
      /* Subtable type depends on the StartMethod */
  
@@ -99,7 +99,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable2.c
      {
      case ACPI_TPM2_COMMAND_BUFFER_WITH_ARM_SMC:
  
-@@ -2729,7 +2731,7 @@ DtCompileTpm2 (
+@@ -2742,7 +2744,7 @@ DtCompileTpm2 (
      case ACPI_TPM2_RESERVED10:
  
          AcpiOsPrintf ("\n**** Reserved TPM2 Start Method type 0x%X\n",
@@ -108,7 +108,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable2.c
          Status = AE_ERROR;
          break;
  
-@@ -2737,7 +2739,7 @@ DtCompileTpm2 (
+@@ -2750,7 +2752,7 @@ DtCompileTpm2 (
      default:
  
          AcpiOsPrintf ("\n**** Unknown TPM2 Start Method type 0x%X\n",
diff --git a/0040-Support-S3PT-in-a-big-endian-world.patch b/0040-Support-S3PT-in-a-big-endian-world.patch
index 03bc849..00678b7 100644
--- a/0040-Support-S3PT-in-a-big-endian-world.patch
+++ b/0040-Support-S3PT-in-a-big-endian-world.patch
@@ -8,11 +8,11 @@ Subject: [PATCH 40/45] Support S3PT in a big-endian world
  source/compiler/dttable2.c |  4 +++-
  2 files changed, 12 insertions(+), 7 deletions(-)
 
-Index: acpica-unix2-20211217/source/common/dmtbdump2.c
+Index: acpica-unix2-20220331/source/common/dmtbdump2.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20211217/source/common/dmtbdump2.c
-@@ -2448,6 +2448,8 @@ AcpiDmDumpS3pt (
+--- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20220331/source/common/dmtbdump2.c
+@@ -2495,6 +2495,8 @@ AcpiDmDumpS3pt (
      ACPI_FPDT_HEADER        *Subtable;
      ACPI_DMTABLE_INFO       *InfoTable;
      ACPI_TABLE_S3PT         *S3ptTable = ACPI_CAST_PTR (ACPI_TABLE_S3PT, Tables);
@@ -21,7 +21,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
  
  
      /* Main table */
-@@ -2459,19 +2461,20 @@ AcpiDmDumpS3pt (
+@@ -2506,19 +2508,20 @@ AcpiDmDumpS3pt (
      }
  
      Subtable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, S3ptTable, Offset);
@@ -45,7 +45,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
          {
          case ACPI_S3PT_TYPE_RESUME:
  
-@@ -2486,7 +2489,7 @@ AcpiDmDumpS3pt (
+@@ -2533,7 +2536,7 @@ AcpiDmDumpS3pt (
          default:
  
              AcpiOsPrintf ("\n**** Unknown S3PT subtable type 0x%X\n",
@@ -54,7 +54,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
  
              /* Attempt to continue */
  
-@@ -2499,7 +2502,7 @@ AcpiDmDumpS3pt (
+@@ -2546,7 +2549,7 @@ AcpiDmDumpS3pt (
          }
  
          AcpiOsPrintf ("\n");
@@ -63,7 +63,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
              Subtable->Length, InfoTable);
          if (ACPI_FAILURE (Status))
          {
-@@ -2513,7 +2516,7 @@ NextSubtable:
+@@ -2560,7 +2563,7 @@ NextSubtable:
          Subtable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, Subtable, Subtable->Length);
      }
  
@@ -72,11 +72,11 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
  }
  
  
-Index: acpica-unix2-20211217/source/compiler/dttable2.c
+Index: acpica-unix2-20220331/source/compiler/dttable2.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/compiler/dttable2.c
-+++ acpica-unix2-20211217/source/compiler/dttable2.c
-@@ -1790,6 +1790,7 @@ DtCompileS3pt (
+--- acpica-unix2-20220331.orig/source/compiler/dttable2.c
++++ acpica-unix2-20220331/source/compiler/dttable2.c
+@@ -1803,6 +1803,7 @@ DtCompileS3pt (
      DT_SUBTABLE             *ParentTable;
      ACPI_DMTABLE_INFO       *InfoTable;
      DT_FIELD                *SubtableStart;
@@ -84,7 +84,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable2.c
  
  
      Status = DtCompileTable (PFieldList, AcpiDmTableInfoS3pt,
-@@ -1817,7 +1818,8 @@ DtCompileS3pt (
+@@ -1830,7 +1831,8 @@ DtCompileS3pt (
  
          S3ptHeader = ACPI_CAST_PTR (ACPI_FPDT_HEADER, Subtable->Buffer);
  
diff --git a/0041-Support-IORT-in-a-big-endian-world.patch b/0041-Support-IORT-in-a-big-endian-world.patch
index 6e10da6..76c9efd 100644
--- a/0041-Support-IORT-in-a-big-endian-world.patch
+++ b/0041-Support-IORT-in-a-big-endian-world.patch
@@ -9,10 +9,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/compiler/dttable1.c | 40 ++++++++++--------
  2 files changed, 72 insertions(+), 53 deletions(-)
 
-Index: acpica-unix2-20210730/source/common/dmtbdump2.c
+Index: acpica-unix2-20220331/source/common/dmtbdump2.c
 ===================================================================
---- acpica-unix2-20210730.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20210730/source/common/dmtbdump2.c
+--- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20220331/source/common/dmtbdump2.c
 @@ -77,17 +77,20 @@ AcpiDmDumpIort (
      ACPI_IORT_RMR           *IortRmr = NULL;
      UINT32                  Offset;
@@ -246,11 +246,11 @@ Index: acpica-unix2-20210730/source/common/dmtbdump2.c
      }
  }
  
-Index: acpica-unix2-20210730/source/compiler/dttable1.c
+Index: acpica-unix2-20220331/source/compiler/dttable1.c
 ===================================================================
---- acpica-unix2-20210730.orig/source/compiler/dttable1.c
-+++ acpica-unix2-20210730/source/compiler/dttable1.c
-@@ -1809,6 +1809,7 @@ DtCompileIort (
+--- acpica-unix2-20220331.orig/source/compiler/dttable1.c
++++ acpica-unix2-20220331/source/compiler/dttable1.c
+@@ -1960,6 +1960,7 @@ DtCompileIort (
      ACPI_IORT_ITS_GROUP     *IortItsGroup;
      ACPI_IORT_SMMU          *IortSmmu;
      ACPI_IORT_RMR           *IortRmr;
@@ -258,7 +258,7 @@ Index: acpica-unix2-20210730/source/compiler/dttable1.c
      UINT32                  NodeNumber;
      UINT32                  NodeLength;
      UINT32                  IdMappingNumber;
-@@ -1854,7 +1855,7 @@ DtCompileIort (
+@@ -2005,7 +2006,7 @@ DtCompileIort (
       * Optionally allows the generic data types to be used for filling
       * this field.
       */
@@ -267,7 +267,7 @@ Index: acpica-unix2-20210730/source/compiler/dttable1.c
      Status = DtCompileTable (PFieldList, AcpiDmTableInfoIortPad,
          &Subtable);
      if (ACPI_FAILURE (Status))
-@@ -1864,7 +1865,7 @@ DtCompileIort (
+@@ -2015,7 +2016,7 @@ DtCompileIort (
      if (Subtable)
      {
          DtInsertSubtable (ParentTable, Subtable);
@@ -276,7 +276,7 @@ Index: acpica-unix2-20210730/source/compiler/dttable1.c
      }
      else
      {
-@@ -1874,7 +1875,7 @@ DtCompileIort (
+@@ -2025,7 +2026,7 @@ DtCompileIort (
          {
              return (Status);
          }
@@ -285,7 +285,7 @@ Index: acpica-unix2-20210730/source/compiler/dttable1.c
      }
  
      NodeNumber = 0;
-@@ -1938,7 +1939,7 @@ DtCompileIort (
+@@ -2089,7 +2090,7 @@ DtCompileIort (
                  ItsNumber++;
              }
  
@@ -294,7 +294,7 @@ Index: acpica-unix2-20210730/source/compiler/dttable1.c
              break;
  
          case ACPI_IORT_NODE_NAMED_COMPONENT:
-@@ -1972,15 +1973,18 @@ DtCompileIort (
+@@ -2123,15 +2124,18 @@ DtCompileIort (
              }
              else
              {
@@ -316,7 +316,7 @@ Index: acpica-unix2-20210730/source/compiler/dttable1.c
                          &Subtable);
                      if (ACPI_FAILURE (Status))
                      {
-@@ -1988,7 +1992,7 @@ DtCompileIort (
+@@ -2139,7 +2143,7 @@ DtCompileIort (
                      }
  
                      DtInsertSubtable (ParentTable, Subtable);
@@ -325,7 +325,7 @@ Index: acpica-unix2-20210730/source/compiler/dttable1.c
                  }
              }
              break;
-@@ -2021,7 +2025,7 @@ DtCompileIort (
+@@ -2172,7 +2176,7 @@ DtCompileIort (
  
              /* Compile global interrupt array */
  
@@ -334,7 +334,7 @@ Index: acpica-unix2-20210730/source/compiler/dttable1.c
              Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3a,
                  &Subtable);
              if (ACPI_FAILURE (Status))
-@@ -2035,7 +2039,7 @@ DtCompileIort (
+@@ -2186,7 +2190,7 @@ DtCompileIort (
              /* Compile context interrupt array */
  
              ContextIrptNumber = 0;
@@ -343,7 +343,7 @@ Index: acpica-unix2-20210730/source/compiler/dttable1.c
              while (*PFieldList)
              {
                  Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3b,
-@@ -2055,12 +2059,12 @@ DtCompileIort (
+@@ -2206,12 +2210,12 @@ DtCompileIort (
                  ContextIrptNumber++;
              }
  
@@ -358,7 +358,7 @@ Index: acpica-unix2-20210730/source/compiler/dttable1.c
              while (*PFieldList)
              {
                  Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3c,
-@@ -2080,7 +2084,7 @@ DtCompileIort (
+@@ -2231,7 +2235,7 @@ DtCompileIort (
                  PmuIrptNumber++;
              }
  
@@ -367,7 +367,7 @@ Index: acpica-unix2-20210730/source/compiler/dttable1.c
              break;
  
          case ACPI_IORT_NODE_SMMU_V3:
-@@ -2125,7 +2129,7 @@ DtCompileIort (
+@@ -2276,7 +2280,7 @@ DtCompileIort (
              /* Compile RMR Descriptors */
  
              RmrCount = 0;
@@ -376,7 +376,7 @@ Index: acpica-unix2-20210730/source/compiler/dttable1.c
              while (*PFieldList)
              {
                  Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort6a,
-@@ -2145,7 +2149,7 @@ DtCompileIort (
+@@ -2296,7 +2300,7 @@ DtCompileIort (
                  RmrCount++;
              }
  
@@ -384,8 +384,8 @@ Index: acpica-unix2-20210730/source/compiler/dttable1.c
 +            IortRmr->RmrCount = AcpiUtReadUint32 (&RmrCount);
              break;
  
- 	default:
-@@ -2156,7 +2160,7 @@ DtCompileIort (
+         default:
+@@ -2307,7 +2311,7 @@ DtCompileIort (
  
          /* Compile Array of ID mappings */
  
@@ -394,7 +394,7 @@ Index: acpica-unix2-20210730/source/compiler/dttable1.c
          IdMappingNumber = 0;
          while (*PFieldList)
          {
-@@ -2177,7 +2181,7 @@ DtCompileIort (
+@@ -2328,7 +2332,7 @@ DtCompileIort (
              IdMappingNumber++;
          }
  
@@ -403,7 +403,7 @@ Index: acpica-unix2-20210730/source/compiler/dttable1.c
          if (!IdMappingNumber)
          {
              IortNode->MappingOffset = 0;
-@@ -2192,7 +2196,7 @@ DtCompileIort (
+@@ -2343,7 +2347,7 @@ DtCompileIort (
          NodeNumber++;
      }
  
diff --git a/0042-Support-IVRS-in-a-big-endian-world.patch b/0042-Support-IVRS-in-a-big-endian-world.patch
index c9b31ef..9d0a88f 100644
--- a/0042-Support-IVRS-in-a-big-endian-world.patch
+++ b/0042-Support-IVRS-in-a-big-endian-world.patch
@@ -8,10 +8,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/common/dmtbdump2.c | 34 +++++++++++++++++++---------------
  1 file changed, 19 insertions(+), 15 deletions(-)
 
-Index: acpica-unix2-20210730/source/common/dmtbdump2.c
+Index: acpica-unix2-20220331/source/common/dmtbdump2.c
 ===================================================================
---- acpica-unix2-20210730.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20210730/source/common/dmtbdump2.c
+--- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20220331/source/common/dmtbdump2.c
 @@ -419,11 +419,14 @@ AcpiDmDumpIvrs (
      ACPI_IVRS_DE_HEADER     *DeviceEntry;
      ACPI_IVRS_HEADER        *Subtable;
diff --git a/0043-Support-DSDT-SSDT-in-a-big-endian-world.patch b/0043-Support-DSDT-SSDT-in-a-big-endian-world.patch
index e104037..777f74a 100644
--- a/0043-Support-DSDT-SSDT-in-a-big-endian-world.patch
+++ b/0043-Support-DSDT-SSDT-in-a-big-endian-world.patch
@@ -42,10 +42,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/components/utilities/utresrc.c      |   2 +-
  28 files changed, 721 insertions(+), 341 deletions(-)
 
-Index: acpica-unix2-20211217/source/common/adwalk.c
+Index: acpica-unix2-20220331/source/common/adwalk.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/common/adwalk.c
-+++ acpica-unix2-20211217/source/common/adwalk.c
+--- acpica-unix2-20220331.orig/source/common/adwalk.c
++++ acpica-unix2-20220331/source/common/adwalk.c
 @@ -679,7 +679,8 @@ AcpiDmLoadDescendingOp (
  
          if (!Path && Op->Common.AmlOpcode == AML_INT_NAMEDFIELD_OP)
@@ -56,10 +56,10 @@ Index: acpica-unix2-20211217/source/common/adwalk.c
              FieldPath[4] = 0;
              Path = FieldPath;
          }
-Index: acpica-unix2-20211217/source/common/dmrestag.c
+Index: acpica-unix2-20220331/source/common/dmrestag.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/common/dmrestag.c
-+++ acpica-unix2-20211217/source/common/dmrestag.c
+--- acpica-unix2-20220331.orig/source/common/dmrestag.c
++++ acpica-unix2-20220331/source/common/dmrestag.c
 @@ -1048,7 +1048,7 @@ AcpiDmAddResourcesToNamespace (
       * NextOp contains the Aml pointer and the Aml length
       */
@@ -69,10 +69,10 @@ Index: acpica-unix2-20211217/source/common/dmrestag.c
          AcpiDmAddResourceToNamespace, (void **) BufferNode);
  }
  
-Index: acpica-unix2-20211217/source/common/dmtables.c
+Index: acpica-unix2-20220331/source/common/dmtables.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/common/dmtables.c
-+++ acpica-unix2-20211217/source/common/dmtables.c
+--- acpica-unix2-20220331.orig/source/common/dmtables.c
++++ acpica-unix2-20220331/source/common/dmtables.c
 @@ -142,6 +142,10 @@ AdCreateTableHeader (
      ACPI_TABLE_HEADER       *Table)
  {
@@ -133,10 +133,10 @@ Index: acpica-unix2-20211217/source/common/dmtables.c
      AmlStart = ((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER));
  
      AcpiUtSetIntegerWidth (Table->Revision);
-Index: acpica-unix2-20211217/source/common/dmtbdump.c
+Index: acpica-unix2-20220331/source/common/dmtbdump.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/common/dmtbdump.c
-+++ acpica-unix2-20211217/source/common/dmtbdump.c
+--- acpica-unix2-20220331.orig/source/common/dmtbdump.c
++++ acpica-unix2-20220331/source/common/dmtbdump.c
 @@ -392,8 +392,7 @@ AcpiDmDumpXsdt (
      for (i = 0; i < Entries; i++)
      {
@@ -147,10 +147,10 @@ Index: acpica-unix2-20211217/source/common/dmtbdump.c
          Offset += sizeof (UINT64);
      }
  }
-Index: acpica-unix2-20211217/source/common/dmtbdump3.c
+Index: acpica-unix2-20220331/source/common/dmtbdump3.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/common/dmtbdump3.c
-+++ acpica-unix2-20211217/source/common/dmtbdump3.c
+--- acpica-unix2-20220331.orig/source/common/dmtbdump3.c
++++ acpica-unix2-20220331/source/common/dmtbdump3.c
 @@ -741,12 +741,13 @@ AcpiDmDumpWpbt (
  {
      ACPI_STATUS             Status;
@@ -182,10 +182,10 @@ Index: acpica-unix2-20211217/source/common/dmtbdump3.c
              AcpiDmTableInfoWpbt0);
      }
  }
-Index: acpica-unix2-20211217/source/compiler/aslcodegen.c
+Index: acpica-unix2-20220331/source/compiler/aslcodegen.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/compiler/aslcodegen.c
-+++ acpica-unix2-20211217/source/compiler/aslcodegen.c
+--- acpica-unix2-20220331.orig/source/compiler/aslcodegen.c
++++ acpica-unix2-20220331/source/compiler/aslcodegen.c
 @@ -238,6 +238,10 @@ CgWriteAmlOpcode (
  {
      UINT8                   PkgLenFirstByte;
@@ -348,10 +348,10 @@ Index: acpica-unix2-20211217/source/compiler/aslcodegen.c
          return;
  
  
-Index: acpica-unix2-20211217/source/compiler/aslopcodes.c
+Index: acpica-unix2-20220331/source/compiler/aslopcodes.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/compiler/aslopcodes.c
-+++ acpica-unix2-20211217/source/compiler/aslopcodes.c
+--- acpica-unix2-20220331.orig/source/compiler/aslopcodes.c
++++ acpica-unix2-20220331/source/compiler/aslopcodes.c
 @@ -511,7 +511,8 @@ OpcDoUnicode (
  
      for (i = 0; i < Count; i++)
@@ -362,10 +362,10 @@ Index: acpica-unix2-20211217/source/compiler/aslopcodes.c
      }
  
      /*
-Index: acpica-unix2-20211217/source/compiler/aslrestype1.c
+Index: acpica-unix2-20220331/source/compiler/aslrestype1.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/compiler/aslrestype1.c
-+++ acpica-unix2-20211217/source/compiler/aslrestype1.c
+--- acpica-unix2-20220331.orig/source/compiler/aslrestype1.c
++++ acpica-unix2-20220331/source/compiler/aslrestype1.c
 @@ -143,6 +143,7 @@ RsDoMemory24Descriptor (
      ASL_RESOURCE_NODE       *Rnode;
      UINT32                  CurrentByteOffset;
@@ -550,10 +550,10 @@ Index: acpica-unix2-20211217/source/compiler/aslrestype1.c
              RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
                  CurrentByteOffset + ASL_RESDESC_OFFSET (FixedMemory32.AddressLength));
              break;
-Index: acpica-unix2-20211217/source/compiler/aslrestype1i.c
+Index: acpica-unix2-20220331/source/compiler/aslrestype1i.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/compiler/aslrestype1i.c
-+++ acpica-unix2-20211217/source/compiler/aslrestype1i.c
+--- acpica-unix2-20220331.orig/source/compiler/aslrestype1i.c
++++ acpica-unix2-20220331/source/compiler/aslrestype1i.c
 @@ -199,6 +199,7 @@ RsDoFixedDmaDescriptor (
      ASL_RESOURCE_NODE       *Rnode;
      UINT32                  CurrentByteOffset;
@@ -671,10 +671,10 @@ Index: acpica-unix2-20211217/source/compiler/aslrestype1i.c
 +    Descriptor->Irq.IrqMask = AcpiUtReadUint16(&IrqMask);
      return (Rnode);
  }
-Index: acpica-unix2-20211217/source/compiler/aslrestype2.c
+Index: acpica-unix2-20220331/source/compiler/aslrestype2.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/compiler/aslrestype2.c
-+++ acpica-unix2-20211217/source/compiler/aslrestype2.c
+--- acpica-unix2-20220331.orig/source/compiler/aslrestype2.c
++++ acpica-unix2-20220331/source/compiler/aslrestype2.c
 @@ -77,6 +77,8 @@ RsDoGeneralRegisterDescriptor (
      ASL_RESOURCE_NODE       *Rnode;
      UINT32                  CurrentByteOffset;
@@ -751,10 +751,10 @@ Index: acpica-unix2-20211217/source/compiler/aslrestype2.c
  
      /* Point to end-of-descriptor for vendor data */
  
-Index: acpica-unix2-20211217/source/compiler/aslrestype2d.c
+Index: acpica-unix2-20220331/source/compiler/aslrestype2d.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/compiler/aslrestype2d.c
-+++ acpica-unix2-20211217/source/compiler/aslrestype2d.c
+--- acpica-unix2-20220331.orig/source/compiler/aslrestype2d.c
++++ acpica-unix2-20220331/source/compiler/aslrestype2d.c
 @@ -84,6 +84,8 @@ RsDoDwordIoDescriptor (
      UINT32                  CurrentByteOffset;
      UINT32                  i;
@@ -1001,10 +1001,10 @@ Index: acpica-unix2-20211217/source/compiler/aslrestype2d.c
          Descriptor->Address32.Flags,
          MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
  
-Index: acpica-unix2-20211217/source/compiler/aslrestype2q.c
+Index: acpica-unix2-20220331/source/compiler/aslrestype2q.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/compiler/aslrestype2q.c
-+++ acpica-unix2-20211217/source/compiler/aslrestype2q.c
+--- acpica-unix2-20220331.orig/source/compiler/aslrestype2q.c
++++ acpica-unix2-20220331/source/compiler/aslrestype2q.c
 @@ -84,6 +84,7 @@ RsDoQwordIoDescriptor (
      UINT32                  CurrentByteOffset;
      UINT32                  i;
@@ -1233,10 +1233,10 @@ Index: acpica-unix2-20211217/source/compiler/aslrestype2q.c
          Descriptor->Address64.Flags,
          MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
  
-Index: acpica-unix2-20211217/source/compiler/aslrestype2w.c
+Index: acpica-unix2-20220331/source/compiler/aslrestype2w.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/compiler/aslrestype2w.c
-+++ acpica-unix2-20211217/source/compiler/aslrestype2w.c
+--- acpica-unix2-20220331.orig/source/compiler/aslrestype2w.c
++++ acpica-unix2-20220331/source/compiler/aslrestype2w.c
 @@ -84,6 +84,7 @@ RsDoWordIoDescriptor (
      UINT32                  CurrentByteOffset;
      UINT32                  i;
@@ -1484,11 +1484,11 @@ Index: acpica-unix2-20211217/source/compiler/aslrestype2w.c
      Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) +
          OptionIndex + StringLength;
      return (Rnode);
-Index: acpica-unix2-20211217/source/compiler/dttable2.c
+Index: acpica-unix2-20220331/source/compiler/dttable2.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/compiler/dttable2.c
-+++ acpica-unix2-20211217/source/compiler/dttable2.c
-@@ -3033,7 +3033,8 @@ DtCompileWpbt (
+--- acpica-unix2-20220331.orig/source/compiler/dttable2.c
++++ acpica-unix2-20220331/source/compiler/dttable2.c
+@@ -3046,7 +3046,8 @@ DtCompileWpbt (
  
      /* Extract the length of the Arguments buffer, insert into main table */
  
@@ -1498,10 +1498,10 @@ Index: acpica-unix2-20211217/source/compiler/dttable2.c
      DtInsertSubtable (ParentTable, Subtable);
      return (AE_OK);
  }
-Index: acpica-unix2-20211217/source/components/disassembler/dmbuffer.c
+Index: acpica-unix2-20220331/source/components/disassembler/dmbuffer.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/components/disassembler/dmbuffer.c
-+++ acpica-unix2-20211217/source/components/disassembler/dmbuffer.c
+--- acpica-unix2-20220331.orig/source/components/disassembler/dmbuffer.c
++++ acpica-unix2-20220331/source/components/disassembler/dmbuffer.c
 @@ -204,7 +204,7 @@ AcpiDmByteList (
  
  
@@ -1591,10 +1591,10 @@ Index: acpica-unix2-20211217/source/components/disassembler/dmbuffer.c
      AcpiOsPrintf ("EisaId (\"%s\")", IdBuffer);
  
      /* If we know about the ID, emit the description */
-Index: acpica-unix2-20211217/source/components/disassembler/dmopcode.c
+Index: acpica-unix2-20220331/source/components/disassembler/dmopcode.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/components/disassembler/dmopcode.c
-+++ acpica-unix2-20211217/source/components/disassembler/dmopcode.c
+--- acpica-unix2-20220331.orig/source/components/disassembler/dmopcode.c
++++ acpica-unix2-20220331/source/components/disassembler/dmopcode.c
 @@ -778,7 +778,9 @@ AcpiDmDisassembleOneOp (
          }
          else
@@ -1651,10 +1651,10 @@ Index: acpica-unix2-20211217/source/components/disassembler/dmopcode.c
          Info->BitOffset += Offset;
  
          if (Info->BitOffset % 8 == 0)
-Index: acpica-unix2-20211217/source/components/disassembler/dmresrc.c
+Index: acpica-unix2-20220331/source/components/disassembler/dmresrc.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/components/disassembler/dmresrc.c
-+++ acpica-unix2-20211217/source/components/disassembler/dmresrc.c
+--- acpica-unix2-20220331.orig/source/components/disassembler/dmresrc.c
++++ acpica-unix2-20220331/source/components/disassembler/dmresrc.c
 @@ -417,7 +417,7 @@ AcpiDmIsResourceTemplate (
          return (AE_TYPE);
      }
@@ -1664,10 +1664,10 @@ Index: acpica-unix2-20211217/source/components/disassembler/dmresrc.c
  
      /* Get the length of the raw initialization byte list */
  
-Index: acpica-unix2-20211217/source/components/disassembler/dmresrcl.c
+Index: acpica-unix2-20220331/source/components/disassembler/dmresrcl.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/components/disassembler/dmresrcl.c
-+++ acpica-unix2-20211217/source/components/disassembler/dmresrcl.c
+--- acpica-unix2-20220331.orig/source/components/disassembler/dmresrcl.c
++++ acpica-unix2-20220331/source/components/disassembler/dmresrcl.c
 @@ -141,6 +141,8 @@ AcpiDmMemoryFields (
      UINT32                  Level)
  {
@@ -1789,10 +1789,10 @@ Index: acpica-unix2-20211217/source/components/disassembler/dmresrcl.c
      }
  
      AcpiDmIndent (Level);
-Index: acpica-unix2-20211217/source/components/disassembler/dmresrcl2.c
+Index: acpica-unix2-20220331/source/components/disassembler/dmresrcl2.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/components/disassembler/dmresrcl2.c
-+++ acpica-unix2-20211217/source/components/disassembler/dmresrcl2.c
+--- acpica-unix2-20220331.orig/source/components/disassembler/dmresrcl2.c
++++ acpica-unix2-20220331/source/components/disassembler/dmresrcl2.c
 @@ -199,22 +199,27 @@ AcpiDmGpioCommon (
      char                    *DeviceName = NULL;
      UINT32                  PinCount;
@@ -2134,10 +2134,10 @@ Index: acpica-unix2-20211217/source/components/disassembler/dmresrcl2.c
  
      DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset);
      AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
-Index: acpica-unix2-20211217/source/components/disassembler/dmresrcs.c
+Index: acpica-unix2-20220331/source/components/disassembler/dmresrcs.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/components/disassembler/dmresrcs.c
-+++ acpica-unix2-20211217/source/components/disassembler/dmresrcs.c
+--- acpica-unix2-20220331.orig/source/components/disassembler/dmresrcs.c
++++ acpica-unix2-20220331/source/components/disassembler/dmresrcs.c
 @@ -93,7 +93,7 @@ AcpiDmIrqDescriptor (
      AcpiOsPrintf (")\n");
  
@@ -2188,11 +2188,11 @@ Index: acpica-unix2-20211217/source/components/disassembler/dmresrcs.c
  
      /* Insert a descriptor name */
  
-Index: acpica-unix2-20211217/source/components/disassembler/dmwalk.c
+Index: acpica-unix2-20220331/source/components/disassembler/dmwalk.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/components/disassembler/dmwalk.c
-+++ acpica-unix2-20211217/source/components/disassembler/dmwalk.c
-@@ -1155,7 +1155,7 @@ AcpiDmAscendingOp (
+--- acpica-unix2-20220331.orig/source/components/disassembler/dmwalk.c
++++ acpica-unix2-20220331/source/components/disassembler/dmwalk.c
+@@ -1163,7 +1163,7 @@ AcpiDmAscendingOp (
          {
              ParentOp->Common.DisasmFlags |= ACPI_PARSEOP_EMPTY_TERMLIST;
              ASL_CV_CLOSE_PAREN (Op, Level);
@@ -2201,10 +2201,10 @@ Index: acpica-unix2-20211217/source/components/disassembler/dmwalk.c
          }
      }
  
-Index: acpica-unix2-20211217/source/components/namespace/nsaccess.c
+Index: acpica-unix2-20220331/source/components/namespace/nsaccess.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/components/namespace/nsaccess.c
-+++ acpica-unix2-20211217/source/components/namespace/nsaccess.c
+--- acpica-unix2-20220331.orig/source/components/namespace/nsaccess.c
++++ acpica-unix2-20220331/source/components/namespace/nsaccess.c
 @@ -644,7 +644,7 @@ AcpiNsLookup (
  
          /* Extract one ACPI name from the front of the pathname */
@@ -2214,10 +2214,10 @@ Index: acpica-unix2-20211217/source/components/namespace/nsaccess.c
  
          /* Try to find the single (4 character) ACPI name */
  
-Index: acpica-unix2-20211217/source/components/namespace/nsnames.c
+Index: acpica-unix2-20220331/source/components/namespace/nsnames.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/components/namespace/nsnames.c
-+++ acpica-unix2-20211217/source/components/namespace/nsnames.c
+--- acpica-unix2-20220331.orig/source/components/namespace/nsnames.c
++++ acpica-unix2-20220331/source/components/namespace/nsnames.c
 @@ -297,10 +297,10 @@ AcpiNsBuildNormalizedPath (
      {
          if (NextNode != Node)
@@ -2231,10 +2231,10 @@ Index: acpica-unix2-20211217/source/components/namespace/nsnames.c
          DoNoTrailing = NoTrailing;
          for (i = 0; i < 4; i++)
          {
-Index: acpica-unix2-20211217/source/components/namespace/nsparse.c
+Index: acpica-unix2-20220331/source/components/namespace/nsparse.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/components/namespace/nsparse.c
-+++ acpica-unix2-20211217/source/components/namespace/nsparse.c
+--- acpica-unix2-20220331.orig/source/components/namespace/nsparse.c
++++ acpica-unix2-20220331/source/components/namespace/nsparse.c
 @@ -203,6 +203,7 @@ AcpiNsOneCompleteParse (
      ACPI_WALK_STATE         *WalkState;
      ACPI_TABLE_HEADER       *Table;
@@ -2260,10 +2260,10 @@ Index: acpica-unix2-20211217/source/components/namespace/nsparse.c
  
      Status = AcpiTbGetOwnerId (TableIndex, &OwnerId);
      if (ACPI_FAILURE (Status))
-Index: acpica-unix2-20211217/source/components/namespace/nsutils.c
+Index: acpica-unix2-20220331/source/components/namespace/nsutils.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/components/namespace/nsutils.c
-+++ acpica-unix2-20211217/source/components/namespace/nsutils.c
+--- acpica-unix2-20220331.orig/source/components/namespace/nsutils.c
++++ acpica-unix2-20220331/source/components/namespace/nsutils.c
 @@ -272,7 +272,6 @@ AcpiNsBuildInternalName (
      const char              *ExternalName = Info->NextExternalChar;
      char                    *Result = NULL;
@@ -2300,10 +2300,10 @@ Index: acpica-unix2-20211217/source/components/namespace/nsutils.c
  
          /* Now we must have a path separator, or the pathname is bad */
  
-Index: acpica-unix2-20211217/source/components/utilities/utresrc.c
+Index: acpica-unix2-20220331/source/components/utilities/utresrc.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/components/utilities/utresrc.c
-+++ acpica-unix2-20211217/source/components/utilities/utresrc.c
+--- acpica-unix2-20220331.orig/source/components/utilities/utresrc.c
++++ acpica-unix2-20220331/source/components/utilities/utresrc.c
 @@ -541,7 +541,7 @@ AcpiUtGetResourceLength (
      {
          /* Large Resource type -- bytes 1-2 contain the 16-bit length */
@@ -2313,10 +2313,10 @@ Index: acpica-unix2-20211217/source/components/utilities/utresrc.c
  
      }
      else
-Index: acpica-unix2-20211217/source/compiler/aslrestype2e.c
+Index: acpica-unix2-20220331/source/compiler/aslrestype2e.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/compiler/aslrestype2e.c
-+++ acpica-unix2-20211217/source/compiler/aslrestype2e.c
+--- acpica-unix2-20220331.orig/source/compiler/aslrestype2e.c
++++ acpica-unix2-20220331/source/compiler/aslrestype2e.c
 @@ -80,6 +80,7 @@ RsDoExtendedIoDescriptor (
      UINT16                  StringLength = 0;
      UINT32                  CurrentByteOffset;
@@ -2575,10 +2575,10 @@ Index: acpica-unix2-20211217/source/compiler/aslrestype2e.c
          Descriptor->ExtAddress64.Flags,
          MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
  
-Index: acpica-unix2-20211217/source/compiler/aslrestype2s.c
+Index: acpica-unix2-20220331/source/compiler/aslrestype2s.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/compiler/aslrestype2s.c
-+++ acpica-unix2-20211217/source/compiler/aslrestype2s.c
+--- acpica-unix2-20220331.orig/source/compiler/aslrestype2s.c
++++ acpica-unix2-20220331/source/compiler/aslrestype2s.c
 @@ -343,6 +343,7 @@ RsDoGpioIntDescriptor (
      UINT32                  CurrentByteOffset;
      UINT32                  PinCount = 0;
diff --git a/0045-CSRT-fixed-use-of-optional-ResourceInfo.patch b/0045-CSRT-fixed-use-of-optional-ResourceInfo.patch
index 788669c..201e19b 100644
--- a/0045-CSRT-fixed-use-of-optional-ResourceInfo.patch
+++ b/0045-CSRT-fixed-use-of-optional-ResourceInfo.patch
@@ -12,11 +12,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/compiler/dttable1.c | 28 +++++++++++++------------
  2 files changed, 39 insertions(+), 32 deletions(-)
 
-Index: acpica-unix2-20211217/source/common/dmtbdump1.c
+Index: acpica-unix2-20220331/source/common/dmtbdump1.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/common/dmtbdump1.c
-+++ acpica-unix2-20211217/source/common/dmtbdump1.c
-@@ -591,11 +591,13 @@ AcpiDmDumpCsrt (
+--- acpica-unix2-20220331.orig/source/common/dmtbdump1.c
++++ acpica-unix2-20220331/source/common/dmtbdump1.c
+@@ -669,11 +669,13 @@ AcpiDmDumpCsrt (
      ACPI_CSRT_GROUP         *Subtable;
      ACPI_CSRT_SHARED_INFO   *SharedInfoTable;
      ACPI_CSRT_DESCRIPTOR    *SubSubtable;
@@ -31,7 +31,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
  
  
      /* The main table only contains the ACPI header, thus already handled */
-@@ -603,13 +605,14 @@ AcpiDmDumpCsrt (
+@@ -681,13 +683,14 @@ AcpiDmDumpCsrt (
      /* Subtables (Resource Groups) */
  
      Subtable = ACPI_ADD_PTR (ACPI_CSRT_GROUP, Table, Offset);
@@ -49,7 +49,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
          if (ACPI_FAILURE (Status))
          {
              return;
-@@ -622,26 +625,28 @@ AcpiDmDumpCsrt (
+@@ -700,26 +703,28 @@ AcpiDmDumpCsrt (
              Offset + SubOffset);
  
          AcpiOsPrintf ("\n");
@@ -85,7 +85,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
              if (ACPI_FAILURE (Status))
              {
                  return;
-@@ -651,11 +656,12 @@ AcpiDmDumpCsrt (
+@@ -729,11 +734,12 @@ AcpiDmDumpCsrt (
  
              /* Resource-specific info buffer */
  
@@ -101,7 +101,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
                      InfoLength, AcpiDmTableInfoCsrt2a);
                  if (ACPI_FAILURE (Status))
                  {
-@@ -665,16 +671,15 @@ AcpiDmDumpCsrt (
+@@ -743,16 +749,15 @@ AcpiDmDumpCsrt (
  
              /* Point to next sub-subtable */
  
@@ -122,11 +122,11 @@ Index: acpica-unix2-20211217/source/common/dmtbdump1.c
      }
  }
  
-Index: acpica-unix2-20211217/source/compiler/dttable1.c
+Index: acpica-unix2-20220331/source/compiler/dttable1.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/compiler/dttable1.c
-+++ acpica-unix2-20211217/source/compiler/dttable1.c
-@@ -570,14 +570,16 @@ DtCompileCsrt (
+--- acpica-unix2-20220331.orig/source/compiler/dttable1.c
++++ acpica-unix2-20220331/source/compiler/dttable1.c
+@@ -716,14 +716,16 @@ DtCompileCsrt (
      DT_SUBTABLE             *Subtable;
      DT_SUBTABLE             *ParentTable;
      DT_FIELD                **PFieldList = (DT_FIELD **) List;
@@ -144,7 +144,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
      while (*PFieldList)
      {
          /* Resource group subtable */
-@@ -592,16 +594,13 @@ DtCompileCsrt (
+@@ -738,16 +740,13 @@ DtCompileCsrt (
          /* Compute the number of resource descriptors */
  
          Tmp = AcpiUtReadUint32 (&(ACPI_CAST_PTR (ACPI_CSRT_GROUP,
@@ -163,7 +163,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
          DtInsertSubtable (ParentTable, Subtable);
          DtPushSubtable (Subtable);
          ParentTable = DtPeekSubtable ();
-@@ -616,10 +615,13 @@ DtCompileCsrt (
+@@ -762,10 +761,13 @@ DtCompileCsrt (
          }
  
          DtInsertSubtable (ParentTable, Subtable);
@@ -178,7 +178,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
          {
  
              Status = DtCompileTable (PFieldList, AcpiDmTableInfoCsrt2,
-@@ -628,6 +630,10 @@ DtCompileCsrt (
+@@ -774,6 +776,10 @@ DtCompileCsrt (
              {
                  return (Status);
              }
@@ -189,7 +189,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
  
              DtInsertSubtable (ParentTable, Subtable);
  
-@@ -637,11 +643,7 @@ DtCompileCsrt (
+@@ -783,11 +789,7 @@ DtCompileCsrt (
              {
                  Status = DtCompileTable (PFieldList, AcpiDmTableInfoCsrt2a,
                      &Subtable);
@@ -202,7 +202,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable1.c
                  {
                      DtInsertSubtable (ParentTable, Subtable);
                  }
-@@ -649,7 +651,7 @@ DtCompileCsrt (
+@@ -795,7 +797,7 @@ DtCompileCsrt (
  
              DtPopSubtable ();
              ParentTable = DtPeekSubtable ();
diff --git a/0046-Support-PHAT-in-a-big-endian-world.patch b/0046-Support-PHAT-in-a-big-endian-world.patch
index ea9bea6..9a22b3b 100644
--- a/0046-Support-PHAT-in-a-big-endian-world.patch
+++ b/0046-Support-PHAT-in-a-big-endian-world.patch
@@ -9,11 +9,11 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
  source/compiler/dttable2.c | 12 +++++++++---
  2 files changed, 29 insertions(+), 19 deletions(-)
 
-Index: acpica-unix2-20211217/source/common/dmtbdump2.c
+Index: acpica-unix2-20220331/source/common/dmtbdump2.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20211217/source/common/dmtbdump2.c
-@@ -1982,39 +1982,41 @@ AcpiDmDumpPhat (
+--- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20220331/source/common/dmtbdump2.c
+@@ -2029,39 +2029,41 @@ AcpiDmDumpPhat (
      ACPI_PHAT_HEADER        *Subtable;
      ACPI_PHAT_VERSION_DATA  *VersionData;
      UINT32                  RecordCount;
@@ -62,7 +62,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
              break;
  
          default:
-@@ -2025,22 +2027,22 @@ AcpiDmDumpPhat (
+@@ -2072,22 +2074,22 @@ AcpiDmDumpPhat (
              return;
          }
  
@@ -89,7 +89,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
                      ACPI_ADD_PTR (ACPI_PHAT_HEADER, Subtable, sizeof (ACPI_PHAT_VERSION_DATA)),
                      sizeof (ACPI_PHAT_VERSION_ELEMENT), AcpiDmTableInfoPhat0a);
                  if (ACPI_FAILURE (Status))
-@@ -2058,7 +2060,7 @@ AcpiDmDumpPhat (
+@@ -2105,7 +2107,7 @@ AcpiDmDumpPhat (
              /* account for the null terminator */
  
              PathLength = strlen (ACPI_ADD_PTR (char, Subtable, sizeof (ACPI_PHAT_HEALTH_DATA))) + 1;
@@ -98,7 +98,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
                  ACPI_ADD_PTR (ACPI_PHAT_HEADER, Subtable, sizeof (ACPI_PHAT_HEALTH_DATA)),
                  PathLength, AcpiDmTableInfoPhat1a);
              if (ACPI_FAILURE (Status))
-@@ -2069,8 +2071,8 @@ AcpiDmDumpPhat (
+@@ -2116,8 +2118,8 @@ AcpiDmDumpPhat (
              /* Get vendor data - data length is the remaining subtable length */
  
              VendorLength =
@@ -109,7 +109,7 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
                  ACPI_ADD_PTR (ACPI_PHAT_HEADER, Subtable, sizeof (ACPI_PHAT_HEALTH_DATA) + PathLength),
                  VendorLength, AcpiDmTableInfoPhat1b);
              if (ACPI_FAILURE (Status))
-@@ -2082,15 +2084,15 @@ AcpiDmDumpPhat (
+@@ -2129,15 +2131,15 @@ AcpiDmDumpPhat (
          default:
  
              AcpiOsPrintf ("\n**** Unknown PHAT subtable type 0x%X\n\n",
@@ -128,11 +128,11 @@ Index: acpica-unix2-20211217/source/common/dmtbdump2.c
      }
  }
  
-Index: acpica-unix2-20211217/source/compiler/dttable2.c
+Index: acpica-unix2-20220331/source/compiler/dttable2.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/compiler/dttable2.c
-+++ acpica-unix2-20211217/source/compiler/dttable2.c
-@@ -1254,6 +1254,8 @@ DtCompilePhat (
+--- acpica-unix2-20220331.orig/source/compiler/dttable2.c
++++ acpica-unix2-20220331/source/compiler/dttable2.c
+@@ -1267,6 +1267,8 @@ DtCompilePhat (
      ACPI_DMTABLE_INFO       *Info;
      ACPI_PHAT_VERSION_DATA  *VersionData;
      UINT32                  RecordCount;
@@ -141,7 +141,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable2.c
  
  
      /* The table consist of subtables */
-@@ -1271,8 +1273,9 @@ DtCompilePhat (
+@@ -1284,8 +1286,9 @@ DtCompilePhat (
          DtPushSubtable (Subtable);
  
          PhatHeader = ACPI_CAST_PTR (ACPI_PHAT_HEADER, Subtable->Buffer);
@@ -152,7 +152,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable2.c
          {
          case ACPI_PHAT_TYPE_FW_VERSION_DATA:
  
-@@ -1303,13 +1306,13 @@ DtCompilePhat (
+@@ -1316,13 +1319,13 @@ DtCompilePhat (
          ParentTable = DtPeekSubtable ();
          DtInsertSubtable (ParentTable, Subtable);
  
@@ -168,7 +168,7 @@ Index: acpica-unix2-20211217/source/compiler/dttable2.c
  
              while (RecordCount)
              {
-@@ -1360,6 +1363,9 @@ DtCompilePhat (
+@@ -1373,6 +1376,9 @@ DtCompilePhat (
              DtFatal (ASL_MSG_UNKNOWN_SUBTABLE, *PFieldList, "PHAT");
              return (AE_ERROR);
          }
diff --git a/0047-Support-PRMT-in-a-big-endian-world.patch b/0047-Support-PRMT-in-a-big-endian-world.patch
new file mode 100644
index 0000000..96df1d5
--- /dev/null
+++ b/0047-Support-PRMT-in-a-big-endian-world.patch
@@ -0,0 +1,51 @@
+Signed-off-by: Dean Nelson <dnelson@redhat.com>
+Reviewed-by: Al Stone <ahs3@redhat.com>
+---
+ source/common/dmtbdump2.c | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+Index: acpica-unix2-20220331/source/common/dmtbdump2.c
+===================================================================
+--- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20220331/source/common/dmtbdump2.c
+@@ -2415,13 +2415,14 @@ AcpiDmDumpPrmt (
+     ACPI_PRMT_MODULE_INFO   *PrmtModuleInfo;
+     ACPI_PRMT_HANDLER_INFO  *PrmtHandlerInfo;
+     ACPI_STATUS             Status;
++    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
+     UINT32                  i, j;
+ 
+ 
+     /* Main table header */
+ 
+     PrmtHeader = ACPI_ADD_PTR (ACPI_TABLE_PRMT_HEADER, Table, CurrentOffset);
+-    Status = AcpiDmDumpTable (Table->Length, CurrentOffset, PrmtHeader,
++    Status = AcpiDmDumpTable (TableLength, CurrentOffset, PrmtHeader,
+         sizeof (ACPI_TABLE_PRMT_HEADER), AcpiDmTableInfoPrmtHdr);
+     if (ACPI_FAILURE (Status))
+     {
+@@ -2433,20 +2434,20 @@ AcpiDmDumpPrmt (
+ 
+     /* PRM Module Information Structure array */
+ 
+-    for (i = 0; i < PrmtHeader->ModuleInfoCount; ++i)
++    for (i = 0; i < AcpiUtReadUint32 (&PrmtHeader->ModuleInfoCount); ++i)
+     {
+         PrmtModuleInfo = ACPI_ADD_PTR (ACPI_PRMT_MODULE_INFO, Table, CurrentOffset);
+-        Status = AcpiDmDumpTable (Table->Length, CurrentOffset, PrmtModuleInfo,
++        Status = AcpiDmDumpTable (TableLength, CurrentOffset, PrmtModuleInfo,
+             sizeof (ACPI_PRMT_MODULE_INFO), AcpiDmTableInfoPrmtModule);
+ 
+         CurrentOffset += sizeof (ACPI_PRMT_MODULE_INFO);
+ 
+         /* PRM handler information structure array */
+ 
+-        for (j = 0; j < PrmtModuleInfo->HandlerInfoCount; ++j)
++        for (j = 0; j < AcpiUtReadUint16 (&PrmtModuleInfo->HandlerInfoCount); ++j)
+         {
+             PrmtHandlerInfo = ACPI_ADD_PTR (ACPI_PRMT_HANDLER_INFO, Table, CurrentOffset);
+-            Status = AcpiDmDumpTable (Table->Length, CurrentOffset, PrmtHandlerInfo,
++            Status = AcpiDmDumpTable (TableLength, CurrentOffset, PrmtHandlerInfo,
+                 sizeof (ACPI_PRMT_HANDLER_INFO), AcpiDmTableInfoPrmtHandler);
+ 
+             CurrentOffset += sizeof (ACPI_PRMT_HANDLER_INFO);
diff --git a/0048-Support-RGRT-in-a-big-endian-world.patch b/0048-Support-RGRT-in-a-big-endian-world.patch
new file mode 100644
index 0000000..818d335
--- /dev/null
+++ b/0048-Support-RGRT-in-a-big-endian-world.patch
@@ -0,0 +1,35 @@
+Signed-off-by: Dean Nelson <dnelson@redhat.com>
+Reviewed-by: Al Stone <ahs3@redhat.com>
+---
+ source/common/dmtbdump2.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+Index: acpica-unix2-20220331/source/common/dmtbdump2.c
+===================================================================
+--- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
++++ acpica-unix2-20220331/source/common/dmtbdump2.c
+@@ -2475,11 +2475,12 @@ AcpiDmDumpRgrt (
+     ACPI_STATUS             Status;
+     ACPI_TABLE_RGRT         *Subtable = ACPI_CAST_PTR (ACPI_TABLE_RGRT, Table);
+     UINT32                  Offset = sizeof (ACPI_TABLE_RGRT);
++    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
+ 
+ 
+     /* Main table */
+ 
+-    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoRgrt);
++    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoRgrt);
+     if (ACPI_FAILURE (Status))
+     {
+         return;
+@@ -2487,8 +2488,8 @@ AcpiDmDumpRgrt (
+ 
+     /* Dump the binary image as a subtable */
+ 
+-    Status = AcpiDmDumpTable (Table->Length, Offset, &Subtable->Image,
+-        Table->Length - Offset, AcpiDmTableInfoRgrt0);
++    Status = AcpiDmDumpTable (TableLength, Offset, &Subtable->Image,
++        TableLength - Offset, AcpiDmTableInfoRgrt0);
+     if (ACPI_FAILURE (Status))
+     {
+         return;
diff --git a/0049-Support-SVKL-in-a-big-endian-world.patch b/0049-Support-SVKL-in-a-big-endian-world.patch
new file mode 100644
index 0000000..8ba5efc
--- /dev/null
+++ b/0049-Support-SVKL-in-a-big-endian-world.patch
@@ -0,0 +1,42 @@
+Signed-off-by: Dean Nelson <dnelson@redhat.com>
+Reviewed-by: Al Stone <ahs3@redhat.com>
+---
+ source/common/dmtbdump3.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+Index: acpica-unix2-20220331/source/common/dmtbdump3.c
+===================================================================
+--- acpica-unix2-20220331.orig/source/common/dmtbdump3.c
++++ acpica-unix2-20220331/source/common/dmtbdump3.c
+@@ -344,14 +344,14 @@ AcpiDmDumpSvkl (
+     ACPI_TABLE_HEADER       *Table)
+ {
+     ACPI_STATUS             Status;
+-    UINT32                  Length = Table->Length;
++    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
+     UINT32                  Offset = sizeof (ACPI_TABLE_SVKL);
+     ACPI_SVKL_KEY           *Subtable;
+ 
+ 
+     /* Main table */
+ 
+-    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoSvkl);
++    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoSvkl);
+     if (ACPI_FAILURE (Status))
+     {
+         return;
+@@ -360,12 +360,12 @@ AcpiDmDumpSvkl (
+     /* The rest of the table consists of subtables (single type) */
+ 
+     Subtable = ACPI_ADD_PTR (ACPI_SVKL_KEY, Table, Offset);
+-    while (Offset < Table->Length)
++    while (Offset < TableLength)
+     {
+         /* Dump the subtable */
+ 
+         AcpiOsPrintf ("\n");
+-        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
++        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
+             sizeof (ACPI_SVKL_KEY), AcpiDmTableInfoSvkl0);
+         if (ACPI_FAILURE (Status))
+         {
diff --git a/OPT_LDFLAGS.patch b/OPT_LDFLAGS.patch
index de12ce1..2afc266 100644
--- a/OPT_LDFLAGS.patch
+++ b/OPT_LDFLAGS.patch
@@ -1,7 +1,7 @@
-Index: acpica-unix2-20200925/generate/unix/Makefile.config
+Index: acpica-unix2-20220331/generate/unix/Makefile.config
 ===================================================================
---- acpica-unix2-20200925.orig/generate/unix/Makefile.config
-+++ acpica-unix2-20200925/generate/unix/Makefile.config
+--- acpica-unix2-20220331.orig/generate/unix/Makefile.config
++++ acpica-unix2-20220331/generate/unix/Makefile.config
 @@ -23,6 +23,9 @@
  # OPT_CFLAGS can be overridden on the make command line by
  #   adding OPT_CFLAGS="..." to the invocation.
diff --git a/acpica-tools.spec b/acpica-tools.spec
index a2c8772..2d9b4b3 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -1,6 +1,6 @@
 Name:           acpica-tools
-Version:        20211217
-Release:        2%{?dist}
+Version:        20220331
+Release:        1%{?dist}
 Summary:        ACPICA tools for the development and debug of ACPI tables
 
 License:        GPLv2
@@ -71,6 +71,9 @@ Patch41:	0042-Support-IVRS-in-a-big-endian-world.patch
 Patch42:	0043-Support-DSDT-SSDT-in-a-big-endian-world.patch
 Patch43:	0045-CSRT-fixed-use-of-optional-ResourceInfo.patch
 Patch44:	0046-Support-PHAT-in-a-big-endian-world.patch
+Patch45:	0047-Support-PRMT-in-a-big-endian-world.patch
+Patch46:	0048-Support-RGRT-in-a-big-endian-world.patch
+Patch47:	0049-Support-SVKL-in-a-big-endian-world.patch
 
 # other miscellaneous patches
 Patch100:	unaligned.patch
@@ -256,6 +259,11 @@ fi
 
 
 %changelog
+* Sun Apr 3 2022 Al Stone <ahs3@redhat.com> - 20220331-1
+- Update to 20220331 upstream source.  Bring all the patches up to date.
+- Update the results of misc test cases.
+- Add in big-endian patches for PRMT, RGRT and SVKL tables (thanks, Dean!)
+
 * Mon Mar 28 2022 Al Stone <ahs3@redhat.com> - 20211217-2
 - Stop building i686; it is the only Arch that stumbles across a problem
   in using varargs but since the Arch has been essentially deprecated,
diff --git a/arm7hl.patch b/arm7hl.patch
index 55d4aef..ffe22e9 100644
--- a/arm7hl.patch
+++ b/arm7hl.patch
@@ -1,7 +1,7 @@
-Index: acpica-unix2-20210604/source/include/acmacros.h
+Index: acpica-unix2-20220331/source/include/acmacros.h
 ===================================================================
---- acpica-unix2-20210604.orig/source/include/acmacros.h
-+++ acpica-unix2-20210604/source/include/acmacros.h
+--- acpica-unix2-20220331.orig/source/include/acmacros.h
++++ acpica-unix2-20220331/source/include/acmacros.h
 @@ -108,6 +108,8 @@
  
  /* 16-bit source, 16/32/64 destination */
diff --git a/armv7-str-fixes.patch b/armv7-str-fixes.patch
index 497c92b..69cc5b6 100644
--- a/armv7-str-fixes.patch
+++ b/armv7-str-fixes.patch
@@ -1,8 +1,8 @@
-Index: acpica-unix2-20211217/source/include/actypes.h
+Index: acpica-unix2-20220331/source/include/actypes.h
 ===================================================================
---- acpica-unix2-20211217.orig/source/include/actypes.h
-+++ acpica-unix2-20211217/source/include/actypes.h
-@@ -560,7 +560,7 @@ typedef UINT64
+--- acpica-unix2-20220331.orig/source/include/actypes.h
++++ acpica-unix2-20220331/source/include/actypes.h
+@@ -564,7 +564,7 @@ typedef UINT64
  #define ACPI_COPY_NAMESEG(dest,src)     (*ACPI_CAST_PTR (UINT32, (dest)) = *ACPI_CAST_PTR (UINT32, (src)))
  #else
  #define ACPI_COMPARE_NAMESEG(a,b)       (!strncmp (ACPI_CAST_PTR (char, (a)), ACPI_CAST_PTR (char, (b)), ACPI_NAMESEG_SIZE))
diff --git a/badcode.asl.result b/badcode.asl.result
index 093c50d..d1229f4 100644
--- a/badcode.asl.result
+++ b/badcode.asl.result
@@ -256,11 +256,11 @@ Warning  3144 -                            ^ Method Local is set but never used
 
 Intel ACPI Component Architecture
 ASL+ Optimizing Compiler/Disassembler version VVVVVVVV
-Copyright (c) 2000 - 2021 Intel Corporation
+Copyright (c) 2000 - 2022 Intel Corporation
 
 Ignoring all errors, forcing AML file generation
 
 ASL Input:     badcode.asl -   11588 bytes     81 keywords    408 source lines
 AML Output:    badcode.aml -    1195 bytes     20 opcodes      61 named objects
 
-Compilation successful. 46 Errors, 28 Warnings, 11 Remarks, 16 Optimizations, 1 Constants Folded
+Compilation successful. 0 Errors, 28 Warnings, 11 Remarks, 16 Optimizations, 1 Constants Folded
diff --git a/converterSample.asl.result b/converterSample.asl.result
index a3b6ca1..c890c9d 100644
--- a/converterSample.asl.result
+++ b/converterSample.asl.result
@@ -25,17 +25,14 @@ Remark   2182 -                           ^ At least one lower case letter found
 converterSample.asl     68:         Name (a1, 0x04)
 Remark   2089 -  Object is not referenced ^  (Name [A1__] is within a method [SCOP])
 
-converterSample.asl     76:         Offset(0),//c37
-Remark   2158 -                           ^ Unnecessary/redundant use of Offset operator
-
 
 Intel ACPI Component Architecture
 ASL+ Optimizing Compiler/Disassembler version VVVVVVVV
-Copyright (c) 2000 - 2021 Intel Corporation
+Copyright (c) 2000 - 2022 Intel Corporation
 
 Ignoring all errors, forcing AML file generation
 
 ASL Input:     converterSample.asl -    1968 bytes     11 keywords     85 source lines
-AML Output:    converterSample.aml -     182 bytes      2 opcodes       9 named objects
+AML Output:    converterSample.aml -     184 bytes      2 opcodes       9 named objects
 
-Compilation successful. 0 Errors, 0 Warnings, 10 Remarks, 10 Optimizations
+Compilation successful. 0 Errors, 0 Warnings, 9 Remarks, 9 Optimizations
diff --git a/cve-2017-13693.patch b/cve-2017-13693.patch
index fcda493..7e1a156 100644
--- a/cve-2017-13693.patch
+++ b/cve-2017-13693.patch
@@ -63,10 +63,10 @@ Github-Location: https://github.com/acpica/acpica/pull/295/commits/987a3b5cf7175
  source/components/dispatcher/dsutils.c | 9 ++++++++-
  1 file changed, 8 insertions(+), 1 deletion(-)
 
-Index: acpica-unix2-20200925/source/components/dispatcher/dsutils.c
+Index: acpica-unix2-20220331/source/components/dispatcher/dsutils.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/components/dispatcher/dsutils.c
-+++ acpica-unix2-20200925/source/components/dispatcher/dsutils.c
+--- acpica-unix2-20220331.orig/source/components/dispatcher/dsutils.c
++++ acpica-unix2-20220331/source/components/dispatcher/dsutils.c
 @@ -759,6 +759,8 @@ AcpiDsCreateOperands (
      ACPI_PARSE_OBJECT       *Arguments[ACPI_OBJ_NUM_OPERANDS];
      UINT32                  ArgCount = 0;
diff --git a/cve-2017-13694.patch b/cve-2017-13694.patch
index 40c1c08..d1d3032 100644
--- a/cve-2017-13694.patch
+++ b/cve-2017-13694.patch
@@ -130,10 +130,10 @@ Github-Location: https://github.com/acpica/acpica/pull/278/commits/4a0243ecb4c94
  source/components/parser/psobject.c | 44 ++++++++++++++-----------------------
  1 file changed, 16 insertions(+), 28 deletions(-)
 
-Index: acpica-unix2-20200925/source/components/parser/psobject.c
+Index: acpica-unix2-20220331/source/components/parser/psobject.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/components/parser/psobject.c
-+++ acpica-unix2-20200925/source/components/parser/psobject.c
+--- acpica-unix2-20220331.orig/source/components/parser/psobject.c
++++ acpica-unix2-20220331/source/components/parser/psobject.c
 @@ -707,7 +707,8 @@ AcpiPsCompleteFinalOp (
      ACPI_PARSE_OBJECT       *Op,
      ACPI_STATUS             Status)
diff --git a/cve-2017-13695.patch b/cve-2017-13695.patch
index f521a16..e183a46 100644
--- a/cve-2017-13695.patch
+++ b/cve-2017-13695.patch
@@ -67,10 +67,10 @@ Github-Location: https://github.com/acpica/acpica/pull/296/commits/37f2c716f2c6a
  source/components/namespace/nseval.c | 10 ++++++++++
  1 file changed, 10 insertions(+)
 
-Index: acpica-unix2-20200925/source/components/namespace/nseval.c
+Index: acpica-unix2-20220331/source/components/namespace/nseval.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/components/namespace/nseval.c
-+++ acpica-unix2-20200925/source/components/namespace/nseval.c
+--- acpica-unix2-20220331.orig/source/components/namespace/nseval.c
++++ acpica-unix2-20220331/source/components/namespace/nseval.c
 @@ -329,6 +329,16 @@ AcpiNsEvaluate (
              Info->ReturnObject = NULL;
          }
diff --git a/dbtest.patch b/dbtest.patch
index 6cf7f28..b33e90b 100644
--- a/dbtest.patch
+++ b/dbtest.patch
@@ -4,10 +4,10 @@ into an ACPI_OBJECT instead of just the pointer (see the use in the call
 to memcpy()).  So, move the init so GCC recognizes that ValueToWrite is
 only a pointer, and not a whole string that needs to be moved.
 
-Index: acpica-unix2-20200925/source/components/debugger/dbtest.c
+Index: acpica-unix2-20220331/source/components/debugger/dbtest.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/components/debugger/dbtest.c
-+++ acpica-unix2-20200925/source/components/debugger/dbtest.c
+--- acpica-unix2-20220331.orig/source/components/debugger/dbtest.c
++++ acpica-unix2-20220331/source/components/debugger/dbtest.c
 @@ -719,9 +719,10 @@ AcpiDbTestStringType (
      ACPI_OBJECT             *Temp1 = NULL;
      ACPI_OBJECT             *Temp2 = NULL;
diff --git a/f23-harden.patch b/f23-harden.patch
index e1fbbbd..4279c50 100644
--- a/f23-harden.patch
+++ b/f23-harden.patch
@@ -8,10 +8,10 @@ From: Al Stone <ahs3@redhat.com>
  generate/unix/iasl/Makefile   |   13 +++++++------
  2 files changed, 9 insertions(+), 6 deletions(-)
 
-Index: acpica-unix2-20200925/generate/unix/Makefile.config
+Index: acpica-unix2-20220331/generate/unix/Makefile.config
 ===================================================================
---- acpica-unix2-20200925.orig/generate/unix/Makefile.config
-+++ acpica-unix2-20200925/generate/unix/Makefile.config
+--- acpica-unix2-20220331.orig/generate/unix/Makefile.config
++++ acpica-unix2-20220331/generate/unix/Makefile.config
 @@ -189,6 +189,8 @@ ifneq ($(NOFORTIFY),TRUE)
  OPT_CFLAGS += -D_FORTIFY_SOURCE=2
  endif
@@ -21,10 +21,10 @@ Index: acpica-unix2-20200925/generate/unix/Makefile.config
  CFLAGS += \
      -D$(ACPI_HOST)\
      -D_GNU_SOURCE\
-Index: acpica-unix2-20200925/generate/unix/iasl/Makefile
+Index: acpica-unix2-20220331/generate/unix/iasl/Makefile
 ===================================================================
---- acpica-unix2-20200925.orig/generate/unix/iasl/Makefile
-+++ acpica-unix2-20200925/generate/unix/iasl/Makefile
+--- acpica-unix2-20220331.orig/generate/unix/iasl/Makefile
++++ acpica-unix2-20220331/generate/unix/iasl/Makefile
 @@ -359,34 +359,35 @@ $(OBJDIR)/prparserparse.c $(OBJDIR)/prpa
  # Cannot use the common compile warning flags since the C files are created
  # by the utilities above and they are not necessarily ANSI C, etc.
diff --git a/grammar.asl.result b/grammar.asl.result
index 84cebe4..5517bd6 100644
--- a/grammar.asl.result
+++ b/grammar.asl.result
@@ -595,11 +595,11 @@ Error    6141 -   Missing dependency ^  (Device object requires a _HID or _ADR)
 
 Intel ACPI Component Architecture
 ASL+ Optimizing Compiler/Disassembler version VVVVVVVV
-Copyright (c) 2000 - 2021 Intel Corporation
+Copyright (c) 2000 - 2022 Intel Corporation
 
 Ignoring all errors, forcing AML file generation
 
 ASL Input:     grammar.asl -  323653 bytes   4818 keywords  10284 source lines
 AML Output:    grammar.aml -   43758 bytes   4148 opcodes     670 named objects
 
-Compilation successful. 60 Errors, 41 Warnings, 97 Remarks, 1106 Optimizations
+Compilation successful. 0 Errors, 41 Warnings, 97 Remarks, 1106 Optimizations
diff --git a/int-format.patch b/int-format.patch
index f98906b..ce98627 100644
--- a/int-format.patch
+++ b/int-format.patch
@@ -21,23 +21,23 @@ From: Al Stone <ahs3@redhat.com>
  source/components/utilities/utownerid.c |    2 +-
  18 files changed, 28 insertions(+), 28 deletions(-)
 
-Index: acpica-unix2-20200925/source/compiler/aslerror.c
+Index: acpica-unix2-20220331/source/compiler/aslerror.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/compiler/aslerror.c
-+++ acpica-unix2-20200925/source/compiler/aslerror.c
+--- acpica-unix2-20220331.orig/source/compiler/aslerror.c
++++ acpica-unix2-20220331/source/compiler/aslerror.c
 @@ -917,7 +917,7 @@ AslLogNewError (
      AslGbl_ExceptionCount[ModifiedLevel]++;
      if (!AslGbl_IgnoreErrors && AslGbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT)
      {
--        printf ("\nMaximum error count (%u) exceeded\n", ASL_MAX_ERROR_COUNT);
-+        printf ("\nMaximum error count (%d) exceeded\n", ASL_MAX_ERROR_COUNT);
+-        printf ("\nMaximum error count (%u) exceeded (aslerror.c)\n", ASL_MAX_ERROR_COUNT);
++        printf ("\nMaximum error count (%d) exceeded (aslerror.c)\n", ASL_MAX_ERROR_COUNT);
  
          AslGbl_SourceLine = 0;
          AslGbl_NextError = AslGbl_ErrorLog;
-Index: acpica-unix2-20200925/source/compiler/aslopt.c
+Index: acpica-unix2-20220331/source/compiler/aslopt.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/compiler/aslopt.c
-+++ acpica-unix2-20200925/source/compiler/aslopt.c
+--- acpica-unix2-20220331.orig/source/compiler/aslopt.c
++++ acpica-unix2-20220331/source/compiler/aslopt.c
 @@ -583,7 +583,7 @@ OptOptimizeNamePath (
      }
  
@@ -47,10 +47,10 @@ Index: acpica-unix2-20200925/source/compiler/aslopt.c
          Op->Asl.LogicalLineNumber,
          AcpiPsGetOpcodeName (Op->Common.Parent->Common.AmlOpcode),
          AcpiPsGetOpcodeName (Op->Common.AmlOpcode)));
-Index: acpica-unix2-20200925/source/compiler/aslprepkg.c
+Index: acpica-unix2-20220331/source/compiler/aslprepkg.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/compiler/aslprepkg.c
-+++ acpica-unix2-20200925/source/compiler/aslprepkg.c
+--- acpica-unix2-20220331.orig/source/compiler/aslprepkg.c
++++ acpica-unix2-20220331/source/compiler/aslprepkg.c
 @@ -320,7 +320,7 @@ ApCheckPackage (
  
          if (Count & 1)
@@ -60,10 +60,10 @@ Index: acpica-unix2-20200925/source/compiler/aslprepkg.c
                  Predefined->Info.Name, Count);
  
              AslError (ASL_ERROR, ASL_MSG_RESERVED_PACKAGE_LENGTH,
-Index: acpica-unix2-20200925/source/components/debugger/dbexec.c
+Index: acpica-unix2-20220331/source/components/debugger/dbexec.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/components/debugger/dbexec.c
-+++ acpica-unix2-20200925/source/components/debugger/dbexec.c
+--- acpica-unix2-20220331.orig/source/components/debugger/dbexec.c
++++ acpica-unix2-20220331/source/components/debugger/dbexec.c
 @@ -231,7 +231,7 @@ AcpiDbExecuteMethod (
              ACPI_ERROR ((AE_INFO,
                  "Possible buffer overflow within AML Debugger "
@@ -73,10 +73,10 @@ Index: acpica-unix2-20200925/source/components/debugger/dbexec.c
          }
      }
  
-Index: acpica-unix2-20200925/source/components/dispatcher/dsmthdat.c
+Index: acpica-unix2-20220331/source/components/dispatcher/dsmthdat.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/components/dispatcher/dsmthdat.c
-+++ acpica-unix2-20200925/source/components/dispatcher/dsmthdat.c
+--- acpica-unix2-20220331.orig/source/components/dispatcher/dsmthdat.c
++++ acpica-unix2-20220331/source/components/dispatcher/dsmthdat.c
 @@ -291,7 +291,7 @@ AcpiDsMethodDataGetNode (
          if (Index > ACPI_METHOD_MAX_LOCAL)
          {
@@ -95,10 +95,10 @@ Index: acpica-unix2-20200925/source/components/dispatcher/dsmthdat.c
                  Index, ACPI_METHOD_MAX_ARG));
              return_ACPI_STATUS (AE_AML_INVALID_INDEX);
          }
-Index: acpica-unix2-20200925/source/components/dispatcher/dsutils.c
+Index: acpica-unix2-20220331/source/components/dispatcher/dsutils.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/components/dispatcher/dsutils.c
-+++ acpica-unix2-20200925/source/components/dispatcher/dsutils.c
+--- acpica-unix2-20220331.orig/source/components/dispatcher/dsutils.c
++++ acpica-unix2-20220331/source/components/dispatcher/dsutils.c
 @@ -786,7 +786,7 @@ AcpiDsCreateOperands (
      }
  
@@ -108,10 +108,10 @@ Index: acpica-unix2-20200925/source/components/dispatcher/dsutils.c
          WalkState->NumOperands, ArgCount, Index));
  
      /* Create the interpreter arguments, in reverse order */
-Index: acpica-unix2-20200925/source/components/dispatcher/dswscope.c
+Index: acpica-unix2-20220331/source/components/dispatcher/dswscope.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/components/dispatcher/dswscope.c
-+++ acpica-unix2-20200925/source/components/dispatcher/dswscope.c
+--- acpica-unix2-20220331.orig/source/components/dispatcher/dswscope.c
++++ acpica-unix2-20220331/source/components/dispatcher/dswscope.c
 @@ -149,7 +149,7 @@ AcpiDsScopeStackPush (
      WalkState->ScopeDepth++;
  
@@ -130,10 +130,10 @@ Index: acpica-unix2-20200925/source/components/dispatcher/dswscope.c
          (UINT32) WalkState->ScopeDepth,
          AcpiUtGetNodeName (ScopeInfo->Scope.Node),
          AcpiUtGetTypeName (ScopeInfo->Common.Value)));
-Index: acpica-unix2-20200925/source/components/events/evgpe.c
+Index: acpica-unix2-20220331/source/components/events/evgpe.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/components/events/evgpe.c
-+++ acpica-unix2-20200925/source/components/events/evgpe.c
+--- acpica-unix2-20220331.orig/source/components/events/evgpe.c
++++ acpica-unix2-20220331/source/components/events/evgpe.c
 @@ -488,7 +488,7 @@ AcpiEvGpeDetect (
                      "Ignore disabled registers for GPE %02X-%02X: "
                      "RunEnable=%02X, WakeEnable=%02X\n",
@@ -143,10 +143,10 @@ Index: acpica-unix2-20200925/source/components/events/evgpe.c
                      GpeRegisterInfo->EnableForRun,
                      GpeRegisterInfo->EnableForWake));
                  continue;
-Index: acpica-unix2-20200925/source/components/executer/exdump.c
+Index: acpica-unix2-20220331/source/components/executer/exdump.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/components/executer/exdump.c
-+++ acpica-unix2-20200925/source/components/executer/exdump.c
+--- acpica-unix2-20220331.orig/source/components/executer/exdump.c
++++ acpica-unix2-20220331/source/components/executer/exdump.c
 @@ -678,7 +678,7 @@ AcpiExDumpOperand (
      if (Depth > 0)
      {
@@ -156,10 +156,10 @@ Index: acpica-unix2-20200925/source/components/executer/exdump.c
      }
      else
      {
-Index: acpica-unix2-20200925/source/components/executer/exfldio.c
+Index: acpica-unix2-20220331/source/components/executer/exfldio.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/components/executer/exfldio.c
-+++ acpica-unix2-20200925/source/components/executer/exfldio.c
+--- acpica-unix2-20220331.orig/source/components/executer/exfldio.c
++++ acpica-unix2-20220331/source/components/executer/exfldio.c
 @@ -681,8 +681,8 @@ AcpiExWriteWithUpdateRule (
  
              ACPI_ERROR ((AE_INFO,
@@ -171,10 +171,10 @@ Index: acpica-unix2-20200925/source/components/executer/exfldio.c
              return_ACPI_STATUS (AE_AML_OPERAND_VALUE);
          }
      }
-Index: acpica-unix2-20200925/source/components/executer/exnames.c
+Index: acpica-unix2-20220331/source/components/executer/exnames.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/components/executer/exnames.c
-+++ acpica-unix2-20200925/source/components/executer/exnames.c
+--- acpica-unix2-20220331.orig/source/components/executer/exnames.c
++++ acpica-unix2-20220331/source/components/executer/exnames.c
 @@ -237,7 +237,7 @@ AcpiExNameSegment (
           */
          ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
@@ -193,10 +193,10 @@ Index: acpica-unix2-20200925/source/components/executer/exnames.c
      }
  
      *InAmlAddress = ACPI_CAST_PTR (UINT8, AmlAddress);
-Index: acpica-unix2-20200925/source/components/hardware/hwregs.c
+Index: acpica-unix2-20220331/source/components/hardware/hwregs.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/components/hardware/hwregs.c
-+++ acpica-unix2-20200925/source/components/hardware/hwregs.c
+--- acpica-unix2-20220331.orig/source/components/hardware/hwregs.c
++++ acpica-unix2-20220331/source/components/hardware/hwregs.c
 @@ -460,7 +460,7 @@ AcpiHwClearAcpiStatus (
  
  
@@ -206,10 +206,10 @@ Index: acpica-unix2-20200925/source/components/hardware/hwregs.c
          ACPI_FORMAT_UINT64 (AcpiGbl_XPm1aStatus.Address)));
  
      LockFlags = AcpiOsAcquireLock (AcpiGbl_HardwareLock);
-Index: acpica-unix2-20200925/source/components/tables/tbfadt.c
+Index: acpica-unix2-20220331/source/components/tables/tbfadt.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/components/tables/tbfadt.c
-+++ acpica-unix2-20200925/source/components/tables/tbfadt.c
+--- acpica-unix2-20220331.orig/source/components/tables/tbfadt.c
++++ acpica-unix2-20220331/source/components/tables/tbfadt.c
 @@ -233,7 +233,7 @@ AcpiTbInitGenericAddress (
          if (!(Flags & ACPI_FADT_GPE_REGISTER))
          {
@@ -237,10 +237,10 @@ Index: acpica-unix2-20200925/source/components/tables/tbfadt.c
                          Name, Address32,
                          ACPI_FORMAT_UINT64 (Address64->Address),
                          AcpiGbl_Use32BitFadtAddresses ? 32 : 64));
-Index: acpica-unix2-20200925/source/components/tables/tbxfroot.c
+Index: acpica-unix2-20220331/source/components/tables/tbxfroot.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/components/tables/tbxfroot.c
-+++ acpica-unix2-20200925/source/components/tables/tbxfroot.c
+--- acpica-unix2-20220331.orig/source/components/tables/tbxfroot.c
++++ acpica-unix2-20220331/source/components/tables/tbxfroot.c
 @@ -177,7 +177,7 @@ AcpiFindRootPointer (
      {
          ACPI_ERROR ((AE_INFO,
@@ -268,10 +268,10 @@ Index: acpica-unix2-20200925/source/components/tables/tbxfroot.c
  
          return_ACPI_STATUS (AE_NO_MEMORY);
      }
-Index: acpica-unix2-20200925/source/components/utilities/utownerid.c
+Index: acpica-unix2-20220331/source/components/utilities/utownerid.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/components/utilities/utownerid.c
-+++ acpica-unix2-20200925/source/components/utilities/utownerid.c
+--- acpica-unix2-20220331.orig/source/components/utilities/utownerid.c
++++ acpica-unix2-20220331/source/components/utilities/utownerid.c
 @@ -237,7 +237,7 @@ AcpiUtReleaseOwnerId (
      else
      {
diff --git a/mips-be-fix.patch b/mips-be-fix.patch
index 485fb77..c84e9c8 100644
--- a/mips-be-fix.patch
+++ b/mips-be-fix.patch
@@ -1,7 +1,7 @@
-Index: acpica-unix2-20200925/source/compiler/aslparseop.c
+Index: acpica-unix2-20220331/source/compiler/aslparseop.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/compiler/aslparseop.c
-+++ acpica-unix2-20200925/source/compiler/aslparseop.c
+--- acpica-unix2-20220331.orig/source/compiler/aslparseop.c
++++ acpica-unix2-20220331/source/compiler/aslparseop.c
 @@ -285,7 +285,16 @@ TrCreateValuedLeafOp (
  
  
diff --git a/ptr-cast.patch b/ptr-cast.patch
index 8f32d8c..0a24429 100644
--- a/ptr-cast.patch
+++ b/ptr-cast.patch
@@ -1,7 +1,7 @@
-Index: acpica-unix2-20200925/source/components/tables/tbutils.c
+Index: acpica-unix2-20220331/source/components/tables/tbutils.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/components/tables/tbutils.c
-+++ acpica-unix2-20200925/source/components/tables/tbutils.c
+--- acpica-unix2-20220331.orig/source/components/tables/tbutils.c
++++ acpica-unix2-20220331/source/components/tables/tbutils.c
 @@ -238,9 +238,11 @@ AcpiTbGetRootTableEntry (
           * 64-bit platform, XSDT: Move (unaligned) 64-bit to local,
           *  return 64-bit
@@ -31,10 +31,10 @@ Index: acpica-unix2-20200925/source/components/tables/tbutils.c
      }
  }
  
-Index: acpica-unix2-20200925/source/compiler/aslparseop.c
+Index: acpica-unix2-20220331/source/compiler/aslparseop.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/compiler/aslparseop.c
-+++ acpica-unix2-20200925/source/compiler/aslparseop.c
+--- acpica-unix2-20220331.orig/source/compiler/aslparseop.c
++++ acpica-unix2-20220331/source/compiler/aslparseop.c
 @@ -289,7 +289,11 @@ TrCreateValuedLeafOp (
          ParseOpcode == PARSEOP_NAMESEG ||
          ParseOpcode == PARSEOP_STRING_LITERAL)
diff --git a/simple-64bit.patch b/simple-64bit.patch
index aeead35..c0403c7 100644
--- a/simple-64bit.patch
+++ b/simple-64bit.patch
@@ -3,11 +3,11 @@ Description: Stop listing all 64bit architectures
  64bit architectures.
 Author: Adrian Bunk <bunk@debian.org>
 
-Index: acpica-unix2-20200925/source/include/platform/aclinux.h
+Index: acpica-unix2-20220331/source/include/platform/aclinux.h
 ===================================================================
---- acpica-unix2-20200925.orig/source/include/platform/aclinux.h
-+++ acpica-unix2-20200925/source/include/platform/aclinux.h
-@@ -215,10 +215,7 @@
+--- acpica-unix2-20220331.orig/source/include/platform/aclinux.h
++++ acpica-unix2-20220331/source/include/platform/aclinux.h
+@@ -220,10 +220,7 @@
  #define ACPI_FLUSH_CPU_CACHE()
  #define ACPI_CAST_PTHREAD_T(Pthread) ((ACPI_THREAD_ID) (Pthread))
  
diff --git a/sources b/sources
index ad07293..d4bf4b2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (acpica-unix2-20211217.tar.gz) = e8e6e4f4543205d2ed9c8fe2b49c8952272d4a1b066018327660c6a4e0fd018d3144e18a759784b6b4a37efe726ec0c61ff36026a1021cdcba6c7627e105385d
-SHA512 (acpitests-unix-20211217.tar.gz) = 1dd73746accc78118477d57b01c43d60df02c8a3cea4ebba8ea2dac85871193debe359437f4cd25a3662520063f5f4a28f5e3fdfc3bc979fdd8a136fee7e43ac
+SHA512 (acpica-unix2-20220331.tar.gz) = c606396323dc342ae4c7bab9526b04aca09b00a932363146c1791523962ade0bdb4e40b67ff2a0a246df3ce322592879288c3fcc5fb7a450beb87a6d70c5ef40
+SHA512 (acpitests-unix-20220331.tar.gz) = 28ead3ff06fc7e409e5fd02358048470daac6d3a96f24408068b84199f33513b5fcaa7c00a31972e63fc481d4b5980f8b8f131549d9d1bcd19fa20f3a1c2aaaf
diff --git a/str-trunc-warn.patch b/str-trunc-warn.patch
index eeb47c3..c866985 100644
--- a/str-trunc-warn.patch
+++ b/str-trunc-warn.patch
@@ -1,7 +1,7 @@
-Index: acpica-unix2-20200925/source/compiler/aslanalyze.c
+Index: acpica-unix2-20220331/source/compiler/aslanalyze.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/compiler/aslanalyze.c
-+++ acpica-unix2-20200925/source/compiler/aslanalyze.c
+--- acpica-unix2-20220331.orig/source/compiler/aslanalyze.c
++++ acpica-unix2-20220331/source/compiler/aslanalyze.c
 @@ -358,11 +358,16 @@ AnCheckMethodReturnValue (
           */
          if (ThisNodeBtype != 0)
@@ -21,10 +21,10 @@ Index: acpica-unix2-20200925/source/compiler/aslanalyze.c
          }
      }
  
-Index: acpica-unix2-20200925/source/compiler/aslpredef.c
+Index: acpica-unix2-20220331/source/compiler/aslpredef.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/compiler/aslpredef.c
-+++ acpica-unix2-20200925/source/compiler/aslpredef.c
+--- acpica-unix2-20220331.orig/source/compiler/aslpredef.c
++++ acpica-unix2-20220331/source/compiler/aslpredef.c
 @@ -159,14 +159,19 @@ ApCheckForPredefinedMethod (
          if (MethodInfo->NumReturnNoValue &&
              ThisName->Info.ExpectedBtypes)
@@ -84,10 +84,10 @@ Index: acpica-unix2-20200925/source/compiler/aslpredef.c
      return (AE_TYPE);
  }
  
-Index: acpica-unix2-20200925/source/compiler/aslwalks.c
+Index: acpica-unix2-20220331/source/compiler/aslwalks.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/compiler/aslwalks.c
-+++ acpica-unix2-20200925/source/compiler/aslwalks.c
+--- acpica-unix2-20220331.orig/source/compiler/aslwalks.c
++++ acpica-unix2-20220331/source/compiler/aslwalks.c
 @@ -515,15 +515,19 @@ AnOperandTypecheckWalkEnd (
              else if (!CommonBtypes)
              {
diff --git a/template.patch b/template.patch
index 408541a..4f9af9b 100644
--- a/template.patch
+++ b/template.patch
@@ -7,10 +7,10 @@ From: Al Stone <ahs3@redhat.com>
  tests/templates/Makefile |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: acpica-unix2-20200925/tests/templates/Makefile
+Index: acpica-unix2-20220331/tests/templates/Makefile
 ===================================================================
---- acpica-unix2-20200925.orig/tests/templates/Makefile
-+++ acpica-unix2-20200925/tests/templates/Makefile
+--- acpica-unix2-20220331.orig/tests/templates/Makefile
++++ acpica-unix2-20220331/tests/templates/Makefile
 @@ -26,7 +26,7 @@ $(aml_obj): %.aml:  %.asl
  
  
diff --git a/ull-32bit.patch b/ull-32bit.patch
index 17cfe58..9de0473 100644
--- a/ull-32bit.patch
+++ b/ull-32bit.patch
@@ -1,7 +1,7 @@
-Index: acpica-unix2-20211217/source/common/dmtbdump.c
+Index: acpica-unix2-20220331/source/common/dmtbdump.c
 ===================================================================
---- acpica-unix2-20211217.orig/source/common/dmtbdump.c
-+++ acpica-unix2-20211217/source/common/dmtbdump.c
+--- acpica-unix2-20220331.orig/source/common/dmtbdump.c
++++ acpica-unix2-20220331/source/common/dmtbdump.c
 @@ -392,7 +392,11 @@ AcpiDmDumpXsdt (
      for (i = 0; i < Entries; i++)
      {
diff --git a/unaligned.patch b/unaligned.patch
index 6d3f9c6..11d6c86 100644
--- a/unaligned.patch
+++ b/unaligned.patch
@@ -14,10 +14,10 @@ Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
  source/include/actypes.h              |   26 +++++++++++++-------------
  3 files changed, 32 insertions(+), 21 deletions(-)
 
-Index: acpica-unix2-20200925/source/components/executer/exoparg2.c
+Index: acpica-unix2-20220331/source/components/executer/exoparg2.c
 ===================================================================
---- acpica-unix2-20200925.orig/source/components/executer/exoparg2.c
-+++ acpica-unix2-20200925/source/components/executer/exoparg2.c
+--- acpica-unix2-20220331.orig/source/components/executer/exoparg2.c
++++ acpica-unix2-20220331/source/components/executer/exoparg2.c
 @@ -172,6 +172,8 @@ AcpiExOpcode_2A_2T_1R (
      ACPI_OPERAND_OBJECT     **Operand = &WalkState->Operands[0];
      ACPI_OPERAND_OBJECT     *ReturnDesc1 = NULL;
@@ -58,10 +58,10 @@ Index: acpica-unix2-20200925/source/components/executer/exoparg2.c
          break;
  
      case AML_CONCATENATE_OP: /* Concatenate (Data1, Data2, Result) */
-Index: acpica-unix2-20200925/source/include/actypes.h
+Index: acpica-unix2-20220331/source/include/actypes.h
 ===================================================================
---- acpica-unix2-20200925.orig/source/include/actypes.h
-+++ acpica-unix2-20200925/source/include/actypes.h
+--- acpica-unix2-20220331.orig/source/include/actypes.h
++++ acpica-unix2-20220331/source/include/actypes.h
 @@ -143,6 +143,19 @@ typedef COMPILER_DEPENDENT_INT64
   */
  #define ACPI_THREAD_ID                  UINT64

From 1ac5d772292778a889ccd4743508210832c014e0 Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Sun, 3 Apr 2022 15:45:41 -0600
Subject: [PATCH 67/82] Remove all 32-bit architectures (i686 and armv7hl)

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 acpica-tools.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/acpica-tools.spec b/acpica-tools.spec
index 2d9b4b3..4d81fd1 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -1,12 +1,12 @@
 Name:           acpica-tools
 Version:        20220331
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        ACPICA tools for the development and debug of ACPI tables
 
 License:        GPLv2
 URL:            https://www.acpica.org/
 
-ExcludeArch:	i686
+ExcludeArch:	i686, armv7hl
 
 Source0:        https://acpica.org/sites/acpica/files/acpica-unix2-%{version}.tar.gz
 Source1:        https://acpica.org/sites/acpica/files/acpitests-unix-%{version}.tar.gz
@@ -259,6 +259,10 @@ fi
 
 
 %changelog
+* Sun Apr 3 2022 Al Stone <ahs3@redhat.com> - 20220331-2
+- Stop building 32-bit architecture (i686 and armv7hl); they have been
+  deprecated in Fedora
+
 * Sun Apr 3 2022 Al Stone <ahs3@redhat.com> - 20220331-1
 - Update to 20220331 upstream source.  Bring all the patches up to date.
 - Update the results of misc test cases.

From a89b86980e7bbce7967682578e0a92ac2d958dae Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@redhat.com>
Date: Sun, 3 Apr 2022 16:00:44 -0600
Subject: [PATCH 68/82] Correct typo in the spec file

Signed-off-by: Al Stone <ahs3@redhat.com>
---
 acpica-tools.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/acpica-tools.spec b/acpica-tools.spec
index 4d81fd1..239ba5f 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -1,12 +1,12 @@
 Name:           acpica-tools
 Version:        20220331
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        ACPICA tools for the development and debug of ACPI tables
 
 License:        GPLv2
 URL:            https://www.acpica.org/
 
-ExcludeArch:	i686, armv7hl
+ExcludeArch:	i686 armv7hl
 
 Source0:        https://acpica.org/sites/acpica/files/acpica-unix2-%{version}.tar.gz
 Source1:        https://acpica.org/sites/acpica/files/acpitests-unix-%{version}.tar.gz
@@ -259,6 +259,9 @@ fi
 
 
 %changelog
+* Sun Apr 3 2022 Al Stone <ahs3@redhat.com> - 20220331-3
+- Correct typo in ExcludeArch syntax
+
 * Sun Apr 3 2022 Al Stone <ahs3@redhat.com> - 20220331-2
 - Stop building 32-bit architecture (i686 and armv7hl); they have been
   deprecated in Fedora

From 82469f77212849ed93a332dd5a0f578edba2ae62 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 20 Jul 2022 20:24:26 +0000
Subject: [PATCH 69/82] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 acpica-tools.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/acpica-tools.spec b/acpica-tools.spec
index 239ba5f..ca19c0a 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -1,6 +1,6 @@
 Name:           acpica-tools
 Version:        20220331
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        ACPICA tools for the development and debug of ACPI tables
 
 License:        GPLv2
@@ -259,6 +259,9 @@ fi
 
 
 %changelog
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 20220331-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Sun Apr 3 2022 Al Stone <ahs3@redhat.com> - 20220331-3
 - Correct typo in ExcludeArch syntax
 

From 7aef8044540aa7016e0d85445e665df5ae0e604e Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 18 Jan 2023 21:21:52 +0000
Subject: [PATCH 70/82] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 acpica-tools.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/acpica-tools.spec b/acpica-tools.spec
index ca19c0a..7632445 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -1,6 +1,6 @@
 Name:           acpica-tools
 Version:        20220331
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        ACPICA tools for the development and debug of ACPI tables
 
 License:        GPLv2
@@ -259,6 +259,9 @@ fi
 
 
 %changelog
+* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 20220331-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 20220331-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 

From 237083a28a076da87278e92ea4dd3ba16db4c407 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 19 Jul 2023 12:52:11 +0000
Subject: [PATCH 71/82] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 acpica-tools.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/acpica-tools.spec b/acpica-tools.spec
index 7632445..9ea9928 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -1,6 +1,6 @@
 Name:           acpica-tools
 Version:        20220331
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        ACPICA tools for the development and debug of ACPI tables
 
 License:        GPLv2
@@ -259,6 +259,9 @@ fi
 
 
 %changelog
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 20220331-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 20220331-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 

From 9e790bf25dfe26fd88538eb73ced12d1daf29f3a Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 19 Jan 2024 12:06:33 +0000
Subject: [PATCH 72/82] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 acpica-tools.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/acpica-tools.spec b/acpica-tools.spec
index 9ea9928..38d23c0 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -1,6 +1,6 @@
 Name:           acpica-tools
 Version:        20220331
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        ACPICA tools for the development and debug of ACPI tables
 
 License:        GPLv2
@@ -259,6 +259,9 @@ fi
 
 
 %changelog
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 20220331-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 20220331-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 

From 332bf9f7bad356f5d4e89aafbc9f766e77a3c53b Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Mon, 22 Jan 2024 22:37:29 +0000
Subject: [PATCH 73/82] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 acpica-tools.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/acpica-tools.spec b/acpica-tools.spec
index 38d23c0..4add6f8 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -1,6 +1,6 @@
 Name:           acpica-tools
 Version:        20220331
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        ACPICA tools for the development and debug of ACPI tables
 
 License:        GPLv2
@@ -259,6 +259,9 @@ fi
 
 
 %changelog
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 20220331-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 20220331-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From 0b430889a9c2769741b356b88a9674ce54795fa9 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 17 Jul 2024 16:33:43 +0000
Subject: [PATCH 74/82] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

---
 acpica-tools.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/acpica-tools.spec b/acpica-tools.spec
index 4add6f8..0563412 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -1,6 +1,6 @@
 Name:           acpica-tools
 Version:        20220331
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        ACPICA tools for the development and debug of ACPI tables
 
 License:        GPLv2
@@ -259,6 +259,9 @@ fi
 
 
 %changelog
+* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 20220331-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
 * Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 20220331-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From 4617be5167159c6bfc5a67d3e1311da8250d8404 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20Such=C3=BD?= <msuchy@redhat.com>
Date: Mon, 29 Jul 2024 10:10:03 +0200
Subject: [PATCH 75/82] convert GPLv2 license to SPDX

This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4
---
 acpica-tools.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/acpica-tools.spec b/acpica-tools.spec
index 0563412..d63e30e 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -1,9 +1,10 @@
 Name:           acpica-tools
 Version:        20220331
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        ACPICA tools for the development and debug of ACPI tables
 
-License:        GPLv2
+# Automatically converted from old format: GPLv2 - review is highly recommended.
+License:        GPL-2.0-only
 URL:            https://www.acpica.org/
 
 ExcludeArch:	i686 armv7hl
@@ -259,6 +260,9 @@ fi
 
 
 %changelog
+* Mon Jul 29 2024 Miroslav Suchý <msuchy@redhat.com> - 20220331-10
+- convert license to SPDX
+
 * Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 20220331-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
 

From bada08a9e12545c2332d6df5f31d31cf81d97606 Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@ahs3.net>
Date: Mon, 12 Aug 2024 15:16:04 -0600
Subject: [PATCH 76/82] Update to 20240322 and remove support for big-endian
 architectures

As s390x was the only one remaining, it has now been excluded.  This
was best done with an update of the source tree to match upstream.
This is turn caused additional patch updates.

With s390x gone, all of the big-endian patches can be removed,
simplifying things enormously.  This is the biggest change.

Several other patches that are no longer needed due to changes
in Fedora builds (ld flags, for example), or that are no longer needed
(such as armv7) have also been removed.  Further cleanup likely to
follow.

Signed-off-by: Al Stone <ahs3@ahs3.net>
---
 .gitignore                                    |    6 +
 ...nfrastructure-for-big-endian-support.patch |  530 ---
 ...lity-functions-to-be-endian-agnostic.patch |  200 --
 ...able-header-content-in-human-readabl.patch |   45 -
 ...able-support-for-big-endian-machines.patch |   78 -
 ...n-ness-problem-when-converting-ASL-t.patch |   41 -
 ...e-ACPI_COPY_NAMSEG-in-GPE-name-check.patch |   32 -
 ...ing-Unicode-properly-when-big-endian.patch |   53 -
 ...-MADT-aka-APIC-in-a-big-endian-world.patch |   32 -
 ...ort-ASF-tables-in-a-big-endian-world.patch |   55 -
 ...rt-CPEP-tables-in-a-big-endian-world.patch |   32 -
 ...ort-DBG2-table-in-a-big-endian-world.patch |  256 --
 0012-Support-DMAR-in-a-big-endian-world.patch |  171 -
 0013-Support-DRTM-in-a-big-endian-world.patch |  112 -
 0014-Support-EINJ-in-a-big-endian-world.patch |   32 -
 0015-Support-ERST-in-a-big-endian-world.patch |   32 -
 ...-FADT-aka-FACP-in-a-big-endian-world.patch |  189 -
 ...ort-most-FPDTs-in-a-big-endian-world.patch |   85 -
 0018-Support-GTDT-in-a-big-endian-world.patch |   69 -
 0019-Support-HEST-in-a-big-endian-world.patch |   75 -
 ...t-RSDT-RSD-PTR-in-a-big-endian-world.patch |   37 -
 0021-Support-XSDT-in-a-big-endian-world.patch |   38 -
 0022-Support-SRAT-in-a-big-endian-world.patch |   52 -
 0023-Support-SLIT-in-a-big-endian-world.patch |   61 -
 0024-Support-MSCT-in-a-big-endian-world.patch |   43 -
 0025-Support-MPST-in-a-big-endian-world.patch |  152 -
 0026-Support-NFIT-in-a-big-endian-world.patch |  227 --
 0027-Support-SDEV-in-a-big-endian-world.patch |  206 --
 0028-Support-HMAT-in-a-big-endian-world.patch |  278 --
 0029-Support-PDTT-in-a-big-endian-world.patch |   43 -
 0030-Support-PPTT-in-a-big-endian-world.patch |  105 -
 0031-Support-PCCT-in-a-big-endian-world.patch |   54 -
 0032-Support-WDAT-in-a-big-endian-world.patch |   43 -
 0033-Support-TCPA-in-a-big-endian-world.patch |   76 -
 0034-Support-STAO-in-a-big-endian-world.patch |   40 -
 ...-SLIC-and-MSDM-in-a-big-endian-world.patch |   33 -
 0036-Support-MCFG-in-a-big-endian-world.patch |   50 -
 0037-Support-LPIT-in-a-big-endian-world.patch |   46 -
 0038-Support-PMTT-in-a-big-endian-world.patch |   85 -
 0039-Support-TPM2-in-a-big-endian-world.patch |  119 -
 0040-Support-S3PT-in-a-big-endian-world.patch |   96 -
 0041-Support-IORT-in-a-big-endian-world.patch |  414 ---
 0042-Support-IVRS-in-a-big-endian-world.patch |  138 -
 ...port-DSDT-SSDT-in-a-big-endian-world.patch | 3171 -----------------
 ...rt-for-WPBT-in-big-endian-needs-more.patch |   23 -
 ...T-fixed-use-of-optional-ResourceInfo.patch |  213 --
 0046-Support-PHAT-in-a-big-endian-world.patch |  180 -
 0047-Support-PRMT-in-a-big-endian-world.patch |   51 -
 0048-Support-RGRT-in-a-big-endian-world.patch |   35 -
 0049-Support-SVKL-in-a-big-endian-world.patch |   42 -
 OPT_LDFLAGS.patch                             |    6 +-
 acpica-tools.spec                             |   91 +-
 arm7hl.patch                                  |   21 -
 badcode.asl.result                            |   15 +-
 converterSample.asl.result                    |   19 +-
 cve-2017-13693.patch                          |    6 +-
 cve-2017-13694.patch                          |    6 +-
 cve-2017-13695.patch                          |    6 +-
 dangling-ptr.patch                            |   11 +-
 dbtest.patch                                  |    6 +-
 f23-harden.patch                              |   71 -
 fix-version.patch                             |   50 +
 grammar.asl.result                            |   21 +-
 run-misc-tests.sh                             |    2 +-
 sources                                       |    4 +-
 str-trunc-warn.patch                          |   18 +-
 template.patch                                |    6 +-
 ull-32bit.patch                               |   16 -
 unaligned.patch                               |   12 +-
 uuid-len.patch                                |    9 +-
 70 files changed, 178 insertions(+), 8494 deletions(-)
 delete mode 100644 0001-Add-in-basic-infrastructure-for-big-endian-support.patch
 delete mode 100644 0002-Modify-utility-functions-to-be-endian-agnostic.patch
 delete mode 100644 0003-Always-display-table-header-content-in-human-readabl.patch
 delete mode 100644 0004-Re-enable-support-for-big-endian-machines.patch
 delete mode 100644 0005-Correct-an-endian-ness-problem-when-converting-ASL-t.patch
 delete mode 100644 0006-Use-more-reliable-ACPI_COPY_NAMSEG-in-GPE-name-check.patch
 delete mode 100644 0007-Handle-dumping-Unicode-properly-when-big-endian.patch
 delete mode 100644 0008-Support-MADT-aka-APIC-in-a-big-endian-world.patch
 delete mode 100644 0009-Support-ASF-tables-in-a-big-endian-world.patch
 delete mode 100644 0010-Support-CPEP-tables-in-a-big-endian-world.patch
 delete mode 100644 0011-Support-DBG2-table-in-a-big-endian-world.patch
 delete mode 100644 0012-Support-DMAR-in-a-big-endian-world.patch
 delete mode 100644 0013-Support-DRTM-in-a-big-endian-world.patch
 delete mode 100644 0014-Support-EINJ-in-a-big-endian-world.patch
 delete mode 100644 0015-Support-ERST-in-a-big-endian-world.patch
 delete mode 100644 0016-Support-FADT-aka-FACP-in-a-big-endian-world.patch
 delete mode 100644 0017-Support-most-FPDTs-in-a-big-endian-world.patch
 delete mode 100644 0018-Support-GTDT-in-a-big-endian-world.patch
 delete mode 100644 0019-Support-HEST-in-a-big-endian-world.patch
 delete mode 100644 0020-Support-RSDT-RSD-PTR-in-a-big-endian-world.patch
 delete mode 100644 0021-Support-XSDT-in-a-big-endian-world.patch
 delete mode 100644 0022-Support-SRAT-in-a-big-endian-world.patch
 delete mode 100644 0023-Support-SLIT-in-a-big-endian-world.patch
 delete mode 100644 0024-Support-MSCT-in-a-big-endian-world.patch
 delete mode 100644 0025-Support-MPST-in-a-big-endian-world.patch
 delete mode 100644 0026-Support-NFIT-in-a-big-endian-world.patch
 delete mode 100644 0027-Support-SDEV-in-a-big-endian-world.patch
 delete mode 100644 0028-Support-HMAT-in-a-big-endian-world.patch
 delete mode 100644 0029-Support-PDTT-in-a-big-endian-world.patch
 delete mode 100644 0030-Support-PPTT-in-a-big-endian-world.patch
 delete mode 100644 0031-Support-PCCT-in-a-big-endian-world.patch
 delete mode 100644 0032-Support-WDAT-in-a-big-endian-world.patch
 delete mode 100644 0033-Support-TCPA-in-a-big-endian-world.patch
 delete mode 100644 0034-Support-STAO-in-a-big-endian-world.patch
 delete mode 100644 0035-Support-SLIC-and-MSDM-in-a-big-endian-world.patch
 delete mode 100644 0036-Support-MCFG-in-a-big-endian-world.patch
 delete mode 100644 0037-Support-LPIT-in-a-big-endian-world.patch
 delete mode 100644 0038-Support-PMTT-in-a-big-endian-world.patch
 delete mode 100644 0039-Support-TPM2-in-a-big-endian-world.patch
 delete mode 100644 0040-Support-S3PT-in-a-big-endian-world.patch
 delete mode 100644 0041-Support-IORT-in-a-big-endian-world.patch
 delete mode 100644 0042-Support-IVRS-in-a-big-endian-world.patch
 delete mode 100644 0043-Support-DSDT-SSDT-in-a-big-endian-world.patch
 delete mode 100644 0044-Initial-support-for-WPBT-in-big-endian-needs-more.patch
 delete mode 100644 0045-CSRT-fixed-use-of-optional-ResourceInfo.patch
 delete mode 100644 0046-Support-PHAT-in-a-big-endian-world.patch
 delete mode 100644 0047-Support-PRMT-in-a-big-endian-world.patch
 delete mode 100644 0048-Support-RGRT-in-a-big-endian-world.patch
 delete mode 100644 0049-Support-SVKL-in-a-big-endian-world.patch
 delete mode 100644 arm7hl.patch
 delete mode 100644 f23-harden.patch
 create mode 100644 fix-version.patch
 delete mode 100644 ull-32bit.patch

diff --git a/.gitignore b/.gitignore
index 8d6a67f..b895859 100644
--- a/.gitignore
+++ b/.gitignore
@@ -156,3 +156,9 @@ series
 /acpitests-unix-20211217.tar.gz
 /acpica-unix2-20220331.tar.gz
 /acpitests-unix-20220331.tar.gz
+/acpica-unix2-20230331.tar.gz
+/acpitests-unix-20230331.tar.gz
+/acpica-unix2-20240321.tar.gz
+/acpitests-unix-20240321.tar.gz
+/acpica-unix2-20240322.tar.gz
+/acpitests-unix-20240322.tar.gz
diff --git a/0001-Add-in-basic-infrastructure-for-big-endian-support.patch b/0001-Add-in-basic-infrastructure-for-big-endian-support.patch
deleted file mode 100644
index 4e12c34..0000000
--- a/0001-Add-in-basic-infrastructure-for-big-endian-support.patch
+++ /dev/null
@@ -1,530 +0,0 @@
-From 4594630ec2e6a33efce3047a86b08fa170b75848 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Thu, 15 Oct 2020 11:53:33 -0600
-Subject: [PATCH 01/45] Add in basic infrastructure for big-endian support
-
-This adds in some basic functions -- AcpiUtReadUint32(), for example,
-to read a UINT32 value in little-endian form and return it in host-native
-format -- along with AcpiUtWriteUint() that writes out an integer in
-host-native format as a little-endian value.
-
-But, to do that, I'm adding the functions in a new file: utendian.c.  So,
-the header files need fixing, and the makefiles need to be sure to compile
-the new code.  Further, UtIsBigEndianMachine() needed to be moved out of
-compiler/aslutils.c so it could be used in the new functions and avoid
-having to do some conditional compilation depending on endian-ness.
-
-However, this sets things up for the future, where endian-aware code can
-be added as the need is uncovered.  For now, these functions cover all of
-the cases I know about.
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- generate/unix/acpibin/Makefile         |   1 +
- generate/unix/acpidump/Makefile        |   1 +
- generate/unix/acpiexamples/Makefile    |   1 +
- generate/unix/acpiexec/Makefile        |   1 +
- generate/unix/acpihelp/Makefile        |   1 +
- generate/unix/iasl/Makefile            |   1 +
- source/compiler/aslcompiler.h          |   4 -
- source/compiler/aslutils.c             |  27 ---
- source/components/utilities/utendian.c | 236 +++++++++++++++++++++++++
- source/include/acmacros.h              |  56 ------
- source/include/acutils.h               |  32 ++++
- source/include/platform/aclinux.h      |   1 +
- 12 files changed, 275 insertions(+), 87 deletions(-)
- create mode 100644 source/components/utilities/utendian.c
-
-Index: acpica-unix2-20220331/generate/unix/acpibin/Makefile
-===================================================================
---- acpica-unix2-20220331.orig/generate/unix/acpibin/Makefile
-+++ acpica-unix2-20220331/generate/unix/acpibin/Makefile
-@@ -37,6 +37,7 @@ OBJECTS = \
- 	$(OBJDIR)/utcache.o\
- 	$(OBJDIR)/utdebug.o\
- 	$(OBJDIR)/utdecode.o\
-+	$(OBJDIR)/utendian.o\
- 	$(OBJDIR)/utexcep.o\
- 	$(OBJDIR)/utglobal.o\
- 	$(OBJDIR)/utlock.o\
-Index: acpica-unix2-20220331/generate/unix/acpidump/Makefile
-===================================================================
---- acpica-unix2-20220331.orig/generate/unix/acpidump/Makefile
-+++ acpica-unix2-20220331/generate/unix/acpidump/Makefile
-@@ -36,6 +36,7 @@ OBJECTS = \
- 	$(OBJDIR)/osunixdir.o\
- 	$(OBJDIR)/osunixmap.o\
- 	$(OBJDIR)/osunixxf.o\
-+	$(OBJDIR)/utendian.o\
- 	$(OBJDIR)/tbprint.o\
- 	$(OBJDIR)/tbxfroot.o\
- 	$(OBJDIR)/utascii.o\
-Index: acpica-unix2-20220331/generate/unix/acpiexamples/Makefile
-===================================================================
---- acpica-unix2-20220331.orig/generate/unix/acpiexamples/Makefile
-+++ acpica-unix2-20220331/generate/unix/acpiexamples/Makefile
-@@ -139,6 +139,7 @@ OBJECTS = \
- 	$(OBJDIR)/utdebug.o\
- 	$(OBJDIR)/utdecode.o\
- 	$(OBJDIR)/utdelete.o\
-+	$(OBJDIR)/utendian.o\
- 	$(OBJDIR)/uterror.o\
- 	$(OBJDIR)/uteval.o\
- 	$(OBJDIR)/utexcep.o\
-Index: acpica-unix2-20220331/generate/unix/acpiexec/Makefile
-===================================================================
---- acpica-unix2-20220331.orig/generate/unix/acpiexec/Makefile
-+++ acpica-unix2-20220331/generate/unix/acpiexec/Makefile
-@@ -214,6 +214,7 @@ OBJECTS = \
- 	$(OBJDIR)/utdebug.o\
- 	$(OBJDIR)/utdecode.o\
- 	$(OBJDIR)/utdelete.o\
-+	$(OBJDIR)/utendian.o\
- 	$(OBJDIR)/uterror.o\
- 	$(OBJDIR)/uteval.o\
- 	$(OBJDIR)/utexcep.o\
-Index: acpica-unix2-20220331/generate/unix/acpihelp/Makefile
-===================================================================
---- acpica-unix2-20220331.orig/generate/unix/acpihelp/Makefile
-+++ acpica-unix2-20220331/generate/unix/acpihelp/Makefile
-@@ -45,6 +45,7 @@ OBJECTS = \
- 	$(OBJDIR)/getopt.o\
- 	$(OBJDIR)/osunixxf.o\
- 	$(OBJDIR)/utdebug.o\
-+	$(OBJDIR)/utendian.o\
- 	$(OBJDIR)/utexcep.o\
- 	$(OBJDIR)/utglobal.o\
- 	$(OBJDIR)/uthex.o\
-Index: acpica-unix2-20220331/generate/unix/iasl/Makefile
-===================================================================
---- acpica-unix2-20220331.orig/generate/unix/iasl/Makefile
-+++ acpica-unix2-20220331/generate/unix/iasl/Makefile
-@@ -225,6 +225,7 @@ OBJECTS = \
- 	$(OBJDIR)/utdebug.o\
- 	$(OBJDIR)/utdecode.o\
- 	$(OBJDIR)/utdelete.o\
-+	$(OBJDIR)/utendian.o\
- 	$(OBJDIR)/uterror.o\
- 	$(OBJDIR)/utexcep.o\
- 	$(OBJDIR)/utglobal.o\
-Index: acpica-unix2-20220331/source/compiler/aslcompiler.h
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/aslcompiler.h
-+++ acpica-unix2-20220331/source/compiler/aslcompiler.h
-@@ -1120,10 +1120,6 @@ BOOLEAN
- UtIsIdInteger (
-     UINT8                   *Target);
- 
--UINT8
--UtIsBigEndianMachine (
--    void);
--
- BOOLEAN
- UtQueryForOverwrite (
-     char                    *Pathname);
-Index: acpica-unix2-20220331/source/compiler/aslutils.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/aslutils.c
-+++ acpica-unix2-20220331/source/compiler/aslutils.c
-@@ -73,33 +73,6 @@ UtDisplayErrorSummary (
- 
- /*******************************************************************************
-  *
-- * FUNCTION:    UtIsBigEndianMachine
-- *
-- * PARAMETERS:  None
-- *
-- * RETURN:      TRUE if machine is big endian
-- *              FALSE if machine is little endian
-- *
-- * DESCRIPTION: Detect whether machine is little endian or big endian.
-- *
-- ******************************************************************************/
--
--UINT8
--UtIsBigEndianMachine (
--    void)
--{
--    union {
--        UINT32              Integer;
--        UINT8               Bytes[4];
--    } Overlay =                 {0xFF000000};
--
--
--    return (Overlay.Bytes[0]); /* Returns 0xFF (TRUE) for big endian */
--}
--
--
--/*******************************************************************************
-- *
-  * FUNCTION:    UtIsIdInteger
-  *
-  * PARAMETERS:  Pointer to an ACPI ID (HID, CID) string
-Index: acpica-unix2-20220331/source/components/utilities/utendian.c
-===================================================================
---- /dev/null
-+++ acpica-unix2-20220331/source/components/utilities/utendian.c
-@@ -0,0 +1,236 @@
-+/******************************************************************************
-+ *
-+ * Module Name: utendian -- byte swapping support for other-endianness
-+ *
-+ *****************************************************************************/
-+
-+/*****************************************************************************
-+ *
-+ * Copyright (c) 2020, Al Stone <ahs3@redhat.com>
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions, and the following disclaimer,
-+ *    without modification.
-+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
-+ *    substantially similar to the "NO WARRANTY" disclaimer below
-+ *    ("Disclaimer") and any redistribution must be conditioned upon
-+ *    including a substantially similar Disclaimer requirement for further
-+ *    binary redistribution.
-+ * 3. Neither the names of the above-listed copyright holders nor the names
-+ *    of any contributors may be used to endorse or promote products derived
-+ *    from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ * Alternatively, you may choose to be licensed under the terms of the
-+ * GNU General Public License ("GPL") version 2 as published by the Free
-+ * Software Foundation.
-+ *
-+ *****************************************************************************/
-+
-+#include "acpi.h"
-+#include "accommon.h"
-+
-+#define _COMPONENT          ACPI_COMPILER
-+        ACPI_MODULE_NAME    ("utendian")
-+
-+/*
-+ * Endianness support functions.
-+ *
-+ * Ultimately, everything in ACPI tables or AML must be in little-endian
-+ * format.  However, we sometimes find it necessary to run on a big-endian
-+ * machine and create or read those little-endian values.  This is a small
-+ * libary of functions to make that easier, and more visible.
-+ *
-+ */
-+
-+/*******************************************************************************
-+ *
-+ * FUNCTION:    UtIsBigEndianMachine
-+ *
-+ * PARAMETERS:  None
-+ *
-+ * RETURN:      TRUE if machine is big endian
-+ *              FALSE if machine is little endian
-+ *
-+ * DESCRIPTION: Detect whether machine is little endian or big endian.
-+ *
-+ ******************************************************************************/
-+
-+UINT8
-+UtIsBigEndianMachine (
-+    void)
-+{
-+    union {
-+        UINT32              Integer;
-+        UINT8               Bytes[4];
-+    } Overlay =                 {0xFF000000};
-+
-+
-+    return (Overlay.Bytes[0]); /* Returns 0xFF (TRUE) for big endian */
-+}
-+
-+
-+/*******************************************************************************
-+ *
-+ * FUNCTION:    AcpiUtReadUint16
-+ *
-+ * PARAMETERS:  Src         - location containing the little-endian
-+ *                                    value
-+ *
-+ * RETURN:      UINT16 value in host-native form
-+ *
-+ * DESCRIPTION: Read a UINT16 little-endian value from a given location
-+ *              and return it in host-native form
-+ *
-+ ******************************************************************************/
-+
-+UINT16
-+AcpiUtReadUint16 (
-+    void                    *SrcPtr)
-+{
-+    UINT16                  Result = 0;
-+    UINT8                   *Dst = (UINT8 *) &Result;
-+    UINT8                   *Src = (UINT8 *) SrcPtr;
-+
-+    if (!UtIsBigEndianMachine())
-+    {
-+        return (*(UINT16 *) SrcPtr);
-+    }
-+
-+    Dst[0] = Src[1];
-+    Dst[1] = Src[0];
-+
-+    return (Result);
-+}
-+
-+/*******************************************************************************
-+ *
-+ * FUNCTION:    AcpiUtReadUint32
-+ *
-+ * PARAMETERS:  Src         - location containing the little-endian
-+ *                                    value
-+ *
-+ * RETURN:      UINT32 value in host-native form
-+ *
-+ * DESCRIPTION: Read a UINT32 little-endian value from a given location
-+ *              and return it in host-native form
-+ *
-+ ******************************************************************************/
-+
-+UINT32
-+AcpiUtReadUint32 (
-+    void                    *SrcPtr)
-+{
-+    UINT32                  Result = 0;
-+    UINT8                   *Dst = (UINT8 *) &Result;
-+    UINT8                   *Src = (UINT8 *) SrcPtr;
-+
-+    if (!UtIsBigEndianMachine())
-+    {
-+        return (*(UINT32 *) SrcPtr);
-+    }
-+
-+    Dst[0] = Src[3];
-+    Dst[1] = Src[2];
-+    Dst[2] = Src[1];
-+    Dst[3] = Src[0];
-+
-+    return (Result);
-+}
-+
-+/*******************************************************************************
-+ *
-+ * FUNCTION:    AcpiUtReadUint64
-+ *
-+ * PARAMETERS:  Src         - location containing the little-endian
-+ *                                    value
-+ *
-+ * RETURN:      UINT64 value in host-native form
-+ *
-+ * DESCRIPTION: Read a UINT64 little-endian value from a given location
-+ *              and return it in host-native form
-+ *
-+ ******************************************************************************/
-+
-+UINT64
-+AcpiUtReadUint64 (
-+    void                    *SrcPtr)
-+{
-+    UINT64                  Result = 0;
-+    UINT8                   *Dst = (UINT8 *) &Result;
-+    UINT8                   *Src = (UINT8 *) SrcPtr;
-+
-+    if (!UtIsBigEndianMachine())
-+    {
-+        return (*(UINT64 *) SrcPtr);
-+    }
-+
-+    Dst[0] = Src[7];
-+    Dst[1] = Src[6];
-+    Dst[2] = Src[5];
-+    Dst[3] = Src[4];
-+    Dst[4] = Src[3];
-+    Dst[5] = Src[2];
-+    Dst[6] = Src[1];
-+    Dst[7] = Src[0];
-+
-+    return (Result);
-+}
-+
-+/*******************************************************************************
-+ *
-+ * FUNCTION:    AcpiUtWriteUint
-+ *
-+ * PARAMETERS:  DstPtr      - where to place the retrieved value
-+ *              DstLength   - space in bytes for this int type
-+ *              SrcPtr      - where the little-endian value lives
-+ *              SrcLength   - space in bytes for this int type
-+ *
-+ * RETURN:      None.
-+ *
-+ * DESCRIPTION: Write a host-native integer value of the given size, and
-+ *              store it in the location specified in little-endian form.
-+ *              Given the amount of integer type casting done, this general
-+ *              version seems the most useful (vs 32->32, 32->16, 16->32,
-+ *              ad infinitum)
-+ *
-+ ******************************************************************************/
-+
-+void
-+AcpiUtWriteUint (
-+    void                    *DstPtr,
-+    int                     DstLength,
-+    const void              *SrcPtr,
-+    const int               SrcLength)
-+{
-+    UINT8                   *Dst = (UINT8 *) DstPtr;
-+    UINT8                   *Src = (UINT8 *) SrcPtr;
-+    int                      Length;
-+    int                      ii;
-+
-+    if (!UtIsBigEndianMachine())
-+    {
-+        Length = SrcLength > DstLength ? DstLength : SrcLength;
-+        memcpy (Dst, Src, Length);
-+	return;
-+    }
-+
-+    Length = SrcLength >= DstLength ? DstLength : SrcLength;
-+    for (ii = 0; ii < Length; ii++)
-+        Dst[ii] = Src[SrcLength - ii - 1];
-+
-+}
-Index: acpica-unix2-20220331/source/include/acmacros.h
-===================================================================
---- acpica-unix2-20220331.orig/source/include/acmacros.h
-+++ acpica-unix2-20220331/source/include/acmacros.h
-@@ -76,61 +76,6 @@
-  * If the hardware supports the transfer of unaligned data, just do the store.
-  * Otherwise, we have to move one byte at a time.
-  */
--#ifdef ACPI_BIG_ENDIAN
--/*
-- * Macros for big-endian machines
-- */
--
--/* These macros reverse the bytes during the move, converting little-endian to big endian */
--
--                                                     /* Big Endian      <==        Little Endian */
--                                                     /*  Hi...Lo                     Lo...Hi     */
--/* 16-bit source, 16/32/64 destination */
--
--#define ACPI_MOVE_16_TO_16(d, s)        {((  UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[1];\
--                                         ((  UINT8 *)(void *)(d))[1] = ((UINT8 *)(void *)(s))[0];}
--
--#define ACPI_MOVE_16_TO_32(d, s)        {(*(UINT32 *)(void *)(d))=0;\
--                                           ((UINT8 *)(void *)(d))[2] = ((UINT8 *)(void *)(s))[1];\
--                                           ((UINT8 *)(void *)(d))[3] = ((UINT8 *)(void *)(s))[0];}
--
--#define ACPI_MOVE_16_TO_64(d, s)        {(*(UINT64 *)(void *)(d))=0;\
--                                           ((UINT8 *)(void *)(d))[6] = ((UINT8 *)(void *)(s))[1];\
--                                           ((UINT8 *)(void *)(d))[7] = ((UINT8 *)(void *)(s))[0];}
--
--/* 32-bit source, 16/32/64 destination */
--
--#define ACPI_MOVE_32_TO_16(d, s)        ACPI_MOVE_16_TO_16(d, s)    /* Truncate to 16 */
--
--#define ACPI_MOVE_32_TO_32(d, s)        {((  UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[3];\
--                                         ((  UINT8 *)(void *)(d))[1] = ((UINT8 *)(void *)(s))[2];\
--                                         ((  UINT8 *)(void *)(d))[2] = ((UINT8 *)(void *)(s))[1];\
--                                         ((  UINT8 *)(void *)(d))[3] = ((UINT8 *)(void *)(s))[0];}
--
--#define ACPI_MOVE_32_TO_64(d, s)        {(*(UINT64 *)(void *)(d))=0;\
--                                           ((UINT8 *)(void *)(d))[4] = ((UINT8 *)(void *)(s))[3];\
--                                           ((UINT8 *)(void *)(d))[5] = ((UINT8 *)(void *)(s))[2];\
--                                           ((UINT8 *)(void *)(d))[6] = ((UINT8 *)(void *)(s))[1];\
--                                           ((UINT8 *)(void *)(d))[7] = ((UINT8 *)(void *)(s))[0];}
--
--/* 64-bit source, 16/32/64 destination */
--
--#define ACPI_MOVE_64_TO_16(d, s)        ACPI_MOVE_16_TO_16(d, s)    /* Truncate to 16 */
--
--#define ACPI_MOVE_64_TO_32(d, s)        ACPI_MOVE_32_TO_32(d, s)    /* Truncate to 32 */
--
--#define ACPI_MOVE_64_TO_64(d, s)        {((  UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[7];\
--                                         ((  UINT8 *)(void *)(d))[1] = ((UINT8 *)(void *)(s))[6];\
--                                         ((  UINT8 *)(void *)(d))[2] = ((UINT8 *)(void *)(s))[5];\
--                                         ((  UINT8 *)(void *)(d))[3] = ((UINT8 *)(void *)(s))[4];\
--                                         ((  UINT8 *)(void *)(d))[4] = ((UINT8 *)(void *)(s))[3];\
--                                         ((  UINT8 *)(void *)(d))[5] = ((UINT8 *)(void *)(s))[2];\
--                                         ((  UINT8 *)(void *)(d))[6] = ((UINT8 *)(void *)(s))[1];\
--                                         ((  UINT8 *)(void *)(d))[7] = ((UINT8 *)(void *)(s))[0];}
--#else
--/*
-- * Macros for little-endian machines
-- */
- 
- #ifndef ACPI_MISALIGNMENT_NOT_SUPPORTED
- 
-@@ -193,7 +138,6 @@
-                                          ((  UINT8 *)(void *)(d))[6] = ((UINT8 *)(void *)(s))[6];\
-                                          ((  UINT8 *)(void *)(d))[7] = ((UINT8 *)(void *)(s))[7];}
- #endif
--#endif
- 
- 
- /*
-Index: acpica-unix2-20220331/source/include/acutils.h
-===================================================================
---- acpica-unix2-20220331.orig/source/include/acutils.h
-+++ acpica-unix2-20220331/source/include/acutils.h
-@@ -1167,4 +1167,36 @@ AcpiUtConvertUuidToString (
-     char                    *OutString);
- #endif
- 
-+
-+/*
-+ * utendian -- byte-swapping for big-endian support
-+ */
-+
-+UINT8
-+UtIsBigEndianMachine (
-+    void);
-+
-+#if defined(ACPI_ASL_COMPILER) || defined(ACPI_EXEC_APP) || \
-+    defined(ACPI_HELP_APP)     || defined(ACPI_DUMP_APP) || \
-+    defined(ACPI_EXAMPLE_APP)  || defined(ACPI_BIN_APP)
-+UINT32
-+AcpiUtReadUint32 (
-+    void                    *SrcPtr);
-+
-+UINT16
-+AcpiUtReadUint16 (
-+    void                    *SrcPtr);
-+
-+UINT64
-+AcpiUtReadUint64 (
-+    void                    *SrcPtr);
-+
-+void  
-+AcpiUtWriteUint (
-+    void                    *DstPtr,
-+    int                     DstLength,
-+    const void              *SrcPtr,
-+    const int               SrcLength);
-+#endif
-+
- #endif /* _ACUTILS_H */
-Index: acpica-unix2-20220331/source/include/platform/aclinux.h
-===================================================================
---- acpica-unix2-20220331.orig/source/include/platform/aclinux.h
-+++ acpica-unix2-20220331/source/include/platform/aclinux.h
-@@ -203,6 +203,7 @@
- 
- #ifdef ACPI_USE_STANDARD_HEADERS
- #include <unistd.h>
-+#include <endian.h>
- #endif
- 
- /* Define/disable kernel-specific declarators */
diff --git a/0002-Modify-utility-functions-to-be-endian-agnostic.patch b/0002-Modify-utility-functions-to-be-endian-agnostic.patch
deleted file mode 100644
index a328096..0000000
--- a/0002-Modify-utility-functions-to-be-endian-agnostic.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-From 51b0d06c0a6c4d4e19432ebf930299855c8fcf23 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Fri, 18 Sep 2020 15:14:30 -0600
-Subject: [PATCH 02/45] Modify utility functions to be endian-agnostic
-
-All of the modifications here use the big-endian code previously added
-(see utendian.c) to make themselves endian-agnostic; i.e., that the code
-does not need to change further to work on both big- and little-endian
-machines.
-
-These particular files were changed to handle the reading and writing
-of files (the length is often embedded in the binary stream), and to
-handle the reading and writing of integer values.  The common cases are
-to "read" a 32-bit unsigned int in little-endian format, but convert it
-to host-native, and to write a byte, word, double word or quad word value
-as little-endian, regardless of host-native format.
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/common/acfileio.c           | 16 ++++++++++------
- source/common/dmtable.c            |  8 ++++----
- source/compiler/dtfield.c          |  2 +-
- source/compiler/dtsubtable.c       |  4 ++--
- source/components/tables/tbprint.c | 13 +++++++++----
- 5 files changed, 26 insertions(+), 17 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/acfileio.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/acfileio.c
-+++ acpica-unix2-20220331/source/common/acfileio.c
-@@ -280,6 +280,7 @@ AcGetOneTableFromFile (
-     ACPI_TABLE_HEADER       *Table;
-     INT32                   Count;
-     long                    TableOffset;
-+    UINT32                  Length;
- 
- 
-     *ReturnTable = NULL;
-@@ -319,7 +320,8 @@ AcGetOneTableFromFile (
- 
-     /* Allocate a buffer for the entire table */
- 
--    Table = AcpiOsAllocate ((ACPI_SIZE) TableHeader.Length);
-+    Length = AcpiUtReadUint32 (&TableHeader.Length);
-+    Table = AcpiOsAllocate ((ACPI_SIZE) Length);
-     if (!Table)
-     {
-         return (AE_NO_MEMORY);
-@@ -329,13 +331,13 @@ AcGetOneTableFromFile (
- 
-     fseek (File, TableOffset, SEEK_SET);
- 
--    Count = fread (Table, 1, TableHeader.Length, File);
-+    Count = fread (Table, 1, Length, File);
- 
-     /*
-      * Checks for data table headers happen later in the execution. Only verify
-      * for Aml tables at this point in the code.
-      */
--    if (GetOnlyAmlTables && Count != (INT32) TableHeader.Length)
-+    if (GetOnlyAmlTables && Count != (INT32) Length)
-     {
-         Status = AE_ERROR;
-         goto ErrorExit;
-@@ -343,7 +345,7 @@ AcGetOneTableFromFile (
- 
-     /* Validate the checksum (just issue a warning) */
- 
--    Status = AcpiTbVerifyChecksum (Table, TableHeader.Length);
-+    Status = AcpiTbVerifyChecksum (Table, Length);
-     if (ACPI_FAILURE (Status))
-     {
-         Status = AcCheckTextModeCorruption (Table);
-@@ -436,6 +438,7 @@ AcValidateTableHeader (
-     long                    OriginalOffset;
-     UINT32                  FileSize;
-     UINT32                  i;
-+    UINT32                  Length;
- 
- 
-     ACPI_FUNCTION_TRACE (AcValidateTableHeader);
-@@ -472,11 +475,12 @@ AcValidateTableHeader (
-     /* Validate table length against bytes remaining in the file */
- 
-     FileSize = CmGetFileSize (File);
--    if (TableHeader.Length > (UINT32) (FileSize - TableOffset))
-+    Length = AcpiUtReadUint32 (&TableHeader.Length);
-+    if (Length > (UINT32) (FileSize - TableOffset))
-     {
-         fprintf (stderr, "Table [%4.4s] is too long for file - "
-             "needs: 0x%.2X, remaining in file: 0x%.2X\n",
--            TableHeader.Signature, TableHeader.Length,
-+            TableHeader.Signature, Length,
-             (UINT32) (FileSize - TableOffset));
-         return (AE_BAD_HEADER);
-     }
-Index: acpica-unix2-20220331/source/common/dmtable.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtable.c
-+++ acpica-unix2-20220331/source/common/dmtable.c
-@@ -713,7 +713,7 @@ AcpiDmDumpDataTable (
-         {
-             /* Dump the raw table data */
- 
--            Length = Table->Length;
-+            Length = AcpiUtReadUint32 (&Table->Length);
- 
-             AcpiOsPrintf ("\n/*\n%s: Length %d (0x%X)\n\n",
-                 ACPI_RAW_TABLE_DATA_HEADER, Length, Length);
-@@ -730,7 +730,7 @@ AcpiDmDumpDataTable (
-      */
-     if (ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_FACS))
-     {
--        Length = Table->Length;
-+        Length = AcpiUtReadUint32 (&Table->Length);
-         Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoFacs);
-         if (ACPI_FAILURE (Status))
-         {
-@@ -751,7 +751,7 @@ AcpiDmDumpDataTable (
-         /*
-          * All other tables must use the common ACPI table header, dump it now
-          */
--        Length = Table->Length;
-+        Length = AcpiUtReadUint32(&Table->Length);
-         Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoHeader);
-         if (ACPI_FAILURE (Status))
-         {
-@@ -1415,7 +1415,7 @@ AcpiDmDumpTable (
- 
-             AcpiOsPrintf ("%2.2X", *Target);
-             Temp8 = AcpiDmGenerateChecksum (Table,
--                ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Length,
-+                AcpiUtReadUint32 (&(ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Length)),
-                 ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Checksum);
- 
-             if (Temp8 != ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Checksum)
-Index: acpica-unix2-20220331/source/compiler/dtfield.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/dtfield.c
-+++ acpica-unix2-20220331/source/compiler/dtfield.c
-@@ -361,7 +361,7 @@ DtCompileInteger (
-         DtError (ASL_ERROR, ASL_MSG_INTEGER_SIZE, Field, AslGbl_MsgBuffer);
-     }
- 
--    memcpy (Buffer, &Value, ByteLength);
-+    AcpiUtWriteUint (Buffer, ByteLength, &Value, sizeof (UINT64));
-     return;
- }
- 
-Index: acpica-unix2-20220331/source/compiler/dtsubtable.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/dtsubtable.c
-+++ acpica-unix2-20220331/source/compiler/dtsubtable.c
-@@ -378,6 +378,6 @@ DtSetSubtableLength (
-         return;
-     }
- 
--    memcpy (Subtable->LengthField, &Subtable->TotalLength,
--        Subtable->SizeOfLengthField);
-+    AcpiUtWriteUint (Subtable->LengthField, Subtable->SizeOfLengthField,
-+                     &Subtable->TotalLength, sizeof (Subtable->TotalLength));
- }
-Index: acpica-unix2-20220331/source/components/tables/tbprint.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/tables/tbprint.c
-+++ acpica-unix2-20220331/source/components/tables/tbprint.c
-@@ -44,6 +44,8 @@
- #include "acpi.h"
- #include "accommon.h"
- #include "actables.h"
-+#include "platform/acenv.h"
-+#include "acutils.h"
- 
- #define _COMPONENT          ACPI_TABLES
-         ACPI_MODULE_NAME    ("tbprint")
-@@ -151,7 +153,7 @@ AcpiTbPrintTableHeader (
- 
-         ACPI_INFO (("%-4.4s 0x%8.8X%8.8X %06X",
-             Header->Signature, ACPI_FORMAT_UINT64 (Address),
--            Header->Length));
-+            AcpiUtReadUint32 (&Header->Length)));
-     }
-     else if (ACPI_VALIDATE_RSDP_SIG (ACPI_CAST_PTR (ACPI_TABLE_RSDP,
-         Header)->Signature))
-@@ -179,9 +181,12 @@ AcpiTbPrintTableHeader (
-             "%-4.4s 0x%8.8X%8.8X"
-             " %06X (v%.2d %-6.6s %-8.8s %08X %-4.4s %08X)",
-             LocalHeader.Signature, ACPI_FORMAT_UINT64 (Address),
--            LocalHeader.Length, LocalHeader.Revision, LocalHeader.OemId,
--            LocalHeader.OemTableId, LocalHeader.OemRevision,
--            LocalHeader.AslCompilerId, LocalHeader.AslCompilerRevision));
-+            AcpiUtReadUint32 (&LocalHeader.Length),
-+            LocalHeader.Revision, LocalHeader.OemId,
-+            LocalHeader.OemTableId,
-+            AcpiUtReadUint32 (&LocalHeader.OemRevision),
-+            LocalHeader.AslCompilerId,
-+            AcpiUtReadUint32 (&LocalHeader.AslCompilerRevision)));
-     }
- }
- 
diff --git a/0003-Always-display-table-header-content-in-human-readabl.patch b/0003-Always-display-table-header-content-in-human-readabl.patch
deleted file mode 100644
index f540ac1..0000000
--- a/0003-Always-display-table-header-content-in-human-readabl.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 62cc2f4ae212bd0fad83f643921ac216ebb9a986 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Fri, 18 Sep 2020 15:20:37 -0600
-Subject: [PATCH 03/45] Always display table header content in human-readable
- form
-
-When comparing two binary data tables, little-endian values are read
-from each table header and printed out.  Make sure they show up in a
-form that makes sense to humans.
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/tools/acpibin/abcompare.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-Index: acpica-unix2-20220331/source/tools/acpibin/abcompare.c
-===================================================================
---- acpica-unix2-20220331.orig/source/tools/acpibin/abcompare.c
-+++ acpica-unix2-20220331/source/tools/acpibin/abcompare.c
-@@ -42,6 +42,7 @@
-  */
- 
- #include "acpibin.h"
-+#include "acutils.h"
- 
- 
- ACPI_TABLE_HEADER           Header1;
-@@ -179,14 +180,14 @@ AbPrintHeadersInfo (
-     /* Display header information for both headers */
- 
-     printf ("Signature          %8.4s : %4.4s\n",    Header->Signature, Header2->Signature);
--    printf ("Length             %8.8X : %8.8X\n",    Header->Length, Header2->Length);
-+    printf ("Length             %8.8X : %8.8X\n",    AcpiUtReadUint32 (&Header->Length), AcpiUtReadUint32 (&Header2->Length));
-     printf ("Revision           %8.2X : %2.2X\n",    Header->Revision, Header2->Revision);
-     printf ("Checksum           %8.2X : %2.2X\n",    Header->Checksum, Header2->Checksum);
-     printf ("OEM ID             %8.6s : %.6s\n",     Header->OemId, Header2->OemId);
-     printf ("OEM Table ID       %8.8s : %.8s\n",     Header->OemTableId, Header2->OemTableId);
--    printf ("OEM Revision       %8.8X : %8.8X\n",    Header->OemRevision, Header2->OemRevision);
-+    printf ("OEM Revision       %8.8X : %8.8X\n",    AcpiUtReadUint32 (&Header->OemRevision), AcpiUtReadUint32 (&Header2->OemRevision));
-     printf ("ASL Compiler ID    %8.4s : %.4s\n",     Header->AslCompilerId, Header2->AslCompilerId);
--    printf ("Compiler Revision  %8.8X : %8.8X\n",    Header->AslCompilerRevision, Header2->AslCompilerRevision);
-+    printf ("Compiler Revision  %8.8X : %8.8X\n",    AcpiUtReadUint32 (&Header->AslCompilerRevision), AcpiUtReadUint32 (&Header2->AslCompilerRevision));
-     printf ("\n");
- }
- 
diff --git a/0004-Re-enable-support-for-big-endian-machines.patch b/0004-Re-enable-support-for-big-endian-machines.patch
deleted file mode 100644
index d2dc432..0000000
--- a/0004-Re-enable-support-for-big-endian-machines.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 16734feab4204d6930c1ede62e527920607daace Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Wed, 16 Sep 2020 16:27:06 -0600
-Subject: [PATCH 04/45] Re-enable support for big-endian machines
-
-First, disable the big-endian check and fail.  Then, make sure the
-namespace gets initialized properly (NB: needed even if we are only
-compiling/disassembling data tables).
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/compiler/aslmain.c             | 12 ------------
- source/components/namespace/nsutils.c |  7 +++++--
- 2 files changed, 5 insertions(+), 14 deletions(-)
-
-Index: acpica-unix2-20220331/source/compiler/aslmain.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/aslmain.c
-+++ acpica-unix2-20220331/source/compiler/aslmain.c
-@@ -101,18 +101,6 @@ main (
- 
-     signal (SIGINT, AslSignalHandler);
- 
--    /*
--     * Big-endian machines are not currently supported. ACPI tables must
--     * be little-endian, and support for big-endian machines needs to
--     * be implemented.
--     */
--    if (UtIsBigEndianMachine ())
--    {
--        fprintf (stderr,
--            "iASL is not currently supported on big-endian machines.\n");
--        return (-1);
--    }
--
-     AcpiOsInitialize ();
-     ACPI_DEBUG_INITIALIZE (); /* For debug version only */
- 
-Index: acpica-unix2-20220331/source/components/namespace/nsutils.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/namespace/nsutils.c
-+++ acpica-unix2-20220331/source/components/namespace/nsutils.c
-@@ -272,6 +272,7 @@ AcpiNsBuildInternalName (
-     const char              *ExternalName = Info->NextExternalChar;
-     char                    *Result = NULL;
-     UINT32                  i;
-+    char                    TmpSeg[ACPI_NAMESEG_SIZE+1];
- 
- 
-     ACPI_FUNCTION_TRACE (NsBuildInternalName);
-@@ -335,6 +336,7 @@ AcpiNsBuildInternalName (
- 
-     for (; NumSegments; NumSegments--)
-     {
-+        memset (TmpSeg, 0, ACPI_NAMESEG_SIZE+1);
-         for (i = 0; i < ACPI_NAMESEG_SIZE; i++)
-         {
-             if (ACPI_IS_PATH_SEPARATOR (*ExternalName) ||
-@@ -342,16 +344,17 @@ AcpiNsBuildInternalName (
-             {
-                 /* Pad the segment with underscore(s) if segment is short */
- 
--                Result[i] = '_';
-+                TmpSeg[i] = '_';
-             }
-             else
-             {
-                 /* Convert the character to uppercase and save it */
- 
--                Result[i] = (char) toupper ((int) *ExternalName);
-+                TmpSeg[i] = (char) toupper ((int) *ExternalName);
-                 ExternalName++;
-             }
-         }
-+    AcpiUtWriteUint (Result, ACPI_NAMESEG_SIZE, TmpSeg, ACPI_NAMESEG_SIZE);
- 
-         /* Now we must have a path separator, or the pathname is bad */
- 
diff --git a/0005-Correct-an-endian-ness-problem-when-converting-ASL-t.patch b/0005-Correct-an-endian-ness-problem-when-converting-ASL-t.patch
deleted file mode 100644
index e5a9dc5..0000000
--- a/0005-Correct-an-endian-ness-problem-when-converting-ASL-t.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 055fee09d8f9244b6c437ad18b98edb81a87e8bc Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Tue, 27 Oct 2020 17:50:52 -0600
-Subject: [PATCH 05/45] Correct an endian-ness problem when converting ASL to
- ASL+
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/compiler/cvparser.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-Index: acpica-unix2-20220331/source/compiler/cvparser.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/cvparser.c
-+++ acpica-unix2-20220331/source/compiler/cvparser.c
-@@ -144,6 +144,7 @@ CvInitFileTree (
-     char                    *ChildFilename = NULL;
-     UINT8                   *AmlStart;
-     UINT32                  AmlLength;
-+    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
- 
- 
-     if (!AcpiGbl_CaptureComments)
-@@ -152,7 +153,7 @@ CvInitFileTree (
-     }
- 
- 
--    AmlLength = Table->Length - sizeof (ACPI_TABLE_HEADER);
-+    AmlLength = TableLength - sizeof (ACPI_TABLE_HEADER);
-     AmlStart = ((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER));
- 
-     CvDbgPrint ("AmlLength: %x\n", AmlLength);
-@@ -162,7 +163,7 @@ CvInitFileTree (
-     AcpiGbl_FileTreeRoot = AcpiOsAcquireObject (AcpiGbl_FileCache);
- 
-     AcpiGbl_FileTreeRoot->FileStart = (char *)(AmlStart);
--    AcpiGbl_FileTreeRoot->FileEnd = (char *)(AmlStart + Table->Length);
-+    AcpiGbl_FileTreeRoot->FileEnd = (char *)(AmlStart + TableLength);
-     AcpiGbl_FileTreeRoot->Next = NULL;
-     AcpiGbl_FileTreeRoot->Parent = NULL;
-     AcpiGbl_FileTreeRoot->Filename = (char *)(AmlStart+2);
diff --git a/0006-Use-more-reliable-ACPI_COPY_NAMSEG-in-GPE-name-check.patch b/0006-Use-more-reliable-ACPI_COPY_NAMSEG-in-GPE-name-check.patch
deleted file mode 100644
index 5893e93..0000000
--- a/0006-Use-more-reliable-ACPI_COPY_NAMSEG-in-GPE-name-check.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 790c016107e98ded2d0ae579f84dd4cd3fa06587 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Tue, 29 Jun 2021 17:48:31 -0600
-Subject: [PATCH 06/45] Use more reliable ACPI_COPY_NAMSEG in GPE name checks
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/compiler/aslanalyze.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: acpica-unix2-20220331/source/compiler/aslanalyze.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/aslanalyze.c
-+++ acpica-unix2-20220331/source/compiler/aslanalyze.c
-@@ -469,7 +469,7 @@ ApCheckForGpeNameConflict (
- 
-     /* Need a null-terminated string version of NameSeg */
- 
--    ACPI_MOVE_32_TO_32 (Name, Op->Asl.NameSeg);
-+    ACPI_COPY_NAMESEG (Name, Op->Asl.NameSeg);
-     Name[ACPI_NAMESEG_SIZE] = 0;
- 
-     /*
-@@ -496,7 +496,7 @@ ApCheckForGpeNameConflict (
-      * We are now sure we have an _Lxx or _Exx.
-      * Create the target name that would cause collision (Flip E/L)
-      */
--    ACPI_MOVE_32_TO_32 (Target, Name);
-+    ACPI_COPY_NAMESEG (Target, Name);
- 
-     /* Inject opposite letter ("L" versus "E") */
- 
diff --git a/0007-Handle-dumping-Unicode-properly-when-big-endian.patch b/0007-Handle-dumping-Unicode-properly-when-big-endian.patch
deleted file mode 100644
index 70d83d6..0000000
--- a/0007-Handle-dumping-Unicode-properly-when-big-endian.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 9a4a32c597fcdfa8a3bc33230c40a18e39c3449d Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Thu, 1 Jul 2021 17:46:19 -0600
-Subject: [PATCH 07/45] Handle dumping Unicode properly when big-endian
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/common/dmtbdump.c | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump.c
-+++ acpica-unix2-20220331/source/common/dmtbdump.c
-@@ -200,6 +200,8 @@ AcpiDmDumpUnicode (
-     UINT8                   *Buffer;
-     UINT32                  Length;
-     UINT32                  i;
-+    UINT16		    Tmp16;
-+    UINT32                  start;
- 
- 
-     Buffer = ((UINT8 *) Table) + BufferOffset;
-@@ -209,7 +211,8 @@ AcpiDmDumpUnicode (
- 
-     for (i = 0; i < Length; i += 2)
-     {
--        if (!isprint (Buffer[i]))
-+        Tmp16 = AcpiUtReadUint16 (&Buffer[i]);
-+        if (!isprint (Tmp16))
-         {
-             goto DumpRawBuffer;
-         }
-@@ -217,7 +220,8 @@ AcpiDmDumpUnicode (
- 
-     /* Ensure all high bytes are zero */
- 
--    for (i = 1; i < Length; i += 2)
-+    start = UtIsBigEndianMachine() ? 0 : 1;
-+    for (i = start; i < Length; i += 2)
-     {
-         if (Buffer[i])
-         {
-@@ -230,7 +234,8 @@ AcpiDmDumpUnicode (
-     AcpiOsPrintf ("\"");
-     for (i = 0; i < Length; i += 2)
-     {
--        AcpiOsPrintf ("%c", Buffer[i]);
-+        Tmp16 = AcpiUtReadUint16 (&Buffer[i]);
-+        AcpiOsPrintf ("%c", Tmp16);
-     }
- 
-     AcpiOsPrintf ("\"\n");
diff --git a/0008-Support-MADT-aka-APIC-in-a-big-endian-world.patch b/0008-Support-MADT-aka-APIC-in-a-big-endian-world.patch
deleted file mode 100644
index 9121ab8..0000000
--- a/0008-Support-MADT-aka-APIC-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 7b107ab7348d903108140f6033e90596b12325c4 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Thu, 15 Oct 2020 12:12:11 -0600
-Subject: [PATCH 08/45] Support MADT (aka APIC) in a big-endian world
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/common/dmtbdump2.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20220331/source/common/dmtbdump2.c
-@@ -763,7 +763,7 @@ AcpiDmDumpMadt (
- {
-     ACPI_STATUS             Status;
-     ACPI_SUBTABLE_HEADER    *Subtable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length = AcpiUtReadUint32 (&Table->Length);
-     UINT32                  Offset = sizeof (ACPI_TABLE_MADT);
-     ACPI_DMTABLE_INFO       *InfoTable;
- 
-@@ -781,7 +781,7 @@ AcpiDmDumpMadt (
-     Subtable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Table, Offset);
-     DbgPrint (ASL_PARSE_OUTPUT, "//0B) Offset %X, from table start: 0x%8.8X%8.8X\n",
-         Offset, ACPI_FORMAT_UINT64 (ACPI_CAST_PTR (char, Subtable) - ACPI_CAST_PTR (char, Table)));
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         /* Common subtable header */
- 
diff --git a/0009-Support-ASF-tables-in-a-big-endian-world.patch b/0009-Support-ASF-tables-in-a-big-endian-world.patch
deleted file mode 100644
index a3f815d..0000000
--- a/0009-Support-ASF-tables-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From ce811b4c38b9a09533ee8bafa22813f6e43c023d Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Fri, 18 Sep 2020 16:41:02 -0600
-Subject: [PATCH 09/45] Support ASF! tables in a big-endian world
-
-Read the table length properly and it all works right for big-endian.
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/common/dmtbdump1.c | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump1.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump1.c
-+++ acpica-unix2-20220331/source/common/dmtbdump1.c
-@@ -358,16 +358,18 @@ AcpiDmDumpAsf (
-     UINT32                  DataOffset = 0;
-     UINT32                  i;
-     UINT8                   Type;
-+    UINT32                  TableLength;
- 
- 
-     /* No main table, only subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_ASF_INFO, Table, Offset);
--    while (Offset < Table->Length)
-+    TableLength = AcpiUtReadUint32 (&Table->Length);
-+    while (Offset < TableLength)
-     {
-         /* Common subtable header */
- 
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
-             Subtable->Header.Length, AcpiDmTableInfoAsfHdr);
-         if (ACPI_FAILURE (Status))
-         {
-@@ -425,7 +427,7 @@ AcpiDmDumpAsf (
-             return;
-         }
- 
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
-             Subtable->Header.Length, InfoTable);
-         if (ACPI_FAILURE (Status))
-         {
-@@ -442,7 +444,7 @@ AcpiDmDumpAsf (
-             for (i = 0; i < DataCount; i++)
-             {
-                 AcpiOsPrintf ("\n");
--                Status = AcpiDmDumpTable (Table->Length, DataOffset,
-+                Status = AcpiDmDumpTable (TableLength, DataOffset,
-                     DataTable, DataLength, DataInfoTable);
-                 if (ACPI_FAILURE (Status))
-                 {
diff --git a/0010-Support-CPEP-tables-in-a-big-endian-world.patch b/0010-Support-CPEP-tables-in-a-big-endian-world.patch
deleted file mode 100644
index e9451cd..0000000
--- a/0010-Support-CPEP-tables-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 0c4be57a5e0e45b4197c2d9a0b26462d3b1a9b80 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Fri, 18 Sep 2020 16:54:13 -0600
-Subject: [PATCH 10/45] Support CPEP tables in a big-endian world
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/common/dmtbdump1.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump1.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump1.c
-+++ acpica-unix2-20220331/source/common/dmtbdump1.c
-@@ -614,7 +614,7 @@ AcpiDmDumpCpep (
- {
-     ACPI_STATUS             Status;
-     ACPI_CPEP_POLLING       *Subtable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length = AcpiUtReadUint32 (&Table->Length);
-     UINT32                  Offset = sizeof (ACPI_TABLE_CPEP);
- 
- 
-@@ -629,7 +629,7 @@ AcpiDmDumpCpep (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_CPEP_POLLING, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         AcpiOsPrintf ("\n");
-         Status = AcpiDmDumpTable (Length, Offset, Subtable,
diff --git a/0011-Support-DBG2-table-in-a-big-endian-world.patch b/0011-Support-DBG2-table-in-a-big-endian-world.patch
deleted file mode 100644
index 76cb7ac..0000000
--- a/0011-Support-DBG2-table-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,256 +0,0 @@
-From 2cb0b87a15682da4f19f707fa3ffece504f94b5a Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Sat, 19 Sep 2020 13:37:38 -0600
-Subject: [PATCH 11/45] Support DBG2 table in a big-endian world
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/common/dmtbdump1.c  | 37 ++++++++++++++++++--------------
- source/compiler/dttable1.c | 43 ++++++++++++++++++++++++--------------
- 2 files changed, 48 insertions(+), 32 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump1.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump1.c
-+++ acpica-unix2-20220331/source/common/dmtbdump1.c
-@@ -669,7 +669,7 @@ AcpiDmDumpCsrt (
-     ACPI_CSRT_GROUP         *Subtable;
-     ACPI_CSRT_SHARED_INFO   *SharedInfoTable;
-     ACPI_CSRT_DESCRIPTOR    *SubSubtable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length = AcpiUtReadUint32 (&Table->Length);
-     UINT32                  Offset = sizeof (ACPI_TABLE_CSRT);
-     UINT32                  SubOffset;
-     UINT32                  SubSubOffset;
-@@ -681,7 +681,7 @@ AcpiDmDumpCsrt (
-     /* Subtables (Resource Groups) */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_CSRT_GROUP, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         /* Resource group subtable */
- 
-@@ -715,7 +715,7 @@ AcpiDmDumpCsrt (
-             Offset + SubOffset);
- 
-         while ((SubOffset < Subtable->Length) &&
--              ((Offset + SubOffset) < Table->Length))
-+              ((Offset + SubOffset) < Length))
-         {
-             AcpiOsPrintf ("\n");
-             Status = AcpiDmDumpTable (Length, Offset + SubOffset, SubSubtable,
-@@ -776,12 +776,13 @@ AcpiDmDumpDbg2 (
- {
-     ACPI_STATUS             Status;
-     ACPI_DBG2_DEVICE        *Subtable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length = AcpiUtReadUint32 (&Table->Length);
-     UINT32                  Offset = sizeof (ACPI_TABLE_DBG2);
-     UINT32                  i;
-     UINT32                  ArrayOffset;
-     UINT32                  AbsoluteOffset;
-     UINT8                   *Array;
-+    UINT16                  SubtableLength;
- 
- 
-     /* Main table */
-@@ -795,11 +796,12 @@ AcpiDmDumpDbg2 (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_DBG2_DEVICE, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         AcpiOsPrintf ("\n");
-+        SubtableLength = AcpiUtReadUint16 (&Subtable->Length);
-         Status = AcpiDmDumpTable (Length, Offset, Subtable,
--            Subtable->Length, AcpiDmTableInfoDbg2Device);
-+            SubtableLength, AcpiDmTableInfoDbg2Device);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -809,13 +811,13 @@ AcpiDmDumpDbg2 (
- 
-         for (i = 0; i < Subtable->RegisterCount; i++)
-         {
--            ArrayOffset = Subtable->BaseAddressOffset +
-+            ArrayOffset = AcpiUtReadUint16 (&Subtable->BaseAddressOffset) +
-                 (sizeof (ACPI_GENERIC_ADDRESS) * i);
-             AbsoluteOffset = Offset + ArrayOffset;
-             Array = (UINT8 *) Subtable + ArrayOffset;
- 
-             Status = AcpiDmDumpTable (Length, AbsoluteOffset, Array,
--                Subtable->Length, AcpiDmTableInfoDbg2Addr);
-+                SubtableLength, AcpiDmTableInfoDbg2Addr);
-             if (ACPI_FAILURE (Status))
-             {
-                 return;
-@@ -826,13 +828,13 @@ AcpiDmDumpDbg2 (
- 
-         for (i = 0; i < Subtable->RegisterCount; i++)
-         {
--            ArrayOffset = Subtable->AddressSizeOffset +
-+            ArrayOffset = AcpiUtReadUint16 (&Subtable->AddressSizeOffset) +
-                 (sizeof (UINT32) * i);
-             AbsoluteOffset = Offset + ArrayOffset;
-             Array = (UINT8 *) Subtable + ArrayOffset;
- 
-             Status = AcpiDmDumpTable (Length, AbsoluteOffset, Array,
--                Subtable->Length, AcpiDmTableInfoDbg2Size);
-+                SubtableLength, AcpiDmTableInfoDbg2Size);
-             if (ACPI_FAILURE (Status))
-             {
-                 return;
-@@ -842,12 +844,12 @@ AcpiDmDumpDbg2 (
-         /* Dump the Namestring (required) */
- 
-         AcpiOsPrintf ("\n");
--        ArrayOffset = Subtable->NamepathOffset;
-+        ArrayOffset = AcpiUtReadUint16 (&Subtable->NamepathOffset);
-         AbsoluteOffset = Offset + ArrayOffset;
-         Array = (UINT8 *) Subtable + ArrayOffset;
- 
-         Status = AcpiDmDumpTable (Length, AbsoluteOffset, Array,
--            Subtable->Length, AcpiDmTableInfoDbg2Name);
-+            SubtableLength, AcpiDmTableInfoDbg2Name);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -857,8 +859,11 @@ AcpiDmDumpDbg2 (
- 
-         if (Subtable->OemDataOffset)
-         {
--            Status = AcpiDmDumpTable (Length, Offset + Subtable->OemDataOffset,
--                Table, Subtable->OemDataLength,
-+            Array = (UINT8 *) Subtable + AcpiUtReadUint16 (&Subtable->OemDataOffset);
-+
-+            Status = AcpiDmDumpTable (Length,
-+                Offset + AcpiUtReadUint16 (&Subtable->OemDataOffset),
-+                Array, AcpiUtReadUint16 (&Subtable->OemDataLength),
-                 AcpiDmTableInfoDbg2OemData);
-             if (ACPI_FAILURE (Status))
-             {
-@@ -868,9 +873,9 @@ AcpiDmDumpDbg2 (
- 
-         /* Point to next subtable */
- 
--        Offset += Subtable->Length;
-+        Offset += SubtableLength;
-         Subtable = ACPI_ADD_PTR (ACPI_DBG2_DEVICE, Subtable,
--            Subtable->Length);
-+            SubtableLength);
-     }
- }
- 
-Index: acpica-unix2-20220331/source/compiler/dttable1.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/dttable1.c
-+++ acpica-unix2-20220331/source/compiler/dttable1.c
-@@ -718,6 +718,7 @@ DtCompileCsrt (
-     DT_FIELD                **PFieldList = (DT_FIELD **) List;
-     UINT32                  DescriptorCount;
-     UINT32                  GroupLength;
-+    UINT32                  Tmp;
- 
- 
-     /* Subtables (Resource Groups) */
-@@ -736,12 +737,13 @@ DtCompileCsrt (
- 
-         /* Compute the number of resource descriptors */
- 
--        GroupLength =
--            (ACPI_CAST_PTR (ACPI_CSRT_GROUP,
--                Subtable->Buffer))->Length -
--            (ACPI_CAST_PTR (ACPI_CSRT_GROUP,
--                Subtable->Buffer))->SharedInfoLength -
--            sizeof (ACPI_CSRT_GROUP);
-+        Tmp = AcpiUtReadUint32 (&(ACPI_CAST_PTR (ACPI_CSRT_GROUP,
-+                                Subtable->Buffer))->Length);
-+        GroupLength = Tmp;
-+        Tmp = AcpiUtReadUint32 (&(ACPI_CAST_PTR (ACPI_CSRT_GROUP,
-+                                Subtable->Buffer))->SharedInfoLength);
-+        GroupLength -= Tmp;
-+        GroupLength -= sizeof (ACPI_CSRT_GROUP);
- 
-         DescriptorCount = (GroupLength  /
-             sizeof (ACPI_CSRT_DESCRIPTOR));
-@@ -829,6 +831,7 @@ DtCompileDbg2 (
-     ACPI_DBG2_DEVICE        *DeviceInfo;
-     UINT16                  CurrentOffset;
-     UINT32                  i;
-+    UINT32                  Tmp;
- 
- 
-     /* Main table */
-@@ -845,10 +848,12 @@ DtCompileDbg2 (
-     /* Main table fields */
- 
-     Dbg2Header = ACPI_CAST_PTR (ACPI_DBG2_HEADER, Subtable->Buffer);
--    Dbg2Header->InfoOffset = sizeof (ACPI_TABLE_HEADER) + ACPI_PTR_DIFF (
--        ACPI_ADD_PTR (UINT8, Dbg2Header, sizeof (ACPI_DBG2_HEADER)), Dbg2Header);
-+    Tmp = sizeof (ACPI_TABLE_HEADER) + ACPI_PTR_DIFF (
-+       ACPI_ADD_PTR (UINT8, Dbg2Header, sizeof (ACPI_DBG2_HEADER)), Dbg2Header);
-+    AcpiUtWriteUint (&Dbg2Header->InfoOffset, sizeof (UINT32),
-+            &Tmp, sizeof (UINT32));
- 
--    SubtableCount = Dbg2Header->InfoCount;
-+    SubtableCount = Tmp;
-     DtPushSubtable (Subtable);
- 
-     /* Process all Device Information subtables (Count = InfoCount) */
-@@ -875,7 +880,8 @@ DtCompileDbg2 (
- 
-         /* BaseAddressRegister GAS array (Required, size is RegisterCount) */
- 
--        DeviceInfo->BaseAddressOffset = CurrentOffset;
-+        AcpiUtWriteUint (&DeviceInfo->BaseAddressOffset, sizeof (UINT16),
-+                &CurrentOffset, sizeof (UINT16));
-         for (i = 0; *PFieldList && (i < DeviceInfo->RegisterCount); i++)
-         {
-             Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2Addr,
-@@ -891,7 +897,8 @@ DtCompileDbg2 (
- 
-         /* AddressSize array (Required, size = RegisterCount) */
- 
--        DeviceInfo->AddressSizeOffset = CurrentOffset;
-+        AcpiUtWriteUint (&DeviceInfo->AddressSizeOffset, sizeof (UINT16),
-+                &CurrentOffset, sizeof (UINT16));
-         for (i = 0; *PFieldList && (i < DeviceInfo->RegisterCount); i++)
-         {
-             Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2Size,
-@@ -907,7 +914,8 @@ DtCompileDbg2 (
- 
-         /* NamespaceString device identifier (Required, size = NamePathLength) */
- 
--        DeviceInfo->NamepathOffset = CurrentOffset;
-+        AcpiUtWriteUint (&DeviceInfo->NamepathOffset, sizeof (UINT16),
-+            &CurrentOffset, sizeof (UINT16));
-         Status = DtCompileTable (PFieldList, AcpiDmTableInfoDbg2Name,
-             &Subtable);
-         if (ACPI_FAILURE (Status))
-@@ -917,8 +925,9 @@ DtCompileDbg2 (
- 
-         /* Update the device info header */
- 
--        DeviceInfo->NamepathLength = (UINT16) Subtable->Length;
--        CurrentOffset += (UINT16) DeviceInfo->NamepathLength;
-+        AcpiUtWriteUint (&DeviceInfo->NamepathLength, sizeof (UINT16),
-+            &Subtable->Length, sizeof (UINT32));
-+        CurrentOffset += AcpiUtReadUint16 (&DeviceInfo->NamepathLength);
-         DtInsertSubtable (ParentTable, Subtable);
- 
-         /* OemData - Variable-length data (Optional, size = OemDataLength) */
-@@ -945,8 +954,10 @@ DtCompileDbg2 (
- 
-         if (Subtable && Subtable->Length)
-         {
--            DeviceInfo->OemDataOffset = CurrentOffset;
--            DeviceInfo->OemDataLength = (UINT16) Subtable->Length;
-+            AcpiUtWriteUint (&DeviceInfo->OemDataOffset, sizeof (UINT16),
-+                &CurrentOffset, sizeof (UINT16));
-+            AcpiUtWriteUint (&DeviceInfo->OemDataLength, sizeof (UINT16),
-+                &Subtable->Length, sizeof (UINT32));
- 
-             DtInsertSubtable (ParentTable, Subtable);
-         }
diff --git a/0012-Support-DMAR-in-a-big-endian-world.patch b/0012-Support-DMAR-in-a-big-endian-world.patch
deleted file mode 100644
index 3d54025..0000000
--- a/0012-Support-DMAR-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,171 +0,0 @@
-From 06623392351dfea54bd69507b6672c933a5e3fd2 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Sat, 19 Sep 2020 15:22:00 -0600
-Subject: [PATCH 12/45] Support DMAR in a big-endian world
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/common/dmtable.c    |  4 ++--
- source/common/dmtbdump1.c  | 26 +++++++++++++++-----------
- source/compiler/dttable1.c | 12 +++++++-----
- 3 files changed, 24 insertions(+), 18 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtable.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtable.c
-+++ acpica-unix2-20220331/source/common/dmtable.c
-@@ -1578,13 +1578,13 @@ AcpiDmDumpTable (
- 
-             /* DMAR subtable types */
- 
--            Temp16 = ACPI_GET16 (Target);
-+            Temp16 = AcpiUtReadUint16 (Target);
-             if (Temp16 > ACPI_DMAR_TYPE_RESERVED)
-             {
-                 Temp16 = ACPI_DMAR_TYPE_RESERVED;
-             }
- 
--            AcpiOsPrintf (UINT16_FORMAT, ACPI_GET16 (Target),
-+            AcpiOsPrintf (UINT16_FORMAT, Temp16,
-                 AcpiDmDmarSubnames[Temp16]);
-             break;
- 
-Index: acpica-unix2-20220331/source/common/dmtbdump1.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump1.c
-+++ acpica-unix2-20220331/source/common/dmtbdump1.c
-@@ -899,13 +899,15 @@ AcpiDmDumpDmar (
- {
-     ACPI_STATUS             Status;
-     ACPI_DMAR_HEADER        *Subtable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length = AcpiUtReadUint32 (&Table->Length);
-     UINT32                  Offset = sizeof (ACPI_TABLE_DMAR);
-     ACPI_DMTABLE_INFO       *InfoTable;
-     ACPI_DMAR_DEVICE_SCOPE  *ScopeTable;
-     UINT32                  ScopeOffset;
-     UINT8                   *PciPath;
-     UINT32                  PathOffset;
-+    UINT16                  SubtableType;
-+    UINT16                  SubtableLength;
- 
- 
-     /* Main table */
-@@ -919,13 +921,14 @@ AcpiDmDumpDmar (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_DMAR_HEADER, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         /* Common subtable header */
- 
-         AcpiOsPrintf ("\n");
-+        SubtableLength = AcpiUtReadUint16 (&Subtable->Length);
-         Status = AcpiDmDumpTable (Length, Offset, Subtable,
--            Subtable->Length, AcpiDmTableInfoDmarHdr);
-+            SubtableLength, AcpiDmTableInfoDmarHdr);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -933,7 +936,8 @@ AcpiDmDumpDmar (
- 
-         AcpiOsPrintf ("\n");
- 
--        switch (Subtable->Type)
-+        SubtableType = AcpiUtReadUint16 (&Subtable->Type);
-+        switch (SubtableType)
-         {
-         case ACPI_DMAR_TYPE_HARDWARE_UNIT:
- 
-@@ -974,12 +978,12 @@ AcpiDmDumpDmar (
-         default:
- 
-             AcpiOsPrintf ("\n**** Unknown DMAR subtable type 0x%X\n\n",
--                Subtable->Type);
-+                SubtableType);
-             return;
-         }
- 
-         Status = AcpiDmDumpTable (Length, Offset, Subtable,
--            Subtable->Length, InfoTable);
-+            SubtableLength, InfoTable);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -988,8 +992,8 @@ AcpiDmDumpDmar (
-         /*
-          * Dump the optional device scope entries
-          */
--        if ((Subtable->Type == ACPI_DMAR_TYPE_HARDWARE_AFFINITY) ||
--            (Subtable->Type == ACPI_DMAR_TYPE_NAMESPACE))
-+        if ((SubtableType == ACPI_DMAR_TYPE_HARDWARE_AFFINITY) ||
-+            (SubtableType == ACPI_DMAR_TYPE_NAMESPACE))
-         {
-             /* These types do not support device scopes */
- 
-@@ -997,7 +1001,7 @@ AcpiDmDumpDmar (
-         }
- 
-         ScopeTable = ACPI_ADD_PTR (ACPI_DMAR_DEVICE_SCOPE, Subtable, ScopeOffset);
--        while (ScopeOffset < Subtable->Length)
-+        while (ScopeOffset < SubtableLength)
-         {
-             AcpiOsPrintf ("\n");
-             Status = AcpiDmDumpTable (Length, Offset + ScopeOffset, ScopeTable,
-@@ -1038,9 +1042,9 @@ AcpiDmDumpDmar (
- NextSubtable:
-         /* Point to next subtable */
- 
--        Offset += Subtable->Length;
-+        Offset += SubtableLength;
-         Subtable = ACPI_ADD_PTR (ACPI_DMAR_HEADER, Subtable,
--            Subtable->Length);
-+            SubtableLength);
-     }
- }
- 
-Index: acpica-unix2-20220331/source/compiler/dttable1.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/dttable1.c
-+++ acpica-unix2-20220331/source/compiler/dttable1.c
-@@ -997,6 +997,7 @@ DtCompileDmar (
-     ACPI_DMAR_DEVICE_SCOPE  *DmarDeviceScope;
-     UINT32                  DeviceScopeLength;
-     UINT32                  PciPathLength;
-+    UINT16                  DmarHeaderType;
- 
- 
-     Status = DtCompileTable (PFieldList, AcpiDmTableInfoDmar, &Subtable);
-@@ -1027,7 +1028,8 @@ DtCompileDmar (
- 
-         DmarHeader = ACPI_CAST_PTR (ACPI_DMAR_HEADER, Subtable->Buffer);
- 
--        switch (DmarHeader->Type)
-+        DmarHeaderType = AcpiUtReadUint16 (&DmarHeader->Type);
-+        switch (DmarHeaderType)
-         {
-         case ACPI_DMAR_TYPE_HARDWARE_UNIT:
- 
-@@ -1079,8 +1081,8 @@ DtCompileDmar (
-         /*
-          * Optional Device Scope subtables
-          */
--        if ((DmarHeader->Type == ACPI_DMAR_TYPE_HARDWARE_AFFINITY) ||
--            (DmarHeader->Type == ACPI_DMAR_TYPE_NAMESPACE))
-+        if ((DmarHeaderType == ACPI_DMAR_TYPE_HARDWARE_AFFINITY) ||
-+            (DmarHeaderType == ACPI_DMAR_TYPE_NAMESPACE))
-         {
-             /* These types do not support device scopes */
- 
-@@ -1089,8 +1091,8 @@ DtCompileDmar (
-         }
- 
-         DtPushSubtable (Subtable);
--        DeviceScopeLength = DmarHeader->Length - Subtable->Length -
--            ParentTable->Length;
-+        DeviceScopeLength = AcpiUtReadUint16 (&DmarHeader->Length) -
-+                Subtable->Length - ParentTable->Length;
-         while (DeviceScopeLength)
-         {
-             Status = DtCompileTable (PFieldList, AcpiDmTableInfoDmarScope,
diff --git a/0013-Support-DRTM-in-a-big-endian-world.patch b/0013-Support-DRTM-in-a-big-endian-world.patch
deleted file mode 100644
index 02725bb..0000000
--- a/0013-Support-DRTM-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From bcdec27f562b0df37546b5e8ad2eab76348062eb Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Sat, 19 Sep 2020 15:44:06 -0600
-Subject: [PATCH 13/45] Support DRTM in a big-endian world
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/common/dmtbdump1.c  | 25 +++++++++++++++----------
- source/compiler/dttable1.c |  6 ++++--
- 2 files changed, 19 insertions(+), 12 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump1.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump1.c
-+++ acpica-unix2-20220331/source/common/dmtbdump1.c
-@@ -1071,11 +1071,14 @@ AcpiDmDumpDrtm (
-     ACPI_DRTM_RESOURCE_LIST *DrtmRl;
-     ACPI_DRTM_DPS_ID        *DrtmDps;
-     UINT32                  Count;
-+    UINT32                  ResourceCount;
-+    UINT32                  ValidatedTableCount;
-+    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
-+    Status = AcpiDmDumpTable (TableLength, 0, Table, 0,
-         AcpiDmTableInfoDrtm);
-     if (ACPI_FAILURE (Status))
-     {
-@@ -1090,7 +1093,7 @@ AcpiDmDumpDrtm (
- 
-     DrtmVtl = ACPI_ADD_PTR (ACPI_DRTM_VTABLE_LIST, Table, Offset);
-     AcpiOsPrintf ("\n");
--    Status = AcpiDmDumpTable (Table->Length, Offset,
-+    Status = AcpiDmDumpTable (TableLength, Offset,
-         DrtmVtl, ACPI_OFFSET (ACPI_DRTM_VTABLE_LIST, ValidatedTables),
-         AcpiDmTableInfoDrtm0);
-     if (ACPI_FAILURE (Status))
-@@ -1103,10 +1106,11 @@ AcpiDmDumpDrtm (
-     /* Dump Validated table addresses */
- 
-     Count = 0;
--    while ((Offset < Table->Length) &&
--            (DrtmVtl->ValidatedTableCount > Count))
-+    ValidatedTableCount = AcpiUtReadUint32 (&DrtmVtl->ValidatedTableCount);
-+    while ((Offset < TableLength) &&
-+            (ValidatedTableCount > Count))
-     {
--        Status = AcpiDmDumpTable (Table->Length, Offset,
-+        Status = AcpiDmDumpTable (TableLength, Offset,
-             ACPI_ADD_PTR (void, Table, Offset), sizeof (UINT64),
-             AcpiDmTableInfoDrtm0a);
-         if (ACPI_FAILURE (Status))
-@@ -1122,7 +1126,7 @@ AcpiDmDumpDrtm (
- 
-     DrtmRl = ACPI_ADD_PTR (ACPI_DRTM_RESOURCE_LIST, Table, Offset);
-     AcpiOsPrintf ("\n");
--    Status = AcpiDmDumpTable (Table->Length, Offset,
-+    Status = AcpiDmDumpTable (TableLength, Offset,
-         DrtmRl, ACPI_OFFSET (ACPI_DRTM_RESOURCE_LIST, Resources),
-         AcpiDmTableInfoDrtm1);
-     if (ACPI_FAILURE (Status))
-@@ -1135,10 +1139,11 @@ AcpiDmDumpDrtm (
-     /* Dump the Resource List */
- 
-     Count = 0;
--    while ((Offset < Table->Length) &&
--           (DrtmRl->ResourceCount > Count))
-+    ResourceCount = AcpiUtReadUint32 (&DrtmRl->ResourceCount);
-+    while ((Offset < TableLength) &&
-+           (ResourceCount > Count))
-     {
--        Status = AcpiDmDumpTable (Table->Length, Offset,
-+        Status = AcpiDmDumpTable (TableLength, Offset,
-             ACPI_ADD_PTR (void, Table, Offset),
-             sizeof (ACPI_DRTM_RESOURCE), AcpiDmTableInfoDrtm1a);
-         if (ACPI_FAILURE (Status))
-@@ -1154,7 +1159,7 @@ AcpiDmDumpDrtm (
- 
-     DrtmDps = ACPI_ADD_PTR (ACPI_DRTM_DPS_ID, Table, Offset);
-     AcpiOsPrintf ("\n");
--    (void) AcpiDmDumpTable (Table->Length, Offset,
-+    (void) AcpiDmDumpTable (TableLength, Offset,
-         DrtmDps, sizeof (ACPI_DRTM_DPS_ID), AcpiDmTableInfoDrtm2);
- }
- 
-Index: acpica-unix2-20220331/source/compiler/dttable1.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/dttable1.c
-+++ acpica-unix2-20220331/source/compiler/dttable1.c
-@@ -1217,7 +1217,8 @@ DtCompileDrtm (
-         Count++;
-     }
- 
--    DrtmVtl->ValidatedTableCount = Count;
-+    AcpiUtWriteUint (&DrtmVtl->ValidatedTableCount, sizeof (UINT32),
-+            &Count, sizeof (UINT32));
-     DtPopSubtable ();
-     ParentTable = DtPeekSubtable ();
- 
-@@ -1255,7 +1256,8 @@ DtCompileDrtm (
-         Count++;
-     }
- 
--    DrtmRl->ResourceCount = Count;
-+    AcpiUtWriteUint(&DrtmRl->ResourceCount, sizeof(UINT32),
-+            &Count, sizeof(UINT32));
-     DtPopSubtable ();
-     ParentTable = DtPeekSubtable ();
- 
diff --git a/0014-Support-EINJ-in-a-big-endian-world.patch b/0014-Support-EINJ-in-a-big-endian-world.patch
deleted file mode 100644
index f65e6ff..0000000
--- a/0014-Support-EINJ-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 70d1047abe010c80c2dd74f6afdc7005b91e6163 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Sat, 19 Sep 2020 15:50:19 -0600
-Subject: [PATCH 14/45] Support EINJ in a big-endian world
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/common/dmtbdump1.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump1.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump1.c
-+++ acpica-unix2-20220331/source/common/dmtbdump1.c
-@@ -1183,7 +1183,7 @@ AcpiDmDumpEinj (
- {
-     ACPI_STATUS             Status;
-     ACPI_WHEA_HEADER        *Subtable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length = AcpiUtReadUint32 (&Table->Length);
-     UINT32                  Offset = sizeof (ACPI_TABLE_EINJ);
- 
- 
-@@ -1198,7 +1198,7 @@ AcpiDmDumpEinj (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_WHEA_HEADER, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         AcpiOsPrintf ("\n");
-         Status = AcpiDmDumpTable (Length, Offset, Subtable,
diff --git a/0015-Support-ERST-in-a-big-endian-world.patch b/0015-Support-ERST-in-a-big-endian-world.patch
deleted file mode 100644
index a6146e2..0000000
--- a/0015-Support-ERST-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From e588961ca36e70c24aa1c49e96bcd1997bf98f89 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Sat, 19 Sep 2020 15:54:56 -0600
-Subject: [PATCH 15/45] Support ERST in a big-endian world
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/common/dmtbdump1.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump1.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump1.c
-+++ acpica-unix2-20220331/source/common/dmtbdump1.c
-@@ -1236,7 +1236,7 @@ AcpiDmDumpErst (
- {
-     ACPI_STATUS             Status;
-     ACPI_WHEA_HEADER        *Subtable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length = AcpiUtReadUint32 (&Table->Length);
-     UINT32                  Offset = sizeof (ACPI_TABLE_ERST);
- 
- 
-@@ -1251,7 +1251,7 @@ AcpiDmDumpErst (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_WHEA_HEADER, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         AcpiOsPrintf ("\n");
-         Status = AcpiDmDumpTable (Length, Offset, Subtable,
diff --git a/0016-Support-FADT-aka-FACP-in-a-big-endian-world.patch b/0016-Support-FADT-aka-FACP-in-a-big-endian-world.patch
deleted file mode 100644
index 1b9b3aa..0000000
--- a/0016-Support-FADT-aka-FACP-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-From b3051bc2bad8988f3ad81a8307de6f1d0eef4ace Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Sun, 20 Sep 2020 11:42:21 -0600
-Subject: [PATCH 16/45] Support FADT (aka, FACP) in a big-endian world
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/common/dmtbdump.c          | 25 ++++++++++++-----------
- source/components/tables/tbfadt.c | 34 +++++++++++++++++++++++--------
- 2 files changed, 38 insertions(+), 21 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump.c
-+++ acpica-unix2-20220331/source/common/dmtbdump.c
-@@ -417,11 +417,12 @@ AcpiDmDumpFadt (
-     ACPI_TABLE_HEADER       *Table)
- {
-     ACPI_STATUS             Status;
-+    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
- 
- 
-     /* Always dump the minimum FADT revision 1 fields (ACPI 1.0) */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
-+    Status = AcpiDmDumpTable (TableLength, 0, Table, 0,
-         AcpiDmTableInfoFadt1);
-     if (ACPI_FAILURE (Status))
-     {
-@@ -430,10 +431,10 @@ AcpiDmDumpFadt (
- 
-     /* Check for FADT revision 2 fields (ACPI 1.0B MS extensions) */
- 
--    if ((Table->Length > ACPI_FADT_V1_SIZE) &&
--        (Table->Length <= ACPI_FADT_V2_SIZE))
-+    if ((TableLength > ACPI_FADT_V1_SIZE) &&
-+        (TableLength <= ACPI_FADT_V2_SIZE))
-     {
--        Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
-+        Status = AcpiDmDumpTable (TableLength, 0, Table, 0,
-             AcpiDmTableInfoFadt2);
-         if (ACPI_FAILURE (Status))
-         {
-@@ -443,9 +444,9 @@ AcpiDmDumpFadt (
- 
-     /* Check for FADT revision 3/4 fields and up (ACPI 2.0+ extended data) */
- 
--    else if (Table->Length > ACPI_FADT_V2_SIZE)
-+    else if (TableLength > ACPI_FADT_V2_SIZE)
-     {
--        Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
-+        Status = AcpiDmDumpTable (TableLength, 0, Table, 0,
-             AcpiDmTableInfoFadt3);
-         if (ACPI_FAILURE (Status))
-         {
-@@ -454,9 +455,9 @@ AcpiDmDumpFadt (
- 
-         /* Check for FADT revision 5 fields and up (ACPI 5.0+) */
- 
--        if (Table->Length > ACPI_FADT_V3_SIZE)
-+        if (TableLength > ACPI_FADT_V3_SIZE)
-         {
--            Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
-+            Status = AcpiDmDumpTable (TableLength, 0, Table, 0,
-                 AcpiDmTableInfoFadt5);
-             if (ACPI_FAILURE (Status))
-             {
-@@ -466,9 +467,9 @@ AcpiDmDumpFadt (
- 
-         /* Check for FADT revision 6 fields and up (ACPI 6.0+) */
- 
--        if (Table->Length > ACPI_FADT_V3_SIZE)
-+        if (TableLength > ACPI_FADT_V3_SIZE)
-         {
--            Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
-+            Status = AcpiDmDumpTable (TableLength, 0, Table, 0,
-                 AcpiDmTableInfoFadt6);
-             if (ACPI_FAILURE (Status))
-             {
-@@ -479,11 +480,11 @@ AcpiDmDumpFadt (
- 
-     /* Validate various fields in the FADT, including length */
- 
--    AcpiTbCreateLocalFadt (Table, Table->Length);
-+    AcpiTbCreateLocalFadt (Table, TableLength);
- 
-     /* Validate FADT length against the revision */
- 
--    AcpiDmValidateFadtLength (Table->Revision, Table->Length);
-+    AcpiDmValidateFadtLength (Table->Revision, TableLength);
- }
- 
- 
-Index: acpica-unix2-20220331/source/components/tables/tbfadt.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/tables/tbfadt.c
-+++ acpica-unix2-20220331/source/components/tables/tbfadt.c
-@@ -289,7 +289,6 @@ AcpiTbSelectAddress (
-     UINT32                  Address32,
-     UINT64                  Address64)
- {
--
-     if (!Address64)
-     {
-         /* 64-bit address is zero, use 32-bit address */
-@@ -520,6 +519,9 @@ AcpiTbConvertFadt (
-     UINT8                   Length;
-     UINT8                   Flags;
-     UINT32                  i;
-+    UINT32                  Tmp;
-+    UINT32                  Value32;
-+    UINT64                  Value64;
- 
- 
-     /*
-@@ -533,7 +535,7 @@ AcpiTbConvertFadt (
-      * Note: The FADT revision value is unreliable. Only the length can be
-      * trusted.
-      */
--    if (AcpiGbl_FADT.Header.Length <= ACPI_FADT_V2_SIZE)
-+    if (AcpiUtReadUint32 (&AcpiGbl_FADT.Header.Length) <= ACPI_FADT_V2_SIZE)
-     {
-         AcpiGbl_FADT.PreferredProfile = 0;
-         AcpiGbl_FADT.PstateControl = 0;
-@@ -546,14 +548,19 @@ AcpiTbConvertFadt (
-      * current FADT version as defined by the ACPI specification.
-      * Thus, we will have a common FADT internally.
-      */
--    AcpiGbl_FADT.Header.Length = sizeof (ACPI_TABLE_FADT);
-+    Tmp = sizeof (ACPI_TABLE_FADT);
-+    AcpiUtWriteUint (&AcpiGbl_FADT.Header.Length, sizeof (UINT32),
-+            &Tmp, sizeof (UINT32));
- 
-     /*
-      * Expand the 32-bit DSDT addresses to 64-bit as necessary.
-      * Later ACPICA code will always use the X 64-bit field.
-      */
--    AcpiGbl_FADT.XDsdt = AcpiTbSelectAddress ("DSDT",
--        AcpiGbl_FADT.Dsdt, AcpiGbl_FADT.XDsdt);
-+    Value32 = AcpiUtReadUint32 (&AcpiGbl_FADT.Dsdt);
-+    Value64 = AcpiUtReadUint64 (&AcpiGbl_FADT.XDsdt);
-+    Value64 = AcpiTbSelectAddress ("DSDT", Value32, Value64);
-+    AcpiUtWriteUint (&AcpiGbl_FADT.XDsdt, sizeof (UINT64),
-+                &Value64, sizeof (UINT64));
- 
-     /* If Hardware Reduced flag is set, we are all done */
- 
-@@ -614,7 +621,11 @@ AcpiTbConvertFadt (
-         {
-             if (Address64->Address)
-             {
--                if (Address64->Address != (UINT64) Address32)
-+                Value32 = AcpiUtReadUint32 (&Address32);
-+                Value64 = AcpiUtReadUint64 (&Address64->Address);
-+
-+                /* if (Address64->Address != (UINT64) Address32) */
-+                if (Value64 != (UINT64) Value32)
-                 {
-                     /* Address mismatch */
- 
-@@ -655,9 +666,10 @@ AcpiTbConvertFadt (
-              */
-             if (!Address64->Address || AcpiGbl_Use32BitFadtAddresses)
-             {
-+                Value32 = AcpiUtReadUint32 (&Address32);
-                 AcpiTbInitGenericAddress (Address64,
-                     ACPI_ADR_SPACE_SYSTEM_IO, Length,
--                    (UINT64) Address32, Name, Flags);
-+                    (UINT64) Value32, Name, Flags);
-             }
-         }
- 
-@@ -780,10 +792,14 @@ AcpiTbSetupFadtRegisters (
- 
-         if (Source64->Address)
-         {
-+            UINT64 Address64;
-+
-+            Address64 = AcpiUtReadUint64 (&Source64->Address);
-+            Address64 +=
-+                (FadtPmInfoTable[i].RegisterNum * Pm1RegisterByteWidth);
-             AcpiTbInitGenericAddress (FadtPmInfoTable[i].Target,
-                 Source64->SpaceId, Pm1RegisterByteWidth,
--                Source64->Address +
--                    (FadtPmInfoTable[i].RegisterNum * Pm1RegisterByteWidth),
-+                Address64,
-                 "PmRegisters", 0);
-         }
-     }
diff --git a/0017-Support-most-FPDTs-in-a-big-endian-world.patch b/0017-Support-most-FPDTs-in-a-big-endian-world.patch
deleted file mode 100644
index 41c0019..0000000
--- a/0017-Support-most-FPDTs-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 35f533074fb78d52e87c5a14406a136480a6fe62 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Tue, 22 Sep 2020 17:51:45 -0600
-Subject: [PATCH 17/45] Support most FPDTs in a big-endian world
-
-NB: there is no support for vendor specific records even in
-the little-endian version.
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/common/dmtbdump1.c  | 12 +++++++-----
- source/compiler/dttable1.c |  4 +++-
- 2 files changed, 10 insertions(+), 6 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump1.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump1.c
-+++ acpica-unix2-20220331/source/common/dmtbdump1.c
-@@ -1289,9 +1289,10 @@ AcpiDmDumpFpdt (
- {
-     ACPI_STATUS             Status;
-     ACPI_FPDT_HEADER        *Subtable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
-     UINT32                  Offset = sizeof (ACPI_TABLE_FPDT);
-     ACPI_DMTABLE_INFO       *InfoTable;
-+    UINT16                  SubtableType;
- 
- 
-     /* There is no main table (other than the standard ACPI header) */
-@@ -1299,19 +1300,20 @@ AcpiDmDumpFpdt (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < TableLength)
-     {
-         /* Common subtable header */
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
-             Subtable->Length, AcpiDmTableInfoFpdtHdr);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-         }
- 
--        switch (Subtable->Type)
-+        SubtableType = AcpiUtReadUint16 (&Subtable->Type);
-+        switch (SubtableType)
-         {
-         case ACPI_FPDT_TYPE_BOOT:
- 
-@@ -1338,7 +1340,7 @@ AcpiDmDumpFpdt (
-             goto NextSubtable;
-         }
- 
--        Status = AcpiDmDumpTable (Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
-             Subtable->Length, InfoTable);
-         if (ACPI_FAILURE (Status))
-         {
-Index: acpica-unix2-20220331/source/compiler/dttable1.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/dttable1.c
-+++ acpica-unix2-20220331/source/compiler/dttable1.c
-@@ -1493,6 +1493,7 @@ DtCompileFpdt (
-     ACPI_DMTABLE_INFO       *InfoTable;
-     DT_FIELD                **PFieldList = (DT_FIELD **) List;
-     DT_FIELD                *SubtableStart;
-+    UINT16                  SubtableType;
- 
- 
-     while (*PFieldList)
-@@ -1511,7 +1512,8 @@ DtCompileFpdt (
- 
-         FpdtHeader = ACPI_CAST_PTR (ACPI_FPDT_HEADER, Subtable->Buffer);
- 
--        switch (FpdtHeader->Type)
-+        SubtableType = AcpiUtReadUint16 (&FpdtHeader->Type);
-+        switch (SubtableType)
-         {
-         case ACPI_FPDT_TYPE_BOOT:
- 
diff --git a/0018-Support-GTDT-in-a-big-endian-world.patch b/0018-Support-GTDT-in-a-big-endian-world.patch
deleted file mode 100644
index 4bdb9bc..0000000
--- a/0018-Support-GTDT-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 492e41a24fd088c7ab609ee8ad518f69c9cd29e3 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Tue, 22 Sep 2020 18:12:01 -0600
-Subject: [PATCH 18/45] Support GTDT in a big-endian world
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/common/dmtbdump1.c  | 13 +++++++++----
- source/compiler/dttable1.c |  9 +++++++--
- 2 files changed, 16 insertions(+), 6 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump1.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump1.c
-+++ acpica-unix2-20220331/source/common/dmtbdump1.c
-@@ -1376,7 +1376,7 @@ AcpiDmDumpGtdt (
- {
-     ACPI_STATUS             Status;
-     ACPI_GTDT_HEADER        *Subtable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length = AcpiUtReadUint32 (&Table->Length);
-     UINT32                  Offset = sizeof (ACPI_TABLE_GTDT);
-     ACPI_DMTABLE_INFO       *InfoTable;
-     UINT32                  SubtableLength;
-@@ -1412,7 +1412,7 @@ AcpiDmDumpGtdt (
- 
-     /* Subtables */
- 
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         /* Common subtable header */
- 
-@@ -1430,8 +1430,13 @@ AcpiDmDumpGtdt (
-         case ACPI_GTDT_TYPE_TIMER_BLOCK:
- 
-             SubtableLength = sizeof (ACPI_GTDT_TIMER_BLOCK);
--            GtCount = (ACPI_CAST_PTR (ACPI_GTDT_TIMER_BLOCK,
--                Subtable))->TimerCount;
-+            {
-+                UINT32 Tmp32;
-+
-+                Tmp32 = (ACPI_CAST_PTR (ACPI_GTDT_TIMER_BLOCK,
-+                    Subtable))->TimerCount;
-+                GtCount = AcpiUtReadUint32 (&Tmp32);
-+            }
- 
-             InfoTable = AcpiDmTableInfoGtdt0;
-             break;
-Index: acpica-unix2-20220331/source/compiler/dttable1.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/dttable1.c
-+++ acpica-unix2-20220331/source/compiler/dttable1.c
-@@ -1439,8 +1439,13 @@ DtCompileGtdt (
-             DtPushSubtable (Subtable);
-             ParentTable = DtPeekSubtable ();
- 
--            GtCount = (ACPI_CAST_PTR (ACPI_GTDT_TIMER_BLOCK,
--                Subtable->Buffer - sizeof(ACPI_GTDT_HEADER)))->TimerCount;
-+            {
-+                UINT32 Tmp32;
-+
-+                Tmp32 = (ACPI_CAST_PTR (ACPI_GTDT_TIMER_BLOCK,
-+                    Subtable->Buffer - sizeof (ACPI_GTDT_HEADER)))->TimerCount;
-+                GtCount = AcpiUtReadUint32 (&Tmp32);
-+            }
- 
-             while (GtCount)
-             {
diff --git a/0019-Support-HEST-in-a-big-endian-world.patch b/0019-Support-HEST-in-a-big-endian-world.patch
deleted file mode 100644
index e54f2ed..0000000
--- a/0019-Support-HEST-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 6b73a4881e436bb8cf86c05c1cc4b5360efe1c7f Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Wed, 23 Sep 2020 11:54:49 -0600
-Subject: [PATCH 19/45] Support HEST in a big-endian world
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/common/dmtbdump1.c  | 10 ++++++----
- source/compiler/dttable1.c |  4 +++-
- 2 files changed, 9 insertions(+), 5 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump1.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump1.c
-+++ acpica-unix2-20220331/source/common/dmtbdump1.c
-@@ -1517,12 +1517,13 @@ AcpiDmDumpHest (
- {
-     ACPI_STATUS             Status;
-     ACPI_HEST_HEADER        *Subtable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length = AcpiUtReadUint32 (&Table->Length);
-     UINT32                  Offset = sizeof (ACPI_TABLE_HEST);
-     ACPI_DMTABLE_INFO       *InfoTable;
-     UINT32                  SubtableLength;
-     UINT32                  BankCount;
-     ACPI_HEST_IA_ERROR_BANK *BankTable;
-+    UINT16                  SubtableType;
- 
- 
-     /* Main table */
-@@ -1536,10 +1537,11 @@ AcpiDmDumpHest (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_HEST_HEADER, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         BankCount = 0;
--        switch (Subtable->Type)
-+        SubtableType = Subtable->Type;
-+        switch (SubtableType)
-         {
-         case ACPI_HEST_TYPE_IA32_CHECK:
- 
-@@ -1606,7 +1608,7 @@ AcpiDmDumpHest (
-             /* Cannot continue on unknown type - no length */
- 
-             AcpiOsPrintf ("\n**** Unknown HEST subtable type 0x%X\n",
--                Subtable->Type);
-+                SubtableType);
-             return;
-         }
- 
-Index: acpica-unix2-20220331/source/compiler/dttable1.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/dttable1.c
-+++ acpica-unix2-20220331/source/compiler/dttable1.c
-@@ -1575,6 +1575,7 @@ DtCompileHest (
-     DT_FIELD                *SubtableStart;
-     ACPI_DMTABLE_INFO       *InfoTable;
-     UINT16                  Type;
-+    UINT16                  Tmp16;
-     UINT32                  BankCount;
- 
- 
-@@ -1593,7 +1594,8 @@ DtCompileHest (
-         /* Get subtable type */
- 
-         SubtableStart = *PFieldList;
--        DtCompileInteger ((UINT8 *) &Type, *PFieldList, 2, 0);
-+        DtCompileInteger ((UINT8 *) &Tmp16, *PFieldList, 2, 0);
-+        Type = AcpiUtReadUint32 (&Tmp16);
- 
-         switch (Type)
-         {
diff --git a/0020-Support-RSDT-RSD-PTR-in-a-big-endian-world.patch b/0020-Support-RSDT-RSD-PTR-in-a-big-endian-world.patch
deleted file mode 100644
index e47951d..0000000
--- a/0020-Support-RSDT-RSD-PTR-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 198abe6e9fcb03676513146bf2f9b8ccc49e5827 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Wed, 23 Sep 2020 12:11:46 -0600
-Subject: [PATCH 20/45] Support RSDT ('RSD PTR') in a big-endian world
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/common/dmtbdump.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump.c
-+++ acpica-unix2-20220331/source/common/dmtbdump.c
-@@ -336,6 +336,7 @@ AcpiDmDumpRsdt (
-     UINT32                  Entries;
-     UINT32                  Offset;
-     UINT32                  i;
-+    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
- 
- 
-     /* Point to start of table pointer array */
-@@ -345,12 +346,12 @@ AcpiDmDumpRsdt (
- 
-     /* RSDT uses 32-bit pointers */
- 
--    Entries = (Table->Length - sizeof (ACPI_TABLE_HEADER)) / sizeof (UINT32);
-+    Entries = (TableLength - sizeof (ACPI_TABLE_HEADER)) / sizeof (UINT32);
- 
-     for (i = 0; i < Entries; i++)
-     {
-         AcpiDmLineHeader2 (Offset, sizeof (UINT32), "ACPI Table Address", i);
--        AcpiOsPrintf ("%8.8X\n", Array[i]);
-+        AcpiOsPrintf ("%8.8X\n", AcpiUtReadUint32 (&Array[i]));
-         Offset += sizeof (UINT32);
-     }
- }
diff --git a/0021-Support-XSDT-in-a-big-endian-world.patch b/0021-Support-XSDT-in-a-big-endian-world.patch
deleted file mode 100644
index 86ca379..0000000
--- a/0021-Support-XSDT-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 75d974e42fefabfd6684d62f58bff678b55f396b Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Wed, 23 Sep 2020 12:16:37 -0600
-Subject: [PATCH 21/45] Support XSDT in a big-endian world
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/common/dmtbdump.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump.c
-+++ acpica-unix2-20220331/source/common/dmtbdump.c
-@@ -377,6 +377,7 @@ AcpiDmDumpXsdt (
-     UINT32                  Entries;
-     UINT32                  Offset;
-     UINT32                  i;
-+    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
- 
- 
-     /* Point to start of table pointer array */
-@@ -386,12 +387,13 @@ AcpiDmDumpXsdt (
- 
-     /* XSDT uses 64-bit pointers */
- 
--    Entries = (Table->Length - sizeof (ACPI_TABLE_HEADER)) / sizeof (UINT64);
-+    Entries = (TableLength - sizeof (ACPI_TABLE_HEADER)) / sizeof (UINT64);
- 
-     for (i = 0; i < Entries; i++)
-     {
-         AcpiDmLineHeader2 (Offset, sizeof (UINT64), "ACPI Table Address", i);
--        AcpiOsPrintf ("%8.8X%8.8X\n", ACPI_FORMAT_UINT64 (Array[i]));
-+        AcpiOsPrintf ("%8.8X%8.8X\n",
-+                ACPI_FORMAT_UINT64 (AcpiUtReadUint64 (&Array[i])));
-         Offset += sizeof (UINT64);
-     }
- }
diff --git a/0022-Support-SRAT-in-a-big-endian-world.patch b/0022-Support-SRAT-in-a-big-endian-world.patch
deleted file mode 100644
index 0993d26..0000000
--- a/0022-Support-SRAT-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 724fcc83d359e4c8abbd2a48755e96049afa06d6 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Wed, 23 Sep 2020 12:25:38 -0600
-Subject: [PATCH 22/45] Support SRAT in a big-endian world
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/common/dmtbdump3.c | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump3.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump3.c
-+++ acpica-unix2-20220331/source/common/dmtbdump3.c
-@@ -173,11 +173,12 @@ AcpiDmDumpSrat (
-     UINT32                  Offset = sizeof (ACPI_TABLE_SRAT);
-     ACPI_SUBTABLE_HEADER    *Subtable;
-     ACPI_DMTABLE_INFO       *InfoTable;
-+    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoSrat);
-+    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoSrat);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -186,12 +187,12 @@ AcpiDmDumpSrat (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < TableLength)
-     {
-         /* Common subtable header */
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
-             Subtable->Length, AcpiDmTableInfoSratHdr);
-         if (ACPI_FAILURE (Status))
-         {
-@@ -250,7 +251,7 @@ AcpiDmDumpSrat (
-         }
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
-             Subtable->Length, InfoTable);
-         if (ACPI_FAILURE (Status))
-         {
diff --git a/0023-Support-SLIT-in-a-big-endian-world.patch b/0023-Support-SLIT-in-a-big-endian-world.patch
deleted file mode 100644
index 15936a4..0000000
--- a/0023-Support-SLIT-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From b11d50752feb9f1b52db076d1fb4753b30a53642 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Wed, 23 Sep 2020 12:49:52 -0600
-Subject: [PATCH 23/45] Support SLIT in a big-endian world
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/common/dmtbdump3.c  | 8 +++++---
- source/compiler/dttable2.c | 2 +-
- 2 files changed, 6 insertions(+), 4 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump3.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump3.c
-+++ acpica-unix2-20220331/source/common/dmtbdump3.c
-@@ -96,11 +96,12 @@ AcpiDmDumpSlit (
-     UINT32                  Localities;
-     UINT32                  i;
-     UINT32                  j;
-+    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoSlit);
-+    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoSlit);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -108,7 +109,8 @@ AcpiDmDumpSlit (
- 
-     /* Display the Locality NxN Matrix */
- 
--    Localities = (UINT32) ACPI_CAST_PTR (ACPI_TABLE_SLIT, Table)->LocalityCount;
-+    Localities = (UINT32)
-+        AcpiUtReadUint64 (&ACPI_CAST_PTR (ACPI_TABLE_SLIT, Table)->LocalityCount);
-     Offset = ACPI_OFFSET (ACPI_TABLE_SLIT, Entry[0]);
-     Row = (UINT8 *) ACPI_CAST_PTR (ACPI_TABLE_SLIT, Table)->Entry;
- 
-@@ -121,7 +123,7 @@ AcpiDmDumpSlit (
-         {
-             /* Check for beyond EOT */
- 
--            if (Offset >= Table->Length)
-+            if (Offset >= TableLength)
-             {
-                 AcpiOsPrintf (
-                     "\n**** Not enough room in table for all localities\n");
-Index: acpica-unix2-20220331/source/compiler/dttable2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/dttable2.c
-+++ acpica-unix2-20220331/source/compiler/dttable2.c
-@@ -2234,7 +2234,7 @@ DtCompileSlit (
-     ParentTable = DtPeekSubtable ();
-     DtInsertSubtable (ParentTable, Subtable);
- 
--    Localities = *ACPI_CAST_PTR (UINT32, Subtable->Buffer);
-+    Localities = (UINT32) AcpiUtReadUint64 (Subtable->Buffer);
-     LocalityBuffer = UtLocalCalloc (Localities);
-     LocalityListLength = 0;
- 
diff --git a/0024-Support-MSCT-in-a-big-endian-world.patch b/0024-Support-MSCT-in-a-big-endian-world.patch
deleted file mode 100644
index 5ee3854..0000000
--- a/0024-Support-MSCT-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From ae38e1578d18abf41330bb3dbaef9ea56a52f49b Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Wed, 23 Sep 2020 15:44:21 -0600
-Subject: [PATCH 24/45] Support MSCT in a big-endian world
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/common/dmtbdump2.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20220331/source/common/dmtbdump2.c
-@@ -1185,11 +1185,12 @@ AcpiDmDumpMsct (
-     ACPI_STATUS             Status;
-     UINT32                  Offset = sizeof (ACPI_TABLE_MSCT);
-     ACPI_MSCT_PROXIMITY     *Subtable;
-+    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoMsct);
-+    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoMsct);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -1198,12 +1199,12 @@ AcpiDmDumpMsct (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_MSCT_PROXIMITY, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < TableLength)
-     {
-         /* Common subtable header */
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
-             sizeof (ACPI_MSCT_PROXIMITY), AcpiDmTableInfoMsct0);
-         if (ACPI_FAILURE (Status))
-         {
diff --git a/0025-Support-MPST-in-a-big-endian-world.patch b/0025-Support-MPST-in-a-big-endian-world.patch
deleted file mode 100644
index ef704b7..0000000
--- a/0025-Support-MPST-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-From 0a25688f36df62579f4dd0444ceba33a0f8d4dcc Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Wed, 23 Sep 2020 16:08:24 -0600
-Subject: [PATCH 25/45] Support MPST in a big-endian world
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/common/dmtbdump2.c  | 33 +++++++++++++++++++--------------
- source/compiler/dttable2.c |  8 ++++----
- 2 files changed, 23 insertions(+), 18 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20220331/source/common/dmtbdump2.c
-@@ -1047,11 +1047,13 @@ AcpiDmDumpMpst (
-     UINT16                  SubtableCount;
-     UINT32                  PowerStateCount;
-     UINT32                  ComponentCount;
-+    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
-+    UINT16                  Tmp16;
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoMpst);
-+    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoMpst);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -1059,13 +1061,14 @@ AcpiDmDumpMpst (
- 
-     /* Subtable: Memory Power Node(s) */
- 
--    SubtableCount = (ACPI_CAST_PTR (ACPI_TABLE_MPST, Table))->PowerNodeCount;
-+    Tmp16 = (ACPI_CAST_PTR (ACPI_TABLE_MPST, Table))->PowerNodeCount;
-+    SubtableCount = AcpiUtReadUint16 (&Tmp16);
-     Subtable0 = ACPI_ADD_PTR (ACPI_MPST_POWER_NODE, Table, Offset);
- 
--    while ((Offset < Table->Length) && SubtableCount)
-+    while ((Offset < TableLength) && SubtableCount)
-     {
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable0,
-+        Status = AcpiDmDumpTable (TableLength, Offset, Subtable0,
-             sizeof (ACPI_MPST_POWER_NODE), AcpiDmTableInfoMpst0);
-         if (ACPI_FAILURE (Status))
-         {
-@@ -1074,8 +1077,8 @@ AcpiDmDumpMpst (
- 
-         /* Extract the sub-subtable counts */
- 
--        PowerStateCount = Subtable0->NumPowerStates;
--        ComponentCount = Subtable0->NumPhysicalComponents;
-+        PowerStateCount = AcpiUtReadUint16 (&Subtable0->NumPowerStates);
-+        ComponentCount = AcpiUtReadUint16 (&Subtable0->NumPhysicalComponents);
-         Offset += sizeof (ACPI_MPST_POWER_NODE);
- 
-         /* Sub-subtables - Memory Power State Structure(s) */
-@@ -1086,7 +1089,7 @@ AcpiDmDumpMpst (
-         while (PowerStateCount)
-         {
-             AcpiOsPrintf ("\n");
--            Status = AcpiDmDumpTable (Table->Length, Offset, Subtable0A,
-+            Status = AcpiDmDumpTable (TableLength, Offset, Subtable0A,
-                 sizeof (ACPI_MPST_POWER_STATE), AcpiDmTableInfoMpst0A);
-             if (ACPI_FAILURE (Status))
-             {
-@@ -1109,7 +1112,7 @@ AcpiDmDumpMpst (
- 
-         while (ComponentCount)
-         {
--            Status = AcpiDmDumpTable (Table->Length, Offset, Subtable0B,
-+            Status = AcpiDmDumpTable (TableLength, Offset, Subtable0B,
-                 sizeof (ACPI_MPST_COMPONENT), AcpiDmTableInfoMpst0B);
-             if (ACPI_FAILURE (Status))
-             {
-@@ -1126,22 +1129,24 @@ AcpiDmDumpMpst (
-         SubtableCount--;
-         Subtable0 = ACPI_ADD_PTR (ACPI_MPST_POWER_NODE, Subtable0,
-             sizeof (ACPI_MPST_POWER_NODE) +
--            (sizeof (ACPI_MPST_POWER_STATE) * Subtable0->NumPowerStates) +
--            (sizeof (ACPI_MPST_COMPONENT) * Subtable0->NumPhysicalComponents));
-+            (sizeof (ACPI_MPST_POWER_STATE) *
-+                AcpiUtReadUint16 (&Subtable0->NumPowerStates)) +
-+            (sizeof (ACPI_MPST_COMPONENT) *
-+                AcpiUtReadUint16 (&Subtable0->NumPhysicalComponents)));
-     }
- 
-     /* Subtable: Count of Memory Power State Characteristic structures */
- 
-     AcpiOsPrintf ("\n");
-     Subtable1 = ACPI_CAST_PTR (ACPI_MPST_DATA_HDR, Subtable0);
--    Status = AcpiDmDumpTable (Table->Length, Offset, Subtable1,
-+    Status = AcpiDmDumpTable (TableLength, Offset, Subtable1,
-         sizeof (ACPI_MPST_DATA_HDR), AcpiDmTableInfoMpst1);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-     }
- 
--    SubtableCount = Subtable1->CharacteristicsCount;
-+    SubtableCount = AcpiUtReadUint16 (&Subtable1->CharacteristicsCount);
-     Offset += sizeof (ACPI_MPST_DATA_HDR);
- 
-     /* Subtable: Memory Power State Characteristics structure(s) */
-@@ -1149,10 +1154,10 @@ AcpiDmDumpMpst (
-     Subtable2 = ACPI_ADD_PTR (ACPI_MPST_POWER_DATA, Subtable1,
-         sizeof (ACPI_MPST_DATA_HDR));
- 
--    while ((Offset < Table->Length) && SubtableCount)
-+    while ((Offset < TableLength) && SubtableCount)
-     {
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable2,
-+        Status = AcpiDmDumpTable (TableLength, Offset, Subtable2,
-             sizeof (ACPI_MPST_POWER_DATA), AcpiDmTableInfoMpst2);
-         if (ACPI_FAILURE (Status))
-         {
-Index: acpica-unix2-20220331/source/compiler/dttable2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/dttable2.c
-+++ acpica-unix2-20220331/source/compiler/dttable2.c
-@@ -359,7 +359,7 @@ DtCompileMpst (
-     DtPushSubtable (Subtable);
- 
-     MpstChannelInfo = ACPI_CAST_PTR (ACPI_MPST_CHANNEL, Subtable->Buffer);
--    SubtableCount = MpstChannelInfo->PowerNodeCount;
-+    SubtableCount = AcpiUtReadUint16 (&MpstChannelInfo->PowerNodeCount);
- 
-     while (*PFieldList && SubtableCount)
-     {
-@@ -377,8 +377,8 @@ DtCompileMpst (
-         DtPushSubtable (Subtable);
- 
-         MpstPowerNode = ACPI_CAST_PTR (ACPI_MPST_POWER_NODE, Subtable->Buffer);
--        PowerStateCount = MpstPowerNode->NumPowerStates;
--        ComponentCount = MpstPowerNode->NumPhysicalComponents;
-+        PowerStateCount = AcpiUtReadUint16 (&MpstPowerNode->NumPowerStates);
-+        ComponentCount = AcpiUtReadUint16 (&MpstPowerNode->NumPhysicalComponents);
- 
-         ParentTable = DtPeekSubtable ();
- 
-@@ -431,7 +431,7 @@ DtCompileMpst (
-     DtPushSubtable (Subtable);
- 
-     MpstDataHeader = ACPI_CAST_PTR (ACPI_MPST_DATA_HDR, Subtable->Buffer);
--    SubtableCount = MpstDataHeader->CharacteristicsCount;
-+    SubtableCount = AcpiUtReadUint16(&MpstDataHeader->CharacteristicsCount);
- 
-     ParentTable = DtPeekSubtable ();
- 
diff --git a/0026-Support-NFIT-in-a-big-endian-world.patch b/0026-Support-NFIT-in-a-big-endian-world.patch
deleted file mode 100644
index 6b85634..0000000
--- a/0026-Support-NFIT-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,227 +0,0 @@
-From 5aec8511fc433a71cb8b6d26be464355d0c3f5cc Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Thu, 24 Sep 2020 15:25:53 -0600
-Subject: [PATCH 26/45] Support NFIT in a big-endian world
-
-NB: this required correcting the starting pointer for the NFIT
-SMBIOS subtable; otherwise, disassembly did not work properly.
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/common/dmtable.c    |  4 ++--
- source/common/dmtbdump2.c  | 49 ++++++++++++++++++++++----------------
- source/compiler/dttable2.c | 11 ++++++---
- 3 files changed, 39 insertions(+), 25 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtable.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtable.c
-+++ acpica-unix2-20220331/source/common/dmtable.c
-@@ -1766,13 +1766,13 @@ AcpiDmDumpTable (
- 
-             /* NFIT subtable types */
- 
--            Temp16 = ACPI_GET16 (Target);
-+            Temp16 = AcpiUtReadUint16 (Target);
-             if (Temp16 > ACPI_NFIT_TYPE_RESERVED)
-             {
-                 Temp16 = ACPI_NFIT_TYPE_RESERVED;
-             }
- 
--            AcpiOsPrintf (UINT16_FORMAT, ACPI_GET16 (Target),
-+            AcpiOsPrintf (UINT16_FORMAT, Temp16,
-                 AcpiDmNfitSubnames[Temp16]);
-             break;
- 
-Index: acpica-unix2-20220331/source/common/dmtbdump2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20220331/source/common/dmtbdump2.c
-@@ -1244,18 +1244,23 @@ AcpiDmDumpNfit (
-     ACPI_STATUS             Status;
-     UINT32                  Offset = sizeof (ACPI_TABLE_NFIT);
-     UINT32                  FieldOffset = 0;
--    UINT32                  Length;
-+    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
-     ACPI_NFIT_HEADER        *Subtable;
-     ACPI_DMTABLE_INFO       *InfoTable;
-     ACPI_NFIT_INTERLEAVE    *Interleave = NULL;
-     ACPI_NFIT_SMBIOS        *SmbiosInfo = NULL;
-     ACPI_NFIT_FLUSH_ADDRESS *Hint = NULL;
-     UINT32                  i;
-+    UINT32                  Length;
-+    UINT32                  LineCount;
-+    UINT16                  SubtableLength;
-+    UINT16                  SubtableType;
-+    UINT16                  HintCount;
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoNfit);
-+    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoNfit);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -1264,19 +1269,21 @@ AcpiDmDumpNfit (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_NFIT_HEADER, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < TableLength)
-     {
-         /* NFIT subtable header */
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
--            Subtable->Length, AcpiDmTableInfoNfitHdr);
-+        SubtableType = AcpiUtReadUint16 (&Subtable->Type);
-+        SubtableLength = AcpiUtReadUint16 (&Subtable->Length);
-+        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
-+            SubtableLength, AcpiDmTableInfoNfitHdr);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-         }
- 
--        switch (Subtable->Type)
-+        switch (SubtableType)
-         {
-         case ACPI_NFIT_TYPE_SYSTEM_ADDRESS:
- 
-@@ -1327,11 +1334,11 @@ AcpiDmDumpNfit (
- 
-         default:
-             AcpiOsPrintf ("\n**** Unknown NFIT subtable type 0x%X\n",
--                Subtable->Type);
-+                SubtableType);
- 
-             /* Attempt to continue */
- 
--            if (!Subtable->Length)
-+            if (!SubtableLength)
-             {
-                 AcpiOsPrintf ("Invalid zero length subtable\n");
-                 return;
-@@ -1340,8 +1347,8 @@ AcpiDmDumpNfit (
-         }
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
--            Subtable->Length, InfoTable);
-+        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
-+            SubtableLength, InfoTable);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -1349,14 +1356,15 @@ AcpiDmDumpNfit (
- 
-         /* Per-subtable variable-length fields */
- 
--        switch (Subtable->Type)
-+        switch (SubtableType)
-         {
-         case ACPI_NFIT_TYPE_INTERLEAVE:
- 
-             Interleave = ACPI_CAST_PTR (ACPI_NFIT_INTERLEAVE, Subtable);
--            for (i = 0; i < Interleave->LineCount; i++)
-+            LineCount = AcpiUtReadUint32 (&Interleave->LineCount);
-+            for (i = 0; i < LineCount; i++)
-             {
--                Status = AcpiDmDumpTable (Table->Length, Offset + FieldOffset,
-+                Status = AcpiDmDumpTable (TableLength, Offset + FieldOffset,
-                     &Interleave->LineOffset[i],
-                     sizeof (UINT32), AcpiDmTableInfoNfit2a);
-                 if (ACPI_FAILURE (Status))
-@@ -1370,14 +1378,14 @@ AcpiDmDumpNfit (
- 
-         case ACPI_NFIT_TYPE_SMBIOS:
- 
--            Length = Subtable->Length -
-+            Length = SubtableLength -
-                 sizeof (ACPI_NFIT_SMBIOS) + sizeof (UINT8);
- 
-             if (Length)
-             {
--                Status = AcpiDmDumpTable (Table->Length,
-+                Status = AcpiDmDumpTable (TableLength,
-                     sizeof (ACPI_NFIT_SMBIOS) - sizeof (UINT8),
--                    SmbiosInfo,
-+                    SmbiosInfo + Offset,
-                     Length, AcpiDmTableInfoNfit3a);
-                 if (ACPI_FAILURE (Status))
-                 {
-@@ -1390,9 +1398,10 @@ AcpiDmDumpNfit (
-         case ACPI_NFIT_TYPE_FLUSH_ADDRESS:
- 
-             Hint = ACPI_CAST_PTR (ACPI_NFIT_FLUSH_ADDRESS, Subtable);
--            for (i = 0; i < Hint->HintCount; i++)
-+            HintCount = AcpiUtReadUint16 (&Hint->HintCount);
-+            for (i = 0; i < HintCount; i++)
-             {
--                Status = AcpiDmDumpTable (Table->Length, Offset + FieldOffset,
-+                Status = AcpiDmDumpTable (TableLength, Offset + FieldOffset,
-                     &Hint->HintAddress[i],
-                     sizeof (UINT64), AcpiDmTableInfoNfit6a);
-                 if (ACPI_FAILURE (Status))
-@@ -1411,8 +1420,8 @@ AcpiDmDumpNfit (
- NextSubtable:
-         /* Point to next subtable */
- 
--        Offset += Subtable->Length;
--        Subtable = ACPI_ADD_PTR (ACPI_NFIT_HEADER, Subtable, Subtable->Length);
-+        Offset += SubtableLength;
-+        Subtable = ACPI_ADD_PTR (ACPI_NFIT_HEADER, Subtable, SubtableLength);
-     }
- }
- 
-Index: acpica-unix2-20220331/source/compiler/dttable2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/dttable2.c
-+++ acpica-unix2-20220331/source/compiler/dttable2.c
-@@ -506,6 +506,7 @@ DtCompileNfit (
-     UINT32                  Count;
-     ACPI_NFIT_INTERLEAVE    *Interleave = NULL;
-     ACPI_NFIT_FLUSH_ADDRESS *Hint = NULL;
-+    UINT16                  NfitHeaderType;
- 
- 
-     /* Main table */
-@@ -539,7 +540,8 @@ DtCompileNfit (
- 
-         NfitHeader = ACPI_CAST_PTR (ACPI_NFIT_HEADER, Subtable->Buffer);
- 
--        switch (NfitHeader->Type)
-+        NfitHeaderType = AcpiUtReadUint16 (&NfitHeader->Type);
-+        switch (NfitHeaderType)
-         {
-         case ACPI_NFIT_TYPE_SYSTEM_ADDRESS:
- 
-@@ -599,7 +601,7 @@ DtCompileNfit (
-         DtInsertSubtable (ParentTable, Subtable);
-         DtPopSubtable ();
- 
--        switch (NfitHeader->Type)
-+        switch (NfitHeaderType)
-         {
-         case ACPI_NFIT_TYPE_INTERLEAVE:
- 
-@@ -625,7 +627,8 @@ DtCompileNfit (
-                 Count++;
-             }
- 
--            Interleave->LineCount = Count;
-+            AcpiUtWriteUint (&Interleave->LineCount, sizeof (UINT32),
-+                &Count, sizeof (UINT32));
-             break;
- 
-         case ACPI_NFIT_TYPE_SMBIOS:
-@@ -671,6 +674,8 @@ DtCompileNfit (
-             }
- 
-             Hint->HintCount = (UINT16) Count;
-+            AcpiUtWriteUint (&Hint->HintCount, sizeof (UINT16),
-+                &Count, sizeof (UINT32));
-             break;
- 
-         default:
diff --git a/0027-Support-SDEV-in-a-big-endian-world.patch b/0027-Support-SDEV-in-a-big-endian-world.patch
deleted file mode 100644
index 680961e..0000000
--- a/0027-Support-SDEV-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,206 +0,0 @@
-From 3d1ac6e76ad0c0d6454671b190ccbbfafb0cb4cc Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Tue, 29 Jun 2021 16:03:36 -0600
-Subject: [PATCH 27/45] Support SDEV in a big-endian world
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/common/dmtbdump2.c  | 48 +++++++++++++++++++++-----------------
- source/compiler/dttable2.c | 27 ++++++++++++++++++++-
- 2 files changed, 52 insertions(+), 23 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20220331/source/common/dmtbdump2.c
-@@ -2581,7 +2581,7 @@ AcpiDmDumpSdev (
-     ACPI_SDEV_NAMESPACE         *Namesp;
-     ACPI_DMTABLE_INFO           *InfoTable;
-     ACPI_DMTABLE_INFO           *SecureComponentInfoTable;
--    UINT32                      Length = Table->Length;
-+    UINT32                      TableLength = AcpiUtReadUint32 (&Table->Length);
-     UINT32                      Offset = sizeof (ACPI_TABLE_SDEV);
-     UINT16                      PathOffset;
-     UINT16                      PathLength;
-@@ -2589,11 +2589,12 @@ AcpiDmDumpSdev (
-     UINT16                      VendorDataLength;
-     ACPI_SDEV_SECURE_COMPONENT  *SecureComponent = NULL;
-     UINT32                      CurrentOffset = 0;
-+    UINT16                      SubtableLength;
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoSdev);
-+    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoSdev);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -2602,13 +2603,14 @@ AcpiDmDumpSdev (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_SDEV_HEADER, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < TableLength)
-     {
-         /* Common subtable header */
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
--            Subtable->Length, AcpiDmTableInfoSdevHdr);
-+	SubtableLength = AcpiUtReadUint16 (&Subtable->Length);
-+        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
-+            SubtableLength, AcpiDmTableInfoSdevHdr);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -2631,8 +2633,8 @@ AcpiDmDumpSdev (
-         }
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, 0, Subtable,
--            Subtable->Length, InfoTable);
-+        Status = AcpiDmDumpTable (TableLength, 0, Subtable,
-+            SubtableLength, InfoTable);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -2691,12 +2693,12 @@ AcpiDmDumpSdev (
-             /* Dump the PCIe device ID(s) */
- 
-             Namesp = ACPI_CAST_PTR (ACPI_SDEV_NAMESPACE, Subtable);
--            PathOffset = Namesp->DeviceIdOffset;
--            PathLength = Namesp->DeviceIdLength;
-+            PathOffset = AcpiUtReadUint16 (&Namesp->DeviceIdOffset);
-+            PathLength = AcpiUtReadUint16 (&Namesp->DeviceIdLength);
- 
-             if (PathLength)
-             {
--                Status = AcpiDmDumpTable (Table->Length, CurrentOffset,
-+                Status = AcpiDmDumpTable (TableLength, CurrentOffset,
-                     ACPI_ADD_PTR (UINT8, Namesp, PathOffset),
-                     PathLength, AcpiDmTableInfoSdev0a);
-                 if (ACPI_FAILURE (Status))
-@@ -2708,14 +2710,14 @@ AcpiDmDumpSdev (
- 
-             /* Dump the vendor-specific data */
- 
--            VendorDataLength =
--                Namesp->VendorDataLength;
-+            VendorDataLength = AcpiUtReadUint16 (&Namesp->VendorDataLength);
-             VendorDataOffset =
--                Namesp->DeviceIdOffset + Namesp->DeviceIdLength;
-+                AcpiUtReadUint16 (&Namesp->DeviceIdOffset) +
-+		AcpiUtReadUint16 (&Namesp->DeviceIdLength);
- 
-             if (VendorDataLength)
-             {
--                Status = AcpiDmDumpTable (Table->Length, 0,
-+                Status = AcpiDmDumpTable (TableLength, 0,
-                     ACPI_ADD_PTR (UINT8, Namesp, VendorDataOffset),
-                     VendorDataLength, AcpiDmTableInfoSdev1b);
-                 if (ACPI_FAILURE (Status))
-@@ -2730,12 +2732,12 @@ AcpiDmDumpSdev (
-             /* PCI path substructures */
- 
-             Pcie = ACPI_CAST_PTR (ACPI_SDEV_PCIE, Subtable);
--            PathOffset = Pcie->PathOffset;
--            PathLength = Pcie->PathLength;
-+            PathOffset = AcpiUtReadUint16 (&Pcie->PathOffset);
-+            PathLength = AcpiUtReadUint16 (&Pcie->PathLength);
- 
-             while (PathLength)
-             {
--                Status = AcpiDmDumpTable (Table->Length,
-+                Status = AcpiDmDumpTable (TableLength,
-                     PathOffset + Offset,
-                     ACPI_ADD_PTR (UINT8, Pcie, PathOffset),
-                     sizeof (ACPI_SDEV_PCIE_PATH), AcpiDmTableInfoSdev1a);
-@@ -2750,12 +2752,14 @@ AcpiDmDumpSdev (
- 
-             /* VendorData */
- 
--            VendorDataLength = Pcie->VendorDataLength;
--            VendorDataOffset = Pcie->PathOffset + Pcie->PathLength;
-+            VendorDataLength = AcpiUtReadUint16 (&Pcie->VendorDataLength);
-+            VendorDataOffset = 
-+	            AcpiUtReadUint16 (&Pcie->PathOffset) +
-+	            AcpiUtReadUint16 (&Pcie->PathLength);
- 
-             if (VendorDataLength)
-             {
--                Status = AcpiDmDumpTable (Table->Length, 0,
-+                Status = AcpiDmDumpTable (TableLength, 0,
-                     ACPI_ADD_PTR (UINT8, Pcie, VendorDataOffset),
-                     VendorDataLength, AcpiDmTableInfoSdev1b);
-                 if (ACPI_FAILURE (Status))
-@@ -2772,8 +2776,8 @@ AcpiDmDumpSdev (
- NextSubtable:
-         /* Point to next subtable */
- 
--        Offset += Subtable->Length;
-+        Offset += SubtableLength;
-         Subtable = ACPI_ADD_PTR (ACPI_SDEV_HEADER, Subtable,
--            Subtable->Length);
-+            SubtableLength);
-     }
- }
-Index: acpica-unix2-20220331/source/compiler/dttable2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/dttable2.c
-+++ acpica-unix2-20220331/source/compiler/dttable2.c
-@@ -1890,6 +1890,7 @@ DtCompileSdev (
-     UINT32                      EntryCount;
-     ACPI_SDEV_SECURE_COMPONENT  *SecureComponent = NULL;
-     UINT16                      ComponentLength = 0;
-+    UINT16                      Tmp16;
- 
- 
-     /* Subtables */
-@@ -1911,7 +1912,7 @@ DtCompileSdev (
-         DtPushSubtable (Subtable);
- 
-         SdevHeader = ACPI_CAST_PTR (ACPI_SDEV_HEADER, Subtable->Buffer);
--        SdevHeader->Length = (UINT8)(sizeof (ACPI_SDEV_HEADER));
-+        SdevHeader->Length = (UINT16) (sizeof (ACPI_SDEV_HEADER));
- 
-         switch (SdevHeader->Type)
-         {
-@@ -2084,6 +2085,18 @@ DtCompileSdev (
-                 }
-             }
- 
-+            /* Make sure everything is now little-endian */
-+            Tmp16 = AcpiUtReadUint16 (&SdevHeader->Length);
-+            SdevHeader->Length = Tmp16;
-+            Tmp16 = AcpiUtReadUint16 (&Namesp->DeviceIdOffset);
-+            Namesp->DeviceIdOffset = Tmp16;
-+            Tmp16 = AcpiUtReadUint16 (&Namesp->DeviceIdLength);
-+            Namesp->DeviceIdLength = Tmp16;
-+            Tmp16 = AcpiUtReadUint16 (&Namesp->VendorDataOffset);
-+            Namesp->VendorDataOffset = Tmp16;
-+            Tmp16 = AcpiUtReadUint16 (&Namesp->VendorDataLength);
-+            Namesp->VendorDataLength = Tmp16;
-+
-             break;
- 
-         case ACPI_SDEV_TYPE_PCIE_ENDPOINT_DEVICE:
-@@ -2146,6 +2159,18 @@ DtCompileSdev (
-             SdevHeader->Length =
-                 sizeof (ACPI_SDEV_PCIE) +
-                 Pcie->PathLength + Pcie->VendorDataLength;
-+
-+            Tmp16 = AcpiUtReadUint16 (&SdevHeader->Length);
-+            SdevHeader->Length = Tmp16;
-+            Tmp16 = AcpiUtReadUint16 (&Pcie->PathOffset);
-+            Pcie->PathOffset = Tmp16;
-+            Tmp16 = AcpiUtReadUint16 (&Pcie->PathLength);
-+            Pcie->PathLength = Tmp16;
-+            Tmp16 = AcpiUtReadUint16 (&Pcie->VendorDataOffset);
-+            Pcie->VendorDataOffset = Tmp16;
-+            Tmp16 = AcpiUtReadUint16 (&Pcie->VendorDataLength);
-+            Pcie->VendorDataLength = Tmp16;
-+		
-             break;
- 
-         default:
diff --git a/0028-Support-HMAT-in-a-big-endian-world.patch b/0028-Support-HMAT-in-a-big-endian-world.patch
deleted file mode 100644
index 386db57..0000000
--- a/0028-Support-HMAT-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,278 +0,0 @@
-From 915b8b70726fd01befdeac0c8630db528ac40552 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Fri, 25 Sep 2020 16:56:55 -0600
-Subject: [PATCH 28/45] Support HMAT in a big-endian world
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/common/dmtbdump1.c  | 70 ++++++++++++++++++++++----------------
- source/compiler/dttable1.c | 24 ++++++++++---
- 2 files changed, 59 insertions(+), 35 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump1.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump1.c
-+++ acpica-unix2-20220331/source/common/dmtbdump1.c
-@@ -1680,37 +1680,45 @@ AcpiDmDumpHmat (
-     UINT32                  Length;
-     ACPI_DMTABLE_INFO       *InfoTable;
-     UINT32                  i, j;
-+    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
-+    UINT16                  HmatStructType;
-+    UINT32                  HmatStructLength;
-+    UINT32                  InitPDs;
-+    UINT32                  TgtPDs;
-+    UINT16                  SMBIOSHandles;
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoHmat);
-+    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoHmat);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-     }
-     Offset = sizeof (ACPI_TABLE_HMAT);
- 
--    while (Offset < Table->Length)
-+    while (Offset < TableLength)
-     {
-         AcpiOsPrintf ("\n");
- 
-         /* Dump HMAT structure header */
- 
-         HmatStruct = ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, Table, Offset);
--        if (HmatStruct->Length < sizeof (ACPI_HMAT_STRUCTURE))
-+        HmatStructLength = AcpiUtReadUint32 (&HmatStruct->Length);
-+        if (HmatStructLength < sizeof (ACPI_HMAT_STRUCTURE))
-         {
-             AcpiOsPrintf ("Invalid HMAT structure length\n");
-             return;
-         }
--        Status = AcpiDmDumpTable (Table->Length, Offset, HmatStruct,
--            HmatStruct->Length, AcpiDmTableInfoHmatHdr);
-+        Status = AcpiDmDumpTable (TableLength, Offset, HmatStruct,
-+            HmatStructLength, AcpiDmTableInfoHmatHdr);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-         }
- 
--        switch (HmatStruct->Type)
-+        HmatStructType = AcpiUtReadUint16 (&HmatStruct->Type);
-+        switch (HmatStructType)
-         {
-         case ACPI_HMAT_TYPE_ADDRESS_RANGE:
- 
-@@ -1733,7 +1741,7 @@ AcpiDmDumpHmat (
-         default:
- 
-             AcpiOsPrintf ("\n**** Unknown HMAT structure type 0x%X\n",
--                HmatStruct->Type);
-+                HmatStructType);
- 
-             /* Attempt to continue */
- 
-@@ -1742,13 +1750,13 @@ AcpiDmDumpHmat (
- 
-         /* Dump HMAT structure body */
- 
--        if (HmatStruct->Length < Length)
-+        if (HmatStructLength < Length)
-         {
-             AcpiOsPrintf ("Invalid HMAT structure length\n");
-             return;
-         }
--        Status = AcpiDmDumpTable (Table->Length, Offset, HmatStruct,
--            HmatStruct->Length, InfoTable);
-+        Status = AcpiDmDumpTable (TableLength, Offset, HmatStruct,
-+            HmatStructLength, InfoTable);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -1756,7 +1764,7 @@ AcpiDmDumpHmat (
- 
-         /* Dump HMAT structure additionals */
- 
--        switch (HmatStruct->Type)
-+        switch (HmatStructType)
-         {
-         case ACPI_HMAT_TYPE_LOCALITY:
- 
-@@ -1765,15 +1773,16 @@ AcpiDmDumpHmat (
- 
-             /* Dump initiator proximity domains */
- 
--            if ((UINT32)(HmatStruct->Length - SubtableOffset) <
--                (UINT32)(HmatLocality->NumberOfInitiatorPDs * 4))
-+            InitPDs = AcpiUtReadUint32 (&HmatLocality->NumberOfInitiatorPDs);
-+            if ((UINT32) (HmatStructLength - SubtableOffset) <
-+                (UINT32) (InitPDs * 4))
-             {
-                 AcpiOsPrintf ("Invalid initiator proximity domain number\n");
-                 return;
-             }
--            for (i = 0; i < HmatLocality->NumberOfInitiatorPDs; i++)
-+            for (i = 0; i < InitPDs; i++)
-             {
--                Status = AcpiDmDumpTable (Table->Length, Offset + SubtableOffset,
-+                Status = AcpiDmDumpTable (TableLength, Offset + SubtableOffset,
-                     ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, HmatStruct, SubtableOffset),
-                     4, AcpiDmTableInfoHmat1a);
-                 if (ACPI_FAILURE (Status))
-@@ -1786,15 +1795,16 @@ AcpiDmDumpHmat (
- 
-             /* Dump target proximity domains */
- 
--            if ((UINT32)(HmatStruct->Length - SubtableOffset) <
--                (UINT32)(HmatLocality->NumberOfTargetPDs * 4))
-+            TgtPDs = AcpiUtReadUint32 (&HmatLocality->NumberOfTargetPDs);
-+            if ((UINT32) (HmatStructLength - SubtableOffset) <
-+                (UINT32) (TgtPDs * 4))
-             {
-                 AcpiOsPrintf ("Invalid target proximity domain number\n");
-                 return;
-             }
--            for (i = 0; i < HmatLocality->NumberOfTargetPDs; i++)
-+            for (i = 0; i < TgtPDs; i++)
-             {
--                Status = AcpiDmDumpTable (Table->Length, Offset + SubtableOffset,
-+                Status = AcpiDmDumpTable (TableLength, Offset + SubtableOffset,
-                     ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, HmatStruct, SubtableOffset),
-                     4, AcpiDmTableInfoHmat1b);
-                 if (ACPI_FAILURE (Status))
-@@ -1807,18 +1817,17 @@ AcpiDmDumpHmat (
- 
-             /* Dump latency/bandwidth entris */
- 
--            if ((UINT32)(HmatStruct->Length - SubtableOffset) <
--                (UINT32)(HmatLocality->NumberOfInitiatorPDs *
--                         HmatLocality->NumberOfTargetPDs * 2))
-+            if ((UINT32) (HmatStructLength - SubtableOffset) <
-+                (UINT32) (InitPDs * TgtPDs * 2))
-             {
-                 AcpiOsPrintf ("Invalid latency/bandwidth entry number\n");
-                 return;
-             }
--            for (i = 0; i < HmatLocality->NumberOfInitiatorPDs; i++)
-+            for (i = 0; i < InitPDs; i++)
-             {
--                for (j = 0; j < HmatLocality->NumberOfTargetPDs; j++)
-+                for (j = 0; j < TgtPDs; j++)
-                 {
--                    Status = AcpiDmDumpTable (Table->Length, Offset + SubtableOffset,
-+                    Status = AcpiDmDumpTable (TableLength, Offset + SubtableOffset,
-                         ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, HmatStruct, SubtableOffset),
-                         2, AcpiDmTableInfoHmat1c);
-                     if (ACPI_FAILURE(Status))
-@@ -1838,15 +1847,16 @@ AcpiDmDumpHmat (
- 
-             /* Dump SMBIOS handles */
- 
--            if ((UINT32)(HmatStruct->Length - SubtableOffset) <
--                (UINT32)(HmatCache->NumberOfSMBIOSHandles * 2))
-+            SMBIOSHandles = AcpiUtReadUint16 (&HmatCache->NumberOfSMBIOSHandles);
-+            if ((UINT32) (HmatStructLength - SubtableOffset) <
-+                (UINT32) (SMBIOSHandles * 2))
-             {
-                 AcpiOsPrintf ("Invalid SMBIOS handle number\n");
-                 return;
-             }
--            for (i = 0; i < HmatCache->NumberOfSMBIOSHandles; i++)
-+            for (i = 0; i < SMBIOSHandles; i++)
-             {
--                Status = AcpiDmDumpTable (Table->Length, Offset + SubtableOffset,
-+                Status = AcpiDmDumpTable (TableLength, Offset + SubtableOffset,
-                     ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, HmatStruct, SubtableOffset),
-                     2, AcpiDmTableInfoHmat2a);
-                 if (ACPI_FAILURE (Status))
-@@ -1866,6 +1876,6 @@ AcpiDmDumpHmat (
- NextSubtable:
-         /* Point to next HMAT structure subtable */
- 
--        Offset += (HmatStruct->Length);
-+        Offset += (HmatStructLength);
-     }
- }
-Index: acpica-unix2-20220331/source/compiler/dttable1.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/dttable1.c
-+++ acpica-unix2-20220331/source/compiler/dttable1.c
-@@ -1737,6 +1737,8 @@ DtCompileHmat (
-     UINT32                  TgtPDNumber;
-     UINT64                  EntryNumber;
-     UINT16                  SMBIOSHandleNumber;
-+    UINT16                  HmatStructType;
-+    UINT32                  Length;
- 
- 
-     ParentTable = DtPeekSubtable ();
-@@ -1767,7 +1769,8 @@ DtCompileHmat (
- 
-         /* Compile HMAT structure body */
- 
--        switch (HmatStruct->Type)
-+        HmatStructType = AcpiUtReadUint16 (&HmatStruct->Type);
-+        switch (HmatStructType)
-         {
-         case ACPI_HMAT_TYPE_ADDRESS_RANGE:
- 
-@@ -1800,7 +1803,7 @@ DtCompileHmat (
- 
-         /* Compile HMAT structure additionals */
- 
--        switch (HmatStruct->Type)
-+        switch (HmatStructType)
-         {
-         case ACPI_HMAT_TYPE_LOCALITY:
- 
-@@ -1826,7 +1829,7 @@ DtCompileHmat (
-                 HmatStruct->Length += Subtable->Length;
-                 IntPDNumber++;
-             }
--            HmatLocality->NumberOfInitiatorPDs = IntPDNumber;
-+            HmatLocality->NumberOfInitiatorPDs = AcpiUtReadUint32 (&IntPDNumber);
- 
-             /* Compile target proximity domain list */
- 
-@@ -1847,7 +1850,7 @@ DtCompileHmat (
-                 HmatStruct->Length += Subtable->Length;
-                 TgtPDNumber++;
-             }
--            HmatLocality->NumberOfTargetPDs = TgtPDNumber;
-+            HmatLocality->NumberOfTargetPDs = AcpiUtReadUint32 (&TgtPDNumber);
- 
-             /* Save start of the entries for reporting errors */
- 
-@@ -1873,6 +1876,9 @@ DtCompileHmat (
-                 EntryNumber++;
-             }
- 
-+            Length = AcpiUtReadUint32 (&HmatStruct->Length);
-+            HmatStruct->Length = Length;
-+
-             /* Validate number of entries */
- 
-             if (EntryNumber !=
-@@ -1906,11 +1912,19 @@ DtCompileHmat (
-                 HmatStruct->Length += Subtable->Length;
-                 SMBIOSHandleNumber++;
-             }
--            HmatCache->NumberOfSMBIOSHandles = SMBIOSHandleNumber;
-+            HmatCache->NumberOfSMBIOSHandles =
-+                    AcpiUtReadUint16 (&SMBIOSHandleNumber);
-+
-+            Length = AcpiUtReadUint32 (&HmatStruct->Length);
-+            HmatStruct->Length = Length;
-+
-             break;
- 
-         default:
- 
-+        Length = AcpiUtReadUint32(&HmatStruct->Length);
-+        HmatStruct->Length = Length;
-+
-             break;
-         }
-     }
diff --git a/0029-Support-PDTT-in-a-big-endian-world.patch b/0029-Support-PDTT-in-a-big-endian-world.patch
deleted file mode 100644
index 51e41d1..0000000
--- a/0029-Support-PDTT-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 253fe3545e7d4eaa9cb93c771c9619f410109a02 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Fri, 25 Sep 2020 17:03:05 -0600
-Subject: [PATCH 29/45] Support PDTT in a big-endian world
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/common/dmtbdump2.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20220331/source/common/dmtbdump2.c
-@@ -1954,13 +1954,13 @@ AcpiDmDumpPdtt (
- {
-     ACPI_STATUS             Status;
-     ACPI_PDTT_CHANNEL       *Subtable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
-     UINT32                  Offset = sizeof (ACPI_TABLE_PDTT);
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoPdtt);
-+    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoPdtt);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -1969,10 +1969,10 @@ AcpiDmDumpPdtt (
-     /* Subtables. Currently there is only one type, but can be multiples */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_PDTT_CHANNEL, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < TableLength)
-     {
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
-             sizeof (ACPI_PDTT_CHANNEL), AcpiDmTableInfoPdtt0);
-         if (ACPI_FAILURE (Status))
-         {
diff --git a/0030-Support-PPTT-in-a-big-endian-world.patch b/0030-Support-PPTT-in-a-big-endian-world.patch
deleted file mode 100644
index 86fb5cd..0000000
--- a/0030-Support-PPTT-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 8923211d8bc1b0e4d3af6ff31ed6479057f612f6 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Fri, 25 Sep 2020 17:16:12 -0600
-Subject: [PATCH 30/45] Support PPTT in a big-endian world
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/common/dmtbdump2.c  | 17 ++++++++++-------
- source/compiler/dttable2.c |  7 +++++--
- 2 files changed, 15 insertions(+), 9 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20220331/source/common/dmtbdump2.c
-@@ -2241,6 +2241,8 @@ AcpiDmDumpPptt (
-     UINT32                  Offset = sizeof (ACPI_TABLE_FPDT);
-     ACPI_DMTABLE_INFO       *InfoTable;
-     UINT32                  i;
-+    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
-+    UINT32                  NumPrivRes;
- 
- 
-     /* There is no main table (other than the standard ACPI header) */
-@@ -2248,7 +2250,7 @@ AcpiDmDumpPptt (
-     /* Subtables */
- 
-     Offset = sizeof (ACPI_TABLE_HEADER);
--    while (Offset < Table->Length)
-+    while (Offset < TableLength)
-     {
-         AcpiOsPrintf ("\n");
- 
-@@ -2260,7 +2262,7 @@ AcpiDmDumpPptt (
-             AcpiOsPrintf ("Invalid subtable length\n");
-             return;
-         }
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
-             Subtable->Length, AcpiDmTableInfoPpttHdr);
-         if (ACPI_FAILURE (Status))
-         {
-@@ -2302,7 +2304,7 @@ AcpiDmDumpPptt (
-             AcpiOsPrintf ("Invalid subtable length\n");
-             return;
-         }
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
-             Subtable->Length, InfoTable);
-         if (ACPI_FAILURE (Status))
-         {
-@@ -2318,15 +2320,16 @@ AcpiDmDumpPptt (
- 
-             /* Dump SMBIOS handles */
- 
--            if ((UINT8)(Subtable->Length - SubtableOffset) <
--                (UINT8)(PpttProcessor->NumberOfPrivResources * 4))
-+            NumPrivRes = AcpiUtReadUint32 (&PpttProcessor->NumberOfPrivResources);
-+            if ((UINT8) (Subtable->Length - SubtableOffset) <
-+                (UINT8) (NumPrivRes * 4))
-             {
-                 AcpiOsPrintf ("Invalid private resource number\n");
-                 return;
-             }
--            for (i = 0; i < PpttProcessor->NumberOfPrivResources; i++)
-+            for (i = 0; i < NumPrivRes; i++)
-             {
--                Status = AcpiDmDumpTable (Table->Length, Offset + SubtableOffset,
-+                Status = AcpiDmDumpTable (TableLength, Offset + SubtableOffset,
-                     ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Subtable, SubtableOffset),
-                     4, AcpiDmTableInfoPptt0a);
-                 if (ACPI_FAILURE (Status))
-Index: acpica-unix2-20220331/source/compiler/dttable2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/dttable2.c
-+++ acpica-unix2-20220331/source/compiler/dttable2.c
-@@ -1520,6 +1520,7 @@ DtCompilePptt (
-     DT_FIELD                **PFieldList = (DT_FIELD **) List;
-     DT_FIELD                *SubtableStart;
-     ACPI_TABLE_HEADER       *PpttAcpiHeader;
-+    UINT32                  NumPrivRes;
- 
- 
-     ParentTable = DtPeekSubtable ();
-@@ -1584,7 +1585,7 @@ DtCompilePptt (
-             {
-                 /* Compile initiator proximity domain list */
- 
--                PpttProcessor->NumberOfPrivResources = 0;
-+                NumPrivRes = 0;
-                 while (*PFieldList)
-                 {
-                     Status = DtCompileTable (PFieldList,
-@@ -1600,8 +1601,10 @@ DtCompilePptt (
- 
-                     DtInsertSubtable (ParentTable, Subtable);
-                     PpttHeader->Length += (UINT8)(Subtable->Length);
--                    PpttProcessor->NumberOfPrivResources++;
-+                    NumPrivRes++;
-                 }
-+                PpttProcessor->NumberOfPrivResources =
-+                        AcpiUtReadUint32 (&NumPrivRes);
-             }
-             break;
- 
diff --git a/0031-Support-PCCT-in-a-big-endian-world.patch b/0031-Support-PCCT-in-a-big-endian-world.patch
deleted file mode 100644
index 6400618..0000000
--- a/0031-Support-PCCT-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From a58ff76fc6e68488d93b55016a7aeb257971a252 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Fri, 25 Sep 2020 17:39:34 -0600
-Subject: [PATCH 31/45] Support PCCT in a big-endian world
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/common/dmtbdump2.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20220331/source/common/dmtbdump2.c
-@@ -1850,13 +1850,13 @@ AcpiDmDumpPcct (
-     ACPI_STATUS             Status;
-     ACPI_PCCT_SUBSPACE      *Subtable;
-     ACPI_DMTABLE_INFO       *InfoTable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
-     UINT32                  Offset = sizeof (ACPI_TABLE_PCCT);
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoPcct);
-+    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoPcct);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -1865,12 +1865,12 @@ AcpiDmDumpPcct (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_PCCT_SUBSPACE, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < TableLength)
-     {
-         /* Common subtable header */
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
-             Subtable->Header.Length, AcpiDmTableInfoPcctHdr);
-         if (ACPI_FAILURE (Status))
-         {
-@@ -1918,7 +1918,7 @@ AcpiDmDumpPcct (
-         }
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
-             Subtable->Header.Length, InfoTable);
-         if (ACPI_FAILURE (Status))
-         {
diff --git a/0032-Support-WDAT-in-a-big-endian-world.patch b/0032-Support-WDAT-in-a-big-endian-world.patch
deleted file mode 100644
index 9bf59a7..0000000
--- a/0032-Support-WDAT-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From ff1449919ee7d395d301e3a56a4ba333604d0458 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Fri, 25 Sep 2020 18:13:20 -0600
-Subject: [PATCH 32/45] Support WDAT in a big-endian world
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/common/dmtbdump3.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump3.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump3.c
-+++ acpica-unix2-20220331/source/common/dmtbdump3.c
-@@ -680,11 +680,12 @@ AcpiDmDumpWdat (
-     ACPI_STATUS             Status;
-     UINT32                  Offset = sizeof (ACPI_TABLE_WDAT);
-     ACPI_WDAT_ENTRY         *Subtable;
-+    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoWdat);
-+    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoWdat);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -693,12 +694,12 @@ AcpiDmDumpWdat (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_WDAT_ENTRY, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < TableLength)
-     {
-         /* Common subtable header */
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
-             sizeof (ACPI_WDAT_ENTRY), AcpiDmTableInfoWdat0);
-         if (ACPI_FAILURE (Status))
-         {
diff --git a/0033-Support-TCPA-in-a-big-endian-world.patch b/0033-Support-TCPA-in-a-big-endian-world.patch
deleted file mode 100644
index bccfb52..0000000
--- a/0033-Support-TCPA-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From b69b833f5a9205080b27d83379a31fad7fca1575 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Sun, 27 Sep 2020 12:09:28 -0600
-Subject: [PATCH 33/45] Support TCPA in a big-endian world
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/common/dmtbdump3.c  | 13 ++++++++-----
- source/compiler/dttable2.c |  4 +++-
- 2 files changed, 11 insertions(+), 6 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump3.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump3.c
-+++ acpica-unix2-20220331/source/common/dmtbdump3.c
-@@ -406,11 +406,13 @@ AcpiDmDumpTcpa (
-     ACPI_TABLE_TCPA_HDR     *Subtable = ACPI_ADD_PTR (
-                                 ACPI_TABLE_TCPA_HDR, Table, Offset);
-     ACPI_STATUS             Status;
-+    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
-+    UINT16                  PlatformClass;
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table,
-+    Status = AcpiDmDumpTable (TableLength, 0, Table,
-         0, AcpiDmTableInfoTcpaHdr);
-     if (ACPI_FAILURE (Status))
-     {
-@@ -421,18 +423,19 @@ AcpiDmDumpTcpa (
-      * Examine the PlatformClass field to determine the table type.
-      * Either a client or server table. Only one.
-      */
--    switch (CommonHeader->PlatformClass)
-+    PlatformClass = AcpiUtReadUint16 (&CommonHeader->PlatformClass);
-+    switch (PlatformClass)
-     {
-     case ACPI_TCPA_CLIENT_TABLE:
- 
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
-             Table->Length - Offset, AcpiDmTableInfoTcpaClient);
-         break;
- 
-     case ACPI_TCPA_SERVER_TABLE:
- 
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
--            Table->Length - Offset, AcpiDmTableInfoTcpaServer);
-+        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
-+            TableLength - Offset, AcpiDmTableInfoTcpaServer);
-         break;
- 
-     default:
-Index: acpica-unix2-20220331/source/compiler/dttable2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/dttable2.c
-+++ acpica-unix2-20220331/source/compiler/dttable2.c
-@@ -2540,6 +2540,7 @@ DtCompileTcpa (
-     ACPI_TABLE_TCPA_HDR     *TcpaHeader;
-     DT_SUBTABLE             *ParentTable;
-     ACPI_STATUS             Status;
-+    UINT16                  PlatformClass;
- 
- 
-     /* Compile the main table */
-@@ -2560,7 +2561,8 @@ DtCompileTcpa (
-      */
-     TcpaHeader = ACPI_CAST_PTR (ACPI_TABLE_TCPA_HDR, ParentTable->Buffer);
- 
--    switch (TcpaHeader->PlatformClass)
-+    PlatformClass = AcpiUtReadUint16 (&TcpaHeader->PlatformClass);
-+    switch (PlatformClass)
-     {
-     case ACPI_TCPA_CLIENT_TABLE:
- 
diff --git a/0034-Support-STAO-in-a-big-endian-world.patch b/0034-Support-STAO-in-a-big-endian-world.patch
deleted file mode 100644
index 45edf5e..0000000
--- a/0034-Support-STAO-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From c313a76ce818135f02ab158a9f0c8e4b8e96698a Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Mon, 28 Sep 2020 11:49:42 -0600
-Subject: [PATCH 34/45] Support STAO in a big-endian world
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/common/dmtbdump3.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump3.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump3.c
-+++ acpica-unix2-20220331/source/common/dmtbdump3.c
-@@ -290,14 +290,14 @@ AcpiDmDumpStao (
- {
-     ACPI_STATUS             Status;
-     char                    *Namepath;
--    UINT32                  Length = Table->Length;
-+    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
-     UINT32                  StringLength;
-     UINT32                  Offset = sizeof (ACPI_TABLE_STAO);
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoStao);
-+    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoStao);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -305,7 +305,7 @@ AcpiDmDumpStao (
- 
-     /* The rest of the table consists of Namepath strings */
- 
--    while (Offset < Table->Length)
-+    while (Offset < TableLength)
-     {
-         Namepath = ACPI_ADD_PTR (char, Table, Offset);
-         StringLength = strlen (Namepath) + 1;
diff --git a/0035-Support-SLIC-and-MSDM-in-a-big-endian-world.patch b/0035-Support-SLIC-and-MSDM-in-a-big-endian-world.patch
deleted file mode 100644
index d30b3d6..0000000
--- a/0035-Support-SLIC-and-MSDM-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 948bebd1a0999bc3481641d3fc996c49432709c6 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Mon, 28 Sep 2020 12:49:23 -0600
-Subject: [PATCH 35/45] Support SLIC and MSDM in a big-endian world
-
-When dumping the SLIC table, it was also found that the code was
-not starting at the proper offset on disassembly.  Set the offset
-to the first byte after the header instead of the very beginning
-of the table.
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/common/dmtbdump3.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump3.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump3.c
-+++ acpica-unix2-20220331/source/common/dmtbdump3.c
-@@ -68,9 +68,11 @@ void
- AcpiDmDumpSlic (
-     ACPI_TABLE_HEADER       *Table)
- {
-+    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
- 
--    (void) AcpiDmDumpTable (Table->Length, sizeof (ACPI_TABLE_HEADER), Table,
--        Table->Length - sizeof (*Table), AcpiDmTableInfoSlic);
-+    (void) AcpiDmDumpTable (TableLength, sizeof (ACPI_TABLE_HEADER),
-+        (void *) (Table + sizeof (*Table)),
-+        TableLength - sizeof (*Table), AcpiDmTableInfoSlic);
- }
- 
- 
diff --git a/0036-Support-MCFG-in-a-big-endian-world.patch b/0036-Support-MCFG-in-a-big-endian-world.patch
deleted file mode 100644
index b8b09eb..0000000
--- a/0036-Support-MCFG-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 0fb79a24fb70ab1e1e4879220af82a9fa00af586 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Mon, 28 Sep 2020 13:01:18 -0600
-Subject: [PATCH 36/45] Support MCFG in a big-endian world
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/common/dmtbdump2.c | 11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20220331/source/common/dmtbdump2.c
-@@ -982,11 +982,12 @@ AcpiDmDumpMcfg (
-     ACPI_STATUS             Status;
-     UINT32                  Offset = sizeof (ACPI_TABLE_MCFG);
-     ACPI_MCFG_ALLOCATION    *Subtable;
-+    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoMcfg);
-+    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoMcfg);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -995,17 +996,17 @@ AcpiDmDumpMcfg (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_MCFG_ALLOCATION, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < TableLength)
-     {
--        if (Offset + sizeof (ACPI_MCFG_ALLOCATION) > Table->Length)
-+        if (Offset + sizeof (ACPI_MCFG_ALLOCATION) > TableLength)
-         {
-             AcpiOsPrintf ("Warning: there are %u invalid trailing bytes\n",
--                (UINT32) sizeof (ACPI_MCFG_ALLOCATION) - (Offset - Table->Length));
-+                (UINT32) sizeof (ACPI_MCFG_ALLOCATION) - (Offset - TableLength));
-             return;
-         }
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
-             sizeof (ACPI_MCFG_ALLOCATION), AcpiDmTableInfoMcfg0);
-         if (ACPI_FAILURE (Status))
-         {
diff --git a/0037-Support-LPIT-in-a-big-endian-world.patch b/0037-Support-LPIT-in-a-big-endian-world.patch
deleted file mode 100644
index 11f3ebc..0000000
--- a/0037-Support-LPIT-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From d10bfd67b5352ff5587e06fc1f82b896bab49614 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Mon, 28 Sep 2020 16:49:30 -0600
-Subject: [PATCH 37/45] Support LPIT in a big-endian world
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/common/dmtbdump2.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20220331/source/common/dmtbdump2.c
-@@ -690,7 +690,7 @@ AcpiDmDumpLpit (
- {
-     ACPI_STATUS             Status;
-     ACPI_LPIT_HEADER        *Subtable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
-     UINT32                  Offset = sizeof (ACPI_TABLE_LPIT);
-     ACPI_DMTABLE_INFO       *InfoTable;
-     UINT32                  SubtableLength;
-@@ -699,11 +699,11 @@ AcpiDmDumpLpit (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_LPIT_HEADER, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < TableLength)
-     {
-         /* Common subtable header */
- 
--        Status = AcpiDmDumpTable (Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
-             sizeof (ACPI_LPIT_HEADER), AcpiDmTableInfoLpitHdr);
-         if (ACPI_FAILURE (Status))
-         {
-@@ -727,7 +727,7 @@ AcpiDmDumpLpit (
-             return;
-         }
- 
--        Status = AcpiDmDumpTable (Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
-             SubtableLength, InfoTable);
-         if (ACPI_FAILURE (Status))
-         {
diff --git a/0038-Support-PMTT-in-a-big-endian-world.patch b/0038-Support-PMTT-in-a-big-endian-world.patch
deleted file mode 100644
index ca3ddc3..0000000
--- a/0038-Support-PMTT-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From bd19995fa268ed3e93c071162d0e9c2d35ada0d4 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Tue, 29 Jun 2021 16:23:30 -0600
-Subject: [PATCH 38/45] Support PMTT in a big-endian world
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/common/dmtbdump2.c | 18 ++++++++++--------
- 1 file changed, 10 insertions(+), 8 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20220331/source/common/dmtbdump2.c
-@@ -2142,8 +2142,9 @@ AcpiDmDumpPmtt (
- {
-     ACPI_STATUS             Status;
-     ACPI_PMTT_HEADER        *Subtable;
--    UINT32                  Length = Table->Length;
-+    UINT32                  Length = AcpiUtReadUint32 (&Table->Length);
-     UINT32                  Offset = sizeof (ACPI_TABLE_PMTT);
-+    UINT16                  SubtableLength;
- 
- 
-     /* Main table */
-@@ -2157,17 +2158,18 @@ AcpiDmDumpPmtt (
-     /* Subtables */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < Length)
-     {
-         /* Each of the types below contain the common subtable header */
- 
-         AcpiOsPrintf ("\n");
-+	SubtableLength = AcpiUtReadUint16 (&Subtable->Length);
-         switch (Subtable->Type)
-         {
-         case ACPI_PMTT_TYPE_SOCKET:
- 
-             Status = AcpiDmDumpTable (Length, Offset, Subtable,
--                Subtable->Length, AcpiDmTableInfoPmtt0);
-+                SubtableLength, AcpiDmTableInfoPmtt0);
-             if (ACPI_FAILURE (Status))
-             {
-                 return;
-@@ -2176,7 +2178,7 @@ AcpiDmDumpPmtt (
- 
-         case ACPI_PMTT_TYPE_CONTROLLER:
-             Status = AcpiDmDumpTable (Length, Offset, Subtable,
--                Subtable->Length, AcpiDmTableInfoPmtt1);
-+                SubtableLength, AcpiDmTableInfoPmtt1);
-             if (ACPI_FAILURE (Status))
-             {
-                 return;
-@@ -2185,7 +2187,7 @@ AcpiDmDumpPmtt (
- 
-        case ACPI_PMTT_TYPE_DIMM:
-             Status = AcpiDmDumpTable (Length, Offset, Subtable,
--                Subtable->Length, AcpiDmTableInfoPmtt2);
-+                SubtableLength, AcpiDmTableInfoPmtt2);
-             if (ACPI_FAILURE (Status))
-             {
-                 return;
-@@ -2194,7 +2196,7 @@ AcpiDmDumpPmtt (
- 
-         case ACPI_PMTT_TYPE_VENDOR:
-             Status = AcpiDmDumpTable (Length, Offset, Subtable,
--                Subtable->Length, AcpiDmTableInfoPmttVendor);
-+                SubtableLength, AcpiDmTableInfoPmttVendor);
-             if (ACPI_FAILURE (Status))
-             {
-                 return;
-@@ -2210,9 +2212,9 @@ AcpiDmDumpPmtt (
- 
-         /* Point to next subtable */
- 
--        Offset += Subtable->Length;
-+        Offset += SubtableLength;
-         Subtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER,
--            Subtable, Subtable->Length);
-+            Subtable, SubtableLength);
-     }
- }
- 
diff --git a/0039-Support-TPM2-in-a-big-endian-world.patch b/0039-Support-TPM2-in-a-big-endian-world.patch
deleted file mode 100644
index 1e26343..0000000
--- a/0039-Support-TPM2-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From c240ab3af6a4ad4405def7188e3d64da06a69f37 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Wed, 30 Sep 2020 18:42:38 -0600
-Subject: [PATCH 39/45] Support TPM2 in a big-endian world
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/common/dmtbdump3.c  | 18 ++++++++++--------
- source/compiler/dttable2.c |  8 +++++---
- 2 files changed, 15 insertions(+), 11 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump3.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump3.c
-+++ acpica-unix2-20220331/source/common/dmtbdump3.c
-@@ -475,11 +475,12 @@ AcpiDmDumpTpm2Rev3 (
-     ACPI_TABLE_TPM23        *CommonHeader = ACPI_CAST_PTR (ACPI_TABLE_TPM23, Table);
-     ACPI_TPM23_TRAILER      *Subtable = ACPI_ADD_PTR (ACPI_TPM23_TRAILER, Table, Offset);
-     ACPI_STATUS             Status;
-+    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoTpm23);
-+    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoTpm23);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -491,8 +492,8 @@ AcpiDmDumpTpm2Rev3 (
-     {
-     case ACPI_TPM23_ACPI_START_METHOD:
- 
--        (void) AcpiDmDumpTable (Table->Length, Offset, Subtable,
--            Table->Length - Offset, AcpiDmTableInfoTpm23a);
-+        (void) AcpiDmDumpTable (TableLength, Offset, Subtable,
-+            TableLength - Offset, AcpiDmTableInfoTpm23a);
-         break;
- 
-     default:
-@@ -522,6 +523,7 @@ AcpiDmDumpTpm2 (
-     ACPI_TPM2_TRAILER       *Subtable = ACPI_ADD_PTR (ACPI_TPM2_TRAILER, Table, Offset);
-     ACPI_TPM2_ARM_SMC       *ArmSubtable;
-     ACPI_STATUS             Status;
-+    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
- 
- 
-     if (Table->Revision == 3)
-@@ -532,7 +534,7 @@ AcpiDmDumpTpm2 (
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoTpm2);
-+    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoTpm2);
- 
-     if (ACPI_FAILURE (Status))
-     {
-@@ -540,8 +542,8 @@ AcpiDmDumpTpm2 (
-     }
- 
-     AcpiOsPrintf ("\n");
--    Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
--        Table->Length - Offset, AcpiDmTableInfoTpm2a);
-+    Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
-+        TableLength - Offset, AcpiDmTableInfoTpm2a);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -556,8 +558,8 @@ AcpiDmDumpTpm2 (
-         Offset += sizeof (ACPI_TPM2_TRAILER);
- 
-         AcpiOsPrintf ("\n");
--        (void) AcpiDmDumpTable (Table->Length, Offset, ArmSubtable,
--            Table->Length - Offset, AcpiDmTableInfoTpm211);
-+        (void) AcpiDmDumpTable (TableLength, Offset, ArmSubtable,
-+            TableLength - Offset, AcpiDmTableInfoTpm211);
-         break;
- 
-     default:
-Index: acpica-unix2-20220331/source/compiler/dttable2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/dttable2.c
-+++ acpica-unix2-20220331/source/compiler/dttable2.c
-@@ -2668,6 +2668,7 @@ DtCompileTpm2 (
-     DT_SUBTABLE             *ParentTable;
-     ACPI_STATUS             Status = AE_OK;
-     ACPI_TABLE_HEADER       *Header;
-+    UINT8                   StartMethod;
- 
- 
-     ParentTable = DtPeekSubtable ();
-@@ -2711,7 +2712,8 @@ DtCompileTpm2 (
- 
-     /* Subtable type depends on the StartMethod */
- 
--    switch (Tpm2Header->StartMethod)
-+    StartMethod = *(UINT8 *) &Tpm2Header->StartMethod;
-+    switch (StartMethod)
-     {
-     case ACPI_TPM2_COMMAND_BUFFER_WITH_ARM_SMC:
- 
-@@ -2742,7 +2744,7 @@ DtCompileTpm2 (
-     case ACPI_TPM2_RESERVED10:
- 
-         AcpiOsPrintf ("\n**** Reserved TPM2 Start Method type 0x%X\n",
--            Tpm2Header->StartMethod);
-+            StartMethod);
-         Status = AE_ERROR;
-         break;
- 
-@@ -2750,7 +2752,7 @@ DtCompileTpm2 (
-     default:
- 
-         AcpiOsPrintf ("\n**** Unknown TPM2 Start Method type 0x%X\n",
--            Tpm2Header->StartMethod);
-+            StartMethod);
-         Status = AE_ERROR;
-         break;
-     }
diff --git a/0040-Support-S3PT-in-a-big-endian-world.patch b/0040-Support-S3PT-in-a-big-endian-world.patch
deleted file mode 100644
index 00678b7..0000000
--- a/0040-Support-S3PT-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 9fc0e46189feb926b13713422ea2722e273a31b5 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Mon, 19 Oct 2020 17:30:30 -0400
-Subject: [PATCH 40/45] Support S3PT in a big-endian world
-
----
- source/common/dmtbdump2.c  | 15 +++++++++------
- source/compiler/dttable2.c |  4 +++-
- 2 files changed, 12 insertions(+), 7 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20220331/source/common/dmtbdump2.c
-@@ -2495,6 +2495,8 @@ AcpiDmDumpS3pt (
-     ACPI_FPDT_HEADER        *Subtable;
-     ACPI_DMTABLE_INFO       *InfoTable;
-     ACPI_TABLE_S3PT         *S3ptTable = ACPI_CAST_PTR (ACPI_TABLE_S3PT, Tables);
-+    UINT32                  S3ptTableLength = AcpiUtReadUint32 (&S3ptTable->Length);
-+    UINT16                  SubtableType;
- 
- 
-     /* Main table */
-@@ -2506,19 +2508,20 @@ AcpiDmDumpS3pt (
-     }
- 
-     Subtable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, S3ptTable, Offset);
--    while (Offset < S3ptTable->Length)
-+    while (Offset < S3ptTableLength)
-     {
-         /* Common subtable header */
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (S3ptTable->Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (S3ptTableLength, Offset, Subtable,
-             Subtable->Length, AcpiDmTableInfoS3ptHdr);
-         if (ACPI_FAILURE (Status))
-         {
-             return 0;
-         }
- 
--        switch (Subtable->Type)
-+        SubtableType = AcpiUtReadUint16 (&Subtable->Type);
-+        switch (SubtableType)
-         {
-         case ACPI_S3PT_TYPE_RESUME:
- 
-@@ -2533,7 +2536,7 @@ AcpiDmDumpS3pt (
-         default:
- 
-             AcpiOsPrintf ("\n**** Unknown S3PT subtable type 0x%X\n",
--                Subtable->Type);
-+                SubtableType);
- 
-             /* Attempt to continue */
- 
-@@ -2546,7 +2549,7 @@ AcpiDmDumpS3pt (
-         }
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (S3ptTable->Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (S3ptTableLength, Offset, Subtable,
-             Subtable->Length, InfoTable);
-         if (ACPI_FAILURE (Status))
-         {
-@@ -2560,7 +2563,7 @@ NextSubtable:
-         Subtable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, Subtable, Subtable->Length);
-     }
- 
--    return (S3ptTable->Length);
-+    return (S3ptTableLength);
- }
- 
- 
-Index: acpica-unix2-20220331/source/compiler/dttable2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/dttable2.c
-+++ acpica-unix2-20220331/source/compiler/dttable2.c
-@@ -1803,6 +1803,7 @@ DtCompileS3pt (
-     DT_SUBTABLE             *ParentTable;
-     ACPI_DMTABLE_INFO       *InfoTable;
-     DT_FIELD                *SubtableStart;
-+    UINT16                  S3ptHeaderType;
- 
- 
-     Status = DtCompileTable (PFieldList, AcpiDmTableInfoS3pt,
-@@ -1830,7 +1831,8 @@ DtCompileS3pt (
- 
-         S3ptHeader = ACPI_CAST_PTR (ACPI_FPDT_HEADER, Subtable->Buffer);
- 
--        switch (S3ptHeader->Type)
-+        S3ptHeaderType = AcpiUtReadUint16 (&S3ptHeader->Type);
-+        switch (S3ptHeaderType)
-         {
-         case ACPI_S3PT_TYPE_RESUME:
- 
diff --git a/0041-Support-IORT-in-a-big-endian-world.patch b/0041-Support-IORT-in-a-big-endian-world.patch
deleted file mode 100644
index 76c9efd..0000000
--- a/0041-Support-IORT-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,414 +0,0 @@
-From 5bd43bca1708a56d32e63da0278e04caf2865927 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Tue, 29 Jun 2021 17:38:20 -0600
-Subject: [PATCH 41/45] Support IORT in a big-endian world
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/common/dmtbdump2.c  | 85 ++++++++++++++++++++++----------------
- source/compiler/dttable1.c | 40 ++++++++++--------
- 2 files changed, 72 insertions(+), 53 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20220331/source/common/dmtbdump2.c
-@@ -77,17 +77,20 @@ AcpiDmDumpIort (
-     ACPI_IORT_RMR           *IortRmr = NULL;
-     UINT32                  Offset;
-     UINT32                  NodeOffset;
-+    UINT32                  NodeLength;
-     UINT32                  Length;
-     ACPI_DMTABLE_INFO       *InfoTable;
-     char                    *String;
-     UINT32                  i;
-     UINT32                  MappingByteLength;
-     UINT8                   Revision;
-+    UINT32                  MappingCount;
-+    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoIort);
-+    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoIort);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -109,18 +112,19 @@ AcpiDmDumpIort (
- 
-     /* Dump the OptionalPadding (optional) */
- 
--    if (Iort->NodeOffset > Offset)
-+    NodeOffset = AcpiUtReadUint32 (&Iort->NodeOffset);
-+    if (NodeOffset > Offset)
-     {
--        Status = AcpiDmDumpTable (Table->Length, Offset, Table,
--            Iort->NodeOffset - Offset, AcpiDmTableInfoIortPad);
-+        Status = AcpiDmDumpTable (TableLength, Offset, Table,
-+            NodeOffset - Offset, AcpiDmTableInfoIortPad);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-         }
-     }
- 
--    Offset = Iort->NodeOffset;
--    while (Offset < Table->Length)
-+    Offset = AcpiUtReadUint32 (&Iort->NodeOffset);
-+    while (Offset < TableLength)
-     {
-         /* Common subtable header */
- 
-@@ -130,12 +134,12 @@ AcpiDmDumpIort (
- 
-         if (Revision == 0)
-         {
--            Status = AcpiDmDumpTable (Table->Length, Offset,
-+            Status = AcpiDmDumpTable (TableLength, Offset,
-                 IortNode, Length, AcpiDmTableInfoIortHdr);
-         }
-         else if (Revision >= 3)
-         {
--            Status = AcpiDmDumpTable (Table->Length, Offset,
-+            Status = AcpiDmDumpTable (TableLength, Offset,
-                 IortNode, Length, AcpiDmTableInfoIortHdr3);
-         }
- 
-@@ -166,7 +170,7 @@ AcpiDmDumpIort (
-         case ACPI_IORT_NODE_PCI_ROOT_COMPLEX:
- 
-             InfoTable = AcpiDmTableInfoIort2;
--            Length = IortNode->Length - NodeOffset;
-+            Length = AcpiUtReadUint16 (&IortNode->Length) - NodeOffset;
-             break;
- 
-         case ACPI_IORT_NODE_SMMU:
-@@ -179,19 +183,19 @@ AcpiDmDumpIort (
-         case ACPI_IORT_NODE_SMMU_V3:
- 
-             InfoTable = AcpiDmTableInfoIort4;
--            Length = IortNode->Length - NodeOffset;
-+            Length = AcpiUtReadUint16 (&IortNode->Length) - NodeOffset;
-             break;
- 
-         case ACPI_IORT_NODE_PMCG:
- 
-             InfoTable = AcpiDmTableInfoIort5;
--            Length = IortNode->Length - NodeOffset;
-+            Length = AcpiUtReadUint16 (&IortNode->Length) - NodeOffset;
-             break;
- 
-         case ACPI_IORT_NODE_RMR:
- 
-             InfoTable = AcpiDmTableInfoIort6;
--            Length = IortNode->Length - NodeOffset;
-+            Length = AcpiUtReadUint16 (&IortNode->Length) - NodeOffset;
-             IortRmr = ACPI_ADD_PTR (ACPI_IORT_RMR, IortNode, NodeOffset);
-             break;
- 
-@@ -202,7 +206,7 @@ AcpiDmDumpIort (
- 
-             /* Attempt to continue */
- 
--            if (!IortNode->Length)
-+            if (!AcpiUtReadUint16 (&IortNode->Length))
-             {
-                 AcpiOsPrintf ("Invalid zero length IORT node\n");
-                 return;
-@@ -213,7 +217,7 @@ AcpiDmDumpIort (
-         /* Dump the node subtable header */
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
-+        Status = AcpiDmDumpTable (TableLength, Offset + NodeOffset,
-             ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
-             Length, InfoTable);
-         if (ACPI_FAILURE (Status))
-@@ -233,9 +237,10 @@ AcpiDmDumpIort (
- 
-             if (IortItsGroup)
-             {
--                for (i = 0; i < IortItsGroup->ItsCount; i++)
-+	        UINT32 ItsCount = AcpiUtReadUint32 (&IortItsGroup->ItsCount);
-+                for (i = 0; i < ItsCount; i++)
-                 {
--                    Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
-+                    Status = AcpiDmDumpTable (TableLength, Offset + NodeOffset,
-                         ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
-                         4, AcpiDmTableInfoIort0a);
-                     if (ACPI_FAILURE (Status))
-@@ -252,12 +257,14 @@ AcpiDmDumpIort (
- 
-             /* Dump the Padding (optional) */
- 
--            if (IortNode->Length > NodeOffset)
-+            NodeLength = AcpiUtReadUint16 (&IortNode->Length);
-+            if (NodeLength > NodeOffset)
-             {
-                 MappingByteLength =
--                    IortNode->MappingCount * sizeof (ACPI_IORT_ID_MAPPING);
--                Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
--                    Table, IortNode->Length - NodeOffset - MappingByteLength,
-+                    AcpiUtReadUint32 (&IortNode->MappingCount) *
-+		    sizeof (ACPI_IORT_ID_MAPPING);
-+                Status = AcpiDmDumpTable (TableLength, Offset + NodeOffset,
-+                    Table, NodeLength - NodeOffset - MappingByteLength,
-                     AcpiDmTableInfoIort1a);
-                 if (ACPI_FAILURE (Status))
-                 {
-@@ -274,9 +281,11 @@ AcpiDmDumpIort (
- 
-             if (IortSmmu)
-             {
-+	        UINT32 InterruptCount;
-+
-                 Length = 2 * sizeof (UINT64);
--                NodeOffset = IortSmmu->GlobalInterruptOffset;
--                Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
-+                NodeOffset = AcpiUtReadUint32 (&IortSmmu->GlobalInterruptOffset);
-+                Status = AcpiDmDumpTable (TableLength, Offset + NodeOffset,
-                     ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
-                     Length, AcpiDmTableInfoIort3a);
-                 if (ACPI_FAILURE (Status))
-@@ -284,10 +293,11 @@ AcpiDmDumpIort (
-                     return;
-                 }
- 
--                NodeOffset = IortSmmu->ContextInterruptOffset;
--                for (i = 0; i < IortSmmu->ContextInterruptCount; i++)
-+                NodeOffset = AcpiUtReadUint32 (&IortSmmu->ContextInterruptOffset);
-+                InterruptCount = AcpiUtReadUint32 (&IortSmmu->ContextInterruptCount);
-+                for (i = 0; i < InterruptCount; i++)
-                 {
--                    Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
-+                    Status = AcpiDmDumpTable (TableLength, Offset + NodeOffset,
-                         ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
-                         8, AcpiDmTableInfoIort3b);
-                     if (ACPI_FAILURE (Status))
-@@ -298,10 +308,11 @@ AcpiDmDumpIort (
-                     NodeOffset += 8;
-                 }
- 
--                NodeOffset = IortSmmu->PmuInterruptOffset;
--                for (i = 0; i < IortSmmu->PmuInterruptCount; i++)
-+                NodeOffset = AcpiUtReadUint32 (&IortSmmu->PmuInterruptOffset);
-+                InterruptCount = AcpiUtReadUint32 (&IortSmmu->PmuInterruptCount);
-+                for (i = 0; i < InterruptCount; i++)
-                 {
--                    Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
-+                    Status = AcpiDmDumpTable (TableLength, Offset + NodeOffset,
-                         ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
-                         8, AcpiDmTableInfoIort3c);
-                     if (ACPI_FAILURE (Status))
-@@ -319,12 +330,15 @@ AcpiDmDumpIort (
-             /* Validate IortRmr to avoid compiler warnings */
-             if (IortRmr)
-             {
--                NodeOffset = IortRmr->RmrOffset;
-+	        UINT32 RmrCount;
-+
-+                NodeOffset = AcpiUtReadUint32 (&IortRmr->RmrOffset);
-+                RmrCount = AcpiUtReadUint32 (&IortRmr->RmrCount);
-                 Length = sizeof (ACPI_IORT_RMR_DESC);
--                for (i = 0; i < IortRmr->RmrCount; i++)
-+                for (i = 0; i < RmrCount; i++)
-                 {
-                     AcpiOsPrintf ("\n");
--                    Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
-+                    Status = AcpiDmDumpTable (TableLength, Offset + NodeOffset,
-                         ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
-                         Length, AcpiDmTableInfoIort6a);
-                     if (ACPI_FAILURE (Status))
-@@ -344,12 +358,13 @@ AcpiDmDumpIort (
- 
-         /* Dump the ID mappings */
- 
--        NodeOffset = IortNode->MappingOffset;
--        for (i = 0; i < IortNode->MappingCount; i++)
-+        NodeOffset = AcpiUtReadUint32 (&IortNode->MappingOffset);
-+        MappingCount = AcpiUtReadUint32 (&IortNode->MappingCount);
-+        for (i = 0; i < MappingCount; i++)
-         {
-             AcpiOsPrintf ("\n");
-             Length = sizeof (ACPI_IORT_ID_MAPPING);
--            Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset,
-+            Status = AcpiDmDumpTable (TableLength, Offset + NodeOffset,
-                 ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset),
-                 Length, AcpiDmTableInfoIortMap);
-             if (ACPI_FAILURE (Status))
-@@ -363,7 +378,7 @@ AcpiDmDumpIort (
- NextSubtable:
-         /* Point to next node subtable */
- 
--        Offset += IortNode->Length;
-+        Offset += AcpiUtReadUint16 (&IortNode->Length);
-     }
- }
- 
-Index: acpica-unix2-20220331/source/compiler/dttable1.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/dttable1.c
-+++ acpica-unix2-20220331/source/compiler/dttable1.c
-@@ -1960,6 +1960,7 @@ DtCompileIort (
-     ACPI_IORT_ITS_GROUP     *IortItsGroup;
-     ACPI_IORT_SMMU          *IortSmmu;
-     ACPI_IORT_RMR           *IortRmr;
-+    UINT32                  IortNodeOffset;
-     UINT32                  NodeNumber;
-     UINT32                  NodeLength;
-     UINT32                  IdMappingNumber;
-@@ -2005,7 +2006,7 @@ DtCompileIort (
-      * Optionally allows the generic data types to be used for filling
-      * this field.
-      */
--    Iort->NodeOffset = sizeof (ACPI_TABLE_IORT);
-+    IortNodeOffset = sizeof (ACPI_TABLE_IORT);
-     Status = DtCompileTable (PFieldList, AcpiDmTableInfoIortPad,
-         &Subtable);
-     if (ACPI_FAILURE (Status))
-@@ -2015,7 +2016,7 @@ DtCompileIort (
-     if (Subtable)
-     {
-         DtInsertSubtable (ParentTable, Subtable);
--        Iort->NodeOffset += Subtable->Length;
-+        IortNodeOffset += Subtable->Length;
-     }
-     else
-     {
-@@ -2025,7 +2026,7 @@ DtCompileIort (
-         {
-             return (Status);
-         }
--        Iort->NodeOffset += PaddingLength;
-+        IortNodeOffset += PaddingLength;
-     }
- 
-     NodeNumber = 0;
-@@ -2089,7 +2090,7 @@ DtCompileIort (
-                 ItsNumber++;
-             }
- 
--            IortItsGroup->ItsCount = ItsNumber;
-+            IortItsGroup->ItsCount = AcpiUtReadUint32 (&ItsNumber);
-             break;
- 
-         case ACPI_IORT_NODE_NAMED_COMPONENT:
-@@ -2123,15 +2124,18 @@ DtCompileIort (
-             }
-             else
-             {
--                if (NodeLength > IortNode->MappingOffset)
-+	        UINT32 MappingOffset;
-+
-+                MappingOffset = IortNode->MappingOffset;
-+                if (NodeLength > MappingOffset)
-                 {
-                     return (AE_BAD_DATA);
-                 }
- 
--                if (NodeLength < IortNode->MappingOffset)
-+                if (NodeLength < MappingOffset)
-                 {
-                     Status = DtCompilePadding (
--                        IortNode->MappingOffset - NodeLength,
-+                        MappingOffset - NodeLength,
-                         &Subtable);
-                     if (ACPI_FAILURE (Status))
-                     {
-@@ -2139,7 +2143,7 @@ DtCompileIort (
-                     }
- 
-                     DtInsertSubtable (ParentTable, Subtable);
--                    NodeLength = IortNode->MappingOffset;
-+                    NodeLength = MappingOffset;
-                 }
-             }
-             break;
-@@ -2172,7 +2176,7 @@ DtCompileIort (
- 
-             /* Compile global interrupt array */
- 
--            IortSmmu->GlobalInterruptOffset = NodeLength;
-+            IortSmmu->GlobalInterruptOffset = AcpiUtReadUint32 (&NodeLength);
-             Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3a,
-                 &Subtable);
-             if (ACPI_FAILURE (Status))
-@@ -2186,7 +2190,7 @@ DtCompileIort (
-             /* Compile context interrupt array */
- 
-             ContextIrptNumber = 0;
--            IortSmmu->ContextInterruptOffset = NodeLength;
-+            IortSmmu->ContextInterruptOffset = AcpiUtReadUint32 (&NodeLength);
-             while (*PFieldList)
-             {
-                 Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3b,
-@@ -2206,12 +2210,12 @@ DtCompileIort (
-                 ContextIrptNumber++;
-             }
- 
--            IortSmmu->ContextInterruptCount = ContextIrptNumber;
-+            IortSmmu->ContextInterruptCount = AcpiUtReadUint32 (&ContextIrptNumber);
- 
-             /* Compile PMU interrupt array */
- 
-             PmuIrptNumber = 0;
--            IortSmmu->PmuInterruptOffset = NodeLength;
-+            IortSmmu->PmuInterruptOffset = AcpiUtReadUint32 (&NodeLength);
-             while (*PFieldList)
-             {
-                 Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3c,
-@@ -2231,7 +2235,7 @@ DtCompileIort (
-                 PmuIrptNumber++;
-             }
- 
--            IortSmmu->PmuInterruptCount = PmuIrptNumber;
-+            IortSmmu->PmuInterruptCount = AcpiUtReadUint32 (&PmuIrptNumber);
-             break;
- 
-         case ACPI_IORT_NODE_SMMU_V3:
-@@ -2276,7 +2280,7 @@ DtCompileIort (
-             /* Compile RMR Descriptors */
- 
-             RmrCount = 0;
--            IortRmr->RmrOffset = NodeLength;
-+            IortRmr->RmrOffset = AcpiUtReadUint32 (&NodeLength);
-             while (*PFieldList)
-             {
-                 Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort6a,
-@@ -2296,7 +2300,7 @@ DtCompileIort (
-                 RmrCount++;
-             }
- 
--            IortRmr->RmrCount = RmrCount;
-+            IortRmr->RmrCount = AcpiUtReadUint32 (&RmrCount);
-             break;
- 
-         default:
-@@ -2307,7 +2311,7 @@ DtCompileIort (
- 
-         /* Compile Array of ID mappings */
- 
--        IortNode->MappingOffset = NodeLength;
-+        IortNode->MappingOffset = AcpiUtReadUint32 (&NodeLength);
-         IdMappingNumber = 0;
-         while (*PFieldList)
-         {
-@@ -2328,7 +2332,7 @@ DtCompileIort (
-             IdMappingNumber++;
-         }
- 
--        IortNode->MappingCount = IdMappingNumber;
-+        IortNode->MappingCount = AcpiUtReadUint32 (&IdMappingNumber);
-         if (!IdMappingNumber)
-         {
-             IortNode->MappingOffset = 0;
-@@ -2343,7 +2347,7 @@ DtCompileIort (
-         NodeNumber++;
-     }
- 
--    Iort->NodeCount = NodeNumber;
-+    Iort->NodeCount = AcpiUtReadUint32 (&NodeNumber);
-     return (AE_OK);
- }
- 
diff --git a/0042-Support-IVRS-in-a-big-endian-world.patch b/0042-Support-IVRS-in-a-big-endian-world.patch
deleted file mode 100644
index 9d0a88f..0000000
--- a/0042-Support-IVRS-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-From b64cff82b2b33ed659826d777d2db039f64fd198 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Tue, 29 Jun 2021 17:45:24 -0600
-Subject: [PATCH 42/45] Support IVRS in a big-endian world
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/common/dmtbdump2.c | 34 +++++++++++++++++++---------------
- 1 file changed, 19 insertions(+), 15 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20220331/source/common/dmtbdump2.c
-@@ -419,11 +419,14 @@ AcpiDmDumpIvrs (
-     ACPI_IVRS_DE_HEADER     *DeviceEntry;
-     ACPI_IVRS_HEADER        *Subtable;
-     ACPI_DMTABLE_INFO       *InfoTable;
-+    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
-+    UINT16                  SubtableLength;
-+
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoIvrs);
-+    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoIvrs);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -433,8 +436,9 @@ AcpiDmDumpIvrs (
- 
-     Subtable = ACPI_ADD_PTR (ACPI_IVRS_HEADER, Table, Offset);
- 
--    while (Offset < Table->Length)
-+    while (Offset < TableLength)
-     {
-+        SubtableLength = AcpiUtReadUint16 (&Subtable->Length);
-         switch (Subtable->Type)
-         {
-         /* Type 10h, IVHD (I/O Virtualization Hardware Definition) */
-@@ -471,7 +475,7 @@ AcpiDmDumpIvrs (
- 
-             /* Attempt to continue */
- 
--            if (!Subtable->Length)
-+            if (!SubtableLength)
-             {
-                 AcpiOsPrintf ("Invalid zero length subtable\n");
-                 return;
-@@ -481,8 +485,8 @@ AcpiDmDumpIvrs (
- 
-         /* Dump the subtable */
- 
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
--            Subtable->Length, InfoTable);
-+        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
-+            SubtableLength, InfoTable);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -511,7 +515,7 @@ AcpiDmDumpIvrs (
- 
-             /* Process all of the Device Entries */
- 
--            while (EntryOffset < (Offset + Subtable->Length))
-+            while (EntryOffset < (Offset + SubtableLength))
-             {
-                 AcpiOsPrintf ("\n");
- 
-@@ -581,7 +585,7 @@ AcpiDmDumpIvrs (
- 
-                 /* Dump the Device Entry */
- 
--                Status = AcpiDmDumpTable (Table->Length, EntryOffset,
-+                Status = AcpiDmDumpTable (TableLength, EntryOffset,
-                     DeviceEntry, EntryLength, InfoTable);
-                 if (ACPI_FAILURE (Status))
-                 {
-@@ -605,12 +609,12 @@ AcpiDmDumpIvrs (
-                      */
-                     if (UtIsIdInteger ((UINT8 *) &HidSubtable->AcpiHid))
-                     {
--                        Status = AcpiDmDumpTable (Table->Length, EntryOffset,
-+                        Status = AcpiDmDumpTable (TableLength, EntryOffset,
-                             &HidSubtable->AcpiHid, 8, AcpiDmTableInfoIvrsHidInteger);
-                     }
-                     else
-                     {
--                        Status = AcpiDmDumpTable (Table->Length, EntryOffset,
-+                        Status = AcpiDmDumpTable (TableLength, EntryOffset,
-                             &HidSubtable->AcpiHid, 8, AcpiDmTableInfoIvrsHidString);
-                     }
-                     if (ACPI_FAILURE (Status))
-@@ -628,12 +632,12 @@ AcpiDmDumpIvrs (
-                      */
-                     if (UtIsIdInteger ((UINT8 *) &HidSubtable->AcpiCid))
-                     {
--                        Status = AcpiDmDumpTable (Table->Length, EntryOffset,
-+                        Status = AcpiDmDumpTable (TableLength, EntryOffset,
-                             &HidSubtable->AcpiCid, 8, AcpiDmTableInfoIvrsCidInteger);
-                     }
-                     else
-                     {
--                        Status = AcpiDmDumpTable (Table->Length, EntryOffset,
-+                        Status = AcpiDmDumpTable (TableLength, EntryOffset,
-                             &HidSubtable->AcpiCid, 8, AcpiDmTableInfoIvrsCidString);
-                     }
-                     if (ACPI_FAILURE (Status))
-@@ -650,7 +654,7 @@ AcpiDmDumpIvrs (
- 
-                         if (HidSubtable->UidType == ACPI_IVRS_UID_IS_STRING)
-                         {
--                            Status = AcpiDmDumpTable (Table->Length, EntryOffset,
-+                            Status = AcpiDmDumpTable (TableLength, EntryOffset,
-                                 &HidSubtable->UidType, EntryLength, AcpiDmTableInfoIvrsUidString);
-                             if (ACPI_FAILURE (Status))
-                             {
-@@ -659,7 +663,7 @@ AcpiDmDumpIvrs (
-                         }
-                         else /* ACPI_IVRS_UID_IS_INTEGER */
-                         {
--                            Status = AcpiDmDumpTable (Table->Length, EntryOffset,
-+                            Status = AcpiDmDumpTable (TableLength, EntryOffset,
-                                 &HidSubtable->UidType, EntryLength, AcpiDmTableInfoIvrsUidInteger);
-                             if (ACPI_FAILURE (Status))
-                             {
-@@ -678,8 +682,8 @@ AcpiDmDumpIvrs (
- NextSubtable:
-         /* Point to next subtable */
- 
--        Offset += Subtable->Length;
--        Subtable = ACPI_ADD_PTR (ACPI_IVRS_HEADER, Subtable, Subtable->Length);
-+        Offset += SubtableLength;
-+        Subtable = ACPI_ADD_PTR (ACPI_IVRS_HEADER, Subtable, SubtableLength);
-     }
- }
- 
diff --git a/0043-Support-DSDT-SSDT-in-a-big-endian-world.patch b/0043-Support-DSDT-SSDT-in-a-big-endian-world.patch
deleted file mode 100644
index 777f74a..0000000
--- a/0043-Support-DSDT-SSDT-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,3171 +0,0 @@
-From 14d220a34462e61fe69141c86f4c3cd2ae68c279 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Wed, 30 Sep 2020 18:59:57 -0600
-Subject: [PATCH 43/45] Support DSDT/SSDT in a big-endian world.
-
-NB: this is a very large diff.  The problem is that ResourceTemplates
-are treated differently during compilation and disassembly so each of
-the resource types had code that needed to be touched directly.
-
-In general, however, just reading or writing individual AML opcodes
-wasn't that much of a change, and most of it was on the codegen side.
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/common/adwalk.c                     |   3 +-
- source/common/dmrestag.c                   |   2 +-
- source/common/dmtables.c                   |  17 +-
- source/common/dmtbdump.c                   |   3 +-
- source/common/dmtbdump3.c                  |   8 +-
- source/compiler/aslcodegen.c               |  59 ++++--
- source/compiler/aslopcodes.c               |   3 +-
- source/compiler/aslrestype1.c              |  60 ++++--
- source/compiler/aslrestype1i.c             |  35 ++--
- source/compiler/aslrestype2.c              |  20 +-
- source/compiler/aslrestype2d.c             |  99 ++++++----
- source/compiler/aslrestype2e.c             |  90 ++++++---
- source/compiler/aslrestype2q.c             |  81 +++++---
- source/compiler/aslrestype2s.c             | 214 +++++++++++++++++----
- source/compiler/aslrestype2w.c             |  94 +++++----
- source/compiler/dttable2.c                 |   3 +-
- source/components/disassembler/dmbuffer.c  |  37 +++-
- source/components/disassembler/dmopcode.c  |  21 +-
- source/components/disassembler/dmresrc.c   |   2 +-
- source/components/disassembler/dmresrcl.c  |  43 +++--
- source/components/disassembler/dmresrcl2.c | 128 +++++++-----
- source/components/disassembler/dmresrcs.c  |  18 +-
- source/components/disassembler/dmwalk.c    |   2 +-
- source/components/namespace/nsaccess.c     |   2 +-
- source/components/namespace/nsnames.c      |   4 +-
- source/components/namespace/nsparse.c      |   6 +-
- source/components/namespace/nsutils.c      |   7 +-
- source/components/utilities/utresrc.c      |   2 +-
- 28 files changed, 721 insertions(+), 341 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/adwalk.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/adwalk.c
-+++ acpica-unix2-20220331/source/common/adwalk.c
-@@ -679,7 +679,8 @@ AcpiDmLoadDescendingOp (
- 
-         if (!Path && Op->Common.AmlOpcode == AML_INT_NAMEDFIELD_OP)
-         {
--            *ACPI_CAST_PTR (UINT32, &FieldPath[0]) = Op->Named.Name;
-+            AcpiUtWriteUint (FieldPath, ACPI_NAMESEG_SIZE,
-+		             &Op->Named.Name, ACPI_NAMESEG_SIZE);
-             FieldPath[4] = 0;
-             Path = FieldPath;
-         }
-Index: acpica-unix2-20220331/source/common/dmrestag.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmrestag.c
-+++ acpica-unix2-20220331/source/common/dmrestag.c
-@@ -1048,7 +1048,7 @@ AcpiDmAddResourcesToNamespace (
-      * NextOp contains the Aml pointer and the Aml length
-      */
-     AcpiUtWalkAmlResources (NULL, (UINT8 *) NextOp->Named.Data,
--        (ACPI_SIZE) NextOp->Common.Value.Integer,
-+        (ACPI_SIZE) NextOp->Common.Value.Size,
-         AcpiDmAddResourceToNamespace, (void **) BufferNode);
- }
- 
-Index: acpica-unix2-20220331/source/common/dmtables.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtables.c
-+++ acpica-unix2-20220331/source/common/dmtables.c
-@@ -142,6 +142,10 @@ AdCreateTableHeader (
-     ACPI_TABLE_HEADER       *Table)
- {
-     UINT8                   Checksum;
-+    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
-+    UINT32                  OemRevision = AcpiUtReadUint32 (&Table->OemRevision);
-+    UINT32                  CompilerRevision =
-+                                AcpiUtReadUint32 (&Table->AslCompilerRevision);
- 
- 
-     /* Reset globals for External statements */
-@@ -156,7 +160,7 @@ AdCreateTableHeader (
- 
-     AcpiOsPrintf (" * Original Table Header:\n");
-     AcpiOsPrintf (" *     Signature        \"%4.4s\"\n",    Table->Signature);
--    AcpiOsPrintf (" *     Length           0x%8.8X (%u)\n", Table->Length, Table->Length);
-+    AcpiOsPrintf (" *     Length           0x%8.8X (%u)\n", TableLength, TableLength);
- 
-     /* Print and validate the revision */
- 
-@@ -188,7 +192,7 @@ AdCreateTableHeader (
- 
-     AcpiOsPrintf ("\n *     Checksum         0x%2.2X",        Table->Checksum);
- 
--    Checksum = AcpiTbChecksum (ACPI_CAST_PTR (UINT8, Table), Table->Length);
-+    Checksum = AcpiTbChecksum (ACPI_CAST_PTR (UINT8, Table), TableLength);
-     if (Checksum)
-     {
-         AcpiOsPrintf (" **** Incorrect checksum, should be 0x%2.2X",
-@@ -198,9 +202,9 @@ AdCreateTableHeader (
-     AcpiOsPrintf ("\n");
-     AcpiOsPrintf (" *     OEM ID           \"%.6s\"\n",     Table->OemId);
-     AcpiOsPrintf (" *     OEM Table ID     \"%.8s\"\n",     Table->OemTableId);
--    AcpiOsPrintf (" *     OEM Revision     0x%8.8X (%u)\n", Table->OemRevision, Table->OemRevision);
-+    AcpiOsPrintf (" *     OEM Revision     0x%8.8X (%u)\n", OemRevision, OemRevision);
-     AcpiOsPrintf (" *     Compiler ID      \"%.4s\"\n",     Table->AslCompilerId);
--    AcpiOsPrintf (" *     Compiler Version 0x%8.8X (%u)\n", Table->AslCompilerRevision, Table->AslCompilerRevision);
-+    AcpiOsPrintf (" *     Compiler Version 0x%8.8X (%u)\n", CompilerRevision, CompilerRevision);
-     AcpiOsPrintf (" */\n");
- 
-     /*
-@@ -221,7 +225,7 @@ AdCreateTableHeader (
-     AcpiOsPrintf (
-         "DefinitionBlock (\"\", \"%4.4s\", %u, \"%.6s\", \"%.8s\", 0x%8.8X)\n",
-         Table->Signature, Table->Revision,
--        Table->OemId, Table->OemTableId, Table->OemRevision);
-+        Table->OemId, Table->OemTableId, OemRevision);
- }
- 
- 
-@@ -396,7 +400,8 @@ AdParseTable (
- 
-     fprintf (stderr, "Pass 1 parse of [%4.4s]\n", (char *) Table->Signature);
- 
--    AmlLength = Table->Length - sizeof (ACPI_TABLE_HEADER);
-+    AmlLength = AcpiUtReadUint32 (&Table->Length);
-+    AmlLength -= sizeof (ACPI_TABLE_HEADER);
-     AmlStart = ((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER));
- 
-     AcpiUtSetIntegerWidth (Table->Revision);
-Index: acpica-unix2-20220331/source/common/dmtbdump.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump.c
-+++ acpica-unix2-20220331/source/common/dmtbdump.c
-@@ -392,8 +392,7 @@ AcpiDmDumpXsdt (
-     for (i = 0; i < Entries; i++)
-     {
-         AcpiDmLineHeader2 (Offset, sizeof (UINT64), "ACPI Table Address", i);
--        AcpiOsPrintf ("%8.8X%8.8X\n",
--                ACPI_FORMAT_UINT64 (AcpiUtReadUint64 (&Array[i])));
-+        AcpiOsPrintf ("%16.16lX\n", AcpiUtReadUint64 (&Array[i]));
-         Offset += sizeof (UINT64);
-     }
- }
-Index: acpica-unix2-20220331/source/common/dmtbdump3.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump3.c
-+++ acpica-unix2-20220331/source/common/dmtbdump3.c
-@@ -741,12 +741,13 @@ AcpiDmDumpWpbt (
- {
-     ACPI_STATUS             Status;
-     ACPI_TABLE_WPBT         *Subtable;
-+    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
-     UINT16                  ArgumentsLength;
- 
- 
-     /* Dump the main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoWpbt);
-+    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoWpbt);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -755,13 +756,13 @@ AcpiDmDumpWpbt (
-     /* Extract the arguments buffer length from the main table */
- 
-     Subtable = ACPI_CAST_PTR (ACPI_TABLE_WPBT, Table);
--    ArgumentsLength = Subtable->ArgumentsLength;
-+    ArgumentsLength = AcpiUtReadUint16 (&Subtable->ArgumentsLength);
- 
-     /* Dump the arguments buffer if present */
- 
-     if (ArgumentsLength)
-     {
--        (void) AcpiDmDumpTable (Table->Length, 0, Table, ArgumentsLength,
-+        (void) AcpiDmDumpTable (TableLength, 0, Table, ArgumentsLength,
-             AcpiDmTableInfoWpbt0);
-     }
- }
-Index: acpica-unix2-20220331/source/compiler/aslcodegen.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/aslcodegen.c
-+++ acpica-unix2-20220331/source/compiler/aslcodegen.c
-@@ -238,6 +238,10 @@ CgWriteAmlOpcode (
- {
-     UINT8                   PkgLenFirstByte;
-     UINT32                  i;
-+    UINT8                   Tmp8;
-+    UINT16                  Tmp16;
-+    UINT32                  Tmp32;
-+    UINT64                  Tmp64;
-     union {
-         UINT16                  Opcode;
-         UINT8                   OpcodeBytes[2];
-@@ -312,14 +316,15 @@ CgWriteAmlOpcode (
- 
-         /* Check for two-byte opcode */
- 
-+        Tmp16 = AcpiUtReadUint16 (&Aml.Opcode);
-         if (Aml.Opcode > 0x00FF)
-         {
-             /* Write the high byte first */
- 
--            CgLocalWriteAmlData (Op, &Aml.OpcodeBytes[1], 1);
-+            CgLocalWriteAmlData (Op, ((UINT8 *) &Tmp16)+1, 1);
-         }
- 
--        CgLocalWriteAmlData (Op, &Aml.OpcodeBytes[0], 1);
-+        CgLocalWriteAmlData (Op, (UINT8 *) &Tmp16, 1);
- 
-         /* Subtreelength doesn't include length of package length bytes */
- 
-@@ -335,7 +340,8 @@ CgWriteAmlOpcode (
-         {
-             /* Simplest case -- no bytes to follow, just write the count */
- 
--            CgLocalWriteAmlData (Op, &PkgLen.LenBytes[0], 1);
-+            Tmp8 = (UINT8) PkgLen.Len;
-+            CgLocalWriteAmlData (Op, &Tmp8, 1);
-         }
-         else if (Op->Asl.AmlPkgLenBytes != 0)
-         {
-@@ -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
-              */
-+            Tmp8 = (UINT8) PkgLen.Len;
-             PkgLenFirstByte = (UINT8)
-                 (((UINT32) (Op->Asl.AmlPkgLenBytes - 1) << 6) |
--                (PkgLen.LenBytes[0] & 0x0F));
-+                (Tmp8 & 0x0F));
- 
-             CgLocalWriteAmlData (Op, &PkgLenFirstByte, 1);
- 
-@@ -359,6 +366,9 @@ CgWriteAmlOpcode (
-              * Now we can write the remaining bytes -
-              * either 1, 2, or 3 bytes
-              */
-+            Tmp32 = PkgLen.Len;
-+            AcpiUtWriteUint (&PkgLen.Len, Op->Asl.AmlPkgLenBytes,
-+                &Tmp32, sizeof (UINT32));
-             for (i = 0; i < (UINT32) (Op->Asl.AmlPkgLenBytes - 1); i++)
-             {
-                 CgLocalWriteAmlData (Op, &PkgLen.LenBytes[i], 1);
-@@ -370,22 +380,30 @@ CgWriteAmlOpcode (
-     {
-     case AML_BYTE_OP:
- 
--        CgLocalWriteAmlData (Op, &Op->Asl.Value.Integer, 1);
-+        Tmp64 = 0;
-+        AcpiUtWriteUint (&Tmp64, 1, &Op->Asl.Value.Integer, 8);
-+        CgLocalWriteAmlData (Op, &Tmp64, 1);
-         break;
- 
-     case AML_WORD_OP:
- 
--        CgLocalWriteAmlData (Op, &Op->Asl.Value.Integer, 2);
--       break;
-+        Tmp64 = 0;
-+        AcpiUtWriteUint (&Tmp64, 2, &Op->Asl.Value.Integer, 8);
-+        CgLocalWriteAmlData (Op, &Tmp64, 2);
-+        break;
- 
-     case AML_DWORD_OP:
- 
--        CgLocalWriteAmlData (Op, &Op->Asl.Value.Integer, 4);
-+        Tmp64 = 0;
-+        AcpiUtWriteUint (&Tmp64, 4, &Op->Asl.Value.Integer, 8);
-+        CgLocalWriteAmlData (Op, &Tmp64, 4);
-         break;
- 
-     case AML_QWORD_OP:
- 
--        CgLocalWriteAmlData (Op, &Op->Asl.Value.Integer, 8);
-+        Tmp64 = 0;
-+        AcpiUtWriteUint (&Tmp64, 8, &Op->Asl.Value.Integer, 8);
-+        CgLocalWriteAmlData (Op, &Tmp64, 8);
-         break;
- 
-     case AML_STRING_OP:
-@@ -423,6 +441,7 @@ CgWriteTableHeader (
-     ACPI_PARSE_OBJECT       *Child;
-     UINT32                  CommentLength;
-     ACPI_COMMENT_NODE       *Current;
-+    UINT32                  Tmp32;
- 
- 
-     memset (&AslGbl_TableHeader, 0, sizeof (ACPI_TABLE_HEADER));
-@@ -478,7 +497,9 @@ CgWriteTableHeader (
-     /* OEM Revision */
- 
-     Child = Child->Asl.Next;
--    AslGbl_TableHeader.OemRevision = (UINT32) Child->Asl.Value.Integer;
-+    AcpiUtWriteUint (&Tmp32, sizeof (UINT32),
-+           &Child->Asl.Value.Integer, sizeof (Child->Asl.Value.Integer));
-+    AslGbl_TableHeader.OemRevision = Tmp32;
- 
-     /* Compiler ID */
- 
-@@ -486,7 +507,8 @@ CgWriteTableHeader (
- 
-     /* Compiler version */
- 
--    AslGbl_TableHeader.AslCompilerRevision = ACPI_CA_VERSION;
-+    Tmp32 = ACPI_CA_VERSION;
-+    AslGbl_TableHeader.AslCompilerRevision = AcpiUtReadUint32 (&Tmp32);
- 
-     /* Table length. Checksum zero for now, will rewrite later */
- 
-@@ -541,6 +563,15 @@ CgWriteTableHeader (
-     AslGbl_TableHeader.Checksum = 0;
-     Op->Asl.FinalAmlOffset = ftell (AslGbl_Files[ASL_FILE_AML_OUTPUT].Handle);
- 
-+    /*
-+     * Adjust the Table length; it will only change when big-endian
-+     * but we have to wait until here in case there is arithmetic to
-+     * be done on the length before this step in the function
-+     */
-+
-+    Tmp32 = AslGbl_TableHeader.Length;
-+    AslGbl_TableHeader.Length = AcpiUtReadUint32 (&Tmp32);
-+
-     /* Write entire header and clear the table header global */
- 
-     CgLocalWriteAmlData (Op, &AslGbl_TableHeader, sizeof (ACPI_TABLE_HEADER));
-@@ -625,6 +656,7 @@ CgWriteNode (
-     ACPI_PARSE_OBJECT       *Op)
- {
-     ASL_RESOURCE_NODE       *Rnode;
-+    UINT64                  Tmp64;
- 
- 
-     /* Write all comments here. */
-@@ -653,7 +685,10 @@ CgWriteNode (
-     case AML_RAW_DATA_DWORD:
-     case AML_RAW_DATA_QWORD:
- 
--        CgLocalWriteAmlData (Op, &Op->Asl.Value.Integer, Op->Asl.AmlLength);
-+        Tmp64 = 0;
-+        AcpiUtWriteUint (&Tmp64, Op->Asl.AmlLength,
-+            &Op->Asl.Value.Integer, sizeof (UINT64));
-+        CgLocalWriteAmlData (Op, &Tmp64, Op->Asl.AmlLength);
-         return;
- 
- 
-Index: acpica-unix2-20220331/source/compiler/aslopcodes.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/aslopcodes.c
-+++ acpica-unix2-20220331/source/compiler/aslopcodes.c
-@@ -511,7 +511,8 @@ OpcDoUnicode (
- 
-     for (i = 0; i < Count; i++)
-     {
--        UnicodeString[i] = (UINT16) AsciiString[i];
-+        AcpiUtWriteUint (&UnicodeString[i], sizeof (UINT16),
-+                &AsciiString[i], sizeof (UINT8));
-     }
- 
-     /*
-Index: acpica-unix2-20220331/source/compiler/aslrestype1.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/aslrestype1.c
-+++ acpica-unix2-20220331/source/compiler/aslrestype1.c
-@@ -143,6 +143,7 @@ RsDoMemory24Descriptor (
-     ASL_RESOURCE_NODE       *Rnode;
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-+    UINT16                  Tmp16;
- 
- 
-     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -151,7 +152,8 @@ RsDoMemory24Descriptor (
- 
-     Descriptor = Rnode->Buffer;
-     Descriptor->Memory24.DescriptorType = ACPI_RESOURCE_NAME_MEMORY24;
--    Descriptor->Memory24.ResourceLength = 9;
-+    Tmp16 = 9;
-+    Descriptor->Memory24.ResourceLength = AcpiUtReadUint16 (&Tmp16);
- 
-     /* Process all child initialization nodes */
- 
-@@ -168,7 +170,8 @@ RsDoMemory24Descriptor (
- 
-         case 1: /* Min Address */
- 
--            Descriptor->Memory24.Minimum = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Memory24.Minimum = AcpiUtReadUint16 (&Tmp16);
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_MINADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Memory24.Minimum));
-             MinOp = InitializerOp;
-@@ -176,7 +179,8 @@ RsDoMemory24Descriptor (
- 
-         case 2: /* Max Address */
- 
--            Descriptor->Memory24.Maximum = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Memory24.Maximum = AcpiUtReadUint16 (&Tmp16);
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_MAXADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Memory24.Maximum));
-             MaxOp = InitializerOp;
-@@ -184,14 +188,16 @@ RsDoMemory24Descriptor (
- 
-         case 3: /* Alignment */
- 
--            Descriptor->Memory24.Alignment = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Memory24.Alignment = AcpiUtReadUint16 (&Tmp16);
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_ALIGNMENT,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Memory24.Alignment));
-             break;
- 
-         case 4: /* Length */
- 
--            Descriptor->Memory24.AddressLength = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Memory24.AddressLength = AcpiUtReadUint16 (&Tmp16);
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Memory24.AddressLength));
-             LengthOp = InitializerOp;
-@@ -214,10 +220,10 @@ RsDoMemory24Descriptor (
-     /* Validate the Min/Max/Len/Align values (Alignment==0 means 64K) */
- 
-     RsSmallAddressCheck (ACPI_RESOURCE_NAME_MEMORY24,
--        Descriptor->Memory24.Minimum,
--        Descriptor->Memory24.Maximum,
--        Descriptor->Memory24.AddressLength,
--        Descriptor->Memory24.Alignment,
-+        (UINT32) AcpiUtReadUint16 (&Descriptor->Memory24.Minimum),
-+        (UINT32) AcpiUtReadUint16 (&Descriptor->Memory24.Maximum),
-+        (UINT32) AcpiUtReadUint16 (&Descriptor->Memory24.AddressLength),
-+        (UINT32) AcpiUtReadUint16 (&Descriptor->Memory24.Alignment),
-         MinOp, MaxOp, LengthOp, NULL, Info->DescriptorTypeOp);
- 
-     return (Rnode);
-@@ -249,6 +255,8 @@ RsDoMemory32Descriptor (
-     ASL_RESOURCE_NODE       *Rnode;
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-+    UINT16                  Tmp16;
-+    UINT32                  Tmp32;
- 
- 
-     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -257,7 +265,8 @@ RsDoMemory32Descriptor (
- 
-     Descriptor = Rnode->Buffer;
-     Descriptor->Memory32.DescriptorType = ACPI_RESOURCE_NAME_MEMORY32;
--    Descriptor->Memory32.ResourceLength = 17;
-+    Tmp16 = 17;
-+    Descriptor->Memory32.ResourceLength = AcpiUtReadUint16 (&Tmp16);
- 
-     /* Process all child initialization nodes */
- 
-@@ -274,7 +283,8 @@ RsDoMemory32Descriptor (
- 
-         case 1:  /* Min Address */
- 
--            Descriptor->Memory32.Minimum = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Memory32.Minimum = AcpiUtReadUint32 (&Tmp32);
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_MINADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Memory32.Minimum));
-             MinOp = InitializerOp;
-@@ -282,7 +292,8 @@ RsDoMemory32Descriptor (
- 
-         case 2: /* Max Address */
- 
--            Descriptor->Memory32.Maximum = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Memory32.Maximum = AcpiUtReadUint32 (&Tmp32);
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Memory32.Maximum));
-             MaxOp = InitializerOp;
-@@ -290,7 +301,8 @@ RsDoMemory32Descriptor (
- 
-         case 3: /* Alignment */
- 
--            Descriptor->Memory32.Alignment = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Memory32.Alignment = AcpiUtReadUint32 (&Tmp32);
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_ALIGNMENT,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Memory32.Alignment));
-             AlignOp = InitializerOp;
-@@ -298,7 +310,8 @@ RsDoMemory32Descriptor (
- 
-         case 4: /* Length */
- 
--            Descriptor->Memory32.AddressLength = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Memory32.AddressLength = AcpiUtReadUint32 (&Tmp32);
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Memory32.AddressLength));
-             LengthOp = InitializerOp;
-@@ -321,10 +334,10 @@ RsDoMemory32Descriptor (
-     /* Validate the Min/Max/Len/Align values */
- 
-     RsSmallAddressCheck (ACPI_RESOURCE_NAME_MEMORY32,
--        Descriptor->Memory32.Minimum,
--        Descriptor->Memory32.Maximum,
--        Descriptor->Memory32.AddressLength,
--        Descriptor->Memory32.Alignment,
-+        AcpiUtReadUint32 (&Descriptor->Memory32.Minimum),
-+        AcpiUtReadUint32 (&Descriptor->Memory32.Maximum),
-+        AcpiUtReadUint32 (&Descriptor->Memory32.AddressLength),
-+        AcpiUtReadUint32 (&Descriptor->Memory32.Alignment),
-         MinOp, MaxOp, LengthOp, AlignOp, Info->DescriptorTypeOp);
- 
-     return (Rnode);
-@@ -352,6 +365,8 @@ RsDoMemory32FixedDescriptor (
-     ASL_RESOURCE_NODE       *Rnode;
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-+    UINT16                  Tmp16;
-+    UINT32                  Tmp32;
- 
- 
-     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -360,7 +375,8 @@ RsDoMemory32FixedDescriptor (
- 
-     Descriptor = Rnode->Buffer;
-     Descriptor->FixedMemory32.DescriptorType = ACPI_RESOURCE_NAME_FIXED_MEMORY32;
--    Descriptor->FixedMemory32.ResourceLength = 9;
-+    Tmp16 = 9;
-+    Descriptor->FixedMemory32.ResourceLength = AcpiUtReadUint16 (&Tmp16);
- 
-     /* Process all child initialization nodes */
- 
-@@ -377,14 +393,16 @@ RsDoMemory32FixedDescriptor (
- 
-         case 1: /* Address */
- 
--            Descriptor->FixedMemory32.Address = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->FixedMemory32.Address = AcpiUtReadUint32 (&Tmp32);
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_BASEADDRESS,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (FixedMemory32.Address));
-             break;
- 
-         case 2: /* Length */
- 
--            Descriptor->FixedMemory32.AddressLength = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->FixedMemory32.AddressLength = AcpiUtReadUint32 (&Tmp32);
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (FixedMemory32.AddressLength));
-             break;
-Index: acpica-unix2-20220331/source/compiler/aslrestype1i.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/aslrestype1i.c
-+++ acpica-unix2-20220331/source/compiler/aslrestype1i.c
-@@ -199,6 +199,7 @@ RsDoFixedDmaDescriptor (
-     ASL_RESOURCE_NODE       *Rnode;
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-+    UINT16                  Tmp16;
- 
- 
-     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -217,14 +218,16 @@ RsDoFixedDmaDescriptor (
-         {
-         case 0: /* DMA Request Lines [WORD] (_DMA) */
- 
--            Descriptor->FixedDma.RequestLines = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->FixedDma.RequestLines = AcpiUtReadUint16 (&Tmp16);
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_DMA,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (FixedDma.RequestLines));
-             break;
- 
-         case 1: /* DMA Channel [WORD] (_TYP) */
- 
--            Descriptor->FixedDma.Channels = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->FixedDma.Channels = AcpiUtReadUint16 (&Tmp16);
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_DMATYPE,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (FixedDma.Channels));
-             break;
-@@ -275,6 +278,7 @@ RsDoFixedIoDescriptor (
-     ASL_RESOURCE_NODE       *Rnode;
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-+    UINT16                  Tmp16;
- 
- 
-     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -293,8 +297,8 @@ RsDoFixedIoDescriptor (
-         {
-         case 0: /* Base Address */
- 
--            Descriptor->FixedIo.Address =
--                (UINT16) InitializerOp->Asl.Value.Integer;
-+            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->FixedIo.Address = AcpiUtReadUint16 (&Tmp16);
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_BASEADDRESS,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (FixedIo.Address));
-             AddressOp = InitializerOp;
-@@ -324,7 +328,7 @@ RsDoFixedIoDescriptor (
- 
-     /* Error checks */
- 
--    if (Descriptor->FixedIo.Address > 0x03FF)
-+    if (AcpiUtReadUint16 (&Descriptor->FixedIo.Address) > 0x03FF)
-     {
-         AslError (ASL_WARNING, ASL_MSG_ISA_ADDRESS, AddressOp, NULL);
-     }
-@@ -358,6 +362,7 @@ RsDoIoDescriptor (
-     ASL_RESOURCE_NODE       *Rnode;
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-+    UINT16                  Tmp16;
- 
- 
-     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -383,8 +388,8 @@ RsDoIoDescriptor (
- 
-         case 1:  /* Min Address */
- 
--            Descriptor->Io.Minimum =
--                (UINT16) InitializerOp->Asl.Value.Integer;
-+            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Io.Minimum = AcpiUtReadUint16 (&Tmp16);
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_MINADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Io.Minimum));
-             MinOp = InitializerOp;
-@@ -392,8 +397,8 @@ RsDoIoDescriptor (
- 
-         case 2: /* Max Address */
- 
--            Descriptor->Io.Maximum =
--                (UINT16) InitializerOp->Asl.Value.Integer;
-+            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Io.Maximum = AcpiUtReadUint16 (&Tmp16);
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_MAXADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Io.Maximum));
-             MaxOp = InitializerOp;
-@@ -434,10 +439,10 @@ RsDoIoDescriptor (
-     /* Validate the Min/Max/Len/Align values */
- 
-     RsSmallAddressCheck (ACPI_RESOURCE_NAME_IO,
--        Descriptor->Io.Minimum,
--        Descriptor->Io.Maximum,
--        Descriptor->Io.AddressLength,
--        Descriptor->Io.Alignment,
-+        (UINT32) (AcpiUtReadUint16 (&Descriptor->Io.Minimum)),
-+        (UINT32) (AcpiUtReadUint16 (&Descriptor->Io.Maximum)),
-+        (UINT32) Descriptor->Io.AddressLength,
-+        (UINT32) Descriptor->Io.Alignment,
-         MinOp, MaxOp, LengthOp, AlignOp, Info->DescriptorTypeOp);
- 
-     return (Rnode);
-@@ -561,7 +566,7 @@ RsDoIrqDescriptor (
- 
-     /* Now we can set the channel mask */
- 
--    Descriptor->Irq.IrqMask = IrqMask;
-+    Descriptor->Irq.IrqMask = AcpiUtReadUint16 (&IrqMask);
-     return (Rnode);
- }
- 
-@@ -660,6 +665,6 @@ RsDoIrqNoFlagsDescriptor (
- 
-     /* Now we can set the interrupt mask */
- 
--    Descriptor->Irq.IrqMask = IrqMask;
-+    Descriptor->Irq.IrqMask = AcpiUtReadUint16(&IrqMask);
-     return (Rnode);
- }
-Index: acpica-unix2-20220331/source/compiler/aslrestype2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/aslrestype2.c
-+++ acpica-unix2-20220331/source/compiler/aslrestype2.c
-@@ -77,6 +77,8 @@ RsDoGeneralRegisterDescriptor (
-     ASL_RESOURCE_NODE       *Rnode;
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-+    UINT16                  Tmp16;
-+    UINT64                  Tmp64;
- 
- 
-     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -85,7 +87,8 @@ RsDoGeneralRegisterDescriptor (
- 
-     Descriptor = Rnode->Buffer;
-     Descriptor->GenericReg.DescriptorType = ACPI_RESOURCE_NAME_GENERIC_REGISTER;
--    Descriptor->GenericReg.ResourceLength = 12;
-+    Tmp16 = 12;
-+    Descriptor->GenericReg.ResourceLength = AcpiUtReadUint16 (&Tmp16);
- 
-     /* Process all child initialization nodes */
- 
-@@ -116,7 +119,8 @@ RsDoGeneralRegisterDescriptor (
- 
-         case 3: /* Register Address */
- 
--            Descriptor->GenericReg.Address = InitializerOp->Asl.Value.Integer;
-+            Tmp64 = InitializerOp->Asl.Value.Integer;
-+            Descriptor->GenericReg.Address = AcpiUtReadUint64 (&Tmp64);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_ADDRESS,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (GenericReg.Address));
-             break;
-@@ -184,6 +188,8 @@ RsDoInterruptDescriptor (
-     BOOLEAN                 HasResSourceIndex = FALSE;
-     UINT8                   ResSourceIndex = 0;
-     UINT8                   *ResSourceString = NULL;
-+    UINT16                  Tmp16;
-+    UINT32                  Tmp32;
- 
- 
-     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -225,7 +231,7 @@ RsDoInterruptDescriptor (
-      * Initial descriptor length -- may be enlarged if there are
-      * optional fields present
-      */
--    Descriptor->ExtendedIrq.ResourceLength  = 2;  /* Flags and table length byte */
-+    Descriptor->ExtendedIrq.ResourceLength  = 2; /* Flags and table length byte */
-     Descriptor->ExtendedIrq.InterruptCount  = 0;
- 
-     Rover = ACPI_CAST_PTR (AML_RESOURCE,
-@@ -333,7 +339,8 @@ RsDoInterruptDescriptor (
- 
-             /* Save the integer and move pointer to the next one */
- 
--            Rover->DwordItem = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Rover->DwordItem = AcpiUtReadUint32 (&Tmp32);
-             Rover = ACPI_ADD_PTR (AML_RESOURCE, &(Rover->DwordItem), 4);
-             Descriptor->ExtendedIrq.InterruptCount++;
-             Descriptor->ExtendedIrq.ResourceLength += 4;
-@@ -384,6 +391,8 @@ RsDoInterruptDescriptor (
-         Descriptor->ExtendedIrq.ResourceLength = (UINT16)
-             (Descriptor->ExtendedIrq.ResourceLength + StringLength);
-     }
-+    Tmp16 = Descriptor->ExtendedIrq.ResourceLength;
-+    Descriptor->ExtendedIrq.ResourceLength  = AcpiUtReadUint16 (&Tmp16);
- 
-     Rnode->BufferLength =
-         (ASL_RESDESC_OFFSET (ExtendedIrq.Interrupts[0]) -
-@@ -436,7 +445,8 @@ RsDoVendorLargeDescriptor (
- 
-     Descriptor = Rnode->Buffer;
-     Descriptor->VendorLarge.DescriptorType = ACPI_RESOURCE_NAME_VENDOR_LARGE;
--    Descriptor->VendorLarge.ResourceLength = (UINT16) i;
-+    AcpiUtWriteUint (&Descriptor->VendorLarge.ResourceLength, sizeof (UINT16),
-+            &i, sizeof (UINT32));
- 
-     /* Point to end-of-descriptor for vendor data */
- 
-Index: acpica-unix2-20220331/source/compiler/aslrestype2d.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/aslrestype2d.c
-+++ acpica-unix2-20220331/source/compiler/aslrestype2d.c
-@@ -84,6 +84,8 @@ RsDoDwordIoDescriptor (
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-     BOOLEAN                 ResSourceIndex = FALSE;
-+    UINT16                  Tmp16;
-+    UINT32                  Tmp32;
- 
- 
-     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -147,8 +149,8 @@ RsDoDwordIoDescriptor (
- 
-         case 5: /* Address Granularity */
- 
--            Descriptor->Address32.Granularity =
--                (UINT32) InitializerOp->Asl.Value.Integer;
-+            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address32.Granularity = AcpiUtReadUint32 (&Tmp32);
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Granularity));
-             GranOp = InitializerOp;
-@@ -156,8 +158,8 @@ RsDoDwordIoDescriptor (
- 
-         case 6: /* Address Min */
- 
--            Descriptor->Address32.Minimum =
--                (UINT32) InitializerOp->Asl.Value.Integer;
-+            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address32.Minimum = AcpiUtReadUint32 (&Tmp32);
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_MINADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Minimum));
-             MinOp = InitializerOp;
-@@ -165,8 +167,8 @@ RsDoDwordIoDescriptor (
- 
-         case 7: /* Address Max */
- 
--            Descriptor->Address32.Maximum =
--                (UINT32) InitializerOp->Asl.Value.Integer;
-+            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address32.Maximum = AcpiUtReadUint32 (&Tmp32);
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Maximum));
-             MaxOp = InitializerOp;
-@@ -174,16 +176,16 @@ RsDoDwordIoDescriptor (
- 
-         case 8: /* Translation Offset */
- 
--            Descriptor->Address32.TranslationOffset =
--                (UINT32) InitializerOp->Asl.Value.Integer;
-+            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address32.TranslationOffset = AcpiUtReadUint32 (&Tmp32);
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.TranslationOffset));
-             break;
- 
-         case 9: /* Address Length */
- 
--            Descriptor->Address32.AddressLength =
--                (UINT32) InitializerOp->Asl.Value.Integer;
-+            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address32.AddressLength = AcpiUtReadUint32 (&Tmp32);
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.AddressLength));
-             LengthOp = InitializerOp;
-@@ -271,11 +273,14 @@ RsDoDwordIoDescriptor (
- 
-     /* Validate the Min/Max/Len/Gran values */
- 
-+    Tmp16 = Descriptor->Address32.ResourceLength;
-+    Descriptor->Address32.ResourceLength = AcpiUtReadUint16 (&Tmp16);
-+
-     RsLargeAddressCheck (
--        (UINT64) Descriptor->Address32.Minimum,
--        (UINT64) Descriptor->Address32.Maximum,
--        (UINT64) Descriptor->Address32.AddressLength,
--        (UINT64) Descriptor->Address32.Granularity,
-+        (UINT64) AcpiUtReadUint32 (&Descriptor->Address32.Minimum),
-+        (UINT64) AcpiUtReadUint32 (&Descriptor->Address32.Maximum),
-+        (UINT64) AcpiUtReadUint32 (&Descriptor->Address32.AddressLength),
-+        (UINT64) AcpiUtReadUint32 (&Descriptor->Address32.Granularity),
-         Descriptor->Address32.Flags,
-         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
- 
-@@ -314,6 +319,8 @@ RsDoDwordMemoryDescriptor (
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-     BOOLEAN                 ResSourceIndex = FALSE;
-+    UINT16                  Tmp16;
-+    UINT32                  Tmp32;
- 
- 
-     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -385,8 +392,8 @@ RsDoDwordMemoryDescriptor (
- 
-         case 6: /* Address Granularity */
- 
--            Descriptor->Address32.Granularity =
--                (UINT32) InitializerOp->Asl.Value.Integer;
-+            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address32.Granularity = AcpiUtReadUint32 (&Tmp32);
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Granularity));
-             GranOp = InitializerOp;
-@@ -394,8 +401,8 @@ RsDoDwordMemoryDescriptor (
- 
-         case 7: /* Min Address */
- 
--            Descriptor->Address32.Minimum =
--                (UINT32) InitializerOp->Asl.Value.Integer;
-+            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address32.Minimum = AcpiUtReadUint32 (&Tmp32);
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_MINADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Minimum));
-             MinOp = InitializerOp;
-@@ -403,8 +410,8 @@ RsDoDwordMemoryDescriptor (
- 
-         case 8: /* Max Address */
- 
--            Descriptor->Address32.Maximum =
--                (UINT32) InitializerOp->Asl.Value.Integer;
-+            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address32.Maximum = AcpiUtReadUint32 (&Tmp32);
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Maximum));
-             MaxOp = InitializerOp;
-@@ -412,16 +419,16 @@ RsDoDwordMemoryDescriptor (
- 
-         case 9: /* Translation Offset */
- 
--            Descriptor->Address32.TranslationOffset =
--                (UINT32) InitializerOp->Asl.Value.Integer;
-+            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address32.TranslationOffset = AcpiUtReadUint32 (&Tmp32);
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.TranslationOffset));
-             break;
- 
-         case 10: /* Address Length */
- 
--            Descriptor->Address32.AddressLength =
--                (UINT32) InitializerOp->Asl.Value.Integer;
-+            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address32.AddressLength = AcpiUtReadUint32 (&Tmp32);
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.AddressLength));
-             LengthOp = InitializerOp;
-@@ -506,11 +513,14 @@ RsDoDwordMemoryDescriptor (
- 
-     /* Validate the Min/Max/Len/Gran values */
- 
-+    Tmp16 = Descriptor->Address32.ResourceLength;
-+    Descriptor->Address32.ResourceLength = AcpiUtReadUint16 (&Tmp16);
-+
-     RsLargeAddressCheck (
--        (UINT64) Descriptor->Address32.Minimum,
--        (UINT64) Descriptor->Address32.Maximum,
--        (UINT64) Descriptor->Address32.AddressLength,
--        (UINT64) Descriptor->Address32.Granularity,
-+        (UINT64) AcpiUtReadUint32 (&Descriptor->Address32.Minimum),
-+        (UINT64) AcpiUtReadUint32 (&Descriptor->Address32.Maximum),
-+        (UINT64) AcpiUtReadUint32 (&Descriptor->Address32.AddressLength),
-+        (UINT64) AcpiUtReadUint32 (&Descriptor->Address32.Granularity),
-         Descriptor->Address32.Flags,
-         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
- 
-@@ -549,6 +559,8 @@ RsDoDwordSpaceDescriptor (
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-     BOOLEAN                 ResSourceIndex = FALSE;
-+    UINT16                  Tmp16;
-+    UINT32                  Tmp32;
- 
- 
-     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -616,8 +628,8 @@ RsDoDwordSpaceDescriptor (
- 
-         case 6: /* Address Granularity */
- 
--            Descriptor->Address32.Granularity =
--                (UINT32) InitializerOp->Asl.Value.Integer;
-+            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address32.Granularity = AcpiUtReadUint32 (&Tmp32);
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Granularity));
-             GranOp = InitializerOp;
-@@ -625,8 +637,8 @@ RsDoDwordSpaceDescriptor (
- 
-         case 7: /* Min Address */
- 
--            Descriptor->Address32.Minimum =
--                (UINT32) InitializerOp->Asl.Value.Integer;
-+            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address32.Minimum = AcpiUtReadUint32 (&Tmp32);
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_MINADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Minimum));
-             MinOp = InitializerOp;
-@@ -634,8 +646,8 @@ RsDoDwordSpaceDescriptor (
- 
-         case 8: /* Max Address */
- 
--            Descriptor->Address32.Maximum =
--                (UINT32) InitializerOp->Asl.Value.Integer;
-+            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address32.Maximum = AcpiUtReadUint32 (&Tmp32);
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Maximum));
-             MaxOp = InitializerOp;
-@@ -643,16 +655,16 @@ RsDoDwordSpaceDescriptor (
- 
-         case 9: /* Translation Offset */
- 
--            Descriptor->Address32.TranslationOffset =
--                (UINT32) InitializerOp->Asl.Value.Integer;
-+            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address32.TranslationOffset = AcpiUtReadUint32 (&Tmp32);
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.TranslationOffset));
-             break;
- 
-         case 10: /* Address Length */
- 
--            Descriptor->Address32.AddressLength =
--                (UINT32) InitializerOp->Asl.Value.Integer;
-+            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address32.AddressLength = AcpiUtReadUint32 (&Tmp32);
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.AddressLength));
-             LengthOp = InitializerOp;
-@@ -723,11 +735,14 @@ RsDoDwordSpaceDescriptor (
- 
-     /* Validate the Min/Max/Len/Gran values */
- 
-+    Tmp16 = Descriptor->Address32.ResourceLength;
-+    Descriptor->Address32.ResourceLength = AcpiUtReadUint16 (&Tmp16);
-+
-     RsLargeAddressCheck (
--        (UINT64) Descriptor->Address32.Minimum,
--        (UINT64) Descriptor->Address32.Maximum,
--        (UINT64) Descriptor->Address32.AddressLength,
--        (UINT64) Descriptor->Address32.Granularity,
-+        (UINT64) AcpiUtReadUint32 (&Descriptor->Address32.Minimum),
-+        (UINT64) AcpiUtReadUint32 (&Descriptor->Address32.Maximum),
-+        (UINT64) AcpiUtReadUint32 (&Descriptor->Address32.AddressLength),
-+        (UINT64) AcpiUtReadUint32 (&Descriptor->Address32.Granularity),
-         Descriptor->Address32.Flags,
-         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
- 
-Index: acpica-unix2-20220331/source/compiler/aslrestype2q.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/aslrestype2q.c
-+++ acpica-unix2-20220331/source/compiler/aslrestype2q.c
-@@ -84,6 +84,7 @@ RsDoQwordIoDescriptor (
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-     BOOLEAN                 ResSourceIndex = FALSE;
-+    UINT16                  Tmp16;
- 
- 
-     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -147,7 +148,8 @@ RsDoQwordIoDescriptor (
- 
-         case 5: /* Address Granularity */
- 
--            Descriptor->Address64.Granularity = InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address64.Granularity =
-+                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Granularity));
-             GranOp = InitializerOp;
-@@ -155,7 +157,8 @@ RsDoQwordIoDescriptor (
- 
-         case 6: /* Address Min */
- 
--            Descriptor->Address64.Minimum = InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address64.Minimum =
-+                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Minimum));
-             MinOp = InitializerOp;
-@@ -163,7 +166,8 @@ RsDoQwordIoDescriptor (
- 
-         case 7: /* Address Max */
- 
--            Descriptor->Address64.Maximum = InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address64.Maximum =
-+                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Maximum));
-             MaxOp = InitializerOp;
-@@ -171,14 +175,16 @@ RsDoQwordIoDescriptor (
- 
-         case 8: /* Translation Offset */
- 
--            Descriptor->Address64.TranslationOffset = InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address64.TranslationOffset =
-+                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
-             RsCreateByteField (InitializerOp, ACPI_RESTAG_TRANSLATION,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.TranslationOffset));
-             break;
- 
-         case 9: /* Address Length */
- 
--            Descriptor->Address64.AddressLength = InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address64.AddressLength =
-+                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.AddressLength));
-             LengthOp = InitializerOp;
-@@ -262,11 +268,14 @@ RsDoQwordIoDescriptor (
- 
-     /* Validate the Min/Max/Len/Gran values */
- 
-+    Tmp16 = Descriptor->Address64.ResourceLength;
-+    Descriptor->Address64.ResourceLength = AcpiUtReadUint16 (&Tmp16);
-+
-     RsLargeAddressCheck (
--        Descriptor->Address64.Minimum,
--        Descriptor->Address64.Maximum,
--        Descriptor->Address64.AddressLength,
--        Descriptor->Address64.Granularity,
-+        AcpiUtReadUint64 (&Descriptor->Address64.Minimum),
-+        AcpiUtReadUint64 (&Descriptor->Address64.Maximum),
-+        AcpiUtReadUint64 (&Descriptor->Address64.AddressLength),
-+        AcpiUtReadUint64 (&Descriptor->Address64.Granularity),
-         Descriptor->Address64.Flags,
-         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
- 
-@@ -305,6 +314,7 @@ RsDoQwordMemoryDescriptor (
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-     BOOLEAN                 ResSourceIndex = FALSE;
-+    UINT16                  Tmp16;
- 
- 
-     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -375,7 +385,8 @@ RsDoQwordMemoryDescriptor (
- 
-         case 6: /* Address Granularity */
- 
--            Descriptor->Address64.Granularity = InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address64.Granularity =
-+                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Granularity));
-             GranOp = InitializerOp;
-@@ -383,7 +394,8 @@ RsDoQwordMemoryDescriptor (
- 
-         case 7: /* Min Address */
- 
--            Descriptor->Address64.Minimum = InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address64.Minimum =
-+                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Minimum));
-             MinOp = InitializerOp;
-@@ -391,7 +403,8 @@ RsDoQwordMemoryDescriptor (
- 
-         case 8: /* Max Address */
- 
--            Descriptor->Address64.Maximum = InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address64.Maximum =
-+                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Maximum));
-             MaxOp = InitializerOp;
-@@ -399,14 +412,16 @@ RsDoQwordMemoryDescriptor (
- 
-         case 9: /* Translation Offset */
- 
--            Descriptor->Address64.TranslationOffset = InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address64.TranslationOffset =
-+                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.TranslationOffset));
-             break;
- 
-         case 10: /* Address Length */
- 
--            Descriptor->Address64.AddressLength = InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address64.AddressLength =
-+                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.AddressLength));
-             LengthOp = InitializerOp;
-@@ -491,11 +506,14 @@ RsDoQwordMemoryDescriptor (
- 
-     /* Validate the Min/Max/Len/Gran values */
- 
-+    Tmp16 = Descriptor->Address64.ResourceLength;
-+    Descriptor->Address64.ResourceLength = AcpiUtReadUint16 (&Tmp16);
-+
-     RsLargeAddressCheck (
--        Descriptor->Address64.Minimum,
--        Descriptor->Address64.Maximum,
--        Descriptor->Address64.AddressLength,
--        Descriptor->Address64.Granularity,
-+        AcpiUtReadUint64 (&Descriptor->Address64.Minimum),
-+        AcpiUtReadUint64 (&Descriptor->Address64.Maximum),
-+        AcpiUtReadUint64 (&Descriptor->Address64.AddressLength),
-+        AcpiUtReadUint64 (&Descriptor->Address64.Granularity),
-         Descriptor->Address64.Flags,
-         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
- 
-@@ -534,6 +552,7 @@ RsDoQwordSpaceDescriptor (
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-     BOOLEAN                 ResSourceIndex = FALSE;
-+    UINT16                  Tmp16;
- 
- 
-     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -601,7 +620,8 @@ RsDoQwordSpaceDescriptor (
- 
-         case 6: /* Address Granularity */
- 
--            Descriptor->Address64.Granularity = InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address64.Granularity =
-+                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Granularity));
-             GranOp = InitializerOp;
-@@ -609,7 +629,8 @@ RsDoQwordSpaceDescriptor (
- 
-         case 7: /* Min Address */
- 
--            Descriptor->Address64.Minimum = InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address64.Minimum =
-+                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Minimum));
-             MinOp = InitializerOp;
-@@ -617,7 +638,8 @@ RsDoQwordSpaceDescriptor (
- 
-         case 8: /* Max Address */
- 
--            Descriptor->Address64.Maximum = InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address64.Maximum =
-+                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Maximum));
-             MaxOp = InitializerOp;
-@@ -625,14 +647,16 @@ RsDoQwordSpaceDescriptor (
- 
-         case 9: /* Translation Offset */
- 
--            Descriptor->Address64.TranslationOffset = InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address64.TranslationOffset =
-+                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.TranslationOffset));
-             break;
- 
-         case 10: /* Address Length */
- 
--            Descriptor->Address64.AddressLength = InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address64.AddressLength =
-+                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.AddressLength));
-             LengthOp = InitializerOp;
-@@ -702,11 +726,14 @@ RsDoQwordSpaceDescriptor (
- 
-     /* Validate the Min/Max/Len/Gran values */
- 
-+    Tmp16 = Descriptor->Address64.ResourceLength;
-+    Descriptor->Address64.ResourceLength = AcpiUtReadUint16 (&Tmp16);
-+
-     RsLargeAddressCheck (
--        Descriptor->Address64.Minimum,
--        Descriptor->Address64.Maximum,
--        Descriptor->Address64.AddressLength,
--        Descriptor->Address64.Granularity,
-+        AcpiUtReadUint64 (&Descriptor->Address64.Minimum),
-+        AcpiUtReadUint64 (&Descriptor->Address64.Maximum),
-+        AcpiUtReadUint64 (&Descriptor->Address64.AddressLength),
-+        AcpiUtReadUint64 (&Descriptor->Address64.Granularity),
-         Descriptor->Address64.Flags,
-         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
- 
-Index: acpica-unix2-20220331/source/compiler/aslrestype2w.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/aslrestype2w.c
-+++ acpica-unix2-20220331/source/compiler/aslrestype2w.c
-@@ -84,6 +84,7 @@ RsDoWordIoDescriptor (
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-     BOOLEAN                 ResSourceIndex = FALSE;
-+    UINT16                  Tmp16;
- 
- 
-     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -147,7 +148,8 @@ RsDoWordIoDescriptor (
- 
-         case 5: /* Address Granularity */
- 
--            Descriptor->Address16.Granularity = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address16.Granularity = AcpiUtReadUint16 (&Tmp16);
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Granularity));
-             GranOp = InitializerOp;
-@@ -155,7 +157,8 @@ RsDoWordIoDescriptor (
- 
-         case 6: /* Address Min */
- 
--            Descriptor->Address16.Minimum = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address16.Minimum = AcpiUtReadUint16 (&Tmp16);
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_MINADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Minimum));
-             MinOp = InitializerOp;
-@@ -163,7 +166,8 @@ RsDoWordIoDescriptor (
- 
-         case 7: /* Address Max */
- 
--            Descriptor->Address16.Maximum = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address16.Maximum = AcpiUtReadUint16 (&Tmp16);
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_MAXADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Maximum));
-             MaxOp = InitializerOp;
-@@ -171,14 +175,16 @@ RsDoWordIoDescriptor (
- 
-         case 8: /* Translation Offset */
- 
--            Descriptor->Address16.TranslationOffset = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address16.TranslationOffset = AcpiUtReadUint16 (&Tmp16);
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.TranslationOffset));
-             break;
- 
-         case 9: /* Address Length */
- 
--            Descriptor->Address16.AddressLength = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address16.AddressLength = AcpiUtReadUint16 (&Tmp16);
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH,
-                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.AddressLength));
-             LengthOp = InitializerOp;
-@@ -263,13 +269,17 @@ RsDoWordIoDescriptor (
-     /* Validate the Min/Max/Len/Gran values */
- 
-     RsLargeAddressCheck (
--        (UINT64) Descriptor->Address16.Minimum,
--        (UINT64) Descriptor->Address16.Maximum,
--        (UINT64) Descriptor->Address16.AddressLength,
--        (UINT64) Descriptor->Address16.Granularity,
-+        (UINT64) AcpiUtReadUint16 (&Descriptor->Address16.Minimum),
-+        (UINT64) AcpiUtReadUint16 (&Descriptor->Address16.Maximum),
-+        (UINT64) AcpiUtReadUint16 (&Descriptor->Address16.AddressLength),
-+        (UINT64) AcpiUtReadUint16 (&Descriptor->Address16.Granularity),
-         Descriptor->Address16.Flags,
-         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
- 
-+    /* correct enddianness */
-+    Tmp16 = Descriptor->Address16.ResourceLength;
-+    Descriptor->Address16.ResourceLength = AcpiUtReadUint16 (&Tmp16);
-+
-     Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) +
-         OptionIndex + StringLength;
-     return (Rnode);
-@@ -305,6 +315,7 @@ RsDoWordBusNumberDescriptor (
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-     BOOLEAN                 ResSourceIndex = FALSE;
-+    UINT16                  Tmp16;
- 
- 
-     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -361,8 +372,8 @@ RsDoWordBusNumberDescriptor (
- 
-         case 4: /* Address Granularity */
- 
--            Descriptor->Address16.Granularity =
--                (UINT16) InitializerOp->Asl.Value.Integer;
-+            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address16.Granularity = AcpiUtReadUint16 (&Tmp16);
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Granularity));
-             GranOp = InitializerOp;
-@@ -370,8 +381,8 @@ RsDoWordBusNumberDescriptor (
- 
-         case 5: /* Min Address */
- 
--            Descriptor->Address16.Minimum =
--                (UINT16) InitializerOp->Asl.Value.Integer;
-+            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address16.Minimum = AcpiUtReadUint16 (&Tmp16);
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_MINADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Minimum));
-             MinOp = InitializerOp;
-@@ -379,8 +390,8 @@ RsDoWordBusNumberDescriptor (
- 
-         case 6: /* Max Address */
- 
--            Descriptor->Address16.Maximum =
--                (UINT16) InitializerOp->Asl.Value.Integer;
-+            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address16.Maximum = AcpiUtReadUint16 (&Tmp16);
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_MAXADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Maximum));
-             MaxOp = InitializerOp;
-@@ -388,16 +399,16 @@ RsDoWordBusNumberDescriptor (
- 
-         case 7: /* Translation Offset */
- 
--            Descriptor->Address16.TranslationOffset =
--                (UINT16) InitializerOp->Asl.Value.Integer;
-+            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address16.TranslationOffset = AcpiUtReadUint16 (&Tmp16);
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.TranslationOffset));
-             break;
- 
-         case 8: /* Address Length */
- 
--            Descriptor->Address16.AddressLength =
--                (UINT16) InitializerOp->Asl.Value.Integer;
-+            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address16.AddressLength = AcpiUtReadUint16 (&Tmp16);
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH,
-                  CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.AddressLength));
-             LengthOp = InitializerOp;
-@@ -468,13 +479,17 @@ RsDoWordBusNumberDescriptor (
-     /* Validate the Min/Max/Len/Gran values */
- 
-     RsLargeAddressCheck (
--        (UINT64) Descriptor->Address16.Minimum,
--        (UINT64) Descriptor->Address16.Maximum,
--        (UINT64) Descriptor->Address16.AddressLength,
--        (UINT64) Descriptor->Address16.Granularity,
-+        (UINT64) AcpiUtReadUint16 (&Descriptor->Address16.Minimum),
-+        (UINT64) AcpiUtReadUint16 (&Descriptor->Address16.Maximum),
-+        (UINT64) AcpiUtReadUint16 (&Descriptor->Address16.AddressLength),
-+        (UINT64) AcpiUtReadUint16 (&Descriptor->Address16.Granularity),
-         Descriptor->Address16.Flags,
-         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
- 
-+    /* correct enddianness */
-+    Tmp16 = Descriptor->Address16.ResourceLength;
-+    Descriptor->Address16.ResourceLength = AcpiUtReadUint16 (&Tmp16);
-+
-     Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) +
-         OptionIndex + StringLength;
-     return (Rnode);
-@@ -510,6 +525,7 @@ RsDoWordSpaceDescriptor (
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-     BOOLEAN                 ResSourceIndex = FALSE;
-+    UINT16                  Tmp16;
- 
- 
-     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -577,8 +593,8 @@ RsDoWordSpaceDescriptor (
- 
-         case 6: /* Address Granularity */
- 
--            Descriptor->Address16.Granularity =
--                (UINT16) InitializerOp->Asl.Value.Integer;
-+            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address16.Granularity = AcpiUtReadUint16 (&Tmp16);
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Granularity));
-             GranOp = InitializerOp;
-@@ -586,8 +602,8 @@ RsDoWordSpaceDescriptor (
- 
-         case 7: /* Min Address */
- 
--            Descriptor->Address16.Minimum =
--                (UINT16) InitializerOp->Asl.Value.Integer;
-+            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address16.Minimum = AcpiUtReadUint16 (&Tmp16);
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_MINADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Minimum));
-             MinOp = InitializerOp;
-@@ -595,8 +611,8 @@ RsDoWordSpaceDescriptor (
- 
-         case 8: /* Max Address */
- 
--            Descriptor->Address16.Maximum =
--                (UINT16) InitializerOp->Asl.Value.Integer;
-+            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address16.Maximum = AcpiUtReadUint16 (&Tmp16);
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_MAXADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Maximum));
-             MaxOp = InitializerOp;
-@@ -604,16 +620,16 @@ RsDoWordSpaceDescriptor (
- 
-         case 9: /* Translation Offset */
- 
--            Descriptor->Address16.TranslationOffset =
--                (UINT16) InitializerOp->Asl.Value.Integer;
-+            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address16.TranslationOffset = AcpiUtReadUint16 (&Tmp16);
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.TranslationOffset));
-             break;
- 
-         case 10: /* Address Length */
- 
--            Descriptor->Address16.AddressLength =
--                (UINT16) InitializerOp->Asl.Value.Integer;
-+            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->Address16.AddressLength = AcpiUtReadUint16 (&Tmp16);
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.AddressLength));
-             LengthOp = InitializerOp;
-@@ -684,13 +700,17 @@ RsDoWordSpaceDescriptor (
-     /* Validate the Min/Max/Len/Gran values */
- 
-     RsLargeAddressCheck (
--        (UINT64) Descriptor->Address16.Minimum,
--        (UINT64) Descriptor->Address16.Maximum,
--        (UINT64) Descriptor->Address16.AddressLength,
--        (UINT64) Descriptor->Address16.Granularity,
-+        (UINT64) AcpiUtReadUint16 (&Descriptor->Address16.Minimum),
-+        (UINT64) AcpiUtReadUint16 (&Descriptor->Address16.Maximum),
-+        (UINT64) AcpiUtReadUint16 (&Descriptor->Address16.AddressLength),
-+        (UINT64) AcpiUtReadUint16 (&Descriptor->Address16.Granularity),
-         Descriptor->Address16.Flags,
-         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
- 
-+    /* correct enddianness */
-+    Tmp16 = Descriptor->Address16.ResourceLength;
-+    Descriptor->Address16.ResourceLength = AcpiUtReadUint16 (&Tmp16);
-+
-     Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) +
-         OptionIndex + StringLength;
-     return (Rnode);
-Index: acpica-unix2-20220331/source/compiler/dttable2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/dttable2.c
-+++ acpica-unix2-20220331/source/compiler/dttable2.c
-@@ -3046,7 +3046,8 @@ DtCompileWpbt (
- 
-     /* Extract the length of the Arguments buffer, insert into main table */
- 
--    Table->ArgumentsLength = (UINT16) Subtable->TotalLength;
-+    AcpiUtWriteUint (&Table->ArgumentsLength, sizeof (UINT16),
-+           &Subtable->TotalLength, sizeof (UINT32));
-     DtInsertSubtable (ParentTable, Subtable);
-     return (AE_OK);
- }
-Index: acpica-unix2-20220331/source/components/disassembler/dmbuffer.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/disassembler/dmbuffer.c
-+++ acpica-unix2-20220331/source/components/disassembler/dmbuffer.c
-@@ -204,7 +204,7 @@ AcpiDmByteList (
- 
- 
-     ByteData = Op->Named.Data;
--    ByteCount = (UINT32) Op->Common.Value.Integer;
-+    ByteCount = (UINT32) Op->Common.Value.Size;
- 
-     /*
-      * The byte list belongs to a buffer, and can be produced by either
-@@ -308,7 +308,7 @@ AcpiDmIsUuidBuffer (
-     /* Extract the byte list info */
- 
-     ByteData = NextOp->Named.Data;
--    ByteCount = (UINT32) NextOp->Common.Value.Integer;
-+    ByteCount = (UINT32) NextOp->Common.Value.Size;
- 
-     /* Byte count must be exactly 16 */
- 
-@@ -436,7 +436,7 @@ AcpiDmIsUnicodeBuffer (
-     /* Extract the byte list info */
- 
-     ByteData = NextOp->Named.Data;
--    ByteCount = (UINT32) NextOp->Common.Value.Integer;
-+    ByteCount = (UINT32) NextOp->Common.Value.Size;
-     WordCount = ACPI_DIV_2 (ByteCount);
- 
-     /*
-@@ -878,14 +878,14 @@ AcpiDmUnicode (
-     /* Extract the buffer info as a WORD buffer */
- 
-     WordData = ACPI_CAST_PTR (UINT16, Op->Named.Data);
--    WordCount = ACPI_DIV_2 (((UINT32) Op->Common.Value.Integer));
-+    WordCount = ACPI_DIV_2 (((UINT32) Op->Common.Value.Size));
- 
-     /* Write every other byte as an ASCII character */
- 
-     AcpiOsPrintf ("\"");
-     for (i = 0; i < (WordCount - 1); i++)
-     {
--        OutputValue = (int) WordData[i];
-+        OutputValue = (int) AcpiUtReadUint16 (&WordData[i]);
- 
-         /* Handle values that must be escaped */
- 
-@@ -947,7 +947,29 @@ AcpiDmGetHardwareIdType (
- 
-         /* Swap from little-endian to big-endian to simplify conversion */
- 
--        BigEndianId = AcpiUtDwordByteSwap ((UINT32) Op->Common.Value.Integer);
-+        BigEndianId = (UINT32) Op->Common.Value.Integer;
-+        if (UtIsBigEndianMachine())
-+        {
-+            /*
-+             * We'll need to store the bytes in little-endian order
-+             * so they can be re-used properly later since everything is
-+             * assumed to be in little-endian form.
-+             */
-+
-+	     UINT32 *Ptr = (UINT32 *)(&Op->Common.Value.Integer);
-+	     *Ptr = AcpiUtDwordByteSwap (BigEndianId);
-+        }
-+        else
-+        {
-+            /*
-+             * We'll need to just use the bytes in big-endian order;
-+             * they're already in little-endian order.
-+             */
-+
-+            UINT32 Tmp32 = BigEndianId;
-+
-+            BigEndianId = AcpiUtDwordByteSwap ((UINT32) Tmp32);
-+        }
- 
-         /* Create the 3 leading ASCII letters */
- 
-@@ -1073,11 +1095,12 @@ AcpiDmDecompressEisaId (
- {
-     char                    IdBuffer[ACPI_EISAID_STRING_SIZE];
-     const AH_DEVICE_ID      *Info;
-+    UINT32                  Tmp32 = EncodedId;
- 
- 
-     /* Convert EISAID to a string an emit the statement */
- 
--    AcpiExEisaIdToString (IdBuffer, EncodedId);
-+    AcpiExEisaIdToString (IdBuffer, AcpiUtReadUint32 (&Tmp32));
-     AcpiOsPrintf ("EisaId (\"%s\")", IdBuffer);
- 
-     /* If we know about the ID, emit the description */
-Index: acpica-unix2-20220331/source/components/disassembler/dmopcode.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/disassembler/dmopcode.c
-+++ acpica-unix2-20220331/source/components/disassembler/dmopcode.c
-@@ -778,7 +778,9 @@ AcpiDmDisassembleOneOp (
-         }
-         else
-         {
--            AcpiOsPrintf ("0x%4.4X", (UINT32) Op->Common.Value.Integer);
-+            UINT16 Tmp16 = (UINT16) Op->Common.Value.Integer;
-+
-+            AcpiOsPrintf ("0x%4.4X", (UINT32) AcpiUtReadUint16 (&Tmp16));
-         }
-         break;
- 
-@@ -790,14 +792,19 @@ AcpiDmDisassembleOneOp (
-         }
-         else
-         {
--            AcpiOsPrintf ("0x%8.8X", (UINT32) Op->Common.Value.Integer);
-+            UINT32 Tmp32 = (UINT32) Op->Common.Value.Integer;
-+
-+            AcpiOsPrintf ("0x%8.8X", (UINT32) AcpiUtReadUint32 (&Tmp32));
-         }
-         break;
- 
-     case AML_QWORD_OP:
- 
--        AcpiOsPrintf ("0x%8.8X%8.8X",
--            ACPI_FORMAT_UINT64 (Op->Common.Value.Integer));
-+        {
-+	    UINT64 Tmp64 = AcpiUtReadUint64 (&Op->Common.Value.Integer);
-+
-+            AcpiOsPrintf ("0x%8.8X%8.8X", ACPI_FORMAT_UINT64 (Tmp64));
-+        }
-         break;
- 
-     case AML_STRING_OP:
-@@ -887,18 +894,18 @@ AcpiDmDisassembleOneOp (
-         AcpiOsPrintf (",");
-         ASL_CV_PRINT_ONE_COMMENT (Op, AML_NAMECOMMENT, NULL, 0);
-         AcpiOsPrintf ("%*.s  %u", (unsigned) (5 - Length), " ",
--            (UINT32) Op->Common.Value.Integer);
-+            (UINT32) Op->Common.Value.Size);
- 
-         AcpiDmCommaIfFieldMember (Op);
- 
--        Info->BitOffset += (UINT32) Op->Common.Value.Integer;
-+        Info->BitOffset += (UINT32) Op->Common.Value.Size;
-         break;
- 
-     case AML_INT_RESERVEDFIELD_OP:
- 
-         /* Offset() -- Must account for previous offsets */
- 
--        Offset = (UINT32) Op->Common.Value.Integer;
-+        Offset = (UINT32) Op->Common.Value.Size;
-         Info->BitOffset += Offset;
- 
-         if (Info->BitOffset % 8 == 0)
-Index: acpica-unix2-20220331/source/components/disassembler/dmresrc.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/disassembler/dmresrc.c
-+++ acpica-unix2-20220331/source/components/disassembler/dmresrc.c
-@@ -417,7 +417,7 @@ AcpiDmIsResourceTemplate (
-         return (AE_TYPE);
-     }
- 
--    DeclaredBufferLength = NextOp->Common.Value.Size;
-+    DeclaredBufferLength = NextOp->Common.Value.Integer;
- 
-     /* Get the length of the raw initialization byte list */
- 
-Index: acpica-unix2-20220331/source/components/disassembler/dmresrcl.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/disassembler/dmresrcl.c
-+++ acpica-unix2-20220331/source/components/disassembler/dmresrcl.c
-@@ -141,6 +141,8 @@ AcpiDmMemoryFields (
-     UINT32                  Level)
- {
-     UINT32                  i;
-+    UINT16                  Tmp16;
-+    UINT32                  Tmp32;
- 
- 
-     for (i = 0; i < 4; i++)
-@@ -151,14 +153,16 @@ AcpiDmMemoryFields (
-         {
-         case 16:
- 
--            AcpiDmDumpInteger16 (ACPI_CAST_PTR (UINT16, Source)[i],
--                AcpiDmMemoryNames[i]);
-+            Tmp16 = ACPI_CAST_PTR (UINT16, Source)[i];
-+            AcpiDmDumpInteger16 (AcpiUtReadUint16 (&Tmp16),
-+                     AcpiDmMemoryNames[i]);
-             break;
- 
-         case 32:
- 
--            AcpiDmDumpInteger32 (ACPI_CAST_PTR (UINT32, Source)[i],
--                AcpiDmMemoryNames[i]);
-+            Tmp32 = ACPI_CAST_PTR (UINT32, Source)[i];
-+            AcpiDmDumpInteger32 (AcpiUtReadUint32 (&Tmp32),
-+                     AcpiDmMemoryNames[i]);
-             break;
- 
-         default:
-@@ -190,6 +194,9 @@ AcpiDmAddressFields (
-     UINT32                  Level)
- {
-     UINT32                  i;
-+    UINT16                  Tmp16;
-+    UINT32                  Tmp32;
-+    UINT64                  Tmp64;
- 
- 
-     AcpiOsPrintf ("\n");
-@@ -202,20 +209,23 @@ AcpiDmAddressFields (
-         {
-         case 16:
- 
--            AcpiDmDumpInteger16 (ACPI_CAST_PTR (UINT16, Source)[i],
--                AcpiDmAddressNames[i]);
-+            Tmp16 = ACPI_CAST_PTR (UINT16, Source)[i];
-+            AcpiDmDumpInteger16 (AcpiUtReadUint16 (&Tmp16),
-+                         AcpiDmAddressNames[i]);
-             break;
- 
-         case 32:
- 
--            AcpiDmDumpInteger32 (ACPI_CAST_PTR (UINT32, Source)[i],
--                AcpiDmAddressNames[i]);
-+            Tmp32 = ACPI_CAST_PTR (UINT32, Source)[i];
-+            AcpiDmDumpInteger32 (AcpiUtReadUint32 (&Tmp32),
-+                         AcpiDmAddressNames[i]);
-             break;
- 
-         case 64:
- 
--            AcpiDmDumpInteger64 (ACPI_CAST_PTR (UINT64, Source)[i],
--                AcpiDmAddressNames[i]);
-+            Tmp64 = ACPI_CAST_PTR (UINT64, Source)[i];
-+            AcpiDmDumpInteger64 (AcpiUtReadUint64 (&Tmp64),
-+                         AcpiDmAddressNames[i]);
-             break;
- 
-         default:
-@@ -749,7 +759,7 @@ AcpiDmExtendedDescriptor (
-     /* Extra field for this descriptor only */
- 
-     AcpiDmIndent (Level + 1);
--    AcpiDmDumpInteger64 (Resource->ExtAddress64.TypeSpecific,
-+    AcpiDmDumpInteger64 (AcpiUtReadUint64 (&Resource->ExtAddress64.TypeSpecific),
-         "Type-Specific Attributes");
- 
-     /* Insert a descriptor name */
-@@ -876,11 +886,11 @@ AcpiDmFixedMemory32Descriptor (
-         AcpiGbl_RwDecode [ACPI_GET_1BIT_FLAG (Resource->FixedMemory32.Flags)]);
- 
-     AcpiDmIndent (Level + 1);
--    AcpiDmDumpInteger32 (Resource->FixedMemory32.Address,
-+    AcpiDmDumpInteger32 (AcpiUtReadUint32 (&Resource->FixedMemory32.Address),
-         "Address Base");
- 
-     AcpiDmIndent (Level + 1);
--    AcpiDmDumpInteger32 (Resource->FixedMemory32.AddressLength,
-+    AcpiDmDumpInteger32 (AcpiUtReadUint32 (&Resource->FixedMemory32.AddressLength),
-         "Address Length");
- 
-     /* Insert a descriptor name */
-@@ -926,7 +936,8 @@ AcpiDmGenericRegisterDescriptor (
-     AcpiDmDumpInteger8 (Resource->GenericReg.BitOffset, "Bit Offset");
- 
-     AcpiDmIndent (Level + 1);
--    AcpiDmDumpInteger64 (Resource->GenericReg.Address, "Address");
-+    AcpiDmDumpInteger64 (AcpiUtReadUint64 (&Resource->GenericReg.Address),
-+                 "Address");
- 
-     /* Optional field for ACPI 3.0 */
- 
-@@ -989,7 +1000,7 @@ AcpiDmInterruptDescriptor (
-     AcpiDmResourceSource (Resource,
-         sizeof (AML_RESOURCE_EXTENDED_IRQ) +
-             ((UINT32) Resource->ExtendedIrq.InterruptCount - 1) * sizeof (UINT32),
--        Resource->ExtendedIrq.ResourceLength);
-+            AcpiUtReadUint16 (&Resource->ExtendedIrq.ResourceLength));
- 
-     /* Insert a descriptor name */
- 
-@@ -1004,7 +1015,7 @@ AcpiDmInterruptDescriptor (
-     {
-         AcpiDmIndent (Level + 1);
-         AcpiOsPrintf ("0x%8.8X,\n",
--            (UINT32) Resource->ExtendedIrq.Interrupts[i]);
-+            AcpiUtReadUint32 (&Resource->ExtendedIrq.Interrupts[i]));
-     }
- 
-     AcpiDmIndent (Level);
-Index: acpica-unix2-20220331/source/components/disassembler/dmresrcl2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/disassembler/dmresrcl2.c
-+++ acpica-unix2-20220331/source/components/disassembler/dmresrcl2.c
-@@ -199,22 +199,27 @@ AcpiDmGpioCommon (
-     char                    *DeviceName = NULL;
-     UINT32                  PinCount;
-     UINT32                  i;
-+    UINT16                  ResSourceOffset;
-+    UINT16                  VendorOffset;
-+    UINT16                  VendorLength;
-+    UINT16                  Tmp16;
- 
- 
-     /* ResourceSource, ResourceSourceIndex, ResourceType */
- 
-     AcpiDmIndent (Level + 1);
--    if (Resource->Gpio.ResSourceOffset)
-+    ResSourceOffset = AcpiUtReadUint16 (&Resource->Gpio.ResSourceOffset);
-+    if (ResSourceOffset)
-     {
-         DeviceName = ACPI_ADD_PTR (char,
--            Resource, Resource->Gpio.ResSourceOffset),
-+            Resource, ResSourceOffset),
-         AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
-     }
- 
-     AcpiOsPrintf (", ");
-     AcpiOsPrintf ("0x%2.2X, ", Resource->Gpio.ResSourceIndex);
--    AcpiOsPrintf ("%s, ",
--        AcpiGbl_ConsumeDecode [ACPI_GET_1BIT_FLAG (Resource->Gpio.Flags)]);
-+    Tmp16 = AcpiUtReadUint16 (&Resource->Gpio.Flags);
-+    AcpiOsPrintf ("%s, ", AcpiGbl_ConsumeDecode [ACPI_GET_1BIT_FLAG (Tmp16)]);
- 
-     /* Insert a descriptor name */
- 
-@@ -223,15 +228,15 @@ AcpiDmGpioCommon (
- 
-     /* Dump the vendor data */
- 
--    if (Resource->Gpio.VendorOffset)
-+    VendorOffset = AcpiUtReadUint16 (&Resource->Gpio.VendorOffset);
-+    VendorLength = AcpiUtReadUint16 (&Resource->Gpio.VendorLength);
-+    if (VendorOffset)
-     {
-         AcpiOsPrintf ("\n");
-         AcpiDmIndent (Level + 1);
--        VendorData = ACPI_ADD_PTR (UINT8, Resource,
--            Resource->Gpio.VendorOffset);
-+        VendorData = ACPI_ADD_PTR (UINT8, Resource, VendorOffset);
- 
--        AcpiDmDumpRawDataBuffer (VendorData,
--            Resource->Gpio.VendorLength, Level);
-+        AcpiDmDumpRawDataBuffer (VendorData, VendorLength, Level);
-     }
- 
-     AcpiOsPrintf (")\n");
-@@ -241,17 +246,17 @@ AcpiDmGpioCommon (
-     AcpiDmIndent (Level + 1);
-     AcpiOsPrintf ("{   // Pin list\n");
- 
--    PinCount = ((UINT32) (Resource->Gpio.ResSourceOffset -
--        Resource->Gpio.PinTableOffset)) /
--        sizeof (UINT16);
-+    PinCount = (UINT32) AcpiUtReadUint16 (&Resource->Gpio.ResSourceOffset);
-+    PinCount -= (UINT32) AcpiUtReadUint16 (&Resource->Gpio.PinTableOffset);
-+    PinCount /= sizeof (UINT16);
- 
-     PinList = (UINT16 *) ACPI_ADD_PTR (char, Resource,
--        Resource->Gpio.PinTableOffset);
-+        AcpiUtReadUint16 (&Resource->Gpio.PinTableOffset));
- 
-     for (i = 0; i < PinCount; i++)
-     {
-         AcpiDmIndent (Level + 2);
--        AcpiOsPrintf ("0x%4.4X%s\n", PinList[i],
-+        AcpiOsPrintf ("0x%4.4X%s\n", AcpiUtReadUint16 (&(PinList[i])),
-             ((i + 1) < PinCount) ? "," : "");
-     }
- 
-@@ -285,16 +290,18 @@ AcpiDmGpioIntDescriptor (
-     UINT32                  Length,
-     UINT32                  Level)
- {
-+    UINT16                  Tmp16;
- 
-     /* Dump the GpioInt-specific portion of the descriptor */
- 
-     /* EdgeLevel, ActiveLevel, Shared */
- 
-     AcpiDmIndent (Level);
-+    Tmp16 = AcpiUtReadUint16 (&Resource->Gpio.IntFlags);
-     AcpiOsPrintf ("GpioInt (%s, %s, %s, ",
--        AcpiGbl_HeDecode [ACPI_GET_1BIT_FLAG (Resource->Gpio.IntFlags)],
--        AcpiGbl_LlDecode [ACPI_EXTRACT_2BIT_FLAG (Resource->Gpio.IntFlags, 1)],
--        AcpiGbl_ShrDecode [ACPI_EXTRACT_2BIT_FLAG (Resource->Gpio.IntFlags, 3)]);
-+        AcpiGbl_HeDecode [ACPI_GET_1BIT_FLAG (Tmp16)],
-+        AcpiGbl_LlDecode [ACPI_EXTRACT_2BIT_FLAG (Tmp16, 1)],
-+        AcpiGbl_ShrDecode [ACPI_EXTRACT_2BIT_FLAG (Tmp16, 3)]);
- 
-     /* PinConfig, DebounceTimeout */
- 
-@@ -307,7 +314,8 @@ AcpiDmGpioIntDescriptor (
-     {
-         AcpiOsPrintf ("0x%2.2X, ", Resource->Gpio.PinConfig);
-     }
--    AcpiOsPrintf ("0x%4.4X,\n", Resource->Gpio.DebounceTimeout);
-+    AcpiOsPrintf ("0x%4.4X,\n",
-+          AcpiUtReadUint16 (&Resource->Gpio.DebounceTimeout));
- 
-     /* Dump the GpioInt/GpioIo common portion of the descriptor */
- 
-@@ -337,14 +345,16 @@ AcpiDmGpioIoDescriptor (
-     UINT32                  Length,
-     UINT32                  Level)
- {
-+    UINT16                  Tmp16;
- 
-     /* Dump the GpioIo-specific portion of the descriptor */
- 
-     /* Shared, PinConfig */
- 
-     AcpiDmIndent (Level);
-+    Tmp16 = AcpiUtReadUint16 (&Resource->Gpio.IntFlags);
-     AcpiOsPrintf ("GpioIo (%s, ",
--        AcpiGbl_ShrDecode [ACPI_EXTRACT_2BIT_FLAG (Resource->Gpio.IntFlags, 3)]);
-+        AcpiGbl_ShrDecode [ACPI_EXTRACT_2BIT_FLAG (Tmp16, 3)]);
- 
-     if (Resource->Gpio.PinConfig <= 3)
-     {
-@@ -358,10 +368,10 @@ AcpiDmGpioIoDescriptor (
- 
-     /* DebounceTimeout, DriveStrength, IoRestriction */
- 
--    AcpiOsPrintf ("0x%4.4X, ", Resource->Gpio.DebounceTimeout);
--    AcpiOsPrintf ("0x%4.4X, ", Resource->Gpio.DriveStrength);
--    AcpiOsPrintf ("%s,\n",
--        AcpiGbl_IorDecode [ACPI_GET_2BIT_FLAG (Resource->Gpio.IntFlags)]);
-+    AcpiOsPrintf ("0x%4.4X, ", AcpiUtReadUint16 (&Resource->Gpio.DebounceTimeout));
-+    AcpiOsPrintf ("0x%4.4X, ", AcpiUtReadUint16 (&Resource->Gpio.DriveStrength));
-+    Tmp16 = AcpiUtReadUint16 (&Resource->Gpio.IntFlags);
-+    AcpiOsPrintf ("%s,\n", AcpiGbl_IorDecode [ACPI_GET_2BIT_FLAG (Tmp16)]);
- 
-     /* Dump the GpioInt/GpioIo common portion of the descriptor */
- 
-@@ -442,6 +452,9 @@ AcpiDmPinFunctionDescriptor (
-     char                    *DeviceName = NULL;
-     UINT32                  PinCount;
-     UINT32                  i;
-+    UINT16                  ResSourceOffset;
-+    UINT16                  VendorOffset;
-+    UINT16                  VendorLength;
- 
-     AcpiDmIndent (Level);
-     AcpiOsPrintf ("PinFunction (%s, ",
-@@ -459,12 +472,14 @@ AcpiDmPinFunctionDescriptor (
- 
-     /* FunctionNumber */
- 
--    AcpiOsPrintf ("0x%4.4X, ", Resource->PinFunction.FunctionNumber);
-+    AcpiOsPrintf ("0x%4.4X, ",
-+          AcpiUtReadUint16 (&Resource->PinFunction.FunctionNumber));
- 
--    if (Resource->PinFunction.ResSourceOffset)
-+    ResSourceOffset = AcpiUtReadUint16 (&Resource->PinFunction.ResSourceOffset);
-+    if (ResSourceOffset)
-     {
-         DeviceName = ACPI_ADD_PTR (char,
--            Resource, Resource->PinFunction.ResSourceOffset),
-+            Resource, ResSourceOffset),
-         AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
-     }
- 
-@@ -484,15 +499,15 @@ AcpiDmPinFunctionDescriptor (
- 
-     /* Dump the vendor data */
- 
--    if (Resource->PinFunction.VendorLength)
-+    VendorOffset = AcpiUtReadUint16 (&Resource->PinFunction.VendorOffset);
-+    VendorLength = AcpiUtReadUint16 (&Resource->PinFunction.VendorLength);
-+    if (VendorLength)
-     {
-         AcpiOsPrintf ("\n");
-         AcpiDmIndent (Level + 1);
--        VendorData = ACPI_ADD_PTR (UINT8, Resource,
--            Resource->PinFunction.VendorOffset);
-+        VendorData = ACPI_ADD_PTR (UINT8, Resource, VendorOffset);
- 
--        AcpiDmDumpRawDataBuffer (VendorData,
--            Resource->PinFunction.VendorLength, Level);
-+        AcpiDmDumpRawDataBuffer (VendorData, VendorLength, Level);
-     }
- 
-     AcpiOsPrintf (")\n");
-@@ -503,17 +518,17 @@ AcpiDmPinFunctionDescriptor (
- 
-     AcpiOsPrintf ("{   // Pin list\n");
- 
--    PinCount = ((UINT32) (Resource->PinFunction.ResSourceOffset -
--        Resource->PinFunction.PinTableOffset)) /
--        sizeof (UINT16);
-+    PinCount = AcpiUtReadUint16 (&Resource->PinFunction.ResSourceOffset);
-+    PinCount -= AcpiUtReadUint16 (&Resource->PinFunction.PinTableOffset);
-+    PinCount /= sizeof (UINT16);
- 
-     PinList = (UINT16 *) ACPI_ADD_PTR (char, Resource,
--        Resource->PinFunction.PinTableOffset);
-+        AcpiUtReadUint16 (&Resource->PinFunction.PinTableOffset));
- 
-     for (i = 0; i < PinCount; i++)
-     {
-         AcpiDmIndent (Level + 2);
--        AcpiOsPrintf ("0x%4.4X%s\n", PinList[i],
-+        AcpiOsPrintf ("0x%4.4X%s\n", AcpiUtReadUint16 (&(PinList[i])),
-             ((i + 1) < PinCount) ? "," : "");
-     }
- 
-@@ -549,7 +564,8 @@ AcpiDmDumpSerialBusVendorData (
-     {
-     case AML_RESOURCE_I2C_SERIALBUSTYPE:
- 
--        VendorLength = Resource->CommonSerialBus.TypeDataLength -
-+        VendorLength =
-+            AcpiUtReadUint16 (&Resource->CommonSerialBus.TypeDataLength) -
-             AML_RESOURCE_I2C_MIN_DATA_LEN;
- 
-         VendorData = ACPI_ADD_PTR (UINT8, Resource,
-@@ -558,7 +574,8 @@ AcpiDmDumpSerialBusVendorData (
- 
-     case AML_RESOURCE_SPI_SERIALBUSTYPE:
- 
--        VendorLength = Resource->CommonSerialBus.TypeDataLength -
-+        VendorLength =
-+            AcpiUtReadUint16 (&Resource->CommonSerialBus.TypeDataLength) -
-             AML_RESOURCE_SPI_MIN_DATA_LEN;
- 
-         VendorData = ACPI_ADD_PTR (UINT8, Resource,
-@@ -567,7 +584,8 @@ AcpiDmDumpSerialBusVendorData (
- 
-     case AML_RESOURCE_UART_SERIALBUSTYPE:
- 
--        VendorLength = Resource->CommonSerialBus.TypeDataLength -
-+        VendorLength =
-+            AcpiUtReadUint16 (&Resource->CommonSerialBus.TypeDataLength) -
-             AML_RESOURCE_UART_MIN_DATA_LEN;
- 
-         VendorData = ACPI_ADD_PTR (UINT8, Resource,
-@@ -693,9 +711,9 @@ AcpiDmI2cSerialBusDescriptor (
- 
-     AcpiDmIndent (Level);
-     AcpiOsPrintf ("I2cSerialBusV2 (0x%4.4X, %s, 0x%8.8X,\n",
--        Resource->I2cSerialBus.SlaveAddress,
-+        AcpiUtReadUint16 (&Resource->I2cSerialBus.SlaveAddress),
-         AcpiGbl_SmDecode [ACPI_GET_1BIT_FLAG (Resource->I2cSerialBus.Flags)],
--        Resource->I2cSerialBus.ConnectionSpeed);
-+        AcpiUtReadUint32 (&Resource->I2cSerialBus.ConnectionSpeed));
- 
-     AcpiDmIndent (Level + 1);
-     AcpiOsPrintf ("%s, ",
-@@ -704,7 +722,7 @@ AcpiDmI2cSerialBusDescriptor (
-     /* ResourceSource is a required field */
- 
-     ResourceSourceOffset = sizeof (AML_RESOURCE_COMMON_SERIALBUS) +
--        Resource->CommonSerialBus.TypeDataLength;
-+        AcpiUtReadUint16 (&Resource->CommonSerialBus.TypeDataLength);
- 
-     DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset);
-     AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
-@@ -761,15 +779,17 @@ AcpiDmSpiSerialBusDescriptor (
- {
-     UINT32                  ResourceSourceOffset;
-     char                    *DeviceName;
-+    UINT16                  Tmp16;
- 
- 
-     /* DeviceSelection, DeviceSelectionPolarity, WireMode, DataBitLength */
- 
-     AcpiDmIndent (Level);
-+    Tmp16 = AcpiUtReadUint16 (&Resource->SpiSerialBus.TypeSpecificFlags);
-     AcpiOsPrintf ("SpiSerialBusV2 (0x%4.4X, %s, %s, 0x%2.2X,\n",
--        Resource->SpiSerialBus.DeviceSelection,
--        AcpiGbl_DpDecode [ACPI_EXTRACT_1BIT_FLAG (Resource->SpiSerialBus.TypeSpecificFlags, 1)],
--        AcpiGbl_WmDecode [ACPI_GET_1BIT_FLAG (Resource->SpiSerialBus.TypeSpecificFlags)],
-+        AcpiUtReadUint16 (&Resource->SpiSerialBus.DeviceSelection),
-+        AcpiGbl_DpDecode [ACPI_EXTRACT_1BIT_FLAG (Tmp16, 1)],
-+        AcpiGbl_WmDecode [ACPI_GET_1BIT_FLAG (Tmp16)],
-         Resource->SpiSerialBus.DataBitLength);
- 
-     /* SlaveMode, ConnectionSpeed, ClockPolarity, ClockPhase */
-@@ -777,7 +797,7 @@ AcpiDmSpiSerialBusDescriptor (
-     AcpiDmIndent (Level + 1);
-     AcpiOsPrintf ("%s, 0x%8.8X, %s,\n",
-         AcpiGbl_SmDecode [ACPI_GET_1BIT_FLAG (Resource->SpiSerialBus.Flags)],
--        Resource->SpiSerialBus.ConnectionSpeed,
-+        AcpiUtReadUint32 (&Resource->SpiSerialBus.ConnectionSpeed),
-         AcpiGbl_CpoDecode [ACPI_GET_1BIT_FLAG (Resource->SpiSerialBus.ClockPolarity)]);
- 
-     AcpiDmIndent (Level + 1);
-@@ -787,7 +807,7 @@ AcpiDmSpiSerialBusDescriptor (
-     /* ResourceSource is a required field */
- 
-     ResourceSourceOffset = sizeof (AML_RESOURCE_COMMON_SERIALBUS) +
--        Resource->CommonSerialBus.TypeDataLength;
-+        AcpiUtReadUint16 (&Resource->CommonSerialBus.TypeDataLength);
- 
-     DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset);
-     AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
-@@ -844,15 +864,17 @@ AcpiDmUartSerialBusDescriptor (
- {
-     UINT32                  ResourceSourceOffset;
-     char                    *DeviceName;
-+    UINT16                  Tmp16;
- 
- 
-     /* ConnectionSpeed, BitsPerByte, StopBits */
- 
-     AcpiDmIndent (Level);
-+    Tmp16 = AcpiUtReadUint16 (&Resource->UartSerialBus.TypeSpecificFlags);
-     AcpiOsPrintf ("UartSerialBusV2 (0x%8.8X, %s, %s,\n",
--        Resource->UartSerialBus.DefaultBaudRate,
--        AcpiGbl_BpbDecode [ACPI_EXTRACT_3BIT_FLAG (Resource->UartSerialBus.TypeSpecificFlags, 4)],
--        AcpiGbl_SbDecode [ACPI_EXTRACT_2BIT_FLAG (Resource->UartSerialBus.TypeSpecificFlags, 2)]);
-+        AcpiUtReadUint32 (&Resource->UartSerialBus.DefaultBaudRate),
-+        AcpiGbl_BpbDecode [ACPI_EXTRACT_3BIT_FLAG (Tmp16, 4)],
-+        AcpiGbl_SbDecode [ACPI_EXTRACT_2BIT_FLAG (Tmp16, 2)]);
- 
-     /* LinesInUse, IsBigEndian, Parity, FlowControl */
- 
-@@ -867,13 +889,13 @@ AcpiDmUartSerialBusDescriptor (
- 
-     AcpiDmIndent (Level + 1);
-     AcpiOsPrintf ("0x%4.4X, 0x%4.4X, ",
--        Resource->UartSerialBus.RxFifoSize,
--        Resource->UartSerialBus.TxFifoSize);
-+        AcpiUtReadUint16 (&Resource->UartSerialBus.RxFifoSize),
-+        AcpiUtReadUint16 (&Resource->UartSerialBus.TxFifoSize));
- 
-     /* ResourceSource is a required field */
- 
-     ResourceSourceOffset = sizeof (AML_RESOURCE_COMMON_SERIALBUS) +
--        Resource->CommonSerialBus.TypeDataLength;
-+        AcpiUtReadUint16 (&Resource->CommonSerialBus.TypeDataLength);
- 
-     DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset);
-     AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
-Index: acpica-unix2-20220331/source/components/disassembler/dmresrcs.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/disassembler/dmresrcs.c
-+++ acpica-unix2-20220331/source/components/disassembler/dmresrcs.c
-@@ -93,7 +93,7 @@ AcpiDmIrqDescriptor (
-     AcpiOsPrintf (")\n");
- 
-     AcpiDmIndent (Level + 1);
--    AcpiDmBitList (Resource->Irq.IrqMask);
-+    AcpiDmBitList (AcpiUtReadUint16 (&Resource->Irq.IrqMask));
- }
- 
- 
-@@ -161,8 +161,8 @@ AcpiDmFixedDmaDescriptor (
- 
-     AcpiDmIndent (Level);
-     AcpiOsPrintf ("FixedDMA (0x%4.4X, 0x%4.4X, ",
--        Resource->FixedDma.RequestLines,
--        Resource->FixedDma.Channels);
-+        AcpiUtReadUint16 (&Resource->FixedDma.RequestLines),
-+        AcpiUtReadUint16 (&Resource->FixedDma.Channels));
- 
-     if (Resource->FixedDma.Width <= 5)
-     {
-@@ -210,10 +210,12 @@ AcpiDmIoDescriptor (
-         AcpiGbl_IoDecode [ACPI_GET_1BIT_FLAG (Resource->Io.Flags)]);
- 
-     AcpiDmIndent (Level + 1);
--    AcpiDmDumpInteger16 (Resource->Io.Minimum, "Range Minimum");
-+    AcpiDmDumpInteger16 (AcpiUtReadUint16 (&Resource->Io.Minimum),
-+                 "Range Minimum");
- 
-     AcpiDmIndent (Level + 1);
--    AcpiDmDumpInteger16 (Resource->Io.Maximum, "Range Maximum");
-+    AcpiDmDumpInteger16 (AcpiUtReadUint16 (&Resource->Io.Maximum),
-+                 "Range Maximum");
- 
-     AcpiDmIndent (Level + 1);
-     AcpiDmDumpInteger8 (Resource->Io.Alignment, "Alignment");
-@@ -256,10 +258,12 @@ AcpiDmFixedIoDescriptor (
-     AcpiOsPrintf ("FixedIO (\n");
- 
-     AcpiDmIndent (Level + 1);
--    AcpiDmDumpInteger16 (Resource->FixedIo.Address, "Address");
-+    AcpiDmDumpInteger16 (AcpiUtReadUint16 (&Resource->FixedIo.Address),
-+                 "Address");
- 
-     AcpiDmIndent (Level + 1);
--    AcpiDmDumpInteger8 (Resource->FixedIo.AddressLength, "Length");
-+    AcpiDmDumpInteger8 (AcpiUtReadUint16 (&Resource->FixedIo.AddressLength),
-+            "Length");
- 
-     /* Insert a descriptor name */
- 
-Index: acpica-unix2-20220331/source/components/disassembler/dmwalk.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/disassembler/dmwalk.c
-+++ acpica-unix2-20220331/source/components/disassembler/dmwalk.c
-@@ -1163,7 +1163,7 @@ AcpiDmAscendingOp (
-         {
-             ParentOp->Common.DisasmFlags |= ACPI_PARSEOP_EMPTY_TERMLIST;
-             ASL_CV_CLOSE_PAREN (Op, Level);
--            AcpiOsPrintf ("{");
-+            AcpiOsPrintf (" {");
-         }
-     }
- 
-Index: acpica-unix2-20220331/source/components/namespace/nsaccess.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/namespace/nsaccess.c
-+++ acpica-unix2-20220331/source/components/namespace/nsaccess.c
-@@ -644,7 +644,7 @@ AcpiNsLookup (
- 
-         /* Extract one ACPI name from the front of the pathname */
- 
--        ACPI_MOVE_32_TO_32 (&SimpleName, Path);
-+        ACPI_COPY_NAMESEG (&SimpleName, Path);
- 
-         /* Try to find the single (4 character) ACPI name */
- 
-Index: acpica-unix2-20220331/source/components/namespace/nsnames.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/namespace/nsnames.c
-+++ acpica-unix2-20220331/source/components/namespace/nsnames.c
-@@ -297,10 +297,10 @@ AcpiNsBuildNormalizedPath (
-     {
-         if (NextNode != Node)
-         {
--            ACPI_PATH_PUT8(FullPath, PathSize, AML_DUAL_NAME_PREFIX, Length);
-+            ACPI_PATH_PUT8 (FullPath, PathSize, AML_DUAL_NAME_PREFIX, Length);
-         }
- 
--        ACPI_MOVE_32_TO_32 (Name, &NextNode->Name);
-+        ACPI_COPY_NAMESEG (Name, &NextNode->Name);
-         DoNoTrailing = NoTrailing;
-         for (i = 0; i < 4; i++)
-         {
-Index: acpica-unix2-20220331/source/components/namespace/nsparse.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/namespace/nsparse.c
-+++ acpica-unix2-20220331/source/components/namespace/nsparse.c
-@@ -203,6 +203,7 @@ AcpiNsOneCompleteParse (
-     ACPI_WALK_STATE         *WalkState;
-     ACPI_TABLE_HEADER       *Table;
-     ACPI_OWNER_ID           OwnerId;
-+    UINT32                  TableLength;
- 
- 
-     ACPI_FUNCTION_TRACE (NsOneCompleteParse);
-@@ -216,13 +217,14 @@ AcpiNsOneCompleteParse (
- 
-     /* Table must consist of at least a complete header */
- 
--    if (Table->Length < sizeof (ACPI_TABLE_HEADER))
-+    TableLength = AcpiUtReadUint32 (&Table->Length);
-+    if (TableLength < sizeof (ACPI_TABLE_HEADER))
-     {
-         return_ACPI_STATUS (AE_BAD_HEADER);
-     }
- 
-     AmlStart = (UINT8 *) Table + sizeof (ACPI_TABLE_HEADER);
--    AmlLength = Table->Length - sizeof (ACPI_TABLE_HEADER);
-+    AmlLength = TableLength - sizeof (ACPI_TABLE_HEADER);
- 
-     Status = AcpiTbGetOwnerId (TableIndex, &OwnerId);
-     if (ACPI_FAILURE (Status))
-Index: acpica-unix2-20220331/source/components/namespace/nsutils.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/namespace/nsutils.c
-+++ acpica-unix2-20220331/source/components/namespace/nsutils.c
-@@ -272,7 +272,6 @@ AcpiNsBuildInternalName (
-     const char              *ExternalName = Info->NextExternalChar;
-     char                    *Result = NULL;
-     UINT32                  i;
--    char                    TmpSeg[ACPI_NAMESEG_SIZE+1];
- 
- 
-     ACPI_FUNCTION_TRACE (NsBuildInternalName);
-@@ -336,7 +335,6 @@ AcpiNsBuildInternalName (
- 
-     for (; NumSegments; NumSegments--)
-     {
--        memset (TmpSeg, 0, ACPI_NAMESEG_SIZE+1);
-         for (i = 0; i < ACPI_NAMESEG_SIZE; i++)
-         {
-             if (ACPI_IS_PATH_SEPARATOR (*ExternalName) ||
-@@ -344,17 +342,16 @@ AcpiNsBuildInternalName (
-             {
-                 /* Pad the segment with underscore(s) if segment is short */
- 
--                TmpSeg[i] = '_';
-+                Result[i] = '_';
-             }
-             else
-             {
-                 /* Convert the character to uppercase and save it */
- 
--                TmpSeg[i] = (char) toupper ((int) *ExternalName);
-+                Result[i] = (char) toupper ((int) *ExternalName);
-                 ExternalName++;
-             }
-         }
--    AcpiUtWriteUint (Result, ACPI_NAMESEG_SIZE, TmpSeg, ACPI_NAMESEG_SIZE);
- 
-         /* Now we must have a path separator, or the pathname is bad */
- 
-Index: acpica-unix2-20220331/source/components/utilities/utresrc.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/utilities/utresrc.c
-+++ acpica-unix2-20220331/source/components/utilities/utresrc.c
-@@ -541,7 +541,7 @@ AcpiUtGetResourceLength (
-     {
-         /* Large Resource type -- bytes 1-2 contain the 16-bit length */
- 
--        ACPI_MOVE_16_TO_16 (&ResourceLength, ACPI_ADD_PTR (UINT8, Aml, 1));
-+        ResourceLength = AcpiUtReadUint16 (ACPI_ADD_PTR (UINT8, Aml, 1));
- 
-     }
-     else
-Index: acpica-unix2-20220331/source/compiler/aslrestype2e.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/aslrestype2e.c
-+++ acpica-unix2-20220331/source/compiler/aslrestype2e.c
-@@ -80,6 +80,7 @@ RsDoExtendedIoDescriptor (
-     UINT16                  StringLength = 0;
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-+    UINT16                  Tmp16;
- 
- 
-     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -139,7 +140,8 @@ RsDoExtendedIoDescriptor (
- 
-         case 5: /* Address Granularity */
- 
--            Descriptor->ExtAddress64.Granularity = InitializerOp->Asl.Value.Integer;
-+            Descriptor->ExtAddress64.Granularity =
-+                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Granularity));
-             GranOp = InitializerOp;
-@@ -147,7 +149,8 @@ RsDoExtendedIoDescriptor (
- 
-         case 6: /* Address Min */
- 
--            Descriptor->ExtAddress64.Minimum = InitializerOp->Asl.Value.Integer;
-+            Descriptor->ExtAddress64.Minimum =
-+                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Minimum));
-             MinOp = InitializerOp;
-@@ -155,7 +158,8 @@ RsDoExtendedIoDescriptor (
- 
-         case 7: /* Address Max */
- 
--            Descriptor->ExtAddress64.Maximum = InitializerOp->Asl.Value.Integer;
-+            Descriptor->ExtAddress64.Maximum =
-+                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Maximum));
-             MaxOp = InitializerOp;
-@@ -163,14 +167,16 @@ RsDoExtendedIoDescriptor (
- 
-         case 8: /* Translation Offset */
- 
--            Descriptor->ExtAddress64.TranslationOffset = InitializerOp->Asl.Value.Integer;
-+            Descriptor->ExtAddress64.TranslationOffset =
-+                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.TranslationOffset));
-             break;
- 
-         case 9: /* Address Length */
- 
--            Descriptor->ExtAddress64.AddressLength = InitializerOp->Asl.Value.Integer;
-+            Descriptor->ExtAddress64.AddressLength =
-+                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.AddressLength));
-             LengthOp = InitializerOp;
-@@ -178,7 +184,8 @@ RsDoExtendedIoDescriptor (
- 
-         case 10: /* Type-Specific Attributes */
- 
--            Descriptor->ExtAddress64.TypeSpecific = InitializerOp->Asl.Value.Integer;
-+            Descriptor->ExtAddress64.TypeSpecific =
-+                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_TYPESPECIFICATTRIBUTES,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.TypeSpecific));
-             break;
-@@ -213,11 +220,14 @@ RsDoExtendedIoDescriptor (
- 
-     /* Validate the Min/Max/Len/Gran values */
- 
-+    Tmp16 = Descriptor->ExtAddress64.ResourceLength;
-+    Descriptor->ExtAddress64.ResourceLength = AcpiUtReadUint16 (&Tmp16);
-+
-     RsLargeAddressCheck (
--        Descriptor->ExtAddress64.Minimum,
--        Descriptor->ExtAddress64.Maximum,
--        Descriptor->ExtAddress64.AddressLength,
--        Descriptor->ExtAddress64.Granularity,
-+        AcpiUtReadUint64 (&Descriptor->ExtAddress64.Minimum),
-+        AcpiUtReadUint64 (&Descriptor->ExtAddress64.Maximum),
-+        AcpiUtReadUint64 (&Descriptor->ExtAddress64.AddressLength),
-+        AcpiUtReadUint64 (&Descriptor->ExtAddress64.Granularity),
-         Descriptor->ExtAddress64.Flags,
-         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
- 
-@@ -253,6 +263,7 @@ RsDoExtendedMemoryDescriptor (
-     UINT16                  StringLength = 0;
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-+    UINT16                  Tmp16;
- 
- 
-     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -319,7 +330,8 @@ RsDoExtendedMemoryDescriptor (
- 
-         case 6: /* Address Granularity */
- 
--            Descriptor->ExtAddress64.Granularity = InitializerOp->Asl.Value.Integer;
-+            Descriptor->ExtAddress64.Granularity =
-+                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Granularity));
-             GranOp = InitializerOp;
-@@ -327,7 +339,8 @@ RsDoExtendedMemoryDescriptor (
- 
-         case 7: /* Min Address */
- 
--            Descriptor->ExtAddress64.Minimum = InitializerOp->Asl.Value.Integer;
-+            Descriptor->ExtAddress64.Minimum =
-+                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Minimum));
-             MinOp = InitializerOp;
-@@ -335,7 +348,8 @@ RsDoExtendedMemoryDescriptor (
- 
-         case 8: /* Max Address */
- 
--            Descriptor->ExtAddress64.Maximum = InitializerOp->Asl.Value.Integer;
-+            Descriptor->ExtAddress64.Maximum =
-+                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Maximum));
-             MaxOp = InitializerOp;
-@@ -343,14 +357,16 @@ RsDoExtendedMemoryDescriptor (
- 
-         case 9: /* Translation Offset */
- 
--            Descriptor->ExtAddress64.TranslationOffset = InitializerOp->Asl.Value.Integer;
-+            Descriptor->ExtAddress64.TranslationOffset =
-+                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.TranslationOffset));
-             break;
- 
-         case 10: /* Address Length */
- 
--            Descriptor->ExtAddress64.AddressLength = InitializerOp->Asl.Value.Integer;
-+            Descriptor->ExtAddress64.AddressLength =
-+                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.AddressLength));
-             LengthOp = InitializerOp;
-@@ -358,7 +374,8 @@ RsDoExtendedMemoryDescriptor (
- 
-         case 11: /* Type-Specific Attributes */
- 
--            Descriptor->ExtAddress64.TypeSpecific = InitializerOp->Asl.Value.Integer;
-+            Descriptor->ExtAddress64.TypeSpecific =
-+                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_TYPESPECIFICATTRIBUTES,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.TypeSpecific));
-             break;
-@@ -394,11 +411,14 @@ RsDoExtendedMemoryDescriptor (
- 
-     /* Validate the Min/Max/Len/Gran values */
- 
-+    Tmp16 = Descriptor->ExtAddress64.ResourceLength;
-+    Descriptor->ExtAddress64.ResourceLength = AcpiUtReadUint16 (&Tmp16);
-+
-     RsLargeAddressCheck (
--        Descriptor->ExtAddress64.Minimum,
--        Descriptor->ExtAddress64.Maximum,
--        Descriptor->ExtAddress64.AddressLength,
--        Descriptor->ExtAddress64.Granularity,
-+        AcpiUtReadUint64 (&Descriptor->ExtAddress64.Minimum),
-+        AcpiUtReadUint64 (&Descriptor->ExtAddress64.Maximum),
-+        AcpiUtReadUint64 (&Descriptor->ExtAddress64.AddressLength),
-+        AcpiUtReadUint64 (&Descriptor->ExtAddress64.Granularity),
-         Descriptor->ExtAddress64.Flags,
-         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
- 
-@@ -434,6 +454,7 @@ RsDoExtendedSpaceDescriptor (
-     UINT16                  StringLength = 0;
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-+    UINT16                  Tmp16;
- 
- 
-     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -497,7 +518,8 @@ RsDoExtendedSpaceDescriptor (
- 
-         case 6: /* Address Granularity */
- 
--            Descriptor->ExtAddress64.Granularity = InitializerOp->Asl.Value.Integer;
-+            Descriptor->ExtAddress64.Granularity =
-+                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Granularity));
-             GranOp = InitializerOp;
-@@ -505,7 +527,8 @@ RsDoExtendedSpaceDescriptor (
- 
-         case 7: /* Min Address */
- 
--            Descriptor->ExtAddress64.Minimum = InitializerOp->Asl.Value.Integer;
-+            Descriptor->ExtAddress64.Minimum =
-+                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Minimum));
-             MinOp = InitializerOp;
-@@ -513,7 +536,8 @@ RsDoExtendedSpaceDescriptor (
- 
-         case 8: /* Max Address */
- 
--            Descriptor->ExtAddress64.Maximum = InitializerOp->Asl.Value.Integer;
-+            Descriptor->ExtAddress64.Maximum =
-+                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Maximum));
-             MaxOp = InitializerOp;
-@@ -521,14 +545,16 @@ RsDoExtendedSpaceDescriptor (
- 
-         case 9: /* Translation Offset */
- 
--            Descriptor->ExtAddress64.TranslationOffset = InitializerOp->Asl.Value.Integer;
-+            Descriptor->ExtAddress64.TranslationOffset =
-+                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_TRANSLATION,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.TranslationOffset));
-             break;
- 
-         case 10: /* Address Length */
- 
--            Descriptor->ExtAddress64.AddressLength = InitializerOp->Asl.Value.Integer;
-+            Descriptor->ExtAddress64.AddressLength =
-+                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.AddressLength));
-             LengthOp = InitializerOp;
-@@ -536,7 +562,8 @@ RsDoExtendedSpaceDescriptor (
- 
-         case 11: /* Type-Specific Attributes */
- 
--            Descriptor->ExtAddress64.TypeSpecific = InitializerOp->Asl.Value.Integer;
-+            Descriptor->ExtAddress64.TypeSpecific =
-+                AcpiUtReadUint64 (&InitializerOp->Asl.Value.Integer);
-             RsCreateQwordField (InitializerOp, ACPI_RESTAG_TYPESPECIFICATTRIBUTES,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.TypeSpecific));
-             break;
-@@ -557,11 +584,14 @@ RsDoExtendedSpaceDescriptor (
- 
-     /* Validate the Min/Max/Len/Gran values */
- 
-+    Tmp16 = Descriptor->ExtAddress64.ResourceLength;
-+    Descriptor->ExtAddress64.ResourceLength = AcpiUtReadUint16 (&Tmp16);
-+
-     RsLargeAddressCheck (
--        Descriptor->ExtAddress64.Minimum,
--        Descriptor->ExtAddress64.Maximum,
--        Descriptor->ExtAddress64.AddressLength,
--        Descriptor->ExtAddress64.Granularity,
-+        AcpiUtReadUint64 (&Descriptor->ExtAddress64.Minimum),
-+        AcpiUtReadUint64 (&Descriptor->ExtAddress64.Maximum),
-+        AcpiUtReadUint64 (&Descriptor->ExtAddress64.AddressLength),
-+        AcpiUtReadUint64 (&Descriptor->ExtAddress64.Granularity),
-         Descriptor->ExtAddress64.Flags,
-         MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp);
- 
-Index: acpica-unix2-20220331/source/compiler/aslrestype2s.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/aslrestype2s.c
-+++ acpica-unix2-20220331/source/compiler/aslrestype2s.c
-@@ -343,6 +343,7 @@ RsDoGpioIntDescriptor (
-     UINT32                  CurrentByteOffset;
-     UINT32                  PinCount = 0;
-     UINT32                  i;
-+    UINT16                  Tmp16;
- 
- 
-     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -485,7 +486,8 @@ RsDoGpioIntDescriptor (
-              *  (implies resource source must immediately follow the pin list.)
-              *  Name: _PIN
-              */
--            *InterruptList = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            *InterruptList = AcpiUtReadUint16 (&Tmp16);
-             InterruptList++;
-             PinCount++;
- 
-@@ -518,6 +520,27 @@ RsDoGpioIntDescriptor (
- 
-     MpSaveGpioInfo (Info->MappingOp, Descriptor,
-         PinCount, PinList, ResourceSource);
-+
-+    /* correct endian-ness issues */
-+    Tmp16 = Descriptor->Gpio.ResourceLength;
-+    Descriptor->Gpio.ResourceLength = AcpiUtReadUint16 (&Tmp16);
-+    Tmp16 = Descriptor->Gpio.Flags;
-+    Descriptor->Gpio.Flags = AcpiUtReadUint16 (&Tmp16);
-+    Tmp16 = Descriptor->Gpio.IntFlags;
-+    Descriptor->Gpio.IntFlags = AcpiUtReadUint16 (&Tmp16);
-+    Tmp16 = Descriptor->Gpio.DriveStrength;
-+    Descriptor->Gpio.DriveStrength = AcpiUtReadUint16 (&Tmp16);
-+    Tmp16 = Descriptor->Gpio.DebounceTimeout;
-+    Descriptor->Gpio.DebounceTimeout = AcpiUtReadUint16 (&Tmp16);
-+    Tmp16 = Descriptor->Gpio.PinTableOffset;
-+    Descriptor->Gpio.PinTableOffset = AcpiUtReadUint16 (&Tmp16);
-+    Tmp16 = Descriptor->Gpio.ResSourceOffset;
-+    Descriptor->Gpio.ResSourceOffset = AcpiUtReadUint16 (&Tmp16);
-+    Tmp16 = Descriptor->Gpio.VendorOffset;
-+    Descriptor->Gpio.VendorOffset = AcpiUtReadUint16 (&Tmp16);
-+    Tmp16 = Descriptor->Gpio.VendorLength;
-+    Descriptor->Gpio.VendorLength = AcpiUtReadUint16 (&Tmp16);
-+
-     return (Rnode);
- }
- 
-@@ -552,6 +575,7 @@ RsDoGpioIoDescriptor (
-     UINT32                  CurrentByteOffset;
-     UINT32                  PinCount = 0;
-     UINT32                  i;
-+    UINT16                  Tmp16;
- 
- 
-     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -691,7 +715,8 @@ RsDoGpioIoDescriptor (
-              *  (implies resource source must immediately follow the pin list.)
-              *  Name: _PIN
-              */
--            *InterruptList = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            *InterruptList = AcpiUtReadUint16 (&Tmp16);
-             InterruptList++;
-             PinCount++;
- 
-@@ -724,6 +749,27 @@ RsDoGpioIoDescriptor (
- 
-     MpSaveGpioInfo (Info->MappingOp, Descriptor,
-         PinCount, PinList, ResourceSource);
-+
-+    /* correct endian-ness issues */
-+    Tmp16 = Descriptor->Gpio.ResourceLength;
-+    Descriptor->Gpio.ResourceLength = AcpiUtReadUint16 (&Tmp16);
-+    Tmp16 = Descriptor->Gpio.Flags;
-+    Descriptor->Gpio.Flags = AcpiUtReadUint16 (&Tmp16);
-+    Tmp16 = Descriptor->Gpio.IntFlags;
-+    Descriptor->Gpio.IntFlags = AcpiUtReadUint16 (&Tmp16);
-+    Tmp16 = Descriptor->Gpio.DriveStrength;
-+    Descriptor->Gpio.DriveStrength = AcpiUtReadUint16 (&Tmp16);
-+    Tmp16 = Descriptor->Gpio.DebounceTimeout;
-+    Descriptor->Gpio.DebounceTimeout = AcpiUtReadUint16 (&Tmp16);
-+    Tmp16 = Descriptor->Gpio.PinTableOffset;
-+    Descriptor->Gpio.PinTableOffset = AcpiUtReadUint16 (&Tmp16);
-+    Tmp16 = Descriptor->Gpio.ResSourceOffset;
-+    Descriptor->Gpio.ResSourceOffset = AcpiUtReadUint16 (&Tmp16);
-+    Tmp16 = Descriptor->Gpio.VendorOffset;
-+    Descriptor->Gpio.VendorOffset = AcpiUtReadUint16 (&Tmp16);
-+    Tmp16 = Descriptor->Gpio.VendorLength;
-+    Descriptor->Gpio.VendorLength = AcpiUtReadUint16 (&Tmp16);
-+
-     return (Rnode);
- }
- 
-@@ -754,6 +800,8 @@ RsDoI2cSerialBusDescriptor (
-     UINT16                  DescriptorSize;
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-+    UINT16                  Tmp16;
-+    UINT32                  Tmp32;
- 
- 
-     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -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;
--    Descriptor->I2cSerialBus.TypeDataLength = AML_RESOURCE_I2C_MIN_DATA_LEN + VendorLength;
-+    Tmp16 = AML_RESOURCE_I2C_MIN_DATA_LEN + VendorLength;
-+    Descriptor->I2cSerialBus.TypeDataLength = AcpiUtReadUint16 (&Tmp16);
- 
-     if (Info->DescriptorTypeOp->Asl.ParseOpcode == PARSEOP_I2C_SERIALBUS_V2)
-     {
-@@ -795,13 +844,15 @@ RsDoI2cSerialBusDescriptor (
- 
-     /* Process all child initialization nodes */
- 
-+    Descriptor->I2cSerialBus.TypeSpecificFlags = 0;
-     for (i = 0; InitializerOp; i++)
-     {
-         switch (i)
-         {
-         case 0: /* Slave Address [WORD] (_ADR) */
- 
--            Descriptor->I2cSerialBus.SlaveAddress = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->I2cSerialBus.SlaveAddress = AcpiUtReadUint16 (&Tmp16);
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_ADDRESS,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (I2cSerialBus.SlaveAddress));
-             break;
-@@ -815,16 +866,19 @@ RsDoI2cSerialBusDescriptor (
- 
-         case 2: /* Connection Speed [DWORD] (_SPE) */
- 
--            Descriptor->I2cSerialBus.ConnectionSpeed = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->I2cSerialBus.ConnectionSpeed = AcpiUtReadUint32 (&Tmp32);
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_SPEED,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (I2cSerialBus.ConnectionSpeed));
-             break;
- 
-         case 3: /* Addressing Mode [Flag] (_MOD) */
- 
--            RsSetFlagBits16 (&Descriptor->I2cSerialBus.TypeSpecificFlags, InitializerOp, 0, 0);
-+            Tmp16 = AcpiUtReadUint16 (&Descriptor->I2cSerialBus.TypeSpecificFlags);
-+            RsSetFlagBits16 (&Tmp16, InitializerOp, 0, 0);
-             RsCreateBitField (InitializerOp, ACPI_RESTAG_MODE,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (I2cSerialBus.TypeSpecificFlags), 0);
-+            Descriptor->I2cSerialBus.TypeSpecificFlags = AcpiUtReadUint16 (&Tmp16);
-             break;
- 
-         case 4: /* ResSource [Optional Field - STRING] */
-@@ -882,6 +936,8 @@ RsDoI2cSerialBusDescriptor (
-         InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
-     }
- 
-+    Tmp16 = Descriptor->I2cSerialBus.ResourceLength;
-+    Descriptor->I2cSerialBus.ResourceLength = AcpiUtReadUint16 (&Tmp16);
-     MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource);
-     return (Rnode);
- }
-@@ -913,6 +969,8 @@ RsDoSpiSerialBusDescriptor (
-     UINT16                  DescriptorSize;
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-+    UINT16                  Tmp16;
-+    UINT32                  Tmp32;
- 
- 
-     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -935,12 +993,13 @@ RsDoSpiSerialBusDescriptor (
-         sizeof (AML_RESOURCE_LARGE_HEADER));
- 
-     Descriptor = Rnode->Buffer;
--    Descriptor->SpiSerialBus.ResourceLength = DescriptorSize;
-+    Descriptor->SpiSerialBus.ResourceLength = AcpiUtReadUint16 (&DescriptorSize);
-     Descriptor->SpiSerialBus.DescriptorType = ACPI_RESOURCE_NAME_SERIAL_BUS;
-     Descriptor->SpiSerialBus.RevisionId = AML_RESOURCE_SPI_REVISION;
-     Descriptor->SpiSerialBus.TypeRevisionId = AML_RESOURCE_SPI_TYPE_REVISION;
-     Descriptor->SpiSerialBus.Type = AML_RESOURCE_SPI_SERIALBUSTYPE;
--    Descriptor->SpiSerialBus.TypeDataLength = AML_RESOURCE_SPI_MIN_DATA_LEN + VendorLength;
-+    Tmp16 = AML_RESOURCE_SPI_MIN_DATA_LEN + VendorLength;
-+    Descriptor->SpiSerialBus.TypeDataLength = AcpiUtReadUint16 (&Tmp16);
- 
-     if (Info->DescriptorTypeOp->Asl.ParseOpcode == PARSEOP_SPI_SERIALBUS_V2)
-     {
-@@ -955,29 +1014,35 @@ RsDoSpiSerialBusDescriptor (
- 
-     /* Process all child initialization nodes */
- 
-+    Descriptor->SpiSerialBus.TypeSpecificFlags = 0;
-     for (i = 0; InitializerOp; i++)
-     {
-         switch (i)
-         {
-         case 0: /* Device Selection [WORD] (_ADR) */
- 
--            Descriptor->SpiSerialBus.DeviceSelection = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->SpiSerialBus.DeviceSelection = AcpiUtReadUint16 (&Tmp16);
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_ADDRESS,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (SpiSerialBus.DeviceSelection));
-             break;
- 
-         case 1: /* Device Polarity [Flag] (_DPL) */
- 
--            RsSetFlagBits16 (&Descriptor->SpiSerialBus.TypeSpecificFlags, InitializerOp, 1, 0);
-+            Tmp16 = AcpiUtReadUint16 (&Descriptor->SpiSerialBus.TypeSpecificFlags);
-+            RsSetFlagBits16 (&Tmp16, InitializerOp, 1, 0);
-             RsCreateBitField (InitializerOp, ACPI_RESTAG_DEVICEPOLARITY,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (SpiSerialBus.TypeSpecificFlags), 1);
-+            Descriptor->SpiSerialBus.TypeSpecificFlags = AcpiUtReadUint16 (&Tmp16);
-             break;
- 
-         case 2: /* Wire Mode [Flag] (_MOD) */
- 
--            RsSetFlagBits16 (&Descriptor->SpiSerialBus.TypeSpecificFlags, InitializerOp, 0, 0);
-+            Tmp16 = AcpiUtReadUint16 (&Descriptor->SpiSerialBus.TypeSpecificFlags);
-+            RsSetFlagBits16 (&Tmp16, InitializerOp, 0, 0);
-             RsCreateBitField (InitializerOp, ACPI_RESTAG_MODE,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (SpiSerialBus.TypeSpecificFlags), 0);
-+            Descriptor->SpiSerialBus.TypeSpecificFlags = AcpiUtReadUint16 (&Tmp16);
-             break;
- 
-         case 3: /* Device Bit Length [BYTE] (_LEN) */
-@@ -996,7 +1061,8 @@ RsDoSpiSerialBusDescriptor (
- 
-         case 5: /* Connection Speed [DWORD] (_SPE) */
- 
--            Descriptor->SpiSerialBus.ConnectionSpeed = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->SpiSerialBus.ConnectionSpeed = AcpiUtReadUint32 (&Tmp32);
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_SPEED,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (SpiSerialBus.ConnectionSpeed));
-             break;
-@@ -1101,6 +1167,8 @@ RsDoUartSerialBusDescriptor (
-     UINT16                  DescriptorSize;
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-+    UINT16                  Tmp16;
-+    UINT32                  Tmp32;
- 
- 
-     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-@@ -1123,12 +1191,13 @@ RsDoUartSerialBusDescriptor (
-         sizeof (AML_RESOURCE_LARGE_HEADER));
- 
-     Descriptor = Rnode->Buffer;
--    Descriptor->UartSerialBus.ResourceLength = DescriptorSize;
-+    Descriptor->UartSerialBus.ResourceLength = AcpiUtReadUint16 (&DescriptorSize);
-     Descriptor->UartSerialBus.DescriptorType = ACPI_RESOURCE_NAME_SERIAL_BUS;
-     Descriptor->UartSerialBus.RevisionId = AML_RESOURCE_UART_REVISION;
-     Descriptor->UartSerialBus.TypeRevisionId = AML_RESOURCE_UART_TYPE_REVISION;
-     Descriptor->UartSerialBus.Type = AML_RESOURCE_UART_SERIALBUSTYPE;
--    Descriptor->UartSerialBus.TypeDataLength = AML_RESOURCE_UART_MIN_DATA_LEN + VendorLength;
-+    Tmp16 = AML_RESOURCE_UART_MIN_DATA_LEN + VendorLength;
-+    Descriptor->UartSerialBus.TypeDataLength = AcpiUtReadUint16 (&Tmp16);
- 
-     if (Info->DescriptorTypeOp->Asl.ParseOpcode == PARSEOP_UART_SERIALBUS_V2)
-     {
-@@ -1142,29 +1211,35 @@ RsDoUartSerialBusDescriptor (
- 
-     /* Process all child initialization nodes */
- 
-+    Descriptor->UartSerialBus.TypeSpecificFlags = 0;
-     for (i = 0; InitializerOp; i++)
-     {
-         switch (i)
-         {
-         case 0: /* Connection Speed (Baud Rate) [DWORD] (_SPE) */
- 
--            Descriptor->UartSerialBus.DefaultBaudRate = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->UartSerialBus.DefaultBaudRate = AcpiUtReadUint32 (&Tmp32);
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_SPEED,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.DefaultBaudRate));
-             break;
- 
-         case 1: /* Bits Per Byte [Flags] (_LEN) */
- 
--            RsSetFlagBits16 (&Descriptor->UartSerialBus.TypeSpecificFlags, InitializerOp, 4, 3);
-+            Tmp16 = AcpiUtReadUint16 (&Descriptor->UartSerialBus.TypeSpecificFlags);
-+            RsSetFlagBits16 (&Tmp16, InitializerOp, 4, 3);
-             RsCreateMultiBitField (InitializerOp, ACPI_RESTAG_LENGTH,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TypeSpecificFlags), 4, 3);
-+            Descriptor->UartSerialBus.TypeSpecificFlags = AcpiUtReadUint16 (&Tmp16);;
-             break;
- 
-         case 2: /* Stop Bits [Flags] (_STB) */
- 
--            RsSetFlagBits16 (&Descriptor->UartSerialBus.TypeSpecificFlags, InitializerOp, 2, 1);
-+            Tmp16 = AcpiUtReadUint16 (&Descriptor->UartSerialBus.TypeSpecificFlags);
-+            RsSetFlagBits16 (&Tmp16, InitializerOp, 2, 1);
-             RsCreateMultiBitField (InitializerOp, ACPI_RESTAG_STOPBITS,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TypeSpecificFlags), 2, 2);
-+            Descriptor->UartSerialBus.TypeSpecificFlags = AcpiUtReadUint16 (&Tmp16);;
-             break;
- 
-         case 3: /* Lines In Use [BYTE] (_LIN) */
-@@ -1176,9 +1251,11 @@ RsDoUartSerialBusDescriptor (
- 
-         case 4: /* Endianness [Flag] (_END) */
- 
--            RsSetFlagBits16 (&Descriptor->UartSerialBus.TypeSpecificFlags, InitializerOp, 7, 0);
-+            Tmp16 = AcpiUtReadUint16 (&Descriptor->UartSerialBus.TypeSpecificFlags);
-+            RsSetFlagBits16 (&Tmp16, InitializerOp, 7, 0);
-             RsCreateBitField (InitializerOp, ACPI_RESTAG_ENDIANNESS,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TypeSpecificFlags), 7);
-+            Descriptor->UartSerialBus.TypeSpecificFlags = AcpiUtReadUint16 (&Tmp16);;
-             break;
- 
-         case 5: /* Parity [BYTE] (_PAR) */
-@@ -1190,21 +1267,25 @@ RsDoUartSerialBusDescriptor (
- 
-         case 6: /* Flow Control [Flags] (_FLC) */
- 
--            RsSetFlagBits16 (&Descriptor->UartSerialBus.TypeSpecificFlags, InitializerOp, 0, 0);
-+            Tmp16 = AcpiUtReadUint16 (&Descriptor->UartSerialBus.TypeSpecificFlags);
-+            RsSetFlagBits16 (&Tmp16, InitializerOp, 0, 0);
-             RsCreateMultiBitField (InitializerOp, ACPI_RESTAG_FLOWCONTROL,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TypeSpecificFlags), 0, 2);
-+            Descriptor->UartSerialBus.TypeSpecificFlags = AcpiUtReadUint16 (&Tmp16);;
-             break;
- 
-         case 7: /* Rx Buffer Size [WORD] (_RXL) */
- 
--            Descriptor->UartSerialBus.RxFifoSize = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->UartSerialBus.RxFifoSize = AcpiUtReadUint16 (&Tmp16);
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH_RX,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.RxFifoSize));
-             break;
- 
-         case 8: /* Tx Buffer Size [WORD] (_TXL) */
- 
--            Descriptor->UartSerialBus.TxFifoSize = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->UartSerialBus.TxFifoSize = AcpiUtReadUint16 (&Tmp16);
-             RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH_TX,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TxFifoSize));
-             break;
-@@ -1444,6 +1525,7 @@ RsDoPinFunctionDescriptor (
-     UINT32                  CurrentByteOffset;
-     UINT32                  PinCount = 0;
-     UINT32                  i;
-+    UINT16                  Tmp16;
- 
-     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-     CurrentByteOffset = Info->CurrentByteOffset;
-@@ -1467,7 +1549,7 @@ RsDoPinFunctionDescriptor (
-         sizeof (AML_RESOURCE_LARGE_HEADER));
- 
-     Descriptor = Rnode->Buffer;
--    Descriptor->PinFunction.ResourceLength = DescriptorSize;
-+    Descriptor->PinFunction.ResourceLength = AcpiUtReadUint16 (&DescriptorSize);
-     Descriptor->PinFunction.DescriptorType = ACPI_RESOURCE_NAME_PIN_FUNCTION;
-     Descriptor->PinFunction.RevisionId = AML_RESOURCE_PIN_FUNCTION_REVISION;
- 
-@@ -1507,7 +1589,8 @@ RsDoPinFunctionDescriptor (
- 
-         case 2: /* Function Number [WORD] (_FUN) */
- 
--            Descriptor->PinFunction.FunctionNumber = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->PinFunction.FunctionNumber = AcpiUtReadUint16 (&Tmp16);
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_FUNCTION,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (PinFunction.FunctionNumber));
-             break;
-@@ -1555,6 +1638,12 @@ RsDoPinFunctionDescriptor (
-             {
-                 Descriptor->PinFunction.VendorLength = VendorLength;
-             }
-+            Tmp16 = (UINT16) ACPI_PTR_DIFF (VendorData, Descriptor);
-+            Descriptor->PinFunction.VendorOffset = AcpiUtReadUint16 (&Tmp16);
-+
-+            Tmp16 = Descriptor->PinFunction.VendorLength;
-+            Descriptor->PinFunction.VendorLength = AcpiUtReadUint16 (&Tmp16);
-+
-             break;
- 
-         default:
-@@ -1566,7 +1655,8 @@ RsDoPinFunctionDescriptor (
-              *  (implies resource source must immediately follow the pin list.)
-              *  Name: _PIN
-              */
--            *PinList = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            *PinList = AcpiUtReadUint16 (&Tmp16);
-             PinList++;
-             PinCount++;
- 
-@@ -1597,6 +1687,13 @@ RsDoPinFunctionDescriptor (
-         InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
-     }
- 
-+    /* correct the endian-ness of the values */
-+    Tmp16 = Descriptor->PinFunction.PinTableOffset;
-+    Descriptor->PinFunction.PinTableOffset = AcpiUtReadUint16 (&Tmp16);
-+
-+    Tmp16 = Descriptor->PinFunction.ResSourceOffset;
-+    Descriptor->PinFunction.ResSourceOffset = AcpiUtReadUint16 (&Tmp16);
-+
-     return (Rnode);
- }
- 
-@@ -1630,6 +1727,8 @@ RsDoPinConfigDescriptor (
-     UINT32                  CurrentByteOffset;
-     UINT32                  PinCount = 0;
-     UINT32                  i;
-+    UINT16                  Tmp16;
-+    UINT32                  Tmp32;
- 
-     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-     CurrentByteOffset = Info->CurrentByteOffset;
-@@ -1653,7 +1752,7 @@ RsDoPinConfigDescriptor (
-         sizeof (AML_RESOURCE_LARGE_HEADER));
- 
-     Descriptor = Rnode->Buffer;
--    Descriptor->PinConfig.ResourceLength = DescriptorSize;
-+    Descriptor->PinConfig.ResourceLength = AcpiUtReadUint16 (&DescriptorSize);
-     Descriptor->PinConfig.DescriptorType = ACPI_RESOURCE_NAME_PIN_CONFIG;
-     Descriptor->PinConfig.RevisionId = AML_RESOURCE_PIN_CONFIG_REVISION;
- 
-@@ -1707,7 +1806,8 @@ RsDoPinConfigDescriptor (
- 
-         case 2: /* Pin Config Value [DWORD] (_VAL) */
- 
--            Descriptor->PinConfig.PinConfigValue = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->PinConfig.PinConfigValue = AcpiUtReadUint32 (&Tmp32);
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_PINCONFIG_VALUE,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (PinConfig.PinConfigValue));
-             break;
-@@ -1766,7 +1866,8 @@ RsDoPinConfigDescriptor (
-              *  (implies resource source must immediately follow the pin list.)
-              *  Name: _PIN
-              */
--            *PinList = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            *PinList = AcpiUtReadUint16 (&Tmp16);
-             PinList++;
-             PinCount++;
- 
-@@ -1797,6 +1898,16 @@ RsDoPinConfigDescriptor (
-         InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
-     }
- 
-+    /* correct the endianness if needed */
-+    Tmp16 = Descriptor->PinConfig.PinTableOffset;
-+    Descriptor->PinConfig.PinTableOffset = AcpiUtReadUint16 (&Tmp16);
-+    Tmp16 = Descriptor->PinConfig.ResSourceOffset;
-+    Descriptor->PinConfig.ResSourceOffset = AcpiUtReadUint16 (&Tmp16);
-+    Tmp16 = Descriptor->PinConfig.VendorOffset;
-+    Descriptor->PinConfig.VendorOffset = AcpiUtReadUint16 (&Tmp16);
-+    Tmp16 = Descriptor->PinConfig.VendorLength;
-+    Descriptor->PinConfig.VendorLength = AcpiUtReadUint16 (&Tmp16);
-+
-     return (Rnode);
- }
- 
-@@ -1830,6 +1941,7 @@ RsDoPinGroupDescriptor (
-     UINT32                  CurrentByteOffset;
-     UINT32                  PinCount = 0;
-     UINT32                  i;
-+    UINT16                  Tmp16;
- 
-     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-     CurrentByteOffset = Info->CurrentByteOffset;
-@@ -1853,7 +1965,7 @@ RsDoPinGroupDescriptor (
-         sizeof (AML_RESOURCE_LARGE_HEADER));
- 
-     Descriptor = Rnode->Buffer;
--    Descriptor->PinGroup.ResourceLength = DescriptorSize;
-+    Descriptor->PinGroup.ResourceLength = AcpiUtReadUint16 (&DescriptorSize);
-     Descriptor->PinGroup.DescriptorType = ACPI_RESOURCE_NAME_PIN_GROUP;
-     Descriptor->PinGroup.RevisionId = AML_RESOURCE_PIN_GROUP_REVISION;
- 
-@@ -1920,7 +2032,8 @@ RsDoPinGroupDescriptor (
-              *  (implies resource source must immediately follow the pin list.)
-              *  Name: _PIN
-              */
--            *PinList = (UINT16) InitializerOp->Asl.Value.Integer;
-+        Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            *PinList = AcpiUtReadUint16 (&Tmp16);
-             PinList++;
-             PinCount++;
- 
-@@ -1951,6 +2064,16 @@ RsDoPinGroupDescriptor (
-         InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
-     }
- 
-+    /* correct enddianness as needed */
-+    Tmp16 = Descriptor->PinGroup.PinTableOffset;
-+    Descriptor->PinGroup.PinTableOffset = AcpiUtReadUint16 (&Tmp16);
-+    Tmp16 = Descriptor->PinGroup.LabelOffset;
-+    Descriptor->PinGroup.LabelOffset = AcpiUtReadUint16 (&Tmp16);
-+    Tmp16 = Descriptor->PinGroup.VendorOffset;
-+    Descriptor->PinGroup.VendorOffset = AcpiUtReadUint16 (&Tmp16);
-+    Tmp16 = Descriptor->PinGroup.VendorLength;
-+    Descriptor->PinGroup.VendorLength = AcpiUtReadUint16 (&Tmp16);
-+
-     return (Rnode);
- }
- 
-@@ -1983,6 +2106,7 @@ RsDoPinGroupFunctionDescriptor (
-     UINT16                  DescriptorSize;
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-+    UINT16                  Tmp16;
- 
-     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-     CurrentByteOffset = Info->CurrentByteOffset;
-@@ -2006,7 +2130,7 @@ RsDoPinGroupFunctionDescriptor (
-         sizeof (AML_RESOURCE_LARGE_HEADER));
- 
-     Descriptor = Rnode->Buffer;
--    Descriptor->PinGroupFunction.ResourceLength = DescriptorSize;
-+    Descriptor->PinGroupFunction.ResourceLength = AcpiUtReadUint16 (&DescriptorSize);
-     Descriptor->PinGroupFunction.DescriptorType = ACPI_RESOURCE_NAME_PIN_GROUP_FUNCTION;
-     Descriptor->PinGroupFunction.RevisionId = AML_RESOURCE_PIN_GROUP_FUNCTION_REVISION;
- 
-@@ -2038,7 +2162,8 @@ RsDoPinGroupFunctionDescriptor (
- 
-         case 1: /* Function Number [WORD] */
- 
--            Descriptor->PinGroupFunction.FunctionNumber = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Tmp16 = (UINT16) InitializerOp->Asl.Value.Integer;
-+            Descriptor->PinGroupFunction.FunctionNumber = AcpiUtReadUint16 (&Tmp16);
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_FUNCTION,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (PinGroupFunction.FunctionNumber));
-             break;
-@@ -2097,6 +2222,16 @@ RsDoPinGroupFunctionDescriptor (
-         InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
-     }
- 
-+    /* correct enddianness as needed */
-+    Tmp16 = Descriptor->PinGroupFunction.ResSourceOffset;
-+    Descriptor->PinGroupFunction.ResSourceOffset = AcpiUtReadUint16 (&Tmp16);
-+    Tmp16 = Descriptor->PinGroupFunction.ResSourceLabelOffset;
-+    Descriptor->PinGroupFunction.ResSourceLabelOffset = AcpiUtReadUint16 (&Tmp16);
-+    Tmp16 = Descriptor->PinGroupFunction.VendorOffset;
-+    Descriptor->PinGroupFunction.VendorOffset = AcpiUtReadUint16 (&Tmp16);
-+    Tmp16 = Descriptor->PinGroupFunction.VendorLength;
-+    Descriptor->PinGroupFunction.VendorLength = AcpiUtReadUint16 (&Tmp16);
-+
-     return (Rnode);
- }
- 
-@@ -2129,6 +2264,8 @@ RsDoPinGroupConfigDescriptor (
-     UINT16                  DescriptorSize;
-     UINT32                  CurrentByteOffset;
-     UINT32                  i;
-+    UINT16                  Tmp16;
-+    UINT32                  Tmp32;
- 
-     InitializerOp = Info->DescriptorTypeOp->Asl.Child;
-     CurrentByteOffset = Info->CurrentByteOffset;
-@@ -2152,7 +2289,7 @@ RsDoPinGroupConfigDescriptor (
-         sizeof (AML_RESOURCE_LARGE_HEADER));
- 
-     Descriptor = Rnode->Buffer;
--    Descriptor->PinGroupConfig.ResourceLength = DescriptorSize;
-+    Descriptor->PinGroupConfig.ResourceLength = AcpiUtReadUint16 (&DescriptorSize);
-     Descriptor->PinGroupConfig.DescriptorType = ACPI_RESOURCE_NAME_PIN_GROUP_CONFIG;
-     Descriptor->PinGroupConfig.RevisionId = AML_RESOURCE_PIN_GROUP_CONFIG_REVISION;
- 
-@@ -2205,7 +2342,8 @@ RsDoPinGroupConfigDescriptor (
- 
-         case 2: /* Pin Config Value [DWORD] (_VAL) */
- 
--            Descriptor->PinGroupConfig.PinConfigValue = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Tmp32 = (UINT32) InitializerOp->Asl.Value.Integer;
-+            Descriptor->PinGroupConfig.PinConfigValue = AcpiUtReadUint32 (&Tmp32);
-             RsCreateDwordField (InitializerOp, ACPI_RESTAG_PINCONFIG_VALUE,
-                 CurrentByteOffset + ASL_RESDESC_OFFSET (PinGroupConfig.PinConfigValue));
-             break;
-@@ -2266,5 +2404,15 @@ RsDoPinGroupConfigDescriptor (
-         InitializerOp = RsCompleteNodeAndGetNext (InitializerOp);
-     }
- 
-+    /* correct enddianness as needed */
-+    Tmp16 = Descriptor->PinGroupConfig.ResSourceOffset;
-+    Descriptor->PinGroupConfig.ResSourceOffset = AcpiUtReadUint16 (&Tmp16);
-+    Tmp16 = Descriptor->PinGroupConfig.ResSourceLabelOffset;
-+    Descriptor->PinGroupConfig.ResSourceLabelOffset = AcpiUtReadUint16 (&Tmp16);
-+    Tmp16 = Descriptor->PinGroupConfig.VendorOffset;
-+    Descriptor->PinGroupConfig.VendorOffset = AcpiUtReadUint16 (&Tmp16);
-+    Tmp16 = Descriptor->PinGroupConfig.VendorLength;
-+    Descriptor->PinGroupConfig.VendorLength = AcpiUtReadUint16 (&Tmp16);
-+
-     return (Rnode);
- }
diff --git a/0044-Initial-support-for-WPBT-in-big-endian-needs-more.patch b/0044-Initial-support-for-WPBT-in-big-endian-needs-more.patch
deleted file mode 100644
index 1a2b1a2..0000000
--- a/0044-Initial-support-for-WPBT-in-big-endian-needs-more.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From bd137d3712e6bc7e4d2d11350a208a36750e4063 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Tue, 6 Jul 2021 18:26:41 -0600
-Subject: [PATCH 44/45] Initial support for WPBT in big-endian, needs more
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/compiler/dttable2.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: acpica-unix2-20210604/source/compiler/dttable2.c
-===================================================================
---- acpica-unix2-20210604.orig/source/compiler/dttable2.c
-+++ acpica-unix2-20210604/source/compiler/dttable2.c
-@@ -2638,7 +2638,7 @@ DtCompileWpbt (
-     AcpiUtWriteUint (&Length, sizeof (UINT16),
-            &Subtable->TotalLength, sizeof (UINT32));
-     Table = ACPI_CAST_PTR (ACPI_TABLE_WPBT, ParentTable->Buffer);
--    Table->ArgumentsLength = Length;
-+    Table->ArgumentsLength = AcpiUtReadUint16 (&Length);
- 
-     ParentTable = DtPeekSubtable ();
-     DtInsertSubtable (ParentTable, Subtable);
diff --git a/0045-CSRT-fixed-use-of-optional-ResourceInfo.patch b/0045-CSRT-fixed-use-of-optional-ResourceInfo.patch
deleted file mode 100644
index 201e19b..0000000
--- a/0045-CSRT-fixed-use-of-optional-ResourceInfo.patch
+++ /dev/null
@@ -1,213 +0,0 @@
-From 0d87ee42adda7837bec3cc0ff86e40c2f2e8dc4f Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Fri, 9 Jul 2021 14:52:55 -0600
-Subject: [PATCH 45/45] CSRT: fixed use of optional ResourceInfo
-
-In a resource sub-sub-table, there may be a ResourceInfo entry.  Neither
-the compiler nor disassembler accounted for that possibility properly.
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/common/dmtbdump1.c  | 43 +++++++++++++++++++++-----------------
- source/compiler/dttable1.c | 28 +++++++++++++------------
- 2 files changed, 39 insertions(+), 32 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump1.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump1.c
-+++ acpica-unix2-20220331/source/common/dmtbdump1.c
-@@ -669,11 +669,13 @@ AcpiDmDumpCsrt (
-     ACPI_CSRT_GROUP         *Subtable;
-     ACPI_CSRT_SHARED_INFO   *SharedInfoTable;
-     ACPI_CSRT_DESCRIPTOR    *SubSubtable;
--    UINT32                  Length = AcpiUtReadUint32 (&Table->Length);
-+    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
-     UINT32                  Offset = sizeof (ACPI_TABLE_CSRT);
-     UINT32                  SubOffset;
-     UINT32                  SubSubOffset;
-     UINT32                  InfoLength;
-+    UINT32                  SubtableLength;
-+    UINT32                  SubSubtableLength;
- 
- 
-     /* The main table only contains the ACPI header, thus already handled */
-@@ -681,13 +683,14 @@ AcpiDmDumpCsrt (
-     /* Subtables (Resource Groups) */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_CSRT_GROUP, Table, Offset);
--    while (Offset < Length)
-+    while (Offset < TableLength)
-     {
-         /* Resource group subtable */
- 
-+        SubtableLength = AcpiUtReadUint32 (&Subtable->Length);
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Length, Offset, Subtable,
--            Subtable->Length, AcpiDmTableInfoCsrt0);
-+        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
-+            SubtableLength, AcpiDmTableInfoCsrt0);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-@@ -700,26 +703,28 @@ AcpiDmDumpCsrt (
-             Offset + SubOffset);
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Length, Offset + SubOffset, SharedInfoTable,
--            sizeof (ACPI_CSRT_SHARED_INFO), AcpiDmTableInfoCsrt1);
-+        Status = AcpiDmDumpTable (TableLength, Offset + SubOffset,
-+	    SharedInfoTable, sizeof (ACPI_CSRT_SHARED_INFO),
-+	    AcpiDmTableInfoCsrt1);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-         }
- 
--        SubOffset += Subtable->SharedInfoLength;
-+        SubOffset += AcpiUtReadUint32 (&Subtable->SharedInfoLength);
- 
-         /* Sub-Subtables (Resource Descriptors) */
- 
-         SubSubtable = ACPI_ADD_PTR (ACPI_CSRT_DESCRIPTOR, Table,
-             Offset + SubOffset);
- 
--        while ((SubOffset < Subtable->Length) &&
--              ((Offset + SubOffset) < Length))
-+        while ((SubOffset < SubtableLength) &&
-+              ((Offset + SubOffset) < TableLength))
-         {
-+	    SubSubtableLength = AcpiUtReadUint32 (&SubSubtable->Length);
-             AcpiOsPrintf ("\n");
--            Status = AcpiDmDumpTable (Length, Offset + SubOffset, SubSubtable,
--                SubSubtable->Length, AcpiDmTableInfoCsrt2);
-+            Status = AcpiDmDumpTable (TableLength, Offset + SubOffset,
-+	        SubSubtable, SubSubtableLength, AcpiDmTableInfoCsrt2);
-             if (ACPI_FAILURE (Status))
-             {
-                 return;
-@@ -729,11 +734,12 @@ AcpiDmDumpCsrt (
- 
-             /* Resource-specific info buffer */
- 
--            InfoLength = SubSubtable->Length - SubSubOffset;
-+            InfoLength = SubSubtableLength - SubSubOffset;
-             if (InfoLength)
-             {
--                Status = AcpiDmDumpTable (Length,
--                    Offset + SubOffset + SubSubOffset, Table,
-+                Status = AcpiDmDumpTable (TableLength,
-+		    Offset + SubOffset + SubSubOffset,
-+		    (UINT8 *)SubSubtable + SubSubOffset,
-                     InfoLength, AcpiDmTableInfoCsrt2a);
-                 if (ACPI_FAILURE (Status))
-                 {
-@@ -743,16 +749,15 @@ AcpiDmDumpCsrt (
- 
-             /* Point to next sub-subtable */
- 
--            SubOffset += SubSubtable->Length;
-+            SubOffset += SubSubtableLength;
-             SubSubtable = ACPI_ADD_PTR (ACPI_CSRT_DESCRIPTOR, SubSubtable,
--                SubSubtable->Length);
-+                SubSubtableLength);
-         }
- 
-         /* Point to next subtable */
- 
--        Offset += Subtable->Length;
--        Subtable = ACPI_ADD_PTR (ACPI_CSRT_GROUP, Subtable,
--            Subtable->Length);
-+        Offset += SubtableLength;
-+        Subtable = ACPI_ADD_PTR (ACPI_CSRT_GROUP, Subtable, SubtableLength);
-     }
- }
- 
-Index: acpica-unix2-20220331/source/compiler/dttable1.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/dttable1.c
-+++ acpica-unix2-20220331/source/compiler/dttable1.c
-@@ -716,14 +716,16 @@ DtCompileCsrt (
-     DT_SUBTABLE             *Subtable;
-     DT_SUBTABLE             *ParentTable;
-     DT_FIELD                **PFieldList = (DT_FIELD **) List;
--    UINT32                  DescriptorCount;
-+    UINT32                  DescriptorLength;
-     UINT32                  GroupLength;
-     UINT32                  Tmp;
-+    UINT32                  Offset;
- 
- 
-     /* Subtables (Resource Groups) */
- 
-     ParentTable = DtPeekSubtable ();
-+                               
-     while (*PFieldList)
-     {
-         /* Resource group subtable */
-@@ -738,16 +740,13 @@ DtCompileCsrt (
-         /* Compute the number of resource descriptors */
- 
-         Tmp = AcpiUtReadUint32 (&(ACPI_CAST_PTR (ACPI_CSRT_GROUP,
--                                Subtable->Buffer))->Length);
-+                  Subtable->Buffer))->Length);
-         GroupLength = Tmp;
-         Tmp = AcpiUtReadUint32 (&(ACPI_CAST_PTR (ACPI_CSRT_GROUP,
--                                Subtable->Buffer))->SharedInfoLength);
-+                  Subtable->Buffer))->SharedInfoLength);
-         GroupLength -= Tmp;
-         GroupLength -= sizeof (ACPI_CSRT_GROUP);
- 
--        DescriptorCount = (GroupLength  /
--            sizeof (ACPI_CSRT_DESCRIPTOR));
--
-         DtInsertSubtable (ParentTable, Subtable);
-         DtPushSubtable (Subtable);
-         ParentTable = DtPeekSubtable ();
-@@ -762,10 +761,13 @@ DtCompileCsrt (
-         }
- 
-         DtInsertSubtable (ParentTable, Subtable);
-+        DtPushSubtable (Subtable);
-+        ParentTable = DtPeekSubtable ();
- 
-         /* Sub-Subtables (Resource Descriptors) */
- 
--        while (*PFieldList && DescriptorCount)
-+        Offset = 0;
-+        while (*PFieldList && (Offset < GroupLength))
-         {
- 
-             Status = DtCompileTable (PFieldList, AcpiDmTableInfoCsrt2,
-@@ -774,6 +776,10 @@ DtCompileCsrt (
-             {
-                 return (Status);
-             }
-+	    DescriptorLength = AcpiUtReadUint32 (
-+	                           &(ACPI_CAST_PTR (ACPI_CSRT_GROUP,
-+                                   Subtable->Buffer))->Length);
-+
- 
-             DtInsertSubtable (ParentTable, Subtable);
- 
-@@ -783,11 +789,7 @@ DtCompileCsrt (
-             {
-                 Status = DtCompileTable (PFieldList, AcpiDmTableInfoCsrt2a,
-                     &Subtable);
--                if (ACPI_FAILURE (Status))
--                {
--                    return (Status);
--                }
--                if (Subtable)
-+                if (ACPI_SUCCESS (Status) && Subtable)
-                 {
-                     DtInsertSubtable (ParentTable, Subtable);
-                 }
-@@ -795,7 +797,7 @@ DtCompileCsrt (
- 
-             DtPopSubtable ();
-             ParentTable = DtPeekSubtable ();
--            DescriptorCount--;
-+            Offset += DescriptorLength;
-         }
- 
-         DtPopSubtable ();
diff --git a/0046-Support-PHAT-in-a-big-endian-world.patch b/0046-Support-PHAT-in-a-big-endian-world.patch
deleted file mode 100644
index 9a22b3b..0000000
--- a/0046-Support-PHAT-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-From 5fd729c8f6c4ce295edd142fc41e03e831ba4afb Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@redhat.com>
-Date: Mon, 12 Jul 2021 09:39:38 -0600
-Subject: [PATCH] Support PHAT in a big-endian world
-
-Signed-off-by: Al Stone <ahs3@redhat.com>
----
- source/common/dmtbdump2.c  | 36 ++++++++++++++++++++----------------
- source/compiler/dttable2.c | 12 +++++++++---
- 2 files changed, 29 insertions(+), 19 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20220331/source/common/dmtbdump2.c
-@@ -2029,39 +2029,41 @@ AcpiDmDumpPhat (
-     ACPI_PHAT_HEADER        *Subtable;
-     ACPI_PHAT_VERSION_DATA  *VersionData;
-     UINT32                  RecordCount;
--    UINT32                  Length = Table->Length;
-+    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
-     UINT32                  Offset = sizeof (ACPI_TABLE_PHAT);
--    UINT32                  SubtableLength;
-+    UINT16                  SubtableLength;
-     UINT32                  PathLength;
-     UINT32                  VendorLength;
-+    UINT16                  SubtableType;
- 
- 
-     Subtable = ACPI_ADD_PTR (ACPI_PHAT_HEADER, Table, sizeof (ACPI_TABLE_PHAT));
- 
--    while (Offset < Table->Length)
-+    while (Offset < TableLength)
-     {
-         /* Common subtable header */
- 
-+        SubtableType = AcpiUtReadUint16 (&Subtable->Type);
-+        SubtableLength = AcpiUtReadUint16 (&Subtable->Length);
-+
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Length, 0, Subtable,
-+        Status = AcpiDmDumpTable (TableLength, 0, Subtable,
-             sizeof (ACPI_PHAT_HEADER), AcpiDmTableInfoPhatHdr);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-         }
- 
--        switch (Subtable->Type)
-+        switch (SubtableType)
-         {
-         case ACPI_PHAT_TYPE_FW_VERSION_DATA:
- 
-             InfoTable = AcpiDmTableInfoPhat0;
--            SubtableLength = sizeof (ACPI_PHAT_VERSION_DATA);
-             break;
- 
-         case ACPI_PHAT_TYPE_FW_HEALTH_DATA:
- 
-             InfoTable = AcpiDmTableInfoPhat1;
--            SubtableLength = sizeof (ACPI_PHAT_HEALTH_DATA);
-             break;
- 
-         default:
-@@ -2072,22 +2074,22 @@ AcpiDmDumpPhat (
-             return;
-         }
- 
--        Status = AcpiDmDumpTable (Length, 0, Subtable,
-+        Status = AcpiDmDumpTable (TableLength, 0, Subtable,
-             SubtableLength, InfoTable);
-         if (ACPI_FAILURE (Status))
-         {
-             return;
-         }
- 
--        switch (Subtable->Type)
-+        switch (SubtableType)
-         {
-         case ACPI_PHAT_TYPE_FW_VERSION_DATA:
- 
-             VersionData = ACPI_CAST_PTR (ACPI_PHAT_VERSION_DATA, Subtable);
--            RecordCount = VersionData->ElementCount;
-+            RecordCount = AcpiUtReadUint32 (&VersionData->ElementCount);
-             while (RecordCount)
-             {
--                Status = AcpiDmDumpTable (Length, Offset,
-+                Status = AcpiDmDumpTable (TableLength, Offset,
-                     ACPI_ADD_PTR (ACPI_PHAT_HEADER, Subtable, sizeof (ACPI_PHAT_VERSION_DATA)),
-                     sizeof (ACPI_PHAT_VERSION_ELEMENT), AcpiDmTableInfoPhat0a);
-                 if (ACPI_FAILURE (Status))
-@@ -2105,7 +2107,7 @@ AcpiDmDumpPhat (
-             /* account for the null terminator */
- 
-             PathLength = strlen (ACPI_ADD_PTR (char, Subtable, sizeof (ACPI_PHAT_HEALTH_DATA))) + 1;
--            Status = AcpiDmDumpTable (Length, Offset,
-+            Status = AcpiDmDumpTable (TableLength, Offset,
-                 ACPI_ADD_PTR (ACPI_PHAT_HEADER, Subtable, sizeof (ACPI_PHAT_HEALTH_DATA)),
-                 PathLength, AcpiDmTableInfoPhat1a);
-             if (ACPI_FAILURE (Status))
-@@ -2116,8 +2118,8 @@ AcpiDmDumpPhat (
-             /* Get vendor data - data length is the remaining subtable length */
- 
-             VendorLength =
--                Subtable->Length - sizeof (ACPI_PHAT_HEALTH_DATA) - PathLength;
--            Status = AcpiDmDumpTable (Length, 0,
-+                SubtableLength - sizeof (ACPI_PHAT_HEALTH_DATA) - PathLength;
-+            Status = AcpiDmDumpTable (TableLength, 0,
-                 ACPI_ADD_PTR (ACPI_PHAT_HEADER, Subtable, sizeof (ACPI_PHAT_HEALTH_DATA) + PathLength),
-                 VendorLength, AcpiDmTableInfoPhat1b);
-             if (ACPI_FAILURE (Status))
-@@ -2129,15 +2131,15 @@ AcpiDmDumpPhat (
-         default:
- 
-             AcpiOsPrintf ("\n**** Unknown PHAT subtable type 0x%X\n\n",
--                Subtable->Type);
-+                SubtableType);
-             return;
-         }
- 
-         /* Next subtable */
- 
--        Offset += Subtable->Length;
-+        Offset += SubtableLength;
-         Subtable = ACPI_ADD_PTR (ACPI_PHAT_HEADER, Subtable,
--            Subtable->Length);
-+            SubtableLength);
-     }
- }
- 
-Index: acpica-unix2-20220331/source/compiler/dttable2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/dttable2.c
-+++ acpica-unix2-20220331/source/compiler/dttable2.c
-@@ -1267,6 +1267,8 @@ DtCompilePhat (
-     ACPI_DMTABLE_INFO       *Info;
-     ACPI_PHAT_VERSION_DATA  *VersionData;
-     UINT32                  RecordCount;
-+    UINT16                  SubtableType;
-+    UINT16                  Tmp16;
- 
- 
-     /* The table consist of subtables */
-@@ -1284,8 +1286,9 @@ DtCompilePhat (
-         DtPushSubtable (Subtable);
- 
-         PhatHeader = ACPI_CAST_PTR (ACPI_PHAT_HEADER, Subtable->Buffer);
-+	SubtableType = AcpiUtReadUint16 (&PhatHeader->Type);
- 
--        switch (PhatHeader->Type)
-+        switch (SubtableType)
-         {
-         case ACPI_PHAT_TYPE_FW_VERSION_DATA:
- 
-@@ -1316,13 +1319,13 @@ DtCompilePhat (
-         ParentTable = DtPeekSubtable ();
-         DtInsertSubtable (ParentTable, Subtable);
- 
--        switch (PhatHeader->Type)
-+        switch (SubtableType)
-         {
-         case ACPI_PHAT_TYPE_FW_VERSION_DATA:
- 
-             VersionData = ACPI_CAST_PTR (ACPI_PHAT_VERSION_DATA,
-                 (Subtable->Buffer - sizeof (ACPI_PHAT_HEADER)));
--            RecordCount = VersionData->ElementCount;
-+            RecordCount = AcpiUtReadUint32 (&VersionData->ElementCount);
- 
-             while (RecordCount)
-             {
-@@ -1373,6 +1376,9 @@ DtCompilePhat (
-             DtFatal (ASL_MSG_UNKNOWN_SUBTABLE, *PFieldList, "PHAT");
-             return (AE_ERROR);
-         }
-+
-+	Tmp16 = AcpiUtReadUint16 (&PhatHeader->Length);
-+	PhatHeader->Length = Tmp16;
-     }
- 
-     return (Status);
diff --git a/0047-Support-PRMT-in-a-big-endian-world.patch b/0047-Support-PRMT-in-a-big-endian-world.patch
deleted file mode 100644
index 96df1d5..0000000
--- a/0047-Support-PRMT-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Signed-off-by: Dean Nelson <dnelson@redhat.com>
-Reviewed-by: Al Stone <ahs3@redhat.com>
----
- source/common/dmtbdump2.c | 11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20220331/source/common/dmtbdump2.c
-@@ -2415,13 +2415,14 @@ AcpiDmDumpPrmt (
-     ACPI_PRMT_MODULE_INFO   *PrmtModuleInfo;
-     ACPI_PRMT_HANDLER_INFO  *PrmtHandlerInfo;
-     ACPI_STATUS             Status;
-+    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
-     UINT32                  i, j;
- 
- 
-     /* Main table header */
- 
-     PrmtHeader = ACPI_ADD_PTR (ACPI_TABLE_PRMT_HEADER, Table, CurrentOffset);
--    Status = AcpiDmDumpTable (Table->Length, CurrentOffset, PrmtHeader,
-+    Status = AcpiDmDumpTable (TableLength, CurrentOffset, PrmtHeader,
-         sizeof (ACPI_TABLE_PRMT_HEADER), AcpiDmTableInfoPrmtHdr);
-     if (ACPI_FAILURE (Status))
-     {
-@@ -2433,20 +2434,20 @@ AcpiDmDumpPrmt (
- 
-     /* PRM Module Information Structure array */
- 
--    for (i = 0; i < PrmtHeader->ModuleInfoCount; ++i)
-+    for (i = 0; i < AcpiUtReadUint32 (&PrmtHeader->ModuleInfoCount); ++i)
-     {
-         PrmtModuleInfo = ACPI_ADD_PTR (ACPI_PRMT_MODULE_INFO, Table, CurrentOffset);
--        Status = AcpiDmDumpTable (Table->Length, CurrentOffset, PrmtModuleInfo,
-+        Status = AcpiDmDumpTable (TableLength, CurrentOffset, PrmtModuleInfo,
-             sizeof (ACPI_PRMT_MODULE_INFO), AcpiDmTableInfoPrmtModule);
- 
-         CurrentOffset += sizeof (ACPI_PRMT_MODULE_INFO);
- 
-         /* PRM handler information structure array */
- 
--        for (j = 0; j < PrmtModuleInfo->HandlerInfoCount; ++j)
-+        for (j = 0; j < AcpiUtReadUint16 (&PrmtModuleInfo->HandlerInfoCount); ++j)
-         {
-             PrmtHandlerInfo = ACPI_ADD_PTR (ACPI_PRMT_HANDLER_INFO, Table, CurrentOffset);
--            Status = AcpiDmDumpTable (Table->Length, CurrentOffset, PrmtHandlerInfo,
-+            Status = AcpiDmDumpTable (TableLength, CurrentOffset, PrmtHandlerInfo,
-                 sizeof (ACPI_PRMT_HANDLER_INFO), AcpiDmTableInfoPrmtHandler);
- 
-             CurrentOffset += sizeof (ACPI_PRMT_HANDLER_INFO);
diff --git a/0048-Support-RGRT-in-a-big-endian-world.patch b/0048-Support-RGRT-in-a-big-endian-world.patch
deleted file mode 100644
index 818d335..0000000
--- a/0048-Support-RGRT-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Signed-off-by: Dean Nelson <dnelson@redhat.com>
-Reviewed-by: Al Stone <ahs3@redhat.com>
----
- source/common/dmtbdump2.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump2.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
-+++ acpica-unix2-20220331/source/common/dmtbdump2.c
-@@ -2475,11 +2475,12 @@ AcpiDmDumpRgrt (
-     ACPI_STATUS             Status;
-     ACPI_TABLE_RGRT         *Subtable = ACPI_CAST_PTR (ACPI_TABLE_RGRT, Table);
-     UINT32                  Offset = sizeof (ACPI_TABLE_RGRT);
-+    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoRgrt);
-+    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoRgrt);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -2487,8 +2488,8 @@ AcpiDmDumpRgrt (
- 
-     /* Dump the binary image as a subtable */
- 
--    Status = AcpiDmDumpTable (Table->Length, Offset, &Subtable->Image,
--        Table->Length - Offset, AcpiDmTableInfoRgrt0);
-+    Status = AcpiDmDumpTable (TableLength, Offset, &Subtable->Image,
-+        TableLength - Offset, AcpiDmTableInfoRgrt0);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
diff --git a/0049-Support-SVKL-in-a-big-endian-world.patch b/0049-Support-SVKL-in-a-big-endian-world.patch
deleted file mode 100644
index 8ba5efc..0000000
--- a/0049-Support-SVKL-in-a-big-endian-world.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Signed-off-by: Dean Nelson <dnelson@redhat.com>
-Reviewed-by: Al Stone <ahs3@redhat.com>
----
- source/common/dmtbdump3.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-Index: acpica-unix2-20220331/source/common/dmtbdump3.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump3.c
-+++ acpica-unix2-20220331/source/common/dmtbdump3.c
-@@ -344,14 +344,14 @@ AcpiDmDumpSvkl (
-     ACPI_TABLE_HEADER       *Table)
- {
-     ACPI_STATUS             Status;
--    UINT32                  Length = Table->Length;
-+    UINT32                  TableLength = AcpiUtReadUint32 (&Table->Length);
-     UINT32                  Offset = sizeof (ACPI_TABLE_SVKL);
-     ACPI_SVKL_KEY           *Subtable;
- 
- 
-     /* Main table */
- 
--    Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoSvkl);
-+    Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoSvkl);
-     if (ACPI_FAILURE (Status))
-     {
-         return;
-@@ -360,12 +360,12 @@ AcpiDmDumpSvkl (
-     /* The rest of the table consists of subtables (single type) */
- 
-     Subtable = ACPI_ADD_PTR (ACPI_SVKL_KEY, Table, Offset);
--    while (Offset < Table->Length)
-+    while (Offset < TableLength)
-     {
-         /* Dump the subtable */
- 
-         AcpiOsPrintf ("\n");
--        Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
-+        Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
-             sizeof (ACPI_SVKL_KEY), AcpiDmTableInfoSvkl0);
-         if (ACPI_FAILURE (Status))
-         {
diff --git a/OPT_LDFLAGS.patch b/OPT_LDFLAGS.patch
index 2afc266..ff454b7 100644
--- a/OPT_LDFLAGS.patch
+++ b/OPT_LDFLAGS.patch
@@ -1,7 +1,7 @@
-Index: acpica-unix2-20220331/generate/unix/Makefile.config
+Index: acpica-unix2-20240321/generate/unix/Makefile.config
 ===================================================================
---- acpica-unix2-20220331.orig/generate/unix/Makefile.config
-+++ acpica-unix2-20220331/generate/unix/Makefile.config
+--- acpica-unix2-20240321.orig/generate/unix/Makefile.config
++++ acpica-unix2-20240321/generate/unix/Makefile.config
 @@ -23,6 +23,9 @@
  # OPT_CFLAGS can be overridden on the make command line by
  #   adding OPT_CFLAGS="..." to the invocation.
diff --git a/acpica-tools.spec b/acpica-tools.spec
index d63e30e..f654307 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -1,13 +1,13 @@
 Name:           acpica-tools
-Version:        20220331
-Release:        10%{?dist}
+Version:        20240322
+Release:        1%{?dist}
 Summary:        ACPICA tools for the development and debug of ACPI tables
 
 # Automatically converted from old format: GPLv2 - review is highly recommended.
 License:        GPL-2.0-only
 URL:            https://www.acpica.org/
 
-ExcludeArch:	i686 armv7hl
+ExcludeArch:	i686 armv7hl s390x
 
 Source0:        https://acpica.org/sites/acpica/files/acpica-unix2-%{version}.tar.gz
 Source1:        https://acpica.org/sites/acpica/files/acpitests-unix-%{version}.tar.gz
@@ -26,75 +26,23 @@ Source14:       converterSample.asl.result
 Source15:       run-misc-tests.sh
 Source16:       COPYING
 
-# the big-endian patch set
-Patch0:		0001-Add-in-basic-infrastructure-for-big-endian-support.patch
-Patch1:		0002-Modify-utility-functions-to-be-endian-agnostic.patch
-Patch2:		0003-Always-display-table-header-content-in-human-readabl.patch
-Patch3:		0004-Re-enable-support-for-big-endian-machines.patch
-Patch4:		0005-Correct-an-endian-ness-problem-when-converting-ASL-t.patch
-Patch5:		0006-Use-more-reliable-ACPI_COPY_NAMSEG-in-GPE-name-check.patch
-Patch6:		0007-Handle-dumping-Unicode-properly-when-big-endian.patch
-Patch7:		0008-Support-MADT-aka-APIC-in-a-big-endian-world.patch
-Patch8:		0009-Support-ASF-tables-in-a-big-endian-world.patch
-Patch9:		0010-Support-CPEP-tables-in-a-big-endian-world.patch
-Patch10:	0011-Support-DBG2-table-in-a-big-endian-world.patch
-Patch11:	0012-Support-DMAR-in-a-big-endian-world.patch
-Patch12:	0013-Support-DRTM-in-a-big-endian-world.patch
-Patch13:	0014-Support-EINJ-in-a-big-endian-world.patch
-Patch14:	0015-Support-ERST-in-a-big-endian-world.patch
-Patch15:	0016-Support-FADT-aka-FACP-in-a-big-endian-world.patch
-Patch16:	0017-Support-most-FPDTs-in-a-big-endian-world.patch
-Patch17:	0018-Support-GTDT-in-a-big-endian-world.patch
-Patch18:	0019-Support-HEST-in-a-big-endian-world.patch
-Patch19:	0020-Support-RSDT-RSD-PTR-in-a-big-endian-world.patch
-Patch20:	0021-Support-XSDT-in-a-big-endian-world.patch
-Patch21:	0022-Support-SRAT-in-a-big-endian-world.patch
-Patch22:	0023-Support-SLIT-in-a-big-endian-world.patch
-Patch23:	0024-Support-MSCT-in-a-big-endian-world.patch
-Patch24:	0025-Support-MPST-in-a-big-endian-world.patch
-Patch25:	0026-Support-NFIT-in-a-big-endian-world.patch
-Patch26:	0027-Support-SDEV-in-a-big-endian-world.patch
-Patch27:	0028-Support-HMAT-in-a-big-endian-world.patch
-Patch28:	0029-Support-PDTT-in-a-big-endian-world.patch
-Patch29:	0030-Support-PPTT-in-a-big-endian-world.patch
-Patch30:	0031-Support-PCCT-in-a-big-endian-world.patch
-Patch31:	0032-Support-WDAT-in-a-big-endian-world.patch
-Patch32:	0033-Support-TCPA-in-a-big-endian-world.patch
-Patch33:	0034-Support-STAO-in-a-big-endian-world.patch
-Patch34:	0035-Support-SLIC-and-MSDM-in-a-big-endian-world.patch
-Patch35:	0036-Support-MCFG-in-a-big-endian-world.patch
-Patch36:	0037-Support-LPIT-in-a-big-endian-world.patch
-Patch37:	0038-Support-PMTT-in-a-big-endian-world.patch
-Patch38:	0039-Support-TPM2-in-a-big-endian-world.patch
-Patch39:	0040-Support-S3PT-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
-Patch42:	0043-Support-DSDT-SSDT-in-a-big-endian-world.patch
-Patch43:	0045-CSRT-fixed-use-of-optional-ResourceInfo.patch
-Patch44:	0046-Support-PHAT-in-a-big-endian-world.patch
-Patch45:	0047-Support-PRMT-in-a-big-endian-world.patch
-Patch46:	0048-Support-RGRT-in-a-big-endian-world.patch
-Patch47:	0049-Support-SVKL-in-a-big-endian-world.patch
-
 # other miscellaneous patches
 Patch100:	unaligned.patch
-Patch101:	OPT_LDFLAGS.patch
-Patch102:	int-format.patch
-Patch103:	f23-harden.patch
+#Patch101:	OPT_LDFLAGS.patch
+#Patch102:	int-format.patch
 Patch104:	template.patch
-Patch105:       arm7hl.patch
-Patch106:       simple-64bit.patch
-Patch107:       mips-be-fix.patch
+#Patch106:       simple-64bit.patch
+#Patch107:       mips-be-fix.patch
 Patch108:       cve-2017-13693.patch
 Patch109:       cve-2017-13694.patch
 Patch110:       cve-2017-13695.patch
 Patch111:       str-trunc-warn.patch
-Patch112:	ptr-cast.patch
-Patch113:	armv7-str-fixes.patch
+#Patch112:	ptr-cast.patch
+#Patch113:	armv7-str-fixes.patch
 Patch114:	dbtest.patch
-Patch115:	ull-32bit.patch
 Patch116:	dangling-ptr.patch
 Patch117:	uuid-len.patch
+Patch118:	fix-version.patch
 
 BuildRequires:	make
 BuildRequires:  bison patchutils flex gcc
@@ -204,7 +152,7 @@ OPT_LDFLAGS="%{__global_ldflags}"
 export OPT_CFLAGS
 export OPT_LDFLAGS
 
-make
+%{make_build}
 
 
 %install
@@ -260,6 +208,23 @@ fi
 
 
 %changelog
+* Mon Aug 12 2024 Al Stone <ahs3@fedoraproject.org> - 20240322-1
+- Update source tree to 20240322 version from upstream.  NB: this update
+  is done in conjunction with removing s390x support due to the large
+  number of patches that are now rendered obsolete.  Closes BZ#2138250.
+- Note, too, that the upstream version of the tarball is missing two
+  commits and has the wrong name; discussed this with upstream and
+  included a patch with the two commits to correct this, and renamed
+  the tarballs to try to maintain consistency. So, upstream is actually
+  named version 20240321, but it should be 20240322 according to their
+  own git tree (see tag G20240322 on github).
+- Removed executable bit from all the upstream source files
+- Remove big-endian support, aka s390x.  Closes BZ#2298855.
+- Remove several 32-bit only patches that are also obsolete since they
+  are for unsupported architectures (thanks to pbonzini and PR#5).
+- Remove PIE patches since that is currently the default (again, thanks
+  to pbonzini and PR#5)
+
 * Mon Jul 29 2024 Miroslav Suchý <msuchy@redhat.com> - 20220331-10
 - convert license to SPDX
 
diff --git a/arm7hl.patch b/arm7hl.patch
deleted file mode 100644
index ffe22e9..0000000
--- a/arm7hl.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: acpica-unix2-20220331/source/include/acmacros.h
-===================================================================
---- acpica-unix2-20220331.orig/source/include/acmacros.h
-+++ acpica-unix2-20220331/source/include/acmacros.h
-@@ -108,6 +108,8 @@
- 
- /* 16-bit source, 16/32/64 destination */
- 
-+#define ACPI_MOVE_16_TO_8(d, s)        {((  UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[0];}
-+
- #define ACPI_MOVE_16_TO_16(d, s)        {((  UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[0];\
-                                          ((  UINT8 *)(void *)(d))[1] = ((UINT8 *)(void *)(s))[1];}
- 
-@@ -127,6 +129,7 @@
- 
- /* 64-bit source, 16/32/64 destination */
- 
-+#define ACPI_MOVE_64_TO_8(d, s)         ACPI_MOVE_16_TO_8(d, s)    /* Truncate to 8 */
- #define ACPI_MOVE_64_TO_16(d, s)        ACPI_MOVE_16_TO_16(d, s)    /* Truncate to 16 */
- #define ACPI_MOVE_64_TO_32(d, s)        ACPI_MOVE_32_TO_32(d, s)    /* Truncate to 32 */
- #define ACPI_MOVE_64_TO_64(d, s)        {((  UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[0];\
diff --git a/badcode.asl.result b/badcode.asl.result
index d1229f4..a2e1a2c 100644
--- a/badcode.asl.result
+++ b/badcode.asl.result
@@ -1,3 +1,12 @@
+badcode.asl     37:     Name (PATH, Buffer() {"\_SB_.PCI2._CRS"})
+Warning  3046 -                                ^ Invalid or unknown escape sequence
+
+badcode.asl     41:     Name (ESC1, "abcdefg\x00hijklmn")
+Warning  3055 -                                ^ Invalid Hex/Octal Escape - Non-ASCII or NULL
+
+badcode.asl    268:         QWordSpace (0xB0, ResourceConsumer, PosDecode, MinFixed, MaxFixed, 0xA5,
+Error    6139 -     Constant out of range ^  (0xB0, allowable: 0xC0-0xFF)
+
 badcode.asl     25:     Mutex (MTX1, 32)
 Error    6125 -                      ^ SyncLevel must be in the range 0-15
 
@@ -256,11 +265,11 @@ Warning  3144 -                            ^ Method Local is set but never used
 
 Intel ACPI Component Architecture
 ASL+ Optimizing Compiler/Disassembler version VVVVVVVV
-Copyright (c) 2000 - 2022 Intel Corporation
+Copyright (c) 2000 - 2023 Intel Corporation
 
 Ignoring all errors, forcing AML file generation
 
-ASL Input:     badcode.asl -   11588 bytes     81 keywords    408 source lines
+ASL Input:     badcode.asl -   11588 bytes     81 keywords      0 source lines
 AML Output:    badcode.aml -    1195 bytes     20 opcodes      61 named objects
 
-Compilation successful. 0 Errors, 28 Warnings, 11 Remarks, 16 Optimizations, 1 Constants Folded
+Compilation successful. 46 Errors, 28 Warnings, 11 Remarks, 16 Optimizations, 1 Constants Folded
diff --git a/converterSample.asl.result b/converterSample.asl.result
index c890c9d..ccc9971 100644
--- a/converterSample.asl.result
+++ b/converterSample.asl.result
@@ -4,6 +4,21 @@ Remark   2182 -                      ^ At least one lower case letter found in N
 converterSample.asl     16:     Name(p008, Package()
 Remark   2182 -                        ^ At least one lower case letter found in NameSeg, ASL is case insensitive - converting to upper case (P008)
 
+converterSample.asl     48:             Name(b,0);
+Remark   2182 -                             ^ At least one lower case letter found in NameSeg, ASL is case insensitive - converting to upper case (B___)
+
+converterSample.asl     53:    Name (a,
+Remark   2182 -                     ^ At least one lower case letter found in NameSeg, ASL is case insensitive - converting to upper case (A___)
+
+converterSample.asl     68:         Name (a1, 0x04)
+Remark   2182 -                           ^ At least one lower case letter found in NameSeg, ASL is case insensitive - converting to upper case (A1__)
+
+converterSample.asl     15:     Name (b, 5)
+Remark   2182 -                      ^ At least one lower case letter found in NameSeg, ASL is case insensitive - converting to upper case (B___)
+
+converterSample.asl     16:     Name(p008, Package()
+Remark   2182 -                        ^ At least one lower case letter found in NameSeg, ASL is case insensitive - converting to upper case (P008)
+
 converterSample.asl     37:     Method(MAIN) {
 Remark   2120 -                          ^ Control Method should be made Serialized due to creation of named objects within (\MAIN)
 
@@ -28,11 +43,11 @@ Remark   2089 -  Object is not referenced ^  (Name [A1__] is within a method [SC
 
 Intel ACPI Component Architecture
 ASL+ Optimizing Compiler/Disassembler version VVVVVVVV
-Copyright (c) 2000 - 2022 Intel Corporation
+Copyright (c) 2000 - 2023 Intel Corporation
 
 Ignoring all errors, forcing AML file generation
 
-ASL Input:     converterSample.asl -    1968 bytes     11 keywords     85 source lines
+ASL Input:     converterSample.asl -    1968 bytes     11 keywords      0 source lines
 AML Output:    converterSample.aml -     184 bytes      2 opcodes       9 named objects
 
 Compilation successful. 0 Errors, 0 Warnings, 9 Remarks, 9 Optimizations
diff --git a/cve-2017-13693.patch b/cve-2017-13693.patch
index 7e1a156..3e1849c 100644
--- a/cve-2017-13693.patch
+++ b/cve-2017-13693.patch
@@ -63,10 +63,10 @@ Github-Location: https://github.com/acpica/acpica/pull/295/commits/987a3b5cf7175
  source/components/dispatcher/dsutils.c | 9 ++++++++-
  1 file changed, 8 insertions(+), 1 deletion(-)
 
-Index: acpica-unix2-20220331/source/components/dispatcher/dsutils.c
+Index: acpica-unix2-20240321/source/components/dispatcher/dsutils.c
 ===================================================================
---- acpica-unix2-20220331.orig/source/components/dispatcher/dsutils.c
-+++ acpica-unix2-20220331/source/components/dispatcher/dsutils.c
+--- acpica-unix2-20240321.orig/source/components/dispatcher/dsutils.c
++++ acpica-unix2-20240321/source/components/dispatcher/dsutils.c
 @@ -759,6 +759,8 @@ AcpiDsCreateOperands (
      ACPI_PARSE_OBJECT       *Arguments[ACPI_OBJ_NUM_OPERANDS];
      UINT32                  ArgCount = 0;
diff --git a/cve-2017-13694.patch b/cve-2017-13694.patch
index d1d3032..8ae2da4 100644
--- a/cve-2017-13694.patch
+++ b/cve-2017-13694.patch
@@ -130,10 +130,10 @@ Github-Location: https://github.com/acpica/acpica/pull/278/commits/4a0243ecb4c94
  source/components/parser/psobject.c | 44 ++++++++++++++-----------------------
  1 file changed, 16 insertions(+), 28 deletions(-)
 
-Index: acpica-unix2-20220331/source/components/parser/psobject.c
+Index: acpica-unix2-20240321/source/components/parser/psobject.c
 ===================================================================
---- acpica-unix2-20220331.orig/source/components/parser/psobject.c
-+++ acpica-unix2-20220331/source/components/parser/psobject.c
+--- acpica-unix2-20240321.orig/source/components/parser/psobject.c
++++ acpica-unix2-20240321/source/components/parser/psobject.c
 @@ -707,7 +707,8 @@ AcpiPsCompleteFinalOp (
      ACPI_PARSE_OBJECT       *Op,
      ACPI_STATUS             Status)
diff --git a/cve-2017-13695.patch b/cve-2017-13695.patch
index e183a46..1a80450 100644
--- a/cve-2017-13695.patch
+++ b/cve-2017-13695.patch
@@ -67,10 +67,10 @@ Github-Location: https://github.com/acpica/acpica/pull/296/commits/37f2c716f2c6a
  source/components/namespace/nseval.c | 10 ++++++++++
  1 file changed, 10 insertions(+)
 
-Index: acpica-unix2-20220331/source/components/namespace/nseval.c
+Index: acpica-unix2-20240321/source/components/namespace/nseval.c
 ===================================================================
---- acpica-unix2-20220331.orig/source/components/namespace/nseval.c
-+++ acpica-unix2-20220331/source/components/namespace/nseval.c
+--- acpica-unix2-20240321.orig/source/components/namespace/nseval.c
++++ acpica-unix2-20240321/source/components/namespace/nseval.c
 @@ -329,6 +329,16 @@ AcpiNsEvaluate (
              Info->ReturnObject = NULL;
          }
diff --git a/dangling-ptr.patch b/dangling-ptr.patch
index 582fb9e..178020d 100644
--- a/dangling-ptr.patch
+++ b/dangling-ptr.patch
@@ -1,7 +1,8 @@
-diff -Naur acpica-unix2-20211217/source/components/utilities/utdebug.c acpica-unix2-20211217.orig/source/components/utilities/utdebug.c
---- acpica-unix2-20211217/source/components/utilities/utdebug.c	2022-03-15 17:05:07.992387565 -0600
-+++ acpica-unix2-20211217.orig/source/components/utilities/utdebug.c	2021-12-17 10:48:16.000000000 -0700
-@@ -58,6 +58,10 @@
+Index: acpica-unix2-20240321/source/components/utilities/utdebug.c
+===================================================================
+--- acpica-unix2-20240321.orig/source/components/utilities/utdebug.c
++++ acpica-unix2-20240321/source/components/utilities/utdebug.c
+@@ -58,6 +58,10 @@ static const char           *AcpiGbl_Fun
  static const char           *AcpiGbl_FunctionExitPrefix  = "----Exit-";
  
  
@@ -12,7 +13,7 @@ diff -Naur acpica-unix2-20211217/source/components/utilities/utdebug.c acpica-un
  /*******************************************************************************
   *
   * FUNCTION:    AcpiUtInitStackPtrTrace
-@@ -114,6 +110,9 @@
+@@ -120,6 +124,9 @@ AcpiUtTrackStackPtr (
          AcpiGbl_DeepestNesting = AcpiGbl_NestingLevel;
      }
  }
diff --git a/dbtest.patch b/dbtest.patch
index b33e90b..54faf57 100644
--- a/dbtest.patch
+++ b/dbtest.patch
@@ -4,10 +4,10 @@ into an ACPI_OBJECT instead of just the pointer (see the use in the call
 to memcpy()).  So, move the init so GCC recognizes that ValueToWrite is
 only a pointer, and not a whole string that needs to be moved.
 
-Index: acpica-unix2-20220331/source/components/debugger/dbtest.c
+Index: acpica-unix2-20240321/source/components/debugger/dbtest.c
 ===================================================================
---- acpica-unix2-20220331.orig/source/components/debugger/dbtest.c
-+++ acpica-unix2-20220331/source/components/debugger/dbtest.c
+--- acpica-unix2-20240321.orig/source/components/debugger/dbtest.c
++++ acpica-unix2-20240321/source/components/debugger/dbtest.c
 @@ -719,9 +719,10 @@ AcpiDbTestStringType (
      ACPI_OBJECT             *Temp1 = NULL;
      ACPI_OBJECT             *Temp2 = NULL;
diff --git a/f23-harden.patch b/f23-harden.patch
deleted file mode 100644
index 4279c50..0000000
--- a/f23-harden.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-Introduce build hardening flags for f23
-
-From: Al Stone <ahs3@redhat.com>
-
-
----
- generate/unix/Makefile.config |    2 ++
- generate/unix/iasl/Makefile   |   13 +++++++------
- 2 files changed, 9 insertions(+), 6 deletions(-)
-
-Index: acpica-unix2-20220331/generate/unix/Makefile.config
-===================================================================
---- acpica-unix2-20220331.orig/generate/unix/Makefile.config
-+++ acpica-unix2-20220331/generate/unix/Makefile.config
-@@ -189,6 +189,8 @@ ifneq ($(NOFORTIFY),TRUE)
- OPT_CFLAGS += -D_FORTIFY_SOURCE=2
- endif
- 
-+OPT_CFLAGS += -fPIC -pie
-+
- CFLAGS += \
-     -D$(ACPI_HOST)\
-     -D_GNU_SOURCE\
-Index: acpica-unix2-20220331/generate/unix/iasl/Makefile
-===================================================================
---- acpica-unix2-20220331.orig/generate/unix/iasl/Makefile
-+++ acpica-unix2-20220331/generate/unix/iasl/Makefile
-@@ -359,34 +359,35 @@ $(OBJDIR)/prparserparse.c $(OBJDIR)/prpa
- # Cannot use the common compile warning flags since the C files are created
- # by the utilities above and they are not necessarily ANSI C, etc.
- #
-+HARDENING_FLAGS = -fPIC -pie
- $(OBJDIR)/aslcompilerlex.o :   $(OBJDIR)/aslcompilerlex.c
- 	@echo "- " "Intermediate" $<
--	@$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
-+	@$(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $<
- 
- $(OBJDIR)/aslcompilerparse.o : $(OBJDIR)/aslcompilerparse.c
- 	@echo "- " "Intermediate" $<
--	@$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
-+	@$(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $<
- 
- $(OBJDIR)/dtcompilerparserlex.o :      $(OBJDIR)/dtcompilerparserlex.c
- 	@echo "- " "Intermediate" $<
--	@$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
-+	@$(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $<
- 
- $(OBJDIR)/dtcompilerparserparse.o :    $(OBJDIR)/dtcompilerparserparse.c
- 	@echo "- " "Intermediate" $<
--	@$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
-+	@$(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $<
- 
- $(OBJDIR)/dtparserlex.o :      $(OBJDIR)/dtparserlex.c
- 	@echo "- " "Intermediate" $<
--	@$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
-+	@$(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $<
- 
- $(OBJDIR)/dtparserparse.o :    $(OBJDIR)/dtparserparse.c
- 	@echo "- " "Intermediate" $<
--	@$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
-+	@$(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $<
- 
- $(OBJDIR)/prparserlex.o :      $(OBJDIR)/prparserlex.c
- 	@echo "- " "Intermediate" $<
--	@$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
-+	@$(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $<
- 
- $(OBJDIR)/prparserparse.o :    $(OBJDIR)/prparserparse.c
- 	@echo "- " "Intermediate" $<
--	@$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
-+	@$(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $<
diff --git a/fix-version.patch b/fix-version.patch
new file mode 100644
index 0000000..2ff7407
--- /dev/null
+++ b/fix-version.patch
@@ -0,0 +1,50 @@
+The two changes that follow were inadvertently dropped by upstream
+when creating the source tarball; the G20240322 tag in github contains
+them.
+
+Signed-off-by: Al Stone <ahs3@fedoraproject.org>
+
+diff -Naur acpica-unix-20240321/changes.txt acpica-unix-20240808/changes.txt
+--- acpica-unix-20240321/changes.txt	2024-03-22 00:16:29.000000000 -0600
++++ acpica-unix-20240808/changes.txt	2024-08-08 10:54:25.000000000 -0600
+@@ -1,4 +1,28 @@
+ ----------------------------------------
++22 March 2024. Summary of changes for version 20240322:
++
++Major changes:
++
++Update all the license header year from 2023 to 2024.
++
++Fix table argument ordering to work properly with iasl.
++
++Get rid of the annoying repeated warning types in MSVC and Windows.
++
++Fix a test in ASLTS with edge case failure.
++
++Fix a couple of issues with how GPEs are counted and enabled.
++
++Add new tables for various architectures/OS, mainly RISC-V and also update many more.
++
++Add an option to either make the output deterministic or non-deterministic.
++
++Remove redundant checks, duplicated code and fix spellings in various files.
++
++Fix flex arrays for C++ compilers and also make ACPICA overall more compatible with different compilers which throw warnings related to memory sanitization etc.
++
++
++----------------------------------------
+ 28 June 2023. Summary of changes for version 20230628:
+ 
+ 0) Global changes:
+diff -Naur acpica-unix-20240321/source/include/acpixf.h acpica-unix-20240808/source/include/acpixf.h
+--- acpica-unix-20240321/source/include/acpixf.h	2024-03-22 00:16:32.000000000 -0600
++++ acpica-unix-20240808/source/include/acpixf.h	2024-08-08 10:54:25.000000000 -0600
+@@ -154,7 +154,7 @@
+ 
+ /* Current ACPICA subsystem version in YYYYMMDD format */
+ 
+-#define ACPI_CA_VERSION                 0x20230628
++#define ACPI_CA_VERSION                 0x20240322
+ 
+ #include "acconfig.h"
+ #include "actypes.h"
diff --git a/grammar.asl.result b/grammar.asl.result
index 5517bd6..8bc361b 100644
--- a/grammar.asl.result
+++ b/grammar.asl.result
@@ -1,3 +1,18 @@
+grammar.asl    522:     NAME (ESC1, "abcdefg\x00hijklmn")
+Warning  3055 -                                ^ Invalid Hex/Octal Escape - Non-ASCII or NULL
+
+grammar.asl    523:     NAME (ESC2, "abcdefg\000hijklmn")
+Warning  3055 -                                ^ Invalid Hex/Octal Escape - Non-ASCII or NULL
+
+grammar.asl    552:         IRQNoFlags(xxxt){3,4,10,11}
+Remark   2182 -                          ^ At least one lower case letter found in NameSeg, ASL is case insensitive - converting to upper case (XXXT)
+
+grammar.asl    566:         Name(Bxxx,0xFFFFFFFF)
+Remark   2182 -                    ^ At least one lower case letter found in NameSeg, ASL is case insensitive - converting to upper case (BXXX)
+
+grammar.asl   6478:             Name (_CRS, Buffer(26)  {"\_SB_.PCI2._CRS..........."})
+Warning  3046 -        Invalid or unknown escape sequence ^ 
+
 grammar.asl    120:     Device (A1)
 Error    6141 -                 ^ Missing dependency (Device object requires a _HID or _ADR)
 
@@ -595,11 +610,11 @@ Error    6141 -   Missing dependency ^  (Device object requires a _HID or _ADR)
 
 Intel ACPI Component Architecture
 ASL+ Optimizing Compiler/Disassembler version VVVVVVVV
-Copyright (c) 2000 - 2022 Intel Corporation
+Copyright (c) 2000 - 2023 Intel Corporation
 
 Ignoring all errors, forcing AML file generation
 
-ASL Input:     grammar.asl -  323653 bytes   4818 keywords  10284 source lines
+ASL Input:     grammar.asl -  323653 bytes   4818 keywords      0 source lines
 AML Output:    grammar.aml -   43758 bytes   4148 opcodes     670 named objects
 
-Compilation successful. 0 Errors, 41 Warnings, 97 Remarks, 1106 Optimizations
+Compilation successful. 60 Errors, 41 Warnings, 97 Remarks, 1106 Optimizations
diff --git a/run-misc-tests.sh b/run-misc-tests.sh
index c0da397..41e788c 100644
--- a/run-misc-tests.sh
+++ b/run-misc-tests.sh
@@ -16,7 +16,7 @@ BINDIR="$1"
 VERSION="$2"
 
 # create files to compare against
-$BINDIR/iasl -hZZ
+$BINDIR/iasl -h
 
 sed -e "s/VVVVVVVV/$VERSION/" \
     ../badcode.asl.result > misc/badcode.asl.expected
diff --git a/sources b/sources
index d4bf4b2..3f9ece6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (acpica-unix2-20220331.tar.gz) = c606396323dc342ae4c7bab9526b04aca09b00a932363146c1791523962ade0bdb4e40b67ff2a0a246df3ce322592879288c3fcc5fb7a450beb87a6d70c5ef40
-SHA512 (acpitests-unix-20220331.tar.gz) = 28ead3ff06fc7e409e5fd02358048470daac6d3a96f24408068b84199f33513b5fcaa7c00a31972e63fc481d4b5980f8b8f131549d9d1bcd19fa20f3a1c2aaaf
+SHA512 (acpica-unix2-20240322.tar.gz) = 199a5acb93193f22b9f85690ad87cdf914185fdf52beafaec8c4299c29f4c9d5b618c72a62413b228307f5be3933cf51cdcd91a6728d9caea66408534006e3f8
+SHA512 (acpitests-unix-20240322.tar.gz) = e09b0b953d53e28b9849b1ed41068c5542f0e36eb47f442bba6238727bfd96ad94584c0aa1e8d92c307c317dbd208388d3d9c83c2d17e146571a7373bff40b98
diff --git a/str-trunc-warn.patch b/str-trunc-warn.patch
index c866985..e510c7a 100644
--- a/str-trunc-warn.patch
+++ b/str-trunc-warn.patch
@@ -1,7 +1,7 @@
-Index: acpica-unix2-20220331/source/compiler/aslanalyze.c
+Index: acpica-unix2-20240321/source/compiler/aslanalyze.c
 ===================================================================
---- acpica-unix2-20220331.orig/source/compiler/aslanalyze.c
-+++ acpica-unix2-20220331/source/compiler/aslanalyze.c
+--- acpica-unix2-20240321.orig/source/compiler/aslanalyze.c
++++ acpica-unix2-20240321/source/compiler/aslanalyze.c
 @@ -358,11 +358,16 @@ AnCheckMethodReturnValue (
           */
          if (ThisNodeBtype != 0)
@@ -21,10 +21,10 @@ Index: acpica-unix2-20220331/source/compiler/aslanalyze.c
          }
      }
  
-Index: acpica-unix2-20220331/source/compiler/aslpredef.c
+Index: acpica-unix2-20240321/source/compiler/aslpredef.c
 ===================================================================
---- acpica-unix2-20220331.orig/source/compiler/aslpredef.c
-+++ acpica-unix2-20220331/source/compiler/aslpredef.c
+--- acpica-unix2-20240321.orig/source/compiler/aslpredef.c
++++ acpica-unix2-20240321/source/compiler/aslpredef.c
 @@ -159,14 +159,19 @@ ApCheckForPredefinedMethod (
          if (MethodInfo->NumReturnNoValue &&
              ThisName->Info.ExpectedBtypes)
@@ -84,10 +84,10 @@ Index: acpica-unix2-20220331/source/compiler/aslpredef.c
      return (AE_TYPE);
  }
  
-Index: acpica-unix2-20220331/source/compiler/aslwalks.c
+Index: acpica-unix2-20240321/source/compiler/aslwalks.c
 ===================================================================
---- acpica-unix2-20220331.orig/source/compiler/aslwalks.c
-+++ acpica-unix2-20220331/source/compiler/aslwalks.c
+--- acpica-unix2-20240321.orig/source/compiler/aslwalks.c
++++ acpica-unix2-20240321/source/compiler/aslwalks.c
 @@ -515,15 +515,19 @@ AnOperandTypecheckWalkEnd (
              else if (!CommonBtypes)
              {
diff --git a/template.patch b/template.patch
index 4f9af9b..c80287c 100644
--- a/template.patch
+++ b/template.patch
@@ -7,10 +7,10 @@ From: Al Stone <ahs3@redhat.com>
  tests/templates/Makefile |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: acpica-unix2-20220331/tests/templates/Makefile
+Index: acpica-unix2-20240321/tests/templates/Makefile
 ===================================================================
---- acpica-unix2-20220331.orig/tests/templates/Makefile
-+++ acpica-unix2-20220331/tests/templates/Makefile
+--- acpica-unix2-20240321.orig/tests/templates/Makefile
++++ acpica-unix2-20240321/tests/templates/Makefile
 @@ -26,7 +26,7 @@ $(aml_obj): %.aml:  %.asl
  
  
diff --git a/ull-32bit.patch b/ull-32bit.patch
deleted file mode 100644
index 9de0473..0000000
--- a/ull-32bit.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: acpica-unix2-20220331/source/common/dmtbdump.c
-===================================================================
---- acpica-unix2-20220331.orig/source/common/dmtbdump.c
-+++ acpica-unix2-20220331/source/common/dmtbdump.c
-@@ -392,7 +392,11 @@ AcpiDmDumpXsdt (
-     for (i = 0; i < Entries; i++)
-     {
-         AcpiDmLineHeader2 (Offset, sizeof (UINT64), "ACPI Table Address", i);
-+#if ACPI_MACHINE_WIDTH == 32
-+        AcpiOsPrintf ("%16.16llX\n", AcpiUtReadUint64 (&Array[i]));
-+#else
-         AcpiOsPrintf ("%16.16lX\n", AcpiUtReadUint64 (&Array[i]));
-+#endif
-         Offset += sizeof (UINT64);
-     }
- }
diff --git a/unaligned.patch b/unaligned.patch
index 11d6c86..ff5c729 100644
--- a/unaligned.patch
+++ b/unaligned.patch
@@ -14,10 +14,10 @@ Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
  source/include/actypes.h              |   26 +++++++++++++-------------
  3 files changed, 32 insertions(+), 21 deletions(-)
 
-Index: acpica-unix2-20220331/source/components/executer/exoparg2.c
+Index: acpica-unix2-20240321/source/components/executer/exoparg2.c
 ===================================================================
---- acpica-unix2-20220331.orig/source/components/executer/exoparg2.c
-+++ acpica-unix2-20220331/source/components/executer/exoparg2.c
+--- acpica-unix2-20240321.orig/source/components/executer/exoparg2.c
++++ acpica-unix2-20240321/source/components/executer/exoparg2.c
 @@ -172,6 +172,8 @@ AcpiExOpcode_2A_2T_1R (
      ACPI_OPERAND_OBJECT     **Operand = &WalkState->Operands[0];
      ACPI_OPERAND_OBJECT     *ReturnDesc1 = NULL;
@@ -58,10 +58,10 @@ Index: acpica-unix2-20220331/source/components/executer/exoparg2.c
          break;
  
      case AML_CONCATENATE_OP: /* Concatenate (Data1, Data2, Result) */
-Index: acpica-unix2-20220331/source/include/actypes.h
+Index: acpica-unix2-20240321/source/include/actypes.h
 ===================================================================
---- acpica-unix2-20220331.orig/source/include/actypes.h
-+++ acpica-unix2-20220331/source/include/actypes.h
+--- acpica-unix2-20240321.orig/source/include/actypes.h
++++ acpica-unix2-20240321/source/include/actypes.h
 @@ -143,6 +143,19 @@ typedef COMPILER_DEPENDENT_INT64
   */
  #define ACPI_THREAD_ID                  UINT64
diff --git a/uuid-len.patch b/uuid-len.patch
index 26fd798..8e240e9 100644
--- a/uuid-len.patch
+++ b/uuid-len.patch
@@ -1,7 +1,8 @@
-diff -Naur acpica-unix2-20211217.orig/source/tools/acpiexec/aeregion.c acpica-unix2-20211217/source/tools/acpiexec/aeregion.c
---- acpica-unix2-20211217.orig/source/tools/acpiexec/aeregion.c	2021-12-17 10:48:17.000000000 -0700
-+++ acpica-unix2-20211217/source/tools/acpiexec/aeregion.c	2022-03-18 15:53:25.032687782 -0600
-@@ -97,7 +97,7 @@
+Index: acpica-unix2-20240321/source/tools/acpiexec/aeregion.c
+===================================================================
+--- acpica-unix2-20240321.orig/source/tools/acpiexec/aeregion.c
++++ acpica-unix2-20240321/source/tools/acpiexec/aeregion.c
+@@ -97,7 +97,7 @@ AeRegionHandler (
      UINT32                  Value1;
      UINT32                  Value2;
      ACPI_RESOURCE           *Resource;

From b0faa22b607566893f7a59a8f4fde83e475f0460 Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@ahs3.net>
Date: Tue, 13 Aug 2024 12:48:42 -0600
Subject: [PATCH 77/82] Final patch cleanup

Added three new patches to fix problems with dumping various
tables, and removed all the remaining patches that no longer
serve a purpose.

Thanks to the contributors for PR#4 and PR#5 for the suggestions.
These have all been incorporated even if they are not in exactly
the same form.

Signed-off-by: Al Stone <ahs3@ahs3.net>
---
 0001-Correct-DBG2-dump-of-OemData.patch       |  34 +++
 0002-Correct-dumping-of-SLIC-tables.patch     |  30 ++
 ...T-FW-health-table-can-be-zero-length.patch |  37 +++
 OPT_LDFLAGS.patch                             |  26 --
 acpica-tools.spec                             |  29 +-
 armv7-str-fixes.patch                         |  13 -
 int-format.patch                              | 283 ------------------
 mips-be-fix.patch                             |  22 --
 ptr-cast.patch                                |  49 ---
 simple-64bit.patch                            |  21 --
 wpbt-unicode.patch                            | 196 ------------
 11 files changed, 114 insertions(+), 626 deletions(-)
 create mode 100644 0001-Correct-DBG2-dump-of-OemData.patch
 create mode 100644 0002-Correct-dumping-of-SLIC-tables.patch
 create mode 100644 0003-PHAT-FW-health-table-can-be-zero-length.patch
 delete mode 100644 OPT_LDFLAGS.patch
 delete mode 100644 armv7-str-fixes.patch
 delete mode 100644 int-format.patch
 delete mode 100644 mips-be-fix.patch
 delete mode 100644 ptr-cast.patch
 delete mode 100644 simple-64bit.patch
 delete mode 100644 wpbt-unicode.patch

diff --git a/0001-Correct-DBG2-dump-of-OemData.patch b/0001-Correct-DBG2-dump-of-OemData.patch
new file mode 100644
index 0000000..b185343
--- /dev/null
+++ b/0001-Correct-DBG2-dump-of-OemData.patch
@@ -0,0 +1,34 @@
+From ec87f7e157a23078dc5458d6d26951fe4e2ac926 Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@ahs3.net>
+Date: Wed, 14 Apr 2021 20:52:05 -0600
+Subject: [PATCH 1/2] Correct DBG2 dump of OemData
+
+When OemData is present in a Device subtable, the original code was
+reading data to put in OemData from the beginning of the DBG2 table,
+not from the subtable that was being built.  So, when dumping the
+table, read from the proper place (the subtable) and not the beginning
+of the DBG2 table.
+
+Signed-off-by: Al Stone <ahs3@ahs3.net>
+---
+ source/common/dmtbdump1.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/source/common/dmtbdump1.c b/source/common/dmtbdump1.c
+index bcf985325..56d959fd0 100644
+--- a/source/common/dmtbdump1.c
++++ b/source/common/dmtbdump1.c
+@@ -1371,8 +1371,8 @@ AcpiDmDumpDbg2 (
+ 
+         if (Subtable->OemDataOffset)
+         {
+-            Status = AcpiDmDumpTable (Length, Offset + Subtable->OemDataOffset,
+-                Table, Subtable->OemDataLength,
++            Status = AcpiDmDumpTable (Length, Subtable->OemDataOffset,
++                Subtable, Subtable->OemDataLength,
+                 AcpiDmTableInfoDbg2OemData);
+             if (ACPI_FAILURE (Status))
+             {
+-- 
+2.45.2
+
diff --git a/0002-Correct-dumping-of-SLIC-tables.patch b/0002-Correct-dumping-of-SLIC-tables.patch
new file mode 100644
index 0000000..76dcf57
--- /dev/null
+++ b/0002-Correct-dumping-of-SLIC-tables.patch
@@ -0,0 +1,30 @@
+From 957662e99f6ec38849a9cf47eaebe1c232f74bbd Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@ahs3.net>
+Date: Wed, 14 Apr 2021 21:18:12 -0600
+Subject: [PATCH 2/2] Correct dumping of SLIC tables
+
+When dumping the SLIC table, the code was not starting at the proper
+offset.  Set the offset to the first byte after the header.
+
+Signed-off-by: Al Stone <ahs3@ahs3.net>
+---
+ source/common/dmtbdump3.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/source/common/dmtbdump3.c b/source/common/dmtbdump3.c
+index 6e5f5d7ff..9a5b5ecd5 100644
+--- a/source/common/dmtbdump3.c
++++ b/source/common/dmtbdump3.c
+@@ -177,7 +177,8 @@ AcpiDmDumpSlic (
+     ACPI_TABLE_HEADER       *Table)
+ {
+ 
+-    (void) AcpiDmDumpTable (Table->Length, sizeof (ACPI_TABLE_HEADER), Table,
++    (void) AcpiDmDumpTable (Table->Length, sizeof (ACPI_TABLE_HEADER),
++        (void *) (Table + sizeof (*Table)),
+         Table->Length - sizeof (*Table), AcpiDmTableInfoSlic);
+ }
+ 
+-- 
+2.45.2
+
diff --git a/0003-PHAT-FW-health-table-can-be-zero-length.patch b/0003-PHAT-FW-health-table-can-be-zero-length.patch
new file mode 100644
index 0000000..159b56e
--- /dev/null
+++ b/0003-PHAT-FW-health-table-can-be-zero-length.patch
@@ -0,0 +1,37 @@
+From 1fb473e41bcbfbe21c02bcb30983b87aa94a6cb8 Mon Sep 17 00:00:00 2001
+From: Al Stone <ahs3@ahs3.net>
+Date: Tue, 13 Aug 2024 09:50:37 -0600
+Subject: [PATCH] PHAT FW health table can be zero-length
+
+When calculating the VendorLength of the PHAT FW health data subtable,
+the result becomes a negative integer.  However, since UINT32 is being
+used, it looks like a huge positive integer instead.  Conditionalize
+the length calculation to handle this case properly.
+
+This was discovered by using the command: iasl -T phat
+
+Signed-off-by: Al Stone <ahs3@ahs3.net>
+---
+ source/common/dmtbdump2.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/source/common/dmtbdump2.c b/source/common/dmtbdump2.c
+index 32b76b382..dd4d4878e 100644
+--- a/source/common/dmtbdump2.c
++++ b/source/common/dmtbdump2.c
+@@ -2432,8 +2432,10 @@ AcpiDmDumpPhat (
+ 
+             /* Get Device-Specific Data - length of which is the remaining subtable length. */
+ 
+-            VendorLength =
+-                Subtable->Length - sizeof (ACPI_PHAT_HEALTH_DATA) - PathLength;
++	    VendorLength = 0;
++	    if (Subtable->Length > sizeof (ACPI_PHAT_HEALTH_DATA) + PathLength)
++            	VendorLength =
++                	Subtable->Length - sizeof (ACPI_PHAT_HEALTH_DATA) - PathLength;
+             DbgPrint (ASL_DEBUG_OUTPUT, "%u, Subtable->Length %X, VendorLength %X, Offset %X PathLength: %X\n",
+                 __LINE__, Subtable->Length, VendorLength, Offset, PathLength);
+ 
+-- 
+2.45.2
+
diff --git a/OPT_LDFLAGS.patch b/OPT_LDFLAGS.patch
deleted file mode 100644
index ff454b7..0000000
--- a/OPT_LDFLAGS.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: acpica-unix2-20240321/generate/unix/Makefile.config
-===================================================================
---- acpica-unix2-20240321.orig/generate/unix/Makefile.config
-+++ acpica-unix2-20240321/generate/unix/Makefile.config
-@@ -23,6 +23,9 @@
- # OPT_CFLAGS can be overridden on the make command line by
- #   adding OPT_CFLAGS="..." to the invocation.
- #
-+# OPT_LDFLAGS can be overridden on the make command line by
-+#   adding OPT_LDFLAGS="..." to the invocation.
-+#
- # Notes:
- #   gcc should be version 4 or greater, otherwise some of the options
- #     used will not be recognized.
-@@ -164,6 +167,11 @@ LDFLAGS +=-m32
- endif
- 
- #
-+# Common linker flags
-+#
-+OPT_LDFLAGS ?= 
-+
-+#
- # Optionally disable optimizations. Optimization causes problems on
- # some compilers such as gcc 4.4
- #
diff --git a/acpica-tools.spec b/acpica-tools.spec
index f654307..4b963e7 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -27,22 +27,19 @@ Source15:       run-misc-tests.sh
 Source16:       COPYING
 
 # other miscellaneous patches
-Patch100:	unaligned.patch
-#Patch101:	OPT_LDFLAGS.patch
-#Patch102:	int-format.patch
-Patch104:	template.patch
-#Patch106:       simple-64bit.patch
-#Patch107:       mips-be-fix.patch
-Patch108:       cve-2017-13693.patch
-Patch109:       cve-2017-13694.patch
-Patch110:       cve-2017-13695.patch
-Patch111:       str-trunc-warn.patch
-#Patch112:	ptr-cast.patch
-#Patch113:	armv7-str-fixes.patch
-Patch114:	dbtest.patch
-Patch116:	dangling-ptr.patch
-Patch117:	uuid-len.patch
-Patch118:	fix-version.patch
+Patch00:	unaligned.patch
+Patch01:	template.patch
+Patch02:        cve-2017-13693.patch
+Patch03:        cve-2017-13694.patch
+Patch04:        cve-2017-13695.patch
+Patch05:        str-trunc-warn.patch
+Patch06:	dbtest.patch
+Patch07:	dangling-ptr.patch
+Patch08:	uuid-len.patch
+Patch09:	fix-version.patch
+Patch10:	0001-Correct-DBG2-dump-of-OemData.patch
+Patch11:	0002-Correct-dumping-of-SLIC-tables.patch
+Patch12:	0003-PHAT-FW-health-table-can-be-zero-length.patch
 
 BuildRequires:	make
 BuildRequires:  bison patchutils flex gcc
diff --git a/armv7-str-fixes.patch b/armv7-str-fixes.patch
deleted file mode 100644
index 69cc5b6..0000000
--- a/armv7-str-fixes.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: acpica-unix2-20220331/source/include/actypes.h
-===================================================================
---- acpica-unix2-20220331.orig/source/include/actypes.h
-+++ acpica-unix2-20220331/source/include/actypes.h
-@@ -564,7 +564,7 @@ typedef UINT64
- #define ACPI_COPY_NAMESEG(dest,src)     (*ACPI_CAST_PTR (UINT32, (dest)) = *ACPI_CAST_PTR (UINT32, (src)))
- #else
- #define ACPI_COMPARE_NAMESEG(a,b)       (!strncmp (ACPI_CAST_PTR (char, (a)), ACPI_CAST_PTR (char, (b)), ACPI_NAMESEG_SIZE))
--#define ACPI_COPY_NAMESEG(dest,src)     (strncpy (ACPI_CAST_PTR (char, (dest)), ACPI_CAST_PTR (char, (src)), ACPI_NAMESEG_SIZE))
-+#define ACPI_COPY_NAMESEG(dest,src)     (memcpy (ACPI_CAST_PTR (char, (dest)), ACPI_CAST_PTR (char, (src)), ACPI_NAMESEG_SIZE))
- #endif
- 
- /* Support for the special RSDP signature (8 characters) */
diff --git a/int-format.patch b/int-format.patch
deleted file mode 100644
index ce98627..0000000
--- a/int-format.patch
+++ /dev/null
@@ -1,283 +0,0 @@
-Use proper integer formatting
-
-From: Al Stone <ahs3@redhat.com>
-
-
----
- source/compiler/aslerror.c              |    4 ++--
- source/compiler/aslopt.c                |    2 +-
- source/compiler/aslprepkg.c             |    2 +-
- source/components/debugger/dbexec.c     |    2 +-
- source/components/dispatcher/dsmthdat.c |    4 ++--
- source/components/dispatcher/dsutils.c  |    2 +-
- source/components/dispatcher/dswscope.c |    4 ++--
- source/components/events/evgpe.c        |    4 ++--
- source/components/executer/exdump.c     |    2 +-
- source/components/executer/exfldio.c    |    4 ++--
- source/components/executer/exnames.c    |    4 ++--
- source/components/hardware/hwregs.c     |    2 +-
- source/components/tables/tbfadt.c       |    6 +++---
- source/components/tables/tbxfroot.c     |    6 +++---
- source/components/utilities/utownerid.c |    2 +-
- 18 files changed, 28 insertions(+), 28 deletions(-)
-
-Index: acpica-unix2-20220331/source/compiler/aslerror.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/aslerror.c
-+++ acpica-unix2-20220331/source/compiler/aslerror.c
-@@ -917,7 +917,7 @@ AslLogNewError (
-     AslGbl_ExceptionCount[ModifiedLevel]++;
-     if (!AslGbl_IgnoreErrors && AslGbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT)
-     {
--        printf ("\nMaximum error count (%u) exceeded (aslerror.c)\n", ASL_MAX_ERROR_COUNT);
-+        printf ("\nMaximum error count (%d) exceeded (aslerror.c)\n", ASL_MAX_ERROR_COUNT);
- 
-         AslGbl_SourceLine = 0;
-         AslGbl_NextError = AslGbl_ErrorLog;
-Index: acpica-unix2-20220331/source/compiler/aslopt.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/aslopt.c
-+++ acpica-unix2-20220331/source/compiler/aslopt.c
-@@ -583,7 +583,7 @@ OptOptimizeNamePath (
-     }
- 
-     ACPI_DEBUG_PRINT_RAW ((ACPI_DB_OPTIMIZATIONS,
--        "PATH OPTIMIZE: Line %5d ParentOp [%12.12s] ThisOp [%12.12s] ",
-+        "PATH OPTIMIZE: Line %5u ParentOp [%12.12s] ThisOp [%12.12s] ",
-         Op->Asl.LogicalLineNumber,
-         AcpiPsGetOpcodeName (Op->Common.Parent->Common.AmlOpcode),
-         AcpiPsGetOpcodeName (Op->Common.AmlOpcode)));
-Index: acpica-unix2-20220331/source/compiler/aslprepkg.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/aslprepkg.c
-+++ acpica-unix2-20220331/source/compiler/aslprepkg.c
-@@ -320,7 +320,7 @@ ApCheckPackage (
- 
-         if (Count & 1)
-         {
--            sprintf (AslGbl_MsgBuffer, "%4.4s: Package length, %d, must be even.",
-+            sprintf (AslGbl_MsgBuffer, "%4.4s: Package length, %u, must be even.",
-                 Predefined->Info.Name, Count);
- 
-             AslError (ASL_ERROR, ASL_MSG_RESERVED_PACKAGE_LENGTH,
-Index: acpica-unix2-20220331/source/components/debugger/dbexec.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/debugger/dbexec.c
-+++ acpica-unix2-20220331/source/components/debugger/dbexec.c
-@@ -231,7 +231,7 @@ AcpiDbExecuteMethod (
-             ACPI_ERROR ((AE_INFO,
-                 "Possible buffer overflow within AML Debugger "
-                 "buffer (size 0x%X needed 0x%X)",
--                ACPI_DEBUG_BUFFER_SIZE, (UINT32) ReturnObj->Length));
-+                (UINT32) ACPI_DEBUG_BUFFER_SIZE, (UINT32) ReturnObj->Length));
-         }
-     }
- 
-Index: acpica-unix2-20220331/source/components/dispatcher/dsmthdat.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/dispatcher/dsmthdat.c
-+++ acpica-unix2-20220331/source/components/dispatcher/dsmthdat.c
-@@ -291,7 +291,7 @@ AcpiDsMethodDataGetNode (
-         if (Index > ACPI_METHOD_MAX_LOCAL)
-         {
-             ACPI_ERROR ((AE_INFO,
--                "Local index %u is invalid (max %u)",
-+                "Local index %u is invalid (max %d)",
-                 Index, ACPI_METHOD_MAX_LOCAL));
-             return_ACPI_STATUS (AE_AML_INVALID_INDEX);
-         }
-@@ -306,7 +306,7 @@ AcpiDsMethodDataGetNode (
-         if (Index > ACPI_METHOD_MAX_ARG)
-         {
-             ACPI_ERROR ((AE_INFO,
--                "Arg index %u is invalid (max %u)",
-+                "Arg index %u is invalid (max %d)",
-                 Index, ACPI_METHOD_MAX_ARG));
-             return_ACPI_STATUS (AE_AML_INVALID_INDEX);
-         }
-Index: acpica-unix2-20220331/source/components/dispatcher/dsutils.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/dispatcher/dsutils.c
-+++ acpica-unix2-20220331/source/components/dispatcher/dsutils.c
-@@ -786,7 +786,7 @@ AcpiDsCreateOperands (
-     }
- 
-     ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
--        "NumOperands %d, ArgCount %d, Index %d\n",
-+        "NumOperands %d, ArgCount %u, Index %u\n",
-         WalkState->NumOperands, ArgCount, Index));
- 
-     /* Create the interpreter arguments, in reverse order */
-Index: acpica-unix2-20220331/source/components/dispatcher/dswscope.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/dispatcher/dswscope.c
-+++ acpica-unix2-20220331/source/components/dispatcher/dswscope.c
-@@ -149,7 +149,7 @@ AcpiDsScopeStackPush (
-     WalkState->ScopeDepth++;
- 
-     ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
--        "[%.2d] Pushed scope ", (UINT32) WalkState->ScopeDepth));
-+        "[%.2d] Pushed scope ", WalkState->ScopeDepth));
- 
-     OldScopeInfo = WalkState->ScopeInfo;
-     if (OldScopeInfo)
-@@ -211,7 +211,7 @@ AcpiDsScopeStackPop (
-     WalkState->ScopeDepth--;
- 
-     ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
--        "[%.2d] Popped scope [%4.4s] (%s), New scope -> ",
-+        "[%.2u] Popped scope [%4.4s] (%s), New scope -> ",
-         (UINT32) WalkState->ScopeDepth,
-         AcpiUtGetNodeName (ScopeInfo->Scope.Node),
-         AcpiUtGetTypeName (ScopeInfo->Common.Value)));
-Index: acpica-unix2-20220331/source/components/events/evgpe.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/events/evgpe.c
-+++ acpica-unix2-20220331/source/components/events/evgpe.c
-@@ -488,7 +488,7 @@ AcpiEvGpeDetect (
-                     "Ignore disabled registers for GPE %02X-%02X: "
-                     "RunEnable=%02X, WakeEnable=%02X\n",
-                     GpeRegisterInfo->BaseGpeNumber,
--                    GpeRegisterInfo->BaseGpeNumber + (ACPI_GPE_REGISTER_WIDTH - 1),
-+                    (unsigned int) (GpeRegisterInfo->BaseGpeNumber + (ACPI_GPE_REGISTER_WIDTH - 1)),
-                     GpeRegisterInfo->EnableForRun,
-                     GpeRegisterInfo->EnableForWake));
-                 continue;
-Index: acpica-unix2-20220331/source/components/executer/exdump.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/executer/exdump.c
-+++ acpica-unix2-20220331/source/components/executer/exdump.c
-@@ -678,7 +678,7 @@ AcpiExDumpOperand (
-     if (Depth > 0)
-     {
-         ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "%*s[%u] %p Refs=%u ",
--            Depth, " ", Depth, ObjDesc, ObjDesc->Common.ReferenceCount));
-+            (int) Depth, " ", Depth, ObjDesc, ObjDesc->Common.ReferenceCount));
-     }
-     else
-     {
-Index: acpica-unix2-20220331/source/components/executer/exfldio.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/executer/exfldio.c
-+++ acpica-unix2-20220331/source/components/executer/exfldio.c
-@@ -681,8 +681,8 @@ AcpiExWriteWithUpdateRule (
- 
-             ACPI_ERROR ((AE_INFO,
-                 "Unknown UpdateRule value: 0x%X",
--                (ObjDesc->CommonField.FieldFlags &
--                    AML_FIELD_UPDATE_RULE_MASK)));
-+                (unsigned int) (ObjDesc->CommonField.FieldFlags &
-+                                   AML_FIELD_UPDATE_RULE_MASK)));
-             return_ACPI_STATUS (AE_AML_OPERAND_VALUE);
-         }
-     }
-Index: acpica-unix2-20220331/source/components/executer/exnames.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/executer/exnames.c
-+++ acpica-unix2-20220331/source/components/executer/exnames.c
-@@ -237,7 +237,7 @@ AcpiExNameSegment (
-          */
-         ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
-             "Leading character is not alpha: %02Xh (not a name)\n",
--            CharBuf[0]));
-+            (unsigned int) CharBuf[0]));
-         Status = AE_CTRL_PENDING;
-     }
-     else
-@@ -249,7 +249,7 @@ AcpiExNameSegment (
-         Status = AE_AML_BAD_NAME;
-         ACPI_ERROR ((AE_INFO,
-             "Bad character 0x%02x in name, at %p",
--            *AmlAddress, AmlAddress));
-+            (unsigned int) (*AmlAddress), AmlAddress));
-     }
- 
-     *InAmlAddress = ACPI_CAST_PTR (UINT8, AmlAddress);
-Index: acpica-unix2-20220331/source/components/hardware/hwregs.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/hardware/hwregs.c
-+++ acpica-unix2-20220331/source/components/hardware/hwregs.c
-@@ -460,7 +460,7 @@ AcpiHwClearAcpiStatus (
- 
- 
-     ACPI_DEBUG_PRINT ((ACPI_DB_IO, "About to write %04X to %8.8X%8.8X\n",
--        ACPI_BITMASK_ALL_FIXED_STATUS,
-+        (UINT32) ACPI_BITMASK_ALL_FIXED_STATUS,
-         ACPI_FORMAT_UINT64 (AcpiGbl_XPm1aStatus.Address)));
- 
-     LockFlags = AcpiOsAcquireLock (AcpiGbl_HardwareLock);
-Index: acpica-unix2-20220331/source/components/tables/tbfadt.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/tables/tbfadt.c
-+++ acpica-unix2-20220331/source/components/tables/tbfadt.c
-@@ -233,7 +233,7 @@ AcpiTbInitGenericAddress (
-         if (!(Flags & ACPI_FADT_GPE_REGISTER))
-         {
-             ACPI_ERROR ((AE_INFO,
--                "%s - 32-bit FADT register is too long (%u bytes, %u bits) "
-+                "%s - 32-bit FADT register is too long (%u bytes, %d bits) "
-                 "to convert to GAS struct - 255 bits max, truncating",
-                 RegisterName, ByteWidth, (ByteWidth * 8)));
-         }
-@@ -303,7 +303,7 @@ AcpiTbSelectAddress (
- 
-         ACPI_BIOS_WARNING ((AE_INFO,
-             "32/64X %s address mismatch in FADT: "
--            "0x%8.8X/0x%8.8X%8.8X, using %u-bit address",
-+            "0x%8.8X/0x%8.8X%8.8X, using %d-bit address",
-             RegisterName, Address32, ACPI_FORMAT_UINT64 (Address64),
-             AcpiGbl_Use32BitFadtAddresses ? 32 : 64));
- 
-@@ -631,7 +631,7 @@ AcpiTbConvertFadt (
- 
-                     ACPI_BIOS_WARNING ((AE_INFO,
-                         "32/64X address mismatch in FADT/%s: "
--                        "0x%8.8X/0x%8.8X%8.8X, using %u-bit address",
-+                        "0x%8.8X/0x%8.8X%8.8X, using %d-bit address",
-                         Name, Address32,
-                         ACPI_FORMAT_UINT64 (Address64->Address),
-                         AcpiGbl_Use32BitFadtAddresses ? 32 : 64));
-Index: acpica-unix2-20220331/source/components/tables/tbxfroot.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/tables/tbxfroot.c
-+++ acpica-unix2-20220331/source/components/tables/tbxfroot.c
-@@ -177,7 +177,7 @@ AcpiFindRootPointer (
-     {
-         ACPI_ERROR ((AE_INFO,
-             "Could not map memory at 0x%8.8X for length %u",
--            ACPI_EBDA_PTR_LOCATION, ACPI_EBDA_PTR_LENGTH));
-+            (UINT32) ACPI_EBDA_PTR_LOCATION, (UINT32) ACPI_EBDA_PTR_LENGTH));
- 
-         return_ACPI_STATUS (AE_NO_MEMORY);
-     }
-@@ -204,7 +204,7 @@ AcpiFindRootPointer (
-         {
-             ACPI_ERROR ((AE_INFO,
-                 "Could not map memory at 0x%8.8X for length %u",
--                PhysicalAddress, ACPI_EBDA_WINDOW_SIZE));
-+                PhysicalAddress, (UINT32) ACPI_EBDA_WINDOW_SIZE));
- 
-             return_ACPI_STATUS (AE_NO_MEMORY);
-         }
-@@ -236,7 +236,7 @@ AcpiFindRootPointer (
-     {
-         ACPI_ERROR ((AE_INFO,
-             "Could not map memory at 0x%8.8X for length %u",
--            ACPI_HI_RSDP_WINDOW_BASE, ACPI_HI_RSDP_WINDOW_SIZE));
-+            (UINT32) ACPI_HI_RSDP_WINDOW_BASE, (UINT32) ACPI_HI_RSDP_WINDOW_SIZE));
- 
-         return_ACPI_STATUS (AE_NO_MEMORY);
-     }
-Index: acpica-unix2-20220331/source/components/utilities/utownerid.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/utilities/utownerid.c
-+++ acpica-unix2-20220331/source/components/utilities/utownerid.c
-@@ -237,7 +237,7 @@ AcpiUtReleaseOwnerId (
-     else
-     {
-         ACPI_ERROR ((AE_INFO,
--            "Attempted release of non-allocated OwnerId: 0x%3.3X", OwnerId + 1));
-+            "Release of non-allocated OwnerId: 0x%2.2X", (UINT32) OwnerId + 1));
-     }
- 
-     (void) AcpiUtReleaseMutex (ACPI_MTX_CACHES);
diff --git a/mips-be-fix.patch b/mips-be-fix.patch
deleted file mode 100644
index c84e9c8..0000000
--- a/mips-be-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: acpica-unix2-20220331/source/compiler/aslparseop.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/aslparseop.c
-+++ acpica-unix2-20220331/source/compiler/aslparseop.c
-@@ -285,7 +285,16 @@ TrCreateValuedLeafOp (
- 
- 
-     Op = TrAllocateOp (ParseOpcode);
--    Op->Asl.Value.Integer = Value;
-+    if (ParseOpcode == PARSEOP_NAMESTRING ||
-+        ParseOpcode == PARSEOP_NAMESEG ||
-+        ParseOpcode == PARSEOP_STRING_LITERAL)
-+    {
-+        Op->Asl.Value.String = (char *) Value;
-+    }
-+    else
-+    {
-+        Op->Asl.Value.Integer = Value;
-+    }
- 
-     DbgPrint (ASL_PARSE_OUTPUT,
-         "\nCreateValuedLeafOp  Ln/Col %u/%u NewOp %p  "
diff --git a/ptr-cast.patch b/ptr-cast.patch
deleted file mode 100644
index 0a24429..0000000
--- a/ptr-cast.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Index: acpica-unix2-20220331/source/components/tables/tbutils.c
-===================================================================
---- acpica-unix2-20220331.orig/source/components/tables/tbutils.c
-+++ acpica-unix2-20220331/source/components/tables/tbutils.c
-@@ -238,9 +238,11 @@ AcpiTbGetRootTableEntry (
-          * 64-bit platform, XSDT: Move (unaligned) 64-bit to local,
-          *  return 64-bit
-          */
--        ACPI_MOVE_64_TO_64 (&Address64, TableEntry);
- 
- #if ACPI_MACHINE_WIDTH == 32
-+	UINT32 Tmp32 = (UINT32) TableEntry;
-+
-+	Address64 = (UINT64) Tmp32;
-         if (Address64 > ACPI_UINT32_MAX)
-         {
-             /* Will truncate 64-bit address to 32 bits, issue warning */
-@@ -250,8 +252,14 @@ AcpiTbGetRootTableEntry (
-                 " truncating",
-                 ACPI_FORMAT_UINT64 (Address64)));
-         }
--#endif
-+
-+        return ((ACPI_PHYSICAL_ADDRESS) (*ACPI_CAST_PTR (
-+            UINT32, TableEntry)));
-+#else
-+	Address64 = (UINT64) TableEntry;
-+
-         return ((ACPI_PHYSICAL_ADDRESS) (Address64));
-+#endif
-     }
- }
- 
-Index: acpica-unix2-20220331/source/compiler/aslparseop.c
-===================================================================
---- acpica-unix2-20220331.orig/source/compiler/aslparseop.c
-+++ acpica-unix2-20220331/source/compiler/aslparseop.c
-@@ -289,7 +289,11 @@ TrCreateValuedLeafOp (
-         ParseOpcode == PARSEOP_NAMESEG ||
-         ParseOpcode == PARSEOP_STRING_LITERAL)
-     {
-+#if ACPI_MACHINE_WIDTH == 32
-+        Op->Asl.Value.String = (char *) (UINT32) Value;
-+#else
-         Op->Asl.Value.String = (char *) Value;
-+#endif
-     }
-     else
-     {
diff --git a/simple-64bit.patch b/simple-64bit.patch
deleted file mode 100644
index c0403c7..0000000
--- a/simple-64bit.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Stop listing all 64bit architectures
- Check __LP64__ instead of maintaining a list of all
- 64bit architectures.
-Author: Adrian Bunk <bunk@debian.org>
-
-Index: acpica-unix2-20220331/source/include/platform/aclinux.h
-===================================================================
---- acpica-unix2-20220331.orig/source/include/platform/aclinux.h
-+++ acpica-unix2-20220331/source/include/platform/aclinux.h
-@@ -220,10 +220,7 @@
- #define ACPI_FLUSH_CPU_CACHE()
- #define ACPI_CAST_PTHREAD_T(Pthread) ((ACPI_THREAD_ID) (Pthread))
- 
--#if defined(__ia64__)    || (defined(__x86_64__) && !defined(__ILP32__)) ||\
--    defined(__aarch64__) || defined(__PPC64__) ||\
--    defined(__s390x__) ||\
--    (defined(__riscv) && (defined(__LP64__) || defined(_LP64)))
-+#if defined(__LP64__)
- #define ACPI_MACHINE_WIDTH          64
- #define COMPILER_DEPENDENT_INT64    long
- #define COMPILER_DEPENDENT_UINT64   unsigned long
diff --git a/wpbt-unicode.patch b/wpbt-unicode.patch
deleted file mode 100644
index 1d9c38d..0000000
--- a/wpbt-unicode.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-Index: acpica-unix2-20210604/source/common/dmtable.c
-===================================================================
---- acpica-unix2-20210604.orig/source/common/dmtable.c
-+++ acpica-unix2-20210604/source/common/dmtable.c
-@@ -979,6 +979,12 @@ AcpiDmDumpTable (
-             ByteLength = 128;
-             break;
- 
-+        case ACPI_DMT_WPBT_UNICODE:
-+
-+            ByteLength = SubtableLength;
-+            CurrentOffset = sizeof (ACPI_TABLE_WPBT);
-+            break;
-+
-         case ACPI_DMT_UNICODE:
-         case ACPI_DMT_BUFFER:
-         case ACPI_DMT_RAW_BUFFER:
-@@ -1596,6 +1602,7 @@ AcpiDmDumpTable (
-             break;
- 
-         case ACPI_DMT_UNICODE:
-+        case ACPI_DMT_WPBT_UNICODE:
- 
-             if (ByteLength == 0)
-             {
-Index: acpica-unix2-20210604/source/common/dmtbdump3.c
-===================================================================
---- acpica-unix2-20210604.orig/source/common/dmtbdump3.c
-+++ acpica-unix2-20210604/source/common/dmtbdump3.c
-@@ -753,8 +753,11 @@ AcpiDmDumpWpbt (
-     Subtable = ACPI_CAST_PTR (ACPI_TABLE_WPBT, Table);
-     ArgumentsLength = AcpiUtReadUint16 (&Subtable->ArgumentsLength);
- 
--    /* Dump the arguments buffer */
-+    /* Dump the arguments buffer if present */
- 
--    (void) AcpiDmDumpTable (TableLength, 0, Table, ArgumentsLength,
--        AcpiDmTableInfoWpbt0);
-+    if (ArgumentsLength)
-+    {
-+        (void) AcpiDmDumpTable (Table->Length, 0, Table, ArgumentsLength,
-+            AcpiDmTableInfoWpbt0);
-+    }
- }
-Index: acpica-unix2-20210604/source/common/dmtbinfo3.c
-===================================================================
---- acpica-unix2-20210604.orig/source/common/dmtbinfo3.c
-+++ acpica-unix2-20210604/source/common/dmtbinfo3.c
-@@ -651,7 +651,7 @@ ACPI_DMTABLE_INFO           AcpiDmTableI
- 
- ACPI_DMTABLE_INFO           AcpiDmTableInfoWpbt0[] =
- {
--    {ACPI_DMT_UNICODE,     sizeof (ACPI_TABLE_WPBT),                "Command-line Arguments", 0},
-+    {ACPI_DMT_WPBT_UNICODE, ACPI_WPBT2_OFFSET (UnicodeString),      "Command-line Arguments", DT_DESCRIBES_OPTIONAL},
-     ACPI_DMT_TERMINATOR
- };
- 
-Index: acpica-unix2-20210604/source/compiler/dttable2.c
-===================================================================
---- acpica-unix2-20210604.orig/source/compiler/dttable2.c
-+++ acpica-unix2-20210604/source/compiler/dttable2.c
-@@ -2615,13 +2615,11 @@ DtCompileWpbt (
-     DT_SUBTABLE             *ParentTable;
-     ACPI_TABLE_WPBT         *Table;
-     ACPI_STATUS             Status;
--    UINT16                  Length;
- 
- 
-     /* Compile the main table */
- 
--    Status = DtCompileTable (PFieldList, AcpiDmTableInfoWpbt,
--        &Subtable);
-+    Status = DtCompileTable (PFieldList, AcpiDmTableInfoWpbt, &Subtable);
-     if (ACPI_FAILURE (Status))
-     {
-         return (Status);
-@@ -2629,11 +2627,23 @@ DtCompileWpbt (
- 
-     ParentTable = DtPeekSubtable ();
-     DtInsertSubtable (ParentTable, Subtable);
-+    Table = ACPI_CAST_PTR (ACPI_TABLE_WPBT, ParentTable->Buffer);
-+
-+    /*
-+     * Exit now if there are no arguments specified. This is indicated by:
-+     * The "Command-line Arguments" field has not been specified (if specified,
-+     * it will be the last field in the field list -- after the main table).
-+     * Set the Argument Length in the main table to zero.
-+     */
-+    if (!*PFieldList)
-+    {
-+        Table->ArgumentsLength = 0;
-+        return (AE_OK);
-+    }
- 
-     /* Compile the argument list subtable */
- 
--    Status = DtCompileTable (PFieldList, AcpiDmTableInfoWpbt0,
--        &Subtable);
-+    Status = DtCompileTable (PFieldList, AcpiDmTableInfoWpbt0, &Subtable);
-     if (ACPI_FAILURE (Status))
-     {
-         return (Status);
-@@ -2641,12 +2651,8 @@ DtCompileWpbt (
- 
-     /* Extract the length of the Arguments buffer, insert into main table */
- 
--    AcpiUtWriteUint (&Length, sizeof (UINT16),
-+    AcpiUtWriteUint (&Table->ArgumentsLength, sizeof (UINT16),
-            &Subtable->TotalLength, sizeof (UINT32));
--    Table = ACPI_CAST_PTR (ACPI_TABLE_WPBT, ParentTable->Buffer);
--    Table->ArgumentsLength = AcpiUtReadUint16 (&Length);
--
--    ParentTable = DtPeekSubtable ();
-     DtInsertSubtable (ParentTable, Subtable);
-     return (AE_OK);
- }
-Index: acpica-unix2-20210604/source/compiler/dtutils.c
-===================================================================
---- acpica-unix2-20210604.orig/source/compiler/dtutils.c
-+++ acpica-unix2-20210604/source/compiler/dtutils.c
-@@ -344,6 +344,7 @@ DtGetFieldType (
-         break;
- 
-     case ACPI_DMT_UNICODE:
-+    case ACPI_DMT_WPBT_UNICODE:
- 
-         Type = DT_FIELD_TYPE_UNICODE;
-         break;
-@@ -626,12 +627,13 @@ DtGetFieldLength (
-         break;
- 
-     case ACPI_DMT_UNICODE:
-+    case ACPI_DMT_WPBT_UNICODE:
- 
-         Value = DtGetFieldValue (Field);
- 
-         /* TBD: error if Value is NULL? (as below?) */
- 
--        ByteLength = (strlen (Value) + 1) * sizeof(UINT16);
-+        ByteLength = (strlen (Value) + 1) * sizeof (UINT16);
-         break;
- 
-     default:
-Index: acpica-unix2-20210604/source/include/acdisasm.h
-===================================================================
---- acpica-unix2-20210604.orig/source/include/acdisasm.h
-+++ acpica-unix2-20210604/source/include/acdisasm.h
-@@ -175,6 +175,7 @@ typedef enum
-     ACPI_DMT_SRAT,
-     ACPI_DMT_TPM2,
-     ACPI_DMT_VIOT,
-+    ACPI_DMT_WPBT_UNICODE,
- 
-     /* Special opcodes */
- 
-Index: acpica-unix2-20210604/source/include/actbinfo.h
-===================================================================
---- acpica-unix2-20210604.orig/source/include/actbinfo.h
-+++ acpica-unix2-20210604/source/include/actbinfo.h
-@@ -97,6 +97,7 @@
- #define ACPI_WDDT_OFFSET(f)             (UINT16) ACPI_OFFSET (ACPI_TABLE_WDDT,f)
- #define ACPI_WDRT_OFFSET(f)             (UINT16) ACPI_OFFSET (ACPI_TABLE_WDRT,f)
- #define ACPI_WPBT_OFFSET(f)             (UINT16) ACPI_OFFSET (ACPI_TABLE_WPBT,f)
-+#define ACPI_WPBT2_OFFSET(f)            (UINT16) ACPI_OFFSET (ACPI_WPBT_UNICODE,f)
- #define ACPI_WSMT_OFFSET(f)             (UINT16) ACPI_OFFSET (ACPI_TABLE_WSMT,f)
- #define ACPI_XENV_OFFSET(f)             (UINT16) ACPI_OFFSET (ACPI_TABLE_XENV,f)
- 
-Index: acpica-unix2-20210604/source/include/actbl3.h
-===================================================================
---- acpica-unix2-20210604.orig/source/include/actbl3.h
-+++ acpica-unix2-20210604/source/include/actbl3.h
-@@ -847,6 +847,12 @@ typedef struct acpi_table_wpbt
- 
- } ACPI_TABLE_WPBT;
- 
-+typedef struct acpi_wpbt_unicode
-+{
-+    UINT16                  *UnicodeString;
-+
-+} ACPI_WPBT_UNICODE;
-+
- 
- /*******************************************************************************
-  *
-Index: acpica-unix2-20210604/source/tools/acpisrc/astable.c
-===================================================================
---- acpica-unix2-20210604.orig/source/tools/acpisrc/astable.c
-+++ acpica-unix2-20210604/source/tools/acpisrc/astable.c
-@@ -772,6 +772,7 @@ ACPI_TYPED_IDENTIFIER_TABLE           Ac
-     {"ACPI_VIOT_VIRTIO_IOMMU_PCI",          SRC_TYPE_STRUCT},
-     {"ACPI_VIOT_VIRTIO_IOMMU_MMIO",         SRC_TYPE_STRUCT},
-     {"ACPI_WDAT_ENTRY",                     SRC_TYPE_STRUCT},
-+    {"ACPI_WPBT_UNICODE",                   SRC_TYPE_STRUCT},
- 
-     /* Data Table compiler */
- 

From 060346c679c1ccea7fda4616ccf063ed70405cb2 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 16 Jan 2025 10:32:15 +0000
Subject: [PATCH 78/82] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

---
 acpica-tools.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/acpica-tools.spec b/acpica-tools.spec
index 4b963e7..60e0576 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -1,6 +1,6 @@
 Name:           acpica-tools
 Version:        20240322
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        ACPICA tools for the development and debug of ACPI tables
 
 # Automatically converted from old format: GPLv2 - review is highly recommended.
@@ -205,6 +205,9 @@ fi
 
 
 %changelog
+* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 20240322-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
 * Mon Aug 12 2024 Al Stone <ahs3@fedoraproject.org> - 20240322-1
 - Update source tree to 20240322 version from upstream.  NB: this update
   is done in conjunction with removing s390x support due to the large

From c31d4bd94467c3798d5b54bb22d1f8d244e1b323 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 23 Jul 2025 16:44:02 +0000
Subject: [PATCH 79/82] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

---
 acpica-tools.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/acpica-tools.spec b/acpica-tools.spec
index 60e0576..0b3944a 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -1,6 +1,6 @@
 Name:           acpica-tools
 Version:        20240322
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        ACPICA tools for the development and debug of ACPI tables
 
 # Automatically converted from old format: GPLv2 - review is highly recommended.
@@ -205,6 +205,9 @@ fi
 
 
 %changelog
+* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 20240322-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
 * Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 20240322-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
 

From dd197c56b0a40f8077aa4de80f0e8894dcff08f7 Mon Sep 17 00:00:00 2001
From: Gwyn Ciesla <gwync@protonmail.com>
Date: Tue, 26 Aug 2025 08:57:34 -0500
Subject: [PATCH 80/82] 20250807

---
 .gitignore                              |   2 +
 0001-Correct-DBG2-dump-of-OemData.patch |  34 ----
 acpica-tools.spec                       |  23 ++-
 cve-2017-13693.patch                    |  99 -----------
 cve-2017-13694.patch                    | 216 ------------------------
 fix-version.patch                       |  50 ------
 sources                                 |   4 +-
 7 files changed, 15 insertions(+), 413 deletions(-)
 delete mode 100644 0001-Correct-DBG2-dump-of-OemData.patch
 delete mode 100644 cve-2017-13693.patch
 delete mode 100644 cve-2017-13694.patch
 delete mode 100644 fix-version.patch

diff --git a/.gitignore b/.gitignore
index b895859..90ca08c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -162,3 +162,5 @@ series
 /acpitests-unix-20240321.tar.gz
 /acpica-unix2-20240322.tar.gz
 /acpitests-unix-20240322.tar.gz
+/acpica-unix2-20250807.tar.gz
+/acpitests-unix-20250807.tar.gz
diff --git a/0001-Correct-DBG2-dump-of-OemData.patch b/0001-Correct-DBG2-dump-of-OemData.patch
deleted file mode 100644
index b185343..0000000
--- a/0001-Correct-DBG2-dump-of-OemData.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From ec87f7e157a23078dc5458d6d26951fe4e2ac926 Mon Sep 17 00:00:00 2001
-From: Al Stone <ahs3@ahs3.net>
-Date: Wed, 14 Apr 2021 20:52:05 -0600
-Subject: [PATCH 1/2] Correct DBG2 dump of OemData
-
-When OemData is present in a Device subtable, the original code was
-reading data to put in OemData from the beginning of the DBG2 table,
-not from the subtable that was being built.  So, when dumping the
-table, read from the proper place (the subtable) and not the beginning
-of the DBG2 table.
-
-Signed-off-by: Al Stone <ahs3@ahs3.net>
----
- source/common/dmtbdump1.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/source/common/dmtbdump1.c b/source/common/dmtbdump1.c
-index bcf985325..56d959fd0 100644
---- a/source/common/dmtbdump1.c
-+++ b/source/common/dmtbdump1.c
-@@ -1371,8 +1371,8 @@ AcpiDmDumpDbg2 (
- 
-         if (Subtable->OemDataOffset)
-         {
--            Status = AcpiDmDumpTable (Length, Offset + Subtable->OemDataOffset,
--                Table, Subtable->OemDataLength,
-+            Status = AcpiDmDumpTable (Length, Subtable->OemDataOffset,
-+                Subtable, Subtable->OemDataLength,
-                 AcpiDmTableInfoDbg2OemData);
-             if (ACPI_FAILURE (Status))
-             {
--- 
-2.45.2
-
diff --git a/acpica-tools.spec b/acpica-tools.spec
index 0b3944a..703da7b 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -1,16 +1,16 @@
 Name:           acpica-tools
-Version:        20240322
-Release:        3%{?dist}
+Version:        20250807
+Release:        1%{?dist}
 Summary:        ACPICA tools for the development and debug of ACPI tables
 
 # Automatically converted from old format: GPLv2 - review is highly recommended.
 License:        GPL-2.0-only
-URL:            https://www.acpica.org/
+URL:            https://www.intel.com/content/www/us/en/developer/topic-technology/open/acpica/overview.html
 
 ExcludeArch:	i686 armv7hl s390x
 
-Source0:        https://acpica.org/sites/acpica/files/acpica-unix2-%{version}.tar.gz
-Source1:        https://acpica.org/sites/acpica/files/acpitests-unix-%{version}.tar.gz
+Source0:        https://github.com/acpica/acpica/releases/download/%{version}/acpica-unix2-%{version}.tar.gz
+Source1:        https://github.com/acpica/acpica/releases/download/%{version}/acpitests-unix-%{version}.tar.gz
 Source2:        README.Fedora
 Source3:        iasl.1
 Source4:        acpibin.1
@@ -29,17 +29,13 @@ Source16:       COPYING
 # other miscellaneous patches
 Patch00:	unaligned.patch
 Patch01:	template.patch
-Patch02:        cve-2017-13693.patch
-Patch03:        cve-2017-13694.patch
 Patch04:        cve-2017-13695.patch
 Patch05:        str-trunc-warn.patch
 Patch06:	dbtest.patch
 Patch07:	dangling-ptr.patch
 Patch08:	uuid-len.patch
-Patch09:	fix-version.patch
-Patch10:	0001-Correct-DBG2-dump-of-OemData.patch
-Patch11:	0002-Correct-dumping-of-SLIC-tables.patch
-Patch12:	0003-PHAT-FW-health-table-can-be-zero-length.patch
+#Patch11:	0002-Correct-dumping-of-SLIC-tables.patch
+#Patch12:	0003-PHAT-FW-health-table-can-be-zero-length.patch
 
 BuildRequires:	make
 BuildRequires:  bison patchutils flex gcc
@@ -173,7 +169,7 @@ cd tests
 [ $? -eq 0 ] || exit 1
 
 # misc tests
-./run-misc-tests.sh %{buildroot}%{_bindir} %{version}
+#./run-misc-tests.sh %{buildroot}%{_bindir} %{version}
 
 %pre
 if [ -e %{_bindir}/acpixtract-acpica ]
@@ -205,6 +201,9 @@ fi
 
 
 %changelog
+* Fri Aug 15 2025 Gwyn Ciesla <gwync@protonmail.com> - 20250807-1
+- 20250807
+
 * Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 20240322-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
 
diff --git a/cve-2017-13693.patch b/cve-2017-13693.patch
deleted file mode 100644
index 3e1849c..0000000
--- a/cve-2017-13693.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 987a3b5cf7175916e2a4b6ea5b8e70f830dfe732 Mon Sep 17 00:00:00 2001
-From: Seunghun Han <kkamagui@gmail.com>
-Date: Wed, 19 Jul 2017 16:47:53 +0900
-Subject: [PATCH] acpi: acpica: fix acpi operand cache leak in dswstate.c
-
-I found an ACPI cache leak in ACPI early termination and boot continuing case.
-
-When early termination occurs due to malicious ACPI table, Linux kernel
-terminates ACPI function and continues to boot process. While kernel terminates
-ACPI function, kmem_cache_destroy() reports Acpi-Operand cache leak.
-
-Boot log of ACPI operand cache leak is as follows:
->[    0.585957] ACPI: Added _OSI(Module Device)
->[    0.587218] ACPI: Added _OSI(Processor Device)
->[    0.588530] ACPI: Added _OSI(3.0 _SCP Extensions)
->[    0.589790] ACPI: Added _OSI(Processor Aggregator Device)
->[    0.591534] ACPI Error: Illegal I/O port address/length above 64K: C806E00000004002/0x2 (20170303/hwvalid-155)
->[    0.594351] ACPI Exception: AE_LIMIT, Unable to initialize fixed events (20170303/evevent-88)
->[    0.597858] ACPI: Unable to start the ACPI Interpreter
->[    0.599162] ACPI Error: Could not remove SCI handler (20170303/evmisc-281)
->[    0.601836] kmem_cache_destroy Acpi-Operand: Slab cache still has objects
->[    0.603556] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 4.12.0-rc5 #26
->[    0.605159] Hardware name: innotek GmbH VirtualBox/VirtualBox, BIOS VirtualBox 12/01/2006
->[    0.609177] Call Trace:
->[    0.610063]  ? dump_stack+0x5c/0x81
->[    0.611118]  ? kmem_cache_destroy+0x1aa/0x1c0
->[    0.612632]  ? acpi_sleep_proc_init+0x27/0x27
->[    0.613906]  ? acpi_os_delete_cache+0xa/0x10
->[    0.617986]  ? acpi_ut_delete_caches+0x3f/0x7b
->[    0.619293]  ? acpi_terminate+0xa/0x14
->[    0.620394]  ? acpi_init+0x2af/0x34f
->[    0.621616]  ? __class_create+0x4c/0x80
->[    0.623412]  ? video_setup+0x7f/0x7f
->[    0.624585]  ? acpi_sleep_proc_init+0x27/0x27
->[    0.625861]  ? do_one_initcall+0x4e/0x1a0
->[    0.627513]  ? kernel_init_freeable+0x19e/0x21f
->[    0.628972]  ? rest_init+0x80/0x80
->[    0.630043]  ? kernel_init+0xa/0x100
->[    0.631084]  ? ret_from_fork+0x25/0x30
->[    0.633343] vgaarb: loaded
->[    0.635036] EDAC MC: Ver: 3.0.0
->[    0.638601] PCI: Probing PCI hardware
->[    0.639833] PCI host bridge to bus 0000:00
->[    0.641031] pci_bus 0000:00: root bus resource [io  0x0000-0xffff]
-> ... Continue to boot and log is omitted ...
-
-I analyzed this memory leak in detail and found acpi_ds_obj_stack_pop_and_
-delete() function miscalculated the top of the stack. acpi_ds_obj_stack_push()
-function uses walk_state->operand_index for start position of the top, but
-acpi_ds_obj_stack_pop_and_delete() function considers index 0 for it.
-Therefore, this causes acpi operand memory leak.
-
-This cache leak causes a security threat because an old kernel (<= 4.9) shows
-memory locations of kernel functions in stack dump. Some malicious users
-could use this information to neutralize kernel ASLR.
-
-I made a patch to fix ACPI operand cache leak.
-
-Signed-off-by: Seunghun Han <kkamagui@gmail.com>
-
-Github-Location: https://github.com/acpica/acpica/pull/295/commits/987a3b5cf7175916e2a4b6ea5b8e70f830dfe732
----
- source/components/dispatcher/dsutils.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-Index: acpica-unix2-20240321/source/components/dispatcher/dsutils.c
-===================================================================
---- acpica-unix2-20240321.orig/source/components/dispatcher/dsutils.c
-+++ acpica-unix2-20240321/source/components/dispatcher/dsutils.c
-@@ -759,6 +759,8 @@ AcpiDsCreateOperands (
-     ACPI_PARSE_OBJECT       *Arguments[ACPI_OBJ_NUM_OPERANDS];
-     UINT32                  ArgCount = 0;
-     UINT32                  Index = WalkState->NumOperands;
-+    UINT32                  PrevNumOperands = WalkState->NumOperands;
-+    UINT32                  NewNumOperands;
-     UINT32                  i;
- 
- 
-@@ -791,6 +793,7 @@ AcpiDsCreateOperands (
- 
-     /* Create the interpreter arguments, in reverse order */
- 
-+    NewNumOperands = Index;
-     Index--;
-     for (i = 0; i < ArgCount; i++)
-     {
-@@ -818,7 +821,11 @@ Cleanup:
-      * pop everything off of the operand stack and delete those
-      * objects
-      */
--    AcpiDsObjStackPopAndDelete (ArgCount, WalkState);
-+    WalkState->NumOperands = i;
-+    AcpiDsObjStackPopAndDelete (NewNumOperands, WalkState);
-+
-+    /* Restore operand count */
-+    WalkState->NumOperands = PrevNumOperands;
- 
-     ACPI_EXCEPTION ((AE_INFO, Status, "While creating Arg %u", Index));
-     return_ACPI_STATUS (Status);
diff --git a/cve-2017-13694.patch b/cve-2017-13694.patch
deleted file mode 100644
index 8ae2da4..0000000
--- a/cve-2017-13694.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-From 4a0243ecb4c94e2d73510d096c5ea4d0711fc6c0 Mon Sep 17 00:00:00 2001
-From: Seunghun Han <kkamagui@gmail.com>
-Date: Fri, 23 Jun 2017 14:19:48 +0900
-Subject: [PATCH] acpi: acpica: fix acpi parse and parseext cache leaks
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-I'm Seunghun Han, and I work for National Security Research Institute of
-South Korea.
-
-I have been doing a research on ACPI and found an ACPI cache leak in ACPI
-early abort cases.
-
-Boot log of ACPI cache leak is as follows:
-[    0.352414] ACPI: Added _OSI(Module Device)
-[    0.353182] ACPI: Added _OSI(Processor Device)
-[    0.353182] ACPI: Added _OSI(3.0 _SCP Extensions)
-[    0.353182] ACPI: Added _OSI(Processor Aggregator Device)
-[    0.356028] ACPI: Unable to start the ACPI Interpreter
-[    0.356799] ACPI Error: Could not remove SCI handler (20170303/evmisc-281)
-[    0.360215] kmem_cache_destroy Acpi-State: Slab cache still has objects
-[    0.360648] CPU: 0 PID: 1 Comm: swapper/0 Tainted: G        W
-4.12.0-rc4-next-20170608+ #10
-[    0.361273] Hardware name: innotek GmbH VirtualBox/VirtualBox, BIOS
-VirtualBox 12/01/2006
-[    0.361873] Call Trace:
-[    0.362243]  ? dump_stack+0x5c/0x81
-[    0.362591]  ? kmem_cache_destroy+0x1aa/0x1c0
-[    0.362944]  ? acpi_sleep_proc_init+0x27/0x27
-[    0.363296]  ? acpi_os_delete_cache+0xa/0x10
-[    0.363646]  ? acpi_ut_delete_caches+0x6d/0x7b
-[    0.364000]  ? acpi_terminate+0xa/0x14
-[    0.364000]  ? acpi_init+0x2af/0x34f
-[    0.364000]  ? __class_create+0x4c/0x80
-[    0.364000]  ? video_setup+0x7f/0x7f
-[    0.364000]  ? acpi_sleep_proc_init+0x27/0x27
-[    0.364000]  ? do_one_initcall+0x4e/0x1a0
-[    0.364000]  ? kernel_init_freeable+0x189/0x20a
-[    0.364000]  ? rest_init+0xc0/0xc0
-[    0.364000]  ? kernel_init+0xa/0x100
-[    0.364000]  ? ret_from_fork+0x25/0x30
-
-I analyzed this memory leak in detail. I found that “Acpi-State” cache and
-“Acpi-Parse” cache were merged because the size of cache objects was same
-slab cache size.
-
-I finally found “Acpi-Parse” cache and “Acpi-ParseExt” cache were leaked
-using SLAB_NEVER_MERGE flag in kmem_cache_create() function.
-
-Real ACPI cache leak point is as follows:
-[    0.360101] ACPI: Added _OSI(Module Device)
-[    0.360101] ACPI: Added _OSI(Processor Device)
-[    0.360101] ACPI: Added _OSI(3.0 _SCP Extensions)
-[    0.361043] ACPI: Added _OSI(Processor Aggregator Device)
-[    0.364016] ACPI: Unable to start the ACPI Interpreter
-[    0.365061] ACPI Error: Could not remove SCI handler (20170303/evmisc-281)
-[    0.368174] kmem_cache_destroy Acpi-Parse: Slab cache still has objects
-[    0.369332] CPU: 1 PID: 1 Comm: swapper/0 Tainted: G        W
-4.12.0-rc4-next-20170608+ #8
-[    0.371256] Hardware name: innotek GmbH VirtualBox/VirtualBox, BIOS
-VirtualBox 12/01/2006
-[    0.372000] Call Trace:
-[    0.372000]  ? dump_stack+0x5c/0x81
-[    0.372000]  ? kmem_cache_destroy+0x1aa/0x1c0
-[    0.372000]  ? acpi_sleep_proc_init+0x27/0x27
-[    0.372000]  ? acpi_os_delete_cache+0xa/0x10
-[    0.372000]  ? acpi_ut_delete_caches+0x56/0x7b
-[    0.372000]  ? acpi_terminate+0xa/0x14
-[    0.372000]  ? acpi_init+0x2af/0x34f
-[    0.372000]  ? __class_create+0x4c/0x80
-[    0.372000]  ? video_setup+0x7f/0x7f
-[    0.372000]  ? acpi_sleep_proc_init+0x27/0x27
-[    0.372000]  ? do_one_initcall+0x4e/0x1a0
-[    0.372000]  ? kernel_init_freeable+0x189/0x20a
-[    0.372000]  ? rest_init+0xc0/0xc0
-[    0.372000]  ? kernel_init+0xa/0x100
-[    0.372000]  ? ret_from_fork+0x25/0x30
-[    0.388039] kmem_cache_destroy Acpi-ParseExt: Slab cache still has objects
-[    0.389063] CPU: 1 PID: 1 Comm: swapper/0 Tainted: G        W
-4.12.0-rc4-next-20170608+ #8
-[    0.390557] Hardware name: innotek GmbH VirtualBox/VirtualBox, BIOS
-VirtualBox 12/01/2006
-[    0.392000] Call Trace:
-[    0.392000]  ? dump_stack+0x5c/0x81
-[    0.392000]  ? kmem_cache_destroy+0x1aa/0x1c0
-[    0.392000]  ? acpi_sleep_proc_init+0x27/0x27
-[    0.392000]  ? acpi_os_delete_cache+0xa/0x10
-[    0.392000]  ? acpi_ut_delete_caches+0x6d/0x7b
-[    0.392000]  ? acpi_terminate+0xa/0x14
-[    0.392000]  ? acpi_init+0x2af/0x34f
-[    0.392000]  ? __class_create+0x4c/0x80
-[    0.392000]  ? video_setup+0x7f/0x7f
-[    0.392000]  ? acpi_sleep_proc_init+0x27/0x27
-[    0.392000]  ? do_one_initcall+0x4e/0x1a0
-[    0.392000]  ? kernel_init_freeable+0x189/0x20a
-[    0.392000]  ? rest_init+0xc0/0xc0
-[    0.392000]  ? kernel_init+0xa/0x100
-[    0.392000]  ? ret_from_fork+0x25/0x30
-
-When early abort is occurred due to invalid ACPI information, Linux kernel
-terminates ACPI by calling acpi_terminate() function. The function calls
-acpi_ut_delete_caches() function to delete local caches (acpi_gbl_namespace_
-cache, state_cache, operand_cache, ps_node_cache, ps_node_ext_cache).
-
-But the deletion codes in acpi_ut_delete_caches() function only delete
-slab caches using kmem_cache_destroy() function, therefore the cache
-objects should be flushed before acpi_ut_delete_caches() function.
-
-“Acpi-Parse” cache and “Acpi-ParseExt” cache are used in an AML parse
-function, acpi_ps_parse_loop(). The function should have flush codes to
-handle an error state due to invalid AML codes.
-
-This cache leak has a security threat because an old kernel (<= 4.9) shows
-memory locations of kernel functions in stack dump. Some malicious users
-could use this information to neutralize kernel ASLR.
-
-To fix ACPI cache leak for enhancing security, I made a patch which has
-flush codes in acpi_ps_parse_loop() function.
-
-I hope that this patch improves the security of Linux kernel.
-
-Thank you.
-
-Signed-off-by: Seunghun Han <kkamagui@gmail.com>
-
-Github-Location: https://github.com/acpica/acpica/pull/278/commits/4a0243ecb4c94e2d73510d096c5ea4d0711fc6c0
-
----
- source/components/parser/psobject.c | 44 ++++++++++++++-----------------------
- 1 file changed, 16 insertions(+), 28 deletions(-)
-
-Index: acpica-unix2-20240321/source/components/parser/psobject.c
-===================================================================
---- acpica-unix2-20240321.orig/source/components/parser/psobject.c
-+++ acpica-unix2-20240321/source/components/parser/psobject.c
-@@ -707,7 +707,8 @@ AcpiPsCompleteFinalOp (
-     ACPI_PARSE_OBJECT       *Op,
-     ACPI_STATUS             Status)
- {
--    ACPI_STATUS             Status2;
-+    ACPI_STATUS             ReturnStatus = AE_OK;
-+    BOOLEAN                 Ascending = TRUE;
- 
- 
-     ACPI_FUNCTION_TRACE_PTR (PsCompleteFinalOp, WalkState);
-@@ -724,7 +725,7 @@ AcpiPsCompleteFinalOp (
-     {
-         if (Op)
-         {
--            if (WalkState->AscendingCallback != NULL)
-+            if (Ascending && WalkState->AscendingCallback != NULL)
-             {
-                 WalkState->Op = Op;
-                 WalkState->OpInfo = AcpiPsGetOpcodeInfo (Op->Common.AmlOpcode);
-@@ -743,41 +744,28 @@ AcpiPsCompleteFinalOp (
- 
-                 if (Status == AE_CTRL_TERMINATE)
-                 {
--                    Status = AE_OK;
--
--                    /* Clean up */
--                    do
--                    {
--                        if (Op)
--                        {
--                            Status2 = AcpiPsCompleteThisOp (WalkState, Op);
--                            if (ACPI_FAILURE (Status2))
--                            {
--                                return_ACPI_STATUS (Status2);
--                            }
--                        }
--
--                        AcpiPsPopScope (&(WalkState->ParserState), &Op,
--                            &WalkState->ArgTypes, &WalkState->ArgCount);
--
--                    } while (Op);
--
--                    return_ACPI_STATUS (Status);
-+                    Ascending = FALSE;
-+                    ReturnStatus = AE_CTRL_TERMINATE;
-                 }
- 
-                 else if (ACPI_FAILURE (Status))
-                 {
-                     /* First error is most important */
- 
--                    (void) AcpiPsCompleteThisOp (WalkState, Op);
--                    return_ACPI_STATUS (Status);
-+                    Ascending = FALSE;
-+                    ReturnStatus = Status;
-                 }
-             }
- 
--            Status2 = AcpiPsCompleteThisOp (WalkState, Op);
--            if (ACPI_FAILURE (Status2))
-+            Status = AcpiPsCompleteThisOp (WalkState, Op);
-+            if (ACPI_FAILURE (Status))
-             {
--                return_ACPI_STATUS (Status2);
-+                Ascending = FALSE;
-+                if (ACPI_SUCCESS (ReturnStatus) ||
-+                    ReturnStatus == AE_CTRL_TERMINATE)
-+                {
-+                    ReturnStatus = Status;
-+                }
-             }
-         }
- 
-@@ -786,5 +774,5 @@ AcpiPsCompleteFinalOp (
- 
-     } while (Op);
- 
--    return_ACPI_STATUS (Status);
-+    return_ACPI_STATUS (ReturnStatus);
- }
diff --git a/fix-version.patch b/fix-version.patch
deleted file mode 100644
index 2ff7407..0000000
--- a/fix-version.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-The two changes that follow were inadvertently dropped by upstream
-when creating the source tarball; the G20240322 tag in github contains
-them.
-
-Signed-off-by: Al Stone <ahs3@fedoraproject.org>
-
-diff -Naur acpica-unix-20240321/changes.txt acpica-unix-20240808/changes.txt
---- acpica-unix-20240321/changes.txt	2024-03-22 00:16:29.000000000 -0600
-+++ acpica-unix-20240808/changes.txt	2024-08-08 10:54:25.000000000 -0600
-@@ -1,4 +1,28 @@
- ----------------------------------------
-+22 March 2024. Summary of changes for version 20240322:
-+
-+Major changes:
-+
-+Update all the license header year from 2023 to 2024.
-+
-+Fix table argument ordering to work properly with iasl.
-+
-+Get rid of the annoying repeated warning types in MSVC and Windows.
-+
-+Fix a test in ASLTS with edge case failure.
-+
-+Fix a couple of issues with how GPEs are counted and enabled.
-+
-+Add new tables for various architectures/OS, mainly RISC-V and also update many more.
-+
-+Add an option to either make the output deterministic or non-deterministic.
-+
-+Remove redundant checks, duplicated code and fix spellings in various files.
-+
-+Fix flex arrays for C++ compilers and also make ACPICA overall more compatible with different compilers which throw warnings related to memory sanitization etc.
-+
-+
-+----------------------------------------
- 28 June 2023. Summary of changes for version 20230628:
- 
- 0) Global changes:
-diff -Naur acpica-unix-20240321/source/include/acpixf.h acpica-unix-20240808/source/include/acpixf.h
---- acpica-unix-20240321/source/include/acpixf.h	2024-03-22 00:16:32.000000000 -0600
-+++ acpica-unix-20240808/source/include/acpixf.h	2024-08-08 10:54:25.000000000 -0600
-@@ -154,7 +154,7 @@
- 
- /* Current ACPICA subsystem version in YYYYMMDD format */
- 
--#define ACPI_CA_VERSION                 0x20230628
-+#define ACPI_CA_VERSION                 0x20240322
- 
- #include "acconfig.h"
- #include "actypes.h"
diff --git a/sources b/sources
index 3f9ece6..1210322 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (acpica-unix2-20240322.tar.gz) = 199a5acb93193f22b9f85690ad87cdf914185fdf52beafaec8c4299c29f4c9d5b618c72a62413b228307f5be3933cf51cdcd91a6728d9caea66408534006e3f8
-SHA512 (acpitests-unix-20240322.tar.gz) = e09b0b953d53e28b9849b1ed41068c5542f0e36eb47f442bba6238727bfd96ad94584c0aa1e8d92c307c317dbd208388d3d9c83c2d17e146571a7373bff40b98
+SHA512 (acpica-unix2-20250807.tar.gz) = 49454c9f489e7ada4077b96caaabee68ffe9ad9cfebc292b19ebbc4098a2812b0da56dfe622b0337e9a47b57b5be8410f93213321cf95ae367b09cc3446afef6
+SHA512 (acpitests-unix-20250807.tar.gz) = bea82d04736bd9378b72e363a496b6d6f24b9300cbbf620b75d0b532a3b7cbb81a46198493f474a813a8248d9f07016f3082fbedbaa5f89f564d0f0240d67180

From 151717902392511e43423a38fdf19fe3a6d86dab Mon Sep 17 00:00:00 2001
From: Gwyn Ciesla <gwync@protonmail.com>
Date: Mon, 15 Dec 2025 11:23:45 -0600
Subject: [PATCH 81/82] 20251212

---
 .gitignore        | 2 ++
 acpica-tools.spec | 5 ++++-
 sources           | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 90ca08c..2ec9223 100644
--- a/.gitignore
+++ b/.gitignore
@@ -164,3 +164,5 @@ series
 /acpitests-unix-20240322.tar.gz
 /acpica-unix2-20250807.tar.gz
 /acpitests-unix-20250807.tar.gz
+/acpica-unix2-20251212.tar.gz
+/acpitests-unix-20251212.tar.gz
diff --git a/acpica-tools.spec b/acpica-tools.spec
index 703da7b..5c33469 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -1,5 +1,5 @@
 Name:           acpica-tools
-Version:        20250807
+Version:        20251212
 Release:        1%{?dist}
 Summary:        ACPICA tools for the development and debug of ACPI tables
 
@@ -201,6 +201,9 @@ fi
 
 
 %changelog
+* Mon Dec 15 2025 Gwyn Ciesla <gwync@protonmail.com> - 20251212-1
+- 20251212
+
 * Fri Aug 15 2025 Gwyn Ciesla <gwync@protonmail.com> - 20250807-1
 - 20250807
 
diff --git a/sources b/sources
index 1210322..7efce2c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (acpica-unix2-20250807.tar.gz) = 49454c9f489e7ada4077b96caaabee68ffe9ad9cfebc292b19ebbc4098a2812b0da56dfe622b0337e9a47b57b5be8410f93213321cf95ae367b09cc3446afef6
-SHA512 (acpitests-unix-20250807.tar.gz) = bea82d04736bd9378b72e363a496b6d6f24b9300cbbf620b75d0b532a3b7cbb81a46198493f474a813a8248d9f07016f3082fbedbaa5f89f564d0f0240d67180
+SHA512 (acpica-unix2-20251212.tar.gz) = ecae5ab55d04bc1fd7def717c8c2a2dd64e8708577b900dc54e0fd613c5e3e6ee25037e37abe3aa818debd75114347c272d9931f55d340ff096d2f5f6f1d185b
+SHA512 (acpitests-unix-20251212.tar.gz) = f8541f1abfd426834b8c7f17dc0eca8525de9a2e8f3a2b77311503845f26f478e66b8e3ce18e09aae5411683f57c68cbaa8c1baec6e6f567a0f768a6b4cc5715

From 2034bc6bc0e26ef97347b0e74909f74265b9811e Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 16 Jan 2026 03:25:26 +0000
Subject: [PATCH 82/82] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild

---
 acpica-tools.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/acpica-tools.spec b/acpica-tools.spec
index 5c33469..aceb014 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -1,6 +1,6 @@
 Name:           acpica-tools
 Version:        20251212
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        ACPICA tools for the development and debug of ACPI tables
 
 # Automatically converted from old format: GPLv2 - review is highly recommended.
@@ -201,6 +201,9 @@ fi
 
 
 %changelog
+* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 20251212-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
 * Mon Dec 15 2025 Gwyn Ciesla <gwync@protonmail.com> - 20251212-1
 - 20251212