From nobody Wed May 15 01:56:57 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+101056+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+101056+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1678691044; cv=none; d=zohomail.com; s=zohoarc; b=Pahn2eErP8KDTvrnFgfOaJeEj6RGlnjf48+knkKOvPWba9IT9ZkGzuHrlV3kzAhgiNAqfSdnnhKBQUJkxdgTpeP31zwmbq202FvK6JpKvvHe5xU+kD+120YvnqPorxFhi9GlKDojRW251U3WCTAOM0Ya1d/vBvwBJkX3tCeV7iw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678691044; h=Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:Message-ID:Reply-To:Sender:Subject:To; bh=s3msedquHkxyv3QhcCTibpyrE1f6dOBZEqtZlJ59GGw=; b=hLDzaCRyecV4WSOp1q3JIqP+sZc5MlnY/qV8cee6UPzzwQ2FiUmjYPkPeAgVkWIyoOzM0uyehOkAp/XRGpahvHP7VTOlDBoZH79lAncV/3NZ3rtjK9Dv2q1ZjhK88QGiK0+J+uYz1QeSJueeGvkHeqyKiblIi/kiSc5vwyMmBQg= 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+101056+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 1678691044396181.74895704971073; Mon, 13 Mar 2023 00:04:04 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id rHE2YY1788612xIqXIGI2SDA; Mon, 13 Mar 2023 00:04:04 -0700 X-Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web11.14209.1678691043227900003 for ; Mon, 13 Mar 2023 00:04:03 -0700 X-IronPort-AV: E=McAfee;i="6500,9779,10647"; a="320930688" X-IronPort-AV: E=Sophos;i="5.98,256,1673942400"; d="scan'208";a="320930688" X-Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Mar 2023 00:04:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10647"; a="821833888" X-IronPort-AV: E=Sophos;i="5.98,256,1673942400"; d="scan'208";a="821833888" X-Received: from sh1gapp1009.ccr.corp.intel.com ([10.239.189.219]) by fmsmga001.fm.intel.com with ESMTP; 13 Mar 2023 00:04:00 -0700 From: "Wu, Jiaxin" To: devel@edk2.groups.io Cc: Eric Dong , Ray Ni , Zeng Star , Laszlo Ersek , Gerd Hoffmann Subject: [edk2-devel] [PATCH v1] UefiCpuPkg/PiSmmCpuDxeSmm: Fix S3 failure in SmmRestoreCpu Date: Mon, 13 Mar 2023 15:03:57 +0800 Message-Id: <20230313070357.8-1-jiaxin.wu@intel.com> 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,jiaxin.wu@intel.com X-Gm-Message-State: oehovMwSft2yRmesKXmG9Hedx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1678691044; bh=u206z6h0FvDrUaU4F0NNuwlWTlxPsoGUK1C/w+WI0Yw=; h=Cc:Date:From:Reply-To:Subject:To; b=neGPS4DjZk3R3Jp8XWiI1seOwixrSI8V1btKdXPc61hDrDzFbiarwhZBMkCQWZ1o7u3 IBPZ+b37+7Doc62OgvkIEV+1i9V/vhvDrYuF6YtpNs+/mRD9FieCSHg9tMgM39RKyRW+/ LwfhLuwBcX29+zMl87Da8oY49r/dFnKN9bI= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1678691045736100001 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4368 This issue is caused by the commit: ec07fd0e35d90dbcc36be300a9ceeac29c5de2ad GetFirstGuidHob() should not be used after exit boot service. Cc: Eric Dong Cc: Ray Ni Cc: Zeng Star Cc: Laszlo Ersek Cc: Gerd Hoffmann Signed-off-by: Jiaxin Wu Reviewed-by: Gerd Hoffmann Reviewed-by: Ray Ni =20 Reviewed-by: Star Zeng Tested-by: Gerd Hoffmann --- UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c b/UefiCpuPkg/PiSmmCpuDxeSmm/= CpuS3.c index d408b3f9f7..240eee6a7d 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c @@ -821,23 +821,11 @@ SmmRestoreCpu ( // First time microcode load and restore MTRRs // InitializeCpuBeforeRebase (); } =20 - // - // Make sure the gSmmBaseHobGuid existence status is the same between no= rmal and S3 boot. - // - ASSERT (mSmmRelocated =3D=3D (BOOLEAN)(GetFirstGuidHob (&gSmmBaseHobGuid= ) !=3D NULL)); - if (mSmmRelocated !=3D (BOOLEAN)(GetFirstGuidHob (&gSmmBaseHobGuid) !=3D= NULL)) { - DEBUG (( - DEBUG_ERROR, - "gSmmBaseHobGuid %a produced in normal boot but %a in S3 boot!", - mSmmRelocated ? "is" : "is not", - mSmmRelocated ? "is not" : "is" - )); - CpuDeadLoop (); - } + DEBUG ((DEBUG_INFO, "SmmRestoreCpu: mSmmRelocated is %d\n", mSmmRelocate= d)); =20 // // Check whether Smm Relocation is done or not. // If not, will do the SmmBases Relocation here!!! // --=20 2.16.2.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 (#101056): https://edk2.groups.io/g/devel/message/101056 Mute This Topic: https://groups.io/mt/97575696/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-