From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mx.groups.io with SMTP id smtpd.web10.2687.1570607151363142133 for ; Wed, 09 Oct 2019 00:45:51 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.31, mailfrom: zhichao.gao@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Oct 2019 00:45:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,273,1566889200"; d="scan'208";a="193609559" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by fmsmga007.fm.intel.com with ESMTP; 09 Oct 2019 00:45:50 -0700 Received: from fmsmsx114.amr.corp.intel.com (10.18.116.8) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 9 Oct 2019 00:45:50 -0700 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by FMSMSX114.amr.corp.intel.com (10.18.116.8) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 9 Oct 2019 00:45:49 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.96]) by SHSMSX152.ccr.corp.intel.com ([10.239.6.52]) with mapi id 14.03.0439.000; Wed, 9 Oct 2019 15:45:47 +0800 From: "Gao, Zhichao" To: "devel@edk2.groups.io" , "abner.chang@hpe.com" CC: "Carsey, Jaben" , "Ni, Ray" , Leif Lindholm , Gilbert Chen Subject: Re: [edk2-devel] [PATCH v6 3/3] ShellPkg/UefiShellDebug1CommandsLib: Update to support SmBios 3.3.0 Thread-Topic: [edk2-devel] [PATCH v6 3/3] ShellPkg/UefiShellDebug1CommandsLib: Update to support SmBios 3.3.0 Thread-Index: AQHVfnHb/5vlcDjHe0+AtPVVatEzt6dR6lLw Date: Wed, 9 Oct 2019 07:45:46 +0000 Message-ID: <3CE959C139B4C44DBEA1810E3AA6F9000B851B60@SHSMSX101.ccr.corp.intel.com> References: <1570603672-13955-1-git-send-email-abner.chang@hpe.com> In-Reply-To: <1570603672-13955-1-git-send-email-abner.chang@hpe.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: zhichao.gao@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Thanks for take my suggestion. But you may forget the other one. What I said is that moving the display functions into one function, not ju= st removing one of them. Here is the example: VOID DisplayProcessorArchitectureType ( IN UINT8 Key, IN UINT8 Option ) { ShellPrintHiiEx (-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_QUERYTABLE_PROC= ESSOR_ARCH_TYPE), gShellDebug1HiiHandle); PRINT_INFO_OPTION (Key, Option); PRINT_TABLE_ITEM (ProcessorArchitectureTypesTable, Key); } And you should add the STR_SMBIOSVIEW_QUERYTABLE_PROCESSOR_ARCH_TYPE to th= e SmbiosViewStrings.uni file with an appropriate string like "Process Archi= tecture Type:". In my opinion, PRINT_STRUCT_VALUE_H is used to print the field's name and = hex value without any explain of the value. And DisplayXXX function is used= to display the field's name, field's value and the meaning of the value. Thanks, Zhichao > -----Original Message----- > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of > Abner Chang > Sent: Wednesday, October 9, 2019 2:48 PM > To: devel@edk2.groups.io > Cc: abner.chang@hpe.com; Carsey, Jaben ; Ni, > Ray ; Gao, Zhichao ; Leif > Lindholm ; Gilbert Chen > Subject: [edk2-devel] [PATCH v6 3/3] > ShellPkg/UefiShellDebug1CommandsLib: Update to support SmBios 3.3.0 >=20 > Shell command smbiosview updates for SMBIOS 3.3.0 spec. >=20 > Bugzilla link, > https://bugzilla.tianocore.org/show_bug.cgi?id=3D2202 >=20 > Signed-off-by: Abner Chang >=20 > Cc: Jaben Carsey > Cc: Ray Ni > Cc: Zhichao Gao > Cc: Leif Lindholm > Cc: Gilbert Chen > --- > .../SmbiosView/PrintInfo.c | 22 +++++++- > .../SmbiosView/PrintInfo.h | 13 ++++- > .../SmbiosView/QueryTable.c | 63 +++++++++++++++= ++++++- > .../UefiShellDebug1CommandsLib.uni | 3 +- > 4 files changed, 97 insertions(+), 4 deletions(-) >=20 > diff --git > a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c > b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c > index cfd7a2b..4989102 100644 > --- > a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c > +++ > b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c > @@ -3,7 +3,7 @@ >=20 > Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved. > (C) Copyright 2014 Hewlett-Packard Development Company, L.P.
> - (C) Copyright 2015-2017 Hewlett Packard Enterprise Development LP
> + (C) Copyright 2015-2019 Hewlett Packard Enterprise Development LP
> SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > **/ > @@ -1169,6 +1169,14 @@ SmbiosPrintStructure ( > break; >=20 > // > + // Processor Additional Information (Type 44) // case 44: > + PRINT_STRUCT_VALUE_H (Struct, Type44, RefHandle); > + DisplayProcessorArchitectureType (Struct->Type44- > >ProcessorSpecificBlock.ProcessorArchType, Option); > + break; > + > + // > // Inactive (Type 126) > // > case 126: > @@ -2350,6 +2358,18 @@ DisplayProcessorFamily2 ( > Print (L"Video Processor\n"); > break; >=20 > + case 0x200: > + Print (L"RISC-V RV32\n"); > + break; > + > + case 0x201: > + Print (L"RISC-V RV64\n"); > + break; > + > + case 0x202: > + Print (L"RISC-V RV128\n"); > + break; > + > default: > ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN > (STR_SMBIOSVIEW_PRINTINFO_UNDEFINED_PROC_FAMILY), > gShellDebug1HiiHandle); > } > diff --git > a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.h > b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.h > index a8c32ab..77a86fc 100644 > --- > a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.h > +++ > b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.h > @@ -2,7 +2,7 @@ > Module to clarify the element info of the smbios structure. >=20 > Copyright (c) 2005 - 2015, Intel Corporation. All rights reserved. > - (C) Copyright 2017 Hewlett Packard Enterprise Development LP
> + (C) Copyright 2017 - 2019 Hewlett Packard Enterprise Development > + LP
> SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > **/ > @@ -427,4 +427,15 @@ DisplayTpmDeviceCharacteristics ( > IN UINT8 Option > ); >=20 > +/** > + Display Processor Architecture Type (Type 44). > + > + @param[in] Key The key of the structure. > + @param[in] Option The optional information. > +**/ > +VOID > +DisplayProcessorArchitectureType ( > + IN UINT8 Key, > + IN UINT8 Option > + ); > #endif > diff --git > a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable. > c > b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable. > c > index bfb7c3b..ef098ad 100644 > --- > a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable. > c > +++ > b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable. > +++ c > @@ -3,7 +3,7 @@ > And give a interface of query a string out of a table. >=20 > Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved. > - (C) Copyright 2016-2017 Hewlett Packard Enterprise Development LP
> + (C) Copyright 2016-2019 Hewlett Packard Enterprise Development LP
> SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > **/ > @@ -620,6 +620,10 @@ TABLE_ITEM ProcessorCharacteristicsTable[] =3D { > { > 7, > L" Power/Performance Control" > + }, > + { > + 8, > + L" 128-bit Capable" > } > }; >=20 > @@ -3268,6 +3272,44 @@ TABLE_ITEM MCHostInterfaceTypeTable[] =3D { > }, > }; >=20 > +TABLE_ITEM ProcessorArchitectureTypesTable[] =3D { > + { > + 0, > + L" Reserved " > + }, > + { > + 1, > + L" IA32 (x86) " > + }, > + { > + 2, > + L" x64 (x86-64, intel64, AMD64, EM64T) " > + }, > + { > + 3, > + L" Intel Itanium architecture " > + }, > + { > + 4, > + L" 32-bit ARM (Aarch32) " > + }, > + { > + 5, > + L" 64-bit ARM (Aarch64) " > + }, > + { > + 6, > + L" 32-bit RISC-V (RV32) " > + }, > + { > + 7, > + L" 64-bit RISC-V (RV64) " > + }, > + { > + 8, > + L" 128-bit RISC-V (RV128) " > + } > +}; >=20 > TABLE_ITEM StructureTypeInfoTable[] =3D { > { > @@ -3447,6 +3489,10 @@ TABLE_ITEM StructureTypeInfoTable[] =3D { > L" TPM Device" > }, > { > + 44, > + L" Processor Additional Information" > + }, > + { > 0x7E, > L" Inactive" > }, > @@ -4697,6 +4743,21 @@ DisplayMCHostInterfaceType ( } >=20 > /** > + Display Processor Architecture Type (Type 44). > + > + @param[in] Key The key of the structure. > + @param[in] Option The optional information. > +**/ > +VOID > +DisplayProcessorArchitectureType ( > + IN UINT8 Key, > + IN UINT8 Option > + ) > +{ > + PRINT_TABLE_ITEM (ProcessorArchitectureTypesTable, Key); } > + > +/** > Display the structure type information. >=20 > @param[in] Key The key of the structure. > diff --git > a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Comman > dsLib.uni > b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Comman > dsLib.uni > index 42a9295..6693be2 100644 > --- > a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Comman > dsLib.uni > +++ > b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Comman > d > +++ sLib.uni > @@ -2,7 +2,7 @@ > // > // Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved. // (C) > Copyright 2013-2015 Hewlett-Packard Development Company, L.P.
-// > (C) Copyright 2016 Hewlett Packard Enterprise Development LP
> +// (C) Copyright 2016 - 2019 Hewlett Packard Enterprise Development > +LP
> // SPDX-License-Identifier: BSD-2-Clause-Patent // // Module Name: > @@ -976,6 +976,7 @@ > " 41 - Onboard Devices Extended Information\r\n" > " 42 - Management Controller Host Interface\r\n" > " 43 - TPM Device\r\n" > +" 44 - Processor Additional Information\r\n" > " 2. Enter the SmbiosHandle parameter in hexadecimal format.\r\n" > " Do not use the '0x' prefix format for hexadecimal values.\r\n" > " 3. Internal commands:\r\n" > -- > 2.7.4 >=20 >=20 >=20