* [edk2-devel] [PATCH] UefiPayloadPkg: Fix the build failure
@ 2021-06-30 22:50 Guo Dong
2021-07-01 20:57 ` Ma, Maurice
0 siblings, 1 reply; 4+ messages in thread
From: Guo Dong @ 2021-06-30 22:50 UTC (permalink / raw)
To: devel; +Cc: maurice.ma, benjamin.you
For non-universal payload, HandoffHobTable is used without initialization.
This patch fixed this failure.
Signed-off-by: Guo Dong <guo.dong@intel.com>
---
UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c | 3 +--
UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c | 4 +---
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c
index ed956c447c..ae16f25c7c 100644
--- a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c
+++ b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c
@@ -559,7 +559,6 @@ PayloadEntry (
{
EFI_STATUS Status;
PHYSICAL_ADDRESS DxeCoreEntryPoint;
- EFI_HOB_HANDOFF_INFO_TABLE *HandoffHobTable;
UINTN MemBase;
UINTN HobMemBase;
UINTN HobMemTop;
@@ -603,7 +602,7 @@ PayloadEntry (
IoWrite8 (LEGACY_8259_MASK_REGISTER_MASTER, 0xFF);
IoWrite8 (LEGACY_8259_MASK_REGISTER_SLAVE, 0xFF);
- Hob.HandoffInformationTable = HandoffHobTable;
+ Hob.HandoffInformationTable = (EFI_HOB_HANDOFF_INFO_TABLE *) GetFirstHob(EFI_HOB_TYPE_HANDOFF);
HandOffToDxeCore (DxeCoreEntryPoint, Hob);
// Should not get here
diff --git a/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c b/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c
index a67653eb11..7a00a56ab9 100644
--- a/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c
+++ b/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c
@@ -364,7 +364,6 @@ _ModuleEntryPoint (
{
EFI_STATUS Status;
PHYSICAL_ADDRESS DxeCoreEntryPoint;
- EFI_HOB_HANDOFF_INFO_TABLE *HandoffHobTable;
EFI_PEI_HOB_POINTERS Hob;
EFI_FIRMWARE_VOLUME_HEADER *DxeFv;
@@ -393,8 +392,7 @@ _ModuleEntryPoint (
IoWrite8 (LEGACY_8259_MASK_REGISTER_MASTER, 0xFF);
IoWrite8 (LEGACY_8259_MASK_REGISTER_SLAVE, 0xFF);
- HandoffHobTable = (EFI_HOB_HANDOFF_INFO_TABLE *) GetFirstHob(EFI_HOB_TYPE_HANDOFF);
- Hob.HandoffInformationTable = HandoffHobTable;
+ Hob.HandoffInformationTable = (EFI_HOB_HANDOFF_INFO_TABLE *) GetFirstHob(EFI_HOB_TYPE_HANDOFF);
HandOffToDxeCore (DxeCoreEntryPoint, Hob);
// Should not get here
--
2.16.2.windows.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [edk2-devel] [PATCH] UefiPayloadPkg: Fix the build failure
2021-06-30 22:50 [edk2-devel] [PATCH] " Guo Dong
@ 2021-07-01 20:57 ` Ma, Maurice
0 siblings, 0 replies; 4+ messages in thread
From: Ma, Maurice @ 2021-07-01 20:57 UTC (permalink / raw)
To: Dong, Guo, devel@edk2.groups.io; +Cc: You, Benjamin
Reviewed-by: Maurice Ma <maurice.ma@intel.com>
-Maurice
> -----Original Message-----
> From: Dong, Guo <guo.dong@intel.com>
> Sent: Wednesday, June 30, 2021 15:51
> To: devel@edk2.groups.io
> Cc: Ma, Maurice <maurice.ma@intel.com>; You, Benjamin
> <benjamin.you@intel.com>
> Subject: [edk2-devel] [PATCH] UefiPayloadPkg: Fix the build failure
>
> For non-universal payload, HandoffHobTable is used without initialization.
> This patch fixed this failure.
>
> Signed-off-by: Guo Dong <guo.dong@intel.com>
> ---
> UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c | 3 +--
> UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c | 4 +---
> 2 files changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c
> b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c
> index ed956c447c..ae16f25c7c 100644
> --- a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c
> +++ b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c
> @@ -559,7 +559,6 @@ PayloadEntry (
> {
> EFI_STATUS Status;
> PHYSICAL_ADDRESS DxeCoreEntryPoint;
> - EFI_HOB_HANDOFF_INFO_TABLE *HandoffHobTable;
> UINTN MemBase;
> UINTN HobMemBase;
> UINTN HobMemTop;
> @@ -603,7 +602,7 @@ PayloadEntry (
> IoWrite8 (LEGACY_8259_MASK_REGISTER_MASTER, 0xFF);
> IoWrite8 (LEGACY_8259_MASK_REGISTER_SLAVE, 0xFF);
>
> - Hob.HandoffInformationTable = HandoffHobTable;
> + Hob.HandoffInformationTable = (EFI_HOB_HANDOFF_INFO_TABLE *)
> GetFirstHob(EFI_HOB_TYPE_HANDOFF);
> HandOffToDxeCore (DxeCoreEntryPoint, Hob);
>
> // Should not get here
> diff --git a/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c
> b/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c
> index a67653eb11..7a00a56ab9 100644
> --- a/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c
> +++ b/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c
> @@ -364,7 +364,6 @@ _ModuleEntryPoint (
> {
> EFI_STATUS Status;
> PHYSICAL_ADDRESS DxeCoreEntryPoint;
> - EFI_HOB_HANDOFF_INFO_TABLE *HandoffHobTable;
> EFI_PEI_HOB_POINTERS Hob;
> EFI_FIRMWARE_VOLUME_HEADER *DxeFv;
>
> @@ -393,8 +392,7 @@ _ModuleEntryPoint (
> IoWrite8 (LEGACY_8259_MASK_REGISTER_MASTER, 0xFF);
> IoWrite8 (LEGACY_8259_MASK_REGISTER_SLAVE, 0xFF);
>
> - HandoffHobTable = (EFI_HOB_HANDOFF_INFO_TABLE *)
> GetFirstHob(EFI_HOB_TYPE_HANDOFF);
> - Hob.HandoffInformationTable = HandoffHobTable;
> + Hob.HandoffInformationTable = (EFI_HOB_HANDOFF_INFO_TABLE *)
> GetFirstHob(EFI_HOB_TYPE_HANDOFF);
> HandOffToDxeCore (DxeCoreEntryPoint, Hob);
>
> // Should not get here
> --
> 2.16.2.windows.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [edk2-devel][PATCH] UefiPayloadPkg: Fix the build failure
@ 2022-04-13 20:48 Guo Dong
2022-04-14 1:04 ` duntan
0 siblings, 1 reply; 4+ messages in thread
From: Guo Dong @ 2022-04-13 20:48 UTC (permalink / raw)
To: devel; +Cc: Guo Dong, Ray Ni, Benjamin You, Sean Rhodes
From: Guo Dong <guo.dong@intel.com>
When Quite parameter is not provided, its default value would
be "None" instead of "". So update its default value not to
impact the build.
Cc: Ray Ni <ray.ni@intel.com>
Cc: Benjamin You <benjamin.you@intel.com>
Cc: Sean Rhodes <sean@starlabs.systems>
Signed-off-by: Guo Dong <guo.dong@intel.com>
---
UefiPayloadPkg/UniversalPayloadBuild.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/UefiPayloadPkg/UniversalPayloadBuild.py b/UefiPayloadPkg/UniversalPayloadBuild.py
index 2796c310a7..99410d244d 100644
--- a/UefiPayloadPkg/UniversalPayloadBuild.py
+++ b/UefiPayloadPkg/UniversalPayloadBuild.py
@@ -53,7 +53,7 @@ def RunCommand(cmd):
def BuildUniversalPayload(Args, MacroList):
BuildTarget = Args.Target
ToolChain = Args.ToolChain
- Quiet = Args.Quiet
+ Quiet = "--quiet" if Args.Quiet else ""
BuildArch = "X64" if Args.Arch == 'X64' else "IA32 -a X64"
ElfToolChain = 'CLANGDWARF'
@@ -121,7 +121,7 @@ def main():
parser.add_argument('-a', '--Arch', choices=['IA32', 'X64'], help='Specify the ARCH for payload entry module. Default build X64 image.', default ='X64')
parser.add_argument("-D", "--Macro", action="append", default=["UNIVERSAL_PAYLOAD=TRUE"])
parser.add_argument('-i', '--ImageId', type=str, help='Specify payload ID (16 bytes maximal).', default ='UEFI')
- parser.add_argument('-q', '--Quiet')
+ parser.add_argument('-q', '--Quiet', action='store_true', help='Disable all build messages except FATAL ERRORS.')
MacroList = {}
args = parser.parse_args()
if args.Macro is not None:
--
2.35.1.windows.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [edk2-devel][PATCH] UefiPayloadPkg: Fix the build failure
2022-04-13 20:48 [edk2-devel][PATCH] UefiPayloadPkg: Fix the build failure Guo Dong
@ 2022-04-14 1:04 ` duntan
0 siblings, 0 replies; 4+ messages in thread
From: duntan @ 2022-04-14 1:04 UTC (permalink / raw)
To: devel@edk2.groups.io, Dong, Guo; +Cc: Ni, Ray, You, Benjamin, Rhodes, Sean
Acked-by: Dun Tan <dun.tan@intel.com>
-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Guo Dong
Sent: Thursday, April 14, 2022 4:49 AM
To: devel@edk2.groups.io
Cc: Dong, Guo <guo.dong@intel.com>; Ni, Ray <ray.ni@intel.com>; You, Benjamin <benjamin.you@intel.com>; Rhodes, Sean <sean@starlabs.systems>
Subject: [edk2-devel][PATCH] UefiPayloadPkg: Fix the build failure
From: Guo Dong <guo.dong@intel.com>
When Quite parameter is not provided, its default value would be "None" instead of "". So update its default value not to impact the build.
Cc: Ray Ni <ray.ni@intel.com>
Cc: Benjamin You <benjamin.you@intel.com>
Cc: Sean Rhodes <sean@starlabs.systems>
Signed-off-by: Guo Dong <guo.dong@intel.com>
---
UefiPayloadPkg/UniversalPayloadBuild.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/UefiPayloadPkg/UniversalPayloadBuild.py b/UefiPayloadPkg/UniversalPayloadBuild.py
index 2796c310a7..99410d244d 100644
--- a/UefiPayloadPkg/UniversalPayloadBuild.py
+++ b/UefiPayloadPkg/UniversalPayloadBuild.py
@@ -53,7 +53,7 @@ def RunCommand(cmd):
def BuildUniversalPayload(Args, MacroList): BuildTarget = Args.Target ToolChain = Args.ToolChain- Quiet = Args.Quiet+ Quiet = "--quiet" if Args.Quiet else "" BuildArch = "X64" if Args.Arch == 'X64' else "IA32 -a X64" ElfToolChain = 'CLANGDWARF' @@ -121,7 +121,7 @@ def main():
parser.add_argument('-a', '--Arch', choices=['IA32', 'X64'], help='Specify the ARCH for payload entry module. Default build X64 image.', default ='X64') parser.add_argument("-D", "--Macro", action="append", default=["UNIVERSAL_PAYLOAD=TRUE"]) parser.add_argument('-i', '--ImageId', type=str, help='Specify payload ID (16 bytes maximal).', default ='UEFI')- parser.add_argument('-q', '--Quiet')+ parser.add_argument('-q', '--Quiet', action='store_true', help='Disable all build messages except FATAL ERRORS.') MacroList = {} args = parser.parse_args() if args.Macro is not None:--
2.35.1.windows.2
-=-=-=-=-=-=
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#88883): https://edk2.groups.io/g/devel/message/88883
Mute This Topic: https://groups.io/mt/90450653/6168883
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [dun.tan@intel.com] -=-=-=-=-=-=
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-04-14 1:04 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-04-13 20:48 [edk2-devel][PATCH] UefiPayloadPkg: Fix the build failure Guo Dong
2022-04-14 1:04 ` duntan
-- strict thread matches above, loose matches on Subject: below --
2021-06-30 22:50 [edk2-devel] [PATCH] " Guo Dong
2021-07-01 20:57 ` Ma, Maurice
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox