From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web10.11870.1671194824336805327 for ; Fri, 16 Dec 2022 04:47:07 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=nd/izBeG; spf=pass (domain: intel.com, ip: 192.55.52.88, mailfrom: ted.kuo@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1671194827; x=1702730827; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=TPG1IAuAcyJjO+ByW6uIyZ9JGitnQdsPF9tNrZbbGlg=; b=nd/izBeG2NfoqRPKIMig1+yyRX1iSmpLfU46sTmxb/9A3/IZk4UZRJvr 7F9K+a1e3ncQk+/7VGs/mlNyTHpM2Aul4veJkfpigDuPUpP+3saPQUuLo qFKsVjIcube/KEAkIwCIjM7T6fRQJ+aefgVygPaHJtTgkoPDMe9kVhZwr 6wsWL5W8zjYat1zXp2XSSNc1WyeNjBQMKwbwa0IiEp44Uu1xCXrHiYtt6 PNNS+5AkkcwOlgPtaXBMAs/UJXQ4nnV4kg+AdgZtMS4bJxPHmz4DdoUHD wqtB7hlsy1vRFxqcZtJdsIHofShcbNPNAL1x68D/iGvPktceu1SqnqICJ A==; X-IronPort-AV: E=McAfee;i="6500,9779,10562"; a="346041901" X-IronPort-AV: E=Sophos;i="5.96,249,1665471600"; d="scan'208";a="346041901" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Dec 2022 04:47:07 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10562"; a="738526331" X-IronPort-AV: E=Sophos;i="5.96,249,1665471600"; d="scan'208";a="738526331" Received: from tedkuo1-win10.gar.corp.intel.com ([10.5.215.0]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Dec 2022 04:47:05 -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 v2 2/2] MdeModulePkg: Supporting S3 in 64bit PEI Date: Fri, 16 Dec 2022 20:46:27 +0800 Message-Id: <353372049f40d2d7408f45f867fa48db87a8f95a.1671194636.git.ted.kuo@intel.com> X-Mailer: git-send-email 2.35.3.windows.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=0D in the entry point. The functionality is to interpret and restore the S3= boot script=0D =0D -Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
=0D +Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.
=0D Copyright (c) 2017, AMD Incorporated. All rights reserved.
=0D =0D SPDX-License-Identifier: BSD-2-Clause-Patent=0D @@ -95,7 +95,7 @@ S3BootScriptExecutorEntryFunction ( PeiS3ResumeState->ReturnStatus =3D (UINT64)(UINTN)Status;=0D if (FeaturePcdGet (PcdDxeIplSwitchToLongMode)) {=0D //=0D - // X64 S3 Resume=0D + // X64 DXE to IA32 PEI S3 Resume=0D //=0D DEBUG ((DEBUG_INFO, "Call AsmDisablePaging64() to return to S3 Resum= e in PEI Phase\n"));=0D PeiS3ResumeState->AsmTransferControl =3D (EFI_PHYSICAL_ADDRESS)(UINT= N)AsmTransferControl32;=0D @@ -121,7 +121,7 @@ S3BootScriptExecutorEntryFunction ( );=0D } else {=0D //=0D - // IA32 S3 Resume=0D + // IA32 DXE to IA32 PEI S3 Resume / X64 DXE to X64 PEI S3 Resume=0D //=0D DEBUG ((DEBUG_INFO, "Call SwitchStack() to return to S3 Resume in PE= I Phase\n"));=0D PeiS3ResumeState->AsmTransferControl =3D (EFI_PHYSICAL_ADDRESS)(UINT= N)AsmTransferControl;=0D @@ -156,8 +156,11 @@ S3BootScriptExecutorEntryFunction ( //=0D // X64 long mode waking vector=0D //=0D - DEBUG ((DEBUG_INFO, "Transfer to 64bit OS waking vector - %x\r\n", (= UINTN)Facs->XFirmwareWakingVector));=0D - if (FeaturePcdGet (PcdDxeIplSwitchToLongMode)) {=0D + DEBUG ((DEBUG_INFO, "Transfer from 64bit DXE to 64bit OS waking vect= or - %x\r\n", (UINTN)Facs->XFirmwareWakingVector));=0D + if (sizeof (UINTN) =3D=3D sizeof (UINT64)) {=0D + //=0D + // 64bit DXE calls to 64bit OS S3 waking vector=0D + //=0D SwitchStack (=0D (SWITCH_STACK_ENTRY_POINT)(UINTN)Facs->XFirmwareWakingVector,=0D NULL,=0D @@ -174,7 +177,10 @@ S3BootScriptExecutorEntryFunction ( // IA32 protected mode waking vector (Page disabled)=0D //=0D DEBUG ((DEBUG_INFO, "Transfer to 32bit OS waking vector - %x\r\n", (= UINTN)Facs->XFirmwareWakingVector));=0D - if (FeaturePcdGet (PcdDxeIplSwitchToLongMode)) {=0D + if (sizeof (UINTN) =3D=3D sizeof (UINT64)) {=0D + //=0D + // 64bit DXE calls to 32bit OS S3 waking vector=0D + //=0D AsmDisablePaging64 (=0D 0x10,=0D (UINT32)Facs->XFirmwareWakingVector,=0D @@ -183,6 +189,9 @@ S3BootScriptExecutorEntryFunction ( (UINT32)TempStackTop=0D );=0D } else {=0D + //=0D + // 32bit DXE calls to 32bit OS S3 waking vector=0D + //=0D SwitchStack (=0D (SWITCH_STACK_ENTRY_POINT)(UINTN)Facs->XFirmwareWakingVector,=0D NULL,=0D 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 @@ =0D Set a IDT entry for interrupt vector 3 for debug purpose for x64 platfor= m=0D =0D -Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
=0D +Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.
=0D Copyright (c) 2017, AMD Incorporated. All rights reserved.
=0D =0D =0D @@ -118,7 +118,7 @@ IsLongModeWakingVector ( ((Facs->OspmFlags & EFI_ACPI_4_0_OSPM_64BIT_WAKE__F) !=3D 0))=0D {=0D // Both BIOS and OS wants 64bit vector=0D - if (FeaturePcdGet (PcdDxeIplSwitchToLongMode)) {=0D + if (sizeof (UINTN) =3D=3D sizeof (UINT64)) {=0D return TRUE;=0D }=0D }=0D 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=0D This is the implementation to save ACPI S3 Context.=0D =0D -Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
=0D +Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.
=0D =0D SPDX-License-Identifier: BSD-2-Clause-Patent=0D =0D @@ -97,7 +97,7 @@ IsLongModeWakingVectorSupport ( //=0D // BIOS supports 64bit waking vector.=0D //=0D - if (FeaturePcdGet (PcdDxeIplSwitchToLongMode)) {=0D + if (sizeof (UINTN) =3D=3D sizeof (UINT64)) {=0D return TRUE;=0D }=0D }=0D @@ -110,11 +110,11 @@ IsLongModeWakingVectorSupport ( =0D @param[in] LongModeWakingVectorSupport Support long mode waking vecto= r or not.=0D =0D - If BootScriptExector driver will run in 64-bit mode, this function will = establish the 1:1=0D + If BootScriptExecutor driver will run in 64-bit mode, this function will= establish the 1:1=0D virtual to physical mapping page table when long mode waking vector is s= upported, otherwise=0D create 4G page table when long mode waking vector is not supported and l= et PF handler to=0D handle > 4G request.=0D - If BootScriptExector driver will not run in 64-bit mode, this function w= ill do nothing.=0D + If BootScriptExecutor driver will not run in 64-bit mode, this function = will do nothing.=0D =0D @return Page table base address.=0D =0D @@ -124,7 +124,7 @@ S3AllocatePageTablesBuffer ( IN BOOLEAN LongModeWakingVectorSupport=0D )=0D {=0D - if (FeaturePcdGet (PcdDxeIplSwitchToLongMode)) {=0D + if ((FeaturePcdGet (PcdDxeIplSwitchToLongMode)) || (sizeof (UINTN) =3D= =3D sizeof (UINT64))) {=0D UINTN ExtraPageTablePages;=0D UINT32 RegEax;=0D UINT32 RegEdx;=0D --=20 2.35.3.windows.1