diff options
| author | Chris Jones <christopher.jones@arm.com> | 2021-08-16 15:52:18 +0100 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2021-10-05 16:04:44 +0000 |
| commit | 942c9bd357d87cc6eed7c8250c213eff218d674e (patch) | |
| tree | e31b29eaf4cdc0134c07bb0ae3176b9b551214fb /ShellPkg/Library | |
| parent | f09dbf20b946cf0327a6d5ebcb7bd46124f3073e (diff) | |
| download | edk2-942c9bd357d87cc6eed7c8250c213eff218d674e.tar.gz edk2-942c9bd357d87cc6eed7c8250c213eff218d674e.tar.bz2 edk2-942c9bd357d87cc6eed7c8250c213eff218d674e.zip | |
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>
Diffstat (limited to 'ShellPkg/Library')
| -rw-r--r-- | ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c | 14 | ||||
| -rw-r--r-- | ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.c | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c index d02fc4929d..d00eaafe60 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c @@ -1,11 +1,11 @@ /** @file
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
@par Reference(s):
- - ACPI 6.3 Specification - January 2019
+ - ACPI 6.4 Specification - January 2021
**/
#include <IndustryStandard/Acpi.h>
@@ -155,7 +155,7 @@ STATIC CONST ACPI_PARSER GtBlockTimerParser[] = { /**
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"Length", 2, 1, L"%d", NULL, NULL, NULL, NULL},
{L"Reserved", 1, 3, L"%x", NULL, NULL, NULL, NULL},
@@ -236,10 +236,10 @@ DumpWatchdogTimer ( ParseAcpi (
TRUE,
2,
- "SBSA Generic Watchdog",
+ "Arm Generic Watchdog",
Ptr,
Length,
- PARSER_PARAMS (SBSAGenericWatchdogParser)
+ PARSER_PARAMS (ArmGenericWatchdogParser)
);
}
@@ -343,10 +343,10 @@ ParseAcpiGtdt ( }
switch (*PlatformTimerType) {
- case EFI_ACPI_6_3_GTDT_GT_BLOCK:
+ case EFI_ACPI_6_4_GTDT_GT_BLOCK:
DumpGTBlock (TimerPtr, *PlatformTimerLength);
break;
- case EFI_ACPI_6_3_GTDT_SBSA_GENERIC_WATCHDOG:
+ case EFI_ACPI_6_4_GTDT_ARM_GENERIC_WATCHDOG:
DumpWatchdogTimer (TimerPtr, *PlatformTimerLength);
break;
default:
diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.c index b30ed3fc85..dcc98f1f13 100644 --- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.c +++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.c @@ -54,7 +54,7 @@ ACPI_TABLE_PARSER ParserList[] = { ParseAcpiDsdt},
{EFI_ACPI_6_3_FIRMWARE_ACPI_CONTROL_STRUCTURE_SIGNATURE, ParseAcpiFacs},
{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_2_IO_REMAPPING_TABLE_SIGNATURE, ParseAcpiIort},
{EFI_ACPI_6_2_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE, ParseAcpiMadt},
|