From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from EUR01-HE1-obe.outbound.protection.outlook.com (EUR01-HE1-obe.outbound.protection.outlook.com [40.107.13.77]) by mx.groups.io with SMTP id smtpd.web11.10741.1676390213001904691 for ; Tue, 14 Feb 2023 07:56:53 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=u8wtlyyf; spf=pass (domain: arm.com, ip: 40.107.13.77, mailfrom: sunny.wang@arm.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=E3zu2iXnyGAZ2WYATkHrI1lKhewFhtVBkcaMx3axZ7k=; b=u8wtlyyfOabehTWn4ztsyM2zl7lX00RzUQY2gtRrRdNMYwAGdgIYTs5lK1/+miIygqOsnNMvZ/6kUgWuwWoToJJ5dyt7I5veMFRbYe2DwxNpjJ1y4NgbLcgA3YPs167R6FShr5VZE0opoVzKsEFjKxM9DpgH9Q3HMdw7ggA3JK4= Received: from AS8PR05CA0021.eurprd05.prod.outlook.com (2603:10a6:20b:311::26) by PAVPR08MB9857.eurprd08.prod.outlook.com (2603:10a6:102:301::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.23; Tue, 14 Feb 2023 15:56:47 +0000 Received: from AM7EUR03FT030.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:311:cafe::f2) by AS8PR05CA0021.outlook.office365.com (2603:10a6:20b:311::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.24 via Frontend Transport; Tue, 14 Feb 2023 15:56:47 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; pr=C Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by AM7EUR03FT030.mail.protection.outlook.com (100.127.140.180) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.24 via Frontend Transport; Tue, 14 Feb 2023 15:56:47 +0000 Received: ("Tessian outbound 333ca28169fa:v132"); Tue, 14 Feb 2023 15:56:46 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 81a15ead3442f01b X-CR-MTA-TID: 64aa7808 Received: from 79d69540be03.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 80C30F85-601F-4BCC-8990-E5250A63DBF4.1; Tue, 14 Feb 2023 15:56:40 +0000 Received: from EUR05-DB8-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 79d69540be03.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Tue, 14 Feb 2023 15:56:40 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j7r3C0RgcRV0Q2CkMbKfBwAiGqL85ClUnLoGKk8NBXwjF5OMyVr5RFRYGa4ol7OeA+Sb3WP/xAyYttVYUOXhmv9Pd0xJWJDgzg44K+D5vSr73QddshEyHwlmntwoOP3EgL3Ws2yuYxRGlJruL7hbwKfpLN2S5+YXTvDF6bZYyQ8tLTc/WzjxFTAf59zgOZ5toBqIGN8CLXu1xZx9Uk3HIz6fHcArYWiSOmL4W/5ljpJ6Bp+kHiRkN5C6oTrK4v6op4o+opxJzyXvcq++UAiPCbDLZp3heyd/ukbMTEPsQCgewn4SXlVFd3R1DaPGADbGAwkHw5ofT4QpobMVGgf8hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=E3zu2iXnyGAZ2WYATkHrI1lKhewFhtVBkcaMx3axZ7k=; b=ZtNw1d+UZ17vmmmTVr8B8ENGyCsi7J1ZC6f45sUNW4Nb+qq77KTUMddJZbwCe4xer2QNy9awTcYfQM/Y3M11+x4uC1AyOEOgHaF3CP0kmVH/BmvtZJM7hCvl4HXiN5cfXk4O8poS5PIAvxMH1FiZfzncdR7cQZsnEaUkp6G5YsdGtgapk/JKXKhRl6tweKyGK3zH1oeVPthG1XhHr6qdD9Rc7KTGPOg//Zuh+JGuWM0Xcz4QnlrwkzQw5E9qxi3zXjfe7iiFhHeR59xl7u6SjoNskgmblWIc2CAbtCDP3S5SnLY+9QrEKRs8gB+R3zWAtpGcl4yQ8lGTc0uCLwm9Mw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=E3zu2iXnyGAZ2WYATkHrI1lKhewFhtVBkcaMx3axZ7k=; b=u8wtlyyfOabehTWn4ztsyM2zl7lX00RzUQY2gtRrRdNMYwAGdgIYTs5lK1/+miIygqOsnNMvZ/6kUgWuwWoToJJ5dyt7I5veMFRbYe2DwxNpjJ1y4NgbLcgA3YPs167R6FShr5VZE0opoVzKsEFjKxM9DpgH9Q3HMdw7ggA3JK4= Received: from AS8PR08MB7791.eurprd08.prod.outlook.com (2603:10a6:20b:52d::6) by AS4PR08MB7430.eurprd08.prod.outlook.com (2603:10a6:20b:4e2::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.24; Tue, 14 Feb 2023 15:56:38 +0000 Received: from AS8PR08MB7791.eurprd08.prod.outlook.com ([fe80::84ca:d9e0:be2a:1a68]) by AS8PR08MB7791.eurprd08.prod.outlook.com ([fe80::84ca:d9e0:be2a:1a68%3]) with mapi id 15.20.6086.024; Tue, 14 Feb 2023 15:56:38 +0000 From: "Sunny Wang" To: "devel@edk2.groups.io" , Sam Kaynor CC: Ray Ni , Zhichao Gao , Sunny Wang Subject: Re: [edk2-devel] [PATCH v1 1/1] ShellPkg: UefiShellDebug1CommandsLib: Uefi Config Tables in Dmem.c Thread-Topic: [edk2-devel] [PATCH v1 1/1] ShellPkg: UefiShellDebug1CommandsLib: Uefi Config Tables in Dmem.c Thread-Index: AQHZOzor4NGUm8/BMkek4TxnKxzIHq7OoHnw Date: Tue, 14 Feb 2023 15:56:37 +0000 Message-ID: References: <20230207211957.62077-1-Sam.Kaynor@arm.com> <20230207211957.62077-2-Sam.Kaynor@arm.com> In-Reply-To: <20230207211957.62077-2-Sam.Kaynor@arm.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; x-ms-traffictypediagnostic: AS8PR08MB7791:EE_|AS4PR08MB7430:EE_|AM7EUR03FT030:EE_|PAVPR08MB9857:EE_ X-MS-Office365-Filtering-Correlation-Id: c6c1373a-f85e-496f-f3b1-08db0ea413c1 x-checkrecipientrouted: true nodisclaimer: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: EjEXSKXj+av2saaTA+8waw0qdRDW06p8fcvixeawsPJw2RPS9naz6DJVn3k1idWRvPTWgwUzpmd193QYO/SJG1pVezeX1R8H5aRLOYYUG/RXpoFYntpaRrf6aY7VMXOMRIaI5RrI+fAYbDozD9XW3zWeYUGjzmTiyWyPr8IqUtd4dn3ELzSnXxrauxafjXd4ByOK2VVQ1Abm/u8Ye6KVGobb9c7DiZ6e0kW2rGGF+AWgaduCLU+0xeOeb+zPSDXqQn16ymdkA0bIJYXr0SFKvinRDiOWiXucSa5WmrHeheyTJ9eHspMTHxGEABO5QV1tbgehsk2nyQ1Tdqxoou+Vzw09g0zASTtrHXV92pOSbiLnKLQvo3i6Mkr05kUyZbKxIOrqJZI2UnwNO8AvCBlnYcN6fITebYgLEWQ+h+ClnofT4VgzxxFOhQMdAjNt+qdLKsmZe5WX6d/rpJg/KqY+/eNywVryorBOY2/+VGxQAzdRMOZLI62mZ4oBM6j/yagfXGm0RyMClqJ/pRFnH7M0ZEFMKIb1X74JfHwBThGFkUGgK331WmFjZajfY5JhL9Kek9EjDztCCAyRjYeWpggeltdW3zBXf4FWljAWQbOpqDKnU+fpCzb7X8ISUW6kr8Uy3tr9fOFQ4OjYQSHnuLXIujGrMTckddqZSnkm+p/bynY+a7/QcL2cmnsLU763VFIy6N8AQ0S8VatxxLou0KWC6hl2HbK2MFWa7chiQWiQQ2k= X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS8PR08MB7791.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(4636009)(136003)(346002)(39860400002)(396003)(366004)(376002)(451199018)(38100700002)(71200400001)(26005)(8936002)(7696005)(5660300002)(122000001)(83380400001)(66899018)(2906002)(966005)(478600001)(6506007)(53546011)(54906003)(6636002)(110136005)(41300700001)(316002)(19627235002)(52536014)(186003)(55016003)(9686003)(33656002)(38070700005)(64756008)(66946007)(66446008)(8676002)(66476007)(76116006)(66556008)(86362001)(4326008);DIR:OUT;SFP:1101; MIME-Version: 1.0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR08MB7430 Original-Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; Return-Path: Sunny.Wang@arm.com X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM7EUR03FT030.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 53482181-3ab2-4944-5a26-08db0ea40e27 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VIx5Ze4ykyqYNoAbSi2xmaCrVD6AwxCDRS7l8WDsOOx70JzlqxxYqjt4gaCwKuvYMTWyGx9wQpDXYBTisr6biIq2RyZ8BBGamhuVqQ0InxnnIpFOx56VsxH05FBn+JLXu3Zw/mUM8lq/7q5iXk91JZS7oAaeazUYXRb7ffnO2+xXS5gLOv8qdpWgC1RtsC34Ze/VqCVEyncW2QyJvy5M1ioRPuaJLsi2tZ0dKHjs+NKBQO2KLxE+b8XsfvatoqFZh6dYkxtLaZ6TwaTkSxvaTvhlKWBuxlMkhP1e2JkiG/i+gWZrH6CHS3NjysYNZzRzsfMXroikpq+Ou4szKf25dDrZ687P9V6KpuFUxVpgaKOFdh6LLzWkJDd65hPhfj4+TDIVo3vChGifFp6Golsl5x1Mx3OHkUCXvbpAUQseEUGwRavwGiA0R4m3Q9VI+uel2mf4M5QVi2+x5K6IbjQMrTXKwx6uReM212nZC0Sc+hl1l57buae6mPZyUBGrnUZ9da+qGa9P3HOc43FZ2mrusxPr8NnIKHlzT8Y5x4JedeKZMxlOlFUhZWU++pQEeFHc7guQJfiVscFo+9OZBdWpdJwfH4n5ZpcA4ZYivUVXIbFunE3EfVSOo5V8/GXYfb3+NjoIMjbCiu9nCCcV3FyA5l+yGDSFAn8lvikbr+S64z+2X53MAKJNQsNlAc/xgaOpAH3Owx5CIXnWGGr1hdlhbuMOIn5toalC2FrDoMRueng= X-Forefront-Antispam-Report: CIP:63.35.35.123;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:64aa7808-outbound-1.mta.getcheckrecipient.com;PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com;CAT:NONE;SFS:(13230025)(4636009)(396003)(376002)(136003)(39860400002)(346002)(451199018)(40470700004)(36840700001)(46966006)(966005)(53546011)(7696005)(6506007)(86362001)(82310400005)(186003)(26005)(478600001)(9686003)(5660300002)(66899018)(6636002)(33656002)(110136005)(19627235002)(54906003)(4326008)(316002)(8676002)(70586007)(356005)(336012)(40480700001)(70206006)(55016003)(47076005)(8936002)(41300700001)(52536014)(83380400001)(30864003)(2906002)(40460700003)(36860700001)(82740400003)(81166007);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Feb 2023 15:56:47.1179 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c6c1373a-f85e-496f-f3b1-08db0ea413c1 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: AM7EUR03FT030.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAVPR08MB9857 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Looks good to me. Thanks for working on this, Sam. Just for others' information, I also had an offline discussion with Sam. - This is change is based on UEFI 2.10 section 4.6. EFI Configuration T= able & Properties Table https://uefi.org/specs/UEFI/2.10/04_EFI_System_Tabl= e.html#efi-configuration-table-properties-table. - The link of pull request is https://github.com/tianocore/edk2/pull/40= 38 Reviewed-by: Sunny Wang -----Original Message----- From: devel@edk2.groups.io On Behalf Of Sam Kaynor v= ia groups.io Sent: 07 February 2023 21:20 To: devel@edk2.groups.io Cc: Sam Kaynor ; Ray Ni ; Zhichao Gao= Subject: [edk2-devel] [PATCH v1 1/1] ShellPkg: UefiShellDebug1CommandsLib: = Uefi Config Tables in Dmem.c Added entries for UEFI Config Tables not present in current Dmem output. Cc: Ray Ni Cc: Zhichao Gao Signed-off-by: Sam Kaynor --- ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf= | 9 ++ ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c = | 89 ++++++++++++++++++-- ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni= | 28 ++++-- 3 files changed, 112 insertions(+), 14 deletions(-) diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Com= mandsLib.inf b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1C= ommandsLib.inf index 74ad5facf6b1..3741dac5d94c 100644 --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLi= b.inf +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLi= b.inf @@ -121,6 +121,7 @@ [Protocols] gEfiBlockIoProtocolGuid ## SOMETIMES_CONSUMES gEfiSimplePointerProtocolGuid ## SOMETIMES_CONSUMES gEfiCpuIo2ProtocolGuid ## SOMETIMES_CONSUMES + gEfiHiiDatabaseProtocolGuid ## SOMETIMES_CONSUMES [Guids] gEfiGlobalVariableGuid ## SOMETIMES_CONSUMES ## GUID @@ -130,3 +131,11 @@ [Guids] gEfiAcpi10TableGuid ## SOMETIMES_CONSUMES ## SystemTable gEfiAcpi20TableGuid ## SOMETIMES_CONSUMES ## SystemTable gShellDebug1HiiGuid ## SOMETIMES_CONSUMES ## HII + gEfiMemoryAttributesTableGuid ## SOMETIMES_CONSUMES ## SystemTable + gEfiRtPropertiesTableGuid ## SOMETIMES_CONSUMES ## SystemTable + gEfiSystemResourceTableGuid ## SOMETIMES_CONSUMES ## SystemTable + gEfiDebugImageInfoTableGuid ## SOMETIMES_CONSUMES ## SystemTable + gEfiImageSecurityDatabaseGuid ## SOMETIMES_CONSUMES ## SystemTable + gEfiJsonConfigDataTableGuid ## SOMETIMES_CONSUMES ## SystemTable + gEfiJsonCapsuleDataTableGuid ## SOMETIMES_CONSUMES ## SystemTable + gEfiJsonCapsuleResultTableGuid ## SOMETIMES_CONSUMES ## SystemTable diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c b/ShellPkg/= Library/UefiShellDebug1CommandsLib/Dmem.c index c52c212a56f8..e2aed306d466 100644 --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c @@ -10,9 +10,16 @@ #include "UefiShellDebug1CommandsLib.h" #include +#include #include #include #include +#include +#include +#include +#include +#include +#include /** Make a printable character. @@ -108,6 +115,18 @@ ShellCommandRunDmem ( UINT64 SalTableAddress; UINT64 SmbiosTableAddress; UINT64 MpsTableAddress; + UINT64 DtbTableAddress; + UINT64 MemoryAttributesTableAddress; + UINT64 RtPropertiesTableAddress; + UINT64 SystemResourceTableAddress; + UINT64 DebugImageInfoTableAddress; + UINT64 ImageExecutionTableAddress; + UINT64 JsonConfigDataTableAddress; + UINT64 JsonCapsuleDataTableAddress; + UINT64 JsonCapsuleResultTableAddress; + UINT64 MemoryRangeCapsuleAddress; + UINT64 HiiDatabaseExportBufferAddress; + UINT64 ConformanceProfileTableAddress; UINTN TableWalker; ShellStatus =3D SHELL_SUCCESS; @@ -168,11 +187,23 @@ ShellCommandRunDmem ( ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_DMEM_HEADER_ROW),= gShellDebug1HiiHandle, (UINT64)(UINTN)Address, Size); DumpHex (2, (UINTN)Address, (UINTN)Size, Address); if (Address =3D=3D (VOID *)gST) { - Acpi20TableAddress =3D 0; - AcpiTableAddress =3D 0; - SalTableAddress =3D 0; - SmbiosTableAddress =3D 0; - MpsTableAddress =3D 0; + Acpi20TableAddress =3D 0; + AcpiTableAddress =3D 0; + SalTableAddress =3D 0; + SmbiosTableAddress =3D 0; + MpsTableAddress =3D 0; + DtbTableAddress =3D 0; + MemoryAttributesTableAddress =3D 0; + RtPropertiesTableAddress =3D 0; + SystemResourceTableAddress =3D 0; + DebugImageInfoTableAddress =3D 0; + ImageExecutionTableAddress =3D 0; + JsonConfigDataTableAddress =3D 0; + JsonCapsuleDataTableAddress =3D 0; + JsonCapsuleResultTableAddress =3D 0; + MemoryRangeCapsuleAddress =3D 0; + HiiDatabaseExportBufferAddress =3D 0; + ConformanceProfileTableAddress =3D 0; for (TableWalker =3D 0; TableWalker < gST->NumberOfTableEntries;= TableWalker++) { if (CompareGuid (&gST->ConfigurationTable[TableWalker].VendorG= uid, &gEfiAcpi20TableGuid)) { Acpi20TableAddress =3D (UINT64)(UINTN)gST->ConfigurationTabl= e[TableWalker].VendorTable; @@ -193,11 +224,43 @@ ShellCommandRunDmem ( SmbiosTableAddress =3D (UINT64)(UINTN)gST->ConfigurationTabl= e[TableWalker].VendorTable; continue; } - if (CompareGuid (&gST->ConfigurationTable[TableWalker].VendorG= uid, &gEfiMpsTableGuid)) { MpsTableAddress =3D (UINT64)(UINTN)gST->ConfigurationTable[T= ableWalker].VendorTable; continue; } + if (CompareGuid(&gST->ConfigurationTable[TableWalker].VendorGu= id, &gEfiMemoryAttributesTableGuid)) { + MemoryAttributesTableAddress =3D (UINT64)(UINTN)gST->Configu= rationTable[TableWalker].VendorTable; + continue; + } + if (CompareGuid(&gST->ConfigurationTable[TableWalker].VendorGu= id, &gEfiRtPropertiesTableGuid)) { + RtPropertiesTableAddress =3D (UINT64)(UINTN)gST->Configurati= onTable[TableWalker].VendorTable; + continue; + } + if (CompareGuid(&gST->ConfigurationTable[TableWalker].VendorGu= id, &gEfiSystemResourceTableGuid)) { + SystemResourceTableAddress =3D (UINT64)(UINTN)gST->Configura= tionTable[TableWalker].VendorTable; + continue; + } + if (CompareGuid(&gST->ConfigurationTable[TableWalker].VendorGu= id, &gEfiDebugImageInfoTableGuid)) { + DebugImageInfoTableAddress =3D (UINT64)(UINTN)gST->Configura= tionTable[TableWalker].VendorTable; + continue; + } + if (CompareGuid(&gST->ConfigurationTable[TableWalker].VendorGu= id, &gEfiImageSecurityDatabaseGuid)) { + ImageExecutionTableAddress =3D (UINT64)(UINTN)gST->Configura= tionTable[TableWalker].VendorTable; + } + if (CompareGuid(&gST->ConfigurationTable[TableWalker].VendorGu= id, &gEfiJsonConfigDataTableGuid)) { + JsonConfigDataTableAddress =3D (UINT64)(UINTN)gST->Configura= tionTable[TableWalker].VendorTable; + continue; + } + if (CompareGuid(&gST->ConfigurationTable[TableWalker].VendorGu= id, &gEfiJsonCapsuleDataTableGuid)) { + JsonCapsuleDataTableAddress =3D (UINT64)(UINTN)gST->Configur= ationTable[TableWalker].VendorTable; + continue; + } + if (CompareGuid(&gST->ConfigurationTable[TableWalker].VendorGu= id, &gEfiJsonCapsuleResultTableGuid)) { + JsonCapsuleResultTableAddress =3D (UINT64)(UINTN)gST->Config= urationTable[TableWalker].VendorTable; + } + if (CompareGuid(&gST->ConfigurationTable[TableWalker].VendorGu= id, &gEfiHiiDatabaseProtocolGuid)) { + HiiDatabaseExportBufferAddress =3D (UINT64)(UINTN)gST->Confi= gurationTable[TableWalker].VendorTable; + } } ShellPrintHiiEx ( @@ -218,7 +281,19 @@ ShellCommandRunDmem ( AcpiTableAddress, Acpi20TableAddress, MpsTableAddress, - SmbiosTableAddress + SmbiosTableAddress, + DtbTableAddress, + MemoryAttributesTableAddress, + RtPropertiesTableAddress, + SystemResourceTableAddress, + DebugImageInfoTableAddress, + ImageExecutionTableAddress, + JsonConfigDataTableAddress, + JsonCapsuleDataTableAddress, + JsonCapsuleResultTableAddress, + MemoryRangeCapsuleAddress, + HiiDatabaseExportBufferAddress, + ConformanceProfileTableAddress ); } } else { diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Com= mandsLib.uni b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1C= ommandsLib.uni index b1d239ed37ea..c1067a0474cd 100644 --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLi= b.uni +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLi= b.uni @@ -108,13 +108,27 @@ "-----------------------= ----------------------\r\n" "System: Table Structure= size %08x revision %08x\r\n" "ConIn (%016LX) ConOut (= %016LX) StdErr (%016LX)\r\n" - "Runtime Services %016LX= \r\n" - "Boot Services %016LX= \r\n" - "SAL System Table %016LX= \r\n" - "ACPI Table %016LX= \r\n" - "ACPI 2.0 Table %016LX= \r\n" - "MPS Table %016LX= \r\n" - "SMBIOS Table %016LX= \r\n" + "Runtime Services = %016LX\r\n" + "Boot Services = %016LX\r\n" + "SAL System Table = %016LX\r\n" + "ACPI Table = %016LX\r\n" + "ACPI 2.0 Table = %016LX\r\n" + "MPS Table = %016LX\r\n" + "SMBIOS Table = %016LX\r\n" + "DTB Table = %016LX\r\n" + "Memory Attribute Table = %016LX\r\n" + "RT Properties Table = %016LX\r\n" + "System Resource Table = %016LX\r\n" + "Debug Image Info Table = %016LX\r\n" + "Image Execution Info Ta= ble %016LX\r\n" + "Json Config Data Table = %016LX\r\n" + "Json Capsule Data Table= %016LX\r\n" + "Json Capsule Results Ta= ble %016LX\r\n" + "Memory Range Capsule = %016LX\r\n" + "Hii Database Export Buf= fer %016LX\r\n" + "Conformance Profile Tab= le %016LX\r\n" + + #string STR_LOAD_PCI_ROM_RES #language en-US "Image '%B%s%N' load res= ult: %r\r\n" #string STR_LOADPCIROM_CORRUPT #language en-US "%H%s%N: File '%B%s%N' I= mage %d is corrupt.\r\n" -- 2.25.1 -=3D-=3D-=3D-=3D-=3D-=3D Groups.io Links: You receive all messages sent to this group. View/Reply Online (#99774): https://edk2.groups.io/g/devel/message/99774 Mute This Topic: https://groups.io/mt/96817141/5985097 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [Sunny.Wang@arm.com] -=3D-=3D-=3D-=3D-=3D-=3D IMPORTANT NOTICE: The contents of this email and any attachments are confid= ential and may also be privileged. If you are not the intended recipient, p= lease 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.