* [Patch V2 0/2] Fix the length and PldHeader for UniversalPayload ExtraData
@ 2021-07-05 6:07 duntan
2021-07-05 6:07 ` [Patch V2 1/2] MdeModulePkg: Change the PldHeader to Header in ExtraData.h duntan
2021-07-05 6:07 ` [Patch V2 2/2] UefiPayloadPkg: Assign the length of UniversalPayload ExtraData duntan
0 siblings, 2 replies; 4+ messages in thread
From: duntan @ 2021-07-05 6:07 UTC (permalink / raw)
To: devel
Change PldHeader to Header in ExtraData.h
Assign the length and revision of UniversalPayload ExtraData
duntan (2):
MdeModulePkg: Change the PldHeader to Header in ExtraData.h
UefiPayloadPkg: Assign the length of UniversalPayload ExtraData
MdeModulePkg/Include/UniversalPayload/ExtraData.h | 4 +++-
UefiPayloadPkg/PayloadLoaderPeim/PayloadLoaderPeim.c | 2 ++
2 files changed, 5 insertions(+), 1 deletion(-)
--
2.31.1.windows.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Patch V2 1/2] MdeModulePkg: Change the PldHeader to Header in ExtraData.h
2021-07-05 6:07 [Patch V2 0/2] Fix the length and PldHeader for UniversalPayload ExtraData duntan
@ 2021-07-05 6:07 ` duntan
2021-07-05 6:07 ` [Patch V2 2/2] UefiPayloadPkg: Assign the length of UniversalPayload ExtraData duntan
1 sibling, 0 replies; 4+ messages in thread
From: duntan @ 2021-07-05 6:07 UTC (permalink / raw)
To: devel; +Cc: Zhiguang Liu, Ray Ni, Jian J Wang, Hao A Wu, DunTan
Change the PldHeader to Header in UNIVERSAL_PAYLOAD_EXTRA_DATA
The meaning of Pld is too general
Cc: Zhiguang Liu <zhiguang.liu@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Hao A Wu <hao.a.wu@intel.com>
Reviewed-by: Zhiguang Liu <zhiguang.liu@intel.com>
Acked-by: Hao A Wu <hao.a.wu@intel.com>
Signed-off-by: DunTan <dun.tan@intel.com>
---
| 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--git a/MdeModulePkg/Include/UniversalPayload/ExtraData.h b/MdeModulePkg/Include/UniversalPayload/ExtraData.h
index 146ec845f6..1128f5f47b 100644
--- a/MdeModulePkg/Include/UniversalPayload/ExtraData.h
+++ b/MdeModulePkg/Include/UniversalPayload/ExtraData.h
@@ -18,11 +18,13 @@ typedef struct {
} UNIVERSAL_PAYLOAD_EXTRA_DATA_ENTRY;
typedef struct {
- UNIVERSAL_PAYLOAD_GENERIC_HEADER PldHeader;
+ UNIVERSAL_PAYLOAD_GENERIC_HEADER Header;
UINT32 Count;
UNIVERSAL_PAYLOAD_EXTRA_DATA_ENTRY Entry[0];
} UNIVERSAL_PAYLOAD_EXTRA_DATA;
#pragma pack()
+#define UNIVERSAL_PAYLOAD_EXTRA_DATA_REVISION 1
+
#endif
--
2.31.1.windows.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Patch V2 2/2] UefiPayloadPkg: Assign the length of UniversalPayload ExtraData
2021-07-05 6:07 [Patch V2 0/2] Fix the length and PldHeader for UniversalPayload ExtraData duntan
2021-07-05 6:07 ` [Patch V2 1/2] MdeModulePkg: Change the PldHeader to Header in ExtraData.h duntan
@ 2021-07-05 6:07 ` duntan
2021-07-13 6:28 ` [edk2-devel] " Ni, Ray
1 sibling, 1 reply; 4+ messages in thread
From: duntan @ 2021-07-05 6:07 UTC (permalink / raw)
To: devel; +Cc: Guo Dong, Ray Ni, Maurice Ma, Benjamin You, DunTan
V1: Assign the length and revision of UniversalPayload ExtraData
V2: Force int to UINT16
Cc: Guo Dong <guo.dong@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Maurice Ma <maurice.ma@intel.com>
Cc: Benjamin You <benjamin.you@intel.com>
Signed-off-by: DunTan <dun.tan@intel.com>
---
UefiPayloadPkg/PayloadLoaderPeim/PayloadLoaderPeim.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/UefiPayloadPkg/PayloadLoaderPeim/PayloadLoaderPeim.c b/UefiPayloadPkg/PayloadLoaderPeim/PayloadLoaderPeim.c
index c619470dbb..0e25bef516 100644
--- a/UefiPayloadPkg/PayloadLoaderPeim/PayloadLoaderPeim.c
+++ b/UefiPayloadPkg/PayloadLoaderPeim/PayloadLoaderPeim.c
@@ -110,6 +110,8 @@ PeiLoadFileLoadPayload (
sizeof (UNIVERSAL_PAYLOAD_EXTRA_DATA) + ExtraDataCount * sizeof (UNIVERSAL_PAYLOAD_EXTRA_DATA_ENTRY)
);
ExtraData->Count = ExtraDataCount;
+ ExtraData->Header.Revision = UNIVERSAL_PAYLOAD_EXTRA_DATA_REVISION;
+ ExtraData->Header.Length = (UINT16) (sizeof (UNIVERSAL_PAYLOAD_EXTRA_DATA) + ExtraDataCount * sizeof (UNIVERSAL_PAYLOAD_EXTRA_DATA_ENTRY));
if (ExtraDataCount != 0) {
for (ExtraDataIndex = 0, Index = 0; Index < Context.ShNum; Index++) {
Status = GetElfSectionName (&Context, Index, &SectionName);
--
2.31.1.windows.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [edk2-devel] [Patch V2 2/2] UefiPayloadPkg: Assign the length of UniversalPayload ExtraData
2021-07-05 6:07 ` [Patch V2 2/2] UefiPayloadPkg: Assign the length of UniversalPayload ExtraData duntan
@ 2021-07-13 6:28 ` Ni, Ray
0 siblings, 0 replies; 4+ messages in thread
From: Ni, Ray @ 2021-07-13 6:28 UTC (permalink / raw)
To: duntan, devel
[-- Attachment #1: Type: text/plain, Size: 233 bytes --]
It will be better if you can create a local variable Length to hold "sizeof (UNIVERSAL_PAYLOAD_EXTRA_DATA) + ExtraDataCount * sizeof (UNIVERSAL_PAYLOAD_EXTRA_DATA_ENTRY)".
So that Length can be used in BuildGuidHob() call as well.
[-- Attachment #2: Type: text/html, Size: 250 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-07-13 6:28 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-07-05 6:07 [Patch V2 0/2] Fix the length and PldHeader for UniversalPayload ExtraData duntan
2021-07-05 6:07 ` [Patch V2 1/2] MdeModulePkg: Change the PldHeader to Header in ExtraData.h duntan
2021-07-05 6:07 ` [Patch V2 2/2] UefiPayloadPkg: Assign the length of UniversalPayload ExtraData duntan
2021-07-13 6:28 ` [edk2-devel] " Ni, Ray
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox