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:   Tue, 17 Jan 2023 19:10:25 +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 v10 01/12] ACPI: CPPC: Add AMD pstate energy performance
 preference cppc control
Message-ID: <Y8aCIdrozMPUd5Vy@amd.com>
References: <20230106061420.95715-1-perry.yuan@amd.com>
 <20230106061420.95715-2-perry.yuan@amd.com>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20230106061420.95715-2-perry.yuan@amd.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?/oRerZtTSabWLEc5fV5So0TJo9TA4LfDeNe7V6uONDTDPISTAcufqkCjRdpn?=
 =?us-ascii?Q?gZvyThkCQ50o2xiBrdRRVV40QMWIQi4eLjx1PmoTrzOSgwHZAZDeUnRaccq1?=
 =?us-ascii?Q?UALXWgbhNpOshqkSb+BBNkMmgu7fCvHVZPsXYq5b7gsSnWFhIBg9PaTK2hI3?=
 =?us-ascii?Q?9KsmovXqds3OlAkY1b2E57JxzA/57lFux2Xy92UHa2J4za3mhy7wigLK/u8W?=
 =?us-ascii?Q?kyk0X+6G5vZqBfW7REszFXYhH1fLom2UObAelaVs+7UaBJD7ka9BnbDbKF8r?=
 =?us-ascii?Q?/YijP/G8xhEsprys2erZUR8tTDftVOY5E4HDkCLH6USeM6jekjHAU+TvDrhr?=
 =?us-ascii?Q?vqCUpphgUGI1js+lDWn5HtBjKCSu/wtgKDxGIXaHaGtT/vthD7e2y7/5EDpn?=
 =?us-ascii?Q?grKieD1gDdEOAhjvrzR7+pRru028zxn25YYqDxxkqB3Fupnq7jnXW2XV4Ybr?=
 =?us-ascii?Q?SCgO0Zxul3eYzsHQsM1H9416+Bz2P4UP66rt1clD6lh+R3ziwoRxlx1QEjg+?=
 =?us-ascii?Q?B+fD4z7NZDNjJ1ssTem7U8nS88Ta+Yh7cG/b99w+ogfcwZ0naGy0XDaNYvY2?=
 =?us-ascii?Q?m7AEteAv9SZ13q2T3r1CgTJ6rab0u4NAfZkeBGfhkrbuUXuZJaXqTxXxIbJN?=
 =?us-ascii?Q?ZBTXHdI7jdek4G2Z+L9+ooyke2/SyP45oRRWE4S4OwCpLZ9M5lQnK2sxnbOu?=
 =?us-ascii?Q?/bqyYR0YfP2UCukNdXpeKDnocRSjss6WZtL3lgCHey+Y/4cJNFnI+juKqNU3?=
 =?us-ascii?Q?OYW1Mhibp4sdgnrrD3TXVDjegHSRuy+OhrdNN9qjI9xjz9iA0kcsafypNT73?=
 =?us-ascii?Q?nHcrskA+RJAFJmG03axCubWWB3at2ICSx6/6ggXPuWGt5kSgVih3NQsL+ZCf?=
 =?us-ascii?Q?/Zm+EOx24e3SpI8qHuJGen+ZX/gp8nX0bHYSVf1wYcmLKYd1/WFeFsXHSblK?=
 =?us-ascii?Q?EqPftgzF/XlA1Unc1orTmAo2rHnoc7ffQe9okySAuUIq/qP5i8ostk3DJeOP?=
 =?us-ascii?Q?6ZJfq84QpeVZOMvT5TexE7pvv179fzY2gyiN1hwNpy5UPehu01/d6pSS8U+E?=
 =?us-ascii?Q?tXsak8kBq/tZ8cjOhC42+AkwgWGFYIYCA/05VK0SR50Ztj9ohEBL4U1D7k/V?=
 =?us-ascii?Q?B4rUUJChtI5xFwEJOxGuQJoAYNEZQC2LkYm7+53tEane2r4S/J1jMBTxpXFY?=
 =?us-ascii?Q?UwFaWncZSJi01slyvMFzr5LmNrTYXli5Hk/V7IYqvfK4UV7JDPXXA7PEbLck?=
 =?us-ascii?Q?Pegj+QDvXznH/uFHP1CuRgKdcXIwsosPQ68CNqFbwZV7uMg6LlWk7jldUe4W?=
 =?us-ascii?Q?9UePfxZsuzqZ8r1OfzzR2bfT7vBAgb+8rxHsPItJjyBWX0QlXkapFkYHjnvz?=
 =?us-ascii?Q?9KWob7EBz1gsWq9tVsNpTfO32j6h/UyCgvtiJiJqAF2pHzQBQl8eTQlX4lhp?=
 =?us-ascii?Q?tHUMKibBJeHme0VJJ/YItsg+JZZSwNZG9PJ2iLCE8Hb72YxgTWwOXvN/17g7?=
 =?us-ascii?Q?49ID0lfjdWnQoFSP4rfi9PONOUwMHMLABAOXJzqxE+yWDpSVkl6sISkRJ146?=
 =?us-ascii?Q?xAYKLrc+J5Z+kCl2k2IVm+NBFmlRej/pmxymNSPg?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7261d141-3895-46c6-ed8d-08daf87b7c81
X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB2504.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jan 2023 11:10:48.2245
 (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: ebQFx6GP/vKiqPBNDDnlukD6cY99+GJjdSizgH8NCGQdK8B534aN4eNj3w1+UaRtomfg8jPCvtDsRrH65fh/gw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR12MB5209
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, Jan 06, 2023 at 02:14:09PM +0800, Yuan, Perry wrote:
> From: Perry Yuan <Perry.Yuan@amd.com>
> 
> Add support for setting and querying EPP preferences to the generic
> CPPC driver.  This enables downstream drivers such as amd-pstate to discover
> and use these values.
> 
> Downstream drivers that want to use the new symbols cppc_get_epp_caps
> and cppc_set_epp_perf for querying and setting EPP preferences will need
> to call cppc_set_epp_perf to enable the EPP function firstly.
> 
> Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
> Reviewed-by: Wyes Karny <wyes.karny@amd.com>
> Signed-off-by: Perry Yuan <Perry.Yuan@amd.com>

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

> ---
>  drivers/acpi/cppc_acpi.c | 67 ++++++++++++++++++++++++++++++++++++++++
>  include/acpi/cppc_acpi.h | 12 +++++++
>  2 files changed, 79 insertions(+)
> 
> diff --git a/drivers/acpi/cppc_acpi.c b/drivers/acpi/cppc_acpi.c
> index 093675b1a1ff..0ce6c55a76ca 100644
> --- a/drivers/acpi/cppc_acpi.c
> +++ b/drivers/acpi/cppc_acpi.c
> @@ -1153,6 +1153,19 @@ int cppc_get_nominal_perf(int cpunum, u64 *nominal_perf)
>  	return cppc_get_perf(cpunum, NOMINAL_PERF, nominal_perf);
>  }
>  
> +/**
> + * cppc_get_epp_perf - Get the epp register value.
> + * @cpunum: CPU from which to get epp preference value.
> + * @epp_perf: Return address.
> + *
> + * Return: 0 for success, -EIO otherwise.
> + */
> +int cppc_get_epp_perf(int cpunum, u64 *epp_perf)
> +{
> +	return cppc_get_perf(cpunum, ENERGY_PERF, epp_perf);
> +}
> +EXPORT_SYMBOL_GPL(cppc_get_epp_perf);
> +
>  /**
>   * cppc_get_perf_caps - Get a CPU's performance capabilities.
>   * @cpunum: CPU from which to get capabilities info.
> @@ -1365,6 +1378,60 @@ int cppc_get_perf_ctrs(int cpunum, struct cppc_perf_fb_ctrs *perf_fb_ctrs)
>  }
>  EXPORT_SYMBOL_GPL(cppc_get_perf_ctrs);
>  
> +/*
> + * Set Energy Performance Preference Register value through
> + * Performance Controls Interface
> + */
> +int cppc_set_epp_perf(int cpu, struct cppc_perf_ctrls *perf_ctrls, bool enable)
> +{
> +	int pcc_ss_id = per_cpu(cpu_pcc_subspace_idx, cpu);
> +	struct cpc_register_resource *epp_set_reg;
> +	struct cpc_register_resource *auto_sel_reg;
> +	struct cpc_desc *cpc_desc = per_cpu(cpc_desc_ptr, cpu);
> +	struct cppc_pcc_data *pcc_ss_data = NULL;
> +	int ret;
> +
> +	if (!cpc_desc) {
> +		pr_debug("No CPC descriptor for CPU:%d\n", cpu);
> +		return -ENODEV;
> +	}
> +
> +	auto_sel_reg = &cpc_desc->cpc_regs[AUTO_SEL_ENABLE];
> +	epp_set_reg = &cpc_desc->cpc_regs[ENERGY_PERF];
> +
> +	if (CPC_IN_PCC(epp_set_reg) || CPC_IN_PCC(auto_sel_reg)) {
> +		if (pcc_ss_id < 0) {
> +			pr_debug("Invalid pcc_ss_id for CPU:%d\n", cpu);
> +			return -ENODEV;
> +		}
> +
> +		if (CPC_SUPPORTED(auto_sel_reg)) {
> +			ret = cpc_write(cpu, auto_sel_reg, enable);
> +			if (ret)
> +				return ret;
> +		}
> +
> +		if (CPC_SUPPORTED(epp_set_reg)) {
> +			ret = cpc_write(cpu, epp_set_reg, perf_ctrls->energy_perf);
> +			if (ret)
> +				return ret;
> +		}
> +
> +		pcc_ss_data = pcc_data[pcc_ss_id];
> +
> +		down_write(&pcc_ss_data->pcc_lock);
> +		/* after writing CPC, transfer the ownership of PCC to platform */
> +		ret = send_pcc_cmd(pcc_ss_id, CMD_WRITE);
> +		up_write(&pcc_ss_data->pcc_lock);
> +	} else {
> +		ret = -ENOTSUPP;
> +		pr_debug("_CPC in PCC is not supported\n");
> +	}
> +
> +	return ret;
> +}
> +EXPORT_SYMBOL_GPL(cppc_set_epp_perf);
> +
>  /**
>   * cppc_set_enable - Set to enable CPPC on the processor by writing the
>   * Continuous Performance Control package EnableRegister field.
> diff --git a/include/acpi/cppc_acpi.h b/include/acpi/cppc_acpi.h
> index c5614444031f..6b487a5bd638 100644
> --- a/include/acpi/cppc_acpi.h
> +++ b/include/acpi/cppc_acpi.h
> @@ -108,12 +108,14 @@ struct cppc_perf_caps {
>  	u32 lowest_nonlinear_perf;
>  	u32 lowest_freq;
>  	u32 nominal_freq;
> +	u32 energy_perf;
>  };
>  
>  struct cppc_perf_ctrls {
>  	u32 max_perf;
>  	u32 min_perf;
>  	u32 desired_perf;
> +	u32 energy_perf;
>  };
>  
>  struct cppc_perf_fb_ctrs {
> @@ -149,6 +151,8 @@ extern bool cpc_ffh_supported(void);
>  extern bool cpc_supported_by_cpu(void);
>  extern int cpc_read_ffh(int cpunum, struct cpc_reg *reg, u64 *val);
>  extern int cpc_write_ffh(int cpunum, struct cpc_reg *reg, u64 val);
> +extern int cppc_get_epp_perf(int cpunum, u64 *epp_perf);
> +extern int cppc_set_epp_perf(int cpu, struct cppc_perf_ctrls *perf_ctrls, bool enable);
>  #else /* !CONFIG_ACPI_CPPC_LIB */
>  static inline int cppc_get_desired_perf(int cpunum, u64 *desired_perf)
>  {
> @@ -202,6 +206,14 @@ static inline int cpc_write_ffh(int cpunum, struct cpc_reg *reg, u64 val)
>  {
>  	return -ENOTSUPP;
>  }
> +static inline int cppc_set_epp_perf(int cpu, struct cppc_perf_ctrls *perf_ctrls, bool enable)
> +{
> +	return -ENOTSUPP;
> +}
> +static inline int cppc_get_epp_perf(int cpunum, u64 *epp_perf)
> +{
> +	return -ENOTSUPP;
> +}
>  #endif /* !CONFIG_ACPI_CPPC_LIB */
>  
>  #endif /* _CPPC_ACPI_H*/
> -- 
> 2.34.1
>