From nobody Mon Feb 9 12:25:41 2026 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+87963+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+87963+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1648080730; cv=none; d=zohomail.com; s=zohoarc; b=oBZTEBU/glkSyIIR137nM8Xdr6aVHEV/1qVQ/yJb7U++fdhkmGd1y0kaExE6+cqbUeGpP4eU2djR5bIJaCBW4RAnMcAmezyMucvo3CnvtjT4flylP/duDyHDzHqvWC4tkIg0mWKN4ZKYezwu4NLU9bkzt6Cg23oyAf6iR1LskuM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648080730; 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=RBlWBMmzN3CIe3Mse5q9FZihfP62GavDhZpRLy1CjEc=; b=EP8eRpYMc8CYGE4UnKfnF88VQnOxkr6cKcMxFtBTMNOiLIA4zCDG3zlET7v/45vWSkHZmdy12tgCWHXwY7ddTFauvttvY3tqsUvnS/2RaF3b9dKqOgr62RC4X9gsAXVL7T5rfZErH7Sh2ce1lPEveaNkxVw8JbV59HBasCnZh+c= 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+87963+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1648080730370140.9265023374935; Wed, 23 Mar 2022 17:12:10 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id jVS2YY1788612x0tahDqw7J8; Wed, 23 Mar 2022 17:12:10 -0700 X-Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mx.groups.io with SMTP id smtpd.web09.4779.1648080680578717265 for ; Wed, 23 Mar 2022 17:12:09 -0700 X-IronPort-AV: E=McAfee;i="6200,9189,10295"; a="258207563" X-IronPort-AV: E=Sophos;i="5.90,205,1643702400"; d="scan'208";a="258207563" X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Mar 2022 17:12:08 -0700 X-IronPort-AV: E=Sophos;i="5.90,205,1643702400"; d="scan'208";a="649651350" X-Received: from mxu9-mobl1.ccr.corp.intel.com ([10.255.31.90]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Mar 2022 17:12:06 -0700 From: "Min Xu" To: devel@edk2.groups.io Cc: Min Xu , Ard Biesheuvel , Jordan Justen , Brijesh Singh , Erdem Aktas , James Bottomley , Jiewen Yao , Tom Lendacky , Gerd Hoffmann , Sebastien Boeuf Subject: [edk2-devel] [PATCH V10 27/47] OvmfPkg/PlatformPei: Refactor NoexecDxeInitialization Date: Thu, 24 Mar 2022 08:10:13 +0800 Message-Id: <20220324001033.1169-28-min.m.xu@intel.com> In-Reply-To: <20220324001033.1169-1-min.m.xu@intel.com> References: <20220324001033.1169-1-min.m.xu@intel.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,min.m.xu@intel.com X-Gm-Message-State: G58bbRI1GgAq9utAMQC7vVlOx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1648080730; bh=/n2PrtUyXaRgrN8vEOZISf0pgAFMTjpxODU3/atBSQQ=; h=Cc:Date:From:Reply-To:Subject:To; b=M0bIZi0rxpRlLepr0yhPIGCOL9BfsHTX1Uok+gItRFD4MyoZ5wtHTT6eZkKK2byfGje 8bc5SXdMHCVXbu1IzqDggPUkr42tf5GBfiUV46NTg35R9U7DSAxS1icQdJS3tC7owO/Hz O63OTueeNzV1ezBo3q5Qc0VF2jW4SvDPMhM= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1648080732034100002 Content-Type: text/plain; charset="utf-8" BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3863 NoexecDxeInitialization is split into 2 functions: - PlatformNoexecDxeInitialization is for PlatformInitLib - NoexecDxeInitialization calls PlatformNoexecDxeInitialization and then sets PCD. Cc: Ard Biesheuvel Cc: Jordan Justen Cc: Brijesh Singh Cc: Erdem Aktas Cc: James Bottomley Cc: Jiewen Yao Cc: Tom Lendacky Cc: Gerd Hoffmann Cc: Sebastien Boeuf Acked-by: Gerd Hoffmann Signed-off-by: Min Xu --- OvmfPkg/PlatformPei/Platform.c | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c index b83bd7515809..e91acca9f769 100644 --- a/OvmfPkg/PlatformPei/Platform.c +++ b/OvmfPkg/PlatformPei/Platform.c @@ -59,7 +59,6 @@ PlatformMemMapInitialization ( { UINT64 PciIoBase; UINT64 PciIoSize; - RETURN_STATUS PcdStatus; UINT32 TopOfLowRam; UINT64 PciExBarBase; UINT32 PciBase; @@ -199,24 +198,33 @@ MemMapInitialization ( ASSERT_RETURN_ERROR (PcdStatus); } =20 -#define UPDATE_BOOLEAN_PCD_FROM_FW_CFG(TokenName) \ - do { \ - BOOLEAN Setting; \ - RETURN_STATUS PcdStatus; \ - \ - if (!RETURN_ERROR (QemuFwCfgParseBool ( \ - "opt/ovmf/" #TokenName, &Setting))) { \ - PcdStatus =3D PcdSetBoolS (TokenName, Setting); \ - ASSERT_RETURN_ERROR (PcdStatus); \ - } \ - } while (0) +/** + * Fetch "opt/ovmf/PcdSetNxForStack" from QEMU + * + * @param Setting The pointer to the setting of "/opt/ovmf/PcdSetNxFor= Stack". + * @return EFI_SUCCESS Successfully fetch the settings. + */ +EFI_STATUS +EFIAPI +PlatformNoexecDxeInitialization ( + IN OUT EFI_HOB_PLATFORM_INFO *PlatformInfoHob + ) +{ + return QemuFwCfgParseBool ("opt/ovmf/PcdSetNxForStack", &PlatformInfoHob= ->PcdSetNxForStack); +} =20 VOID NoexecDxeInitialization ( VOID ) { - UPDATE_BOOLEAN_PCD_FROM_FW_CFG (PcdSetNxForStack); + RETURN_STATUS Status; + + Status =3D PlatformNoexecDxeInitialization (&mPlatformInfoHob); + if (!RETURN_ERROR (Status)) { + Status =3D PcdSetBoolS (PcdSetNxForStack, mPlatformInfoHob.PcdSetNxFor= Stack); + ASSERT_RETURN_ERROR (Status); + } } =20 VOID --=20 2.29.2.windows.2 -=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 (#87963): https://edk2.groups.io/g/devel/message/87963 Mute This Topic: https://groups.io/mt/89989256/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-