From nobody Mon Feb 9 02:28:22 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+39728+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39728+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1556504215; cv=none; d=zoho.com; s=zohoarc; b=FtCBW2i4WaQtE172CQ+g89f5WA65Kh5DO6Mx76b955A9LCF1vclcXtTSX3uxny/tjZxVMXkNXkLtz2tj2rSRZ8mbf4+RaytMbOBzqdevUW6L2TwKwMK4OQnA5bYvxn1Ix8KJcCNc0RZAiZRJr8dE4r1g5e/fpWLlse9VZa5U/Yc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556504215; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=d94jGq2rAEL7qQYZ3EGlZUkKvo800TIoN9ZNYbFLaW8=; b=EUpVtancF+rY1XaCKkqzcV5gtXQxZQly7xCrSDwT0bVLhZt7qIVSpbx3w13rkbTBQFIMoX9FPFv8UixQ9H9fMUO6WSITPyOyWeqJLJ6Ij1gFQE4pDIgt1uTQ4xsa7U/1TKF4nFxbZ0P4HZiU4Dnkl4VRPmWf0eaVism1fEYr/Ok= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+39728+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1556504215448994.8288777269246; Sun, 28 Apr 2019 19:16:55 -0700 (PDT) Return-Path: X-Received: from mga05.intel.com (mga05.intel.com []) by groups.io with SMTP; Sun, 28 Apr 2019 19:16:54 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Apr 2019 19:16:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,408,1549958400"; d="scan'208";a="139631995" X-Received: from shwdeopenpsi114.ccr.corp.intel.com ([10.239.157.147]) by orsmga006.jf.intel.com with ESMTP; 28 Apr 2019 19:16:53 -0700 From: "Dandan Bi" To: devel@edk2.groups.io Cc: Eric Dong , Ray Ni , Laszlo Ersek Subject: [edk2-devel] [patch 09/11] UefiCpuPkg: Remove PcdFrameworkCompatibilitySupport usage Date: Mon, 29 Apr 2019 10:16:05 +0800 Message-Id: <20190429021607.11304-10-dandan.bi@intel.com> In-Reply-To: <20190429021607.11304-1-dandan.bi@intel.com> References: <20190429021607.11304-1-dandan.bi@intel.com> Precedence: Bulk List-Unsubscribe: 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,dandan.bi@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1556504215; bh=XBiUeJ6q3gqfhJs08OFL5u5PS3f6jO+Plf5vl29Hkio=; h=Cc:Date:From:Reply-To:Subject:To; b=dOAPOmYTI9TUpQrlKWO68wnD3863cMWXHZ6ZLIlRV353CS53DYVckTbXIv608Qw4iN7 vaxvAD8xAOdc7Hoz05S85HgyiGTJQocbyTo8krKWhTd1qKWUkrhdMNg7iX+jSyA1vF4Zg gs4rZwwZ6XLJq6fG9aRF12+Hd1cDxx/aiCE= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1464 Currently Framework compatibility support is not needed and PcdFrameworkCompatibilitySupport will be removed from edk2. So remove the usage of this PCD firstly. Cc: Eric Dong Cc: Ray Ni Cc: Laszlo Ersek Signed-off-by: Dandan Bi Reviewed-by: Laszlo Ersek --- .../Universal/Acpi/S3Resume2Pei/S3Resume.c | 30 ------------------- .../Acpi/S3Resume2Pei/S3Resume2Pei.inf | 3 +- 2 files changed, 1 insertion(+), 32 deletions(-) diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c b/UefiCpuPkg= /Universal/Acpi/S3Resume2Pei/S3Resume.c index 77c3fb6bdc..83ce1c4037 100644 --- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c +++ b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c @@ -741,12 +741,10 @@ S3ResumeExecuteBootScript ( { EFI_STATUS Status; PEI_SMM_ACCESS_PPI *SmmAccess; UINTN Index; VOID *GuidHob; - IA32_DESCRIPTOR *IdtDescriptor; - VOID *IdtBuffer; PEI_S3_RESUME_STATE *PeiS3ResumeState; BOOLEAN InterruptStatus; =20 DEBUG ((DEBUG_INFO, "S3ResumeExecuteBootScript()\n")); =20 @@ -802,38 +800,10 @@ S3ResumeExecuteBootScript ( =20 if (FeaturePcdGet (PcdDxeIplSwitchToLongMode)) { AsmWriteCr3 ((UINTN)AcpiS3Context->S3NvsPageTableAddress); } =20 - if (FeaturePcdGet (PcdFrameworkCompatibilitySupport)) { - // - // On some platform, such as ECP, a dispatch node in boot script table= may execute a 32-bit PEIM which may need PeiServices - // pointer. So PeiServices need preserve in (IDTBase- sizeof (UINTN)). - // - IdtDescriptor =3D (IA32_DESCRIPTOR *) (UINTN) (AcpiS3Context->IdtrProf= ile); - // - // Make sure the newly allocated IDT align with 16-bytes - // - IdtBuffer =3D AllocatePages (EFI_SIZE_TO_PAGES((IdtDescriptor->Limit += 1) + 16)); - if (IdtBuffer =3D=3D NULL) { - REPORT_STATUS_CODE ( - EFI_ERROR_CODE | EFI_ERROR_MAJOR, - (EFI_SOFTWARE_PEI_MODULE | EFI_SW_PEI_EC_S3_RESUME_FAILED) - ); - ASSERT (FALSE); - } - // - // Additional 16 bytes allocated to save IA32 IDT descriptor and Pei S= ervice Table Pointer - // IA32 IDT descriptor will be used to setup IA32 IDT table for 32-bit= Framework Boot Script code - // - ZeroMem (IdtBuffer, 16); - AsmReadIdtr ((IA32_DESCRIPTOR *)IdtBuffer); - CopyMem ((VOID*)((UINT8*)IdtBuffer + 16),(VOID*)(IdtDescriptor->Base),= (IdtDescriptor->Limit + 1)); - IdtDescriptor->Base =3D (UINTN)((UINT8*)IdtBuffer + 16); - *(UINTN*)(IdtDescriptor->Base - sizeof(UINTN)) =3D (UINTN)GetPeiServic= esTablePointer (); - } - InterruptStatus =3D SaveAndDisableInterrupts (); // // Need to make sure the GDT is loaded with values that support long mod= e and real mode. // AsmWriteGdtr (&mGdt); diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf b/Uefi= CpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf index d694a98691..aae984d138 100644 --- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf +++ b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf @@ -3,11 +3,11 @@ # # This module works with StandAloneBootScriptExecutor to S3 resume to OS. # This module will excute the boot script saved during last boot and after= that, # control is passed to OS waking up handler. # -# Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.
+# Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.
# Copyright (c) 2017, AMD Incorporated. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent # ## @@ -87,11 +87,10 @@ gEfiEndOfPeiSignalPpiGuid ## SOMETIMES_PRODUCES gEfiPeiSmmCommunicationPpiGuid ## SOMETIMES_CONSUMES =20 [FeaturePcd] gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode ## CONS= UMES - gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport ## CONS= UMES =20 [Pcd] gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable ## SOMETIMES_CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdPteMemoryEncryptionAddressOrMask ##= CONSUMES =20 --=20 2.18.0.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 (#39728): https://edk2.groups.io/g/devel/message/39728 Mute This Topic: https://groups.io/mt/31379004/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-