diff options
| author | Ruiyu Ni <ruiyu.ni@intel.com> | 2017-04-17 11:20:47 +0800 |
|---|---|---|
| committer | Ruiyu Ni <ruiyu.ni@intel.com> | 2017-04-18 10:29:04 +0800 |
| commit | c9b449213337172d629197a75390a151eba65eb6 (patch) | |
| tree | 0698f6b33637e7ee4ba56ab01340ace829d070b3 /UefiCpuPkg | |
| parent | 17c3dc19395121486c6f1614dbc564f39763720a (diff) | |
| download | edk2-c9b449213337172d629197a75390a151eba65eb6.tar.gz edk2-c9b449213337172d629197a75390a151eba65eb6.tar.bz2 edk2-c9b449213337172d629197a75390a151eba65eb6.zip | |
UefiCpuPkg/MtrrLib: Avoid running unnecessary code
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Hao A Wu <hao.a.wu@intel.com>
Diffstat (limited to 'UefiCpuPkg')
| -rw-r--r-- | UefiCpuPkg/Library/MtrrLib/MtrrLib.c | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/UefiCpuPkg/Library/MtrrLib/MtrrLib.c b/UefiCpuPkg/Library/MtrrLib/MtrrLib.c index c38191a7ef..9d1927262a 100644 --- a/UefiCpuPkg/Library/MtrrLib/MtrrLib.c +++ b/UefiCpuPkg/Library/MtrrLib/MtrrLib.c @@ -1536,6 +1536,7 @@ MtrrLibAddVariableMtrr ( MTRR_LIB_ASSERT_ALIGNED (BaseAddress, Length);
if (Type == CacheInvalid) {
+ ASSERT (Ranges != NULL);
for (Index = 0; Index < RangeCount; Index++) {
if (Ranges[Index].BaseAddress <= BaseAddress && BaseAddress < Ranges[Index].BaseAddress + Ranges[Index].Length) {
@@ -2027,25 +2028,27 @@ MtrrSetMemoryAttributeWorker ( ASSERT (OriginalVariableMtrrCount - FreeVariableMtrrCount <= FirmwareVariableMtrrCount);
//
- // Move MTRRs after the FirmwraeVariableMtrrCount position to beginning
+ // Move MTRRs after the FirmwareVariableMtrrCount position to beginning
//
- WorkingIndex = FirmwareVariableMtrrCount;
- for (Index = 0; Index < FirmwareVariableMtrrCount; Index++) {
- if (!OriginalVariableMtrr[Index].Valid) {
- //
- // Found an empty MTRR in WorkingIndex position
- //
- for (; WorkingIndex < OriginalVariableMtrrCount; WorkingIndex++) {
- if (OriginalVariableMtrr[WorkingIndex].Valid) {
- break;
+ if (FirmwareVariableMtrrCount < OriginalVariableMtrrCount) {
+ WorkingIndex = FirmwareVariableMtrrCount;
+ for (Index = 0; Index < FirmwareVariableMtrrCount; Index++) {
+ if (!OriginalVariableMtrr[Index].Valid) {
+ //
+ // Found an empty MTRR in WorkingIndex position
+ //
+ for (; WorkingIndex < OriginalVariableMtrrCount; WorkingIndex++) {
+ if (OriginalVariableMtrr[WorkingIndex].Valid) {
+ break;
+ }
}
- }
- if (WorkingIndex != OriginalVariableMtrrCount) {
- CopyMem (&OriginalVariableMtrr[Index], &OriginalVariableMtrr[WorkingIndex], sizeof (VARIABLE_MTRR));
- VariableSettingModified[Index] = TRUE;
- VariableSettingModified[WorkingIndex] = TRUE;
- OriginalVariableMtrr[WorkingIndex].Valid = FALSE;
+ if (WorkingIndex != OriginalVariableMtrrCount) {
+ CopyMem (&OriginalVariableMtrr[Index], &OriginalVariableMtrr[WorkingIndex], sizeof (VARIABLE_MTRR));
+ VariableSettingModified[Index] = TRUE;
+ VariableSettingModified[WorkingIndex] = TRUE;
+ OriginalVariableMtrr[WorkingIndex].Valid = FALSE;
+ }
}
}
}
|