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.15381.1678697810637739482 for ; Mon, 13 Mar 2023 01:56:50 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=BnZrEm2x; spf=pass (domain: intel.com, ip: 134.134.136.100, mailfrom: star.zeng@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678697810; x=1710233810; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=yMVkiFNN6kjcU8xRJRc69SKYWVlPNWg0A3DhNZPmpfc=; b=BnZrEm2xMh9JBOz3YC2OgBlfPYBjSmIKe9JLzMl8N9pM6DTo9kNBFbft /QZSSgDeBv+QqqORWcSQw4TJ1i9iJA9+dzBRPYCd34QlvGGYNJ0CRZAps EXYztOKr+p0fjx6QuDpJNzitrH5HTgLjCcfIMxvNxge9klW34ExjPxQ6T 7IaflXsziXD2oorCy1zYre/Gj7NKu5pUA6jySDKXHY8nDfMM9oCvztLMV HCQ0ao4F6QNcNDktWBvaMr08G4p69jpl99og8sG3FrxDoND+Xb3hVtVMx 1W7BJ652Xe+FRbf7K4q9fEU5gqwx/0Mr78zeThEabCBTrCbbMNrssmZxu w==; X-IronPort-AV: E=McAfee;i="6500,9779,10647"; a="401965029" X-IronPort-AV: E=Sophos;i="5.98,256,1673942400"; d="scan'208";a="401965029" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Mar 2023 01:56:38 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10647"; a="711050424" X-IronPort-AV: E=Sophos;i="5.98,256,1673942400"; d="scan'208";a="711050424" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by orsmga001.jf.intel.com with ESMTP; 13 Mar 2023 01:56:37 -0700 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21; Mon, 13 Mar 2023 01:56:37 -0700 Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) by orsmsx610.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21 via Frontend Transport; Mon, 13 Mar 2023 01:56:37 -0700 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (104.47.57.177) by edgegateway.intel.com (134.134.137.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.21; Mon, 13 Mar 2023 01:56:37 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hHFVEjzuvqJW3JbMkK1ECVJiEMgeZvucaaZEzh/fPtan0w2A4ia+Qi7/oAHEkP7xqikiaeKK9Nz7RUPL4y5TkWroGa12ysQp8k2MF0O03OIXVwzwZPwP2xmvjCrdMJbC1cKNl71IFSuxtnMG9/5VH+JRttmRcffLQyyfxKnTkhOnNwMCc4eITnVEX+SHLZEGp/6Zy9M29hFHA9iMb2yFXCdq0mrLh2NoGsoOzt2ySCEz2kqKHuOvcetUUsuJ6EFtHxfieaz94HKvVqEeKdjZHEQ/Kog6Br5cLaDus41gEubW2JzujliXjxpL3V3LUf8Q32LbMPMGkKHGRCqyV5kwIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=3eGgtfmLhTFidzEJp1ZZ0MprQRb/eD26sN7Ku8HmnQQ=; b=MVDZPGvlcjRUj/KCxw7Po2xxaqjGicrZE0LZPC3mwHY7OUX3cghpj323L7Xr4leRCSJfhwFWdZCENMh/ExwNbTHA2XSo2DVs6tgMUGAxBcCXv5tTi7ozEuMRPNo8q/nIiNOonC0O5XS1myxHI3gi4FQ+FuqvN+ws38eYmni0EHZ5o7MdBwsQ6ywD5aJKGMxedZ9o0kgGDukOD87EKXXxyWdeOC/1CPFAEPxUIcOIbbaYPLwgibsRz7Fzlh8sVeGs/+4P/4zIwMV1Y4z2RTQ9KpkfUU8XQIoEQ2LOa0MOf6OA+wEEOGQBbJapSPXJ+HCn+TYUvsXJs0BfuLOmifhv7A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from DM8PR11MB5623.namprd11.prod.outlook.com (2603:10b6:8:25::20) by CY5PR11MB6138.namprd11.prod.outlook.com (2603:10b6:930:2a::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.20; Mon, 13 Mar 2023 08:56:35 +0000 Received: from DM8PR11MB5623.namprd11.prod.outlook.com ([fe80::4548:1db9:bd40:4a26]) by DM8PR11MB5623.namprd11.prod.outlook.com ([fe80::4548:1db9:bd40:4a26%6]) with mapi id 15.20.6178.024; Mon, 13 Mar 2023 08:56:35 +0000 From: "Zeng, Star" To: "Wu, Jiaxin" , "devel@edk2.groups.io" CC: "Dong, Eric" , "Ni, Ray" , "Laszlo Ersek" , Gerd Hoffmann , "Zeng, Star" Subject: Re: [PATCH v1] UefiCpuPkg/PiSmmCpuDxeSmm: Fix S3 failure in SmmRestoreCpu Thread-Topic: [PATCH v1] UefiCpuPkg/PiSmmCpuDxeSmm: Fix S3 failure in SmmRestoreCpu Thread-Index: AQHZVXoD5g54WSilIUWzQ93zoZdj1q74aChg Date: Mon, 13 Mar 2023 08:56:35 +0000 Message-ID: References: <20230313070357.8-1-jiaxin.wu@intel.com> In-Reply-To: <20230313070357.8-1-jiaxin.wu@intel.com> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: DM8PR11MB5623:EE_|CY5PR11MB6138:EE_ x-ms-office365-filtering-correlation-id: f86c4473-e111-415b-8712-08db23a0d9b6 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: Rg9kFPqP/sTTcIGO+SxmXOiHsvfwEqU9A0ij60ULBk2VIwBS6+mmPN2esY1gQe3dEDY4dRgerLymQ/GJhQ79nBwHsII2cN7cdGfGwj0LhzYQfGYAzSOthsSala1YHWx4JKpuhBUfH4GTaCDGZgzt9W4PTxKijIqFcqJmIF+DPvrApAIaMQp9Cf2SUarN64pue6ptRM6kVXrJWJziQoHvsf71flinOsLUEdcg8BParxf0kq7UpmMXeB29iF4bAqcClZHRr3pNlbqTixL16VfswCnzly47Nvl6fT5naQ+SwSVvjtwgoBVaMtdh1vdGT/8oZt8lYKNoKA9YcFeUb6sa19aFqQEI2t7rH3ZlXcYjh+djKtR+VsyYsjFmEf5PmVdt2KKHF7GrxDekw7b8Ato45s4R1OAvSlnosJekX+d8ffcZr2n6gK4Ow+UASBX3nqR9mItV1MAjbJTWtbr9gcGwwS+iuQeHRPj5PcRNK/8Rd5KrwZisdlS+yjBl+XQnUk+fa5JswkDrtRPQyGvKL9GNLTxMdaBRXuSTb0eKXTxAK/yyHXDrGFGqqZhOCJj6mctweNnebpzdf6V/KgKcsGzB0grpfpUs8LQ7uIm6YG97sOsTnBbedgyAAFY2CYereI86aheUo/kTxirl2RNTTu/yRjd9FUqkvatO3R34l8Cti4fsMltPzAWfX+UrBIxRTpE2 x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM8PR11MB5623.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(6029001)(366004)(396003)(346002)(136003)(376002)(39860400002)(451199018)(5660300002)(33656002)(83380400001)(41300700001)(66946007)(8676002)(66476007)(7696005)(478600001)(26005)(107886003)(71200400001)(53546011)(186003)(9686003)(966005)(6506007)(8936002)(38070700005)(4326008)(66556008)(66446008)(316002)(52536014)(55016003)(64756008)(76116006)(19627235002)(38100700002)(110136005)(86362001)(54906003)(82960400001)(2906002)(122000001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?/sZJF5dzhwiPdcOKtlJOgf8YMhLP7GrGzSzNi/gHkvl3zdAVnRKlcf36IaOo?= =?us-ascii?Q?9O6oR6BMAE8CCnSl/diVoQwoZp6Gu/LFDxTc7jSxGoLKoN49TCnupNTZipT9?= =?us-ascii?Q?Je3YKmlOUCbLw0Z6xNLtgS0AvU9qqX2NGax7KqeX+UNCfkAaAhCcX7GY9TMc?= =?us-ascii?Q?yiz8XNrex/7LjhYsa0CA5IsO41QXMRLuFPKijN/mjKduY4auhT+rKLYNgHvX?= =?us-ascii?Q?SY9McidIbwBIPzDIAMT+HeQ8SFOnxHkKSKqrL3BAPgrImj1RLSPkPVGtGFdd?= =?us-ascii?Q?6yw7TUi/DRIkXoQ760FjZtnFEmNVt/3B5GlwFJEw5orOgeqKJtkK6oDYdv9u?= =?us-ascii?Q?cMjxXLOcYj0fQyQfbrckeNWuR5CNvlBB5bGORcjkGR0H3kcpYe97+UIaOPsj?= =?us-ascii?Q?ZGDyjrcwSX6d3ckh+kasSLLxv+TuzTL1SsZWajAoZDUOqGTCxhQSsDKlfGkW?= =?us-ascii?Q?XeYyg1HapEUPJDdN2aVXH7WKL5WqLMRUAlz+YYfIPcgaaKXDLyJxLaAQFSb7?= =?us-ascii?Q?nRf5SRt0Z2BXrFWS/d4pfWH6YJ9GmT79gnzQzNQrOBngFSN3DNNvHlrkeehk?= =?us-ascii?Q?9WrVpbhE0zHrL4qTtDG9OY+eRre8qE3NqljFZDGxfepLU7pnmcNSugi4Zpid?= =?us-ascii?Q?3H8oO2ThXNSZb4Fpq5cF3rDfNrQh+7ozUcsmqacXwApy1LI4/thdEWI1lLVr?= =?us-ascii?Q?3g4gtU+TQsCbQNToTrOwqcBLYLydQTsDf954KFHhWaRXQ3HDci4L2j0dd5Fg?= =?us-ascii?Q?ezKZXFBKC6fbaF9CCV3vwSD8CsYHTHwpI3TDqSQglDHwmjtkTLp23I1gHk2n?= =?us-ascii?Q?PkbjpHETMPdvxFhzhGdZYJ6i1aq1SIg0ImGsNzZeD8uu0KcVkjYH3FaNcSVU?= =?us-ascii?Q?X5g6vbbBBlbQqHOq80mCIAa2H5H4pf8tmcMcGCdGmLugI7hMNpR/N9D0yEux?= =?us-ascii?Q?mnIyfeF700O6z5QvM5YqFffKwSPRFaWanXZ5tnQy1oc/lMFSA9CIhcRrwflv?= =?us-ascii?Q?Wqi/cxIt2/INkfE6ek3OfN13kIHSbHHTYaG7OT+aRLuYeTLmI3GzKe9G24zV?= =?us-ascii?Q?MsA57S46PKpor4ScgCqhUumoyZEt5LqVqgCanrb2qDMSeqRNTvUd58WanFgA?= =?us-ascii?Q?eUiJ0wPYjhy3BBAst68sAWxx3dUcS6XLcaqEqzxX2H2eFlqB66hsULshDYkP?= =?us-ascii?Q?/SWlEiuloNEl5LRI5IS8jScsds6H8KmC2tBJpi8AICGvaewOSX0+Rt2hNy9D?= =?us-ascii?Q?zT2KCvDtHG46V5VUw7ZapEcbCa3MxRR3QQr74rt5q2NzyeJlgy51K8bKojr/?= =?us-ascii?Q?swbkHxsyXNOG/0SWL4HbSV+kaZPdX2JcwrX9HXPidGz0hXaT+w4O5Y/1E3T4?= =?us-ascii?Q?PFUPlNgltTrzqF/S2PZaW97YVkyG2aKcxcpwhU95M5hgjHfp6sR3hi7VFx0Q?= =?us-ascii?Q?t7RXrWFfpHh8ll5w0J1D9WzZT7PhYyvg9+wBc01ifNX9PKzomPNsiY6KX8jN?= =?us-ascii?Q?58loIH+xjeGe4Nh7qPw1zP3EXqiL9d91btYhUvfXYVOI+nFgy6T8yAWNGSO+?= =?us-ascii?Q?vdus+xL8yxJYuhzEtN+QbkIR6TE2mtFrPeDMaf5+?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM8PR11MB5623.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f86c4473-e111-415b-8712-08db23a0d9b6 X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Mar 2023 08:56:35.7259 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: hAry5Bf4LGUCO0X/kB/wBE3eCxG1DPGpGVeVK+/NuboNX+938B7aArDszOOMV31zsNgs4mFDpiDofvmwOipI9w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR11MB6138 Return-Path: star.zeng@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Star Zeng -----Original Message----- From: Wu, Jiaxin =20 Sent: Monday, March 13, 2023 3:04 PM To: devel@edk2.groups.io Cc: Dong, Eric ; Ni, Ray ; Zeng, Sta= r ; Laszlo Ersek ; Gerd Hoffmann Subject: [PATCH v1] UefiCpuPkg/PiSmmCpuDxeSmm: Fix S3 failure in SmmRestore= Cpu 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 --- 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