416465f
From bd19995fa268ed3e93c071162d0e9c2d35ada0d4 Mon Sep 17 00:00:00 2001
416465f
From: Al Stone <ahs3@redhat.com>
416465f
Date: Tue, 29 Jun 2021 16:23:30 -0600
416465f
Subject: [PATCH 38/45] Support PMTT in a big-endian world
416465f
416465f
Signed-off-by: Al Stone <ahs3@redhat.com>
416465f
---
416465f
 source/common/dmtbdump2.c | 18 ++++++++++--------
416465f
 1 file changed, 10 insertions(+), 8 deletions(-)
416465f
fc3eef6
Index: acpica-unix2-20220331/source/common/dmtbdump2.c
416465f
===================================================================
fc3eef6
--- acpica-unix2-20220331.orig/source/common/dmtbdump2.c
fc3eef6
+++ acpica-unix2-20220331/source/common/dmtbdump2.c
fc3eef6
@@ -2142,8 +2142,9 @@ AcpiDmDumpPmtt (
416465f
 {
416465f
     ACPI_STATUS             Status;
416465f
     ACPI_PMTT_HEADER        *Subtable;
416465f
-    UINT32                  Length = Table->Length;
416465f
+    UINT32                  Length = AcpiUtReadUint32 (&Table->Length);
416465f
     UINT32                  Offset = sizeof (ACPI_TABLE_PMTT);
416465f
+    UINT16                  SubtableLength;
416465f
 
416465f
 
416465f
     /* Main table */
fc3eef6
@@ -2157,17 +2158,18 @@ AcpiDmDumpPmtt (
416465f
     /* Subtables */
416465f
 
416465f
     Subtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, Table, Offset);
416465f
-    while (Offset < Table->Length)
416465f
+    while (Offset < Length)
416465f
     {
416465f
         /* Each of the types below contain the common subtable header */
416465f
 
416465f
         AcpiOsPrintf ("\n");
416465f
+	SubtableLength = AcpiUtReadUint16 (&Subtable->Length);
416465f
         switch (Subtable->Type)
416465f
         {
416465f
         case ACPI_PMTT_TYPE_SOCKET:
416465f
 
416465f
             Status = AcpiDmDumpTable (Length, Offset, Subtable,
416465f
-                Subtable->Length, AcpiDmTableInfoPmtt0);
416465f
+                SubtableLength, AcpiDmTableInfoPmtt0);
416465f
             if (ACPI_FAILURE (Status))
416465f
             {
416465f
                 return;
fc3eef6
@@ -2176,7 +2178,7 @@ AcpiDmDumpPmtt (
416465f
 
416465f
         case ACPI_PMTT_TYPE_CONTROLLER:
416465f
             Status = AcpiDmDumpTable (Length, Offset, Subtable,
416465f
-                Subtable->Length, AcpiDmTableInfoPmtt1);
416465f
+                SubtableLength, AcpiDmTableInfoPmtt1);
416465f
             if (ACPI_FAILURE (Status))
416465f
             {
416465f
                 return;
fc3eef6
@@ -2185,7 +2187,7 @@ AcpiDmDumpPmtt (
416465f
 
416465f
        case ACPI_PMTT_TYPE_DIMM:
416465f
             Status = AcpiDmDumpTable (Length, Offset, Subtable,
416465f
-                Subtable->Length, AcpiDmTableInfoPmtt2);
416465f
+                SubtableLength, AcpiDmTableInfoPmtt2);
416465f
             if (ACPI_FAILURE (Status))
416465f
             {
416465f
                 return;
fc3eef6
@@ -2194,7 +2196,7 @@ AcpiDmDumpPmtt (
416465f
 
416465f
         case ACPI_PMTT_TYPE_VENDOR:
416465f
             Status = AcpiDmDumpTable (Length, Offset, Subtable,
416465f
-                Subtable->Length, AcpiDmTableInfoPmttVendor);
416465f
+                SubtableLength, AcpiDmTableInfoPmttVendor);
416465f
             if (ACPI_FAILURE (Status))
416465f
             {
416465f
                 return;
fc3eef6
@@ -2210,9 +2212,9 @@ AcpiDmDumpPmtt (
416465f
 
416465f
         /* Point to next subtable */
416465f
 
416465f
-        Offset += Subtable->Length;
416465f
+        Offset += SubtableLength;
416465f
         Subtable = ACPI_ADD_PTR (ACPI_PMTT_HEADER,
416465f
-            Subtable, Subtable->Length);
416465f
+            Subtable, SubtableLength);
416465f
     }
416465f
 }
416465f