MdePkg/Include: Smbios Specification 3.4.0 changes

The following changes were addressed,
1. Smbios specs 3.4.0 table-51 bit5&6, these fields moved
   from specific MemoryArrayLocationCXLFlexbus10AddonCard
   to generic MemoryArrayLocationCXLAddonCard
   to address both CXL1.0 and 2.0 CXL revisions.
2. Smbios specs 3.4.0 table-79, The memory technology name changed
   from MemoryTechnologyIntelPersistentMemory
   to MemoryTechnologyIntelOptanePersistentMemory.

Signed-off-by: Thotala Gopi <gopi.thotala@intel.com>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>

diff --git a/MdePkg/Include/IndustryStandard/SmBios.h b/MdePkg/Include/IndustryStandard/SmBios.h
index cc023b73692a35dfe5ebe248d9e84bb7924899b8..6918f58cce445f98b8a4917be5d856f922fbe3bc 100644 (file)
--- a/MdePkg/Include/IndustryStandard/SmBios.h
+++ b/MdePkg/Include/IndustryStandard/SmBios.h
@@ -1393,7 +1393,10 @@ typedef struct {
   UINT8  HotPlugDevicesSupported :1;\r
   UINT8  SmbusSignalSupported    :1;\r
   UINT8  BifurcationSupported    :1;\r
-  UINT8  Reserved                :4;  ///< Set to 0.\r
+  UINT8  AsyncSurpriseRemoval    :1;\r
+  UINT8  FlexbusSlotCxl10Capable :1;\r
+  UINT8  FlexbusSlotCxl20Capable :1;\r
+  UINT8  Reserved                :1;  ///< Set to 0.\r
 } MISC_SLOT_CHARACTERISTICS2;\r
 \r
 ///\r
@@ -1435,6 +1438,12 @@ typedef struct {
   UINT8                       DataBusWidth;\r
   UINT8                       PeerGroupingCount;\r
   MISC_SLOT_PEER_GROUP        PeerGroups[1];\r
+  //\r
+  // Add for smbios 3.4\r
+  //\r
+  UINT8                       SlotInformation;\r
+  UINT8                       SlotPhysicalWidth;\r
+  UINT16                      SlotPitch;\r
 } SMBIOS_TABLE_TYPE9;\r
 \r
 ///\r
@@ -1628,7 +1637,7 @@ typedef enum {
   MemoryArrayLocationPc98C24AddonCard      = 0xA1,\r
   MemoryArrayLocationPc98EAddonCard        = 0xA2,\r
   MemoryArrayLocationPc98LocalBusAddonCard = 0xA3,\r
-  MemoryArrayLocationCXLFlexbus10AddonCard = 0xA4\r
+  MemoryArrayLocationCXLAddonCard          = 0xA4\r
 } MEMORY_ARRAY_LOCATION;\r
 \r
 ///\r
@@ -1763,17 +1772,18 @@ typedef struct {
 /// Memory Device - Memory Technology\r
 ///\r
 typedef enum {\r
-  MemoryTechnologyOther                     = 0x01,\r
-  MemoryTechnologyUnknown                   = 0x02,\r
-  MemoryTechnologyDram                      = 0x03,\r
-  MemoryTechnologyNvdimmN                   = 0x04,\r
-  MemoryTechnologyNvdimmF                   = 0x05,\r
-  MemoryTechnologyNvdimmP                   = 0x06,\r
+  MemoryTechnologyOther                          = 0x01,\r
+  MemoryTechnologyUnknown                        = 0x02,\r
+  MemoryTechnologyDram                           = 0x03,\r
+  MemoryTechnologyNvdimmN                        = 0x04,\r
+  MemoryTechnologyNvdimmF                        = 0x05,\r
+  MemoryTechnologyNvdimmP                        = 0x06,\r
   //\r
   // This definition is updated to represent Intel\r
-  // Optane DC Presistent Memory in SMBIOS spec 3.3.0\r
+  // Optane DC Persistent Memory in SMBIOS spec 3.4.0\r
   //\r
-  MemoryTechnologyIntelPersistentMemory     = 0x07\r
+  MemoryTechnologyIntelOptanePersistentMemory    = 0x07\r
+\r
 } MEMORY_DEVICE_TECHNOLOGY;\r
 \r
 ///\r

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c
index 39a3e3c0895b2218b726fb5f632bf186aa0951de..7fc9d38a3b03a9fee430ae56fda7fea935cca1e2 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c
@@ -2300,8 +2300,8 @@ TABLE_ITEM  PMALocationTable[] = {
     L"  PC-98/Local bus add-on card"\r
   },\r
   {\r
-    MemoryArrayLocationCXLFlexbus10AddonCard,\r
-    L"  CXL Flexbus 1.0 add-on card"\r
+    MemoryArrayLocationCXLAddonCard,\r
+    L"  CXL add-on card"\r
   }\r
 };\r
 \r
@@ -2650,8 +2650,8 @@ TABLE_ITEM  MemoryDeviceMemoryTechnologyTable[] = {
     L" NVDIMM-P"\r
   },\r
   {\r
-    MemoryTechnologyIntelPersistentMemory,\r
-    L" Intel Optane DC Persistent Memory"\r
+    MemoryTechnologyIntelOptanePersistentMemory,\r
+    L" Intel Optane Persistent Memory"\r
   }\r
 };\r
 \r