From e47459e635741c8f4100f7892b0a1444115773e8 Mon Sep 17 00:00:00 2001 From: vanjeff Date: Thu, 15 Mar 2012 05:33:43 +0000 Subject: 1. Updated S3Resume2Pei to save IA32 IDT table setup in protected mode. 2. Updated BootScriptSaveOnS3SaveStateThunk restore IA32 IDT table before transferring to protected mode. It could support exception handler in 32-bit Framework Boot Script code. Signed-off-by: vanjeff Reviewed-by: jyao1 git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13099 6f19259b-4bc3-4df7-8a09-765794883524 --- UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'UefiCpuPkg') diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c index 3afd0ff0e3..c0680bf771 100644 --- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c +++ b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c @@ -4,7 +4,7 @@ This module will excute the boot script saved during last boot and after that, control is passed to OS waking up handler. - Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.
+ Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions @@ -712,6 +712,12 @@ S3ResumeExecuteBootScript ( // IdtBuffer = AllocatePages (EFI_SIZE_TO_PAGES((IdtDescriptor->Limit + 1) + 16)); ASSERT (IdtBuffer != NULL); + // + // Additional 16 bytes allocated to save IA32 IDT descriptor and Pei Service 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 = (UINTN)((UINT8*)IdtBuffer + 16); *(UINTN*)(IdtDescriptor->Base - sizeof(UINTN)) = (UINTN)GetPeiServicesTablePointer (); -- cgit v1.2.3