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, 29 Aug 2022 17:20:37 +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>,
        "viresh.kumar@linaro.org" <viresh.kumar@linaro.org>,
        "Sharma, Deepak" <Deepak.Sharma@amd.com>,
        "Limonciello, Mario" <Mario.Limonciello@amd.com>,
        "Fontenot, Nathan" <Nathan.Fontenot@amd.com>,
        "Deucher, Alexander" <Alexander.Deucher@amd.com>,
        "Su, Jinzhou (Joe)" <Jinzhou.Su@amd.com>,
        "Huang, Shimmer" <Shimmer.Huang@amd.com>,
        "Du, Xiaojian" <Xiaojian.Du@amd.com>,
        "Meng, Li (Jassmine)" <Li.Meng@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 v2] cpufreq: amd_pstate: Fix initial highest_perf value
Message-ID: <YwyE5UygDEhfPDVY@amd.com>
References: <20220829055901.24593-1-Perry.Yuan@amd.com>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20220829055901.24593-1-Perry.Yuan@amd.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?pyNOE/2CFwP351mYsZpiyQ+RRkc97gWBX3hQ/SnVyK2IMxTiBXuiKEhuqsxD?=
 =?us-ascii?Q?2yx/ShlGbsjpCnnVjqduoJ/ybJsxxttC4Md7258zpDAzaCyBXrztJlBvps8Y?=
 =?us-ascii?Q?BnWzeX+MzbGa1NwCnzfQE1yuD4M58GY9VuinnYigAPtDKPM6L7Z0+37l0OKP?=
 =?us-ascii?Q?Ck9cfne+jzDtOcRZxkf6quj4zVZHS0Dbxkj87AUwyi8M7+oHrNhXzq25QupV?=
 =?us-ascii?Q?tE5JYpVL3V9p8bkhn255dbotE+ON5A81DKDXMetyczrrownDUP9DOefq2NF0?=
 =?us-ascii?Q?YdzoOYc2otfn2hVPly36QJ/L3Td+Vu2AHcZqlr1UycOOnNcPExbZblRiSGL6?=
 =?us-ascii?Q?6XMyTWX1EfamJ918jhNn95mPf0zrdiAzHTRpBDhdB0uC97l+Q5VUDr2uKcjj?=
 =?us-ascii?Q?zs6gbw+1GmApfP6a+ZXvtchcQurTa9ccZF6rXj7c9Q4mrduu+BYW5BpIynZu?=
 =?us-ascii?Q?bZ9P+LinpzyYfnXJTgYcFX5shqWWsANpXlnyeCZlKecjYP73Wn5Ydf5NhJbB?=
 =?us-ascii?Q?TPCRYqaUxDzG0SUSM28JuLMPHnbpS4iaQnYSs7MqFLvwoVzKYFeM79jO9JA8?=
 =?us-ascii?Q?b9oD49MmEm36mXVfFua35cn3uJ1rL2M/Kc6J7XN89N9fhKxmwVR47a4c7V6i?=
 =?us-ascii?Q?e1+TBisVKynCWEN5BRJ5LVLVdMmrzT2n1uapFk1VaH0AEVyv4ZsQqbiroHtV?=
 =?us-ascii?Q?Nl8eN7Kd9+dL10WnO8EJrr3n2Or237K0lvWIBmTLvHT73pjOY7KIlgk/wrUE?=
 =?us-ascii?Q?3Go7rOuA36OdwHpC/mvB87BJIZ6WxodDB0U7hln8/eCh31g1vt/mOy2JrjWQ?=
 =?us-ascii?Q?ybnlQr9Jw8GCJ7vHUXZmGhiAEVckV0EPc6+EIL6Gs0P8x5Sq5QDuSY1BUiUr?=
 =?us-ascii?Q?xQzWL2GbT9YOUWpLtYyakw6mZPVDlDHp4Dlxys3kovN3bkZYjKoJT2tdKUBi?=
 =?us-ascii?Q?2ajZ2LSDXzbjZHpcFy9OsJHyHbVKDtZDDD+xEG8oKBJJ26MfOvBstaUOoczZ?=
 =?us-ascii?Q?2uVpQgxwMuxpFrovpHMPAqAglmlE4wkkQ8MvyE7uxS/yzpcf+mffgxGPhOPA?=
 =?us-ascii?Q?jBH8uThyF0Rc/VHQaPdTVzYEt7RPmJrd48mTv3vXhpbOmByjE8npEjTdOnS6?=
 =?us-ascii?Q?7D/GpFcPAfyxBfOiPCk8+jNKQac5D7ezbNQ36FbO7uJhpUU0Fc3DgUdL90vf?=
 =?us-ascii?Q?AXaUiVEFsXgpWx4/Wr8rjBnZoK0NCQe41X/pzyagCWkXb4+/sjrzCpZ1gyUP?=
 =?us-ascii?Q?itBXr9bv29HeNsgiDsp7e0iQb06cDrUGIfVAjft489esXXk/EgyhMiOEyNpS?=
 =?us-ascii?Q?W3ziVDaa+9KDGBWBvpsJ4XAybPlVeUdsKtYthYvxzV1x1tWclmMUEFfCniWm?=
 =?us-ascii?Q?XYPE/2pV+QnxF/UQiHDRlH9+j6RD3jThTkzhZHedbNTMLBZEmHliZWDVOA3B?=
 =?us-ascii?Q?3SohhO3fG8FWzclhtVWE1lk+nqLqjiu4r+WxYxYMQ0/CrFjz9+SWCt7sYSHp?=
 =?us-ascii?Q?hmudjHmEG2gz04GobyD1oQ4bd1+G55pbTCqx7k0GFwZ3eXWWKfXx94XPYCGp?=
 =?us-ascii?Q?TzWC5XfaP+t+eaZbx7HmkYG3/iUV8lbjrLj9dGS6?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 515891fd-c9b5-4681-f82c-08da899fcc4d
X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB2504.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Aug 2022 09:21:04.8376
 (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: VWyT/5QiTToBSibjtA1vhB1i3o+9bO+s6QWXe0jWrZCILo2wauZHKdpvByCcYe430LXIsANRi/Jt4J7eNZUvdA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB6269
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,T_SCC_BODY_TEXT_LINE
        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 Mon, Aug 29, 2022 at 01:59:01PM +0800, Yuan, Perry wrote:
> To avoid some new AMD processors use wrong highest perf when amd pstate
> driver loaded, this fix will query the highest perf from MSR register
> MSR_AMD_CPPC_CAP1 and cppc_acpi interface firstly, then compare with the
> highest perf value got by calling amd_get_highest_perf() function.
> 
> The lower value will be the correct highest perf we need to use.
> Otherwise the CPU max MHz will be incorrect if the
> amd_get_highest_perf() did not cover the new process family and model ID.
> 
> Like this lscpu info, the max frequency is incorrect.
> 
> Vendor ID:               AuthenticAMD
>     Socket(s):           1
>     Stepping:            2
>     CPU max MHz:         5410.0000
>     CPU min MHz:         400.0000
>     BogoMIPS:            5600.54
> 
> Fixes: 3743d55b289c2 (x86, sched: Fix the AMD CPPC maximum performance value on certain AMD Ryzen generations)
> Signed-off-by: Perry Yuan <Perry.Yuan@amd.com>

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

> ---
>  drivers/cpufreq/amd-pstate.c | 14 ++++++++++++--
>  1 file changed, 12 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c
> index 9f4375f7ab46..30fbd30c0949 100644
> --- a/drivers/cpufreq/amd-pstate.c
> +++ b/drivers/cpufreq/amd-pstate.c
> @@ -354,6 +354,7 @@ static inline int amd_pstate_enable(bool enable)
>  static int pstate_init_perf(struct amd_cpudata *cpudata)
>  {
>  	u64 cap1;
> +	u32 highest_perf;
>  
>  	int ret = rdmsrl_safe_on_cpu(cpudata->cpu, MSR_AMD_CPPC_CAP1,
>  				     &cap1);
> @@ -365,7 +366,11 @@ static int pstate_init_perf(struct amd_cpudata *cpudata)
>  	 *
>  	 * CPPC entry doesn't indicate the highest performance in some ASICs.
>  	 */
> -	WRITE_ONCE(cpudata->highest_perf, amd_get_highest_perf());
> +	highest_perf = amd_get_highest_perf();
> +	if (highest_perf > AMD_CPPC_HIGHEST_PERF(cap1))
> +		highest_perf = AMD_CPPC_HIGHEST_PERF(cap1);
> +
> +	WRITE_ONCE(cpudata->highest_perf, highest_perf);
>  
>  	WRITE_ONCE(cpudata->nominal_perf, AMD_CPPC_NOMINAL_PERF(cap1));
>  	WRITE_ONCE(cpudata->lowest_nonlinear_perf, AMD_CPPC_LOWNONLIN_PERF(cap1));
> @@ -377,12 +382,17 @@ static int pstate_init_perf(struct amd_cpudata *cpudata)
>  static int cppc_init_perf(struct amd_cpudata *cpudata)
>  {
>  	struct cppc_perf_caps cppc_perf;
> +	u32 highest_perf;
>  
>  	int ret = cppc_get_perf_caps(cpudata->cpu, &cppc_perf);
>  	if (ret)
>  		return ret;
>  
> -	WRITE_ONCE(cpudata->highest_perf, amd_get_highest_perf());
> +	highest_perf = amd_get_highest_perf();
> +	if (highest_perf > cppc_perf.highest_perf)
> +		highest_perf = cppc_perf.highest_perf;
> +
> +	WRITE_ONCE(cpudata->highest_perf, highest_perf);
>  
>  	WRITE_ONCE(cpudata->nominal_perf, cppc_perf.nominal_perf);
>  	WRITE_ONCE(cpudata->lowest_nonlinear_perf,
> -- 
> 2.34.1
>