|
 |
edb6c78 |
From 9583e760908d4b7d2dabec82137d16f2492d2773 Mon Sep 17 00:00:00 2001
|
|
|
edb6c78 |
From: Al Stone <ahs3@redhat.com>
|
|
|
edb6c78 |
Date: Sat, 19 Sep 2020 15:44:06 -0600
|
|
|
edb6c78 |
Subject: [PATCH 10/40] Support DRTM in a big-endian world
|
|
|
edb6c78 |
|
|
|
edb6c78 |
Signed-off-by: Al Stone <ahs3@redhat.com>
|
|
|
edb6c78 |
---
|
|
|
edb6c78 |
source/common/dmtbdump1.c | 25 +++++++++++++++----------
|
|
|
edb6c78 |
source/compiler/dttable1.c | 6 ++++--
|
|
|
edb6c78 |
2 files changed, 19 insertions(+), 12 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 |
@@ -692,11 +692,14 @@ AcpiDmDumpDrtm (
|
|
|
edb6c78 |
ACPI_DRTM_RESOURCE_LIST *DrtmRl;
|
|
|
edb6c78 |
ACPI_DRTM_DPS_ID *DrtmDps;
|
|
|
edb6c78 |
UINT32 Count;
|
|
|
edb6c78 |
+ UINT32 ResourceCount;
|
|
|
edb6c78 |
+ UINT32 ValidatedTableCount;
|
|
|
edb6c78 |
+ UINT32 TableLength = AcpiUtReadUint32(&Table->Length);
|
|
|
edb6c78 |
|
|
|
edb6c78 |
|
|
|
edb6c78 |
/* Main table */
|
|
|
edb6c78 |
|
|
|
edb6c78 |
- Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
|
|
|
edb6c78 |
+ Status = AcpiDmDumpTable (TableLength, 0, Table, 0,
|
|
|
edb6c78 |
AcpiDmTableInfoDrtm);
|
|
|
edb6c78 |
if (ACPI_FAILURE (Status))
|
|
|
edb6c78 |
{
|
|
|
edb6c78 |
@@ -711,7 +714,7 @@ AcpiDmDumpDrtm (
|
|
|
edb6c78 |
|
|
|
edb6c78 |
DrtmVtl = ACPI_ADD_PTR (ACPI_DRTM_VTABLE_LIST, Table, Offset);
|
|
|
edb6c78 |
AcpiOsPrintf ("\n");
|
|
|
edb6c78 |
- Status = AcpiDmDumpTable (Table->Length, Offset,
|
|
|
edb6c78 |
+ Status = AcpiDmDumpTable (TableLength, Offset,
|
|
|
edb6c78 |
DrtmVtl, ACPI_OFFSET (ACPI_DRTM_VTABLE_LIST, ValidatedTables),
|
|
|
edb6c78 |
AcpiDmTableInfoDrtm0);
|
|
|
edb6c78 |
if (ACPI_FAILURE (Status))
|
|
|
edb6c78 |
@@ -724,10 +727,11 @@ AcpiDmDumpDrtm (
|
|
|
edb6c78 |
/* Dump Validated table addresses */
|
|
|
edb6c78 |
|
|
|
edb6c78 |
Count = 0;
|
|
|
edb6c78 |
- while ((Offset < Table->Length) &&
|
|
|
edb6c78 |
- (DrtmVtl->ValidatedTableCount > Count))
|
|
|
edb6c78 |
+ ValidatedTableCount = AcpiUtReadUint32(&DrtmVtl->ValidatedTableCount);
|
|
|
edb6c78 |
+ while ((Offset < TableLength) &&
|
|
|
edb6c78 |
+ (ValidatedTableCount > Count))
|
|
|
edb6c78 |
{
|
|
|
edb6c78 |
- Status = AcpiDmDumpTable (Table->Length, Offset,
|
|
|
edb6c78 |
+ Status = AcpiDmDumpTable (TableLength, Offset,
|
|
|
edb6c78 |
ACPI_ADD_PTR (void, Table, Offset), sizeof (UINT64),
|
|
|
edb6c78 |
AcpiDmTableInfoDrtm0a);
|
|
|
edb6c78 |
if (ACPI_FAILURE (Status))
|
|
|
edb6c78 |
@@ -743,7 +747,7 @@ AcpiDmDumpDrtm (
|
|
|
edb6c78 |
|
|
|
edb6c78 |
DrtmRl = ACPI_ADD_PTR (ACPI_DRTM_RESOURCE_LIST, Table, Offset);
|
|
|
edb6c78 |
AcpiOsPrintf ("\n");
|
|
|
edb6c78 |
- Status = AcpiDmDumpTable (Table->Length, Offset,
|
|
|
edb6c78 |
+ Status = AcpiDmDumpTable (TableLength, Offset,
|
|
|
edb6c78 |
DrtmRl, ACPI_OFFSET (ACPI_DRTM_RESOURCE_LIST, Resources),
|
|
|
edb6c78 |
AcpiDmTableInfoDrtm1);
|
|
|
edb6c78 |
if (ACPI_FAILURE (Status))
|
|
|
edb6c78 |
@@ -756,10 +760,11 @@ AcpiDmDumpDrtm (
|
|
|
edb6c78 |
/* Dump the Resource List */
|
|
|
edb6c78 |
|
|
|
edb6c78 |
Count = 0;
|
|
|
edb6c78 |
- while ((Offset < Table->Length) &&
|
|
|
edb6c78 |
- (DrtmRl->ResourceCount > Count))
|
|
|
edb6c78 |
+ ResourceCount = AcpiUtReadUint32(&DrtmRl->ResourceCount);
|
|
|
edb6c78 |
+ while ((Offset < TableLength) &&
|
|
|
edb6c78 |
+ (ResourceCount > Count))
|
|
|
edb6c78 |
{
|
|
|
edb6c78 |
- Status = AcpiDmDumpTable (Table->Length, Offset,
|
|
|
edb6c78 |
+ Status = AcpiDmDumpTable (TableLength, Offset,
|
|
|
edb6c78 |
ACPI_ADD_PTR (void, Table, Offset),
|
|
|
edb6c78 |
sizeof (ACPI_DRTM_RESOURCE), AcpiDmTableInfoDrtm1a);
|
|
|
edb6c78 |
if (ACPI_FAILURE (Status))
|
|
|
edb6c78 |
@@ -775,7 +780,7 @@ AcpiDmDumpDrtm (
|
|
|
edb6c78 |
|
|
|
edb6c78 |
DrtmDps = ACPI_ADD_PTR (ACPI_DRTM_DPS_ID, Table, Offset);
|
|
|
edb6c78 |
AcpiOsPrintf ("\n");
|
|
|
edb6c78 |
- (void) AcpiDmDumpTable (Table->Length, Offset,
|
|
|
edb6c78 |
+ (void) AcpiDmDumpTable (TableLength, Offset,
|
|
|
edb6c78 |
DrtmDps, sizeof (ACPI_DRTM_DPS_ID), AcpiDmTableInfoDrtm2);
|
|
|
edb6c78 |
}
|
|
|
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 |
@@ -775,7 +775,8 @@ DtCompileDrtm (
|
|
|
edb6c78 |
Count++;
|
|
|
edb6c78 |
}
|
|
|
edb6c78 |
|
|
|
edb6c78 |
- DrtmVtl->ValidatedTableCount = Count;
|
|
|
edb6c78 |
+ AcpiUtWriteUint(&DrtmVtl->ValidatedTableCount, sizeof(UINT32),
|
|
|
edb6c78 |
+ &Count, sizeof(UINT32));
|
|
|
edb6c78 |
DtPopSubtable ();
|
|
|
edb6c78 |
ParentTable = DtPeekSubtable ();
|
|
|
edb6c78 |
|
|
|
edb6c78 |
@@ -813,7 +814,8 @@ DtCompileDrtm (
|
|
|
edb6c78 |
Count++;
|
|
|
edb6c78 |
}
|
|
|
edb6c78 |
|
|
|
edb6c78 |
- DrtmRl->ResourceCount = Count;
|
|
|
edb6c78 |
+ AcpiUtWriteUint(&DrtmRl->ResourceCount, sizeof(UINT32),
|
|
|
edb6c78 |
+ &Count, sizeof(UINT32));
|
|
|
edb6c78 |
DtPopSubtable ();
|
|
|
edb6c78 |
ParentTable = DtPeekSubtable ();
|
|
|
edb6c78 |
|