From nobody Sat Nov 2 12:25:31 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1490756645184521.7633151356379; Tue, 28 Mar 2017 20:04:05 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 1831821940D03; Tue, 28 Mar 2017 20:03:58 -0700 (PDT) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 9626520084778 for ; Tue, 28 Mar 2017 20:03:54 -0700 (PDT) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga105.jf.intel.com with ESMTP; 28 Mar 2017 20:03:54 -0700 Received: from ray-dev.ccr.corp.intel.com ([10.239.9.25]) by orsmga001.jf.intel.com with ESMTP; 28 Mar 2017 20:03:53 -0700 X-Original-To: edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,239,1486454400"; d="scan'208";a="1113146600" From: Ruiyu Ni To: edk2-devel@lists.01.org Date: Wed, 29 Mar 2017 11:03:41 +0800 Message-Id: <20170329030346.249872-6-ruiyu.ni@intel.com> X-Mailer: git-send-email 2.9.0.windows.1 In-Reply-To: <20170329030346.249872-1-ruiyu.ni@intel.com> References: <20170329030346.249872-1-ruiyu.ni@intel.com> Subject: [edk2] [PATCH 05/10] UefiCpuPkg/MtrrLib: Add MtrrLib prefix to ProgramFixedMtrr X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jeff Fan MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ruiyu Ni Cc: Jeff Fan --- UefiCpuPkg/Library/MtrrLib/MtrrLib.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/UefiCpuPkg/Library/MtrrLib/MtrrLib.c b/UefiCpuPkg/Library/Mtrr= Lib/MtrrLib.c index 7e8a19a..4adc41f 100644 --- a/UefiCpuPkg/Library/MtrrLib/MtrrLib.c +++ b/UefiCpuPkg/Library/MtrrLib/MtrrLib.c @@ -445,7 +445,7 @@ MtrrGetVariableMtrr ( /** Programs fixed MTRRs registers. =20 - @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] Length The length of memory range. @param[in, out] LastMsrNum On input, the last index of the fixed M= TRR MSR to program. @@ -459,13 +459,13 @@ MtrrGetVariableMtrr ( =20 **/ RETURN_STATUS -ProgramFixedMtrr ( - IN UINT64 MemoryCacheType, - IN OUT UINT64 *Base, - IN OUT UINT64 *Length, - IN OUT UINT32 *LastMsrNum, - OUT UINT64 *ReturnClearMask, - OUT UINT64 *ReturnOrMask +MtrrLibProgramFixedMtrr ( + IN MTRR_MEMORY_CACHE_TYPE Type, + IN OUT UINT64 *Base, + IN OUT UINT64 *Length, + IN OUT UINT32 *LastMsrNum, + OUT UINT64 *ReturnClearMask, + OUT UINT64 *ReturnOrMask ) { UINT32 MsrNum; @@ -491,7 +491,7 @@ ProgramFixedMtrr ( } } =20 - if (MsrNum >=3D MTRR_NUMBER_OF_FIXED_MTRR) { + if (MsrNum =3D=3D MTRR_NUMBER_OF_FIXED_MTRR) { return RETURN_UNSUPPORTED; } =20 @@ -526,7 +526,7 @@ ProgramFixedMtrr ( } =20 ClearMask =3D CLEAR_SEED; - OrMask =3D MultU64x32 (OR_SEED, (UINT32)MemoryCacheType); + OrMask =3D MultU64x32 (OR_SEED, (UINT32) Type); =20 if (LeftByteShift !=3D 0) { // @@ -1562,7 +1562,7 @@ MtrrSetMemoryAttributeWorker ( if (BaseAddress < BASE_1MB) { MsrNum =3D (UINT32)-1; while ((BaseAddress < BASE_1MB) && (Length > 0) && Status =3D=3D RETUR= N_SUCCESS) { - Status =3D ProgramFixedMtrr (MemoryType, &BaseAddress, &Length, &Msr= Num, &ClearMask, &OrMask); + Status =3D MtrrLibProgramFixedMtrr (Attribute, &BaseAddress, &Length= , &MsrNum, &ClearMask, &OrMask); if (RETURN_ERROR (Status)) { goto Done; } --=20 2.9.0.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel