Reviewed-by: Zhichao Gao <zhichao....@intel.com> Thanks, Zhichao
> -----Original Message----- > From: Chris Jones <christopher.jo...@arm.com> > Sent: Wednesday, November 3, 2021 11:41 PM > To: devel@edk2.groups.io > Cc: Kinney, Michael D <michael.d.kin...@intel.com>; > gaolim...@byosoft.com.cn; Liu, Zhiguang <zhiguang....@intel.com>; Ni, Ray > <ray...@intel.com>; Gao, Zhichao <zhichao....@intel.com>; > alexei.fedo...@arm.com; sami.muja...@arm.com; n...@arm.com > Subject: [PATCH v2 3/7] ShellPkg: Update Acpiview PPTT parser to ACPI 6.4 > > Bugzilla: 3697 (https://bugzilla.tianocore.org/show_bug.cgi?id=3697) > > Update the Acpiview PPTT parser to use Acpi64.h. As part of the changes, > remove support for parsing PPTT type 2 ID structure. > > Signed-off-by: Chris Jones <christopher.jo...@arm.com> > --- > > Notes: > v2: > - Changed PPTT ID error message to say "removed" instead of > "deprecated". > > ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttParser.c > | 61 ++++---------------- > > ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewComman > dLib.c | 2 +- > 2 files changed, 12 insertions(+), 51 deletions(-) > > diff --git > a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttParser. > c > b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttParser. > c > index > acd2b81bb3258c7322aa10d2c0e0d842d89e358b..bb840a0dbab240d371aa58d3 > 23e61f47fa8d1587 100644 > --- > a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttParser. > c > +++ > b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Pptt/PpttPars > +++ er.c > @@ -1,11 +1,11 @@ > /** @file > PPTT table parser > > - Copyright (c) 2019 - 2020, ARM Limited. All rights reserved. > + Copyright (c) 2019 - 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 > - ARM Architecture Reference Manual ARMv8 (D.a) **/ > > @@ -157,8 +157,8 @@ ValidateCacheAttributes ( > ) > { > // Reference: Advanced Configuration and Power Interface (ACPI) > Specification > - // Version 6.2 Errata A, September 2017 > - // Table 5-153: Cache Type Structure > + // Version 6.4, January 2021 > + // Table 5-140: Cache Type Structure > UINT8 Attributes; > Attributes = *(UINT8*)Ptr; > > @@ -222,22 +222,6 @@ STATIC CONST ACPI_PARSER > CacheTypeStructureParser[] = { > {L"Line size", 2, 22, L"%d", NULL, NULL, ValidateCacheLineSize, NULL} }; > > -/** > - An ACPI_PARSER array describing the ID Type Structure - Type 2. > -**/ > -STATIC CONST ACPI_PARSER IdStructureParser[] = { > - {L"Type", 1, 0, L"0x%x", NULL, NULL, NULL, NULL}, > - {L"Length", 1, 1, L"%d", NULL, NULL, NULL, NULL}, > - {L"Reserved", 2, 2, L"0x%x", NULL, NULL, NULL, NULL}, > - > - {L"VENDOR_ID", 4, 4, NULL, Dump4Chars, NULL, NULL, NULL}, > - {L"LEVEL_1_ID", 8, 8, L"0x%x", NULL, NULL, NULL, NULL}, > - {L"LEVEL_2_ID", 8, 16, L"0x%x", NULL, NULL, NULL, NULL}, > - {L"MAJOR_REV", 2, 24, L"0x%x", NULL, NULL, NULL, NULL}, > - {L"MINOR_REV", 2, 26, L"0x%x", NULL, NULL, NULL, NULL}, > - {L"SPIN_REV", 2, 28, L"0x%x", NULL, NULL, NULL, NULL}, -}; > - > /** > This function parses the Processor Hierarchy Node Structure (Type 0). > > @@ -335,29 +319,6 @@ DumpCacheTypeStructure ( > ); > } > > -/** > - This function parses the ID Structure (Type 2). > - > - @param [in] Ptr Pointer to the start of the ID Structure data. > - @param [in] Length Length of the ID Structure. > -**/ > -STATIC > -VOID > -DumpIDStructure ( > - IN UINT8* Ptr, > - IN UINT8 Length > - ) > -{ > - ParseAcpi ( > - TRUE, > - 2, > - "ID Structure", > - Ptr, > - Length, > - PARSER_PARAMS (IdStructureParser) > - ); > -} > - > /** > This function parses the ACPI PPTT table. > When trace is enabled this function parses the PPTT table and @@ -366,7 > +327,6 @@ DumpIDStructure ( > This function parses the following processor topology structures: > - Processor hierarchy node structure (Type 0) > - Cache Type Structure (Type 1) > - - ID structure (Type 2) > > This function also performs validation of the ACPI table fields. > > @@ -444,22 +404,23 @@ ParseAcpiPptt ( > Print (L"0x%x\n", Offset); > > switch (*ProcessorTopologyStructureType) { > - case EFI_ACPI_6_2_PPTT_TYPE_PROCESSOR: > + case EFI_ACPI_6_4_PPTT_TYPE_PROCESSOR: > DumpProcessorHierarchyNodeStructure ( > ProcessorTopologyStructurePtr, > *ProcessorTopologyStructureLength > ); > break; > - case EFI_ACPI_6_2_PPTT_TYPE_CACHE: > + case EFI_ACPI_6_4_PPTT_TYPE_CACHE: > DumpCacheTypeStructure ( > ProcessorTopologyStructurePtr, > *ProcessorTopologyStructureLength > ); > break; > - case EFI_ACPI_6_2_PPTT_TYPE_ID: > - DumpIDStructure ( > - ProcessorTopologyStructurePtr, > - *ProcessorTopologyStructureLength > + case EFI_ACPI_6_3_PPTT_TYPE_ID: > + IncrementErrorCount (); > + Print ( > + L"ERROR: PPTT Type 2 - Processor ID has been removed and must not > be" > + L"used.\n" > ); > break; > default: > diff --git > a/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewComm > andLib.c > b/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewComm > andLib.c > index > d725cad14c5d018e2004eb8e33c845aa9c719429..ab9e6c619d70df4f79d782416 > 037d7bef62c92d5 100644 > --- > a/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewComm > andLib.c > +++ > b/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewComm > +++ andLib.c > @@ -62,7 +62,7 @@ ACPI_TABLE_PARSER ParserList[] = { > ParseAcpiMcfg}, > > {EFI_ACPI_6_4_PLATFORM_COMMUNICATIONS_CHANNEL_TABLE_SIGNAT > URE, > ParseAcpiPcct}, > - > {EFI_ACPI_6_2_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_STRUCTURE_S > IGNATURE, > + > + > {EFI_ACPI_6_4_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_STRUCTURE_S > IGNATURE, > ParseAcpiPptt}, > {RSDP_TABLE_INFO, ParseAcpiRsdp}, > {EFI_ACPI_6_2_SYSTEM_LOCALITY_INFORMATION_TABLE_SIGNATURE, > ParseAcpiSlit}, > -- > Guid("CE165669-3EF3-493F-B85D-6190EE5B9759") -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#83472): https://edk2.groups.io/g/devel/message/83472 Mute This Topic: https://groups.io/mt/86794163/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
