From nobody Mon Feb 9 02:15:26 2026 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+97467+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+97467+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1671116885; cv=none; d=zohomail.com; s=zohoarc; b=RhMHr0Y8cNNTi8nw2QAMWH1Ojx5VcHpDO9n/vKArRrenVUWZwDx8o/+wXXNkAQroPwtzcbMhbKQyPfhqSXBySl9siRfUXB0Rx49lxJNhpSRo2HAsK4R6yQIszxV5ZJM2xZKN1tEKyOiIWtFCG/chIvNGvvuiM6vnJUSA2hQ9hdo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671116885; 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=Vl349bo0OG1LDY/QXrR9OGJmVTjW0JmHsfPQd8q2q/U=; b=OFe2+zVTDm7dQfkS9Ok3xKAMQYktMyven+O3VD9ZTW0BZ6+4dbMkkw2a8MKrLEGpV8S0BPFV1n1aPvvKUj9XainmwWxMtVxilHq1Mo6yhwPfdSxlZ003ZK0X59L8NeIiOqD/AeYw63RUAozT1PiJnUBoeovVAs1/ACi8MxA2heA= 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+97467+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 1671116885212867.7523338041536; Thu, 15 Dec 2022 07:08:05 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id DZcCYY1788612xMJpnoMWY6v; Thu, 15 Dec 2022 07:08:04 -0800 X-Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mx.groups.io with SMTP id smtpd.web11.136387.1671116882493125274 for ; Thu, 15 Dec 2022 07:08:03 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10561"; a="306356968" X-IronPort-AV: E=Sophos;i="5.96,247,1665471600"; d="scan'208";a="306356968" X-Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Dec 2022 06:47:53 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10561"; a="978239419" X-IronPort-AV: E=Sophos;i="5.96,247,1665471600"; d="scan'208";a="978239419" X-Received: from tedkuo1-win10.gar.corp.intel.com ([10.5.215.0]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Dec 2022 06:47:51 -0800 From: "Kuo, Ted" To: devel@edk2.groups.io Cc: Ray Ni , Zhiguang Liu , Chasel Chiu , Nate DeSimone , Star Zeng , Ashraf Ali S , Chinni B Duggapu Subject: [edk2-devel][PATCH v1 2/2] MdeModulePkg: Supporting S3 in 64bit PEI Date: Thu, 15 Dec 2022 22:47:28 +0800 Message-Id: <86c1600392189e645b01683762161492c6fe97fc.1671115398.git.ted.kuo@intel.com> In-Reply-To: References: MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: 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,ted.kuo@intel.com X-Gm-Message-State: YAd2zoRN46lZqFaJbC0mQJ80x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1671116884; bh=cLpDG3XDbeoRInMapyhxpAgmPkNWzAhomuwgdcIsvcg=; h=Cc:Date:From:Reply-To:Subject:To; b=m+WOR6GDBVOScZ7u3yj1Ue8gWiFCYuvXLysNw+HXnaIMZil7JJSEokPBHLXOYlJKnDt BXJPWe+SQQYu9jMskuL1JAmigS3TSDnrBJ1cIXiXkUoaVt1CwW6N22eybrfi3GpkjVHQm yD48z513lSS2E7v8OpbkxWUU2/Z208tkak8= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1671116885774100008 Content-Type: text/plain; charset="utf-8" https://bugzilla.tianocore.org/show_bug.cgi?id=3D4195 Transfer from DXE to OS waking vector by calling SwitchStack() when both are in the same execution mode. Cc: Ray Ni Cc: Zhiguang Liu Cc: Chasel Chiu Cc: Nate DeSimone Cc: Star Zeng Cc: Ashraf Ali S Cc: Chinni B Duggapu Signed-off-by: Ted Kuo --- .../BootScriptExecutorDxe/ScriptExecute.c | 21 +++++++++++++------ .../BootScriptExecutorDxe/X64/SetIdtEntry.c | 4 ++-- .../Acpi/S3SaveStateDxe/AcpiS3ContextSave.c | 10 ++++----- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecut= e.c b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.c index 82481aacd6..98c5abecf8 100644 --- a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.c +++ b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/ScriptExecute.c @@ -4,7 +4,7 @@ This driver is dispatched by Dxe core and the driver will reload itself = to ACPI reserved memory in the entry point. The functionality is to interpret and restore the S3= boot script =20 -Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.
Copyright (c) 2017, AMD Incorporated. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent @@ -95,7 +95,7 @@ S3BootScriptExecutorEntryFunction ( PeiS3ResumeState->ReturnStatus =3D (UINT64)(UINTN)Status; if (FeaturePcdGet (PcdDxeIplSwitchToLongMode)) { // - // X64 S3 Resume + // X64 DXE to IA32 PEI S3 Resume // DEBUG ((DEBUG_INFO, "Call AsmDisablePaging64() to return to S3 Resum= e in PEI Phase\n")); PeiS3ResumeState->AsmTransferControl =3D (EFI_PHYSICAL_ADDRESS)(UINT= N)AsmTransferControl32; @@ -121,7 +121,7 @@ S3BootScriptExecutorEntryFunction ( ); } else { // - // IA32 S3 Resume + // IA32 DXE to IA32 PEI S3 Resume / X64 DXE to X64 PEI S3 Resume // DEBUG ((DEBUG_INFO, "Call SwitchStack() to return to S3 Resume in PE= I Phase\n")); PeiS3ResumeState->AsmTransferControl =3D (EFI_PHYSICAL_ADDRESS)(UINT= N)AsmTransferControl; @@ -156,8 +156,11 @@ S3BootScriptExecutorEntryFunction ( // // X64 long mode waking vector // - DEBUG ((DEBUG_INFO, "Transfer to 64bit OS waking vector - %x\r\n", (= UINTN)Facs->XFirmwareWakingVector)); - if (FeaturePcdGet (PcdDxeIplSwitchToLongMode)) { + DEBUG ((DEBUG_INFO, "Transfer from 64bit DXE to 64bit OS waking vect= or - %x\r\n", (UINTN)Facs->XFirmwareWakingVector)); + if (sizeof (UINTN) =3D=3D sizeof (UINT64)) { + // + // 64bit DXE calls to 64bit OS S3 waking vector + // SwitchStack ( (SWITCH_STACK_ENTRY_POINT)(UINTN)Facs->XFirmwareWakingVector, NULL, @@ -174,7 +177,10 @@ S3BootScriptExecutorEntryFunction ( // IA32 protected mode waking vector (Page disabled) // DEBUG ((DEBUG_INFO, "Transfer to 32bit OS waking vector - %x\r\n", (= UINTN)Facs->XFirmwareWakingVector)); - if (FeaturePcdGet (PcdDxeIplSwitchToLongMode)) { + if (sizeof (UINTN) =3D=3D sizeof (UINT64)) { + // + // 64bit DXE calls to 32bit OS S3 waking vector + // AsmDisablePaging64 ( 0x10, (UINT32)Facs->XFirmwareWakingVector, @@ -183,6 +189,9 @@ S3BootScriptExecutorEntryFunction ( (UINT32)TempStackTop ); } else { + // + // 32bit DXE calls to 32bit OS S3 waking vector + // SwitchStack ( (SWITCH_STACK_ENTRY_POINT)(UINTN)Facs->XFirmwareWakingVector, NULL, diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/SetIdtEn= try.c b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/SetIdtEntry.c index 6b44f50bac..7fc6cdcb4e 100644 --- a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/SetIdtEntry.c +++ b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/SetIdtEntry.c @@ -3,7 +3,7 @@ =20 Set a IDT entry for interrupt vector 3 for debug purpose for x64 platform =20 -Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.
Copyright (c) 2017, AMD Incorporated. All rights reserved.
=20 =20 @@ -118,7 +118,7 @@ IsLongModeWakingVector ( ((Facs->OspmFlags & EFI_ACPI_4_0_OSPM_64BIT_WAKE__F) !=3D 0)) { // Both BIOS and OS wants 64bit vector - if (FeaturePcdGet (PcdDxeIplSwitchToLongMode)) { + if (sizeof (UINTN) =3D=3D sizeof (UINT64)) { return TRUE; } } diff --git a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/AcpiS3ContextSave.c= b/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/AcpiS3ContextSave.c index 03f7a332d3..70bee7a67b 100644 --- a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/AcpiS3ContextSave.c +++ b/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/AcpiS3ContextSave.c @@ -1,7 +1,7 @@ /** @file This is the implementation to save ACPI S3 Context. =20 -Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -97,7 +97,7 @@ IsLongModeWakingVectorSupport ( // // BIOS supports 64bit waking vector. // - if (FeaturePcdGet (PcdDxeIplSwitchToLongMode)) { + if (sizeof (UINTN) =3D=3D sizeof (UINT64)) { return TRUE; } } @@ -110,11 +110,11 @@ IsLongModeWakingVectorSupport ( =20 @param[in] LongModeWakingVectorSupport Support long mode waking vecto= r or not. =20 - If BootScriptExector driver will run in 64-bit mode, this function will = establish the 1:1 + If BootScriptExecutor driver will run in 64-bit mode, this function will= establish the 1:1 virtual to physical mapping page table when long mode waking vector is s= upported, otherwise create 4G page table when long mode waking vector is not supported and l= et PF handler to handle > 4G request. - If BootScriptExector driver will not run in 64-bit mode, this function w= ill do nothing. + If BootScriptExecutor driver will not run in 64-bit mode, this function = will do nothing. =20 @return Page table base address. =20 @@ -124,7 +124,7 @@ S3AllocatePageTablesBuffer ( IN BOOLEAN LongModeWakingVectorSupport ) { - if (FeaturePcdGet (PcdDxeIplSwitchToLongMode)) { + if ((FeaturePcdGet (PcdDxeIplSwitchToLongMode)) || (sizeof (UINTN) =3D= =3D sizeof (UINT64))) { UINTN ExtraPageTablePages; UINT32 RegEax; UINT32 RegEdx; --=20 2.35.3.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 (#97467): https://edk2.groups.io/g/devel/message/97467 Mute This Topic: https://groups.io/mt/95690180/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-