From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: hpe.com, ip: 148.163.147.86, mailfrom: prvs=016647cc7d=abner.chang@hpe.com) Received: from mx0a-002e3701.pphosted.com (mx0a-002e3701.pphosted.com [148.163.147.86]) by groups.io with SMTP; Thu, 19 Sep 2019 21:26:07 -0700 Received: from pps.filterd (m0150242.ppops.net [127.0.0.1]) by mx0a-002e3701.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id x8K4Q7qQ032152; Fri, 20 Sep 2019 04:26:07 GMT Received: from g2t2354.austin.hpe.com (g2t2354.austin.hpe.com [15.233.44.27]) by mx0a-002e3701.pphosted.com with ESMTP id 2v4jaawehq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 20 Sep 2019 04:26:06 +0000 Received: from g2t2360.austin.hpecorp.net (g2t2360.austin.hpecorp.net [16.196.225.135]) by g2t2354.austin.hpe.com (Postfix) with ESMTP id B66AA9D; Fri, 20 Sep 2019 04:25:51 +0000 (UTC) Received: from UB16Abner.asiapacific.hpqcorp.net (ub16abner.asiapacific.hpqcorp.net [15.119.209.44]) by g2t2360.austin.hpecorp.net (Postfix) with ESMTP id A94FE39; Fri, 20 Sep 2019 04:25:49 +0000 (UTC) From: "Abner Chang" To: devel@edk2.groups.io Cc: abner.chang@hpe.com, Jaben Carsey , Ray Ni , Zhichao Gao , Leif Lindholm , Gilbert Chen Subject: [PATCH v3 3/3] ShellPkg/UefiShellDebug1CommandsLib: Update to support Date: Fri, 20 Sep 2019 11:55:11 +0800 Message-Id: <1568951711-4482-4-git-send-email-abner.chang@hpe.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1568951711-4482-1-git-send-email-abner.chang@hpe.com> References: <1568951711-4482-1-git-send-email-abner.chang@hpe.com> X-HPE-SCL: -1 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.70,1.0.8 definitions=2019-09-20_01:2019-09-19,2019-09-20 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=999 clxscore=1015 impostorscore=0 phishscore=0 adultscore=0 spamscore=0 suspectscore=1 mlxscore=0 lowpriorityscore=0 malwarescore=0 bulkscore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-1908290000 definitions=main-1909200049 Shell command smbiosview updates for SMBIOS 3.3.0 spec. Signed-off-by: Abner Chang Cc: Jaben Carsey Cc: Ray Ni Cc: Zhichao Gao Cc: Leif Lindholm Cc: Gilbert Chen --- .../SmbiosView/PrintInfo.c | 23 +------- .../SmbiosView/PrintInfo.h | 13 +---- .../SmbiosView/QueryTable.c | 63 +--------------------- .../UefiShellDebug1CommandsLib.uni | 3 +- 4 files changed, 4 insertions(+), 98 deletions(-) diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c index ff0c1db..cfd7a2b 100644 --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c @@ -3,7 +3,7 @@ Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.
(C) Copyright 2014 Hewlett-Packard Development Company, L.P.
- (C) Copyright 2015-2019 Hewlett Packard Enterprise Development LP
+ (C) Copyright 2015-2017 Hewlett Packard Enterprise Development LP
SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -1169,15 +1169,6 @@ SmbiosPrintStructure ( break; // - // Processor Additional Information (Type 44) - // - case 44: - PRINT_STRUCT_VALUE_H (Struct, Type44, RefHandle); - PRINT_STRUCT_VALUE_H (Struct, Type44, ProcessorSpecificBlock.ProcessorArchType); - ProcessorArchitectureType (Struct->Type44->ProcessorSpecificBlock.ProcessorArchType, Option); - break; - - // // Inactive (Type 126) // case 126: @@ -2359,18 +2350,6 @@ DisplayProcessorFamily2 ( Print (L"Video Processor\n"); break; - 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 22f59d6..a8c32ab 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. Copyright (c) 2005 - 2015, Intel Corporation. All rights reserved.
- (C) Copyright 2017 - 2019 Hewlett Packard Enterprise Development LP
+ (C) Copyright 2017 Hewlett Packard Enterprise Development LP
SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -427,15 +427,4 @@ DisplayTpmDeviceCharacteristics ( IN UINT8 Option ); -/** - Display Processor Architecture Type (Type 44). - - @param[in] Type The key of the structure. - @param[in] Option The optional information. -**/ -VOID -ProcessorArchitectureType ( - IN UINT8 Type, - IN UINT8 Option - ); #endif diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c index 54e9a52..bfb7c3b 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. Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.
- (C) Copyright 2016-2019 Hewlett Packard Enterprise Development LP
+ (C) Copyright 2016-2017 Hewlett Packard Enterprise Development LP
SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -620,10 +620,6 @@ TABLE_ITEM ProcessorCharacteristicsTable[] = { { 7, L" Power/Performance Control" - }, - { - 8, - L" 128-bit Capable" } }; @@ -3272,44 +3268,6 @@ TABLE_ITEM MCHostInterfaceTypeTable[] = { }, }; -TABLE_ITEM ProcessorArchitectureTypesTable[] = { - { - 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) " - } -}; TABLE_ITEM StructureTypeInfoTable[] = { { @@ -3489,10 +3447,6 @@ TABLE_ITEM StructureTypeInfoTable[] = { L" TPM Device" }, { - 44, - L" Processor Additional Information" - }, - { 0x7E, L" Inactive" }, @@ -4743,21 +4697,6 @@ DisplayMCHostInterfaceType ( } /** - Display Processor Architecture Type (Type 44). - - @param[in] Type The key of the structure. - @param[in] Option The optional information. -**/ -VOID -ProcessorArchitectureType ( - IN UINT8 Type, - IN UINT8 Option - ) -{ - PRINT_TABLE_ITEM (ProcessorArchitectureTypesTable, Type); -} - -/** Display the structure type information. @param[in] Key The key of the structure. diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni index 6693be2..42a9295 100644 --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.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 - 2019 Hewlett Packard Enterprise Development LP
+// (C) Copyright 2016 Hewlett Packard Enterprise Development LP
// SPDX-License-Identifier: BSD-2-Clause-Patent // // Module Name: @@ -976,7 +976,6 @@ " 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