From: "Fu, Siyuan" <siyuan.fu@intel.com>
To: "Wang, Fan" <fan.wang@intel.com>,
"edk2-devel@lists.01.org" <edk2-devel@lists.01.org>
Cc: "Ye, Ting" <ting.ye@intel.com>, "Wu, Jiaxin" <jiaxin.wu@intel.com>
Subject: Re: [Patch 1/3] NetworkPkg: Update Api from NetLibDetectMedia to NetLibDetectMediaWaitTimeout.
Date: Wed, 13 Dec 2017 01:43:31 +0000 [thread overview]
Message-ID: <B1FF2E9001CE9041BD10B825821D5BC58B3F3FB7@SHSMSX103.ccr.corp.intel.com> (raw)
In-Reply-To: <1513068842-4892-2-git-send-email-fan.wang@intel.com>
Hi, Fan
We'd better to define a macro for the timeout, instead of using 20 in each place.
BestRegards
Fu Siyuan
> -----Original Message-----
> From: Wang, Fan
> Sent: Tuesday, December 12, 2017 4:54 PM
> To: edk2-devel@lists.01.org
> Cc: Ye, Ting <ting.ye@intel.com>; Fu, Siyuan <siyuan.fu@intel.com>; Wu,
> Jiaxin <jiaxin.wu@intel.com>; Wang, Fan <fan.wang@intel.com>
> Subject: [Patch 1/3] NetworkPkg: Update Api from NetLibDetectMedia to
> NetLibDetectMediaWaitTimeout.
>
> Since new Api NetLibDetectMediaWaitTimeout was involved to support
> connecting
> state handling, and it is forward compatible. So apply this Api in Network.
>
> Cc: Ye Ting <ting.ye@intel.com>
> Cc: Fu Siyuan <siyuan.fu@intel.com>
> Cc: Wu Jiaxin <jiaxin.wu@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Wang Fan <fan.wang@intel.com>
> ---
> NetworkPkg/DnsDxe/DnsDhcp.c | 20 ++++++++++----------
> NetworkPkg/HttpBootDxe/HttpBootImpl.c | 10 +++++-----
> NetworkPkg/IScsiDxe/IScsiDhcp.c | 11 ++++++-----
> NetworkPkg/IScsiDxe/IScsiDhcp6.c | 11 ++++++-----
> NetworkPkg/IScsiDxe/IScsiProto.c | 8 ++++----
> NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c | 10 +++++-----
> 6 files changed, 36 insertions(+), 34 deletions(-)
>
> diff --git a/NetworkPkg/DnsDxe/DnsDhcp.c b/NetworkPkg/DnsDxe/DnsDhcp.c
> index 93779be..604047c 100644
> --- a/NetworkPkg/DnsDxe/DnsDhcp.c
> +++ b/NetworkPkg/DnsDxe/DnsDhcp.c
> @@ -267,11 +267,11 @@ GetDns4ServerFromDhcp4 (
> )
> {
> EFI_STATUS Status;
> EFI_HANDLE Image;
> EFI_HANDLE Controller;
> - BOOLEAN MediaPresent;
> + EFI_STATUS MediaStatus;
> EFI_HANDLE MnpChildHandle;
> EFI_MANAGED_NETWORK_PROTOCOL *Mnp;
> EFI_MANAGED_NETWORK_CONFIG_DATA MnpConfigData;
> EFI_HANDLE Dhcp4Handle;
> EFI_DHCP4_PROTOCOL *Dhcp4;
> @@ -312,15 +312,15 @@ GetDns4ServerFromDhcp4 (
> DnsServerInfor.ServerCount = DnsServerCount;
>
> IsDone = FALSE;
>
> //
> - // Check media.
> + // Check media status, wait no more than 20 seconds
> //
> - MediaPresent = TRUE;
> - NetLibDetectMedia (Controller, &MediaPresent);
> - if (!MediaPresent) {
> + MediaStatus = EFI_SUCCESS;
> + NetLibDetectMediaWaitTimeout (Controller, EFI_TIMER_PERIOD_SECONDS(20),
> &MediaStatus);
> + if (MediaStatus != EFI_SUCCESS) {
> return EFI_NO_MEDIA;
> }
>
> //
> // Create a Mnp child instance, get the protocol and config for it.
> @@ -618,11 +618,11 @@ GetDns6ServerFromDhcp6 (
> EFI_STATUS Status;
> EFI_STATUS TimerStatus;
> EFI_DHCP6_PACKET_OPTION *Oro;
> EFI_DHCP6_RETRANSMISSION InfoReqReXmit;
> EFI_EVENT Timer;
> - BOOLEAN MediaPresent;
> + EFI_STATUS MediaStatus;
> DNS6_SERVER_INFOR DnsServerInfor;
>
> Dhcp6Handle = NULL;
> Dhcp6 = NULL;
> Oro = NULL;
> @@ -631,15 +631,15 @@ GetDns6ServerFromDhcp6 (
> ZeroMem (&DnsServerInfor, sizeof (DNS6_SERVER_INFOR));
>
> DnsServerInfor.ServerCount = DnsServerCount;
>
> //
> - // Check media status before doing DHCP.
> + // Check media, wait no more than 20 seconds
> //
> - MediaPresent = TRUE;
> - NetLibDetectMedia (Controller, &MediaPresent);
> - if (!MediaPresent) {
> + MediaStatus = EFI_SUCCESS;
> + NetLibDetectMediaWaitTimeout (Controller, EFI_TIMER_PERIOD_SECONDS(20),
> &MediaStatus);
> + if (MediaStatus != EFI_SUCCESS) {
> return EFI_NO_MEDIA;
> }
>
> //
> // Create a DHCP6 child instance and get the protocol.
> diff --git a/NetworkPkg/HttpBootDxe/HttpBootImpl.c
> b/NetworkPkg/HttpBootDxe/HttpBootImpl.c
> index d591db5..05fea28 100644
> --- a/NetworkPkg/HttpBootDxe/HttpBootImpl.c
> +++ b/NetworkPkg/HttpBootDxe/HttpBootImpl.c
> @@ -546,11 +546,11 @@ HttpBootDxeLoadFile (
> IN VOID *Buffer OPTIONAL
> )
> {
> HTTP_BOOT_PRIVATE_DATA *Private;
> HTTP_BOOT_VIRTUAL_NIC *VirtualNic;
> - BOOLEAN MediaPresent;
> + EFI_STATUS MediaStatus;
> BOOLEAN UsingIpv6;
> EFI_STATUS Status;
> HTTP_BOOT_IMAGE_TYPE ImageType;
>
> if (This == NULL || BufferSize == NULL || FilePath == NULL) {
> @@ -566,15 +566,15 @@ HttpBootDxeLoadFile (
>
> VirtualNic = HTTP_BOOT_VIRTUAL_NIC_FROM_LOADFILE (This);
> Private = VirtualNic->Private;
>
> //
> - // Check media status before HTTP boot start
> + // Check media status before HTTP boot start, wait no more than 20
> seconds
> //
> - MediaPresent = TRUE;
> - NetLibDetectMedia (Private->Controller, &MediaPresent);
> - if (!MediaPresent) {
> + MediaStatus = EFI_SUCCESS;
> + NetLibDetectMediaWaitTimeout (Private->Controller,
> EFI_TIMER_PERIOD_SECONDS(20), &MediaStatus);
> + if (MediaStatus != EFI_SUCCESS) {
> AsciiPrint ("\n Error: Could not detect network connection.\n");
> return EFI_NO_MEDIA;
> }
>
> //
> diff --git a/NetworkPkg/IScsiDxe/IScsiDhcp.c
> b/NetworkPkg/IScsiDxe/IScsiDhcp.c
> index 309ce0d..6d25cde 100644
> --- a/NetworkPkg/IScsiDxe/IScsiDhcp.c
> +++ b/NetworkPkg/IScsiDxe/IScsiDhcp.c
> @@ -441,23 +441,24 @@ IScsiDoDhcp (
> EFI_DHCP4_PROTOCOL *Dhcp4;
> EFI_STATUS Status;
> EFI_DHCP4_PACKET_OPTION *ParaList;
> EFI_DHCP4_CONFIG_DATA Dhcp4ConfigData;
> ISCSI_SESSION_CONFIG_NVDATA *NvData;
> - BOOLEAN MediaPresent;
> + EFI_STATUS MediaStatus;
>
> Dhcp4Handle = NULL;
> Ip4Config2 = NULL;
> Dhcp4 = NULL;
> ParaList = NULL;
>
> //
> - // Check media status before doing DHCP.
> + // Check media status, no more than 20 seconds
> //
> - MediaPresent = TRUE;
> - NetLibDetectMedia (Controller, &MediaPresent);
> - if (!MediaPresent) {
> + MediaStatus = EFI_SUCCESS;
> + NetLibDetectMediaWaitTimeout (Controller, EFI_TIMER_PERIOD_SECONDS(20),
> &MediaStatus);
> + if (MediaStatus!= EFI_SUCCESS) {
> + AsciiPrint ("\n Error: Could not detect network connection.\n");
> return EFI_NO_MEDIA;
> }
>
> //
> // DHCP4 service allows only one of its children to be configured in
> diff --git a/NetworkPkg/IScsiDxe/IScsiDhcp6.c
> b/NetworkPkg/IScsiDxe/IScsiDhcp6.c
> index 06c634c..0d57704 100644
> --- a/NetworkPkg/IScsiDxe/IScsiDhcp6.c
> +++ b/NetworkPkg/IScsiDxe/IScsiDhcp6.c
> @@ -399,18 +399,19 @@ IScsiDoDhcp6 (
> EFI_STATUS Status;
> EFI_STATUS TimerStatus;
> EFI_DHCP6_PACKET_OPTION *Oro;
> EFI_DHCP6_RETRANSMISSION InfoReqReXmit;
> EFI_EVENT Timer;
> - BOOLEAN MediaPresent;
> + EFI_STATUS MediaStatus;
>
> //
> - // Check media status before doing DHCP.
> + // Check media status, no more than 20 seconds
> //
> - MediaPresent = TRUE;
> - NetLibDetectMedia (Controller, &MediaPresent);
> - if (!MediaPresent) {
> + MediaStatus = EFI_SUCCESS;
> + NetLibDetectMediaWaitTimeout (Controller, EFI_TIMER_PERIOD_SECONDS(20),
> &MediaStatus);
> + if (MediaStatus != EFI_SUCCESS) {
> + AsciiPrint ("\n Error: Could not detect network connection.\n");
> return EFI_NO_MEDIA;
> }
>
> //
> // iSCSI will only request target info from DHCPv6 server.
> diff --git a/NetworkPkg/IScsiDxe/IScsiProto.c
> b/NetworkPkg/IScsiDxe/IScsiProto.c
> index 1602a26..ccdd5df 100644
> --- a/NetworkPkg/IScsiDxe/IScsiProto.c
> +++ b/NetworkPkg/IScsiDxe/IScsiProto.c
> @@ -442,18 +442,18 @@ IScsiSessionLogin (
> EFI_STATUS Status;
> ISCSI_CONNECTION *Conn;
> VOID *Tcp;
> EFI_GUID *ProtocolGuid;
> UINT8 RetryCount;
> - BOOLEAN MediaPresent;
> + EFI_STATUS MediaStatus;
>
> //
> // Check media status before session login.
> //
> - MediaPresent = TRUE;
> - NetLibDetectMedia (Session->Private->Controller, &MediaPresent);
> - if (!MediaPresent) {
> + MediaStatus = EFI_SUCCESS;
> + NetLibDetectMediaWaitTimeout (Session->Private->Controller,
> EFI_TIMER_PERIOD_SECONDS(20), &MediaStatus);
> + if (MediaStatus != EFI_SUCCESS) {
> return EFI_NO_MEDIA;
> }
>
> //
> // Set session identifier
> diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c
> b/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c
> index ab9e494..7940cbe 100644
> --- a/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c
> +++ b/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c
> @@ -2345,11 +2345,11 @@ EfiPxeLoadFile (
> PXEBC_PRIVATE_DATA *Private;
> PXEBC_VIRTUAL_NIC *VirtualNic;
> EFI_PXE_BASE_CODE_PROTOCOL *PxeBc;
> BOOLEAN UsingIpv6;
> EFI_STATUS Status;
> - BOOLEAN MediaPresent;
> + EFI_STATUS MediaStatus;
>
> if (FilePath == NULL || !IsDevicePathEnd (FilePath)) {
> return EFI_INVALID_PARAMETER;
> }
>
> @@ -2369,15 +2369,15 @@ EfiPxeLoadFile (
> if (!BootPolicy) {
> return EFI_UNSUPPORTED;
> }
>
> //
> - // Check media status before PXE start
> + // Check media status before PXE start, wait no more than 20 seconds
> //
> - MediaPresent = TRUE;
> - NetLibDetectMedia (Private->Controller, &MediaPresent);
> - if (!MediaPresent) {
> + MediaStatus = EFI_SUCCESS;
> + NetLibDetectMediaWaitTimeout (Private->Controller,
> EFI_TIMER_PERIOD_SECONDS(20), &MediaStatus);
> + if (MediaStatus != EFI_SUCCESS) {
> return EFI_NO_MEDIA;
> }
>
> //
> // Check whether the virtual nic is using IPv6 or not.
> --
> 1.9.5.msysgit.1
next prev parent reply other threads:[~2017-12-13 1:38 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-12 8:53 [Patch 0/3] *** SUBJECT HERE *** fanwang2
2017-12-12 8:54 ` [Patch 1/3] NetworkPkg: Update Api from NetLibDetectMedia to NetLibDetectMediaWaitTimeout fanwang2
2017-12-13 1:43 ` Fu, Siyuan [this message]
2017-12-12 8:54 ` [Patch 2/3] MdeModulePkg: " fanwang2
2017-12-12 8:54 ` [Patch 3/3] ShellPkg: " fanwang2
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=B1FF2E9001CE9041BD10B825821D5BC58B3F3FB7@SHSMSX103.ccr.corp.intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox