tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UefiCpuPkg/PiSmmCpuDxeSmm: Refine code to avoid duplicated code. 

V2:
  Change function parameter to avoid touch global info in function.
  Enhance function name, make it more user friendly

V1:
  Refine code to avoid duplicate code to set processor register.

Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
This commit is contained in:
Eric Dong 2017-09-28 17:12:38 +08:00
parent 7677b4db62
commit 94744aa2ce
1 changed files with 24 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c
View File

@ -208,18 +208,30 @@ Returns:
This function programs registers for the calling processor. This function programs registers for the calling processor.
@param RegisterTable Pointer to register table of the running processor. @param RegisterTables Pointer to register table of the running processor.
@param RegisterTableCount Register table count.
**/ **/
VOID VOID
SetProcessorRegister ( SetProcessorRegister (
IN CPU_REGISTER_TABLE *RegisterTable IN CPU_REGISTER_TABLE *RegisterTables,
IN UINTN RegisterTableCount
) )
{ {
CPU_REGISTER_TABLE_ENTRY *RegisterTableEntry; CPU_REGISTER_TABLE_ENTRY *RegisterTableEntry;
UINTN Index; UINTN Index;
UINTN Value; UINTN Value;
SPIN_LOCK *MsrSpinLock; SPIN_LOCK *MsrSpinLock;
UINT32 InitApicId;
CPU_REGISTER_TABLE *RegisterTable;
InitApicId = GetInitialApicId ();
for (Index = 0; Index < RegisterTableCount; Index++) {
if (RegisterTables[Index].InitialApicId == InitApicId) {
RegisterTable = &RegisterTables[Index];
break;
}
}
// //
// Traverse Register Table of this logical processor // Traverse Register Table of this logical processor
@ -347,36 +359,20 @@ SetProcessorRegister (
} }
} }
/** /**
AP initialization before then after SMBASE relocation in the S3 boot path. AP initialization before then after SMBASE relocation in the S3 boot path.
**/ **/
VOID VOID
MPRendezvousProcedure ( InitializeAp (
VOID VOID
) )
{ {
CPU_REGISTER_TABLE *RegisterTableList;
UINT32 InitApicId;
UINTN Index;
UINTN TopOfStack; UINTN TopOfStack;
UINT8 Stack[128]; UINT8 Stack[128];
LoadMtrrData (mAcpiCpuData.MtrrTable); LoadMtrrData (mAcpiCpuData.MtrrTable);
// SetProcessorRegister ((CPU_REGISTER_TABLE *) (UINTN) mAcpiCpuData.PreSmmInitRegisterTable, mAcpiCpuData.NumberOfCpus);
// Find processor number for this CPU.
//
RegisterTableList = (CPU_REGISTER_TABLE *) (UINTN) mAcpiCpuData.PreSmmInitRegisterTable;
InitApicId = GetInitialApicId ();
for (Index = 0; Index < mAcpiCpuData.NumberOfCpus; Index++) {
if (RegisterTableList[Index].InitialApicId == InitApicId) {
SetProcessorRegister (&RegisterTableList[Index]);
break;
}
}
// //
// Count down the number with lock mechanism. // Count down the number with lock mechanism.
@ -393,14 +389,7 @@ MPRendezvousProcedure (
ProgramVirtualWireMode (); ProgramVirtualWireMode ();
DisableLvtInterrupts (); DisableLvtInterrupts ();
RegisterTableList = (CPU_REGISTER_TABLE *) (UINTN) mAcpiCpuData.RegisterTable; SetProcessorRegister ((CPU_REGISTER_TABLE *) (UINTN) mAcpiCpuData.RegisterTable, mAcpiCpuData.NumberOfCpus);
InitApicId = GetInitialApicId ();
for (Index = 0; Index < mAcpiCpuData.NumberOfCpus; Index++) {
if (RegisterTableList[Index].InitialApicId == InitApicId) {
SetProcessorRegister (&RegisterTableList[Index]);
break;
}
}
// //
// Place AP into the safe code, count down the number with lock mechanism in the safe code. // Place AP into the safe code, count down the number with lock mechanism in the safe code.
@ -475,34 +464,20 @@ PrepareApStartupVector (
**/ **/
VOID VOID
EarlyInitializeCpu ( InitializeCpuBeforeRebase (
VOID VOID
) )
{ {
CPU_REGISTER_TABLE *RegisterTableList;
UINT32 InitApicId;
UINTN Index;
LoadMtrrData (mAcpiCpuData.MtrrTable); LoadMtrrData (mAcpiCpuData.MtrrTable);
// SetProcessorRegister ((CPU_REGISTER_TABLE *) (UINTN) mAcpiCpuData.PreSmmInitRegisterTable, mAcpiCpuData.NumberOfCpus);
// Find processor number for this CPU.
//
RegisterTableList = (CPU_REGISTER_TABLE *) (UINTN) mAcpiCpuData.PreSmmInitRegisterTable;
InitApicId = GetInitialApicId ();
for (Index = 0; Index < mAcpiCpuData.NumberOfCpus; Index++) {
if (RegisterTableList[Index].InitialApicId == InitApicId) {
SetProcessorRegister (&RegisterTableList[Index]);
break;
}
}
ProgramVirtualWireMode (); ProgramVirtualWireMode ();
PrepareApStartupVector (mAcpiCpuData.StartupVector); PrepareApStartupVector (mAcpiCpuData.StartupVector);
mNumberToFinish = mAcpiCpuData.NumberOfCpus - 1; mNumberToFinish = mAcpiCpuData.NumberOfCpus - 1;
mExchangeInfo->ApFunction = (VOID *) (UINTN) MPRendezvousProcedure; mExchangeInfo->ApFunction = (VOID *) (UINTN) InitializeAp;
// //
// Execute code for before SmmBaseReloc. Note: This flag is maintained across S3 boots. // Execute code for before SmmBaseReloc. Note: This flag is maintained across S3 boots.
@ -527,22 +502,11 @@ EarlyInitializeCpu (
**/ **/
VOID VOID
InitializeCpu ( InitializeCpuAfterRebase (
VOID VOID
) )
{ {
CPU_REGISTER_TABLE *RegisterTableList; SetProcessorRegister ((CPU_REGISTER_TABLE *) (UINTN) mAcpiCpuData.RegisterTable, mAcpiCpuData.NumberOfCpus);
UINT32 InitApicId;
UINTN Index;
RegisterTableList = (CPU_REGISTER_TABLE *) (UINTN) mAcpiCpuData.RegisterTable;
InitApicId = GetInitialApicId ();
for (Index = 0; Index < mAcpiCpuData.NumberOfCpus; Index++) {
if (RegisterTableList[Index].InitialApicId == InitApicId) {
SetProcessorRegister (&RegisterTableList[Index]);
break;
}
}
mNumberToFinish = mAcpiCpuData.NumberOfCpus - 1; mNumberToFinish = mAcpiCpuData.NumberOfCpus - 1;
@ -660,7 +624,7 @@ SmmRestoreCpu (
// //
// First time microcode load and restore MTRRs // First time microcode load and restore MTRRs
// //
EarlyInitializeCpu (); InitializeCpuBeforeRebase ();
} }
// //
@ -675,7 +639,7 @@ SmmRestoreCpu (
// //
// Restore MSRs for BSP and all APs // Restore MSRs for BSP and all APs
// //
InitializeCpu (); InitializeCpuAfterRebase ();
} }
// //