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

UefiCpuPkg/MtrrLib: Add MtrrLib prefix to ProgramFixedMtrr 

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Jeff Fan <jeff.fan@intel.com>
This commit is contained in:
Ruiyu Ni 2016-09-02 10:41:28 +08:00
parent 386f5785ea
commit 94240f1b05
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -445,7 +445,7 @@ MtrrGetVariableMtrr (
/** /**
Programs fixed MTRRs registers. Programs fixed MTRRs registers.
@param[in] MemoryCacheType The memory type to set. @param[in] Type The memory type to set.
@param[in, out] Base The base address of memory range. @param[in, out] Base The base address of memory range.
@param[in, out] Length The length of memory range. @param[in, out] Length The length of memory range.
@param[in, out] LastMsrNum On input, the last index of the fixed MTRR MSR to program. @param[in, out] LastMsrNum On input, the last index of the fixed MTRR MSR to program.
@ -459,13 +459,13 @@ MtrrGetVariableMtrr (
**/ **/
RETURN_STATUS RETURN_STATUS
ProgramFixedMtrr ( MtrrLibProgramFixedMtrr (
IN UINT64 MemoryCacheType, IN MTRR_MEMORY_CACHE_TYPE Type,
IN OUT UINT64 *Base, IN OUT UINT64 *Base,
IN OUT UINT64 *Length, IN OUT UINT64 *Length,
IN OUT UINT32 *LastMsrNum, IN OUT UINT32 *LastMsrNum,
OUT UINT64 *ReturnClearMask, OUT UINT64 *ReturnClearMask,
OUT UINT64 *ReturnOrMask OUT UINT64 *ReturnOrMask
) )
{ {
UINT32 MsrNum; UINT32 MsrNum;
@ -491,7 +491,7 @@ ProgramFixedMtrr (
} }
} }
if (MsrNum >= MTRR_NUMBER_OF_FIXED_MTRR) { if (MsrNum == MTRR_NUMBER_OF_FIXED_MTRR) {
return RETURN_UNSUPPORTED; return RETURN_UNSUPPORTED;
} }
@ -526,7 +526,7 @@ ProgramFixedMtrr (
} }
ClearMask = CLEAR_SEED; ClearMask = CLEAR_SEED;
OrMask = MultU64x32 (OR_SEED, (UINT32)MemoryCacheType); OrMask = MultU64x32 (OR_SEED, (UINT32) Type);
if (LeftByteShift != 0) { if (LeftByteShift != 0) {
// //
@ -1562,7 +1562,7 @@ MtrrSetMemoryAttributeWorker (
if (BaseAddress < BASE_1MB) { if (BaseAddress < BASE_1MB) {
MsrNum = (UINT32)-1; MsrNum = (UINT32)-1;
while ((BaseAddress < BASE_1MB) && (Length > 0) && Status == RETURN_SUCCESS) { while ((BaseAddress < BASE_1MB) && (Length > 0) && Status == RETURN_SUCCESS) {
Status = ProgramFixedMtrr (MemoryType, &BaseAddress, &Length, &MsrNum, &ClearMask, &OrMask); Status = MtrrLibProgramFixedMtrr (Attribute, &BaseAddress, &Length, &MsrNum, &ClearMask, &OrMask);
if (RETURN_ERROR (Status)) { if (RETURN_ERROR (Status)) {
goto Done; goto Done;
} }