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.web10.2444.1617739159219287987 for ; Tue, 06 Apr 2021 12:59:19 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=INWlUmFp; spf=pass (domain: intel.com, ip: 192.55.52.120, mailfrom: paul.a.lohr@intel.com) IronPort-SDR: H4hmZ21pzpDgq3k7yOytzf2SexVdZjCiBtYnQtFwVUf1uc+th+0z0yyTkDAEEIIvTXkt7DJClO vLL3xaooJaAQ== X-IronPort-AV: E=McAfee;i="6000,8403,9946"; a="190979947" X-IronPort-AV: E=Sophos;i="5.82,201,1613462400"; d="scan'208";a="190979947" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Apr 2021 12:59:18 -0700 IronPort-SDR: QQNkVltGhzHdhxVTwfv6Ilp62oeW/ky0FYbAL7JJcjXI++1auDGlNdi+zOi2ZikKqQWXz0wg+t n31C8+Zeoggg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,201,1613462400"; d="scan'208";a="414928379" Received: from orsmsx605.amr.corp.intel.com ([10.22.229.18]) by fmsmga008.fm.intel.com with ESMTP; 06 Apr 2021 12:59:18 -0700 Received: from orsmsx611.amr.corp.intel.com (10.22.229.24) by ORSMSX605.amr.corp.intel.com (10.22.229.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Tue, 6 Apr 2021 12:59:18 -0700 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX611.amr.corp.intel.com (10.22.229.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Tue, 6 Apr 2021 12:59:17 -0700 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) 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.2106.2 via Frontend Transport; Tue, 6 Apr 2021 12:59:17 -0700 Received: from NAM04-MW2-obe.outbound.protection.outlook.com (104.47.73.173) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2106.2; Tue, 6 Apr 2021 12:59:16 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ExJJRTCr+NWijadL2rYeBaFdKjSs14dJ1Dx96y96HdHZTKnbiYxeU8c01w1PTuSGLydfZ2r/Xt9JY16gFV1BdeVcUdIhLH/iSnoaejp7eCm1y3J1sPureZyWCgjaSoMWB8UkWA+lUbOb4wge/bDSVTarTwYqt42f4ygCqX8/6UxSs9iQ7jDpPM1CIVyfIGvkzPVNePXI6s+o6l+yRj7v1CR4xcl3C+VTW2FMOIMB3g3c5DOxPn7/E9BDvug6E8ZQFYg8yC8kTfOmBINaDoB9uRDR2IWp8V9XrVDY4ZVY5LU7xQxpEAxTC6AUWiiW1CSLYUgb69rgZfkeKSkn0znXsQ== 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=o1zbueYHU7RfLAdm0Mjn17hnPV2UAzfRmAR3vcddxdo=; b=dSXRJQASOm4BcwXDilS2a9u0EjTy2zaDeHxNgoqYIElYan5dwol/92WYOKjsxMWCC+Ot21Siq5EEfe/VU97stJPJk7VLEjpPJsWdJZqK4Y4POqSreGdkf1coD/H1fyRO977mBVYc6vOLjx9zaUV8mS9r2zuu4nECmr2KfRXpHyFgwN6bkUQx2vuoKu7HF9IkPeuLca/OlMwrV3uA4PGiyQZKW0nLYUAx7sePrCWFErZodiSVvmxI1NxVC17JXowBDPcw23i/jTBQYMdsc5biezMdCsqPerFnQP0Y7ykzLPLeQCoSW/H1QlwAjPx5UAYJSCs2NguZO5J0z4wxd8ssqg== 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=o1zbueYHU7RfLAdm0Mjn17hnPV2UAzfRmAR3vcddxdo=; b=INWlUmFpajIvzSO9/4m01HaC186getMLeIOyqNmrIPs5JER9Y64jUBWUTAWi3hZLRe975ks04ouGSF3NOJ7FITPy96xX4JDo8uGDIUU39jZ2avZGd7NwCPd82BHooARYbvfTJjzBTI9PPJQ3XmOGl9fRivCl1ITRKVVqnJseJ8k= Received: from SA2PR11MB5131.namprd11.prod.outlook.com (2603:10b6:806:116::9) by SN6PR11MB3053.namprd11.prod.outlook.com (2603:10b6:805:d9::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.29; Tue, 6 Apr 2021 19:59:15 +0000 Received: from SA2PR11MB5131.namprd11.prod.outlook.com ([fe80::19e6:badd:f76f:e19e]) by SA2PR11MB5131.namprd11.prod.outlook.com ([fe80::19e6:badd:f76f:e19e%5]) with mapi id 15.20.3999.032; Tue, 6 Apr 2021 19:59:15 +0000 From: "Lohr, Paul A" To: "devel@edk2.groups.io" , "Kinney, Michael D" CC: "Wang, Jian J" , "Wu, Hao A" , "Dong, Eric" Subject: Re: [edk2-devel] [Patch 1/1] MdeModulePkg/PiDxeS3BootScriptLib: Rename mAcpiS3Enable to avoid dup symbol Thread-Topic: [edk2-devel] [Patch 1/1] MdeModulePkg/PiDxeS3BootScriptLib: Rename mAcpiS3Enable to avoid dup symbol Thread-Index: AQHXKmtzz5cmJq1a7ESjwbHJVALBOaqn6b5w Date: Tue, 6 Apr 2021 19:59:15 +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 X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-reaction: no-action dlp-version: 11.5.1.3 authentication-results: edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=none action=none header.from=intel.com; x-originating-ip: [216.82.221.187] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: f2234cd1-2264-467f-8f3d-08d8f9367503 x-ms-traffictypediagnostic: SN6PR11MB3053: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:8882; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: CneWbwPUlj8j/y6FNaxQDPvPvQX8VIk8hMdQvLpHeU1Fo1wVwljgVIBmxsXSBxEcZNDUGab38tyiHw+9SPFX+pPzc1+4Uucb1Y8jq2cREv29De7K9OEfc3Mjyis5LkhIzTABr+7pbJsgy4JhlzGIaZX0AclzGZyT0+toYoyB4oLtvQyOfrlivB/PFk0ZqsajM7CKymx/aHKx6t8dR28kTiYsRTceL+UFgw7RXTI29nq2Ez7Lp0qGVKG0oTvZt7rrrZ6g01mVpQFZNqa6o82c+qCTgfIooO+12gKGdlI3RZP+Nnu1d8tvgVP0oRB3G0IUQ7RxBb0wMB0TbR7W/34Uzb4HzDNNQVzjvB1I7SGdPn6/TfFnSdWRgnSFb4z5qFp5VqBDBKoWhuhBfj8zE2NYRtGVAlaQcMfhHW7bndV9S/FYInf/XxO9maAv8xknOseddDythTZGDHl9r1jySY2CEp2fgf/gcjyiZlmZ6ivMiVjtKfgl0Q4+ZWp/6HRZ5uVut+piI9W9aybPXtopx8gjBzNl/wZZXtqE3ZYYQLh+mDSrl6n0A6CgoJqNhyOypA56AIMlTAmB5q2EjOOl8KFcgVABrDlMxzFQ1nFXRnI5BNjuWkG5+n+dBZqByISaq6p82t+dcHJDIHl9KqicBFroDgD7/eE+PNRUJSJEkpPoF9XFcYL2IaWSdmaAsQaP+vHXkg8PrWiYEASNm9xwp8IUik+lJWze1AKpKArEJf4QuOPo+b/Eg8sV3XiV0E5JFJJzIFcI+tt0ydoWLc952RGdpg== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SA2PR11MB5131.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(6029001)(366004)(396003)(346002)(376002)(136003)(39860400002)(966005)(76116006)(107886003)(64756008)(19627235002)(9686003)(54906003)(38100700001)(55016002)(7696005)(6636002)(8936002)(4326008)(52536014)(66476007)(66556008)(6506007)(33656002)(83380400001)(86362001)(186003)(110136005)(478600001)(71200400001)(66946007)(8676002)(5660300002)(316002)(26005)(66446008)(53546011)(2906002)(32563001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: =?us-ascii?Q?6vOHOAZ/3tljdrjmLX0Ff1nhdBO9zwvR9YqQ60Y39epp8CRQB5bU8qGo3M7Q?= =?us-ascii?Q?oov5BlxhWGKjpfquLDiLdmtH7uqed0GG1RTcWXBPeey1qUjaxX4QSQDA4+7L?= =?us-ascii?Q?MRNfYPXYGvRNp/7NohStJvBTRLryYlooRe73bDeVzaJ63z9Vt4KPjOhblpvS?= =?us-ascii?Q?20FOAdFa6pkNN4a/HSMLZcpGQtp0km0LRYhjVZZOR+xlqaamarBLQphSsp9i?= =?us-ascii?Q?QKpPP2PZMSET++5Q9CttzfMxnITIrSCeO+n4ClvJaxXEetphnRMYGfnEt62H?= =?us-ascii?Q?2kKedCwhfvVwXJfmbAT6+E9p48u8ya/zOxwiyiZbaWsAcSN3AKzp30V8vbHz?= =?us-ascii?Q?UAA6d+rF0iVLqV9S5JEixPtzL4ZBalilN/sHAUamz+apjEVXrPVwT2H3wDO4?= =?us-ascii?Q?K9jnMeFGARd6NtnFjoK6sqwvb2UAJeSouChCdaPeoW1cZFj4dsMEibmU19GU?= =?us-ascii?Q?dbrH62mop4mz+6cze9Il509+pLF2E+Qbs04V8jZGeQw6jM/ln02+DLmdBmuh?= =?us-ascii?Q?ulLwscyBhqBLoMK0Wlxe5oVi9xdWcU8xyPuvbDVyLeuYCb/rXlIsf425vUfs?= =?us-ascii?Q?oJMzw0MqOAvN8qSQ5ZQ+KIjEHOtEwsO2a80168JSJUlUTDXk2wII/DrlMszw?= =?us-ascii?Q?qa2q26645uNpkiJEfONyNi7k2Nc7NDXI/neXZUWmp4YkFzLs6sxgmsejvoRn?= =?us-ascii?Q?ZxDgzmeKZE/HnF7S3E9QNGvjEBCE0AE3Gk3axbrbA6r4+lqOGmAy3nmSvLQ2?= =?us-ascii?Q?xhRMCIt/JvcLZ41NEWo6h3Sxock8qfadnZc7fScT6RbkSPIGk6pNa+C/VuPX?= =?us-ascii?Q?Jikslikow9KYwl65XZ1biHUPwh6qctk7TOuY1sNXZbcBbYg0iTqx5IUhf1gp?= =?us-ascii?Q?wD3SizzLYGF/25ke2qyyUgr8bKPl0KadLG7KW58rVa4W9cc8QB/jZ7QFsP98?= =?us-ascii?Q?RwYUIFRRhBBFjyf9IInS3RO7lfMyzuoMxOsdscCdU4NOhHhdcj0nfb8Av+fW?= =?us-ascii?Q?bjevj0QZ0z3CW7cOkc5zHlE8FRpke+Q3v1aDReiIH0mZNsnj2qlP9nNi5C9y?= =?us-ascii?Q?6ruwJUjXbVHJemZYNQBkGfetLJ0naAHnNwl9s0JPxOvzwwFc+yveQORANsV+?= =?us-ascii?Q?vyBNAV6JYLiEh7bYO2yiCDzkF1vTenj5q/RF9AuNkbZqQuQ4zvqFcs7MCwWq?= =?us-ascii?Q?O3voUyAaWBBxP0XEY9G2/6CYLppqFFxLADKER0Zp01rIdvL8oPigHOJoWE4i?= =?us-ascii?Q?nGDaVPViAFrTvm512f6a/8ZvNOQedVcxLO8tmB9ktBVi9QjuWBT90+SrJ5vi?= =?us-ascii?Q?rVaUZOZhGuo511fDgLO5AAnm?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SA2PR11MB5131.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f2234cd1-2264-467f-8f3d-08d8f9367503 X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Apr 2021 19:59:15.8527 (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: zrebK73QsoBkQSlFFRVaSsAE1Brlv/ZkrxnpD5eqdloygHEYH5wefRR0Vel1MkfCtaq2ktPJjnQh+5bv2POY9A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR11MB3053 Return-Path: paul.a.lohr@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Looks good to me Mike. Thank you! Paul A. Lohr - Server Firmware Enabling 512.239.9073 (cell) 512.794.5044 (work) -----Original Message----- From: devel@edk2.groups.io On Behalf Of Michael D K= inney Sent: Monday, April 5, 2021 5:31 PM To: devel@edk2.groups.io Cc: Wang, Jian J ; Wu, Hao A ; = Dong, Eric Subject: [edk2-devel] [Patch 1/1] MdeModulePkg/PiDxeS3BootScriptLib: Renam= e mAcpiS3Enable to avoid dup symbol https://bugzilla.tianocore.org/show_bug.cgi?id=3D3297 Rename the global variable mAcpiS3Enable to mS3BootScriptAcpiS3Enable to a= void duplicate symbol errors from CLANGPDB tool change when PiDxeS3BootScri= ptLib from the MdeModulePkg is linked with PiSmmCpuDxeSmm from the UefiCpuP= kg. 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(-) 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=20 + reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -124,7 +124,7 @@ VOID *mRegistrationSmmRead= yToLock =3D NULL; BOOLEAN mS3BootScriptTableAllocated =3D FALSE; BOOLEAN mS3BootScriptTableSmmAllocated =3D FALSE= ; 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, recalcu= late 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; } =20 @@ -2410,4 +2410,3 @@ S3BootScriptCompare ( =20 return EFI_SUCCESS; } - -- 2.31.1.windows.1