|
 |
edb6c78 |
From 1e1129d788087025cf31b0c3babdb9bca01f1c4e Mon Sep 17 00:00:00 2001
|
|
|
edb6c78 |
From: Al Stone <ahs3@redhat.com>
|
|
|
edb6c78 |
Date: Wed, 30 Sep 2020 18:42:38 -0600
|
|
|
edb6c78 |
Subject: [PATCH 38/40] Support TPM2 in a big-endian world
|
|
|
edb6c78 |
|
|
|
edb6c78 |
Signed-off-by: Al Stone <ahs3@redhat.com>
|
|
|
edb6c78 |
---
|
|
|
edb6c78 |
source/common/dmtbdump3.c | 18 ++++++++++--------
|
|
|
edb6c78 |
source/compiler/dttable2.c | 8 +++++---
|
|
|
edb6c78 |
2 files changed, 15 insertions(+), 11 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 |
@@ -409,11 +409,12 @@ AcpiDmDumpTpm2Rev3 (
|
|
|
edb6c78 |
ACPI_TABLE_TPM23 *CommonHeader = ACPI_CAST_PTR (ACPI_TABLE_TPM23, Table);
|
|
|
edb6c78 |
ACPI_TPM23_TRAILER *Subtable = ACPI_ADD_PTR (ACPI_TPM23_TRAILER, Table, Offset);
|
|
|
edb6c78 |
ACPI_STATUS Status;
|
|
|
edb6c78 |
+ UINT32 TableLength = AcpiUtReadUint32(&Table->Length);
|
|
|
edb6c78 |
|
|
|
edb6c78 |
|
|
|
edb6c78 |
/* Main table */
|
|
|
edb6c78 |
|
|
|
edb6c78 |
- Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoTpm23);
|
|
|
edb6c78 |
+ Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoTpm23);
|
|
|
edb6c78 |
if (ACPI_FAILURE (Status))
|
|
|
edb6c78 |
{
|
|
|
edb6c78 |
return;
|
|
|
edb6c78 |
@@ -425,8 +426,8 @@ AcpiDmDumpTpm2Rev3 (
|
|
|
edb6c78 |
{
|
|
|
edb6c78 |
case ACPI_TPM23_ACPI_START_METHOD:
|
|
|
edb6c78 |
|
|
|
edb6c78 |
- (void) AcpiDmDumpTable (Table->Length, Offset, Subtable,
|
|
|
edb6c78 |
- Table->Length - Offset, AcpiDmTableInfoTpm23a);
|
|
|
edb6c78 |
+ (void) AcpiDmDumpTable (TableLength, Offset, Subtable,
|
|
|
edb6c78 |
+ TableLength - Offset, AcpiDmTableInfoTpm23a);
|
|
|
edb6c78 |
break;
|
|
|
edb6c78 |
|
|
|
edb6c78 |
default:
|
|
|
edb6c78 |
@@ -456,6 +457,7 @@ AcpiDmDumpTpm2 (
|
|
|
edb6c78 |
ACPI_TPM2_TRAILER *Subtable = ACPI_ADD_PTR (ACPI_TPM2_TRAILER, Table, Offset);
|
|
|
edb6c78 |
ACPI_TPM2_ARM_SMC *ArmSubtable;
|
|
|
edb6c78 |
ACPI_STATUS Status;
|
|
|
edb6c78 |
+ UINT32 TableLength = AcpiUtReadUint32(&Table->Length);
|
|
|
edb6c78 |
|
|
|
edb6c78 |
|
|
|
edb6c78 |
if (Table->Revision == 3)
|
|
|
edb6c78 |
@@ -466,7 +468,7 @@ AcpiDmDumpTpm2 (
|
|
|
edb6c78 |
|
|
|
edb6c78 |
/* Main table */
|
|
|
edb6c78 |
|
|
|
edb6c78 |
- Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoTpm2);
|
|
|
edb6c78 |
+ Status = AcpiDmDumpTable (TableLength, 0, Table, 0, AcpiDmTableInfoTpm2);
|
|
|
edb6c78 |
|
|
|
edb6c78 |
if (ACPI_FAILURE (Status))
|
|
|
edb6c78 |
{
|
|
|
edb6c78 |
@@ -474,8 +476,8 @@ AcpiDmDumpTpm2 (
|
|
|
edb6c78 |
}
|
|
|
edb6c78 |
|
|
|
edb6c78 |
AcpiOsPrintf ("\n");
|
|
|
edb6c78 |
- Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
|
|
|
edb6c78 |
- Table->Length - Offset, AcpiDmTableInfoTpm2a);
|
|
|
edb6c78 |
+ Status = AcpiDmDumpTable (TableLength, Offset, Subtable,
|
|
|
edb6c78 |
+ TableLength - Offset, AcpiDmTableInfoTpm2a);
|
|
|
edb6c78 |
if (ACPI_FAILURE (Status))
|
|
|
edb6c78 |
{
|
|
|
edb6c78 |
return;
|
|
|
edb6c78 |
@@ -490,8 +492,8 @@ AcpiDmDumpTpm2 (
|
|
|
edb6c78 |
Offset += sizeof (ACPI_TPM2_TRAILER);
|
|
|
edb6c78 |
|
|
|
edb6c78 |
AcpiOsPrintf ("\n");
|
|
|
edb6c78 |
- (void) AcpiDmDumpTable (Table->Length, Offset, ArmSubtable,
|
|
|
edb6c78 |
- Table->Length - Offset, AcpiDmTableInfoTpm211);
|
|
|
edb6c78 |
+ (void) AcpiDmDumpTable (TableLength, Offset, ArmSubtable,
|
|
|
edb6c78 |
+ TableLength - Offset, AcpiDmTableInfoTpm211);
|
|
|
edb6c78 |
break;
|
|
|
edb6c78 |
|
|
|
edb6c78 |
default:
|
|
|
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 |
@@ -1904,6 +1904,7 @@ DtCompileTpm2 (
|
|
|
edb6c78 |
DT_SUBTABLE *ParentTable;
|
|
|
edb6c78 |
ACPI_STATUS Status = AE_OK;
|
|
|
edb6c78 |
ACPI_TABLE_HEADER *Header;
|
|
|
edb6c78 |
+ UINT8 StartMethod;
|
|
|
edb6c78 |
|
|
|
edb6c78 |
|
|
|
edb6c78 |
ParentTable = DtPeekSubtable ();
|
|
|
edb6c78 |
@@ -1947,7 +1948,8 @@ DtCompileTpm2 (
|
|
|
edb6c78 |
|
|
|
edb6c78 |
/* Subtable type depends on the StartMethod */
|
|
|
edb6c78 |
|
|
|
edb6c78 |
- switch (Tpm2Header->StartMethod)
|
|
|
edb6c78 |
+ StartMethod = *(UINT8 *)&Tpm2Header->StartMethod;
|
|
|
edb6c78 |
+ switch (StartMethod)
|
|
|
edb6c78 |
{
|
|
|
edb6c78 |
case ACPI_TPM2_COMMAND_BUFFER_WITH_ARM_SMC:
|
|
|
edb6c78 |
|
|
|
edb6c78 |
@@ -1978,7 +1980,7 @@ DtCompileTpm2 (
|
|
|
edb6c78 |
case ACPI_TPM2_RESERVED10:
|
|
|
edb6c78 |
|
|
|
edb6c78 |
AcpiOsPrintf ("\n**** Reserved TPM2 Start Method type 0x%X\n",
|
|
|
edb6c78 |
- Tpm2Header->StartMethod);
|
|
|
edb6c78 |
+ StartMethod);
|
|
|
edb6c78 |
Status = AE_ERROR;
|
|
|
edb6c78 |
break;
|
|
|
edb6c78 |
|
|
|
edb6c78 |
@@ -1986,7 +1988,7 @@ DtCompileTpm2 (
|
|
|
edb6c78 |
default:
|
|
|
edb6c78 |
|
|
|
edb6c78 |
AcpiOsPrintf ("\n**** Unknown TPM2 Start Method type 0x%X\n",
|
|
|
edb6c78 |
- Tpm2Header->StartMethod);
|
|
|
edb6c78 |
+ StartMethod);
|
|
|
edb6c78 |
Status = AE_ERROR;
|
|
|
edb6c78 |
break;
|
|
|
edb6c78 |
}
|