Re: [PATCH] amd-pstate: Fix amd_pstate mode switch

[Rafael J. Wysocki]

On Fri, Mar 31, 2023 at 12:18 PM Wyes Karny <wyes.karny@xxxxxxx> wrote:
>
> On 31 Mar 11:11, Rafael J. Wysocki wrote:
> > On Fri, Mar 31, 2023 at 8:12 AM Wyes Karny <wyes.karny@xxxxxxx> wrote:
> > >
> > > Hi Rafael,
> > >
> > > On 30 Mar 20:19, Rafael J. Wysocki wrote:
> > > > On Thu, Mar 30, 2023 at 4:13 PM Wyes Karny <wyes.karny@xxxxxxx> wrote:
> > > > >
> > > > > amd_pstate mode can be changed by writing the mode name to the `status`
> > > > > sysfs. But some combinations are not working. Fix this issue by taking
> > > > > care of the edge cases.
> > > > >
> > > > > Before the fix the mode change combination test fails:
> > > > >
> > > > >  #./pst_test.sh
> > > > > Test passed: from: disable, to
> > > > > Test passed: from: disable, to disable
> > > > > Test failed: 1, From mode: disable, to mode: passive
> > > > > Test failed: 1, From mode: disable, to mode: active
> > > > > Test failed: 1, From mode: passive, to mode: active
> > > > > Test passed: from: passive, to disable
> > > > > Test failed: 1, From mode: passive, to mode: passive
> > > > > Test failed: 1, From mode: passive, to mode: active
> > > > > Test failed: 1, From mode: active, to mode: active
> > > > > Test passed: from: active, to disable
> > > > > Test failed: 1, From mode: active, to mode: passive
> > > > > Test failed: 1, From mode: active, to mode: active
> > > > >
> > > > > After the fix test passes:
> > > > >
> > > > >  #./pst_test.sh
> > > > > Test passed: from: disable, to
> > > > > Test passed: from: disable, to disable
> > > > > Test passed: from: disable, to passive
> > > > > Test passed: from: disable, to active
> > > > > Test passed: from: passive, to active
> > > > > Test passed: from: passive, to disable
> > > > > Test passed: from: passive, to passive
> > > > > Test passed: from: passive, to active
> > > > > Test passed: from: active, to active
> > > > > Test passed: from: active, to disable
> > > > > Test passed: from: active, to passive
> > > > > Test passed: from: active, to active
> > > > >
> > > > > Fixes: abd61c08ef349 ("cpufreq: amd-pstate: add driver working mode switch support")
> > > > >
> > > > > Acked-by: Huang Rui <ray.huang@xxxxxxx>
> > > > > Reviewed-by: Alexey Kardashevskiy <aik@xxxxxxx>
> > > > > Signed-off-by: Wyes Karny <wyes.karny@xxxxxxx>
> > > > >
> > > > > Cc: "Rafael J. Wysocki" <rafael@xxxxxxxxxx>
> > > > > Cc: Viresh Kumar <viresh.kumar@xxxxxxxxxx>
> > > > > Cc: Mario Limonciello <mario.limonciello@xxxxxxx>
> > > > > Cc: Perry Yuan <Perry.Yuan@xxxxxxx>
> > > >
> > > > This is all fine, but you need to tell me how it interacts with the
> > > > amd-pstate changes in linux-next.
> > > >
> > > > Does it affect the code in linux-next at all or is it only for 6.3-rc?
> > > >
> > >
> > > This is only for 6.3-rc.
> > > The commit 3ca7bc818d8c ("cpufreq: amd-pstate: Add guided mode control
> > > support via sysfs") in linux-next may not apply cleanly after this fix.
> > > Please let me know if I need to rebase and send the guided mode patches [1].
> > >
> > > [1]: https://lore.kernel.org/linux-pm/20230307112740.132338-1-wyes.karny@xxxxxxx/
> >
> > Well, instead, you please let me know how to resolve the merge
> > conflict between the patch below and your series.
> >
> > Can I simply assume that the code added by commit 3ca7bc818d8c
> > replaces the code modified by the $subject patch?
>
> Yes, commit 3ca7bc818d8c replaces the whole `amd_pstate_update_status`
> function with new implementation.

OK, thanks!

$subject patch has been queued up for 6.3-rc7, thanks!