<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40"> <head> <meta http-equiv="Content-Type" content="text/html; charset=us-ascii"> <meta name="Generator" content="Microsoft Word 15 (filtered medium)"> <style></style> </head> <body lang="EN-US" link="#0563C1" vlink="#954F72"> <div class="WordSection1"> Ray,<o:p></o:p> <o:p> </o:p> I applied this change to an internal desktop machine and did below tests:<o:p></o:p> <![if !supportLists]>1. <![endif]>boot it to shell <o:p></o:p> <![if !supportLists]>2. <![endif]>reboot the system to shell.<o:p></o:p> <o:p> </o:p> Thanks,<o:p></o:p> Eric<o:p></o:p> <div style="border:none;border-left:solid blue 1.5pt;padding:0in 0in 0in 4.0pt"> <div> <div style="border:none;border-top:solid #E1E1E1 1.0pt;padding:3.0pt 0in 0in 0in"> From: Ni, Ray Sent: Wednesday, January 15, 2020 3:43 PM To: devel@edk2.groups.io; Dong, Eric <eric.dong@intel.com> Cc: Laszlo Ersek <lersek@redhat.com> Subject: RE: [edk2-devel] [PATCH] UefiCpuPkg/Library/MpInitLib: Remove BSP index == 0 Assumption.<o:p></o:p> </div> </div> <o:p> </o:p> Eric, What unit test was done for this patch? > -----Original Message----- > From: <a href="mailto:devel@edk2.groups.io">devel@edk2.groups.io</a> <<a href="mailto:devel@edk2.groups.io">devel@edk2.groups.io</a>> On Behalf Of Dong, Eric > Sent: Wednesday, January 15, 2020 2:07 PM > To: <a href="mailto:devel@edk2.groups.io">devel@edk2.groups.io</a> > Cc: Ni, Ray <<a href="mailto:ray.ni@intel.com">ray.ni@intel.com</a>>; Laszlo Ersek <<a href="mailto:lersek@redhat.com">lersek@redhat.com</a>> > Subject: [edk2-devel] [PATCH] UefiCpuPkg/Library/MpInitLib: Remove BSP index == 0 Assumption. > > REF: <a href="https://bugzilla.tianocore.org/show_bug.cgi?id=2392">https://bugzilla.tianocore.org/show_bug.cgi?id=2392</a> > > > Current code implementation assumes BSP index is 0 at the begin. > This code change removes this assumption. It get BSP index from > the saved data structure if it existed. > > Cc: Ray Ni <<a href="mailto:ray.ni@intel.com">ray.ni@intel.com</a>> > Cc: Laszlo Ersek <<a href="mailto:lersek@redhat.com">lersek@redhat.com</a>> > Signed-off-by: Eric Dong <<a href="mailto:eric.dong@intel.com">eric.dong@intel.com</a>> > --- > UefiCpuPkg/Library/MpInitLib/MpLib.c | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c b/UefiCpuPkg/Library/MpInitLib/MpLib.c > index 6ec9b172b8..922c87b766 100644 > --- a/UefiCpuPkg/Library/MpInitLib/MpLib.c > +++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c > @@ -636,7 +636,7 @@ ApWakeupFunction ( > // to initialize AP in InitConfig path. > > // NOTE: IDTR.BASE stored in CpuMpData->CpuData[0].VolatileRegisters points to a different IDT shared by all APs. > > // > > - RestoreVolatileRegisters (&CpuMpData->CpuData[0].VolatileRegisters, FALSE); > > + RestoreVolatileRegisters (&CpuMpData->CpuData[CpuMpData->BspNumber].VolatileRegisters, FALSE); > > InitializeApData (CpuMpData, ProcessorNumber, BistData, ApTopOfStack); > > ApStartupSignalBuffer = CpuMpData->CpuData[ProcessorNumber].StartupApSignal; > > > > @@ -1615,6 +1615,7 @@ MpInitLibInitialize ( > UINTN ApResetVectorSize; > > UINTN BackupBufferAddr; > > UINTN ApIdtBase; > > + UINT64 BspTopOfStack; > > > > OldCpuMpData = GetCpuMpDataFromGuidedHob (); > > if (OldCpuMpData == NULL) { > > @@ -1677,7 +1678,7 @@ MpInitLibInitialize ( > CpuMpData->BackupBufferSize = ApResetVectorSize; > > CpuMpData->WakeupBuffer = (UINTN) -1; > > CpuMpData->CpuCount = 1; > > - CpuMpData->BspNumber = 0; > > + CpuMpData->BspNumber = OldCpuMpData != NULL ? OldCpuMpData->BspNumber : 0; > > CpuMpData->WaitEvent = NULL; > > CpuMpData->SwitchBspFlag = FALSE; > > CpuMpData->CpuData = (CPU_AP_DATA *) (CpuMpData + 1); > > @@ -1704,11 +1705,12 @@ MpInitLibInitialize ( > // Don't pass BSP's TR to APs to avoid AP init failure. > > // > > VolatileRegisters.Tr = 0; > > - CopyMem (&CpuMpData->CpuData[0].VolatileRegisters, &VolatileRegisters, sizeof (VolatileRegisters)); > > + CopyMem (&CpuMpData->CpuData[CpuMpData->BspNumber].VolatileRegisters, &VolatileRegisters, sizeof > (VolatileRegisters)); > > // > > // Set BSP basic information > > // > > - InitializeApData (CpuMpData, 0, 0, CpuMpData->Buffer + ApStackSize); > > + BspTopOfStack = CpuMpData->Buffer + (CpuMpData->BspNumber + 1) * CpuMpData->CpuApStackSize; > > + InitializeApData (CpuMpData, CpuMpData->BspNumber, 0, BspTopOfStack); > > // > > // Save assembly code information > > // > > -- > 2.23.0.windows.1 > > > -=-=-=-=-=-= > Groups.io Links: You receive all messages sent to this group. > > View/Reply Online (#53263): <a href="https://edk2.groups.io/g/devel/message/53263">https://edk2.groups.io/g/devel/message/53263</a> > Mute This Topic: <a href="https://groups.io/mt/69712223/1712937">https://groups.io/mt/69712223/1712937</a> > Group Owner: <a href="mailto:devel+owner@edk2.groups.io">devel+owner@edk2.groups.io</a> > Unsubscribe: <a href="https://edk2.groups.io/g/devel/unsub">https://edk2.groups.io/g/devel/unsub</a> [ray.ni@intel.com] > -=-=-=-=-=-=<o:p></o:p> </div> </div> </body> </html> <div width="1" style="color:white;clear:both">_._,_._,_</div> <hr> Groups.io Links: You receive all messages sent to this group. <a target="_blank" href="https://edk2.groups.io/g/devel/message/53265">View/Reply Online (#53265)</a> | | <a target="_blank" href="https://groups.io/mt/69712223/1813853">Mute This Topic</a> | <a href="https://edk2.groups.io/g/devel/post">New Topic</a> <a href="https://edk2.groups.io/g/devel/editsub/1813853">Your Subscription</a> | <a href="mailto:devel+owner@edk2.groups.io">Contact Group Owner</a> | <a href="https://edk2.groups.io/g/devel/unsub">Unsubscribe</a> [edk2-devel-archive@redhat.com] <div width="1" style="color:white;clear:both">_._,_._,_</div>