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 064B0940F89 for ; Wed, 13 Sep 2023 04:27:17 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=Jf5Aerr0MId1tH5IxhxXO09KOoxcKT4/R8AOVPS6EZc=; 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=1694579236; v=1; b=q68OHl7ycNXi1FpRNS6cDnJ6xaEV6PiB6HpKfBX2/aIm9VkgtzWukfvVMyN5GEihEipDX7L7 oGCx0b8Bmw8UmaT/zFWYah1rMvegzU5fWTD2NSmrC6A/I12XcatBQXYAz6HDqoQInsNuRc+xt8Q lyxXPRvFKVrLHMqwZzwxWhZQ= X-Received: by 127.0.0.2 with SMTP id CtbXYY7687511xu6g9FWlHGp; Tue, 12 Sep 2023 21:27:16 -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:16 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10831"; a="363595450" X-IronPort-AV: E=Sophos;i="6.02,142,1688454000"; d="scan'208";a="363595450" 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:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10831"; a="859093642" X-IronPort-AV: E=Sophos;i="6.02,142,1688454000"; d="scan'208";a="859093642" 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:14 -0700 From: "Yuanhao Xie" To: devel@edk2.groups.io Cc: Yuanhao Xie , Eric Dong , Rahul Kumar , Gerd Hoffmann , Ray Ni Subject: [edk2-devel] [PATCH 07/16] UefiCpuPkg/MtrrUnitTest: Update UnitTestMtrrGetAllMtrrs(). Date: Wed, 13 Sep 2023 12:26:30 +0800 Message-Id: <20230913042639.2066-8-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: vpLMqBxw9V5vBBYaJBNUDCiJx7686176AA= 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=q68OHl7y; 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 UnitTestMtrrGetAllMtrrs() 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 | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 84 insertions(+), 15 deletions(-) diff --git a/UefiCpuPkg/Library/MtrrLib/UnitTest/MtrrLibUnitTest.c b/UefiCpuPkg/Library/MtrrLib/UnitTest/MtrrLibUnitTest.c index 13cebee32b..de9db4fcb4 100644 --- a/UefiCpuPkg/Library/MtrrLib/UnitTest/MtrrLibUnitTest.c +++ b/UefiCpuPkg/Library/MtrrLib/UnitTest/MtrrLibUnitTest.c @@ -653,6 +653,52 @@ UnitTestMtrrGetFixedMtrr ( return UNIT_TEST_PASSED; } +/** + Set Random Variable and Fixed MTRRs Settings for + unit test of UnitTestMtrrGetAllMtrrs. + + @param SystemParameter System parameter that controls the MTRR registers initialization. + @param ExpectedMtrrs Expected Fixed and Variable MTRRs. +**/ +VOID +SetRandomlyGeneratedMtrrSettings ( + IN MTRR_LIB_SYSTEM_PARAMETER *SystemParameter, + IN MTRR_SETTINGS *ExpectedMtrrs + ) +{ + UINT32 Index; + UINTN MsrIndex; + UINTN ByteIndex; + UINT64 MsrValue; + MSR_IA32_MTRR_DEF_TYPE_REGISTER Default; + + AsmWriteMsr64 (MSR_IA32_MTRR_DEF_TYPE, ExpectedMtrrs->MtrrDefType); + // + // Randomly generate Variable MTRR BASE/MASK for a specified type and write to MSR. + // + for (Index = 0; Index < SystemParameter->VariableMtrrCount; Index++) { + GenerateRandomMtrrPair (SystemParameter->PhysicalAddressBits, GenerateRandomCacheType (), &ExpectedMtrrs->Variables.Mtrr[Index], NULL); + AsmWriteMsr64 (MSR_IA32_MTRR_PHYSBASE0 + (Index << 1), ExpectedMtrrs->Variables.Mtrr[Index].Base); + AsmWriteMsr64 (MSR_IA32_MTRR_PHYSMASK0 + (Index << 1), ExpectedMtrrs->Variables.Mtrr[Index].Mask); + } + + // + // Set Fixed MTRRs when the Fixed MTRRs is enabled and the MTRRs is supported. + // + Default.Uint64 = AsmReadMsr64 (MSR_IA32_MTRR_DEF_TYPE); + if ((Default.Bits.FE == 1) && (SystemParameter->MtrrSupported == TRUE)) { + 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; + AsmWriteMsr64 (mFixedMtrrsIndex[MsrIndex], MsrValue); + } + } +} + /** Unit test of MtrrLib service MtrrGetAllMtrrs() @@ -669,28 +715,51 @@ UnitTestMtrrGetAllMtrrs ( IN UNIT_TEST_CONTEXT Context ) { - MTRR_SETTINGS *Result; - MTRR_SETTINGS Mtrrs; - MTRR_SETTINGS ExpectedMtrrs; - MTRR_VARIABLE_SETTING VariableMtrr[MTRR_NUMBER_OF_VARIABLE_MTRR]; - UINT32 Index; - MTRR_LIB_SYSTEM_PARAMETER SystemParameter; - MTRR_LIB_TEST_CONTEXT *LocalContext; + MTRR_SETTINGS *Result; + MTRR_SETTINGS Mtrrs; + MTRR_SETTINGS ExpectedMtrrs; + MTRR_LIB_SYSTEM_PARAMETER SystemParameter; + MTRR_LIB_TEST_CONTEXT *LocalContext; + MSR_IA32_MTRR_DEF_TYPE_REGISTER Default; LocalContext = (MTRR_LIB_TEST_CONTEXT *)Context; CopyMem (&SystemParameter, LocalContext->SystemParameter, sizeof (SystemParameter)); - InitializeMtrrRegs (&SystemParameter); - for (Index = 0; Index < SystemParameter.VariableMtrrCount; Index++) { - GenerateRandomMtrrPair (SystemParameter.PhysicalAddressBits, GenerateRandomCacheType (), &VariableMtrr[Index], NULL); - AsmWriteMsr64 (MSR_IA32_MTRR_PHYSBASE0 + (Index << 1), VariableMtrr[Index].Base); - AsmWriteMsr64 (MSR_IA32_MTRR_PHYSMASK0 + (Index << 1), VariableMtrr[Index].Mask); - } + // + // For the case that Fixed MTRRs is NOT enabled + // + SystemParameter.MtrrSupported = TRUE; + SystemParameter.FixedMtrrSupported = FALSE; + InitializeMtrrRegs (&SystemParameter); + Default.Uint64 = 0; + Default.Bits.E = 1; + Default.Bits.FE = 0; + ZeroMem (&ExpectedMtrrs, sizeof (ExpectedMtrrs)); + ExpectedMtrrs.MtrrDefType = Default.Uint64; + // + // Randomly generate expected MtrrSettings and set to MSR. + // + SetRandomlyGeneratedMtrrSettings (&SystemParameter, &ExpectedMtrrs); + Result = MtrrGetAllMtrrs (&Mtrrs); + UT_ASSERT_MEM_EQUAL (&ExpectedMtrrs.Fixed, &Mtrrs.Fixed, sizeof (MTRR_FIXED_SETTINGS)); + UT_ASSERT_MEM_EQUAL (Mtrrs.Variables.Mtrr, ExpectedMtrrs.Variables.Mtrr, sizeof (MTRR_VARIABLE_SETTING) * (SystemParameter.VariableMtrrCount)); + // + // For the case that Fixed MTRRs is enabled + // + SystemParameter.MtrrSupported = TRUE; + SystemParameter.FixedMtrrSupported = TRUE; + InitializeMtrrRegs (&SystemParameter); + Default.Uint64 = 0; + Default.Bits.E = 1; + Default.Bits.FE = 1; + ZeroMem (&ExpectedMtrrs, sizeof (ExpectedMtrrs)); + ExpectedMtrrs.MtrrDefType = Default.Uint64; + SetRandomlyGeneratedMtrrSettings (&SystemParameter, &ExpectedMtrrs); Result = MtrrGetAllMtrrs (&Mtrrs); - UT_ASSERT_EQUAL ((UINTN)Result, (UINTN)&Mtrrs); - UT_ASSERT_MEM_EQUAL (Mtrrs.Variables.Mtrr, VariableMtrr, sizeof (MTRR_VARIABLE_SETTING) * SystemParameter.VariableMtrrCount); + UT_ASSERT_MEM_EQUAL (&ExpectedMtrrs.Fixed, &Mtrrs.Fixed, sizeof (MTRR_FIXED_SETTINGS)); + UT_ASSERT_MEM_EQUAL (Mtrrs.Variables.Mtrr, ExpectedMtrrs.Variables.Mtrr, sizeof (MTRR_VARIABLE_SETTING) * (SystemParameter.VariableMtrrCount)); // // Negative test case when MTRRs are not supported -- 2.36.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#108563): https://edk2.groups.io/g/devel/message/108563 Mute This Topic: https://groups.io/mt/101331025/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-