From nobody Fri May 17 12:46:07 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+104192+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+104192+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1683393862; cv=none; d=zohomail.com; s=zohoarc; b=OI4BPj9uABPpskQDzMn5YORdeXliMThtevasmDpX0eqpkjyk5QN5lR1+mHnbLls6IO8Md8GOruOIqWbIjrlEq1EcZFsy3KxnntUKpDsJQ1vFsBLdxRjbeiNqygTa5pHKR/W8rJLeM4o66St/JRDBN4mtSoVXIBPpGb31MAttjd8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683393862; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=8+KX5njHH+rxCk7y8Qd3YzvRtMP6R6K5NuPRjig+eTE=; b=R2Gb6J3Tl5t/vKciKoD3VGV31tddHUcwJhGAeewod4sqrrBGi9o1vrpQRdu1j3nCsNzCXRNxlxPf/ebXINzxXpC0JtcPIa9cA6NgEnMiLZhY1RM4aoCDp/dbPiVbHECbGAfHb9qVjXRiJOYIFr0R4rEu+Y/a1j3QxSObGB/mSVA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+104192+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1683393862575435.38137066525167; Sat, 6 May 2023 10:24:22 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 6xgZYY1788612xATaF3DAoQp; Sat, 06 May 2023 10:24:22 -0700 X-Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by mx.groups.io with SMTP id smtpd.web11.38492.1683393861585270438 for ; Sat, 06 May 2023 10:24:21 -0700 X-Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id EDE6B5C0253; Sat, 6 May 2023 13:24:20 -0400 (EDT) X-Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Sat, 06 May 2023 13:24:20 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrfeefgedgledtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheptfgvsggv tggtrgcuvehrrghnuceorhgvsggvtggtrgessghsughiohdrtghomheqnecuggftrfgrth htvghrnhepveegudefjeevkeeuffffgeefgfeghfeuveetgeeuieevvdekudfhhfeivddv ueelnecuffhomhgrihhnpehtihgrnhhotghorhgvrdhorhhgpdgrshhmshihnhgthhhroh hnihiirghtihhonhdrshgsnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehm rghilhhfrhhomheprhgvsggvtggtrgessghsughiohdrtghomh X-ME-Proxy: Feedback-ID: i5b994698:Fastmail X-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 6 May 2023 13:24:19 -0400 (EDT) From: "Rebecca Cran" To: devel@edk2.groups.io, Andrew Fish , Leif Lindholm , Michael D Kinney , Liming Gao , Bob Feng , Yuwei Chen Cc: Dongyan Qian , Zhiguang Liu , Chao Li Subject: [edk2-devel] [PATCH v2 1/7] BaseSynchronizationLib: Fix LoongArch64 synchronization functions Date: Sat, 6 May 2023 11:23:56 -0600 Message-Id: <20230506172402.116-2-rebecca@bsdio.com> In-Reply-To: <20230506172402.116-1-rebecca@bsdio.com> References: <20230506172402.116-1-rebecca@bsdio.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,rebecca@bsdio.com X-Gm-Message-State: S4DFjCyMTx2sXUqQrq0TQgFVx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1683393862; bh=c32fahza2/VCa1r3rwrAVT3Rzdr9m2x0a5XT1iMv9+g=; h=Cc:Date:From:Reply-To:Subject:To; b=rnG9fxN82QziVhkg7x3LAafgI58v83BroZJ++7WNhQixv6HXqAwaJsyoa6kLvvdbKP3 zjBFRSSvOMtKN9iEp5jLC41aaE2/5rcEER3tDB1qJEica9I0yNuaTRG6NjAugGsGURO6E tEdF7W3lfZLLRHACeeStYAEb/A2VetxfmDs= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1683393863123100002 Content-Type: text/plain; charset="utf-8" From: Dongyan Qian REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4432 There is a return value bug: The sc.w/sc.d instruction will destroy the reg_t0, use reg_t1 to avoid context reg_t0 being corrupted. Adjust Check that ptr align is UINT16. Optimize function SyncIncrement and SyncDecrement. Cc: Michael D Kinney Cc: Liming Gao Cc: Zhiguang Liu Cc: Chao Li Signed-off-by: Dongyan Qian Reviewed-by: Chao Li --- MdePkg/Library/BaseSynchronizationLib/LoongArch64/AsmSynchronization.S | 3= 0 ++++++++------------ MdePkg/Library/BaseSynchronizationLib/LoongArch64/Synchronization.c | = 2 +- 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/MdePkg/Library/BaseSynchronizationLib/LoongArch64/AsmSynchroni= zation.S b/MdePkg/Library/BaseSynchronizationLib/LoongArch64/AsmSynchroniza= tion.S index fdd50c54b5f3..03865bf2c966 100644 --- a/MdePkg/Library/BaseSynchronizationLib/LoongArch64/AsmSynchronization.S +++ b/MdePkg/Library/BaseSynchronizationLib/LoongArch64/AsmSynchronization.S @@ -53,9 +53,9 @@ ASM_PFX(AsmInternalSyncCompareExchange32): 1: ll.w $t0, $a0, 0x0 bne $t0, $a1, 2f - move $t0, $a2 - sc.w $t0, $a0, 0x0 - beqz $t0, 1b + move $t1, $a2 + sc.w $t1, $a0, 0x0 + beqz $t1, 1b b 3f 2: dbar 0 @@ -76,9 +76,9 @@ ASM_PFX(AsmInternalSyncCompareExchange64): 1: ll.d $t0, $a0, 0x0 bne $t0, $a1, 2f - move $t0, $a2 - sc.d $t0, $a0, 0x0 - beqz $t0, 1b + move $t1, $a2 + sc.d $t1, $a0, 0x0 + beqz $t1, 1b b 3f 2: dbar 0 @@ -94,13 +94,10 @@ AsmInternalSyncIncrement ( ) **/ ASM_PFX(AsmInternalSyncIncrement): - move $t0, $a0 - dbar 0 - ld.w $t1, $t0, 0x0 - li.w $t2, 1 - amadd.w $t1, $t2, $t0 + li.w $t0, 1 + amadd.w $zero, $t0, $a0 =20 - ld.w $a0, $t0, 0x0 + ld.w $a0, $a0, 0 jirl $zero, $ra, 0 =20 /** @@ -111,12 +108,9 @@ AsmInternalSyncDecrement ( ) **/ ASM_PFX(AsmInternalSyncDecrement): - move $t0, $a0 - dbar 0 - ld.w $t1, $t0, 0x0 - li.w $t2, -1 - amadd.w $t1, $t2, $t0 + li.w $t0, -1 + amadd.w $zero, $t0, $a0 =20 - ld.w $a0, $t0, 0x0 + ld.w $a0, $a0, 0 jirl $zero, $ra, 0 .end diff --git a/MdePkg/Library/BaseSynchronizationLib/LoongArch64/Synchronizat= ion.c b/MdePkg/Library/BaseSynchronizationLib/LoongArch64/Synchronization.c index d696c8ce102f..6baf841c9b09 100644 --- a/MdePkg/Library/BaseSynchronizationLib/LoongArch64/Synchronization.c +++ b/MdePkg/Library/BaseSynchronizationLib/LoongArch64/Synchronization.c @@ -81,7 +81,7 @@ InternalSyncCompareExchange16 ( volatile UINT32 *Ptr32; =20 /* Check that ptr is naturally aligned */ - ASSERT (!((UINT64)Value & (sizeof (Value) - 1))); + ASSERT (!((UINT64)Value & (sizeof (UINT16) - 1))); =20 /* Mask inputs to the correct size. */ Mask =3D (((~0UL) - (1UL << (0)) + 1) & (~0UL >> (64 - 1 -= ((sizeof (UINT16) * 8) - 1)))); --=20 2.40.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#104192): https://edk2.groups.io/g/devel/message/104192 Mute This Topic: https://groups.io/mt/98728625/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Fri May 17 12:46:07 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+104193+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+104193+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1683393863; cv=none; d=zohomail.com; s=zohoarc; b=QvsAFTWVIw/BDHGETyYVEUJ0jTfRqTHAwyhrUw1xYolUotKoIRR+Pyc3SS1gyOHwh8SGN1Wz3S9GBa3AqhCPHwV/I2UwdLACNauJiyyDuIiu2o9Mj7rXK/NMC3EzMRviC/WIx3e5DgFRKYB22iSyhNIMYwOq5EO5Tjk3c+QZURM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683393863; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=rYiP+wc0MbRsS/bgyVJSk4ENFihJ7iN14nkz2qlkGIc=; b=kaNGv+Iawu8xij65F3IfemJLjvQIl35uF/hRucx77E8CcP32Vlov85Axrr7lMp5WunYaEQvIV4OUBFiKMIB1mqBuzfgUqhI9chTZBiZ9b0oJqcFhP6PMhfvT45OcXauZwPxgjs2x2UgoI+UCMzfBudbFdON9nVVK6PJSv5ifYbc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+104193+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1683393863867608.7805633172188; Sat, 6 May 2023 10:24:23 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id NEAIYY1788612xkelbfGLVBG; Sat, 06 May 2023 10:24:23 -0700 X-Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by mx.groups.io with SMTP id smtpd.web10.38451.1683393862957220937 for ; Sat, 06 May 2023 10:24:23 -0700 X-Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 49CF35C0256; Sat, 6 May 2023 13:24:22 -0400 (EDT) X-Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Sat, 06 May 2023 13:24:22 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrfeefgedgkeelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheptfgvsggv tggtrgcuvehrrghnuceorhgvsggvtggtrgessghsughiohdrtghomheqnecuggftrfgrth htvghrnhepveevheevtdeuieeigeelvdfgfeefveehgfetieeukefhudduhfeileekueeh gffgnecuffhomhgrihhnpehfughfrdhinhgtnecuvehluhhsthgvrhfuihiivgeptdenuc frrghrrghmpehmrghilhhfrhhomheprhgvsggvtggtrgessghsughiohdrtghomh X-ME-Proxy: Feedback-ID: i5b994698:Fastmail X-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 6 May 2023 13:24:21 -0400 (EDT) From: "Rebecca Cran" To: devel@edk2.groups.io, Andrew Fish , Leif Lindholm , Michael D Kinney , Liming Gao , Bob Feng , Yuwei Chen Cc: Gerd Hoffmann , Jiewen Yao Subject: [edk2-devel] [PATCH v2 2/7] OvmfPkg: move OvmfTpmPei.fdf.inc to Include/Fdf Date: Sat, 6 May 2023 11:23:57 -0600 Message-Id: <20230506172402.116-3-rebecca@bsdio.com> In-Reply-To: <20230506172402.116-1-rebecca@bsdio.com> References: <20230506172402.116-1-rebecca@bsdio.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,rebecca@bsdio.com X-Gm-Message-State: v9OrGkHOSLYSESndNs1x1Fr8x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1683393863; bh=nsM3k8LlpfiH2NXfneiIiKsy31XqGGt/ZbhnWbWuxYQ=; h=Cc:Date:From:Reply-To:Subject:To; b=stbnKZUprRjj3X6Tc1i7h3uzoUOdAFJq19C28zW1IrA8mPqR2PrhZLBLIbPZHpTYhwO Dmv6dkoF9//16rUdAGdta9+elu6V81gCr8/MX9UWPxXQqqd+27C0UNoPGUel8qlfJBXVT +wTlP48M1lSEbwNFBHDJz1kS5ff5KBzoLfQ= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1683393864761100009 Content-Type: text/plain; charset="utf-8" From: Gerd Hoffmann Signed-off-by: Gerd Hoffmann Reviewed-by: Jiewen Yao --- OvmfPkg/AmdSev/AmdSevX64.fdf | 2 +- OvmfPkg/CloudHv/CloudHvX64.fdf | 2 +- OvmfPkg/{ =3D> Include/Fdf}/OvmfTpmPei.fdf.inc | 0 OvmfPkg/OvmfPkgIa32.fdf | 2 +- OvmfPkg/OvmfPkgIa32X64.fdf | 2 +- OvmfPkg/OvmfPkgX64.fdf | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf index 5fb3b5d27632..25e446013cd4 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.fdf +++ b/OvmfPkg/AmdSev/AmdSevX64.fdf @@ -162,7 +162,7 @@ [FV.PEIFV] INF UefiCpuPkg/CpuMpPei/CpuMpPei.inf INF OvmfPkg/AmdSev/SecretPei/SecretPei.inf =20 -!include OvmfPkg/OvmfTpmPei.fdf.inc +!include OvmfPkg/Include/Fdf/OvmfTpmPei.fdf.inc =20 ##########################################################################= ###### =20 diff --git a/OvmfPkg/CloudHv/CloudHvX64.fdf b/OvmfPkg/CloudHv/CloudHvX64.fdf index 0d13d4066d27..62d048bce181 100644 --- a/OvmfPkg/CloudHv/CloudHvX64.fdf +++ b/OvmfPkg/CloudHv/CloudHvX64.fdf @@ -168,7 +168,7 @@ [FV.PEIFV] !endif INF UefiCpuPkg/CpuMpPei/CpuMpPei.inf =20 -!include OvmfPkg/OvmfTpmPei.fdf.inc +!include OvmfPkg/Include/Fdf/OvmfTpmPei.fdf.inc =20 ##########################################################################= ###### =20 diff --git a/OvmfPkg/OvmfTpmPei.fdf.inc b/OvmfPkg/Include/Fdf/OvmfTpmPei.fd= f.inc similarity index 100% rename from OvmfPkg/OvmfTpmPei.fdf.inc rename to OvmfPkg/Include/Fdf/OvmfTpmPei.fdf.inc diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf index 15a25f1be5e5..63b9ef5d9674 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf @@ -172,7 +172,7 @@ [FV.PEIFV] !endif INF UefiCpuPkg/CpuMpPei/CpuMpPei.inf =20 -!include OvmfPkg/OvmfTpmPei.fdf.inc +!include OvmfPkg/Include/Fdf/OvmfTpmPei.fdf.inc =20 ##########################################################################= ###### =20 diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf index 138cbd382d4e..36eb28c34f89 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -172,7 +172,7 @@ [FV.PEIFV] !endif INF UefiCpuPkg/CpuMpPei/CpuMpPei.inf =20 -!include OvmfPkg/OvmfTpmPei.fdf.inc +!include OvmfPkg/Include/Fdf/OvmfTpmPei.fdf.inc =20 ##########################################################################= ###### =20 diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf index 4f24051ae994..d9ecc837295a 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -188,7 +188,7 @@ [FV.PEIFV] INF UefiCpuPkg/CpuMpPei/CpuMpPei.inf INF FILE_GUID =3D $(UP_CPU_PEI_GUID) UefiCpuPkg/CpuMpPei/CpuMpPei.inf =20 -!include OvmfPkg/OvmfTpmPei.fdf.inc +!include OvmfPkg/Include/Fdf/OvmfTpmPei.fdf.inc =20 ##########################################################################= ###### =20 --=20 2.40.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#104193): https://edk2.groups.io/g/devel/message/104193 Mute This Topic: https://groups.io/mt/98728626/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Fri May 17 12:46:07 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+104194+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+104194+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1683393865; cv=none; d=zohomail.com; s=zohoarc; b=fhkUZko+OKxOztmNpGnHtd8PQU3ybWkt2n/6TKBqBl20iZxL4vLADiVmTyf+Fyw7d6ZshTnILe2R8ysuQ5BAL7aBSLcadBSiVJuq+SxbKPYCClJ9VULq1U9W23MuvkFGty1AUpda72KueB9c6/i5togUZ0kxEhK2g9ewPBbzdJo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683393865; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=s2wKtxbdmq7+a0RaCMusEsk71sP0mx2DV8KKXAvM254=; b=fTtXGaX6tTL1KNc4GDA5o35UL3m0q2uF65UOG9+66ZoSXAvptQPi5XBgbbYi1bMpUu+N+ULCgCkFl817qfL6hAlLtoL2meB1MUlc7zqZh3KYycR0UJGAoVezSW66hUIVHvfyWjGsYtVwPpqLQrH4JBHJnPNTvxkRIPfTgnR/Xzk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+104194+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1683393865366565.9129330152949; Sat, 6 May 2023 10:24:25 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id qOBXYY1788612xHmqXFdbXsb; Sat, 06 May 2023 10:24:25 -0700 X-Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by mx.groups.io with SMTP id smtpd.web10.38453.1683393864277018068 for ; Sat, 06 May 2023 10:24:24 -0700 X-Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 993195C0257; Sat, 6 May 2023 13:24:23 -0400 (EDT) X-Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Sat, 06 May 2023 13:24:23 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrfeefgedgkeelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheptfgvsggv tggtrgcuvehrrghnuceorhgvsggvtggtrgessghsughiohdrtghomheqnecuggftrfgrth htvghrnhepveevheevtdeuieeigeelvdfgfeefveehgfetieeukefhudduhfeileekueeh gffgnecuffhomhgrihhnpehfughfrdhinhgtnecuvehluhhsthgvrhfuihiivgepudenuc frrghrrghmpehmrghilhhfrhhomheprhgvsggvtggtrgessghsughiohdrtghomh X-ME-Proxy: Feedback-ID: i5b994698:Fastmail X-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 6 May 2023 13:24:22 -0400 (EDT) From: "Rebecca Cran" To: devel@edk2.groups.io, Andrew Fish , Leif Lindholm , Michael D Kinney , Liming Gao , Bob Feng , Yuwei Chen Cc: Gerd Hoffmann , Jiewen Yao Subject: [edk2-devel] [PATCH v2 3/7] OvmfPkg: move OvmfTpmDxe.fdf.inc to Include/Fdf Date: Sat, 6 May 2023 11:23:58 -0600 Message-Id: <20230506172402.116-4-rebecca@bsdio.com> In-Reply-To: <20230506172402.116-1-rebecca@bsdio.com> References: <20230506172402.116-1-rebecca@bsdio.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,rebecca@bsdio.com X-Gm-Message-State: KN95igDRvKP5dAv7iGUfNeozx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1683393865; bh=H32T+gN0k4bU8rqwK3nyvLKN4/cKcSunHJjFKiJnZkY=; h=Cc:Date:From:Reply-To:Subject:To; b=HirjKjsqvehGzPtw0fDRRpzWCqYCnnxx4V6DuO6kaYUBu9pzcDGdzyzo1vfiJDWwoh6 MMElDM/eMKVLwqXxnCvSwE442ZTTegQsy1dsgmHkSMSfF5mf3VjKD+e+cOMYM58jUHBvm 1ti42obNy+EsuVfyhihWjrUDIYQtTbnP8vs= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1683393867116100015 Content-Type: text/plain; charset="utf-8" From: Gerd Hoffmann Signed-off-by: Gerd Hoffmann Reviewed-by: Jiewen Yao --- OvmfPkg/AmdSev/AmdSevX64.fdf | 2 +- OvmfPkg/CloudHv/CloudHvX64.fdf | 2 +- OvmfPkg/{ =3D> Include/Fdf}/OvmfTpmDxe.fdf.inc | 0 OvmfPkg/OvmfPkgIa32.fdf | 2 +- OvmfPkg/OvmfPkgIa32X64.fdf | 2 +- OvmfPkg/OvmfPkgX64.fdf | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf index 25e446013cd4..fec08468d3e0 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.fdf +++ b/OvmfPkg/AmdSev/AmdSevX64.fdf @@ -316,7 +316,7 @@ [FV.DXEFV] # # TPM support # -!include OvmfPkg/OvmfTpmDxe.fdf.inc +!include OvmfPkg/Include/Fdf/OvmfTpmDxe.fdf.inc =20 ##########################################################################= ###### =20 diff --git a/OvmfPkg/CloudHv/CloudHvX64.fdf b/OvmfPkg/CloudHv/CloudHvX64.fdf index 62d048bce181..72de7bcdad66 100644 --- a/OvmfPkg/CloudHv/CloudHvX64.fdf +++ b/OvmfPkg/CloudHv/CloudHvX64.fdf @@ -343,7 +343,7 @@ [FV.DXEFV] # # TPM support # -!include OvmfPkg/OvmfTpmDxe.fdf.inc +!include OvmfPkg/Include/Fdf/OvmfTpmDxe.fdf.inc =20 ##########################################################################= ###### =20 diff --git a/OvmfPkg/OvmfTpmDxe.fdf.inc b/OvmfPkg/Include/Fdf/OvmfTpmDxe.fd= f.inc similarity index 100% rename from OvmfPkg/OvmfTpmDxe.fdf.inc rename to OvmfPkg/Include/Fdf/OvmfTpmDxe.fdf.inc diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf index 63b9ef5d9674..c9c938439759 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf @@ -372,7 +372,7 @@ [FV.DXEFV] # # TPM support # -!include OvmfPkg/OvmfTpmDxe.fdf.inc +!include OvmfPkg/Include/Fdf/OvmfTpmDxe.fdf.inc =20 !if $(LOAD_X64_ON_IA32_ENABLE) =3D=3D TRUE INF OvmfPkg/CompatImageLoaderDxe/CompatImageLoaderDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf index 36eb28c34f89..f52219e0c26d 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -379,7 +379,7 @@ [FV.DXEFV] # # TPM support # -!include OvmfPkg/OvmfTpmDxe.fdf.inc +!include OvmfPkg/Include/Fdf/OvmfTpmDxe.fdf.inc =20 ##########################################################################= ###### =20 diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf index d9ecc837295a..00c7f8849fb8 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -413,7 +413,7 @@ [FV.DXEFV] # # TPM support # -!include OvmfPkg/OvmfTpmDxe.fdf.inc +!include OvmfPkg/Include/Fdf/OvmfTpmDxe.fdf.inc =20 ##########################################################################= ###### =20 --=20 2.40.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#104194): https://edk2.groups.io/g/devel/message/104194 Mute This Topic: https://groups.io/mt/98728627/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Fri May 17 12:46:07 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+104195+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+104195+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1683393866; cv=none; d=zohomail.com; s=zohoarc; b=EjC/f1gYvLEtbW1zgxfgPtd2gnRjkR85zPEhJyUBbdQLJ04aTL0Y9I54xGMAOJ71n2QbwfXrukn+rggmRPBmtBUjlWbP7hGhy4RVIfgb5rMkODEUN3geIL5bgaHXCuVb1d/n2NYzXP8oUPmIQe50pwJHEemmRAkNtYY4KNWB1sk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683393866; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=dM5haSzaf6z5MKlqBuCQQd9g2t+rnm9IJbz3fG9GL/U=; b=dSGRFipcMl0nay71bzVM9RO5M9UubGX2lSMMOqpow2708FLdMF91nU6Pojig/VDDoooLfJixhlnQpTAcxaHBS1uAPwds18WxOoBwVEaXzuKpr/RjU8+Y3KhQovSYMw88orHf5/ViMtiNI+Hmaf01LAcBA9pwNG5ixs+BAYncnuA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+104195+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1683393866331745.4718889138713; Sat, 6 May 2023 10:24:26 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id U3K5YY1788612xWOIuBhqbjQ; Sat, 06 May 2023 10:24:25 -0700 X-Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by mx.groups.io with SMTP id smtpd.web10.38455.1683393865387617806 for ; Sat, 06 May 2023 10:24:25 -0700 X-Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id B41C15C0258; Sat, 6 May 2023 13:24:24 -0400 (EDT) X-Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Sat, 06 May 2023 13:24:24 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrfeefgedgkeelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheptfgvsggv tggtrgcuvehrrghnuceorhgvsggvtggtrgessghsughiohdrtghomheqnecuggftrfgrth htvghrnhepgeffueeuledvgefgvddvgfetvdduhfefkedukeeikedtudekfeetteeifedv leefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheprh gvsggvtggtrgessghsughiohdrtghomh X-ME-Proxy: Feedback-ID: i5b994698:Fastmail X-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 6 May 2023 13:24:23 -0400 (EDT) From: "Rebecca Cran" To: devel@edk2.groups.io, Andrew Fish , Leif Lindholm , Michael D Kinney , Liming Gao , Bob Feng , Yuwei Chen Cc: Rebecca Cran Subject: [edk2-devel] [PATCH v2 4/7] BaseTools: Remove Python2/Python3 detection from toolset.bat Date: Sat, 6 May 2023 11:23:59 -0600 Message-Id: <20230506172402.116-5-rebecca@bsdio.com> In-Reply-To: <20230506172402.116-1-rebecca@bsdio.com> References: <20230506172402.116-1-rebecca@bsdio.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,rebecca@bsdio.com X-Gm-Message-State: 6EwwUU7IeVBhnmlgSOGjZTGxx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1683393865; bh=kNMibZ5CKLAa+2ME3uSsa36liSqCzhkSbntBEbEpJuQ=; h=Cc:Date:From:Reply-To:Subject:To; b=Wcf201tCgyWdBoMdLHyysy9ND1vEVg/z2ijlPG2vMHSgdJ+NgDJfj8yO27krgvnYiYe 9Z46cFM41YgjPB6zoYGpDCH9TwjOmcYcgmXA3shIE/1NIm2C5EG+/EV4xmA6tQYrcGIZl DsuyOKYqm/w8UdhzJcDD8C7W22mQ8leiSOE= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1683393866780100013 Content-Type: text/plain; charset="utf-8" Since Python3 is now required, we can remove the checks for PYTHON3_ENABLE and PYTHON3 and simplify the code in toolsetup.bat. Also, remove the leftover from when we supported freezing Python code. While here, fix a couple of typos and improve error messages. Signed-off-by: Rebecca Cran --- BaseTools/toolsetup.bat | 64 +++++--------------- 1 file changed, 16 insertions(+), 48 deletions(-) diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat index 25d13d559cd6..3d13e9fad286 100755 --- a/BaseTools/toolsetup.bat +++ b/BaseTools/toolsetup.bat @@ -305,18 +305,8 @@ goto check_build_environment ) =20 :defined_python -if defined PYTHON_COMMAND if not defined PYTHON3_ENABLE ( - goto check_python_available -) -if defined PYTHON3_ENABLE ( - if "%PYTHON3_ENABLE%" EQU "TRUE" ( - set PYTHON_COMMAND=3Dpy -3 - goto check_python_available - ) else ( - goto check_python2 - ) -) -if not defined PYTHON_COMMAND if not defined PYTHON3_ENABLE ( + +if not defined PYTHON_COMMAND ( set PYTHON_COMMAND=3Dpy -3 py -3 %BASE_TOOLS_PATH%\Tests\PythonTest.py >PythonCheck.txt 2>&1 setlocal enabledelayedexpansion @@ -328,56 +318,40 @@ if not defined PYTHON_COMMAND if not defined PYTHON3_= ENABLE ( set PYTHON_COMMAND=3D echo. echo !!! ERROR !!! Binary python tools are missing. - echo PYTHON_COMMAND, PYTHON3_ENABLE or PYTHON_HOME - echo Environment variable is not set successfully. - echo They is required to build or execute the python tools. + echo PYTHON_COMMAND or PYTHON_HOME + echo Environment variable is not set correctly. + echo They are required to build or execute the python tools. echo. goto end - ) else ( - goto check_python2 ) - ) else ( - goto check_freezer_path ) ) =20 -:check_python2 endlocal + if defined PYTHON_HOME ( if EXIST "%PYTHON_HOME%" ( set PYTHON_COMMAND=3D%PYTHON_HOME%\python.exe - goto check_python_available + ) else ( + echo . + echo !!! ERROR !!! PYTHON_HOME=3D"%PYTHON_HOME%" does not exist. + echo . + goto end ) ) -if defined PYTHONHOME ( - if EXIST "%PYTHONHOME%" ( - set PYTHON_HOME=3D%PYTHONHOME% - set PYTHON_COMMAND=3D%PYTHON_HOME%\python.exe - goto check_python_available - ) -) -echo. -echo !!! ERROR !!! PYTHON_HOME is not defined or The value of this variab= le does not exist -echo. -goto end -:check_python_available + %PYTHON_COMMAND% %BASE_TOOLS_PATH%\Tests\PythonTest.py >PythonCheck.txt 2>= &1 setlocal enabledelayedexpansion set /p PythonCheck=3D<"PythonCheck.txt" del PythonCheck.txt if "!PythonCheck!" NEQ "TRUE" ( echo. - echo ! ERROR ! "%PYTHON_COMMAND%" is not installed or added to enviro= nment variables + echo ! ERROR ! PYTHON_COMMAND=3D"%PYTHON_COMMAND%" is not installed o= r added to environment variables echo. goto end - ) else ( - goto check_freezer_path - ) +) =20 - - -:check_freezer_path - endlocal +endlocal =20 %PYTHON_COMMAND% -c "import edk2basetools" >NUL 2>NUL if %ERRORLEVEL% EQU 0 ( @@ -404,13 +378,7 @@ goto end =20 :print_python_info echo PATH =3D %PATH% - if defined PYTHON3_ENABLE if "%PYTHON3_ENABLE%" EQU "TRUE" ( - echo PYTHON3_ENABLE =3D %PYTHON3_ENABLE% - echo PYTHON3 =3D %PYTHON_COMMAND% - ) else ( - echo PYTHON3_ENABLE =3D FALSE - echo PYTHON_COMMAND =3D %PYTHON_COMMAND% - ) + echo PYTHON_COMMAND =3D %PYTHON_COMMAND% echo PYTHONPATH =3D %PYTHONPATH% echo. =20 --=20 2.40.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#104195): https://edk2.groups.io/g/devel/message/104195 Mute This Topic: https://groups.io/mt/98728628/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Fri May 17 12:46:07 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+104196+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+104196+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1683393867; cv=none; d=zohomail.com; s=zohoarc; b=gRmcT1jU1LD54nuE9jqH9tSrGWiTxMwvIZ7Ad8+i6anXA0lP8Kd1tzxcddp9JNh2rHDxLKBNQao6RiNlGgRMqtcYOwfQBACVl0HLmZmeWM3M+l1OnOR6OYZQPmKSTLTFnwLWjmh6NGhyjtiCgTKmVZg8NDQkWJ3I15GKPKbOFOw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683393867; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=DOcp/KJJ9yekPLS8lBlQYlfMlJztimXUZ9n5+vWjIgw=; b=VSH9R0Rnz4tt1LieSdyDG7ELsA4LibSO9ARA8nczJXu8Ye2/TUnvrQ3XQF4VIoDfn7rvPPAb5Ch9rRfntNeSIw0SGUvalkcc1tf4vkNsIPQK7iEBQy8mbtbDPEVGA11G3QPhhiwyqt1ve5DMrwRm3r07jvRHdcdOKn/8bKpMjiU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+104196+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1683393867780614.7440182409288; Sat, 6 May 2023 10:24:27 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id hFgPYY1788612xHB9cCJqiD0; Sat, 06 May 2023 10:24:27 -0700 X-Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by mx.groups.io with SMTP id smtpd.web11.38496.1683393866636539711 for ; Sat, 06 May 2023 10:24:26 -0700 X-Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id E5A2A5C0259; Sat, 6 May 2023 13:24:25 -0400 (EDT) X-Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Sat, 06 May 2023 13:24:25 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrfeefgedgkeelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheptfgvsggv tggtrgcuvehrrghnuceorhgvsggvtggtrgessghsughiohdrtghomheqnecuggftrfgrth htvghrnhepgeffueeuledvgefgvddvgfetvdduhfefkedukeeikedtudekfeetteeifedv leefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheprh gvsggvtggtrgessghsughiohdrtghomh X-ME-Proxy: Feedback-ID: i5b994698:Fastmail X-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 6 May 2023 13:24:24 -0400 (EDT) From: "Rebecca Cran" To: devel@edk2.groups.io, Andrew Fish , Leif Lindholm , Michael D Kinney , Liming Gao , Bob Feng , Yuwei Chen Cc: Rebecca Cran Subject: [edk2-devel] [PATCH v2 5/7] BaseTools: use threading.current_thread in NmakeSubdirs.py Date: Sat, 6 May 2023 11:24:00 -0600 Message-Id: <20230506172402.116-6-rebecca@bsdio.com> In-Reply-To: <20230506172402.116-1-rebecca@bsdio.com> References: <20230506172402.116-1-rebecca@bsdio.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,rebecca@bsdio.com X-Gm-Message-State: 1vmJ2kyEDPkBT3oNBIClg6BHx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1683393867; bh=D9YD0ueOlk3kBbE6Ygkvjnj96DYjKyhM6MsvoiNm+wE=; h=Cc:Date:From:Reply-To:Subject:To; b=J4B2imIwNReTTHbb2WK2kL3J+XObivvhqfhb4jQId0wFKYflgDHZQZ0ve6g5yj/R7MB nM31B8Iq7LFAA3ugW+6t5/CwR6k0xBkMfhNMN2s7WCRv30CL1ynFkrkHt+XxxbeY2UdOj ukYwZnNHpgrcfU+X5P2yqNsmB2wTgWx47Pg= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1683393868761100021 Content-Type: text/plain; charset="utf-8" threading.currentThread is a deprecated alias for threading.current_thread, and causes a warning to be displayed when it's called. Update NmakeSubdirs.py to use the latter method instead. Signed-off-by: Rebecca Cran --- BaseTools/Source/C/Makefiles/NmakeSubdirs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BaseTools/Source/C/Makefiles/NmakeSubdirs.py b/BaseTools/Sourc= e/C/Makefiles/NmakeSubdirs.py index 1f4a45004f4b..7860c040afa0 100644 --- a/BaseTools/Source/C/Makefiles/NmakeSubdirs.py +++ b/BaseTools/Source/C/Makefiles/NmakeSubdirs.py @@ -132,7 +132,7 @@ class ThreadControl(object): break =20 self.runningLock.acquire(True) - self.running.remove(threading.currentThread()) + self.running.remove(threading.current_thread()) self.runningLock.release() =20 def Run(): --=20 2.40.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#104196): https://edk2.groups.io/g/devel/message/104196 Mute This Topic: https://groups.io/mt/98728630/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Fri May 17 12:46:07 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+104197+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+104197+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1683393868; cv=none; d=zohomail.com; s=zohoarc; b=hyd6OWkok2vhUyV6cNfNW/9u3IX8wKvM//iD81G6Re6TNqpcG10i2/PrhpwP5p51cuNNF1QtYzOt/8sORrwWKn1mb9T8mc/w3dszP1xzKd1D34hAXyCTeh2qt7c60z/ed9vFoAqdP0miKbOnpM2HC805ObTHES+NyfekxClonak= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683393868; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=yZc0QGiblJiJldv6V7u6IKY/gsWxvngMQPvMDYqDQ78=; b=HnHwdzJYt110p+zAwE2Q+VnFGX8Ea14IzhUOEmFY2kV5LUucZN0BL7+29eGvbMMlrL+2s4NLPEPR8INB9pGPdGciUZ2re8vW9i58yXPBjsvqMghVq5l7YSzx4WC48Wi9jdB3+Bp8//X0xtAceLgCOwBhMV8CapWcvaNcobMK1zg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+104197+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1683393868850700.2044941632013; Sat, 6 May 2023 10:24:28 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id UNmwYY1788612xX6VUwBGdiz; Sat, 06 May 2023 10:24:28 -0700 X-Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by mx.groups.io with SMTP id smtpd.web11.38498.1683393867893986557 for ; Sat, 06 May 2023 10:24:28 -0700 X-Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 3F8D85C00DF; Sat, 6 May 2023 13:24:27 -0400 (EDT) X-Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Sat, 06 May 2023 13:24:27 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrfeefgedgledtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheptfgvsggv tggtrgcuvehrrghnuceorhgvsggvtggtrgessghsughiohdrtghomheqnecuggftrfgrth htvghrnhepgeffueeuledvgefgvddvgfetvdduhfefkedukeeikedtudekfeetteeifedv leefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheprh gvsggvtggtrgessghsughiohdrtghomh X-ME-Proxy: Feedback-ID: i5b994698:Fastmail X-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 6 May 2023 13:24:26 -0400 (EDT) From: "Rebecca Cran" To: devel@edk2.groups.io, Andrew Fish , Leif Lindholm , Michael D Kinney , Liming Gao , Bob Feng , Yuwei Chen Cc: Rebecca Cran Subject: [edk2-devel] [PATCH v2 6/7] edksetup.bat: if toolsetup.bat fails, just exit Date: Sat, 6 May 2023 11:24:01 -0600 Message-Id: <20230506172402.116-7-rebecca@bsdio.com> In-Reply-To: <20230506172402.116-1-rebecca@bsdio.com> References: <20230506172402.116-1-rebecca@bsdio.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,rebecca@bsdio.com X-Gm-Message-State: JOgw0VSIncWYBvQlXGKQoRuyx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1683393868; bh=isreuk9mR656hpKIa/o6n+5XWelYDhR6FfQX8iGJ1Ug=; h=Cc:Date:From:Reply-To:Subject:To; b=UX96xV4fQtn67dkeE8zA+pdDjjGlyx+1oKQz4AFIYb7iY8EIkdhyChUImMjp1AQ3KwP 1Bs4bECB3g/PFawkc2Ia2AZ3XjYrsachrwo237gzJOU0qc7sbAwac6sMXB9SMwqI0Jbvn mQwiRzuFq+LfvoBxH0QsbSHn234f7IEkSjI= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1683393869103100025 Content-Type: text/plain; charset="utf-8" If toolsetup.bat fails (i.e. exits with a non-zero %ERRORLEVEL%), don't try and carry on but just quit. Signed-off-by: Rebecca Cran --- edksetup.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/edksetup.bat b/edksetup.bat index 2fdf130e00e2..71ceefb32742 100755 --- a/edksetup.bat +++ b/edksetup.bat @@ -86,6 +86,7 @@ if exist %EDK_TOOLS_PATH%\Source set BASE_TOOLS_PATH=3D%E= DK_TOOLS_PATH% :checkBaseTools IF NOT EXIST "%EDK_TOOLS_PATH%\toolsetup.bat" goto BadBaseTools call %EDK_TOOLS_PATH%\toolsetup.bat %* +if %ERRORLEVEL% NEQ 0 goto end if /I "%1"=3D=3D"Reconfig" shift goto check_NASM goto check_cygwin --=20 2.40.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#104197): https://edk2.groups.io/g/devel/message/104197 Mute This Topic: https://groups.io/mt/98728631/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Fri May 17 12:46:07 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+104198+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+104198+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1683393870; cv=none; d=zohomail.com; s=zohoarc; b=aOsZ7701bd3cKOAcQV/ygfD/rtaYwdN25GiiCa7JdCfgvlWQgkDPFSg+GHk9Zl4lDGo/4s8YqfvdUDhRrjECOI8UqpDT+FTwgjxswxYahECGg1lARZhJyl6RKiKa3tjqqtE5hdC9tdtMR6Rm92jbsf0ixrgZHiPspD3nvJ810P0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683393870; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=uUsVf6HAZKLpnbWa4rNx1j1Z7unb2zHXurMY0K6oJzk=; b=a7A9Bnt6+391/ukrgkTSYWlEJTCXIjfWjXEFgkwm8SlXFlkPo6EjhTkXbCuT1W326UAAXAWfbVohPYJiOPlBccsHxNtgttv6+iIqoj08OHDQsguAd80xtj1vwXST779kTAUI26cVnnDIg4ScufTcUVmvhnyw3Hsq8cSGIkfA5X4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+104198+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1683393870105777.2286934054944; Sat, 6 May 2023 10:24:30 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id NS8SYY1788612xJQFcMmuoU2; Sat, 06 May 2023 10:24:29 -0700 X-Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by mx.groups.io with SMTP id smtpd.web10.38460.1683393869066005517 for ; Sat, 06 May 2023 10:24:29 -0700 X-Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 65FE35C0253; Sat, 6 May 2023 13:24:28 -0400 (EDT) X-Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Sat, 06 May 2023 13:24:28 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrfeefgedgkeelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheptfgvsggv tggtrgcuvehrrghnuceorhgvsggvtggtrgessghsughiohdrtghomheqnecuggftrfgrth htvghrnhephfdttdehhfejudefvedtueehuddvueetgfeiueefjefghfdvtdelfeetuddt gffgnecuffhomhgrihhnpehphihthhhonhdrohhrghenucevlhhushhtvghrufhiiigvpe dtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehrvggsvggttggrsegsshguihhordgtohhm X-ME-Proxy: Feedback-ID: i5b994698:Fastmail X-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 6 May 2023 13:24:27 -0400 (EDT) From: "Rebecca Cran" To: devel@edk2.groups.io, Andrew Fish , Leif Lindholm , Michael D Kinney , Liming Gao , Bob Feng , Yuwei Chen Cc: Rebecca Cran Subject: [edk2-devel] [PATCH v2 7/7] BaseTools: Update toolsetup.bat and Tests/PythonTest.py to check ver Date: Sat, 6 May 2023 11:24:02 -0600 Message-Id: <20230506172402.116-8-rebecca@bsdio.com> In-Reply-To: <20230506172402.116-1-rebecca@bsdio.com> References: <20230506172402.116-1-rebecca@bsdio.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,rebecca@bsdio.com X-Gm-Message-State: ZWP2fHHlzgOn7etCygIZgGlnx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1683393869; bh=d5OagIm7Tfr2c4dCmbX6snkAPNcO0m8xNRXCzJRc4pI=; h=Cc:Date:From:Reply-To:Subject:To; b=nskm2xb34TEKVJFswR5HdgRQG93MNQGStv5ZwA0AqoLtlwRDS3nBP2GEQGyHLlAbH7l s24N20xif09GAe0NhD9CVZ+85BBjf80IOVahKcwoEYHu6fvE3AZQq5rFe57wiRoGlAemh 9Hftt9AS2nsRVLwzmpaBkwqNA5yukcvjhyk= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1683393871113100029 Content-Type: text/plain; charset="utf-8" Update toolsetup.bat and Tests/PythonTest.py to check if we're running a version of Python that's compatible with BaseTools and the Pip BaseTools. BaseTools uses syntax from Python 3.6 or newer, so set that as the minimum version EDK2 requires. Signed-off-by: Rebecca Cran --- BaseTools/Tests/PythonTest.py | 22 ++++++- BaseTools/toolsetup.bat | 61 +++++++++++--------- 2 files changed, 54 insertions(+), 29 deletions(-) diff --git a/BaseTools/Tests/PythonTest.py b/BaseTools/Tests/PythonTest.py index ec44c7947086..b87c78570eae 100644 --- a/BaseTools/Tests/PythonTest.py +++ b/BaseTools/Tests/PythonTest.py @@ -1,9 +1,27 @@ ## @file -# Test whether PYTHON_COMMAND is available +# Test whether PYTHON_COMMAND is available and the +# minimum Python version is installed. # # Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent # =20 +import sys + if __name__ =3D=3D '__main__': - print('TRUE') + # Check if the major and minor versions required were specified. + if len(sys.argv) >=3D 3: + req_major_version =3D int(sys.argv[1]) + req_minor_version =3D int(sys.argv[2]) + else: + # If the minimum version wasn't specified on the command line, + # default to 3.6 because BaseTools uses syntax from PEP 526 + # (https://peps.python.org/pep-0526/) + req_major_version =3D 3 + req_minor_version =3D 6 + + if sys.version_info.major =3D=3D req_major_version and \ + sys.version_info.minor >=3D req_minor_version: + sys.exit(0) + else: + sys.exit(1) diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat index 3d13e9fad286..dc6288effd7d 100755 --- a/BaseTools/toolsetup.bat +++ b/BaseTools/toolsetup.bat @@ -12,6 +12,8 @@ @echo off pushd . set SCRIPT_ERROR=3D0 +set PYTHON_VER_MAJOR=3D3 +set PYTHON_VER_MINOR=3D6 =20 @REM ############################################################## @REM # You should not have to modify anything below this line @@ -304,17 +306,19 @@ goto check_build_environment ) ) =20 -:defined_python +@REM Check Python environment =20 if not defined PYTHON_COMMAND ( set PYTHON_COMMAND=3Dpy -3 - py -3 %BASE_TOOLS_PATH%\Tests\PythonTest.py >PythonCheck.txt 2>&1 - setlocal enabledelayedexpansion - set /p PythonCheck=3D<"PythonCheck.txt" - del PythonCheck.txt - if "!PythonCheck!" NEQ "TRUE" ( + py -3 %BASE_TOOLS_PATH%\Tests\PythonTest.py %PYTHON_VER_MAJOR% %PYTHON_V= ER_MINOR% >NUL 2>NUL + if %ERRORLEVEL% EQU 1 ( + echo. + echo !!! ERROR !!! Python %PYTHON_VER_MAJOR%.%PYTHON_VER_MINOR% or new= er is required. + echo. + goto end + ) + if %ERRORLEVEL% NEQ 0 ( if not defined PYTHON_HOME if not defined PYTHONHOME ( - endlocal set PYTHON_COMMAND=3D echo. echo !!! ERROR !!! Binary python tools are missing. @@ -327,8 +331,6 @@ if not defined PYTHON_COMMAND ( ) ) =20 -endlocal - if defined PYTHON_HOME ( if EXIST "%PYTHON_HOME%" ( set PYTHON_COMMAND=3D%PYTHON_HOME%\python.exe @@ -340,27 +342,30 @@ if defined PYTHON_HOME ( ) ) =20 -%PYTHON_COMMAND% %BASE_TOOLS_PATH%\Tests\PythonTest.py >PythonCheck.txt 2>= &1 - setlocal enabledelayedexpansion - set /p PythonCheck=3D<"PythonCheck.txt" - del PythonCheck.txt - if "!PythonCheck!" NEQ "TRUE" ( - echo. - echo ! ERROR ! PYTHON_COMMAND=3D"%PYTHON_COMMAND%" is not installed o= r added to environment variables - echo. - goto end +%PYTHON_COMMAND% %BASE_TOOLS_PATH%\Tests\PythonTest.py %PYTHON_VER_MAJOR% = %PYTHON_VER_MINOR% >NUL 2>NUL +if %ERRORLEVEL% EQU 1 ( + echo. + echo !!! ERROR !!! Python %PYTHON_VER_MAJOR%.%PYTHON_VER_MINOR% or newer= is required. + echo. + goto end +) +if %ERRORLEVEL% NEQ 0 ( + echo. + echo !!! ERROR !!! PYTHON_COMMAND=3D"%PYTHON_COMMAND%" does not exist o= r is not a Python interpreter. + echo. + goto end ) =20 endlocal =20 - %PYTHON_COMMAND% -c "import edk2basetools" >NUL 2>NUL - if %ERRORLEVEL% EQU 0 ( - goto use_pip_basetools - ) else ( - REM reset ERRORLEVEL - type nul>nul - goto use_builtin_basetools - ) +%PYTHON_COMMAND% -c "import edk2basetools" >NUL 2>NUL +if %ERRORLEVEL% EQU 0 ( + goto use_pip_basetools +) else ( + REM reset ERRORLEVEL + type nul>nul + goto use_builtin_basetools +) =20 :use_builtin_basetools @echo Using EDK2 in-source Basetools @@ -444,5 +449,7 @@ set VS2019=3D set VS2017=3D set VS2015=3D set VSTool=3D +set PYTHON_VER_MAJOR=3D +set PYTHON_VER_MINOR=3D +set SCRIPT_ERROR=3D popd - --=20 2.40.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#104198): https://edk2.groups.io/g/devel/message/104198 Mute This Topic: https://groups.io/mt/98728632/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-