* [Patch 1/1] MdeModulePkg/PiDxeS3BootScriptLib: Rename mAcpiS3Enable to avoid dup symbol
@ 2021-04-05 22:31 Michael D Kinney
2021-04-06 1:13 ` Wu, Hao A
2021-04-06 19:59 ` [edk2-devel] " Lohr, Paul A
0 siblings, 2 replies; 3+ messages in thread
From: Michael D Kinney @ 2021-04-05 22:31 UTC (permalink / raw)
To: devel; +Cc: Jian J Wang, Hao A Wu, Eric Dong
https://bugzilla.tianocore.org/show_bug.cgi?id=3297
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.
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Hao A Wu <hao.a.wu@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
.../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.
- Copyright (c) 2006 - 2020, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2006 - 2021, Intel Corporation. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -124,7 +124,7 @@ VOID *mRegistrationSmmReadyToLock = NULL;
BOOLEAN mS3BootScriptTableAllocated = FALSE;
BOOLEAN mS3BootScriptTableSmmAllocated = FALSE;
EFI_SMM_SYSTEM_TABLE2 *mBootScriptSmst = NULL;
-BOOLEAN mAcpiS3Enable = TRUE;
+BOOLEAN mS3BootScriptAcpiS3Enable = TRUE;
/**
This is an internal function to add a terminate node the entry, recalculate the table
@@ -438,7 +438,7 @@ S3BootScriptLibInitialize (
EFI_PHYSICAL_ADDRESS Buffer;
if (!PcdGetBool (PcdAcpiS3Enable)) {
- mAcpiS3Enable = FALSE;
+ mS3BootScriptAcpiS3Enable = FALSE;
DEBUG ((DEBUG_INFO, "%a: Skip S3BootScript because ACPI S3 disabled.\n", gEfiCallerBaseName));
return RETURN_SUCCESS;
}
@@ -569,7 +569,7 @@ S3BootScriptLibDeinitialize (
{
EFI_STATUS Status;
- if (!mAcpiS3Enable) {
+ if (!mS3BootScriptAcpiS3Enable) {
return RETURN_SUCCESS;
}
@@ -821,7 +821,7 @@ S3BootScriptGetEntryAddAddress (
{
UINT8* NewEntryPtr;
- if (!mAcpiS3Enable) {
+ if (!mS3BootScriptAcpiS3Enable) {
return NULL;
}
@@ -2410,4 +2410,3 @@ S3BootScriptCompare (
return EFI_SUCCESS;
}
-
--
2.31.1.windows.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Patch 1/1] MdeModulePkg/PiDxeS3BootScriptLib: Rename mAcpiS3Enable to avoid dup symbol
2021-04-05 22:31 [Patch 1/1] MdeModulePkg/PiDxeS3BootScriptLib: Rename mAcpiS3Enable to avoid dup symbol Michael D Kinney
@ 2021-04-06 1:13 ` Wu, Hao A
2021-04-06 19:59 ` [edk2-devel] " Lohr, Paul A
1 sibling, 0 replies; 3+ messages in thread
From: Wu, Hao A @ 2021-04-06 1:13 UTC (permalink / raw)
To: Kinney, Michael D, devel@edk2.groups.io; +Cc: Wang, Jian J, Dong, Eric
> -----Original Message-----
> From: Kinney, Michael D <michael.d.kinney@intel.com>
> Sent: Tuesday, April 6, 2021 6:31 AM
> To: devel@edk2.groups.io
> Cc: Wang, Jian J <jian.j.wang@intel.com>; Wu, Hao A <hao.a.wu@intel.com>;
> Dong, Eric <eric.dong@intel.com>
> Subject: [Patch 1/1] MdeModulePkg/PiDxeS3BootScriptLib: Rename
> mAcpiS3Enable to avoid dup symbol
>
> https://bugzilla.tianocore.org/show_bug.cgi?id=3297
>
> 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.
>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Hao A Wu <hao.a.wu@intel.com>
> Cc: Eric Dong <eric.dong@intel.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
> .../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.
>
> - Copyright (c) 2006 - 2020, Intel Corporation. All rights reserved.<BR>
> + Copyright (c) 2006 - 2021, Intel Corporation. All rights
> + reserved.<BR>
>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> @@ -124,7 +124,7 @@ VOID *mRegistrationSmmReadyToLock
> = NULL;
> BOOLEAN mS3BootScriptTableAllocated = FALSE;
> BOOLEAN mS3BootScriptTableSmmAllocated = FALSE;
> EFI_SMM_SYSTEM_TABLE2 *mBootScriptSmst = NULL;
> -BOOLEAN mAcpiS3Enable = TRUE;
> +BOOLEAN mS3BootScriptAcpiS3Enable = TRUE;
>
> /**
> This is an internal function to add a terminate node the entry, recalculate
> the table @@ -438,7 +438,7 @@ S3BootScriptLibInitialize (
> EFI_PHYSICAL_ADDRESS Buffer;
>
> if (!PcdGetBool (PcdAcpiS3Enable)) {
> - mAcpiS3Enable = FALSE;
> + mS3BootScriptAcpiS3Enable = FALSE;
> DEBUG ((DEBUG_INFO, "%a: Skip S3BootScript because ACPI S3
> disabled.\n", gEfiCallerBaseName));
> return RETURN_SUCCESS;
> }
> @@ -569,7 +569,7 @@ S3BootScriptLibDeinitialize ( {
> EFI_STATUS Status;
>
> - if (!mAcpiS3Enable) {
> + if (!mS3BootScriptAcpiS3Enable) {
> return RETURN_SUCCESS;
> }
>
> @@ -821,7 +821,7 @@ S3BootScriptGetEntryAddAddress ( {
> UINT8* NewEntryPtr;
>
> - if (!mAcpiS3Enable) {
> + if (!mS3BootScriptAcpiS3Enable) {
> return NULL;
> }
Reviewed-by: Hao A Wu <hao.a.wu@intel.com>
Best Regards,
Hao Wu
>
> @@ -2410,4 +2410,3 @@ S3BootScriptCompare (
>
> return EFI_SUCCESS;
> }
> -
> --
> 2.31.1.windows.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [edk2-devel] [Patch 1/1] MdeModulePkg/PiDxeS3BootScriptLib: Rename mAcpiS3Enable to avoid dup symbol
2021-04-05 22:31 [Patch 1/1] MdeModulePkg/PiDxeS3BootScriptLib: Rename mAcpiS3Enable to avoid dup symbol Michael D Kinney
2021-04-06 1:13 ` Wu, Hao A
@ 2021-04-06 19:59 ` Lohr, Paul A
1 sibling, 0 replies; 3+ messages in thread
From: Lohr, Paul A @ 2021-04-06 19:59 UTC (permalink / raw)
To: devel@edk2.groups.io, Kinney, Michael D
Cc: Wang, Jian J, Wu, Hao A, Dong, Eric
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 <devel@edk2.groups.io> On Behalf Of Michael D Kinney
Sent: Monday, April 5, 2021 5:31 PM
To: devel@edk2.groups.io
Cc: Wang, Jian J <jian.j.wang@intel.com>; Wu, Hao A <hao.a.wu@intel.com>; Dong, Eric <eric.dong@intel.com>
Subject: [edk2-devel] [Patch 1/1] MdeModulePkg/PiDxeS3BootScriptLib: Rename mAcpiS3Enable to avoid dup symbol
https://bugzilla.tianocore.org/show_bug.cgi?id=3297
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.
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Hao A Wu <hao.a.wu@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
.../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.
- Copyright (c) 2006 - 2020, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2006 - 2021, Intel Corporation. All rights
+ reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -124,7 +124,7 @@ VOID *mRegistrationSmmReadyToLock = NULL;
BOOLEAN mS3BootScriptTableAllocated = FALSE;
BOOLEAN mS3BootScriptTableSmmAllocated = FALSE;
EFI_SMM_SYSTEM_TABLE2 *mBootScriptSmst = NULL;
-BOOLEAN mAcpiS3Enable = TRUE;
+BOOLEAN mS3BootScriptAcpiS3Enable = TRUE;
/**
This is an internal function to add a terminate node the entry, recalculate the table @@ -438,7 +438,7 @@ S3BootScriptLibInitialize (
EFI_PHYSICAL_ADDRESS Buffer;
if (!PcdGetBool (PcdAcpiS3Enable)) {
- mAcpiS3Enable = FALSE;
+ mS3BootScriptAcpiS3Enable = FALSE;
DEBUG ((DEBUG_INFO, "%a: Skip S3BootScript because ACPI S3 disabled.\n", gEfiCallerBaseName));
return RETURN_SUCCESS;
}
@@ -569,7 +569,7 @@ S3BootScriptLibDeinitialize ( {
EFI_STATUS Status;
- if (!mAcpiS3Enable) {
+ if (!mS3BootScriptAcpiS3Enable) {
return RETURN_SUCCESS;
}
@@ -821,7 +821,7 @@ S3BootScriptGetEntryAddAddress ( {
UINT8* NewEntryPtr;
- if (!mAcpiS3Enable) {
+ if (!mS3BootScriptAcpiS3Enable) {
return NULL;
}
@@ -2410,4 +2410,3 @@ S3BootScriptCompare (
return EFI_SUCCESS;
}
-
--
2.31.1.windows.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-04-06 19:59 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-05 22:31 [Patch 1/1] MdeModulePkg/PiDxeS3BootScriptLib: Rename mAcpiS3Enable to avoid dup symbol Michael D Kinney
2021-04-06 1:13 ` Wu, Hao A
2021-04-06 19:59 ` [edk2-devel] " Lohr, Paul A
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox