From 28b7a6d5eab8badcf6c5dc119411653817f38468 Mon Sep 17 00:00:00 2001
From: Cassandra Lam <Cassandra.Lam@amd.com>
Date: Sun, 5 Oct 2025 23:00:28 -0500
Subject: [PATCH] ShellPkg/SmbiosView: Display Type 2 Contained Objects info

Add prints for SMBIOS Type 2 "Number of Contained Object Handles" and
"Contained Object Handles" fields.

Signed-off-by: Cassandra Lam <Cassandra.Lam@amd.com>
---
 .../SmbiosView/PrintInfo.c                           | 12 ++++++++++++
 .../SmbiosView/SmbiosViewStrings.uni                 |  2 ++
 2 files changed, 14 insertions(+)

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c
index 3698e0ea18..71cfbc3740 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c
@@ -382,6 +382,18 @@ SmbiosPrintStructure (
         PRINT_PENDING_STRING (Struct, Type2, LocationInChassis);
         PRINT_STRUCT_VALUE_H (Struct, Type2, ChassisHandle);
         DisplayBaseBoardBoardType (Struct->Type2->BoardType, Option);
+        ShellPrintHiiDefaultEx (
+          STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_NUM_CONTAINED_OBJECTS_HANDLES),
+          gShellDebug1HiiHandle,
+          Struct->Type2->NumberOfContainedObjectHandles
+          );
+        for (Index = 0; Index < Struct->Type2->NumberOfContainedObjectHandles; Index++) {
+          ShellPrintHiiDefaultEx (
+            STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_CONTAINED_OBJECTS_HANDLE),
+            gShellDebug1HiiHandle,
+            Struct->Type2->ContainedObjectHandles[Index]
+            );
+        }
       }
 
       break;
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStrings.uni b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStrings.uni
index 1f90e405fc..10edc12aa7 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStrings.uni
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStrings.uni
@@ -388,6 +388,8 @@
 #string STR_SMBIOSVIEW_PRINTINFO_POWER_SUPPLY_NOT_REPLACE       #language en-US "Power supply is not hot replaceable\r\n"
 #string STR_SMBIOSVIEW_PRINTINFO_BIOS_SIZE                      #language en-US "BIOS ROM Size:  %d KB\r\n"
 #string STR_SMBIOSVIEW_PRINTINFO_EXTENDED_BIOS_SIZE             #language en-US "Extended BIOS ROM Size:  %d %s\r\n"
+#string STR_SMBIOSVIEW_PRINTINFO_NUM_CONTAINED_OBJECTS_HANDLES  #language en-US "Number of Contained Object Handles: %d\r\n"
+#string STR_SMBIOSVIEW_PRINTINFO_CONTAINED_OBJECTS_HANDLE       #language en-US "  Contained Object Handle: 0x%x\r\n"
 #string STR_SMBIOSVIEW_QUERYTABLE_NO_INFO                       #language en-US "No Info"
 #string STR_SMBIOSVIEW_QUERYTABLE_RSVD_BITS_SET                 #language en-US "\r\nIt also has reserved bits set 1 --- reserved bits: 0x%x"
 #string STR_SMBIOSVIEW_QUERYTABLE_SYSTEM_WAKEUP_TYPE            #language en-US "System Wakeup Type:"