[edk2-devel] [PATCH V2] UefiCpuPkg/CpuDxe: Fix boot error
Michael D Kinney
michael.d.kinney at intel.com
Thu Jan 7 18:22:42 UTC 2021
Reviewed-by: Michael D Kinney <michael.d.kinney at intel.com>
Mike
> -----Original Message-----
> From: devel at edk2.groups.io <devel at edk2.groups.io> On Behalf Of Guo Dong
> Sent: Wednesday, January 6, 2021 7:11 PM
> To: devel at edk2.groups.io
> Cc: Dong, Eric <eric.dong at intel.com>; Ni, Ray <ray.ni at intel.com>; lersek at redhat.com; Kumar, Rahul1
> <rahul1.kumar at intel.com>
> Subject: [edk2-devel] [PATCH V2] UefiCpuPkg/CpuDxe: Fix boot error
>
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3084
>
> When DXE drivers are dispatched above 4GB memory in 64bit
> mode, the address setCodeSelectorLongJump in stack will
> be override by parameter. Jump to Qword is not supported
> by some processors. So use "o64 retf" instead.
>
> Signed-off-by: Guo Dong <guo.dong at intel.com>
> ---
> UefiCpuPkg/CpuDxe/X64/CpuAsm.nasm | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/UefiCpuPkg/CpuDxe/X64/CpuAsm.nasm b/UefiCpuPkg/CpuDxe/X64/CpuAsm.nasm
> index c3489bcc3e..a8216cd56f 100644
> --- a/UefiCpuPkg/CpuDxe/X64/CpuAsm.nasm
> +++ b/UefiCpuPkg/CpuDxe/X64/CpuAsm.nasm
> @@ -20,13 +20,11 @@
> ;------------------------------------------------------------------------------
> global ASM_PFX(SetCodeSelector)
> ASM_PFX(SetCodeSelector):
> - sub rsp, 0x10
> + push rcx,
> lea rax, [setCodeSelectorLongJump]
> - mov [rsp], rax
> - mov [rsp+4], cx
> - jmp dword far [rsp]
> + push rax
> + o64 retf
> setCodeSelectorLongJump:
> - add rsp, 0x10
> ret
>
> ;------------------------------------------------------------------------------
> --
> 2.16.2.windows.1
>
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#69947): https://edk2.groups.io/g/devel/message/69947
Mute This Topic: https://groups.io/mt/79491640/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-
More information about the edk2-devel-archive
mailing list