drop cpufreq-amd-pstate-ut-convert-nominal_freq-to-khz-du.patch

diff --git a/queue-6.1/cpufreq-amd-pstate-ut-convert-nominal_freq-to-khz-du.patch b/queue-6.1/cpufreq-amd-pstate-ut-convert-nominal_freq-to-khz-du.patch
deleted file mode 100644 (file)
index b37d0d1..0000000
--- a/queue-6.1/cpufreq-amd-pstate-ut-convert-nominal_freq-to-khz-du.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 7c49aa544a7a507b628cf797d693938e74d569a2 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 2 Jul 2024 08:14:13 +0000
-Subject: cpufreq/amd-pstate-ut: Convert nominal_freq to khz during comparisons
-
-From: Dhananjay Ugwekar <Dhananjay.Ugwekar@amd.com>
-
-[ Upstream commit f21ab5ed4e8758b06230900f44b9dcbcfdc0c3ae ]
-
-cpudata->nominal_freq being in MHz whereas other frequencies being in
-KHz breaks the amd-pstate-ut frequency sanity check. This fixes it.
-
-Fixes: e4731baaf294 ("cpufreq: amd-pstate: Fix the inconsistency in max frequency units")
-Reported-by: David Arcari <darcari@redhat.com>
-Signed-off-by: Dhananjay Ugwekar <Dhananjay.Ugwekar@amd.com>
-Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
-Reviewed-by: Gautham R. Shenoy <gautham.shenoy@amd.com>
-Link: https://lore.kernel.org/r/20240702081413.5688-2-Dhananjay.Ugwekar@amd.com
-Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/cpufreq/amd-pstate-ut.c | 12 +++++++-----
- 1 file changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/drivers/cpufreq/amd-pstate-ut.c b/drivers/cpufreq/amd-pstate-ut.c
-index b448c8d6a16dd..9c1fc386c010f 100644
---- a/drivers/cpufreq/amd-pstate-ut.c
-+++ b/drivers/cpufreq/amd-pstate-ut.c
-@@ -201,6 +201,7 @@ static void amd_pstate_ut_check_freq(u32 index)
-       int cpu = 0;
-       struct cpufreq_policy *policy = NULL;
-       struct amd_cpudata *cpudata = NULL;
-+      u32 nominal_freq_khz;
- 
-       for_each_possible_cpu(cpu) {
-               policy = cpufreq_cpu_get(cpu);
-@@ -208,13 +209,14 @@ static void amd_pstate_ut_check_freq(u32 index)
-                       break;
-               cpudata = policy->driver_data;
- 
--              if (!((cpudata->max_freq >= cpudata->nominal_freq) &&
--                      (cpudata->nominal_freq > cpudata->lowest_nonlinear_freq) &&
-+              nominal_freq_khz = cpudata->nominal_freq*1000;
-+              if (!((cpudata->max_freq >= nominal_freq_khz) &&
-+                      (nominal_freq_khz > cpudata->lowest_nonlinear_freq) &&
-                       (cpudata->lowest_nonlinear_freq > cpudata->min_freq) &&
-                       (cpudata->min_freq > 0))) {
-                       amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_FAIL;
-                       pr_err("%s cpu%d max=%d >= nominal=%d > lowest_nonlinear=%d > min=%d > 0, the formula is incorrect!\n",
--                              __func__, cpu, cpudata->max_freq, cpudata->nominal_freq,
-+                              __func__, cpu, cpudata->max_freq, nominal_freq_khz,
-                               cpudata->lowest_nonlinear_freq, cpudata->min_freq);
-                       goto skip_test;
-               }
-@@ -228,13 +230,13 @@ static void amd_pstate_ut_check_freq(u32 index)
- 
-               if (cpudata->boost_supported) {
-                       if ((policy->max == cpudata->max_freq) ||
--                                      (policy->max == cpudata->nominal_freq))
-+                                      (policy->max == nominal_freq_khz))
-                               amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_PASS;
-                       else {
-                               amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_FAIL;
-                               pr_err("%s cpu%d policy_max=%d should be equal cpu_max=%d or cpu_nominal=%d !\n",
-                                       __func__, cpu, policy->max, cpudata->max_freq,
--                                      cpudata->nominal_freq);
-+                                      nominal_freq_khz);
-                               goto skip_test;
-                       }
-               } else {
--- 
-2.43.0
-

diff --git a/queue-6.1/series b/queue-6.1/series
index 4e5b19476aa919a1ad9720b24fb945e8486330b4..531f6ac56e8250debb4332738238d3834f817dc5 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -677,7 +677,6 @@ perf-sched-move-curr_thread-initialization-to-perf_s.patch
 perf-sched-move-curr_pid-and-cpu_last_switched-initi.patch
 libsubcmd-don-t-free-the-usage-string.patch
 selftests-net-remove-executable-bits-from-library-sc.patch
-cpufreq-amd-pstate-ut-convert-nominal_freq-to-khz-du.patch
 bluetooth-fix-usage-of-__hci_cmd_sync_status.patch
 fs-ntfs3-do-not-call-file_modified-if-collapse-range.patch
 fs-ntfs3-fix-sparse-warning-in-ni_fiemap.patch

diff --git a/queue-6.6/cpufreq-amd-pstate-ut-convert-nominal_freq-to-khz-du.patch b/queue-6.6/cpufreq-amd-pstate-ut-convert-nominal_freq-to-khz-du.patch
deleted file mode 100644 (file)
index 2ea1c4c..0000000
--- a/queue-6.6/cpufreq-amd-pstate-ut-convert-nominal_freq-to-khz-du.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 2f74dc2d274bf984d16bbe3ab6dfbeedcd1e08f4 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 2 Jul 2024 08:14:13 +0000
-Subject: cpufreq/amd-pstate-ut: Convert nominal_freq to khz during comparisons
-
-From: Dhananjay Ugwekar <Dhananjay.Ugwekar@amd.com>
-
-[ Upstream commit f21ab5ed4e8758b06230900f44b9dcbcfdc0c3ae ]
-
-cpudata->nominal_freq being in MHz whereas other frequencies being in
-KHz breaks the amd-pstate-ut frequency sanity check. This fixes it.
-
-Fixes: e4731baaf294 ("cpufreq: amd-pstate: Fix the inconsistency in max frequency units")
-Reported-by: David Arcari <darcari@redhat.com>
-Signed-off-by: Dhananjay Ugwekar <Dhananjay.Ugwekar@amd.com>
-Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
-Reviewed-by: Gautham R. Shenoy <gautham.shenoy@amd.com>
-Link: https://lore.kernel.org/r/20240702081413.5688-2-Dhananjay.Ugwekar@amd.com
-Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/cpufreq/amd-pstate-ut.c | 12 +++++++-----
- 1 file changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/drivers/cpufreq/amd-pstate-ut.c b/drivers/cpufreq/amd-pstate-ut.c
-index f04ae67dda372..f5e0151f50083 100644
---- a/drivers/cpufreq/amd-pstate-ut.c
-+++ b/drivers/cpufreq/amd-pstate-ut.c
-@@ -201,6 +201,7 @@ static void amd_pstate_ut_check_freq(u32 index)
-       int cpu = 0;
-       struct cpufreq_policy *policy = NULL;
-       struct amd_cpudata *cpudata = NULL;
-+      u32 nominal_freq_khz;
- 
-       for_each_possible_cpu(cpu) {
-               policy = cpufreq_cpu_get(cpu);
-@@ -208,13 +209,14 @@ static void amd_pstate_ut_check_freq(u32 index)
-                       break;
-               cpudata = policy->driver_data;
- 
--              if (!((cpudata->max_freq >= cpudata->nominal_freq) &&
--                      (cpudata->nominal_freq > cpudata->lowest_nonlinear_freq) &&
-+              nominal_freq_khz = cpudata->nominal_freq*1000;
-+              if (!((cpudata->max_freq >= nominal_freq_khz) &&
-+                      (nominal_freq_khz > cpudata->lowest_nonlinear_freq) &&
-                       (cpudata->lowest_nonlinear_freq > cpudata->min_freq) &&
-                       (cpudata->min_freq > 0))) {
-                       amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_FAIL;
-                       pr_err("%s cpu%d max=%d >= nominal=%d > lowest_nonlinear=%d > min=%d > 0, the formula is incorrect!\n",
--                              __func__, cpu, cpudata->max_freq, cpudata->nominal_freq,
-+                              __func__, cpu, cpudata->max_freq, nominal_freq_khz,
-                               cpudata->lowest_nonlinear_freq, cpudata->min_freq);
-                       goto skip_test;
-               }
-@@ -228,13 +230,13 @@ static void amd_pstate_ut_check_freq(u32 index)
- 
-               if (cpudata->boost_supported) {
-                       if ((policy->max == cpudata->max_freq) ||
--                                      (policy->max == cpudata->nominal_freq))
-+                                      (policy->max == nominal_freq_khz))
-                               amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_PASS;
-                       else {
-                               amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_FAIL;
-                               pr_err("%s cpu%d policy_max=%d should be equal cpu_max=%d or cpu_nominal=%d !\n",
-                                       __func__, cpu, policy->max, cpudata->max_freq,
--                                      cpudata->nominal_freq);
-+                                      nominal_freq_khz);
-                               goto skip_test;
-                       }
-               } else {
--- 
-2.43.0
-

diff --git a/queue-6.6/series b/queue-6.6/series
index baa2a816cbe7f5b44ca45a4adbc9af99dddd5171..0dfd1807cee08e958956ef84f583fe8d35519d93 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -40,7 +40,6 @@ perf-sched-move-curr_thread-initialization-to-perf_s.patch
 perf-sched-move-curr_pid-and-cpu_last_switched-initi.patch
 libsubcmd-don-t-free-the-usage-string.patch
 selftests-net-remove-executable-bits-from-library-sc.patch
-cpufreq-amd-pstate-ut-convert-nominal_freq-to-khz-du.patch
 selftests-introduce-makefile-variable-to-list-shared.patch
 bluetooth-fix-usage-of-__hci_cmd_sync_status.patch
 jbd2-fix-kernel-doc-for-j_transaction_overhead_buffe.patch