|
|
edb6c78 |
From faba93b1dd7ce4aa8983880e917d108496cd173f Mon Sep 17 00:00:00 2001
|
|
|
edb6c78 |
From: Al Stone <ahs3@redhat.com>
|
|
|
edb6c78 |
Date: Tue, 22 Sep 2020 18:12:01 -0600
|
|
|
edb6c78 |
Subject: [PATCH 15/40] Support GTDT in a big-endian world
|
|
|
edb6c78 |
|
|
|
edb6c78 |
Signed-off-by: Al Stone <ahs3@redhat.com>
|
|
|
edb6c78 |
---
|
|
|
edb6c78 |
source/common/dmtbdump1.c | 13 +++++++++----
|
|
|
edb6c78 |
source/compiler/dttable1.c | 9 +++++++--
|
|
|
edb6c78 |
2 files changed, 16 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 |
@@ -997,7 +997,7 @@ AcpiDmDumpGtdt (
|
|
|
edb6c78 |
{
|
|
|
edb6c78 |
ACPI_STATUS Status;
|
|
|
edb6c78 |
ACPI_GTDT_HEADER *Subtable;
|
|
|
edb6c78 |
- UINT32 Length = Table->Length;
|
|
|
edb6c78 |
+ UINT32 Length = AcpiUtReadUint32(&Table->Length);
|
|
|
edb6c78 |
UINT32 Offset = sizeof (ACPI_TABLE_GTDT);
|
|
|
edb6c78 |
ACPI_DMTABLE_INFO *InfoTable;
|
|
|
edb6c78 |
UINT32 SubtableLength;
|
|
|
edb6c78 |
@@ -1033,7 +1033,7 @@ AcpiDmDumpGtdt (
|
|
|
edb6c78 |
|
|
|
edb6c78 |
/* Subtables */
|
|
|
edb6c78 |
|
|
|
edb6c78 |
- while (Offset < Table->Length)
|
|
|
edb6c78 |
+ while (Offset < Length)
|
|
|
edb6c78 |
{
|
|
|
edb6c78 |
/* Common subtable header */
|
|
|
edb6c78 |
|
|
|
edb6c78 |
@@ -1051,8 +1051,13 @@ AcpiDmDumpGtdt (
|
|
|
edb6c78 |
case ACPI_GTDT_TYPE_TIMER_BLOCK:
|
|
|
edb6c78 |
|
|
|
edb6c78 |
SubtableLength = sizeof (ACPI_GTDT_TIMER_BLOCK);
|
|
|
edb6c78 |
- GtCount = (ACPI_CAST_PTR (ACPI_GTDT_TIMER_BLOCK,
|
|
|
edb6c78 |
- Subtable))->TimerCount;
|
|
|
edb6c78 |
+ {
|
|
|
edb6c78 |
+ UINT32 Tmp32;
|
|
|
edb6c78 |
+
|
|
|
edb6c78 |
+ Tmp32 = (ACPI_CAST_PTR (ACPI_GTDT_TIMER_BLOCK,
|
|
|
edb6c78 |
+ Subtable))->TimerCount;
|
|
|
edb6c78 |
+ GtCount = AcpiUtReadUint32(&Tmp32);
|
|
|
edb6c78 |
+ }
|
|
|
edb6c78 |
|
|
|
edb6c78 |
InfoTable = AcpiDmTableInfoGtdt0;
|
|
|
edb6c78 |
break;
|
|
|
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 |
@@ -997,8 +997,13 @@ DtCompileGtdt (
|
|
|
edb6c78 |
DtPushSubtable (Subtable);
|
|
|
edb6c78 |
ParentTable = DtPeekSubtable ();
|
|
|
edb6c78 |
|
|
|
edb6c78 |
- GtCount = (ACPI_CAST_PTR (ACPI_GTDT_TIMER_BLOCK,
|
|
|
edb6c78 |
- Subtable->Buffer - sizeof(ACPI_GTDT_HEADER)))->TimerCount;
|
|
|
edb6c78 |
+ {
|
|
|
edb6c78 |
+ UINT32 Tmp32;
|
|
|
edb6c78 |
+
|
|
|
edb6c78 |
+ Tmp32 = (ACPI_CAST_PTR (ACPI_GTDT_TIMER_BLOCK,
|
|
|
edb6c78 |
+ Subtable->Buffer - sizeof(ACPI_GTDT_HEADER)))->TimerCount;
|
|
|
edb6c78 |
+ GtCount = AcpiUtReadUint32(&Tmp32);
|
|
|
edb6c78 |
+ }
|
|
|
edb6c78 |
|
|
|
edb6c78 |
while (GtCount)
|
|
|
edb6c78 |
{
|