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:   Thu, 25 May 2023 11:43:39 +0530
From:   Wyes Karny <wyes.karny@amd.com>
To:     "Rafael J. Wysocki" <rafael@kernel.org>
Cc:     ray.huang@amd.com, viresh.kumar@linaro.org,
        linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org,
        gautham.shenoy@amd.com
Subject: Re: [PATCH] cpufreq: amd-pstate: Update policy->cur for adjust perf
Message-ID: <ZG78k9dOJS2vauEP@BLR-5CG13462PL.amd.com>
References: <20230518055819.71585-1-wyes.karny@amd.com>
 <CAJZ5v0iR0tvS74s+EnzaSN-7urAWZGPgOEF4OTgaKgWNFueOgw@mail.gmail.com>
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <CAJZ5v0iR0tvS74s+EnzaSN-7urAWZGPgOEF4OTgaKgWNFueOgw@mail.gmail.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?dzAyT2hIemRuMDFIVFVjL1RucjdMd0FKZStzdmhuTWdNcXQ2ZURQSVV2aWRs?=
 =?utf-8?B?UUwrRlBiSlNYYzViWGUxZEpqR29kUXV1dWxhbEJxVlJnTlcrYlhZUzNMYWJ0?=
 =?utf-8?B?czFYNkpCWm9oYzM3V2o2bFhiUGFrM21IR3daTk04Q1BsL3RhOUZCRFVRTDBV?=
 =?utf-8?B?cVA1RlFSZmJIY2NBTG9lcW1jZHRSdDYzU1ZqV0F3NHFmQUdvcHkxc2pPOGx1?=
 =?utf-8?B?eTJSZEo2a1BHcVN3ZTZpMTJNRm05NFhibWNpU3hLa2o1MGY1VytEamNwNTJH?=
 =?utf-8?B?ZGlQUktxRTYyOXl6NjFORjRMR0E0RGExOSswblJBdDlPdVNXNkFTNjBoUUZ4?=
 =?utf-8?B?TVU5ZkV3SXpwT0k4N1Y3ZUNhdklUQWxGb3BrWVB1Rm16ZVJpMmdTWUl4ZDA2?=
 =?utf-8?B?NU1MdVBKOGpTSzhmV3pIaDBrSzJwMGphc1UvbklCcXdEd0ZORHlKWW4yS3N1?=
 =?utf-8?B?L1dKbzVLcE9HdVUrK0MydWNNMWlaUjdBRVpHVE9PMkh4a3V5QTZscFBtYkUz?=
 =?utf-8?B?SFhlT0RmZUMwSWl1MzhFSDJ5THpENy9EQnlldXVpSkIvTTZ1U0R4Ym9SZjhJ?=
 =?utf-8?B?NFM1WGxiU1lnVjlZMmZuUUhUNk5KV05FNEIwV092R3hVRi84Qm1BWktZenVM?=
 =?utf-8?B?eFBKQ2taREgrOTRlUmRJRTY0YmVueHhYUkhpU09qUE1OV2krejE1ZU9sRFdM?=
 =?utf-8?B?RDZXM21TZHJKTU0vZGI3cEgvWHFmUUo5QTNZZDYxWTVZK1IrUVNEeFI5ZnRw?=
 =?utf-8?B?QUlweGRPNmxheXJScldWU1BzcGIxLzNLQlI1WnhWV3Z0dGFUWnlhd3VGK0ds?=
 =?utf-8?B?aHNHUDFZQWcvN0ZVZjdLZnpSQTQxR01QMVFEbEVtckV1Sk5Ub2Jjd0t1OUlV?=
 =?utf-8?B?TXFPY1BEUWYwZmdLQTJINy92a2IzYmx2NmtpdEJDMG9zT3puMnVwWE1qYjd3?=
 =?utf-8?B?YVVGVXNlQ2k2MmZiMEdyaVBtb1BZdlRmSE9hVWQ0Ly90dndGcG5VRXpFa2lo?=
 =?utf-8?B?TVlHQzZOdHNiVU1ML2x6S0ZUVk4zS292Ri9nQjM2Y29DWVoxODNMVVV6UHdY?=
 =?utf-8?B?VUZBeHJ0OWdrWkJmZnJBVUhwTW0wZStaVVVUZEpmYzZXU1lqbENhN2FyL3NS?=
 =?utf-8?B?Mkp0Q1A3ZTgzQWIyS09UMk1nWlNkM3JsdUFGYzE1RTJ3SUlkTGVnM1NJN0R4?=
 =?utf-8?B?Ylc2c1E3NlA5QUs0SmZOOENWWnU5TUhlTEwvRitWZ0RNcTJHaUtmRTg2eXlh?=
 =?utf-8?B?WDNxTEpuTElFcjdRK3NrdmtGdTdtZkJXeEMzZmkrNGlYMDhQUjI0cGZhL2J1?=
 =?utf-8?B?UWpyR1BaK0FxN1V3amI1SkVlRkdtM3hEK2VubVF6MW9jZ2ZrRC9PZTlIbGhx?=
 =?utf-8?B?Nmc4c3U3VHhqYkFsZUtsK0l1RHVsaW1rRyt6RmdFY2REM3NmalIwK3g1OEw5?=
 =?utf-8?B?ODlVMWJaUnUveE5ROWZId0JPYXMyWlQ2N1ZKV0dxOXlVZVJNY3ViQXNuRGlY?=
 =?utf-8?B?YmpKdmhvY09EenBmd1EvYUhIZ3JLNXdVL0t3VmlUdjVKWnZ2YWhlbXY0dDZF?=
 =?utf-8?B?eHFTZTFyUjhId3d2S3I3VEliVUhzaXFYZytrUDN2cytVdWtRNnBEenZLRGlT?=
 =?utf-8?B?QVI4d3NyOGRJdUw4TTZNVmRid2RPWjZvVGtncjVBVEpueFc2TEk0aHhPRWpm?=
 =?utf-8?B?OTZ1UXNreEhTenBhZnhWaHVNbE1KUTd4N3RoUXI0T01oQzFWSEtkMDBiOEQx?=
 =?utf-8?B?MFhKTllINTNvaCtRS09XeUxqOHZCN0d5MCs1eUt2QktDWVBJZU9zaVZnajdw?=
 =?utf-8?B?dkVWaUJOSlRKVG5tS2JxL3l2d0xwdi9pV2toUWR3MFk4WDdCVzM1NE5waUV4?=
 =?utf-8?B?eVQ0UTRCbk1nNC9UdFB0S1BiUTZsUytoRDJlY2ZLdU84SkZwNUlYTlgvVzls?=
 =?utf-8?B?QlFJUnhoaE85REl2OUlYcFRIdnBzMUhhUDd3UEZJT2FwdjlGRUZoTmRNUjZj?=
 =?utf-8?B?SExJY3BsQTV5QWdHV3E0elZ5UVByL1d5ajlVQXRiWUdHMmE4YWRVcHlITS9D?=
 =?utf-8?B?QmVaUFdycXh1Tjlob0VESzcxUnVYZkY0bGM2ajhsTDZNckpjUGFyU2tZRjFP?=
 =?utf-8?Q?GlV3x2LkwWy4qnfmCR/Aj+FNa?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: dd20b785-1c1b-4a04-3fe0-08db5ce736bb
X-MS-Exchange-CrossTenant-AuthSource: BY5PR12MB3876.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2023 06:13:53.5585
 (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: xSm2Ga1YVAWMJx/qvpYPXhslxee/NgFrcxDi50eJuHdYSLEvp1MLnMOv03a7CytBNdVmH9DAwZnm6YLtz6NCUQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4309
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

Hi Rafael,

On 24 May 19:57, Rafael J. Wysocki wrote:
> On Thu, May 18, 2023 at 7:58 AM Wyes Karny <wyes.karny@amd.com> wrote:
> >
> > Driver should update policy->cur after updating the frequency.
> > Currently amd_pstate doesn't update policy->cur when `adjust_perf`
> > is used. Which causes /proc/cpuinfo to show wrong cpu frequency.
> > Fix this by updating policy->cur with correct frequency value in
> > adjust_perf function callback.
> >
> > - Before the fix: (setting min freq to 1.5 MHz)
> >
> > [root@amd]# cat /proc/cpuinfo | grep "cpu MHz" | sort | uniq --count
> >       1 cpu MHz         : 1777.016
> >       1 cpu MHz         : 1797.160
> >       1 cpu MHz         : 1797.270
> >     189 cpu MHz         : 400.000
> >
> > - After the fix: (setting min freq to 1.5 MHz)
> >
> > [root@amd]# cat /proc/cpuinfo | grep "cpu MHz" | sort | uniq --count
> >       1 cpu MHz         : 1753.353
> >       1 cpu MHz         : 1756.838
> >       1 cpu MHz         : 1776.466
> >       1 cpu MHz         : 1776.873
> >       1 cpu MHz         : 1777.308
> >       1 cpu MHz         : 1779.900
> >     183 cpu MHz         : 1805.231
> >       1 cpu MHz         : 1956.815
> >       1 cpu MHz         : 2246.203
> >       1 cpu MHz         : 2259.984
> >
> > Fixes: 1d215f0319c2 ("cpufreq: amd-pstate: Add fast switch function for AMD P-State")
> >
> > Signed-off-by: Wyes Karny <wyes.karny@amd.com>
> > ---
> >  drivers/cpufreq/amd-pstate.c | 8 +++++++-
> >  1 file changed, 7 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c
> > index 5a3d4aa0f45a..736dab69ba1e 100644
> > --- a/drivers/cpufreq/amd-pstate.c
> > +++ b/drivers/cpufreq/amd-pstate.c
> > @@ -479,12 +479,14 @@ static void amd_pstate_adjust_perf(unsigned int cpu,
> >                                    unsigned long capacity)
> >  {
> >         unsigned long max_perf, min_perf, des_perf,
> > -                     cap_perf, lowest_nonlinear_perf;
> > +                     cap_perf, lowest_nonlinear_perf, max_freq;
> >         struct cpufreq_policy *policy = cpufreq_cpu_get(cpu);
> >         struct amd_cpudata *cpudata = policy->driver_data;
> > +       unsigned int target_freq;
> >
> >         cap_perf = READ_ONCE(cpudata->highest_perf);
> >         lowest_nonlinear_perf = READ_ONCE(cpudata->lowest_nonlinear_perf);
> > +       max_freq = READ_ONCE(cpudata->max_freq);
> >
> >         des_perf = cap_perf;
> >         if (target_perf < capacity)
> > @@ -501,6 +503,10 @@ static void amd_pstate_adjust_perf(unsigned int cpu,
> >         if (max_perf < min_perf)
> >                 max_perf = min_perf;
> >
> > +       des_perf = clamp_t(unsigned long, des_perf, min_perf, max_perf);
> > +       target_freq = div_u64(des_perf * max_freq, max_perf);
> > +       policy->cur = target_freq;
> > +
> >         amd_pstate_update(cpudata, min_perf, des_perf, max_perf, true,
> >                         policy->governor->flags);
> >         cpufreq_cpu_put(policy);
> > --
> 
> Applied under an edited subject, thanks!
> 
> I think you'd like this to go into 6.4 and "stable", right?

Yes, please. I should have added stable tag.

Thanks & Regards,
Wyes