From nobody Fri Dec 19 21:55:38 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+108567+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+108567+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1694579247; cv=none; d=zohomail.com; s=zohoarc; b=GSZ7W9TiZrq2bg2W387JKNFMS2GzXWjrOjC/a41GIuYnmJW/qgOwjwrjBJ8/uL4nl+S2/kUTE1xGb6EQ7SqJURlus0qAvmOTGO+g+DhA/jCdfwozBMr6v7ZarbYl/oIiZxDar1PnFNrc9xfA2XbUO24xryRBDPtxweKXmwJ3kL0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694579247; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=e3wk7DkA3ItCkvB0cxeDWjKeAYT4/E8BBeOLQq+99pk=; b=detKZw+BBd761xKWYzZs/LM/N2hF6jjp1K0tLlPDcbT14P4Iroj+vr3THGB2jvTl2qNQUNSdeODPX5uQIRvUvrQToyvnNXjU5p3AF/3BGVyXUkeeavInpI+n1xx7lPbg3Z1utC0lot1HlpXZJpyZWmDVWEw2GhW8OcRa5ayJN3k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+108567+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1694579247242219.5548826658328; Tue, 12 Sep 2023 21:27:27 -0700 (PDT) Return-Path: DKIM-Signature: a=rsa-sha256; bh=euJo5E+KtCi7MQBA0PM+Y17gqe22MtDHy/YPO0b4IiU=; 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=Bip03YbHrVlW64k5GF8dHhLFanBTukowwVTedPYZ8Rql04JZHBlmYeJR9V4eWMC7NIIBnS2v JfR5tSR4MtuBeP/jHoslg2Gug/ccy+q0W7hTLoc2ohHpihVEgAcbm87fsCiqpe5CxH0YI6hS0Ho kHqzphyqCNn4xWUhzME64WHM= X-Received: by 127.0.0.2 with SMTP id DJ1kYY1788612xZasjVgkhpW; 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: CQaoKqtwLiMstNyQX86GT3fjx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1694579249516100003 Content-Type: text/plain; charset="utf-8" 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/UefiCp= uPkg/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 ( =20 /** Unit test of MtrrLib service MtrrSetAllMtrrs() - @param[in] Context Ignored - @retval UNIT_TEST_PASSED The Unit test has completed and th= e 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; =20 LocalContext =3D (MTRR_LIB_TEST_CONTEXT *)Context; - CopyMem (&SystemParameter, LocalContext->SystemParameter, sizeof (System= Parameter)); InitializeMtrrRegs (&SystemParameter); - Default.Uint64 =3D 0; Default.Bits.E =3D 1; Default.Bits.FE =3D 1; Default.Bits.Type =3D GenerateRandomCacheType (); - - ZeroMem (&Mtrrs, sizeof (Mtrrs)); - Mtrrs.MtrrDefType =3D Default.Uint64; + ZeroMem (&ExpectedMtrrs, sizeof (ExpectedMtrrs)); + ExpectedMtrrs.MtrrDefType =3D Default.Uint64; for (Index =3D 0; Index < SystemParameter.VariableMtrrCount; Index++) { - GenerateRandomMtrrPair (SystemParameter.PhysicalAddressBits, GenerateR= andomCacheType (), &Mtrrs.Variables.Mtrr[Index], NULL); + GenerateRandomMtrrPair (SystemParameter.PhysicalAddressBits, GenerateR= andomCacheType (), &ExpectedMtrrs.Variables.Mtrr[Index], NULL); } =20 - Result =3D MtrrSetAllMtrrs (&Mtrrs); - UT_ASSERT_EQUAL ((UINTN)Result, (UINTN)&Mtrrs); + for (MsrIndex =3D 0; MsrIndex < ARRAY_SIZE (mFixedMtrrsIndex); MsrIndex+= +) { + MsrValue =3D 0; + for (ByteIndex =3D 0; ByteIndex < sizeof (UINT64); ByteIndex++) { + MsrValue =3D MsrValue | LShiftU64 (GenerateRandomCacheType (), ByteI= ndex * 8); + } + + ExpectedMtrrs.Fixed.Mtrr[MsrIndex] =3D MsrValue; + } =20 - UT_ASSERT_EQUAL (AsmReadMsr64 (MSR_IA32_MTRR_DEF_TYPE), Mtrrs.MtrrDefTyp= e); + Result =3D MtrrSetAllMtrrs (&ExpectedMtrrs); + UT_ASSERT_EQUAL ((UINTN)Result, (UINTN)&ExpectedMtrrs); + UT_ASSERT_EQUAL (AsmReadMsr64 (MSR_IA32_MTRR_DEF_TYPE), ExpectedMtrrs.Mt= rrDefType); for (Index =3D 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); } =20 return UNIT_TEST_PASSED; --=20 2.36.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- 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/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-