public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
* [edk2-platforms][PATCH V1 00/11] Add SMBIOS tables for SGI/RD platforms
@ 2021-01-15 18:26 Pranav Madhu
  2021-01-15 18:26 ` [edk2-platforms][PATCH V1 01/11] Platform/ARM/SgiPkg: Define RD-N2 platform id values Pranav Madhu
                   ` (11 more replies)
  0 siblings, 12 replies; 14+ messages in thread
From: Pranav Madhu @ 2021-01-15 18:26 UTC (permalink / raw)
  To: devel; +Cc: Ard Biesheuvel, Leif Lindholm

SMBIOS provides basic hardware and firmware configuration information
through table-driven data structure. This patch series adds SMBIOS
support for Arm's SGI/RD platforms.

The first patch in this series defines platform-id values for the
RD-N2 platform library header. The second patch add SgiGetProductId API,
which is used by the SMBIOS driver to distinguish between the platforms,
and install the right table. The third patch in this series adds SMBIOS
driver support that allows for installation of multiple SMBIOS tables.
And subsequent patches in this series add SMBIOS tables, which are
mandatory as per Arm serverready SBBR specification.

This patch should be kept on top of 'Update ACPI revision' patch to
avoid conflict.

Pranav Madhu (11):
  Platform/ARM/SgiPkg: Define RD-N2 platform id values
  Platform/ARM/SgiPkg: Add GetProductId API for SGI/RD Platforms
  Platform/ARM/SgiPkg: Add Initial SMBIOS support
  Platform/ARM/SgiPkg: Add SMBIOS Type1 Table
  Platform/ARM/SgiPkg: Add SMBIOS Type3 Table
  Platform/ARM/SgiPkg: Add SMBIOS Type4 Table
  Platform/ARM/SgiPkg: Add SMBIOS Type7 Table
  Platform/ARM/SgiPkg: Add SMBIOS Type16 Table
  Platform/ARM/SgiPkg: Add SMBIOS Type17 Table
  Platform/ARM/SgiPkg: Add SMBIOS Type19 Table
  Platform/ARM/SgiPkg: Add SMBIOS Type32 Table

 Platform/ARM/SgiPkg/SgiPlatform.dsc.inc       |  11 +
 Platform/ARM/SgiPkg/SgiPlatform.fdf           |   8 +-
 .../SmbiosPlatformDxe/SmbiosPlatformDxe.inf   |  72 +++++
 .../SmbiosPlatformDxe/SmbiosPlatformDxe.h     |  85 +++++
 Platform/ARM/SgiPkg/Include/SgiPlatform.h     |  27 +-
 .../SmbiosPlatformDxe/SmbiosPlatformDxe.c     |  82 +++++
 .../SmbiosPlatformDxe/Type0BiosInformation.c  | 108 +++++++
 .../Type16PhysicalMemoryArray.c               |  85 +++++
 .../SmbiosPlatformDxe/Type17MemoryDevice.c    | 273 ++++++++++++++++
 .../Type19MemoryArrayMappedAddress.c          |  73 +++++
 .../Type1SystemInformation.c                  | 114 +++++++
 .../Type32SystemBootInformation.c             |  66 ++++
 .../SmbiosPlatformDxe/Type3SystemEnclosure.c  |  77 +++++
 .../Type4ProcessorInformation.c               | 182 +++++++++++
 .../SmbiosPlatformDxe/Type7CacheInformation.c | 297 ++++++++++++++++++
 .../SgiPkg/Library/PlatformLib/PlatformLib.c  |  83 ++++-
 16 files changed, 1640 insertions(+), 3 deletions(-)
 create mode 100644 Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
 create mode 100644 Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.h
 create mode 100644 Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c
 create mode 100644 Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type0BiosInformation.c
 create mode 100644 Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type16PhysicalMemoryArray.c
 create mode 100644 Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type17MemoryDevice.c
 create mode 100644 Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type19MemoryArrayMappedAddress.c
 create mode 100644 Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type1SystemInformation.c
 create mode 100644 Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type32SystemBootInformation.c
 create mode 100644 Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type3SystemEnclosure.c
 create mode 100644 Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type4ProcessorInformation.c
 create mode 100644 Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type7CacheInformation.c

-- 
2.17.1


^ permalink raw reply	[flat|nested] 14+ messages in thread

* [edk2-platforms][PATCH V1 01/11] Platform/ARM/SgiPkg: Define RD-N2 platform id values
  2021-01-15 18:26 [edk2-platforms][PATCH V1 00/11] Add SMBIOS tables for SGI/RD platforms Pranav Madhu
@ 2021-01-15 18:26 ` Pranav Madhu
  2021-01-15 18:26 ` [edk2-platforms][PATCH V1 02/11] Platform/ARM/SgiPkg: Add GetProductId API for SGI/RD Platforms Pranav Madhu
                   ` (10 subsequent siblings)
  11 siblings, 0 replies; 14+ messages in thread
From: Pranav Madhu @ 2021-01-15 18:26 UTC (permalink / raw)
  To: devel; +Cc: Ard Biesheuvel, Leif Lindholm

Add the RD-N2 platform identification values including the part number
and configuration number. This information will be used in populating
the SMBIOS tables.

Signed-off-by: Pranav Madhu <pranav.madhu@arm.com>
---
 Platform/ARM/SgiPkg/Include/SgiPlatform.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Platform/ARM/SgiPkg/Include/SgiPlatform.h b/Platform/ARM/SgiPkg/Include/SgiPlatform.h
index d6ab585cce80..e0bb0b4bbe07 100644
--- a/Platform/ARM/SgiPkg/Include/SgiPlatform.h
+++ b/Platform/ARM/SgiPkg/Include/SgiPlatform.h
@@ -1,6 +1,6 @@
 /** @file
 *
-*  Copyright (c) 2018-2020, ARM Limited. All rights reserved.
+*  Copyright (c) 2018-2021, ARM Limited. All rights reserved.
 *
 *  SPDX-License-Identifier: BSD-2-Clause-Patent
 *
@@ -43,6 +43,10 @@
 #define RD_V1_CONF_ID                             0x1
 #define RD_V1_MC_CONF_ID                          0x2
 
+// RD-N2 Platform Identification values
+#define RD_N2_PART_NUM                            0x7B7
+#define RD_N2_CONF_ID                             0x1
+
 #define SGI_CONFIG_MASK                           0x0F
 #define SGI_CONFIG_SHIFT                          0x1C
 #define SGI_PART_NUM_MASK                         0xFFF
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [edk2-platforms][PATCH V1 02/11] Platform/ARM/SgiPkg: Add GetProductId API for SGI/RD Platforms
  2021-01-15 18:26 [edk2-platforms][PATCH V1 00/11] Add SMBIOS tables for SGI/RD platforms Pranav Madhu
  2021-01-15 18:26 ` [edk2-platforms][PATCH V1 01/11] Platform/ARM/SgiPkg: Define RD-N2 platform id values Pranav Madhu
@ 2021-01-15 18:26 ` Pranav Madhu
  2021-01-15 18:26 ` [edk2-platforms][PATCH V1 03/11] Platform/ARM/SgiPkg: Add Initial SMBIOS support Pranav Madhu
                   ` (9 subsequent siblings)
  11 siblings, 0 replies; 14+ messages in thread
From: Pranav Madhu @ 2021-01-15 18:26 UTC (permalink / raw)
  To: devel; +Cc: Ard Biesheuvel, Leif Lindholm

Add GetProductId API for SGI/RD Platform. The API returns a product id
in integer format based on the platform description data. The product id
is required for other drivers such as SMBIOS.

Signed-off-by: Pranav Madhu <pranav.madhu@arm.com>
---
 Platform/ARM/SgiPkg/Include/SgiPlatform.h             | 21 +++++
 Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.c | 83 +++++++++++++++++++-
 2 files changed, 103 insertions(+), 1 deletion(-)

diff --git a/Platform/ARM/SgiPkg/Include/SgiPlatform.h b/Platform/ARM/SgiPkg/Include/SgiPlatform.h
index e0bb0b4bbe07..dfcc616fb08b 100644
--- a/Platform/ARM/SgiPkg/Include/SgiPlatform.h
+++ b/Platform/ARM/SgiPkg/Include/SgiPlatform.h
@@ -72,4 +72,25 @@ typedef struct {
   UINTN  MultiChipMode;
 } SGI_PLATFORM_DESCRIPTOR;
 
+// Arm SGI/RD Product IDs
+enum ARM_RD_PRODUCT_ID {
+  UnknownId = 0,
+  Sgi575,
+  RdN1Edge,
+  RdN1EdgeX2,
+  RdE1Edge,
+  RdV1,
+  RdV1Mc,
+  RdN2
+};
+
+// Arm ProductId look-up table
+typedef struct {
+  UINTN  ProductId;
+  UINTN  PlatformId;
+  UINTN  ConfigId;
+  UINTN  MultiChipMode;
+} SGI_PRODUCT_ID_LOOKUP;
+
+UINT8 SgiGetProductId ( VOID );
 #endif // __SGI_PLATFORM_H__
diff --git a/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.c b/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.c
index 9731d7cccede..f2accb7dd098 100644
--- a/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.c
+++ b/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.c
@@ -1,6 +1,6 @@
 /** @file
 *
-*  Copyright (c) 2018, ARM Limited. All rights reserved.
+*  Copyright (c) 2018-2021, ARM Limited. All rights reserved.
 *
 *  SPDX-License-Identifier: BSD-2-Clause-Patent
 *
@@ -8,9 +8,12 @@
 
 #include <Library/ArmPlatformLib.h>
 #include <Library/BaseLib.h>
+#include <Library/HobLib.h>
 #include <Ppi/ArmMpCoreInfo.h>
 #include <Ppi/SgiPlatformId.h>
 
+#include "SgiPlatform.h"
+
 UINT64 NtFwConfigDtBlob;
 STATIC SGI_NT_FW_CONFIG_INFO_PPI mNtFwConfigDtInfoPpi;
 
@@ -21,6 +24,51 @@ STATIC ARM_CORE_INFO mCoreInfoTable[] = {
   },
 };
 
+STATIC SGI_PRODUCT_ID_LOOKUP SgiProductIdLookup[] = {
+  {
+    Sgi575,
+    SGI575_PART_NUM,
+    SGI575_CONF_NUM,
+    0
+  },
+  {
+    RdN1Edge,
+    RD_N1E1_EDGE_PART_NUM,
+    RD_N1_EDGE_CONF_ID,
+    0
+  },
+  {
+    RdN1EdgeX2,
+    RD_N1E1_EDGE_PART_NUM,
+    RD_N1_EDGE_CONF_ID,
+    1
+  },
+  {
+    RdE1Edge,
+    RD_N1E1_EDGE_PART_NUM,
+    RD_E1_EDGE_CONF_ID,
+    0
+  },
+  {
+    RdV1,
+    RD_V1_PART_NUM,
+    RD_V1_CONF_ID,
+    0
+  },
+  {
+    RdV1Mc,
+    RD_V1_PART_NUM,
+    RD_V1_CONF_ID,
+    1
+  },
+  {
+    RdN2,
+    RD_N2_PART_NUM,
+    RD_N2_CONF_ID,
+    0
+  }
+};
+
 EFI_BOOT_MODE
 ArmPlatformGetBootMode (
   VOID
@@ -75,3 +123,36 @@ ArmPlatformGetPlatformPpiList (
   *PpiListSize = sizeof (gPlatformPpiTable);
   *PpiList = gPlatformPpiTable;
 }
+
+/**
+  Update the product Id by reading platform id descriptor
+
+  @retval Zero           Failed identify platform
+  @retval Others         Platform identified, and return ARM_PRODUCT_ID
+**/
+UINT8
+SgiGetProductId (
+         VOID
+  )
+{
+  VOID *SystemIdHob;
+  UINT8 Idx;
+  SGI_PLATFORM_DESCRIPTOR *HobData;
+
+  SystemIdHob = GetFirstGuidHob (&gArmSgiPlatformIdDescriptorGuid);
+  if (SystemIdHob == NULL) {
+    return UnknownId;
+  }
+
+  HobData = (SGI_PLATFORM_DESCRIPTOR *)GET_GUID_HOB_DATA (SystemIdHob);
+
+  for (Idx = 0; Idx < ARRAY_SIZE (SgiProductIdLookup); Idx++) {
+    if ((HobData->PlatformId == SgiProductIdLookup[Idx].PlatformId) &&
+        (HobData->ConfigId == SgiProductIdLookup[Idx].ConfigId) &&
+        (HobData->MultiChipMode == SgiProductIdLookup[Idx].MultiChipMode)) {
+      return SgiProductIdLookup[Idx].ProductId;
+    }
+  }
+
+  return UnknownId;
+}
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [edk2-platforms][PATCH V1 03/11] Platform/ARM/SgiPkg: Add Initial SMBIOS support
  2021-01-15 18:26 [edk2-platforms][PATCH V1 00/11] Add SMBIOS tables for SGI/RD platforms Pranav Madhu
  2021-01-15 18:26 ` [edk2-platforms][PATCH V1 01/11] Platform/ARM/SgiPkg: Define RD-N2 platform id values Pranav Madhu
  2021-01-15 18:26 ` [edk2-platforms][PATCH V1 02/11] Platform/ARM/SgiPkg: Add GetProductId API for SGI/RD Platforms Pranav Madhu
@ 2021-01-15 18:26 ` Pranav Madhu
  2021-01-15 18:26 ` [edk2-platforms][PATCH V1 04/11] Platform/ARM/SgiPkg: Add SMBIOS Type1 Table Pranav Madhu
                   ` (8 subsequent siblings)
  11 siblings, 0 replies; 14+ messages in thread
From: Pranav Madhu @ 2021-01-15 18:26 UTC (permalink / raw)
  To: devel; +Cc: Ard Biesheuvel, Leif Lindholm

SMBIOS provides basic hardware and firmware configuration information
through table-driven data structure. This patch adds SMBIOS driver
support that allows for installation of multiple SMBIOS types. Also add
SMBIOS Type0 (BIOS Information) table, that include information about
BIOS vendor name, version, SMBIOS version and other information related
to BIOS.

Signed-off-by: Pranav Madhu <pranav.madhu@arm.com>
---
 Platform/ARM/SgiPkg/SgiPlatform.dsc.inc                              |  10 ++
 Platform/ARM/SgiPkg/SgiPlatform.fdf                                  |   8 +-
 Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf  |  56 ++++++++++
 Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.h    |  18 ++++
 Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c    |  74 ++++++++++++++
 Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type0BiosInformation.c | 108 ++++++++++++++++++++
 6 files changed, 273 insertions(+), 1 deletion(-)

diff --git a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc b/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
index f5c3ccd13069..806f570c637f 100644
--- a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
+++ b/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
@@ -119,6 +119,10 @@
   # ACPI Table Version
   gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiExposedTableVersions|0x20
 
+  # SMBIOS entry point version
+  gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosVersion|0x0304
+  gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosDocRev|0x0
+
   #
   # PCIe
   #
@@ -260,6 +264,12 @@
   MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
   MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
 
+  #
+  # SMBIOS/DMI
+  #
+  MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
+  Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
+
   #
   # platform driver
   #
diff --git a/Platform/ARM/SgiPkg/SgiPlatform.fdf b/Platform/ARM/SgiPkg/SgiPlatform.fdf
index 18fd09e5d2e2..d94e4633e36c 100644
--- a/Platform/ARM/SgiPkg/SgiPlatform.fdf
+++ b/Platform/ARM/SgiPkg/SgiPlatform.fdf
@@ -1,5 +1,5 @@
 #
-#  Copyright (c) 2018, ARM Limited. All rights reserved.
+#  Copyright (c) 2018-2021, ARM Limited. All rights reserved.
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -109,6 +109,12 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
 !include $(BOARD_DXE_FV_COMPONENTS)
 
+  #
+  # SMBIOS/DMI
+  #
+  INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
+  INF Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
+
   # Required by PCI
   INF ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf
 
diff --git a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
new file mode 100644
index 000000000000..8996c521de54
--- /dev/null
+++ b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
@@ -0,0 +1,56 @@
+## @file
+#  This driver installs SMBIOS information for RD Platforms
+#
+#  Copyright (c) 2020-2021, ARM Limited. All rights reserved.
+#
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
+#
+##
+
+[Defines]
+  INF_VERSION                    = 0x0001001A
+  BASE_NAME                      = SmbiosPlatformDxe
+  FILE_GUID                      = 86e0aa8b-4f8d-44a5-a140-1f693d529c76
+  MODULE_TYPE                    = DXE_DRIVER
+  VERSION_STRING                 = 1.0
+
+  ENTRY_POINT                    = SmbiosTableEntryPoint
+
+#
+# The following information is for reference only and not required by the build
+# tools.
+#
+#  VALID_ARCHITECTURES           = AARCH64
+#
+
+[Sources]
+  SmbiosPlatformDxe.c
+  Type0BiosInformation.c
+
+[Packages]
+  ArmPkg/ArmPkg.dec
+  ArmPlatformPkg/ArmPlatformPkg.dec
+  MdeModulePkg/MdeModulePkg.dec
+  MdePkg/MdePkg.dec
+  Platform/ARM/SgiPkg/SgiPlatform.dec
+
+[LibraryClasses]
+  ArmPlatformLib
+  DebugLib
+  HobLib
+  UefiDriverEntryPoint
+
+[Guids]
+  gEfiGlobalVariableGuid
+  gArmSgiPlatformIdDescriptorGuid
+
+[FixedPcd]
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareRevision
+
+[Protocols]
+  gEfiSmbiosProtocolGuid                      # PROTOCOL ALWAYS_CONSUMED
+
+[Guids]
+
+[Depex]
+  gEfiSmbiosProtocolGuid
diff --git a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.h b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.h
new file mode 100644
index 000000000000..9a10bbf15e9e
--- /dev/null
+++ b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.h
@@ -0,0 +1,18 @@
+/** @file
+*
+*  Copyright (c) 2020-2021, ARM Limited. All rights reserved.
+*
+*  SPDX-License-Identifier: BSD-2-Clause-Patent
+*
+**/
+
+#ifndef SMBIOS_PLATFORM_DXE_H_
+#define SMBIOS_PLATFORM_DXE_H_
+
+EFI_STATUS
+EFIAPI
+InstallBiosInformation (
+  IN     EFI_SMBIOS_PROTOCOL    *Smbios
+  );
+
+#endif // SMBIOS_PLATFORM_DXE_H_
diff --git a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c
new file mode 100644
index 000000000000..f00ef5f8c415
--- /dev/null
+++ b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c
@@ -0,0 +1,74 @@
+/** @file
+  Install SMBIOS information for Arm's SGI/RD platforms
+
+  Copyright (c) 2020-2021, ARM Limited. All rights reserved.
+
+  SPDX-License-Identifier: BSD-2-Clause-Patent
+
+**/
+
+#include <IndustryStandard/SmBios.h>
+#include <Library/DebugLib.h>
+#include <Library/HobLib.h>
+#include <Library/UefiBootServicesTableLib.h>
+#include <PiDxe.h>
+#include <Protocol/Smbios.h>
+
+#include "SgiPlatform.h"
+#include "SmbiosPlatformDxe.h"
+
+typedef EFI_STATUS (*ARM_RD_SMBIOS_TABLE_INSTALL_FPTR)(EFI_SMBIOS_PROTOCOL *);
+
+STATIC
+ARM_RD_SMBIOS_TABLE_INSTALL_FPTR mSmbiosTableList[] = {
+  &InstallBiosInformation,
+};
+
+/**
+  Driver entry point. Installs SMBIOS information
+
+  @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
+SmbiosTableEntryPoint (
+  IN     EFI_HANDLE             ImageHandle,
+  IN     EFI_SYSTEM_TABLE       *SystemTable
+  )
+{
+  EFI_STATUS Status;
+  EFI_SMBIOS_PROTOCOL *Smbios = NULL;
+  UINT8 CountFail = 0;
+  UINT8 Idx;
+
+  /* Install SMBIOS table only for supported product. */
+  if (SgiGetProductId () == UnknownId) {
+    return EFI_NOT_FOUND;
+  }
+
+  /* Find the SMBIOS protocol */
+  Status = gBS->LocateProtocol (
+                  &gEfiSmbiosProtocolGuid,
+                  NULL,
+                  (VOID **)&Smbios
+                  );
+  if (EFI_ERROR (Status)) {
+    return Status;
+  }
+
+  /* Install the tables listed in mSmbiosTableList */
+  for (Idx = 0; Idx < ARRAY_SIZE (mSmbiosTableList); Idx++) {
+    Status = (*mSmbiosTableList[Idx]) (Smbios);
+    if (Status != EFI_SUCCESS) {
+      CountFail++;
+    }
+  }
+
+  DEBUG ((DEBUG_INFO, "Installed %d SMBIOS tables\n",
+            ARRAY_SIZE (mSmbiosTableList) - CountFail));
+  return Status;
+}
diff --git a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type0BiosInformation.c b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type0BiosInformation.c
new file mode 100644
index 000000000000..ef39178b595e
--- /dev/null
+++ b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type0BiosInformation.c
@@ -0,0 +1,108 @@
+/** @file
+  SMBIOS Type 0 (BIOS information) table for ARM RD platforms.
+
+  Copyright (c) 2020-2021, ARM Limited. All rights reserved.
+
+  SPDX-License-Identifier: BSD-2-Clause-Patent
+
+**/
+
+#include <Protocol/Smbios.h>
+
+#define TYPE0_STRINGS                                   \
+  "ARM LTD\0"                   /* Vendor */            \
+  "EDK II\0"                    /* BiosVersion */       \
+  __DATE__"\0"                  /* BiosReleaseDate */   \
+  "\0"
+
+/* SMBIOS Type0 structure */
+#pragma pack(1)
+struct ArmRdSmbiosType0 {
+  SMBIOS_TABLE_TYPE0  Base;
+  INT8                Strings[sizeof (TYPE0_STRINGS)];
+};
+#pragma pack()
+
+/* BIOS information (SMBIOS 3.4 spec, section 7.1) */
+static struct ArmRdSmbiosType0 mArmRdSmbiosType0 = {
+  {
+    {
+      // SMBIOS header
+      EFI_SMBIOS_TYPE_BIOS_INFORMATION, // Type 0
+      sizeof (SMBIOS_TABLE_TYPE0),      // Length
+      SMBIOS_HANDLE_PI_RESERVED,        // Assign an unused handle number
+    },
+    1,              // String number of vendor name in TYPE0_STRINGS
+    2,              // String number of BiosVersion
+    0,              // Bios starting address segment
+    3,              // String number of BiosReleaseDate
+    0,              // Bios ROM size
+    {               // MISC_BIOS_CHARACTERISTICS BiosCharacteristics
+      0,            // Reserved
+      0,            // Unknown
+      0,            // BIOS Characteristics are not supported
+      0,            // ISA is supported
+      0,            // MCA is supported
+      0,            // EISA is supported
+      1,            // PCI supported
+      0,            // PC card (PCMCIA) is supported
+      1,            // Plug and Play is supported
+      0,            // APM is supported
+      1,            // BIOS upgradable
+      0,            // BIOS shadowing is allowed
+      0,            // VL-VESA is supported
+      0,            // ESCD support is available
+      0,            // Boot from CD is supported
+      1,            // selectable boot
+    },
+    {               // BIOSCharacteristicsExtensionBytes
+      (
+        (1 << 0) |  // ACPI Supported
+        (1 << 1)    // Legacy USB supported
+      ),
+      (
+        (1 << 3) |  // Content distribution enabled
+        (1 << 4)    // UEFI spec supported
+      )
+    },
+    0,              // SMBIOS Major Release, updated dynamically
+    0,              // SMBIOS Minor Release, updated dynamically
+    0xFF,           // Embedded Controller Firmware Major Release
+    0xFF            // Embedded Controller Firmware Minor Release
+  },
+  // Text strings (unformatted area)
+  TYPE0_STRINGS
+};
+
+/**
+  Install SMBIOS Bios information Table
+
+  @retval EFI_SUCCESS           Record was added.
+  @retval EFI_OUT_OF_RESOURCES  Record was not added.
+  @retval EFI_ALREADY_STARTED   The SmbiosHandle passed in is already in use.
+**/
+EFI_STATUS
+InstallBiosInformation (
+  IN     EFI_SMBIOS_PROTOCOL    *Smbios
+  )
+{
+  EFI_STATUS Status;
+  EFI_SMBIOS_HANDLE SmbiosHandle;
+
+  SmbiosHandle = ((EFI_SMBIOS_TABLE_HEADER *)&mArmRdSmbiosType0)->Handle;
+
+  /* Update firmware revision dynamicaly */
+  mArmRdSmbiosType0.Base.SystemBiosMajorRelease =
+    (PcdGet32 ( PcdFirmwareRevision ) >> 16) & 0xFF;
+  mArmRdSmbiosType0.Base.SystemBiosMinorRelease =
+    PcdGet32 ( PcdFirmwareRevision ) & 0xFF;
+
+  Status = Smbios->Add (
+                     Smbios,
+                     NULL,
+                     &SmbiosHandle,
+                     (EFI_SMBIOS_TABLE_HEADER *)&mArmRdSmbiosType0
+                     );
+
+  return Status;
+}
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [edk2-platforms][PATCH V1 04/11] Platform/ARM/SgiPkg: Add SMBIOS Type1 Table
  2021-01-15 18:26 [edk2-platforms][PATCH V1 00/11] Add SMBIOS tables for SGI/RD platforms Pranav Madhu
                   ` (2 preceding siblings ...)
  2021-01-15 18:26 ` [edk2-platforms][PATCH V1 03/11] Platform/ARM/SgiPkg: Add Initial SMBIOS support Pranav Madhu
@ 2021-01-15 18:26 ` Pranav Madhu
  2021-01-15 18:26 ` [edk2-platforms][PATCH V1 05/11] Platform/ARM/SgiPkg: Add SMBIOS Type3 Table Pranav Madhu
                   ` (7 subsequent siblings)
  11 siblings, 0 replies; 14+ messages in thread
From: Pranav Madhu @ 2021-01-15 18:26 UTC (permalink / raw)
  To: devel; +Cc: Ard Biesheuvel, Leif Lindholm

Add the SMBIOS type 1 table (System Information) that includes
information about manufacturer, product name, version, serial number and
other information related to the system identification.

Signed-off-by: Pranav Madhu <pranav.madhu@arm.com>
---
 Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf    |   1 +
 Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.h      |   6 ++
 Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c      |   1 +
 Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type1SystemInformation.c | 114 ++++++++++++++++++++
 4 files changed, 122 insertions(+)

diff --git a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
index 8996c521de54..6a00912ab742 100644
--- a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
+++ b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
@@ -26,6 +26,7 @@
 [Sources]
   SmbiosPlatformDxe.c
   Type0BiosInformation.c
+  Type1SystemInformation.c
 
 [Packages]
   ArmPkg/ArmPkg.dec
diff --git a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.h b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.h
index 9a10bbf15e9e..43427158106d 100644
--- a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.h
+++ b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.h
@@ -15,4 +15,10 @@ InstallBiosInformation (
   IN     EFI_SMBIOS_PROTOCOL    *Smbios
   );
 
+EFI_STATUS
+EFIAPI
+InstallSystemInformation (
+  IN     EFI_SMBIOS_PROTOCOL    *Smbios
+  );
+
 #endif // SMBIOS_PLATFORM_DXE_H_
diff --git a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c
index f00ef5f8c415..1068398bcba3 100644
--- a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c
+++ b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c
@@ -22,6 +22,7 @@ typedef EFI_STATUS (*ARM_RD_SMBIOS_TABLE_INSTALL_FPTR)(EFI_SMBIOS_PROTOCOL *);
 STATIC
 ARM_RD_SMBIOS_TABLE_INSTALL_FPTR mSmbiosTableList[] = {
   &InstallBiosInformation,
+  &InstallSystemInformation,
 };
 
 /**
diff --git a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type1SystemInformation.c b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type1SystemInformation.c
new file mode 100644
index 000000000000..21b3ad863719
--- /dev/null
+++ b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type1SystemInformation.c
@@ -0,0 +1,114 @@
+/** @file
+  SMBIOS Type 1 (System information) table for ARM RD platforms.
+
+  Copyright (c) 2020-2021, ARM Limited. All rights reserved.
+
+  SPDX-License-Identifier: BSD-2-Clause-Patent
+
+**/
+
+#include <Library/BaseMemoryLib.h>
+#include <Library/DebugLib.h>
+#include <Library/PcdLib.h>
+#include <Protocol/Smbios.h>
+
+#include "SgiPlatform.h"
+
+#define PRODUCT_NAME_BASE  6    /* Product name base from TYPE1_STRINGS */
+#define TYPE1_STRINGS                                   \
+  "ARM LTD\0"                   /* Manufacturer */      \
+  "Version not set\0"           /* Version */           \
+  "Serial not set\0"            /* Serial number */     \
+  "Not Applicable\0"            /* SKU */               \
+  "Not Applicable\0"            /* Family */            \
+  "SGI575\0"                    /* Product Names */     \
+  "RdN1Edge\0"                                          \
+  "RdN1EdgeX2\0"                                        \
+  "RdE1Edge\0"                                          \
+  "RdV1\0"                                              \
+  "RdV1Mc\0"                                            \
+  "RdN2\0"
+
+/* SMBIOS Type1 structure */
+#pragma pack(1)
+struct ArmRdSmbiosType1 {
+  SMBIOS_TABLE_TYPE1  Base;
+  UINT8               Strings[sizeof (TYPE1_STRINGS)];
+} ARM_TYPE1;
+#pragma pack()
+
+STATIC GUID mSmbiosUid[] = {
+  /* Sgi575        */
+  {0xdd7cad0a, 0x227c, 0x4ed4, {0x9f, 0x42, 0xa9, 0x8b, 0xd6, 0xa2, 0x42, 0x6c}},
+  /* Rd-N1-Edge    */
+  {0x80984efe, 0x404a, 0x43e0, {0xad, 0xa4, 0x63, 0xa0, 0xe0, 0xc4, 0x5e, 0x60}},
+  /* Rd-N1-Edge-X2 */
+  {0x2cc4f916, 0x267a, 0x4251, {0x95, 0x6e, 0xf0, 0x49, 0x82, 0xbe, 0x94, 0x58}},
+  /* Rd-E1-Edge    */
+  {0x567f35c4, 0x104f, 0x447b, {0xa0, 0x94, 0x89, 0x2f, 0xbd, 0xb6, 0x5a, 0x55}},
+  /* Rd-V1         */
+  {0xc481f0b1, 0x237c, 0x42d7, {0x98, 0xb2, 0xb4, 0xb4, 0x8d, 0xb5, 0x4f, 0x50}},
+  /* Rd-V1Mc       */
+  {0x1f3a0806, 0x18b5, 0x4eca, {0xad, 0xcd, 0xba, 0x9b, 0x07, 0xb1, 0x0a, 0xcf}},
+  /* Rd-N2         */
+  {0xf2cded73, 0x37f9, 0x4ec9, {0xd9, 0xf9, 0x89, 0x9b, 0x74, 0x91, 0x20, 0x49}}
+};
+
+/* System information (SMBIOS 3.4 spec, section 7.2) */
+static struct ArmRdSmbiosType1 mArmRdSmbiosType1 = {
+  {
+    {
+      // SMBIOS header
+      EFI_SMBIOS_TYPE_SYSTEM_INFORMATION, // Type 1
+      sizeof (SMBIOS_TABLE_TYPE1),        // Length
+      SMBIOS_HANDLE_PI_RESERVED,          // Assign an unused handle number
+    },
+    1,                      // Manufacturer
+    PRODUCT_NAME_BASE,      // Product Name, update dynamically
+    2,                      // Version
+    3,                      // Serial
+    {0},                    // UUID, Update dymanically
+    1,                      // Wakeup type other
+    4,                      // SKU
+    5,                      // Family
+  },
+  // Text strings (unformatted)
+  TYPE1_STRINGS
+};
+
+/**
+  Install SMBIOS System information Table
+
+  @retval EFI_SUCCESS           Record was added.
+  @retval EFI_NOT_FOUND         Unknown product id.
+  @retval EFI_OUT_OF_RESOURCES  Record was not added.
+  @retval EFI_ALREADY_STARTED   The SmbiosHandle passed in is already in use.
+**/
+EFI_STATUS
+InstallSystemInformation (
+  IN     EFI_SMBIOS_PROTOCOL    *Smbios
+  )
+{
+  EFI_STATUS Status;
+  EFI_SMBIOS_HANDLE SmbiosHandle;
+
+  SmbiosHandle = ((EFI_SMBIOS_TABLE_HEADER *)&mArmRdSmbiosType1)->Handle;
+
+  if (SgiGetProductId () != UnknownId) {
+    mArmRdSmbiosType1.Base.ProductName =
+      PRODUCT_NAME_BASE + (SgiGetProductId  () - 1);  // from TYPE1_STRINGS
+    CopyGuid (&mArmRdSmbiosType1.Base.Uuid,
+              &mSmbiosUid[SgiGetProductId  () - 1]);
+  } else {
+    return EFI_NOT_FOUND;
+  }
+
+  Status = Smbios->Add (
+                     Smbios,
+                     NULL,
+                     &SmbiosHandle,
+                     (EFI_SMBIOS_TABLE_HEADER *)&mArmRdSmbiosType1
+                     );
+
+  return Status;
+}
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [edk2-platforms][PATCH V1 05/11] Platform/ARM/SgiPkg: Add SMBIOS Type3 Table
  2021-01-15 18:26 [edk2-platforms][PATCH V1 00/11] Add SMBIOS tables for SGI/RD platforms Pranav Madhu
                   ` (3 preceding siblings ...)
  2021-01-15 18:26 ` [edk2-platforms][PATCH V1 04/11] Platform/ARM/SgiPkg: Add SMBIOS Type1 Table Pranav Madhu
@ 2021-01-15 18:26 ` Pranav Madhu
  2021-01-15 18:26 ` [edk2-platforms][PATCH V1 06/11] Platform/ARM/SgiPkg: Add SMBIOS Type4 Table Pranav Madhu
                   ` (6 subsequent siblings)
  11 siblings, 0 replies; 14+ messages in thread
From: Pranav Madhu @ 2021-01-15 18:26 UTC (permalink / raw)
  To: devel; +Cc: Ard Biesheuvel, Leif Lindholm

Add the SMBIOS type 3 table (System Enclosure) that includes information
about manufacturer, type, serial number and other information related to
system enclosure.

Signed-off-by: Pranav Madhu <pranav.madhu@arm.com>
---
 Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf  |  1 +
 Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.h    | 10 +++
 Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c    |  1 +
 Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type3SystemEnclosure.c | 77 ++++++++++++++++++++
 4 files changed, 89 insertions(+)

diff --git a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
index 6a00912ab742..8095257a4c94 100644
--- a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
+++ b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
@@ -27,6 +27,7 @@
   SmbiosPlatformDxe.c
   Type0BiosInformation.c
   Type1SystemInformation.c
+  Type3SystemEnclosure.c
 
 [Packages]
   ArmPkg/ArmPkg.dec
diff --git a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.h b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.h
index 43427158106d..749439f939ee 100644
--- a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.h
+++ b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.h
@@ -21,4 +21,14 @@ InstallSystemInformation (
   IN     EFI_SMBIOS_PROTOCOL    *Smbios
   );
 
+EFI_STATUS
+EFIAPI
+InstallSystemEnclosure (
+  IN     EFI_SMBIOS_PROTOCOL    *Smbios
+  );
+
+enum SMBIOS_REFRENCE_HANDLES {
+  SMBIOS_HANDLE_ENCLOSURE = 0x1000,
+};
+
 #endif // SMBIOS_PLATFORM_DXE_H_
diff --git a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c
index 1068398bcba3..2eff18630030 100644
--- a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c
+++ b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c
@@ -23,6 +23,7 @@ STATIC
 ARM_RD_SMBIOS_TABLE_INSTALL_FPTR mSmbiosTableList[] = {
   &InstallBiosInformation,
   &InstallSystemInformation,
+  &InstallSystemEnclosure,
 };
 
 /**
diff --git a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type3SystemEnclosure.c b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type3SystemEnclosure.c
new file mode 100644
index 000000000000..c6d134e5af59
--- /dev/null
+++ b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type3SystemEnclosure.c
@@ -0,0 +1,77 @@
+/** @file
+  SMBIOS Type 3 (System enclosure) table for ARM RD platforms.
+
+  Copyright (c) 2020-2021, ARM Limited. All rights reserved.
+
+  SPDX-License-Identifier: BSD-2-Clause-Patent
+
+**/
+
+#include <Library/DebugLib.h>
+#include <Protocol/Smbios.h>
+
+#include "SmbiosPlatformDxe.h"
+
+#define TYPE3_STRINGS                                   \
+  "ARM LTD\0"                   /* Manufacturer */      \
+  "Version not set\0"           /* Version */           \
+  "Serial not set\0"            /* Serial */            \
+  "Asset Tag not set\0"         /* Asset Tag */
+
+/* SMBIOS Type3 structure */
+#pragma pack(1)
+struct ArmRdSmbiosType3 {
+  SMBIOS_TABLE_TYPE3  Base;
+  UINT8               Strings[sizeof (TYPE3_STRINGS)];
+};
+#pragma pack()
+
+/* System information (SMBIOS 3.4 spec, section 7.4) */
+static struct ArmRdSmbiosType3 mArmRdSmbiosType3 = {
+  {
+    {
+      // SMBIOS header
+      EFI_SMBIOS_TYPE_SYSTEM_ENCLOSURE,   // Type 3
+      sizeof (SMBIOS_TABLE_TYPE1),        // Length
+      SMBIOS_HANDLE_ENCLOSURE,            // Assign an unused handle number
+    },
+    1,                              // Manufacturer
+    2,                              // Enclosure type unknown
+    2,                              // Version
+    3,                              // Serial
+    4,                              // Asset Tag
+    ChassisStateSafe,               // Boot chassis state
+    ChassisStateSafe,               // Power supply state
+    ChassisStateSafe,               // Thermal state
+    ChassisSecurityStatusUnknown,   // Security Status
+    {0},                            // BIOS vendor specific Information
+  },
+  // Text strings (unformatted)
+  TYPE3_STRINGS
+};
+
+/**
+  Install SMBIOS System Enclosure Table
+
+  @retval EFI_SUCCESS           Record was added.
+  @retval EFI_OUT_OF_RESOURCES  Record was not added.
+  @retval EFI_ALREADY_STARTED   The SmbiosHandle passed in is already in use.
+**/
+EFI_STATUS
+InstallSystemEnclosure (
+  IN     EFI_SMBIOS_PROTOCOL    *Smbios
+  )
+{
+  EFI_STATUS Status;
+  EFI_SMBIOS_HANDLE SmbiosHandle;
+
+  SmbiosHandle = ((EFI_SMBIOS_TABLE_HEADER *)&mArmRdSmbiosType3)->Handle;
+  Status = Smbios->Add (
+                     Smbios,
+                     NULL,
+                     &SmbiosHandle,
+                     (EFI_SMBIOS_TABLE_HEADER *)&mArmRdSmbiosType3
+                     );
+
+  return Status;
+}
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [edk2-platforms][PATCH V1 06/11] Platform/ARM/SgiPkg: Add SMBIOS Type4 Table
  2021-01-15 18:26 [edk2-platforms][PATCH V1 00/11] Add SMBIOS tables for SGI/RD platforms Pranav Madhu
                   ` (4 preceding siblings ...)
  2021-01-15 18:26 ` [edk2-platforms][PATCH V1 05/11] Platform/ARM/SgiPkg: Add SMBIOS Type3 Table Pranav Madhu
@ 2021-01-15 18:26 ` Pranav Madhu
  2021-01-15 18:26 ` [edk2-platforms][PATCH V1 07/11] Platform/ARM/SgiPkg: Add SMBIOS Type7 Table Pranav Madhu
                   ` (5 subsequent siblings)
  11 siblings, 0 replies; 14+ messages in thread
From: Pranav Madhu @ 2021-01-15 18:26 UTC (permalink / raw)
  To: devel; +Cc: Ard Biesheuvel, Leif Lindholm

Add the SMBIOS type 4 table (Processor Information) that includes
information about manufacture, family, processor id, maximum operating
frequency, and other information related to the processor.

Signed-off-by: Pranav Madhu <pranav.madhu@arm.com>
---
 Platform/ARM/SgiPkg/SgiPlatform.dsc.inc                                   |   1 +
 Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf       |   6 +
 Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.h         |  12 ++
 Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c         |   1 +
 Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type4ProcessorInformation.c | 182 ++++++++++++++++++++
 5 files changed, 202 insertions(+)

diff --git a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc b/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
index 806f570c637f..de1a4be0605a 100644
--- a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
+++ b/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
@@ -63,6 +63,7 @@
   HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf
   MemoryAllocationLib|MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf
   PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
+  PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
 
 [LibraryClasses.common.DXE_DRIVER]
   FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf
diff --git a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
index 8095257a4c94..883f6a49243d 100644
--- a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
+++ b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
@@ -28,6 +28,7 @@
   Type0BiosInformation.c
   Type1SystemInformation.c
   Type3SystemEnclosure.c
+  Type4ProcessorInformation.c
 
 [Packages]
   ArmPkg/ArmPkg.dec
@@ -37,9 +38,11 @@
   Platform/ARM/SgiPkg/SgiPlatform.dec
 
 [LibraryClasses]
+  ArmLib
   ArmPlatformLib
   DebugLib
   HobLib
+  PrintLib
   UefiDriverEntryPoint
 
 [Guids]
@@ -47,6 +50,9 @@
   gArmSgiPlatformIdDescriptorGuid
 
 [FixedPcd]
+  gArmPlatformTokenSpaceGuid.PcdClusterCount
+  gArmPlatformTokenSpaceGuid.PcdCoreCount
+  gArmSgiTokenSpaceGuid.PcdChipCount
   gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareRevision
 
 [Protocols]
diff --git a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.h b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.h
index 749439f939ee..161bd7ba4090 100644
--- a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.h
+++ b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.h
@@ -27,8 +27,20 @@ InstallSystemEnclosure (
   IN     EFI_SMBIOS_PROTOCOL    *Smbios
   );
 
+EFI_STATUS
+EFIAPI
+InstallProcessorInformation (
+  IN     EFI_SMBIOS_PROTOCOL    *Smbios
+  );
+
 enum SMBIOS_REFRENCE_HANDLES {
   SMBIOS_HANDLE_ENCLOSURE = 0x1000,
+  SMBIOS_HANDLE_CLUSTER1,
+  SMBIOS_HANDLE_L1I_CACHE,
+  SMBIOS_HANDLE_L1D_CACHE,
+  SMBIOS_HANDLE_L2_CACHE,
+  SMBIOS_HANDLE_L3_CACHE,
+  SMBIOS_HANDLE_L4_CACHE,
 };
 
 #endif // SMBIOS_PLATFORM_DXE_H_
diff --git a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c
index 2eff18630030..12c54f31e149 100644
--- a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c
+++ b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c
@@ -24,6 +24,7 @@ ARM_RD_SMBIOS_TABLE_INSTALL_FPTR mSmbiosTableList[] = {
   &InstallBiosInformation,
   &InstallSystemInformation,
   &InstallSystemEnclosure,
+  &InstallProcessorInformation,
 };
 
 /**
diff --git a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type4ProcessorInformation.c b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type4ProcessorInformation.c
new file mode 100644
index 000000000000..0d66258c2884
--- /dev/null
+++ b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type4ProcessorInformation.c
@@ -0,0 +1,182 @@
+/** @file
+  SMBIOS Type 4 (Processor information) table for ARM RD platforms.
+
+  Copyright (c) 2020-2021, ARM Limited. All rights reserved.
+
+  SPDX-License-Identifier: BSD-2-Clause-Patent
+
+**/
+
+#include <Library/ArmLib.h>
+#include <Library/BaseMemoryLib.h>
+#include <Library/DebugLib.h>
+#include <Library/PrintLib.h>
+#include <Protocol/Smbios.h>
+
+#include "SgiPlatform.h"
+#include "SmbiosPlatformDxe.h"
+
+#define NEOVERSE_E1_THREADS_PER_CORE    2
+
+#define SOCKET_TYPE_BASE        3
+#define SOCKET_TYPE_NUM         1
+#define PROCESSOR_VERSION_BASE  (SOCKET_TYPE_BASE + SOCKET_TYPE_NUM)
+#define PROCESSOR_VERSION_NUM   8
+#define SERIAL_NUMBER_BASE      (PROCESSOR_VERSION_BASE + PROCESSOR_VERSION_NUM)
+#define TYPE4_STRINGS                                   \
+  "0x000\0"                     /* Part Number */       \
+  "ARM LTD\0"                   /* manufactuer */       \
+  "Other\0"                     /* socket type */       \
+  "Unknown\0"                   /* Processor Version */ \
+  "Cortex-A75\0"                                        \
+  "Neoverse-N1\0"                                       \
+  "Neoverse-N1\0"                                       \
+  "Neoverse-E1\0"                                       \
+  "Neoverse-V1\0"                                       \
+  "Neoverse-V1\0"                                       \
+  "Neoverse-N2\0"                                       \
+  "000-0\0"                     /* Serial number */     \
+  "783-3\0"                                             \
+  "786-1\0"                                             \
+  "786-1\0"                                             \
+  "786-2\0"                                             \
+  "78A-1\0"                                             \
+  "78A-2\0"                                             \
+  "7B7-1\0"
+
+/* SMBIOS Type4 structure */
+#pragma pack(1)
+struct ArmRdSmbiosType4 {
+  SMBIOS_TABLE_TYPE4  Base;
+  UINT8               Strings[sizeof (TYPE4_STRINGS)];
+} ARM_TYPE4;
+#pragma pack()
+
+/* Processor information (SMBIOS 3.4 spec, section 7.5) */
+static struct ArmRdSmbiosType4 mArmRdSmbiosType4 = {
+  {
+    {
+      // SMBIOS header
+      EFI_SMBIOS_TYPE_PROCESSOR_INFORMATION, // Type 4
+      sizeof (SMBIOS_TABLE_TYPE4),           // Length
+      SMBIOS_HANDLE_CLUSTER1,                // handle number
+    },
+    SOCKET_TYPE_BASE,        // Socket type
+    CentralProcessor,        // Processor type
+    ProcessorFamilyIndicatorFamily2,
+                             // Use Processor Family 2 field
+    2,                       // Manufacturer string number
+    {{0}, {0}},              // Processor id, update dynamically
+    PROCESSOR_VERSION_BASE,  // Processor version, update dynamically
+    {0, 0, 0, 0, 0, 1},      // Non legacy mode for processor voltage
+    0,                       // External clock frequency unknown
+    2600,                    // Max speed in MHz
+    2600,                    // Current speed in MHz
+    (                        // Status
+     (1 << 6) |              // CPU Socket Populated
+     (1 << 0)                // CPU Enabled
+    ),
+    ProcessorUpgradeOther,   // Processor Upgrade
+    SMBIOS_HANDLE_L1I_CACHE, // L1 Cache handle
+    SMBIOS_HANDLE_L2_CACHE,  // L2 Cache handle
+    SMBIOS_HANDLE_L3_CACHE,  // L3 Cache handle
+    0,                       // Processor serial number not set
+    0,                       // Processor asset tag not set
+    1,                       // Part number, update dynamically
+    0,                       // Core count, update dynamically
+    0,                       // Enabled core count, update dynamically
+    0,                       // Thread per socket count
+    (                        // Processor characteristics
+      (1 << 2) |             // 64-bit Capable
+      (1 << 3) |             // Multi-Core
+      (1 << 5) |             // Execute Protection
+      (1 << 6) |             // Enhanced Virtualization
+      (1 << 7)               // Power/Performance Control
+    ),
+    ProcessorFamilyARM       // Processor Family 2
+    },
+  TYPE4_STRINGS
+};
+
+/**
+  Get the part number from ProcessorId and update TYPE4_STRINGS
+
+  @param  ProcessorId    The processor Id read from MIDR register
+**/
+STATIC
+VOID
+UpdatePartNumber (
+  IN     UINT64 ProcessorId
+  )
+{
+  CHAR8  PartNumber[4] = {0};
+  UINT16 PartNum;
+
+  PartNum = (UINT16)((ProcessorId >> 4) & 0xFFF);
+
+  /* Convert 3 digit hexadecimal partnumber to ASCII and update TYPE4_STRINGS */
+  AsciiSPrint(PartNumber, sizeof (PartNumber), "%03x", PartNum);
+  CopyMem (&mArmRdSmbiosType4.Strings[2], PartNumber, sizeof (PartNumber));
+}
+
+/**
+  Install SMBIOS Processor information Table
+
+  @retval EFI_SUCCESS           Record was added.
+  @retval EFI_NOT_FOUND         Unknown product id.
+  @retval EFI_OUT_OF_RESOURCES  Record was not added.
+  @retval EFI_ALREADY_STARTED   The SmbiosHandle passed in is already in use.
+**/
+EFI_STATUS
+InstallProcessorInformation (
+  IN     EFI_SMBIOS_PROTOCOL    *Smbios
+  )
+{
+  EFI_STATUS Status;
+  EFI_SMBIOS_HANDLE SmbiosHandle;
+  UINT32 CoreCount;
+  UINT64 *ProcessorId = (UINT64 *)&(mArmRdSmbiosType4.Base.ProcessorId);
+
+  SmbiosHandle = ((EFI_SMBIOS_TABLE_HEADER *)&mArmRdSmbiosType4)->Handle;
+  CoreCount = (FixedPcdGet32 (PcdCoreCount) * FixedPcdGet32 (PcdClusterCount));
+
+  switch (SgiGetProductId ()) {
+  case Sgi575:
+  case RdN1Edge:
+  case RdV1:
+  case RdN2:
+    mArmRdSmbiosType4.Base.CoreCount = CoreCount;
+    mArmRdSmbiosType4.Base.EnabledCoreCount = CoreCount;
+    mArmRdSmbiosType4.Base.ThreadCount = CoreCount;
+    break;
+  case RdN1EdgeX2:
+  case RdV1Mc:
+    mArmRdSmbiosType4.Base.CoreCount = CoreCount * FixedPcdGet32 (PcdChipCount);
+    mArmRdSmbiosType4.Base.EnabledCoreCount = CoreCount * FixedPcdGet32 (PcdChipCount);
+    mArmRdSmbiosType4.Base.ThreadCount = CoreCount * FixedPcdGet32 (PcdChipCount);
+    break;
+  case RdE1Edge:
+    mArmRdSmbiosType4.Base.CoreCount = CoreCount / NEOVERSE_E1_THREADS_PER_CORE;
+    mArmRdSmbiosType4.Base.EnabledCoreCount = CoreCount / NEOVERSE_E1_THREADS_PER_CORE;
+    mArmRdSmbiosType4.Base.ThreadCount = CoreCount;
+    mArmRdSmbiosType4.Base.MaxSpeed = 2300;      // Frequency in MHz
+    mArmRdSmbiosType4.Base.CurrentSpeed = 2300;  // Frequency in MHz
+    break;
+  }
+
+  mArmRdSmbiosType4.Base.ProcessorVersion = PROCESSOR_VERSION_BASE + SgiGetProductId ();
+  mArmRdSmbiosType4.Base.SerialNumber = SERIAL_NUMBER_BASE + SgiGetProductId ();
+
+  /* Update processor-id and part number */
+  *ProcessorId = ArmReadMidr();
+  UpdatePartNumber (*ProcessorId);
+
+  Status = Smbios->Add (
+                     Smbios,
+                     NULL,
+                     &SmbiosHandle,
+                     (EFI_SMBIOS_TABLE_HEADER *)&mArmRdSmbiosType4
+                     );
+
+  return Status;
+}
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [edk2-platforms][PATCH V1 07/11] Platform/ARM/SgiPkg: Add SMBIOS Type7 Table
  2021-01-15 18:26 [edk2-platforms][PATCH V1 00/11] Add SMBIOS tables for SGI/RD platforms Pranav Madhu
                   ` (5 preceding siblings ...)
  2021-01-15 18:26 ` [edk2-platforms][PATCH V1 06/11] Platform/ARM/SgiPkg: Add SMBIOS Type4 Table Pranav Madhu
@ 2021-01-15 18:26 ` Pranav Madhu
  2021-01-15 18:26 ` [edk2-platforms][PATCH V1 08/11] Platform/ARM/SgiPkg: Add SMBIOS Type16 Table Pranav Madhu
                   ` (4 subsequent siblings)
  11 siblings, 0 replies; 14+ messages in thread
From: Pranav Madhu @ 2021-01-15 18:26 UTC (permalink / raw)
  To: devel; +Cc: Ard Biesheuvel, Leif Lindholm

Add the SMBIOS type 7 table (Cache Information) that includes
information about cache levels implemented, cache configuration, ways of
associativity and other information related to cache memory installed.

Signed-off-by: Pranav Madhu <pranav.madhu@arm.com>
---
 Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf   |   1 +
 Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.h     |   6 +
 Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c     |   1 +
 Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type7CacheInformation.c | 297 ++++++++++++++++++++
 4 files changed, 305 insertions(+)

diff --git a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
index 883f6a49243d..162b9c68cfcc 100644
--- a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
+++ b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
@@ -29,6 +29,7 @@
   Type1SystemInformation.c
   Type3SystemEnclosure.c
   Type4ProcessorInformation.c
+  Type7CacheInformation.c
 
 [Packages]
   ArmPkg/ArmPkg.dec
diff --git a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.h b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.h
index 161bd7ba4090..85a765cfe0c0 100644
--- a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.h
+++ b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.h
@@ -33,6 +33,12 @@ InstallProcessorInformation (
   IN     EFI_SMBIOS_PROTOCOL    *Smbios
   );
 
+EFI_STATUS
+EFIAPI
+InstallCacheInformation (
+  IN     EFI_SMBIOS_PROTOCOL    *Smbios
+  );
+
 enum SMBIOS_REFRENCE_HANDLES {
   SMBIOS_HANDLE_ENCLOSURE = 0x1000,
   SMBIOS_HANDLE_CLUSTER1,
diff --git a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c
index 12c54f31e149..c2e45e7877d0 100644
--- a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c
+++ b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c
@@ -25,6 +25,7 @@ ARM_RD_SMBIOS_TABLE_INSTALL_FPTR mSmbiosTableList[] = {
   &InstallSystemInformation,
   &InstallSystemEnclosure,
   &InstallProcessorInformation,
+  &InstallCacheInformation,
 };
 
 /**
diff --git a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type7CacheInformation.c b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type7CacheInformation.c
new file mode 100644
index 000000000000..b8d0af54678c
--- /dev/null
+++ b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type7CacheInformation.c
@@ -0,0 +1,297 @@
+/** @file
+  SMBIOS Type 7 (Cache information) table for ARM RD platforms.
+
+  Copyright (c) 2020-2021, ARM Limited. All rights reserved.
+
+  SPDX-License-Identifier: BSD-2-Clause-Patent
+
+**/
+
+#include <Library/DebugLib.h>
+#include <Protocol/Smbios.h>
+
+#include "SgiPlatform.h"
+#include "SmbiosPlatformDxe.h"
+
+#define TYPE7_STRINGS                                   \
+  "L1 Instruction\0"            /* L1I */               \
+  "L1 Data\0"                   /* L1D */               \
+  "L2\0"                        /* L2  */               \
+  "L3\0"                        /* L3  */               \
+  "SLC\0"                       /* L4  */
+
+/* SMBIOS Type7 structure */
+#pragma pack(1)
+struct ArmRdSmbiosType7 {
+  SMBIOS_TABLE_TYPE7  Base;
+  UINT8               Strings[sizeof (TYPE7_STRINGS)];
+} ARM_TYPE7;
+#pragma pack()
+
+/* Cache information (SMBIOS 3.4 spec, section 7.8) */
+static struct ArmRdSmbiosType7 mArmRdSmbiosType7[] = {
+  {   // Entry 0, L1 Instruction Cache
+    {
+      {
+        // SMBIOS header
+        EFI_SMBIOS_TYPE_CACHE_INFORMATION, // Type 7
+        sizeof (SMBIOS_TABLE_TYPE7),       // Length
+        SMBIOS_HANDLE_L1I_CACHE,           // Handle number
+      },
+      1,
+      (
+        (1 << 8) | // Write-back
+        (1 << 7) | // Cache enabled
+        (1 << 3) | // Cache socketed
+        0x0        // Cache level 1
+      ),
+      0xFFFF,      // Uses Maximum cache size 2 field
+      0xFFFF,      // Uses Installed cache size 2 field
+      {0, 1},      // Supported SRAM type unknown
+      {0, 1},      // Current SRAM type unknown
+      0,           // Cache Speed Unknown
+      0x02,        // Error correction type unknown
+      0x03,        // Instruction cache
+      0,           // Associativity, update dynamically
+      0,           // Maximum cache size 2, update dynamically
+      0            // Installed cache size 2, update dynamically
+    },
+    // Text strings (unformatted area)
+    TYPE7_STRINGS
+  },
+  {   // Entry 1, L1 Data Cache
+    {
+      {
+        // SMBIOS header
+        EFI_SMBIOS_TYPE_CACHE_INFORMATION, // Type 7
+        sizeof (SMBIOS_TABLE_TYPE7),       // Length
+        SMBIOS_HANDLE_L1D_CACHE,           // Handle number
+      },
+      2,
+      (
+        (1 << 8) | // Write-back
+        (1 << 7) | // Cache enabled
+        (1 << 3) | // Cache socketed
+        0x0        // Cache level 1
+      ),
+      0xFFFF,      // Uses Maximum cache size 2 field
+      0xFFFF,      // Uses Installed cache size 2 field
+      {0, 1},      // Supported SRAM type unknown
+      {0, 1},      // Current SRAM type unknown
+      0,           // Cache Speed Unknown
+      0x02,        // Error correction type unknown
+      0x04,        // Data cache
+      0,           // Associativity, update dynamically
+      0,           // Maximum cache size 2, update dynamically
+      0            // Installed cache size 2, update dynamically
+    },
+    // Text strings (unformatted area)
+    TYPE7_STRINGS
+  },
+  {   // Entry 2, L2 Cache
+    {
+      {
+        // SMBIOS header
+        EFI_SMBIOS_TYPE_CACHE_INFORMATION, // Type 7
+        sizeof (SMBIOS_TABLE_TYPE7),       // Length
+        SMBIOS_HANDLE_L2_CACHE,            // Handle number
+      },
+      3,
+      (
+        (1 << 8) | // Write-back
+        (1 << 7) | // Cache enabled
+        (1 << 3) | // Cache socketed
+        0x1        // Cache level 2
+      ),
+      0xFFFF,      // Uses Maximum cache size 2 field
+      0xFFFF,      // Uses Installed cache size 2 field
+      {0, 1},      // Supported SRAM type unknown
+      {0, 1},      // Current SRAM type unknown
+      0,           // Cache Speed Unknown
+      0x02,        // Error correction type unknown
+      0x05,        // Unified cache
+      0,           // Associativity, update dynamically
+      0,           // Maximum cache size 2, update dynamically
+      0            // Installed cache size 2, update dynamically
+    },
+    // Text strings (unformatted area)
+    TYPE7_STRINGS
+  },
+  {   // Entry 3, L3 Cache
+    {
+      {
+        // SMBIOS header
+        EFI_SMBIOS_TYPE_CACHE_INFORMATION, // Type 7
+        sizeof (SMBIOS_TABLE_TYPE7),       // Length
+        SMBIOS_HANDLE_L3_CACHE,            // Handle number
+      },
+      4,
+      (
+        (1 << 8) | // Write-back
+        (1 << 7) | // Cache enabled
+        (1 << 3) | // Cache socketed
+        0x2        // Cache level 3
+      ),
+      0xFFFF,      // Uses Maximum cache size 2 field
+      0xFFFF,      // Uses Installed cache size 2 field
+      {0, 1},      // Supported SRAM type unknown
+      {0, 1},      // Current SRAM type unknown
+      0,           // Cache Speed Unknown
+      0x02,        // Error correction type unknown
+      0x05,        // Unified cache
+      0,           // Associativity, update dynamically
+      0,           // Maximum cache size 2, update dynamically
+      0            // Installed cache size 2, update dynamically
+    },
+    // Text strings (unformatted area)
+    TYPE7_STRINGS
+  },
+  {   // Entry 4, SLC Cache
+    {
+      {
+        // SMBIOS header
+        EFI_SMBIOS_TYPE_CACHE_INFORMATION, // Type 7
+        sizeof (SMBIOS_TABLE_TYPE7),       // Length
+        SMBIOS_HANDLE_L4_CACHE,            // Handle number
+      },
+      5,
+      (
+        (1 << 8) | // Write-back
+        (1 << 7) | // Cache enabled
+        (1 << 3) | // Cache socketed
+        0x3        // Cache level 4
+      ),
+      0xFFFF,      // Uses Maximum cache size 2 field
+      0xFFFF,      // Uses Installed cache size 2 field
+      {0, 1},      // Supported SRAM type unknown
+      {0, 1},      // Current SRAM type unknown
+      0,           // Cache Speed Unknown
+      0x02,        // Error correction type unknown
+      0x05,        // Unified cache
+      0,           // Associativity, update dynamically
+      0,           // Maximum cache size 2, update dynamically
+      0            // Installed cache size 2, update dynamically
+    },
+    // Text strings (unformatted area)
+    TYPE7_STRINGS
+  }
+};
+
+/**
+  Install SMBIOS Cache information Table
+
+  @retval EFI_SUCCESS           Record was added.
+  @retval EFI_NOT_FOUND         Unknown product id.
+  @retval EFI_OUT_OF_RESOURCES  Record was not added.
+  @retval EFI_ALREADY_STARTED   The SmbiosHandle passed in is already in use.
+**/
+EFI_STATUS
+InstallCacheInformation (
+  IN     EFI_SMBIOS_PROTOCOL    *Smbios
+  )
+{
+  EFI_STATUS Status;
+  EFI_SMBIOS_HANDLE SmbiosHandle;
+  UINT8 CacheIdx;
+
+  /* Update the cache attributes based on the product */
+  switch (SgiGetProductId ()) {
+  case Sgi575:
+    mArmRdSmbiosType7[0].Base.MaximumCacheSize2 = 64;     // 64KB
+    mArmRdSmbiosType7[0].Base.InstalledSize2 = 64;        // 64KB
+    mArmRdSmbiosType7[0].Base.Associativity = CacheAssociativity4Way;
+    mArmRdSmbiosType7[1].Base.MaximumCacheSize2 = 64;     // 64KB
+    mArmRdSmbiosType7[1].Base.InstalledSize2 = 64;        // 64KB
+    mArmRdSmbiosType7[1].Base.Associativity = CacheAssociativity16Way;
+    mArmRdSmbiosType7[2].Base.MaximumCacheSize2 = 512;    // 512KB
+    mArmRdSmbiosType7[2].Base.InstalledSize2 = 512;       // 512KB
+    mArmRdSmbiosType7[2].Base.Associativity = CacheAssociativity8Way;
+    mArmRdSmbiosType7[3].Base.MaximumCacheSize2 = 2048;   // 2MB
+    mArmRdSmbiosType7[3].Base.InstalledSize2 = 2048;      // 2MB
+    mArmRdSmbiosType7[3].Base.Associativity = CacheAssociativity16Way;
+    break;
+  case RdN1Edge:
+  case RdN1EdgeX2:
+    mArmRdSmbiosType7[0].Base.MaximumCacheSize2 = 64;    // 64KB
+    mArmRdSmbiosType7[0].Base.InstalledSize2 = 64;       // 64KB
+    mArmRdSmbiosType7[0].Base.Associativity = CacheAssociativity4Way;
+    mArmRdSmbiosType7[1].Base.MaximumCacheSize2 = 64;    // 64KB
+    mArmRdSmbiosType7[1].Base.InstalledSize2 = 64;       // 64KB
+    mArmRdSmbiosType7[1].Base.Associativity = CacheAssociativity4Way;
+    mArmRdSmbiosType7[2].Base.MaximumCacheSize2 = 512;   // 512KB
+    mArmRdSmbiosType7[2].Base.InstalledSize2 = 512;      // 512KB
+    mArmRdSmbiosType7[2].Base.Associativity = CacheAssociativity8Way;
+    mArmRdSmbiosType7[3].Base.MaximumCacheSize2 = 2048;  // 2MB
+    mArmRdSmbiosType7[3].Base.InstalledSize2 = 2048;     // 2MB
+    mArmRdSmbiosType7[3].Base.Associativity = CacheAssociativity16Way;
+    mArmRdSmbiosType7[4].Base.MaximumCacheSize2 = 8192;  // 8MB SLC per chip
+    mArmRdSmbiosType7[4].Base.InstalledSize2 = 8192;     // 8MB SLC per chip
+    mArmRdSmbiosType7[4].Base.Associativity = CacheAssociativity16Way;
+    break;
+  case RdE1Edge:
+    mArmRdSmbiosType7[0].Base.MaximumCacheSize2 = 32;    // 32KB
+    mArmRdSmbiosType7[0].Base.InstalledSize2 = 32;       // 32KB
+    mArmRdSmbiosType7[0].Base.Associativity = CacheAssociativity4Way;
+    mArmRdSmbiosType7[1].Base.MaximumCacheSize2 = 32;    // 32KB
+    mArmRdSmbiosType7[1].Base.InstalledSize2 = 32;       // 32KB
+    mArmRdSmbiosType7[1].Base.Associativity = CacheAssociativity4Way;
+    mArmRdSmbiosType7[2].Base.MaximumCacheSize2 = 256;   // 256KB
+    mArmRdSmbiosType7[2].Base.InstalledSize2 = 256;      // 256KB
+    mArmRdSmbiosType7[2].Base.Associativity = CacheAssociativity4Way;
+    mArmRdSmbiosType7[3].Base.MaximumCacheSize2 = 2048;  // 2MB
+    mArmRdSmbiosType7[3].Base.InstalledSize2 = 2048;     // 2MB
+    mArmRdSmbiosType7[3].Base.Associativity = CacheAssociativity16Way;
+    mArmRdSmbiosType7[4].Base.MaximumCacheSize2 = 8192;  // 8MB SLC
+    mArmRdSmbiosType7[4].Base.InstalledSize2 = 8192;     // 8MB SLC
+    mArmRdSmbiosType7[4].Base.Associativity = CacheAssociativity16Way;
+    break;
+  case RdV1:
+  case RdV1Mc:
+    mArmRdSmbiosType7[0].Base.MaximumCacheSize2 = 64;    // 64KB
+    mArmRdSmbiosType7[0].Base.InstalledSize2 = 64;       // 64KB
+    mArmRdSmbiosType7[0].Base.Associativity = CacheAssociativity4Way;
+    mArmRdSmbiosType7[1].Base.MaximumCacheSize2 = 64;    // 64KB
+    mArmRdSmbiosType7[1].Base.InstalledSize2 = 64;       // 64KB
+    mArmRdSmbiosType7[1].Base.Associativity = CacheAssociativity4Way;
+    mArmRdSmbiosType7[2].Base.MaximumCacheSize2 = 1024;  // 1MB
+    mArmRdSmbiosType7[2].Base.InstalledSize2 = 1024;     // 1MB
+    mArmRdSmbiosType7[2].Base.Associativity = CacheAssociativity8Way;
+    mArmRdSmbiosType7[4].Base.MaximumCacheSize2 = 16384; // 16MB SLC per chip
+    mArmRdSmbiosType7[4].Base.InstalledSize2 = 16384;    // 16MB SLC per chip
+    mArmRdSmbiosType7[4].Base.Associativity = CacheAssociativity16Way;
+    break;
+  case RdN2:
+    mArmRdSmbiosType7[0].Base.MaximumCacheSize2 = 64;    // 64KB
+    mArmRdSmbiosType7[0].Base.InstalledSize2 = 64;       // 64KB
+    mArmRdSmbiosType7[0].Base.Associativity = CacheAssociativity4Way;
+    mArmRdSmbiosType7[1].Base.MaximumCacheSize2 = 64;    // 64KB
+    mArmRdSmbiosType7[1].Base.InstalledSize2 = 64;       // 64KB
+    mArmRdSmbiosType7[1].Base.Associativity = CacheAssociativity4Way;
+    mArmRdSmbiosType7[2].Base.MaximumCacheSize2 = 1024;  // 1MB
+    mArmRdSmbiosType7[2].Base.InstalledSize2 = 1024;     // 1MB
+    mArmRdSmbiosType7[2].Base.Associativity = CacheAssociativity8Way;
+    mArmRdSmbiosType7[4].Base.MaximumCacheSize2 = 32768; // 32MB SLC
+    mArmRdSmbiosType7[4].Base.InstalledSize2 = 32768;    // 32MB SLC
+    mArmRdSmbiosType7[4].Base.Associativity = CacheAssociativity16Way;
+    break;
+  }
+
+  for (CacheIdx = 0; CacheIdx < ARRAY_SIZE (mArmRdSmbiosType7); CacheIdx++) {
+    if (mArmRdSmbiosType7[CacheIdx].Base.MaximumCacheSize2 == 0) {
+      continue;
+    }
+
+    SmbiosHandle = ((EFI_SMBIOS_TABLE_HEADER *)&mArmRdSmbiosType7[CacheIdx])->Handle;
+    Status = Smbios->Add (
+                       Smbios,
+                       NULL,
+                       &SmbiosHandle,
+                       (EFI_SMBIOS_TABLE_HEADER *)&mArmRdSmbiosType7[CacheIdx]
+                       );
+    if (EFI_ERROR (Status)) {
+      break;
+    }
+  }
+
+  return Status;
+}
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [edk2-platforms][PATCH V1 08/11] Platform/ARM/SgiPkg: Add SMBIOS Type16 Table
  2021-01-15 18:26 [edk2-platforms][PATCH V1 00/11] Add SMBIOS tables for SGI/RD platforms Pranav Madhu
                   ` (6 preceding siblings ...)
  2021-01-15 18:26 ` [edk2-platforms][PATCH V1 07/11] Platform/ARM/SgiPkg: Add SMBIOS Type7 Table Pranav Madhu
@ 2021-01-15 18:26 ` Pranav Madhu
  2021-01-15 18:26 ` [edk2-platforms][PATCH V1 09/11] Platform/ARM/SgiPkg: Add SMBIOS Type17 Table Pranav Madhu
                   ` (3 subsequent siblings)
  11 siblings, 0 replies; 14+ messages in thread
From: Pranav Madhu @ 2021-01-15 18:26 UTC (permalink / raw)
  To: devel; +Cc: Ard Biesheuvel, Leif Lindholm

Add the SMBIOS type 16 table (Physical Memory Array) describes a
collection of memory devices that operate together to form a memory
address. It includes information about number of devices, total memory
installed, error correction mechanism used and other related information.

Signed-off-by: Pranav Madhu <pranav.madhu@arm.com>
---
 Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf       |  4 +
 Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.h         |  7 ++
 Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c         |  1 +
 Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type16PhysicalMemoryArray.c | 85 ++++++++++++++++++++
 4 files changed, 97 insertions(+)

diff --git a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
index 162b9c68cfcc..83bcb40531fe 100644
--- a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
+++ b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
@@ -30,6 +30,7 @@
   Type3SystemEnclosure.c
   Type4ProcessorInformation.c
   Type7CacheInformation.c
+  Type16PhysicalMemoryArray.c
 
 [Packages]
   ArmPkg/ArmPkg.dec
@@ -54,6 +55,9 @@
   gArmPlatformTokenSpaceGuid.PcdClusterCount
   gArmPlatformTokenSpaceGuid.PcdCoreCount
   gArmSgiTokenSpaceGuid.PcdChipCount
+  gArmSgiTokenSpaceGuid.PcdDramBlock2Size
+  gArmTokenSpaceGuid.PcdSystemMemoryBase
+  gArmTokenSpaceGuid.PcdSystemMemorySize
   gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareRevision
 
 [Protocols]
diff --git a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.h b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.h
index 85a765cfe0c0..e7ecb5d56704 100644
--- a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.h
+++ b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.h
@@ -39,6 +39,12 @@ InstallCacheInformation (
   IN     EFI_SMBIOS_PROTOCOL    *Smbios
   );
 
+EFI_STATUS
+EFIAPI
+InstallPhysicalMemoryArray (
+  IN     EFI_SMBIOS_PROTOCOL    *Smbios
+  );
+
 enum SMBIOS_REFRENCE_HANDLES {
   SMBIOS_HANDLE_ENCLOSURE = 0x1000,
   SMBIOS_HANDLE_CLUSTER1,
@@ -47,6 +53,7 @@ enum SMBIOS_REFRENCE_HANDLES {
   SMBIOS_HANDLE_L2_CACHE,
   SMBIOS_HANDLE_L3_CACHE,
   SMBIOS_HANDLE_L4_CACHE,
+  SMBIOS_HANDLE_PHYSICAL_MEMORY,
 };
 
 #endif // SMBIOS_PLATFORM_DXE_H_
diff --git a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c
index c2e45e7877d0..accc9fe2e560 100644
--- a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c
+++ b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c
@@ -26,6 +26,7 @@ ARM_RD_SMBIOS_TABLE_INSTALL_FPTR mSmbiosTableList[] = {
   &InstallSystemEnclosure,
   &InstallProcessorInformation,
   &InstallCacheInformation,
+  &InstallPhysicalMemoryArray,
 };
 
 /**
diff --git a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type16PhysicalMemoryArray.c b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type16PhysicalMemoryArray.c
new file mode 100644
index 000000000000..90895f0ad268
--- /dev/null
+++ b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type16PhysicalMemoryArray.c
@@ -0,0 +1,85 @@
+/** @file
+  SMBIOS Type 16 (Physical Memory Array) table for ARM RD platforms.
+
+  Copyright (c) 2020-2021, ARM Limited. All rights reserved.
+
+  SPDX-License-Identifier: BSD-2-Clause-Patent
+
+**/
+
+#include <Library/BaseMemoryLib.h>
+#include <Protocol/Smbios.h>
+
+#include "SmbiosPlatformDxe.h"
+
+#define TYPE16_STRINGS                                  \
+  "\0"                          /* Null string */
+
+/* SMBIOS Type16 structure */
+#pragma pack(1)
+struct ArmRdSmbiosType16 {
+  SMBIOS_TABLE_TYPE16 Base;
+  UINT8               Strings[sizeof (TYPE16_STRINGS)];
+} ARM_TYPE16;
+#pragma pack()
+
+/* Physical Memory Array (SMBIOS 3.4 spec, section 7.17) */
+static struct ArmRdSmbiosType16 mArmRdSmbiosType16 = {
+  {
+    {
+      // SMBIOS header
+      EFI_SMBIOS_TYPE_PHYSICAL_MEMORY_ARRAY, // Type 16
+      sizeof (SMBIOS_TABLE_TYPE16),          // Length
+      SMBIOS_HANDLE_PHYSICAL_MEMORY
+    },
+    MemoryArrayLocationSystemBoard,     // Location
+    MemoryArrayUseSystemMemory,         // Used as system memory
+    MemoryErrorCorrectionUnknown,       // Error correction
+    0x80000000, // Maximum capacity in KiB, uses Extended Maximum capacity field
+    0xFFFE,     // Memory error info handle, does not provide this info
+    0,          // Num of memory devices, update dymamically
+    0           // Extended Maximum capacity, update dymamically
+  },
+  // Text strings (unformatted area)
+  TYPE16_STRINGS
+};
+
+/**
+  Install SMBIOS Bios information Table
+
+  @retval EFI_SUCCESS           Record was added.
+  @retval EFI_OUT_OF_RESOURCES  Record was not added.
+  @retval EFI_ALREADY_STARTED   The SmbiosHandle passed in is already in use.
+**/
+EFI_STATUS
+InstallPhysicalMemoryArray (
+  IN     EFI_SMBIOS_PROTOCOL    *Smbios
+  )
+{
+  EFI_STATUS Status;
+  EFI_SMBIOS_HANDLE SmbiosHandle;
+  UINT16 NumOfMemoryDevices = 1;
+  UINT64 InstalledMemory;
+
+  SmbiosHandle = ((EFI_SMBIOS_TABLE_HEADER *)&mArmRdSmbiosType16)->Handle;
+
+  /* Include 16MB of Trusted DRAM as well */
+  InstalledMemory = PcdGet64 (PcdSystemMemorySize) + SIZE_16MB;
+  if (PcdGet64 (PcdDramBlock2Size) != 0) {
+    NumOfMemoryDevices++;
+    InstalledMemory += PcdGet64 (PcdDramBlock2Size);
+  }
+
+  mArmRdSmbiosType16.Base.ExtendedMaximumCapacity =
+    InstalledMemory * FixedPcdGet32 (PcdChipCount);
+  mArmRdSmbiosType16.Base.NumberOfMemoryDevices =
+    NumOfMemoryDevices * FixedPcdGet32 (PcdChipCount);
+
+  Status = Smbios->Add (
+                     Smbios,
+                     NULL,
+                     &SmbiosHandle,
+                     (EFI_SMBIOS_TABLE_HEADER *)&mArmRdSmbiosType16
+                     );
+  return Status;
+}
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [edk2-platforms][PATCH V1 09/11] Platform/ARM/SgiPkg: Add SMBIOS Type17 Table
  2021-01-15 18:26 [edk2-platforms][PATCH V1 00/11] Add SMBIOS tables for SGI/RD platforms Pranav Madhu
                   ` (7 preceding siblings ...)
  2021-01-15 18:26 ` [edk2-platforms][PATCH V1 08/11] Platform/ARM/SgiPkg: Add SMBIOS Type16 Table Pranav Madhu
@ 2021-01-15 18:26 ` Pranav Madhu
  2021-01-15 18:26 ` [edk2-platforms][PATCH V1 10/11] Platform/ARM/SgiPkg: Add SMBIOS Type19 Table Pranav Madhu
                   ` (2 subsequent siblings)
  11 siblings, 0 replies; 14+ messages in thread
From: Pranav Madhu @ 2021-01-15 18:26 UTC (permalink / raw)
  To: devel; +Cc: Ard Biesheuvel, Leif Lindholm

Add the SMBIOS type 17 table (Memory Device) that includes the
specification of each installed memory device such as size of each
device, bank locator, memory device type, and other related information.

Signed-off-by: Pranav Madhu <pranav.madhu@arm.com>
---
 Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf |   1 +
 Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.h   |  14 +
 Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c   |   1 +
 Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type17MemoryDevice.c  | 273 ++++++++++++++++++++
 4 files changed, 289 insertions(+)

diff --git a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
index 83bcb40531fe..7f16aef64c8e 100644
--- a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
+++ b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
@@ -31,6 +31,7 @@
   Type4ProcessorInformation.c
   Type7CacheInformation.c
   Type16PhysicalMemoryArray.c
+  Type17MemoryDevice.c
 
 [Packages]
   ArmPkg/ArmPkg.dec
diff --git a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.h b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.h
index e7ecb5d56704..c56429541504 100644
--- a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.h
+++ b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.h
@@ -45,6 +45,12 @@ InstallPhysicalMemoryArray (
   IN     EFI_SMBIOS_PROTOCOL    *Smbios
   );
 
+EFI_STATUS
+EFIAPI
+InstallMemoryDevice (
+  IN     EFI_SMBIOS_PROTOCOL    *Smbios
+  );
+
 enum SMBIOS_REFRENCE_HANDLES {
   SMBIOS_HANDLE_ENCLOSURE = 0x1000,
   SMBIOS_HANDLE_CLUSTER1,
@@ -54,6 +60,14 @@ enum SMBIOS_REFRENCE_HANDLES {
   SMBIOS_HANDLE_L3_CACHE,
   SMBIOS_HANDLE_L4_CACHE,
   SMBIOS_HANDLE_PHYSICAL_MEMORY,
+  SMBIOS_HANDLE_MEMORY_DEVICE0000,  // Chip 0 Bank 0
+  SMBIOS_HANDLE_MEMORY_DEVICE0001,  // Chip 0 Bank 1
+  SMBIOS_HANDLE_MEMORY_DEVICE0100,  // Chip 1 Bank 0
+  SMBIOS_HANDLE_MEMORY_DEVICE0101,  // Chip 1 Bank 1
+  SMBIOS_HANDLE_MEMORY_DEVICE0200,  // Chip 2 Bank 0
+  SMBIOS_HANDLE_MEMORY_DEVICE0201,  // Chip 2 Bank 1
+  SMBIOS_HANDLE_MEMORY_DEVICE0300,  // Chip 3 Bank 0
+  SMBIOS_HANDLE_MEMORY_DEVICE0301,  // Chip 3 Bank 1
 };
 
 #endif // SMBIOS_PLATFORM_DXE_H_
diff --git a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c
index accc9fe2e560..464fb62d06fa 100644
--- a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c
+++ b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c
@@ -27,6 +27,7 @@ ARM_RD_SMBIOS_TABLE_INSTALL_FPTR mSmbiosTableList[] = {
   &InstallProcessorInformation,
   &InstallCacheInformation,
   &InstallPhysicalMemoryArray,
+  &InstallMemoryDevice,
 };
 
 /**
diff --git a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type17MemoryDevice.c b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type17MemoryDevice.c
new file mode 100644
index 000000000000..283ff6eaa236
--- /dev/null
+++ b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type17MemoryDevice.c
@@ -0,0 +1,273 @@
+/** @file
+  SMBIOS Type 17 (Memory Device) table for ARM RD platforms.
+
+  Copyright (c) 2020-2021, ARM Limited. All rights reserved.
+
+  SPDX-License-Identifier: BSD-2-Clause-Patent
+
+**/
+
+#include <Library/BaseMemoryLib.h>
+#include <Library/DebugLib.h>
+#include <Protocol/Smbios.h>
+
+#include "SmbiosPlatformDxe.h"
+
+#define MAX_CHIP_COUNT  4
+#define BANK0_BASE      1
+#define BANK1_BASE      (BANK0_BASE + MAX_CHIP_COUNT)
+#define TYPE17_STRINGS                                  \
+  "Chip 0 Bank 0\0"                                     \
+  "Chip 1 Bank 0\0"                                     \
+  "Chip 2 Bank 0\0"                                     \
+  "Chip 3 Bank 0\0"                                     \
+  "Chip 0 Bank 1\0"                                     \
+  "Chip 1 Bank 1\0"                                     \
+  "Chip 2 Bank 1\0"                                     \
+  "Chip 3 Bank 1\0"
+
+/* SMBIOS Type17 structure */
+#pragma pack(1)
+struct ArmRdSmbiosType17 {
+  SMBIOS_TABLE_TYPE17 Base;
+  UINT8               Strings[sizeof (TYPE17_STRINGS)];
+};
+#pragma pack()
+
+/* Memory Device (SMBIOS 3.4 spec, section 7.18) */
+static struct ArmRdSmbiosType17 mArmRdSmbiosType17[] = {
+  {
+    {
+      {
+        // SMBIOS header
+        EFI_SMBIOS_TYPE_MEMORY_DEVICE,  // Type 17
+        sizeof (SMBIOS_TABLE_TYPE17),   // Length
+        SMBIOS_HANDLE_MEMORY_DEVICE0000
+      },
+      SMBIOS_HANDLE_PHYSICAL_MEMORY,    // Physical memory array handle
+      0xFFFE,                           // Memory error info handle
+      0xFFFF,                           // Total width unknown
+      0xFFFF,                           // Data width unknown
+      0,                                // Size, Update dynamically
+      MemoryFormFactorOther,            // Form Factor
+      0,                                // Device set, not part of a set
+      0,                                // Device locator
+      BANK0_BASE,                       // Chip 0 Bank 0
+      MemoryTypeDram,                   // Memory type
+      {0, 1},                           // Type details others
+    },
+    // Text strings (unformatted area)
+    TYPE17_STRINGS
+  },
+  {
+    {
+      {
+        // SMBIOS header
+        EFI_SMBIOS_TYPE_MEMORY_DEVICE,  // Type 17
+        sizeof (SMBIOS_TABLE_TYPE17),   // Length
+        SMBIOS_HANDLE_MEMORY_DEVICE0001
+      },
+      SMBIOS_HANDLE_PHYSICAL_MEMORY,    // Physical memory array handle
+      0xFFFE,                           // Memory error info handle
+      0xFFFF,                           // Total width unknown
+      0xFFFF,                           // Data width unknown
+      0,                                // Size, Update dynamically
+      MemoryFormFactorOther,            // Form Factor
+      0,                                // Device set, not part of a set
+      0,                                // Device locator
+      BANK1_BASE,                       // Chip 0 Bank 1
+      MemoryTypeDram,                   // Memory type
+      {0, 1},                           // Type details others
+    },
+    // Text strings (unformatted area)
+    TYPE17_STRINGS
+  },
+  {
+    {
+      {
+        // SMBIOS header
+        EFI_SMBIOS_TYPE_MEMORY_DEVICE,  // Type 17
+        sizeof (SMBIOS_TABLE_TYPE17),   // Length
+        SMBIOS_HANDLE_MEMORY_DEVICE0100
+      },
+      SMBIOS_HANDLE_PHYSICAL_MEMORY,    // Physical memory array handle
+      0xFFFE,                           // Memory error info handle
+      0xFFFF,                           // Total width unknown
+      0xFFFF,                           // Data width unknown
+      0,                                // Size, Update dynamically
+      MemoryFormFactorOther,            // Form Factor
+      0,                                // Device set, not part of a set
+      0,                                // Device locator
+      BANK0_BASE + 1,                   // Chip 1 Bank 0
+      MemoryTypeDram,                   // Memory type
+      {0, 1},                           // Type details others
+    },
+    // Text strings (unformatted area)
+    TYPE17_STRINGS
+  },
+  {
+    {
+      {
+        // SMBIOS header
+        EFI_SMBIOS_TYPE_MEMORY_DEVICE,  // Type 17
+        sizeof (SMBIOS_TABLE_TYPE17),   // Length
+        SMBIOS_HANDLE_MEMORY_DEVICE0101
+      },
+      SMBIOS_HANDLE_PHYSICAL_MEMORY,    // Physical memory array handle
+      0xFFFE,                           // Memory error info handle
+      0xFFFF,                           // Total width unknown
+      0xFFFF,                           // Data width unknown
+      0,                                // Size, Update dynamically
+      MemoryFormFactorOther,            // Form Factor
+      0,                                // Device set, not part of a set
+      0,                                // Device locator
+      BANK1_BASE + 1,                   // Chip 1 Bank 1
+      MemoryTypeDram,                   // Memory type
+      {0, 1},                           // Type details others
+    },
+    // Text strings (unformatted area)
+    TYPE17_STRINGS
+  },
+  {
+    {
+      {
+        // SMBIOS header
+        EFI_SMBIOS_TYPE_MEMORY_DEVICE,  // Type 17
+        sizeof (SMBIOS_TABLE_TYPE17),   // Length
+        SMBIOS_HANDLE_MEMORY_DEVICE0200
+      },
+      SMBIOS_HANDLE_PHYSICAL_MEMORY,    // Physical memory array handle
+      0xFFFE,                           // Memory error info handle
+      0xFFFF,                           // Total width unknown
+      0xFFFF,                           // Data width unknown
+      0,                                // Size, Update dynamically
+      MemoryFormFactorOther,            // Form Factor
+      0,                                // Device set, not part of a set
+      0,                                // Device locator
+      BANK0_BASE + 2,                   // Chip 2 Bank 0
+      MemoryTypeDram,                   // Memory type
+      {0, 1},                           // Type details others
+    },
+    // Text strings (unformatted area)
+    TYPE17_STRINGS
+  },
+  {
+    {
+      {
+        // SMBIOS header
+        EFI_SMBIOS_TYPE_MEMORY_DEVICE,  // Type 17
+        sizeof (SMBIOS_TABLE_TYPE17),   // Length
+        SMBIOS_HANDLE_MEMORY_DEVICE0201
+      },
+      SMBIOS_HANDLE_PHYSICAL_MEMORY,    // Physical memory array handle
+      0xFFFE,                           // Memory error info handle
+      0xFFFF,                           // Total width unknown
+      0xFFFF,                           // Data width unknown
+      0,                                // Size, Update dynamically
+      MemoryFormFactorOther,            // Form Factor
+      0,                                // Device set, not part of a set
+      0,                                // Device locator
+      BANK1_BASE + 2,                   // Chip 2 Bank 1
+      MemoryTypeDram,                   // Memory type
+      {0, 1},                           // Type details others
+    },
+    // Text strings (unformatted area)
+    TYPE17_STRINGS
+  },
+  {
+    {
+      {
+        // SMBIOS header
+        EFI_SMBIOS_TYPE_MEMORY_DEVICE,  // Type 17
+        sizeof (SMBIOS_TABLE_TYPE17),   // Length
+        SMBIOS_HANDLE_MEMORY_DEVICE0300
+      },
+      SMBIOS_HANDLE_PHYSICAL_MEMORY,    // Physical memory array handle
+      0xFFFE,                           // Memory error info handle
+      0xFFFF,                           // Total width unknown
+      0xFFFF,                           // Data width unknown
+      0,                                // Size, Update dynamically
+      MemoryFormFactorOther,            // Form Factor
+      0,                                // Device set, not part of a set
+      0,                                // Device locator
+      BANK0_BASE + 3,                   // Chip 3 Bank 0
+      MemoryTypeDram,                   // Memory type
+      {0, 1},                           // Type details others
+    },
+    // Text strings (unformatted area)
+    TYPE17_STRINGS
+  },
+  {
+    {
+      {
+        // SMBIOS header
+        EFI_SMBIOS_TYPE_MEMORY_DEVICE,  // Type 17
+        sizeof (SMBIOS_TABLE_TYPE17),   // Length
+        SMBIOS_HANDLE_MEMORY_DEVICE0301
+      },
+      SMBIOS_HANDLE_PHYSICAL_MEMORY,    // Physical memory array handle
+      0xFFFE,                           // Memory error info handle
+      0xFFFF,                           // Total width unknown
+      0xFFFF,                           // Data width unknown
+      0,                                // Size, Update dynamically
+      MemoryFormFactorOther,            // Form Factor
+      0,                                // Device set, not part of a set
+      0,                                // Device locator
+      BANK1_BASE + 3,                   // Chip 3 Bank 1
+      MemoryTypeDram,                   // Memory type
+      {0, 1},                           // Type details others
+    },
+    // Text strings (unformatted area)
+    TYPE17_STRINGS
+  },
+};
+
+/**
+  Install SMBIOS Bios information Table
+
+  @retval EFI_SUCCESS           Record was added.
+  @retval EFI_OUT_OF_RESOURCES  Record was not added.
+  @retval EFI_ALREADY_STARTED   The SmbiosHandle passed in is already in use.
+**/
+EFI_STATUS
+InstallMemoryDevice (
+  IN     EFI_SMBIOS_PROTOCOL    *Smbios
+  )
+{
+  EFI_STATUS Status;
+  EFI_SMBIOS_HANDLE SmbiosHandle;
+  UINT8  Idx;
+
+  for (Idx = 0; Idx < (FixedPcdGet32 (PcdChipCount) * 2); Idx += 2) {
+    mArmRdSmbiosType17[Idx].Base.Size =
+      (PcdGet64 (PcdSystemMemorySize) + SIZE_16MB) / SIZE_1MB;
+    mArmRdSmbiosType17[Idx].Base.MemoryTechnology = MemoryTechnologyDram;
+    mArmRdSmbiosType17[Idx].Base.MemoryOperatingModeCapability.Bits.VolatileMemory = 1;
+
+    if (PcdGet64 (PcdDramBlock2Size) != 0) {
+      mArmRdSmbiosType17[Idx + 1].Base.Size =
+        PcdGet64 (PcdDramBlock2Size) / SIZE_1MB;
+      mArmRdSmbiosType17[Idx + 1].Base.MemoryTechnology = MemoryTechnologyDram;
+      mArmRdSmbiosType17[Idx + 1].Base.MemoryOperatingModeCapability.Bits.VolatileMemory = 1;
+    }
+  }
+
+  /* Install valid entries */
+  for (Idx = 0; Idx < ARRAY_SIZE (mArmRdSmbiosType17); Idx++) {
+    if (mArmRdSmbiosType17[Idx].Base.Size != 0) {
+      SmbiosHandle =
+        ((EFI_SMBIOS_TABLE_HEADER *)&mArmRdSmbiosType17[Idx])->Handle;
+      Status = Smbios->Add (
+                         Smbios,
+                         NULL,
+                         &SmbiosHandle,
+                         (EFI_SMBIOS_TABLE_HEADER *)&mArmRdSmbiosType17[Idx]
+                         );
+      if (EFI_ERROR (Status)) {
+        break;
+      }
+    }
+  }
+
+  return Status;
+}
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [edk2-platforms][PATCH V1 10/11] Platform/ARM/SgiPkg: Add SMBIOS Type19 Table
  2021-01-15 18:26 [edk2-platforms][PATCH V1 00/11] Add SMBIOS tables for SGI/RD platforms Pranav Madhu
                   ` (8 preceding siblings ...)
  2021-01-15 18:26 ` [edk2-platforms][PATCH V1 09/11] Platform/ARM/SgiPkg: Add SMBIOS Type17 Table Pranav Madhu
@ 2021-01-15 18:26 ` Pranav Madhu
  2021-01-15 18:26 ` [edk2-platforms][PATCH V1 11/11] Platform/ARM/SgiPkg: Add SMBIOS Type32 Table Pranav Madhu
  2021-01-26 14:33 ` [edk2-devel] [edk2-platforms][PATCH V1 00/11] Add SMBIOS tables for SGI/RD platforms Thomas Abraham
  11 siblings, 0 replies; 14+ messages in thread
From: Pranav Madhu @ 2021-01-15 18:26 UTC (permalink / raw)
  To: devel; +Cc: Ard Biesheuvel, Leif Lindholm

Add the SMBIOS type 19 table (Memory Array Mapped Addr) that includes
information about the address mapping for a Physical Memory Array.

Signed-off-by: Pranav Madhu <pranav.madhu@arm.com>
---
 Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf            |  1 +
 Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.h              |  6 ++
 Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c              |  1 +
 Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type19MemoryArrayMappedAddress.c | 73 ++++++++++++++++++++
 4 files changed, 81 insertions(+)

diff --git a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
index 7f16aef64c8e..15db3d05b6b6 100644
--- a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
+++ b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
@@ -32,6 +32,7 @@
   Type7CacheInformation.c
   Type16PhysicalMemoryArray.c
   Type17MemoryDevice.c
+  Type19MemoryArrayMappedAddress.c
 
 [Packages]
   ArmPkg/ArmPkg.dec
diff --git a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.h b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.h
index c56429541504..1cd66b759446 100644
--- a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.h
+++ b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.h
@@ -51,6 +51,12 @@ InstallMemoryDevice (
   IN     EFI_SMBIOS_PROTOCOL    *Smbios
   );
 
+EFI_STATUS
+EFIAPI
+InstallMemoryArrayMappedAddress (
+  IN     EFI_SMBIOS_PROTOCOL    *Smbios
+  );
+
 enum SMBIOS_REFRENCE_HANDLES {
   SMBIOS_HANDLE_ENCLOSURE = 0x1000,
   SMBIOS_HANDLE_CLUSTER1,
diff --git a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c
index 464fb62d06fa..847260b24750 100644
--- a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c
+++ b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c
@@ -28,6 +28,7 @@ ARM_RD_SMBIOS_TABLE_INSTALL_FPTR mSmbiosTableList[] = {
   &InstallCacheInformation,
   &InstallPhysicalMemoryArray,
   &InstallMemoryDevice,
+  &InstallMemoryArrayMappedAddress,
 };
 
 /**
diff --git a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type19MemoryArrayMappedAddress.c b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type19MemoryArrayMappedAddress.c
new file mode 100644
index 000000000000..b34fdf754900
--- /dev/null
+++ b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type19MemoryArrayMappedAddress.c
@@ -0,0 +1,73 @@
+/** @file
+  SMBIOS Type 19 (Memory Array Mapped Address) table for ARM RD platforms.
+
+  Copyright (c) 2020-2021, ARM Limited. All rights reserved.
+
+  SPDX-License-Identifier: BSD-2-Clause-Patent
+
+**/
+
+#include <Library/BaseMemoryLib.h>
+#include <Protocol/Smbios.h>
+
+#include "SmbiosPlatformDxe.h"
+
+#define TYPE19_STRINGS                                  \
+  "\0"                          /* Null string */
+
+/* SMBIOS Type19 structure */
+#pragma pack(1)
+struct ArmRdSmbiosType19 {
+  SMBIOS_TABLE_TYPE19 Base;
+  UINT8               Strings[sizeof (TYPE19_STRINGS)];
+};
+#pragma pack()
+
+/* Memory Array Mapped Address (SMBIOS 3.4 spec, section 7.20 */
+static struct ArmRdSmbiosType19 mArmRdSmbiosType19 = {
+  {
+    {
+      // SMBIOS header
+      EFI_SMBIOS_TYPE_MEMORY_ARRAY_MAPPED_ADDRESS,  // Type 19
+      sizeof (SMBIOS_TABLE_TYPE19),     // Length
+      SMBIOS_HANDLE_PI_RESERVED,        // Assign an unused handle number
+    },
+    0,                                  // Starting address
+    0,                                  // Ending address
+    SMBIOS_HANDLE_PHYSICAL_MEMORY,      // Memory array handle
+    1                                   // Partition width
+  },
+  // Text strings (unformatted area)
+  TYPE19_STRINGS
+};
+
+/**
+  Install SMBIOS Bios information Table
+
+  @retval EFI_SUCCESS           Record was added.
+  @retval EFI_OUT_OF_RESOURCES  Record was not added.
+  @retval EFI_ALREADY_STARTED   The SmbiosHandle passed in is already in use.
+**/
+EFI_STATUS
+InstallMemoryArrayMappedAddress (
+  IN     EFI_SMBIOS_PROTOCOL    *Smbios
+  )
+{
+  EFI_STATUS Status;
+  EFI_SMBIOS_HANDLE SmbiosHandle;
+
+  SmbiosHandle = ((EFI_SMBIOS_TABLE_HEADER *)&mArmRdSmbiosType19)->Handle;
+
+  mArmRdSmbiosType19.Base.StartingAddress = PcdGet64 (PcdSystemMemoryBase) / SIZE_1KB;
+  mArmRdSmbiosType19.Base.EndingAddress = ((PcdGet64 (PcdSystemMemoryBase) +
+         (PcdGet64 (PcdSystemMemorySize) + SIZE_16MB)) / // 16MB Trusted DRAM
+         SIZE_1KB) - 1;
+
+  Status = Smbios->Add (
+                     Smbios,
+                     NULL,
+                     &SmbiosHandle,
+                     (EFI_SMBIOS_TABLE_HEADER *)&mArmRdSmbiosType19
+                     );
+  return Status;
+}
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [edk2-platforms][PATCH V1 11/11] Platform/ARM/SgiPkg: Add SMBIOS Type32 Table
  2021-01-15 18:26 [edk2-platforms][PATCH V1 00/11] Add SMBIOS tables for SGI/RD platforms Pranav Madhu
                   ` (9 preceding siblings ...)
  2021-01-15 18:26 ` [edk2-platforms][PATCH V1 10/11] Platform/ARM/SgiPkg: Add SMBIOS Type19 Table Pranav Madhu
@ 2021-01-15 18:26 ` Pranav Madhu
  2021-01-26 14:33 ` [edk2-devel] [edk2-platforms][PATCH V1 00/11] Add SMBIOS tables for SGI/RD platforms Thomas Abraham
  11 siblings, 0 replies; 14+ messages in thread
From: Pranav Madhu @ 2021-01-15 18:26 UTC (permalink / raw)
  To: devel; +Cc: Ard Biesheuvel, Leif Lindholm

Add the SMBIOS type 32 table (System Boot Information) that includes
information about the System Boot Status.

Signed-off-by: Pranav Madhu <pranav.madhu@arm.com>
---
 Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf         |  1 +
 Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.h           |  6 ++
 Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c           |  1 +
 Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type32SystemBootInformation.c | 66 ++++++++++++++++++++
 4 files changed, 74 insertions(+)

diff --git a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
index 15db3d05b6b6..bb4cbbaf9ddd 100644
--- a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
+++ b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
@@ -33,6 +33,7 @@
   Type16PhysicalMemoryArray.c
   Type17MemoryDevice.c
   Type19MemoryArrayMappedAddress.c
+  Type32SystemBootInformation.c
 
 [Packages]
   ArmPkg/ArmPkg.dec
diff --git a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.h b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.h
index 1cd66b759446..924b4f77f5f5 100644
--- a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.h
+++ b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.h
@@ -57,6 +57,12 @@ InstallMemoryArrayMappedAddress (
   IN     EFI_SMBIOS_PROTOCOL    *Smbios
   );
 
+EFI_STATUS
+EFIAPI
+InstallSystemBootInformation (
+  IN     EFI_SMBIOS_PROTOCOL    *Smbios
+  );
+
 enum SMBIOS_REFRENCE_HANDLES {
   SMBIOS_HANDLE_ENCLOSURE = 0x1000,
   SMBIOS_HANDLE_CLUSTER1,
diff --git a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c
index 847260b24750..3b56edc13ef2 100644
--- a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c
+++ b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c
@@ -29,6 +29,7 @@ ARM_RD_SMBIOS_TABLE_INSTALL_FPTR mSmbiosTableList[] = {
   &InstallPhysicalMemoryArray,
   &InstallMemoryDevice,
   &InstallMemoryArrayMappedAddress,
+  &InstallSystemBootInformation,
 };
 
 /**
diff --git a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type32SystemBootInformation.c b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type32SystemBootInformation.c
new file mode 100644
index 000000000000..4fec8a833141
--- /dev/null
+++ b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type32SystemBootInformation.c
@@ -0,0 +1,66 @@
+/** @file
+  SMBIOS Type 32 (System Boot Information) table for ARM RD platforms.
+
+  Copyright (c) 2020-2021, ARM Limited. All rights reserved.
+
+  SPDX-License-Identifier: BSD-2-Clause-Patent
+
+**/
+
+#include <Library/BaseMemoryLib.h>
+#include <Protocol/Smbios.h>
+
+#include "SmbiosPlatformDxe.h"
+
+#define TYPE32_STRINGS                                  \
+  "\0"                          /* Null string */
+
+/* SMBIOS Type32 structure */
+#pragma pack(1)
+struct ArmRdSmbiosType32 {
+  SMBIOS_TABLE_TYPE32 Base;
+  UINT8               Strings[sizeof (TYPE32_STRINGS)];
+};
+#pragma pack()
+
+/* System Boot Information (SMBIOS 3.4 spec, section 7.33) */
+static struct ArmRdSmbiosType32 mArmRdSmbiosType32 = {
+  {
+    {
+      // SMBIOS header
+      EFI_SMBIOS_TYPE_SYSTEM_BOOT_INFORMATION,  // Type 32
+      sizeof (SMBIOS_TABLE_TYPE32),     // Length
+      SMBIOS_HANDLE_PI_RESERVED
+    },
+    {0},                                // Reserved field
+    BootInformationStatusNoError        // Boot status
+  },
+  // Text strings (unformatted area)
+  TYPE32_STRINGS
+};
+
+/**
+  Install SMBIOS Bios information Table
+
+  @retval EFI_SUCCESS           Record was added.
+  @retval EFI_OUT_OF_RESOURCES  Record was not added.
+  @retval EFI_ALREADY_STARTED   The SmbiosHandle passed in is already in use.
+**/
+EFI_STATUS
+InstallSystemBootInformation (
+  IN     EFI_SMBIOS_PROTOCOL    *Smbios
+  )
+{
+  EFI_STATUS Status;
+  EFI_SMBIOS_HANDLE SmbiosHandle;
+
+  SmbiosHandle = ((EFI_SMBIOS_TABLE_HEADER *)&mArmRdSmbiosType32)->Handle;
+
+  Status = Smbios->Add (
+                     Smbios,
+                     NULL,
+                     &SmbiosHandle,
+                     (EFI_SMBIOS_TABLE_HEADER *)&mArmRdSmbiosType32
+                     );
+  return Status;
+}
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 14+ messages in thread

* Re: [edk2-devel] [edk2-platforms][PATCH V1 00/11] Add SMBIOS tables for SGI/RD platforms
  2021-01-15 18:26 [edk2-platforms][PATCH V1 00/11] Add SMBIOS tables for SGI/RD platforms Pranav Madhu
                   ` (10 preceding siblings ...)
  2021-01-15 18:26 ` [edk2-platforms][PATCH V1 11/11] Platform/ARM/SgiPkg: Add SMBIOS Type32 Table Pranav Madhu
@ 2021-01-26 14:33 ` Thomas Abraham
  2021-01-29  6:29   ` Pranav Madhu
  11 siblings, 1 reply; 14+ messages in thread
From: Thomas Abraham @ 2021-01-26 14:33 UTC (permalink / raw)
  To: devel@edk2.groups.io, Pranav Madhu
  Cc: 'Ard Biesheuvel', Ard Biesheuvel, Leif Lindholm, nd


On Friday, January 15, 2021 11:57 PM, Pranav Madhu wrote:
> SMBIOS provides basic hardware and firmware configuration information
> through table-driven data structure. This patch series adds SMBIOS
> support for Arm's SGI/RD platforms.
> 
> The first patch in this series defines platform-id values for the
> RD-N2 platform library header. The second patch add SgiGetProductId API,
> which is used by the SMBIOS driver to distinguish between the platforms,
> and install the right table. The third patch in this series adds SMBIOS
> driver support that allows for installation of multiple SMBIOS tables.
> And subsequent patches in this series add SMBIOS tables, which are
> mandatory as per Arm serverready SBBR specification.
> 
> This patch should be kept on top of 'Update ACPI revision' patch to
> avoid conflict.
> 
> Pranav Madhu (11):
>   Platform/ARM/SgiPkg: Define RD-N2 platform id values
>   Platform/ARM/SgiPkg: Add GetProductId API for SGI/RD Platforms
>   Platform/ARM/SgiPkg: Add Initial SMBIOS support
>   Platform/ARM/SgiPkg: Add SMBIOS Type1 Table
>   Platform/ARM/SgiPkg: Add SMBIOS Type3 Table
>   Platform/ARM/SgiPkg: Add SMBIOS Type4 Table
>   Platform/ARM/SgiPkg: Add SMBIOS Type7 Table
>   Platform/ARM/SgiPkg: Add SMBIOS Type16 Table
>   Platform/ARM/SgiPkg: Add SMBIOS Type17 Table
>   Platform/ARM/SgiPkg: Add SMBIOS Type19 Table
>   Platform/ARM/SgiPkg: Add SMBIOS Type32 Table

For the series:
Reviewed-by: Thomas Abraham <thomas.abraham@arm.com>

[...]

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [edk2-devel] [edk2-platforms][PATCH V1 00/11] Add SMBIOS tables for SGI/RD platforms
  2021-01-26 14:33 ` [edk2-devel] [edk2-platforms][PATCH V1 00/11] Add SMBIOS tables for SGI/RD platforms Thomas Abraham
@ 2021-01-29  6:29   ` Pranav Madhu
  0 siblings, 0 replies; 14+ messages in thread
From: Pranav Madhu @ 2021-01-29  6:29 UTC (permalink / raw)
  To: devel@edk2.groups.io
  Cc: 'Ard Biesheuvel', Thomas Abraham, Ard Biesheuvel,
	Leif Lindholm, nd

> -----Original Message-----
> From: Thomas Abraham <thomas.abraham@arm.com>
> Sent: Tuesday, January 26, 2021 8:04 PM
> To: devel@edk2.groups.io; Pranav Madhu <Pranav.Madhu@arm.com>
> Cc: 'Ard Biesheuvel' <ardb+tianocore@kernel.org>; Ard Biesheuvel
> <Ard.Biesheuvel@arm.com>; Leif Lindholm <leif@nuviainc.com>; nd
> <nd@arm.com>
> Subject: RE: [edk2-devel] [edk2-platforms][PATCH V1 00/11] Add SMBIOS
> tables for SGI/RD platforms
>
>
> On Friday, January 15, 2021 11:57 PM, Pranav Madhu wrote:
> > SMBIOS provides basic hardware and firmware configuration information
> > through table-driven data structure. This patch series adds SMBIOS
> > support for Arm's SGI/RD platforms.
> >
> > The first patch in this series defines platform-id values for the
> > RD-N2 platform library header. The second patch add SgiGetProductId
> > API, which is used by the SMBIOS driver to distinguish between the
> > platforms, and install the right table. The third patch in this series
> > adds SMBIOS driver support that allows for installation of multiple SMBIOS
> tables.
> > And subsequent patches in this series add SMBIOS tables, which are
> > mandatory as per Arm serverready SBBR specification.
> >
> > This patch should be kept on top of 'Update ACPI revision' patch to
> > avoid conflict.
> >
> > Pranav Madhu (11):
> >   Platform/ARM/SgiPkg: Define RD-N2 platform id values
> >   Platform/ARM/SgiPkg: Add GetProductId API for SGI/RD Platforms
> >   Platform/ARM/SgiPkg: Add Initial SMBIOS support
> >   Platform/ARM/SgiPkg: Add SMBIOS Type1 Table
> >   Platform/ARM/SgiPkg: Add SMBIOS Type3 Table
> >   Platform/ARM/SgiPkg: Add SMBIOS Type4 Table
> >   Platform/ARM/SgiPkg: Add SMBIOS Type7 Table
> >   Platform/ARM/SgiPkg: Add SMBIOS Type16 Table
> >   Platform/ARM/SgiPkg: Add SMBIOS Type17 Table
> >   Platform/ARM/SgiPkg: Add SMBIOS Type19 Table
> >   Platform/ARM/SgiPkg: Add SMBIOS Type32 Table
>
> For the series:
> Reviewed-by: Thomas Abraham <thomas.abraham@arm.com>
>
Hi Ard, Leif,

Could you please have a look at this patch series and let me know if there are any comments.

Thanks,
Pranav
> [...]
IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.

^ permalink raw reply	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2021-01-29  6:30 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-15 18:26 [edk2-platforms][PATCH V1 00/11] Add SMBIOS tables for SGI/RD platforms Pranav Madhu
2021-01-15 18:26 ` [edk2-platforms][PATCH V1 01/11] Platform/ARM/SgiPkg: Define RD-N2 platform id values Pranav Madhu
2021-01-15 18:26 ` [edk2-platforms][PATCH V1 02/11] Platform/ARM/SgiPkg: Add GetProductId API for SGI/RD Platforms Pranav Madhu
2021-01-15 18:26 ` [edk2-platforms][PATCH V1 03/11] Platform/ARM/SgiPkg: Add Initial SMBIOS support Pranav Madhu
2021-01-15 18:26 ` [edk2-platforms][PATCH V1 04/11] Platform/ARM/SgiPkg: Add SMBIOS Type1 Table Pranav Madhu
2021-01-15 18:26 ` [edk2-platforms][PATCH V1 05/11] Platform/ARM/SgiPkg: Add SMBIOS Type3 Table Pranav Madhu
2021-01-15 18:26 ` [edk2-platforms][PATCH V1 06/11] Platform/ARM/SgiPkg: Add SMBIOS Type4 Table Pranav Madhu
2021-01-15 18:26 ` [edk2-platforms][PATCH V1 07/11] Platform/ARM/SgiPkg: Add SMBIOS Type7 Table Pranav Madhu
2021-01-15 18:26 ` [edk2-platforms][PATCH V1 08/11] Platform/ARM/SgiPkg: Add SMBIOS Type16 Table Pranav Madhu
2021-01-15 18:26 ` [edk2-platforms][PATCH V1 09/11] Platform/ARM/SgiPkg: Add SMBIOS Type17 Table Pranav Madhu
2021-01-15 18:26 ` [edk2-platforms][PATCH V1 10/11] Platform/ARM/SgiPkg: Add SMBIOS Type19 Table Pranav Madhu
2021-01-15 18:26 ` [edk2-platforms][PATCH V1 11/11] Platform/ARM/SgiPkg: Add SMBIOS Type32 Table Pranav Madhu
2021-01-26 14:33 ` [edk2-devel] [edk2-platforms][PATCH V1 00/11] Add SMBIOS tables for SGI/RD platforms Thomas Abraham
2021-01-29  6:29   ` Pranav Madhu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox