[PATCH v2 0/4] Define EDKII_SERIAL_PORT_LIB_VENDOR_GUID

[PATCH v2 0/4] Define EDKII_SERIAL_PORT_LIB_VENDOR_GUID

[Anthony PERARD]

The macro SERIAL_DXE_FILE_GUID is been defined twice and the GUID is been used
once without defining the macro. This patch series define a macro in
MdeModulePkg where the SerialDxe is, and replace all other use by this new one,
EDKII_SERIAL_PORT_LIB_VENDOR_GUID.

Note that I haven't build/test those changes, but I have test the first patch
by applying a similar change to a patch series I'm working on.

Patch series available in this git branch:
https://xenbits.xen.org/git-http/people/aperard/ovmf.git br.serial-dxe-guid-v2

Thanks.

Anthony PERARD (4):
  MdeModulePkg: Introduce EDKII_SERIAL_PORT_LIB_VENDOR_GUID
  ArmVirtPkg/PlatformBootManagerLib: Use
    EDKII_SERIAL_PORT_LIB_VENDOR_GUID from MdeModulePkg
  ArmPkg/PlatformBootManagerLib: Use EDKII_SERIAL_PORT_LIB_VENDOR_GUID
    from MdeModulePkg
  UefiPayloadPkg/PlatformBootManagerLib: Use
    EDKII_SERIAL_PORT_LIB_VENDOR_GUID from MdeModulePkg

 MdeModulePkg/MdeModulePkg.dec                 |  3 +++
 .../Universal/SerialDxe/SerialDxe.inf         |  1 +
 .../Include/Guid/SerialPortLibVendor.h        | 19 +++++++++++++++++++
 .../PlatformBootManagerLib/PlatformBm.c       |  8 ++------
 .../PlatformBootManagerLib/PlatformBm.c       |  8 ++------
 MdeModulePkg/Universal/SerialDxe/SerialIo.c   |  3 ++-
 .../PlatformBootManagerLib/PlatformConsole.c  |  3 ++-
 7 files changed, 31 insertions(+), 14 deletions(-)
 create mode 100644 MdeModulePkg/Include/Guid/SerialPortLibVendor.h

-- 
Anthony PERARD

[PATCH v2 1/4] MdeModulePkg: Introduce EDKII_SERIAL_PORT_LIB_VENDOR_GUID

[Anthony PERARD]

SERIAL_DXE_FILE_GUID is used in different places, create a single
define that other can use. Also fix SerialDxe to actually use
EDKII_SERIAL_PORT_LIB_VENDOR_GUID in the device path instead of the
FILE_GUID.

Suggested-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
---

Notes:
    Suggested in: Message-ID: <7d6adf5d-baca-7e9c-68ef-2f8479bbd902@redhat.com>

 MdeModulePkg/MdeModulePkg.dec                 |  3 +++
 .../Universal/SerialDxe/SerialDxe.inf         |  1 +
 .../Include/Guid/SerialPortLibVendor.h        | 19 +++++++++++++++++++
 MdeModulePkg/Universal/SerialDxe/SerialIo.c   |  3 ++-
 4 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 MdeModulePkg/Include/Guid/SerialPortLibVendor.h

diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index 6cba729982..2dee139ba3 100644
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -396,6 +396,9 @@ [Guids]
   ## Include/Guid/S3StorageDeviceInitList.h
   gS3StorageDeviceInitListGuid = { 0x310e9b8c, 0xcf90, 0x421e, { 0x8e, 0x9b, 0x9e, 0xef, 0xb6, 0x17, 0xc8, 0xef } }
 
+  ## Include/Guid/SerialPortLibVendor.h
+  gEdkiiSerialPortLibVendorGuid = { 0xD3987D4B, 0x971A, 0x435F, { 0x8C, 0xAF, 0x49, 0x67, 0xEB, 0x62, 0x72, 0x41 } }
+
 [Ppis]
   ## Include/Ppi/AtaController.h
   gPeiAtaControllerPpiGuid       = { 0xa45e60d1, 0xc719, 0x44aa, { 0xb0, 0x7a, 0xaa, 0x77, 0x7f, 0x85, 0x90, 0x6d }}
diff --git a/MdeModulePkg/Universal/SerialDxe/SerialDxe.inf b/MdeModulePkg/Universal/SerialDxe/SerialDxe.inf
index 81066a26a2..b6c85b3f84 100644
--- a/MdeModulePkg/Universal/SerialDxe/SerialDxe.inf
+++ b/MdeModulePkg/Universal/SerialDxe/SerialDxe.inf
@@ -22,6 +22,7 @@ [Sources.common]
 
 [Packages]
   MdePkg/MdePkg.dec
+  MdeModulePkg/MdeModulePkg.dec
 
 [LibraryClasses]
   UefiDriverEntryPoint
diff --git a/MdeModulePkg/Include/Guid/SerialPortLibVendor.h b/MdeModulePkg/Include/Guid/SerialPortLibVendor.h
new file mode 100644
index 0000000000..887f96c30a
--- /dev/null
+++ b/MdeModulePkg/Include/Guid/SerialPortLibVendor.h
@@ -0,0 +1,19 @@
+/** @file
+  Define the SerialDxe GUID.
+
+  Copyright (c) 2019, Citrix Systems, Inc.
+
+  SPDX-License-Identifier: BSD-2-Clause-Patent
+**/
+
+#ifndef __SERIAL_PORT_LIB_VENDOR_H__
+#define __SERIAL_PORT_LIB_VENDOR_H__
+
+#define EDKII_SERIAL_PORT_LIB_VENDOR_GUID { \
+          0xD3987D4B, 0x971A, 0x435F, \
+          { 0x8C, 0xAF, 0x49, 0x67, 0xEB, 0x62, 0x72, 0x41 } \
+          }
+
+extern EFI_GUID gEdkiiSerialPortLibVendorGuid;
+
+#endif // __SERIAL_PORT_LIB_VENDOR_H__
diff --git a/MdeModulePkg/Universal/SerialDxe/SerialIo.c b/MdeModulePkg/Universal/SerialDxe/SerialIo.c
index 720a3f264a..fb816a1611 100644
--- a/MdeModulePkg/Universal/SerialDxe/SerialIo.c
+++ b/MdeModulePkg/Universal/SerialDxe/SerialIo.c
@@ -16,6 +16,7 @@
 
 #include <Protocol/SerialIo.h>
 #include <Protocol/DevicePath.h>
+#include <Guid/SerialPortLibVendor.h>
 
 typedef struct {
   VENDOR_DEVICE_PATH        Guid;
@@ -159,7 +160,7 @@ EFI_HANDLE mSerialHandle = NULL;
 SERIAL_DEVICE_PATH mSerialDevicePath = {
   {
     { HARDWARE_DEVICE_PATH, HW_VENDOR_DP, { sizeof (VENDOR_DEVICE_PATH), 0} },
-    EFI_CALLER_ID_GUID  // Use the driver's GUID
+    EDKII_SERIAL_PORT_LIB_VENDOR_GUID
   },
   {
     { MESSAGING_DEVICE_PATH, MSG_UART_DP, { sizeof (UART_DEVICE_PATH), 0} },
-- 
Anthony PERARD

[PATCH v2 2/4] ArmVirtPkg/PlatformBootManagerLib: Use EDKII_SERIAL_PORT_LIB_VENDOR_GUID from MdeModulePkg

[Anthony PERARD]

SERIAL_DXE_FILE_GUID is now defined in MdeModulePkg as
EDKII_SERIAL_PORT_LIB_VENDOR_GUID, simply use it.

Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
---
 ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c
index b8f50ea96b..30c015eec5 100644
--- a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c
+++ b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c
@@ -26,6 +26,7 @@
 #include <Protocol/VirtioDevice.h>
 #include <Guid/EventGroup.h>
 #include <Guid/RootBridgesConnectedEventGroup.h>
+#include <Guid/SerialPortLibVendor.h>
 
 #include "PlatformBm.h"
 
@@ -41,18 +42,13 @@ typedef struct {
 } PLATFORM_SERIAL_CONSOLE;
 #pragma pack ()
 
-#define SERIAL_DXE_FILE_GUID { \
-          0xD3987D4B, 0x971A, 0x435F, \
-          { 0x8C, 0xAF, 0x49, 0x67, 0xEB, 0x62, 0x72, 0x41 } \
-          }
-
 STATIC PLATFORM_SERIAL_CONSOLE mSerialConsole = {
   //
   // VENDOR_DEVICE_PATH SerialDxe
   //
   {
     { HARDWARE_DEVICE_PATH, HW_VENDOR_DP, DP_NODE_LEN (VENDOR_DEVICE_PATH) },
-    SERIAL_DXE_FILE_GUID
+    EDKII_SERIAL_PORT_LIB_VENDOR_GUID
   },
 
   //
-- 
Anthony PERARD

[PATCH v2 3/4] ArmPkg/PlatformBootManagerLib: Use EDKII_SERIAL_PORT_LIB_VENDOR_GUID from MdeModulePkg

[Anthony PERARD]

SERIAL_DXE_FILE_GUID is now defined in MdeModulePkg as
EDKII_SERIAL_PORT_LIB_VENDOR_GUID, simply use it.

Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
---
 ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c b/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c
index 0f91692c1a..1e30f148b3 100644
--- a/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c
+++ b/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c
@@ -28,6 +28,7 @@
 #include <Protocol/PlatformBootManager.h>
 #include <Guid/EventGroup.h>
 #include <Guid/TtyTerm.h>
+#include <Guid/SerialPortLibVendor.h>
 
 #include "PlatformBm.h"
 
@@ -42,18 +43,13 @@ typedef struct {
 } PLATFORM_SERIAL_CONSOLE;
 #pragma pack ()
 
-#define SERIAL_DXE_FILE_GUID { \
-          0xD3987D4B, 0x971A, 0x435F, \
-          { 0x8C, 0xAF, 0x49, 0x67, 0xEB, 0x62, 0x72, 0x41 } \
-          }
-
 STATIC PLATFORM_SERIAL_CONSOLE mSerialConsole = {
   //
   // VENDOR_DEVICE_PATH SerialDxe
   //
   {
     { HARDWARE_DEVICE_PATH, HW_VENDOR_DP, DP_NODE_LEN (VENDOR_DEVICE_PATH) },
-    SERIAL_DXE_FILE_GUID
+    EDKII_SERIAL_PORT_LIB_VENDOR_GUID
   },
 
   //
-- 
Anthony PERARD

[PATCH v2 4/4] UefiPayloadPkg/PlatformBootManagerLib: Use EDKII_SERIAL_PORT_LIB_VENDOR_GUID from MdeModulePkg

[Anthony PERARD]

EDKII_SERIAL_PORT_LIB_VENDOR_GUID is now defined in MdeModulePkg,
simply use it.

Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
---
 .../Library/PlatformBootManagerLib/PlatformConsole.c           | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformConsole.c b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformConsole.c
index 80a11d7451..ee2d8c8d1e 100644
--- a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformConsole.c
+++ b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformConsole.c
@@ -8,6 +8,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 #include "PlatformBootManager.h"
 #include "PlatformConsole.h"
+#include <Guid/SerialPortLibVendor.h>
 
 #define PCI_DEVICE_PATH_NODE(Func, Dev) \
   { \
@@ -53,7 +54,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
         (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8) \
       } \
     }, \
-    {0xD3987D4B, 0x971A, 0x435F, {0x8C, 0xAF, 0x49, 0x67, 0xEB, 0x62, 0x72, 0x41}} \
+    EDKII_SERIAL_PORT_LIB_VENDOR_GUID \
   }
 
 #define gUart \
-- 
Anthony PERARD

Re: [PATCH v2 2/4] ArmVirtPkg/PlatformBootManagerLib: Use EDKII_SERIAL_PORT_LIB_VENDOR_GUID from MdeModulePkg

[Laszlo Ersek]

On 06/06/19 15:14, Anthony PERARD wrote:
> SERIAL_DXE_FILE_GUID is now defined in MdeModulePkg as
> EDKII_SERIAL_PORT_LIB_VENDOR_GUID, simply use it.
> 
> Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
> ---
>  ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c | 8 ++------
>  1 file changed, 2 insertions(+), 6 deletions(-)
> 
> diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c
> index b8f50ea96b..30c015eec5 100644
> --- a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c
> +++ b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c
> @@ -26,6 +26,7 @@
>  #include <Protocol/VirtioDevice.h>
>  #include <Guid/EventGroup.h>
>  #include <Guid/RootBridgesConnectedEventGroup.h>
> +#include <Guid/SerialPortLibVendor.h>
>  
>  #include "PlatformBm.h"
>  
> @@ -41,18 +42,13 @@ typedef struct {
>  } PLATFORM_SERIAL_CONSOLE;
>  #pragma pack ()
>  
> -#define SERIAL_DXE_FILE_GUID { \
> -          0xD3987D4B, 0x971A, 0x435F, \
> -          { 0x8C, 0xAF, 0x49, 0x67, 0xEB, 0x62, 0x72, 0x41 } \
> -          }
> -
>  STATIC PLATFORM_SERIAL_CONSOLE mSerialConsole = {
>    //
>    // VENDOR_DEVICE_PATH SerialDxe
>    //
>    {
>      { HARDWARE_DEVICE_PATH, HW_VENDOR_DP, DP_NODE_LEN (VENDOR_DEVICE_PATH) },
> -    SERIAL_DXE_FILE_GUID
> +    EDKII_SERIAL_PORT_LIB_VENDOR_GUID
>    },
>  
>    //
> 

I would drop "from MdeModulePkg" from the subject line. With that change,

Reviewed-by: Laszlo Ersek <lersek@redhat.com>

If the maintainer that pushes this series agrees to tweak the subject
like that, then I'm OK if the series is not reposted just for this. (BTW
I could be that maintainer too.)

Thanks
Laszlo

Re: [PATCH v2 1/4] MdeModulePkg: Introduce EDKII_SERIAL_PORT_LIB_VENDOR_GUID

[Laszlo Ersek]

On 06/06/19 15:14, Anthony PERARD wrote:
> SERIAL_DXE_FILE_GUID is used in different places, create a single
> define that other can use. Also fix SerialDxe to actually use
> EDKII_SERIAL_PORT_LIB_VENDOR_GUID in the device path instead of the
> FILE_GUID.
> 
> Suggested-by: Laszlo Ersek <lersek@redhat.com>
> Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
> ---
> 
> Notes:
>     Suggested in: Message-ID: <7d6adf5d-baca-7e9c-68ef-2f8479bbd902@redhat.com>
> 
>  MdeModulePkg/MdeModulePkg.dec                 |  3 +++
>  .../Universal/SerialDxe/SerialDxe.inf         |  1 +
>  .../Include/Guid/SerialPortLibVendor.h        | 19 +++++++++++++++++++
>  MdeModulePkg/Universal/SerialDxe/SerialIo.c   |  3 ++-
>  4 files changed, 25 insertions(+), 1 deletion(-)
>  create mode 100644 MdeModulePkg/Include/Guid/SerialPortLibVendor.h
> 
> diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
> index 6cba729982..2dee139ba3 100644
> --- a/MdeModulePkg/MdeModulePkg.dec
> +++ b/MdeModulePkg/MdeModulePkg.dec
> @@ -396,6 +396,9 @@ [Guids]
>    ## Include/Guid/S3StorageDeviceInitList.h
>    gS3StorageDeviceInitListGuid = { 0x310e9b8c, 0xcf90, 0x421e, { 0x8e, 0x9b, 0x9e, 0xef, 0xb6, 0x17, 0xc8, 0xef } }
>  
> +  ## Include/Guid/SerialPortLibVendor.h
> +  gEdkiiSerialPortLibVendorGuid = { 0xD3987D4B, 0x971A, 0x435F, { 0x8C, 0xAF, 0x49, 0x67, 0xEB, 0x62, 0x72, 0x41 } }
> +
>  [Ppis]
>    ## Include/Ppi/AtaController.h
>    gPeiAtaControllerPpiGuid       = { 0xa45e60d1, 0xc719, 0x44aa, { 0xb0, 0x7a, 0xaa, 0x77, 0x7f, 0x85, 0x90, 0x6d }}
> diff --git a/MdeModulePkg/Universal/SerialDxe/SerialDxe.inf b/MdeModulePkg/Universal/SerialDxe/SerialDxe.inf
> index 81066a26a2..b6c85b3f84 100644
> --- a/MdeModulePkg/Universal/SerialDxe/SerialDxe.inf
> +++ b/MdeModulePkg/Universal/SerialDxe/SerialDxe.inf
> @@ -22,6 +22,7 @@ [Sources.common]
>  
>  [Packages]
>    MdePkg/MdePkg.dec
> +  MdeModulePkg/MdeModulePkg.dec
>  
>  [LibraryClasses]
>    UefiDriverEntryPoint
> diff --git a/MdeModulePkg/Include/Guid/SerialPortLibVendor.h b/MdeModulePkg/Include/Guid/SerialPortLibVendor.h
> new file mode 100644
> index 0000000000..887f96c30a
> --- /dev/null
> +++ b/MdeModulePkg/Include/Guid/SerialPortLibVendor.h
> @@ -0,0 +1,19 @@
> +/** @file
> +  Define the SerialDxe GUID.

I think we could elaborate a bit more here, if we really wanted to, but
in the end I'm fine with this. (I'm not an MdeModulePkg maintainer though.)

Reviewed-by: Laszlo Ersek <lersek@redhat.com>

Thanks
Laszlo


> +
> +  Copyright (c) 2019, Citrix Systems, Inc.
> +
> +  SPDX-License-Identifier: BSD-2-Clause-Patent
> +**/
> +
> +#ifndef __SERIAL_PORT_LIB_VENDOR_H__
> +#define __SERIAL_PORT_LIB_VENDOR_H__
> +
> +#define EDKII_SERIAL_PORT_LIB_VENDOR_GUID { \
> +          0xD3987D4B, 0x971A, 0x435F, \
> +          { 0x8C, 0xAF, 0x49, 0x67, 0xEB, 0x62, 0x72, 0x41 } \
> +          }
> +
> +extern EFI_GUID gEdkiiSerialPortLibVendorGuid;
> +
> +#endif // __SERIAL_PORT_LIB_VENDOR_H__
> diff --git a/MdeModulePkg/Universal/SerialDxe/SerialIo.c b/MdeModulePkg/Universal/SerialDxe/SerialIo.c
> index 720a3f264a..fb816a1611 100644
> --- a/MdeModulePkg/Universal/SerialDxe/SerialIo.c
> +++ b/MdeModulePkg/Universal/SerialDxe/SerialIo.c
> @@ -16,6 +16,7 @@
>  
>  #include <Protocol/SerialIo.h>
>  #include <Protocol/DevicePath.h>
> +#include <Guid/SerialPortLibVendor.h>
>  
>  typedef struct {
>    VENDOR_DEVICE_PATH        Guid;
> @@ -159,7 +160,7 @@ EFI_HANDLE mSerialHandle = NULL;
>  SERIAL_DEVICE_PATH mSerialDevicePath = {
>    {
>      { HARDWARE_DEVICE_PATH, HW_VENDOR_DP, { sizeof (VENDOR_DEVICE_PATH), 0} },
> -    EFI_CALLER_ID_GUID  // Use the driver's GUID
> +    EDKII_SERIAL_PORT_LIB_VENDOR_GUID
>    },
>    {
>      { MESSAGING_DEVICE_PATH, MSG_UART_DP, { sizeof (UART_DEVICE_PATH), 0} },
> 

Re: [PATCH v2 0/4] Define EDKII_SERIAL_PORT_LIB_VENDOR_GUID

[Laszlo Ersek]

On 06/06/19 15:14, Anthony PERARD wrote:
> The macro SERIAL_DXE_FILE_GUID is been defined twice and the GUID is been used
> once without defining the macro. This patch series define a macro in
> MdeModulePkg where the SerialDxe is, and replace all other use by this new one,
> EDKII_SERIAL_PORT_LIB_VENDOR_GUID.
> 
> Note that I haven't build/test those changes, but I have test the first patch
> by applying a similar change to a patch series I'm working on.
> 
> Patch series available in this git branch:
> https://xenbits.xen.org/git-http/people/aperard/ovmf.git br.serial-dxe-guid-v2
> 
> Thanks.
> 
> Anthony PERARD (4):
>   MdeModulePkg: Introduce EDKII_SERIAL_PORT_LIB_VENDOR_GUID
>   ArmVirtPkg/PlatformBootManagerLib: Use
>     EDKII_SERIAL_PORT_LIB_VENDOR_GUID from MdeModulePkg
>   ArmPkg/PlatformBootManagerLib: Use EDKII_SERIAL_PORT_LIB_VENDOR_GUID
>     from MdeModulePkg
>   UefiPayloadPkg/PlatformBootManagerLib: Use
>     EDKII_SERIAL_PORT_LIB_VENDOR_GUID from MdeModulePkg
> 
>  MdeModulePkg/MdeModulePkg.dec                 |  3 +++
>  .../Universal/SerialDxe/SerialDxe.inf         |  1 +
>  .../Include/Guid/SerialPortLibVendor.h        | 19 +++++++++++++++++++
>  .../PlatformBootManagerLib/PlatformBm.c       |  8 ++------
>  .../PlatformBootManagerLib/PlatformBm.c       |  8 ++------
>  MdeModulePkg/Universal/SerialDxe/SerialIo.c   |  3 ++-
>  .../PlatformBootManagerLib/PlatformConsole.c  |  3 ++-
>  7 files changed, 31 insertions(+), 14 deletions(-)
>  create mode 100644 MdeModulePkg/Include/Guid/SerialPortLibVendor.h
> 

For patches #1 and #2:

Tested-by: Laszlo Ersek <lersek@redhat.com>

Thanks
Laszlo

Re: [PATCH v2 0/4] Define EDKII_SERIAL_PORT_LIB_VENDOR_GUID

[Ard Biesheuvel]

On Thu, 6 Jun 2019 at 19:16, Laszlo Ersek <lersek@redhat.com> wrote:
>
> On 06/06/19 15:14, Anthony PERARD wrote:
> > The macro SERIAL_DXE_FILE_GUID is been defined twice and the GUID is been used
> > once without defining the macro. This patch series define a macro in
> > MdeModulePkg where the SerialDxe is, and replace all other use by this new one,
> > EDKII_SERIAL_PORT_LIB_VENDOR_GUID.
> >
> > Note that I haven't build/test those changes, but I have test the first patch
> > by applying a similar change to a patch series I'm working on.
> >
> > Patch series available in this git branch:
> > https://xenbits.xen.org/git-http/people/aperard/ovmf.git br.serial-dxe-guid-v2
> >
> > Thanks.
> >
> > Anthony PERARD (4):
> >   MdeModulePkg: Introduce EDKII_SERIAL_PORT_LIB_VENDOR_GUID
> >   ArmVirtPkg/PlatformBootManagerLib: Use
> >     EDKII_SERIAL_PORT_LIB_VENDOR_GUID from MdeModulePkg
> >   ArmPkg/PlatformBootManagerLib: Use EDKII_SERIAL_PORT_LIB_VENDOR_GUID
> >     from MdeModulePkg
> >   UefiPayloadPkg/PlatformBootManagerLib: Use
> >     EDKII_SERIAL_PORT_LIB_VENDOR_GUID from MdeModulePkg
> >
> >  MdeModulePkg/MdeModulePkg.dec                 |  3 +++
> >  .../Universal/SerialDxe/SerialDxe.inf         |  1 +
> >  .../Include/Guid/SerialPortLibVendor.h        | 19 +++++++++++++++++++
> >  .../PlatformBootManagerLib/PlatformBm.c       |  8 ++------
> >  .../PlatformBootManagerLib/PlatformBm.c       |  8 ++------
> >  MdeModulePkg/Universal/SerialDxe/SerialIo.c   |  3 ++-
> >  .../PlatformBootManagerLib/PlatformConsole.c  |  3 ++-
> >  7 files changed, 31 insertions(+), 14 deletions(-)
> >  create mode 100644 MdeModulePkg/Include/Guid/SerialPortLibVendor.h
> >
>
> For patches #1 and #2:
>
> Tested-by: Laszlo Ersek <lersek@redhat.com>
>

For the series:

Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

Re: [edk2-devel] [PATCH v2 1/4] MdeModulePkg: Introduce EDKII_SERIAL_PORT_LIB_VENDOR_GUID

[Wu, Hao A]

> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Laszlo Ersek
> Sent: Friday, June 07, 2019 1:13 AM
> To: Anthony PERARD; devel@edk2.groups.io
> Cc: Ni, Ray; Julien Grall; Ard Biesheuvel; Leif Lindholm; Wang, Jian J; Wu, Hao
> A; Zeng, Star
> Subject: Re: [edk2-devel] [PATCH v2 1/4] MdeModulePkg: Introduce
> EDKII_SERIAL_PORT_LIB_VENDOR_GUID
> 
> On 06/06/19 15:14, Anthony PERARD wrote:
> > SERIAL_DXE_FILE_GUID is used in different places, create a single
> > define that other can use. Also fix SerialDxe to actually use
> > EDKII_SERIAL_PORT_LIB_VENDOR_GUID in the device path instead of the
> > FILE_GUID.
> >
> > Suggested-by: Laszlo Ersek <lersek@redhat.com>
> > Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
> > ---
> >
> > Notes:
> >     Suggested in: Message-ID: <7d6adf5d-baca-7e9c-68ef-
> 2f8479bbd902@redhat.com>
> >
> >  MdeModulePkg/MdeModulePkg.dec                 |  3 +++
> >  .../Universal/SerialDxe/SerialDxe.inf         |  1 +
> >  .../Include/Guid/SerialPortLibVendor.h        | 19 +++++++++++++++++++
> >  MdeModulePkg/Universal/SerialDxe/SerialIo.c   |  3 ++-
> >  4 files changed, 25 insertions(+), 1 deletion(-)
> >  create mode 100644 MdeModulePkg/Include/Guid/SerialPortLibVendor.h
> >
> > diff --git a/MdeModulePkg/MdeModulePkg.dec
> b/MdeModulePkg/MdeModulePkg.dec
> > index 6cba729982..2dee139ba3 100644
> > --- a/MdeModulePkg/MdeModulePkg.dec
> > +++ b/MdeModulePkg/MdeModulePkg.dec
> > @@ -396,6 +396,9 @@ [Guids]
> >    ## Include/Guid/S3StorageDeviceInitList.h
> >    gS3StorageDeviceInitListGuid = { 0x310e9b8c, 0xcf90, 0x421e, { 0x8e, 0x9b,
> 0x9e, 0xef, 0xb6, 0x17, 0xc8, 0xef } }
> >
> > +  ## Include/Guid/SerialPortLibVendor.h
> > +  gEdkiiSerialPortLibVendorGuid = { 0xD3987D4B, 0x971A, 0x435F, { 0x8C,
> 0xAF, 0x49, 0x67, 0xEB, 0x62, 0x72, 0x41 } }
> > +
> >  [Ppis]
> >    ## Include/Ppi/AtaController.h
> >    gPeiAtaControllerPpiGuid       = { 0xa45e60d1, 0xc719, 0x44aa, { 0xb0, 0x7a,
> 0xaa, 0x77, 0x7f, 0x85, 0x90, 0x6d }}
> > diff --git a/MdeModulePkg/Universal/SerialDxe/SerialDxe.inf
> b/MdeModulePkg/Universal/SerialDxe/SerialDxe.inf
> > index 81066a26a2..b6c85b3f84 100644
> > --- a/MdeModulePkg/Universal/SerialDxe/SerialDxe.inf
> > +++ b/MdeModulePkg/Universal/SerialDxe/SerialDxe.inf
> > @@ -22,6 +22,7 @@ [Sources.common]
> >
> >  [Packages]
> >    MdePkg/MdePkg.dec
> > +  MdeModulePkg/MdeModulePkg.dec
> >
> >  [LibraryClasses]
> >    UefiDriverEntryPoint
> > diff --git a/MdeModulePkg/Include/Guid/SerialPortLibVendor.h
> b/MdeModulePkg/Include/Guid/SerialPortLibVendor.h
> > new file mode 100644
> > index 0000000000..887f96c30a
> > --- /dev/null
> > +++ b/MdeModulePkg/Include/Guid/SerialPortLibVendor.h
> > @@ -0,0 +1,19 @@
> > +/** @file
> > +  Define the SerialDxe GUID.
> 
> I think we could elaborate a bit more here, if we really wanted to, but
> in the end I'm fine with this. (I'm not an MdeModulePkg maintainer though.)


Sorry for the delayed response.
I am okay with this file description comment.

Reviewed-by: Hao A Wu <hao.a.wu@intel.com>

Best Regards,
Hao Wu


> 
> Reviewed-by: Laszlo Ersek <lersek@redhat.com>
> 
> Thanks
> Laszlo
> 
> 
> > +
> > +  Copyright (c) 2019, Citrix Systems, Inc.
> > +
> > +  SPDX-License-Identifier: BSD-2-Clause-Patent
> > +**/
> > +
> > +#ifndef __SERIAL_PORT_LIB_VENDOR_H__
> > +#define __SERIAL_PORT_LIB_VENDOR_H__
> > +
> > +#define EDKII_SERIAL_PORT_LIB_VENDOR_GUID { \
> > +          0xD3987D4B, 0x971A, 0x435F, \
> > +          { 0x8C, 0xAF, 0x49, 0x67, 0xEB, 0x62, 0x72, 0x41 } \
> > +          }
> > +
> > +extern EFI_GUID gEdkiiSerialPortLibVendorGuid;
> > +
> > +#endif // __SERIAL_PORT_LIB_VENDOR_H__
> > diff --git a/MdeModulePkg/Universal/SerialDxe/SerialIo.c
> b/MdeModulePkg/Universal/SerialDxe/SerialIo.c
> > index 720a3f264a..fb816a1611 100644
> > --- a/MdeModulePkg/Universal/SerialDxe/SerialIo.c
> > +++ b/MdeModulePkg/Universal/SerialDxe/SerialIo.c
> > @@ -16,6 +16,7 @@
> >
> >  #include <Protocol/SerialIo.h>
> >  #include <Protocol/DevicePath.h>
> > +#include <Guid/SerialPortLibVendor.h>
> >
> >  typedef struct {
> >    VENDOR_DEVICE_PATH        Guid;
> > @@ -159,7 +160,7 @@ EFI_HANDLE mSerialHandle = NULL;
> >  SERIAL_DEVICE_PATH mSerialDevicePath = {
> >    {
> >      { HARDWARE_DEVICE_PATH, HW_VENDOR_DP, { sizeof
> (VENDOR_DEVICE_PATH), 0} },
> > -    EFI_CALLER_ID_GUID  // Use the driver's GUID
> > +    EDKII_SERIAL_PORT_LIB_VENDOR_GUID
> >    },
> >    {
> >      { MESSAGING_DEVICE_PATH, MSG_UART_DP, { sizeof
> (UART_DEVICE_PATH), 0} },
> >
> 
> 
> 

Re: [edk2-devel] [PATCH v2 0/4] Define EDKII_SERIAL_PORT_LIB_VENDOR_GUID

[Laszlo Ersek]

On 06/06/19 15:14, Anthony PERARD wrote:
> The macro SERIAL_DXE_FILE_GUID is been defined twice and the GUID is been used
> once without defining the macro. This patch series define a macro in
> MdeModulePkg where the SerialDxe is, and replace all other use by this new one,
> EDKII_SERIAL_PORT_LIB_VENDOR_GUID.
> 
> Note that I haven't build/test those changes, but I have test the first patch
> by applying a similar change to a patch series I'm working on.
> 
> Patch series available in this git branch:
> https://xenbits.xen.org/git-http/people/aperard/ovmf.git br.serial-dxe-guid-v2
> 
> Thanks.
> 
> Anthony PERARD (4):
>   MdeModulePkg: Introduce EDKII_SERIAL_PORT_LIB_VENDOR_GUID
>   ArmVirtPkg/PlatformBootManagerLib: Use
>     EDKII_SERIAL_PORT_LIB_VENDOR_GUID from MdeModulePkg
>   ArmPkg/PlatformBootManagerLib: Use EDKII_SERIAL_PORT_LIB_VENDOR_GUID
>     from MdeModulePkg

Leif, Ard, can you please review patch #3?

>   UefiPayloadPkg/PlatformBootManagerLib: Use
>     EDKII_SERIAL_PORT_LIB_VENDOR_GUID from MdeModulePkg

Maurice, Guo, Benjamin, can you please review patch #4?

Thanks,
Laszlo

Re: [edk2-devel] [PATCH v2 0/4] Define EDKII_SERIAL_PORT_LIB_VENDOR_GUID

[Laszlo Ersek]

On 06/13/19 17:32, Laszlo Ersek wrote:
> On 06/06/19 15:14, Anthony PERARD wrote:
>> The macro SERIAL_DXE_FILE_GUID is been defined twice and the GUID is been used
>> once without defining the macro. This patch series define a macro in
>> MdeModulePkg where the SerialDxe is, and replace all other use by this new one,
>> EDKII_SERIAL_PORT_LIB_VENDOR_GUID.
>>
>> Note that I haven't build/test those changes, but I have test the first patch
>> by applying a similar change to a patch series I'm working on.
>>
>> Patch series available in this git branch:
>> https://xenbits.xen.org/git-http/people/aperard/ovmf.git br.serial-dxe-guid-v2
>>
>> Thanks.
>>
>> Anthony PERARD (4):
>>   MdeModulePkg: Introduce EDKII_SERIAL_PORT_LIB_VENDOR_GUID
>>   ArmVirtPkg/PlatformBootManagerLib: Use
>>     EDKII_SERIAL_PORT_LIB_VENDOR_GUID from MdeModulePkg
>>   ArmPkg/PlatformBootManagerLib: Use EDKII_SERIAL_PORT_LIB_VENDOR_GUID
>>     from MdeModulePkg
> 
> Leif, Ard, can you please review patch #3?

Ooops, nevermind, I missed for a moment Ard's ACK for the whole series:

http://mid.mail-archive.com/CAKv+Gu9jx+xgQBfD0DOc+ZLJ1XqKb6=TJDBh09_LUAwdSXs-hg@mail.gmail.com

However,

> 
>>   UefiPayloadPkg/PlatformBootManagerLib: Use
>>     EDKII_SERIAL_PORT_LIB_VENDOR_GUID from MdeModulePkg
> 
> Maurice, Guo, Benjamin, can you please review patch #4?

the UefiPayloadPkg patch still needs a maintainer A-b or R-b.

Thanks
Laszlo

Re: [edk2-devel] [PATCH v2 4/4] UefiPayloadPkg/PlatformBootManagerLib: Use EDKII_SERIAL_PORT_LIB_VENDOR_GUID from MdeModulePkg

[Ma, Maurice]

Reviewed-by: Maurice Ma <maurice.ma@intel.com>

Regards,
Maurice

> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Anthony PERARD
> Sent: Thursday, June 6, 2019 6:15
> To: devel@edk2.groups.io
> Cc: Ni, Ray <ray.ni@intel.com>; Julien Grall <julien.grall@arm.com>; Ard
> Biesheuvel <ard.biesheuvel@linaro.org>; Leif Lindholm
> <leif.lindholm@linaro.org>; Laszlo Ersek <lersek@redhat.com>; Wang, Jian J
> <jian.j.wang@intel.com>; Wu, Hao A <hao.a.wu@intel.com>; Zeng, Star
> <star.zeng@intel.com>; Anthony PERARD <anthony.perard@citrix.com>
> Subject: [edk2-devel] [PATCH v2 4/4]
> UefiPayloadPkg/PlatformBootManagerLib: Use
> EDKII_SERIAL_PORT_LIB_VENDOR_GUID from MdeModulePkg
> 
> EDKII_SERIAL_PORT_LIB_VENDOR_GUID is now defined in MdeModulePkg,
> simply use it.
> 
> Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
> ---
>  .../Library/PlatformBootManagerLib/PlatformConsole.c           | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git
> a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformConsole.c
> b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformConsole.c
> index 80a11d7451..ee2d8c8d1e 100644
> --- a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformConsole.c
> +++ b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformConsole.c
> @@ -8,6 +8,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  #include "PlatformBootManager.h"
>  #include "PlatformConsole.h"
> +#include <Guid/SerialPortLibVendor.h>
> 
>  #define PCI_DEVICE_PATH_NODE(Func, Dev) \
>    { \
> @@ -53,7 +54,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
>          (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8) \
>        } \
>      }, \
> -    {0xD3987D4B, 0x971A, 0x435F, {0x8C, 0xAF, 0x49, 0x67, 0xEB, 0x62, 0x72,
> 0x41}} \
> +    EDKII_SERIAL_PORT_LIB_VENDOR_GUID \
>    }
> 
>  #define gUart \
> --
> Anthony PERARD
> 
> 
> 

Re: [edk2-devel] [PATCH v2 0/4] Define EDKII_SERIAL_PORT_LIB_VENDOR_GUID

[Ma, Maurice]

Hi, Laszlo

Thank you for the reminder.   Reviewed patch #4 just now.

Regards,
Maurice
> -----Original Message-----
> From: Laszlo Ersek [mailto:lersek@redhat.com]
> Sent: Thursday, June 13, 2019 8:32
> To: Ard Biesheuvel <ard.biesheuvel@linaro.org>; Leif Lindholm
> <leif.lindholm@linaro.org>; Ma, Maurice <maurice.ma@intel.com>; Dong,
> Guo <guo.dong@intel.com>; You, Benjamin <benjamin.you@intel.com>
> Cc: Wang, Jian J <jian.j.wang@intel.com>; Wu, Hao A <hao.a.wu@intel.com>;
> Zeng, Star <star.zeng@intel.com>; devel@edk2.groups.io; Anthony Perard
> <anthony.perard@citrix.com>; Julien Grall <julien.grall@arm.com>; Ni, Ray
> <ray.ni@intel.com>
> Subject: Re: [edk2-devel] [PATCH v2 0/4] Define
> EDKII_SERIAL_PORT_LIB_VENDOR_GUID
> 
> On 06/06/19 15:14, Anthony PERARD wrote:
> > The macro SERIAL_DXE_FILE_GUID is been defined twice and the GUID is
> > been used once without defining the macro. This patch series define a
> > macro in MdeModulePkg where the SerialDxe is, and replace all other
> > use by this new one, EDKII_SERIAL_PORT_LIB_VENDOR_GUID.
> >
> > Note that I haven't build/test those changes, but I have test the
> > first patch by applying a similar change to a patch series I'm working on.
> >
> > Patch series available in this git branch:
> > https://xenbits.xen.org/git-http/people/aperard/ovmf.git
> > br.serial-dxe-guid-v2
> >
> > Thanks.
> >
> > Anthony PERARD (4):
> >   MdeModulePkg: Introduce EDKII_SERIAL_PORT_LIB_VENDOR_GUID
> >   ArmVirtPkg/PlatformBootManagerLib: Use
> >     EDKII_SERIAL_PORT_LIB_VENDOR_GUID from MdeModulePkg
> >   ArmPkg/PlatformBootManagerLib: Use
> EDKII_SERIAL_PORT_LIB_VENDOR_GUID
> >     from MdeModulePkg
> 
> Leif, Ard, can you please review patch #3?
> 
> >   UefiPayloadPkg/PlatformBootManagerLib: Use
> >     EDKII_SERIAL_PORT_LIB_VENDOR_GUID from MdeModulePkg
> 
> Maurice, Guo, Benjamin, can you please review patch #4?
> 
> Thanks,
> Laszlo

Re: [edk2-devel] [PATCH v2 0/4] Define EDKII_SERIAL_PORT_LIB_VENDOR_GUID

[Laszlo Ersek]

On 06/06/19 15:14, Anthony PERARD wrote:
> The macro SERIAL_DXE_FILE_GUID is been defined twice and the GUID is been used
> once without defining the macro. This patch series define a macro in
> MdeModulePkg where the SerialDxe is, and replace all other use by this new one,
> EDKII_SERIAL_PORT_LIB_VENDOR_GUID.
> 
> Note that I haven't build/test those changes, but I have test the first patch
> by applying a similar change to a patch series I'm working on.
> 
> Patch series available in this git branch:
> https://xenbits.xen.org/git-http/people/aperard/ovmf.git br.serial-dxe-guid-v2
> 
> Thanks.
> 
> Anthony PERARD (4):
>   MdeModulePkg: Introduce EDKII_SERIAL_PORT_LIB_VENDOR_GUID
>   ArmVirtPkg/PlatformBootManagerLib: Use
>     EDKII_SERIAL_PORT_LIB_VENDOR_GUID from MdeModulePkg
>   ArmPkg/PlatformBootManagerLib: Use EDKII_SERIAL_PORT_LIB_VENDOR_GUID
>     from MdeModulePkg
>   UefiPayloadPkg/PlatformBootManagerLib: Use
>     EDKII_SERIAL_PORT_LIB_VENDOR_GUID from MdeModulePkg
> 
>  MdeModulePkg/MdeModulePkg.dec                 |  3 +++
>  .../Universal/SerialDxe/SerialDxe.inf         |  1 +
>  .../Include/Guid/SerialPortLibVendor.h        | 19 +++++++++++++++++++
>  .../PlatformBootManagerLib/PlatformBm.c       |  8 ++------
>  .../PlatformBootManagerLib/PlatformBm.c       |  8 ++------
>  MdeModulePkg/Universal/SerialDxe/SerialIo.c   |  3 ++-
>  .../PlatformBootManagerLib/PlatformConsole.c  |  3 ++-
>  7 files changed, 31 insertions(+), 14 deletions(-)
>  create mode 100644 MdeModulePkg/Include/Guid/SerialPortLibVendor.h
> 

Pushed as commit range b0663641c977..fec63bb922d1.

Thanks!
Laszlo