From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (using TLSv1 with cipher CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 28C8A1A1E7F for ; Fri, 2 Sep 2016 06:58:59 -0700 (PDT) Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga102.fm.intel.com with ESMTP; 02 Sep 2016 06:58:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.30,271,1470726000"; d="scan'208";a="3897032" Received: from ray-dev.ccr.corp.intel.com ([10.239.9.25]) by fmsmga005.fm.intel.com with ESMTP; 02 Sep 2016 06:58:58 -0700 From: Ruiyu Ni To: edk2-devel@lists.01.org Cc: Jeff Fan Date: Fri, 2 Sep 2016 21:58:46 +0800 Message-Id: <20160902135850.251164-7-ruiyu.ni@intel.com> X-Mailer: git-send-email 2.9.0.windows.1 In-Reply-To: <20160902135850.251164-1-ruiyu.ni@intel.com> References: <20160902135850.251164-1-ruiyu.ni@intel.com> Subject: [PATCH 06/10] UefiCpuPkg/MtrrLib: Add MtrrLib prefix to several internal functions X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Sep 2016 13:58:59 -0000 Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ruiyu Ni Cc: Jeff Fan --- UefiCpuPkg/Library/MtrrLib/MtrrLib.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/UefiCpuPkg/Library/MtrrLib/MtrrLib.c b/UefiCpuPkg/Library/MtrrLib/MtrrLib.c index 4adc41f..d7e6f05 100644 --- a/UefiCpuPkg/Library/MtrrLib/MtrrLib.c +++ b/UefiCpuPkg/Library/MtrrLib/MtrrLib.c @@ -243,7 +243,7 @@ MtrrGetDefaultMemoryType ( **/ VOID -PreMtrrChange ( +MtrrLibPreMtrrChange ( OUT MTRR_CONTEXT *MtrrContext ) { @@ -284,7 +284,7 @@ PreMtrrChange ( **/ VOID -PostMtrrChangeEnableCache ( +MtrrLibPostMtrrChangeEnableCache ( IN MTRR_CONTEXT *MtrrContext ) { @@ -319,7 +319,7 @@ PostMtrrChangeEnableCache ( **/ VOID -PostMtrrChange ( +MtrrLibPostMtrrChange ( IN MTRR_CONTEXT *MtrrContext ) { @@ -328,7 +328,7 @@ PostMtrrChange ( // AsmMsrBitFieldWrite64 (MTRR_LIB_IA32_MTRR_DEF_TYPE, 10, 11, 3); - PostMtrrChangeEnableCache (MtrrContext); + MtrrLibPostMtrrChangeEnableCache (MtrrContext); } /** @@ -1086,7 +1086,7 @@ MtrrLibInitializeMtrrMask ( **/ UINT64 -MtrrPrecedence ( +MtrrLibPrecedence ( IN UINT64 MtrrType1, IN UINT64 MtrrType2 ) @@ -1245,7 +1245,7 @@ MtrrGetMemoryAttributeByAddressWorker ( if (Address >= VariableMtrr[Index].BaseAddress && Address < VariableMtrr[Index].BaseAddress+VariableMtrr[Index].Length) { TempMtrrType = VariableMtrr[Index].Type; - MtrrType = MtrrPrecedence (MtrrType, TempMtrrType); + MtrrType = MtrrLibPrecedence (MtrrType, TempMtrrType); } } } @@ -1791,7 +1791,7 @@ Done: for (Index = 0; Index < MTRR_NUMBER_OF_FIXED_MTRR; Index++) { if (FixedSettingsModified[Index]) { if (!MtrrContextValid) { - PreMtrrChange (&MtrrContext); + MtrrLibPreMtrrChange (&MtrrContext); MtrrContextValid = TRUE; } AsmWriteMsr64 ( @@ -1809,7 +1809,7 @@ Done: if (WorkingVariableSettings.Mtrr[Index].Base != OriginalVariableSettings.Mtrr[Index].Base || WorkingVariableSettings.Mtrr[Index].Mask != OriginalVariableSettings.Mtrr[Index].Mask ) { if (!MtrrContextValid) { - PreMtrrChange (&MtrrContext); + MtrrLibPreMtrrChange (&MtrrContext); MtrrContextValid = TRUE; } AsmWriteMsr64 ( @@ -1824,7 +1824,7 @@ Done: } } if (MtrrContextValid) { - PostMtrrChange (&MtrrContext); + MtrrLibPostMtrrChange (&MtrrContext); } DEBUG((DEBUG_CACHE, " Status = %r\n", Status)); @@ -1971,9 +1971,9 @@ MtrrSetVariableMtrr ( return VariableSettings; } - PreMtrrChange (&MtrrContext); + MtrrLibPreMtrrChange (&MtrrContext); MtrrSetVariableMtrrWorker (VariableSettings); - PostMtrrChange (&MtrrContext); + MtrrLibPostMtrrChange (&MtrrContext); MtrrDebugPrintAllMtrrs (); return VariableSettings; @@ -2021,9 +2021,9 @@ MtrrSetFixedMtrr ( return FixedSettings; } - PreMtrrChange (&MtrrContext); + MtrrLibPreMtrrChange (&MtrrContext); MtrrSetFixedMtrrWorker (FixedSettings); - PostMtrrChange (&MtrrContext); + MtrrLibPostMtrrChange (&MtrrContext); MtrrDebugPrintAllMtrrs (); return FixedSettings; @@ -2091,7 +2091,7 @@ MtrrSetAllMtrrs ( return MtrrSetting; } - PreMtrrChange (&MtrrContext); + MtrrLibPreMtrrChange (&MtrrContext); // // Set fixed MTRRs @@ -2108,7 +2108,7 @@ MtrrSetAllMtrrs ( // AsmWriteMsr64 (MTRR_LIB_IA32_MTRR_DEF_TYPE, MtrrSetting->MtrrDefType); - PostMtrrChangeEnableCache (&MtrrContext); + MtrrLibPostMtrrChangeEnableCache (&MtrrContext); return MtrrSetting; } -- 2.9.0.windows.1