From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id E0436940F57 for ; Wed, 13 Sep 2023 04:27:14 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=OZccVSF8k1VbIWTBR0Qf36Ld06l1rvfr1khb3xoHjdI=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding; s=20140610; t=1694579233; v=1; b=kAJzHLeZItRQxg4dH9yFsF4Sob1+mYaj11nRFOpcSQ7AyDdu1MYL+JQEEOBMbTMINdTsVHnu 5lIqebLZJjxKu/++WS7tBQDAYtuCoqWCbfZ/IbYDGhf0zSYafVOgsNEnvWUAwS9wXkNG0gYw65q ttY6G4CT/cIphb4hOgeQ63Eg= X-Received: by 127.0.0.2 with SMTP id aKHeYY7687511xc1pDcgRLNF; Tue, 12 Sep 2023 21:27:13 -0700 X-Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web11.4645.1694579216558329653 for ; Tue, 12 Sep 2023 21:27:13 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10831"; a="363595434" X-IronPort-AV: E=Sophos;i="6.02,142,1688454000"; d="scan'208";a="363595434" X-Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2023 21:27:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10831"; a="859093636" X-IronPort-AV: E=Sophos;i="6.02,142,1688454000"; d="scan'208";a="859093636" X-Received: from shwdeopenlab705.ccr.corp.intel.com ([10.239.55.100]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2023 21:27:10 -0700 From: "Yuanhao Xie" To: devel@edk2.groups.io Cc: Ray Ni , Yuanhao Xie , Eric Dong , Rahul Kumar , Gerd Hoffmann Subject: [edk2-devel] [PATCH 06/16] UefiCpuPkg/MtrrLib: Fix MtrrGetAllMtrrs to return correct MTRR setting. Date: Wed, 13 Sep 2023 12:26:29 +0800 Message-Id: <20230913042639.2066-7-yuanhao.xie@intel.com> In-Reply-To: <20230913042639.2066-1-yuanhao.xie@intel.com> References: <20230913042639.2066-1-yuanhao.xie@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,yuanhao.xie@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: zpfuZgCelfMR7idoq2wPC2Rox7686176AA= Content-Transfer-Encoding: 8bit X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=kAJzHLeZ; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io From: Ray Ni The patch fixes the following issues in the original implementation: 1. MtrrSetting contains random value if MTRR is not supported. 2. Unconditionally access fixed MTRR on CPU that may not support fixed MTRR. 3. The maximum number of Variable MTRR entries are initialized, while the portion exceeding the maximum number remains uninitialized. Signed-off-by: Ray Ni Signed-off-by: Yuanhao Xie Cc: Eric Dong Cc: Rahul Kumar Cc: Gerd Hoffmann --- UefiCpuPkg/Library/MtrrLib/MtrrLib.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/UefiCpuPkg/Library/MtrrLib/MtrrLib.c b/UefiCpuPkg/Library/MtrrLib/MtrrLib.c index bd61ffc240..c9440f01ef 100644 --- a/UefiCpuPkg/Library/MtrrLib/MtrrLib.c +++ b/UefiCpuPkg/Library/MtrrLib/MtrrLib.c @@ -2824,29 +2824,43 @@ MtrrGetAllMtrrs ( OUT MTRR_SETTINGS *MtrrSetting ) { - if (!IsMtrrSupported ()) { + BOOLEAN FixedMtrrSupported; + UINT32 VariableMtrrCount; + MSR_IA32_MTRR_DEF_TYPE_REGISTER *MtrrDefType; + + ZeroMem (MtrrSetting, sizeof (*MtrrSetting)); + + MtrrDefType = (MSR_IA32_MTRR_DEF_TYPE_REGISTER *)&MtrrSetting->MtrrDefType; + if (!MtrrLibIsMtrrSupported (&FixedMtrrSupported, &VariableMtrrCount)) { return MtrrSetting; } + // + // Get MTRR_DEF_TYPE value + // + MtrrDefType->Uint64 = AsmReadMsr64 (MSR_IA32_MTRR_DEF_TYPE); + + // + // Enabling the Fixed MTRR bit when unsupported is not allowed. + // + ASSERT (FixedMtrrSupported || (MtrrDefType->Bits.FE == 0)); + // // Get fixed MTRRs // - MtrrGetFixedMtrrWorker (&MtrrSetting->Fixed); + if (MtrrDefType->Bits.FE == 1) { + MtrrGetFixedMtrrWorker (&MtrrSetting->Fixed); + } // // Get variable MTRRs // MtrrGetVariableMtrrWorker ( NULL, - GetVariableMtrrCountWorker (), + VariableMtrrCount, &MtrrSetting->Variables ); - // - // Get MTRR_DEF_TYPE value - // - MtrrSetting->MtrrDefType = AsmReadMsr64 (MSR_IA32_MTRR_DEF_TYPE); - return MtrrSetting; } -- 2.36.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#108562): https://edk2.groups.io/g/devel/message/108562 Mute This Topic: https://groups.io/mt/101331024/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-