From: "Pranav Madhu" <pranav.madhu@arm.com>
To: devel@edk2.groups.io
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>,
Sami Mujawar <sami.mujawar@arm.com>
Subject: [edk2-platforms][PATCH V3 09/11] Platform/Sgi: Add SMBIOS Type17 Table
Date: Tue, 18 May 2021 22:03:46 +0530 [thread overview]
Message-ID: <20210518163348.16618-10-pranav.madhu@arm.com> (raw)
In-Reply-To: <20210518163348.16618-1-pranav.madhu@arm.com>
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>
Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>
---
Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf | 1 +
Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.h | 26 ++
Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c | 1 +
Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type17MemoryDevice.c | 298 ++++++++++++++++++++
4 files changed, 326 insertions(+)
diff --git a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
index ebd19c1882bb..9061c491d461 100644
--- a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
+++ b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
@@ -21,6 +21,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 95bb2c4bfc70..4e663033d515 100644
--- a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.h
+++ b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.h
@@ -122,6 +122,24 @@ InstallType16PhysicalMemoryArray (
IN EFI_SMBIOS_PROTOCOL *Smbios
);
+
+/**
+ Install SMBIOS memory device table.
+
+ Install the SMBIOS memory device (type 17) table for RD platforms.
+
+ @param[in] Smbios SMBIOS protocol.
+
+ @retval EFI_SUCCESS Record was added.
+ @retval EFI_OUT_OF_RESOURCES Record was not added.
+ @retval EFI_ALREADY_STARTED The SmbiosHandle passed is already in use.
+**/
+EFI_STATUS
+EFIAPI
+InstallType17MemoryDevice (
+ IN EFI_SMBIOS_PROTOCOL *Smbios
+ );
+
typedef enum {
SMBIOS_HANDLE_ENCLOSURE = 0x1000,
SMBIOS_HANDLE_CLUSTER1,
@@ -131,6 +149,14 @@ typedef enum {
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
} SMBIOS_REFRENCE_HANDLES;
#endif // SMBIOS_PLATFORM_DXE_H_
diff --git a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c
index 4f14be165c94..4e6a6b250813 100644
--- a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c
+++ b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c
@@ -32,6 +32,7 @@ ARM_RD_SMBIOS_TABLE_INSTALL_FPTR mSmbiosTableList[] = {
&InstallType4ProcessorInformation,
&InstallType7CacheInformation,
&InstallType16PhysicalMemoryArray,
+ &InstallType17MemoryDevice,
};
/**
diff --git a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type17MemoryDevice.c b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type17MemoryDevice.c
new file mode 100644
index 000000000000..7ed004bc7f15
--- /dev/null
+++ b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type17MemoryDevice.c
@@ -0,0 +1,298 @@
+/** @file
+ SMBIOS Type 17 (Memory Device) table for ARM RD platforms.
+
+ This file installs SMBIOS Type 17 (Memory Device) table for Arm's Reference
+ Design platforms. It includes the specification of each installed memory
+ device such as size of each device, bank locator, memory device type, and
+ other related information.
+
+ Copyright (c) 2021, ARM Limited. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent
+
+ @par Specification Reference:
+ - SMBIOS Reference Specification 3.4.0, Chapter 7.18
+**/
+
+#include <Library/BaseMemoryLib.h>
+#include <Library/DebugLib.h>
+#include <Protocol/Smbios.h>
+
+#include "SmbiosPlatformDxe.h"
+
+#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"
+
+typedef enum {
+ Chip0Bank0 = 1,
+ Chip1Bank0,
+ Chip2Bank0,
+ Chip3Bank0,
+ Chip0Bank1,
+ Chip1Bank1,
+ Chip2Bank1,
+ Chip3Bank1
+} TYPE17_STRING_ELEMENTS;
+
+/* SMBIOS Type17 structure */
+#pragma pack(1)
+typedef struct {
+ SMBIOS_TABLE_TYPE17 Base;
+ CHAR8 Strings[sizeof (TYPE17_STRINGS)];
+} ARM_RD_SMBIOS_TYPE17;
+#pragma pack()
+
+/* Memory Device */
+STATIC ARM_RD_SMBIOS_TYPE17 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
+ Chip0Bank0, // 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
+ Chip0Bank1, // 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
+ Chip1Bank0, // 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
+ Chip1Bank1, // 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
+ Chip2Bank0, // 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
+ Chip2Bank1, // 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
+ Chip3Bank0, // 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
+ Chip3Bank1, // Chip 3 Bank 1
+ MemoryTypeDram, // Memory type
+ {0, 1}, // Type details others
+ },
+ // Text strings (unformatted area)
+ TYPE17_STRINGS
+ },
+};
+
+/**
+ Install SMBIOS memory device Table.
+
+ Install the SMBIOS memory device (type 17) table for RD platforms.
+
+ @param[in] Smbios SMBIOS protocol.
+
+ @retval EFI_SUCCESS Record was added.
+ @retval EFI_OUT_OF_RESOURCES Record was not added.
+ @retval EFI_ALREADY_STARTED The SmbiosHandle passed is already in use.
+**/
+EFI_STATUS
+InstallType17MemoryDevice (
+ IN EFI_SMBIOS_PROTOCOL *Smbios
+ )
+{
+ EFI_STATUS Status;
+ EFI_SMBIOS_HANDLE SmbiosHandle;
+ UINT8 Idx;
+
+ /* Get system memory information */
+ for (Idx = 0; Idx < (FixedPcdGet32 (PcdChipCount) * 2); Idx += 2) {
+ mArmRdSmbiosType17[Idx].Base.Size = 0x7FFF;
+ mArmRdSmbiosType17[Idx].Base.ExtendedSize =
+ (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 = 0x7FFF;
+ mArmRdSmbiosType17[Idx + 1].Base.ExtendedSize =
+ 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.ExtendedSize != 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)) {
+ DEBUG ((
+ DEBUG_ERROR,
+ "SMBIOS: Failed to install Type17 SMBIOS table.\n"
+ ));
+ break;
+ }
+ }
+ }
+
+ return Status;
+}
--
2.17.1
next prev parent reply other threads:[~2021-05-18 16:34 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-18 16:33 [edk2-platforms][PATCH V3 00/11] Add SMBIOS tables for Arm's Reference Design platforms Pranav Madhu
2021-05-18 16:33 ` [edk2-platforms][PATCH V3 01/11] Platform/Sgi: Define RD-N2 platform id values Pranav Madhu
2021-05-18 16:33 ` [edk2-platforms][PATCH V3 02/11] Platform/Sgi: Add GetProductId API for SGI/RD Platforms Pranav Madhu
2021-05-18 16:33 ` [edk2-platforms][PATCH V3 03/11] Platform/Sgi: Add Initial SMBIOS support Pranav Madhu
2021-05-18 16:33 ` [edk2-platforms][PATCH V3 04/11] Platform/Sgi: Add SMBIOS Type1 Table Pranav Madhu
2021-05-18 16:33 ` [edk2-platforms][PATCH V3 05/11] Platform/Sgi: Add SMBIOS Type3 Table Pranav Madhu
2021-05-18 16:33 ` [edk2-platforms][PATCH V3 06/11] Platform/Sgi: Add SMBIOS Type4 Table Pranav Madhu
2021-05-18 16:33 ` [edk2-platforms][PATCH V3 07/11] Platform/Sgi: Add SMBIOS Type7 Table Pranav Madhu
2021-05-18 16:33 ` [edk2-platforms][PATCH V3 08/11] Platform/Sgi: Add SMBIOS Type16 Table Pranav Madhu
2021-05-18 16:33 ` Pranav Madhu [this message]
2021-05-18 16:33 ` [edk2-platforms][PATCH V3 10/11] Platform/Sgi: Add SMBIOS Type19 Table Pranav Madhu
2021-05-18 16:33 ` [edk2-platforms][PATCH V3 11/11] Platform/Sgi: Add SMBIOS Type32 Table Pranav Madhu
2021-05-19 11:30 ` [edk2-devel] [edk2-platforms][PATCH V3 00/11] Add SMBIOS tables for Arm's Reference Design platforms Thomas Abraham
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210518163348.16618-10-pranav.madhu@arm.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox