From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by mx.groups.io with SMTP id smtpd.web10.79532.1673286893286952999 for ; Mon, 09 Jan 2023 09:54:53 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=sE58J3zO; spf=pass (domain: kernel.org, ip: 145.40.68.75, mailfrom: ardb@kernel.org) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 451B9B80EB5 for ; Mon, 9 Jan 2023 17:54:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id ED4FEC433F1 for ; Mon, 9 Jan 2023 17:54:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1673286890; bh=HqVfJCJ2lTKxQbJlO9VkUInH7O2ozt/qNZj00ICAcfU=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=sE58J3zO5OcIYl5Ers/PUZK7NFXcRhBFkHnyRJKEmALKZovY85EK4ryNTln8VrrQ3 TyNrtmp0Wjk9OHY9vJrFuDaHGzODds1xEDQ/2Mie5BlkQkYCYqqkuBmubWNc+y+Zp4 QOT2BN2uAmg8eZXCRlOhWxACaAFXPcOTTgfsCJ2E58yFXa2wNmdWnAt0yYtxhjUsNR OA5MJu//zdEpFMz47DfeK47E/s3NrmOKvBEe6wqalAEXFU9vUeoOmRAVWYWYdmbkuo VxIvXHuFykertdcLGNpA1xTrgRJo632sxrn9QaYRRr9BkaLHfPPwFafxXbB5t4eWvf NTUpRM8uKoQqg== Received: by mail-lj1-f181.google.com with SMTP id o7so9334561ljj.8 for ; Mon, 09 Jan 2023 09:54:49 -0800 (PST) X-Gm-Message-State: AFqh2ko+pAxyTM3bXoIHl9Yq/Gt3AnfCv07noME6jcRpaGMW2sB5Xp6p 14b34bJ4XIW9wic8ImqDBadq0HWA5ES3OJK9GSg= X-Google-Smtp-Source: AMrXdXscxOOP3ilgd02VtXFD5KxiZe14nIiJmJpM9VaPxN8/awZb5ciQuSTNyLuYhPRTltbllKX3CwBfKjRVRfqGYkw= X-Received: by 2002:a2e:a99b:0:b0:27f:b833:cf6d with SMTP id x27-20020a2ea99b000000b0027fb833cf6dmr4341446ljq.291.1673286887931; Mon, 09 Jan 2023 09:54:47 -0800 (PST) MIME-Version: 1.0 References: <20230109033724.1130-1-yuanhao.xie@intel.com> In-Reply-To: From: "Ard Biesheuvel" Date: Mon, 9 Jan 2023 18:54:36 +0100 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [edk2-devel] [PATCH 0/4] Revert the series of the patches which put APs in To: devel@edk2.groups.io, lersek@redhat.com Cc: yuanhao.xie@intel.com Content-Type: text/plain; charset="UTF-8" On Mon, 9 Jan 2023 at 09:15, Laszlo Ersek wrote: > > On 1/9/23 04:37, Yuanhao Xie wrote: > > This series of original patches requiring revert, redo and further cleanup. > > > > 4GB limitation of memory allocation will be kept for the case APs > > still need to be transferred to 32-bit mode before handoff to the OS. > > > > Stack offset for AsmRelocateApLoopStart in 32-bit mode needs to be > > fixed up, as it is calculated taking into account the removed parameters. > > > > The allocation size of the stack should be updated as the variant of > > APs loop function is introduced. > > > > Keep the logic that removes the XP attribute. > > > > Since the commit 73ccde8f6d04 introduced CpuPageTableLib dependency which > > resolved for OvmfPkg and UefiPayloadPkg, it follows the revert order shown > > as below instead of the reverse order of original commits to ensure the tree > > buildable at every stage of the revert: > > > > 73ccde8f6d04 UefiCpuPkg: Has APs in 64 bit long-mode before booting to OS. > > 3f378450dfaf UefiPayloadPkg: Add CpuPageTableLib required by MpInitLib. > > 4a8642422460 OvmfPkg: Add CpuPageTableLib required by MpInitLib. > > 7bda8c648192 UefiCpuPkg: Duplicated AsmRelocateApLoop as AsmRelocateApLoopAmd > > > > Yuanhao Xie (4): > > Revert "UefiCpuPkg: Has APs in 64 bit long-mode before booting to OS." > > Revert "UefiPayloadPkg: Add CpuPageTableLib required by MpInitLib." > > Revert "OvmfPkg: Add CpuPageTableLib required by MpInitLib." > > Revert "UefiCpuPkg: Duplicated AsmRelocateApLoop as > > AsmRelocateApLoopAmd" > > > > OvmfPkg/AmdSev/AmdSevX64.dsc | 3 +- > > OvmfPkg/CloudHv/CloudHvX64.dsc | 1 - > > OvmfPkg/IntelTdx/IntelTdxX64.dsc | 4 +- > > OvmfPkg/Microvm/MicrovmX64.dsc | 3 +- > > OvmfPkg/OvmfPkgIa32X64.dsc | 1 - > > OvmfPkg/OvmfPkgX64.dsc | 2 - > > OvmfPkg/OvmfXen.dsc | 3 +- > > UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf | 7 +- > > UefiCpuPkg/Library/MpInitLib/DxeMpLib.c | 128 +++++++------ > > .../Library/MpInitLib/Ia32/CreatePageTable.c | 27 --- > > UefiCpuPkg/Library/MpInitLib/MpEqu.inc | 2 - > > UefiCpuPkg/Library/MpInitLib/MpLib.h | 46 +---- > > UefiCpuPkg/Library/MpInitLib/X64/AmdSev.nasm | 169 ----------------- > > .../Library/MpInitLib/X64/CreatePageTable.c | 75 -------- > > UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm | 176 ++++++++++++++---- > > UefiCpuPkg/UefiCpuPkg.dsc | 1 - > > UefiPayloadPkg/UefiPayloadPkg.dsc | 1 - > > 17 files changed, 220 insertions(+), 429 deletions(-) > > delete mode 100644 UefiCpuPkg/Library/MpInitLib/Ia32/CreatePageTable.c > > delete mode 100644 UefiCpuPkg/Library/MpInitLib/X64/CreatePageTable.c > > > > Reviewed-by: Laszlo Ersek > Series merged as #3873 Thanks all,