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

UefiCpuPkg/MtrrLib: Fix GCC build failure 

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
This commit is contained in:
Ruiyu Ni 2017-03-31 22:04:17 +08:00
parent 47454e238c
commit 4ef6c3850e
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
UefiCpuPkg/Library/MtrrLib/MtrrLib.c
View File

@ -836,7 +836,7 @@ MtrrLibGetMtrrNumber (
IN UINT64 Alignment0, IN UINT64 Alignment0,
OUT UINT32 *SubLeft, // subtractive from BaseAddress to get more aligned address, to save MTRR OUT UINT32 *SubLeft, // subtractive from BaseAddress to get more aligned address, to save MTRR
OUT UINT32 *SubRight // subtractive from BaseAddress + Length, to save MTRR OUT UINT32 *SubRight // subtractive from BaseAddress + Length, to save MTRR
) )
{ {
UINT64 Alignment; UINT64 Alignment;
UINT32 LeastLeftMtrrNumber; UINT32 LeastLeftMtrrNumber;
@ -859,6 +859,8 @@ MtrrLibGetMtrrNumber (
// Get the optimal left subtraction solution. // Get the optimal left subtraction solution.
// //
if (BaseAddress != 0) { if (BaseAddress != 0) {
SubtractiveBaseAddress = 0;
SubtractiveLength = 0;
// //
// Get the MTRR number needed without left subtraction. // Get the MTRR number needed without left subtraction.
// //
@ -1371,6 +1373,8 @@ MtrrLibSetMemoryType (
UINT32 EndIndex; UINT32 EndIndex;
UINT32 DeltaCount; UINT32 DeltaCount;
LengthRight = 0;
LengthLeft = 0;
Limit = BaseAddress + Length; Limit = BaseAddress + Length;
StartIndex = *Count; StartIndex = *Count;
EndIndex = *Count; EndIndex = *Count;
@ -1847,6 +1851,8 @@ MtrrSetMemoryAttributeWorker (
if (((BaseAddress & ~MtrrValidAddressMask) != 0) || (Length & ~MtrrValidAddressMask) != 0) { if (((BaseAddress & ~MtrrValidAddressMask) != 0) || (Length & ~MtrrValidAddressMask) != 0) {
return RETURN_UNSUPPORTED; return RETURN_UNSUPPORTED;
} }
OriginalVariableMtrrCount = 0;
VariableSettings = NULL;
ZeroMem (&WorkingFixedSettings, sizeof (WorkingFixedSettings)); ZeroMem (&WorkingFixedSettings, sizeof (WorkingFixedSettings));
for (Index = 0; Index < MTRR_NUMBER_OF_FIXED_MTRR; Index++) { for (Index = 0; Index < MTRR_NUMBER_OF_FIXED_MTRR; Index++) {
@ -2048,7 +2054,7 @@ MtrrSetMemoryAttributeWorker (
if (VariableSettingModified[Index]) { if (VariableSettingModified[Index]) {
if (OriginalVariableMtrr[Index].Valid) { if (OriginalVariableMtrr[Index].Valid) {
VariableSettings->Mtrr[Index].Base = (OriginalVariableMtrr[Index].BaseAddress & MtrrValidAddressMask) | (UINT8) OriginalVariableMtrr[Index].Type; VariableSettings->Mtrr[Index].Base = (OriginalVariableMtrr[Index].BaseAddress & MtrrValidAddressMask) | (UINT8) OriginalVariableMtrr[Index].Type;
VariableSettings->Mtrr[Index].Mask = (~(OriginalVariableMtrr[Index].Length - 1)) & MtrrValidAddressMask | BIT11; VariableSettings->Mtrr[Index].Mask = ((~(OriginalVariableMtrr[Index].Length - 1)) & MtrrValidAddressMask) | BIT11;
} else { } else {
VariableSettings->Mtrr[Index].Base = 0; VariableSettings->Mtrr[Index].Base = 0;
VariableSettings->Mtrr[Index].Mask = 0; VariableSettings->Mtrr[Index].Mask = 0;
@ -2081,6 +2087,8 @@ Done:
// //
// Write variable MTRRs // Write variable MTRRs
// When only fixed MTRRs were changed, below loop doesn't run
// because OriginalVariableMtrrCount equals to 0.
// //
for (Index = 0; Index < OriginalVariableMtrrCount; Index++) { for (Index = 0; Index < OriginalVariableMtrrCount; Index++) {
if (VariableSettingModified[Index]) { if (VariableSettingModified[Index]) {
@ -2102,7 +2110,7 @@ Done:
MtrrLibPostMtrrChange (&MtrrContext); MtrrLibPostMtrrChange (&MtrrContext);
} }
return Status; return RETURN_SUCCESS;
} }
/** /**