* [PATCH 0/3] Add SMBIOS spec 3.1.1 support
@ 2017-01-22 8:17 Star Zeng
2017-01-22 8:17 ` [PATCH 1/3] MdePkg: Add definitions for SMBIOS spec 3.1.1 Star Zeng
` (2 more replies)
0 siblings, 3 replies; 19+ messages in thread
From: Star Zeng @ 2017-01-22 8:17 UTC (permalink / raw)
To: edk2-devel
Cc: Star Zeng, Liming Gao, Michael Kinney, Feng Tian, Ruiyu Ni,
Jaben Carsey
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=349
These patches are to add support for below items.
Processor Information (Type 4):
- add socket SP3r2
- add AMD Zen Processor Family
Management Controller Host Interface (Type 42):
- include Host Interface Type and Protocol Identifier enumerations
Cc: Liming Gao <liming.gao@intel.com>
Cc: Michael Kinney <michael.d.kinney@intel.com>
Cc: Feng Tian <feng.tian@intel.com>
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Jaben Carsey <jaben.carsey@intel.com>
Star Zeng (3):
MdePkg: Add definitions for SMBIOS spec 3.1.1
MdeModulePkg: Update PcdSmbiosDocRev to 0x1 for SMBIOS spec 3.1.1
ShellPkg SmbiosView: Add decoding of SMBIOS spec 3.1.1
MdeModulePkg/MdeModulePkg.dec | 2 +-
MdePkg/Include/IndustryStandard/SmBios.h | 25 +++++++++++++--
.../SmbiosView/PrintInfo.c | 6 +++-
.../SmbiosView/QueryTable.c | 37 ++++++++++++++++++++++
.../SmbiosView/QueryTable.h | 14 +++++++-
.../SmbiosView/SmbiosViewStrings.uni | 3 +-
6 files changed, 81 insertions(+), 6 deletions(-)
--
2.7.0.windows.1
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 1/3] MdePkg: Add definitions for SMBIOS spec 3.1.1
2017-01-22 8:17 [PATCH 0/3] Add SMBIOS spec 3.1.1 support Star Zeng
@ 2017-01-22 8:17 ` Star Zeng
2017-01-24 7:24 ` Gao, Liming
2017-01-22 8:17 ` [PATCH 2/3] MdeModulePkg: Update PcdSmbiosDocRev to 0x1 " Star Zeng
2017-01-22 8:17 ` [PATCH 3/3] ShellPkg SmbiosView: Add decoding of " Star Zeng
2 siblings, 1 reply; 19+ messages in thread
From: Star Zeng @ 2017-01-22 8:17 UTC (permalink / raw)
To: edk2-devel; +Cc: Star Zeng, Liming Gao, Michael Kinney
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=UTF-8, Size: 2799 bytes --]
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=349
This patch is to add definitions for below items.
Processor Information (Type 4):
- add socket SP3r2
- add AMD Zen Processor Family
Management Controller Host Interface (Type 42):
- include Host Interface Type and Protocol Identifier enumerations
Cc: Liming Gao <liming.gao@intel.com>
Cc: Michael Kinney <michael.d.kinney@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Star Zeng <star.zeng@intel.com>
---
MdePkg/Include/IndustryStandard/SmBios.h | 25 +++++++++++++++++++++++--
1 file changed, 23 insertions(+), 2 deletions(-)
diff --git a/MdePkg/Include/IndustryStandard/SmBios.h b/MdePkg/Include/IndustryStandard/SmBios.h
index f5c29bcbd0c8..6a8fa1b39d17 100644
--- a/MdePkg/Include/IndustryStandard/SmBios.h
+++ b/MdePkg/Include/IndustryStandard/SmBios.h
@@ -611,6 +611,7 @@ typedef enum {
ProcessorFamilyAmdOpteronX2000Series = 0x68,
ProcessorFamilyAmdOpteronASeries = 0x69,
ProcessorFamilyAmdOpteronX3000Series = 0x6A,
+ ProcessorFamilyAmdZen = 0x6B,
ProcessorFamilyHobbit = 0x70,
ProcessorFamilyCrusoeTM5000 = 0x78,
ProcessorFamilyCrusoeTM3000 = 0x79,
@@ -804,7 +805,8 @@ typedef enum {
ProcessorUpgradeSocketBGA1440 = 0x34,
ProcessorUpgradeSocketBGA1515 = 0x35,
ProcessorUpgradeSocketLGA3647_1 = 0x36,
- ProcessorUpgradeSocketSP3 = 0x37
+ ProcessorUpgradeSocketSP3 = 0x37,
+ ProcessorUpgradeSocketSP3r2 = 0x38
} PROCESSOR_UPGRADE;
///
@@ -2386,6 +2388,25 @@ typedef struct {
} SMBIOS_TABLE_TYPE41;
///
+/// Management Controller Host Interface - Interface Types.
+/// 00h ¨C 3Fh: MCTP Host Interfaces
+///
+typedef enum{
+ MCHostInterfaceTypeNetworkHostInterface = 0x40,
+ MCHostInterfaceTypeOemDefined = 0xF0
+} MC_HOST_INTERFACE_TYPE;
+
+///
+/// Management Controller Host Interface - Protocol Types.
+///
+typedef enum{
+ MCHostInterfaceProtocolTypeIPMI = 0x02,
+ MCHostInterfaceProtocolTypeMCTP = 0x03,
+ MCHostInterfaceProtocolTypeRedfishOverIP = 0x04,
+ MCHostInterfaceProtocolTypeOemDefined = 0xF0
+} MC_HOST_INTERFACE_PROTOCOL_TYPE;
+
+///
/// Management Controller Host Interface (Type 42).
///
/// The information in this structure defines the attributes of a Management
@@ -2404,7 +2425,7 @@ typedef struct {
///
typedef struct {
SMBIOS_STRUCTURE Hdr;
- UINT8 InterfaceType;
+ UINT8 InterfaceType; ///< The enumeration value from MC_HOST_INTERFACE_TYPE
UINT8 MCHostInterfaceData[1]; ///< This field has a minimum of four bytes
} SMBIOS_TABLE_TYPE42;
--
2.7.0.windows.1
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 2/3] MdeModulePkg: Update PcdSmbiosDocRev to 0x1 for SMBIOS spec 3.1.1
2017-01-22 8:17 [PATCH 0/3] Add SMBIOS spec 3.1.1 support Star Zeng
2017-01-22 8:17 ` [PATCH 1/3] MdePkg: Add definitions for SMBIOS spec 3.1.1 Star Zeng
@ 2017-01-22 8:17 ` Star Zeng
2017-01-24 7:27 ` Tian, Feng
2017-01-22 8:17 ` [PATCH 3/3] ShellPkg SmbiosView: Add decoding of " Star Zeng
2 siblings, 1 reply; 19+ messages in thread
From: Star Zeng @ 2017-01-22 8:17 UTC (permalink / raw)
To: edk2-devel; +Cc: Star Zeng, Feng Tian, Liming Gao
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=349
Cc: Feng Tian <feng.tian@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Star Zeng <star.zeng@intel.com>
---
MdeModulePkg/MdeModulePkg.dec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index 7e67ddccbb85..273cd7e1716f 100644
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -1519,7 +1519,7 @@ [PcdsFixedAtBuild, PcdsPatchableInModule, PcdsDynamic, PcdsDynamicEx]
## SMBIOS Docrev field in SMBIOS 3.0 (64-bit) Entry Point Structure.
# @Prompt SMBIOS Docrev field in SMBIOS 3.0 (64-bit) Entry Point Structure.
- gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosDocRev|0x0|UINT8|0x0001006A
+ gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosDocRev|0x1|UINT8|0x0001006A
## SMBIOS produce method.
# BIT0 set indicates 32-bit entry point and table are produced.<BR>
--
2.7.0.windows.1
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS spec 3.1.1
2017-01-22 8:17 [PATCH 0/3] Add SMBIOS spec 3.1.1 support Star Zeng
2017-01-22 8:17 ` [PATCH 1/3] MdePkg: Add definitions for SMBIOS spec 3.1.1 Star Zeng
2017-01-22 8:17 ` [PATCH 2/3] MdeModulePkg: Update PcdSmbiosDocRev to 0x1 " Star Zeng
@ 2017-01-22 8:17 ` Star Zeng
2017-01-22 8:56 ` Ni, Ruiyu
2 siblings, 1 reply; 19+ messages in thread
From: Star Zeng @ 2017-01-22 8:17 UTC (permalink / raw)
To: edk2-devel; +Cc: Star Zeng, Ruiyu Ni, Jaben Carsey
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=349
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>
---
.../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.<BR>
+ Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.<BR>
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.<BR>
+// Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.<BR>
// (C) Copyright 2014-2015 Hewlett-Packard Development Company, L.P.<BR>
// (C) Copyright 2015-2017 Hewlett Packard Enterprise Development LP<BR>
// 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
^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS spec 3.1.1
2017-01-22 8:17 ` [PATCH 3/3] ShellPkg SmbiosView: Add decoding of " Star Zeng
@ 2017-01-22 8:56 ` Ni, Ruiyu
2017-01-22 9:24 ` Zeng, Star
0 siblings, 1 reply; 19+ messages in thread
From: Ni, Ruiyu @ 2017-01-22 8:56 UTC (permalink / raw)
To: Zeng, Star, edk2-devel@lists.01.org; +Cc: Carsey, Jaben
Star,
Why some strings are hardcoded in C file while some are defined in UNI file?
What's the rule?
Thanks/Ray
> -----Original Message-----
> From: Zeng, Star
> Sent: Sunday, January 22, 2017 4:18 PM
> To: edk2-devel@lists.01.org
> Cc: Zeng, Star <star.zeng@intel.com>; Ni, Ruiyu <ruiyu.ni@intel.com>;
> Carsey, Jaben <jaben.carsey@intel.com>
> Subject: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS spec
> 3.1.1
>
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=349
>
> 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>
> ---
> .../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.<BR>
> + Copyright (c) 2005 - 2017, Intel Corporation. All rights
> + reserved.<BR>
> 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/SmbiosView
> Strings.uni
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView
> Strings.uni
> index b9032df076d2..7d694536dbcd 100644
> ---
> a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView
> Strings.uni
> +++
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView
> S
> +++ trings.uni
> @@ -1,6 +1,6 @@
> // /**
> //
> -// Copyright (c) 2005 - 2015, Intel Corporation. All rights reserved.<BR>
> +// Copyright (c) 2005 - 2017, Intel Corporation. All rights
> +reserved.<BR>
> // (C) Copyright 2014-2015 Hewlett-Packard Development Company, L.P.<BR>
> // (C) Copyright 2015-2017 Hewlett Packard Enterprise Development LP<BR>
> // 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
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS spec 3.1.1
2017-01-22 8:56 ` Ni, Ruiyu
@ 2017-01-22 9:24 ` Zeng, Star
2017-01-22 9:49 ` Ni, Ruiyu
0 siblings, 1 reply; 19+ messages in thread
From: Zeng, Star @ 2017-01-22 9:24 UTC (permalink / raw)
To: Ni, Ruiyu, edk2-devel@lists.01.org; +Cc: Carsey, Jaben, Zeng, Star
Ray & Jaben,
I am not so sure about the rule.
The mixed using of strings in c code and strings in uni file has been there since it was created.
Thanks,
Star
-----Original Message-----
From: Ni, Ruiyu
Sent: Sunday, January 22, 2017 4:56 PM
To: Zeng, Star <star.zeng@intel.com>; edk2-devel@lists.01.org
Cc: Carsey, Jaben <jaben.carsey@intel.com>
Subject: RE: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS spec 3.1.1
Star,
Why some strings are hardcoded in C file while some are defined in UNI file?
What's the rule?
Thanks/Ray
> -----Original Message-----
> From: Zeng, Star
> Sent: Sunday, January 22, 2017 4:18 PM
> To: edk2-devel@lists.01.org
> Cc: Zeng, Star <star.zeng@intel.com>; Ni, Ruiyu <ruiyu.ni@intel.com>;
> Carsey, Jaben <jaben.carsey@intel.com>
> Subject: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS spec
> 3.1.1
>
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=349
>
> 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>
> ---
> .../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.<BR>
> + Copyright (c) 2005 - 2017, Intel Corporation. All rights
> + reserved.<BR>
> 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/SmbiosView
> Strings.uni
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView
> Strings.uni
> index b9032df076d2..7d694536dbcd 100644
> ---
> a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView
> Strings.uni
> +++
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView
> S
> +++ trings.uni
> @@ -1,6 +1,6 @@
> // /**
> //
> -// Copyright (c) 2005 - 2015, Intel Corporation. All rights
> reserved.<BR>
> +// Copyright (c) 2005 - 2017, Intel Corporation. All rights
> +reserved.<BR>
> // (C) Copyright 2014-2015 Hewlett-Packard Development Company,
> L.P.<BR> // (C) Copyright 2015-2017 Hewlett Packard Enterprise
> Development LP<BR> // 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
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS spec 3.1.1
2017-01-22 9:24 ` Zeng, Star
@ 2017-01-22 9:49 ` Ni, Ruiyu
2017-01-23 17:40 ` Carsey, Jaben
0 siblings, 1 reply; 19+ messages in thread
From: Ni, Ruiyu @ 2017-01-22 9:49 UTC (permalink / raw)
To: Zeng, Star, edk2-devel@lists.01.org; +Cc: Carsey, Jaben
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
Thanks/Ray
> -----Original Message-----
> From: Zeng, Star
> Sent: Sunday, January 22, 2017 5:25 PM
> To: Ni, Ruiyu <ruiyu.ni@intel.com>; edk2-devel@lists.01.org
> Cc: Carsey, Jaben <jaben.carsey@intel.com>; Zeng, Star
> <star.zeng@intel.com>
> Subject: RE: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS
> spec 3.1.1
>
> Ray & Jaben,
>
> I am not so sure about the rule.
> The mixed using of strings in c code and strings in uni file has been there
> since it was created.
>
>
> Thanks,
> Star
> -----Original Message-----
> From: Ni, Ruiyu
> Sent: Sunday, January 22, 2017 4:56 PM
> To: Zeng, Star <star.zeng@intel.com>; edk2-devel@lists.01.org
> Cc: Carsey, Jaben <jaben.carsey@intel.com>
> Subject: RE: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS
> spec 3.1.1
>
> Star,
> Why some strings are hardcoded in C file while some are defined in UNI file?
> What's the rule?
>
> Thanks/Ray
>
> > -----Original Message-----
> > From: Zeng, Star
> > Sent: Sunday, January 22, 2017 4:18 PM
> > To: edk2-devel@lists.01.org
> > Cc: Zeng, Star <star.zeng@intel.com>; Ni, Ruiyu <ruiyu.ni@intel.com>;
> > Carsey, Jaben <jaben.carsey@intel.com>
> > Subject: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS spec
> > 3.1.1
> >
> > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=349
> >
> > 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>
> > ---
> > .../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.<BR>
> > + Copyright (c) 2005 - 2017, Intel Corporation. All rights
> > + reserved.<BR>
> > 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/SmbiosView
> > Strings.uni
> >
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView
> > Strings.uni
> > index b9032df076d2..7d694536dbcd 100644
> > ---
> >
> a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView
> > Strings.uni
> > +++
> >
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView
> > S
> > +++ trings.uni
> > @@ -1,6 +1,6 @@
> > // /**
> > //
> > -// Copyright (c) 2005 - 2015, Intel Corporation. All rights
> > reserved.<BR>
> > +// Copyright (c) 2005 - 2017, Intel Corporation. All rights
> > +reserved.<BR>
> > // (C) Copyright 2014-2015 Hewlett-Packard Development Company,
> > L.P.<BR> // (C) Copyright 2015-2017 Hewlett Packard Enterprise
> > Development LP<BR> // 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
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS spec 3.1.1
2017-01-22 9:49 ` Ni, Ruiyu
@ 2017-01-23 17:40 ` Carsey, Jaben
2017-01-23 20:51 ` Tim Lewis
0 siblings, 1 reply; 19+ messages in thread
From: Carsey, Jaben @ 2017-01-23 17:40 UTC (permalink / raw)
To: Ni, Ruiyu, Zeng, Star, edk2-devel@lists.01.org; +Cc: Carsey, Jaben
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
I think that string mixed use existed in the EDK version of the command and was just never removed.
-Jaben
> -----Original Message-----
> From: Ni, Ruiyu
> Sent: Sunday, January 22, 2017 1:49 AM
> To: Zeng, Star <star.zeng@intel.com>; edk2-devel@lists.01.org
> Cc: Carsey, Jaben <jaben.carsey@intel.com>
> Subject: RE: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS
> spec 3.1.1
> Importance: High
>
> Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
>
> Thanks/Ray
>
> > -----Original Message-----
> > From: Zeng, Star
> > Sent: Sunday, January 22, 2017 5:25 PM
> > To: Ni, Ruiyu <ruiyu.ni@intel.com>; edk2-devel@lists.01.org
> > Cc: Carsey, Jaben <jaben.carsey@intel.com>; Zeng, Star
> > <star.zeng@intel.com>
> > Subject: RE: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS
> > spec 3.1.1
> >
> > Ray & Jaben,
> >
> > I am not so sure about the rule.
> > The mixed using of strings in c code and strings in uni file has been there
> > since it was created.
> >
> >
> > Thanks,
> > Star
> > -----Original Message-----
> > From: Ni, Ruiyu
> > Sent: Sunday, January 22, 2017 4:56 PM
> > To: Zeng, Star <star.zeng@intel.com>; edk2-devel@lists.01.org
> > Cc: Carsey, Jaben <jaben.carsey@intel.com>
> > Subject: RE: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS
> > spec 3.1.1
> >
> > Star,
> > Why some strings are hardcoded in C file while some are defined in UNI
> file?
> > What's the rule?
> >
> > Thanks/Ray
> >
> > > -----Original Message-----
> > > From: Zeng, Star
> > > Sent: Sunday, January 22, 2017 4:18 PM
> > > To: edk2-devel@lists.01.org
> > > Cc: Zeng, Star <star.zeng@intel.com>; Ni, Ruiyu <ruiyu.ni@intel.com>;
> > > Carsey, Jaben <jaben.carsey@intel.com>
> > > Subject: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS
> spec
> > > 3.1.1
> > >
> > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=349
> > >
> > > 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>
> > > ---
> > > .../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.<BR>
> > > + Copyright (c) 2005 - 2017, Intel Corporation. All rights
> > > + reserved.<BR>
> > > 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/SmbiosView
> > > Strings.uni
> > >
> >
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView
> > > Strings.uni
> > > index b9032df076d2..7d694536dbcd 100644
> > > ---
> > >
> >
> a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView
> > > Strings.uni
> > > +++
> > >
> >
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView
> > > S
> > > +++ trings.uni
> > > @@ -1,6 +1,6 @@
> > > // /**
> > > //
> > > -// Copyright (c) 2005 - 2015, Intel Corporation. All rights
> > > reserved.<BR>
> > > +// Copyright (c) 2005 - 2017, Intel Corporation. All rights
> > > +reserved.<BR>
> > > // (C) Copyright 2014-2015 Hewlett-Packard Development Company,
> > > L.P.<BR> // (C) Copyright 2015-2017 Hewlett Packard Enterprise
> > > Development LP<BR> // 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
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS spec 3.1.1
2017-01-23 17:40 ` Carsey, Jaben
@ 2017-01-23 20:51 ` Tim Lewis
2017-01-23 21:14 ` Carsey, Jaben
2017-01-24 6:56 ` Ni, Ruiyu
0 siblings, 2 replies; 19+ messages in thread
From: Tim Lewis @ 2017-01-23 20:51 UTC (permalink / raw)
To: Carsey, Jaben, Ni, Ruiyu, Zeng, Star, edk2-devel@lists.01.org
Also, in some cases, the text is taken directly from the specification. Introducing HII strings in order to make these translatable when the source material is normative doesn't help, IMO.
Tim
-----Original Message-----
From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Carsey, Jaben
Sent: Monday, January 23, 2017 9:41 AM
To: Ni, Ruiyu <ruiyu.ni@intel.com>; Zeng, Star <star.zeng@intel.com>; edk2-devel@lists.01.org
Cc: Carsey, Jaben <jaben.carsey@intel.com>
Subject: Re: [edk2] [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS spec 3.1.1
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
I think that string mixed use existed in the EDK version of the command and was just never removed.
-Jaben
> -----Original Message-----
> From: Ni, Ruiyu
> Sent: Sunday, January 22, 2017 1:49 AM
> To: Zeng, Star <star.zeng@intel.com>; edk2-devel@lists.01.org
> Cc: Carsey, Jaben <jaben.carsey@intel.com>
> Subject: RE: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS
> spec 3.1.1
> Importance: High
>
> Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
>
> Thanks/Ray
>
> > -----Original Message-----
> > From: Zeng, Star
> > Sent: Sunday, January 22, 2017 5:25 PM
> > To: Ni, Ruiyu <ruiyu.ni@intel.com>; edk2-devel@lists.01.org
> > Cc: Carsey, Jaben <jaben.carsey@intel.com>; Zeng, Star
> > <star.zeng@intel.com>
> > Subject: RE: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS
> > spec 3.1.1
> >
> > Ray & Jaben,
> >
> > I am not so sure about the rule.
> > The mixed using of strings in c code and strings in uni file has
> > been there since it was created.
> >
> >
> > Thanks,
> > Star
> > -----Original Message-----
> > From: Ni, Ruiyu
> > Sent: Sunday, January 22, 2017 4:56 PM
> > To: Zeng, Star <star.zeng@intel.com>; edk2-devel@lists.01.org
> > Cc: Carsey, Jaben <jaben.carsey@intel.com>
> > Subject: RE: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS
> > spec 3.1.1
> >
> > Star,
> > Why some strings are hardcoded in C file while some are defined in
> > UNI
> file?
> > What's the rule?
> >
> > Thanks/Ray
> >
> > > -----Original Message-----
> > > From: Zeng, Star
> > > Sent: Sunday, January 22, 2017 4:18 PM
> > > To: edk2-devel@lists.01.org
> > > Cc: Zeng, Star <star.zeng@intel.com>; Ni, Ruiyu
> > > <ruiyu.ni@intel.com>; Carsey, Jaben <jaben.carsey@intel.com>
> > > Subject: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS
> spec
> > > 3.1.1
> > >
> > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=349
> > >
> > > 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>
> > > ---
> > > .../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.<BR>
> > > + Copyright (c) 2005 - 2017, Intel Corporation. All rights
> > > + reserved.<BR>
> > > 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/SmbiosView
> > > Strings.uni
> > >
> >
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView
> > > Strings.uni
> > > index b9032df076d2..7d694536dbcd 100644
> > > ---
> > >
> >
> a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView
> > > Strings.uni
> > > +++
> > >
> >
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView
> > > S
> > > +++ trings.uni
> > > @@ -1,6 +1,6 @@
> > > // /**
> > > //
> > > -// Copyright (c) 2005 - 2015, Intel Corporation. All rights
> > > reserved.<BR>
> > > +// Copyright (c) 2005 - 2017, Intel Corporation. All rights
> > > +reserved.<BR>
> > > // (C) Copyright 2014-2015 Hewlett-Packard Development Company,
> > > L.P.<BR> // (C) Copyright 2015-2017 Hewlett Packard Enterprise
> > > Development LP<BR> // 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
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS spec 3.1.1
2017-01-23 20:51 ` Tim Lewis
@ 2017-01-23 21:14 ` Carsey, Jaben
2017-01-23 21:25 ` Tim Lewis
2017-01-24 6:56 ` Ni, Ruiyu
1 sibling, 1 reply; 19+ messages in thread
From: Carsey, Jaben @ 2017-01-23 21:14 UTC (permalink / raw)
To: Tim Lewis, Ni, Ruiyu, Zeng, Star, edk2-devel@lists.01.org; +Cc: Carsey, Jaben
Tim,
I agree that some strings are directly from SMBIOS or UEFI specifications and are not needed to be localized.
Is there a disadvantage to allowing each compiler of the shell to make that an individual decision?
In either case, it might be worthwhile to verify that all of the embedded strings meet that criterion.
-Jaben
> -----Original Message-----
> From: Tim Lewis [mailto:tim.lewis@insyde.com]
> Sent: Monday, January 23, 2017 12:52 PM
> To: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ruiyu
> <ruiyu.ni@intel.com>; Zeng, Star <star.zeng@intel.com>; edk2-
> devel@lists.01.org
> Subject: RE: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS
> spec 3.1.1
> Importance: High
>
> Also, in some cases, the text is taken directly from the specification.
> Introducing HII strings in order to make these translatable when the source
> material is normative doesn't help, IMO.
>
> Tim
>
> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
> Carsey, Jaben
> Sent: Monday, January 23, 2017 9:41 AM
> To: Ni, Ruiyu <ruiyu.ni@intel.com>; Zeng, Star <star.zeng@intel.com>; edk2-
> devel@lists.01.org
> Cc: Carsey, Jaben <jaben.carsey@intel.com>
> Subject: Re: [edk2] [PATCH 3/3] ShellPkg SmbiosView: Add decoding of
> SMBIOS spec 3.1.1
>
> Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
>
> I think that string mixed use existed in the EDK version of the command and
> was just never removed.
>
> -Jaben
>
> > -----Original Message-----
> > From: Ni, Ruiyu
> > Sent: Sunday, January 22, 2017 1:49 AM
> > To: Zeng, Star <star.zeng@intel.com>; edk2-devel@lists.01.org
> > Cc: Carsey, Jaben <jaben.carsey@intel.com>
> > Subject: RE: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS
> > spec 3.1.1
> > Importance: High
> >
> > Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
> >
> > Thanks/Ray
> >
> > > -----Original Message-----
> > > From: Zeng, Star
> > > Sent: Sunday, January 22, 2017 5:25 PM
> > > To: Ni, Ruiyu <ruiyu.ni@intel.com>; edk2-devel@lists.01.org
> > > Cc: Carsey, Jaben <jaben.carsey@intel.com>; Zeng, Star
> > > <star.zeng@intel.com>
> > > Subject: RE: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS
> > > spec 3.1.1
> > >
> > > Ray & Jaben,
> > >
> > > I am not so sure about the rule.
> > > The mixed using of strings in c code and strings in uni file has
> > > been there since it was created.
> > >
> > >
> > > Thanks,
> > > Star
> > > -----Original Message-----
> > > From: Ni, Ruiyu
> > > Sent: Sunday, January 22, 2017 4:56 PM
> > > To: Zeng, Star <star.zeng@intel.com>; edk2-devel@lists.01.org
> > > Cc: Carsey, Jaben <jaben.carsey@intel.com>
> > > Subject: RE: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS
> > > spec 3.1.1
> > >
> > > Star,
> > > Why some strings are hardcoded in C file while some are defined in
> > > UNI
> > file?
> > > What's the rule?
> > >
> > > Thanks/Ray
> > >
> > > > -----Original Message-----
> > > > From: Zeng, Star
> > > > Sent: Sunday, January 22, 2017 4:18 PM
> > > > To: edk2-devel@lists.01.org
> > > > Cc: Zeng, Star <star.zeng@intel.com>; Ni, Ruiyu
> > > > <ruiyu.ni@intel.com>; Carsey, Jaben <jaben.carsey@intel.com>
> > > > Subject: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS
> > spec
> > > > 3.1.1
> > > >
> > > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=349
> > > >
> > > > 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>
> > > > ---
> > > > .../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.<BR>
> > > > + Copyright (c) 2005 - 2017, Intel Corporation. All rights
> > > > + reserved.<BR>
> > > > 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/SmbiosView
> > > > Strings.uni
> > > >
> > >
> >
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView
> > > > Strings.uni
> > > > index b9032df076d2..7d694536dbcd 100644
> > > > ---
> > > >
> > >
> >
> a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView
> > > > Strings.uni
> > > > +++
> > > >
> > >
> >
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView
> > > > S
> > > > +++ trings.uni
> > > > @@ -1,6 +1,6 @@
> > > > // /**
> > > > //
> > > > -// Copyright (c) 2005 - 2015, Intel Corporation. All rights
> > > > reserved.<BR>
> > > > +// Copyright (c) 2005 - 2017, Intel Corporation. All rights
> > > > +reserved.<BR>
> > > > // (C) Copyright 2014-2015 Hewlett-Packard Development Company,
> > > > L.P.<BR> // (C) Copyright 2015-2017 Hewlett Packard Enterprise
> > > > Development LP<BR> // 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
>
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS spec 3.1.1
2017-01-23 21:14 ` Carsey, Jaben
@ 2017-01-23 21:25 ` Tim Lewis
2017-01-23 21:47 ` Carsey, Jaben
0 siblings, 1 reply; 19+ messages in thread
From: Tim Lewis @ 2017-01-23 21:25 UTC (permalink / raw)
To: Carsey, Jaben, Ni, Ruiyu, Zeng, Star, edk2-devel@lists.01.org
Jaben --
I don't know exactly what you mean by each "compiler of the shell". I do know that HII strings and HII string handling add the largest discretionary, non-spec-required overhead to the Shell executable (based on our production mini-shell vs. the EDK2 shell) even without any second language. I understand it as a design goal of the EDK2 shell to allow localization (although it does not actually do any itself). I also understand that it is easier to enforce the strings-in-uni rule as an absolute. But it does come with a cost for those who want to use a fully functional shell in a much more restricted environment.
Tim
-----Original Message-----
From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Carsey, Jaben
Sent: Monday, January 23, 2017 1:15 PM
To: Tim Lewis <tim.lewis@insyde.com>; Ni, Ruiyu <ruiyu.ni@intel.com>; Zeng, Star <star.zeng@intel.com>; edk2-devel@lists.01.org
Cc: Carsey, Jaben <jaben.carsey@intel.com>
Subject: Re: [edk2] [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS spec 3.1.1
Tim,
I agree that some strings are directly from SMBIOS or UEFI specifications and are not needed to be localized.
Is there a disadvantage to allowing each compiler of the shell to make that an individual decision?
In either case, it might be worthwhile to verify that all of the embedded strings meet that criterion.
-Jaben
> -----Original Message-----
> From: Tim Lewis [mailto:tim.lewis@insyde.com]
> Sent: Monday, January 23, 2017 12:52 PM
> To: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ruiyu
> <ruiyu.ni@intel.com>; Zeng, Star <star.zeng@intel.com>; edk2-
> devel@lists.01.org
> Subject: RE: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS
> spec 3.1.1
> Importance: High
>
> Also, in some cases, the text is taken directly from the specification.
> Introducing HII strings in order to make these translatable when the
> source material is normative doesn't help, IMO.
>
> Tim
>
> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
> Carsey, Jaben
> Sent: Monday, January 23, 2017 9:41 AM
> To: Ni, Ruiyu <ruiyu.ni@intel.com>; Zeng, Star <star.zeng@intel.com>;
> edk2- devel@lists.01.org
> Cc: Carsey, Jaben <jaben.carsey@intel.com>
> Subject: Re: [edk2] [PATCH 3/3] ShellPkg SmbiosView: Add decoding of
> SMBIOS spec 3.1.1
>
> Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
>
> I think that string mixed use existed in the EDK version of the
> command and was just never removed.
>
> -Jaben
>
> > -----Original Message-----
> > From: Ni, Ruiyu
> > Sent: Sunday, January 22, 2017 1:49 AM
> > To: Zeng, Star <star.zeng@intel.com>; edk2-devel@lists.01.org
> > Cc: Carsey, Jaben <jaben.carsey@intel.com>
> > Subject: RE: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS
> > spec 3.1.1
> > Importance: High
> >
> > Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
> >
> > Thanks/Ray
> >
> > > -----Original Message-----
> > > From: Zeng, Star
> > > Sent: Sunday, January 22, 2017 5:25 PM
> > > To: Ni, Ruiyu <ruiyu.ni@intel.com>; edk2-devel@lists.01.org
> > > Cc: Carsey, Jaben <jaben.carsey@intel.com>; Zeng, Star
> > > <star.zeng@intel.com>
> > > Subject: RE: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of
> > > SMBIOS spec 3.1.1
> > >
> > > Ray & Jaben,
> > >
> > > I am not so sure about the rule.
> > > The mixed using of strings in c code and strings in uni file has
> > > been there since it was created.
> > >
> > >
> > > Thanks,
> > > Star
> > > -----Original Message-----
> > > From: Ni, Ruiyu
> > > Sent: Sunday, January 22, 2017 4:56 PM
> > > To: Zeng, Star <star.zeng@intel.com>; edk2-devel@lists.01.org
> > > Cc: Carsey, Jaben <jaben.carsey@intel.com>
> > > Subject: RE: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of
> > > SMBIOS spec 3.1.1
> > >
> > > Star,
> > > Why some strings are hardcoded in C file while some are defined in
> > > UNI
> > file?
> > > What's the rule?
> > >
> > > Thanks/Ray
> > >
> > > > -----Original Message-----
> > > > From: Zeng, Star
> > > > Sent: Sunday, January 22, 2017 4:18 PM
> > > > To: edk2-devel@lists.01.org
> > > > Cc: Zeng, Star <star.zeng@intel.com>; Ni, Ruiyu
> > > > <ruiyu.ni@intel.com>; Carsey, Jaben <jaben.carsey@intel.com>
> > > > Subject: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS
> > spec
> > > > 3.1.1
> > > >
> > > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=349
> > > >
> > > > 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>
> > > > ---
> > > > .../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.<BR>
> > > > + Copyright (c) 2005 - 2017, Intel Corporation. All rights
> > > > + reserved.<BR>
> > > > 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/SmbiosView
> > > > Strings.uni
> > > >
> > >
> >
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView
> > > > Strings.uni
> > > > index b9032df076d2..7d694536dbcd 100644
> > > > ---
> > > >
> > >
> >
> a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView
> > > > Strings.uni
> > > > +++
> > > >
> > >
> >
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView
> > > > S
> > > > +++ trings.uni
> > > > @@ -1,6 +1,6 @@
> > > > // /**
> > > > //
> > > > -// Copyright (c) 2005 - 2015, Intel Corporation. All rights
> > > > reserved.<BR>
> > > > +// Copyright (c) 2005 - 2017, Intel Corporation. All rights
> > > > +reserved.<BR>
> > > > // (C) Copyright 2014-2015 Hewlett-Packard Development Company,
> > > > L.P.<BR> // (C) Copyright 2015-2017 Hewlett Packard Enterprise
> > > > Development LP<BR> // 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
>
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS spec 3.1.1
2017-01-23 21:25 ` Tim Lewis
@ 2017-01-23 21:47 ` Carsey, Jaben
2017-01-23 21:57 ` Tim Lewis
0 siblings, 1 reply; 19+ messages in thread
From: Carsey, Jaben @ 2017-01-23 21:47 UTC (permalink / raw)
To: Tim Lewis, Ni, Ruiyu, Zeng, Star, edk2-devel@lists.01.org; +Cc: Carsey, Jaben
Tim,
I meant some customers do localize the shell and we don't want to arbitrarily restrict that.
Do you have any ideas on how to remove the overhead when localization is not required?
-Jaben
> -----Original Message-----
> From: Tim Lewis [mailto:tim.lewis@insyde.com]
> Sent: Monday, January 23, 2017 1:25 PM
> To: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ruiyu <ruiyu.ni@intel.com>;
> Zeng, Star <star.zeng@intel.com>; edk2-devel@lists.01.org
> Subject: RE: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS spec
> 3.1.1
> Importance: High
>
> Jaben --
>
> I don't know exactly what you mean by each "compiler of the shell". I do know
> that HII strings and HII string handling add the largest discretionary, non-spec-
> required overhead to the Shell executable (based on our production mini-
> shell vs. the EDK2 shell) even without any second language. I understand it as
> a design goal of the EDK2 shell to allow localization (although it does not
> actually do any itself). I also understand that it is easier to enforce the strings-
> in-uni rule as an absolute. But it does come with a cost for those who want to
> use a fully functional shell in a much more restricted environment.
>
>
> Tim
>
> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
> Carsey, Jaben
> Sent: Monday, January 23, 2017 1:15 PM
> To: Tim Lewis <tim.lewis@insyde.com>; Ni, Ruiyu <ruiyu.ni@intel.com>; Zeng,
> Star <star.zeng@intel.com>; edk2-devel@lists.01.org
> Cc: Carsey, Jaben <jaben.carsey@intel.com>
> Subject: Re: [edk2] [PATCH 3/3] ShellPkg SmbiosView: Add decoding of
> SMBIOS spec 3.1.1
>
> Tim,
>
> I agree that some strings are directly from SMBIOS or UEFI specifications and
> are not needed to be localized.
>
> Is there a disadvantage to allowing each compiler of the shell to make that an
> individual decision?
>
> In either case, it might be worthwhile to verify that all of the embedded strings
> meet that criterion.
>
> -Jaben
>
> > -----Original Message-----
> > From: Tim Lewis [mailto:tim.lewis@insyde.com]
> > Sent: Monday, January 23, 2017 12:52 PM
> > To: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ruiyu
> > <ruiyu.ni@intel.com>; Zeng, Star <star.zeng@intel.com>; edk2-
> > devel@lists.01.org
> > Subject: RE: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS
> > spec 3.1.1
> > Importance: High
> >
> > Also, in some cases, the text is taken directly from the specification.
> > Introducing HII strings in order to make these translatable when the
> > source material is normative doesn't help, IMO.
> >
> > Tim
> >
> > -----Original Message-----
> > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
> > Carsey, Jaben
> > Sent: Monday, January 23, 2017 9:41 AM
> > To: Ni, Ruiyu <ruiyu.ni@intel.com>; Zeng, Star <star.zeng@intel.com>;
> > edk2- devel@lists.01.org
> > Cc: Carsey, Jaben <jaben.carsey@intel.com>
> > Subject: Re: [edk2] [PATCH 3/3] ShellPkg SmbiosView: Add decoding of
> > SMBIOS spec 3.1.1
> >
> > Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
> >
> > I think that string mixed use existed in the EDK version of the
> > command and was just never removed.
> >
> > -Jaben
> >
> > > -----Original Message-----
> > > From: Ni, Ruiyu
> > > Sent: Sunday, January 22, 2017 1:49 AM
> > > To: Zeng, Star <star.zeng@intel.com>; edk2-devel@lists.01.org
> > > Cc: Carsey, Jaben <jaben.carsey@intel.com>
> > > Subject: RE: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS
> > > spec 3.1.1
> > > Importance: High
> > >
> > > Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
> > >
> > > Thanks/Ray
> > >
> > > > -----Original Message-----
> > > > From: Zeng, Star
> > > > Sent: Sunday, January 22, 2017 5:25 PM
> > > > To: Ni, Ruiyu <ruiyu.ni@intel.com>; edk2-devel@lists.01.org
> > > > Cc: Carsey, Jaben <jaben.carsey@intel.com>; Zeng, Star
> > > > <star.zeng@intel.com>
> > > > Subject: RE: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of
> > > > SMBIOS spec 3.1.1
> > > >
> > > > Ray & Jaben,
> > > >
> > > > I am not so sure about the rule.
> > > > The mixed using of strings in c code and strings in uni file has
> > > > been there since it was created.
> > > >
> > > >
> > > > Thanks,
> > > > Star
> > > > -----Original Message-----
> > > > From: Ni, Ruiyu
> > > > Sent: Sunday, January 22, 2017 4:56 PM
> > > > To: Zeng, Star <star.zeng@intel.com>; edk2-devel@lists.01.org
> > > > Cc: Carsey, Jaben <jaben.carsey@intel.com>
> > > > Subject: RE: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of
> > > > SMBIOS spec 3.1.1
> > > >
> > > > Star,
> > > > Why some strings are hardcoded in C file while some are defined in
> > > > UNI
> > > file?
> > > > What's the rule?
> > > >
> > > > Thanks/Ray
> > > >
> > > > > -----Original Message-----
> > > > > From: Zeng, Star
> > > > > Sent: Sunday, January 22, 2017 4:18 PM
> > > > > To: edk2-devel@lists.01.org
> > > > > Cc: Zeng, Star <star.zeng@intel.com>; Ni, Ruiyu
> > > > > <ruiyu.ni@intel.com>; Carsey, Jaben <jaben.carsey@intel.com>
> > > > > Subject: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS
> > > spec
> > > > > 3.1.1
> > > > >
> > > > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=349
> > > > >
> > > > > 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>
> > > > > ---
> > > > > .../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.<BR>
> > > > > + Copyright (c) 2005 - 2017, Intel Corporation. All rights
> > > > > + reserved.<BR>
> > > > > 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/SmbiosView
> > > > > Strings.uni
> > > > >
> > > >
> > >
> > b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView
> > > > > Strings.uni
> > > > > index b9032df076d2..7d694536dbcd 100644
> > > > > ---
> > > > >
> > > >
> > >
> > a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView
> > > > > Strings.uni
> > > > > +++
> > > > >
> > > >
> > >
> > b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView
> > > > > S
> > > > > +++ trings.uni
> > > > > @@ -1,6 +1,6 @@
> > > > > // /**
> > > > > //
> > > > > -// Copyright (c) 2005 - 2015, Intel Corporation. All rights
> > > > > reserved.<BR>
> > > > > +// Copyright (c) 2005 - 2017, Intel Corporation. All rights
> > > > > +reserved.<BR>
> > > > > // (C) Copyright 2014-2015 Hewlett-Packard Development Company,
> > > > > L.P.<BR> // (C) Copyright 2015-2017 Hewlett Packard Enterprise
> > > > > Development LP<BR> // 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
> >
> > _______________________________________________
> > edk2-devel mailing list
> > edk2-devel@lists.01.org
> > https://lists.01.org/mailman/listinfo/edk2-devel
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS spec 3.1.1
2017-01-23 21:47 ` Carsey, Jaben
@ 2017-01-23 21:57 ` Tim Lewis
2017-01-23 21:59 ` Carsey, Jaben
0 siblings, 1 reply; 19+ messages in thread
From: Tim Lewis @ 2017-01-23 21:57 UTC (permalink / raw)
To: Carsey, Jaben, Ni, Ruiyu, Zeng, Star, edk2-devel@lists.01.org
We have not found a good solution for handling this automatically, although we have toyed with alternate ways to process the .uni file to create string literals with the StrDefs.h #defines and alternate versions of the ShellLib functions that use them.
Tim
-----Original Message-----
From: Carsey, Jaben [mailto:jaben.carsey@intel.com]
Sent: Monday, January 23, 2017 1:48 PM
To: Tim Lewis <tim.lewis@insyde.com>; Ni, Ruiyu <ruiyu.ni@intel.com>; Zeng, Star <star.zeng@intel.com>; edk2-devel@lists.01.org
Cc: Carsey, Jaben <jaben.carsey@intel.com>
Subject: RE: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS spec 3.1.1
Tim,
I meant some customers do localize the shell and we don't want to arbitrarily restrict that.
Do you have any ideas on how to remove the overhead when localization is not required?
-Jaben
> -----Original Message-----
> From: Tim Lewis [mailto:tim.lewis@insyde.com]
> Sent: Monday, January 23, 2017 1:25 PM
> To: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ruiyu
> <ruiyu.ni@intel.com>; Zeng, Star <star.zeng@intel.com>;
> edk2-devel@lists.01.org
> Subject: RE: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS
> spec
> 3.1.1
> Importance: High
>
> Jaben --
>
> I don't know exactly what you mean by each "compiler of the shell". I
> do know that HII strings and HII string handling add the largest
> discretionary, non-spec- required overhead to the Shell executable
> (based on our production mini- shell vs. the EDK2 shell) even without
> any second language. I understand it as a design goal of the EDK2
> shell to allow localization (although it does not actually do any
> itself). I also understand that it is easier to enforce the strings-
> in-uni rule as an absolute. But it does come with a cost for those who want to use a fully functional shell in a much more restricted environment.
>
>
> Tim
>
> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
> Carsey, Jaben
> Sent: Monday, January 23, 2017 1:15 PM
> To: Tim Lewis <tim.lewis@insyde.com>; Ni, Ruiyu <ruiyu.ni@intel.com>;
> Zeng, Star <star.zeng@intel.com>; edk2-devel@lists.01.org
> Cc: Carsey, Jaben <jaben.carsey@intel.com>
> Subject: Re: [edk2] [PATCH 3/3] ShellPkg SmbiosView: Add decoding of
> SMBIOS spec 3.1.1
>
> Tim,
>
> I agree that some strings are directly from SMBIOS or UEFI
> specifications and are not needed to be localized.
>
> Is there a disadvantage to allowing each compiler of the shell to make
> that an individual decision?
>
> In either case, it might be worthwhile to verify that all of the
> embedded strings meet that criterion.
>
> -Jaben
>
> > -----Original Message-----
> > From: Tim Lewis [mailto:tim.lewis@insyde.com]
> > Sent: Monday, January 23, 2017 12:52 PM
> > To: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ruiyu
> > <ruiyu.ni@intel.com>; Zeng, Star <star.zeng@intel.com>; edk2-
> > devel@lists.01.org
> > Subject: RE: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS
> > spec 3.1.1
> > Importance: High
> >
> > Also, in some cases, the text is taken directly from the specification.
> > Introducing HII strings in order to make these translatable when the
> > source material is normative doesn't help, IMO.
> >
> > Tim
> >
> > -----Original Message-----
> > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf
> > Of Carsey, Jaben
> > Sent: Monday, January 23, 2017 9:41 AM
> > To: Ni, Ruiyu <ruiyu.ni@intel.com>; Zeng, Star
> > <star.zeng@intel.com>;
> > edk2- devel@lists.01.org
> > Cc: Carsey, Jaben <jaben.carsey@intel.com>
> > Subject: Re: [edk2] [PATCH 3/3] ShellPkg SmbiosView: Add decoding of
> > SMBIOS spec 3.1.1
> >
> > Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
> >
> > I think that string mixed use existed in the EDK version of the
> > command and was just never removed.
> >
> > -Jaben
> >
> > > -----Original Message-----
> > > From: Ni, Ruiyu
> > > Sent: Sunday, January 22, 2017 1:49 AM
> > > To: Zeng, Star <star.zeng@intel.com>; edk2-devel@lists.01.org
> > > Cc: Carsey, Jaben <jaben.carsey@intel.com>
> > > Subject: RE: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of
> > > SMBIOS spec 3.1.1
> > > Importance: High
> > >
> > > Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
> > >
> > > Thanks/Ray
> > >
> > > > -----Original Message-----
> > > > From: Zeng, Star
> > > > Sent: Sunday, January 22, 2017 5:25 PM
> > > > To: Ni, Ruiyu <ruiyu.ni@intel.com>; edk2-devel@lists.01.org
> > > > Cc: Carsey, Jaben <jaben.carsey@intel.com>; Zeng, Star
> > > > <star.zeng@intel.com>
> > > > Subject: RE: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of
> > > > SMBIOS spec 3.1.1
> > > >
> > > > Ray & Jaben,
> > > >
> > > > I am not so sure about the rule.
> > > > The mixed using of strings in c code and strings in uni file has
> > > > been there since it was created.
> > > >
> > > >
> > > > Thanks,
> > > > Star
> > > > -----Original Message-----
> > > > From: Ni, Ruiyu
> > > > Sent: Sunday, January 22, 2017 4:56 PM
> > > > To: Zeng, Star <star.zeng@intel.com>; edk2-devel@lists.01.org
> > > > Cc: Carsey, Jaben <jaben.carsey@intel.com>
> > > > Subject: RE: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of
> > > > SMBIOS spec 3.1.1
> > > >
> > > > Star,
> > > > Why some strings are hardcoded in C file while some are defined
> > > > in UNI
> > > file?
> > > > What's the rule?
> > > >
> > > > Thanks/Ray
> > > >
> > > > > -----Original Message-----
> > > > > From: Zeng, Star
> > > > > Sent: Sunday, January 22, 2017 4:18 PM
> > > > > To: edk2-devel@lists.01.org
> > > > > Cc: Zeng, Star <star.zeng@intel.com>; Ni, Ruiyu
> > > > > <ruiyu.ni@intel.com>; Carsey, Jaben <jaben.carsey@intel.com>
> > > > > Subject: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of
> > > > > SMBIOS
> > > spec
> > > > > 3.1.1
> > > > >
> > > > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=349
> > > > >
> > > > > 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>
> > > > > ---
> > > > > .../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.<BR>
> > > > > + Copyright (c) 2005 - 2017, Intel Corporation. All rights
> > > > > + reserved.<BR>
> > > > > 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/SmbiosView
> > > > > Strings.uni
> > > > >
> > > >
> > >
> > b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView
> > > > > Strings.uni
> > > > > index b9032df076d2..7d694536dbcd 100644
> > > > > ---
> > > > >
> > > >
> > >
> > a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView
> > > > > Strings.uni
> > > > > +++
> > > > >
> > > >
> > >
> > b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView
> > > > > S
> > > > > +++ trings.uni
> > > > > @@ -1,6 +1,6 @@
> > > > > // /**
> > > > > //
> > > > > -// Copyright (c) 2005 - 2015, Intel Corporation. All rights
> > > > > reserved.<BR>
> > > > > +// Copyright (c) 2005 - 2017, Intel Corporation. All rights
> > > > > +reserved.<BR>
> > > > > // (C) Copyright 2014-2015 Hewlett-Packard Development
> > > > > Company, L.P.<BR> // (C) Copyright 2015-2017 Hewlett Packard
> > > > > Enterprise Development LP<BR> // 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
> >
> > _______________________________________________
> > edk2-devel mailing list
> > edk2-devel@lists.01.org
> > https://lists.01.org/mailman/listinfo/edk2-devel
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS spec 3.1.1
2017-01-23 21:57 ` Tim Lewis
@ 2017-01-23 21:59 ` Carsey, Jaben
2017-01-23 22:02 ` Tim Lewis
0 siblings, 1 reply; 19+ messages in thread
From: Carsey, Jaben @ 2017-01-23 21:59 UTC (permalink / raw)
To: Tim Lewis, Ni, Ruiyu, Zeng, Star, edk2-devel@lists.01.org; +Cc: Carsey, Jaben
I was wondering if some replaced version of HiiLib could use the StrDefs.h differently and save the overhead if only one language is present...
-Jaben
> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Tim
> Lewis
> Sent: Monday, January 23, 2017 1:57 PM
> To: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ruiyu <ruiyu.ni@intel.com>;
> Zeng, Star <star.zeng@intel.com>; edk2-devel@lists.01.org
> Subject: Re: [edk2] [PATCH 3/3] ShellPkg SmbiosView: Add decoding of
> SMBIOS spec 3.1.1
> Importance: High
>
> We have not found a good solution for handling this automatically, although
> we have toyed with alternate ways to process the .uni file to create string
> literals with the StrDefs.h #defines and alternate versions of the ShellLib
> functions that use them.
>
> Tim
>
> -----Original Message-----
> From: Carsey, Jaben [mailto:jaben.carsey@intel.com]
> Sent: Monday, January 23, 2017 1:48 PM
> To: Tim Lewis <tim.lewis@insyde.com>; Ni, Ruiyu <ruiyu.ni@intel.com>; Zeng,
> Star <star.zeng@intel.com>; edk2-devel@lists.01.org
> Cc: Carsey, Jaben <jaben.carsey@intel.com>
> Subject: RE: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS spec
> 3.1.1
>
> Tim,
>
> I meant some customers do localize the shell and we don't want to arbitrarily
> restrict that.
>
> Do you have any ideas on how to remove the overhead when localization is
> not required?
>
> -Jaben
>
> > -----Original Message-----
> > From: Tim Lewis [mailto:tim.lewis@insyde.com]
> > Sent: Monday, January 23, 2017 1:25 PM
> > To: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ruiyu
> > <ruiyu.ni@intel.com>; Zeng, Star <star.zeng@intel.com>;
> > edk2-devel@lists.01.org
> > Subject: RE: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS
> > spec
> > 3.1.1
> > Importance: High
> >
> > Jaben --
> >
> > I don't know exactly what you mean by each "compiler of the shell". I
> > do know that HII strings and HII string handling add the largest
> > discretionary, non-spec- required overhead to the Shell executable
> > (based on our production mini- shell vs. the EDK2 shell) even without
> > any second language. I understand it as a design goal of the EDK2
> > shell to allow localization (although it does not actually do any
> > itself). I also understand that it is easier to enforce the strings-
> > in-uni rule as an absolute. But it does come with a cost for those who want
> to use a fully functional shell in a much more restricted environment.
> >
> >
> > Tim
> >
> > -----Original Message-----
> > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
> > Carsey, Jaben
> > Sent: Monday, January 23, 2017 1:15 PM
> > To: Tim Lewis <tim.lewis@insyde.com>; Ni, Ruiyu <ruiyu.ni@intel.com>;
> > Zeng, Star <star.zeng@intel.com>; edk2-devel@lists.01.org
> > Cc: Carsey, Jaben <jaben.carsey@intel.com>
> > Subject: Re: [edk2] [PATCH 3/3] ShellPkg SmbiosView: Add decoding of
> > SMBIOS spec 3.1.1
> >
> > Tim,
> >
> > I agree that some strings are directly from SMBIOS or UEFI
> > specifications and are not needed to be localized.
> >
> > Is there a disadvantage to allowing each compiler of the shell to make
> > that an individual decision?
> >
> > In either case, it might be worthwhile to verify that all of the
> > embedded strings meet that criterion.
> >
> > -Jaben
> >
> > > -----Original Message-----
> > > From: Tim Lewis [mailto:tim.lewis@insyde.com]
> > > Sent: Monday, January 23, 2017 12:52 PM
> > > To: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ruiyu
> > > <ruiyu.ni@intel.com>; Zeng, Star <star.zeng@intel.com>; edk2-
> > > devel@lists.01.org
> > > Subject: RE: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS
> > > spec 3.1.1
> > > Importance: High
> > >
> > > Also, in some cases, the text is taken directly from the specification.
> > > Introducing HII strings in order to make these translatable when the
> > > source material is normative doesn't help, IMO.
> > >
> > > Tim
> > >
> > > -----Original Message-----
> > > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf
> > > Of Carsey, Jaben
> > > Sent: Monday, January 23, 2017 9:41 AM
> > > To: Ni, Ruiyu <ruiyu.ni@intel.com>; Zeng, Star
> > > <star.zeng@intel.com>;
> > > edk2- devel@lists.01.org
> > > Cc: Carsey, Jaben <jaben.carsey@intel.com>
> > > Subject: Re: [edk2] [PATCH 3/3] ShellPkg SmbiosView: Add decoding of
> > > SMBIOS spec 3.1.1
> > >
> > > Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
> > >
> > > I think that string mixed use existed in the EDK version of the
> > > command and was just never removed.
> > >
> > > -Jaben
> > >
> > > > -----Original Message-----
> > > > From: Ni, Ruiyu
> > > > Sent: Sunday, January 22, 2017 1:49 AM
> > > > To: Zeng, Star <star.zeng@intel.com>; edk2-devel@lists.01.org
> > > > Cc: Carsey, Jaben <jaben.carsey@intel.com>
> > > > Subject: RE: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of
> > > > SMBIOS spec 3.1.1
> > > > Importance: High
> > > >
> > > > Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
> > > >
> > > > Thanks/Ray
> > > >
> > > > > -----Original Message-----
> > > > > From: Zeng, Star
> > > > > Sent: Sunday, January 22, 2017 5:25 PM
> > > > > To: Ni, Ruiyu <ruiyu.ni@intel.com>; edk2-devel@lists.01.org
> > > > > Cc: Carsey, Jaben <jaben.carsey@intel.com>; Zeng, Star
> > > > > <star.zeng@intel.com>
> > > > > Subject: RE: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of
> > > > > SMBIOS spec 3.1.1
> > > > >
> > > > > Ray & Jaben,
> > > > >
> > > > > I am not so sure about the rule.
> > > > > The mixed using of strings in c code and strings in uni file has
> > > > > been there since it was created.
> > > > >
> > > > >
> > > > > Thanks,
> > > > > Star
> > > > > -----Original Message-----
> > > > > From: Ni, Ruiyu
> > > > > Sent: Sunday, January 22, 2017 4:56 PM
> > > > > To: Zeng, Star <star.zeng@intel.com>; edk2-devel@lists.01.org
> > > > > Cc: Carsey, Jaben <jaben.carsey@intel.com>
> > > > > Subject: RE: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of
> > > > > SMBIOS spec 3.1.1
> > > > >
> > > > > Star,
> > > > > Why some strings are hardcoded in C file while some are defined
> > > > > in UNI
> > > > file?
> > > > > What's the rule?
> > > > >
> > > > > Thanks/Ray
> > > > >
> > > > > > -----Original Message-----
> > > > > > From: Zeng, Star
> > > > > > Sent: Sunday, January 22, 2017 4:18 PM
> > > > > > To: edk2-devel@lists.01.org
> > > > > > Cc: Zeng, Star <star.zeng@intel.com>; Ni, Ruiyu
> > > > > > <ruiyu.ni@intel.com>; Carsey, Jaben <jaben.carsey@intel.com>
> > > > > > Subject: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of
> > > > > > SMBIOS
> > > > spec
> > > > > > 3.1.1
> > > > > >
> > > > > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=349
> > > > > >
> > > > > > 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>
> > > > > > ---
> > > > > > .../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.<BR>
> > > > > > + Copyright (c) 2005 - 2017, Intel Corporation. All rights
> > > > > > + reserved.<BR>
> > > > > > 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/SmbiosView
> > > > > > Strings.uni
> > > > > >
> > > > >
> > > >
> > >
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView
> > > > > > Strings.uni
> > > > > > index b9032df076d2..7d694536dbcd 100644
> > > > > > ---
> > > > > >
> > > > >
> > > >
> > >
> a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView
> > > > > > Strings.uni
> > > > > > +++
> > > > > >
> > > > >
> > > >
> > >
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView
> > > > > > S
> > > > > > +++ trings.uni
> > > > > > @@ -1,6 +1,6 @@
> > > > > > // /**
> > > > > > //
> > > > > > -// Copyright (c) 2005 - 2015, Intel Corporation. All rights
> > > > > > reserved.<BR>
> > > > > > +// Copyright (c) 2005 - 2017, Intel Corporation. All rights
> > > > > > +reserved.<BR>
> > > > > > // (C) Copyright 2014-2015 Hewlett-Packard Development
> > > > > > Company, L.P.<BR> // (C) Copyright 2015-2017 Hewlett Packard
> > > > > > Enterprise Development LP<BR> // 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
> > >
> > > _______________________________________________
> > > edk2-devel mailing list
> > > edk2-devel@lists.01.org
> > > https://lists.01.org/mailman/listinfo/edk2-devel
> > _______________________________________________
> > edk2-devel mailing list
> > edk2-devel@lists.01.org
> > https://lists.01.org/mailman/listinfo/edk2-devel
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS spec 3.1.1
2017-01-23 21:59 ` Carsey, Jaben
@ 2017-01-23 22:02 ` Tim Lewis
0 siblings, 0 replies; 19+ messages in thread
From: Tim Lewis @ 2017-01-23 22:02 UTC (permalink / raw)
To: Carsey, Jaben, Ni, Ruiyu, Zeng, Star, edk2-devel@lists.01.org
In our case, the main firmware is multi-lingual, but the shell is mono-lingual, and they are built together. The reason is: setup users require more user-friendly than shell users in our experience.
Tim
-----Original Message-----
From: Carsey, Jaben [mailto:jaben.carsey@intel.com]
Sent: Monday, January 23, 2017 1:59 PM
To: Tim Lewis <tim.lewis@insyde.com>; Ni, Ruiyu <ruiyu.ni@intel.com>; Zeng, Star <star.zeng@intel.com>; edk2-devel@lists.01.org
Cc: Carsey, Jaben <jaben.carsey@intel.com>
Subject: RE: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS spec 3.1.1
I was wondering if some replaced version of HiiLib could use the StrDefs.h differently and save the overhead if only one language is present...
-Jaben
> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
> Tim Lewis
> Sent: Monday, January 23, 2017 1:57 PM
> To: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ruiyu
> <ruiyu.ni@intel.com>; Zeng, Star <star.zeng@intel.com>;
> edk2-devel@lists.01.org
> Subject: Re: [edk2] [PATCH 3/3] ShellPkg SmbiosView: Add decoding of
> SMBIOS spec 3.1.1
> Importance: High
>
> We have not found a good solution for handling this automatically,
> although we have toyed with alternate ways to process the .uni file to
> create string literals with the StrDefs.h #defines and alternate
> versions of the ShellLib functions that use them.
>
> Tim
>
> -----Original Message-----
> From: Carsey, Jaben [mailto:jaben.carsey@intel.com]
> Sent: Monday, January 23, 2017 1:48 PM
> To: Tim Lewis <tim.lewis@insyde.com>; Ni, Ruiyu <ruiyu.ni@intel.com>;
> Zeng, Star <star.zeng@intel.com>; edk2-devel@lists.01.org
> Cc: Carsey, Jaben <jaben.carsey@intel.com>
> Subject: RE: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS
> spec
> 3.1.1
>
> Tim,
>
> I meant some customers do localize the shell and we don't want to
> arbitrarily restrict that.
>
> Do you have any ideas on how to remove the overhead when localization
> is not required?
>
> -Jaben
>
> > -----Original Message-----
> > From: Tim Lewis [mailto:tim.lewis@insyde.com]
> > Sent: Monday, January 23, 2017 1:25 PM
> > To: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ruiyu
> > <ruiyu.ni@intel.com>; Zeng, Star <star.zeng@intel.com>;
> > edk2-devel@lists.01.org
> > Subject: RE: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS
> > spec
> > 3.1.1
> > Importance: High
> >
> > Jaben --
> >
> > I don't know exactly what you mean by each "compiler of the shell".
> > I do know that HII strings and HII string handling add the largest
> > discretionary, non-spec- required overhead to the Shell executable
> > (based on our production mini- shell vs. the EDK2 shell) even
> > without any second language. I understand it as a design goal of
> > the EDK2 shell to allow localization (although it does not actually
> > do any itself). I also understand that it is easier to enforce the
> > strings- in-uni rule as an absolute. But it does come with a cost
> > for those who want
> to use a fully functional shell in a much more restricted environment.
> >
> >
> > Tim
> >
> > -----Original Message-----
> > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf
> > Of Carsey, Jaben
> > Sent: Monday, January 23, 2017 1:15 PM
> > To: Tim Lewis <tim.lewis@insyde.com>; Ni, Ruiyu
> > <ruiyu.ni@intel.com>; Zeng, Star <star.zeng@intel.com>;
> > edk2-devel@lists.01.org
> > Cc: Carsey, Jaben <jaben.carsey@intel.com>
> > Subject: Re: [edk2] [PATCH 3/3] ShellPkg SmbiosView: Add decoding of
> > SMBIOS spec 3.1.1
> >
> > Tim,
> >
> > I agree that some strings are directly from SMBIOS or UEFI
> > specifications and are not needed to be localized.
> >
> > Is there a disadvantage to allowing each compiler of the shell to
> > make that an individual decision?
> >
> > In either case, it might be worthwhile to verify that all of the
> > embedded strings meet that criterion.
> >
> > -Jaben
> >
> > > -----Original Message-----
> > > From: Tim Lewis [mailto:tim.lewis@insyde.com]
> > > Sent: Monday, January 23, 2017 12:52 PM
> > > To: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ruiyu
> > > <ruiyu.ni@intel.com>; Zeng, Star <star.zeng@intel.com>; edk2-
> > > devel@lists.01.org
> > > Subject: RE: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of
> > > SMBIOS spec 3.1.1
> > > Importance: High
> > >
> > > Also, in some cases, the text is taken directly from the specification.
> > > Introducing HII strings in order to make these translatable when
> > > the source material is normative doesn't help, IMO.
> > >
> > > Tim
> > >
> > > -----Original Message-----
> > > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On
> > > Behalf Of Carsey, Jaben
> > > Sent: Monday, January 23, 2017 9:41 AM
> > > To: Ni, Ruiyu <ruiyu.ni@intel.com>; Zeng, Star
> > > <star.zeng@intel.com>;
> > > edk2- devel@lists.01.org
> > > Cc: Carsey, Jaben <jaben.carsey@intel.com>
> > > Subject: Re: [edk2] [PATCH 3/3] ShellPkg SmbiosView: Add decoding
> > > of SMBIOS spec 3.1.1
> > >
> > > Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
> > >
> > > I think that string mixed use existed in the EDK version of the
> > > command and was just never removed.
> > >
> > > -Jaben
> > >
> > > > -----Original Message-----
> > > > From: Ni, Ruiyu
> > > > Sent: Sunday, January 22, 2017 1:49 AM
> > > > To: Zeng, Star <star.zeng@intel.com>; edk2-devel@lists.01.org
> > > > Cc: Carsey, Jaben <jaben.carsey@intel.com>
> > > > Subject: RE: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of
> > > > SMBIOS spec 3.1.1
> > > > Importance: High
> > > >
> > > > Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
> > > >
> > > > Thanks/Ray
> > > >
> > > > > -----Original Message-----
> > > > > From: Zeng, Star
> > > > > Sent: Sunday, January 22, 2017 5:25 PM
> > > > > To: Ni, Ruiyu <ruiyu.ni@intel.com>; edk2-devel@lists.01.org
> > > > > Cc: Carsey, Jaben <jaben.carsey@intel.com>; Zeng, Star
> > > > > <star.zeng@intel.com>
> > > > > Subject: RE: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of
> > > > > SMBIOS spec 3.1.1
> > > > >
> > > > > Ray & Jaben,
> > > > >
> > > > > I am not so sure about the rule.
> > > > > The mixed using of strings in c code and strings in uni file
> > > > > has been there since it was created.
> > > > >
> > > > >
> > > > > Thanks,
> > > > > Star
> > > > > -----Original Message-----
> > > > > From: Ni, Ruiyu
> > > > > Sent: Sunday, January 22, 2017 4:56 PM
> > > > > To: Zeng, Star <star.zeng@intel.com>; edk2-devel@lists.01.org
> > > > > Cc: Carsey, Jaben <jaben.carsey@intel.com>
> > > > > Subject: RE: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of
> > > > > SMBIOS spec 3.1.1
> > > > >
> > > > > Star,
> > > > > Why some strings are hardcoded in C file while some are
> > > > > defined in UNI
> > > > file?
> > > > > What's the rule?
> > > > >
> > > > > Thanks/Ray
> > > > >
> > > > > > -----Original Message-----
> > > > > > From: Zeng, Star
> > > > > > Sent: Sunday, January 22, 2017 4:18 PM
> > > > > > To: edk2-devel@lists.01.org
> > > > > > Cc: Zeng, Star <star.zeng@intel.com>; Ni, Ruiyu
> > > > > > <ruiyu.ni@intel.com>; Carsey, Jaben <jaben.carsey@intel.com>
> > > > > > Subject: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of
> > > > > > SMBIOS
> > > > spec
> > > > > > 3.1.1
> > > > > >
> > > > > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=349
> > > > > >
> > > > > > 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>
> > > > > > ---
> > > > > > .../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/PrintIn
> > > > fo
> > > > .c
> > > > > >
> > > >
> > b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c
> > > > > > index ecb8e2492453..1d6002b92593 100644
> > > > > > ---
> > > > > >
> > > > a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintIn
> > > > fo
> > > > .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.<BR>
> > > > > > + Copyright (c) 2005 - 2017, Intel Corporation. All rights
> > > > > > + reserved.<BR>
> > > > > > 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/SmbiosView
> > > > > > Strings.uni
> > > > > >
> > > > >
> > > >
> > >
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView
> > > > > > Strings.uni
> > > > > > index b9032df076d2..7d694536dbcd 100644
> > > > > > ---
> > > > > >
> > > > >
> > > >
> > >
> a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView
> > > > > > Strings.uni
> > > > > > +++
> > > > > >
> > > > >
> > > >
> > >
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView
> > > > > > S
> > > > > > +++ trings.uni
> > > > > > @@ -1,6 +1,6 @@
> > > > > > // /**
> > > > > > //
> > > > > > -// Copyright (c) 2005 - 2015, Intel Corporation. All rights
> > > > > > reserved.<BR>
> > > > > > +// Copyright (c) 2005 - 2017, Intel Corporation. All rights
> > > > > > +reserved.<BR>
> > > > > > // (C) Copyright 2014-2015 Hewlett-Packard Development
> > > > > > Company, L.P.<BR> // (C) Copyright 2015-2017 Hewlett Packard
> > > > > > Enterprise Development LP<BR> // 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
> > >
> > > _______________________________________________
> > > edk2-devel mailing list
> > > edk2-devel@lists.01.org
> > > https://lists.01.org/mailman/listinfo/edk2-devel
> > _______________________________________________
> > edk2-devel mailing list
> > edk2-devel@lists.01.org
> > https://lists.01.org/mailman/listinfo/edk2-devel
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS spec 3.1.1
2017-01-23 20:51 ` Tim Lewis
2017-01-23 21:14 ` Carsey, Jaben
@ 2017-01-24 6:56 ` Ni, Ruiyu
1 sibling, 0 replies; 19+ messages in thread
From: Ni, Ruiyu @ 2017-01-24 6:56 UTC (permalink / raw)
To: Tim Lewis, Carsey, Jaben, Zeng, Star, edk2-devel@lists.01.org
Tim,
I agree with you.
If the text to display has to be in English. Embedding them in C file makes code more readable.
Thanks/Ray
> -----Original Message-----
> From: Tim Lewis [mailto:tim.lewis@insyde.com]
> Sent: Tuesday, January 24, 2017 4:52 AM
> To: Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ruiyu <ruiyu.ni@intel.com>;
> Zeng, Star <star.zeng@intel.com>; edk2-devel@lists.01.org
> Subject: RE: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS
> spec 3.1.1
>
> Also, in some cases, the text is taken directly from the specification.
> Introducing HII strings in order to make these translatable when the source
> material is normative doesn't help, IMO.
>
> Tim
>
> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
> Carsey, Jaben
> Sent: Monday, January 23, 2017 9:41 AM
> To: Ni, Ruiyu <ruiyu.ni@intel.com>; Zeng, Star <star.zeng@intel.com>; edk2-
> devel@lists.01.org
> Cc: Carsey, Jaben <jaben.carsey@intel.com>
> Subject: Re: [edk2] [PATCH 3/3] ShellPkg SmbiosView: Add decoding of
> SMBIOS spec 3.1.1
>
> Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
>
> I think that string mixed use existed in the EDK version of the command and
> was just never removed.
>
> -Jaben
>
> > -----Original Message-----
> > From: Ni, Ruiyu
> > Sent: Sunday, January 22, 2017 1:49 AM
> > To: Zeng, Star <star.zeng@intel.com>; edk2-devel@lists.01.org
> > Cc: Carsey, Jaben <jaben.carsey@intel.com>
> > Subject: RE: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS
> > spec 3.1.1
> > Importance: High
> >
> > Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
> >
> > Thanks/Ray
> >
> > > -----Original Message-----
> > > From: Zeng, Star
> > > Sent: Sunday, January 22, 2017 5:25 PM
> > > To: Ni, Ruiyu <ruiyu.ni@intel.com>; edk2-devel@lists.01.org
> > > Cc: Carsey, Jaben <jaben.carsey@intel.com>; Zeng, Star
> > > <star.zeng@intel.com>
> > > Subject: RE: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS
> > > spec 3.1.1
> > >
> > > Ray & Jaben,
> > >
> > > I am not so sure about the rule.
> > > The mixed using of strings in c code and strings in uni file has
> > > been there since it was created.
> > >
> > >
> > > Thanks,
> > > Star
> > > -----Original Message-----
> > > From: Ni, Ruiyu
> > > Sent: Sunday, January 22, 2017 4:56 PM
> > > To: Zeng, Star <star.zeng@intel.com>; edk2-devel@lists.01.org
> > > Cc: Carsey, Jaben <jaben.carsey@intel.com>
> > > Subject: RE: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS
> > > spec 3.1.1
> > >
> > > Star,
> > > Why some strings are hardcoded in C file while some are defined in
> > > UNI
> > file?
> > > What's the rule?
> > >
> > > Thanks/Ray
> > >
> > > > -----Original Message-----
> > > > From: Zeng, Star
> > > > Sent: Sunday, January 22, 2017 4:18 PM
> > > > To: edk2-devel@lists.01.org
> > > > Cc: Zeng, Star <star.zeng@intel.com>; Ni, Ruiyu
> > > > <ruiyu.ni@intel.com>; Carsey, Jaben <jaben.carsey@intel.com>
> > > > Subject: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS
> > spec
> > > > 3.1.1
> > > >
> > > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=349
> > > >
> > > > 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>
> > > > ---
> > > > .../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.<BR>
> > > > + Copyright (c) 2005 - 2017, Intel Corporation. All rights
> > > > + reserved.<BR>
> > > > 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/SmbiosView
> > > > Strings.uni
> > > >
> > >
> >
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView
> > > > Strings.uni
> > > > index b9032df076d2..7d694536dbcd 100644
> > > > ---
> > > >
> > >
> >
> a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView
> > > > Strings.uni
> > > > +++
> > > >
> > >
> >
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView
> > > > S
> > > > +++ trings.uni
> > > > @@ -1,6 +1,6 @@
> > > > // /**
> > > > //
> > > > -// Copyright (c) 2005 - 2015, Intel Corporation. All rights
> > > > reserved.<BR>
> > > > +// Copyright (c) 2005 - 2017, Intel Corporation. All rights
> > > > +reserved.<BR>
> > > > // (C) Copyright 2014-2015 Hewlett-Packard Development Company,
> > > > L.P.<BR> // (C) Copyright 2015-2017 Hewlett Packard Enterprise
> > > > Development LP<BR> // 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
>
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 1/3] MdePkg: Add definitions for SMBIOS spec 3.1.1
2017-01-22 8:17 ` [PATCH 1/3] MdePkg: Add definitions for SMBIOS spec 3.1.1 Star Zeng
@ 2017-01-24 7:24 ` Gao, Liming
2017-01-24 7:25 ` Zeng, Star
0 siblings, 1 reply; 19+ messages in thread
From: Gao, Liming @ 2017-01-24 7:24 UTC (permalink / raw)
To: Zeng, Star, edk2-devel@lists.01.org; +Cc: Kinney, Michael D
Star:
Please fix the incorrect character in comments. With this change, I add my Reviewed-by: Liming Gao <liming.gao@intel.com>
+/// 00h �C 3Fh: MCTP Host Interfaces
Thanks
Liming
>-----Original Message-----
>From: Zeng, Star
>Sent: Sunday, January 22, 2017 4:18 PM
>To: edk2-devel@lists.01.org
>Cc: Zeng, Star <star.zeng@intel.com>; Gao, Liming <liming.gao@intel.com>;
>Kinney, Michael D <michael.d.kinney@intel.com>
>Subject: [PATCH 1/3] MdePkg: Add definitions for SMBIOS spec 3.1.1
>
>REF: https://bugzilla.tianocore.org/show_bug.cgi?id=349
>
>This patch is to add definitions for below items.
>Processor Information (Type 4):
>- add socket SP3r2
>- add AMD Zen Processor Family
>Management Controller Host Interface (Type 42):
>- include Host Interface Type and Protocol Identifier enumerations
>
>Cc: Liming Gao <liming.gao@intel.com>
>Cc: Michael Kinney <michael.d.kinney@intel.com>
>Contributed-under: TianoCore Contribution Agreement 1.0
>Signed-off-by: Star Zeng <star.zeng@intel.com>
>---
> MdePkg/Include/IndustryStandard/SmBios.h | 25
>+++++++++++++++++++++++--
> 1 file changed, 23 insertions(+), 2 deletions(-)
>
>diff --git a/MdePkg/Include/IndustryStandard/SmBios.h
>b/MdePkg/Include/IndustryStandard/SmBios.h
>index f5c29bcbd0c8..6a8fa1b39d17 100644
>--- a/MdePkg/Include/IndustryStandard/SmBios.h
>+++ b/MdePkg/Include/IndustryStandard/SmBios.h
>@@ -611,6 +611,7 @@ typedef enum {
> ProcessorFamilyAmdOpteronX2000Series = 0x68,
> ProcessorFamilyAmdOpteronASeries = 0x69,
> ProcessorFamilyAmdOpteronX3000Series = 0x6A,
>+ ProcessorFamilyAmdZen = 0x6B,
> ProcessorFamilyHobbit = 0x70,
> ProcessorFamilyCrusoeTM5000 = 0x78,
> ProcessorFamilyCrusoeTM3000 = 0x79,
>@@ -804,7 +805,8 @@ typedef enum {
> ProcessorUpgradeSocketBGA1440 = 0x34,
> ProcessorUpgradeSocketBGA1515 = 0x35,
> ProcessorUpgradeSocketLGA3647_1 = 0x36,
>- ProcessorUpgradeSocketSP3 = 0x37
>+ ProcessorUpgradeSocketSP3 = 0x37,
>+ ProcessorUpgradeSocketSP3r2 = 0x38
> } PROCESSOR_UPGRADE;
>
> ///
>@@ -2386,6 +2388,25 @@ typedef struct {
> } SMBIOS_TABLE_TYPE41;
>
> ///
>+/// Management Controller Host Interface - Interface Types.
>+/// 00h �C 3Fh: MCTP Host Interfaces
>+///
>+typedef enum{
>+ MCHostInterfaceTypeNetworkHostInterface = 0x40,
>+ MCHostInterfaceTypeOemDefined = 0xF0
>+} MC_HOST_INTERFACE_TYPE;
>+
>+///
>+/// Management Controller Host Interface - Protocol Types.
>+///
>+typedef enum{
>+ MCHostInterfaceProtocolTypeIPMI = 0x02,
>+ MCHostInterfaceProtocolTypeMCTP = 0x03,
>+ MCHostInterfaceProtocolTypeRedfishOverIP = 0x04,
>+ MCHostInterfaceProtocolTypeOemDefined = 0xF0
>+} MC_HOST_INTERFACE_PROTOCOL_TYPE;
>+
>+///
> /// Management Controller Host Interface (Type 42).
> ///
> /// The information in this structure defines the attributes of a Management
>@@ -2404,7 +2425,7 @@ typedef struct {
> ///
> typedef struct {
> SMBIOS_STRUCTURE Hdr;
>- UINT8 InterfaceType;
>+ UINT8 InterfaceType; ///< The enumeration value from
>MC_HOST_INTERFACE_TYPE
> UINT8 MCHostInterfaceData[1]; ///< This field has a minimum
>of four bytes
> } SMBIOS_TABLE_TYPE42;
>
>--
>2.7.0.windows.1
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 1/3] MdePkg: Add definitions for SMBIOS spec 3.1.1
2017-01-24 7:24 ` Gao, Liming
@ 2017-01-24 7:25 ` Zeng, Star
0 siblings, 0 replies; 19+ messages in thread
From: Zeng, Star @ 2017-01-24 7:25 UTC (permalink / raw)
To: Gao, Liming, edk2-devel@lists.01.org; +Cc: Kinney, Michael D, Zeng, Star
Yes, good catch.
Thanks,
Star
-----Original Message-----
From: Gao, Liming
Sent: Tuesday, January 24, 2017 3:25 PM
To: Zeng, Star <star.zeng@intel.com>; edk2-devel@lists.01.org
Cc: Kinney, Michael D <michael.d.kinney@intel.com>
Subject: RE: [PATCH 1/3] MdePkg: Add definitions for SMBIOS spec 3.1.1
Star:
Please fix the incorrect character in comments. With this change, I add my Reviewed-by: Liming Gao <liming.gao@intel.com>
+/// 00h C 3Fh: MCTP Host Interfaces
Thanks
Liming
>-----Original Message-----
>From: Zeng, Star
>Sent: Sunday, January 22, 2017 4:18 PM
>To: edk2-devel@lists.01.org
>Cc: Zeng, Star <star.zeng@intel.com>; Gao, Liming
><liming.gao@intel.com>; Kinney, Michael D <michael.d.kinney@intel.com>
>Subject: [PATCH 1/3] MdePkg: Add definitions for SMBIOS spec 3.1.1
>
>REF: https://bugzilla.tianocore.org/show_bug.cgi?id=349
>
>This patch is to add definitions for below items.
>Processor Information (Type 4):
>- add socket SP3r2
>- add AMD Zen Processor Family
>Management Controller Host Interface (Type 42):
>- include Host Interface Type and Protocol Identifier enumerations
>
>Cc: Liming Gao <liming.gao@intel.com>
>Cc: Michael Kinney <michael.d.kinney@intel.com>
>Contributed-under: TianoCore Contribution Agreement 1.0
>Signed-off-by: Star Zeng <star.zeng@intel.com>
>---
> MdePkg/Include/IndustryStandard/SmBios.h | 25
>+++++++++++++++++++++++--
> 1 file changed, 23 insertions(+), 2 deletions(-)
>
>diff --git a/MdePkg/Include/IndustryStandard/SmBios.h
>b/MdePkg/Include/IndustryStandard/SmBios.h
>index f5c29bcbd0c8..6a8fa1b39d17 100644
>--- a/MdePkg/Include/IndustryStandard/SmBios.h
>+++ b/MdePkg/Include/IndustryStandard/SmBios.h
>@@ -611,6 +611,7 @@ typedef enum {
> ProcessorFamilyAmdOpteronX2000Series = 0x68,
> ProcessorFamilyAmdOpteronASeries = 0x69,
> ProcessorFamilyAmdOpteronX3000Series = 0x6A,
>+ ProcessorFamilyAmdZen = 0x6B,
> ProcessorFamilyHobbit = 0x70,
> ProcessorFamilyCrusoeTM5000 = 0x78,
> ProcessorFamilyCrusoeTM3000 = 0x79,
>@@ -804,7 +805,8 @@ typedef enum {
> ProcessorUpgradeSocketBGA1440 = 0x34,
> ProcessorUpgradeSocketBGA1515 = 0x35,
> ProcessorUpgradeSocketLGA3647_1 = 0x36,
>- ProcessorUpgradeSocketSP3 = 0x37
>+ ProcessorUpgradeSocketSP3 = 0x37,
>+ ProcessorUpgradeSocketSP3r2 = 0x38
> } PROCESSOR_UPGRADE;
>
> ///
>@@ -2386,6 +2388,25 @@ typedef struct { } SMBIOS_TABLE_TYPE41;
>
> ///
>+/// Management Controller Host Interface - Interface Types.
>+/// 00h C 3Fh: MCTP Host Interfaces
>+///
>+typedef enum{
>+ MCHostInterfaceTypeNetworkHostInterface = 0x40,
>+ MCHostInterfaceTypeOemDefined = 0xF0
>+} MC_HOST_INTERFACE_TYPE;
>+
>+///
>+/// Management Controller Host Interface - Protocol Types.
>+///
>+typedef enum{
>+ MCHostInterfaceProtocolTypeIPMI = 0x02,
>+ MCHostInterfaceProtocolTypeMCTP = 0x03,
>+ MCHostInterfaceProtocolTypeRedfishOverIP = 0x04,
>+ MCHostInterfaceProtocolTypeOemDefined = 0xF0
>+} MC_HOST_INTERFACE_PROTOCOL_TYPE;
>+
>+///
> /// Management Controller Host Interface (Type 42).
> ///
> /// The information in this structure defines the attributes of a
>Management @@ -2404,7 +2425,7 @@ typedef struct { /// typedef struct
>{
> SMBIOS_STRUCTURE Hdr;
>- UINT8 InterfaceType;
>+ UINT8 InterfaceType; ///< The enumeration value from
>MC_HOST_INTERFACE_TYPE
> UINT8 MCHostInterfaceData[1]; ///< This field has a minimum
>of four bytes
> } SMBIOS_TABLE_TYPE42;
>
>--
>2.7.0.windows.1
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 2/3] MdeModulePkg: Update PcdSmbiosDocRev to 0x1 for SMBIOS spec 3.1.1
2017-01-22 8:17 ` [PATCH 2/3] MdeModulePkg: Update PcdSmbiosDocRev to 0x1 " Star Zeng
@ 2017-01-24 7:27 ` Tian, Feng
0 siblings, 0 replies; 19+ messages in thread
From: Tian, Feng @ 2017-01-24 7:27 UTC (permalink / raw)
To: Zeng, Star, edk2-devel@lists.01.org; +Cc: Gao, Liming, Tian, Feng
reviewed-by: Feng Tian <feng.tian@intel.com>
-----Original Message-----
From: Zeng, Star
Sent: Sunday, January 22, 2017 4:18 PM
To: edk2-devel@lists.01.org
Cc: Zeng, Star <star.zeng@intel.com>; Tian, Feng <feng.tian@intel.com>; Gao, Liming <liming.gao@intel.com>
Subject: [PATCH 2/3] MdeModulePkg: Update PcdSmbiosDocRev to 0x1 for SMBIOS spec 3.1.1
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=349
Cc: Feng Tian <feng.tian@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Star Zeng <star.zeng@intel.com>
---
MdeModulePkg/MdeModulePkg.dec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec index 7e67ddccbb85..273cd7e1716f 100644
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -1519,7 +1519,7 @@ [PcdsFixedAtBuild, PcdsPatchableInModule, PcdsDynamic, PcdsDynamicEx]
## SMBIOS Docrev field in SMBIOS 3.0 (64-bit) Entry Point Structure.
# @Prompt SMBIOS Docrev field in SMBIOS 3.0 (64-bit) Entry Point Structure.
- gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosDocRev|0x0|UINT8|0x0001006A
+ gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosDocRev|0x1|UINT8|0x0001006A
## SMBIOS produce method.
# BIT0 set indicates 32-bit entry point and table are produced.<BR>
--
2.7.0.windows.1
^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2017-01-24 7:27 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-22 8:17 [PATCH 0/3] Add SMBIOS spec 3.1.1 support Star Zeng
2017-01-22 8:17 ` [PATCH 1/3] MdePkg: Add definitions for SMBIOS spec 3.1.1 Star Zeng
2017-01-24 7:24 ` Gao, Liming
2017-01-24 7:25 ` Zeng, Star
2017-01-22 8:17 ` [PATCH 2/3] MdeModulePkg: Update PcdSmbiosDocRev to 0x1 " Star Zeng
2017-01-24 7:27 ` Tian, Feng
2017-01-22 8:17 ` [PATCH 3/3] ShellPkg SmbiosView: Add decoding of " Star Zeng
2017-01-22 8:56 ` Ni, Ruiyu
2017-01-22 9:24 ` Zeng, Star
2017-01-22 9:49 ` Ni, Ruiyu
2017-01-23 17:40 ` Carsey, Jaben
2017-01-23 20:51 ` Tim Lewis
2017-01-23 21:14 ` Carsey, Jaben
2017-01-23 21:25 ` Tim Lewis
2017-01-23 21:47 ` Carsey, Jaben
2017-01-23 21:57 ` Tim Lewis
2017-01-23 21:59 ` Carsey, Jaben
2017-01-23 22:02 ` Tim Lewis
2017-01-24 6:56 ` Ni, Ruiyu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox