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 D38F7AC09EA for ; Wed, 13 Sep 2023 04:27:27 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=tLzj+DrDxqug7TeYhzrVM+WQMdYPqW3n1ofFo2+OCYI=; 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=1694579246; v=1; b=HzRU037LdmnxEQSM/E8Tq0eUEemRe/JFIIpZklLn7rchZvmzu0WFT9k6H32k3n4kTB0NhCDt UHUBzmTytAvoq1LtvUw5wxDgVDn33ilvaztOF/CU5aNczWITWM7LHJtdC9Ms7ohc4xtyUtWOXw7 R76KK9/ujjeE3FA5SqOT8jhQ= X-Received: by 127.0.0.2 with SMTP id hyOSYY7687511xXDa5nsH0oo; Tue, 12 Sep 2023 21:27:26 -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:26 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10831"; a="363595481" X-IronPort-AV: E=Sophos;i="6.02,142,1688454000"; d="scan'208";a="363595481" 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:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10831"; a="859093664" X-IronPort-AV: E=Sophos;i="6.02,142,1688454000"; d="scan'208";a="859093664" 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:23 -0700 From: "Yuanhao Xie" To: devel@edk2.groups.io Cc: Yuanhao Xie , Eric Dong , Rahul Kumar , Gerd Hoffmann , Ray Ni Subject: [edk2-devel] [PATCH 11/16] UefiCpuPkg/MtrrUnitTest: Update UnitTestMtrrSetAllMtrrs(). Date: Wed, 13 Sep 2023 12:26:34 +0800 Message-Id: <20230913042639.2066-12-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: EfFCdwcqfZZUtYR6WI25af9fx7686176AA= 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=HzRU037L; 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 UnitTestMtrrSetAllMtrrs() for the case that fixed MtrrLib is not always supported. Signed-off-by: Yuanhao Xie Cc: Eric Dong Cc: Rahul Kumar Cc: Gerd Hoffmann Cc: Ray Ni --- UefiCpuPkg/Library/MtrrLib/UnitTest/MtrrLibUnitTest.c | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/UefiCpuPkg/Library/MtrrLib/UnitTest/MtrrLibUnitTest.c b/UefiCpuPkg/Library/MtrrLib/UnitTest/MtrrLibUnitTest.c index 2905b091a5..dc348ef0a3 100644 --- a/UefiCpuPkg/Library/MtrrLib/UnitTest/MtrrLibUnitTest.c +++ b/UefiCpuPkg/Library/MtrrLib/UnitTest/MtrrLibUnitTest.c @@ -799,13 +799,10 @@ UnitTestMtrrGetAllMtrrs ( /** Unit test of MtrrLib service MtrrSetAllMtrrs() - @param[in] Context Ignored - @retval UNIT_TEST_PASSED The Unit test has completed and the test case was successful. @retval UNIT_TEST_ERROR_TEST_FAILED A test case assertion has failed. - **/ UNIT_TEST_STATUS EFIAPI @@ -814,35 +811,43 @@ UnitTestMtrrSetAllMtrrs ( ) { MTRR_SETTINGS *Result; - MTRR_SETTINGS Mtrrs; + MTRR_SETTINGS ExpectedMtrrs; UINT32 Index; MSR_IA32_MTRR_DEF_TYPE_REGISTER Default; MTRR_LIB_SYSTEM_PARAMETER SystemParameter; MTRR_LIB_TEST_CONTEXT *LocalContext; + UINTN MsrIndex; + UINTN ByteIndex; + UINT64 MsrValue; LocalContext = (MTRR_LIB_TEST_CONTEXT *)Context; - CopyMem (&SystemParameter, LocalContext->SystemParameter, sizeof (SystemParameter)); InitializeMtrrRegs (&SystemParameter); - Default.Uint64 = 0; Default.Bits.E = 1; Default.Bits.FE = 1; Default.Bits.Type = GenerateRandomCacheType (); - - ZeroMem (&Mtrrs, sizeof (Mtrrs)); - Mtrrs.MtrrDefType = Default.Uint64; + ZeroMem (&ExpectedMtrrs, sizeof (ExpectedMtrrs)); + ExpectedMtrrs.MtrrDefType = Default.Uint64; for (Index = 0; Index < SystemParameter.VariableMtrrCount; Index++) { - GenerateRandomMtrrPair (SystemParameter.PhysicalAddressBits, GenerateRandomCacheType (), &Mtrrs.Variables.Mtrr[Index], NULL); + GenerateRandomMtrrPair (SystemParameter.PhysicalAddressBits, GenerateRandomCacheType (), &ExpectedMtrrs.Variables.Mtrr[Index], NULL); } - Result = MtrrSetAllMtrrs (&Mtrrs); - UT_ASSERT_EQUAL ((UINTN)Result, (UINTN)&Mtrrs); + for (MsrIndex = 0; MsrIndex < ARRAY_SIZE (mFixedMtrrsIndex); MsrIndex++) { + MsrValue = 0; + for (ByteIndex = 0; ByteIndex < sizeof (UINT64); ByteIndex++) { + MsrValue = MsrValue | LShiftU64 (GenerateRandomCacheType (), ByteIndex * 8); + } + + ExpectedMtrrs.Fixed.Mtrr[MsrIndex] = MsrValue; + } - UT_ASSERT_EQUAL (AsmReadMsr64 (MSR_IA32_MTRR_DEF_TYPE), Mtrrs.MtrrDefType); + Result = MtrrSetAllMtrrs (&ExpectedMtrrs); + UT_ASSERT_EQUAL ((UINTN)Result, (UINTN)&ExpectedMtrrs); + UT_ASSERT_EQUAL (AsmReadMsr64 (MSR_IA32_MTRR_DEF_TYPE), ExpectedMtrrs.MtrrDefType); for (Index = 0; Index < SystemParameter.VariableMtrrCount; Index++) { - UT_ASSERT_EQUAL (AsmReadMsr64 (MSR_IA32_MTRR_PHYSBASE0 + (Index << 1)), Mtrrs.Variables.Mtrr[Index].Base); - UT_ASSERT_EQUAL (AsmReadMsr64 (MSR_IA32_MTRR_PHYSMASK0 + (Index << 1)), Mtrrs.Variables.Mtrr[Index].Mask); + UT_ASSERT_EQUAL (AsmReadMsr64 (MSR_IA32_MTRR_PHYSBASE0 + (Index << 1)), ExpectedMtrrs.Variables.Mtrr[Index].Base); + UT_ASSERT_EQUAL (AsmReadMsr64 (MSR_IA32_MTRR_PHYSMASK0 + (Index << 1)), ExpectedMtrrs.Variables.Mtrr[Index].Mask); } return UNIT_TEST_PASSED; -- 2.36.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#108567): https://edk2.groups.io/g/devel/message/108567 Mute This Topic: https://groups.io/mt/101331029/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-