* [PATCH edk2-platforms] Platform/Socionext/DeveloperBox: add SMBIOS tables
@ 2018-03-03 11:29 Ard Biesheuvel
2018-03-15 18:37 ` Leif Lindholm
0 siblings, 1 reply; 5+ messages in thread
From: Ard Biesheuvel @ 2018-03-03 11:29 UTC (permalink / raw)
To: edk2-devel; +Cc: leif.lindholm, Ard Biesheuvel
This adds SMBIOS tables to the DeveloperBox platform describing the
BIOS, system, enclosure, CPUs, caches, PCIe slots and system memory,
which almost amounts to the mandatory minimum as given by the SMBIOS
spec. Only the type 17 structures currently lack detailed information
about the DIMMs: the SPDs are on a I2C bus that is only accessible by
the SCP, and it currently does not share this information.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
Platform/Socionext/DeveloperBox/DeveloperBox.dsc | 9 +
Platform/Socionext/DeveloperBox/DeveloperBox.fdf | 6 +
Platform/Socionext/DeveloperBox/SmbiosPlatformDxe/SmbiosPlatformDxe.c | 641 ++++++++++++++++++++
Platform/Socionext/DeveloperBox/SmbiosPlatformDxe/SmbiosPlatformDxe.inf | 47 ++
4 files changed, 703 insertions(+)
diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
index d170266087af..c971f76233b0 100644
--- a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
+++ b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
@@ -688,4 +688,13 @@ [Components.common]
!include Silicon/Socionext/SynQuacer/Acpi.dsc.inc
+ #
+ # SMBIOS/DMI support
+ #
+ MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
+ Platform/Socionext/DeveloperBox/SmbiosPlatformDxe/SmbiosPlatformDxe.inf {
+ <BuildOptions>
+ *_*_*_CC_FLAGS = -DFIRMWARE_VENDOR=\"$(FIRMWARE_VENDOR)\" -DBUILD_NUMBER=\"$(BUILD_NUMBER)\"
+ }
+
Platform/Socionext/DeveloperBox/OsInstallerMenuDxe/OsInstallerMenuDxe.inf
diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.fdf b/Platform/Socionext/DeveloperBox/DeveloperBox.fdf
index 851082808564..0dfefe428fb2 100644
--- a/Platform/Socionext/DeveloperBox/DeveloperBox.fdf
+++ b/Platform/Socionext/DeveloperBox/DeveloperBox.fdf
@@ -260,6 +260,12 @@ [FV.FvMain]
INF MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf
INF RuleOverride = ACPITABLE Silicon/Socionext/SynQuacer/AcpiTables/AcpiTables.inf
+ #
+ # SMBIOS/DMI support
+ #
+ INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
+ INF Platform/Socionext/DeveloperBox/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
+
INF Platform/Socionext/DeveloperBox/OsInstallerMenuDxe/OsInstallerMenuDxe.inf
!if $(DO_X86EMU) == TRUE
diff --git a/Platform/Socionext/DeveloperBox/SmbiosPlatformDxe/SmbiosPlatformDxe.c b/Platform/Socionext/DeveloperBox/SmbiosPlatformDxe/SmbiosPlatformDxe.c
new file mode 100644
index 000000000000..f1aec6ebdac0
--- /dev/null
+++ b/Platform/Socionext/DeveloperBox/SmbiosPlatformDxe/SmbiosPlatformDxe.c
@@ -0,0 +1,641 @@
+/** @file
+ This driver installs SMBIOS information for Socionext SynQuacer platforms
+
+ Copyright (c) 2015, ARM Limited. All rights reserved.
+ Copyright (c) 2018, Linaro, Ltd. All rights reserved.
+
+ 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 <PiDxe.h>
+#include <IndustryStandard/SmBios.h>
+#include <Library/BaseLib.h>
+#include <Library/BaseMemoryLib.h>
+#include <Library/DebugLib.h>
+#include <Library/HobLib.h>
+#include <Library/MemoryAllocationLib.h>
+#include <Library/UefiBootServicesTableLib.h>
+#include <Protocol/Smbios.h>
+
+STATIC EFI_SMBIOS_PROTOCOL *mSmbios;
+
+//
+// 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)
+//
+#pragma pack(1)
+typedef struct {
+ SMBIOS_TABLE_TYPE0 Base;
+ INT8 Strings[];
+} ARM_TYPE0;
+
+typedef struct {
+ SMBIOS_TABLE_TYPE1 Base;
+ UINT8 Strings[];
+} ARM_TYPE1;
+
+typedef struct {
+ SMBIOS_TABLE_TYPE2 Base;
+ UINT8 Strings[];
+} ARM_TYPE2;
+
+typedef struct {
+ SMBIOS_TABLE_TYPE3 Base;
+ UINT8 Strings[];
+} ARM_TYPE3;
+
+typedef struct {
+ SMBIOS_TABLE_TYPE4 Base;
+ UINT8 Strings[];
+} ARM_TYPE4;
+
+typedef struct {
+ SMBIOS_TABLE_TYPE7 Base;
+ UINT8 Strings[];
+} ARM_TYPE7;
+
+typedef struct {
+ SMBIOS_TABLE_TYPE9 Base;
+ UINT8 Strings[];
+} ARM_TYPE9;
+
+typedef struct {
+ SMBIOS_TABLE_TYPE16 Base;
+ UINT8 Strings[];
+} ARM_TYPE16;
+
+typedef struct {
+ SMBIOS_TABLE_TYPE17 Base;
+ UINT8 Strings[];
+} ARM_TYPE17;
+
+typedef struct {
+ SMBIOS_TABLE_TYPE19 Base;
+ UINT8 Strings[];
+} ARM_TYPE19;
+
+typedef struct {
+ SMBIOS_TABLE_TYPE32 Base;
+ UINT8 Strings[];
+} ARM_TYPE32;
+#pragma pack()
+
+enum {
+ SMBIOS_HANDLE_A53_L1I = 0x1000,
+ SMBIOS_HANDLE_A53_L1D,
+ SMBIOS_HANDLE_A53_L2,
+ SMBIOS_HANDLE_A53_L3,
+ SMBIOS_HANDLE_MOTHERBOARD,
+ SMBIOS_HANDLE_CHASSIS,
+ SMBIOS_HANDLE_A53_CLUSTER,
+ SMBIOS_HANDLE_MEMORY,
+};
+
+// BIOS information (section 7.1)
+STATIC CONST ARM_TYPE0 mArmDefaultType0 = {
+ {
+ { // SMBIOS_STRUCTURE Hdr
+ EFI_SMBIOS_TYPE_BIOS_INFORMATION,
+ sizeof (SMBIOS_TABLE_TYPE0),
+ SMBIOS_HANDLE_PI_RESERVED,
+ },
+ 1, // Vendor
+ 2, // BiosVersion
+ 0xE800, // BiosSegment
+ 3, // BiosReleaseDate
+ (FixedPcdGet32 (PcdFdSize) - SIZE_64KB) / SIZE_64KB, // BiosSize
+ {
+ 0, 0, 0, 0, 0, 0,
+ 1, // PCI supported
+ 0,
+ 1, // PNP supported
+ 0,
+ 1, // BIOS upgradable
+ 0, 0, 0,
+ 1, // Boot from CD
+ 1, // Selectable boot
+ },
+ { 0x3, 0xC, }, // BIOSCharacteristicsExtensionBytes[2]
+
+ FixedPcdGet32 (PcdFirmwareRevision) >> 16, // SystemBiosMajorRelease
+ FixedPcdGet32 (PcdFirmwareRevision) & 0xff, // SystemBiosMinorRelease
+ 0xFF, // EmbeddedControllerFirmwareMajorRelease
+ 0xFF // EmbeddedControllerFirmwareMinorRelease
+ },
+ FIRMWARE_VENDOR "\0"
+ BUILD_NUMBER "\0"
+ __DATE__
+};
+
+// System information (section 7.2)
+STATIC CONST ARM_TYPE1 mArmDefaultType1 = {
+ {
+ { // SMBIOS_STRUCTURE Hdr
+ EFI_SMBIOS_TYPE_SYSTEM_INFORMATION,
+ sizeof(SMBIOS_TABLE_TYPE1),
+ SMBIOS_HANDLE_PI_RESERVED,
+ },
+ 1, // Manufacturer
+ 2, // Product Name
+ 0, // Version
+ 0, // Serial
+ { 0xbf4ec78a, 0x431d, 0x4eb6, { 0xbb, 0xc9, 0x0c, 0x06, 0x19, 0x05, 0xca, 0x13 }},
+ 6, // Wakeup type
+ 0, // SKU
+ 0, // Family
+ },
+ "Socionext\0"
+ "SynQuacer E-series DeveloperBox"
+};
+
+// Enclosure
+STATIC CONST ARM_TYPE3 mArmDefaultType3 = {
+ {
+ { // SMBIOS_STRUCTURE Hdr
+ EFI_SMBIOS_TYPE_SYSTEM_ENCLOSURE,
+ sizeof (SMBIOS_TABLE_TYPE3),
+ SMBIOS_HANDLE_CHASSIS,
+ },
+ 1, // Manufacturer
+ 4, // Enclosure type (low profile desktop)
+ 2, // Version
+ 0, // 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
+ }, {
+ "InWin\0"
+ "BK623"
+ }
+};
+
+STATIC CONST ARM_TYPE4 mArmDefaultType4 = {
+ {
+ { // SMBIOS_STRUCTURE Hdr
+ EFI_SMBIOS_TYPE_PROCESSOR_INFORMATION,
+ sizeof (SMBIOS_TABLE_TYPE4),
+ SMBIOS_HANDLE_A53_CLUSTER,
+ },
+ 0, // socket type
+ 3, // processor type CPU
+ ProcessorFamilyIndicatorFamily2, // processor family, acquire from field2
+ 1, // manufacturer
+ {}, // processor id
+ 2, // version
+ { 0, 0, 0, 0, 0, 1 }, // voltage
+ 0, // external clock
+ 1000, // max speed
+ 1000, // current speed
+ 0x41, // status
+ ProcessorUpgradeNone,
+ SMBIOS_HANDLE_A53_L1I, // l1 cache handle
+ SMBIOS_HANDLE_A53_L2, // l2 cache handle
+ SMBIOS_HANDLE_A53_L3, // l3 cache handle
+ 0, // serial not set
+ 0, // asset not set
+ 3, // part number
+ 24, // core count in socket
+ 24, // enabled core count in socket
+ 1, // threads per socket
+ 0xEC, // processor characteristics
+ ProcessorFamilyARM, // ARM core
+ },
+ "ARM Ltd.\0"
+ "Cortex-A53\0"
+ "0xd03"
+};
+
+STATIC CONST ARM_TYPE7 mArmDefaultType7_l1i = {
+ {
+ { // SMBIOS_STRUCTURE Hdr
+ EFI_SMBIOS_TYPE_CACHE_INFORMATION,
+ sizeof (SMBIOS_TABLE_TYPE7),
+ SMBIOS_HANDLE_A53_L1I,
+ },
+ 1,
+ 0x380, // L1 enabled
+ 32, // 32k i cache max
+ 32, // 32k installed
+ { 0, 1 }, // SRAM type
+ { 0, 1 }, // SRAM type
+ 0, // unknown speed
+ CacheErrorParity,
+ CacheTypeInstruction,
+ CacheAssociativity2Way,
+ },
+ "L1 Instruction"
+};
+
+STATIC CONST ARM_TYPE7 mArmDefaultType7_l1d = {
+ {
+ { // SMBIOS_STRUCTURE Hdr
+ EFI_SMBIOS_TYPE_CACHE_INFORMATION,
+ sizeof (SMBIOS_TABLE_TYPE7),
+ SMBIOS_HANDLE_A53_L1D,
+ },
+ 1,
+ 0x180, // L1 enabled, WB
+ 32, // 32k d cache max
+ 32, // 32k installed
+ { 0, 1 }, // SRAM type
+ { 0, 1 }, // SRAM type
+ 0, // unknown speed
+ CacheErrorSingleBit,
+ CacheTypeData,
+ CacheAssociativity4Way,
+ },
+ "L1 Data"
+};
+
+STATIC CONST ARM_TYPE7 mArmDefaultType7_l2 = {
+ {
+ { // SMBIOS_STRUCTURE Hdr
+ EFI_SMBIOS_TYPE_CACHE_INFORMATION,
+ sizeof (SMBIOS_TABLE_TYPE7),
+ SMBIOS_HANDLE_A53_L2,
+ },
+ 1,
+ 0x181, // L2 enabled, WB
+ 256, // 256 KB cache max
+ 256, // 256 KB installed
+ { 0, 1 }, // SRAM type
+ { 0, 1 }, // SRAM type
+ 0, // unknown speed
+ CacheErrorSingleBit,
+ CacheTypeUnified,
+ CacheAssociativity16Way,
+ },
+ "L2"
+};
+
+STATIC CONST ARM_TYPE7 mArmDefaultType7_l3 = {
+ {
+ { // SMBIOS_STRUCTURE Hdr
+ EFI_SMBIOS_TYPE_CACHE_INFORMATION,
+ sizeof (SMBIOS_TABLE_TYPE7),
+ SMBIOS_HANDLE_A53_L3,
+ },
+ 1,
+ 0x182, // L3 enabled, WB
+ 4096, // 4M cache max
+ 4096, // 4M installed
+ { 0, 1 }, // SRAM type
+ { 0, 1 }, // SRAM type
+ 0, // unknown speed
+ CacheErrorSingleBit,
+ CacheTypeUnified,
+ CacheAssociativityUnknown,
+ },
+ "L3"
+};
+
+// Slots
+STATIC CONST ARM_TYPE9 mArmDefaultType9_0 = {
+ {
+ { // SMBIOS_STRUCTURE Hdr
+ EFI_SMBIOS_TYPE_SYSTEM_SLOTS,
+ sizeof (SMBIOS_TABLE_TYPE9),
+ SMBIOS_HANDLE_PI_RESERVED,
+ },
+ 1,
+ SlotTypePciExpressGen2X16,
+ SlotDataBusWidth4X,
+ SlotUsageUnknown,
+ SlotLengthLong,
+ 0,
+ { 1 },
+ {},
+ 1,
+ 0,
+ 0,
+ },
+ "J-PCIEX16"
+};
+
+STATIC CONST ARM_TYPE9 mArmDefaultType9_1 = {
+ {
+ { // SMBIOS_STRUCTURE Hdr
+ EFI_SMBIOS_TYPE_SYSTEM_SLOTS,
+ sizeof (SMBIOS_TABLE_TYPE9),
+ SMBIOS_HANDLE_PI_RESERVED,
+ },
+ 1,
+ SlotTypePciExpressGen2X1,
+ SlotDataBusWidth1X,
+ SlotUsageUnknown,
+ SlotLengthShort,
+ 0,
+ { 1 },
+ {},
+ 0,
+ 1,
+ 3,
+ },
+ "J-PCIE1"
+};
+
+STATIC CONST ARM_TYPE9 mArmDefaultType9_2 = {
+ {
+ { // SMBIOS_STRUCTURE Hdr
+ EFI_SMBIOS_TYPE_SYSTEM_SLOTS,
+ sizeof (SMBIOS_TABLE_TYPE9),
+ SMBIOS_HANDLE_PI_RESERVED,
+ },
+ 1,
+ SlotTypePciExpressGen2X1,
+ SlotDataBusWidth1X,
+ SlotUsageUnknown,
+ SlotLengthShort,
+ 0,
+ { 1 },
+ {},
+ 0,
+ 1,
+ 7,
+ },
+ "J-PCIE2"
+};
+
+// Memory array
+STATIC CONST ARM_TYPE16 mArmDefaultType16 = {
+ {
+ { // SMBIOS_STRUCTURE Hdr
+ EFI_SMBIOS_TYPE_PHYSICAL_MEMORY_ARRAY,
+ sizeof (SMBIOS_TABLE_TYPE16),
+ SMBIOS_HANDLE_MEMORY,
+ },
+ MemoryArrayLocationSystemBoard, // on motherboard
+ MemoryArrayUseSystemMemory, // system RAM
+ MemoryErrorCorrectionNone,
+ 0x4000000, // max 64 GB
+ 0xFFFE, // No error information structure
+ 0x1, // soldered memory
+ }, {
+ }
+};
+
+// Memory device
+STATIC CONST ARM_TYPE17 mArmDefaultType17_1 = {
+ {
+ { // SMBIOS_STRUCTURE Hdr
+ EFI_SMBIOS_TYPE_MEMORY_DEVICE,
+ sizeof (SMBIOS_TABLE_TYPE17),
+ SMBIOS_HANDLE_PI_RESERVED,
+ },
+ SMBIOS_HANDLE_MEMORY, // array to which this module belongs
+ 0xFFFE, // no errors
+ 72, // single DIMM with ECC
+ 64, // data width of this device (64-bits)
+ 0xFFFF, // size unknown
+ 0x09, // DIMM
+ 1, // part of a set
+ 1, // device locator
+ 0, // bank locator
+ MemoryTypeDdr4, // DDR4
+ {}, // type detail
+ 0, // ? MHz
+ 0, // manufacturer
+ 0, // serial
+ 0, // asset tag
+ 0, // part number
+ 0, // rank
+ }, {
+ "DIMM1"
+ }
+};
+
+STATIC CONST ARM_TYPE17 mArmDefaultType17_2 = {
+ {
+ { // SMBIOS_STRUCTURE Hdr
+ EFI_SMBIOS_TYPE_MEMORY_DEVICE,
+ sizeof (SMBIOS_TABLE_TYPE17),
+ SMBIOS_HANDLE_PI_RESERVED,
+ },
+ SMBIOS_HANDLE_MEMORY, // array to which this module belongs
+ 0xFFFE, // no errors
+ 72, // single DIMM with ECC
+ 64, // data width of this device (64-bits)
+ 0xFFFF, // size unknown
+ 0x09, // DIMM
+ 1, // part of a set
+ 1, // device locator
+ 0, // bank locator
+ MemoryTypeDdr4, // DDR4
+ {}, // type detail
+ 0, // ? MHz
+ 0, // manufacturer
+ 0, // serial
+ 0, // asset tag
+ 0, // part number
+ 0, // rank
+ }, {
+ "DIMM2"
+ }
+};
+
+STATIC CONST ARM_TYPE17 mArmDefaultType17_3 = {
+ {
+ { // SMBIOS_STRUCTURE Hdr
+ EFI_SMBIOS_TYPE_MEMORY_DEVICE,
+ sizeof (SMBIOS_TABLE_TYPE17),
+ SMBIOS_HANDLE_PI_RESERVED,
+ },
+ SMBIOS_HANDLE_MEMORY, // array to which this module belongs
+ 0xFFFE, // no errors
+ 72, // single DIMM with ECC
+ 64, // data width of this device (64-bits)
+ 0xFFFF, // size unknown
+ 0x09, // DIMM
+ 1, // part of a set
+ 1, // device locator
+ 0, // bank locator
+ MemoryTypeDdr4, // DDR4
+ {}, // type detail
+ 0, // ? MHz
+ 0, // manufacturer
+ 0, // serial
+ 0, // asset tag
+ 0, // part number
+ 0, // rank
+ }, {
+ "DIMM3"
+ }
+};
+
+STATIC CONST ARM_TYPE17 mArmDefaultType17_4 = {
+ {
+ { // SMBIOS_STRUCTURE Hdr
+ EFI_SMBIOS_TYPE_MEMORY_DEVICE,
+ sizeof (SMBIOS_TABLE_TYPE17),
+ SMBIOS_HANDLE_PI_RESERVED,
+ },
+ SMBIOS_HANDLE_MEMORY, // array to which this module belongs
+ 0xFFFE, // no errors
+ 72, // single DIMM with ECC
+ 64, // data width of this device (64-bits)
+ 0xFFFF, // size unknown
+ 0x09, // DIMM
+ 1, // part of a set
+ 1, // device locator
+ 0, // bank locator
+ MemoryTypeDdr4, // DDR4
+ {}, // type detail
+ 0, // ? MHz
+ 0, // manufacturer
+ 0, // serial
+ 0, // asset tag
+ 0, // part number
+ 0, // rank
+ }, {
+ "DIMM4"
+ }
+};
+
+// Memory array mapped address, this structure
+// is overridden by InstallMemoryStructure
+STATIC CONST ARM_TYPE19 mArmDefaultType19 = {
+ {
+ { // SMBIOS_STRUCTURE Hdr
+ EFI_SMBIOS_TYPE_MEMORY_ARRAY_MAPPED_ADDRESS,
+ sizeof (SMBIOS_TABLE_TYPE19),
+ SMBIOS_HANDLE_PI_RESERVED,
+ },
+ 0xFFFFFFFF, // invalid, look at extended addr field
+ 0xFFFFFFFF,
+ SMBIOS_HANDLE_MEMORY, // handle
+ 1,
+ 0x0,
+ 0x0,
+ }, {
+ }
+};
+
+// System boot info
+STATIC CONST ARM_TYPE32 mArmDefaultType32 = {
+ {
+ { // SMBIOS_STRUCTURE Hdr
+ EFI_SMBIOS_TYPE_SYSTEM_BOOT_INFORMATION,
+ sizeof (SMBIOS_TABLE_TYPE32),
+ SMBIOS_HANDLE_PI_RESERVED,
+ },
+ {},
+ BootInformationStatusNoError,
+ }, {
+ }
+};
+
+STATIC CONST VOID * CONST FixedTables[] = {
+ &mArmDefaultType0,
+ &mArmDefaultType1,
+ &mArmDefaultType3,
+ &mArmDefaultType7_l1i,
+ &mArmDefaultType7_l1d,
+ &mArmDefaultType7_l2,
+ &mArmDefaultType7_l3,
+ &mArmDefaultType4,
+ &mArmDefaultType9_0,
+ &mArmDefaultType9_1,
+ &mArmDefaultType9_2,
+ &mArmDefaultType16,
+ &mArmDefaultType17_1,
+ &mArmDefaultType17_2,
+ &mArmDefaultType17_3,
+ &mArmDefaultType17_4,
+ &mArmDefaultType32,
+};
+
+STATIC
+EFI_STATUS
+InstallMemoryStructure (
+ IN UINT64 StartingAddress,
+ IN UINT64 RegionLength
+ )
+{
+ EFI_SMBIOS_HANDLE SmbiosHandle;
+ ARM_TYPE19 MemoryDescriptor;
+
+ CopyMem (&MemoryDescriptor, &mArmDefaultType19, sizeof (mArmDefaultType19));
+
+ MemoryDescriptor.Base.ExtendedStartingAddress = StartingAddress;
+ MemoryDescriptor.Base.ExtendedEndingAddress = StartingAddress + RegionLength;
+ SmbiosHandle = MemoryDescriptor.Base.Hdr.Handle;
+
+ return mSmbios->Add (mSmbios, NULL, &SmbiosHandle,
+ (EFI_SMBIOS_TABLE_HEADER*) &MemoryDescriptor);
+}
+
+STATIC
+VOID
+InstallAllStructures (
+ VOID
+ )
+{
+ EFI_STATUS Status;
+ EFI_SMBIOS_HANDLE SmbiosHandle;
+ UINTN Idx;
+ EFI_PEI_HOB_POINTERS Hob;
+
+ for (Idx = 0; Idx < ARRAY_SIZE (FixedTables); Idx++) {
+ SmbiosHandle = ((EFI_SMBIOS_TABLE_HEADER *)FixedTables[Idx])->Handle;
+ Status = mSmbios->Add (mSmbios, NULL, &SmbiosHandle,
+ (EFI_SMBIOS_TABLE_HEADER*) FixedTables[Idx]);
+ if (EFI_ERROR(Status)) {
+ DEBUG ((DEBUG_WARN, "%a: failed to add SMBIOS table - %r\n",
+ __FUNCTION__, Status));
+ break;
+ }
+ }
+
+ for (Hob.Raw = GetHobList ();
+ !END_OF_HOB_LIST (Hob);
+ Hob.Raw = GET_NEXT_HOB (Hob)) {
+ if (Hob.Header->HobType == EFI_HOB_TYPE_RESOURCE_DESCRIPTOR &&
+ Hob.ResourceDescriptor->ResourceType == EFI_RESOURCE_SYSTEM_MEMORY) {
+ Status = InstallMemoryStructure (Hob.ResourceDescriptor->PhysicalStart,
+ Hob.ResourceDescriptor->ResourceLength);
+ ASSERT_EFI_ERROR (Status);
+ }
+ }
+}
+
+/**
+ Installs SMBIOS information for SynQuacer platform
+
+ @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
+SmbiosPlatformDxeEntryPoint (
+ IN EFI_HANDLE ImageHandle,
+ IN EFI_SYSTEM_TABLE *SystemTable
+ )
+{
+ EFI_STATUS Status;
+
+ Status = gBS->LocateProtocol (&gEfiSmbiosProtocolGuid, NULL,
+ (VOID **)&mSmbios);
+ ASSERT_EFI_ERROR (Status);
+
+ InstallAllStructures ();
+
+ return EFI_SUCCESS;
+}
diff --git a/Platform/Socionext/DeveloperBox/SmbiosPlatformDxe/SmbiosPlatformDxe.inf b/Platform/Socionext/DeveloperBox/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
new file mode 100644
index 000000000000..4bb5acdfa386
--- /dev/null
+++ b/Platform/Socionext/DeveloperBox/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
@@ -0,0 +1,47 @@
+## @file
+#
+# Copyright (c) 2018, Linaro, Limited. All rights reserved.
+#
+# 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 = 0x0001001A
+ BASE_NAME = SmbiosPlatformDxe
+ FILE_GUID = 449c91b9-0907-49b5-aa76-04af3097401c
+ MODULE_TYPE = DXE_DRIVER
+ VERSION_STRING = 1.0
+ ENTRY_POINT = SmbiosPlatformDxeEntryPoint
+
+[Sources]
+ SmbiosPlatformDxe.c
+
+[Packages]
+ ArmPkg/ArmPkg.dec
+ MdeModulePkg/MdeModulePkg.dec
+ MdePkg/MdePkg.dec
+
+[LibraryClasses]
+ BaseMemoryLib
+ BaseLib
+ DebugLib
+ HobLib
+ MemoryAllocationLib
+ UefiBootServicesTableLib
+ UefiDriverEntryPoint
+
+[FixedPcd]
+ gArmTokenSpaceGuid.PcdFdSize
+ gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareRevision
+
+[Protocols]
+ gEfiSmbiosProtocolGuid # PROTOCOL ALWAYS_CONSUMED
+
+[Depex]
+ gEfiSmbiosProtocolGuid
--
2.11.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH edk2-platforms] Platform/Socionext/DeveloperBox: add SMBIOS tables
2018-03-03 11:29 [PATCH edk2-platforms] Platform/Socionext/DeveloperBox: add SMBIOS tables Ard Biesheuvel
@ 2018-03-15 18:37 ` Leif Lindholm
2018-03-15 18:43 ` Ard Biesheuvel
0 siblings, 1 reply; 5+ messages in thread
From: Leif Lindholm @ 2018-03-15 18:37 UTC (permalink / raw)
To: Ard Biesheuvel; +Cc: edk2-devel
On Sat, Mar 03, 2018 at 11:29:23AM +0000, Ard Biesheuvel wrote:
> This adds SMBIOS tables to the DeveloperBox platform describing the
> BIOS, system, enclosure, CPUs, caches, PCIe slots and system memory,
> which almost amounts to the mandatory minimum as given by the SMBIOS
> spec. Only the type 17 structures currently lack detailed information
> about the DIMMs: the SPDs are on a I2C bus that is only accessible by
> the SCP, and it currently does not share this information.
>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
So, this looks great, but you appear to have generated this patch
against a working branch (DO_X86EMU, OsInstallerMenuDxe), so it won't
apply for me automatically.
/
Leif
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH edk2-platforms] Platform/Socionext/DeveloperBox: add SMBIOS tables
2018-03-15 18:37 ` Leif Lindholm
@ 2018-03-15 18:43 ` Ard Biesheuvel
2018-03-15 19:34 ` Leif Lindholm
0 siblings, 1 reply; 5+ messages in thread
From: Ard Biesheuvel @ 2018-03-15 18:43 UTC (permalink / raw)
To: Leif Lindholm; +Cc: edk2-devel@lists.01.org
On 15 March 2018 at 18:37, Leif Lindholm <leif.lindholm@linaro.org> wrote:
> On Sat, Mar 03, 2018 at 11:29:23AM +0000, Ard Biesheuvel wrote:
>> This adds SMBIOS tables to the DeveloperBox platform describing the
>> BIOS, system, enclosure, CPUs, caches, PCIe slots and system memory,
>> which almost amounts to the mandatory minimum as given by the SMBIOS
>> spec. Only the type 17 structures currently lack detailed information
>> about the DIMMs: the SPDs are on a I2C bus that is only accessible by
>> the SCP, and it currently does not share this information.
>>
>> Contributed-under: TianoCore Contribution Agreement 1.1
>> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>
> So, this looks great, but you appear to have generated this patch
> against a working branch (DO_X86EMU, OsInstallerMenuDxe), so it won't
> apply for me automatically.
>
Ehm, yes.
I can respin it if you like? Or you can grab it here
https://git.linaro.org/leg/noupstream/edk2-platforms.git/
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH edk2-platforms] Platform/Socionext/DeveloperBox: add SMBIOS tables
2018-03-15 18:43 ` Ard Biesheuvel
@ 2018-03-15 19:34 ` Leif Lindholm
2018-03-15 21:00 ` Ard Biesheuvel
0 siblings, 1 reply; 5+ messages in thread
From: Leif Lindholm @ 2018-03-15 19:34 UTC (permalink / raw)
To: Ard Biesheuvel; +Cc: edk2-devel@lists.01.org
On Thu, Mar 15, 2018 at 06:43:11PM +0000, Ard Biesheuvel wrote:
> On 15 March 2018 at 18:37, Leif Lindholm <leif.lindholm@linaro.org> wrote:
> > On Sat, Mar 03, 2018 at 11:29:23AM +0000, Ard Biesheuvel wrote:
> >> This adds SMBIOS tables to the DeveloperBox platform describing the
> >> BIOS, system, enclosure, CPUs, caches, PCIe slots and system memory,
> >> which almost amounts to the mandatory minimum as given by the SMBIOS
> >> spec. Only the type 17 structures currently lack detailed information
> >> about the DIMMs: the SPDs are on a I2C bus that is only accessible by
> >> the SCP, and it currently does not share this information.
> >>
> >> Contributed-under: TianoCore Contribution Agreement 1.1
> >> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> >
> > So, this looks great, but you appear to have generated this patch
> > against a working branch (DO_X86EMU, OsInstallerMenuDxe), so it won't
> > apply for me automatically.
>
> Ehm, yes.
>
> I can respin it if you like? Or you can grab it here
>
> https://git.linaro.org/leg/noupstream/edk2-platforms.git/
Nah, wasn't hard to resolve manually.
So once you've done that and fixed the issue you spotted and I didn't:
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
/
Leif
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH edk2-platforms] Platform/Socionext/DeveloperBox: add SMBIOS tables
2018-03-15 19:34 ` Leif Lindholm
@ 2018-03-15 21:00 ` Ard Biesheuvel
0 siblings, 0 replies; 5+ messages in thread
From: Ard Biesheuvel @ 2018-03-15 21:00 UTC (permalink / raw)
To: Leif Lindholm; +Cc: edk2-devel@lists.01.org
On 15 March 2018 at 19:34, Leif Lindholm <leif.lindholm@linaro.org> wrote:
> On Thu, Mar 15, 2018 at 06:43:11PM +0000, Ard Biesheuvel wrote:
>> On 15 March 2018 at 18:37, Leif Lindholm <leif.lindholm@linaro.org> wrote:
>> > On Sat, Mar 03, 2018 at 11:29:23AM +0000, Ard Biesheuvel wrote:
>> >> This adds SMBIOS tables to the DeveloperBox platform describing the
>> >> BIOS, system, enclosure, CPUs, caches, PCIe slots and system memory,
>> >> which almost amounts to the mandatory minimum as given by the SMBIOS
>> >> spec. Only the type 17 structures currently lack detailed information
>> >> about the DIMMs: the SPDs are on a I2C bus that is only accessible by
>> >> the SCP, and it currently does not share this information.
>> >>
>> >> Contributed-under: TianoCore Contribution Agreement 1.1
>> >> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>> >
>> > So, this looks great, but you appear to have generated this patch
>> > against a working branch (DO_X86EMU, OsInstallerMenuDxe), so it won't
>> > apply for me automatically.
>>
>> Ehm, yes.
>>
>> I can respin it if you like? Or you can grab it here
>>
>> https://git.linaro.org/leg/noupstream/edk2-platforms.git/
>
> Nah, wasn't hard to resolve manually.
>
> So once you've done that and fixed the issue you spotted and I didn't:
> Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
>
Pushed as ca11ac71980cdb4c1bd3b4c2c6549b90fc47b4cc
Thanks
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-03-15 20:54 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-03 11:29 [PATCH edk2-platforms] Platform/Socionext/DeveloperBox: add SMBIOS tables Ard Biesheuvel
2018-03-15 18:37 ` Leif Lindholm
2018-03-15 18:43 ` Ard Biesheuvel
2018-03-15 19:34 ` Leif Lindholm
2018-03-15 21:00 ` Ard Biesheuvel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox