From: Greg Kroah-Hartman Date: Thu, 16 Oct 2025 14:25:46 +0000 (+0200) Subject: drop cpufreq-cppc-avoid-using-cpufreq_eternal-as-transition-delay.patch from older... X-Git-Tag: v5.15.195~51 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9fbdbe7883e68c9cfc12c6eb205f1ae2b0c4b20b;p=thirdparty%2Fkernel%2Fstable-queue.git drop cpufreq-cppc-avoid-using-cpufreq_eternal-as-transition-delay.patch from older queues breaks the build --- diff --git a/queue-6.1/cpufreq-cppc-avoid-using-cpufreq_eternal-as-transition-delay.patch b/queue-6.1/cpufreq-cppc-avoid-using-cpufreq_eternal-as-transition-delay.patch deleted file mode 100644 index b2086a314b..0000000000 --- a/queue-6.1/cpufreq-cppc-avoid-using-cpufreq_eternal-as-transition-delay.patch +++ /dev/null @@ -1,65 +0,0 @@ -From f965d111e68f4a993cc44d487d416e3d954eea11 Mon Sep 17 00:00:00 2001 -From: "Rafael J. Wysocki" -Date: Fri, 26 Sep 2025 12:19:41 +0200 -Subject: cpufreq: CPPC: Avoid using CPUFREQ_ETERNAL as transition delay - -From: Rafael J. Wysocki - -commit f965d111e68f4a993cc44d487d416e3d954eea11 upstream. - -If cppc_get_transition_latency() returns CPUFREQ_ETERNAL to indicate a -failure to retrieve the transition latency value from the platform -firmware, the CPPC cpufreq driver will use that value (converted to -microseconds) as the policy transition delay, but it is way too large -for any practical use. - -Address this by making the driver use the cpufreq's default -transition latency value (in microseconds) as the transition delay -if CPUFREQ_ETERNAL is returned by cppc_get_transition_latency(). - -Fixes: d4f3388afd48 ("cpufreq / CPPC: Set platform specific transition_delay_us") -Cc: 5.19+ # 5.19 -Signed-off-by: Rafael J. Wysocki -Reviewed-by: Mario Limonciello (AMD) -Reviewed-by: Jie Zhan -Acked-by: Viresh Kumar -Reviewed-by: Qais Yousef -Signed-off-by: Greg Kroah-Hartman ---- - drivers/cpufreq/cppc_cpufreq.c | 14 ++++++++++++-- - 1 file changed, 12 insertions(+), 2 deletions(-) - ---- a/drivers/cpufreq/cppc_cpufreq.c -+++ b/drivers/cpufreq/cppc_cpufreq.c -@@ -338,6 +338,16 @@ static int cppc_verify_policy(struct cpu - return 0; - } - -+static unsigned int __cppc_cpufreq_get_transition_delay_us(unsigned int cpu) -+{ -+ unsigned int transition_latency_ns = cppc_get_transition_latency(cpu); -+ -+ if (transition_latency_ns == CPUFREQ_ETERNAL) -+ return CPUFREQ_DEFAULT_TRANSITION_LATENCY_NS / NSEC_PER_USEC; -+ -+ return transition_latency_ns / NSEC_PER_USEC; -+} -+ - /* - * The PCC subspace describes the rate at which platform can accept commands - * on the shared PCC channel (including READs which do not count towards freq -@@ -360,12 +370,12 @@ static unsigned int cppc_cpufreq_get_tra - return 10000; - } - } -- return cppc_get_transition_latency(cpu) / NSEC_PER_USEC; -+ return __cppc_cpufreq_get_transition_delay_us(cpu); - } - #else - static unsigned int cppc_cpufreq_get_transition_delay_us(unsigned int cpu) - { -- return cppc_get_transition_latency(cpu) / NSEC_PER_USEC; -+ return __cppc_cpufreq_get_transition_delay_us(cpu); - } - #endif - diff --git a/queue-6.1/series b/queue-6.1/series index a83c366f0f..9a49e1a7b3 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -70,7 +70,6 @@ blk-crypto-fix-missing-blktrace-bio-split-events.patch btrfs-avoid-potential-out-of-bounds-in-btrfs_encode_fh.patch bus-mhi-host-do-not-use-uninitialized-dev-pointer-in-mhi_init_irq_setup.patch copy_sighand-handle-architectures-where-sizeof-unsigned-long-sizeof-u64.patch -cpufreq-cppc-avoid-using-cpufreq_eternal-as-transition-delay.patch cpufreq-intel_pstate-fix-object-lifecycle-issue-in-update_qos_request.patch crypto-aspeed-fix-dma_unmap_sg-direction.patch crypto-atmel-fix-dma_unmap_sg-direction.patch diff --git a/queue-6.12/cpufreq-cppc-avoid-using-cpufreq_eternal-as-transition-delay.patch b/queue-6.12/cpufreq-cppc-avoid-using-cpufreq_eternal-as-transition-delay.patch deleted file mode 100644 index ab94da360e..0000000000 --- a/queue-6.12/cpufreq-cppc-avoid-using-cpufreq_eternal-as-transition-delay.patch +++ /dev/null @@ -1,65 +0,0 @@ -From f965d111e68f4a993cc44d487d416e3d954eea11 Mon Sep 17 00:00:00 2001 -From: "Rafael J. Wysocki" -Date: Fri, 26 Sep 2025 12:19:41 +0200 -Subject: cpufreq: CPPC: Avoid using CPUFREQ_ETERNAL as transition delay - -From: Rafael J. Wysocki - -commit f965d111e68f4a993cc44d487d416e3d954eea11 upstream. - -If cppc_get_transition_latency() returns CPUFREQ_ETERNAL to indicate a -failure to retrieve the transition latency value from the platform -firmware, the CPPC cpufreq driver will use that value (converted to -microseconds) as the policy transition delay, but it is way too large -for any practical use. - -Address this by making the driver use the cpufreq's default -transition latency value (in microseconds) as the transition delay -if CPUFREQ_ETERNAL is returned by cppc_get_transition_latency(). - -Fixes: d4f3388afd48 ("cpufreq / CPPC: Set platform specific transition_delay_us") -Cc: 5.19+ # 5.19 -Signed-off-by: Rafael J. Wysocki -Reviewed-by: Mario Limonciello (AMD) -Reviewed-by: Jie Zhan -Acked-by: Viresh Kumar -Reviewed-by: Qais Yousef -Signed-off-by: Greg Kroah-Hartman ---- - drivers/cpufreq/cppc_cpufreq.c | 14 ++++++++++++-- - 1 file changed, 12 insertions(+), 2 deletions(-) - ---- a/drivers/cpufreq/cppc_cpufreq.c -+++ b/drivers/cpufreq/cppc_cpufreq.c -@@ -339,6 +339,16 @@ static int cppc_verify_policy(struct cpu - return 0; - } - -+static unsigned int __cppc_cpufreq_get_transition_delay_us(unsigned int cpu) -+{ -+ unsigned int transition_latency_ns = cppc_get_transition_latency(cpu); -+ -+ if (transition_latency_ns == CPUFREQ_ETERNAL) -+ return CPUFREQ_DEFAULT_TRANSITION_LATENCY_NS / NSEC_PER_USEC; -+ -+ return transition_latency_ns / NSEC_PER_USEC; -+} -+ - /* - * The PCC subspace describes the rate at which platform can accept commands - * on the shared PCC channel (including READs which do not count towards freq -@@ -361,12 +371,12 @@ static unsigned int cppc_cpufreq_get_tra - return 10000; - } - } -- return cppc_get_transition_latency(cpu) / NSEC_PER_USEC; -+ return __cppc_cpufreq_get_transition_delay_us(cpu); - } - #else - static unsigned int cppc_cpufreq_get_transition_delay_us(unsigned int cpu) - { -- return cppc_get_transition_latency(cpu) / NSEC_PER_USEC; -+ return __cppc_cpufreq_get_transition_delay_us(cpu); - } - #endif - diff --git a/queue-6.12/series b/queue-6.12/series index 5c640c38b7..722889b5bc 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -123,7 +123,6 @@ bus-mhi-ep-fix-chained-transfer-handling-in-read-path.patch bus-mhi-host-do-not-use-uninitialized-dev-pointer-in-mhi_init_irq_setup.patch clk-qcom-tcsrcc-x1e80100-set-the-bi_tcxo-as-parent-to-edp-refclk.patch copy_sighand-handle-architectures-where-sizeof-unsigned-long-sizeof-u64.patch -cpufreq-cppc-avoid-using-cpufreq_eternal-as-transition-delay.patch cpufreq-intel_pstate-fix-object-lifecycle-issue-in-update_qos_request.patch crypto-aspeed-fix-dma_unmap_sg-direction.patch crypto-atmel-fix-dma_unmap_sg-direction.patch diff --git a/queue-6.6/cpufreq-cppc-avoid-using-cpufreq_eternal-as-transition-delay.patch b/queue-6.6/cpufreq-cppc-avoid-using-cpufreq_eternal-as-transition-delay.patch deleted file mode 100644 index a53c10b129..0000000000 --- a/queue-6.6/cpufreq-cppc-avoid-using-cpufreq_eternal-as-transition-delay.patch +++ /dev/null @@ -1,65 +0,0 @@ -From f965d111e68f4a993cc44d487d416e3d954eea11 Mon Sep 17 00:00:00 2001 -From: "Rafael J. Wysocki" -Date: Fri, 26 Sep 2025 12:19:41 +0200 -Subject: cpufreq: CPPC: Avoid using CPUFREQ_ETERNAL as transition delay - -From: Rafael J. Wysocki - -commit f965d111e68f4a993cc44d487d416e3d954eea11 upstream. - -If cppc_get_transition_latency() returns CPUFREQ_ETERNAL to indicate a -failure to retrieve the transition latency value from the platform -firmware, the CPPC cpufreq driver will use that value (converted to -microseconds) as the policy transition delay, but it is way too large -for any practical use. - -Address this by making the driver use the cpufreq's default -transition latency value (in microseconds) as the transition delay -if CPUFREQ_ETERNAL is returned by cppc_get_transition_latency(). - -Fixes: d4f3388afd48 ("cpufreq / CPPC: Set platform specific transition_delay_us") -Cc: 5.19+ # 5.19 -Signed-off-by: Rafael J. Wysocki -Reviewed-by: Mario Limonciello (AMD) -Reviewed-by: Jie Zhan -Acked-by: Viresh Kumar -Reviewed-by: Qais Yousef -Signed-off-by: Greg Kroah-Hartman ---- - drivers/cpufreq/cppc_cpufreq.c | 14 ++++++++++++-- - 1 file changed, 12 insertions(+), 2 deletions(-) - ---- a/drivers/cpufreq/cppc_cpufreq.c -+++ b/drivers/cpufreq/cppc_cpufreq.c -@@ -344,6 +344,16 @@ static int cppc_verify_policy(struct cpu - return 0; - } - -+static unsigned int __cppc_cpufreq_get_transition_delay_us(unsigned int cpu) -+{ -+ unsigned int transition_latency_ns = cppc_get_transition_latency(cpu); -+ -+ if (transition_latency_ns == CPUFREQ_ETERNAL) -+ return CPUFREQ_DEFAULT_TRANSITION_LATENCY_NS / NSEC_PER_USEC; -+ -+ return transition_latency_ns / NSEC_PER_USEC; -+} -+ - /* - * The PCC subspace describes the rate at which platform can accept commands - * on the shared PCC channel (including READs which do not count towards freq -@@ -366,12 +376,12 @@ static unsigned int cppc_cpufreq_get_tra - return 10000; - } - } -- return cppc_get_transition_latency(cpu) / NSEC_PER_USEC; -+ return __cppc_cpufreq_get_transition_delay_us(cpu); - } - #else - static unsigned int cppc_cpufreq_get_transition_delay_us(unsigned int cpu) - { -- return cppc_get_transition_latency(cpu) / NSEC_PER_USEC; -+ return __cppc_cpufreq_get_transition_delay_us(cpu); - } - #endif - diff --git a/queue-6.6/series b/queue-6.6/series index eb22cc693b..531cb016b4 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -82,7 +82,6 @@ btrfs-avoid-potential-out-of-bounds-in-btrfs_encode_fh.patch bus-mhi-ep-fix-chained-transfer-handling-in-read-path.patch bus-mhi-host-do-not-use-uninitialized-dev-pointer-in-mhi_init_irq_setup.patch copy_sighand-handle-architectures-where-sizeof-unsigned-long-sizeof-u64.patch -cpufreq-cppc-avoid-using-cpufreq_eternal-as-transition-delay.patch cpufreq-intel_pstate-fix-object-lifecycle-issue-in-update_qos_request.patch crypto-aspeed-fix-dma_unmap_sg-direction.patch crypto-atmel-fix-dma_unmap_sg-direction.patch