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;
Message-ID: <59f451af-56a9-5c89-7c59-321850114df7@amd.com>
Date:   Mon, 19 Dec 2022 17:01:58 -0600
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101
 Thunderbird/102.6.0
Subject: Re: [PATCH v8 05/13] cpufreq: amd-pstate: optimize driver working
 mode selection in amd_pstate_param()
Content-Language: en-US
To:     Perry Yuan <perry.yuan@amd.com>, rafael.j.wysocki@intel.com,
        ray.huang@amd.com, viresh.kumar@linaro.org
Cc:     Deepak.Sharma@amd.com, Nathan.Fontenot@amd.com,
        Alexander.Deucher@amd.com, Shimmer.Huang@amd.com,
        Xiaojian.Du@amd.com, Li.Meng@amd.com, wyes.karny@amd.com,
        linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org
References: <20221219064042.661122-1-perry.yuan@amd.com>
 <20221219064042.661122-6-perry.yuan@amd.com>
From:   "Limonciello, Mario" <mario.limonciello@amd.com>
In-Reply-To: <20221219064042.661122-6-perry.yuan@amd.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?SjVyS0VMWmxMTjBYTlk1VkVqejlIcDJySGNWbDlwdkdHd0U3N0J4M2dSNUUz?=
 =?utf-8?B?SWgyK2NYNU5KV2JBUHVqbU9GZkE1a1NPeUZPODhlcW1kaXI5NTBlaGtZdWxG?=
 =?utf-8?B?MDFtYkFEOEVvcnlNc2Q2NzhMZWV4cnAzLzZsSXFvQTNGSW5hNTNxTG82QWVR?=
 =?utf-8?B?N2R3Yk0zc1FUNWI1QWYrTGZtUXBGUzczT0w3NXU0NXVQMnNoRVJlY09Kb3RC?=
 =?utf-8?B?c01ISENUVWphbVVwZjZEaE45K3RsRmlIbUpNRUFuQVFrYmxVS2JjWTBCR1hV?=
 =?utf-8?B?Nks3emt0ZFVIRjZZdzJTUjUyZ3hJalE0dWlNaGxoQmx6bXhCek9YeDViWVVv?=
 =?utf-8?B?ZnlLa3NiUXlJeVp2YWErUGtoZktLVWxzRnlFc2o2RzE4TWNrdzU5VGtqNjBm?=
 =?utf-8?B?WTRhRDNiV21sOFJ5ZW5jeFovNDZxUXlYSFY2ZUhEVDRYRU9sbmtHcUpFZ3Jy?=
 =?utf-8?B?aHhxeHArZ0ZjLzkwTitRT1YzY3l1U1NHSm5HWFp5a01KTUlFTTFQUFM3T3hV?=
 =?utf-8?B?Z1ZGZ0I2M0dlUThCd1c0MXBGeEJZUzlMTGdCQUhqUXExNEhhRG0zYjdJUXpT?=
 =?utf-8?B?REk3R25uYjRUWjZkZWNmaHhWaUZHWGc0MHNvRmF5ck1SQXp4bG56bDFxRWdG?=
 =?utf-8?B?dkJIZ0gvVkk1RTVwblUxTUNiQXlVSFE0Vm9ycjFScW0zMzlPZEYvRS9uaTNK?=
 =?utf-8?B?R2lVenlaSnVEdkk2RnVqdWVUTE9LNmNCanZrYTRlSWFLeGcyR3JVM01KN0J0?=
 =?utf-8?B?QWZvQlJVZmRNRE5yZEV5K3A4d01lVi9IZGgvYVVZVUhqeXRMQmlxeTRzS2Vo?=
 =?utf-8?B?WWoyUjVlL0srK3dLMlBobjRXeEEvU21zaUVCOERvQ2huUGFnRUlVNkZvbnRB?=
 =?utf-8?B?L2o5VjdoNzFZeEJwL21aR1o4V24wdS9Jdk0zRGR0c0VyLzNycXhteW1TOFlx?=
 =?utf-8?B?T3JWRXhxbkUraFVrQXBndmZvWFcvMFlaQTh1VU01YTdQREZaaEVJZ3hzZStW?=
 =?utf-8?B?a0xrdDgrZkx0eHlFYXFoNzJOMlliUjZ3dHErT3QrTndSVUkvT3NNSUZ1K05m?=
 =?utf-8?B?U2tHV1JZcUlJeWYvcmhrRnBCdFNFWVJYWWNiV2RXeDZjZDZmSi9zT1ZRYzF0?=
 =?utf-8?B?bWc3bU9kK0RWK0prNGRoY1dOYklaSXFCTkI3QWZlQVEzTmMwd29nQzhwOEQx?=
 =?utf-8?B?VXYwN0hhTUJHV1YwWXc5ZGdmL292eWdZREEzSWs5dXVqV2pQWUcvSDl3eEIv?=
 =?utf-8?B?QUgvT21jaFRDRXNhSlVRV2lOTXlhSHRrWmJ2VVFUOFU1M0cxQjd5TWVFMXRo?=
 =?utf-8?B?QTlEdnpKbjZzSTJydWNkbndScGNGalg4L2piNWlCRzF3QVlONzNsRGV3N2pi?=
 =?utf-8?B?aFRxQUZaajNyYjdiYVdzbURqYmxqNVRxZXZLL2ZLUytiVWlXZ1hPRGI5Wjhl?=
 =?utf-8?B?Y3RNQUVQSWdlRWQ1WGk1cEtDT0pERGk4cGJXMEVkdEI0VDVSaW5Ia0FMZEEr?=
 =?utf-8?B?WjErVXhJQXZjMFVOY3hXZ3ZJNVdwQWJXYzE0UElMYmxkSEpRMzhnR3dlU2JJ?=
 =?utf-8?B?aGkrSU8zOHZIbUhLNEJMOWJFMkV2d3dGNDVsaUhhT2hPUGZwdGQxL3liWG5Q?=
 =?utf-8?B?SGM4ZlJtYWxSZm44Z2k1U2tMcW13QXF5VDN4a0VYaEZKeEZockpMMXNzUjVP?=
 =?utf-8?B?U2MxbHpZd3dMSVhqelFKT1B2VWFjZWF2cmkwbGZFVlh2R3ZoRVpxYXJBbGk4?=
 =?utf-8?B?L1hDcjYwWmQ4RGhJSlM3NnI1bzZMa1BLbmphUEVmRE0wM1B1eFB0VmNsVmxD?=
 =?utf-8?B?M3RkbnVuNHJIcXNacWdERWNraC9yTXhPODdDTGJKTFNEcFJpTHlFYXBaUjBp?=
 =?utf-8?B?UFgrTW5UUGR5N25heTlmZCtHL29tN0V0TXlLSTU2eHZHS0tjbGlKSEZlUmJz?=
 =?utf-8?B?bzQrd3VYeVI1bHcvdmVJbWMxa3U4WGgyZEJKNFY4clhySlBMRllkbGwwTWp2?=
 =?utf-8?B?Ui9PcWZoTURhNnhyU0lkdmp2eWZ6QTBsczRYZytZbVFOUzVPdnE4VDNMRU15?=
 =?utf-8?B?WXV4NUIyNG5mVjVNM202VnlNZUNveUw5QitnaW5QN3lWeE8zbDBqUDV2N3pK?=
 =?utf-8?Q?NSTaJhH02mkCaOhMAPkm2iah8?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 54de3116-dae4-40c7-f548-08dae215099c
X-MS-Exchange-CrossTenant-AuthSource: MN0PR12MB6101.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Dec 2022 23:02:01.1068
 (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: utjH9Fyrrnp5w2RF1gG1bTE8TdlMWHo/5lM0i2zuPcgOfmfWJ4erHYklFqIRHfc20PbHqNs3G5vc0oM7FfIWJw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8405
X-Spam-Status: No, score=-3.3 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,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 12/19/2022 00:40, Perry Yuan wrote:
> There are some other amd pstate driver working mode to be supported.

Perhaps:

The amd-pstate driver may support multiple working modes. Introduce a 
variable to keep track of which mode is currently enabled.

> Here we use cppc_state var to indicate which mode is enabled.
> This change will help to simplify the the amd_pstate_param() to choose
> which mode used for the following driver registeration.

s/registeration/registration/

> 
> Signed-off-by: Perry Yuan <perry.yuan@amd.com>
> Signed-off-by: Wyes Karny <wyes.karny@amd.com>
> ---
>   drivers/cpufreq/amd-pstate.c | 35 +++++++++++++++++++++++++++--------
>   include/linux/amd-pstate.h   | 29 +++++++++++++++++++++++++++++
>   2 files changed, 56 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c
> index c17bd845f5fc..861a905f9324 100644
> --- a/drivers/cpufreq/amd-pstate.c
> +++ b/drivers/cpufreq/amd-pstate.c
> @@ -60,7 +60,18 @@
>    * module parameter to be able to enable it manually for debugging.
>    */
>   static struct cpufreq_driver amd_pstate_driver;
> -static int cppc_load __initdata;
> +static int cppc_state = AMD_PSTATE_DISABLE;
> +
> +static inline int get_mode_idx_from_str(const char *str, size_t size)
> +{
> +	int i;
> +
> +	for (i=0; i < AMD_PSTATE_MAX; i++) {
> +		if (!strncmp(str, amd_pstate_mode_string[i], size))
> +			return i;
> +	}
> +	return -EINVAL;
> +}
>   
>   static inline int pstate_enable(bool enable)
>   {
> @@ -628,7 +639,7 @@ static int __init amd_pstate_init(void)
>   	 * enable the amd_pstate passive mode driver explicitly
>   	 * with amd_pstate=passive in kernel command line
>   	 */
> -	if (!cppc_load) {
> +	if (cppc_state == AMD_PSTATE_DISABLE) {
>   		pr_debug("driver load is disabled, boot with amd_pstate=passive to enable this\n");

Presumably this message needs to be changed since there are different 
modes that can be used to enable it now.

>   		return -ENODEV;
>   	}
> @@ -671,16 +682,24 @@ device_initcall(amd_pstate_init);
>   
>   static int __init amd_pstate_param(char *str)
>   {
> +	size_t size;
> +	int mode_idx;
> +
>   	if (!str)
>   		return -EINVAL;
>   
> -	if (!strcmp(str, "disable")) {
> -		cppc_load = 0;
> -		pr_info("driver is explicitly disabled\n");
> -	} else if (!strcmp(str, "passive"))
> -		cppc_load = 1;
> +	size = strlen(str);
> +	mode_idx = get_mode_idx_from_str(str, size);
>   
> -	return 0;
> +	if (mode_idx >= AMD_PSTATE_DISABLE && mode_idx < AMD_PSTATE_MAX) {
> +		cppc_state = mode_idx;
> +		if (cppc_state == AMD_PSTATE_DISABLE)
> +			pr_info("driver is explicitly disabled\n");
> +
> +		return 0;
> +	}
> +
> +	return -EINVAL;
>   }
>   early_param("amd_pstate", amd_pstate_param);
>   
> diff --git a/include/linux/amd-pstate.h b/include/linux/amd-pstate.h
> index 1c4b8659f171..922d05a13902 100644
> --- a/include/linux/amd-pstate.h
> +++ b/include/linux/amd-pstate.h
> @@ -74,4 +74,33 @@ struct amd_cpudata {
>   	bool	boost_supported;
>   };
>   
> +/**
> + * enum amd_pstate_mode - driver working mode of amd pstate
> + */
> +
> +enum amd_pstate_mode {
> +	/** @AMD_PSTATE_DISABLE: Driver mode is disabled */
> +	AMD_PSTATE_DISABLE = 0,
> +
> +	/** @AMD_PSTATE_PASSIVE: Drier mode is passive mode */

s/Drier/Driver/

> +	AMD_PSTATE_PASSIVE = 1,
> +
> +	/** @AMD_PSTATE_ACTIVE: Driver mode is active mode */
> +	AMD_PSTATE_ACTIVE = 2,
> +
> +	/** @AMD_PSTATE_GUIDE: Driver mode is guided mode */
> +	AMD_PSTATE_GUIDE = 3,
> +
> +	/** @AMD_PSTATE_MAX */
> +	AMD_PSTATE_MAX = 4,
> +};
> +
> +static const char * const amd_pstate_mode_string[] = {
> +	[AMD_PSTATE_DISABLE]     = "disable",
> +	[AMD_PSTATE_PASSIVE]     = "passive",
> +	[AMD_PSTATE_ACTIVE]      = "active",
> +	[AMD_PSTATE_GUIDE]      = "guide",

I get the intent here, but guided mode isn't actually part of the v8
series under review.

I think it should either be folded into the series or this patch
should be split into two across the two patch-sets:
1) introduce the state machine (part of the EPP patch-set)
2) add guided mode support (part of the guided mode patch-set).

> +	NULL,
> +};
> +
>   #endif /* _LINUX_AMD_PSTATE_H */