1. Patchew
  2. EDK2
  3. View series

[edk2-devel] [PATCH] NetworkPkg/Library/DxeHttpIoLib: Http boot failure with no initializes timeout value.

GregX Yeh posted 1 patch 3 years, 3 months ago
Failed in applying to current master (apply log)
NetworkPkg/Library/DxeHttpIoLib/DxeHttpIoLib.c   | 1 +
NetworkPkg/Library/DxeHttpIoLib/DxeHttpIoLib.inf | 1 +
NetworkPkg/NetworkPkg.dec                        | 6 +++++-
3 files changed, 7 insertions(+), 1 deletion(-)
[edk2-devel] [PATCH] NetworkPkg/Library/DxeHttpIoLib: Http boot failure with no initializes timeout value.
Posted by GregX Yeh 3 years, 3 months ago 
https://bugzilla.tianocore.org/show_bug.cgi?id=3170
Using PcdHttpIoTimeout to set default timeout value to HttpIoLib.

Cc: Maciej Rabeda <maciej.rabeda@linux.intel.com>
Cc: Jiaxin Wu <jiaxin.wu@intel.com>
Cc: Siyuan Fu <siyuan.fu@intel.com>
Signed-off-by: GregX Yeh <gregx.yeh@intel.com>
---
 NetworkPkg/Library/DxeHttpIoLib/DxeHttpIoLib.c   | 1 +
 NetworkPkg/Library/DxeHttpIoLib/DxeHttpIoLib.inf | 1 +
 NetworkPkg/NetworkPkg.dec                        | 6 +++++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/NetworkPkg/Library/DxeHttpIoLib/DxeHttpIoLib.c b/NetworkPkg/Library/DxeHttpIoLib/DxeHttpIoLib.c
index 67583fb220..04b01adec5 100644
--- a/NetworkPkg/Library/DxeHttpIoLib/DxeHttpIoLib.c
+++ b/NetworkPkg/Library/DxeHttpIoLib/DxeHttpIoLib.c
@@ -189,6 +189,7 @@ HttpIoCreateIo (
   HttpIo->Http        = Http;
   HttpIo->Callback    = Callback;
   HttpIo->Context     = Context;
+  HttpIo->Timeout     = PcdGet32 (PcdHttpIoTimeout);
 
   if (ConfigData != NULL) {
     if (HttpIo->IpVersion == IP_VERSION_4) {
diff --git a/NetworkPkg/Library/DxeHttpIoLib/DxeHttpIoLib.inf b/NetworkPkg/Library/DxeHttpIoLib/DxeHttpIoLib.inf
index 25f5eb2ec6..347f8d5508 100644
--- a/NetworkPkg/Library/DxeHttpIoLib/DxeHttpIoLib.inf
+++ b/NetworkPkg/Library/DxeHttpIoLib/DxeHttpIoLib.inf
@@ -43,3 +43,4 @@
 
 [Pcd]
   gEfiNetworkPkgTokenSpaceGuid.PcdMaxHttpChunkTransfer  ## SOMETIMES_CONSUMES
+  gEfiNetworkPkgTokenSpaceGuid.PcdHttpIoTimeout         ## SOMETIMES_CONSUMES
diff --git a/NetworkPkg/NetworkPkg.dec b/NetworkPkg/NetworkPkg.dec
index 2d0d7fd2dc..87725674e9 100644
--- a/NetworkPkg/NetworkPkg.dec
+++ b/NetworkPkg/NetworkPkg.dec
@@ -3,7 +3,7 @@
 #
 # This package provides network modules that conform to UEFI 2.4 specification.
 #
-# Copyright (c) 2009 - 2019, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2009 - 2021, Intel Corporation. All rights reserved.<BR>
 # (C) Copyright 2015-2020 Hewlett Packard Enterprise Development LP<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -96,6 +96,10 @@
   ## The maximum size of total HTTP chunk transfer.
   # @Prompt Max size of total HTTP chunk transfer. the default value is 12MB.
   gEfiNetworkPkgTokenSpaceGuid.PcdMaxHttpChunkTransfer|0x0C00000|UINT32|0x0000000E
+  
+  ## The Timeout value of HTTP IO.
+  # @Prompt The Timeout value of HTTP Io. Default value is 5000.
+  gEfiNetworkPkgTokenSpaceGuid.PcdHttpIoTimeout|5000|UINT32|0x0000000F
 
 [PcdsFixedAtBuild, PcdsPatchableInModule]
   ## Indicates whether HTTP connections (i.e., unsecured) are permitted or not.
-- 
2.16.2.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#70371): https://edk2.groups.io/g/devel/message/70371
Mute This Topic: https://groups.io/mt/79696524/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] NetworkPkg/Library/DxeHttpIoLib: Http boot failure with no initializes timeout value.
Posted by Maciej Rabeda 3 years, 3 months ago 
Thanks for the patch!

Reviewed-by: Maciej Rabeda <maciej.rabeda@linux.intel.com>

On 15-Jan-21 07:22, GregX Yeh wrote:
> https://bugzilla.tianocore.org/show_bug.cgi?id=3170
> Using PcdHttpIoTimeout to set default timeout value to HttpIoLib.
>
> Cc: Maciej Rabeda <maciej.rabeda@linux.intel.com>
> Cc: Jiaxin Wu <jiaxin.wu@intel.com>
> Cc: Siyuan Fu <siyuan.fu@intel.com>
> Signed-off-by: GregX Yeh <gregx.yeh@intel.com>
> ---
>   NetworkPkg/Library/DxeHttpIoLib/DxeHttpIoLib.c   | 1 +
>   NetworkPkg/Library/DxeHttpIoLib/DxeHttpIoLib.inf | 1 +
>   NetworkPkg/NetworkPkg.dec                        | 6 +++++-
>   3 files changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/NetworkPkg/Library/DxeHttpIoLib/DxeHttpIoLib.c b/NetworkPkg/Library/DxeHttpIoLib/DxeHttpIoLib.c
> index 67583fb220..04b01adec5 100644
> --- a/NetworkPkg/Library/DxeHttpIoLib/DxeHttpIoLib.c
> +++ b/NetworkPkg/Library/DxeHttpIoLib/DxeHttpIoLib.c
> @@ -189,6 +189,7 @@ HttpIoCreateIo (
>     HttpIo->Http        = Http;
>     HttpIo->Callback    = Callback;
>     HttpIo->Context     = Context;
> +  HttpIo->Timeout     = PcdGet32 (PcdHttpIoTimeout);
>   
>     if (ConfigData != NULL) {
>       if (HttpIo->IpVersion == IP_VERSION_4) {
> diff --git a/NetworkPkg/Library/DxeHttpIoLib/DxeHttpIoLib.inf b/NetworkPkg/Library/DxeHttpIoLib/DxeHttpIoLib.inf
> index 25f5eb2ec6..347f8d5508 100644
> --- a/NetworkPkg/Library/DxeHttpIoLib/DxeHttpIoLib.inf
> +++ b/NetworkPkg/Library/DxeHttpIoLib/DxeHttpIoLib.inf
> @@ -43,3 +43,4 @@
>   
>   [Pcd]
>     gEfiNetworkPkgTokenSpaceGuid.PcdMaxHttpChunkTransfer  ## SOMETIMES_CONSUMES
> +  gEfiNetworkPkgTokenSpaceGuid.PcdHttpIoTimeout         ## SOMETIMES_CONSUMES
> diff --git a/NetworkPkg/NetworkPkg.dec b/NetworkPkg/NetworkPkg.dec
> index 2d0d7fd2dc..87725674e9 100644
> --- a/NetworkPkg/NetworkPkg.dec
> +++ b/NetworkPkg/NetworkPkg.dec
> @@ -3,7 +3,7 @@
>   #
>   # This package provides network modules that conform to UEFI 2.4 specification.
>   #
> -# Copyright (c) 2009 - 2019, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2009 - 2021, Intel Corporation. All rights reserved.<BR>
>   # (C) Copyright 2015-2020 Hewlett Packard Enterprise Development LP<BR>
>   #
>   # SPDX-License-Identifier: BSD-2-Clause-Patent
> @@ -96,6 +96,10 @@
>     ## The maximum size of total HTTP chunk transfer.
>     # @Prompt Max size of total HTTP chunk transfer. the default value is 12MB.
>     gEfiNetworkPkgTokenSpaceGuid.PcdMaxHttpChunkTransfer|0x0C00000|UINT32|0x0000000E
> +
> +  ## The Timeout value of HTTP IO.
> +  # @Prompt The Timeout value of HTTP Io. Default value is 5000.
> +  gEfiNetworkPkgTokenSpaceGuid.PcdHttpIoTimeout|5000|UINT32|0x0000000F
>   
>   [PcdsFixedAtBuild, PcdsPatchableInModule]
>     ## Indicates whether HTTP connections (i.e., unsecured) are permitted or not.



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#70572): https://edk2.groups.io/g/devel/message/70572
Mute This Topic: https://groups.io/mt/79696524/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] NetworkPkg/Library/DxeHttpIoLib: Http boot failure with no initializes timeout value.
Posted by Siyuan, Fu 3 years, 3 months ago 
This seems good with me. 

Reviewed-by: Siyuan Fu <siyuan.fu@intel.com>

> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Yeh, GregX
> Sent: 2021年1月15日 14:23
> To: devel@edk2.groups.io
> Cc: Maciej Rabeda <maciej.rabeda@linux.intel.com>; Wu, Jiaxin
> <jiaxin.wu@intel.com>; Fu, Siyuan <siyuan.fu@intel.com>
> Subject: [edk2-devel] [PATCH] NetworkPkg/Library/DxeHttpIoLib: Http boot
> failure with no initializes timeout value.
> 
> https://bugzilla.tianocore.org/show_bug.cgi?id=3170
> Using PcdHttpIoTimeout to set default timeout value to HttpIoLib.
> 
> Cc: Maciej Rabeda <maciej.rabeda@linux.intel.com>
> Cc: Jiaxin Wu <jiaxin.wu@intel.com>
> Cc: Siyuan Fu <siyuan.fu@intel.com>
> Signed-off-by: GregX Yeh <gregx.yeh@intel.com>
> ---
>  NetworkPkg/Library/DxeHttpIoLib/DxeHttpIoLib.c   | 1 +
>  NetworkPkg/Library/DxeHttpIoLib/DxeHttpIoLib.inf | 1 +
>  NetworkPkg/NetworkPkg.dec                        | 6 +++++-
>  3 files changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/NetworkPkg/Library/DxeHttpIoLib/DxeHttpIoLib.c
> b/NetworkPkg/Library/DxeHttpIoLib/DxeHttpIoLib.c
> index 67583fb220..04b01adec5 100644
> --- a/NetworkPkg/Library/DxeHttpIoLib/DxeHttpIoLib.c
> +++ b/NetworkPkg/Library/DxeHttpIoLib/DxeHttpIoLib.c
> @@ -189,6 +189,7 @@ HttpIoCreateIo (
>    HttpIo->Http        = Http;
>    HttpIo->Callback    = Callback;
>    HttpIo->Context     = Context;
> +  HttpIo->Timeout     = PcdGet32 (PcdHttpIoTimeout);
> 
>    if (ConfigData != NULL) {
>      if (HttpIo->IpVersion == IP_VERSION_4) {
> diff --git a/NetworkPkg/Library/DxeHttpIoLib/DxeHttpIoLib.inf
> b/NetworkPkg/Library/DxeHttpIoLib/DxeHttpIoLib.inf
> index 25f5eb2ec6..347f8d5508 100644
> --- a/NetworkPkg/Library/DxeHttpIoLib/DxeHttpIoLib.inf
> +++ b/NetworkPkg/Library/DxeHttpIoLib/DxeHttpIoLib.inf
> @@ -43,3 +43,4 @@
> 
>  [Pcd]
>    gEfiNetworkPkgTokenSpaceGuid.PcdMaxHttpChunkTransfer  ##
> SOMETIMES_CONSUMES
> +  gEfiNetworkPkgTokenSpaceGuid.PcdHttpIoTimeout         ##
> SOMETIMES_CONSUMES
> diff --git a/NetworkPkg/NetworkPkg.dec b/NetworkPkg/NetworkPkg.dec
> index 2d0d7fd2dc..87725674e9 100644
> --- a/NetworkPkg/NetworkPkg.dec
> +++ b/NetworkPkg/NetworkPkg.dec
> @@ -3,7 +3,7 @@
>  #
>  # This package provides network modules that conform to UEFI 2.4
> specification.
>  #
> -# Copyright (c) 2009 - 2019, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2009 - 2021, Intel Corporation. All rights reserved.<BR>
>  # (C) Copyright 2015-2020 Hewlett Packard Enterprise Development LP<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
> @@ -96,6 +96,10 @@
>    ## The maximum size of total HTTP chunk transfer.
>    # @Prompt Max size of total HTTP chunk transfer. the default value is 12MB.
> 
> gEfiNetworkPkgTokenSpaceGuid.PcdMaxHttpChunkTransfer|0x0C00000|UINT3
> 2|0x0000000E
> +
> +  ## The Timeout value of HTTP IO.
> +  # @Prompt The Timeout value of HTTP Io. Default value is 5000.
> +
> gEfiNetworkPkgTokenSpaceGuid.PcdHttpIoTimeout|5000|UINT32|0x0000000F
> 
>  [PcdsFixedAtBuild, PcdsPatchableInModule]
>    ## Indicates whether HTTP connections (i.e., unsecured) are permitted or not.
> --
> 2.16.2.windows.1
> 
> 
> 
> 
> 



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#70570): https://edk2.groups.io/g/devel/message/70570
Mute This Topic: https://groups.io/mt/79696524/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.