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 18CA1941C6F for ; Mon, 13 Nov 2023 17:24:28 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=vZu15ZJ5vXhluVB4v61q0EkT/T2m+LxdEl/+rgqiVRQ=; c=relaxed/simple; d=groups.io; h=ARC-Seal:ARC-Message-Signature:ARC-Authentication-Results:From:To:CC:Subject:Thread-Topic:Thread-Index:Date:Message-ID:Accept-Language:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Language:Content-Type:Content-Transfer-Encoding; s=20140610; t=1699896267; v=1; b=AOuWiBXsjRnszFIcbH6S32sr/DUjmv1zmKiecZZ4eINzf632EDuZQ0LUjh6MavgUM88O5CqA aUSFzbcPptapRUEPbMH58q0gSoLyLqh4GAh4v2PNG0syF/iOAxo7hSxnINSM1f6lzypYuM9E9cg KXHHoMzmO4Gcqe4cCvRvtkDk= X-Received: by 127.0.0.2 with SMTP id jh1JYY7687511xzHlbe9PAZl; Mon, 13 Nov 2023 09:24:27 -0800 X-Received: from NAM10-MW2-obe.outbound.protection.outlook.com (NAM10-MW2-obe.outbound.protection.outlook.com [40.107.94.57]) by mx.groups.io with SMTP id smtpd.web11.1248.1699896266602910378 for ; Mon, 13 Nov 2023 09:24:27 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=M2AzK00/UWjbnGFlQT0/U0vuMvHjo+uRTYbKifM5kk8FshZkf90sk9sZyxWb0j5DExO6agHswun6GmeUa/xSgZyyfj1gbs/0l+BwPXilNoA3JDP4Ddc69niYh7bjz4wOLtIFBSGvlOO5FaeFFtcDoJFHgALVzNqcnAhbKH/J4Frf40AsAKPvm/XBMP2/rbXgPyQPMgGrEVuNatycz0K/raP0SKCl09WHY4s0nBfUSXWwvCgGP6vo4mgxRpPUOHZvNrD/PtEELYfkZInXqOEUqkVvbJ4PzqcPpQo3DhEykUmTZDhfRpTbLgsGtiNp47Bc6IbTwf0ed9SAFgV/Um7QFw== 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=NI6DwN+01mynXdsb81p8gGwcsEjsJJdNP5tb+Ugdtdo=; b=MGoq4jsqIvOzSj6GN+FiOgRFAJVMqXTkGmItEoD4dxUQKHFbcBbheC3ELDgmYZJ+O2eC9zIMaP96kgpER42PKTjTKY60h+AE72cCp900NfU3HMbKIgb+uJEQbnoI3KIjCa7CQU4ogNKr6SzlkDpPGRAHvNIom1iDPC9qbCWD87J7mglGo+fBd9Qe09rv6Kxo7xNKP+OqGoKoy8svR1nAcLbqflM8++V22v2H+vCuhiLyAl1XJN3qM1LtXeQ8j/x6jF2dkC+O1TjiofJCcD43+WKHRxKHpykn6o4G8L3VHdl6PmaRiv8eDAVLaJ2B4dayKRkWAlAHtQ6bSrS9adeLgQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=ami.com; dmarc=pass action=none header.from=ami.com; dkim=pass header.d=ami.com; arc=none X-Received: from BLAPR10MB5185.namprd10.prod.outlook.com (2603:10b6:208:328::16) by CH2PR10MB4263.namprd10.prod.outlook.com (2603:10b6:610:a6::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.29; Mon, 13 Nov 2023 17:24:24 +0000 X-Received: from BLAPR10MB5185.namprd10.prod.outlook.com ([fe80::9dc0:d4e1:1d40:3e33]) by BLAPR10MB5185.namprd10.prod.outlook.com ([fe80::9dc0:d4e1:1d40:3e33%4]) with mapi id 15.20.6977.029; Mon, 13 Nov 2023 17:24:23 +0000 From: "Igor Kulchytskyy via groups.io" To: "devel@edk2.groups.io" CC: Abner Chang , Nickle Wang Subject: [edk2-devel] [PATCH 2/2] RedfishPkg: RedfishDiscoverDxe: Optimize the Redfish Discover flow Thread-Topic: [PATCH 2/2] RedfishPkg: RedfishDiscoverDxe: Optimize the Redfish Discover flow Thread-Index: AQHaFlY+IlOuOGHW5kGqdjHFJMIBEA== Date: Mon, 13 Nov 2023 17:24:23 +0000 Message-ID: <20231113172421.1912-1-igork@ami.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: BLAPR10MB5185:EE_|CH2PR10MB4263:EE_ x-ms-office365-filtering-correlation-id: e4080e64-0d37-4987-940a-08dbe46d6160 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam-message-info: HiICtAw3VwSbKz3f8f2Z72iaf7vSIj2rFdYl0Q7ILsaxCqG2dRBg/txv9w7G+J+CjAoCqyVCwoL+BwGCg8AAYS/O/Gvspx4p0fSdm3EpMp2Zpxn2dKBoigEJOELFfwaCBCBaS5me2gvII/u//U/EBpzqTFAgHWyRZPRX5hwnsrF5pEFhPrveAR1P1HWBdx6xox4OvNcR3NdhzC9Qwu6C6q0fA5/7BVb88HVYPigQ5prfESXFN0s/WmOdUMwIb+dpUHPSj+2FHtUDOzZeMEI0IfvCdtN0W21/U+npvOBbGcfktwiS/2Ci+6DFB0vhWoRdhgLxglAvtODyxC8g1SQFnTBKoVpZh8Q7c19fNXcqhflvtZd+N26JlXS7OEi0q22sFUnoCQlAE+fz+5TmsNNKOQU2+eWm1qytW+vHI4AgUmPt12YTBWeSmTMBPvvAU+fM/rGa7xaELqHUm/06qkZfbwh66qK6d7czRaWimQQAJqykUJjyN9bri/rh6u8Z0IKsCn3hEKOEX4/RV8fAxOBbrltMh3Ri9nU7J12Szl2zwiKNAh8HtrOGPvt3KWXBgljR7r1ic+cB3dRKRHt2biueYAR4YadMAERgC5UPzSHlR48= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?CqYlANq89y+lSZh4azfqL4XzkVwrpFRgZXpGVuBSHNLvWjayIWN5CgIjdG?= =?iso-8859-1?Q?Sz+8loInpBw670UbaqkDupsl0w6vzx6qG1BdnH6KqzDxwCijjSPkIojb/f?= =?iso-8859-1?Q?3ZVsuHqJ2OTN1Huq0oQ6fQeSlivI2xMtYnvS0/P/KIUM5ElK4u5lBGWg7l?= =?iso-8859-1?Q?uJy1p+nEiaxRC2tcM3V1DBbmSaqCNtU9BofOUxadB2U4BjU8MthI1+G0fR?= =?iso-8859-1?Q?g7CqIp7BHmje6vlVdPeMHJQy7kPqUJod+t37W9pjHob7smPghFEX04ODDZ?= =?iso-8859-1?Q?yiAThwhfYbp9iRMQUuJ4h5VNsIisYnVWeA7JvBprr7EWvAVQwNO7ht0WPd?= =?iso-8859-1?Q?QfZmVgIg158Pk3K8NBu5N+UyQD9wohZGdOzoSFqoaVWy+vwXH8w3Eku4Y5?= =?iso-8859-1?Q?eUbOydWTRYlQokj2+8WYQjvr69F78bssw+uPWHfNGIUdwEYbxhkVJKR0ZN?= =?iso-8859-1?Q?Pe1uXIOW6QsNQU7/T2Uf2UAhuwUOLPVqTwEpwFo9/JpRf0KRenl+dpxSLt?= =?iso-8859-1?Q?UHXaoMzsmxvYbN2tgdgWpTA7wx5ndaUXo6YiBxfEvEWCQA2PQimIcGj5mq?= =?iso-8859-1?Q?/4oRlRYS1tWnh3IFeAL8l6JKZ/F/ESSaIfGQju3ut0kP7awlJf3tnm0m5X?= =?iso-8859-1?Q?UP7Dmfm1upw+9zIJ/jeTZCvhAYtGfe7aVrWxl+Uk3x7DH/qxdMbML3cSth?= =?iso-8859-1?Q?jqqolQSJJSRuTH2ypELWJkP7avvH4stuxOchhM6wps1Cd2Aar96zrGfmsQ?= =?iso-8859-1?Q?g3TGCsZwJ5cjJPgpo5seqO1caSP4jUa3OxIvXDF8cDb/fmiars5vn9xVdS?= =?iso-8859-1?Q?wHi9Wm/lxDfWfXbynfbdz8IdyZYBqfDTdwePjKiSgKVM0JezfYUUyt1Wz+?= =?iso-8859-1?Q?Rm2yg1KDHYcYMd+Vt/4Fc4ur/e3JCjEnNdeyDL3AmB6ya8+2MXI9Bcf/Yp?= =?iso-8859-1?Q?K5AWBDisZBOkN2qDxpx6t1ujAPsVCMXm12OHhVZeQeUQR9zXuo/nitBbsy?= =?iso-8859-1?Q?01ywU70V9VDoqsn+o8BuIahN5bEFYqefscUz4Lu2VP1G75pl38G6UtjXtD?= =?iso-8859-1?Q?Hu0rR9z02DaQWzNu6Zs6Y64lB7ekXrVylZbm75buMzdF3y3/gaVWSCfajX?= =?iso-8859-1?Q?t9lfjTJ5Nf6NMfbtMacTdBgFxtAUzZ1zWeiIoUNuifWvFNXhD9nrR2W8dX?= =?iso-8859-1?Q?1xr1Npqz4RimkQ5bRnSpRPeF9mM7n0p9ybXaU7mjxpzRzz+SVCq9nFeNCw?= =?iso-8859-1?Q?Cm+5aEqyimstdbmanu7ZchWXEro2gQZ4cGdvsUulCqTFF4p0kGkyAPBsgi?= =?iso-8859-1?Q?fUZrJJf9Q4nenbTWvmlo77dNdsNoCqB2QHLqpp5ZG8BpgJACnai8Z+nU08?= =?iso-8859-1?Q?kNQYrYaqeAed9gy0LqkBGg/NROtH4GrRa47G6tn5jE/gjjD9X2Hg2wCLMj?= =?iso-8859-1?Q?ZhbJ2iOHicoi8aib6mQY5eSWOOSxjA8NHIJopaxvkR6ITwoPet1CoZFUk+?= =?iso-8859-1?Q?M1MXDhlgUhQzx2R+Aiw+cHEyfdzDLj/5Yo9MJM2hxOQFMuEYv9/+ImH9iP?= =?iso-8859-1?Q?ARbNufPbICgmbxgSvNmGN75xdS3+cqKyx9u8a2JDkN57Thnef5wWnBWosg?= =?iso-8859-1?Q?yBOkhYJALOo111VoiS9d/SIY1VYJ/O8W8Z?= MIME-Version: 1.0 X-OriginatorOrg: ami.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BLAPR10MB5185.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e4080e64-0d37-4987-940a-08dbe46d6160 X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Nov 2023 17:24:23.8815 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 27e97857-e15f-486c-b58e-86c2b3040f93 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: EeHWT01EZ5b1e2cULTgwVWAYuZ7n45bUYAX+QlyFwTXK1WZvOHuisi8eoWmteDQC X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR10MB4263 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 Reply-To: devel@edk2.groups.io,igork@ami.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: px2S1O7Ih986HtEtFoALuKHtx7686176AA= Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=AOuWiBXs; dmarc=none; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io Filter out the network interfaces which are not supported by Redfish Host Interface. Cc: Abner Chang Cc: Nickle Wang Signed-off-by: Igor Kulchytskyy --- .../RedfishDiscoverDxe/RedfishDiscoverDxe.c | 169 +++++++++++++----- 1 file changed, 120 insertions(+), 49 deletions(-) diff --git a/RedfishPkg/RedfishDiscoverDxe/RedfishDiscoverDxe.c b/RedfishPk= g/RedfishDiscoverDxe/RedfishDiscoverDxe.c index 0f622e05a9..3d514d7e4c 100644 --- a/RedfishPkg/RedfishDiscoverDxe/RedfishDiscoverDxe.c +++ b/RedfishPkg/RedfishDiscoverDxe/RedfishDiscoverDxe.c @@ -13,6 +13,12 @@ #include "RedfishDiscoverInternal.h" +#define MAC_COMPARE(ThisNetworkInterface, TargetNetworkInterface) (Compar= eMem ((VOID *)&ThisNetworkInterface->MacAddress, &TargetNetworkInterface->M= acAddress, ThisNetworkInterface->HwAddressSize)) +#define VALID_TCP6(TargetNetworkInterface, ThisNetworkInterface) (Target= NetworkInterface->IsIpv6 && (ThisNetworkInterface->NetworkProtocolType =3D= =3D ProtocolTypeTcp6)) +#define VALID_TCP4(TargetNetworkInterface, ThisNetworkInterface) (!Targe= tNetworkInterface->IsIpv6 && (ThisNetworkInterface->NetworkProtocolType =3D= =3D ProtocolTypeTcp4)) +#define IS_TCP4_MATCH(IpType) ((gRequ= iredProtocol[Index].ProtocolType =3D=3D ProtocolTypeTcp4) && (IpType !=3D R= EDFISH_HOST_INTERFACE_HOST_IP_ADDRESS_FORMAT_IP4)) +#define IS_TCP6_MATCH(IpType) ((gRequ= iredProtocol[Index].ProtocolType =3D=3D ProtocolTypeTcp6) && (IpType !=3D R= EDFISH_HOST_INTERFACE_HOST_IP_ADDRESS_FORMAT_IP6)) + LIST_ENTRY mRedfishDiscoverList; LIST_ENTRY mRedfishInstanceList; EFI_SMBIOS_PROTOCOL *mSmbios =3D NULL; @@ -322,9 +328,16 @@ GetTargetNetworkInterfaceInternal ( { EFI_REDFISH_DISCOVER_NETWORK_INTERFACE_INTERNAL *ThisNetworkInterface; + if (IsListEmpty (&mEfiRedfishDiscoverNetworkInterface)) { + return NULL; + } + ThisNetworkInterface =3D (EFI_REDFISH_DISCOVER_NETWORK_INTERFACE_INTERNA= L *)GetFirstNode (&mEfiRedfishDiscoverNetworkInterface); while (TRUE) { - if (CompareMem ((VOID *)&ThisNetworkInterface->MacAddress, &TargetNetw= orkInterface->MacAddress, ThisNetworkInterface->HwAddressSize) =3D=3D 0) { + if ((MAC_COMPARE (ThisNetworkInterface, TargetNetworkInterface) =3D=3D= 0) && + (VALID_TCP6 (TargetNetworkInterface, ThisNetworkInterface) || + VALID_TCP4 (TargetNetworkInterface, ThisNetworkInterface))) + { return ThisNetworkInterface; } @@ -354,6 +367,10 @@ GetTargetNetworkInterfaceInternalByController ( { EFI_REDFISH_DISCOVER_NETWORK_INTERFACE_INTERNAL *ThisNetworkInterface; + if (IsListEmpty (&mEfiRedfishDiscoverNetworkInterface)) { + return NULL; + } + ThisNetworkInterface =3D (EFI_REDFISH_DISCOVER_NETWORK_INTERFACE_INTERNA= L *)GetFirstNode (&mEfiRedfishDiscoverNetworkInterface); while (TRUE) { if (ThisNetworkInterface->OpenDriverControllerHandle =3D=3D Controller= Handle) { @@ -476,6 +493,42 @@ CheckIsIpVersion6 ( return FALSE; } +/** + This function returns the IP type supported by the Host Interface. + + @retval 00h is Unknown + 01h is Ipv4 + 02h is Ipv6 + +**/ +UINT8 +GetHiIpProtocolType ( + VOID + ) +{ + EFI_STATUS Status; + REDFISH_OVER_IP_PROTOCOL_DATA *Data; + REDFISH_INTERFACE_DATA *DeviceDescriptor; + + Data =3D NULL; + DeviceDescriptor =3D NULL; + if (mSmbios =3D=3D NULL) { + Status =3D gBS->LocateProtocol (&gEfiSmbiosProtocolGuid, NULL, (VOID *= *)&mSmbios); + if (EFI_ERROR (Status)) { + return REDFISH_HOST_INTERFACE_HOST_IP_ADDRESS_FORMAT_UNKNOWN; + } + } + + Status =3D RedfishGetHostInterfaceProtocolData (mSmbios, &DeviceDescript= or, &Data); // Search for SMBIOS type 42h + if (!EFI_ERROR (Status) && (Data !=3D NULL) && + (Data->HostIpAssignmentType =3D=3D RedfishHostIpAssignmentStatic)) + { + return Data->HostIpAddressFormat; + } + + return REDFISH_HOST_INTERFACE_HOST_IP_ADDRESS_FORMAT_UNKNOWN; +} + /** This function discover Redfish service through SMBIOS host interface. @@ -512,6 +565,18 @@ DiscoverRedfishHostInterface ( Status =3D RedfishGetHostInterfaceProtocolData (mSmbios, &DeviceDescript= or, &Data); // Search for SMBIOS type 42h if (!EFI_ERROR (Status) && (Data !=3D NULL) && (DeviceDescriptor !=3D NU= LL)) { + if ((Instance->NetworkInterface->NetworkProtocolType =3D=3D ProtocolTy= peTcp4) && + (Data->HostIpAddressFormat !=3D REDFISH_HOST_INTERFACE_HOST_IP_ADD= RESS_FORMAT_IP4)) // IPv4 case + { + DEBUG ((DEBUG_ERROR, "%a: Network Interface is IPv4, but Host Interf= ace requires Ipv6\n", __func__)); + return EFI_UNSUPPORTED; + } else if ((Instance->NetworkInterface->NetworkProtocolType =3D=3D Pro= tocolTypeTcp6) && + (Data->HostIpAddressFormat !=3D REDFISH_HOST_INTERFACE_HOST= _IP_ADDRESS_FORMAT_IP6)) // IPv6 case + { + DEBUG ((DEBUG_ERROR, "%a: Network Interface is IPv6, but Host Interf= ace requires IPv4\n", __func__)); + return EFI_UNSUPPORTED; + } + // // Check if we can reach out Redfish service using this network interf= ace. // Check with MAC address using Device Descriptor Data Device Type 04 = and Type 05. @@ -1102,6 +1167,7 @@ RedfishServiceGetNetworkInterface ( OUT EFI_REDFISH_DISCOVER_NETWORK_INTERFACE **NetworkIntfInstances ) { + EFI_STATUS Status; EFI_REDFISH_DISCOVER_NETWORK_INTERFACE_INTERNAL *ThisNetworkInterfaceIn= tn; EFI_REDFISH_DISCOVER_NETWORK_INTERFACE *ThisNetworkInterface; EFI_REDFISH_DISCOVER_REST_EX_INSTANCE_INTERNAL *RestExInstance; @@ -1141,13 +1207,23 @@ RedfishServiceGetNetworkInterface ( ThisNetworkInterfaceIntn =3D (EFI_REDFISH_DISCOVER_NETWORK_INTERFACE_INT= ERNAL *)GetFirstNode (&mEfiRedfishDiscoverNetworkInterface); while (TRUE) { + // If Get Subnet Info failed then skip this interface + Status =3D NetworkInterfaceGetSubnetInfo (ThisNetworkInterfaceIntn, Im= ageHandle); // Get subnet info + if (EFI_ERROR (Status)) { + if (IsNodeAtEnd (&mEfiRedfishDiscoverNetworkInterface, &ThisNetworkI= nterfaceIntn->Entry)) { + break; + } + + ThisNetworkInterfaceIntn =3D (EFI_REDFISH_DISCOVER_NETWORK_INTERFACE= _INTERNAL *)GetNextNode (&mEfiRedfishDiscoverNetworkInterface, &ThisNetwork= InterfaceIntn->Entry); + continue; + } + ThisNetworkInterface->IsIpv6 =3D FALSE; if (CheckIsIpVersion6 (ThisNetworkInterfaceIntn)) { ThisNetworkInterface->IsIpv6 =3D TRUE; } CopyMem ((VOID *)&ThisNetworkInterface->MacAddress, &ThisNetworkInterf= aceIntn->MacAddress, ThisNetworkInterfaceIntn->HwAddressSize); - NetworkInterfaceGetSubnetInfo (ThisNetworkInterfaceIntn, ImageHandle);= // Get subnet info. if (!ThisNetworkInterface->IsIpv6) { IP4_COPY_ADDRESS (&ThisNetworkInterface->SubnetId.v4, &ThisNetworkIn= terfaceIntn->SubnetAddr.v4); // IPv4 subnet information. } else { @@ -1230,7 +1306,12 @@ RedfishServiceAcquireService ( if (TargetNetworkInterface !=3D NULL) { TargetNetworkInterfaceInternal =3D GetTargetNetworkInterfaceInternal (= TargetNetworkInterface); - NumNetworkInterfaces =3D 1; + if (TargetNetworkInterfaceInternal =3D=3D NULL) { + DEBUG ((DEBUG_ERROR, "%a:No network interface on platform.\n", __fun= c__)); + return EFI_UNSUPPORTED; + } + + NumNetworkInterfaces =3D 1; } else { TargetNetworkInterfaceInternal =3D (EFI_REDFISH_DISCOVER_NETWORK_INTER= FACE_INTERNAL *)GetFirstNode (&mEfiRedfishDiscoverNetworkInterface); NumNetworkInterfaces =3D NumberOfNetworkInterface (); @@ -1260,7 +1341,13 @@ RedfishServiceAcquireService ( // Get subnet information in case subnet information is not set beca= use // RedfishServiceGetNetworkInterfaces hasn't been called yet. // - NetworkInterfaceGetSubnetInfo (TargetNetworkInterfaceInternal, Image= Handle); + Status1 =3D NetworkInterfaceGetSubnetInfo (TargetNetworkInterfaceInt= ernal, ImageHandle); + if (EFI_ERROR (Status1)) { + DEBUG ((DEBUG_ERROR, "%a: Get subnet information fail.\n", __func_= _)); + FreePool (Instance); + continue; + } + NewInstance =3D TRUE; } @@ -1547,26 +1634,25 @@ TestForRequiredProtocols ( ControllerHandle, EFI_OPEN_PROTOCOL_TEST_PROTOCOL ); - if (EFI_ERROR (Status)) { - return EFI_UNSUPPORTED; - } - - Status =3D gBS->OpenProtocol ( - ControllerHandle, - gRequiredProtocol[Index].DiscoveredProtocolGuid, - (VOID **)&Id, - This->DriverBindingHandle, - ControllerHandle, - EFI_OPEN_PROTOCOL_GET_PROTOCOL - ); if (!EFI_ERROR (Status)) { - // Already installed - return EFI_UNSUPPORTED; + Status =3D gBS->OpenProtocol ( + ControllerHandle, + gRequiredProtocol[Index].DiscoveredProtocolGuid, + (VOID **)&Id, + This->DriverBindingHandle, + ControllerHandle, + EFI_OPEN_PROTOCOL_GET_PROTOCOL + ); + if (EFI_ERROR (Status)) { + if (Index =3D=3D ListCount - 1) { + DEBUG ((DEBUG_INFO, "%a: all required protocols are found on thi= s controller handle: %p.\n", __func__, ControllerHandle)); + return EFI_SUCCESS; + } + } } } - DEBUG ((DEBUG_MANAGEABILITY, "%a: all required protocols are found on th= is controller handle: %p.\n", __func__, ControllerHandle)); - return EFI_SUCCESS; + return EFI_UNSUPPORTED; } /** @@ -1601,10 +1687,22 @@ BuildupNetworkInterface ( EFI_REDFISH_DISCOVER_REST_EX_INSTANCE_INTERNAL *RestExInstance; EFI_TPL OldTpl; BOOLEAN NewNetworkInterfaceInst= alled; + UINT8 IpType; + UINTN ListCount; + ListCount =3D (sizeof (gRequiredProtocol) / sizeof (R= EDFISH_DISCOVER_REQUIRED_PROTOCOL)); NewNetworkInterfaceInstalled =3D FALSE; Index =3D 0; - do { + + // Get IP Type to filter out unnecessary network protocol if possible + IpType =3D GetHiIpProtocolType (); + + for (Index =3D 0; Index < ListCount; Index++) { + // Check IP Type and skip an unnecessary network protocol if does not = match + if (IS_TCP4_MATCH (IpType) || IS_TCP6_MATCH (IpType)) { + continue; + } + Status =3D gBS->OpenProtocol ( // Already in list? ControllerHandle, @@ -1615,11 +1713,6 @@ BuildupNetworkInterface ( EFI_OPEN_PROTOCOL_GET_PROTOCOL ); if (!EFI_ERROR (Status)) { - Index++; - if (Index =3D=3D (sizeof (gRequiredProtocol) / sizeof (REDFISH_DISCO= VER_REQUIRED_PROTOCOL))) { - break; - } - continue; } @@ -1632,11 +1725,6 @@ BuildupNetworkInterface ( EFI_OPEN_PROTOCOL_GET_PROTOCOL ); if (EFI_ERROR (Status)) { - Index++; - if (Index =3D=3D (sizeof (gRequiredProtocol) / sizeof (REDFISH_DISCO= VER_REQUIRED_PROTOCOL))) { - break; - } - continue; } @@ -1695,11 +1783,6 @@ BuildupNetworkInterface ( ProtocolDiscoverIdPtr ); if (EFI_ERROR (Status)) { - Index++; - if (Index =3D=3D (sizeof (gRequiredProtocol) / sizeof (REDFISH_DISCO= VER_REQUIRED_PROTOCOL))) { - break; - } - continue; } @@ -1756,25 +1839,13 @@ BuildupNetworkInterface ( } } else { DEBUG ((DEBUG_MANAGEABILITY, "%a: Not REST EX, continue with nex= t\n", __func__)); - Index++; - if (Index =3D=3D (sizeof (gRequiredProtocol) / sizeof (REDFISH_D= ISCOVER_REQUIRED_PROTOCOL))) { - break; - } - continue; } } return Status; - } else { - Index++; - if (Index =3D=3D (sizeof (gRequiredProtocol) / sizeof (REDFISH_DISCO= VER_REQUIRED_PROTOCOL))) { - break; - } - - continue; } - } while (Index < (sizeof (gRequiredProtocol) / sizeof (REDFISH_DISCOVER_= REQUIRED_PROTOCOL))); + } return EFI_DEVICE_ERROR; } -- 2.37.1.windows.1 -The information contained in this message may be confidential and propriet= ary to American Megatrends (AMI). This communication is intended to be read= only by the individual or entity to whom it is addressed or by their desig= nee. If the reader of this message is not the intended recipient, you are o= n notice that any distribution of this message, in any form, is strictly pr= ohibited. Please promptly notify the sender by reply e-mail or by telephone= at 770-246-8600, and then delete or destroy all copies of the transmission= . -=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 (#111171): https://edk2.groups.io/g/devel/message/111171 Mute This Topic: https://groups.io/mt/102566326/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-