|
 |
edb6c78 |
From 4e76aa1a5556f250f51a3802734fd6cb77718299 Mon Sep 17 00:00:00 2001
|
|
|
edb6c78 |
From: Al Stone <ahs3@redhat.com>
|
|
|
edb6c78 |
Date: Wed, 23 Sep 2020 12:49:52 -0600
|
|
|
edb6c78 |
Subject: [PATCH 20/40] Support SLIT in a big-endian world
|
|
|
edb6c78 |
|
|
|
edb6c78 |
Signed-off-by: Al Stone <ahs3@redhat.com>
|
|
|
edb6c78 |
---
|
|
|
edb6c78 |
source/common/dmtbdump3.c | 8 +++++---
|
|
|
edb6c78 |
source/compiler/dttable2.c | 2 +-
|
|
|
edb6c78 |
2 files changed, 6 insertions(+), 4 deletions(-)
|
|
|
edb6c78 |
|
|
|
edb6c78 |
Index: acpica-unix2-20200925/source/common/dmtbdump3.c
|
|
|
edb6c78 |
===================================================================
|
|
|
edb6c78 |
--- acpica-unix2-20200925.orig/source/common/dmtbdump3.c
|
|
|
edb6c78 |
+++ acpica-unix2-20200925/source/common/dmtbdump3.c
|
|
|
edb6c78 |
@@ -96,11 +96,12 @@ AcpiDmDumpSlit (
|
|
|
edb6c78 |
UINT32 Localities;
|
|
|
edb6c78 |
UINT32 i;
|
|
|
edb6c78 |
UINT32 j;
|
|
|
edb6c78 |
+ UINT32 TableLength = AcpiUtReadUint32(&Table->Length);
|
|
|
edb6c78 |
|
|
|
edb6c78 |
|
|
|
edb6c78 |
/* Main table */
|
|
|
edb6c78 |
|
|
|
edb6c78 |
- Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoSlit);
|
|
|
edb6c78 |
+ Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoSlit);
|
|
|
edb6c78 |
if (ACPI_FAILURE (Status))
|
|
|
edb6c78 |
{
|
|
|
edb6c78 |
return;
|
|
|
edb6c78 |
@@ -108,7 +109,8 @@ AcpiDmDumpSlit (
|
|
|
edb6c78 |
|
|
|
edb6c78 |
/* Display the Locality NxN Matrix */
|
|
|
edb6c78 |
|
|
|
edb6c78 |
- Localities = (UINT32) ACPI_CAST_PTR (ACPI_TABLE_SLIT, Table)->LocalityCount;
|
|
|
edb6c78 |
+ Localities = (UINT32)
|
|
|
edb6c78 |
+ AcpiUtReadUint64(&ACPI_CAST_PTR (ACPI_TABLE_SLIT, Table)->LocalityCount);
|
|
|
edb6c78 |
Offset = ACPI_OFFSET (ACPI_TABLE_SLIT, Entry[0]);
|
|
|
edb6c78 |
Row = (UINT8 *) ACPI_CAST_PTR (ACPI_TABLE_SLIT, Table)->Entry;
|
|
|
edb6c78 |
|
|
|
edb6c78 |
@@ -121,7 +123,7 @@ AcpiDmDumpSlit (
|
|
|
edb6c78 |
{
|
|
|
edb6c78 |
/* Check for beyond EOT */
|
|
|
edb6c78 |
|
|
|
edb6c78 |
- if (Offset >= Table->Length)
|
|
|
edb6c78 |
+ if (Offset >= TableLength)
|
|
|
edb6c78 |
{
|
|
|
edb6c78 |
AcpiOsPrintf (
|
|
|
edb6c78 |
"\n**** Not enough room in table for all localities\n");
|
|
|
edb6c78 |
Index: acpica-unix2-20200925/source/compiler/dttable2.c
|
|
|
edb6c78 |
===================================================================
|
|
|
edb6c78 |
--- acpica-unix2-20200925.orig/source/compiler/dttable2.c
|
|
|
edb6c78 |
+++ acpica-unix2-20200925/source/compiler/dttable2.c
|
|
|
edb6c78 |
@@ -1529,7 +1529,7 @@ DtCompileSlit (
|
|
|
edb6c78 |
ParentTable = DtPeekSubtable ();
|
|
|
edb6c78 |
DtInsertSubtable (ParentTable, Subtable);
|
|
|
edb6c78 |
|
|
|
edb6c78 |
- Localities = *ACPI_CAST_PTR (UINT32, Subtable->Buffer);
|
|
|
edb6c78 |
+ Localities = (UINT32) AcpiUtReadUint64(Subtable->Buffer);
|
|
|
edb6c78 |
LocalityBuffer = UtLocalCalloc (Localities);
|
|
|
edb6c78 |
LocalityListLength = 0;
|
|
|
edb6c78 |
|