tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ShellPkg: Update Acpiview GTDT parser to ACPI 6.4 

Bugzilla: 3565 (https://bugzilla.tianocore.org/show_bug.cgi?id=3565)

Update the Acpiview GTDT parser to use Acpi64.h and as such rename all
occurences of "SBSA Generic Watchdog" to "Arm Generic Watchdog".

Signed-off-by: Chris Jones <christopher.jones@arm.com>
Reviewed-by: Zhichao Gao <zhichao.gao@intel.com>
Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>
This commit is contained in:
Chris Jones 2021-08-16 15:52:18 +01:00 committed by mergify[bot]
parent f09dbf20b9
commit 942c9bd357
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c
View File

@ -1,11 +1,11 @@
/** @file /** @file
GTDT table parser GTDT table parser
Copyright (c) 2016 - 2020, ARM Limited. All rights reserved. Copyright (c) 2016 - 2021, ARM Limited. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent SPDX-License-Identifier: BSD-2-Clause-Patent
@par Reference(s): @par Reference(s):
- ACPI 6.3 Specification - January 2019 - ACPI 6.4 Specification - January 2021
**/ **/
#include <IndustryStandard/Acpi.h> #include <IndustryStandard/Acpi.h>
@ -155,7 +155,7 @@ STATIC CONST ACPI_PARSER GtBlockTimerParser[] = {
/** /**
An ACPI_PARSER array describing the Platform Watchdog. An ACPI_PARSER array describing the Platform Watchdog.
**/ **/
STATIC CONST ACPI_PARSER SBSAGenericWatchdogParser[] = { STATIC CONST ACPI_PARSER ArmGenericWatchdogParser[] = {
{L"Type", 1, 0, L"%d", NULL, NULL, NULL, NULL}, {L"Type", 1, 0, L"%d", NULL, NULL, NULL, NULL},
{L"Length", 2, 1, L"%d", NULL, NULL, NULL, NULL}, {L"Length", 2, 1, L"%d", NULL, NULL, NULL, NULL},
{L"Reserved", 1, 3, L"%x", NULL, NULL, NULL, NULL}, {L"Reserved", 1, 3, L"%x", NULL, NULL, NULL, NULL},
@ -236,10 +236,10 @@ DumpWatchdogTimer (
ParseAcpi ( ParseAcpi (
TRUE, TRUE,
2, 2,
"SBSA Generic Watchdog", "Arm Generic Watchdog",
Ptr, Ptr,
Length, Length,
PARSER_PARAMS (SBSAGenericWatchdogParser) PARSER_PARAMS (ArmGenericWatchdogParser)
); );
} }
@ -343,10 +343,10 @@ ParseAcpiGtdt (
} }
switch (*PlatformTimerType) { switch (*PlatformTimerType) {
case EFI_ACPI_6_3_GTDT_GT_BLOCK: case EFI_ACPI_6_4_GTDT_GT_BLOCK:
DumpGTBlock (TimerPtr, *PlatformTimerLength); DumpGTBlock (TimerPtr, *PlatformTimerLength);
break; break;
case EFI_ACPI_6_3_GTDT_SBSA_GENERIC_WATCHDOG: case EFI_ACPI_6_4_GTDT_ARM_GENERIC_WATCHDOG:
DumpWatchdogTimer (TimerPtr, *PlatformTimerLength); DumpWatchdogTimer (TimerPtr, *PlatformTimerLength);
break; break;
default: default:

2
ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.c
View File

@ -54,7 +54,7 @@ ACPI_TABLE_PARSER ParserList[] = {
ParseAcpiDsdt}, ParseAcpiDsdt},
{EFI_ACPI_6_3_FIRMWARE_ACPI_CONTROL_STRUCTURE_SIGNATURE, ParseAcpiFacs}, {EFI_ACPI_6_3_FIRMWARE_ACPI_CONTROL_STRUCTURE_SIGNATURE, ParseAcpiFacs},
{EFI_ACPI_6_2_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE, ParseAcpiFadt}, {EFI_ACPI_6_2_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE, ParseAcpiFadt},
{EFI_ACPI_6_2_GENERIC_TIMER_DESCRIPTION_TABLE_SIGNATURE, ParseAcpiGtdt}, {EFI_ACPI_6_4_GENERIC_TIMER_DESCRIPTION_TABLE_SIGNATURE, ParseAcpiGtdt},
{EFI_ACPI_6_3_HETEROGENEOUS_MEMORY_ATTRIBUTE_TABLE_SIGNATURE, ParseAcpiHmat}, {EFI_ACPI_6_3_HETEROGENEOUS_MEMORY_ATTRIBUTE_TABLE_SIGNATURE, ParseAcpiHmat},
{EFI_ACPI_6_2_IO_REMAPPING_TABLE_SIGNATURE, ParseAcpiIort}, {EFI_ACPI_6_2_IO_REMAPPING_TABLE_SIGNATURE, ParseAcpiIort},
{EFI_ACPI_6_2_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE, ParseAcpiMadt}, {EFI_ACPI_6_2_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE, ParseAcpiMadt},