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;
MIME-Version: 1.0
References: <20230330141314.1364083-1-wyes.karny@amd.com> <CAJZ5v0jxwuAnTVdnThGmHmptB7qeKc34-keUOdHcugeADYSL+w@mail.gmail.com>
 <ZCZ5zjw+O3gS6trx@bhagirati.amd.com> <CAJZ5v0iwmvnTFVKhox11gKxM8UBR+=748zPB0tr_O5mPBbkpiA@mail.gmail.com>
 <ZCazdI9puSXLd0D4@bhagirati.amd.com>
In-Reply-To: <ZCazdI9puSXLd0D4@bhagirati.amd.com>
From:   "Rafael J. Wysocki" <rafael@kernel.org>
Date:   Tue, 11 Apr 2023 20:49:49 +0200
Message-ID: <CAJZ5v0hLaqCuZ69HJ5J4Cm0NBn0SUQ_4AiE5c5tPkho1Ek=ZuQ@mail.gmail.com>
Subject: Re: [PATCH] amd-pstate: Fix amd_pstate mode switch
To:     Wyes Karny <wyes.karny@amd.com>
Cc:     "Rafael J. Wysocki" <rafael@kernel.org>, viresh.kumar@linaro.org,
        ray.huang@amd.com, linux-pm@vger.kernel.org,
        linux-kernel@vger.kernel.org, Alexey Kardashevskiy <aik@amd.com>,
        Mario Limonciello <mario.limonciello@amd.com>,
        Perry Yuan <Perry.Yuan@amd.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 8BIT
Precedence: bulk

On Fri, Mar 31, 2023 at 12:18 PM Wyes Karny <wyes.karny@amd.com> wrote:
>
> On 31 Mar 11:11, Rafael J. Wysocki wrote:
> > On Fri, Mar 31, 2023 at 8:12 AM Wyes Karny <wyes.karny@amd.com> 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@amd.com> 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@amd.com>
> > > > > Reviewed-by: Alexey Kardashevskiy <aik@amd.com>
> > > > > Signed-off-by: Wyes Karny <wyes.karny@amd.com>
> > > > >
> > > > > Cc: "Rafael J. Wysocki" <rafael@kernel.org>
> > > > > Cc: Viresh Kumar <viresh.kumar@linaro.org>
> > > > > Cc: Mario Limonciello <mario.limonciello@amd.com>
> > > > > Cc: Perry Yuan <Perry.Yuan@amd.com>
> > > >
> > > > 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@amd.com/
> >
> > 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!