From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-002e3701.pphosted.com (mx0b-002e3701.pphosted.com [148.163.143.35]) by mx.groups.io with SMTP id smtpd.web10.9130.1604651628990376608 for ; Fri, 06 Nov 2020 00:33:49 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@hpe.com header.s=pps0720 header.b=cdzjW/Kq; spf=pass (domain: hpe.com, ip: 148.163.143.35, mailfrom: prvs=057929b778=abner.chang@hpe.com) Received: from pps.filterd (m0134425.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 0A68UVQ9010583; Fri, 6 Nov 2020 08:33:30 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hpe.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=pps0720; bh=Hs9n+HY8S3J5KdjnMQER0vvPhnyLOQSa2OpxpbaHzA4=; b=cdzjW/Kq5o17yOJmFOKtU9VJR/AmGHN5E+xbMVky/ReIJ66autWwY2Pt1ZrZsIQPNIY2 j/MYN381CVR0qEuw8FTTSdcD19j7kzRpUf003v+wo6fUvEAv8tsyBEVUUnysEtlllMve 6yuAceNJv4kQJTO2Co0q1E/MgSw07VwbgroR07i/kV0T27A26M6sN4FSKFG1/RwVA7UY 3wfbvxbiTi2oNVbtDy8QB9a6DNRUghiFdpQKaAafwF2AZClCy7+TOJRNRNjZycdQNqi9 FDuthuZjO5UXN+6upN9Odq0UIaGGPwFMxogQatNbePQuJOchlBrRwVbne26G5uSPj5P4 Dw== Received: from g2t2352.austin.hpe.com (g2t2352.austin.hpe.com [15.233.44.25]) by mx0b-002e3701.pphosted.com with ESMTP id 34n2nqr6kx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 06 Nov 2020 08:33:30 +0000 Received: from g2t2360.austin.hpecorp.net (g2t2360.austin.hpecorp.net [16.196.225.135]) by g2t2352.austin.hpe.com (Postfix) with ESMTP id 50800AF; Fri, 6 Nov 2020 08:33:28 +0000 (UTC) Received: from abner-virtual-machine.asiapacific.hpqcorp.net (abner-virtual-machine.asiapacific.hpqcorp.net [15.119.210.153]) by g2t2360.austin.hpecorp.net (Postfix) with ESMTP id BBD7339; Fri, 6 Nov 2020 08:33:26 +0000 (UTC) From: "Abner Chang" To: devel@edk2.groups.io Cc: Michael D Kinney , Liming Gao , Zhiguang Liu , Nickle Wang , Peter O'Hanley Subject: [EFI Shell PATCH v2 1/2] MdePkg/Include: EFI Redfish Discover protocol Date: Fri, 6 Nov 2020 15:47:47 +0800 Message-Id: <20201106074748.21286-2-abner.chang@hpe.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201106074748.21286-1-abner.chang@hpe.com> References: <20201106074748.21286-1-abner.chang@hpe.com> X-HPE-SCL: -1 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.312,18.0.737 definitions=2020-11-06_02:2020-11-05,2020-11-06 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=2 lowpriorityscore=0 phishscore=0 malwarescore=0 spamscore=0 priorityscore=1501 bulkscore=0 impostorscore=0 adultscore=0 clxscore=1015 mlxscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2011060061 Move GUID definition of EFI Redfish Discover protocol to under MdePkg. With this we don't have dependency of RedfishPkg in ShellPkg. Signed-off-by: Abner Chang Cc: Michael D Kinney Cc: Liming Gao Cc: Zhiguang Liu Cc: Nickle Wang Cc: Peter O'Hanley --- .../Include/Protocol/RedfishDiscover.h | 42 ++++++++----------- MdePkg/MdePkg.dec | 3 ++ RedfishPkg/RedfishPkg.dec | 4 -- 3 files changed, 21 insertions(+), 28 deletions(-) rename {RedfishPkg => MdePkg}/Include/Protocol/RedfishDiscover.h (87%) diff --git a/RedfishPkg/Include/Protocol/RedfishDiscover.h b/MdePkg/Include/Protocol/RedfishDiscover.h similarity index 87% rename from RedfishPkg/Include/Protocol/RedfishDiscover.h rename to MdePkg/Include/Protocol/RedfishDiscover.h index 4c91605c4e..8fe23470e1 100644 --- a/RedfishPkg/Include/Protocol/RedfishDiscover.h +++ b/MdePkg/Include/Protocol/RedfishDiscover.h @@ -5,16 +5,13 @@ SPDX-License-Identifier: BSD-2-Clause-Patent + @par Revision Reference: + This Protocol is introduced in UEFI Specification 2.8 **/ #ifndef EFI_REDFISH_DISCOVER_PROTOCOL_H_ #define EFI_REDFISH_DISCOVER_PROTOCOL_H_ -#include -#include -#include -#include - // // GUID definitions // @@ -40,12 +37,9 @@ typedef UINT32 EFI_REDFISH_DISCOVER_FLAG; ///< 3 to 15. The corresponding duration is 8 to 2^15 seconds. ///< Duration is only valid when EFI_REDFISH_DISCOVER_KEEP_ALIVE ///< is set to 1. -#define EFI_REDFISH_DISCOVER_DURATION_BIT_POS 8 - typedef struct _EFI_REDFISH_DISCOVER_PROTOCOL EFI_REDFISH_DISCOVER_PROTOCOL; -typedef struct _EFI_REDFISH_DISCOVERED_INFORMATION EFI_REDFISH_DISCOVERED_INFORMATION; -typedef struct _EFI_REDFISH_DISCOVERED_INFORMATION { +typedef struct { EFI_HANDLE RedfishRestExHandle; ///< REST EX EFI handle associated with this Redfish service. BOOLEAN IsUdp6; ///< Indicates it's IP versino 6. EFI_IP_ADDRESS RedfishHostIpAddress; ///< IP address of Redfish service. @@ -57,7 +51,7 @@ typedef struct _EFI_REDFISH_DISCOVERED_INFORMATION { CHAR16 *Product; ///< Redfish service product name. CHAR16 *ProductVer; ///< Redfish service product version. BOOLEAN UseHttps; ///< Using HTTPS. -}; +} EFI_REDFISH_DISCOVERED_INFORMATION; typedef struct { EFI_STATUS Status; ///< Status of Redfish service discovery. @@ -75,7 +69,7 @@ typedef struct { EFI_IP_ADDRESS SubnetId; ///< Subnet ID. UINT8 SubnetPrefixLength; ///< Subnet prefix-length for IPv4 and IPv6. UINT16 VlanId; ///< VLAN ID. -} EFI_REDFISH_DISCOVER_NETWORK_INSTANCE; +} EFI_REDFISH_DISCOVER_NETWORK_INTERFACE; typedef struct { UINT32 Signature; ///< Token signature. @@ -112,10 +106,10 @@ typedef struct { typedef EFI_STATUS (EFIAPI *EFI_REDFISH_DISCOVER_NETWORK_LIST)( - IN EFI_REDFISH_DISCOVER_PROTOCOL *This, - IN EFI_HANDLE ImageHandle, - OUT UINTN *NumberOfNetworkInterfaces, - OUT EFI_REDFISH_DISCOVER_NETWORK_INSTANCE **NetworkInterfaces + IN EFI_REDFISH_DISCOVER_PROTOCOL *This, + IN EFI_HANDLE ImageHandle, + OUT UINTN *NumberOfNetworkInterfaces, + OUT EFI_REDFISH_DISCOVER_NETWORK_INTERFACE **NetworkInterfaces ); /** @@ -147,7 +141,7 @@ EFI_STATUS (EFIAPI *EFI_REDFISH_DISCOVER_ACQUIRE_SERVICE)( IN EFI_REDFISH_DISCOVER_PROTOCOL *This, IN EFI_HANDLE ImageHandle, - IN EFI_REDFISH_DISCOVER_NETWORK_INSTANCE *TargetNetworkInterface, + IN EFI_REDFISH_DISCOVER_NETWORK_INTERFACE *TargetNetworkInterface OPTIONAL, IN EFI_REDFISH_DISCOVER_FLAG Flags, IN EFI_REDFISH_DISCOVERED_TOKEN *Token ); @@ -155,8 +149,8 @@ EFI_STATUS /** This function aborts Redfish service discovery on the given network interface. - @param[in] This EFI_REDFISH_DISCOVER_PROTOCOL instance. - @param[in] TargetNetworkInterface Target NIC to do the discovery. + @param[in] This EFI_REDFISH_DISCOVER_PROTOCOL instance. + @param[in] TargetNetworkInterface Target NIC to do the discovery. @retval EFI_SUCCESS REST EX instance of discovered Redfish services are returned. @retval Others Fail to abort Redfish service discovery. @@ -165,15 +159,15 @@ EFI_STATUS typedef EFI_STATUS (EFIAPI *EFI_REDFISH_DISCOVER_ABORT_ACQUIRE)( - IN EFI_REDFISH_DISCOVER_PROTOCOL *This, - IN EFI_REDFISH_DISCOVER_NETWORK_INSTANCE *TargetNetworkInterface OPTIONAL + IN EFI_REDFISH_DISCOVER_PROTOCOL *This, + IN EFI_REDFISH_DISCOVER_NETWORK_INTERFACE *TargetNetworkInterface OPTIONAL ); /** This function releases Redfish services found by RedfishServiceAcquire(). @param[in] This EFI_REDFISH_DISCOVER_PROTOCOL instance. - @param[in] InstanceList The Redfish service to release. + @param[in] List The Redfish service to release. @retval EFI_SUCCESS REST EX instances of discovered Redfish are released. @retval Others Fail to remove the entry @@ -183,15 +177,15 @@ typedef EFI_STATUS (EFIAPI *EFI_REDFISH_DISCOVER_RELEASE_SERVICE)( IN EFI_REDFISH_DISCOVER_PROTOCOL *This, - IN EFI_REDFISH_DISCOVERED_LIST *InstanceList + IN EFI_REDFISH_DISCOVERED_LIST *List ); -typedef struct _EFI_REDFISH_DISCOVER_PROTOCOL { +struct _EFI_REDFISH_DISCOVER_PROTOCOL { EFI_REDFISH_DISCOVER_NETWORK_LIST GetNetworkInterfaceList; EFI_REDFISH_DISCOVER_ACQUIRE_SERVICE AcquireRedfishService; EFI_REDFISH_DISCOVER_ABORT_ACQUIRE AbortAcquireRedfishService; EFI_REDFISH_DISCOVER_RELEASE_SERVICE ReleaseRedfishService; -} EFI_REDFISH_DISCOVER_PROTOCOL; +}; extern EFI_GUID gEfiRestExProtocolGuid; extern EFI_GUID gEfiRestExServiceBindingProtocolGuid; diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec index 645f61b80e..839bcfe063 100644 --- a/MdePkg/MdePkg.dec +++ b/MdePkg/MdePkg.dec @@ -1858,6 +1858,9 @@ ## Include/Protocol/RestJsonStructure.h gEfiRestJsonStructureProtocolGuid = { 0xa9a048f6, 0x48a0, 0x4714, {0xb7, 0xda, 0xa9, 0xad,0x87, 0xd4, 0xda, 0xc9 }} + ## Include/Protocol/RedfishDiscover.h + gEfiRedfishDiscoverProtocolGuid = { 0x5db12509, 0x4550, 0x4347, { 0x96, 0xb3, 0x73, 0xc0, 0xff, 0x6e, 0x86, 0x9f }} + # # Protocols defined in Shell2.0 # diff --git a/RedfishPkg/RedfishPkg.dec b/RedfishPkg/RedfishPkg.dec index f12f83526c..65e21f6bd6 100644 --- a/RedfishPkg/RedfishPkg.dec +++ b/RedfishPkg/RedfishPkg.dec @@ -21,10 +21,6 @@ # Platform implementation-specific Redfish Host Interface. RedfishPlatformHostInterfaceLib|Include/Library/RedfishHostInterfaceLib.h -[Protocols] - ## Include/Protocol/RedfishDiscover.h - gEfiRedfishDiscoverProtocolGuid = { 0x5db12509, 0x4550, 0x4347, { 0x96, 0xb3, 0x73, 0xc0, 0xff, 0x6e, 0x86, 0x9f }} - [Guids] gEfiRedfishPkgTokenSpaceGuid = { 0x4fdbccb7, 0xe829, 0x4b4c, { 0x88, 0x87, 0xb2, 0x3f, 0xd7, 0x25, 0x4b, 0x85 }} -- 2.17.1