ShellPkg/UefiShellDebug1CommandsLib: Update to support SmBios 3.3.0

Shell command smbiosview updates for SMBIOS 3.3.0 spec.

Bugzilla link,
https://bugzilla.tianocore.org/show_bug.cgi?id=2202

Signed-off-by: Abner Chang <abner.chang@hpe.com>
Cc: Jaben Carsey <jaben.carsey@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Zhichao Gao <zhichao.gao@intel.com>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Gilbert Chen <gilbert.chen@hpe.com>
Reviewed-by: Zhichao Gao <zhichao.gao@intel.com>

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c
index cfd7a2b9e986f61e95da5157c6cef75140e98f5f..a75caff3de3457129e9dff75ddb8e2df95ed372f 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c
@@ -3,7 +3,7 @@
 \r
   Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>\r
   (C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>\r
-  (C) Copyright 2015-2017 Hewlett Packard Enterprise Development LP<BR>\r
+  (C) Copyright 2015-2019 Hewlett Packard Enterprise Development LP<BR>\r
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
@@ -1168,6 +1168,13 @@ SmbiosPrintStructure (
     PRINT_STRUCT_VALUE_H (Struct, Type43, OemDefined);\r
     break;\r
 \r
+  //\r
+  // Processor Additional Information (Type 44)\r
+  //\r
+  case 44:\r
+    DisplayProcessorArchitectureType (Struct->Type44->ProcessorSpecificBlock.ProcessorArchType, Option);\r
+    break;\r
+\r
   //\r
   // Inactive (Type 126)\r
   //\r
@@ -2350,6 +2357,18 @@ DisplayProcessorFamily2 (
       Print (L"Video Processor\n");\r
       break;\r
 \r
+    case 0x200:\r
+      Print (L"RISC-V RV32\n");\r
+      break;\r
+\r
+    case 0x201:\r
+      Print (L"RISC-V RV64\n");\r
+      break;\r
+\r
+    case 0x202:\r
+      Print (L"RISC-V RV128\n");\r
+      break;\r
+\r
     default:\r
      ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_UNDEFINED_PROC_FAMILY), gShellDebug1HiiHandle);\r
   }\r

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.h b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.h
index a8c32ab60ff67d56a89b30b05608a507f70c2ee5..fd219773de174a2d216618f34a3972f54cc8a9c5 100644 (file)
--- 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.\r
 \r
   Copyright (c) 2005 - 2015, Intel Corporation. All rights reserved.<BR>\r
-  (C) Copyright 2017 Hewlett Packard Enterprise Development LP<BR>\r
+  (C) Copyright 2017 - 2019 Hewlett Packard Enterprise Development LP<BR>\r
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
@@ -427,4 +427,15 @@ DisplayTpmDeviceCharacteristics (
   IN UINT8   Option\r
   );\r
 \r
+/**\r
+  Display Processor Architecture Type (Type 44).\r
+\r
+  @param[in] Key            The key of the structure.\r
+  @param[in] Option         The optional information.\r
+**/\r
+VOID\r
+DisplayProcessorArchitectureType (\r
+  IN UINT8 Key,\r
+  IN UINT8 Option\r
+  );\r
 #endif\r

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c
index bfb7c3b2cec777bdb7e6da36815fa91745ea27df..fdb7a47d33250fc2c244d6196b88e836099ce913 100644 (file)
--- 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.\r
 \r
   Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>\r
-  (C) Copyright 2016-2017 Hewlett Packard Enterprise Development LP<BR>\r
+  (C) Copyright 2016-2019 Hewlett Packard Enterprise Development LP<BR>\r
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
@@ -620,6 +620,10 @@ TABLE_ITEM  ProcessorCharacteristicsTable[] = {
   {\r
     7,\r
     L" Power/Performance Control"\r
+  },\r
+  {\r
+    8,\r
+    L" 128-bit Capable"\r
   }\r
 };\r
 \r
@@ -3268,6 +3272,44 @@ TABLE_ITEM  MCHostInterfaceTypeTable[] = {
   },\r
 };\r
 \r
+TABLE_ITEM  ProcessorArchitectureTypesTable[] = {\r
+  {\r
+    0,\r
+    L" Reserved "\r
+  },\r
+  {\r
+    1,\r
+    L" IA32 (x86) "\r
+  },\r
+  {\r
+    2,\r
+    L" x64 (x86-64, intel64, AMD64, EM64T) "\r
+  },\r
+  {\r
+    3,\r
+    L" Intel Itanium architecture "\r
+  },\r
+  {\r
+    4,\r
+    L" 32-bit ARM (Aarch32) "\r
+  },\r
+  {\r
+    5,\r
+    L" 64-bit ARM (Aarch64) "\r
+  },\r
+  {\r
+    6,\r
+    L" 32-bit RISC-V (RV32) "\r
+  },\r
+  {\r
+    7,\r
+    L" 64-bit RISC-V (RV64) "\r
+  },\r
+  {\r
+    8,\r
+    L" 128-bit RISC-V (RV128) "\r
+  }\r
+};\r
 \r
 TABLE_ITEM  StructureTypeInfoTable[] = {\r
   {\r
@@ -3446,6 +3488,10 @@ TABLE_ITEM  StructureTypeInfoTable[] = {
     43,\r
     L" TPM Device"\r
   },\r
+  {\r
+    44,\r
+    L" Processor Additional Information"\r
+  },\r
   {\r
     0x7E,\r
     L" Inactive"\r
@@ -4696,6 +4742,23 @@ DisplayMCHostInterfaceType (
   PRINT_TABLE_ITEM (MCHostInterfaceTypeTable, Key);\r
 }\r
 \r
+/**\r
+  Display Processor Architecture Type (Type 44).\r
+\r
+  @param[in] Key            The key of the structure.\r
+  @param[in] Option         The optional information.\r
+**/\r
+VOID\r
+DisplayProcessorArchitectureType (\r
+  IN UINT8 Key,\r
+  IN UINT8 Option\r
+  )\r
+{\r
+  ShellPrintHiiEx (-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_QUERYTABLE_PROCESSOR_ARCH_TYPE), gShellDebug1HiiHandle);\r
+  PRINT_INFO_OPTION (Key, Option);\r
+  PRINT_TABLE_ITEM (ProcessorArchitectureTypesTable, Key);\r
+}\r
+\r
 /**\r
   Display the structure type information.\r
 \r

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStrings.uni b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStrings.uni
index 94aff91f519a8e5dc85c9fe27136e22c6a811ef3..7fbcc9a31afb496e98bedf62a5aac0aa2fc6a870 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStrings.uni
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStrings.uni
@@ -2,7 +2,7 @@
 //\r
 // Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>\r
 // (C) Copyright 2014-2015 Hewlett-Packard Development Company, L.P.<BR>\r
-// (C) Copyright 2015-2017 Hewlett Packard Enterprise Development LP<BR>\r
+// (C) Copyright 2015-2019 Hewlett Packard Enterprise Development LP<BR>\r
 // SPDX-License-Identifier: BSD-2-Clause-Patent\r
 //\r
 // Module Name:\r
@@ -447,6 +447,7 @@
 #string STR_SMBIOSVIEW_QUERYTABLE_BMC_INTERFACE_TYPE            #language en-US "BMC Interface Type:"\r
 #string STR_SMBIOSVIEW_QUERYTABLE_MC_HOST_INTERFACE_TYPE        #language en-US "MC Host Interface Type:"\r
 #string STR_SMBIOSVIEW_QUERYTABLE_STRUCT_TYPE                   #language en-US "Structure Type:"\r
+#string STR_SMBIOSVIEW_QUERYTABLE_PROCESSOR_ARCH_TYPE           #language en-US "Processor Architecture Type:"\r
 #string STR_SMBIOSVIEW_SMBIOSVIEW_ONE_VAR_ARGV                  #language en-US "%s "\r
 #string STR_SMBIOSVIEW_SMBIOSVIEW_QUERY_STRUCT_COND             #language en-US "Query Structure, conditions are:\r\n"\r
 #string STR_SMBIOSVIEW_SMBIOSVIEW_QUERYTYPE_RANDOM              #language en-US "QueryType   = Random \r\n"\r

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni
index 42a9295100cdb46cc76d4302eaee1002515f4cc3..6693be26e6996a5a64659b86af03e71ae7e90bbb 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni
@@ -2,7 +2,7 @@
 //\r
 // Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
 // (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>\r
-// (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
+// (C) Copyright 2016 - 2019 Hewlett Packard Enterprise Development LP<BR>\r
 // SPDX-License-Identifier: BSD-2-Clause-Patent\r
 //\r
 // Module Name:\r
@@ -976,6 +976,7 @@
 "       41 - Onboard Devices Extended Information\r\n"\r
 "       42 - Management Controller Host Interface\r\n"\r
 "       43 - TPM Device\r\n"\r
+"       44 - Processor Additional Information\r\n"\r
 "  2. Enter the SmbiosHandle parameter in hexadecimal format.\r\n"\r
 "     Do not use the '0x' prefix format for hexadecimal values.\r\n"\r
 "  3. Internal commands:\r\n"\r