From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Permerror (SPF Permanent Error: More than 10 MX records returned) identity=mailfrom; client-ip=134.134.136.24; helo=mga09.intel.com; envelope-from=siyuan.fu@intel.com; receiver=edk2-devel@lists.01.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) (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 A2FF32216D8C1 for ; Thu, 14 Dec 2017 16:28:26 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Dec 2017 16:33:06 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,402,1508828400"; d="scan'208";a="187116296" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by fmsmga006.fm.intel.com with ESMTP; 14 Dec 2017 16:33:06 -0800 Received: from fmsmsx156.amr.corp.intel.com (10.18.116.74) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.319.2; Thu, 14 Dec 2017 16:33:06 -0800 Received: from shsmsx104.ccr.corp.intel.com (10.239.4.70) by fmsmsx156.amr.corp.intel.com (10.18.116.74) with Microsoft SMTP Server (TLS) id 14.3.319.2; Thu, 14 Dec 2017 16:33:05 -0800 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.213]) by SHSMSX104.ccr.corp.intel.com ([169.254.5.152]) with mapi id 14.03.0319.002; Fri, 15 Dec 2017 08:33:04 +0800 From: "Fu, Siyuan" To: "Wang, Fan" , "edk2-devel@lists.01.org" CC: "Ye, Ting" , "Wang, Fan" , "Wu, Jiaxin" Thread-Topic: [edk2] [Patch 1/3 V2] MdeModulePkg: Update Api from NetLibDetectMedia to NetLibDetectMediaWaitTimeout. Thread-Index: AQHTdMFyR5aiabuEvk25GTCwKIUbd6NDjv3Q Date: Fri, 15 Dec 2017 00:33:03 +0000 Message-ID: References: <1513245190-8172-1-git-send-email-fan.wang@intel.com> <1513245190-8172-2-git-send-email-fan.wang@intel.com> In-Reply-To: <1513245190-8172-2-git-send-email-fan.wang@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_IC x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiNjY5MzMwYWYtNmM0MC00NDRhLWI4ZmQtYTg2ZTliZjhiZjNmIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjIuNS4xOCIsIlRydXN0ZWRMYWJlbEhhc2giOiJQS1VMK3ZYeTlHUGZnXC9rV1FuRUdzS1Z4aklSeHFkYkxIbVwvUnhYK2xHU3NSeHljdFRpQUlqUUV4ckpzc2YzZzcifQ== dlp-product: dlpe-windows dlp-version: 11.0.0.116 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [Patch 1/3 V2] 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: , X-List-Received-Date: Fri, 15 Dec 2017 00:28:26 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Fu Siyuan > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of > fanwang2 > Sent: Thursday, December 14, 2017 5:53 PM > To: edk2-devel@lists.01.org > Cc: Ye, Ting ; Wang, Fan ; Fu, > Siyuan ; Wu, Jiaxin > Subject: [edk2] [Patch 1/3 V2] MdeModulePkg: Update Api from > NetLibDetectMedia to NetLibDetectMediaWaitTimeout. >=20 > From: Wang Fan >=20 > V2: > *Define time period in a macro instead of hard code. >=20 > Cc: Ye Ting > Cc: Fu Siyuan > Cc: Wu Jiaxin > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Wang Fan > --- > MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c | 8 ++++---- > MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.h | 1 + > MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c | 8 ++++---- > MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c | 8 ++++---- > MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.h | 3 +++ > MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c | 8 ++++---- > MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.h | 1 + > 7 files changed, 21 insertions(+), 16 deletions(-) >=20 > diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c > b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c > index 8780414..aad6674 100644 > --- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c > +++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c > @@ -778,13 +778,13 @@ EfiDhcp4Start ( > IN EFI_EVENT CompletionEvent OPTIONAL > ) > { > DHCP_PROTOCOL *Instance; > DHCP_SERVICE *DhcpSb; > - BOOLEAN MediaPresent; > EFI_STATUS Status; > EFI_TPL OldTpl; > + EFI_STATUS MediaStatus; >=20 > // > // First validate the parameters > // > if (This =3D=3D NULL) { > @@ -811,13 +811,13 @@ EfiDhcp4Start ( > } >=20 > // > // Check Media Satus. > // > - MediaPresent =3D TRUE; > - NetLibDetectMedia (DhcpSb->Controller, &MediaPresent); > - if (!MediaPresent) { > + MediaStatus =3D EFI_SUCCESS; > + NetLibDetectMediaWaitTimeout (DhcpSb->Controller, > DHCP_CHECK_MEDIA_WAITING_TIME, &MediaStatus); > + if (MediaStatus !=3D EFI_SUCCESS) { > Status =3D EFI_NO_MEDIA; > goto ON_ERROR; > } >=20 > DhcpSb->IoStatus =3D EFI_ALREADY_STARTED; > diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.h > b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.h > index e546a08..2d66afe 100644 > --- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.h > +++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.h > @@ -41,10 +41,11 @@ typedef struct _DHCP_PROTOCOL DHCP_PROTOCOL; > #include "Dhcp4Io.h" >=20 > #define DHCP_SERVICE_SIGNATURE SIGNATURE_32 ('D', 'H', 'C', 'P') > #define DHCP_PROTOCOL_SIGNATURE SIGNATURE_32 ('d', 'h', 'c', 'p') >=20 > +#define DHCP_CHECK_MEDIA_WAITING_TIME EFI_TIMER_PERIOD_SECONDS(20) >=20 > // > // The state of the DHCP service. It starts as UNCONFIGED. If > // and active child configures the service successfully, it > // goes to CONFIGED. If the active child configures NULL, it > diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c > b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c > index 869a56a..976fe5d 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 > // > - MediaPresent =3D TRUE; > - NetLibDetectMedia (Controller, &MediaPresent); > - if (!MediaPresent) { > + MediaStatus =3D EFI_SUCCESS; > + NetLibDetectMediaWaitTimeout (Controller, > ISCSI_CHECK_MEDIA_GET_DHCP_WAITING_TIME, &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/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c > index 14f13f8..4317de2 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 > // > - MediaPresent =3D TRUE; > - NetLibDetectMedia (Private->Controller, &MediaPresent); > - if (!MediaPresent) { > + MediaStatus =3D EFI_SUCCESS; > + NetLibDetectMediaWaitTimeout (Private->Controller, > ISCSI_CHECK_MEDIA_LOGIN_WAITING_TIME, &MediaStatus); > + if (MediaStatus !=3D EFI_SUCCESS) { > return EFI_NO_MEDIA; > } >=20 > // > // Set session identifier > diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.h > b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.h > index 48b4e72..2f95323 100644 > --- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.h > +++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.h > @@ -40,10 +40,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, > EITHER EXPRESS OR IMPLIED. > #define DEFAULT_MAX_OUTSTANDING_R2T 1 >=20 > #define ISCSI_VERSION_MAX 0x00 > #define ISCSI_VERSION_MIN 0x00 >=20 > +#define ISCSI_CHECK_MEDIA_LOGIN_WAITING_TIME > EFI_TIMER_PERIOD_SECONDS(20) > +#define ISCSI_CHECK_MEDIA_GET_DHCP_WAITING_TIME > EFI_TIMER_PERIOD_SECONDS(20) > + > #define ISCSI_KEY_AUTH_METHOD "AuthMethod" > #define ISCSI_KEY_HEADER_DIGEST "HeaderDigest" > #define ISCSI_KEY_DATA_DIGEST "DataDigest" > #define ISCSI_KEY_MAX_CONNECTIONS "MaxConnections" > #define ISCSI_KEY_TARGET_NAME "TargetName" > diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c > b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c > index 4bfeaf3..825a22c 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 > @@ -2825,13 +2825,13 @@ EfiPxeLoadFile ( > } >=20 > // > // Check media status before PXE start > // > - MediaPresent =3D TRUE; > - NetLibDetectMedia (Private->Controller, &MediaPresent); > - if (!MediaPresent) { > + MediaStatus =3D EFI_SUCCESS; > + NetLibDetectMediaWaitTimeout (Private->Controller, > PXEBC_CHECK_MEDIA_WAITING_TIME, &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)) { > diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.h > b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.h > index 834c0d0..e96b6f2 100644 > --- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.h > +++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.h > @@ -55,10 +55,11 @@ typedef struct _PXEBC_PRIVATE_DATA PXEBC_PRIVATE_DAT= A; > #define PXEBC_MTFTP_RETRIES 6 > #define PXEBC_DEFAULT_UDP_OVERHEAD_SIZE 8 > #define PXEBC_DEFAULT_TFTP_OVERHEAD_SIZE 4 > #define PXEBC_DEFAULT_PACKET_SIZE 1480 > #define PXEBC_DEFAULT_LIFETIME 50000 // 50ms, unit is > microsecond > +#define PXEBC_CHECK_MEDIA_WAITING_TIME EFI_TIMER_PERIOD_SECONDS(20) >=20 > struct _PXEBC_PRIVATE_DATA { > UINT32 Signature; > EFI_HANDLE Controller; > EFI_HANDLE Image; > -- > 1.9.5.msysgit.1 >=20 > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel