[PATCH V5 0/8] Update SMBIOS 3.3.0

[PATCH V5 0/8] Update SMBIOS 3.3.0

[Gao, Zhichao]

The following changes were made to version 3.2.0 of the document to produce this
version:
System Slots (Type 9):
- Add PCI Express Gen 4 values
- Clarify bus number usage for PCI Express
Memory Device (Type 17):
- Add new memory device type value (HBM) and new form factor value (Die)
- Update the string for Intel persistent memory
Various:
- Add support for RISC-V processors, add structure type 44 (processor-additional information)
- add support for CXL Flexbus

V2:
Add the new definition to MdePkg/Smbios.h.

V3:
Avoid change the enum name to casue the incompatible issue.
Add the comment instead change the enum define name.

V4:
Use the enums instead of the magic numbers.
Plan to add a new BZ to add the missing enums/MACROs and convert all
magic numbers into enums/MACROs.

V5:
Fix the typo Smbios.h to SmBios.h.

Notes:
Clarify bus number usage for PCI Express - Update the spec no code change requirement
Add support for RISC-V processors, add structure type 44 (processor-additional information) -
Already done at https://bugzilla.tianocore.org/show_bug.cgi?id=2202

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>

Gao, Zhichao (8):
  MdePkg/Smbios.h: SMBIOS 3.3.0 add PCI gen4 values for type 9
  MdePkg/Smbios.h: SMBIOS 3.3.0 add support for CXL Flexbus
  MdePkg/Smbios.h: SMBIOS 3.3.0 Add value HBM and Die for type 17
  MdePkg/Smbios.h: SMBIOS 3.3.0 Update Intel Persistent Memory string
  ShellPkg/SmbiosView: SMBIOS 3.3.0 add PCI gen4 values for type 9
  ShellPkg/SmbiosView: SMBIOS 3.3.0 add support for CXL Flexbus
  ShellPkg/SmbiosView: SMBIOS 3.3.0 Add value HBM and Die for type 17
  ShellPkg/SmbiosView: SMBIOS 3.3.0 Update "Intel persistent memory"

 MdePkg/Include/IndustryStandard/SmBios.h           | 25 ++++++++---
 .../SmbiosView/QueryTable.c                        | 50 ++++++++++++++++++++--
 .../SmbiosView/QueryTable.h                        |  4 +-
 3 files changed, 70 insertions(+), 9 deletions(-)

-- 
2.16.2.windows.1

[PATCH V5 0/8] Update SMBIOS 3.3.0

[Gao, Zhichao]

The following changes were made to version 3.2.0 of the document to produce this
version:
System Slots (Type 9):
- Add PCI Express Gen 4 values
- Clarify bus number usage for PCI Express
Memory Device (Type 17):
- Add new memory device type value (HBM) and new form factor value (Die)
- Update the string for Intel persistent memory
Various:
- Add support for RISC-V processors, add structure type 44 (processor-additional information)
- add support for CXL Flexbus

V2:
Add the new definition to MdePkg/Smbios.h.

V3:
Avoid change the enum name to casue the incompatible issue.
Add the comment instead change the enum define name.

V4:
Use the enums instead of the magic numbers.
Plan to add a new BZ to add the missing enums/MACROs and convert all
magic numbers into enums/MACROs.

V5:
Fix the typo Smbios.h to SmBios.h.

Notes:
Clarify bus number usage for PCI Express - Update the spec no code change requirement
Add support for RISC-V processors, add structure type 44 (processor-additional information) -
Already done at https://bugzilla.tianocore.org/show_bug.cgi?id=2202

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>

Gao, Zhichao (8):
  MdePkg/SmBios.h: SMBIOS 3.3.0 add PCI gen4 values for type 9
  MdePkg/SmBios.h: SMBIOS 3.3.0 add support for CXL Flexbus
  MdePkg/SmBios.h: SMBIOS 3.3.0 Add value HBM and Die for type 17
  MdePkg/SmBios.h: SMBIOS 3.3.0 Update Intel Persistent Memory string
  ShellPkg/SmbiosView: SMBIOS 3.3.0 add PCI gen4 values for type 9
  ShellPkg/SmbiosView: SMBIOS 3.3.0 add support for CXL Flexbus
  ShellPkg/SmbiosView: SMBIOS 3.3.0 Add value HBM and Die for type 17
  ShellPkg/SmbiosView: SMBIOS 3.3.0 Update "Intel persistent memory"

 MdePkg/Include/IndustryStandard/SmBios.h           | 25 ++++++++---
 .../SmbiosView/QueryTable.c                        | 50 ++++++++++++++++++++--
 .../SmbiosView/QueryTable.h                        |  4 +-
 3 files changed, 70 insertions(+), 9 deletions(-)

-- 
2.16.2.windows.1

[PATCH V5 1/8] MdePkg/SmBios.h: SMBIOS 3.3.0 add PCI gen4 values for type 9

[Gao, Zhichao]

From: "Gao, Zhichao" <zhichao.gao@intel.com>

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

System Slots (Type 9):
- SMBIOSCR00184: add PCI Express Gen 4 values

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
Reviewed-by: Sai Chaganty <rangasai.v.chaganty@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
---
 MdePkg/Include/IndustryStandard/SmBios.h | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/MdePkg/Include/IndustryStandard/SmBios.h b/MdePkg/Include/IndustryStandard/SmBios.h
index f504cc84e7..0a31e37f18 100644
--- a/MdePkg/Include/IndustryStandard/SmBios.h
+++ b/MdePkg/Include/IndustryStandard/SmBios.h
@@ -1,7 +1,7 @@
 /** @file
   Industry Standard Definitions of SMBIOS Table Specification v3.3.0.
 
-Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>
 (C) Copyright 2015-2017 Hewlett Packard Enterprise Development LP<BR>
 (C) Copyright 2015 - 2019 Hewlett Packard Enterprise Development LP<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -1307,7 +1307,13 @@ typedef enum {
   SlotTypePciExpressGen3X2             = 0xB3,
   SlotTypePciExpressGen3X4             = 0xB4,
   SlotTypePciExpressGen3X8             = 0xB5,
-  SlotTypePciExpressGen3X16            = 0xB6
+  SlotTypePciExpressGen3X16            = 0xB6,
+  SlotTypePciExpressGen4               = 0xB8,
+  SlotTypePciExpressGen4X1             = 0xB9,
+  SlotTypePciExpressGen4X2             = 0xBA,
+  SlotTypePciExpressGen4X4             = 0xBB,
+  SlotTypePciExpressGen4X8             = 0xBC,
+  SlotTypePciExpressGen4X16            = 0xBD
 } MISC_SLOT_TYPE;
 
 ///
-- 
2.16.2.windows.1

[PATCH V5 2/8] MdePkg/SmBios.h: SMBIOS 3.3.0 add support for CXL Flexbus

[Gao, Zhichao]

From: "Gao, Zhichao" <zhichao.gao@intel.com>

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

Various:
- SMBIOSCR00183: add support for CXL Flexbus

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
Reviewed-by: Sai Chaganty <rangasai.v.chaganty@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
---
 MdePkg/Include/IndustryStandard/SmBios.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/MdePkg/Include/IndustryStandard/SmBios.h b/MdePkg/Include/IndustryStandard/SmBios.h
index 0a31e37f18..54ec837671 100644
--- a/MdePkg/Include/IndustryStandard/SmBios.h
+++ b/MdePkg/Include/IndustryStandard/SmBios.h
@@ -1285,6 +1285,7 @@ typedef enum {
   SlotTypePciExpressMini52pinWithBSKO  = 0x21,      ///< PCI Express Mini 52-pin (CEM spec. 2.0) with bottom-side keep-outs.
   SlotTypePciExpressMini52pinWithoutBSKO = 0x22,    ///< PCI Express Mini 52-pin (CEM spec. 2.0) without bottom-side keep-outs.
   SlotTypePciExpressMini76pin          = 0x23,      ///< PCI Express Mini 76-pin (CEM spec. 2.0) Corresponds to Display-Mini card.
+  SlotTypeCXLFlexbus10                 = 0x30,
   SlotTypePC98C20                      = 0xA0,
   SlotTypePC98C24                      = 0xA1,
   SlotTypePC98E                        = 0xA2,
@@ -1612,7 +1613,8 @@ typedef enum {
   MemoryArrayLocationPc98C20AddonCard      = 0xA0,
   MemoryArrayLocationPc98C24AddonCard      = 0xA1,
   MemoryArrayLocationPc98EAddonCard        = 0xA2,
-  MemoryArrayLocationPc98LocalBusAddonCard = 0xA3
+  MemoryArrayLocationPc98LocalBusAddonCard = 0xA3,
+  MemoryArrayLocationCXLFlexbus10AddonCard = 0xA4
 } MEMORY_ARRAY_LOCATION;
 
 ///
-- 
2.16.2.windows.1

[PATCH V5 3/8] MdePkg/SmBios.h: SMBIOS 3.3.0 Add value HBM and Die for type 17

[Gao, Zhichao]

From: "Gao, Zhichao" <zhichao.gao@intel.com>

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

Memory Device (Type 17):
- SMBIOSCR00178: add new memory device type value (HBM) and new form
factor value (Die)

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
---
 MdePkg/Include/IndustryStandard/SmBios.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/MdePkg/Include/IndustryStandard/SmBios.h b/MdePkg/Include/IndustryStandard/SmBios.h
index 54ec837671..9aa8cf3e72 100644
--- a/MdePkg/Include/IndustryStandard/SmBios.h
+++ b/MdePkg/Include/IndustryStandard/SmBios.h
@@ -1681,7 +1681,8 @@ typedef enum {
   MemoryFormFactorRimm                     = 0x0C,
   MemoryFormFactorSodimm                   = 0x0D,
   MemoryFormFactorSrimm                    = 0x0E,
-  MemoryFormFactorFbDimm                   = 0x0F
+  MemoryFormFactorFbDimm                   = 0x0F,
+  MemoryFormFactorDie                      = 0x10
 } MEMORY_FORM_FACTOR;
 
 ///
@@ -1715,7 +1716,9 @@ typedef enum {
   MemoryTypeLpddr2                         = 0x1C,
   MemoryTypeLpddr3                         = 0x1D,
   MemoryTypeLpddr4                         = 0x1E,
-  MemoryTypeLogicalNonVolatileDevice       = 0x1F
+  MemoryTypeLogicalNonVolatileDevice       = 0x1F,
+  MemoryTypeHBM                            = 0x20,
+  MemoryTypeHBM2                           = 0x21
 } MEMORY_DEVICE_TYPE;
 
 ///
-- 
2.16.2.windows.1

[PATCH V5 4/8] MdePkg/SmBios.h: SMBIOS 3.3.0 Update Intel Persistent Memory string

[Gao, Zhichao]

From: "Gao, Zhichao" <zhichao.gao@intel.com>

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

Memory Device (Type 17):
- SMBIOSCR00179: update the string for Intel persistent memory

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
---
 MdePkg/Include/IndustryStandard/SmBios.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/MdePkg/Include/IndustryStandard/SmBios.h b/MdePkg/Include/IndustryStandard/SmBios.h
index 9aa8cf3e72..8b3c4d7ba9 100644
--- a/MdePkg/Include/IndustryStandard/SmBios.h
+++ b/MdePkg/Include/IndustryStandard/SmBios.h
@@ -1753,6 +1753,10 @@ typedef enum {
   MemoryTechnologyNvdimmN                   = 0x04,
   MemoryTechnologyNvdimmF                   = 0x05,
   MemoryTechnologyNvdimmP                   = 0x06,
+  //
+  // This definition is updated to represent Intel
+  // Optane DC Presistent Memory in SMBIOS spec 3.3.0
+  //
   MemoryTechnologyIntelPersistentMemory     = 0x07
 } MEMORY_DEVICE_TECHNOLOGY;
 
-- 
2.16.2.windows.1

[PATCH V5 5/8] ShellPkg/SmbiosView: SMBIOS 3.3.0 add PCI gen4 values for type 9

[Gao, Zhichao]

From: "Gao, Zhichao" <zhichao.gao@intel.com>

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

System Slots (Type 9):
- SMBIOSCR00184: add PCI Express Gen 4 values

Add the Smbios.h to use the MARCOs or enums.

Cc: Ray Ni <ray.ni@intel.com>
Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
---
 .../SmbiosView/QueryTable.c                        | 26 +++++++++++++++++++++-
 .../SmbiosView/QueryTable.h                        |  4 +++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c
index fdb7a47d33..94d995bda1 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c
@@ -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 - 2018, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2005 - 2019, Intel Corporation. All rights reserved.<BR>
   (C) Copyright 2016-2019 Hewlett Packard Enterprise Development LP<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
@@ -1523,6 +1523,30 @@ TABLE_ITEM  SystemSlotTypeTable[] = {
   {
     0xB6,
     L"PCI Express Gen 3 X16"
+  },
+  {
+    SlotTypePciExpressGen4,
+    L"PCI Express Gen 4"
+  },
+  {
+    SlotTypePciExpressGen4X1,
+    L"PCI Express Gen 4 X1"
+  },
+  {
+    SlotTypePciExpressGen4X2,
+    L"PCI Express Gen 4 X2"
+  },
+  {
+    SlotTypePciExpressGen4X4,
+    L"PCI Express Gen 4 X4"
+  },
+  {
+    SlotTypePciExpressGen4X8,
+    L"PCI Express Gen 4 X8"
+  },
+  {
+    SlotTypePciExpressGen4X16,
+    L"PCI Express Gen 4 X16"
   }
 };
 
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.h b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.h
index 60fb42c59c..756009b2f2 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 - 2018, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2005 - 2019, Intel Corporation. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
@@ -10,6 +10,8 @@
 #ifndef _SMBIOS_QUERY_TABLE_H_
 #define _SMBIOS_QUERY_TABLE_H_
 
+#include <IndustryStandard/SmBios.h>
+
 #define QUERY_TABLE_UNFOUND 0xFF
 
 typedef struct TABLE_ITEM {
-- 
2.16.2.windows.1

[PATCH V5 6/8] ShellPkg/SmbiosView: SMBIOS 3.3.0 add support for CXL Flexbus

[Gao, Zhichao]

From: "Gao, Zhichao" <zhichao.gao@intel.com>

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

Various:
- SMBIOSCR00183: add support for CXL Flexbus

Cc: Ray Ni <ray.ni@intel.com>
Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
---
 .../Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c    | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c
index 94d995bda1..8ed2bae4d3 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c
@@ -1432,6 +1432,10 @@ TABLE_ITEM  SystemSlotTypeTable[] = {
     0x23,
     L"PCI Express Mini 76-pin (CEM spec. 2.0) Corresponds to Display-Mini card"
   },
+  {
+    SlotTypeCXLFlexbus10,
+    L"CXL Flexbus 1.0"
+  },
   {
     0xA0,
     L"PC-98/C20 "
@@ -2290,6 +2294,10 @@ TABLE_ITEM  PMALocationTable[] = {
   {
     0xA3,
     L"  PC-98/Local bus add-on card"
+  },
+  {
+    MemoryArrayLocationCXLFlexbus10AddonCard,
+    L"  CXL Flexbus 1.0 add-on card"
   }
 };
 
-- 
2.16.2.windows.1

[PATCH V5 7/8] ShellPkg/SmbiosView: SMBIOS 3.3.0 Add value HBM and Die for type 17

[Gao, Zhichao]

From: "Gao, Zhichao" <zhichao.gao@intel.com>

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

Memory Device (Type 17):
- SMBIOSCR00178: add new memory device type value (HBM) and new form
factor value (Die)

Cc: Ray Ni <ray.ni@intel.com>
Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
---
 .../UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c       | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c
index 8ed2bae4d3..16b75f2667 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c
@@ -2423,6 +2423,10 @@ TABLE_ITEM  MemoryDeviceFormFactorTable[] = {
   {
     0x0F,
     L"  FB-DIMM"
+  },
+  {
+    MemoryFormFactorDie,
+    L"  Die"
   }
 };
 
@@ -2538,6 +2542,14 @@ TABLE_ITEM  MemoryDeviceTypeTable[] = {
   {
     0x1F,
     L"  Logical non-volatile device"
+  },
+  {
+    MemoryTypeHBM,
+    L"  HBM (High Bandwidth Memory)"
+  },
+  {
+    MemoryTypeHBM2,
+    L"  HBM2 (High Bandwidth Memory Generation 2)"
   }
 };
 
-- 
2.16.2.windows.1

[PATCH V5 8/8] ShellPkg/SmbiosView: SMBIOS 3.3.0 Update "Intel persistent memory"

[Gao, Zhichao]

From: "Gao, Zhichao" <zhichao.gao@intel.com>

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

Memory Device (Type 17):
- SMBIOSCR00179: update the string for Intel persistent memory

Cc: Ray Ni <ray.ni@intel.com>
Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
---
 ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c
index 16b75f2667..b80e16d56a 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c
@@ -2638,8 +2638,8 @@ TABLE_ITEM  MemoryDeviceMemoryTechnologyTable[] = {
     L" NVDIMM-P"
   },
   {
-    0x07,
-    L" Intel persistent memory"
+    MemoryTechnologyIntelPersistentMemory,
+    L" Intel Optane DC Persistent Memory"
   }
 };
 
-- 
2.16.2.windows.1

Re: [PATCH V5 5/8] ShellPkg/SmbiosView: SMBIOS 3.3.0 add PCI gen4 values for type 9

[Ni, Ray]

Reviewed-by: Ray Ni <ray.ni@intel.com>

> -----Original Message-----
> From: Gao, Zhichao <zhichao.gao@intel.com>
> Sent: Wednesday, November 13, 2019 10:11 AM
> To: devel@edk2.groups.io
> Cc: Gao, Zhichao <zhichao.gao@intel.com>; Ni, Ray <ray.ni@intel.com>;
> Chaganty, Rangasai V <rangasai.v.chaganty@intel.com>
> Subject: [PATCH V5 5/8] ShellPkg/SmbiosView: SMBIOS 3.3.0 add PCI gen4
> values for type 9
> 
> From: "Gao, Zhichao" <zhichao.gao@intel.com>
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2305
> 
> System Slots (Type 9):
> - SMBIOSCR00184: add PCI Express Gen 4 values
> 
> Add the Smbios.h to use the MARCOs or enums.
> 
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
> Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
> ---
>  .../SmbiosView/QueryTable.c                        | 26 +++++++++++++++++++++-
>  .../SmbiosView/QueryTable.h                        |  4 +++-
>  2 files changed, 28 insertions(+), 2 deletions(-)
> 
> diff --git
> a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.
> c
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.
> c
> index fdb7a47d33..94d995bda1 100644
> ---
> a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.
> c
> +++
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.
> c
> @@ -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 - 2018, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2005 - 2019, Intel Corporation. All rights reserved.<BR>
>    (C) Copyright 2016-2019 Hewlett Packard Enterprise Development LP<BR>
>    SPDX-License-Identifier: BSD-2-Clause-Patent
> 
> @@ -1523,6 +1523,30 @@ TABLE_ITEM  SystemSlotTypeTable[] = {
>    {
>      0xB6,
>      L"PCI Express Gen 3 X16"
> +  },
> +  {
> +    SlotTypePciExpressGen4,
> +    L"PCI Express Gen 4"
> +  },
> +  {
> +    SlotTypePciExpressGen4X1,
> +    L"PCI Express Gen 4 X1"
> +  },
> +  {
> +    SlotTypePciExpressGen4X2,
> +    L"PCI Express Gen 4 X2"
> +  },
> +  {
> +    SlotTypePciExpressGen4X4,
> +    L"PCI Express Gen 4 X4"
> +  },
> +  {
> +    SlotTypePciExpressGen4X8,
> +    L"PCI Express Gen 4 X8"
> +  },
> +  {
> +    SlotTypePciExpressGen4X16,
> +    L"PCI Express Gen 4 X16"
>    }
>  };
> 
> diff --git
> a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.
> h
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.
> h
> index 60fb42c59c..756009b2f2 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 - 2018, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2005 - 2019, Intel Corporation. All rights reserved.<BR>
>    SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> @@ -10,6 +10,8 @@
>  #ifndef _SMBIOS_QUERY_TABLE_H_
>  #define _SMBIOS_QUERY_TABLE_H_
> 
> +#include <IndustryStandard/SmBios.h>
> +
>  #define QUERY_TABLE_UNFOUND 0xFF
> 
>  typedef struct TABLE_ITEM {
> --
> 2.16.2.windows.1