From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id C8A2BAC1511 for ; Tue, 26 Mar 2024 15:15:45 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=QgTMXsGRRE0nJpSQo1vD6pM03hTV547U3CFSsN3LJG4=; c=relaxed/simple; d=groups.io; h=Received-SPF:From:To:CC:Subject:Date:Message-ID:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Resent-Date:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20240206; t=1711466144; v=1; b=OSI9o510pmeb3LKC+UPylyYLK4GfQHzbbS6/JiCRNgAr628ZZR93lqh0h5duNn6dqYIirtAR KIN3yI/krsGZFexHKbBimET1IPu38vjz0i8Rsb75DSR2UehnDbHzEQllU/7Piib+8DvCbAVpP/e fFYf4E2I3how9hKV1hFzCzbGhO9G9OXxbQcHz7TpMx5qfdNfS9P83xEm3OFiBw0rTuOf8/p+TnJ BrVMZMfTeROkG3RiXiphWKCYQMhpKTMYTAVYDsEAF2/ZjyERsT4C0e84vhzukpSyxGXcUClfZuz 9iK0SzdAbdfYk+9kxdMGqdIj6ioMLHR657Xq9/JhF8AZg== X-Received: by 127.0.0.2 with SMTP id 2dSWYY7687511xC5LGhgOTU8; Tue, 26 Mar 2024 08:15:44 -0700 X-Received: from NAM10-BN7-obe.outbound.protection.outlook.com (NAM10-BN7-obe.outbound.protection.outlook.com [40.107.92.73]) by mx.groups.io with SMTP id smtpd.web11.11690.1711466143596873402 for ; Tue, 26 Mar 2024 08:15:43 -0700 X-Received: from PH7P221CA0006.NAMP221.PROD.OUTLOOK.COM (2603:10b6:510:32a::19) by CY8PR12MB8066.namprd12.prod.outlook.com (2603:10b6:930:70::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.33; Tue, 26 Mar 2024 15:15:40 +0000 X-Received: from CY4PEPF0000E9D9.namprd05.prod.outlook.com (2603:10b6:510:32a:cafe::62) by PH7P221CA0006.outlook.office365.com (2603:10b6:510:32a::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.13 via Frontend Transport; Tue, 26 Mar 2024 15:15:40 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C X-Received: from SATLEXMB04.amd.com (165.204.84.17) by CY4PEPF0000E9D9.mail.protection.outlook.com (10.167.241.77) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7409.10 via Frontend Transport; Tue, 26 Mar 2024 15:15:40 +0000 X-Received: from TPE-L1-ABNCHANG.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Tue, 26 Mar 2024 10:15:35 -0500 From: "Chang, Abner via groups.io" To: CC: Nickle Wang , Igor Kulchytskyy Subject: [edk2-devel] [PATCH V2 3/6] RedfishPkg/RedfishPlatformConfigDxe:Add RefishDebugLib support Date: Tue, 26 Mar 2024 23:14:59 +0800 Message-ID: <20240326151503.106-4-abner.chang@amd.com> In-Reply-To: <20240326151503.106-1-abner.chang@amd.com> References: <20240326151503.106-1-abner.chang@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000E9D9:EE_|CY8PR12MB8066:EE_ X-MS-Office365-Filtering-Correlation-Id: 95611955-765a-44db-294a-08dc4da7992d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: KLb3LdypONTvdvGs1abzAYgtBiiJqEX+mOxL6Farhr/8MZUsKMJK6p+Yc/YV5RFAKK+Rn4Rdn3vh2/kSMxPpr0dOMFm0cyY9nJE/5VavfUxqXuWogopLSzLW7Bbv0cPYRknPZUUBHzZNa2JKCQddqTiW/rFtvsed1EVgzn2UiSboj7Df7SXWWSPaa++3sLw052FGXR6v5ubp0lb9r6kdKWqEVphRn6s1GRg0uew6KyhhKtK0L7FBFK2BrPrlG0wAVBFf2UuigYf/fUUsuxzD+JYJw0tBK/ngbBzJVQvAUMCZFWLqLeuUusscRTJV1F15rgbAUH0LOWZj4xsn2/Q+8Y2DKKquXuThykX9WvCTtH3DoFf57A5VS8SPRhf9K2VUb5twdt1jK5/GQT2AvVbzYThsUg0dFVl6SvZLRYpbiMHvF/xnZkCZGkV5deB531RrgfaJxoi/L//Z4CteWv6SoZtOSP+SDeJa9NDpfZZtBhlX/iDcGJN1X1lOezmjrl+RZfFozMezITRUyf/vyCpQTH0mscfy9jUavwIV44/7ZiypWsQa0kphmfc8PzIAwyAgCYwKZvPXi7EAIxAOT2QMfOsQHdndLNf7V5O3pbA8n4zBKJOwJHYSPdVbc8IAQB8/DNLY3tlZxSKdHIBTuykDlkreRtV/bp27ORuIEh3EZrlA/LuL6tqDsePB5Fxy6/CgLyp6J0YWyQWvSMgsJwK3GEoSrAClUrKEbIxCvq/vhJxkmQttBpSs6CkXXmQo7Unz X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Mar 2024 15:15:40.3425 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 95611955-765a-44db-294a-08dc4da7992d X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000E9D9.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB8066 Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Resent-Date: Tue, 26 Mar 2024 08:15:43 -0700 Reply-To: devel@edk2.groups.io,abner.chang@amd.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: s2RsJwRNb6VaNJzoyCCHnc5ux7686176AA= Content-Transfer-Encoding: quoted-printable Content-Type: text/plain X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20240206 header.b=OSI9o510; dmarc=pass (policy=none) header.from=groups.io; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io From: Abner Chang Add RedfishPlatformConfigDxe debug capability that aligns with edk2 Redfish debug mechanism. - PcdRedfishPlatformConfigDebugProperty, add PCD to control RedfishPlatformConfigDxe subordinate of Redfish debug capabilities. - PcdRedfishPlatformConfigFeatureProperty, add PCD to manage RedfishPlatformConfigDxe features. Signed-off-by: Abner Chang Co-authored-by: Nickle Wang Cc: Igor Kulchytskyy --- RedfishPkg/RedfishPkg.dec | 15 +++ .../RedfishPlatformConfigDxe.inf | 8 ++ .../RedfishPlatformConfigDxe.h | 46 +++++++- .../RedfishPlatformConfigImpl.h | 28 +++++ .../RedfishPlatformConfigCapability.c | 58 ++++++++++ .../RedfishPlatformConfigDxe.c | 59 +++++++--- .../RedfishPlatformConfigImpl.c | 107 +++++++++++------- 7 files changed, 262 insertions(+), 59 deletions(-) create mode 100644 RedfishPkg/RedfishPlatformConfigDxe/RedfishPlatformConf= igCapability.c diff --git a/RedfishPkg/RedfishPkg.dec b/RedfishPkg/RedfishPkg.dec index a9665ff68ef..c048e43f53b 100644 --- a/RedfishPkg/RedfishPkg.dec +++ b/RedfishPkg/RedfishPkg.dec @@ -193,3 +193,18 @@ # 0x0000000000000001 RedfishPlatformConfigDxe driver debug enabled. # gEfiRedfishPkgTokenSpaceGuid.PcdRedfishDebugCategory|0|UINT64|0x00001012 + # + # Redfish RedfishPlatformConfigDxe Debug Properties + # 0x00000001 x-uefi-redfish string database message enabled + # 0x00000002 Debug Message for dumping formset + # 0x00000004 Debug Message for x-uefi-redfish searching result + # 0x00000008 Debug Message for x-uefi-redfish Regular Expression sear= ching result + # + gEfiRedfishPkgTokenSpaceGuid.PcdRedfishPlatformConfigDebugProperty|0|UIN= T32|0x00001013 + # + # RedfishPlatformConfigDxe feature enablement + # 0x00000001 Enable building Redfish Attribute Registry menu path. + # 0x00000002 Allow supressed HII option to be exposed on Redfish. + # + # Redfish RedfishPlatformConfigDxe feature Properties + gEfiRedfishPkgTokenSpaceGuid.PcdRedfishPlatformConfigFeatureProperty|0|U= INT32|0x00001014 diff --git a/RedfishPkg/RedfishPlatformConfigDxe/RedfishPlatformConfigDxe.i= nf b/RedfishPkg/RedfishPlatformConfigDxe/RedfishPlatformConfigDxe.inf index 5a249c8c3bc..2db47c2cffc 100644 --- a/RedfishPkg/RedfishPlatformConfigDxe/RedfishPlatformConfigDxe.inf +++ b/RedfishPkg/RedfishPlatformConfigDxe/RedfishPlatformConfigDxe.inf @@ -3,6 +3,7 @@ # # (C) Copyright 2021 Hewlett Packard Enterprise Development LP
# Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES. All rights reserve= d. +# Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved. # # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -23,6 +24,7 @@ RedfishPkg/RedfishPkg.dec =20 [Sources] + RedfishPlatformConfigCapability.c RedfishPlatformConfigDxe.h RedfishPlatformConfigDxe.c RedfishPlatformConfigImpl.h @@ -36,7 +38,9 @@ HiiLib HiiUtilityLib MemoryAllocationLib + PcdLib PrintLib + RedfishDebugLib UefiLib UefiBootServicesTableLib UefiRuntimeServicesTableLib @@ -51,5 +55,9 @@ [Guids] gEfiRegexSyntaxTypePerlGuid ## CONSUMED =20 +[FixedPcd] + gEfiRedfishPkgTokenSpaceGuid.PcdRedfishPlatformConfigFeatureProperty + gEfiRedfishPkgTokenSpaceGuid.PcdRedfishPlatformConfigDebugProperty + [Depex] TRUE diff --git a/RedfishPkg/RedfishPlatformConfigDxe/RedfishPlatformConfigDxe.h= b/RedfishPkg/RedfishPlatformConfigDxe/RedfishPlatformConfigDxe.h index 38adea04c5b..688f2067bff 100644 --- a/RedfishPkg/RedfishPlatformConfigDxe/RedfishPlatformConfigDxe.h +++ b/RedfishPkg/RedfishPlatformConfigDxe/RedfishPlatformConfigDxe.h @@ -3,6 +3,7 @@ =20 (C) Copyright 2021 Hewlett Packard Enterprise Development LP
Copyright (c) 2022-2023, NVIDIA CORPORATION & AFFILIATES. All rights res= erved. + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -20,7 +21,9 @@ #include #include #include +#include #include +#include #include #include #include @@ -37,6 +40,41 @@ // #include =20 +// +// Debug message in DEBUG_REDFISH_COMPONENT_PLATFORM_CONFIG_DXE scope. +// To enable the debug message for this module, below PCDs must be set. +// +// 1. DEBUG_MANAGEABILITY must be set PcdDebugPrintErrorLevel. +// +// 2 RedfishPlatformConfigDxe debug enablement must be set in +// PcdRedfishDebugCategory (defined in RedfishPkg.dec) +// +// 3. The suborinate debug enablement for RedfishPlatformConfigDxe +// must be set in PcdRedfishPlatformConfigDebugPropert (defined +// in RedfishPkg.dec). +// +#define DEBUG_REDFISH_THIS_MODULE(DebugSubordinate, ...) \ + while (RedfishPlatformConfigDebugProp (DebugSubordinate)) { \ + DEBUG_REDFISH(DEBUG_REDFISH_COMPONENT_PLATFORM_CONFIG_DXE, ##__VA_ARGS= __); \ + break; \ + } + +#define DEBUG_REDFISH_THIS_MODULE_CODE_BEGIN(DebugSubordinate) \ + if (RedfishPlatformConfigDebugProp (DebugSubordinate)) { + +#define DEBUG_REDFISH_THIS_MODULE_CODE_END() } + +#define DEBUG_REDFISH_THIS_MODULE_CODE(DebugSubordinate, Expression) \ + DEBUG_REDFISH_THIS_MODULE_CODE_BEGIN(DebugSubordinate) \ + Expression \ + DEBUG_REDFISH_THIS_MODULE_CODE_END() + +// Subordinate debug property for DEBUG_REDFISH_PLATFORM_CONFIG_DXE +#define REDFISH_PLATFORM_CONFIG_DEBUG_STRING_DATABASE 0x00000001 +#define REDFISH_PLATFORM_CONFIG_DEBUG_DUMP_FORMSET 0x00000002 +#define REDFISH_PLATFORM_CONFIG_DEBUG_CONFIG_LANG_SEARCH 0x00000004 +#define REDFISH_PLATFORM_CONFIG_DEBUG_CONFIG_LANG_REGEX 0x00000008 + /// /// Definition of EDKII_REDFISH_PLATFORM_CONFIG_NOTIFY. /// @@ -75,8 +113,12 @@ typedef struct { #define REGULAR_EXPRESSION_INCLUDE_ALL L".*" #define CONFIGURE_LANGUAGE_PREFIX "x-uefi-redfish-" #define REDFISH_PLATFORM_CONFIG_VERSION 0x00010000 -#define REDFISH_PLATFORM_CONFIG_DEBUG DEBUG_MANAGEABILITY -#define REDFISH_MENU_PATH_SIZE 8 + +#define REDFISH_MENU_PATH_SIZE 8 + +// Definitions of Redfish platform config capbility +#define REDFISH_PLATFORM_CONFIG_BUILD_MENU_PATH 0x000000001 +#define REDFISH_PLATFORM_CONFIG_ALLOW_SUPPRESSED 0x000000002 =20 /** Convert input unicode string to ascii string. It's caller's diff --git a/RedfishPkg/RedfishPlatformConfigDxe/RedfishPlatformConfigImpl.= h b/RedfishPkg/RedfishPlatformConfigDxe/RedfishPlatformConfigImpl.h index 6e6c7fdb8a9..09d9789f574 100644 --- a/RedfishPkg/RedfishPlatformConfigDxe/RedfishPlatformConfigImpl.h +++ b/RedfishPkg/RedfishPlatformConfigDxe/RedfishPlatformConfigImpl.h @@ -418,4 +418,32 @@ HiiStrSize ( IN CONST CHAR16 *String ); =20 +/** + Check if the debug property is enabled or not. + + @param[in] DebugType Debug enablement type + + @retval TRUE, the debug property is enabled. + FALSE, the debug property is not enabled. + +**/ +BOOLEAN +RedfishPlatformConfigDebugProp ( + IN UINT64 DebugProp + ); + +/** + Check if the Platform Configure feature is enabled or not. + + @param[in] FeatureType Redfish platform config feature enablement + + @retval TRUE, the feature is enabled. + FALSE, the feature is not enabled. + +**/ +BOOLEAN +RedfishPlatformConfigFeatureProp ( + IN UINT64 FeatureProp + ); + #endif diff --git a/RedfishPkg/RedfishPlatformConfigDxe/RedfishPlatformConfigCapab= ility.c b/RedfishPkg/RedfishPlatformConfigDxe/RedfishPlatformConfigCapabili= ty.c new file mode 100644 index 00000000000..753c4d393f3 --- /dev/null +++ b/RedfishPkg/RedfishPlatformConfigDxe/RedfishPlatformConfigCapability.c @@ -0,0 +1,58 @@ +/** @file + The implementation of EDKII Redfish Platform Config Capability. + Copyright (C) 2024 Advanced Micro Devices, Inc. All rights reserved.
+ + SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +#include "RedfishPlatformConfigDxe.h" +#include "RedfishPlatformConfigImpl.h" + +/** + Check if the debug property is enabled or not. + + @param[in] DebugType Debug enablement type + + @retval TRUE, the debug property is enabled. + FALSE, the debug property is not enabled. + +**/ +BOOLEAN +RedfishPlatformConfigDebugProp ( + IN UINT64 DebugType + ) +{ + UINT64 DebugProp; + + DebugProp =3D FixedPcdGet64 (PcdRedfishPlatformConfigDebugProperty); + if ((DebugProp & DebugType) !=3D 0) { + return TRUE; + } + + return FALSE; +} + +/** + Check if the Platform Configure feature is enabled or not. + + @param[in] FeatureType Redfish platform config feature enablement + + @retval TRUE, the feature is enabled. + FALSE, the feature is not enabled. + +**/ +BOOLEAN +RedfishPlatformConfigFeatureProp ( + IN UINT64 FeatureType + ) +{ + UINT64 FeatureProp; + + FeatureProp =3D FixedPcdGet64 (PcdRedfishPlatformConfigFeatureProperty); + if ((FeatureProp & FeatureType) !=3D 0) { + return TRUE; + } + + return FALSE; +} diff --git a/RedfishPkg/RedfishPlatformConfigDxe/RedfishPlatformConfigDxe.c= b/RedfishPkg/RedfishPlatformConfigDxe/RedfishPlatformConfigDxe.c index 664b48eb50e..8a02c839035 100644 --- a/RedfishPkg/RedfishPlatformConfigDxe/RedfishPlatformConfigDxe.c +++ b/RedfishPkg/RedfishPlatformConfigDxe/RedfishPlatformConfigDxe.c @@ -315,7 +315,7 @@ DumpHiiStatementPrompt ( =20 **/ CHAR8 * -BuildMenPath ( +BuildMenuPath ( IN REDFISH_PLATFORM_CONFIG_STATEMENT_PRIVATE *StatementPrivate ) { @@ -345,7 +345,7 @@ BuildMenPath ( } =20 do { - DEBUG ((REDFISH_PLATFORM_CONFIG_DEBUG, "F(%d) <-", FormPrivate->Id)); + DEBUG ((DEBUG_REDFISH_PLATFORM_CONFIG, "F(%d) <-", FormPrivate->Id)); FormPrivate =3D FindFormLinkToThis (FormPrivate); if (FormPrivate =3D=3D NULL) { break; @@ -387,7 +387,7 @@ BuildMenPath ( AsciiStrCatS (Buffer, OldBufferSize, "/"); AsciiStrCatS (Buffer, OldBufferSize, FormTitle); FreePool (FormTitle); - DEBUG ((REDFISH_PLATFORM_CONFIG_DEBUG, " %a\n", Buffer)); + DEBUG ((DEBUG_REDFISH_PLATFORM_CONFIG, " %a\n", Buffer)); } =20 FormPrivate =3D (REDFISH_PLATFORM_CONFIG_FORM_PRIVATE *)PopRedfishStac= k (FormStack); @@ -1061,12 +1061,12 @@ DumpOrderedListValue ( return; } =20 - DEBUG ((REDFISH_PLATFORM_CONFIG_DEBUG, "Value.Type=3D 0x%x\n", OrderedLi= stStatement->Value.Type)); - DEBUG ((REDFISH_PLATFORM_CONFIG_DEBUG, "Value.BufferValueType=3D 0x%x\n"= , OrderedListStatement->Value.BufferValueType)); - DEBUG ((REDFISH_PLATFORM_CONFIG_DEBUG, "Value.BufferLen=3D 0x%x\n", Orde= redListStatement->Value.BufferLen)); - DEBUG ((REDFISH_PLATFORM_CONFIG_DEBUG, "Value.Buffer=3D 0x%x\n", Ordered= ListStatement->Value.Buffer)); - DEBUG ((REDFISH_PLATFORM_CONFIG_DEBUG, "Value.MaxContainers=3D 0x%x\n", = OrderedListStatement->ExtraData.OrderListData.MaxContainers)); - DEBUG ((REDFISH_PLATFORM_CONFIG_DEBUG, "StorageWidth=3D 0x%x\n", Ordered= ListStatement->StorageWidth)); + DEBUG ((DEBUG_REDFISH_PLATFORM_CONFIG, "Value.Type=3D 0x%x\n", OrderedLi= stStatement->Value.Type)); + DEBUG ((DEBUG_REDFISH_PLATFORM_CONFIG, "Value.BufferValueType=3D 0x%x\n"= , OrderedListStatement->Value.BufferValueType)); + DEBUG ((DEBUG_REDFISH_PLATFORM_CONFIG, "Value.BufferLen=3D 0x%x\n", Orde= redListStatement->Value.BufferLen)); + DEBUG ((DEBUG_REDFISH_PLATFORM_CONFIG, "Value.Buffer=3D 0x%x\n", Ordered= ListStatement->Value.Buffer)); + DEBUG ((DEBUG_REDFISH_PLATFORM_CONFIG, "Value.MaxContainers=3D 0x%x\n", = OrderedListStatement->ExtraData.OrderListData.MaxContainers)); + DEBUG ((DEBUG_REDFISH_PLATFORM_CONFIG, "StorageWidth=3D 0x%x\n", Ordered= ListStatement->StorageWidth)); =20 if (OrderedListStatement->Value.Buffer =3D=3D NULL) { return; @@ -1083,7 +1083,7 @@ DumpOrderedListValue ( Value8 =3D (UINT8 *)OrderedListStatement->Value.Buffer; Count =3D OrderedListStatement->StorageWidth / sizeof (UINT8); for (Index =3D 0; Index < Count; Index++) { - DEBUG ((REDFISH_PLATFORM_CONFIG_DEBUG, "%d ", Value8[Index])); + DEBUG ((DEBUG_REDFISH_PLATFORM_CONFIG, "%d ", Value8[Index])); } =20 break; @@ -1091,7 +1091,7 @@ DumpOrderedListValue ( Value16 =3D (UINT16 *)OrderedListStatement->Value.Buffer; Count =3D OrderedListStatement->StorageWidth / sizeof (UINT16); for (Index =3D 0; Index < Count; Index++) { - DEBUG ((REDFISH_PLATFORM_CONFIG_DEBUG, "%d ", Value16[Index])); + DEBUG ((DEBUG_REDFISH_PLATFORM_CONFIG, "%d ", Value16[Index])); } =20 break; @@ -1099,7 +1099,7 @@ DumpOrderedListValue ( Value32 =3D (UINT32 *)OrderedListStatement->Value.Buffer; Count =3D OrderedListStatement->StorageWidth / sizeof (UINT32); for (Index =3D 0; Index < Count; Index++) { - DEBUG ((REDFISH_PLATFORM_CONFIG_DEBUG, "%d ", Value32[Index])); + DEBUG ((DEBUG_REDFISH_PLATFORM_CONFIG, "%d ", Value32[Index])); } =20 break; @@ -1107,7 +1107,7 @@ DumpOrderedListValue ( Value64 =3D (UINT64 *)OrderedListStatement->Value.Buffer; Count =3D OrderedListStatement->StorageWidth / sizeof (UINT64); for (Index =3D 0; Index < Count; Index++) { - DEBUG ((REDFISH_PLATFORM_CONFIG_DEBUG, "%d ", Value64[Index])); + DEBUG ((DEBUG_REDFISH_PLATFORM_CONFIG, "%d ", Value64[Index])); } =20 break; @@ -1115,13 +1115,13 @@ DumpOrderedListValue ( Value8 =3D (UINT8 *)OrderedListStatement->Value.Buffer; Count =3D OrderedListStatement->StorageWidth / sizeof (UINT8); for (Index =3D 0; Index < Count; Index++) { - DEBUG ((REDFISH_PLATFORM_CONFIG_DEBUG, "%d ", Value8[Index])); + DEBUG ((DEBUG_REDFISH_PLATFORM_CONFIG, "%d ", Value8[Index])); } =20 break; } =20 - DEBUG ((REDFISH_PLATFORM_CONFIG_DEBUG, "\n")); + DEBUG ((DEBUG_REDFISH_PLATFORM_CONFIG, "\n")); } =20 /** @@ -2013,6 +2013,8 @@ RedfishPlatformConfigProtocolGetConfigureLang ( UINTN Index; CHAR8 *FullSchema; =20 + DEBUG ((DEBUG_INFO, "%a: Harvest config language of %a_%a (Regex: %s).\n= ", __func__, Schema, Version, RegexPattern)); + if ((This =3D=3D NULL) || IS_EMPTY_STRING (Schema) || IS_EMPTY_STRING (V= ersion) || (Count =3D=3D NULL) || (ConfigureLangList =3D=3D NULL) || IS_EMP= TY_STRING (RegexPattern)) { return EFI_INVALID_PARAMETER; } @@ -2072,6 +2074,22 @@ RedfishPlatformConfigProtocolGetConfigureLang ( *Count =3D StatementList.Count; *ConfigureLangList =3D TmpConfigureLangList; =20 + DEBUG_REDFISH_THIS_MODULE ( + REDFISH_PLATFORM_CONFIG_DEBUG_CONFIG_LANG_REGEX, + "%a: Number of configure language strings harvested: %d\n", + __func__, + StatementList.Count + ); + + DEBUG_REDFISH_THIS_MODULE_CODE ( + REDFISH_PLATFORM_CONFIG_DEBUG_CONFIG_LANG_REGEX, + DEBUG_REDFISH (DEBUG_REDFISH_COMPONENT_PLATFORM_CONFIG_DXE, "%a: Numbe= r of configure language strings harvested: %d\n", __func__, StatementList.C= ount); + for (Index =3D 0; Index < *Count; Index++) { + DEBUG_REDFISH (DEBUG_REDFISH_COMPONENT_PLATFORM_CONFIG_DXE, " (%d) %= s\n", Index, TmpConfigureLangList[Index]); + } + + ); + RELEASE_RESOURCE: =20 if (FullSchema !=3D NULL) { @@ -2082,6 +2100,7 @@ RELEASE_RESOURCE: ReleaseStatementList (&StatementList); } =20 + DEBUG ((DEBUG_INFO, "%a: exit.\n", __func__)); return Status; } =20 @@ -2296,6 +2315,7 @@ RedfishPlatformConfigProtocolGetAttribute ( CHAR8 *FullSchema; CHAR8 *Buffer; =20 + DEBUG ((DEBUG_INFO, "%a: Entry\n", __func__)); if ((This =3D=3D NULL) || IS_EMPTY_STRING (Schema) || IS_EMPTY_STRING (V= ersion) || IS_EMPTY_STRING (ConfigureLang) || (AttributeValue =3D=3D NULL))= { return EFI_INVALID_PARAMETER; } @@ -2337,9 +2357,11 @@ RedfishPlatformConfigProtocolGetAttribute ( // // Build up menu path // - AttributeValue->MenuPath =3D BuildMenPath (TargetStatement); - if (AttributeValue->MenuPath =3D=3D NULL) { - DEBUG ((DEBUG_ERROR, "%a: failed to build menu path for \"%a\"\n", __f= unc__, AttributeValue->AttributeName)); + if (RedfishPlatformConfigFeatureProp (REDFISH_PLATFORM_CONFIG_BUILD_MENU= _PATH)) { + AttributeValue->MenuPath =3D BuildMenuPath (TargetStatement); + if (AttributeValue->MenuPath =3D=3D NULL) { + DEBUG ((DEBUG_ERROR, "%a: failed to build menu path for \"%a\"\n", _= _func__, AttributeValue->AttributeName)); + } } =20 // @@ -2370,6 +2392,7 @@ RELEASE_RESOURCE: FreePool (FullSchema); } =20 + DEBUG ((DEBUG_INFO, "%a: Exit\n", __func__)); return Status; } =20 diff --git a/RedfishPkg/RedfishPlatformConfigDxe/RedfishPlatformConfigImpl.= c b/RedfishPkg/RedfishPlatformConfigDxe/RedfishPlatformConfigImpl.c index 8b1ddf4360a..537ce09a2d3 100644 --- a/RedfishPkg/RedfishPlatformConfigDxe/RedfishPlatformConfigImpl.c +++ b/RedfishPkg/RedfishPlatformConfigDxe/RedfishPlatformConfigImpl.c @@ -32,7 +32,7 @@ DumpHiiString ( EFI_STRING String; =20 if ((HiiHandle =3D=3D NULL) || (StringId =3D=3D 0)) { - DEBUG ((REDFISH_PLATFORM_CONFIG_DEBUG, "???")); + DEBUG ((DEBUG_REDFISH_PLATFORM_CONFIG, "???")); return EFI_INVALID_PARAMETER; } =20 @@ -41,7 +41,7 @@ DumpHiiString ( return EFI_NOT_FOUND; } =20 - DEBUG ((REDFISH_PLATFORM_CONFIG_DEBUG, "%s", String)); + DEBUG ((DEBUG_REDFISH_PLATFORM_CONFIG, "%s", String)); FreePool (String); =20 return EFI_SUCCESS; @@ -79,18 +79,18 @@ DumpFormset ( HiiFormPrivate =3D REDFISH_PLATFORM_CONFIG_FORM_FROM_LINK (HiiFormLin= k); HiiNextFormLink =3D GetNextNode (&FormsetPrivate->HiiFormList, HiiForm= Link); =20 - DEBUG ((REDFISH_PLATFORM_CONFIG_DEBUG, " [%d] form: %d title: ", ++In= dex, HiiFormPrivate->Id)); + DEBUG ((DEBUG_REDFISH_PLATFORM_CONFIG, " [%d] form: %d title: ", ++In= dex, HiiFormPrivate->Id)); DumpHiiString (FormsetPrivate->HiiHandle, HiiFormPrivate->Title); - DEBUG ((REDFISH_PLATFORM_CONFIG_DEBUG, "\n")); + DEBUG ((DEBUG_REDFISH_PLATFORM_CONFIG, "\n")); =20 HiiStatementLink =3D GetFirstNode (&HiiFormPrivate->StatementList); while (!IsNull (&HiiFormPrivate->StatementList, HiiStatementLink)) { HiiStatementPrivate =3D REDFISH_PLATFORM_CONFIG_STATEMENT_FROM_LINK= (HiiStatementLink); HiiNextStatementLink =3D GetNextNode (&HiiFormPrivate->StatementList= , HiiStatementLink); =20 - DEBUG ((REDFISH_PLATFORM_CONFIG_DEBUG, " QID: 0x%x Prompt: ", Hii= StatementPrivate->QuestionId)); + DEBUG ((DEBUG_REDFISH_PLATFORM_CONFIG, " QID: 0x%x Prompt: ", Hii= StatementPrivate->QuestionId)); DumpHiiString (FormsetPrivate->HiiHandle, HiiStatementPrivate->Descr= iption); - DEBUG ((REDFISH_PLATFORM_CONFIG_DEBUG, "\n")); + DEBUG ((DEBUG_REDFISH_PLATFORM_CONFIG, "\n")); =20 HiiStatementLink =3D HiiNextStatementLink; } @@ -125,7 +125,7 @@ DumpFormsetList ( } =20 if (IsListEmpty (FormsetList)) { - DEBUG ((REDFISH_PLATFORM_CONFIG_DEBUG, "%a: Empty formset list\n", __f= unc__)); + DEBUG ((DEBUG_REDFISH_PLATFORM_CONFIG, "%a: Empty formset list\n", __f= unc__)); return EFI_SUCCESS; } =20 @@ -135,7 +135,7 @@ DumpFormsetList ( HiiFormsetNextLink =3D GetNextNode (FormsetList, HiiFormsetLink); HiiFormsetPrivate =3D REDFISH_PLATFORM_CONFIG_FORMSET_FROM_LINK (HiiF= ormsetLink); =20 - DEBUG ((REDFISH_PLATFORM_CONFIG_DEBUG, "[%d] HII Handle: 0x%x formset:= %g at %s\n", ++Index, HiiFormsetPrivate->HiiHandle, &HiiFormsetPrivate->Gu= id, HiiFormsetPrivate->DevicePathStr)); + DEBUG ((DEBUG_REDFISH_PLATFORM_CONFIG, "[%d] HII Handle: 0x%x formset:= %g at %s\n", ++Index, HiiFormsetPrivate->HiiHandle, &HiiFormsetPrivate->Gu= id, HiiFormsetPrivate->DevicePathStr)); DumpFormset (HiiFormsetPrivate); =20 HiiFormsetLink =3D HiiFormsetNextLink; @@ -622,7 +622,9 @@ GetStatementPrivateByConfigureLangRegex ( HiiNextStatementLink =3D GetNextNode (&HiiFormPrivate->StatementLi= st, HiiStatementLink); HiiStatementPrivate =3D REDFISH_PLATFORM_CONFIG_STATEMENT_FROM_LI= NK (HiiStatementLink); =20 - if ((HiiStatementPrivate->Description !=3D 0) && !HiiStatementPriv= ate->Suppressed) { + if ((HiiStatementPrivate->Description !=3D 0) && + (RedfishPlatformConfigFeatureProp (REDFISH_PLATFORM_CONFIG_ALL= OW_SUPPRESSED) || !HiiStatementPrivate->Suppressed)) + { TmpString =3D HiiStatementPrivate->DescriptionStr; if (TmpString !=3D NULL) { Status =3D RegularExpressionProtocol->MatchString ( @@ -698,6 +700,7 @@ GetStatementPrivateByConfigureLang ( LIST_ENTRY *HiiNextStatementLink; REDFISH_PLATFORM_CONFIG_STATEMENT_PRIVATE *HiiStatementPrivate; EFI_STRING TmpString; + UINTN Index; =20 if ((FormsetList =3D=3D NULL) || IS_EMPTY_STRING (Schema) || IS_EMPTY_ST= RING (ConfigureLang)) { return NULL; @@ -707,6 +710,7 @@ GetStatementPrivateByConfigureLang ( return NULL; } =20 + Index =3D 0; HiiFormsetLink =3D GetFirstNode (FormsetList); while (!IsNull (FormsetList, HiiFormsetLink)) { HiiFormsetNextLink =3D GetNextNode (FormsetList, HiiFormsetLink); @@ -731,15 +735,22 @@ GetStatementPrivateByConfigureLang ( HiiNextStatementLink =3D GetNextNode (&HiiFormPrivate->StatementLi= st, HiiStatementLink); HiiStatementPrivate =3D REDFISH_PLATFORM_CONFIG_STATEMENT_FROM_LI= NK (HiiStatementLink); =20 - DEBUG_CODE ( - STATIC UINTN Index =3D 0; - Index++; - DEBUG ((REDFISH_PLATFORM_CONFIG_DEBUG, "%a: [%d] search %s in QI= D: 0x%x form: 0x%x formset: %g\n", __func__, Index, ConfigureLang, HiiState= mentPrivate->QuestionId, HiiFormPrivate->Id, &HiiFormsetPrivate->Guid)); - ); - - if (HiiStatementPrivate->Description !=3D 0) { + if ((HiiStatementPrivate->Description !=3D 0) && + (RedfishPlatformConfigFeatureProp (REDFISH_PLATFORM_CONFIG_ALL= OW_SUPPRESSED) || !HiiStatementPrivate->Suppressed)) + { TmpString =3D HiiStatementPrivate->DescriptionStr; if (TmpString !=3D NULL) { + Index++; + DEBUG_REDFISH_THIS_MODULE ( + REDFISH_PLATFORM_CONFIG_DEBUG_CONFIG_LANG_SEARCH, + "%a: [%d] check %s in QID: 0x%x form: 0x%x formset: %g\n", + __func__, + Index, + ConfigureLang, + HiiStatementPrivate->QuestionId, + HiiFormPrivate->Id, + &HiiFormsetPrivate->Guid + ); if (HiiStrCmp (TmpString, ConfigureLang) =3D=3D 0) { return HiiStatementPrivate; } @@ -1022,7 +1033,7 @@ NewRedfishXuefiStringArray ( =20 **/ REDFISH_X_UEFI_STRING_DATABASE * -GetExitOrCreateXuefiStringDatabase ( +GetExistOrCreateXuefiStringDatabase ( IN REDFISH_PLATFORM_CONFIG_FORM_SET_PRIVATE *FormsetPrivate, IN EFI_HII_STRING_PACKAGE_HDR *HiiStringPackageHeader ) @@ -1031,8 +1042,6 @@ GetExitOrCreateXuefiStringDatabase ( BOOLEAN CreateNewOne; REDFISH_X_UEFI_STRING_DATABASE *XuefiRedfishStringDatabase; =20 - DEBUG ((DEBUG_INFO, "%a: Entry\n", __func__)); - CreateNewOne =3D TRUE; XuefiRedfishStringDatabase =3D NULL; if (!IsListEmpty (&FormsetPrivate->XuefiRedfishStringDatabase)) { @@ -1054,7 +1063,7 @@ GetExitOrCreateXuefiStringDatabase ( } =20 if (CreateNewOne) { - DEBUG ((REDFISH_PLATFORM_CONFIG_DEBUG, " Creating x-uefi-redfish (%a)= string database...\n", HiiStringPackageHeader->Language)); + DEBUG ((DEBUG_REDFISH_PLATFORM_CONFIG, " Creating x-uefi-redfish (%a)= string database...\n", HiiStringPackageHeader->Language)); XuefiRedfishStringDatabase =3D (REDFISH_X_UEFI_STRING_DATABASE *)Alloc= ateZeroPool (sizeof (REDFISH_X_UEFI_STRING_DATABASE)); if (XuefiRedfishStringDatabase =3D=3D NULL) { DEBUG ((DEBUG_ERROR, " Failed to allocate REDFISH_X_UEFI_STRING_DAT= ABASE.\n")); @@ -1073,7 +1082,7 @@ GetExitOrCreateXuefiStringDatabase ( } =20 DEBUG (( - REDFISH_PLATFORM_CONFIG_DEBUG, + DEBUG_REDFISH_PLATFORM_CONFIG, " x-uefi-redfish (%a):\n String array is added to XuefiRedfishSt= ringDatabase, total %d arrays now.\n", XuefiRedfishStringDatabase->XuefiRedfishLanguage, XuefiRedfishStringDatabase->StringsArrayBlocks @@ -1145,7 +1154,7 @@ RedfishXuefiStringInsertDatabase ( REDFISH_X_UEFI_STRING_DATABASE *XuefiRedfishStringDatabase; REDFISH_X_UEFI_STRINGS_ARRAY *ThisArray; =20 - XuefiRedfishStringDatabase =3D GetExitOrCreateXuefiStringDatabase (Forms= etPrivate, HiiStringPackageHeader); + XuefiRedfishStringDatabase =3D GetExistOrCreateXuefiStringDatabase (Form= setPrivate, HiiStringPackageHeader); if (XuefiRedfishStringDatabase =3D=3D NULL) { DEBUG ((DEBUG_ERROR, "%a: Failed to get REDFISH_X_UEFI_STRING_DATABASE= of x-uefi-redfish language %a.\n", __func__, HiiStringPackageHeader->Langu= age)); ReleaseXuefiStringDatabase (FormsetPrivate); @@ -1170,21 +1179,22 @@ RedfishXuefiStringInsertDatabase ( (ThisArray->ArrayEntryAddress + StringIdOffset)->StringId =3D StringId; (ThisArray->ArrayEntryAddress + StringIdOffset)->UcsString =3D StringTex= tPtr; =20 - DEBUG (( - REDFISH_PLATFORM_CONFIG_DEBUG, + DEBUG_REDFISH_THIS_MODULE ( + REDFISH_PLATFORM_CONFIG_DEBUG_STRING_DATABASE, " Insert string ID: (%d) to database\n x-uefi-string: \"%s\"\n = Language: %a.\n", StringId, StringTextPtr, HiiStringPackageHeader->Language - )); + ); return EFI_SUCCESS; } =20 /** Get x-uefi-redfish string and language by string ID. =20 - @param[in] FormsetPrivate Pointer to HII form-set private = instance. - @param[in] HiiStringPackageHeader HII string package header. + @param[in] FormsetPrivate Pointer to HII form-set private= instance. + @param[in] HiiStringPackageHeader HII string package header. + @param[out] TotalStringAdded Return the total strings added = to database. =20 @retval TRUE x-uefi-redfish string and ID map is inserted to database= . FALSE Something is wrong when insert x-uefi-redfish string and= ID map. @@ -1192,8 +1202,9 @@ RedfishXuefiStringInsertDatabase ( **/ BOOLEAN CreateXuefiLanguageStringIdMap ( - IN REDFISH_PLATFORM_CONFIG_FORM_SET_PRIVATE *FormsetPrivate, - IN EFI_HII_STRING_PACKAGE_HDR *HiiStringPackageHeader + IN REDFISH_PLATFORM_CONFIG_FORM_SET_PRIVATE *FormsetPrivate, + IN EFI_HII_STRING_PACKAGE_HDR *HiiStringPackageHeader, + OUT UINTN *TotalStringAdded ) { EFI_STATUS Status; @@ -1209,6 +1220,9 @@ CreateXuefiLanguageStringIdMap ( EFI_HII_SIBT_EXT2_BLOCK Ext2; UINT32 Length32; UINT8 *StringBlockInfo; + UINTN StringsAdded; + + StringsAdded =3D 0; =20 // // Parse the string blocks to get the string text and font. @@ -1280,6 +1294,8 @@ CreateXuefiLanguageStringIdMap ( DEBUG ((DEBUG_ERROR, "%a: Failed to insert x-uefi-redfish stri= ng %s.\n", __func__, StringTextPtr)); return FALSE; } + + StringsAdded++; } =20 BlockSize +=3D (Offset + HiiStrSize ((CHAR16 *)StringTextPtr)); @@ -1371,6 +1387,7 @@ CreateXuefiLanguageStringIdMap ( BlockHdr =3D (UINT8 *)(StringBlockInfo + BlockSize); } =20 + *TotalStringAdded =3D StringsAdded; return TRUE; } =20 @@ -1484,6 +1501,8 @@ BuildXUefiRedfishStringDatabase ( UINTN SupportedSchemaLangCount; CHAR8 **SupportedSchemaLang; BOOLEAN StringIdMapIsBuilt; + UINTN TotalStringsAdded; + UINTN NumberPackageStrings; =20 DEBUG ((DEBUG_INFO, "%a: Building x-uefi-redfish string database, HII Fo= rmset GUID - %g.\n", __func__, FormsetPrivate->Guid)); =20 @@ -1515,6 +1534,7 @@ BuildXUefiRedfishStringDatabase ( return; } =20 + TotalStringsAdded =3D 0; // // Finding the string package. // @@ -1539,14 +1559,18 @@ BuildXUefiRedfishStringDatabase ( AsciiStrLen (HiiStringPackageHeader->Language) ) =3D=3D 0) { - StringIdMapIsBuilt =3D CreateXuefiLanguageStringIdMap (Formset= Private, HiiStringPackageHeader); + StringIdMapIsBuilt =3D CreateXuefiLanguageStringIdMap (Formset= Private, HiiStringPackageHeader, &NumberPackageStrings); + if (StringIdMapIsBuilt) { + TotalStringsAdded +=3D NumberPackageStrings; + } + break; } } =20 if (StringIdMapIsBuilt =3D=3D FALSE) { if (AsciiStrStr (HiiStringPackageHeader->Language, X_UEFI_SCHEMA= _PREFIX) =3D=3D NULL) { - DEBUG ((REDFISH_PLATFORM_CONFIG_DEBUG, " No need to build x-u= efi-redfish string ID map for HII language %a\n", HiiStringPackageHeader->L= anguage)); + DEBUG ((DEBUG_REDFISH_PLATFORM_CONFIG, " No need to build x-u= efi-redfish string ID map for HII language %a\n", HiiStringPackageHeader->L= anguage)); } else { DEBUG ((DEBUG_ERROR, " Failed to build x-uefi-redfish string = ID map of HII language %a\n", HiiStringPackageHeader->Language)); } @@ -1556,6 +1580,8 @@ BuildXUefiRedfishStringDatabase ( PackageHeader =3D (EFI_HII_PACKAGE_HEADER *)((UINTN)PackageHeader = + PackageHeader->Length); } } + + DEBUG ((DEBUG_REDFISH_PLATFORM_CONFIG, " Total %d x-uefi-redfish config= language are added.\n", TotalStringsAdded)); } =20 /** @@ -1621,7 +1647,7 @@ LoadFormset ( FormsetPrivate->DevicePathStr =3D ConvertDevicePathToText (HiiFormSet->D= evicePath, FALSE, FALSE); Status =3D GetSupportedSchema (FormsetPrivate->Hi= iHandle, &FormsetPrivate->SupportedSchema); if (EFI_ERROR (Status)) { - DEBUG ((REDFISH_PLATFORM_CONFIG_DEBUG, "%a: No x-uefi-redfish configur= ation found on the formset - %g\n", __func__, FormsetPrivate->Guid)); + DEBUG ((DEBUG_REDFISH_PLATFORM_CONFIG, "%a: No x-uefi-redfish configur= ation found on the formset - %g\n", __func__, FormsetPrivate->Guid)); return EFI_UNSUPPORTED; // Can't build AttributeRegistry Meni path wit= h returning EFI_UNSUPPORTED. } else { // Building x-uefi-redfish string database @@ -1789,7 +1815,10 @@ LoadFormsetList ( InsertTailList (FormsetList, &FormsetPrivate->Link); =20 DEBUG_CODE ( + if (RedfishPlatformConfigDebugProp (REDFISH_PLATFORM_CONFIG_DEBUG_DUMP= _FORMSET)) { DumpFormsetList (FormsetList); + } + ); =20 return EFI_SUCCESS; @@ -1909,7 +1938,7 @@ NotifyFormsetUpdate ( if (TargetPendingList !=3D NULL) { TargetPendingList->IsDeleted =3D FALSE; DEBUG_CODE ( - DEBUG ((REDFISH_PLATFORM_CONFIG_DEBUG, "%a: HII handle: 0x%x is upda= ted\n", __func__, HiiHandle)); + DEBUG ((DEBUG_REDFISH_PLATFORM_CONFIG, "%a: HII handle: 0x%x is upda= ted\n", __func__, HiiHandle)); ); return EFI_SUCCESS; } @@ -1925,7 +1954,7 @@ NotifyFormsetUpdate ( InsertTailList (PendingList, &TargetPendingList->Link); =20 DEBUG_CODE ( - DEBUG ((REDFISH_PLATFORM_CONFIG_DEBUG, "%a: HII handle: 0x%x is create= d\n", __func__, HiiHandle)); + DEBUG ((DEBUG_REDFISH_PLATFORM_CONFIG, "%a: HII handle: 0x%x is create= d\n", __func__, HiiHandle)); ); =20 return EFI_SUCCESS; @@ -1962,7 +1991,7 @@ NotifyFormsetDeleted ( if (TargetPendingList !=3D NULL) { TargetPendingList->IsDeleted =3D TRUE; DEBUG_CODE ( - DEBUG ((REDFISH_PLATFORM_CONFIG_DEBUG, "%a: HII handle: 0x%x is upda= ted and deleted\n", __func__, HiiHandle)); + DEBUG ((DEBUG_REDFISH_PLATFORM_CONFIG, "%a: HII handle: 0x%x is upda= ted and deleted\n", __func__, HiiHandle)); ); return EFI_SUCCESS; } @@ -1978,7 +2007,7 @@ NotifyFormsetDeleted ( InsertTailList (PendingList, &TargetPendingList->Link); =20 DEBUG_CODE ( - DEBUG ((REDFISH_PLATFORM_CONFIG_DEBUG, "%a: HII handle: 0x%x is delete= d\n", __func__, HiiHandle)); + DEBUG ((DEBUG_REDFISH_PLATFORM_CONFIG, "%a: HII handle: 0x%x is delete= d\n", __func__, HiiHandle)); ); =20 return EFI_SUCCESS; @@ -2027,12 +2056,12 @@ ProcessPendingList ( // FormsetPrivate =3D GetFormsetPrivateByHiiHandle (Target->HiiHandle, = FormsetList); if (FormsetPrivate !=3D NULL) { - DEBUG ((REDFISH_PLATFORM_CONFIG_DEBUG, "%a: formset: %g is removed= because driver release HII resource it already\n", __func__, FormsetPrivat= e->Guid)); + DEBUG ((DEBUG_REDFISH_PLATFORM_CONFIG, "%a: formset: %g is removed= because driver release HII resource it already\n", __func__, FormsetPrivat= e->Guid)); RemoveEntryList (&FormsetPrivate->Link); ReleaseFormset (FormsetPrivate); FreePool (FormsetPrivate); } else { - DEBUG ((REDFISH_PLATFORM_CONFIG_DEBUG, "%a: formset on HII handle = 0x%x was removed already\n", __func__, Target->HiiHandle)); + DEBUG ((DEBUG_REDFISH_PLATFORM_CONFIG, "%a: formset on HII handle = 0x%x was removed already\n", __func__, Target->HiiHandle)); } } else { // @@ -2043,7 +2072,7 @@ ProcessPendingList ( // // HII formset already exist, release it and query again. // - DEBUG ((REDFISH_PLATFORM_CONFIG_DEBUG, "%a: formset: %g is updated= . Release current formset\n", __func__, &FormsetPrivate->Guid)); + DEBUG ((DEBUG_REDFISH_PLATFORM_CONFIG, "%a: formset: %g is updated= . Release current formset\n", __func__, &FormsetPrivate->Guid)); RemoveEntryList (&FormsetPrivate->Link); ReleaseFormset (FormsetPrivate); FreePool (FormsetPrivate); --=20 2.37.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#117126): https://edk2.groups.io/g/devel/message/117126 Mute This Topic: https://groups.io/mt/105159787/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-