tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
e9f0be021b.

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>
This commit is contained in:
Star Zeng 2017-01-12 17:20:01 +08:00
parent e1108d9735
commit 44175ee77f
4 changed files with 102 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c
View File

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

56
ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c
View File

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

1
ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStrings.uni
View File

@ -380,6 +380,7 @@
#string STR_SMBIOSVIEW_PRINTINFO_POWER_SUPPLY_REPLACE #language en-US "Power supply is hot replaceable\r\n"
#string STR_SMBIOSVIEW_PRINTINFO_POWER_SUPPLY_NOT_REPLACE #language en-US "Power supply is not hot replaceable\r\n"
#string STR_SMBIOSVIEW_PRINTINFO_BIOS_SIZE #language en-US "BiosSize: %d KB\r\n"
#string STR_SMBIOSVIEW_PRINTINFO_EXTENDED_BIOS_SIZE #language en-US "ExtendedBiosSize: %d %s\r\n"
#string STR_SMBIOSVIEW_QUERYTABLE_NO_INFO #language en-US "No Info"
#string STR_SMBIOSVIEW_QUERYTABLE_RSVD_BITS_SET #language en-US "\r\nIt also has reserved bits set 1 --- reserved bits: 0x%x"
#string STR_SMBIOSVIEW_QUERYTABLE_SYSTEM_WAKEUP_TYPE #language en-US "System Wakeup Type:"

3
ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni
View File

@ -1,6 +1,6 @@
// /**
//
// Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>
// Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
// (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>
// (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
// This program and the accompanying materials
@ -999,6 +999,7 @@
" 40 - Additional Information\r\n"
" 41 - Onboard Devices Extended Information\r\n"
" 42 - Management Controller Host Interface\r\n"
" 43 - TPM Device\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"