Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Mon, 5 Dec 2022 19:48:59 +0800
From:   Huang Rui <ray.huang@amd.com>
To:     "Yuan, Perry" <Perry.Yuan@amd.com>
Cc:     "rafael.j.wysocki@intel.com" <rafael.j.wysocki@intel.com>,
        "Limonciello, Mario" <Mario.Limonciello@amd.com>,
        "viresh.kumar@linaro.org" <viresh.kumar@linaro.org>,
        "Sharma, Deepak" <Deepak.Sharma@amd.com>,
        "Fontenot, Nathan" <Nathan.Fontenot@amd.com>,
        "Deucher, Alexander" <Alexander.Deucher@amd.com>,
        "Huang, Shimmer" <Shimmer.Huang@amd.com>,
        "Du, Xiaojian" <Xiaojian.Du@amd.com>,
        "Meng, Li (Jassmine)" <Li.Meng@amd.com>,
        "Karny, Wyes" <Wyes.Karny@amd.com>,
        "linux-pm@vger.kernel.org" <linux-pm@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v6 03/11] cpufreq: intel_pstate: use common macro
 definition for Energy Preference Performance(EPP)
Message-ID: <Y43aq2gMKnFRIhxh@amd.com>
References: <20221202074719.623673-1-perry.yuan@amd.com>
 <20221202074719.623673-4-perry.yuan@amd.com>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20221202074719.623673-4-perry.yuan@amd.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?P8rwafKwzQ4LlaF9UgmyypNOPuanSOF9IGjur3y1f5mg84uAFqpsiYmwxaXq?=
 =?us-ascii?Q?iHn8H9s6fx0hIDuK3ZkEiZO/OJIaHVXqlNM7VB9mWA2CeHTeaizFCD3T2Ni+?=
 =?us-ascii?Q?TvDs1ZDXznDFyjqcXFLIomoUrpAEasGBTId1y/5EThEvghfiJ8ShInVmTbuZ?=
 =?us-ascii?Q?N/wUBQ7HXEp+gQOvByfe9Tlw0XmLFS2VwrsrXKtXCkIWjD7iJcM7qtQnZ/ch?=
 =?us-ascii?Q?CeQup9II8OcOxeuUu01Gtpzbf3jFSAVDDHcXQFfUp8q8lxIUH6pla21ss3TE?=
 =?us-ascii?Q?MIJuAzl+wI7/vaQmstNw7iQcUuoru/VX2pqz5B01tQMf1dKfbSHMo7bJhMHH?=
 =?us-ascii?Q?PjffeJCmz7pPcfBUYGEJRamCzOyhzjGRE3EfKP4N8Pap899/3C7dRE2MHpJB?=
 =?us-ascii?Q?0SsAwTN88JJKlfLNQ3LR23mRHqkOwQ/EOUUWG3IgbxRbOo1O0xJHoV4zgKri?=
 =?us-ascii?Q?OgevYUlPjx0DKgSGKp8hWhFxLHUKnr7c1iJJAyWCQr8MUrBzc4V/mpM0cZgy?=
 =?us-ascii?Q?xt9bzj1Hl6Ph/J/0736mxLbMDLQ0lfsnL5YakVgPs/YU7WCtyW1p/EQZoGB6?=
 =?us-ascii?Q?k0+9WZNvz8wKuIgVzwqFCh9VamHNRzZnp+A9ZOILcWNNK9hMwyAS2qQRvyeK?=
 =?us-ascii?Q?2vPwo5Hzvz7z1zTJlFuhbV+XiyjUkE0VA3iSCBUb72tQiWjE7L5TYLftPTeq?=
 =?us-ascii?Q?Lq4EhdSDYtdsTGa5DvNx7T3QyWNxvXg1EDZj8afZ5WtF1epp4ywzDOraaT+R?=
 =?us-ascii?Q?TieygGGclyf4Bzfq+Rp/Kgscl93Q2YYib+UEB5bTudEMw8u2AUJxdUkXrDFB?=
 =?us-ascii?Q?+VvMJ6QanSHRldnRIIgF9/3SPyvAsAV+B12KuWYEO4UII2eG6+9/0+9XWe6o?=
 =?us-ascii?Q?0JW9pNW9DZDz3ufKUDQONpi2Rb4uzClUfawRcOoklo5DrmT4IzlAeZqb48v6?=
 =?us-ascii?Q?lMcg81XcanbwW2QLwB95ix3R4rq1MeTobjAROw+0k+JWYNXGbEjldsi8T2ql?=
 =?us-ascii?Q?++NbXsL02kBldM+DKLWvNnGSuO/5l82C8nYfFYdRlNnVvw84YqKz6PrHfzYy?=
 =?us-ascii?Q?r9xLICEBbu8sG8LCNBlda90tBY0npA376BJmDBgndI9zKkBbCLL7tSzbK3a1?=
 =?us-ascii?Q?gpiDOI6jivtM42D3mJUwhgzLkn5cIow+4AYBNBAtSQsMG4Z0ulzLfjGxcd+y?=
 =?us-ascii?Q?X3EVINY4D57YbRg9c5F5o6hgwlwBEYSIF5M1ZifhPSm8Q8uDm29sVVE1OoAm?=
 =?us-ascii?Q?S02TWi34a3GKfEv53plufyV5LLbUCEen03zP13LH6Up+hoigbFcM31qmhCvs?=
 =?us-ascii?Q?uR3VvfawyIEyqzti3VNeIn9xmFFBlnyGLcANq4oiADgRIPi7IQvNhPX4RZYS?=
 =?us-ascii?Q?KVHrQK+ioADkXg6cdPZ3Foe5oQe8yZ5E3uMwvUCoLpC/QiW/xSEY5xt1suIf?=
 =?us-ascii?Q?rXKBxthjLMHWIFpqCDRQcS6xVcEivkw47AUG83u4XbHIR2cBdqMouMTZEA/s?=
 =?us-ascii?Q?Bja8D+SezMdJZf7BLtrnqalpoZ1kBEUvtR+IMDW4g7LZFpblxMgWvb3WGEG+?=
 =?us-ascii?Q?ISy6YwUxtAynqeH9yuTMMyOPbLkXGzjtEeQ8fIXh?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 09bc2913-1f37-4bf0-81b9-08dad6b6c052
X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB2504.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Dec 2022 11:49:22.6933
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: aW1pbxr32jj5ljrEMdjskzjaVU43z5Gv/AP1AG0LcPZBemiWjCHX4fnulYJfVsFo/7txFmoHu8eXSnfsrCefaQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB7103
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Fri, Dec 02, 2022 at 03:47:11PM +0800, Yuan, Perry wrote:
> make the energy preference performance strings and profiles using one
> common header for intel_pstate driver, then the amd_pstate epp driver can
> use the common header as well. This will simpify the intel_pstate and
> amd_pstate driver.
> 
> Signed-off-by: Perry Yuan <perry.yuan@amd.com>
> ---
>  arch/x86/include/asm/msr-index.h |  4 ---
>  drivers/cpufreq/intel_pstate.c   | 37 +--------------------
>  include/linux/cpufreq_common.h   | 56 ++++++++++++++++++++++++++++++++

I don't find any specific reason why you have to use another common
cpufreq_common header instead of include/linux/cpufreq.h.

Thanks,
Ray

>  3 files changed, 57 insertions(+), 40 deletions(-)
>  create mode 100644 include/linux/cpufreq_common.h
> 
> diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h
> index 4a2af82553e4..3983378cff5b 100644
> --- a/arch/x86/include/asm/msr-index.h
> +++ b/arch/x86/include/asm/msr-index.h
> @@ -472,10 +472,6 @@
>  #define HWP_MAX_PERF(x) 		((x & 0xff) << 8)
>  #define HWP_DESIRED_PERF(x)		((x & 0xff) << 16)
>  #define HWP_ENERGY_PERF_PREFERENCE(x)	(((unsigned long long) x & 0xff) << 24)
> -#define HWP_EPP_PERFORMANCE		0x00
> -#define HWP_EPP_BALANCE_PERFORMANCE	0x80
> -#define HWP_EPP_BALANCE_POWERSAVE	0xC0
> -#define HWP_EPP_POWERSAVE		0xFF
>  #define HWP_ACTIVITY_WINDOW(x)		((unsigned long long)(x & 0xff3) << 32)
>  #define HWP_PACKAGE_CONTROL(x)		((unsigned long long)(x & 0x1) << 42)
>  
> diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
> index ad9be31753b6..65036ca21719 100644
> --- a/drivers/cpufreq/intel_pstate.c
> +++ b/drivers/cpufreq/intel_pstate.c
> @@ -25,6 +25,7 @@
>  #include <linux/acpi.h>
>  #include <linux/vmalloc.h>
>  #include <linux/pm_qos.h>
> +#include <linux/cpufreq_common.h>
>  #include <trace/events/power.h>
>  
>  #include <asm/cpu.h>
> @@ -628,42 +629,6 @@ static int intel_pstate_set_epb(int cpu, s16 pref)
>  	return 0;
>  }
>  
> -/*
> - * EPP/EPB display strings corresponding to EPP index in the
> - * energy_perf_strings[]
> - *	index		String
> - *-------------------------------------
> - *	0		default
> - *	1		performance
> - *	2		balance_performance
> - *	3		balance_power
> - *	4		power
> - */
> -
> -enum energy_perf_value_index {
> -	EPP_INDEX_DEFAULT = 0,
> -	EPP_INDEX_PERFORMANCE,
> -	EPP_INDEX_BALANCE_PERFORMANCE,
> -	EPP_INDEX_BALANCE_POWERSAVE,
> -	EPP_INDEX_POWERSAVE,
> -};
> -
> -static const char * const energy_perf_strings[] = {
> -	[EPP_INDEX_DEFAULT] = "default",
> -	[EPP_INDEX_PERFORMANCE] = "performance",
> -	[EPP_INDEX_BALANCE_PERFORMANCE] = "balance_performance",
> -	[EPP_INDEX_BALANCE_POWERSAVE] = "balance_power",
> -	[EPP_INDEX_POWERSAVE] = "power",
> -	NULL
> -};
> -static unsigned int epp_values[] = {
> -	[EPP_INDEX_DEFAULT] = 0, /* Unused index */
> -	[EPP_INDEX_PERFORMANCE] = HWP_EPP_PERFORMANCE,
> -	[EPP_INDEX_BALANCE_PERFORMANCE] = HWP_EPP_BALANCE_PERFORMANCE,
> -	[EPP_INDEX_BALANCE_POWERSAVE] = HWP_EPP_BALANCE_POWERSAVE,
> -	[EPP_INDEX_POWERSAVE] = HWP_EPP_POWERSAVE,
> -};
> -
>  static int intel_pstate_get_energy_pref_index(struct cpudata *cpu_data, int *raw_epp)
>  {
>  	s16 epp;
> diff --git a/include/linux/cpufreq_common.h b/include/linux/cpufreq_common.h
> new file mode 100644
> index 000000000000..2d14b0b0f55c
> --- /dev/null
> +++ b/include/linux/cpufreq_common.h
> @@ -0,0 +1,56 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> +/*
> + * linux/include/linux/cpufreq_common.h
> + *
> + * Copyright (C) 2022 Advanced Micro Devices, Inc.
> + *
> + * Author: Perry Yuan <Perry.Yuan@amd.com>
> + */
> +
> +#ifndef _LINUX_CPUFREQ_COMMON_H
> +#define _LINUX_CPUFREQ_COMMON_H
> +
> +#include <asm/msr.h>
> +/*
> + * EPP/EPB display strings corresponding to EPP index in the
> + * energy_perf_strings[]
> + *	index		String
> + *-------------------------------------
> + *	0		default
> + *	1		performance
> + *	2		balance_performance
> + *	3		balance_power
> + *	4		power
> + */
> +
> +#define HWP_EPP_PERFORMANCE		0x00
> +#define HWP_EPP_BALANCE_PERFORMANCE	0x80
> +#define HWP_EPP_BALANCE_POWERSAVE	0xC0
> +#define HWP_EPP_POWERSAVE		0xFF
> +
> +enum energy_perf_value_index {
> +	EPP_INDEX_DEFAULT = 0,
> +	EPP_INDEX_PERFORMANCE,
> +	EPP_INDEX_BALANCE_PERFORMANCE,
> +	EPP_INDEX_BALANCE_POWERSAVE,
> +	EPP_INDEX_POWERSAVE,
> +};
> +
> +static const char * const energy_perf_strings[] = {
> +	[EPP_INDEX_DEFAULT] = "default",
> +	[EPP_INDEX_PERFORMANCE] = "performance",
> +	[EPP_INDEX_BALANCE_PERFORMANCE] = "balance_performance",
> +	[EPP_INDEX_BALANCE_POWERSAVE] = "balance_power",
> +	[EPP_INDEX_POWERSAVE] = "power",
> +	NULL
> +};
> +
> +static unsigned int epp_values[] = {
> +	[EPP_INDEX_DEFAULT] = 0, /* Unused index */
> +	[EPP_INDEX_PERFORMANCE] = HWP_EPP_PERFORMANCE,
> +	[EPP_INDEX_BALANCE_PERFORMANCE] = HWP_EPP_BALANCE_PERFORMANCE,
> +	[EPP_INDEX_BALANCE_POWERSAVE] = HWP_EPP_BALANCE_POWERSAVE,
> +	[EPP_INDEX_POWERSAVE] = HWP_EPP_POWERSAVE,
> +};
> +
> +#endif /* _LINUX_CPUFREQ_COMMON_H */
> \ No newline at end of file
> -- 
> 2.34.1
>