From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 23EF081ED9 for ; Sun, 22 Jan 2017 00:17:52 -0800 (PST) Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga103.jf.intel.com with ESMTP; 22 Jan 2017 00:17:51 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,268,1477983600"; d="scan'208";a="56140001" Received: from shwdeopenpsi068.ccr.corp.intel.com ([10.239.9.9]) by fmsmga005.fm.intel.com with ESMTP; 22 Jan 2017 00:17:50 -0800 From: Star Zeng To: edk2-devel@lists.01.org Cc: Star Zeng , Ruiyu Ni , Jaben Carsey Date: Sun, 22 Jan 2017 16:17:43 +0800 Message-Id: <1485073063-211620-4-git-send-email-star.zeng@intel.com> X-Mailer: git-send-email 2.7.0.windows.1 In-Reply-To: <1485073063-211620-1-git-send-email-star.zeng@intel.com> References: <1485073063-211620-1-git-send-email-star.zeng@intel.com> Subject: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS spec 3.1.1 X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Jan 2017 08:17:52 -0000 REF: https://bugzilla.tianocore.org/show_bug.cgi?id=349 Cc: Ruiyu Ni Cc: Jaben Carsey Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Star Zeng --- .../SmbiosView/PrintInfo.c | 6 +++- .../SmbiosView/QueryTable.c | 37 ++++++++++++++++++++++ .../SmbiosView/QueryTable.h | 14 +++++++- .../SmbiosView/SmbiosViewStrings.uni | 3 +- 4 files changed, 57 insertions(+), 3 deletions(-) diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c index ecb8e2492453..1d6002b92593 100644 --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c @@ -1106,7 +1106,7 @@ SmbiosPrintStructure ( // Management Controller Host Interface (Type 42) // case 42: - PRINT_STRUCT_VALUE_H (Struct, Type42, InterfaceType); + DisplayMCHostInterfaceType (Struct->Type42->InterfaceType, Option); break; // @@ -1818,6 +1818,10 @@ DisplayProcessorFamily ( Print (L"AMD Opteron(TM) X3000 Series APU\n"); break; + case 0x6B: + Print (L"AMD Zen Processor Family\n"); + break; + case 0x70: ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_HOBBIT_FAMILY), gShellDebug1HiiHandle); break; diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c index 4a06c12e3b2b..282ba584c8c9 100644 --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c @@ -575,6 +575,10 @@ TABLE_ITEM ProcessorUpgradeTable[] = { { 0x37, L"Socket SP3" + }, + { + 0x38, + L"Socket SP3r2" } }; @@ -3156,6 +3160,22 @@ TABLE_ITEM IPMIDIBMCInterfaceTypeTable[] = { }, }; +TABLE_ITEM MCHostInterfaceTypeTable[] = { + { + 0x3F00, + L" MCTP Host Interface " + }, + { + 0x40, + L" Network Host Interface " + }, + { + 0xF0, + L" OEM defined " + }, +}; + + TABLE_ITEM StructureTypeInfoTable[] = { { 0, @@ -4525,6 +4545,23 @@ DisplayIPMIDIBMCInterfaceType ( } /** + Display Management Controller Host Interface (Type 42) information. + + @param[in] Key The key of the structure. + @param[in] Option The optional information. +**/ +VOID +DisplayMCHostInterfaceType ( + IN UINT8 Key, + IN UINT8 Option + ) +{ + ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_QUERYTABLE_MC_HOST_INTERFACE_TYPE), gShellDebug1HiiHandle); + PRINT_INFO_OPTION (Key, Option); + PRINT_TABLE_ITEM (MCHostInterfaceTypeTable, Key); +} + +/** Display the structure type information. @param[in] Key The key of the structure. diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.h b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.h index 9cae7094fb19..bd9e6898d40a 100644 --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.h +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.h @@ -2,7 +2,7 @@ Build a table, each item is (key, info) pair. and give a interface of query a string out of a table. - Copyright (c) 2005 - 2012, Intel Corporation. All rights reserved.
+ Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -779,4 +779,16 @@ DisplayIPMIDIBMCInterfaceType ( IN UINT8 Option ); +/** + Display Management Controller Host Interface (Type 42) information. + + @param[in] Key The key of the structure. + @param[in] Option The optional information. +**/ +VOID +DisplayMCHostInterfaceType ( + IN UINT8 Key, + IN UINT8 Option + ); + #endif diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStrings.uni b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStrings.uni index b9032df076d2..7d694536dbcd 100644 --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStrings.uni +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStrings.uni @@ -1,6 +1,6 @@ // /** // -// Copyright (c) 2005 - 2015, Intel Corporation. All rights reserved.
+// Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.
// (C) Copyright 2014-2015 Hewlett-Packard Development Company, L.P.
// (C) Copyright 2015-2017 Hewlett Packard Enterprise Development LP
// This program and the accompanying materials @@ -444,6 +444,7 @@ #string STR_SMBIOSVIEW_QUERYTABLE_MANAGEMENT_DEV_ADDR_TYPE #language en-US "Management Device - Address Type:" #string STR_SMBIOSVIEW_QUERYTABLE_MEM_CHANNEL_TYPE #language en-US "Memory Channel Type:" #string STR_SMBIOSVIEW_QUERYTABLE_BMC_INTERFACE_TYPE #language en-US "BMC Interface Type:" +#string STR_SMBIOSVIEW_QUERYTABLE_MC_HOST_INTERFACE_TYPE #language en-US "MC Host Interface Type:" #string STR_SMBIOSVIEW_QUERYTABLE_STRUCT_TYPE #language en-US "Structure Type:" #string STR_SMBIOSVIEW_SMBIOSVIEW_ONE_VAR_ARGV #language en-US "%s " #string STR_SMBIOSVIEW_SMBIOSVIEW_QUERY_STRUCT_COND #language en-US "Query Structure, conditions are:\r\n" -- 2.7.0.windows.1