|
 |
edb6c78 |
From f0cba59f1ce62095cb0a0cecdf8d661b77bf2baf Mon Sep 17 00:00:00 2001
|
|
|
edb6c78 |
From: Al Stone <ahs3@redhat.com>
|
|
|
edb6c78 |
Date: Tue, 22 Sep 2020 17:51:45 -0600
|
|
|
edb6c78 |
Subject: [PATCH 14/40] Support most FPDTs in a big-endian world
|
|
|
edb6c78 |
|
|
|
edb6c78 |
NB: there is no support for vendor specific records even in
|
|
|
edb6c78 |
the little-endian version.
|
|
|
edb6c78 |
|
|
|
edb6c78 |
Signed-off-by: Al Stone <ahs3@redhat.com>
|
|
|
edb6c78 |
---
|
|
|
edb6c78 |
source/common/dmtbdump1.c | 12 +++++++-----
|
|
|
edb6c78 |
source/compiler/dttable1.c | 4 +++-
|
|
|
edb6c78 |
2 files changed, 10 insertions(+), 6 deletions(-)
|
|
|
edb6c78 |
|
|
|
edb6c78 |
Index: acpica-unix2-20200925/source/common/dmtbdump1.c
|
|
|
edb6c78 |
===================================================================
|
|
|
edb6c78 |
--- acpica-unix2-20200925.orig/source/common/dmtbdump1.c
|
|
|
edb6c78 |
+++ acpica-unix2-20200925/source/common/dmtbdump1.c
|
|
|
edb6c78 |
@@ -910,9 +910,10 @@ AcpiDmDumpFpdt (
|
|
|
edb6c78 |
{
|
|
|
edb6c78 |
ACPI_STATUS Status;
|
|
|
edb6c78 |
ACPI_FPDT_HEADER *Subtable;
|
|
|
edb6c78 |
- UINT32 Length = Table->Length;
|
|
|
edb6c78 |
+ UINT32 TableLength = AcpiUtReadUint32(&Table->Length);
|
|
|
edb6c78 |
UINT32 Offset = sizeof (ACPI_TABLE_FPDT);
|
|
|
edb6c78 |
ACPI_DMTABLE_INFO *InfoTable;
|
|
|
edb6c78 |
+ UINT16 SubtableType;
|
|
|
edb6c78 |
|
|
|
edb6c78 |
|
|
|
edb6c78 |
/* There is no main table (other than the standard ACPI header) */
|
|
|
edb6c78 |
@@ -920,19 +921,20 @@ AcpiDmDumpFpdt (
|
|
|
edb6c78 |
/* Subtables */
|
|
|
edb6c78 |
|
|
|
edb6c78 |
Subtable = ACPI_ADD_PTR (ACPI_FPDT_HEADER, Table, Offset);
|
|
|
edb6c78 |
- while (Offset < Table->Length)
|
|
|
edb6c78 |
+ while (Offset < TableLength)
|
|
|
edb6c78 |
{
|
|
|
edb6c78 |
/* Common subtable header */
|
|
|
edb6c78 |
|
|
|
edb6c78 |
AcpiOsPrintf ("\n");
|
|
|
edb6c78 |
- Status = AcpiDmDumpTable (Length, Offset, Subtable,
|
|
|
edb6c78 |
+ Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
|
|
|
edb6c78 |
Subtable->Length, AcpiDmTableInfoFpdtHdr);
|
|
|
edb6c78 |
if (ACPI_FAILURE (Status))
|
|
|
edb6c78 |
{
|
|
|
edb6c78 |
return;
|
|
|
edb6c78 |
}
|
|
|
edb6c78 |
|
|
|
edb6c78 |
- switch (Subtable->Type)
|
|
|
edb6c78 |
+ SubtableType = AcpiUtReadUint16(&Subtable->Type);
|
|
|
edb6c78 |
+ switch (SubtableType)
|
|
|
edb6c78 |
{
|
|
|
edb6c78 |
case ACPI_FPDT_TYPE_BOOT:
|
|
|
edb6c78 |
|
|
|
edb6c78 |
@@ -959,7 +961,7 @@ AcpiDmDumpFpdt (
|
|
|
edb6c78 |
goto NextSubtable;
|
|
|
edb6c78 |
}
|
|
|
edb6c78 |
|
|
|
edb6c78 |
- Status = AcpiDmDumpTable (Length, Offset, Subtable,
|
|
|
edb6c78 |
+ Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
|
|
|
edb6c78 |
Subtable->Length, InfoTable);
|
|
|
edb6c78 |
if (ACPI_FAILURE (Status))
|
|
|
edb6c78 |
{
|
|
|
edb6c78 |
Index: acpica-unix2-20200925/source/compiler/dttable1.c
|
|
|
edb6c78 |
===================================================================
|
|
|
edb6c78 |
--- acpica-unix2-20200925.orig/source/compiler/dttable1.c
|
|
|
edb6c78 |
+++ acpica-unix2-20200925/source/compiler/dttable1.c
|
|
|
edb6c78 |
@@ -1051,6 +1051,7 @@ DtCompileFpdt (
|
|
|
edb6c78 |
ACPI_DMTABLE_INFO *InfoTable;
|
|
|
edb6c78 |
DT_FIELD **PFieldList = (DT_FIELD **) List;
|
|
|
edb6c78 |
DT_FIELD *SubtableStart;
|
|
|
edb6c78 |
+ UINT16 SubtableType;
|
|
|
edb6c78 |
|
|
|
edb6c78 |
|
|
|
edb6c78 |
while (*PFieldList)
|
|
|
edb6c78 |
@@ -1069,7 +1070,8 @@ DtCompileFpdt (
|
|
|
edb6c78 |
|
|
|
edb6c78 |
FpdtHeader = ACPI_CAST_PTR (ACPI_FPDT_HEADER, Subtable->Buffer);
|
|
|
edb6c78 |
|
|
|
edb6c78 |
- switch (FpdtHeader->Type)
|
|
|
edb6c78 |
+ SubtableType = AcpiUtReadUint16(&FpdtHeader->Type);
|
|
|
edb6c78 |
+ switch (SubtableType)
|
|
|
edb6c78 |
{
|
|
|
edb6c78 |
case ACPI_FPDT_TYPE_BOOT:
|
|
|
edb6c78 |
|