* [Patch] MdeModulePkg PeiCore: Make SetPeiServicesTablePointer() early in EntryPoint
@ 2016-11-23 4:51 Liming Gao
2016-11-23 7:18 ` Zeng, Star
0 siblings, 1 reply; 2+ messages in thread
From: Liming Gao @ 2016-11-23 4:51 UTC (permalink / raw)
To: edk2-devel; +Cc: Michael Kinney, Star Zeng
Make SetPeiServicesTablePointer() earlier than ProcessLibraryConstructorList()
so the constructor() function can get the correct pei service table pointer.
https://bugzilla.tianocore.org/show_bug.cgi?id=238
Cc: Michael Kinney <michael.d.kinney@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <liming.gao@intel.com>
---
MdeModulePkg/Core/Pei/PeiMain/PeiMain.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c b/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
index fed34f3..27484ba 100644
--- a/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
+++ b/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
@@ -208,16 +208,16 @@ PeiCore (
}
//
- // Initialize libraries that the PEI Core is linked against
- //
- ProcessLibraryConstructorList (NULL, (CONST EFI_PEI_SERVICES **)&OldCoreData->Ps);
-
- //
// Fixup for PeiService's address
//
SetPeiServicesTablePointer ((CONST EFI_PEI_SERVICES **)&OldCoreData->Ps);
//
+ // Initialize libraries that the PEI Core is linked against
+ //
+ ProcessLibraryConstructorList (NULL, (CONST EFI_PEI_SERVICES **)&OldCoreData->Ps);
+
+ //
// Update HandOffHob for new installed permanent memory
//
HandoffInformationTable = OldCoreData->HobList.HandoffInformationTable;
@@ -302,14 +302,14 @@ PeiCore (
PrivateData.Ps = &PrivateData.ServiceTableShadow;
//
- // Initialize libraries that the PEI Core is linked against
+ // Save PeiServicePointer so that it can be retrieved anywhere.
//
- ProcessLibraryConstructorList (NULL, (CONST EFI_PEI_SERVICES **)&PrivateData.Ps);
+ SetPeiServicesTablePointer ((CONST EFI_PEI_SERVICES **)&PrivateData.Ps);
//
- // Save PeiServicePointer so that it can be retrieved anywhere.
+ // Initialize libraries that the PEI Core is linked against
//
- SetPeiServicesTablePointer ((CONST EFI_PEI_SERVICES **)&PrivateData.Ps);
+ ProcessLibraryConstructorList (NULL, (CONST EFI_PEI_SERVICES **)&PrivateData.Ps);
//
// Initialize PEI Core Services
--
2.8.0.windows.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [Patch] MdeModulePkg PeiCore: Make SetPeiServicesTablePointer() early in EntryPoint
2016-11-23 4:51 [Patch] MdeModulePkg PeiCore: Make SetPeiServicesTablePointer() early in EntryPoint Liming Gao
@ 2016-11-23 7:18 ` Zeng, Star
0 siblings, 0 replies; 2+ messages in thread
From: Zeng, Star @ 2016-11-23 7:18 UTC (permalink / raw)
To: Gao, Liming, edk2-devel@lists.01.org; +Cc: Kinney, Michael D, Zeng, Star
Reviewed-by: Star Zeng <star.zeng@intel.com>
-----Original Message-----
From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Liming Gao
Sent: Wednesday, November 23, 2016 12:51 PM
To: edk2-devel@lists.01.org
Cc: Kinney, Michael D <michael.d.kinney@intel.com>; Zeng, Star <star.zeng@intel.com>
Subject: [edk2] [Patch] MdeModulePkg PeiCore: Make SetPeiServicesTablePointer() early in EntryPoint
Make SetPeiServicesTablePointer() earlier than ProcessLibraryConstructorList() so the constructor() function can get the correct pei service table pointer.
https://bugzilla.tianocore.org/show_bug.cgi?id=238
Cc: Michael Kinney <michael.d.kinney@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <liming.gao@intel.com>
---
MdeModulePkg/Core/Pei/PeiMain/PeiMain.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c b/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
index fed34f3..27484ba 100644
--- a/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
+++ b/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
@@ -208,16 +208,16 @@ PeiCore (
}
//
- // Initialize libraries that the PEI Core is linked against
- //
- ProcessLibraryConstructorList (NULL, (CONST EFI_PEI_SERVICES **)&OldCoreData->Ps);
-
- //
// Fixup for PeiService's address
//
SetPeiServicesTablePointer ((CONST EFI_PEI_SERVICES **)&OldCoreData->Ps);
//
+ // Initialize libraries that the PEI Core is linked against
+ //
+ ProcessLibraryConstructorList (NULL, (CONST EFI_PEI_SERVICES
+ **)&OldCoreData->Ps);
+
+ //
// Update HandOffHob for new installed permanent memory
//
HandoffInformationTable = OldCoreData->HobList.HandoffInformationTable;
@@ -302,14 +302,14 @@ PeiCore (
PrivateData.Ps = &PrivateData.ServiceTableShadow;
//
- // Initialize libraries that the PEI Core is linked against
+ // Save PeiServicePointer so that it can be retrieved anywhere.
//
- ProcessLibraryConstructorList (NULL, (CONST EFI_PEI_SERVICES **)&PrivateData.Ps);
+ SetPeiServicesTablePointer ((CONST EFI_PEI_SERVICES
+ **)&PrivateData.Ps);
//
- // Save PeiServicePointer so that it can be retrieved anywhere.
+ // Initialize libraries that the PEI Core is linked against
//
- SetPeiServicesTablePointer ((CONST EFI_PEI_SERVICES **)&PrivateData.Ps);
+ ProcessLibraryConstructorList (NULL, (CONST EFI_PEI_SERVICES
+ **)&PrivateData.Ps);
//
// Initialize PEI Core Services
--
2.8.0.windows.1
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-11-23 7:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-23 4:51 [Patch] MdeModulePkg PeiCore: Make SetPeiServicesTablePointer() early in EntryPoint Liming Gao
2016-11-23 7:18 ` Zeng, Star
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox