[edk2-devel] [edk2-platforms: PATCH v2] Marvell/Armada7k8k: Introduce SMBIOS/DMI support
Jeremy Linton
jeremy.linton at arm.com
Fri May 31 20:08:45 UTC 2019
Hi,
So I told myself not to debug this, but did anyway. Its because edk2 is
advertising a > smbios 3.1 table. SMBIOS 3.1 adds
//
// Add for smbios 3.1.0
//
UINT32 MaximumCacheSize2;
UINT32 InstalledSize2;
} SMBIOS_TABLE_TYPE7;
which means that dmidecodes which are new enough notice this, go ahead
and use the larger cache size descriptions which were added in 3.1
instead of the old description. So in this case you need to fill out
both the Installed/MaximumCacheSize fields as your doing as well as the
new MaximumCacheSize2/InstalledSize2 fields.
On 5/31/19 1:04 PM, Marcin Wojtas wrote:
> Hi Jeremy,
>
> Thanks for a quick test!
>
> 1. Cache sizes - here's the dmidecode output
>
> Handle 0x1000, DMI type 7, 27 bytes
> Cache Information
> Socket Designation: L1 Instruction
> [...]
> Installed Size: 48 kB
> [...]
>
> Handle 0x1001, DMI type 7, 27 bytes
> Cache Information
> Socket Designation: L1 Data
> [...]
> Installed Size: 32 kB
> Maximum Size: 32 kB
> [...]
>
> Handle 0x1002, DMI type 7, 27 bytes
> Cache Information
> Socket Designation: L2
> [...]
> Installed Size: 512 kB
> Maximum Size: 512 kB
> [...]
>
> Handle 0x1003, DMI type 7, 27 bytes
> Cache Information
> Socket Designation: L3
> [...]
> Installed Size: 1024 kB
> Maximum Size: 1024 kB
> [...]
>
> Above size values match the spec. Am I missing something?
>
> 2. DIMM/SPD data is read and processed in ARM-TF. Currently processing this
> data is not available in EDK2. On the other hand Table19 and TYPE 17 shows
> the real memory map and size, which is read during EDK2 init (check
> GetDramSize ()
> in Silicon/Marvell/Armada7k8k/Library/Armada7k8kLib/Armada7k8kLibMem.c)
> from via SMC from the secure world.
>
> DDR speed is also read from the SoC registers.
>
> Any particular data that you are missing?
>
> 3. In next step I'd like to use BoardDescProtocol to update a couple of
> tables fields such as name, revision number, PCIE slots information.
>
> Best regards,
> Marcin
>
>
>
> pt., 31 maj 2019 o 19:05 Jeremy Linton <jeremy.linton at arm.com> napisał(a):
>
>> Hi,
>>
>> I'm super in favor of this, but.. I noticed while trying to test it that
>> the cache sizes being displayed by dmidecode don't seem to match what is
>> in this table, implying something doesn't appear to be 100% correct.
>>
>> Also, while its understandable all the missing serial/chassis/etc
>> fields, the dimm data should be available? I assume the dimm training
>> add-on is reading the SPD from the dimm, so it can/should be stored
>> somewhere?
>>
>> Thanks,
>>
>>
>> On 5/31/19 11:20 AM, Marcin Wojtas via Groups.Io wrote:
>>> Fill in the basic requirements of the SMBIOS specification by specifying
>>> the minimum required structures. The basic fixup is performed.
>>> CPU/DRAM frequency is obtained via SampleAtResetlib and the DRAM size
>>> is calculated from the information stored in the HOB list.
>>>
>>> Add new Armada SmbiosPlatformDxe and MdeModulePkg/SmbiosDxe to the
>>> build and firmware image. With these changes, the EFI BDS, EFI shell,
>>> and Linux dmidecode command return useful information.
>>>
>>> Contributed-under: TianoCore Contribution Agreement 1.1
>>> Signed-off-by: Marcin Wojtas <mw at semihalf.com>
>>> ---
>>> Hi,
>>>
>>> This is the second version of the SmBios support for
>>> Armada platforms, addressing all remarks from the initial
>>> patch. Please check the changelog below.
>>>
>>> In order to ease review, the patch is available in the github:
>>>
>> https://github.com/MarvellEmbeddedProcessors/edk2-open-platform/commits/smbios-upstream-r20190531
>>>
>>> Looking forward to your comments.
>>>
>>> Best regards,
>>> Marcin
>>>
>>> Changelog:
>>> v1->v2:
>>> * Update SMBIOS version to 3.2
>>> * Correct copyright name and remove unused Packages/LibraryClasses/Pcds
>>> * Remove unused headers
>>> * SMBIOS_REFRENCE_HANDLES
>>> - Drop CA53 references
>>> - SMBIOS_HANDLE_A72_L3/SMBIOS_HANDLE_L3
>>> - Add SMBIOS_HANDLE_A72_L1D and according type7 table
>>> * Do not use 'fixup' word
>>> * Unify string placeholders to 32 signs
>>> * LogSmbiosData
>>> - Use same variable name as in DoxyGen blurb
>>> - Fix indentation in for loop
>>> - Set double null in the same way in all cases.
>>> - Cast Record with (VOID *)
>>> * Add missing parameters description of SmbiosInstallMemoryStructure()
>> and SmbiosInstallStructures()
>>> * Split variable assignment with its declaration in SmbiosMemoryInstall()
>>> * Keep firmware revision in local variables in
>> SmbiosInstallAllStructures()
>>>
>>> Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 9 +
>>> Silicon/Marvell/Armada7k8k/Armada7k8k.fdf | 4 +
>>> Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf | 50
>> ++
>>> Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c | 813
>> ++++++++++++++++++++
>>> 4 files changed, 876 insertions(+)
>>> create mode 100644
>> Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
>>> create mode 100644
>> Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c
>>>
>>> diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
>> b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
>>> index 0e63bc8..ed716a7 100644
>>> --- a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
>>> +++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
>>> @@ -398,6 +398,11 @@
>>> gMarvellTokenSpaceGuid.PcdOpTeeRegionBase|0x4400000
>>> gMarvellTokenSpaceGuid.PcdOpTeeRegionSize|0x1000000
>>>
>>> + # SMBIOS/DMI
>>> + gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosDocRev|0x0
>>> + gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosEntryPointProvideMethod|0x2
>>> + gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosVersion|0x0320
>>> +
>>> # TRNG
>>> gMarvellTokenSpaceGuid.PcdEip76TrngBaseAddress|0xF2760000
>>>
>>> @@ -615,6 +620,10 @@
>>> ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
>>> !endif #$(INCLUDE_TFTP_COMMAND)
>>>
>>> + # SMBIOS/DMI
>>> + MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
>>> + Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
>>> +
>>> [Components.AARCH64]
>>> #
>>> # Generic ACPI modules
>>> diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
>> b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
>>> index f59cc1f..e003623 100644
>>> --- a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
>>> +++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf
>>> @@ -207,6 +207,10 @@ FvNameGuid =
>> 5eda4200-2c5f-43cb-9da3-0baf74b1b30c
>>> # DTB
>>> INF EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.inf
>>>
>>> + # SMBIOS/DMI
>>> + INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
>>> + INF Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
>>> +
>>> !if $(ARCH) == AARCH64
>>> # ACPI support
>>> INF MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf
>>> diff --git
>> a/Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
>> b/Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
>>> new file mode 100644
>>> index 0000000..8fa0438
>>> --- /dev/null
>>> +++ b/Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
>>> @@ -0,0 +1,50 @@
>>> +#/** @file
>>> +# SMBIOS Table for ARM platform
>>> +#
>>> +# Copyright (c) 2013, Linaro Ltd. All rights reserved.<BR>
>>> +# Copyright (c) 2019, Marvell International Ltd. and its affiliates
>>> +#
>>> +# 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
>>> +# http://opensource.org/licenses/bsd-license.php
>>> +#
>>> +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>>> +# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
>> IMPLIED.
>>> +#
>>> +#**/
>>> +
>>> +[Defines]
>>> + INF_VERSION = 0x0001001B
>>> + BASE_NAME = SmbiosPlatformDxe
>>> + FILE_GUID = 1c5028a4-3bd0-43cf-9e56-b450584dc22b
>>> + MODULE_TYPE = DXE_DRIVER
>>> + VERSION_STRING = 1.0
>>> + ENTRY_POINT = SmbiosPlatformDriverEntryPoint
>>> +
>>> +[Sources]
>>> + SmbiosPlatformDxe.c
>>> +
>>> +[Packages]
>>> + MdeModulePkg/MdeModulePkg.dec
>>> + MdePkg/MdePkg.dec
>>> + Silicon/Marvell/Marvell.dec
>>> +
>>> +[LibraryClasses]
>>> + BaseLib
>>> + BaseMemoryLib
>>> + DebugLib
>>> + HobLib
>>> + PcdLib
>>> + SampleAtResetLib
>>> + UefiBootServicesTableLib
>>> + UefiDriverEntryPoint
>>> +
>>> +[FixedPcd]
>>> + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareRevision
>>> +
>>> +[Protocols]
>>> + gEfiSmbiosProtocolGuid # PROTOCOL ALWAYS_CONSUMED
>>> +
>>> +[Depex]
>>> + gEfiSmbiosProtocolGuid
>>> diff --git
>> a/Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c
>> b/Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c
>>> new file mode 100644
>>> index 0000000..12ee72e
>>> --- /dev/null
>>> +++ b/Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c
>>> @@ -0,0 +1,813 @@
>>> +/** @file
>>> + This driver installs SMBIOS information for Marvell Armada platforms
>>> +
>>> + Copyright (c) 2015, ARM Limited. All rights reserved.
>>> + Copyright (c) 2019, Marvell International Ltd. and its affiliates
>>> +
>>> + 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
>>> + http://opensource.org/licenses/bsd-license.php
>>> +
>>> + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>>> + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
>> IMPLIED.
>>> +
>>> +**/
>>> +#include <Library/BaseLib.h>
>>> +#include <Library/BaseMemoryLib.h>
>>> +#include <Library/DebugLib.h>
>>> +#include <Library/HobLib.h>
>>> +#include <Library/MemoryAllocationLib.h>
>>> +#include <Library/PcdLib.h>
>>> +#include <Library/SampleAtResetLib.h>
>>> +#include <Library/UefiBootServicesTableLib.h>
>>> +
>>> +#include <Protocol/Smbios.h>
>>> +
>>> +#include <IndustryStandard/SmBios.h>
>>> +
>>> +//
>>> +// SMBIOS tables often reference each other using
>>> +// fixed constants, define a list of these constants
>>> +// for our hardcoded tables
>>> +//
>>> +enum SMBIOS_REFRENCE_HANDLES {
>>> + SMBIOS_HANDLE_A72_L1I = 0x1000,
>>> + SMBIOS_HANDLE_A72_L1D,
>>> + SMBIOS_HANDLE_A72_L2,
>>> + SMBIOS_HANDLE_L3,
>>> + SMBIOS_HANDLE_MOTHERBOARD,
>>> + SMBIOS_HANDLE_CHASSIS,
>>> + SMBIOS_HANDLE_A72_CLUSTER,
>>> + SMBIOS_HANDLE_MEMORY,
>>> + SMBIOS_HANDLE_DIMM
>>> +};
>>> +
>>> +//
>>> +// Type definition and contents of the default SMBIOS table.
>>> +// This table covers only the minimum structures required by
>>> +// the SMBIOS specification (section 6.2, version 3.0)
>>> +//
>>> +
>>> +// BIOS information (section 7.1)
>>> +STATIC SMBIOS_TABLE_TYPE0 mArmadaDefaultType0 = {
>>> + { // SMBIOS_STRUCTURE Hdr
>>> + EFI_SMBIOS_TYPE_BIOS_INFORMATION, // UINT8 Type
>>> + sizeof (SMBIOS_TABLE_TYPE0), // UINT8 Length
>>> + SMBIOS_HANDLE_PI_RESERVED,
>>> + },
>>> + 1, // SMBIOS_TABLE_STRING Vendor
>>> + 2, // SMBIOS_TABLE_STRING BiosVersion
>>> + 0xE800,// UINT16 BiosSegment
>>> + 3, // SMBIOS_TABLE_STRING BiosReleaseDate
>>> + 0, // UINT8 BiosSize
>>> + {
>>> + 0,0,0,0,0,0,
>>> + 1, //PCI supported
>>> + 0,
>>> + 1, //PNP supported
>>> + 0,
>>> + 1, //BIOS upgradable
>>> + 0, 0, 0,
>>> + 0, //Boot from CD
>>> + 1, //selectable boot
>>> + }, // MISC_BIOS_CHARACTERISTICS BiosCharacteristics
>>> + { // BIOSCharacteristicsExtensionBytes[2]
>>> + 0x3,
>>> + 0xC,
>>> + },
>>> + 0, // UINT8 SystemBiosMajorRelease
>>> + 0, // UINT8 SystemBiosMinorRelease
>>> + 0xFF, // UINT8
>> EmbeddedControllerFirmwareMajorRelease
>>> + 0xFF, // UINT8
>> EmbeddedControllerFirmwareMinorRelease
>>> +};
>>> +
>>> +STATIC CHAR8 CONST *mArmadaDefaultType0Strings[] = {
>>> + "EFI Development Kit II / Marvell\0", /* Vendor */
>>> + "EDK II\0", /* BiosVersion */
>>> + __DATE__"\0", /* BiosReleaseDate */
>>> + NULL
>>> +};
>>> +
>>> +// System information (section 7.2)
>>> +STATIC SMBIOS_TABLE_TYPE1 mArmadaDefaultType1 = {
>>> + { // SMBIOS_STRUCTURE Hdr
>>> + EFI_SMBIOS_TYPE_SYSTEM_INFORMATION,
>>> + sizeof (SMBIOS_TABLE_TYPE1),
>>> + SMBIOS_HANDLE_PI_RESERVED,
>>> + },
>>> + 1, //Manufacturer
>>> + 2, //Product Name
>>> + 3, //Version
>>> + 4, //Serial
>>> + { 0x97c93925, 0x1273, 0x4f03, {
>> 0x9f,0x75,0x2f,0x2b,0x7e,0xd1,0x94,0x80 }}, //UUID
>>> + 6, //Wakeup type
>>> + 0, //SKU
>>> + 0, //Family
>>> +};
>>> +
>>> +STATIC CHAR8 CONST *mArmadaDefaultType1Strings[] = {
>>> + "Marvell \0",/* Manufacturer */
>>> + "Armada 7k/8k Family Board \0",/* Product Name placeholder*/
>>> + "Revision unknown \0",/* Version placeholder */
>>> + " \0",/* 32 character buffer */
>>> + NULL
>>> +};
>>> +
>>> +// Baseboard (section 7.3)
>>> +STATIC SMBIOS_TABLE_TYPE2 mArmadaDefaultType2 = {
>>> + { // SMBIOS_STRUCTURE Hdr
>>> + EFI_SMBIOS_TYPE_BASEBOARD_INFORMATION, // UINT8 Type
>>> + sizeof (SMBIOS_TABLE_TYPE2), // UINT8 Length
>>> + SMBIOS_HANDLE_MOTHERBOARD,
>>> + },
>>> + 1, //Manufacturer
>>> + 2, //Product Name
>>> + 3, //Version
>>> + 4, //Serial
>>> + 0, //Asset tag
>>> + {1}, //motherboard, not replaceable
>>> + 5, //location of board
>>> + SMBIOS_HANDLE_CHASSIS,
>>> + BaseBoardTypeMotherBoard,
>>> + 1,
>>> + {SMBIOS_HANDLE_A72_CLUSTER},
>>> +};
>>> +
>>> +STATIC CHAR8 CONST *mArmadaDefaultType2Strings[] = {
>>> + "Marvell \0",/* Manufacturer */
>>> + "Armada 7k/8k Family Board \0",/* Product Name placeholder*/
>>> + "Revision unknown \0",/* Version placeholder */
>>> + "Serial Not Set \0",/* Serial */
>>> + "Base of Chassis \0",/* Board location */
>>> + NULL
>>> +};
>>> +
>>> +// Enclosure
>>> +STATIC SMBIOS_TABLE_TYPE3 mArmadaDefaultType3 = {
>>> + { // SMBIOS_STRUCTURE Hdr
>>> + EFI_SMBIOS_TYPE_SYSTEM_ENCLOSURE, // UINT8 Type
>>> + sizeof (SMBIOS_TABLE_TYPE3), // UINT8 Length
>>> + SMBIOS_HANDLE_CHASSIS,
>>> + },
>>> + 1, //Manufacturer
>>> + 2, //enclosure type
>>> + 2, //version
>>> + 3, //serial
>>> + 0, //asset tag
>>> + ChassisStateUnknown, //boot chassis state
>>> + ChassisStateSafe, //power supply state
>>> + ChassisStateSafe, //thermal state
>>> + ChassisSecurityStatusNone, //security state
>>> + {0,0,0,0,}, //OEM defined
>>> + 1, //1U height
>>> + 1, //number of power cords
>>> + 0, //no contained elements
>>> +};
>>> +
>>> +STATIC CHAR8 CONST *mArmadaDefaultType3Strings[] = {
>>> + "Marvell \0",/* Manufacturer placeholder */
>>> + "Revision unknown \0",/* Version placeholder */
>>> + "Serial Not Set \0",/* Serial placeholder */
>>> + NULL
>>> +};
>>> +
>>> +// Processor
>>> +STATIC SMBIOS_TABLE_TYPE4 mArmadaDefaultType4 = {
>>> + { // SMBIOS_STRUCTURE Hdr
>>> + EFI_SMBIOS_TYPE_PROCESSOR_INFORMATION, // UINT8 Type
>>> + sizeof (SMBIOS_TABLE_TYPE4), // UINT8 Length
>>> + SMBIOS_HANDLE_A72_CLUSTER,
>>> + },
>>> + 1, //socket type
>>> + 3, //processor type CPU
>>> + ProcessorFamilyIndicatorFamily2, //processor family, acquire from
>> field2
>>> + 2, //manufactuer
>>> + {{0,},{0.}}, //processor id
>>> + 3, //version
>>> + {0,0,0,0,0,1}, //voltage
>>> + 0, //external clock
>>> + 2000, //max speed
>>> + 0, //current speed - requires update
>>> + 0x41, //status
>>> + ProcessorUpgradeOther,
>>> + SMBIOS_HANDLE_A72_L1I, //l1 cache handle
>>> + SMBIOS_HANDLE_A72_L2, //l2 cache handle
>>> + SMBIOS_HANDLE_L3, //l3 cache handle
>>> + 0, //serial not set
>>> + 0, //asset not set
>>> + 4, //part number
>>> + 4, //core count in socket
>>> + 4, //enabled core count in socket
>>> + 0, //threads per socket
>>> + 0xEC, //processor characteristics
>>> + ProcessorFamilyARM, //ARMADA core
>>> +};
>>> +
>>> +STATIC CHAR8 CONST *mArmadaDefaultType4Strings[] = {
>>> + "Socket type unknown \0", /* Socket type placeholder */
>>> + "Marvell\0", /* manufactuer */
>>> + "Cortex-A72\0", /* processor description */
>>> + "0xd08\0", /* A72 part number */
>>> + NULL
>>> +};
>>> +
>>> +// Cache
>>> +STATIC SMBIOS_TABLE_TYPE7 mArmadaDefaultType7_a72_l1i = {
>>> + { // SMBIOS_STRUCTURE Hdr
>>> + EFI_SMBIOS_TYPE_CACHE_INFORMATION, // UINT8 Type
>>> + sizeof (SMBIOS_TABLE_TYPE7), // UINT8 Length
>>> + SMBIOS_HANDLE_A72_L1I,
>>> + },
>>> + 1,
>>> + 0x380, //L1 enabled, unknown WB
>>> + 48, //48k I-cache max
>>> + 48, //48k installed
>>> + {0,1}, //SRAM type
>>> + {0,1}, //SRAM type
>>> + 0, //speed unknown
>>> + CacheErrorParity, //parity checking
>>> + CacheTypeInstruction, //instruction cache
>>> + CacheAssociativityOther, //three way
>>> +};
>>> +
>>> +STATIC SMBIOS_TABLE_TYPE7 mArmadaDefaultType7_a72_l1d = {
>>> + { // SMBIOS_STRUCTURE Hdr
>>> + EFI_SMBIOS_TYPE_CACHE_INFORMATION, // UINT8 Type
>>> + sizeof (SMBIOS_TABLE_TYPE7), // UINT8 Length
>>> + SMBIOS_HANDLE_A72_L1D,
>>> + },
>>> + 2,
>>> + 0x380, //L1 enabled, unknown WB
>>> + 32, //32k D-cache max
>>> + 32, //32k installed
>>> + {0,1}, //SRAM type
>>> + {0,1}, //SRAM type
>>> + 0, //speed unknown
>>> + CacheErrorParity, //parity checking
>>> + CacheTypeInstruction, //instruction cache
>>> + CacheAssociativityOther, //three way
>>> +};
>>> +
>>> +STATIC SMBIOS_TABLE_TYPE7 mArmadaDefaultType7_a72_l2 = {
>>> + { // SMBIOS_STRUCTURE Hdr
>>> + EFI_SMBIOS_TYPE_CACHE_INFORMATION, // UINT8 Type
>>> + sizeof (SMBIOS_TABLE_TYPE7), // UINT8 Length
>>> + SMBIOS_HANDLE_A72_L2,
>>> + },
>>> + 3,
>>> + 0x181, //L2 enabled, WB
>>> + 512, //512k D-cache max
>>> + 512, //512k installed
>>> + {0,1}, //SRAM type
>>> + {0,1}, //SRAM type
>>> + 0, //speed unknown
>>> + CacheErrorSingleBit, //ECC checking
>>> + CacheTypeUnified, //instruction cache
>>> + CacheAssociativity16Way, //16 way associative
>>> +};
>>> +
>>> +STATIC SMBIOS_TABLE_TYPE7 mArmadaDefaultType7_l3 = {
>>> + { // SMBIOS_STRUCTURE Hdr
>>> + EFI_SMBIOS_TYPE_CACHE_INFORMATION, // UINT8 Type
>>> + sizeof (SMBIOS_TABLE_TYPE7), // UINT8 Length
>>> + SMBIOS_HANDLE_L3,
>>> + },
>>> + 4,
>>> + 0x182, //L3 enabled, WB
>>> + 1024, //1M cache max
>>> + 1024, //1M installed
>>> + {0,1}, //SRAM type
>>> + {0,1}, //SRAM type
>>> + 0, //speed unknown
>>> + CacheErrorSingleBit, //ECC checking
>>> + CacheTypeUnified, //instruction cache
>>> + CacheAssociativity8Way, //8 way associative
>>> +};
>>> +
>>> +STATIC CONST CHAR8 *mArmadaDefaultType7Strings[] = {
>>> + "L1 Instruction\0", /* L1I */
>>> + "L1 Data\0", /* L1D */
>>> + "L2\0", /* L2 */
>>> + "L3\0", /* L3 */
>>> + NULL
>>> +};
>>> +
>>> +// Slots
>>> +STATIC SMBIOS_TABLE_TYPE9 mArmadaDefaultType9_0 = {
>>> + { // SMBIOS_STRUCTURE Hdr
>>> + EFI_SMBIOS_TYPE_INACTIVE, // UINT8 Type
>>> + sizeof (SMBIOS_TABLE_TYPE9), // UINT8 Length
>>> + SMBIOS_HANDLE_PI_RESERVED,
>>> + },
>>> + 1, // CP0 PCIE0
>>> + SlotTypePciExpressGen2X1,
>>> + SlotDataBusWidth1X,
>>> + SlotUsageUnknown,
>>> + SlotLengthShort,
>>> + 0,
>>> + {1}, //Unknown
>>> + {1,0,1}, //PME and SMBUS
>>> + 0,
>>> + 0,
>>> + 1,
>>> +};
>>> +
>>> +STATIC SMBIOS_TABLE_TYPE9 mArmadaDefaultType9_1 = {
>>> + { // SMBIOS_STRUCTURE Hdr
>>> + EFI_SMBIOS_TYPE_INACTIVE, // UINT8 Type
>>> + sizeof (SMBIOS_TABLE_TYPE9), // UINT8 Length
>>> + SMBIOS_HANDLE_PI_RESERVED,
>>> + },
>>> + 2, // CP0 PCIE1
>>> + SlotTypePciExpressGen2X1,
>>> + SlotDataBusWidth1X,
>>> + SlotUsageUnknown,
>>> + SlotLengthShort,
>>> + 0,
>>> + {1},
>>> + {1,0,1}, //PME and SMBUS
>>> + 0,
>>> + 0,
>>> + 2,
>>> +};
>>> +
>>> +STATIC SMBIOS_TABLE_TYPE9 mArmadaDefaultType9_2 = {
>>> + { // SMBIOS_STRUCTURE Hdr
>>> + EFI_SMBIOS_TYPE_INACTIVE, // UINT8 Type
>>> + sizeof (SMBIOS_TABLE_TYPE9), // UINT8 Length
>>> + SMBIOS_HANDLE_PI_RESERVED,
>>> + },
>>> + 3, // CP0 PCIE2
>>> + SlotTypePciExpressGen2X1,
>>> + SlotDataBusWidth1X,
>>> + SlotUsageUnknown,
>>> + SlotLengthShort,
>>> + 0,
>>> + {1},
>>> + {1,0,1}, //PME and SMBUS
>>> + 0,
>>> + 0,
>>> + 3,
>>> +};
>>> +
>>> +STATIC SMBIOS_TABLE_TYPE9 mArmadaDefaultType9_3 = {
>>> + { // SMBIOS_STRUCTURE Hdr
>>> + EFI_SMBIOS_TYPE_INACTIVE, // UINT8 Type
>>> + sizeof (SMBIOS_TABLE_TYPE9), // UINT8 Length
>>> + SMBIOS_HANDLE_PI_RESERVED,
>>> + },
>>> + 4, // CP1 PCIE0
>>> + SlotTypePciExpressGen2X1,
>>> + SlotDataBusWidth1X,
>>> + SlotUsageUnknown,
>>> + SlotLengthShort,
>>> + 0,
>>> + {1},
>>> + {1,0,1}, //PME and SMBUS
>>> + 0,
>>> + 0,
>>> + 0xc,
>>> +};
>>> +
>>> +STATIC SMBIOS_TABLE_TYPE9 mArmadaDefaultType9_4 = {
>>> + { // SMBIOS_STRUCTURE Hdr
>>> + EFI_SMBIOS_TYPE_INACTIVE, // UINT8 Type
>>> + sizeof (SMBIOS_TABLE_TYPE9), // UINT8 Length
>>> + SMBIOS_HANDLE_PI_RESERVED,
>>> + },
>>> + 5, // CP1 PCIE1
>>> + SlotTypePciExpressGen2X1,
>>> + SlotDataBusWidth1X,
>>> + SlotUsageUnknown,
>>> + SlotLengthShort,
>>> + 0,
>>> + {1},
>>> + {1,0,1}, //PME and SMBUS
>>> + 0,
>>> + 0,
>>> + 0xc,
>>> +};
>>> +
>>> +STATIC SMBIOS_TABLE_TYPE9 mArmadaDefaultType9_5 = {
>>> + { // SMBIOS_STRUCTURE Hdr
>>> + EFI_SMBIOS_TYPE_INACTIVE, // UINT8 Type
>>> + sizeof (SMBIOS_TABLE_TYPE9), // UINT8 Length
>>> + SMBIOS_HANDLE_PI_RESERVED,
>>> + },
>>> + 6, // CP1 PCIE2
>>> + SlotTypePciExpressGen2X1,
>>> + SlotDataBusWidth1X,
>>> + SlotUsageUnknown,
>>> + SlotLengthShort,
>>> + 0,
>>> + {1},
>>> + {1,0,1}, //PME and SMBUS
>>> + 0,
>>> + 0,
>>> + 0xc,
>>> +};
>>> +
>>> +STATIC CHAR8 CONST *mArmadaDefaultType9Strings[] = {
>>> + "PCIE0 CP0 \0",/* Slot0 */
>>> + "PCIE1 CP0 \0",/* Slot1 */
>>> + "PCIE2 CP0 \0",/* Slot2 */
>>> + "PCIE0 CP1 \0",/* Slot3 */
>>> + "PCIE1 CP1 \0",/* Slot4 */
>>> + "PCIE2 CP1 \0",/* Slot5 */
>>> + NULL
>>> +};
>>> +
>>> +// Memory array
>>> +STATIC SMBIOS_TABLE_TYPE16 mArmadaDefaultType16 = {
>>> + { // SMBIOS_STRUCTURE Hdr
>>> + EFI_SMBIOS_TYPE_PHYSICAL_MEMORY_ARRAY, // UINT8 Type
>>> + sizeof (SMBIOS_TABLE_TYPE16), // UINT8 Length
>>> + SMBIOS_HANDLE_MEMORY,
>>> + },
>>> + MemoryArrayLocationSystemBoard, //on motherboard
>>> + MemoryArrayUseSystemMemory, //system RAM
>>> + MemoryErrorCorrectionNone, //ECC RAM
>>> + 0x1000000, //16GB
>>> + 0xFFFE, //No error information structure
>>> + 0x1, //soldered memory
>>> +};
>>> +
>>> +STATIC CHAR8 CONST *mArmadaDefaultType16Strings[] = {
>>> + NULL
>>> +};
>>> +
>>> +// Memory device
>>> +STATIC SMBIOS_TABLE_TYPE17 mArmadaDefaultType17 = {
>>> + { // SMBIOS_STRUCTURE Hdr
>>> + EFI_SMBIOS_TYPE_MEMORY_DEVICE, // UINT8 Type
>>> + sizeof (SMBIOS_TABLE_TYPE17), // UINT8 Length
>>> + SMBIOS_HANDLE_DIMM,
>>> + },
>>> + SMBIOS_HANDLE_MEMORY, //array to which this module belongs
>>> + 0xFFFE, //no errors
>>> + 64, //single DIMM, no ECC is 64bits (for ecc this would be 72)
>>> + 32, //data width of this device (32-bits)
>>> + 0, //Memory size obtained dynamically
>>> + MemoryFormFactorRowOfChips, //Memory factor
>>> + 0, //Not part of a set
>>> + 1, //Right side of board
>>> + 2, //Bank 0
>>> + MemoryTypeDdr4, //DDR4
>>> + {0,0,0,0,0,0,0,0,0,0,0,0,0,0,1}, //unbuffered
>>> + 0, //DRAM speed - requires update
>>> + 0, //varies between diffrent production runs
>>> + 0, //serial
>>> + 0, //asset tag
>>> + 0, //part number
>>> + 0, //rank
>>> +};
>>> +
>>> +STATIC CHAR8 CONST *mArmadaDefaultType17Strings[] = {
>>> + "RIGHT SIDE\0", /* location */
>>> + "BANK 0\0", /* bank description */
>>> + NULL
>>> +};
>>> +
>>> +//
>>> +// Memory array mapped address, this structure
>>> +// is overridden by SmbiosInstallMemoryStructure.
>>> +//
>>> +STATIC SMBIOS_TABLE_TYPE19 mArmadaDefaultType19 = {
>>> + { // SMBIOS_STRUCTURE Hdr
>>> + EFI_SMBIOS_TYPE_MEMORY_ARRAY_MAPPED_ADDRESS, // UINT8 Type
>>> + sizeof (SMBIOS_TABLE_TYPE19), // UINT8 Length
>>> + SMBIOS_HANDLE_PI_RESERVED,
>>> + },
>>> + 0xFFFFFFFF, //invalid, look at extended addr field
>>> + 0xFFFFFFFF,
>>> + SMBIOS_HANDLE_DIMM, //handle
>>> + 1,
>>> + 0x080000000, //starting addr of first 2GB
>>> + 0x100000000, //ending addr of first 2GB
>>> +};
>>> +
>>> +// System boot infomArmadaDefaultType4.
>>> +STATIC SMBIOS_TABLE_TYPE32 mArmadaDefaultType32 = {
>>> + { // SMBIOS_STRUCTURE Hdr
>>> + EFI_SMBIOS_TYPE_SYSTEM_BOOT_INFORMATION, // UINT8 Type
>>> + sizeof (SMBIOS_TABLE_TYPE32), // UINT8 Length
>>> + SMBIOS_HANDLE_PI_RESERVED,
>>> + },
>>> + {0, 0, 0, 0, 0, 0}, //reserved
>>> + BootInformationStatusNoError,
>>> +};
>>> +
>>> +STATIC CHAR8 CONST *mArmadaDefaultType32Strings[] = {
>>> + NULL
>>> +};
>>> +
>>> +STATIC CONST VOID *DefaultCommonTables[][2] =
>>> +{
>>> + { &mArmadaDefaultType0, mArmadaDefaultType0Strings },
>>> + { &mArmadaDefaultType1, mArmadaDefaultType1Strings },
>>> + { &mArmadaDefaultType2, mArmadaDefaultType2Strings },
>>> + { &mArmadaDefaultType3, mArmadaDefaultType3Strings },
>>> + { &mArmadaDefaultType4, mArmadaDefaultType4Strings },
>>> + { &mArmadaDefaultType7_a72_l1i, mArmadaDefaultType7Strings },
>>> + { &mArmadaDefaultType7_a72_l1d, mArmadaDefaultType7Strings },
>>> + { &mArmadaDefaultType7_a72_l2, mArmadaDefaultType7Strings },
>>> + { &mArmadaDefaultType7_l3, mArmadaDefaultType7Strings },
>>> + { &mArmadaDefaultType9_0, mArmadaDefaultType9Strings },
>>> + { &mArmadaDefaultType9_1, mArmadaDefaultType9Strings },
>>> + { &mArmadaDefaultType9_2, mArmadaDefaultType9Strings },
>>> + { &mArmadaDefaultType9_3, mArmadaDefaultType9Strings },
>>> + { &mArmadaDefaultType9_4, mArmadaDefaultType9Strings },
>>> + { &mArmadaDefaultType9_5, mArmadaDefaultType9Strings },
>>> + { &mArmadaDefaultType16, mArmadaDefaultType16Strings },
>>> + { &mArmadaDefaultType17, mArmadaDefaultType17Strings },
>>> + { &mArmadaDefaultType32, mArmadaDefaultType32Strings },
>>> + { NULL, NULL },
>>> +};
>>> +
>>> +/**
>>> +
>>> + Create SMBIOS record.
>>> +
>>> + Converts a fixed SMBIOS structure and an array of pointers to strings
>> into
>>> + an SMBIOS record where the strings are cat'ed on the end of the fixed
>> record
>>> + and terminated via a double NULL and add to SMBIOS table.
>>> +
>>> + SMBIOS_TABLE_TYPE32 gSmbiosType12 = {
>>> + { EFI_SMBIOS_TYPE_SYSTEM_CONFIGURATION_OPTIONS, sizeof
>> (SMBIOS_TABLE_TYPE12), 0 },
>>> + 1 // StringCount
>>> + };
>>> +
>>> + CHAR8 *gSmbiosType12Strings[] = {
>>> + "Not Found",
>>> + NULL
>>> + };
>>> +
>>> + ...
>>> +
>>> + LogSmbiosData (
>>> + (EFI_SMBIOS_TABLE_HEADER*)&gSmbiosType12,
>>> + gSmbiosType12Strings
>>> + );
>>> +
>>> + @param Smbios SMBIOS protocol
>>> + @param Template Fixed SMBIOS structure, required.
>>> + @param StringArray Array of strings to convert to an SMBIOS string
>> pack.
>>> + NULL is OK.
>>> +**/
>>> +STATIC
>>> +EFI_STATUS
>>> +EFIAPI
>>> +LogSmbiosData (
>>> + IN EFI_SMBIOS_PROTOCOL *Smbios,
>>> + IN EFI_SMBIOS_TABLE_HEADER *Template,
>>> + IN CONST CHAR8 * CONST *StringArray
>>> + )
>>> +{
>>> + EFI_STATUS Status;
>>> + EFI_SMBIOS_TABLE_HEADER *Record;
>>> + UINTN Index;
>>> + UINTN StringSize;
>>> + UINTN Size;
>>> + CHAR8 *Str;
>>> +
>>> +
>>> + // Calculate the size of the fixed record and optional string pack
>>> + Size = Template->Length;
>>> + if (StringArray == NULL) {
>>> + // At least a double null is required
>>> + Size += 1;
>>> + } else {
>>> + for (Index = 0; StringArray[Index] != NULL; Index++) {
>>> + StringSize = AsciiStrSize (StringArray[Index]);
>>> + Size += StringSize;
>>> + }
>>> + if (StringArray[0] == NULL) {
>>> + // At least a double null is required
>>> + Size += 1;
>>> + }
>>> +
>>> + // Don't forget the terminating double null
>>> + Size += 1;
>>> + }
>>> +
>>> + // Copy over Template
>>> + Record = (EFI_SMBIOS_TABLE_HEADER *)AllocateZeroPool (Size);
>>> + if (Record == NULL) {
>>> + return EFI_OUT_OF_RESOURCES;
>>> + }
>>> + CopyMem (Record, Template, Template->Length);
>>> +
>>> + // Append string pack
>>> + Str = ((VOID *)Record) + Record->Length;
>>> + for (Index = 0; StringArray[Index] != NULL; Index++) {
>>> + StringSize = AsciiStrSize (StringArray[Index]);
>>> + CopyMem (Str, StringArray[Index], StringSize);
>>> + Str += StringSize;
>>> + }
>>> + *Str = 0;
>>> +
>>> + Status = Smbios->Add (Smbios,
>>> + NULL,
>>> + &Record->Handle,
>>> + Record);
>>> + ASSERT_EFI_ERROR (Status);
>>> +
>>> + FreePool (Record);
>>> +
>>> + return Status;
>>> +}
>>> +
>>> +/**
>>> + Installs a memory descriptor (type19) for the given address range
>>> +
>>> + @param Smbios SMBIOS protocol.
>>> + @param StartingAddress Start address of the memory chunk.
>>> + @param RegionLength Memory chunk size.
>>> +
>>> +**/
>>> +EFI_STATUS
>>> +SmbiosInstallMemoryStructure (
>>> + IN EFI_SMBIOS_PROTOCOL *Smbios,
>>> + IN UINT64 StartingAddress,
>>> + IN UINT64 RegionLength
>>> + )
>>> +{
>>> + EFI_SMBIOS_HANDLE SmbiosHandle;
>>> + SMBIOS_TABLE_TYPE19 MemoryDescriptor;
>>> + EFI_STATUS Status = EFI_SUCCESS;
>>> +
>>> + CopyMem (&MemoryDescriptor,
>>> + &mArmadaDefaultType19,
>>> + sizeof (SMBIOS_TABLE_TYPE19));
>>> +
>>> + MemoryDescriptor.ExtendedStartingAddress = StartingAddress;
>>> + MemoryDescriptor.ExtendedEndingAddress = StartingAddress +
>> RegionLength;
>>> + SmbiosHandle = MemoryDescriptor.Hdr.Handle;
>>> +
>>> + Status = Smbios->Add (Smbios,
>>> + NULL,
>>> + &SmbiosHandle,
>>> + (EFI_SMBIOS_TABLE_HEADER*) &MemoryDescriptor);
>>> +
>>> + return Status;
>>> +}
>>> +
>>> +/**
>>> + Install a whole table worth of structructures
>>> +
>>> + @param Smbios SMBIOS protocol.
>>> + @param DefaultTables A pointer to the default SMBIOS table
>> structure.
>>> +
>>> +**/
>>> +EFI_STATUS
>>> +SmbiosInstallStructures (
>>> + IN EFI_SMBIOS_PROTOCOL *Smbios,
>>> + IN CONST VOID *DefaultTables[][2]
>>> + )
>>> +{
>>> + EFI_STATUS Status = EFI_SUCCESS;
>>> + INTN TableEntry;
>>> +
>>> + for (TableEntry = 0; DefaultTables[TableEntry][0] != NULL;
>> TableEntry++) {
>>> + // Omit disabled tables
>>> + if (((EFI_SMBIOS_TABLE_HEADER
>> *)DefaultTables[TableEntry][0])->Type ==
>>> + EFI_SMBIOS_TYPE_INACTIVE) {
>>> + continue;
>>> + }
>>> +
>>> + Status = LogSmbiosData (Smbios,
>>> + ((EFI_SMBIOS_TABLE_HEADER
>> *)DefaultTables[TableEntry][0]),
>>> + DefaultTables[TableEntry][1]);
>>> + if (EFI_ERROR (Status))
>>> + break;
>>> + }
>>> +
>>> + return Status;
>>> +}
>>> +
>>> +/**
>>> + Update memory information basing on the HOB list.
>>> +
>>> + @param Smbios SMBIOS protocol
>>> +
>>> +**/
>>> +STATIC
>>> +EFI_STATUS
>>> +SmbiosMemoryInstall (
>>> + IN EFI_SMBIOS_PROTOCOL *Smbios
>>> + )
>>> +{
>>> + EFI_PEI_HOB_POINTERS Hob;
>>> + UINT64 MemorySize;
>>> + EFI_STATUS Status;
>>> +
>>> + MemorySize = 0;
>>> +
>>> + //
>>> + // Get the HOB list for processing
>>> + //
>>> + Hob.Raw = GetHobList ();
>>> +
>>> + //
>>> + // Collect memory ranges
>>> + //
>>> + while (!END_OF_HOB_LIST (Hob)) {
>>> + if (Hob.Header->HobType == EFI_HOB_TYPE_RESOURCE_DESCRIPTOR) {
>>> + if (Hob.ResourceDescriptor->ResourceType ==
>> EFI_RESOURCE_SYSTEM_MEMORY) {
>>> + MemorySize +=
>> (UINT64)(Hob.ResourceDescriptor->ResourceLength);
>>> +
>>> + Status = SmbiosInstallMemoryStructure (Smbios,
>>> + Hob.ResourceDescriptor->PhysicalStart,
>>> + Hob.ResourceDescriptor->ResourceLength);
>>> + if (EFI_ERROR(Status)) {
>>> + return Status;
>>> + }
>>> + }
>>> + }
>>> + Hob.Raw = GET_NEXT_HOB (Hob);
>>> + }
>>> +
>>> + //
>>> + // Update TYPE17 memory size field
>>> + //
>>> + mArmadaDefaultType17.Size = (UINT16)(MemorySize >> 20);
>>> +
>>> + return EFI_SUCCESS;
>>> +}
>>> +
>>> +/**
>>> + Install all structures from the DefaultTables structure
>>> +
>>> + @param Smbios SMBIOS protocol
>>> +
>>> +**/
>>> +EFI_STATUS
>>> +SmbiosInstallAllStructures (
>>> + IN EFI_SMBIOS_PROTOCOL *Smbios
>>> + )
>>> +{
>>> + EFI_STATUS Status;
>>> + UINT32 FirmwareMajorRevisionNumber;
>>> + UINT32 FirmwareMinorRevisionNumber;
>>> +
>>> + FirmwareMajorRevisionNumber = (PcdGet32 (PcdFirmwareRevision) >> 16)
>> & 0xFF;
>>> + FirmwareMinorRevisionNumber = PcdGet32 (PcdFirmwareRevision) & 0xFF;
>>> +
>>> + //
>>> + // Update Firmware Revision, CPU and DRAM frequencies.
>>> + //
>>> + mArmadaDefaultType0.SystemBiosMajorRelease =
>> FirmwareMajorRevisionNumber;
>>> + mArmadaDefaultType0.SystemBiosMinorRelease =
>> FirmwareMinorRevisionNumber;
>>> + mArmadaDefaultType4.CurrentSpeed = SampleAtResetGetCpuFrequency ();
>>> + mArmadaDefaultType17.Speed = SampleAtResetGetDramFrequency ();
>>> +
>>> + //
>>> + // Generate memory descriptors.
>>> + //
>>> + Status = SmbiosMemoryInstall (Smbios);
>>> + ASSERT_EFI_ERROR (Status);
>>> +
>>> + //
>>> + // Install all tables.
>>> + //
>>> + Status = SmbiosInstallStructures (Smbios, DefaultCommonTables);
>>> + ASSERT_EFI_ERROR (Status);
>>> +
>>> + return EFI_SUCCESS;
>>> +}
>>> +
>>> +/**
>>> + Installs SMBIOS information for Armada platforms
>>> +
>>> + @param ImageHandle Module's image handle
>>> + @param SystemTable Pointer of EFI_SYSTEM_TABLE
>>> +
>>> + @retval EFI_SUCCESS Smbios data successfully installed
>>> + @retval Other Smbios data was not installed
>>> +
>>> +**/
>>> +EFI_STATUS
>>> +EFIAPI
>>> +SmbiosPlatformDriverEntryPoint (
>>> + IN EFI_HANDLE ImageHandle,
>>> + IN EFI_SYSTEM_TABLE *SystemTable
>>> + )
>>> +{
>>> + EFI_STATUS Status;
>>> + EFI_SMBIOS_PROTOCOL *Smbios;
>>> +
>>> + //
>>> + // Find the SMBIOS protocol
>>> + //
>>> + Status = gBS->LocateProtocol (&gEfiSmbiosProtocolGuid,
>>> + NULL,
>>> + (VOID **)&Smbios);
>>> + if (EFI_ERROR (Status)) {
>>> + return Status;
>>> + }
>>> +
>>> + Status = SmbiosInstallAllStructures (Smbios);
>>> +
>>> + return Status;
>>> +}
>>>
>>
>>
>>
>>
>>
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#41761): https://edk2.groups.io/g/devel/message/41761
Mute This Topic: https://groups.io/mt/31882098/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-
More information about the edk2-devel-archive
mailing list