From nobody Mon May 6 01:25:02 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+97324+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1670975571349380.5921228454513; Tue, 13 Dec 2022 15:52:51 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id fvPxYY1788612x8lPjCSExSQ; Tue, 13 Dec 2022 15:52:51 -0800 X-Received: from NAM11-CO1-obe.outbound.protection.outlook.com (NAM11-CO1-obe.outbound.protection.outlook.com [40.107.220.76]) by mx.groups.io with SMTP id smtpd.web11.37604.1670830512537428680 for ; Sun, 11 Dec 2022 23:35:12 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ckkTFq42O/VCUgnf0B3ym9BB62jjcAEKvucR2HeW0M5onAmaY4yc/yDTTFN1DikIEvIKSn3OcDb0xP7rjvSBCA8WjGFTe1PvO3cOVWrxvMWGmrvJunKqf4BUcpuk96AByz+ZTuh7p6AxLgaBTGaiy8VIvKMWHHp9XSrOtc+14tS5fFRBpBsFLAvD7P4KWTq0OK7CyxlHzZZEM3G6cvo8c11KK+R0JsPNWBwwvmwQ8mUuGk3yVL+f3vj/Tpci/X//aMpwbD8QiRTn0DNrpOjHEOtB7C3m5mzG3plouIVgGHxDDHqftFllhMBKMaZsXxXwARFjz4hysFg6Mi3SriwlQQ== 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=CltKUKGbegVfXGBEO+mP5TxfzbSE+QeqfmATkQbIQtk=; b=l0yF3Cq4IJQHu0dlxAPZcaC6dPuLXX9KZOoqt93Iktd/nURTnMZbsVeufGJy3rJAtYUb66gViSbMCSVvIdFjgOtYfW/Ml4upCU+aRk8CMpWpZ4y//+NkIHAPHmeZqD64Z8/zP0lQ3NrgpeKgUFFchboSf3Rij8HTPFQ7N0xxaS+g93fMUb0U+/pUs4LCroqw6YUiIhTP9DmV9E5qyaSAPygg7bivBW7LtGtPZJ67dD45otLn4/oHSHj1fwsTAs6Cp9/oiscmZ7AAQBlFWC47AiKJ9N5hSUBmlEBvCh1qKVYIie4gH/Ox1ZuvuBgrHCNShXgOYuycTcxXmRL92ssIyw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none X-Received: from BN9PR03CA0298.namprd03.prod.outlook.com (2603:10b6:408:f5::33) by IA1PR12MB6114.namprd12.prod.outlook.com (2603:10b6:208:3ea::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.19; Mon, 12 Dec 2022 07:35:10 +0000 X-Received: from BN8NAM11FT038.eop-nam11.prod.protection.outlook.com (2603:10b6:408:f5:cafe::f6) by BN9PR03CA0298.outlook.office365.com (2603:10b6:408:f5::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.19 via Frontend Transport; Mon, 12 Dec 2022 07:35:10 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+97324+1787277+3901457@groups.io; helo=mail02.groups.io; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C X-Received: from mail.nvidia.com (216.228.117.160) by BN8NAM11FT038.mail.protection.outlook.com (10.13.176.246) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5901.21 via Frontend Transport; Mon, 12 Dec 2022 07:35:10 +0000 X-Received: from rnnvmail202.nvidia.com (10.129.68.7) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Sun, 11 Dec 2022 23:34:58 -0800 X-Received: from rnnvmail203.nvidia.com (10.129.68.9) by rnnvmail202.nvidia.com (10.129.68.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Sun, 11 Dec 2022 23:34:58 -0800 X-Received: from localhost.localdomain (10.127.8.14) by mail.nvidia.com (10.129.68.9) with Microsoft SMTP Server id 15.2.986.36 via Frontend Transport; Sun, 11 Dec 2022 23:34:57 -0800 From: "Simon Wang via groups.io" To: CC: Simon Wang , Nickle Wang , "Abner Chang" , Igor Kulchytskyy , Nick Ramirez Subject: [edk2-devel] [PATCH v2] edk2-staging/RedfishClientPkg: Add Redfish.Settings support Date: Mon, 12 Dec 2022 15:34:08 +0800 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT038:EE_|IA1PR12MB6114:EE_ X-MS-Office365-Filtering-Correlation-Id: b1369b36-479f-4988-eb63-08dadc13663a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: /WJpkwLCQylwJ9njHKt33yQG603zy8L8ohx+LWfnPdxQyNBDDEAV0hb8YuRjbdvK938dwkjUj2cLiJLv15yqJ9RbvcYIKDsmO7dbCnyNF5cZYvA85KyBzmphaSCxA95VXVWwnRgp4xEHNnqgPhT+1+YAlZ4UMD4x7VaEeJioEDJzyu8ypuoiC/jLZ+7ti4aQXeXQCQS3/2qGdukOmumk4LdSbaHemxis4PENa4eEh+qKm91MwRbI3x7BbRUlCp/7T6I/3Ji6YoKffYBUSGEKxqgioxGQX5gcmUByZDkWmDimDB9BWMXoIlho2GjN3r7BsQ9dcp29IyRuCT+zZELj5wkcZHbXhHtVlnQXjhshmpHTwIK+SDAmUThIQzzu/gdOivaG2IpHnPz7LVDzlkzUbDdMqlS4C8bzqRvSCmdrsBlRG0SrIbcT2qw0DcQ8frxMkCWazF8MlQdVogdQZxIqMTb70VFC6mvW0kH0kpdDbvFXB0z/ihke/BMWyMTsaf09eDQyxKjKIiVvO7/15i/ypnNvygJXHJ2wuuzlIx9DyNkzc7+kN5LAHmZQwnPU8kcbu4SxwWw0+YzEWw0GFgj6pN7qxqBmbmDVFyexN5bxBP+SPGvG3fuw5JUYnjLejdirJwjDyC3V9znucZBPq5nxV5W+gpbwQ8+qBv6uEj3WGCvXq1hfNkZjK+we1Cqs84Fky9fzTlmxflyEN1PneUdQhQ== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Dec 2022 07:35:10.1942 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b1369b36-479f-4988-eb63-08dadc13663a X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.160];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT038.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6114 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,simowang@nvidia.com X-Gm-Message-State: DecjNKx5Srv2XNfutNjK6Fzvx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1670975571; bh=0aqr8uSFZJMITPazfqwSC56/olErezArzs0g4v09mrk=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=R3Fiu94Cz/lJOg63siC0UyycsEpJU7aulyTgrnv+SWg2vKRWhQhKPNeCettK2mjXEvM 3WU4dgRAHyX2zfQuVCorGsUEqN42nfNLndVvH03g2606Q8j9NliC/TQTtWqg0+djSZHMD uKfUf9mrvCYySw2f0d1gw1PS/0f1l2TVI8A= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1670975573536100002 Content-Type: text/plain; charset="utf-8" From: "Simon Wang" BIOS feature driver cannot recognize "@Redfish.Settings", decode it and get pending setting URI. So BIOS feature driver can consume pending setting from correct place. Signed-off-by: Simon Wang Cc: Nickle Wang Cc: Abner Chang Cc: Igor Kulchytskyy Cc: Nick Ramirez --- .../Features/Bios/v1_0_9/Dxe/BiosDxe.c | 216 +++++++++++------- .../v1_5_0/Dxe/ComputerSystemDxe.c | 3 +- .../Features/Memory/V1_7_1/Dxe/MemoryDxe.c | 3 +- .../Include/RedfishResourceCommon.h | 3 + 4 files changed, 137 insertions(+), 88 deletions(-) diff --git a/RedfishClientPkg/Features/Bios/v1_0_9/Dxe/BiosDxe.c b/RedfishC= lientPkg/Features/Bios/v1_0_9/Dxe/BiosDxe.c index a478061cdeb6..c436c323c590 100644 --- a/RedfishClientPkg/Features/Bios/v1_0_9/Dxe/BiosDxe.c +++ b/RedfishClientPkg/Features/Bios/v1_0_9/Dxe/BiosDxe.c @@ -2,6 +2,7 @@ Redfish feature driver implementation - Bios =20 (C) Copyright 2020-2022 Hewlett Packard Enterprise Development LP
+ Copyright (c) 2022, NVIDIA CORPORATION. All rights reserved. =20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -9,15 +10,15 @@ =20 #include "../Common/BiosCommon.h" =20 -extern REDFISH_RESOURCE_COMMON_PRIVATE *mRedfishResourcePrivate; + =20 EFI_STATUS HandleResource ( - IN REDFISH_RESOURCE_COMMON_PRIVATE *Private, - IN EFI_STRING Uri + IN REDFISH_RESOURCE_COMMON_PRIVATE *Private, + IN EFI_STRING Uri ); =20 -EFI_HANDLE medfishResourceConfigProtocolHandle; +EFI_HANDLE medfishResourceConfigProtocolHandle; =20 /** Provising redfish resource by given URI. @@ -33,16 +34,16 @@ EFI_HANDLE medfishResourceConfigProtocolHandle; **/ EFI_STATUS RedfishResourceProvisioningResource ( - IN EDKII_REDFISH_RESOURCE_CONFIG_PROTOCOL *This, - IN EFI_STRING Uri, - IN BOOLEAN PostMode + IN EDKII_REDFISH_RESOURCE_CONFIG_PROTOCOL *This, + IN EFI_STRING Uri, + IN BOOLEAN PostMode ) { - REDFISH_RESOURCE_COMMON_PRIVATE *Private; - EFI_STATUS Status; - REDFISH_RESPONSE Response; + REDFISH_RESOURCE_COMMON_PRIVATE *Private; + EFI_STATUS Status; + REDFISH_RESPONSE Response; =20 - if (This =3D=3D NULL || IS_EMPTY_STRING (Uri)) { + if ((This =3D=3D NULL) || IS_EMPTY_STRING (Uri)) { return EFI_INVALID_PARAMETER; } =20 @@ -60,7 +61,7 @@ RedfishResourceProvisioningResource ( return Status; } =20 - Private->Uri =3D Uri; + Private->Uri =3D Uri; Private->Payload =3D Response.Payload; ASSERT (Private->Payload !=3D NULL); =20 @@ -94,16 +95,22 @@ RedfishResourceProvisioningResource ( **/ EFI_STATUS RedfishResourceConsumeResource ( - IN EDKII_REDFISH_RESOURCE_CONFIG_PROTOCOL *This, - IN EFI_STRING Uri + IN EDKII_REDFISH_RESOURCE_CONFIG_PROTOCOL *This, + IN EFI_STRING Uri ) { - REDFISH_RESOURCE_COMMON_PRIVATE *Private; - EFI_STATUS Status; - REDFISH_RESPONSE Response; - CHAR8 *Etag; + REDFISH_RESOURCE_COMMON_PRIVATE *Private; + EFI_STATUS Status; + REDFISH_RESPONSE Response; + REDFISH_RESPONSE *ExpectedResponse; + REDFISH_RESPONSE RedfishSettingsResponse; + CHAR8 *Etag; + UINTN Index; + EDKII_JSON_VALUE JsonValue; + EFI_STRING RedfishSettingsUri; + CONST CHAR8 *RedfishSettingsUriKeys[] =3D { "@Redfi= sh.Settings", "SettingsObject", "@odata.id" }; =20 - if (This =3D=3D NULL || IS_EMPTY_STRING (Uri)) { + if ((This =3D=3D NULL) || IS_EMPTY_STRING (Uri)) { return EFI_INVALID_PARAMETER; } =20 @@ -119,8 +126,38 @@ RedfishResourceConsumeResource ( return Status; } =20 - Private->Uri =3D Uri; - Private->Payload =3D Response.Payload; + ExpectedResponse =3D &Response; + RedfishSettingsUri =3D NULL; + JsonValue =3D RedfishJsonInPayload (Response.Payload); + + // + // Seeking RedfishSettings URI link. + // + for (Index =3D 0; Index < ARRAY_SIZE (RedfishSettingsUriKeys); Index++) { + if (JsonValue =3D=3D NULL) { + break; + } + + JsonValue =3D JsonObjectGetValue (JsonValueGetObject (JsonValue), Redf= ishSettingsUriKeys[Index]); + } + + if (JsonValue !=3D NULL) { + // + // Verify RedfishSettings URI link is valid to retrieve resource or no= t. + // + RedfishSettingsUri =3D JsonValueGetUnicodeString (JsonValue); + + Status =3D GetResourceByUri (Private->RedfishService, RedfishSettingsU= ri, &RedfishSettingsResponse); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, "%a, @Redfish.Settings exists, get resource fro= m: %s failed\n", __FUNCTION__, RedfishSettingsUri)); + } else { + Uri =3D RedfishSettingsUri; + ExpectedResponse =3D &RedfishSettingsResponse; + } + } + + Private->Uri =3D Uri; + Private->Payload =3D ExpectedResponse->Payload; ASSERT (Private->Payload !=3D NULL); =20 Private->Json =3D JsonDumpString (RedfishJsonInPayload (Private->Payload= ), EDKII_JSON_COMPACT); @@ -129,8 +166,8 @@ RedfishResourceConsumeResource ( // // Find etag in HTTP response header // - Etag =3D NULL; - Status =3D GetEtagAndLocation (&Response, &Etag, NULL); + Etag =3D NULL; + Status =3D GetEtagAndLocation (ExpectedResponse, &Etag, NULL); if (EFI_ERROR (Status)) { DEBUG ((DEBUG_ERROR, "%a, failed to get ETag from HTTP header\n", __FU= NCTION__)); } @@ -153,12 +190,24 @@ RedfishResourceConsumeResource ( // Release resource // if (Private->Payload !=3D NULL) { - RedfishFreeResponse ( - Response.StatusCode, - Response.HeaderCount, - Response.Headers, - Response.Payload - ); + if (Response.Payload !=3D NULL) { + RedfishFreeResponse ( + Response.StatusCode, + Response.HeaderCount, + Response.Headers, + Response.Payload + ); + } + + if (RedfishSettingsResponse.Payload !=3D NULL) { + RedfishFreeResponse ( + RedfishSettingsResponse.StatusCode, + RedfishSettingsResponse.HeaderCount, + RedfishSettingsResponse.Headers, + RedfishSettingsResponse.Payload + ); + } + Private->Payload =3D NULL; } =20 @@ -185,13 +234,13 @@ RedfishResourceConsumeResource ( **/ EFI_STATUS RedfishResourceGetInfo ( - IN EDKII_REDFISH_RESOURCE_CONFIG_PROTOCOL *This, + IN EDKII_REDFISH_RESOURCE_CONFIG_PROTOCOL *This, OUT REDFISH_SCHEMA_INFO *Info ) { - REDFISH_RESOURCE_COMMON_PRIVATE *Private; + REDFISH_RESOURCE_COMMON_PRIVATE *Private; =20 - if (This =3D=3D NULL || Info =3D=3D NULL) { + if ((This =3D=3D NULL) || (Info =3D=3D NULL)) { return EFI_INVALID_PARAMETER; } =20 @@ -217,15 +266,15 @@ RedfishResourceGetInfo ( **/ EFI_STATUS RedfishResourceUpdate ( - IN EDKII_REDFISH_RESOURCE_CONFIG_PROTOCOL *This, - IN EFI_STRING Uri + IN EDKII_REDFISH_RESOURCE_CONFIG_PROTOCOL *This, + IN EFI_STRING Uri ) { - REDFISH_RESOURCE_COMMON_PRIVATE *Private; - EFI_STATUS Status; - REDFISH_RESPONSE Response; + REDFISH_RESOURCE_COMMON_PRIVATE *Private; + EFI_STATUS Status; + REDFISH_RESPONSE Response; =20 - if (This =3D=3D NULL || IS_EMPTY_STRING (Uri)) { + if ((This =3D=3D NULL) || IS_EMPTY_STRING (Uri)) { return EFI_INVALID_PARAMETER; } =20 @@ -241,7 +290,7 @@ RedfishResourceUpdate ( return Status; } =20 - Private->Uri =3D Uri; + Private->Uri =3D Uri; Private->Payload =3D Response.Payload; ASSERT (Private->Payload !=3D NULL); =20 @@ -286,15 +335,15 @@ RedfishResourceUpdate ( **/ EFI_STATUS RedfishResourceCheck ( - IN EDKII_REDFISH_RESOURCE_CONFIG_PROTOCOL *This, - IN EFI_STRING Uri + IN EDKII_REDFISH_RESOURCE_CONFIG_PROTOCOL *This, + IN EFI_STRING Uri ) { - REDFISH_RESOURCE_COMMON_PRIVATE *Private; - EFI_STATUS Status; - REDFISH_RESPONSE Response; + REDFISH_RESOURCE_COMMON_PRIVATE *Private; + EFI_STATUS Status; + REDFISH_RESPONSE Response; =20 - if (This =3D=3D NULL || IS_EMPTY_STRING (Uri)) { + if ((This =3D=3D NULL) || IS_EMPTY_STRING (Uri)) { return EFI_INVALID_PARAMETER; } =20 @@ -310,7 +359,7 @@ RedfishResourceCheck ( return Status; } =20 - Private->Uri =3D Uri; + Private->Uri =3D Uri; Private->Payload =3D Response.Payload; ASSERT (Private->Payload !=3D NULL); =20 @@ -354,18 +403,17 @@ RedfishResourceCheck ( @retval Others Some error happened. =20 **/ - EFI_STATUS RedfishResourceIdentify ( IN EDKII_REDFISH_RESOURCE_CONFIG_PROTOCOL *This, IN EFI_STRING Uri ) { - REDFISH_RESOURCE_COMMON_PRIVATE *Private; - EFI_STATUS Status; - REDFISH_RESPONSE Response; + REDFISH_RESOURCE_COMMON_PRIVATE *Private; + EFI_STATUS Status; + REDFISH_RESPONSE Response; =20 - if (This =3D=3D NULL || IS_EMPTY_STRING (Uri)) { + if ((This =3D=3D NULL) || IS_EMPTY_STRING (Uri)) { return EFI_INVALID_PARAMETER; } =20 @@ -381,7 +429,7 @@ RedfishResourceIdentify ( return Status; } =20 - Private->Uri =3D Uri; + Private->Uri =3D Uri; Private->Payload =3D Response.Payload; ASSERT (Private->Payload !=3D NULL); =20 @@ -392,6 +440,7 @@ RedfishResourceIdentify ( if (EFI_ERROR (Status)) { DEBUG ((DEBUG_ERROR, "%a, identify %s failed: %r\n", __FUNCTION__, Uri= , Status)); } + // // Release resource // @@ -413,7 +462,7 @@ RedfishResourceIdentify ( return Status; } =20 -EDKII_REDFISH_RESOURCE_CONFIG_PROTOCOL mRedfishResourceConfig =3D { +EDKII_REDFISH_RESOURCE_CONFIG_PROTOCOL mRedfishResourceConfig =3D { RedfishResourceProvisioningResource, RedfishResourceConsumeResource, RedfishResourceUpdate, @@ -441,10 +490,10 @@ EFI_STATUS EFIAPI RedfishResourceInit ( IN EDKII_REDFISH_CONFIG_HANDLER_PROTOCOL *This, - IN REDFISH_CONFIG_SERVICE_INFORMATION *RedfishConfigServiceInfo + IN REDFISH_CONFIG_SERVICE_INFORMATION *RedfishConfigServiceInfo ) { - REDFISH_RESOURCE_COMMON_PRIVATE *Private; + REDFISH_RESOURCE_COMMON_PRIVATE *Private; =20 Private =3D REDFISH_RESOURCE_COMMON_PRIVATE_DATA_FROM_CONFIG_PROTOCOL (T= his); =20 @@ -468,10 +517,10 @@ RedfishResourceInit ( EFI_STATUS EFIAPI RedfishResourceStop ( - IN EDKII_REDFISH_CONFIG_HANDLER_PROTOCOL *This + IN EDKII_REDFISH_CONFIG_HANDLER_PROTOCOL *This ) { - REDFISH_RESOURCE_COMMON_PRIVATE *Private; + REDFISH_RESOURCE_COMMON_PRIVATE *Private; =20 Private =3D REDFISH_RESOURCE_COMMON_PRIVATE_DATA_FROM_CONFIG_PROTOCOL (T= his); =20 @@ -493,7 +542,7 @@ RedfishResourceStop ( return EFI_SUCCESS; } =20 -EDKII_REDFISH_CONFIG_HANDLER_PROTOCOL mRedfishConfigHandler =3D { +EDKII_REDFISH_CONFIG_HANDLER_PROTOCOL mRedfishConfigHandler =3D { RedfishResourceInit, RedfishResourceStop }; @@ -506,10 +555,9 @@ EDKII_REDFISH_CONFIG_HANDLER_PROTOCOL mRedfishConfigHa= ndler =3D { **/ VOID EFIAPI -EfiRestJasonStructureProtocolIsReady - ( - IN EFI_EVENT Event, - IN VOID *Context +EfiRestJasonStructureProtocolIsReady ( + IN EFI_EVENT Event, + IN VOID *Context ) { EFI_STATUS Status; @@ -523,10 +571,10 @@ EfiRestJasonStructureProtocolIsReady } =20 Status =3D gBS->LocateProtocol ( - &gEfiRestJsonStructureProtocolGuid, - NULL, - (VOID **)&mRedfishResourcePrivate->JsonStructProtocol - ); + &gEfiRestJsonStructureProtocolGuid, + NULL, + (VOID **)&mRedfishResourcePrivate->JsonStructProtocol + ); if (EFI_ERROR (Status)) { DEBUG ((DEBUG_ERROR, "%a, failed to locate gEfiRestJsonStructureProtoc= olGuid: %r\n", __FUNCTION__, Status)); } @@ -550,7 +598,7 @@ RedfishResourceUnload ( ) { EFI_STATUS Status; - EDKII_REDFISH_CONFIG_HANDLER_PROTOCOL *ConfigHandler; + EDKII_REDFISH_CONFIG_HANDLER_PROTOCOL *ConfigHandler; =20 if (mRedfishResourcePrivate =3D=3D NULL) { return EFI_NOT_READY; @@ -564,12 +612,12 @@ RedfishResourceUnload ( Status =3D gBS->OpenProtocol ( ImageHandle, &gEdkIIRedfishConfigHandlerProtocolGuid, - (VOID **) &ConfigHandler, + (VOID **)&ConfigHandler, NULL, NULL, EFI_OPEN_PROTOCOL_BY_HANDLE_PROTOCOL ); - if (EFI_ERROR (Status) || ConfigHandler =3D=3D NULL) { + if (EFI_ERROR (Status) || (ConfigHandler =3D=3D NULL)) { return Status; } =20 @@ -612,10 +660,10 @@ RedfishResourceUnload ( EFI_STATUS EFIAPI RedfishExternalResourceResourceFeatureCallback ( - IN EDKII_REDFISH_FEATURE_PROTOCOL *This, - IN FEATURE_CALLBACK_ACTION FeatureAction, - IN VOID *Context, - IN OUT RESOURCE_INFORMATION_EXCHANGE *InformationExchange + IN EDKII_REDFISH_FEATURE_PROTOCOL *This, + IN FEATURE_CALLBACK_ACTION FeatureAction, + IN VOID *Context, + IN OUT RESOURCE_INFORMATION_EXCHANGE *InformationExchange ) { EFI_STATUS Status; @@ -647,11 +695,12 @@ RedfishExternalResourceResourceFeatureCallback ( // // Create the full URI from Redfish service root. // - ResourceUri =3D (EFI_STRING)AllocateZeroPool (MAX_URI_LENGTH * sizeof(CH= AR16)); + ResourceUri =3D (EFI_STRING)AllocateZeroPool (MAX_URI_LENGTH * sizeof (C= HAR16)); if (ResourceUri =3D=3D NULL) { DEBUG ((DEBUG_ERROR, "%a, Fail to allocate memory for full URI.\n", __= FUNCTION__)); return EFI_OUT_OF_RESOURCES; } + StrCatS (ResourceUri, MAX_URI_LENGTH, Private->RedfishVersion); StrCatS (ResourceUri, MAX_URI_LENGTH, InformationExchange->SendInformati= on.FullUri); =20 @@ -681,10 +730,9 @@ RedfishExternalResourceResourceFeatureCallback ( **/ VOID EFIAPI -EdkIIRedfishFeatureProtocolIsReady - ( - IN EFI_EVENT Event, - IN VOID *Context +EdkIIRedfishFeatureProtocolIsReady ( + IN EFI_EVENT Event, + IN VOID *Context ) { EFI_STATUS Status; @@ -699,10 +747,10 @@ EdkIIRedfishFeatureProtocolIsReady } =20 Status =3D gBS->LocateProtocol ( - &gEdkIIRedfishFeatureProtocolGuid, - NULL, - (VOID **)&FeatureProtocol - ); + &gEdkIIRedfishFeatureProtocolGuid, + NULL, + (VOID **)&FeatureProtocol + ); if (EFI_ERROR (Status)) { DEBUG ((DEBUG_ERROR, "%a, failed to locate gEdkIIRedfishFeatureProtoco= lGuid: %r\n", __FUNCTION__, Status)); gBS->CloseEvent (Event); @@ -744,8 +792,8 @@ RedfishResourceEntryPoint ( IN EFI_SYSTEM_TABLE *SystemTable ) { - EFI_STATUS Status; - VOID *Registration; + EFI_STATUS Status; + VOID *Registration; =20 if (mRedfishResourcePrivate !=3D NULL) { return EFI_ALREADY_STARTED; diff --git a/RedfishClientPkg/Features/ComputerSystem/v1_5_0/Dxe/ComputerSy= stemDxe.c b/RedfishClientPkg/Features/ComputerSystem/v1_5_0/Dxe/ComputerSys= temDxe.c index c2a638d7c05c..5f8308b2bdeb 100644 --- a/RedfishClientPkg/Features/ComputerSystem/v1_5_0/Dxe/ComputerSystemDxe= .c +++ b/RedfishClientPkg/Features/ComputerSystem/v1_5_0/Dxe/ComputerSystemDxe= .c @@ -2,6 +2,7 @@ Redfish feature driver implementation - ComputerSystem =20 (C) Copyright 2020-2022 Hewlett Packard Enterprise Development LP
+ Copyright (c) 2022, NVIDIA CORPORATION. All rights reserved. =20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -9,8 +10,6 @@ =20 #include "../Common/ComputerSystemCommon.h" =20 -extern REDFISH_RESOURCE_COMMON_PRIVATE *mRedfishResourcePrivate; - EFI_HANDLE medfishResourceConfigProtocolHandle; =20 /** diff --git a/RedfishClientPkg/Features/Memory/V1_7_1/Dxe/MemoryDxe.c b/Redf= ishClientPkg/Features/Memory/V1_7_1/Dxe/MemoryDxe.c index 0a9d344d6fe7..e43828f628fa 100644 --- a/RedfishClientPkg/Features/Memory/V1_7_1/Dxe/MemoryDxe.c +++ b/RedfishClientPkg/Features/Memory/V1_7_1/Dxe/MemoryDxe.c @@ -2,6 +2,7 @@ Redfish feature driver implementation - Memory =20 (C) Copyright 2020-2022 Hewlett Packard Enterprise Development LP
+ Copyright (c) 2022, NVIDIA CORPORATION. All rights reserved. =20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -9,8 +10,6 @@ =20 #include "../Common/MemoryCommon.h" =20 -extern REDFISH_RESOURCE_COMMON_PRIVATE *mRedfishResourcePrivate; - EFI_HANDLE medfishResourceConfigProtocolHandle; =20 /** diff --git a/RedfishClientPkg/Include/RedfishResourceCommon.h b/RedfishClie= ntPkg/Include/RedfishResourceCommon.h index af4b8091215f..9c001206cbf0 100644 --- a/RedfishClientPkg/Include/RedfishResourceCommon.h +++ b/RedfishClientPkg/Include/RedfishResourceCommon.h @@ -2,6 +2,7 @@ Redfish feature driver common header file. =20 (C) Copyright 2020-2022 Hewlett Packard Enterprise Development LP
+ Copyright (c) 2022, NVIDIA CORPORATION. All rights reserved. =20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -58,6 +59,8 @@ typedef struct _REDFISH_RESOURCE_COMMON_PRIVATE { EFI_STRING RedfishVersion; } REDFISH_RESOURCE_COMMON_PRIVATE; =20 +extern REDFISH_RESOURCE_COMMON_PRIVATE *mRedfishResourcePrivate; + #define REDFISH_RESOURCE_COMMON_PRIVATE_DATA_FROM_CONFIG_PROTOCOL(This) \ BASE_CR ((This), REDFISH_RESOURCE_COMMON_PRIVATE, ConfigHandler) =20 --=20 2.38.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 (#97324): https://edk2.groups.io/g/devel/message/97324 Mute This Topic: https://groups.io/mt/95656981/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-