[Patch] UefiCpuPkg RegisterCpuFeaturesLib: Enhance debug messages.

[Patch] UefiCpuPkg RegisterCpuFeaturesLib: Enhance debug messages.

[Eric Dong]

Current debug message when enable/disable CPU feature not
correct. This patch enhances it to make it more accurate.

Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Shao, Ming <ming.shao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Eric Dong <eric.dong@intel.com>
---
 UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c
index 54c9827..474aea3 100644
--- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c
+++ b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c
@@ -528,9 +528,9 @@ AnalysisProcessorFeatures (
           //
           SupportedMaskCleanBit (CpuFeaturesData->SettingPcds, CpuFeatureInOrder->FeatureMask);
           if (CpuFeatureInOrder->FeatureName != NULL) {
-            DEBUG ((DEBUG_WARN, "Warning :: Failed to enable Feature Name = %a.\n", CpuFeatureInOrder->FeatureName));
+            DEBUG ((DEBUG_WARN, "Warning :: Failed to enable Feature: Name = %a.\n", CpuFeatureInOrder->FeatureName));
           } else {
-            DEBUG ((DEBUG_WARN, "Warning :: Failed to enable Feature Mask = "));
+            DEBUG ((DEBUG_WARN, "Warning :: Failed to enable Feature: Mask = "));
             DumpCpuFeatureMask (CpuFeatureInOrder->FeatureMask);
           }
         }
@@ -538,9 +538,9 @@ AnalysisProcessorFeatures (
         Status = CpuFeatureInOrder->InitializeFunc (ProcessorNumber, CpuInfo, CpuFeatureInOrder->ConfigData, FALSE);
         if (EFI_ERROR (Status)) {
           if (CpuFeatureInOrder->FeatureName != NULL) {
-            DEBUG ((DEBUG_WARN, "Warning :: Failed to enable Feature Name = %a.\n", CpuFeatureInOrder->FeatureName));
+            DEBUG ((DEBUG_WARN, "Warning :: Failed to disable Feature: Name = %a.\n", CpuFeatureInOrder->FeatureName));
           } else {
-            DEBUG ((DEBUG_WARN, "Warning :: Failed to enable Feature Mask = "));
+            DEBUG ((DEBUG_WARN, "Warning :: Failed to disable Feature: Mask = "));
             DumpCpuFeatureMask (CpuFeatureInOrder->FeatureMask);
           }
         }
-- 
2.7.0.windows.1

[Patch] UefiCpuPkg RegisterCpuFeaturesLib: Fix buffer pointer error usage.

[Eric Dong]

Current code allocate buffer for the pointer which later get value
from PCD database. but current code error use "=" for this case.
Use CopyMem instead to fix it.

Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Shao, Ming <ming.shao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Eric Dong <eric.dong@intel.com>
---
 UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c
index 474aea3..77834ae 100644
--- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c
+++ b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c
@@ -66,7 +66,7 @@ GetSupportPcds (
   BitMaskSize = PcdGetSize (PcdCpuFeaturesSupport);
   SupportBitMask = AllocateZeroPool (BitMaskSize);
   ASSERT (SupportBitMask != NULL);
-  SupportBitMask = (UINT8 *) PcdGetPtr (PcdCpuFeaturesSupport);
+  CopyMem (SupportBitMask, (UINT8 *) PcdGetPtr (PcdCpuFeaturesSupport), BitMaskSize);
 
   return SupportBitMask;
 }
@@ -87,7 +87,7 @@ GetConfigurationPcds (
   BitMaskSize = PcdGetSize (PcdCpuFeaturesUserConfiguration);
   SupportBitMask = AllocateZeroPool (BitMaskSize);
   ASSERT (SupportBitMask != NULL);
-  SupportBitMask = (UINT8 *) PcdGetPtr (PcdCpuFeaturesUserConfiguration);
+  CopyMem (SupportBitMask, (UINT8 *) PcdGetPtr (PcdCpuFeaturesUserConfiguration), BitMaskSize);
 
   return SupportBitMask;
 }
-- 
2.7.0.windows.1

Re: [Patch] UefiCpuPkg RegisterCpuFeaturesLib: Fix buffer pointer error usage.

[Ni, Ruiyu]

How about to use AllocateCopyPool()?

Thanks/Ray

> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
> Eric Dong
> Sent: Tuesday, August 15, 2017 1:32 PM
> To: edk2-devel@lists.01.org
> Cc: Ni, Ruiyu <ruiyu.ni@intel.com>; Shao, Ming <ming.shao@intel.com>;
> Shao@ml01.01.org
> Subject: [edk2] [Patch] UefiCpuPkg RegisterCpuFeaturesLib: Fix buffer
> pointer error usage.
> 
> Current code allocate buffer for the pointer which later get value from PCD
> database. but current code error use "=" for this case.
> Use CopyMem instead to fix it.
> 
> Cc: Ruiyu Ni <ruiyu.ni@intel.com>
> Cc: Shao, Ming <ming.shao@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Eric Dong <eric.dong@intel.com>
> ---
>  UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git
> a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c
> b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c
> index 474aea3..77834ae 100644
> --- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c
> +++ b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c
> @@ -66,7 +66,7 @@ GetSupportPcds (
>    BitMaskSize = PcdGetSize (PcdCpuFeaturesSupport);
>    SupportBitMask = AllocateZeroPool (BitMaskSize);
>    ASSERT (SupportBitMask != NULL);
> -  SupportBitMask = (UINT8 *) PcdGetPtr (PcdCpuFeaturesSupport);
> +  CopyMem (SupportBitMask, (UINT8 *) PcdGetPtr
> (PcdCpuFeaturesSupport),
> + BitMaskSize);
> 
>    return SupportBitMask;
>  }
> @@ -87,7 +87,7 @@ GetConfigurationPcds (
>    BitMaskSize = PcdGetSize (PcdCpuFeaturesUserConfiguration);
>    SupportBitMask = AllocateZeroPool (BitMaskSize);
>    ASSERT (SupportBitMask != NULL);
> -  SupportBitMask = (UINT8 *) PcdGetPtr
> (PcdCpuFeaturesUserConfiguration);
> +  CopyMem (SupportBitMask, (UINT8 *) PcdGetPtr
> + (PcdCpuFeaturesUserConfiguration), BitMaskSize);
> 
>    return SupportBitMask;
>  }
> --
> 2.7.0.windows.1
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel

[Patch] UefiCpuPkg BaseUefiCpuLib: remove error reference code.

[Eric Dong]

UefiCpuLib inf file reference itself in [LibraryClasses]
section, this is not necessary. This patch remove it.

Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Ming Shao <ming.shao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Eric Dong <eric.dong@intel.com>
---
 UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf b/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
index b397ce0..ce5d3aa 100644
--- a/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
+++ b/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
@@ -3,7 +3,7 @@
 #
 #  The library routines are UEFI specification compliant.
 #
-#  Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
 #  which accompanies this distribution.  The full text of the license may be found at
@@ -42,7 +42,3 @@
 [Packages]
   MdePkg/MdePkg.dec
   UefiCpuPkg/UefiCpuPkg.dec
-
-[LibraryClasses]
-  UefiCpuLib
-
-- 
2.7.0.windows.1

Re: [Patch] UefiCpuPkg BaseUefiCpuLib: remove error reference code.

[Ni, Ruiyu]

How about changing title to "UefiCpuPkg/BaseUefiCpuLib.inf: Remove unnecessary library class"?

Thanks/Ray

> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
> Eric Dong
> Sent: Tuesday, August 15, 2017 1:32 PM
> To: edk2-devel@lists.01.org
> Cc: Ni, Ruiyu <ruiyu.ni@intel.com>; Shao, Ming <ming.shao@intel.com>
> Subject: [edk2] [Patch] UefiCpuPkg BaseUefiCpuLib: remove error reference
> code.
> 
> UefiCpuLib inf file reference itself in [LibraryClasses]
> section, this is not necessary. This patch remove it.
> 
> Cc: Ruiyu Ni <ruiyu.ni@intel.com>
> Cc: Ming Shao <ming.shao@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Eric Dong <eric.dong@intel.com>
> ---
>  UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
> b/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
> index b397ce0..ce5d3aa 100644
> --- a/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
> +++ b/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
> @@ -3,7 +3,7 @@
>  #
>  #  The library routines are UEFI specification compliant.
>  #
> -#  Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
> +#  Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>
>  #  This program and the accompanying materials
>  #  are licensed and made available under the terms and conditions of the
> BSD License
>  #  which accompanies this distribution.  The full text of the license may be
> found at
> @@ -42,7 +42,3 @@
>  [Packages]
>    MdePkg/MdePkg.dec
>    UefiCpuPkg/UefiCpuPkg.dec
> -
> -[LibraryClasses]
> -  UefiCpuLib
> -
> --
> 2.7.0.windows.1
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel

Re: [Patch] UefiCpuPkg BaseUefiCpuLib: remove error reference code.

[Dong, Eric]

Ok, I will update it when I push it.

-----Original Message-----
From: Ni, Ruiyu 
Sent: Wednesday, August 16, 2017 4:13 PM
To: Dong, Eric <eric.dong@intel.com>; edk2-devel@lists.01.org
Cc: Shao, Ming <ming.shao@intel.com>
Subject: RE: [edk2] [Patch] UefiCpuPkg BaseUefiCpuLib: remove error reference code.

How about changing title to "UefiCpuPkg/BaseUefiCpuLib.inf: Remove unnecessary library class"?

Thanks/Ray

> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of 
> Eric Dong
> Sent: Tuesday, August 15, 2017 1:32 PM
> To: edk2-devel@lists.01.org
> Cc: Ni, Ruiyu <ruiyu.ni@intel.com>; Shao, Ming <ming.shao@intel.com>
> Subject: [edk2] [Patch] UefiCpuPkg BaseUefiCpuLib: remove error 
> reference code.
> 
> UefiCpuLib inf file reference itself in [LibraryClasses] section, this 
> is not necessary. This patch remove it.
> 
> Cc: Ruiyu Ni <ruiyu.ni@intel.com>
> Cc: Ming Shao <ming.shao@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Eric Dong <eric.dong@intel.com>
> ---
>  UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
> b/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
> index b397ce0..ce5d3aa 100644
> --- a/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
> +++ b/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
> @@ -3,7 +3,7 @@
>  #
>  #  The library routines are UEFI specification compliant.
>  #
> -#  Copyright (c) 2009 - 2014, Intel Corporation. All rights 
> reserved.<BR>
> +#  Copyright (c) 2009 - 2017, Intel Corporation. All rights 
> +reserved.<BR>
>  #  This program and the accompanying materials  #  are licensed and 
> made available under the terms and conditions of the BSD License  #  
> which accompanies this distribution.  The full text of the license may 
> be found at @@ -42,7 +42,3 @@  [Packages]
>    MdePkg/MdePkg.dec
>    UefiCpuPkg/UefiCpuPkg.dec
> -
> -[LibraryClasses]
> -  UefiCpuLib
> -
> --
> 2.7.0.windows.1
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel

Re: [Patch] UefiCpuPkg RegisterCpuFeaturesLib: Enhance debug messages.

[Ni, Ruiyu]

Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>

Thanks/Ray

> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
> Eric Dong
> Sent: Tuesday, August 15, 2017 1:32 PM
> To: edk2-devel@lists.01.org
> Cc: Ni, Ruiyu <ruiyu.ni@intel.com>; Shao, Ming <ming.shao@intel.com>;
> Shao@ml01.01.org
> Subject: [edk2] [Patch] UefiCpuPkg RegisterCpuFeaturesLib: Enhance debug
> messages.
> 
> Current debug message when enable/disable CPU feature not correct. This
> patch enhances it to make it more accurate.
> 
> Cc: Ruiyu Ni <ruiyu.ni@intel.com>
> Cc: Shao, Ming <ming.shao@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Eric Dong <eric.dong@intel.com>
> ---
>  UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c | 8
> ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git
> a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c
> b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c
> index 54c9827..474aea3 100644
> --- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c
> +++ b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c
> @@ -528,9 +528,9 @@ AnalysisProcessorFeatures (
>            //
>            SupportedMaskCleanBit (CpuFeaturesData->SettingPcds,
> CpuFeatureInOrder->FeatureMask);
>            if (CpuFeatureInOrder->FeatureName != NULL) {
> -            DEBUG ((DEBUG_WARN, "Warning :: Failed to enable Feature Name
> = %a.\n", CpuFeatureInOrder->FeatureName));
> +            DEBUG ((DEBUG_WARN, "Warning :: Failed to enable Feature:
> + Name = %a.\n", CpuFeatureInOrder->FeatureName));
>            } else {
> -            DEBUG ((DEBUG_WARN, "Warning :: Failed to enable Feature Mask =
> "));
> +            DEBUG ((DEBUG_WARN, "Warning :: Failed to enable Feature:
> + Mask = "));
>              DumpCpuFeatureMask (CpuFeatureInOrder->FeatureMask);
>            }
>          }
> @@ -538,9 +538,9 @@ AnalysisProcessorFeatures (
>          Status = CpuFeatureInOrder->InitializeFunc (ProcessorNumber, CpuInfo,
> CpuFeatureInOrder->ConfigData, FALSE);
>          if (EFI_ERROR (Status)) {
>            if (CpuFeatureInOrder->FeatureName != NULL) {
> -            DEBUG ((DEBUG_WARN, "Warning :: Failed to enable Feature Name
> = %a.\n", CpuFeatureInOrder->FeatureName));
> +            DEBUG ((DEBUG_WARN, "Warning :: Failed to disable Feature:
> + Name = %a.\n", CpuFeatureInOrder->FeatureName));
>            } else {
> -            DEBUG ((DEBUG_WARN, "Warning :: Failed to enable Feature Mask =
> "));
> +            DEBUG ((DEBUG_WARN, "Warning :: Failed to disable Feature:
> + Mask = "));
>              DumpCpuFeatureMask (CpuFeatureInOrder->FeatureMask);
>            }
>          }
> --
> 2.7.0.windows.1
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel