From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mx.groups.io with SMTP id smtpd.web11.2166.1676363598559087685 for ; Tue, 14 Feb 2023 00:33:20 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=AtRQMH5g; spf=pass (domain: intel.com, ip: 192.55.52.120, mailfrom: jiaxin.wu@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1676363600; x=1707899600; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=U8lmLAy7tMIcOUf7OmS1XeiJPftaRY1LXD/XFrov4zg=; b=AtRQMH5gdyxZShHFppKCW+hcrH6fHFu2/2Q/+814dyorksw+uh+lqkas +PH5oRvv+imIsmW/0f4eme5GBVjl0wCfCxnXbt0g9MuNkDO36pbbBf3Xk jxVzqMjSCUSVsHpXR4FlwBzFZZ4Q1YA63/JNoF453WylJhZ/u76a8mhKk us9Y6poZxfsRLGxGMJr0lQ27nvFrknMWL6Aur/cDJy3yQQ9NPsuIQ/IzA a7nufNiT52YjSTX+PVlQOcUZlmcJykmfHPIpEm4xZcp9N81QvnPardzKa mEXkz84RqXlFRjrWTVdlc/hmw9ssm5D/hph6WfHLWtJI3FpC9P5oVKEVQ Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10620"; a="329736265" X-IronPort-AV: E=Sophos;i="5.97,296,1669104000"; d="scan'208";a="329736265" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Feb 2023 00:33:20 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10620"; a="914662389" X-IronPort-AV: E=Sophos;i="5.97,296,1669104000"; d="scan'208";a="914662389" Received: from sh1gapp1009.ccr.corp.intel.com ([10.239.189.79]) by fmsmga006.fm.intel.com with ESMTP; 14 Feb 2023 00:33:18 -0800 From: "Wu, Jiaxin" To: devel@edk2.groups.io Cc: Eric Dong , Ray Ni , Zeng Star , Laszlo Ersek , Gerd Hoffmann , Rahul Kumar Subject: [PATCH v7 1/6] UefiCpuPkg/PiSmmCpuDxeSmm: Fix invalid InitializeMpSyncData call Date: Tue, 14 Feb 2023 16:33:09 +0800 Message-Id: <20230214083314.15092-2-jiaxin.wu@intel.com> X-Mailer: git-send-email 2.16.2.windows.1 In-Reply-To: <20230214083314.15092-1-jiaxin.wu@intel.com> References: <20230214083314.15092-1-jiaxin.wu@intel.com> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4338 No need call InitializeMpSyncData during normal boot SMI init, because mSmmMpSyncData is NULL at that time. mSmmMpSyncData is allocated in InitializeMpServiceData, which is invoked after normal boot SMI init (SmmRelocateBases). Cc: Eric Dong Cc: Ray Ni Cc: Zeng Star Cc: Laszlo Ersek Cc: Gerd Hoffmann Cc: Rahul Kumar Signed-off-by: Jiaxin Wu Reviewed-by: Ray Ni --- UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c index 655175a2c6..2ac655d032 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c @@ -1,9 +1,9 @@ /** @file Agent Module to load other modules to deploy SMM Entry Vector for X86 CPU. -Copyright (c) 2009 - 2019, Intel Corporation. All rights reserved.
+Copyright (c) 2009 - 2023, Intel Corporation. All rights reserved.
Copyright (c) 2017, AMD Incorporated. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -369,13 +369,11 @@ SmmInitHandler ( if (!mSmmS3Flag) { // // Check XD and BTS features on each processor on normal boot // CheckFeatureSupported (); - } - - if (mIsBsp) { + } else if (mIsBsp) { // // BSP rebase is already done above. // Initialize private data during S3 resume // InitializeMpSyncData (); -- 2.16.2.windows.1