ShellPkg SmbiosView: Add decoding of SMBIOS spec 3.1.0

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=340

The decoding of TPM Device (Type 43) has been added at
e9f0be021b7649c15d823e193110c0088cda9a89.

Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Jaben Carsey <jaben.carsey@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c
index abbc9835b5d0a0740c17295239b55b10b3229f31..ecb8e24924530c5c2d36fd5e1a9e02210f4cb065 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c
@@ -335,7 +335,17 @@ SmbiosPrintStructure (
       PRINT_STRUCT_VALUE (Struct, Type0, EmbeddedControllerFirmwareMajorRelease);\r
       PRINT_STRUCT_VALUE (Struct, Type0, EmbeddedControllerFirmwareMinorRelease);\r
     }\r
-\r
+    if (AE_SMBIOS_VERSION (0x3, 0x1) && (Struct->Hdr->Length > 0x18)) {\r
+      ShellPrintHiiEx (\r
+        -1,\r
+        -1,\r
+        NULL,\r
+        STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_EXTENDED_BIOS_SIZE),\r
+        gShellDebug1HiiHandle,\r
+        Struct->Type0->ExtendedBiosSize.Size,\r
+        (Struct->Type0->ExtendedBiosSize.Unit == 0x0) ? L"MB": L"GB"\r
+        );\r
+    }\r
     break;\r
 \r
   //\r
@@ -510,6 +520,10 @@ SmbiosPrintStructure (
     DisplayCacheErrCorrectingType (Struct->Type7->ErrorCorrectionType, Option);\r
     DisplayCacheSystemCacheType (Struct->Type7->SystemCacheType, Option);\r
     DisplayCacheAssociativity (Struct->Type7->Associativity, Option);\r
+    if (AE_SMBIOS_VERSION (0x3, 0x1) && (Struct->Hdr->Length > 0x13)) {\r
+      PRINT_STRUCT_VALUE_H (Struct, Type7, MaximumCacheSize2);\r
+      PRINT_STRUCT_VALUE_H (Struct, Type7, InstalledSize2);\r
+    }\r
     break;\r
 \r
   //\r
@@ -1584,6 +1598,18 @@ DisplayProcessorFamily (
     Print (L"Intel(R) Core(TM) M processor\n");\r
     break;\r
 \r
+  case 0x2D:\r
+    Print (L"Intel(R) Core(TM) m3 processor\n");\r
+    break;\r
+\r
+  case 0x2E:\r
+    Print (L"Intel(R) Core(TM) m5 processor\n");\r
+    break;\r
+\r
+  case 0x2F:\r
+    Print (L"Intel(R) Core(TM) m7 processor\n");\r
+    break;\r
+\r
   case 0x30:\r
     ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_ALPHA_FAMILY_2), gShellDebug1HiiHandle);\r
     break;\r
@@ -1784,6 +1810,14 @@ DisplayProcessorFamily (
     Print (L"AMD Opteron(TM) X2000 Series APU\n");\r
     break;\r
 \r
+  case 0x69:\r
+    Print (L"AMD Opteron(TM) A-Series Processor\n");\r
+    break;\r
+\r
+  case 0x6A:\r
+    Print (L"AMD Opteron(TM) X3000 Series APU\n");\r
+    break;\r
+\r
   case 0x70:\r
     ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_HOBBIT_FAMILY), gShellDebug1HiiHandle);\r
     break;\r
@@ -2215,6 +2249,14 @@ DisplayProcessorFamily2 (
   // Use switch to check\r
   //\r
   switch (Family2) {\r
+    case 0x100:\r
+      Print (L"ARMv7\n");\r
+      break;\r
+\r
+    case 0x101:\r
+      Print (L"ARMv8\n");\r
+      break;\r
+\r
     case 0x104:\r
       Print (L"SH-3\n");\r
       break;\r

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c
index acca00d5c37db756cebb16b9930c8665fecafa5e..4a06c12e3b2bebd6dec4341d6f1082d9401cd7f8 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c
@@ -260,6 +260,22 @@ TABLE_ITEM  SystemEnclosureTypeTable[] = {
     0x20,\r
     L"  Detachable"\r
   },\r
+  {\r
+    0x21,\r
+    L"  IoT Gateway"\r
+  },\r
+  {\r
+    0x22,\r
+    L"  Embedded PC"\r
+  },\r
+  {\r
+    0x23,\r
+    L"  Mini PC"\r
+  },\r
+  {\r
+    0x24,\r
+    L"  Stick PC"\r
+  },\r
 };\r
 \r
 TABLE_ITEM  SystemEnclosureStatusTable[] = {\r
@@ -531,6 +547,34 @@ TABLE_ITEM  ProcessorUpgradeTable[] = {
   {\r
     0x30,\r
     L"Socket BGA1364"\r
+  },\r
+  {\r
+    0x31,\r
+    L"Socket AM4"\r
+  },\r
+  {\r
+    0x32,\r
+    L"Socket LGA1151"\r
+  },\r
+  {\r
+    0x33,\r
+    L"Socket BGA1356"\r
+  },\r
+  {\r
+    0x34,\r
+    L"Socket BGA1440"\r
+  },\r
+  {\r
+    0x35,\r
+    L"Socket BGA1515"\r
+  },\r
+  {\r
+    0x36,\r
+    L"Socket LGA3647-1"\r
+  },\r
+  {\r
+    0x37,\r
+    L"Socket SP3"\r
   }\r
 };\r
 \r
@@ -1346,6 +1390,18 @@ TABLE_ITEM  SystemSlotTypeTable[] = {
     0x20,\r
     L"PCI Express Gen 3 SFF-8639"\r
   },\r
+  {\r
+    0x21,\r
+    L"PCI Express Mini 52-pin (CEM spec. 2.0) with bottom-side keep-outs"\r
+  },\r
+  {\r
+    0x22,\r
+    L"PCI Express Mini 52-pin (CEM spec. 2.0) without bottom-side keep-outs"\r
+  },\r
+  {\r
+    0x23,\r
+    L"PCI Express Mini 76-pin (CEM spec. 2.0) Corresponds to Display-Mini card"\r
+  },\r
   {\r
     0xA0,\r
     L"PC-98/C20 "\r

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStrings.uni b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStrings.uni
index 0596f1fb3126cdd9fdc1ba38897a9f148183c81c..b9032df076d26969f3f4c9fa90d04d31c170797b 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStrings.uni
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStrings.uni
@@ -380,6 +380,7 @@
 #string STR_SMBIOSVIEW_PRINTINFO_POWER_SUPPLY_REPLACE           #language en-US "Power supply is hot replaceable\r\n"\r
 #string STR_SMBIOSVIEW_PRINTINFO_POWER_SUPPLY_NOT_REPLACE       #language en-US "Power supply is not hot replaceable\r\n"\r
 #string STR_SMBIOSVIEW_PRINTINFO_BIOS_SIZE                      #language en-US "BiosSize:  %d KB\r\n"\r
+#string STR_SMBIOSVIEW_PRINTINFO_EXTENDED_BIOS_SIZE             #language en-US "ExtendedBiosSize:  %d %s\r\n"\r
 #string STR_SMBIOSVIEW_QUERYTABLE_NO_INFO                       #language en-US "No Info"\r
 #string STR_SMBIOSVIEW_QUERYTABLE_RSVD_BITS_SET                 #language en-US "\r\nIt also has reserved bits set 1 --- reserved bits: 0x%x"\r
 #string STR_SMBIOSVIEW_QUERYTABLE_SYSTEM_WAKEUP_TYPE            #language en-US "System Wakeup Type:"\r

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni
index 06865a42a292387951a14eb6061373d54b488d3e..609e1a80772ee33e30e7095db4fb0707f197b488 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni
@@ -1,6 +1,6 @@
 // /**\r
 //\r
-// Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2010 - 2017, 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
 // This program and the accompanying materials\r
@@ -999,6 +999,7 @@
 "       40 - Additional Information\r\n"\r
 "       41 - Onboard Devices Extended Information\r\n"\r
 "       42 - Management Controller Host Interface\r\n"\r
+"       43 - TPM Device\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