[edk2-devel] FW: UefiCpuPkg/CpuDxe: Fix boot error
Guo Dong
guo.dong at intel.com
Wed Jan 6 22:07:15 UTC 2021
Hi Mike,
I just did a test with retfq, it looks the compiler will take 'retfq' as a label with a warnig:
"CpuAsm.iii:26: warning: label alone on a line without a colon might be in error"
CpuAsm.nasm is the source file.
Both CpuAsm.iii and CpuAsm.obj are from the build folder.
CpuAsm_dasm.txt is the dasm file using objdump.
I am using "NASM version 2.12.01rc2 compiled on Mar 7 2016".
BTW, if using "O64 retf" instead of "retfq", the generated obj matches with DB one.
Do you prefer using " O64 retf" comparing with "DB 0x48, 0xcb"?
Thanks,
Guo
> -----Original Message-----
> From: Kinney, Michael D <michael.d.kinney at intel.com>
> Sent: Tuesday, January 5, 2021 7:01 PM
> To: Dong, Guo <guo.dong at intel.com>; devel at edk2.groups.io; Kinney, Michael
> D <michael.d.kinney at intel.com>
> 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: RE: [edk2-devel] [PATCH] UefiCpuPkg/CpuDxe: Fix boot error
>
> Hi Guo,
>
> Could be the port from MASM to NASM did not check to see if NASM supported
> the instruction.
>
> You can verify the NASM disassembly to make sure it matches the DB bytes.
>
> Mike
>
> > -----Original Message-----
> > From: Dong, Guo <guo.dong at intel.com>
> > Sent: Tuesday, January 5, 2021 4:51 PM
> > To: Kinney, Michael D <michael.d.kinney at intel.com>; 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: RE: [edk2-devel] [PATCH] UefiCpuPkg/CpuDxe: Fix boot error
> >
> >
> > Hi Mike,
> >
> > Thanks for the comments. I will remove DB and submit a new patch.
> > I used DB because retfq is used in EDK2 only in
> OvmfPkg\Library\LoadLinuxLib\X64\JumpToKernel.nasm and it used DB.
> > Not sure if there is any BKM why they use it.
> >
> > Thanks,
> > Guo
> >
> > > -----Original Message-----
> > > From: Kinney, Michael D <michael.d.kinney at intel.com>
> > > Sent: Monday, January 4, 2021 9:31 PM
> > > To: devel at edk2.groups.io; Dong, Guo <guo.dong at intel.com>; Kinney,
> Michael
> > > D <michael.d.kinney at intel.com>
> > > 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: RE: [edk2-devel] [PATCH] UefiCpuPkg/CpuDxe: Fix boot error
> > >
> > > Hi Guo,
> > >
> > > NASM has good support for instructions. Can the DB be removed and
> replaced
> > > with the equivalent instruction?
> > >
> > > Thanks,
> > >
> > > Mike
> > >
> > > > -----Original Message-----
> > > > From: devel at edk2.groups.io <devel at edk2.groups.io> On Behalf Of Guo
> Dong
> > > > Sent: Thursday, December 24, 2020 12:04 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] 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 retfq 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..e33ddb2784 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
> > > > + DB 0x48, 0xcb ; retfq
> > > > setCodeSelectorLongJump:
> > > > - add rsp, 0x10
> > > > ret
> > > >
> > > > ;------------------------------------------------------------------------------
> > > > --
> > > > 2.16.2.windows.1
> > > >
> > > >
> > > >
> > > >
> > > >
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#69874): https://edk2.groups.io/g/devel/message/69874
Mute This Topic: https://groups.io/mt/79485985/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-
-------------- next part --------------
A non-text attachment was scrubbed...
Name: CpuAsm.iii
Type: application/x-iphone
Size: 1139 bytes
Desc: CpuAsm.iii
URL: <http://listman.redhat.com/archives/edk2-devel-archive/attachments/20210106/8ae4d948/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: CpuAsm.obj
Type: application/octet-stream
Size: 1329 bytes
Desc: CpuAsm.obj
URL: <http://listman.redhat.com/archives/edk2-devel-archive/attachments/20210106/8ae4d948/attachment.obj>
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: CpuAsm_dasm.txt
URL: <http://listman.redhat.com/archives/edk2-devel-archive/attachments/20210106/8ae4d948/attachment.txt>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: CpuAsm.nasm
Type: application/octet-stream
Size: 1175 bytes
Desc: CpuAsm.nasm
URL: <http://listman.redhat.com/archives/edk2-devel-archive/attachments/20210106/8ae4d948/attachment-0001.obj>
More information about the edk2-devel-archive
mailing list