From nobody Sat Nov 2 12:21:56 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1490691282630149.04138148511015; Tue, 28 Mar 2017 01:54:42 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id EBDCA21DFA7BD; Tue, 28 Mar 2017 01:54:40 -0700 (PDT) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 930FC21DFA7B5 for ; Tue, 28 Mar 2017 01:54:38 -0700 (PDT) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga105.fm.intel.com with ESMTP; 28 Mar 2017 01:54:38 -0700 Received: from jfan12-desk.ccr.corp.intel.com ([10.239.158.57]) by FMSMGA003.fm.intel.com with ESMTP; 28 Mar 2017 01:54:37 -0700 X-Original-To: edk2-devel@ml01.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,236,1486454400"; d="scan'208";a="839216406" From: Jeff Fan To: edk2-devel@ml01.01.org Date: Tue, 28 Mar 2017 16:54:31 +0800 Message-Id: <20170328085433.24332-2-jeff.fan@intel.com> X-Mailer: git-send-email 2.9.3.windows.2 In-Reply-To: <20170328085433.24332-1-jeff.fan@intel.com> References: <20170328085433.24332-1-jeff.fan@intel.com> Subject: [edk2] [PATCH 1/3] UefiCpuPkg/PiSmmCpuDxeSmm: Save SMM ranges info into global variables X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Kinney , Feng Tian , Jiewen Yao MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Cc: Jiewen Yao Cc: Michael Kinney Cc: Feng Tian Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jeff Fan --- UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c | 44 ++++++++++++++++----------= ---- UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h | 4 ++- 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c b/UefiCpuPkg/PiSmmC= puDxeSmm/PiSmmCpuDxeSmm.c index d061482..bcdb498 100755 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c @@ -108,6 +108,12 @@ UINT64 mAddressEncMask =3D 0; // SPIN_LOCK *mConfigSmmCodeAccessCheckLock =3D NULL; =20 +// +// Saved SMM ranges information +// +EFI_SMRAM_DESCRIPTOR *mSmmCpuSmramRanges; +UINTN mSmmCpuSmramRangeCount; + /** Initialize IDT to setup exception handlers for SMM. =20 @@ -971,8 +977,6 @@ FindSmramInfo ( UINTN Size; EFI_SMM_ACCESS2_PROTOCOL *SmmAccess; EFI_SMRAM_DESCRIPTOR *CurrentSmramRange; - EFI_SMRAM_DESCRIPTOR *SmramRanges; - UINTN SmramRangeCount; UINTN Index; UINT64 MaxSize; BOOLEAN Found; @@ -990,31 +994,31 @@ FindSmramInfo ( Status =3D SmmAccess->GetCapabilities (SmmAccess, &Size, NULL); ASSERT (Status =3D=3D EFI_BUFFER_TOO_SMALL); =20 - SmramRanges =3D (EFI_SMRAM_DESCRIPTOR *)AllocatePool (Size); - ASSERT (SmramRanges !=3D NULL); + mSmmCpuSmramRanges =3D (EFI_SMRAM_DESCRIPTOR *)AllocatePool (Size); + ASSERT (mSmmCpuSmramRanges !=3D NULL); =20 - Status =3D SmmAccess->GetCapabilities (SmmAccess, &Size, SmramRanges); + Status =3D SmmAccess->GetCapabilities (SmmAccess, &Size, mSmmCpuSmramRan= ges); ASSERT_EFI_ERROR (Status); =20 - SmramRangeCount =3D Size / sizeof (EFI_SMRAM_DESCRIPTOR); + mSmmCpuSmramRangeCount =3D Size / sizeof (EFI_SMRAM_DESCRIPTOR); =20 // // Find the largest SMRAM range between 1MB and 4GB that is at least 256= K - 4K in size // CurrentSmramRange =3D NULL; - for (Index =3D 0, MaxSize =3D SIZE_256KB - EFI_PAGE_SIZE; Index < SmramR= angeCount; Index++) { + for (Index =3D 0, MaxSize =3D SIZE_256KB - EFI_PAGE_SIZE; Index < mSmmCp= uSmramRangeCount; Index++) { // // Skip any SMRAM region that is already allocated, needs testing, or = needs ECC initialization // - if ((SmramRanges[Index].RegionState & (EFI_ALLOCATED | EFI_NEEDS_TESTI= NG | EFI_NEEDS_ECC_INITIALIZATION)) !=3D 0) { + if ((mSmmCpuSmramRanges[Index].RegionState & (EFI_ALLOCATED | EFI_NEED= S_TESTING | EFI_NEEDS_ECC_INITIALIZATION)) !=3D 0) { continue; } =20 - if (SmramRanges[Index].CpuStart >=3D BASE_1MB) { - if ((SmramRanges[Index].CpuStart + SmramRanges[Index].PhysicalSize) = <=3D BASE_4GB) { - if (SmramRanges[Index].PhysicalSize >=3D MaxSize) { - MaxSize =3D SmramRanges[Index].PhysicalSize; - CurrentSmramRange =3D &SmramRanges[Index]; + if (mSmmCpuSmramRanges[Index].CpuStart >=3D BASE_1MB) { + if ((mSmmCpuSmramRanges[Index].CpuStart + mSmmCpuSmramRanges[Index].= PhysicalSize) <=3D BASE_4GB) { + if (mSmmCpuSmramRanges[Index].PhysicalSize >=3D MaxSize) { + MaxSize =3D mSmmCpuSmramRanges[Index].PhysicalSize; + CurrentSmramRange =3D &mSmmCpuSmramRanges[Index]; } } } @@ -1027,19 +1031,19 @@ FindSmramInfo ( =20 do { Found =3D FALSE; - for (Index =3D 0; Index < SmramRangeCount; Index++) { - if (SmramRanges[Index].CpuStart < *SmrrBase && *SmrrBase =3D=3D (Smr= amRanges[Index].CpuStart + SmramRanges[Index].PhysicalSize)) { - *SmrrBase =3D (UINT32)SmramRanges[Index].CpuStart; - *SmrrSize =3D (UINT32)(*SmrrSize + SmramRanges[Index].PhysicalSize= ); + for (Index =3D 0; Index < mSmmCpuSmramRangeCount; Index++) { + if (mSmmCpuSmramRanges[Index].CpuStart < *SmrrBase && + *SmrrBase =3D=3D (mSmmCpuSmramRanges[Index].CpuStart + mSmmCpuSm= ramRanges[Index].PhysicalSize)) { + *SmrrBase =3D (UINT32)mSmmCpuSmramRanges[Index].CpuStart; + *SmrrSize =3D (UINT32)(*SmrrSize + mSmmCpuSmramRanges[Index].Physi= calSize); Found =3D TRUE; - } else if ((*SmrrBase + *SmrrSize) =3D=3D SmramRanges[Index].CpuStar= t && SmramRanges[Index].PhysicalSize > 0) { - *SmrrSize =3D (UINT32)(*SmrrSize + SmramRanges[Index].PhysicalSize= ); + } else if ((*SmrrBase + *SmrrSize) =3D=3D mSmmCpuSmramRanges[Index].= CpuStart && mSmmCpuSmramRanges[Index].PhysicalSize > 0) { + *SmrrSize =3D (UINT32)(*SmrrSize + mSmmCpuSmramRanges[Index].Physi= calSize); Found =3D TRUE; } } } while (Found); =20 - FreePool (SmramRanges); DEBUG ((EFI_D_INFO, "SMRR Base: 0x%x, SMRR Size: 0x%x\n", *SmrrBase, *Sm= rrSize)); } =20 diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h b/UefiCpuPkg/PiSmmC= puDxeSmm/PiSmmCpuDxeSmm.h index 71af2f1..969eb47 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h @@ -1,7 +1,7 @@ /** @file Agent Module to load other modules to deploy SMM Entry Vector for X86 CPU. =20 -Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.
Copyright (c) 2017, AMD Incorporated. All rights reserved.
=20 This program and the accompanying materials @@ -415,6 +415,8 @@ extern UINTN mSemaphoreSi= ze; extern SPIN_LOCK *mPFLock; extern SPIN_LOCK *mConfigSmmCodeAccessCheckLock; extern SPIN_LOCK *mMemoryMappedLock; +extern EFI_SMRAM_DESCRIPTOR *mSmmCpuSmramRanges; +extern UINTN mSmmCpuSmramRangeCount; =20 // // Copy of the PcdPteMemoryEncryptionAddressOrMask --=20 2.9.3.windows.2 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel