Virtualization
/
edk2
mirror of https://gitlab.com/qemu-project/edk2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

MdePkg SmBios.h: Add SMBIOS 3.2.0 definitions 

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

Add SMBIOS 3.2.0 definitions according to
www.dmtf.org/sites/default/files/standards/documents/DSP0134_3.2.0.pdf.

Processor Information (Type 4):
- SMBIOSCR00163: add socket LGA2066
- SMBIOSCR00173: add Intel Core i9
- SMBIOSCR00176: add new processor sockets
Port Connector Information (Type 8):
- SMBIOSCR00168: add USB Type-C
System Slots (Type 9):
- SMBIOSCR00164: add "unavailable" to current usage field
- SMBIOSCR00167: add support for PCIe bifurcation
Memory Device (Type 17):
- SMBIOSCR00162: add support for NVDIMMs
- SMBIOSCR00166: extend support for NVDIMMs and add support for logical memory type
- SMBIOSCR00172: rename "Configured Memory Clock Speed" to "Configured Memory Speed"
- SMBIOSCR00174: add new memory technology value (Intel Persistent Memory, 3D XPoint)
IPMI Device Information (Type 38):
- SMBIOSCR00171: add SSIF
Management Controller Host Interface (Type 42)
- SMBIOSCR00175: fix structure data parsing issue

V2: Add missing update to MISC_PORT_TYPE and SMBIOS_TABLE_TYPE9.

Cc: Liming Gao <liming.gao@intel.com>
Cc: Dandan Bi <dandan.bi@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Dandan Bi <dandan.bi@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
This commit is contained in:
Star Zeng 2018-07-13 10:28:34 +08:00
parent 033949a810
commit cfcca3c2de
1 changed files with 120 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

155
MdePkg/Include/IndustryStandard/SmBios.h
View File

@ -1,5 +1,5 @@
/** @file /** @file
Industry Standard Definitions of SMBIOS Table Specification v3.1.1. Industry Standard Definitions of SMBIOS Table Specification v3.2.0.
Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR> Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
(C) Copyright 2015-2017 Hewlett Packard Enterprise Development LP<BR> (C) Copyright 2015-2017 Hewlett Packard Enterprise Development LP<BR>
@ -685,6 +685,7 @@ typedef enum {
ProcessorFamilyzArchitecture = 0xCC, ProcessorFamilyzArchitecture = 0xCC,
ProcessorFamilyIntelCoreI5 = 0xCD, ProcessorFamilyIntelCoreI5 = 0xCD,
ProcessorFamilyIntelCoreI3 = 0xCE, ProcessorFamilyIntelCoreI3 = 0xCE,
ProcessorFamilyIntelCoreI9 = 0xCF,
ProcessorFamilyViaC7M = 0xD2, ProcessorFamilyViaC7M = 0xD2,
ProcessorFamilyViaC7D = 0xD3, ProcessorFamilyViaC7D = 0xD3,
ProcessorFamilyViaC7 = 0xD4, ProcessorFamilyViaC7 = 0xD4,
@ -806,7 +807,11 @@ typedef enum {
ProcessorUpgradeSocketBGA1515 = 0x35, ProcessorUpgradeSocketBGA1515 = 0x35,
ProcessorUpgradeSocketLGA3647_1 = 0x36, ProcessorUpgradeSocketLGA3647_1 = 0x36,
ProcessorUpgradeSocketSP3 = 0x37, ProcessorUpgradeSocketSP3 = 0x37,
ProcessorUpgradeSocketSP3r2 = 0x38 ProcessorUpgradeSocketSP3r2 = 0x38,
ProcessorUpgradeSocketLGA2066 = 0x39,
ProcessorUpgradeSocketBGA1392 = 0x3A,
ProcessorUpgradeSocketBGA1510 = 0x3B,
ProcessorUpgradeSocketBGA1528 = 0x3C
} PROCESSOR_UPGRADE; } PROCESSOR_UPGRADE;
/// ///
@ -1159,6 +1164,7 @@ typedef enum {
PortConnectorTypeBNC = 0x20, PortConnectorTypeBNC = 0x20,
PortConnectorType1394 = 0x21, PortConnectorType1394 = 0x21,
PortConnectorTypeSasSata = 0x22, PortConnectorTypeSasSata = 0x22,
PortConnectorTypeUsbTypeC = 0x23,
PortConnectorTypePC98 = 0xA0, PortConnectorTypePC98 = 0xA0,
PortConnectorTypePC98Hireso = 0xA1, PortConnectorTypePC98Hireso = 0xA1,
PortConnectorTypePCH98 = 0xA2, PortConnectorTypePCH98 = 0xA2,
@ -1205,6 +1211,8 @@ typedef enum {
PortTypeNetworkPort = 0x1F, PortTypeNetworkPort = 0x1F,
PortTypeSata = 0x20, PortTypeSata = 0x20,
PortTypeSas = 0x21, PortTypeSas = 0x21,
PortTypeMfdp = 0x22, ///< Multi-Function Display Port
PortTypeThunderbolt = 0x23,
PortType8251Compatible = 0xA0, PortType8251Compatible = 0xA0,
PortType8251FifoCompatible = 0xA1, PortType8251FifoCompatible = 0xA1,
PortTypeOther = 0xFF PortTypeOther = 0xFF
@ -1314,10 +1322,11 @@ typedef enum {
/// System Slots - Current Usage. /// System Slots - Current Usage.
/// ///
typedef enum { typedef enum {
SlotUsageOther = 0x01, SlotUsageOther = 0x01,
SlotUsageUnknown = 0x02, SlotUsageUnknown = 0x02,
SlotUsageAvailable = 0x03, SlotUsageAvailable = 0x03,
SlotUsageInUse = 0x04 SlotUsageInUse = 0x04,
SlotUsageUnavailable = 0x05
} MISC_SLOT_USAGE; } MISC_SLOT_USAGE;
/// ///
@ -1350,9 +1359,20 @@ typedef struct {
UINT8 PmeSignalSupported :1; UINT8 PmeSignalSupported :1;
UINT8 HotPlugDevicesSupported :1; UINT8 HotPlugDevicesSupported :1;
UINT8 SmbusSignalSupported :1; UINT8 SmbusSignalSupported :1;
UINT8 Reserved :5; ///< Set to 0. UINT8 BifurcationSupported :1;
UINT8 Reserved :4; ///< Set to 0.
} MISC_SLOT_CHARACTERISTICS2; } MISC_SLOT_CHARACTERISTICS2;
///
/// System Slots - Peer Segment/Bus/Device/Function/Width Groups
///
typedef struct {
UINT16 SegmentGroupNum;
UINT8 BusNum;
UINT8 DevFuncNum;
UINT8 DataBusWidth;
} MISC_SLOT_PEER_GROUP;
/// ///
/// System Slots (Type 9) /// System Slots (Type 9)
/// ///
@ -1376,6 +1396,12 @@ typedef struct {
UINT16 SegmentGroupNum; UINT16 SegmentGroupNum;
UINT8 BusNum; UINT8 BusNum;
UINT8 DevFuncNum; UINT8 DevFuncNum;
//
// Add for smbios 3.2
//
UINT8 DataBusWidth;
UINT8 PeerGroupingCount;
MISC_SLOT_PEER_GROUP PeerGroups[1];
} SMBIOS_TABLE_TYPE9; } SMBIOS_TABLE_TYPE9;
/// ///
@ -1668,9 +1694,13 @@ typedef enum {
MemoryTypeLpddr = 0x1B, MemoryTypeLpddr = 0x1B,
MemoryTypeLpddr2 = 0x1C, MemoryTypeLpddr2 = 0x1C,
MemoryTypeLpddr3 = 0x1D, MemoryTypeLpddr3 = 0x1D,
MemoryTypeLpddr4 = 0x1E MemoryTypeLpddr4 = 0x1E,
MemoryTypeLogicalNonVolatileDevice = 0x1F
} MEMORY_DEVICE_TYPE; } MEMORY_DEVICE_TYPE;
///
/// Memory Device - Type Detail
///
typedef struct { typedef struct {
UINT16 Reserved :1; UINT16 Reserved :1;
UINT16 Other :1; UINT16 Other :1;
@ -1690,6 +1720,41 @@ typedef struct {
UINT16 LrDimm :1; UINT16 LrDimm :1;
} MEMORY_DEVICE_TYPE_DETAIL; } MEMORY_DEVICE_TYPE_DETAIL;
///
/// Memory Device - Memory Technology
///
typedef enum {
MemoryTechnologyOther = 0x01,
MemoryTechnologyUnknown = 0x02,
MemoryTechnologyDram = 0x03,
MemoryTechnologyNvdimmN = 0x04,
MemoryTechnologyNvdimmF = 0x05,
MemoryTechnologyNvdimmP = 0x06,
MemoryTechnologyIntelPersistentMemory = 0x07
} MEMORY_DEVICE_TECHNOLOGY;
///
/// Memory Device - Memory Operating Mode Capability
///
typedef union {
///
/// Individual bit fields
///
struct {
UINT16 Reserved :1; ///< Set to 0.
UINT16 Other :1;
UINT16 Unknown :1;
UINT16 VolatileMemory :1;
UINT16 ByteAccessiblePersistentMemory :1;
UINT16 BlockAccessiblePersistentMemory :1;
UINT16 Reserved2 :10; ///< Set to 0.
} Bits;
///
/// All bit fields as a 16-bit value
///
UINT16 Uint16;
} MEMORY_DEVICE_OPERATING_MODE_CAPABILITY;
/// ///
/// Memory Device (Type 17). /// Memory Device (Type 17).
/// ///
@ -1700,38 +1765,57 @@ typedef struct {
/// socket is currently populated. /// socket is currently populated.
/// ///
typedef struct { typedef struct {
SMBIOS_STRUCTURE Hdr; SMBIOS_STRUCTURE Hdr;
UINT16 MemoryArrayHandle; UINT16 MemoryArrayHandle;
UINT16 MemoryErrorInformationHandle; UINT16 MemoryErrorInformationHandle;
UINT16 TotalWidth; UINT16 TotalWidth;
UINT16 DataWidth; UINT16 DataWidth;
UINT16 Size; UINT16 Size;
UINT8 FormFactor; ///< The enumeration value from MEMORY_FORM_FACTOR. UINT8 FormFactor; ///< The enumeration value from MEMORY_FORM_FACTOR.
UINT8 DeviceSet; UINT8 DeviceSet;
SMBIOS_TABLE_STRING DeviceLocator; SMBIOS_TABLE_STRING DeviceLocator;
SMBIOS_TABLE_STRING BankLocator; SMBIOS_TABLE_STRING BankLocator;
UINT8 MemoryType; ///< The enumeration value from MEMORY_DEVICE_TYPE. UINT8 MemoryType; ///< The enumeration value from MEMORY_DEVICE_TYPE.
MEMORY_DEVICE_TYPE_DETAIL TypeDetail; MEMORY_DEVICE_TYPE_DETAIL TypeDetail;
UINT16 Speed; UINT16 Speed;
SMBIOS_TABLE_STRING Manufacturer; SMBIOS_TABLE_STRING Manufacturer;
SMBIOS_TABLE_STRING SerialNumber; SMBIOS_TABLE_STRING SerialNumber;
SMBIOS_TABLE_STRING AssetTag; SMBIOS_TABLE_STRING AssetTag;
SMBIOS_TABLE_STRING PartNumber; SMBIOS_TABLE_STRING PartNumber;
// //
// Add for smbios 2.6 // Add for smbios 2.6
// //
UINT8 Attributes; UINT8 Attributes;
// //
// Add for smbios 2.7 // Add for smbios 2.7
// //
UINT32 ExtendedSize; UINT32 ExtendedSize;
UINT16 ConfiguredMemoryClockSpeed; //
// Keep using name "ConfiguredMemoryClockSpeed" for compatibility
// although this field is renamed from "Configured Memory Clock Speed"
// to "Configured Memory Speed" in smbios 3.2.0.
//
UINT16 ConfiguredMemoryClockSpeed;
// //
// Add for smbios 2.8.0 // Add for smbios 2.8.0
// //
UINT16 MinimumVoltage; UINT16 MinimumVoltage;
UINT16 MaximumVoltage; UINT16 MaximumVoltage;
UINT16 ConfiguredVoltage; UINT16 ConfiguredVoltage;
//
// Add for smbios 3.2.0
//
UINT8 MemoryTechnology; ///< The enumeration value from MEMORY_DEVICE_TECHNOLOGY
MEMORY_DEVICE_OPERATING_MODE_CAPABILITY MemoryOperatingModeCapability;
SMBIOS_TABLE_STRING FirwareVersion;
UINT16 ModuleManufacturerID;
UINT16 ModuleProductID;
UINT16 MemorySubsystemControllerManufacturerID;
UINT16 MemorySubsystemControllerProductID;
UINT64 NonVolatileSize;
UINT64 VolatileSize;
UINT64 CacheSize;
UINT64 LogicalSize;
} SMBIOS_TABLE_TYPE17; } SMBIOS_TABLE_TYPE17;
/// ///
@ -2269,7 +2353,7 @@ typedef enum {
IPMIDeviceInfoInterfaceTypeKCS = 0x01, ///< The Keyboard Controller Style. IPMIDeviceInfoInterfaceTypeKCS = 0x01, ///< The Keyboard Controller Style.
IPMIDeviceInfoInterfaceTypeSMIC = 0x02, ///< The Server Management Interface Chip. IPMIDeviceInfoInterfaceTypeSMIC = 0x02, ///< The Server Management Interface Chip.
IPMIDeviceInfoInterfaceTypeBT = 0x03, ///< The Block Transfer IPMIDeviceInfoInterfaceTypeBT = 0x03, ///< The Block Transfer
IPMIDeviceInfoInterfaceTypeReserved = 0x04 IPMIDeviceInfoInterfaceTypeSSIF = 0x04 ///< SMBus System Interface
} BMC_INTERFACE_TYPE; } BMC_INTERFACE_TYPE;
/// ///
@ -2339,7 +2423,7 @@ typedef struct {
UINT8 ReferencedOffset; UINT8 ReferencedOffset;
SMBIOS_TABLE_STRING EntryString; SMBIOS_TABLE_STRING EntryString;
UINT8 Value[1]; UINT8 Value[1];
}ADDITIONAL_INFORMATION_ENTRY; } ADDITIONAL_INFORMATION_ENTRY;
/// ///
/// Additional Information (Type 40). /// Additional Information (Type 40).
@ -2425,8 +2509,9 @@ typedef enum{
/// ///
typedef struct { typedef struct {
SMBIOS_STRUCTURE Hdr; SMBIOS_STRUCTURE Hdr;
UINT8 InterfaceType; ///< The enumeration value from MC_HOST_INTERFACE_TYPE UINT8 InterfaceType; ///< The enumeration value from MC_HOST_INTERFACE_TYPE
UINT8 MCHostInterfaceData[1]; ///< This field has a minimum of four bytes UINT8 InterfaceTypeSpecificDataLength;
UINT8 InterfaceTypeSpecificData[4]; ///< This field has a minimum of four bytes
} SMBIOS_TABLE_TYPE42; } SMBIOS_TABLE_TYPE42;
/// ///