* Second round of amd-pstate 6.12 content
@ 2024-09-09 15:51 Mario Limonciello
2024-09-09 16:38 ` Rafael J. Wysocki
0 siblings, 1 reply; 5+ messages in thread
From: Mario Limonciello @ 2024-09-09 15:51 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: Linux PM
Hi,
The following changes since commit 8cc214312cf8a0c3702edd1aa52e507262adccb9:
Merge branch 'pm-opp' into linux-next (2024-09-06 20:53:58 +0200)
are available in the Git repository at:
ssh://git@gitolite.kernel.org/pub/scm/linux/kernel/git/superm1/linux.git
tags/amd-pstate-v6.12-2024-09-09
for you to fetch changes up to e121c01c0422fc56033d0dfa1bf3f0366115d2d5:
cpufreq/amd-pstate-ut: Add test case for mode switches (2024-09-09
10:26:26 -0500)
----------------------------------------------------------------
second round of amd-pstate changes for 6.12:
* Move the calculation of the AMD boost numerator outside of
amd-pstate, correcting acpi-cpufreq on systems with preferred cores
* Harden preferred core detection to avoid potential false positives
* Add extra unit test coverage for mode state machine
----------------------------------------------------------------
Mario Limonciello (13):
x86/amd: Move amd_get_highest_perf() from amd.c to cppc.c
ACPI: CPPC: Adjust return code for inline functions in
!CONFIG_ACPI_CPPC_LIB
x86/amd: Rename amd_get_highest_perf() to
amd_get_boost_ratio_numerator()
ACPI: CPPC: Drop check for non zero perf ratio
ACPI: CPPC: Adjust debug messages in amd_set_max_freq_ratio() to warn
x86/amd: Move amd_get_highest_perf() out of amd-pstate
x86/amd: Detect preferred cores in amd_get_boost_ratio_numerator()
cpufreq: amd-pstate: Merge amd_pstate_highest_perf_set() into
amd_get_boost_ratio_numerator()
cpufreq: amd-pstate: Optimize amd_pstate_update_limits()
cpufreq: amd-pstate: Add documentation for `amd_pstate_hw_prefcore`
amd-pstate: Add missing documentation for
`amd_pstate_prefcore_ranking`
cpufreq/amd-pstate: Export symbols for changing modes
cpufreq/amd-pstate-ut: Add test case for mode switches
Documentation/admin-guide/pm/amd-pstate.rst | 15 ++++++++++++++-
arch/x86/include/asm/processor.h | 3 ---
arch/x86/kernel/acpi/cppc.c | 172
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------
arch/x86/kernel/cpu/amd.c | 16 ----------------
drivers/cpufreq/acpi-cpufreq.c | 12 +++++++++---
drivers/cpufreq/amd-pstate-ut.c | 41
++++++++++++++++++++++++++++++++++++++++-
drivers/cpufreq/amd-pstate.c | 151
+++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------
drivers/cpufreq/amd-pstate.h | 14 ++++++++++++++
include/acpi/cppc_acpi.h | 41
++++++++++++++++++++++++++++-------------
9 files changed, 305 insertions(+), 160 deletions(-)
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Second round of amd-pstate 6.12 content
2024-09-09 15:51 Second round of amd-pstate 6.12 content Mario Limonciello
@ 2024-09-09 16:38 ` Rafael J. Wysocki
2024-09-11 14:43 ` Rafael J. Wysocki
0 siblings, 1 reply; 5+ messages in thread
From: Rafael J. Wysocki @ 2024-09-09 16:38 UTC (permalink / raw)
To: Mario Limonciello; +Cc: Rafael J. Wysocki, Linux PM
Hi Mario,
On Mon, Sep 9, 2024 at 5:52 PM Mario Limonciello
<mario.limonciello@amd.com> wrote:
>
> Hi,
>
> The following changes since commit 8cc214312cf8a0c3702edd1aa52e507262adccb9:
>
> Merge branch 'pm-opp' into linux-next (2024-09-06 20:53:58 +0200)
>
> are available in the Git repository at:
>
>
> ssh://git@gitolite.kernel.org/pub/scm/linux/kernel/git/superm1/linux.git
> tags/amd-pstate-v6.12-2024-09-09
>
> for you to fetch changes up to e121c01c0422fc56033d0dfa1bf3f0366115d2d5:
>
> cpufreq/amd-pstate-ut: Add test case for mode switches (2024-09-09
> 10:26:26 -0500)
>
> ----------------------------------------------------------------
> second round of amd-pstate changes for 6.12:
>
> * Move the calculation of the AMD boost numerator outside of
> amd-pstate, correcting acpi-cpufreq on systems with preferred cores
> * Harden preferred core detection to avoid potential false positives
> * Add extra unit test coverage for mode state machine
>
> ----------------------------------------------------------------
> Mario Limonciello (13):
> x86/amd: Move amd_get_highest_perf() from amd.c to cppc.c
> ACPI: CPPC: Adjust return code for inline functions in
> !CONFIG_ACPI_CPPC_LIB
> x86/amd: Rename amd_get_highest_perf() to
> amd_get_boost_ratio_numerator()
> ACPI: CPPC: Drop check for non zero perf ratio
> ACPI: CPPC: Adjust debug messages in amd_set_max_freq_ratio() to warn
> x86/amd: Move amd_get_highest_perf() out of amd-pstate
> x86/amd: Detect preferred cores in amd_get_boost_ratio_numerator()
> cpufreq: amd-pstate: Merge amd_pstate_highest_perf_set() into
> amd_get_boost_ratio_numerator()
> cpufreq: amd-pstate: Optimize amd_pstate_update_limits()
> cpufreq: amd-pstate: Add documentation for `amd_pstate_hw_prefcore`
> amd-pstate: Add missing documentation for
> `amd_pstate_prefcore_ranking`
> cpufreq/amd-pstate: Export symbols for changing modes
> cpufreq/amd-pstate-ut: Add test case for mode switches
>
> Documentation/admin-guide/pm/amd-pstate.rst | 15 ++++++++++++++-
> arch/x86/include/asm/processor.h | 3 ---
> arch/x86/kernel/acpi/cppc.c | 172
> +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------
> arch/x86/kernel/cpu/amd.c | 16 ----------------
> drivers/cpufreq/acpi-cpufreq.c | 12 +++++++++---
> drivers/cpufreq/amd-pstate-ut.c | 41
> ++++++++++++++++++++++++++++++++++++++++-
> drivers/cpufreq/amd-pstate.c | 151
> +++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------
> drivers/cpufreq/amd-pstate.h | 14 ++++++++++++++
> include/acpi/cppc_acpi.h | 41
> ++++++++++++++++++++++++++++-------------
> 9 files changed, 305 insertions(+), 160 deletions(-)
Pulled and added to the linux-next branch in linux-pm.git, thanks!
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Second round of amd-pstate 6.12 content
2024-09-09 16:38 ` Rafael J. Wysocki
@ 2024-09-11 14:43 ` Rafael J. Wysocki
2024-09-11 14:48 ` Mario Limonciello
0 siblings, 1 reply; 5+ messages in thread
From: Rafael J. Wysocki @ 2024-09-11 14:43 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: Mario Limonciello, Linux PM
On Mon, Sep 9, 2024 at 6:38 PM Rafael J. Wysocki <rafael@kernel.org> wrote:
>
> Hi Mario,
>
> On Mon, Sep 9, 2024 at 5:52 PM Mario Limonciello
> <mario.limonciello@amd.com> wrote:
> >
> > Hi,
> >
> > The following changes since commit 8cc214312cf8a0c3702edd1aa52e507262adccb9:
> >
> > Merge branch 'pm-opp' into linux-next (2024-09-06 20:53:58 +0200)
> >
> > are available in the Git repository at:
> >
> >
> > ssh://git@gitolite.kernel.org/pub/scm/linux/kernel/git/superm1/linux.git
> > tags/amd-pstate-v6.12-2024-09-09
> >
> > for you to fetch changes up to e121c01c0422fc56033d0dfa1bf3f0366115d2d5:
> >
> > cpufreq/amd-pstate-ut: Add test case for mode switches (2024-09-09
> > 10:26:26 -0500)
> >
> > ----------------------------------------------------------------
> > second round of amd-pstate changes for 6.12:
> >
> > * Move the calculation of the AMD boost numerator outside of
> > amd-pstate, correcting acpi-cpufreq on systems with preferred cores
> > * Harden preferred core detection to avoid potential false positives
> > * Add extra unit test coverage for mode state machine
> >
> > ----------------------------------------------------------------
> > Mario Limonciello (13):
> > x86/amd: Move amd_get_highest_perf() from amd.c to cppc.c
> > ACPI: CPPC: Adjust return code for inline functions in
> > !CONFIG_ACPI_CPPC_LIB
> > x86/amd: Rename amd_get_highest_perf() to
> > amd_get_boost_ratio_numerator()
> > ACPI: CPPC: Drop check for non zero perf ratio
> > ACPI: CPPC: Adjust debug messages in amd_set_max_freq_ratio() to warn
> > x86/amd: Move amd_get_highest_perf() out of amd-pstate
> > x86/amd: Detect preferred cores in amd_get_boost_ratio_numerator()
> > cpufreq: amd-pstate: Merge amd_pstate_highest_perf_set() into
> > amd_get_boost_ratio_numerator()
> > cpufreq: amd-pstate: Optimize amd_pstate_update_limits()
> > cpufreq: amd-pstate: Add documentation for `amd_pstate_hw_prefcore`
> > amd-pstate: Add missing documentation for
> > `amd_pstate_prefcore_ranking`
> > cpufreq/amd-pstate: Export symbols for changing modes
> > cpufreq/amd-pstate-ut: Add test case for mode switches
> >
> > Documentation/admin-guide/pm/amd-pstate.rst | 15 ++++++++++++++-
> > arch/x86/include/asm/processor.h | 3 ---
> > arch/x86/kernel/acpi/cppc.c | 172
> > +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------
> > arch/x86/kernel/cpu/amd.c | 16 ----------------
> > drivers/cpufreq/acpi-cpufreq.c | 12 +++++++++---
> > drivers/cpufreq/amd-pstate-ut.c | 41
> > ++++++++++++++++++++++++++++++++++++++++-
> > drivers/cpufreq/amd-pstate.c | 151
> > +++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------
> > drivers/cpufreq/amd-pstate.h | 14 ++++++++++++++
> > include/acpi/cppc_acpi.h | 41
> > ++++++++++++++++++++++++++++-------------
> > 9 files changed, 305 insertions(+), 160 deletions(-)
>
> Pulled and added to the linux-next branch in linux-pm.git, thanks!
And unpulled because it was based on the linux-next branch of the day.
Basically, please don't do this.
Please base your pull requests on top of mainline commits and if there
are dependencies out-of-the-mainline dependencies you need to pull in,
please ask for immutable branches to pull from.
Thanks!
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Second round of amd-pstate 6.12 content
2024-09-11 14:43 ` Rafael J. Wysocki
@ 2024-09-11 14:48 ` Mario Limonciello
2024-09-11 15:06 ` Rafael J. Wysocki
0 siblings, 1 reply; 5+ messages in thread
From: Mario Limonciello @ 2024-09-11 14:48 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: Linux PM
On 9/11/2024 09:43, Rafael J. Wysocki wrote:
> On Mon, Sep 9, 2024 at 6:38 PM Rafael J. Wysocki <rafael@kernel.org> wrote:
>>
>> Hi Mario,
>>
>> On Mon, Sep 9, 2024 at 5:52 PM Mario Limonciello
>> <mario.limonciello@amd.com> wrote:
>>>
>>> Hi,
>>>
>>> The following changes since commit 8cc214312cf8a0c3702edd1aa52e507262adccb9:
>>>
>>> Merge branch 'pm-opp' into linux-next (2024-09-06 20:53:58 +0200)
>>>
>>> are available in the Git repository at:
>>>
>>>
>>> ssh://git@gitolite.kernel.org/pub/scm/linux/kernel/git/superm1/linux.git
>>> tags/amd-pstate-v6.12-2024-09-09
>>>
>>> for you to fetch changes up to e121c01c0422fc56033d0dfa1bf3f0366115d2d5:
>>>
>>> cpufreq/amd-pstate-ut: Add test case for mode switches (2024-09-09
>>> 10:26:26 -0500)
>>>
>>> ----------------------------------------------------------------
>>> second round of amd-pstate changes for 6.12:
>>>
>>> * Move the calculation of the AMD boost numerator outside of
>>> amd-pstate, correcting acpi-cpufreq on systems with preferred cores
>>> * Harden preferred core detection to avoid potential false positives
>>> * Add extra unit test coverage for mode state machine
>>>
>>> ----------------------------------------------------------------
>>> Mario Limonciello (13):
>>> x86/amd: Move amd_get_highest_perf() from amd.c to cppc.c
>>> ACPI: CPPC: Adjust return code for inline functions in
>>> !CONFIG_ACPI_CPPC_LIB
>>> x86/amd: Rename amd_get_highest_perf() to
>>> amd_get_boost_ratio_numerator()
>>> ACPI: CPPC: Drop check for non zero perf ratio
>>> ACPI: CPPC: Adjust debug messages in amd_set_max_freq_ratio() to warn
>>> x86/amd: Move amd_get_highest_perf() out of amd-pstate
>>> x86/amd: Detect preferred cores in amd_get_boost_ratio_numerator()
>>> cpufreq: amd-pstate: Merge amd_pstate_highest_perf_set() into
>>> amd_get_boost_ratio_numerator()
>>> cpufreq: amd-pstate: Optimize amd_pstate_update_limits()
>>> cpufreq: amd-pstate: Add documentation for `amd_pstate_hw_prefcore`
>>> amd-pstate: Add missing documentation for
>>> `amd_pstate_prefcore_ranking`
>>> cpufreq/amd-pstate: Export symbols for changing modes
>>> cpufreq/amd-pstate-ut: Add test case for mode switches
>>>
>>> Documentation/admin-guide/pm/amd-pstate.rst | 15 ++++++++++++++-
>>> arch/x86/include/asm/processor.h | 3 ---
>>> arch/x86/kernel/acpi/cppc.c | 172
>>> +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------
>>> arch/x86/kernel/cpu/amd.c | 16 ----------------
>>> drivers/cpufreq/acpi-cpufreq.c | 12 +++++++++---
>>> drivers/cpufreq/amd-pstate-ut.c | 41
>>> ++++++++++++++++++++++++++++++++++++++++-
>>> drivers/cpufreq/amd-pstate.c | 151
>>> +++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------
>>> drivers/cpufreq/amd-pstate.h | 14 ++++++++++++++
>>> include/acpi/cppc_acpi.h | 41
>>> ++++++++++++++++++++++++++++-------------
>>> 9 files changed, 305 insertions(+), 160 deletions(-)
>>
>> Pulled and added to the linux-next branch in linux-pm.git, thanks!
>
> And unpulled because it was based on the linux-next branch of the day.
>
> Basically, please don't do this.
>
> Please base your pull requests on top of mainline commits and if there
> are dependencies out-of-the-mainline dependencies you need to pull in,
> please ask for immutable branches to pull from.
>
> Thanks!
Ah. That's what I did originally, but there was a conflict specifically
because this got applied through another tree and I ran into problems
when I tried to do a test merge before sending out the PR.
commit 5493f9714e4c ("cpufreq: amd-pstate: add check for
cpufreq_cpu_get's return value")
So I figured it was better to rebase. In this case can you please make
me an immutable branch and I'll redo the PR from that?
Thanks!
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Second round of amd-pstate 6.12 content
2024-09-11 14:48 ` Mario Limonciello
@ 2024-09-11 15:06 ` Rafael J. Wysocki
0 siblings, 0 replies; 5+ messages in thread
From: Rafael J. Wysocki @ 2024-09-11 15:06 UTC (permalink / raw)
To: Mario Limonciello; +Cc: Rafael J. Wysocki, Linux PM
On Wed, Sep 11, 2024 at 4:48 PM Mario Limonciello
<mario.limonciello@amd.com> wrote:
>
> On 9/11/2024 09:43, Rafael J. Wysocki wrote:
> > On Mon, Sep 9, 2024 at 6:38 PM Rafael J. Wysocki <rafael@kernel.org> wrote:
> >>
> >> Hi Mario,
> >>
> >> On Mon, Sep 9, 2024 at 5:52 PM Mario Limonciello
> >> <mario.limonciello@amd.com> wrote:
> >>>
> >>> Hi,
> >>>
> >>> The following changes since commit 8cc214312cf8a0c3702edd1aa52e507262adccb9:
> >>>
> >>> Merge branch 'pm-opp' into linux-next (2024-09-06 20:53:58 +0200)
> >>>
> >>> are available in the Git repository at:
> >>>
> >>>
> >>> ssh://git@gitolite.kernel.org/pub/scm/linux/kernel/git/superm1/linux.git
> >>> tags/amd-pstate-v6.12-2024-09-09
> >>>
> >>> for you to fetch changes up to e121c01c0422fc56033d0dfa1bf3f0366115d2d5:
> >>>
> >>> cpufreq/amd-pstate-ut: Add test case for mode switches (2024-09-09
> >>> 10:26:26 -0500)
> >>>
> >>> ----------------------------------------------------------------
> >>> second round of amd-pstate changes for 6.12:
> >>>
> >>> * Move the calculation of the AMD boost numerator outside of
> >>> amd-pstate, correcting acpi-cpufreq on systems with preferred cores
> >>> * Harden preferred core detection to avoid potential false positives
> >>> * Add extra unit test coverage for mode state machine
> >>>
> >>> ----------------------------------------------------------------
> >>> Mario Limonciello (13):
> >>> x86/amd: Move amd_get_highest_perf() from amd.c to cppc.c
> >>> ACPI: CPPC: Adjust return code for inline functions in
> >>> !CONFIG_ACPI_CPPC_LIB
> >>> x86/amd: Rename amd_get_highest_perf() to
> >>> amd_get_boost_ratio_numerator()
> >>> ACPI: CPPC: Drop check for non zero perf ratio
> >>> ACPI: CPPC: Adjust debug messages in amd_set_max_freq_ratio() to warn
> >>> x86/amd: Move amd_get_highest_perf() out of amd-pstate
> >>> x86/amd: Detect preferred cores in amd_get_boost_ratio_numerator()
> >>> cpufreq: amd-pstate: Merge amd_pstate_highest_perf_set() into
> >>> amd_get_boost_ratio_numerator()
> >>> cpufreq: amd-pstate: Optimize amd_pstate_update_limits()
> >>> cpufreq: amd-pstate: Add documentation for `amd_pstate_hw_prefcore`
> >>> amd-pstate: Add missing documentation for
> >>> `amd_pstate_prefcore_ranking`
> >>> cpufreq/amd-pstate: Export symbols for changing modes
> >>> cpufreq/amd-pstate-ut: Add test case for mode switches
> >>>
> >>> Documentation/admin-guide/pm/amd-pstate.rst | 15 ++++++++++++++-
> >>> arch/x86/include/asm/processor.h | 3 ---
> >>> arch/x86/kernel/acpi/cppc.c | 172
> >>> +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------
> >>> arch/x86/kernel/cpu/amd.c | 16 ----------------
> >>> drivers/cpufreq/acpi-cpufreq.c | 12 +++++++++---
> >>> drivers/cpufreq/amd-pstate-ut.c | 41
> >>> ++++++++++++++++++++++++++++++++++++++++-
> >>> drivers/cpufreq/amd-pstate.c | 151
> >>> +++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------
> >>> drivers/cpufreq/amd-pstate.h | 14 ++++++++++++++
> >>> include/acpi/cppc_acpi.h | 41
> >>> ++++++++++++++++++++++++++++-------------
> >>> 9 files changed, 305 insertions(+), 160 deletions(-)
> >>
> >> Pulled and added to the linux-next branch in linux-pm.git, thanks!
> >
> > And unpulled because it was based on the linux-next branch of the day.
> >
> > Basically, please don't do this.
> >
> > Please base your pull requests on top of mainline commits and if there
> > are dependencies out-of-the-mainline dependencies you need to pull in,
> > please ask for immutable branches to pull from.
> >
> > Thanks!
>
> Ah. That's what I did originally, but there was a conflict specifically
> because this got applied through another tree and I ran into problems
> when I tried to do a test merge before sending out the PR.
>
> commit 5493f9714e4c ("cpufreq: amd-pstate: add check for
> cpufreq_cpu_get's return value")
>
> So I figured it was better to rebase. In this case can you please make
> me an immutable branch and I'll redo the PR from that?
If I'm not mistaken, you can pull this:
git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git
tags/cpufreq-arm-updates-6.12
as per
https://lore.kernel.org/linux-pm/20240906054735.cbsjpwvpelgukppq@vireshk-i7/
and apply your changes on top of that merge.
Alternatively, I can just cherry pick them from the branch I have
pulled and apply them myself, whichever you prefer.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-09-11 15:06 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-09 15:51 Second round of amd-pstate 6.12 content Mario Limonciello
2024-09-09 16:38 ` Rafael J. Wysocki
2024-09-11 14:43 ` Rafael J. Wysocki
2024-09-11 14:48 ` Mario Limonciello
2024-09-11 15:06 ` Rafael J. Wysocki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox