Drop cpufreq-use-the-fixed-and-coherent-frequency-for-sca.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-6.6/cpufreq-use-the-fixed-and-coherent-frequency-for-sca.patch b/queue-6.6/cpufreq-use-the-fixed-and-coherent-frequency-for-sca.patch
deleted file mode 100644 (file)
index 3ba1036..0000000
--- a/queue-6.6/cpufreq-use-the-fixed-and-coherent-frequency-for-sca.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 0950167d5d273ea412602497ca5452d4752040d0 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 11 Dec 2023 11:48:50 +0100
-Subject: cpufreq: Use the fixed and coherent frequency for scaling capacity
-
-From: Vincent Guittot <vincent.guittot@linaro.org>
-
-[ Upstream commit 599457ba15403037b489fe536266a3d5f9efaed7 ]
-
-cpuinfo.max_freq can change at runtime because of boost as an example. This
-implies that the value could be different from the frequency that has been
-used to compute the capacity of a CPU.
-
-The new arch_scale_freq_ref() returns a fixed and coherent frequency
-that can be used to compute the capacity for a given frequency.
-
-[ Also fix a arch_set_freq_scale()  newline style wart in <linux/cpufreq.h>. ]
-
-Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org>
-Signed-off-by: Ingo Molnar <mingo@kernel.org>
-Tested-by: Lukasz Luba <lukasz.luba@arm.com>
-Reviewed-by: Lukasz Luba <lukasz.luba@arm.com>
-Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
-Acked-by: Rafael J. Wysocki <rafael@kernel.org>
-Link: https://lore.kernel.org/r/20231211104855.558096-3-vincent.guittot@linaro.org
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/cpufreq/cpufreq.c | 4 ++--
- include/linux/cpufreq.h   | 1 +
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
-index 60ed89000e82..8c4f9c2f9c44 100644
---- a/drivers/cpufreq/cpufreq.c
-+++ b/drivers/cpufreq/cpufreq.c
-@@ -454,7 +454,7 @@ void cpufreq_freq_transition_end(struct cpufreq_policy *policy,
- 
-       arch_set_freq_scale(policy->related_cpus,
-                           policy->cur,
--                          policy->cpuinfo.max_freq);
-+                          arch_scale_freq_ref(policy->cpu));
- 
-       spin_lock(&policy->transition_lock);
-       policy->transition_ongoing = false;
-@@ -2174,7 +2174,7 @@ unsigned int cpufreq_driver_fast_switch(struct cpufreq_policy *policy,
- 
-       policy->cur = freq;
-       arch_set_freq_scale(policy->related_cpus, freq,
--                          policy->cpuinfo.max_freq);
-+                          arch_scale_freq_ref(policy->cpu));
-       cpufreq_stats_record_transition(policy, freq);
- 
-       if (trace_cpu_frequency_enabled()) {
-diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
-index 71d186d6933a..738dcddf3cfe 100644
---- a/include/linux/cpufreq.h
-+++ b/include/linux/cpufreq.h
-@@ -1211,6 +1211,7 @@ void arch_set_freq_scale(const struct cpumask *cpus,
- {
- }
- #endif
-+
- /* the following are really really optional */
- extern struct freq_attr cpufreq_freq_attr_scaling_available_freqs;
- extern struct freq_attr cpufreq_freq_attr_scaling_boost_freqs;
--- 
-2.43.0
-

diff --git a/queue-6.6/series b/queue-6.6/series
index f778eb5217c69034350a4ba950d793d76141e395..119dc48978dea965d6873c2e9e73cb1068b7357e 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -12,7 +12,6 @@ powerpc-lib-validate-size-for-vector-operations.patch
 x86-mce-mark-fatal-mce-s-page-as-poison-to-avoid-pan.patch
 perf-core-fix-narrow-startup-race-when-creating-the-.patch
 debugobjects-stop-accessing-objects-after-releasing-.patch
-cpufreq-use-the-fixed-and-coherent-frequency-for-sca.patch
 cpufreq-schedutil-use-a-fixed-reference-frequency.patch
 energy_model-use-a-fixed-reference-frequency.patch
 regulator-core-only-increment-use_count-when-enable_.patch

diff --git a/queue-6.7/cpufreq-use-the-fixed-and-coherent-frequency-for-sca.patch b/queue-6.7/cpufreq-use-the-fixed-and-coherent-frequency-for-sca.patch
deleted file mode 100644 (file)
index 79abf51..0000000
--- a/queue-6.7/cpufreq-use-the-fixed-and-coherent-frequency-for-sca.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 36ad3cf98507b32a2ba905f81b087035ef495111 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 11 Dec 2023 11:48:50 +0100
-Subject: cpufreq: Use the fixed and coherent frequency for scaling capacity
-
-From: Vincent Guittot <vincent.guittot@linaro.org>
-
-[ Upstream commit 599457ba15403037b489fe536266a3d5f9efaed7 ]
-
-cpuinfo.max_freq can change at runtime because of boost as an example. This
-implies that the value could be different from the frequency that has been
-used to compute the capacity of a CPU.
-
-The new arch_scale_freq_ref() returns a fixed and coherent frequency
-that can be used to compute the capacity for a given frequency.
-
-[ Also fix a arch_set_freq_scale()  newline style wart in <linux/cpufreq.h>. ]
-
-Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org>
-Signed-off-by: Ingo Molnar <mingo@kernel.org>
-Tested-by: Lukasz Luba <lukasz.luba@arm.com>
-Reviewed-by: Lukasz Luba <lukasz.luba@arm.com>
-Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
-Acked-by: Rafael J. Wysocki <rafael@kernel.org>
-Link: https://lore.kernel.org/r/20231211104855.558096-3-vincent.guittot@linaro.org
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/cpufreq/cpufreq.c | 4 ++--
- include/linux/cpufreq.h   | 1 +
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
-index 934d35f570b7..44db4f59c4cc 100644
---- a/drivers/cpufreq/cpufreq.c
-+++ b/drivers/cpufreq/cpufreq.c
-@@ -454,7 +454,7 @@ void cpufreq_freq_transition_end(struct cpufreq_policy *policy,
- 
-       arch_set_freq_scale(policy->related_cpus,
-                           policy->cur,
--                          policy->cpuinfo.max_freq);
-+                          arch_scale_freq_ref(policy->cpu));
- 
-       spin_lock(&policy->transition_lock);
-       policy->transition_ongoing = false;
-@@ -2174,7 +2174,7 @@ unsigned int cpufreq_driver_fast_switch(struct cpufreq_policy *policy,
- 
-       policy->cur = freq;
-       arch_set_freq_scale(policy->related_cpus, freq,
--                          policy->cpuinfo.max_freq);
-+                          arch_scale_freq_ref(policy->cpu));
-       cpufreq_stats_record_transition(policy, freq);
- 
-       if (trace_cpu_frequency_enabled()) {
-diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
-index 1c5ca92a0555..afda5f24d3dd 100644
---- a/include/linux/cpufreq.h
-+++ b/include/linux/cpufreq.h
-@@ -1203,6 +1203,7 @@ void arch_set_freq_scale(const struct cpumask *cpus,
- {
- }
- #endif
-+
- /* the following are really really optional */
- extern struct freq_attr cpufreq_freq_attr_scaling_available_freqs;
- extern struct freq_attr cpufreq_freq_attr_scaling_boost_freqs;
--- 
-2.43.0
-

diff --git a/queue-6.7/series b/queue-6.7/series
index 82647b01275519accd17b459e15df14309eb69c6..ec0b8e3b8d4e397b85082d43aba95d0a73897c41 100644 (file)
--- a/queue-6.7/series
+++ b/queue-6.7/series
@@ -12,7 +12,6 @@ x86-mce-mark-fatal-mce-s-page-as-poison-to-avoid-pan.patch
 sched-numa-fix-mm-numa_scan_seq-based-unconditional-.patch
 perf-core-fix-narrow-startup-race-when-creating-the-.patch
 debugobjects-stop-accessing-objects-after-releasing-.patch
-cpufreq-use-the-fixed-and-coherent-frequency-for-sca.patch
 cpufreq-schedutil-use-a-fixed-reference-frequency.patch
 energy_model-use-a-fixed-reference-frequency.patch
 sched-fair-fix-tg-load-when-offlining-a-cpu.patch