From nobody Tue Jan 14 22:32:10 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1513068896276697.8147973270272; Tue, 12 Dec 2017 00:54:56 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 09E1D220EE10E; Tue, 12 Dec 2017 00:50:17 -0800 (PST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id CA93321B02825 for ; Tue, 12 Dec 2017 00:50:15 -0800 (PST) Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Dec 2017 00:54:54 -0800 Received: from fanwang2-hp.ccr.corp.intel.com ([10.239.9.33]) by orsmga006.jf.intel.com with ESMTP; 12 Dec 2017 00:54:53 -0800 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Permerror (SPF Permanent Error: More than 10 MX records returned) identity=mailfrom; client-ip=134.134.136.65; helo=mga03.intel.com; envelope-from=fan.wang@intel.com; receiver=edk2-devel@lists.01.org X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,394,1508828400"; d="scan'208";a="2130324" From: fanwang2 To: edk2-devel@lists.01.org Date: Tue, 12 Dec 2017 16:54:01 +0800 Message-Id: <1513068842-4892-3-git-send-email-fan.wang@intel.com> X-Mailer: git-send-email 1.9.5.msysgit.1 In-Reply-To: <1513068842-4892-1-git-send-email-fan.wang@intel.com> References: <1513068842-4892-1-git-send-email-fan.wang@intel.com> Subject: [edk2] [Patch 2/3] MdeModulePkg: Update Api from NetLibDetectMedia to NetLibDetectMediaWaitTimeout. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ye Ting , Wang Fan , Fu Siyuan , Wu Jiaxin MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Since new Api NetLibDetectMediaWaitTimeout was involved to support connecti= ng state handling, and it is forward compatible. So apply this Api in MdeModul= ePkg. Cc: Ye Ting Cc: Fu Siyuan Cc: Wu Jiaxin Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Wang Fan --- MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c | 10 +++++----- MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c | 10 +++++----- MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c b/MdeModul= ePkg/Universal/Network/IScsiDxe/IScsiDhcp.c index 869a56a..25b7e0a 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c @@ -358,23 +358,23 @@ IScsiDoDhcp ( EFI_HANDLE Dhcp4Handle; EFI_DHCP4_PROTOCOL *Dhcp4; EFI_STATUS Status; EFI_DHCP4_PACKET_OPTION *ParaList; EFI_DHCP4_CONFIG_DATA Dhcp4ConfigData; - BOOLEAN MediaPresent; + EFI_STATUS MediaStatus; UINT8 *Data; =20 Dhcp4Handle =3D NULL; Dhcp4 =3D NULL; ParaList =3D NULL; =20 // - // Check media status before do DHCP + // Check media status before do DHCP, wait no more than 20 seconds // - MediaPresent =3D TRUE; - NetLibDetectMedia (Controller, &MediaPresent); - if (!MediaPresent) { + MediaStatus =3D EFI_SUCCESS; + NetLibDetectMediaWaitTimeout (Controller, EFI_TIMER_PERIOD_SECONDS(20), = &MediaStatus); + if (MediaStatus !=3D EFI_SUCCESS) { return EFI_NO_MEDIA; } =20 // // Create a DHCP4 child instance and get the protocol. diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c b/MdeModu= lePkg/Universal/Network/IScsiDxe/IScsiProto.c index 14f13f8..3406bee 100644 --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c @@ -287,20 +287,20 @@ IScsiSessionLogin ( { EFI_STATUS Status; ISCSI_SESSION *Session; ISCSI_CONNECTION *Conn; EFI_TCP4_PROTOCOL *Tcp4; - BOOLEAN MediaPresent; + EFI_STATUS MediaStatus; =20 Session =3D &Private->Session; =20 // - // Check media status before session login + // Check media status before session login, wait no more than 20 seconds // - MediaPresent =3D TRUE; - NetLibDetectMedia (Private->Controller, &MediaPresent); - if (!MediaPresent) { + MediaStatus =3D EFI_SUCCESS; + NetLibDetectMediaWaitTimeout (Private->Controller, EFI_TIMER_PERIOD_SECO= NDS(20), &MediaStatus); + if (MediaStatus !=3D EFI_SUCCESS) { return EFI_NO_MEDIA; } =20 // // Set session identifier diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c b/MdeM= odulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c index 6d4f33f..da52310 100644 --- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c +++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c @@ -2799,11 +2799,11 @@ EfiPxeLoadFile ( PXEBC_PRIVATE_DATA *Private; EFI_PXE_BASE_CODE_PROTOCOL *PxeBc; BOOLEAN NewMakeCallback; EFI_STATUS Status; UINT64 TmpBufSize; - BOOLEAN MediaPresent; + EFI_STATUS MediaStatus; =20 if (FilePath =3D=3D NULL || !IsDevicePathEnd (FilePath)) { return EFI_INVALID_PARAMETER; } =20 @@ -2823,15 +2823,15 @@ EfiPxeLoadFile ( if (!BootPolicy) { return EFI_UNSUPPORTED; } =20 // - // Check media status before PXE start + // Check media status before PXE start, no more than 20 seconds // - MediaPresent =3D TRUE; - NetLibDetectMedia (Private->Controller, &MediaPresent); - if (!MediaPresent) { + MediaStatus =3D EFI_SUCCESS; + NetLibDetectMediaWaitTimeout (Private->Controller, EFI_TIMER_PERIOD_SECO= NDS(20), &MediaStatus); + if (MediaStatus !=3D EFI_SUCCESS) { return EFI_NO_MEDIA; } =20 Status =3D PxeBc->Start (PxeBc, FALSE); if (EFI_ERROR (Status) && (Status !=3D EFI_ALREADY_STARTED)) { --=20 1.9.5.msysgit.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel