From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mx.groups.io with SMTP id smtpd.web09.5930.1617671624182699039 for ; Mon, 05 Apr 2021 18:13:44 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=Whlk6p67; spf=pass (domain: intel.com, ip: 192.55.52.136, mailfrom: hao.a.wu@intel.com) IronPort-SDR: IVOMd40du+yY4oNkavhcX7psmXiV+kRCb0nen3R/hfgk4M4k5z/lSgvML3eWbKWR2d1u4r+7yB e39P9aDSWhqw== X-IronPort-AV: E=McAfee;i="6000,8403,9945"; a="172426371" X-IronPort-AV: E=Sophos;i="5.81,308,1610438400"; d="scan'208";a="172426371" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Apr 2021 18:13:42 -0700 IronPort-SDR: P6+lcFmby6/gVhrwocRFc7NnvaahwBrpiT1z3MnNAo3JpordA5yGKAeB2x7s/sutMv/uZ5Qk+b 3aSwc0GA80IQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,308,1610438400"; d="scan'208";a="414527441" Received: from fmsmsx602.amr.corp.intel.com ([10.18.126.82]) by fmsmga008.fm.intel.com with ESMTP; 05 Apr 2021 18:13:42 -0700 Received: from fmsmsx612.amr.corp.intel.com (10.18.126.92) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Mon, 5 Apr 2021 18:13:42 -0700 Received: from fmsmsx612.amr.corp.intel.com (10.18.126.92) by fmsmsx612.amr.corp.intel.com (10.18.126.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Mon, 5 Apr 2021 18:13:41 -0700 Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) by fmsmsx612.amr.corp.intel.com (10.18.126.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2 via Frontend Transport; Mon, 5 Apr 2021 18:13:41 -0700 Received: from NAM02-CY1-obe.outbound.protection.outlook.com (104.47.37.56) by edgegateway.intel.com (192.55.55.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2106.2; Mon, 5 Apr 2021 18:13:41 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q9OtnlsnI5E/WyTp0eF1w1NDPgBxD9aoIEcMCXb25J9SYqvxjdY1MZkjIWHjwQmkNY3TCXftZaUK4eR1opfVOFMCU4++Itq0RLbRyvG20cPscJPH9r9NKZ+jZR17ayJj/crYyOdKj0Dm2OzW3B26hWixWCsj8vFiPDLDlXzqSgt8ZIms918HHhcuewDjZCWRrbt5I0IyJIhl02r2+ndk/0fVLiZ1WYmN/dAQRrTPujtZY9K3KrknztAUSFinBs1DY218RUwDg2I/Od0COnisIDoL/Tw3JqpTWi2r65fzreO7ABRsh7bVVzYwAgmF79Dn2R3t73yJGjeBk3D1DInYdA== 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-SenderADCheck; bh=Uo3eMNMKC4Z3B/GhDbRnyroKGqTQNIOulM/bnMZnH1w=; b=A2pM+NlmVsWAuNJmRui7V1O5NqKidGem3DbFDhpsVvUmdGlG/z1Hul8twG4HzoIrGNe7Ft11cc5mQc9kZ9rEfhAdaMWZnNRftIpbjHuqxI9KKAFdz9JolwjpjIQKmBYPOJQMpnB1XBtNuV93nyNAk48MhnWTFMkVbEFQsLJ/RocvdoFxaQKQyURIBtMmF9MfcFDArGNLZINkc1YPni5rDYExunxqNhs7OiYG2yHaeXqKQ5h3i1Qf/0MJ7HQLZ1bWnQrnzCR6bVEzAaffjZ03RSZGof1szu3eyK8TTwHeaIIgdHMCABFE7uk4zoWuBwMNzt+a7oh5soRh0Z51VJgdwg== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Uo3eMNMKC4Z3B/GhDbRnyroKGqTQNIOulM/bnMZnH1w=; b=Whlk6p67US1aPKSLqH/kGGBxpQRl/tGYUKqhmH+hWImbQIgyeJ1a5O/yUXqtq1p5F0btSANLfdHCxppknopAhzWR05VBQL3lqvOywrOUxRTqeZbLRZX8CZxdck1d+d7W0XE9kq7rmeXS4RSln98Xs/8HOAVtKI7tRMvM+Q16Jvc= Received: from BN8PR11MB3666.namprd11.prod.outlook.com (2603:10b6:408:8c::19) by BN6PR11MB4036.namprd11.prod.outlook.com (2603:10b6:405:82::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.27; Tue, 6 Apr 2021 01:13:40 +0000 Received: from BN8PR11MB3666.namprd11.prod.outlook.com ([fe80::9d91:6348:53a9:cb20]) by BN8PR11MB3666.namprd11.prod.outlook.com ([fe80::9d91:6348:53a9:cb20%7]) with mapi id 15.20.3999.032; Tue, 6 Apr 2021 01:13:40 +0000 From: "Wu, Hao A" To: "Kinney, Michael D" , "devel@edk2.groups.io" CC: "Wang, Jian J" , "Dong, Eric" Subject: Re: [Patch 1/1] MdeModulePkg/PiDxeS3BootScriptLib: Rename mAcpiS3Enable to avoid dup symbol Thread-Topic: [Patch 1/1] MdeModulePkg/PiDxeS3BootScriptLib: Rename mAcpiS3Enable to avoid dup symbol Thread-Index: AQHXKmtwomNONZotw0WFpx6rmYtcWKqmry+Q Date: Tue, 6 Apr 2021 01:13:40 +0000 Message-ID: References: <20210405223120.1228-1-michael.d.kinney@intel.com> In-Reply-To: <20210405223120.1228-1-michael.d.kinney@intel.com> Accept-Language: en-US, zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-reaction: no-action dlp-version: 11.5.1.3 authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.198.147.218] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 8489b98a-e9ec-4b15-1c0f-08d8f89936cc x-ms-traffictypediagnostic: BN6PR11MB4036: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2803; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 2PRWL6bbB3GYtKQJbs9X82I11uemnsk/V4Ikh4FDVGIKRzIiQcBWeGjHJRESm7JYnUe9VhexsRsLqa3dYs7K/Mm6w6BMNhIHHPKdzJDEkQtoGkLVglFb8pD8/os1h17ola4ojMEX6jC6u+jTT1kmjXYnJTKF23n270LFeqRJjj0Xgrv1OUSaGbufFxfPSi3D1zvsOu4vPDi3yPORMwMT4Xz66zH5JQa/Z1lonX7G2wP7wMdxtXFRKFhrfemvmI4QYnY661qVC0msA35dl4U2CPNyvlO60ThKP5ulvj/TdMswul3Tih5FPc8e9cGld+PZhT+CJPXn+XDhRV7fXkx1UTnElgV0kSrdH+H5iffPzSaWuqp69B/cwwIuH3Lh+t8Rx1L53DmiYRYFj+yJBu1Oi7V5ehWksgAhqbBRlPj9Lt44rzdst8fFtFlprZQH9ssxA735ZFip91H6boc+HjJ/fY5hQ/rSH3gZerm8NmEvjrr0eZxU0JQVKevrJqBbnUkBCxwJQDCNY8ByxkTJfsyWdsyA1odeGwAGBRzK0FeKvepzfWE3rI9Nx5wFskJybs72y5rA9cobVOUVzi+xodYVFQ0Em6oB1cFyRdt5g7YjClHv20PYgWiIUaztzMoGU9Q059mBRaXWZtTSVuv0zBIGs8XK6ahWlALLmqJKnwftY4m7KfERfSz7BrMlqxfNTTa7XAIFnhXPnODbZE7KHO+0w0BtE/a1HKE4a+NX2WZYE6VXJHCRdL5pkEtegM+JrGDiFZZQ1rNF95VIKYORKogrRw== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BN8PR11MB3666.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(6029001)(136003)(396003)(346002)(376002)(366004)(39860400002)(186003)(83380400001)(71200400001)(5660300002)(110136005)(54906003)(6506007)(53546011)(966005)(316002)(19627235002)(86362001)(55016002)(64756008)(8676002)(66556008)(8936002)(9686003)(26005)(7696005)(38100700001)(66476007)(478600001)(33656002)(66946007)(107886003)(76116006)(52536014)(66446008)(2906002)(4326008)(32563001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: =?us-ascii?Q?HVBXS+zwH5HFTp1v5hXWmStGT4hwKgJYXplLXnpVPXpHoqIFD0xyL2noEgLy?= =?us-ascii?Q?4GahprxVhLoaR3sFO3Ji2QS79PCo6f7HYt1DbC0Reo4eHLZeLg5cCmXgNKB2?= =?us-ascii?Q?PjX3wvI0/cx6L7YH8REr92FR1aoki7QsUkBCimwskYfKypDh4SZoqFfZYzt3?= =?us-ascii?Q?vExi5hh9PPaXfkcQ6GTI7oyqND1U3H1OdVPtB9GAkyR865Xz/ehTkcD07q3w?= =?us-ascii?Q?Bg26e6AFCOJAQm8UwxYgouvuUjHa8vsUjapKPpciAX7gpuWnN+FcQQOP1AlD?= =?us-ascii?Q?DkWgTm74NIFrLRMjBIUgoBUpd/ShGT2pj87ZwNaIwSkPGMHQX3mBozdDdUs1?= =?us-ascii?Q?BVTIvlEm7e+YKkbfAc+R1IBMJ+OOD6d4Lw7ZlL+auyDLSqp3MpvrKAkcSvke?= =?us-ascii?Q?EWiOElhWS6/wA6/myLo1KO2qpZg8UclXbGJARClKgFYpONu6K9rVV7IqwLTX?= =?us-ascii?Q?NbqPp/daOHjjY3lbxcemtZOZsFjisiNms/9AW053tocYm2g2eH3Y+FdaMv27?= =?us-ascii?Q?+HHJZdEQ2T/YjACD5uriBessKK4yIz417+z4SILjbP/cje0ui/YerXXjmv23?= =?us-ascii?Q?076Rw43XpODycbGtPLPzUKrLgvsSUKZhahC1JEq2oeQ+ga8Ek0nLloiFcNjN?= =?us-ascii?Q?hMJ4fa7aaO1eojoGocmZbBwrK4/cu3vg1MwZF6IzNq7TEk8eTDOLDf1uuccP?= =?us-ascii?Q?EBxCdmh1I3nV6FU/d2r4XXpg4Xyt3hMVHSS+q0eykCT5uRdQSy0qB0wiolgf?= =?us-ascii?Q?WTf2CdCm0zK1J5HWAYaZ54OHsrEf/WNefyfQoSN6qSSbbQBKQcjgvHMtkRzl?= =?us-ascii?Q?wLD+QVKVJNUAUlAe8MT/5FVZGY0QDoVir5YJMXupXdeqGAWpbeVtxFNPn0gX?= =?us-ascii?Q?o99Z1qucaiSUmk8vRkNhzf/7AxhXketKV98G7I6c/zlU41ReWOr5HRCNVb8g?= =?us-ascii?Q?n0PIB1uaWRnsUHP5hj/+Mlxg8vllGHd3HSispnTiwiFa/u13LbYGWy0RIS2P?= =?us-ascii?Q?8DGwMOYtXWxHdvqQ27Hkgl9MqtCzdOGF4o+ptaq5PjokLBwus+pGnnU87j0p?= =?us-ascii?Q?rUcueoDa58iGJ3D0r05CzJ1t4eCL63AMdM2p/h/qzOYwBU2omfuODSPGaw5a?= =?us-ascii?Q?mZ+AZpZwzXFP94ivQgIZ0jzeQv8hL1Syc1832Ym6YohzIH36ODsg8feVMCeu?= =?us-ascii?Q?M47uwZHewMDOjF0nuE47ysTDtZEF19dH6UUrxHpdpgoTFyLHP7octPb5PI8a?= =?us-ascii?Q?MqBfoFh/OBJiXTd8TQHqgRU4ISCyxjowsANPbi9Svn4tWOj6qZvies+ORoez?= =?us-ascii?Q?JWNpleSj16oyuVEGSNUOxn1X?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BN8PR11MB3666.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8489b98a-e9ec-4b15-1c0f-08d8f89936cc X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Apr 2021 01:13:40.4197 (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: Sr2EivNhKAyQrpz/tAUXEIQeWmRj27+zyj6NTVnqYJlPs8GeDdtlgbYYrsY1jef6qVd46XCDgazSX+YX7HcfNQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB4036 Return-Path: hao.a.wu@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable > -----Original Message----- > From: Kinney, Michael D > Sent: Tuesday, April 6, 2021 6:31 AM > To: devel@edk2.groups.io > Cc: Wang, Jian J ; Wu, Hao A ; > Dong, Eric > Subject: [Patch 1/1] MdeModulePkg/PiDxeS3BootScriptLib: Rename > mAcpiS3Enable to avoid dup symbol >=20 > https://bugzilla.tianocore.org/show_bug.cgi?id=3D3297 >=20 > Rename the global variable mAcpiS3Enable to mS3BootScriptAcpiS3Enable to > avoid duplicate symbol errors from CLANGPDB tool change when > PiDxeS3BootScriptLib from the MdeModulePkg is linked with > PiSmmCpuDxeSmm from the UefiCpuPkg. >=20 > Cc: Jian J Wang > Cc: Hao A Wu > Cc: Eric Dong > Signed-off-by: Michael D Kinney > --- > .../Library/PiDxeS3BootScriptLib/BootScriptSave.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) >=20 > diff --git a/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c > b/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c > index 9315fc9f0188..9cdf47552162 100644 > --- a/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c > +++ b/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c > @@ -1,7 +1,7 @@ > /** @file > Save the S3 data to S3 boot script. >=20 > - Copyright (c) 2006 - 2020, Intel Corporation. All rights reserved.
> + Copyright (c) 2006 - 2021, Intel Corporation. All rights > + reserved.
>=20 > SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > @@ -124,7 +124,7 @@ VOID *mRegistrationSmmRea= dyToLock > =3D NULL; > BOOLEAN mS3BootScriptTableAllocated =3D FALSE; > BOOLEAN mS3BootScriptTableSmmAllocated =3D FALS= E; > EFI_SMM_SYSTEM_TABLE2 *mBootScriptSmst =3D NULL; > -BOOLEAN mAcpiS3Enable =3D TRUE; > +BOOLEAN mS3BootScriptAcpiS3Enable =3D TRUE; >=20 > /** > This is an internal function to add a terminate node the entry, recalc= ulate > the table @@ -438,7 +438,7 @@ S3BootScriptLibInitialize ( > EFI_PHYSICAL_ADDRESS Buffer; >=20 > if (!PcdGetBool (PcdAcpiS3Enable)) { > - mAcpiS3Enable =3D FALSE; > + mS3BootScriptAcpiS3Enable =3D FALSE; > DEBUG ((DEBUG_INFO, "%a: Skip S3BootScript because ACPI S3 > disabled.\n", gEfiCallerBaseName)); > return RETURN_SUCCESS; > } > @@ -569,7 +569,7 @@ S3BootScriptLibDeinitialize ( { > EFI_STATUS Status; >=20 > - if (!mAcpiS3Enable) { > + if (!mS3BootScriptAcpiS3Enable) { > return RETURN_SUCCESS; > } >=20 > @@ -821,7 +821,7 @@ S3BootScriptGetEntryAddAddress ( { > UINT8* NewEntryPtr; >=20 > - if (!mAcpiS3Enable) { > + if (!mS3BootScriptAcpiS3Enable) { > return NULL; > } Reviewed-by: Hao A Wu Best Regards, Hao Wu >=20 > @@ -2410,4 +2410,3 @@ S3BootScriptCompare ( >=20 > return EFI_SUCCESS; > } > - > -- > 2.31.1.windows.1