* [PATCH] UefiCpuPkg: Keep library class header file definition independent
@ 2017-12-14 8:31 Song, BinX
2017-12-15 5:02 ` Ni, Ruiyu
0 siblings, 1 reply; 4+ messages in thread
From: Song, BinX @ 2017-12-14 8:31 UTC (permalink / raw)
To: edk2-devel@lists.01.org; +Cc: Dong, Eric, lersek@redhat.com
Keep library class header file definition independent
Cc: Eric Dong <eric.dong@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Bell Song <binx.song@intel.com>
---
UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h | 7 +++----
UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c | 7 ++-----
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h b/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h
index fc3ccda..9582ad8 100644
--- a/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h
+++ b/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h
@@ -71,12 +71,11 @@
#define CPU_FEATURE_APIC_TPR_UPDATE_MESSAGE (32+9)
#define CPU_FEATURE_ENERGY_PERFORMANCE_BIAS (32+10)
#define CPU_FEATURE_PPIN (32+11)
+#define CPU_FEATURE_PROC_TRACE (32+12)
//
-// Currently, CPU_FEATURE_PROC_TRACE is the MAX feature we support.
-// If you define a feature bigger than it, please also replace it
-// in RegisterCpuFeatureLibIsFeatureValid function.
+// Please keep CPU_FEATURE_MAX as the max CPU feature
//
-#define CPU_FEATURE_PROC_TRACE (32+12)
+#define CPU_FEATURE_MAX (32+12)
#define CPU_FEATURE_BEFORE_ALL BIT27
#define CPU_FEATURE_AFTER_ALL BIT28
diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c
index 6ec26e1..911f4d0 100644
--- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c
+++ b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c
@@ -97,11 +97,8 @@ RegisterCpuFeatureLibIsFeatureValid (
Data = Feature;
Data &= ~(CPU_FEATURE_BEFORE | CPU_FEATURE_AFTER | CPU_FEATURE_BEFORE_ALL | CPU_FEATURE_AFTER_ALL);
- //
- // Currently, CPU_FEATURE_PROC_TRACE is the MAX feature we support.
- // If you define a feature bigger than it, please replace it at below.
- //
- if (Data > CPU_FEATURE_PROC_TRACE) {
+
+ if (Data > CPU_FEATURE_MAX) {
DEBUG ((DEBUG_ERROR, "Invalid CPU feature: 0x%x ", Feature));
return FALSE;
}
--
2.10.2.windows.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] UefiCpuPkg: Keep library class header file definition independent
2017-12-14 8:31 [PATCH] UefiCpuPkg: Keep library class header file definition independent Song, BinX
@ 2017-12-15 5:02 ` Ni, Ruiyu
2017-12-15 17:33 ` Kinney, Michael D
0 siblings, 1 reply; 4+ messages in thread
From: Ni, Ruiyu @ 2017-12-15 5:02 UTC (permalink / raw)
To: Song, BinX, edk2-devel@lists.01.org; +Cc: lersek@redhat.com, Dong, Eric
On 12/14/2017 4:31 PM, Song, BinX wrote:
> Keep library class header file definition independent
>
> Cc: Eric Dong <eric.dong@intel.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Bell Song <binx.song@intel.com>
> ---
> UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h | 7 +++----
> UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c | 7 ++-----
> 2 files changed, 5 insertions(+), 9 deletions(-)
>
> diff --git a/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h b/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h
> index fc3ccda..9582ad8 100644
> --- a/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h
> +++ b/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h
> @@ -71,12 +71,11 @@
> #define CPU_FEATURE_APIC_TPR_UPDATE_MESSAGE (32+9)
> #define CPU_FEATURE_ENERGY_PERFORMANCE_BIAS (32+10)
> #define CPU_FEATURE_PPIN (32+11)
> +#define CPU_FEATURE_PROC_TRACE (32+12)
> //
> -// Currently, CPU_FEATURE_PROC_TRACE is the MAX feature we support.
> -// If you define a feature bigger than it, please also replace it
> -// in RegisterCpuFeatureLibIsFeatureValid function.
> +// Please keep CPU_FEATURE_MAX as the max CPU feature
> //
> -#define CPU_FEATURE_PROC_TRACE (32+12)
> +#define CPU_FEATURE_MAX (32+12)
I think we need to define this CPU_FEATURE_MAX in
RegisterCpuFeaturesLib.c.
Thinking about another instance of RegisterCpuFeatureLib
that only supports features up to (32+9).
The MAX will be 32+9 for that instance.
The library class header only defines the features and
corresponding ID (32+xx).
Library instance chooses which features to support.
>
> #define CPU_FEATURE_BEFORE_ALL BIT27
> #define CPU_FEATURE_AFTER_ALL BIT28
> diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c
> index 6ec26e1..911f4d0 100644
> --- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c
> +++ b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c
> @@ -97,11 +97,8 @@ RegisterCpuFeatureLibIsFeatureValid (
>
> Data = Feature;
> Data &= ~(CPU_FEATURE_BEFORE | CPU_FEATURE_AFTER | CPU_FEATURE_BEFORE_ALL | CPU_FEATURE_AFTER_ALL);
> - //
> - // Currently, CPU_FEATURE_PROC_TRACE is the MAX feature we support.
> - // If you define a feature bigger than it, please replace it at below.
> - //
> - if (Data > CPU_FEATURE_PROC_TRACE) {
> +
> + if (Data > CPU_FEATURE_MAX) {
> DEBUG ((DEBUG_ERROR, "Invalid CPU feature: 0x%x ", Feature));
> return FALSE;
> }
>
--
Thanks,
Ray
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] UefiCpuPkg: Keep library class header file definition independent
2017-12-15 5:02 ` Ni, Ruiyu
@ 2017-12-15 17:33 ` Kinney, Michael D
2017-12-18 5:17 ` Song, BinX
0 siblings, 1 reply; 4+ messages in thread
From: Kinney, Michael D @ 2017-12-15 17:33 UTC (permalink / raw)
To: Ni, Ruiyu, Song, BinX, edk2-devel@lists.01.org, Kinney, Michael D
Cc: lersek@redhat.com, Dong, Eric
Ray,
I agree. The max should not be in the lib class
header file.
Mike
> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-
> bounces@lists.01.org] On Behalf Of Ni, Ruiyu
> Sent: Thursday, December 14, 2017 9:02 PM
> To: Song, BinX <binx.song@intel.com>; edk2-
> devel@lists.01.org
> Cc: lersek@redhat.com; Dong, Eric <eric.dong@intel.com>
> Subject: Re: [edk2] [PATCH] UefiCpuPkg: Keep library
> class header file definition independent
>
> On 12/14/2017 4:31 PM, Song, BinX wrote:
> > Keep library class header file definition independent
> >
> > Cc: Eric Dong <eric.dong@intel.com>
> > Cc: Laszlo Ersek <lersek@redhat.com>
> > Contributed-under: TianoCore Contribution Agreement
> 1.1
> > Signed-off-by: Bell Song <binx.song@intel.com>
> > ---
> > UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h
> | 7 +++----
> >
> UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFe
> aturesLib.c | 7 ++-----
> > 2 files changed, 5 insertions(+), 9 deletions(-)
> >
> > diff --git
> a/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h
> b/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h
> > index fc3ccda..9582ad8 100644
> > ---
> a/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h
> > +++
> b/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h
> > @@ -71,12 +71,11 @@
> > #define CPU_FEATURE_APIC_TPR_UPDATE_MESSAGE
> (32+9)
> > #define CPU_FEATURE_ENERGY_PERFORMANCE_BIAS
> (32+10)
> > #define CPU_FEATURE_PPIN
> (32+11)
> > +#define CPU_FEATURE_PROC_TRACE
> (32+12)
> > //
> > -// Currently, CPU_FEATURE_PROC_TRACE is the MAX
> feature we support.
> > -// If you define a feature bigger than it, please
> also replace it
> > -// in RegisterCpuFeatureLibIsFeatureValid function.
> > +// Please keep CPU_FEATURE_MAX as the max CPU
> feature
> > //
> > -#define CPU_FEATURE_PROC_TRACE
> (32+12)
> > +#define CPU_FEATURE_MAX
> (32+12)
> I think we need to define this CPU_FEATURE_MAX in
> RegisterCpuFeaturesLib.c.
>
> Thinking about another instance of
> RegisterCpuFeatureLib
> that only supports features up to (32+9).
> The MAX will be 32+9 for that instance.
> The library class header only defines the features and
> corresponding ID (32+xx).
> Library instance chooses which features to support.
>
> >
> > #define CPU_FEATURE_BEFORE_ALL
> BIT27
> > #define CPU_FEATURE_AFTER_ALL
> BIT28
> > diff --git
> a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpu
> FeaturesLib.c
> b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpu
> FeaturesLib.c
> > index 6ec26e1..911f4d0 100644
> > ---
> a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpu
> FeaturesLib.c
> > +++
> b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpu
> FeaturesLib.c
> > @@ -97,11 +97,8 @@
> RegisterCpuFeatureLibIsFeatureValid (
> >
> > Data = Feature;
> > Data &= ~(CPU_FEATURE_BEFORE | CPU_FEATURE_AFTER
> | CPU_FEATURE_BEFORE_ALL | CPU_FEATURE_AFTER_ALL);
> > - //
> > - // Currently, CPU_FEATURE_PROC_TRACE is the MAX
> feature we support.
> > - // If you define a feature bigger than it, please
> replace it at below.
> > - //
> > - if (Data > CPU_FEATURE_PROC_TRACE) {
> > +
> > + if (Data > CPU_FEATURE_MAX) {
> > DEBUG ((DEBUG_ERROR, "Invalid CPU feature: 0x%x
> ", Feature));
> > return FALSE;
> > }
> >
>
>
> --
> Thanks,
> Ray
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] UefiCpuPkg: Keep library class header file definition independent
2017-12-15 17:33 ` Kinney, Michael D
@ 2017-12-18 5:17 ` Song, BinX
0 siblings, 0 replies; 4+ messages in thread
From: Song, BinX @ 2017-12-18 5:17 UTC (permalink / raw)
To: Kinney, Michael D, Ni, Ruiyu, edk2-devel@lists.01.org
Cc: lersek@redhat.com, Dong, Eric
Hi Ray & Mike,
Thanks for your suggestion, I will update a V2 patch.
Best Regards,
Bell Song
> -----Original Message-----
> From: Kinney, Michael D
> Sent: Saturday, December 16, 2017 1:34 AM
> To: Ni, Ruiyu <ruiyu.ni@intel.com>; Song, BinX <binx.song@intel.com>;
> edk2-devel@lists.01.org; Kinney, Michael D <michael.d.kinney@intel.com>
> Cc: lersek@redhat.com; Dong, Eric <eric.dong@intel.com>
> Subject: RE: [edk2] [PATCH] UefiCpuPkg: Keep library class header file
> definition independent
>
> Ray,
>
> I agree. The max should not be in the lib class
> header file.
>
> Mike
>
> > -----Original Message-----
> > From: edk2-devel [mailto:edk2-devel-
> > bounces@lists.01.org] On Behalf Of Ni, Ruiyu
> > Sent: Thursday, December 14, 2017 9:02 PM
> > To: Song, BinX <binx.song@intel.com>; edk2-
> > devel@lists.01.org
> > Cc: lersek@redhat.com; Dong, Eric <eric.dong@intel.com>
> > Subject: Re: [edk2] [PATCH] UefiCpuPkg: Keep library
> > class header file definition independent
> >
> > On 12/14/2017 4:31 PM, Song, BinX wrote:
> > > Keep library class header file definition independent
> > >
> > > Cc: Eric Dong <eric.dong@intel.com>
> > > Cc: Laszlo Ersek <lersek@redhat.com>
> > > Contributed-under: TianoCore Contribution Agreement
> > 1.1
> > > Signed-off-by: Bell Song <binx.song@intel.com>
> > > ---
> > > UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h
> > | 7 +++----
> > >
> > UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFe
> > aturesLib.c | 7 ++-----
> > > 2 files changed, 5 insertions(+), 9 deletions(-)
> > >
> > > diff --git
> > a/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h
> > b/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h
> > > index fc3ccda..9582ad8 100644
> > > ---
> > a/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h
> > > +++
> > b/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h
> > > @@ -71,12 +71,11 @@
> > > #define CPU_FEATURE_APIC_TPR_UPDATE_MESSAGE
> > (32+9)
> > > #define CPU_FEATURE_ENERGY_PERFORMANCE_BIAS
> > (32+10)
> > > #define CPU_FEATURE_PPIN
> > (32+11)
> > > +#define CPU_FEATURE_PROC_TRACE
> > (32+12)
> > > //
> > > -// Currently, CPU_FEATURE_PROC_TRACE is the MAX
> > feature we support.
> > > -// If you define a feature bigger than it, please
> > also replace it
> > > -// in RegisterCpuFeatureLibIsFeatureValid function.
> > > +// Please keep CPU_FEATURE_MAX as the max CPU
> > feature
> > > //
> > > -#define CPU_FEATURE_PROC_TRACE
> > (32+12)
> > > +#define CPU_FEATURE_MAX
> > (32+12)
> > I think we need to define this CPU_FEATURE_MAX in
> > RegisterCpuFeaturesLib.c.
> >
> > Thinking about another instance of
> > RegisterCpuFeatureLib
> > that only supports features up to (32+9).
> > The MAX will be 32+9 for that instance.
> > The library class header only defines the features and
> > corresponding ID (32+xx).
> > Library instance chooses which features to support.
> >
> > >
> > > #define CPU_FEATURE_BEFORE_ALL
> > BIT27
> > > #define CPU_FEATURE_AFTER_ALL
> > BIT28
> > > diff --git
> > a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpu
> > FeaturesLib.c
> > b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpu
> > FeaturesLib.c
> > > index 6ec26e1..911f4d0 100644
> > > ---
> > a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpu
> > FeaturesLib.c
> > > +++
> > b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpu
> > FeaturesLib.c
> > > @@ -97,11 +97,8 @@
> > RegisterCpuFeatureLibIsFeatureValid (
> > >
> > > Data = Feature;
> > > Data &= ~(CPU_FEATURE_BEFORE | CPU_FEATURE_AFTER
> > | CPU_FEATURE_BEFORE_ALL | CPU_FEATURE_AFTER_ALL);
> > > - //
> > > - // Currently, CPU_FEATURE_PROC_TRACE is the MAX
> > feature we support.
> > > - // If you define a feature bigger than it, please
> > replace it at below.
> > > - //
> > > - if (Data > CPU_FEATURE_PROC_TRACE) {
> > > +
> > > + if (Data > CPU_FEATURE_MAX) {
> > > DEBUG ((DEBUG_ERROR, "Invalid CPU feature: 0x%x
> > ", Feature));
> > > return FALSE;
> > > }
> > >
> >
> >
> > --
> > Thanks,
> > Ray
> > _______________________________________________
> > edk2-devel mailing list
> > edk2-devel@lists.01.org
> > https://lists.01.org/mailman/listinfo/edk2-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-12-18 5:12 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-14 8:31 [PATCH] UefiCpuPkg: Keep library class header file definition independent Song, BinX
2017-12-15 5:02 ` Ni, Ruiyu
2017-12-15 17:33 ` Kinney, Michael D
2017-12-18 5:17 ` Song, BinX
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox