From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web11.4209.1646706992182166839 for ; Mon, 07 Mar 2022 18:37:08 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=JRETCodM; spf=pass (domain: intel.com, ip: 134.134.136.100, mailfrom: min.m.xu@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1646707028; x=1678243028; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=r+wQPrRFP/4wt2M7hhP9cY36ZhXTNEzA40qEmuavxM8=; b=JRETCodMEjFfqX2hR4esHrL/FxC2JbOjV6b+DOiMKoXTlqffSz5I/ekg 6lWWDF5B7LyKMjzlMn2Nm8y9UYYDwIIFpHb915Y8ygrufuBCa4zM/6WUX apa2Zgr3L2csCYFFVqAPxtaM1876S3Mc+YPcEtMWbCeoiwWjzr/3BTV6i +IY/RXs7+4nCWVEfPxINGY0ZfZ7C0iasUu3o1LwP8TPjMnW8D5skTe7i6 mlMcv/hvCNgH7SrfZslobKLJoKdV/85+jOMRarhPsXrOPvwOz3VIgvxu8 SaHKbqKLXMquwND3WqvilLT2p43Md13I/etnJp3/17yasQGSojD9wK8Vv w==; X-IronPort-AV: E=McAfee;i="6200,9189,10279"; a="317801247" X-IronPort-AV: E=Sophos;i="5.90,163,1643702400"; d="scan'208";a="317801247" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Mar 2022 18:37:08 -0800 X-IronPort-AV: E=Sophos;i="5.90,163,1643702400"; d="scan'208";a="553432891" Received: from mxu9-mobl1.ccr.corp.intel.com ([10.238.2.184]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Mar 2022 18:37:05 -0800 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: [PATCH 11/14] OvmfPkg/PlatformPei: Refactor NoexecDxeInitialization Date: Tue, 8 Mar 2022 10:36:12 +0800 Message-Id: <1e10fcce6003b5e83563d7aacc8da987aceff1e8.1646706302.git.min.m.xu@intel.com> X-Mailer: git-send-email 2.29.2.windows.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3863 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 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 01fca33e7119..2d652b0dc127 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); } -#define UPDATE_BOOLEAN_PCD_FROM_FW_CFG(TokenName) \ - do { \ - BOOLEAN Setting; \ - RETURN_STATUS PcdStatus; \ - \ - if (!RETURN_ERROR (QemuFwCfgParseBool ( \ - "opt/ovmf/" #TokenName, &Setting))) { \ - PcdStatus = 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/PcdSetNxForStack". + * @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); +} VOID NoexecDxeInitialization ( VOID ) { - UPDATE_BOOLEAN_PCD_FROM_FW_CFG (PcdSetNxForStack); + RETURN_STATUS Status; + + Status = PlatformNoexecDxeInitialization (&mPlatformInfoHob); + if (!RETURN_ERROR (Status)) { + Status = PcdSetBoolS (PcdSetNxForStack, mPlatformInfoHob.PcdSetNxForStack); + ASSERT_RETURN_ERROR (Status); + } } VOID -- 2.29.2.windows.2