From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web10.1740.1682489774480026272 for ; Tue, 25 Apr 2023 23:16:17 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=dhVQiH/T; spf=pass (domain: intel.com, ip: 134.134.136.126, 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=1682489777; x=1714025777; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=c1Pn3aVJotre+3C3EiHAe9zlQhelDfVcjLPOLK1s6WU=; b=dhVQiH/TIcyocRk7JsGYZqWbEXwwtJAW3rwKkSZnjOyTBz+AJkdLgTyH QP9PvxnxY1P3HoSzaz3nESpr2HVy2AXy5S/7e4SBh/T2Vy4yykQGZ2ehg uS46LvXiq0Y0AsaeIVjXvRhCQIZAsSx8X8siH55rlexoM5PHA4s1Tu31A wxPjuS007OgvigQfga7NP91DxzTsvSzrahUs5m0QyfFeqOm3HncFNYYYX LzNDrGfVSKqyYIpnALY4C6sg+fm1ZPAOMAlGeAT2cQwU1eheYrIjtyOgq FySWpTNe0/PQVVt5PTqVwngOEYDCv1mmIaj6yzJfiExJqJhYr3da5KzCY g==; X-IronPort-AV: E=McAfee;i="6600,9927,10691"; a="331235176" X-IronPort-AV: E=Sophos;i="5.99,227,1677571200"; d="scan'208";a="331235176" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Apr 2023 23:16:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10691"; a="644125213" X-IronPort-AV: E=Sophos;i="5.99,227,1677571200"; d="scan'208";a="644125213" Received: from shwdesfp01.ccr.corp.intel.com ([10.239.158.151]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Apr 2023 23:16:15 -0700 From: "Zhiguang Liu" To: devel@edk2.groups.io Cc: Zhiguang Liu , Nate DeSimone , Ray Ni Subject: [PATCH v2 3/5] SimicsOpenBoardPkg: Use SmmAccessLib instead of SmmAccessPei.inf Date: Wed, 26 Apr 2023 14:15:47 +0800 Message-Id: <20230426061549.1254-4-zhiguang.liu@intel.com> X-Mailer: git-send-email 2.31.1.windows.1 In-Reply-To: <20230426061549.1254-1-zhiguang.liu@intel.com> References: <20230426061549.1254-1-zhiguang.liu@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit SmmAccessPei.inf is a PEIM we should delete, here is the reason: 1. It programs registers MCH_TOLUD to set the Low Usable DRAM, but reading LMCH_TOLUD always return zero in QSP platforms 2. It programs/reads MCH_TSEGMB to implement some Smm Access service such as open/close/lock. However, this reading LMCH_TOLUD also always return zero in QSP platforms 3. It returns the hard-code Smm range information. However, there are two improper things about this. One is that we already have the hard code value about T-Seg base/size in MemDetect. The other Smm range information is already saved in gEfiSmmSmramMemoryGuid Hob. No need hard-code value. So, this patch uses another way, calling PeiInstallSmmAccessPpi from SmmAccessLib. The lib instance we choose will use the gEfiSmmSmramMemoryGuid Hob information. In a word, with the patch, we can avoid additional hard-code, and avoid programing unimplemented registers. Cc: Nate DeSimone Cc: Ray Ni Reviewed-by: Ray Ni Signed-off-by: Zhiguang Liu --- .../SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc | 9 ++------- .../SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf | 3 +-- Platform/Intel/SimicsOpenBoardPkg/SimicsPei/MemDetect.c | 9 +++++++++ .../Intel/SimicsOpenBoardPkg/SimicsPei/SimicsPei.inf | 2 ++ 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc index 7b98baf764..ae6f980a68 100644 --- a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc +++ b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc @@ -1,7 +1,7 @@ ## @file # The main build description file for the X58Ich10 board. # -# Copyright (c) 2019 - 2021, Intel Corporation. All rights reserved.
+# Copyright (c) 2019 - 2023, Intel Corporation. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -142,6 +142,7 @@ # Silicon Package ##################################### ReportCpuHobLib|IntelSiliconPkg/Library/ReportCpuHobLib/ReportCpuHobLib.inf + SmmAccessLib|IntelSiliconPkg/Feature/SmmAccess/Library/PeiSmmAccessLib/PeiSmmAccessLib.inf ##################################### # Platform Package @@ -190,12 +191,6 @@ ####################################### # Silicon Initialization Package ####################################### -!if gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly == FALSE - $(SKT_PKG)/Smm/Access/SmmAccessPei.inf { - - PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf - } -!endif ##################################### # Platform Package diff --git a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf index 221706ae03..94f4ead826 100644 --- a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf +++ b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf @@ -1,6 +1,6 @@ ## @file # -# Copyright (c) 2019 Intel Corporation. All rights reserved.
+# Copyright (c) 2019 - 2023 Intel Corporation. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -165,7 +165,6 @@ INF MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPolicyPeiPostMem.inf !include MinPlatformPkg/Include/Fdf/CoreSecurityPostMemoryInclude.fdf INF UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf -INF $(SKT_PKG)/Smm/Access/SmmAccessPei.inf # S3 SMM PEI driver #INF UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationPei.inf diff --git a/Platform/Intel/SimicsOpenBoardPkg/SimicsPei/MemDetect.c b/Platform/Intel/SimicsOpenBoardPkg/SimicsPei/MemDetect.c index 5da8ef80b2..b1df1c2ef2 100644 --- a/Platform/Intel/SimicsOpenBoardPkg/SimicsPei/MemDetect.c +++ b/Platform/Intel/SimicsOpenBoardPkg/SimicsPei/MemDetect.c @@ -25,6 +25,7 @@ #include #include #include +#include #include @@ -482,6 +483,8 @@ InitializeRamRegions ( VOID ) { + EFI_STATUS Status; + QemuInitializeRam (); if (mS3Supported && mBootMode != BOOT_ON_S3_RESUME) { @@ -554,4 +557,10 @@ InitializeRamRegions ( ); } } + + // + // Install EFI_PEI_MM_ACCESS_PPI for S3 resume case + // + Status = PeiInstallSmmAccessPpi (); + ASSERT_EFI_ERROR (Status); } diff --git a/Platform/Intel/SimicsOpenBoardPkg/SimicsPei/SimicsPei.inf b/Platform/Intel/SimicsOpenBoardPkg/SimicsPei/SimicsPei.inf index 9a85ccb962..9f5f8761fc 100644 --- a/Platform/Intel/SimicsOpenBoardPkg/SimicsPei/SimicsPei.inf +++ b/Platform/Intel/SimicsOpenBoardPkg/SimicsPei/SimicsPei.inf @@ -36,6 +36,7 @@ SimicsX58SktPkg/SktPkg.dec SimicsIch10Pkg/Ich10Pkg.dec BoardModulePkg/BoardModulePkg.dec + IntelSiliconPkg/IntelSiliconPkg.dec [Guids] gEfiMemoryTypeInformationGuid @@ -55,6 +56,7 @@ MtrrLib PcdLib CmosAccessLib + SmmAccessLib [Pcd] gSimicsOpenBoardPkgTokenSpaceGuid.PcdSimicsPeiMemFvBase -- 2.31.1.windows.1