[PATCHv1 0/3] UefiPayloadPkg align with USF spec

[PATCHv1 0/3] UefiPayloadPkg align with USF spec

[gua.guo]

From: Gua Guo <gua.guo@intel.com>

1. Align PayloadInfo Identifier with USF spec
2. Align PayloadInfo SpecRevision with USF spec
3. Fix SpecRevision is always "0".

Gua Guo (3):
  MdeModulePkg/UniversalPayload: Align Identifier value with UPL spec
  UefiPayloadPkg: Align Identifier value with UPL spec
  UefiPayloadPkg: Align SpecRevision value with UPL spec

 MdeModulePkg/Include/UniversalPayload/UniversalPayload.h | 2 +-
 UefiPayloadPkg/UniversalPayloadBuild.py                  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

-- 
2.31.1.windows.1

[PATCH 1/3] MdeModulePkg/UniversalPayload: Align Identifier value with UPL spec

[gua.guo]

From: Gua Guo <gua.guo@intel.com>

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3933

URL: https://universalpayload.github.io/documentation/
Currently, Identifier value is "UPLD", it needs to have correct value
"PLDH" based on Universal Payload Specification spec section 2.12.2

Cc: Ray Ni <ray.ni@intel.com>
Cc: Guo Dong <guo.dong@intel.com>
Signed-off-by: Gua Guo <gua.guo@intel.com>
---
 MdeModulePkg/Include/UniversalPayload/UniversalPayload.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MdeModulePkg/Include/UniversalPayload/UniversalPayload.h b/MdeModulePkg/Include/UniversalPayload/UniversalPayload.h
index 1a42d61f77..bb40f240f6 100644
--- a/MdeModulePkg/Include/UniversalPayload/UniversalPayload.h
+++ b/MdeModulePkg/Include/UniversalPayload/UniversalPayload.h
@@ -18,7 +18,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 typedef  VOID (EFIAPI *UNIVERSAL_PAYLOAD_ENTRY)(VOID *HobList);
 
-#define UNIVERSAL_PAYLOAD_IDENTIFIER                    SIGNATURE_32('U', 'P', 'L', 'D')
+#define UNIVERSAL_PAYLOAD_IDENTIFIER                    SIGNATURE_32('P', 'L', 'D', 'H')
 #define UNIVERSAL_PAYLOAD_INFO_SEC_NAME                 ".upld_info"
 #define UNIVERSAL_PAYLOAD_EXTRA_SEC_NAME_PREFIX         ".upld."
 #define UNIVERSAL_PAYLOAD_EXTRA_SEC_NAME_PREFIX_LENGTH  (sizeof (UNIVERSAL_PAYLOAD_EXTRA_SEC_NAME_PREFIX) - 1)
-- 
2.31.1.windows.1

Re: [PATCH 1/3] MdeModulePkg/UniversalPayload: Align Identifier value with UPL spec

[Ni, Ray]

Reviewed-by: Ray Ni <ray.ni@intel.com>

> -----Original Message-----
> From: Guo, Gua <gua.guo@intel.com>
> Sent: Thursday, May 26, 2022 8:14 PM
> To: devel@edk2.groups.io
> Cc: Guo, Gua <gua.guo@intel.com>; Ni, Ray <ray.ni@intel.com>; Dong, Guo <guo.dong@intel.com>
> Subject: [PATCH 1/3] MdeModulePkg/UniversalPayload: Align Identifier value with UPL spec
> 
> From: Gua Guo <gua.guo@intel.com>
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3933
> 
> URL: https://universalpayload.github.io/documentation/
> Currently, Identifier value is "UPLD", it needs to have correct value
> "PLDH" based on Universal Payload Specification spec section 2.12.2
> 
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Guo Dong <guo.dong@intel.com>
> Signed-off-by: Gua Guo <gua.guo@intel.com>
> ---
>  MdeModulePkg/Include/UniversalPayload/UniversalPayload.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/MdeModulePkg/Include/UniversalPayload/UniversalPayload.h
> b/MdeModulePkg/Include/UniversalPayload/UniversalPayload.h
> index 1a42d61f77..bb40f240f6 100644
> --- a/MdeModulePkg/Include/UniversalPayload/UniversalPayload.h
> +++ b/MdeModulePkg/Include/UniversalPayload/UniversalPayload.h
> @@ -18,7 +18,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> 
>  typedef  VOID (EFIAPI *UNIVERSAL_PAYLOAD_ENTRY)(VOID *HobList);
> 
> 
> 
> -#define UNIVERSAL_PAYLOAD_IDENTIFIER                    SIGNATURE_32('U', 'P', 'L', 'D')
> 
> +#define UNIVERSAL_PAYLOAD_IDENTIFIER                    SIGNATURE_32('P', 'L', 'D', 'H')
> 
>  #define UNIVERSAL_PAYLOAD_INFO_SEC_NAME                 ".upld_info"
> 
>  #define UNIVERSAL_PAYLOAD_EXTRA_SEC_NAME_PREFIX         ".upld."
> 
>  #define UNIVERSAL_PAYLOAD_EXTRA_SEC_NAME_PREFIX_LENGTH  (sizeof (UNIVERSAL_PAYLOAD_EXTRA_SEC_NAME_PREFIX)
> - 1)
> 
> --
> 2.31.1.windows.1

[PATCH 2/3] UefiPayloadPkg: Align Identifier value with UPL spec

[gua.guo]

From: Gua Guo <gua.guo@intel.com>

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3933

URL: https://universalpayload.github.io/documentation/
Currently, Identifier value is "UPLD", it needs to have correct value
"PLDH" based on Universal Payload Specification spec section 2.12.2

Cc: Ray Ni <ray.ni@intel.com>
Cc: Guo Dong <guo.dong@intel.com>
Signed-off-by: Gua Guo <gua.guo@intel.com>
---
 UefiPayloadPkg/UniversalPayloadBuild.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UefiPayloadPkg/UniversalPayloadBuild.py b/UefiPayloadPkg/UniversalPayloadBuild.py
index 50335d4316..b7fd1505b6 100644
--- a/UefiPayloadPkg/UniversalPayloadBuild.py
+++ b/UefiPayloadPkg/UniversalPayloadBuild.py
@@ -29,7 +29,7 @@ class UPLD_INFO_HEADER(LittleEndianStructure):
         ]
 
     def __init__(self):
-        self.Identifier     =  b'UPLD'
+        self.Identifier     =  b'PLDH'
         self.HeaderLength   = sizeof(UPLD_INFO_HEADER)
         self.HeaderRevision = 0x0075
         self.Revision       = 0x0000010105
-- 
2.31.1.windows.1

Re: [PATCH 2/3] UefiPayloadPkg: Align Identifier value with UPL spec

[Ni, Ray]

Reviewed-by: Ray Ni <ray.ni@intel.com>

> -----Original Message-----
> From: Guo, Gua <gua.guo@intel.com>
> Sent: Thursday, May 26, 2022 8:14 PM
> To: devel@edk2.groups.io
> Cc: Guo, Gua <gua.guo@intel.com>; Ni, Ray <ray.ni@intel.com>; Dong, Guo <guo.dong@intel.com>
> Subject: [PATCH 2/3] UefiPayloadPkg: Align Identifier value with UPL spec
> 
> From: Gua Guo <gua.guo@intel.com>
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3933
> 
> URL: https://universalpayload.github.io/documentation/
> Currently, Identifier value is "UPLD", it needs to have correct value
> "PLDH" based on Universal Payload Specification spec section 2.12.2
> 
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Guo Dong <guo.dong@intel.com>
> Signed-off-by: Gua Guo <gua.guo@intel.com>
> ---
>  UefiPayloadPkg/UniversalPayloadBuild.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/UefiPayloadPkg/UniversalPayloadBuild.py b/UefiPayloadPkg/UniversalPayloadBuild.py
> index 50335d4316..b7fd1505b6 100644
> --- a/UefiPayloadPkg/UniversalPayloadBuild.py
> +++ b/UefiPayloadPkg/UniversalPayloadBuild.py
> @@ -29,7 +29,7 @@ class UPLD_INFO_HEADER(LittleEndianStructure):
>          ]
> 
> 
> 
>      def __init__(self):
> 
> -        self.Identifier     =  b'UPLD'
> 
> +        self.Identifier     =  b'PLDH'
> 
>          self.HeaderLength   = sizeof(UPLD_INFO_HEADER)
> 
>          self.HeaderRevision = 0x0075
> 
>          self.Revision       = 0x0000010105
> 
> --
> 2.31.1.windows.1

Re: [PATCH 2/3] UefiPayloadPkg: Align Identifier value with UPL spec

[Guo Dong]

Reviewed-by: Guo Dong <guo.dong@intel.com>

-----Original Message-----
From: Guo, Gua <gua.guo@intel.com> 
Sent: Thursday, May 26, 2022 5:14 AM
To: devel@edk2.groups.io
Cc: Guo, Gua <gua.guo@intel.com>; Ni, Ray <ray.ni@intel.com>; Dong, Guo <guo.dong@intel.com>
Subject: [PATCH 2/3] UefiPayloadPkg: Align Identifier value with UPL spec

From: Gua Guo <gua.guo@intel.com>

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3933

URL: https://universalpayload.github.io/documentation/
Currently, Identifier value is "UPLD", it needs to have correct value "PLDH" based on Universal Payload Specification spec section 2.12.2

Cc: Ray Ni <ray.ni@intel.com>
Cc: Guo Dong <guo.dong@intel.com>
Signed-off-by: Gua Guo <gua.guo@intel.com>
---
 UefiPayloadPkg/UniversalPayloadBuild.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UefiPayloadPkg/UniversalPayloadBuild.py b/UefiPayloadPkg/UniversalPayloadBuild.py
index 50335d4316..b7fd1505b6 100644
--- a/UefiPayloadPkg/UniversalPayloadBuild.py
+++ b/UefiPayloadPkg/UniversalPayloadBuild.py
@@ -29,7 +29,7 @@ class UPLD_INFO_HEADER(LittleEndianStructure):
         ]      def __init__(self):-        self.Identifier     =  b'UPLD'+        self.Identifier     =  b'PLDH'         self.HeaderLength   = sizeof(UPLD_INFO_HEADER)         self.HeaderRevision = 0x0075         self.Revision       = 0x0000010105-- 
2.31.1.windows.1

[PATCH 3/3] UefiPayloadPkg: Align SpecRevision value with UPL spec

[gua.guo]

From: Gua Guo <gua.guo@intel.com>

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3933

URL: https://universalpayload.github.io/documentation/

1. Currently, SpecRevision on USF spec is 0.7. Change to align it.
2. SpecRevision is not be patched into UniversalPayloadInfo.bin due to
different structure item name. Change item name from "HeaderRevision"
 to "SpecRevision" to check the correct value can be patched.

Cc: Ray Ni <ray.ni@intel.com>
Cc: Guo Dong <guo.dong@intel.com>
Signed-off-by: Gua Guo <gua.guo@intel.com>
---
 UefiPayloadPkg/UniversalPayloadBuild.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UefiPayloadPkg/UniversalPayloadBuild.py b/UefiPayloadPkg/UniversalPayloadBuild.py
index b7fd1505b6..089d631b51 100644
--- a/UefiPayloadPkg/UniversalPayloadBuild.py
+++ b/UefiPayloadPkg/UniversalPayloadBuild.py
@@ -31,7 +31,7 @@ class UPLD_INFO_HEADER(LittleEndianStructure):
     def __init__(self):
         self.Identifier     =  b'PLDH'
         self.HeaderLength   = sizeof(UPLD_INFO_HEADER)
-        self.HeaderRevision = 0x0075
+        self.SpecRevision   = 0x0007
         self.Revision       = 0x0000010105
         self.ImageId        = b'UEFI'
         self.ProducerId     = b'INTEL'
-- 
2.31.1.windows.1

Re: [PATCH 3/3] UefiPayloadPkg: Align SpecRevision value with UPL spec

[Ni, Ray]

Reviewed-by: Ray Ni <ray.ni@intel.com>

> -----Original Message-----
> From: Guo, Gua <gua.guo@intel.com>
> Sent: Thursday, May 26, 2022 8:14 PM
> To: devel@edk2.groups.io
> Cc: Guo, Gua <gua.guo@intel.com>; Ni, Ray <ray.ni@intel.com>; Dong, Guo <guo.dong@intel.com>
> Subject: [PATCH 3/3] UefiPayloadPkg: Align SpecRevision value with UPL spec
> 
> From: Gua Guo <gua.guo@intel.com>
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3933
> 
> URL: https://universalpayload.github.io/documentation/
> 
> 1. Currently, SpecRevision on USF spec is 0.7. Change to align it.
> 2. SpecRevision is not be patched into UniversalPayloadInfo.bin due to
> different structure item name. Change item name from "HeaderRevision"
>  to "SpecRevision" to check the correct value can be patched.
> 
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Guo Dong <guo.dong@intel.com>
> Signed-off-by: Gua Guo <gua.guo@intel.com>
> ---
>  UefiPayloadPkg/UniversalPayloadBuild.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/UefiPayloadPkg/UniversalPayloadBuild.py b/UefiPayloadPkg/UniversalPayloadBuild.py
> index b7fd1505b6..089d631b51 100644
> --- a/UefiPayloadPkg/UniversalPayloadBuild.py
> +++ b/UefiPayloadPkg/UniversalPayloadBuild.py
> @@ -31,7 +31,7 @@ class UPLD_INFO_HEADER(LittleEndianStructure):
>      def __init__(self):
> 
>          self.Identifier     =  b'PLDH'
> 
>          self.HeaderLength   = sizeof(UPLD_INFO_HEADER)
> 
> -        self.HeaderRevision = 0x0075
> 
> +        self.SpecRevision   = 0x0007
> 
>          self.Revision       = 0x0000010105
> 
>          self.ImageId        = b'UEFI'
> 
>          self.ProducerId     = b'INTEL'
> 
> --
> 2.31.1.windows.1

Re: [PATCH 3/3] UefiPayloadPkg: Align SpecRevision value with UPL spec

[Guo Dong]

Reviewed-by: Guo Dong <guo.dong@intel.com>

-----Original Message-----
From: Guo, Gua <gua.guo@intel.com> 
Sent: Thursday, May 26, 2022 5:14 AM
To: devel@edk2.groups.io
Cc: Guo, Gua <gua.guo@intel.com>; Ni, Ray <ray.ni@intel.com>; Dong, Guo <guo.dong@intel.com>
Subject: [PATCH 3/3] UefiPayloadPkg: Align SpecRevision value with UPL spec

From: Gua Guo <gua.guo@intel.com>

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3933

URL: https://universalpayload.github.io/documentation/

1. Currently, SpecRevision on USF spec is 0.7. Change to align it.
2. SpecRevision is not be patched into UniversalPayloadInfo.bin due to different structure item name. Change item name from "HeaderRevision"
 to "SpecRevision" to check the correct value can be patched.

Cc: Ray Ni <ray.ni@intel.com>
Cc: Guo Dong <guo.dong@intel.com>
Signed-off-by: Gua Guo <gua.guo@intel.com>
---
 UefiPayloadPkg/UniversalPayloadBuild.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UefiPayloadPkg/UniversalPayloadBuild.py b/UefiPayloadPkg/UniversalPayloadBuild.py
index b7fd1505b6..089d631b51 100644
--- a/UefiPayloadPkg/UniversalPayloadBuild.py
+++ b/UefiPayloadPkg/UniversalPayloadBuild.py
@@ -31,7 +31,7 @@ class UPLD_INFO_HEADER(LittleEndianStructure):
     def __init__(self):         self.Identifier     =  b'PLDH'         self.HeaderLength   = sizeof(UPLD_INFO_HEADER)-        self.HeaderRevision = 0x0075+        self.SpecRevision   = 0x0007         self.Revision       = 0x0000010105         self.ImageId        = b'UEFI'         self.ProducerId     = b'INTEL'-- 
2.31.1.windows.1