Merged https://github.com/tianocore/edk2/pull/2919
> -----Original Message----- > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Yao, Jiewen > Sent: Thursday, May 26, 2022 5:37 PM > To: Gao, Liming <gaolim...@byosoft.com.cn>; devel@edk2.groups.io; > quic_rc...@quicinc.com; theojeh...@gmail.com; Xu, Min M > <min.m...@intel.com> > Cc: 'Ard Biesheuvel' <ardb+tianoc...@kernel.org>; Justen, Jordan L > <jordan.l.jus...@intel.com>; 'Gerd Hoffmann' <kra...@redhat.com> > Subject: Re: [edk2-devel] [edk2] [PATCH v1 1/1] OvmfPkg/TdxDxe: Remove > AsmRelocateApMailBoxLoopStart prefix at call > > Thank you Liming. > > Theo's Patch is reviewed-by: Jiewen Yao <jiewen....@intle.com> > > I am creating PR to merge it. > > > -----Original Message----- > > From: gaoliming <gaolim...@byosoft.com.cn> > > Sent: Thursday, May 26, 2022 4:34 PM > > To: devel@edk2.groups.io; quic_rc...@quicinc.com; theojeh...@gmail.com; > > Xu, Min M <min.m...@intel.com>; Yao, Jiewen <jiewen....@intel.com> > > Cc: 'Ard Biesheuvel' <ardb+tianoc...@kernel.org>; Yao, Jiewen > > <jiewen....@intel.com>; Justen, Jordan L <jordan.l.jus...@intel.com>; 'Gerd > > Hoffmann' <kra...@redhat.com> > > Subject: 回复: [edk2-devel] [edk2] [PATCH v1 1/1] OvmfPkg/TdxDxe: Remove > > AsmRelocateApMailBoxLoopStart prefix at call > > > > Min: > > This failure is introduced by the commit > > b22ac35b754d1a071e0b40adc47f7c53c3d77893 OvmfPkg: Update > > PlatformInitLib to process Tdx hoblist from you. Can you provide the hot > > fix for > > this stable tag 202205? This stable tag will be released on tomorrow. > > > > lld-link: error: undefined symbol: memcpy > > >>> referenced by > > e:\code\edk2github\OvmfPkg\Library\PlatformInitLib\IntelTdx.c:191 > > >>> PlatformInitLib.lib(IntelTdx.obj):(ValidateHobList) > > > > Thanks > > Liming > > > -----邮件原件----- > > > 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Rebecca Cran > > > 发送时间: 2022年5月26日 9:27 > > > 收件人: devel@edk2.groups.io; theojeh...@gmail.com > > > 抄送: Ard Biesheuvel <ardb+tianoc...@kernel.org>; Jiewen Yao > > > <jiewen....@intel.com>; Jordan Justen <jordan.l.jus...@intel.com>; Gerd > > > Hoffmann <kra...@redhat.com> > > > 主题: Re: [edk2-devel] [edk2] [PATCH v1 1/1] OvmfPkg/TdxDxe: Remove > > > AsmRelocateApMailBoxLoopStart prefix at call > > > > > > Reviewed-by: Rebecca Cran <quic_rc...@quicinc.com> > > > Tested-by: Rebecca Cran <quic_rc...@quicinc.com> > > > > > > This lets the build get further, before it runs into Availability.h not > > > being found. > > > > > > If I download > > > http://opensource.apple.com/source/CarbonHeaders/CarbonHeaders- > 18.1/A > > > vailability.h > > > and > > > http://opensource.apple.com/source/CarbonHeaders/CarbonHeaders- > 18.1/A > > > vailabilityInternal.h > > > into MdePkg/Include > > > (which is very much a hack) then the DEBUG and RELEASE builds succeed. > > > > > > However, NOOPT fails with code generating a call to _memcpy: > > > > > > Undefined symbols for architecture x86_64: > > > "_memcpy", referenced from: > > > _ValidateHobList in PlatformInitLib.lib(IntelTdx.obj) > > > ld: symbol(s) not found for architecture x86_64 > > > "libtool" -static -o > > > > /Users/bcran/src/uefi/edk2/Build/OvmfX64/NOOPT_XCODE5/X64/MdeModu > > > > lePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe/OUTPUT/CapsuleR > > > untimeDxe.lib > > > -filelist > > > > /Users/bcran/src/uefi/edk2/Build/OvmfX64/NOOPT_XCODE5/X64/MdeModu > > > > lePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe/OUTPUT/object_fil > > > es.lst > > > make: *** > > > [/Users/bcran/src/uefi/edk2/Build/OvmfX64/NOOPT_XCODE5/X64/OvmfPkg > > > /Sec/SecMain/DEBUG/SecMain.dll] > > > Error 1 > > > > > > > > > build.py... > > > : error 7000: Failed to execute command > > > make tbuild > > > [/Users/bcran/src/uefi/edk2/Build/OvmfX64/NOOPT_XCODE5/X64/OvmfPkg > > > /Sec/SecMain] > > > > > > > > > build.py... > > > : error F002: Failed to build module > > > /Users/bcran/src/uefi/edk2/OvmfPkg/Sec/SecMain.inf [X64, XCODE5, > > > NOOPT] > > > > > > > > > > > > On 5/25/22 17:54, Théo Jehl wrote: > > > > From: Theo Jehl <theojeh...@gmail.com> > > > > > > > > Removed prefix to match AsmRelocateApMailBoxLoopStart declaration. > > > > This fixes a compilation issue. > > > > > > > > Cc: Ard Biesheuvel <ardb+tianoc...@kernel.org> > > > > Cc: Jiewen Yao <jiewen....@intel.com> > > > > Cc: Jordan Justen <jordan.l.jus...@intel.com> > > > > Cc: Gerd Hoffmann <kra...@redhat.com> > > > > Signed-off-by: Jehl Theo <theojeh...@gmail.com> > > > > --- > > > > OvmfPkg/TdxDxe/X64/ApRunLoop.nasm | 2 +- > > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > > > diff --git a/OvmfPkg/TdxDxe/X64/ApRunLoop.nasm > > > b/OvmfPkg/TdxDxe/X64/ApRunLoop.nasm > > > > index a859375fb819..52fb3b4944bf 100644 > > > > --- a/OvmfPkg/TdxDxe/X64/ApRunLoop.nasm > > > > +++ b/OvmfPkg/TdxDxe/X64/ApRunLoop.nasm > > > > @@ -83,7 +83,7 @@ AsmRelocateApMailBoxLoopEnd: > > > > > > > > ;------------------------------------------------------------------------------------- > > > > global ASM_PFX(AsmGetRelocationMap) > > > > ASM_PFX(AsmGetRelocationMap): > > > > - lea rax, [ASM_PFX(AsmRelocateApMailBoxLoopStart)] > > > > + lea rax, [AsmRelocateApMailBoxLoopStart] > > > > mov qword [rcx], rax > > > > mov qword [rcx + 8h], AsmRelocateApMailBoxLoopEnd - > > > AsmRelocateApMailBoxLoopStart > > > > ret > > > > > > > > > > > > > > > > > > > > > > > > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#90042): https://edk2.groups.io/g/devel/message/90042 Mute This Topic: https://groups.io/mt/91351654/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
