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 66A75740039 for ; Wed, 13 Sep 2023 04:27:10 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=R/jec6jhVePz5KQRVGeA2nMNGxTzRRbQ2PGetdYgXc4=; 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=1694579228; v=1; b=iEXUbp1TPukv37WAGdUycB1d8dnQW+6+UlK5UedAZoWFjJ/BRdHAo2VtQ95pIGclJr/ZBnp0 gaSZcJKusntWwBKY3S0JVCf4B2nfaW0AfKD69/bo7roBEiCFRj3aqlc4IpETogT9Ly3GSy7qoLc dBZ55+kn/oSZ/eZZfBQimxJg= X-Received: by 127.0.0.2 with SMTP id s43jYY7687511x7xjVnreJgI; Tue, 12 Sep 2023 21:27:08 -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:08 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10831"; a="363595425" X-IronPort-AV: E=Sophos;i="6.02,142,1688454000"; d="scan'208";a="363595425" 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:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10831"; a="859093626" X-IronPort-AV: E=Sophos;i="6.02,142,1688454000"; d="scan'208";a="859093626" 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:06 -0700 From: "Yuanhao Xie" To: devel@edk2.groups.io Cc: Ray Ni , Eric Dong , Rahul Kumar , Gerd Hoffmann Subject: [edk2-devel] [PATCH 04/16] UefiCpuPkg/MtrrUnitTest: Update UnitTestMtrrGetDefaultMemoryType. Date: Wed, 13 Sep 2023 12:26:27 +0800 Message-Id: <20230913042639.2066-5-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: d5kMve1V8vHOrGLxDs1E6PmGx7686176AA= 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=iEXUbp1T; 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 Update UnitTestMtrrGetDefaultMemoryType for the case the when Fixed MTRRs are not supported. The original implementation returns FALSE when either fixed MTRR isn't supported or the number of variable MTRRs is 0. The correct behavior should return FALSE only when both fixed MTRR isn't supported and the number of variable MTRRs is 0. Signed-off-by: Ray Ni Cc: Eric Dong Cc: Rahul Kumar Cc: Gerd Hoffmann --- UefiCpuPkg/Library/MtrrLib/UnitTest/MtrrLibUnitTest.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/UefiCpuPkg/Library/MtrrLib/UnitTest/MtrrLibUnitTest.c b/UefiCpuPkg/Library/MtrrLib/UnitTest/MtrrLibUnitTest.c index 75ae4d65b9..293f3bc7b5 100644 --- a/UefiCpuPkg/Library/MtrrLib/UnitTest/MtrrLibUnitTest.c +++ b/UefiCpuPkg/Library/MtrrLib/UnitTest/MtrrLibUnitTest.c @@ -896,26 +896,18 @@ UnitTestMtrrGetDefaultMemoryType ( UT_ASSERT_EQUAL (Result, SystemParameter.DefaultCacheType); } - // - // If MTRRs are not supported, then always return CacheUncacheable - // - SystemParameter.MtrrSupported = FALSE; - InitializeMtrrRegs (&SystemParameter); - Result = MtrrGetDefaultMemoryType (); - UT_ASSERT_EQUAL (Result, CacheUncacheable); - SystemParameter.MtrrSupported = TRUE; SystemParameter.FixedMtrrSupported = FALSE; InitializeMtrrRegs (&SystemParameter); Result = MtrrGetDefaultMemoryType (); - UT_ASSERT_EQUAL (Result, CacheUncacheable); + UT_ASSERT_EQUAL (Result, SystemParameter.DefaultCacheType); SystemParameter.MtrrSupported = TRUE; SystemParameter.FixedMtrrSupported = TRUE; SystemParameter.VariableMtrrCount = 0; InitializeMtrrRegs (&SystemParameter); Result = MtrrGetDefaultMemoryType (); - UT_ASSERT_EQUAL (Result, CacheUncacheable); + UT_ASSERT_EQUAL (Result, SystemParameter.DefaultCacheType); return UNIT_TEST_PASSED; } -- 2.36.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#108560): https://edk2.groups.io/g/devel/message/108560 Mute This Topic: https://groups.io/mt/101331022/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-