From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.byosoft.com.cn (mail.byosoft.com.cn [58.240.74.242]) by mx.groups.io with SMTP id smtpd.web10.5161.1647569393143407206 for ; Thu, 17 Mar 2022 19:09:54 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: byosoft.com.cn, ip: 58.240.74.242, mailfrom: gaoliming@byosoft.com.cn) Received: from DESKTOPS6D0PVI ([101.224.116.119]) (envelope-sender ) by 192.168.6.13 with ESMTP for ; Fri, 18 Mar 2022 10:09:44 +0800 X-WM-Sender: gaoliming@byosoft.com.cn X-Originating-IP: 101.224.116.119 X-WM-AuthFlag: YES X-WM-AuthUser: gaoliming@byosoft.com.cn From: "gaoliming" To: , , "'Abdul Lateef Attar'" Cc: "'Michael D Kinney'" , "'Zhiguang Liu'" References: <20220224155003.24032-1-abdattar@amd.com> <20220224155003.24032-2-abdattar@amd.com> <16DA445789CC6E39.8112@groups.io> In-Reply-To: <16DA445789CC6E39.8112@groups.io> Subject: =?UTF-8?B?5Zue5aSNOiBbZWRrMi1kZXZlbF0g5Zue5aSNOiBbUEFUQ0ggdjMgMS8xXSBNZGVQa2cvSW5jbHVkZTogU21iaW9zIFNwZWNpZmljYXRpb24gMy41LjAgY2hhbmdlcw==?= Date: Fri, 18 Mar 2022 10:09:48 +0800 Message-ID: <01f701d83a6d$3e981470$bbc83d50$@byosoft.com.cn> MIME-Version: 1.0 X-Mailer: Microsoft Outlook 16.0 Thread-Index: AQGw8Uj7R5Y9EL59iTA7c34WM9qryQGCdr9AAbZoL7is+TDcwA== Content-Type: text/plain; charset="gb2312" Content-Transfer-Encoding: quoted-printable Content-Language: zh-cn Create PR https://github.com/tianocore/edk2/pull/2647 to merge it. Thanks Liming > -----=D3=CA=BC=FE=D4=AD=BC=FE----- > =B7=A2=BC=FE=C8=CB: devel@edk2.groups.io =B4=FA=B1= =ED gaoliming > =B7=A2=CB=CD=CA=B1=BC=E4: 2022=C4=EA3=D4=C28=C8=D5 9:42 > =CA=D5=BC=FE=C8=CB: 'Abdul Lateef Attar' ; devel@edk2.g= roups.io > =B3=AD=CB=CD: 'Michael D Kinney' ; 'Zhiguang = Liu' > > =D6=F7=CC=E2: [edk2-devel] =BB=D8=B8=B4: [PATCH v3 1/1] MdePkg/Include: S= mbios > Specification 3.5.0 changes >=20 > Reviewed-by: Liming Gao >=20 > > -----=D3=CA=BC=FE=D4=AD=BC=FE----- > > =B7=A2=BC=FE=C8=CB: abdullateef.attar@amd.com =B4=FA=B1=ED > > Abdul Lateef Attar > > =B7=A2=CB=CD=CA=B1=BC=E4: 2022=C4=EA2=D4=C224=C8=D5 23:50 > > =CA=D5=BC=FE=C8=CB: devel@edk2.groups.io > > =B3=AD=CB=CD: Michael D Kinney ; Liming Gao > > ; Zhiguang Liu > > =D6=F7=CC=E2: [PATCH v3 1/1] MdePkg/Include: Smbios Specification 3.5.0= changes > > > > Adds following changes > > 1) Added support for manufacturing mode in > > BIOS Characteristics Extension Byte 2. > > 2) Added support for slot height in > > System Slot Table (type 9). > > 3) Updated Built-in pointing device interface with > > USB, I2C and SPI. > > 4) Updates Onboard Devices Extended Information with > > wireless LAN, bluetooth, WWAN, eMMC, NVMe and UFC. > > 5) Added new table Firmware Inventory Information (Type 45) > > and its corresponding enum values. > > 6) Added new table String Property Table (Type 46) > > and its corresponding enum values. > > > > Cc: Michael D Kinney > > Cc: Liming Gao > > Cc: Zhiguang Liu > > Signed-off-by: Abdul Lateef Attar > > --- > > MdePkg/Include/IndustryStandard/SmBios.h | 144 > +++++++++++++++++++- > > 1 file changed, 140 insertions(+), 4 deletions(-) > > > > diff --git a/MdePkg/Include/IndustryStandard/SmBios.h > > b/MdePkg/Include/IndustryStandard/SmBios.h > > index 828ea6d753c2..2b1567b0528b 100644 > > --- a/MdePkg/Include/IndustryStandard/SmBios.h > > +++ b/MdePkg/Include/IndustryStandard/SmBios.h > > @@ -1,9 +1,10 @@ > > /** @file > > > > - Industry Standard Definitions of SMBIOS Table Specification v3.3.0. > > > > + Industry Standard Definitions of SMBIOS Table Specification v3.5.0. > > > > > > > > Copyright (c) 2006 - 2021, Intel Corporation. All rights reserved.
> > > > (C) Copyright 2015-2017 Hewlett Packard Enterprise Development > LP
> > > > (C) Copyright 2015 - 2019 Hewlett Packard Enterprise Development > LP
> > > > +Copyright (c) 2022, AMD Incorporated. All rights reserved.
> > > > SPDX-License-Identifier: BSD-2-Clause-Patent > > > > > > > > **/ > > > > @@ -94,6 +95,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent > > #define SMBIOS_TYPE_MANAGEMENT_CONTROLLER_HOST_INTERFACE > > 42 > > > > #define SMBIOS_TYPE_TPM_DEVICE > 43 > > > > #define SMBIOS_TYPE_PROCESSOR_ADDITIONAL_INFORMATION > 44 > > > > +#define SMBIOS_TYPE_FIRMWARE_INVENTORY_INFORMATION > > 45 > > > > +#define SMBIOS_TYPE_STRING_PROPERTY_INFORMATION > 46 > > > > > > > > /// > > > > /// Inactive type is added from SMBIOS 2.2. Reference SMBIOS 2.6, > chapter > > 3.3.43. > > > > @@ -252,7 +255,9 @@ typedef struct { > > UINT8 TargetContentDistributionEnabled : 1; > > > > UINT8 UefiSpecificationSupported : 1; > > > > UINT8 VirtualMachineSupported : 1; > > > > - UINT8 ExtensionByte2Reserved : 3; > > > > + UINT8 ManufacturingModeSupported : 1; > > > > + UINT8 ManufacturingModeEnabled : 1; > > > > + UINT8 ExtensionByte2Reserved : 1; > > > > } MBCE_SYSTEM_RESERVED; > > > > > > > > /// > > > > @@ -1401,6 +1406,17 @@ typedef struct { > > UINT8 Reserved : 1; ///< Set to 0. > > > > } MISC_SLOT_CHARACTERISTICS2; > > > > > > > > +/// > > > > +/// System Slots - Slot Height > > > > +/// > > > > +typedef enum { > > > > + SlotHeightNone =3D 0x00, > > > > + SlotHeightOther =3D 0x01, > > > > + SlotHeightUnknown =3D 0x02, > > > > + SlotHeightFullHeight =3D 0x03, > > > > + SlotHeightLowProfile =3D 0x04 > > > > +} MISC_SLOT_HEIGHT; > > > > + > > > > /// > > > > /// System Slots - Peer Segment/Bus/Device/Function/Width Groups > > > > /// > > > > @@ -1446,6 +1462,10 @@ typedef struct { > > UINT8 SlotInformation; > > > > UINT8 SlotPhysicalWidth; > > > > UINT16 SlotPitch; > > > > + // > > > > + // Add for smbios 3.5 > > > > + // > > > > + UINT8 SlotHeight; ///< > The > > enumeration value from MISC_SLOT_HEIGHT. > > > > } SMBIOS_TABLE_TYPE9; > > > > > > > > /// > > > > @@ -2004,7 +2024,9 @@ typedef enum { > > PointingDeviceInterfaceADB =3D 0x08, > > > > PointingDeviceInterfaceBusMouseDB9 =3D 0xA0, > > > > PointingDeviceInterfaceBusMouseMicroDin =3D 0xA1, > > > > - PointingDeviceInterfaceUsb =3D 0xA2 > > > > + PointingDeviceInterfaceUsb =3D 0xA2, > > > > + PointingDeviceInterfaceI2c =3D 0xA3, > > > > + PointingDeviceInterfaceSpi =3D 0xA4 > > > > } BUILTIN_POINTING_DEVICE_INTERFACE; > > > > > > > > /// > > > > @@ -2508,7 +2530,13 @@ typedef enum { > > OnBoardDeviceExtendedTypeSound =3D 0x07, > > > > OnBoardDeviceExtendedTypePATAController =3D 0x08, > > > > OnBoardDeviceExtendedTypeSATAController =3D 0x09, > > > > - OnBoardDeviceExtendedTypeSASController =3D 0x0A > > > > + OnBoardDeviceExtendedTypeSASController =3D 0x0A, > > > > + OnBoardDeviceExtendedTypeWirelessLAN =3D 0x0B, > > > > + OnBoardDeviceExtendedTypeBluetooth =3D 0x0C, > > > > + OnBoardDeviceExtendedTypeWWAN =3D 0x0D, > > > > + OnBoardDeviceExtendedTypeeMMC =3D 0x0E, > > > > + OnBoardDeviceExtendedTypeNvme =3D 0x0F, > > > > + OnBoardDeviceExtendedTypeUfc =3D 0x10 > > > > } ONBOARD_DEVICE_EXTENDED_INFO_TYPE; > > > > > > > > /// > > > > @@ -2646,6 +2674,112 @@ typedef struct { > > UINT32 OemDefined; > > > > } SMBIOS_TABLE_TYPE43; > > > > > > > > +/// > > > > +/// Firmware Inventory Version Format Type (Type 45). > > > > +/// > > > > +typedef enum { > > > > + VersionFormatTypeFreeForm =3D 0x00, > > > > + VersionFormatTypeMajorMinor =3D 0x01, > > > > + VersionFormatType32BitHex =3D 0x02, > > > > + VersionFormatType64BitHex =3D 0x03, > > > > + VersionFormatTypeReserved =3D 0x04, /// 0x04 - 0x7F are reserved > > > > + VersionFormatTypeOem =3D 0x80 /// 0x80 - 0xFF are BIOS > > Vendor/OEM-specific > > > > +} FIRMWARE_INVENTORY_VERSION_FORMAT_TYPE; > > > > + > > > > +/// > > > > +/// Firmware Inventory Firmware Id Format Type (Type 45). > > > > +/// > > > > +typedef enum { > > > > + FirmwareIdFormatTypeFreeForm =3D 0x00, > > > > + FirmwareIdFormatTypeUuid =3D 0x01, > > > > + FirmwareIdFormatTypeReserved =3D 0x04, /// 0x04 - 0x7F are > > reserved > > > > + InventoryFirmwareIdFormatTypeOem =3D 0x80 /// 0x80 - 0xFF are > BIOS > > Vendor/OEM-specific > > > > +} FIRMWARE_INVENTORY_FIRMWARE_ID_FORMAT_TYPE; > > > > + > > > > +/// > > > > +/// Firmware Inventory Firmware Characteristics (Type 45). > > > > +/// > > > > +typedef enum { > > > > + CharacteristicsUpdatable =3D 0x00, > > > > + CharacteristicsWriteProtected =3D 0x01, > > > > + CharacteristicsReserved =3D 0x02 /// 0x02 - 0x0F are > reserved > > > > +} FIRMWARE_INVENTORY_CHARACTERISTICS; > > > > + > > > > +/// > > > > +/// Firmware Inventory State Information (Type 45). > > > > +/// > > > > +typedef enum { > > > > + FirmwareInventoryStateOther =3D 0x01, > > > > + FirmwareInventoryStateUnknown =3D 0x02, > > > > + FirmwareInventoryStateDisabled =3D 0x03, > > > > + FirmwareInventoryStateEnabled =3D 0x04, > > > > + FirmwareInventoryStateAbsent =3D 0x05, > > > > + FirmwareInventoryStateStandbyOffline =3D 0x06, > > > > + FirmwareInventoryStateStandbySpare =3D 0x07, > > > > + FirmwareInventoryStateUnavailableOffline =3D 0x08, > > > > +} FIRMWARE_INVENTORY_STATE; > > > > + > > > > +/// > > > > +/// Firmware Inventory Information (Type 45) > > > > +/// > > > > +/// The information in this structure defines an inventory of firmware > > > > +/// components in the system. This can include firmware components suc= h > > as > > > > +/// BIOS, BMC, as well as firmware for other devices in the system. > > > > +/// The information can be used by software to display the firmware > > inventory > > > > +/// in a uniform manner. It can also be used by a management controller, > > > > +/// such as a BMC, for remote system management. > > > > +/// This structure is not intended to replace other standard programmatic > > > > +/// interfaces for firmware updates. > > > > +/// One Type 45 structure is provided for each firmware component. > > > > +/// > > > > +typedef struct { > > > > + SMBIOS_STRUCTURE Hdr; > > > > + SMBIOS_HANDLE RefHandle; > > > > + > > > > + UINT8 FirmwareComponentName; > > > > + UINT8 FirmwareVersion; > > > > + UINT8 FirmwareVersionFormat; ///< The > > enumeration value from FIRMWARE_INVENTORY_VERSION_FORMAT_TYPE > > > > + UINT8 FirmwareId; > > > > + UINT8 FirmwareIdFormat; > > > > + UINT8 ReleaseDate; > > > > + UINT8 Manufacturer; > > > > + UINT8 LowestSupportedVersion; > > > > + UINT64 ImageSize; > > > > + UINT32 Characteristics; > > > > + UINT8 State; > > > > + UINT8 AssociatedComponentCount; > > > > + /// > > > > + /// zero or n-number of handles depends on > AssociatedComponentCount > > > > + /// handles are of type SMBIOS_HANDLE > > > > + /// > > > > +} SMBIOS_TABLE_TYPE45; > > > > + > > > > +/// > > > > +/// String Property IDs (Type 46). > > > > +/// > > > > +typedef enum { > > > > + StringPropertyIdNone =3D 0x0000, > > > > + StringPropertyIdDevicePath =3D 0x0001, > > > > + StringPropertyIdReserved =3D 0x0002, /// Reserved 0x0002 - > > 0x7FFF > > > > + StringPropertyIdBiosVendor =3D 0x8000, /// BIOS vendor 0x8000 - > 0xBFFF > > > > + StringPropertyIdOem =3D 0xC000 /// OEM range 0xC000 - > > 0xFFFF > > > > +} STRING_PROPERTY_ID; > > > > + > > > > +/// > > > > +/// This structure defines a string property for another structure. > > > > +/// This allows adding string properties that are common to several > > structures > > > > +/// without having to modify the definitions of these structures. > > > > +/// Multiple type 46 structures can add string properties to the same > > > > +/// parent structure. > > > > +/// > > > > +typedef struct { > > > > + SMBIOS_STRUCTURE Hdr; > > > > + SMBIOS_HANDLE RefHandle; > > > > + UINT16 StringPropertyId; > > > > + UINT8 StringPropertyValue; > > > > + SMBIOS_HANDLE ParentHandle; > > > > +} SMBIOS_TABLE_TYPE46; > > > > + > > > > /// > > > > /// Inactive (Type 126) > > > > /// > > > > @@ -2710,6 +2844,8 @@ typedef union { > > SMBIOS_TABLE_TYPE42 *Type42; > > > > SMBIOS_TABLE_TYPE43 *Type43; > > > > SMBIOS_TABLE_TYPE44 *Type44; > > > > + SMBIOS_TABLE_TYPE45 *Type45; > > > > + SMBIOS_TABLE_TYPE46 *Type46; > > > > SMBIOS_TABLE_TYPE126 *Type126; > > > > SMBIOS_TABLE_TYPE127 *Type127; > > > > UINT8 *Raw; > > > > -- > > 2.25.1 >=20 >=20 >=20 >=20 >=20 >=20 >=20