[PATCH 0/3] Move MdeModulePkg/Include/Protocol/Dpc.h to NetworkPkg

[PATCH 0/3] Move MdeModulePkg/Include/Protocol/Dpc.h to NetworkPkg

[Zhang, Shenglei]

The file MdeModulePkg/Include/Protocol/Dpc.h is consumed
by the modules in NetworkPkg.
Hence, this protocol header file should be moved into NetworkPkg.
https://bugzilla.tianocore.org/show_bug.cgi?id=1949

Cc: Siyuan Fu <siyuan.fu@intel.com>
Cc: Jiaxin Wu <jiaxin.wu@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Hao A Wu <hao.a.wu@intel.com>
Shenglei Zhang (3):
  NetworkPkg: Add Dpc protocol
  NetworkPkg: Move Dpc.h from MdeModulePkg to NetworkPkg
  MdeModulePkg/MdeModulePkg.dec: Remove gEfiDpcProtocolGuid

 MdeModulePkg/MdeModulePkg.dec                       | 3 ---
 NetworkPkg/DpcDxe/DpcDxe.inf                        | 1 -
 {MdeModulePkg => NetworkPkg}/Include/Protocol/Dpc.h | 0
 NetworkPkg/Library/DxeDpcLib/DxeDpcLib.inf          | 1 -
 NetworkPkg/NetworkPkg.dec                           | 4 ++++
 5 files changed, 4 insertions(+), 5 deletions(-)
 rename {MdeModulePkg => NetworkPkg}/Include/Protocol/Dpc.h (100%)

-- 
2.18.0.windows.1

[PATCH 1/3] NetworkPkg: Add Dpc protocol

[Zhang, Shenglei]

To move Dpc.h from MdeModulePkg to NetworkPkg,
we need to introduce the Guid of protocol first.
https://bugzilla.tianocore.org/show_bug.cgi?id=1949

Cc: Siyuan Fu <siyuan.fu@intel.com>
Cc: Jiaxin Wu <jiaxin.wu@intel.com>
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
---
 NetworkPkg/NetworkPkg.dec | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/NetworkPkg/NetworkPkg.dec b/NetworkPkg/NetworkPkg.dec
index b260ea5b77c5..2bdb3f5663a2 100644
--- a/NetworkPkg/NetworkPkg.dec
+++ b/NetworkPkg/NetworkPkg.dec
@@ -70,6 +70,10 @@ [Guids]
   # Include/Guid/WifiConnectionManagerConfigHii.h
   gWifiConfigGuid               = { 0x9f94d327, 0x0b18, 0x4245, { 0x8f, 0xf2, 0x83, 0x2e, 0x30, 0xd, 0x2c, 0xef }}
 
+[Protocols]
+  ## Include/Protocol/Dpc.h
+  gEfiDpcProtocolGuid           = {0x480f8ae9, 0xc46, 0x4aa9,  { 0xbc, 0x89, 0xdb, 0x9f, 0xba, 0x61, 0x98, 0x6 }}
+
 [PcdsFixedAtBuild]
   ## The max attempt number will be created by iSCSI driver.
   # @Prompt Max attempt number.
-- 
2.18.0.windows.1

[PATCH 2/3] NetworkPkg: Move Dpc.h from MdeModulePkg to NetworkPkg

[Zhang, Shenglei]

Move Dpc.h from MdeModulePkg to NetworkPkg. And remove the
dependency on MdeModulePkg.dec in INFs.
https://bugzilla.tianocore.org/show_bug.cgi?id=1949

Cc: Siyuan Fu <siyuan.fu@intel.com>
Cc: Jiaxin Wu <jiaxin.wu@intel.com>
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
---
 NetworkPkg/DpcDxe/DpcDxe.inf                        | 1 -
 {MdeModulePkg => NetworkPkg}/Include/Protocol/Dpc.h | 0
 NetworkPkg/Library/DxeDpcLib/DxeDpcLib.inf          | 1 -
 3 files changed, 2 deletions(-)
 rename {MdeModulePkg => NetworkPkg}/Include/Protocol/Dpc.h (100%)

diff --git a/NetworkPkg/DpcDxe/DpcDxe.inf b/NetworkPkg/DpcDxe/DpcDxe.inf
index 1462de28a253..716a04d9824c 100644
--- a/NetworkPkg/DpcDxe/DpcDxe.inf
+++ b/NetworkPkg/DpcDxe/DpcDxe.inf
@@ -28,7 +28,6 @@ [Sources]
 
 [Packages]
   MdePkg/MdePkg.dec
-  MdeModulePkg/MdeModulePkg.dec
   NetworkPkg/NetworkPkg.dec
 
 [LibraryClasses]
diff --git a/MdeModulePkg/Include/Protocol/Dpc.h b/NetworkPkg/Include/Protocol/Dpc.h
similarity index 100%
rename from MdeModulePkg/Include/Protocol/Dpc.h
rename to NetworkPkg/Include/Protocol/Dpc.h
diff --git a/NetworkPkg/Library/DxeDpcLib/DxeDpcLib.inf b/NetworkPkg/Library/DxeDpcLib/DxeDpcLib.inf
index 3fb8718f1e33..423037090beb 100644
--- a/NetworkPkg/Library/DxeDpcLib/DxeDpcLib.inf
+++ b/NetworkPkg/Library/DxeDpcLib/DxeDpcLib.inf
@@ -27,7 +27,6 @@ [Sources]
 
 [Packages]
   MdePkg/MdePkg.dec
-  MdeModulePkg/MdeModulePkg.dec
   NetworkPkg/NetworkPkg.dec
 
 [LibraryClasses]
-- 
2.18.0.windows.1

[PATCH 3/3] MdeModulePkg/MdeModulePkg.dec: Remove gEfiDpcProtocolGuid

[Zhang, Shenglei]

Since the transfer has been finished in previous patches,
gEfiDpcProtocolGuid can be removed.
https://bugzilla.tianocore.org/show_bug.cgi?id=1949

Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Hao A Wu <hao.a.wu@intel.com>
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
---
 MdeModulePkg/MdeModulePkg.dec | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index 35935d7aa623..cf08e959f69a 100644
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -489,9 +489,6 @@ [Protocols]
   # Include/Protocol/DebuggerConfiguration.h
   gEfiDebuggerConfigurationProtocolGuid = { 0x577d959c, 0xe967, 0x4546, { 0x86, 0x20, 0xc7, 0x78, 0xfa, 0xe5, 0xda, 0x05 }}
 
-  ## Include/Protocol/Dpc.h
-  gEfiDpcProtocolGuid            = {0x480f8ae9, 0xc46, 0x4aa9,  { 0xbc, 0x89, 0xdb, 0x9f, 0xba, 0x61, 0x98, 0x6 }}
-
   ## Fault Tolerant Write protocol provides boot-time service to do fault tolerant write capability for block devices.
   #  Include/Protocol/FaultTolerantWrite.h
   gEfiFaultTolerantWriteProtocolGuid = { 0x3EBD9E82, 0x2C78, 0x4DE6, { 0x97, 0x86, 0x8D, 0x4B, 0xFC, 0xB7, 0xC8, 0x81 }}
-- 
2.18.0.windows.1

Re: [PATCH 1/3] NetworkPkg: Add Dpc protocol

[Siyuan, Fu]

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

> -----Original Message-----
> From: Zhang, Shenglei
> Sent: 2019年8月12日 16:37
> To: devel@edk2.groups.io
> Cc: Fu, Siyuan <siyuan.fu@intel.com>; Wu, Jiaxin <jiaxin.wu@intel.com>
> Subject: [PATCH 1/3] NetworkPkg: Add Dpc protocol
> 
> To move Dpc.h from MdeModulePkg to NetworkPkg,
> we need to introduce the Guid of protocol first.
> https://bugzilla.tianocore.org/show_bug.cgi?id=1949
> 
> Cc: Siyuan Fu <siyuan.fu@intel.com>
> Cc: Jiaxin Wu <jiaxin.wu@intel.com>
> Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
> ---
>  NetworkPkg/NetworkPkg.dec | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/NetworkPkg/NetworkPkg.dec b/NetworkPkg/NetworkPkg.dec
> index b260ea5b77c5..2bdb3f5663a2 100644
> --- a/NetworkPkg/NetworkPkg.dec
> +++ b/NetworkPkg/NetworkPkg.dec
> @@ -70,6 +70,10 @@ [Guids]
>    # Include/Guid/WifiConnectionManagerConfigHii.h
>    gWifiConfigGuid               = { 0x9f94d327, 0x0b18, 0x4245, { 0x8f, 0xf2, 0x83,
> 0x2e, 0x30, 0xd, 0x2c, 0xef }}
> 
> +[Protocols]
> +  ## Include/Protocol/Dpc.h
> +  gEfiDpcProtocolGuid           = {0x480f8ae9, 0xc46, 0x4aa9,  { 0xbc, 0x89, 0xdb,
> 0x9f, 0xba, 0x61, 0x98, 0x6 }}
> +
>  [PcdsFixedAtBuild]
>    ## The max attempt number will be created by iSCSI driver.
>    # @Prompt Max attempt number.
> --
> 2.18.0.windows.1

Re: [edk2-devel] [PATCH 2/3] NetworkPkg: Move Dpc.h from MdeModulePkg to NetworkPkg

[Siyuan, Fu]

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

> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Zhang,
> Shenglei
> Sent: 2019年8月12日 16:37
> To: devel@edk2.groups.io
> Cc: Fu, Siyuan <siyuan.fu@intel.com>; Wu, Jiaxin <jiaxin.wu@intel.com>
> Subject: [edk2-devel] [PATCH 2/3] NetworkPkg: Move Dpc.h from
> MdeModulePkg to NetworkPkg
> 
> Move Dpc.h from MdeModulePkg to NetworkPkg. And remove the
> dependency on MdeModulePkg.dec in INFs.
> https://bugzilla.tianocore.org/show_bug.cgi?id=1949
> 
> Cc: Siyuan Fu <siyuan.fu@intel.com>
> Cc: Jiaxin Wu <jiaxin.wu@intel.com>
> Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
> ---
>  NetworkPkg/DpcDxe/DpcDxe.inf                        | 1 -
>  {MdeModulePkg => NetworkPkg}/Include/Protocol/Dpc.h | 0
>  NetworkPkg/Library/DxeDpcLib/DxeDpcLib.inf          | 1 -
>  3 files changed, 2 deletions(-)
>  rename {MdeModulePkg => NetworkPkg}/Include/Protocol/Dpc.h (100%)
> 
> diff --git a/NetworkPkg/DpcDxe/DpcDxe.inf b/NetworkPkg/DpcDxe/DpcDxe.inf
> index 1462de28a253..716a04d9824c 100644
> --- a/NetworkPkg/DpcDxe/DpcDxe.inf
> +++ b/NetworkPkg/DpcDxe/DpcDxe.inf
> @@ -28,7 +28,6 @@ [Sources]
> 
>  [Packages]
>    MdePkg/MdePkg.dec
> -  MdeModulePkg/MdeModulePkg.dec
>    NetworkPkg/NetworkPkg.dec
> 
>  [LibraryClasses]
> diff --git a/MdeModulePkg/Include/Protocol/Dpc.h
> b/NetworkPkg/Include/Protocol/Dpc.h
> similarity index 100%
> rename from MdeModulePkg/Include/Protocol/Dpc.h
> rename to NetworkPkg/Include/Protocol/Dpc.h
> diff --git a/NetworkPkg/Library/DxeDpcLib/DxeDpcLib.inf
> b/NetworkPkg/Library/DxeDpcLib/DxeDpcLib.inf
> index 3fb8718f1e33..423037090beb 100644
> --- a/NetworkPkg/Library/DxeDpcLib/DxeDpcLib.inf
> +++ b/NetworkPkg/Library/DxeDpcLib/DxeDpcLib.inf
> @@ -27,7 +27,6 @@ [Sources]
> 
>  [Packages]
>    MdePkg/MdePkg.dec
> -  MdeModulePkg/MdeModulePkg.dec
>    NetworkPkg/NetworkPkg.dec
> 
>  [LibraryClasses]
> --
> 2.18.0.windows.1
> 
> 
> 

Re: [PATCH 0/3] Move MdeModulePkg/Include/Protocol/Dpc.h to NetworkPkg

[Wu, Hao A]

> -----Original Message-----
> From: Zhang, Shenglei
> Sent: Monday, August 12, 2019 4:37 PM
> To: devel@edk2.groups.io
> Cc: Fu, Siyuan; Wu, Jiaxin; Wang, Jian J; Wu, Hao A
> Subject: [PATCH 0/3] Move MdeModulePkg/Include/Protocol/Dpc.h to
> NetworkPkg
> 
> The file MdeModulePkg/Include/Protocol/Dpc.h is consumed
> by the modules in NetworkPkg.
> Hence, this protocol header file should be moved into NetworkPkg.
> https://bugzilla.tianocore.org/show_bug.cgi?id=1949
> 
> Cc: Siyuan Fu <siyuan.fu@intel.com>
> Cc: Jiaxin Wu <jiaxin.wu@intel.com>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Hao A Wu <hao.a.wu@intel.com>
> Shenglei Zhang (3):
>   NetworkPkg: Add Dpc protocol
>   NetworkPkg: Move Dpc.h from MdeModulePkg to NetworkPkg
>   MdeModulePkg/MdeModulePkg.dec: Remove gEfiDpcProtocolGuid


I would recommend the below sequence:
Patch 1 (NetworkPkg): Duplicate the Dpc.h file in NetworkPkg, update NetworkPkg.dec
Patch 2 (NetworkPkg): Update the INF files in NetworkPkg to remove MdeModulePkg dependency
Patch 3 (MdeModulePkg): Remove the Dpc.h file in MdeModulePkg, update MdeModulePkg.dec

But if other reviewers are fine with the current series, I am okay with
the current one:
For patch 3/3 (MdeModulePkg part),
Reviewed-by: Hao A Wu <hao.a.wu@intel.com>

Best Regards,
Hao Wu


> 
>  MdeModulePkg/MdeModulePkg.dec                       | 3 ---
>  NetworkPkg/DpcDxe/DpcDxe.inf                        | 1 -
>  {MdeModulePkg => NetworkPkg}/Include/Protocol/Dpc.h | 0
>  NetworkPkg/Library/DxeDpcLib/DxeDpcLib.inf          | 1 -
>  NetworkPkg/NetworkPkg.dec                           | 4 ++++
>  5 files changed, 4 insertions(+), 5 deletions(-)
>  rename {MdeModulePkg => NetworkPkg}/Include/Protocol/Dpc.h (100%)
> 
> --
> 2.18.0.windows.1