From: Wang Fan <fan.wang@intel.com>
V2:
*Define time period in a macro instead of hard code.
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>
---
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(-)
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;
//
// First validate the parameters
//
if (This == NULL) {
@@ -811,13 +811,13 @@ EfiDhcp4Start (
}
//
// Check Media Satus.
//
- MediaPresent = TRUE;
- NetLibDetectMedia (DhcpSb->Controller, &MediaPresent);
- if (!MediaPresent) {
+ MediaStatus = EFI_SUCCESS;
+ NetLibDetectMediaWaitTimeout (DhcpSb->Controller, DHCP_CHECK_MEDIA_WAITING_TIME, &MediaStatus);
+ if (MediaStatus != EFI_SUCCESS) {
Status = EFI_NO_MEDIA;
goto ON_ERROR;
}
DhcpSb->IoStatus = 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"
#define DHCP_SERVICE_SIGNATURE SIGNATURE_32 ('D', 'H', 'C', 'P')
#define DHCP_PROTOCOL_SIGNATURE SIGNATURE_32 ('d', 'h', 'c', 'p')
+#define DHCP_CHECK_MEDIA_WAITING_TIME EFI_TIMER_PERIOD_SECONDS(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;
Dhcp4Handle = NULL;
Dhcp4 = NULL;
ParaList = NULL;
//
// Check media status before do DHCP
//
- MediaPresent = TRUE;
- NetLibDetectMedia (Controller, &MediaPresent);
- if (!MediaPresent) {
+ MediaStatus = EFI_SUCCESS;
+ NetLibDetectMediaWaitTimeout (Controller, ISCSI_CHECK_MEDIA_GET_DHCP_WAITING_TIME, &MediaStatus);
+ if (MediaStatus != EFI_SUCCESS) {
return EFI_NO_MEDIA;
}
//
// 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;
Session = &Private->Session;
//
// Check media status before session login
//
- MediaPresent = TRUE;
- NetLibDetectMedia (Private->Controller, &MediaPresent);
- if (!MediaPresent) {
+ MediaStatus = EFI_SUCCESS;
+ NetLibDetectMediaWaitTimeout (Private->Controller, ISCSI_CHECK_MEDIA_LOGIN_WAITING_TIME, &MediaStatus);
+ if (MediaStatus != EFI_SUCCESS) {
return EFI_NO_MEDIA;
}
//
// 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
#define ISCSI_VERSION_MAX 0x00
#define ISCSI_VERSION_MIN 0x00
+#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;
if (FilePath == NULL || !IsDevicePathEnd (FilePath)) {
return EFI_INVALID_PARAMETER;
}
@@ -2825,13 +2825,13 @@ EfiPxeLoadFile (
}
//
// Check media status before PXE start
//
- MediaPresent = TRUE;
- NetLibDetectMedia (Private->Controller, &MediaPresent);
- if (!MediaPresent) {
+ MediaStatus = EFI_SUCCESS;
+ NetLibDetectMediaWaitTimeout (Private->Controller, PXEBC_CHECK_MEDIA_WAITING_TIME, &MediaStatus);
+ if (MediaStatus != EFI_SUCCESS) {
return EFI_NO_MEDIA;
}
Status = PxeBc->Start (PxeBc, FALSE);
if (EFI_ERROR (Status) && (Status != 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_DATA;
#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)
struct _PXEBC_PRIVATE_DATA {
UINT32 Signature;
EFI_HANDLE Controller;
EFI_HANDLE Image;
--
1.9.5.msysgit.1
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>
> -----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 <ting.ye@intel.com>; Wang, Fan <fan.wang@intel.com>; Fu,
> Siyuan <siyuan.fu@intel.com>; Wu, Jiaxin <jiaxin.wu@intel.com>
> Subject: [edk2] [Patch 1/3 V2] MdeModulePkg: Update Api from
> NetLibDetectMedia to NetLibDetectMediaWaitTimeout.
>
> From: Wang Fan <fan.wang@intel.com>
>
> V2:
> *Define time period in a macro instead of hard code.
>
> 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>
> ---
> 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(-)
>
> 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;
>
> //
> // First validate the parameters
> //
> if (This == NULL) {
> @@ -811,13 +811,13 @@ EfiDhcp4Start (
> }
>
> //
> // Check Media Satus.
> //
> - MediaPresent = TRUE;
> - NetLibDetectMedia (DhcpSb->Controller, &MediaPresent);
> - if (!MediaPresent) {
> + MediaStatus = EFI_SUCCESS;
> + NetLibDetectMediaWaitTimeout (DhcpSb->Controller,
> DHCP_CHECK_MEDIA_WAITING_TIME, &MediaStatus);
> + if (MediaStatus != EFI_SUCCESS) {
> Status = EFI_NO_MEDIA;
> goto ON_ERROR;
> }
>
> DhcpSb->IoStatus = 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"
>
> #define DHCP_SERVICE_SIGNATURE SIGNATURE_32 ('D', 'H', 'C', 'P')
> #define DHCP_PROTOCOL_SIGNATURE SIGNATURE_32 ('d', 'h', 'c', 'p')
>
> +#define DHCP_CHECK_MEDIA_WAITING_TIME EFI_TIMER_PERIOD_SECONDS(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;
>
> Dhcp4Handle = NULL;
> Dhcp4 = NULL;
> ParaList = NULL;
>
> //
> // Check media status before do DHCP
> //
> - MediaPresent = TRUE;
> - NetLibDetectMedia (Controller, &MediaPresent);
> - if (!MediaPresent) {
> + MediaStatus = EFI_SUCCESS;
> + NetLibDetectMediaWaitTimeout (Controller,
> ISCSI_CHECK_MEDIA_GET_DHCP_WAITING_TIME, &MediaStatus);
> + if (MediaStatus != EFI_SUCCESS) {
> return EFI_NO_MEDIA;
> }
>
> //
> // 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;
>
> Session = &Private->Session;
>
> //
> // Check media status before session login
> //
> - MediaPresent = TRUE;
> - NetLibDetectMedia (Private->Controller, &MediaPresent);
> - if (!MediaPresent) {
> + MediaStatus = EFI_SUCCESS;
> + NetLibDetectMediaWaitTimeout (Private->Controller,
> ISCSI_CHECK_MEDIA_LOGIN_WAITING_TIME, &MediaStatus);
> + if (MediaStatus != EFI_SUCCESS) {
> return EFI_NO_MEDIA;
> }
>
> //
> // 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
>
> #define ISCSI_VERSION_MAX 0x00
> #define ISCSI_VERSION_MIN 0x00
>
> +#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;
>
> if (FilePath == NULL || !IsDevicePathEnd (FilePath)) {
> return EFI_INVALID_PARAMETER;
> }
>
> @@ -2825,13 +2825,13 @@ EfiPxeLoadFile (
> }
>
> //
> // Check media status before PXE start
> //
> - MediaPresent = TRUE;
> - NetLibDetectMedia (Private->Controller, &MediaPresent);
> - if (!MediaPresent) {
> + MediaStatus = EFI_SUCCESS;
> + NetLibDetectMediaWaitTimeout (Private->Controller,
> PXEBC_CHECK_MEDIA_WAITING_TIME, &MediaStatus);
> + if (MediaStatus != EFI_SUCCESS) {
> return EFI_NO_MEDIA;
> }
>
> Status = PxeBc->Start (PxeBc, FALSE);
> if (EFI_ERROR (Status) && (Status != 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_DATA;
> #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)
>
> struct _PXEBC_PRIVATE_DATA {
> UINT32 Signature;
> EFI_HANDLE Controller;
> EFI_HANDLE Image;
> --
> 1.9.5.msysgit.1
>
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
© 2016 - 2024 Red Hat, Inc.