From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mx.groups.io with SMTP id smtpd.web10.916.1686193607701518790 for ; Wed, 07 Jun 2023 20:06:48 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=bxOF+FHN; spf=pass (domain: intel.com, ip: 192.55.52.136, mailfrom: zhiguang.liu@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1686193608; x=1717729608; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=OqFEAq5tB0Phe3t2cdXZk4vMNlu2/vTijA9TRR13RTg=; b=bxOF+FHNJTrIIJTIiAFZGzEbmb+S5NVi4UnxsNmkcJGBeSWydK9NVN49 1hCUQpwnxZ1EUd7M2CfFrQVdznkuxmlbZQ2ubTbtn6zg+Dbar+O+4U1Px UKw5/b/AiwGi8hrU+Ipww/3dJmL6x1/fV74sk3F0JMFUiIBspOE8WE53z 60MhIsNBPdEwk2IFJuyJ1Z/qTOX0t7zYrzftcLfHG9gO5f0khdeHNQMF8 6mRUMC/MnFb2YfUh6xFYZIzjgIhKpHmCDKfQu5naiFzZ4w/k6XDnR1Ojv abXPsTQuBXw3/7NUKGTbHGtPm1K+eYzFug/dw84sOC2zucUdr3KHoqgYd Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10734"; a="336808869" X-IronPort-AV: E=Sophos;i="6.00,226,1681196400"; d="scan'208";a="336808869" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Jun 2023 20:06:48 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10734"; a="742933587" X-IronPort-AV: E=Sophos;i="6.00,226,1681196400"; d="scan'208";a="742933587" Received: from shwdesfp01.ccr.corp.intel.com ([10.239.158.151]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Jun 2023 20:06:47 -0700 From: "Zhiguang Liu" To: devel@edk2.groups.io Cc: Zhiguang Liu , Michael Kubacki , Nate DeSimone Subject: [PATCH 2/4] PrmPkg: Use new API to replace MtrrLibInitializeMtrrMask Date: Thu, 8 Jun 2023 11:06:27 +0800 Message-Id: <20230608030629.2734-2-zhiguang.liu@intel.com> X-Mailer: git-send-email 2.31.1.windows.1 In-Reply-To: <20230608030629.2734-1-zhiguang.liu@intel.com> References: <20230608030629.2734-1-zhiguang.liu@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3394 The function MtrrLibInitializeMtrrMask is a private function in MtrrLib.c from UefiCpuPkg, and it can be replace with new API GetMaxPlatformAddressBits. Cc: Michael Kubacki Cc: Nate DeSimone Signed-off-by: Zhiguang Liu --- .../PrmSampleHardwareAccessModule.c | 18 ++---------------- .../PrmSampleHardwareAccessModule.inf | 1 + 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/PrmPkg/Samples/PrmSampleHardwareAccessModule/PrmSampleHardwareAccessModule.c b/PrmPkg/Samples/PrmSampleHardwareAccessModule/PrmSampleHardwareAccessModule.c index 1a1e735029..398497c3a9 100644 --- a/PrmPkg/Samples/PrmSampleHardwareAccessModule/PrmSampleHardwareAccessModule.c +++ b/PrmPkg/Samples/PrmSampleHardwareAccessModule/PrmSampleHardwareAccessModule.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include @@ -37,21 +38,6 @@ // extern CONST CHAR8 *mMtrrMemoryCacheTypeShortName[]; -/** - Initializes the valid bits mask and valid address mask for MTRRs. - - This function initializes the valid bits mask and valid address mask for MTRRs. - - @param[out] MtrrValidBitsMask The mask for the valid bit of the MTRR - @param[out] MtrrValidAddressMask The valid address mask for the MTRR - -**/ -VOID -MtrrLibInitializeMtrrMask ( - OUT UINT64 *MtrrValidBitsMask, - OUT UINT64 *MtrrValidAddressMask - ); - /** Convert variable MTRRs to a RAW MTRR_MEMORY_RANGE array. One MTRR_MEMORY_RANGE element is created for each MTRR setting. @@ -151,7 +137,7 @@ AccessAllMtrrs ( MtrrGetAllMtrrs (&LocalMtrrs); Mtrrs = &LocalMtrrs; - MtrrLibInitializeMtrrMask (&MtrrValidBitsMask, &MtrrValidAddressMask); + GetMaxPlatformAddressBits (&MtrrValidBitsMask, &MtrrValidAddressMask); Ranges[0].BaseAddress = 0; Ranges[0].Length = MtrrValidBitsMask + 1; Ranges[0].Type = MtrrGetDefaultMemoryType (); diff --git a/PrmPkg/Samples/PrmSampleHardwareAccessModule/PrmSampleHardwareAccessModule.inf b/PrmPkg/Samples/PrmSampleHardwareAccessModule/PrmSampleHardwareAccessModule.inf index 46d4a88185..b15da817c1 100644 --- a/PrmPkg/Samples/PrmSampleHardwareAccessModule/PrmSampleHardwareAccessModule.inf +++ b/PrmPkg/Samples/PrmSampleHardwareAccessModule/PrmSampleHardwareAccessModule.inf @@ -34,6 +34,7 @@ MtrrLib UefiDriverEntryPoint UefiLib + CpuLib [Depex] TRUE -- 2.31.1.windows.1