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:   Fri, 16 Jun 2023 15:28:33 +0800
From:   Huang Rui <ray.huang@amd.com>
To:     "Karny, Wyes" <Wyes.Karny@amd.com>
Cc:     "rafael@kernel.org" <rafael@kernel.org>,
        "viresh.kumar@linaro.org" <viresh.kumar@linaro.org>,
        "trenn@suse.com" <trenn@suse.com>,
        "shuah@kernel.org" <shuah@kernel.org>,
        "Shenoy, Gautham Ranjal" <gautham.shenoy@amd.com>,
        "Limonciello, Mario" <Mario.Limonciello@amd.com>,
        "Yuan, Perry" <Perry.Yuan@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 5/6] cpupower: Add support for amd_pstate mode change
Message-ID: <ZIwPIeby2TD1drZE@amd.com>
References: <20230612113615.205353-1-wyes.karny@amd.com>
 <20230612113615.205353-6-wyes.karny@amd.com>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20230612113615.205353-6-wyes.karny@amd.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?OwYhZNZ9cJxU0mtlbpprzsz8HUifbwkwSkJs4MD80LpeIEZf2OFHfmFvNdq1?=
 =?us-ascii?Q?ei+RD+UHffmbDzoKXdKIkRas7d3hbC7nJ2zd/GghlFOOdOv/4fRspPbaD7U1?=
 =?us-ascii?Q?/fvRuRVfcT7ZgBcfiy7m58K+XR27PczvI4cIDaC01XsHt4K5/pf6Se4DuEaW?=
 =?us-ascii?Q?FSGX28f6bPLnj1/KdPwxxtkSrOV0dzF1iF4dWF/NXiFc3SPJuHwDoxYlzPuN?=
 =?us-ascii?Q?Y4Df0Uog6Unu7b3HJ2LkmzLHfHV2BML7LxhbtD945xzg164yWi7W8b1+P9d6?=
 =?us-ascii?Q?0HkIlHdtZawu4U+LI8OJwzsgivLJSwM3WAD76rrYdNZj2pqIynEHjbEdvFr8?=
 =?us-ascii?Q?Fj/15JUbhoNV3p4inf9WNDAxPcctvLFXd1KwfZnT+fwQhtyNBuEyk4ZYhXBL?=
 =?us-ascii?Q?LZzG57qHXoUprFkDUHZ2K6vLzuSGtxseN2i36lax48KrVZb6dOSwiQJA1l75?=
 =?us-ascii?Q?vuHk2JR1GRFyMmUW812USQ61fXMYRgW+lB8OLuupx6bMwRPxdS32BG4EQu+g?=
 =?us-ascii?Q?4fQwbb4UAWkcjpQ1OP9Ji9LItzDgJ3Pg6gs9ePWJBVu7YKUAJ8I+Cfx8DavZ?=
 =?us-ascii?Q?jFeX76PAaPHijamsuJkXfIUQhg1ejB6znrDcP9sWqmbREpbkuLbVggXdfBiH?=
 =?us-ascii?Q?MKtX1iMT+1lhUqYg8kq8eI2voqSU1tPKKZHRTKPpcTPFwJKoECyB6jk5sTny?=
 =?us-ascii?Q?QdThuGTi4WeXol6STpbhPywSFPniSttRz2TSTLzuq3lJ/zTtdNS1PFehlAdn?=
 =?us-ascii?Q?4fKGtF3KA5t57+hegBnRHytoisCL5TdxouYBwWZir6xP4pmnJNdqhE4mjXxY?=
 =?us-ascii?Q?hpdzFs9XYpP+RDzqnboQcDomk9PKjiipc7C7UwpqzFBb9VrlvggDm/TzLoSH?=
 =?us-ascii?Q?jHDCyPKlhn+rRRfVaO741Jw37H9SNnNx39Wdl9Xle2VgfOwLlhevZT/AzRfT?=
 =?us-ascii?Q?JsKM8PRyQPFqJI2zQRKb+xaMWVlpRPCl3rnal0AjUFKEX7n6PURoXS1CDOuI?=
 =?us-ascii?Q?IYiKjDZ7Ruup2c0+G3o3L34lVbWx036zIdfz9gCQY4IdNavhAmLDCK7KqbqA?=
 =?us-ascii?Q?oBP7dKP//jR1kfGsq6TNxiK8RXbKo/sMKG3CUpsunrQX6KqGSLLPud6j85tx?=
 =?us-ascii?Q?kXqUQqD67sLR2is8pFwxyeXQL7B6UteIZJ2wYQ8ryOp+lvXnMPRGeZmjV7tx?=
 =?us-ascii?Q?CIuDnbfUESZ87zQ9fn++It26iMrw+h37FS4nYC39qk4ehKqMY4wioBx7xTcx?=
 =?us-ascii?Q?Od/ZtvAHopZJKc9BY7dvZN53hPQNV9blTAqY160GX7GjY4jzmsfopU4BIbXI?=
 =?us-ascii?Q?6IReB0K44Bsl0We3zGSpdjtoPO5pHRpEghtSVeyom/hiSJlse50eaBKb0yfd?=
 =?us-ascii?Q?pq61SMB6Tx+LlNV7Xy9uoWtP10g4Bgng2A7chjTS/p4oCaQ4x8IPGqFlxsIT?=
 =?us-ascii?Q?JIkdVGSFKLZ8H3n1+ETDZPYceex9vmX2a0jRd/G8pWAqa6Rp1VdZ5+X10Dep?=
 =?us-ascii?Q?3W5gUioo8UP34XnDmZhZAxQBdrFXIHl3D0/zE0cRmCJypDwYNKa4SjBDgCML?=
 =?us-ascii?Q?jEklKjGnvkYoa9H0sy7YKokEfBPdIblgPkUmawQM?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e88ba3ed-9fcf-4355-79f7-08db6e3b58b1
X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB2504.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jun 2023 07:28:57.4442
 (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: ubKn0tlmlMfROEuqV2lxtQUj/YITZ9/qUnfMa8SSNG4dD9/RoO58uVuBT9SpA5WMJ+AqjVdOunHaH1xtr3SD6w==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4226
X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,
        RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE,
        T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no 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 Mon, Jun 12, 2023 at 07:36:14PM +0800, Karny, Wyes wrote:
> amd_pstate supports changing of its mode dynamically via `status` sysfs
> file. Add the same capability in cpupower. To change the mode to active
> mode use below command:
> 
> cpupower set --amd-pstate-mode active
> 
> Reviewed-by: Gautham R. Shenoy <gautham.shenoy@amd.com>
> Signed-off-by: Wyes Karny <wyes.karny@amd.com>

Acked-by: Huang Rui <ray.huang@amd.com>

> ---
>  tools/power/cpupower/utils/cpupower-set.c    | 24 ++++++++++++++++++--
>  tools/power/cpupower/utils/helpers/helpers.h |  3 +++
>  tools/power/cpupower/utils/helpers/misc.c    | 18 +++++++++++++++
>  3 files changed, 43 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/power/cpupower/utils/cpupower-set.c b/tools/power/cpupower/utils/cpupower-set.c
> index a789b123dbd4..c2ba69b7ea54 100644
> --- a/tools/power/cpupower/utils/cpupower-set.c
> +++ b/tools/power/cpupower/utils/cpupower-set.c
> @@ -19,6 +19,7 @@
>  static struct option set_opts[] = {
>  	{"perf-bias", required_argument, NULL, 'b'},
>  	{"epp", required_argument, NULL, 'e'},
> +	{"amd-pstate-mode", required_argument, NULL, 'm'},
>  	{ },
>  };
>  
> @@ -39,12 +40,13 @@ int cmd_set(int argc, char **argv)
>  		struct {
>  			int perf_bias:1;
>  			int epp:1;
> +			int mode:1;
>  		};
>  		int params;
>  	} params;
>  	int perf_bias = 0;
>  	int ret = 0;
> -	char epp[30];
> +	char epp[30], mode[20];
>  
>  	ret = uname(&uts);
>  	if (!ret && (!strcmp(uts.machine, "ppc64le") ||
> @@ -58,7 +60,7 @@ int cmd_set(int argc, char **argv)
>  
>  	params.params = 0;
>  	/* parameter parsing */
> -	while ((ret = getopt_long(argc, argv, "b:e:",
> +	while ((ret = getopt_long(argc, argv, "b:e:m:",
>  						set_opts, NULL)) != -1) {
>  		switch (ret) {
>  		case 'b':
> @@ -81,6 +83,17 @@ int cmd_set(int argc, char **argv)
>  			}
>  			params.epp = 1;
>  			break;
> +		case 'm':
> +			if (cpupower_cpu_info.vendor != X86_VENDOR_AMD)
> +				print_wrong_arg_exit();
> +			if (params.mode)
> +				print_wrong_arg_exit();
> +			if (sscanf(optarg, "%19s", mode) != 1) {
> +				print_wrong_arg_exit();
> +				return -EINVAL;
> +			}
> +			params.mode = 1;
> +			break;
>  		default:
>  			print_wrong_arg_exit();
>  		}
> @@ -89,6 +102,12 @@ int cmd_set(int argc, char **argv)
>  	if (!params.params)
>  		print_wrong_arg_exit();
>  
> +	if (params.mode) {
> +		ret = cpupower_set_amd_pstate_mode(mode);
> +		if (ret)
> +			fprintf(stderr, "Error setting mode\n");
> +	}
> +
>  	/* Default is: set all CPUs */
>  	if (bitmask_isallclear(cpus_chosen))
>  		bitmask_setall(cpus_chosen);
> @@ -123,6 +142,7 @@ int cmd_set(int argc, char **argv)
>  				break;
>  			}
>  		}
> +
>  	}
>  	return ret;
>  }
> diff --git a/tools/power/cpupower/utils/helpers/helpers.h b/tools/power/cpupower/utils/helpers/helpers.h
> index 5d998de2d291..d35596631eef 100644
> --- a/tools/power/cpupower/utils/helpers/helpers.h
> +++ b/tools/power/cpupower/utils/helpers/helpers.h
> @@ -117,6 +117,7 @@ extern int cpupower_intel_get_perf_bias(unsigned int cpu);
>  extern unsigned long long msr_intel_get_turbo_ratio(unsigned int cpu);
>  
>  extern int cpupower_set_epp(unsigned int cpu, char *epp);
> +extern int cpupower_set_amd_pstate_mode(char *mode);
>  
>  /* Read/Write msr ****************************/
>  
> @@ -177,6 +178,8 @@ static inline unsigned long long msr_intel_get_turbo_ratio(unsigned int cpu)
>  
>  static inline int cpupower_set_epp(unsigned int cpu, char *epp)
>  { return -1; };
> +static inline int cpupower_set_amd_pstate_mode(char *mode)
> +{ return -1; };
>  
>  /* Read/Write msr ****************************/
>  
> diff --git a/tools/power/cpupower/utils/helpers/misc.c b/tools/power/cpupower/utils/helpers/misc.c
> index 63c3f26ef874..9df9af8a969e 100644
> --- a/tools/power/cpupower/utils/helpers/misc.c
> +++ b/tools/power/cpupower/utils/helpers/misc.c
> @@ -106,6 +106,24 @@ int cpupower_set_epp(unsigned int cpu, char *epp)
>  	return 0;
>  }
>  
> +int cpupower_set_amd_pstate_mode(char *mode)
> +{
> +	char path[SYSFS_PATH_MAX];
> +	char linebuf[20] = {};
> +
> +	snprintf(path, sizeof(path), PATH_TO_CPU "amd_pstate/status");
> +
> +	if (!is_valid_path(path))
> +		return -1;
> +
> +	snprintf(linebuf, sizeof(linebuf), "%s\n", mode);
> +
> +	if (cpupower_write_sysfs(path, linebuf, 20) <= 0)
> +		return -1;
> +
> +	return 0;
> +}
> +
>  bool cpupower_amd_pstate_enabled(void)
>  {
>  	char *driver = cpufreq_get_driver(0);
> -- 
> 2.34.1
>