2024-03-18 10:13:56

by Yuan, Perry

Subject: [PATCH v6 1/6] cpufreq: acpi: move MSR_K7_HWCR_CPB_DIS_BIT into msr-index.h

There are some other drivers also need to use the
MSR_K7_HWCR_CPB_DIS_BIT for CPB control bit, so it makes sense to move
the definition to a common header file to allow other driver to use it.

No intentional functional impact.

Suggested-by: Gautham Ranjal Shenoy <[email protected]>
Signed-off-by: Perry Yuan <[email protected]>
---
arch/x86/include/asm/msr-index.h | 2 ++
drivers/cpufreq/acpi-cpufreq.c | 2 --
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h
index 05956bd8bacf..41503647192e 100644
--- a/arch/x86/include/asm/msr-index.h
+++ b/arch/x86/include/asm/msr-index.h
@@ -775,6 +775,8 @@
#define MSR_K7_HWCR_IRPERF_EN BIT_ULL(MSR_K7_HWCR_IRPERF_EN_BIT)
#define MSR_K7_FID_VID_CTL 0xc0010041
#define MSR_K7_FID_VID_STATUS 0xc0010042
+#define MSR_K7_HWCR_CPB_DIS_BIT 25
+#define MSR_K7_HWCR_CPB_DIS BIT_ULL(MSR_K7_HWCR_CPB_DIS_BIT)

/* K6 MSRs */
#define MSR_K6_WHCR 0xc0000082
diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
index 37f1cdf46d29..2fc82831bddd 100644
--- a/drivers/cpufreq/acpi-cpufreq.c
+++ b/drivers/cpufreq/acpi-cpufreq.c
@@ -50,8 +50,6 @@ enum {
#define AMD_MSR_RANGE (0x7)
#define HYGON_MSR_RANGE (0x7)

-#define MSR_K7_HWCR_CPB_DIS (1ULL << 25)
-
struct acpi_cpufreq_data {
unsigned int resume;
unsigned int cpu_feature;
--
2.34.1

2024-03-18 12:43:53

by Rafael J. Wysocki

Subject: Re: [PATCH v6 1/6] cpufreq: acpi: move MSR_K7_HWCR_CPB_DIS_BIT into msr-index.h

On Mon, Mar 18, 2024 at 11:12 AM Perry Yuan <[email protected]> wrote:
>
> There are some other drivers also need to use the
> MSR_K7_HWCR_CPB_DIS_BIT for CPB control bit, so it makes sense to move
> the definition to a common header file to allow other driver to use it.
>
> No intentional functional impact.
>
> Suggested-by: Gautham Ranjal Shenoy <[email protected]>
> Signed-off-by: Perry Yuan <[email protected]>

This change is fine with me, so

Acked-by: Rafael J. Wysocki <[email protected]>

> ---
> arch/x86/include/asm/msr-index.h | 2 ++
> drivers/cpufreq/acpi-cpufreq.c | 2 --
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h
> index 05956bd8bacf..41503647192e 100644
> --- a/arch/x86/include/asm/msr-index.h
> +++ b/arch/x86/include/asm/msr-index.h
> @@ -775,6 +775,8 @@
> #define MSR_K7_HWCR_IRPERF_EN BIT_ULL(MSR_K7_HWCR_IRPERF_EN_BIT)
> #define MSR_K7_FID_VID_CTL 0xc0010041
> #define MSR_K7_FID_VID_STATUS 0xc0010042
> +#define MSR_K7_HWCR_CPB_DIS_BIT 25
> +#define MSR_K7_HWCR_CPB_DIS BIT_ULL(MSR_K7_HWCR_CPB_DIS_BIT)
>
> /* K6 MSRs */
> #define MSR_K6_WHCR 0xc0000082
> diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
> index 37f1cdf46d29..2fc82831bddd 100644
> --- a/drivers/cpufreq/acpi-cpufreq.c
> +++ b/drivers/cpufreq/acpi-cpufreq.c
> @@ -50,8 +50,6 @@ enum {
> #define AMD_MSR_RANGE (0x7)
> #define HYGON_MSR_RANGE (0x7)
>
> -#define MSR_K7_HWCR_CPB_DIS (1ULL << 25)
> -
> struct acpi_cpufreq_data {
> unsigned int resume;
> unsigned int cpu_feature;
> --
> 2.34.1
>
>

2024-03-21 02:25:56

by Yuan, Perry

Subject: RE: [PATCH v6 1/6] cpufreq: acpi: move MSR_K7_HWCR_CPB_DIS_BIT into msr-index.h

[AMD Official Use Only - General]

Hi Rafael,

> -----Original Message-----
> From: Rafael J. Wysocki <[email protected]>
> Sent: Monday, March 18, 2024 8:43 PM
> To: Yuan, Perry <[email protected]>
> Cc: [email protected]; Limonciello, Mario
> <[email protected]>; [email protected]; Huang, Ray
> <[email protected]>; Shenoy, Gautham Ranjal
> <[email protected]>; Petkov, Borislav <[email protected]>;
> Deucher, Alexander <[email protected]>; Huang, Shimmer
> <[email protected]>; [email protected]; Du, Xiaojian
> <[email protected]>; Meng, Li (Jassmine) <[email protected]>; linux-
> [email protected]; [email protected]
> Subject: Re: [PATCH v6 1/6] cpufreq: acpi: move
> MSR_K7_HWCR_CPB_DIS_BIT into msr-index.h
>
> On Mon, Mar 18, 2024 at 11:12 AM Perry Yuan <[email protected]>
> wrote:
> >
> > There are some other drivers also need to use the
> > MSR_K7_HWCR_CPB_DIS_BIT for CPB control bit, so it makes sense to move
> > the definition to a common header file to allow other driver to use it.
> >
> > No intentional functional impact.
> >
> > Suggested-by: Gautham Ranjal Shenoy <[email protected]>
> > Signed-off-by: Perry Yuan <[email protected]>
>
> This change is fine with me, so
>
> Acked-by: Rafael J. Wysocki <[email protected]>

Thank you help to ack the change,
Will pick tag in next version.

Perry.

>
> > ---
> > arch/x86/include/asm/msr-index.h | 2 ++
> > drivers/cpufreq/acpi-cpufreq.c | 2 --
> > 2 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/arch/x86/include/asm/msr-index.h
> > b/arch/x86/include/asm/msr-index.h
> > index 05956bd8bacf..41503647192e 100644
> > --- a/arch/x86/include/asm/msr-index.h
> > +++ b/arch/x86/include/asm/msr-index.h
> > @@ -775,6 +775,8 @@
> > #define MSR_K7_HWCR_IRPERF_EN
> BIT_ULL(MSR_K7_HWCR_IRPERF_EN_BIT)
> > #define MSR_K7_FID_VID_CTL 0xc0010041
> > #define MSR_K7_FID_VID_STATUS 0xc0010042
> > +#define MSR_K7_HWCR_CPB_DIS_BIT 25
> > +#define MSR_K7_HWCR_CPB_DIS
> BIT_ULL(MSR_K7_HWCR_CPB_DIS_BIT)
> >
> > /* K6 MSRs */
> > #define MSR_K6_WHCR 0xc0000082
> > diff --git a/drivers/cpufreq/acpi-cpufreq.c
> > b/drivers/cpufreq/acpi-cpufreq.c index 37f1cdf46d29..2fc82831bddd
> > 100644
> > --- a/drivers/cpufreq/acpi-cpufreq.c
> > +++ b/drivers/cpufreq/acpi-cpufreq.c
> > @@ -50,8 +50,6 @@ enum {
> > #define AMD_MSR_RANGE (0x7)
> > #define HYGON_MSR_RANGE (0x7)
> >
> > -#define MSR_K7_HWCR_CPB_DIS (1ULL << 25)
> > -
> > struct acpi_cpufreq_data {
> > unsigned int resume;
> > unsigned int cpu_feature;
> > --
> > 2.34.1
> >
> >