a9069d4ba2
Bugzilla: https://bugzilla.redhat.com/2065349
Upstream Status: https://src.fedoraproject.org/rpms/acpica-tools.git
Conflicts: Partial backport of only big-endian patches for PRMT, RGRT, and SVKL
tables. This required some adjustments since RHEL-9 is based on
acpica release 20210604, whereas Fedora is based on 20220331.
commit fc3eef63e8
Author: Al Stone <ahs3@redhat.com>
Date: Sun Apr 3 15:18:02 2022 -0600
Update to 20220331 upstream sources
This includes new source tarballs, updated patches, and updated
expected results for test cases. In addition, three new tables
(PRMT, RGRT and SVKL) now have big-endian support.
Signed-off-by: Al Stone <ahs3@redhat.com>
Resolves: rhbz#2065349
Signed-off-by: Dean Nelson <dnelson@redhat.com>
52 lines
2.2 KiB
Diff
52 lines
2.2 KiB
Diff
Signed-off-by: Dean Nelson <dnelson@redhat.com>
|
|
Reviewed-by: Al Stone <ahs3@redhat.com>
|
|
---
|
|
source/common/dmtbdump2.c | 11 ++++++-----
|
|
1 file changed, 6 insertions(+), 5 deletions(-)
|
|
|
|
Index: acpica-unix2-20210604/source/common/dmtbdump2.c
|
|
===================================================================
|
|
--- acpica-unix2-20210604.orig/source/common/dmtbdump2.c
|
|
+++ acpica-unix2-20210604/source/common/dmtbdump2.c
|
|
@@ -1959,13 +1959,14 @@ AcpiDmDumpPrmt (
|
|
ACPI_PRMT_MODULE_INFO *PrmtModuleInfo;
|
|
ACPI_PRMT_HANDLER_INFO *PrmtHandlerInfo;
|
|
ACPI_STATUS Status;
|
|
+ UINT32 TableLength = AcpiUtReadUint32 (&Table->Length);
|
|
UINT32 i, j;
|
|
|
|
|
|
/* Main table header */
|
|
|
|
PrmtHeader = ACPI_ADD_PTR (ACPI_TABLE_PRMT_HEADER, Table, CurrentOffset);
|
|
- Status = AcpiDmDumpTable (Table->Length, CurrentOffset, PrmtHeader,
|
|
+ Status = AcpiDmDumpTable (TableLength, CurrentOffset, PrmtHeader,
|
|
sizeof (ACPI_TABLE_PRMT_HEADER), AcpiDmTableInfoPrmtHdr);
|
|
if (ACPI_FAILURE (Status))
|
|
{
|
|
@@ -1977,20 +1978,20 @@ AcpiDmDumpPrmt (
|
|
|
|
/* PRM Module Information Structure array */
|
|
|
|
- for (i = 0; i < PrmtHeader->ModuleInfoCount; ++i)
|
|
+ for (i = 0; i < AcpiUtReadUint32 (&PrmtHeader->ModuleInfoCount); ++i)
|
|
{
|
|
PrmtModuleInfo = ACPI_ADD_PTR (ACPI_PRMT_MODULE_INFO, Table, CurrentOffset);
|
|
- Status = AcpiDmDumpTable (Table->Length, CurrentOffset, PrmtModuleInfo,
|
|
+ Status = AcpiDmDumpTable (TableLength, CurrentOffset, PrmtModuleInfo,
|
|
sizeof (ACPI_PRMT_MODULE_INFO), AcpiDmTableInfoPrmtModule);
|
|
|
|
CurrentOffset += sizeof (ACPI_PRMT_MODULE_INFO);
|
|
|
|
/* PRM handler information structure array */
|
|
|
|
- for (j = 0; j < PrmtModuleInfo->HandlerInfoCount; ++j)
|
|
+ for (j = 0; j < AcpiUtReadUint16 (&PrmtModuleInfo->HandlerInfoCount); ++j)
|
|
{
|
|
PrmtHandlerInfo = ACPI_ADD_PTR (ACPI_PRMT_HANDLER_INFO, Table, CurrentOffset);
|
|
- Status = AcpiDmDumpTable (Table->Length, CurrentOffset, PrmtHandlerInfo,
|
|
+ Status = AcpiDmDumpTable (TableLength, CurrentOffset, PrmtHandlerInfo,
|
|
sizeof (ACPI_PRMT_HANDLER_INFO), AcpiDmTableInfoPrmtHandler);
|
|
|
|
CurrentOffset += sizeof (ACPI_PRMT_HANDLER_INFO);
|