From: Sasha Levin Date: Tue, 30 Jul 2024 14:00:47 +0000 (-0400) Subject: Drop cpufreq-amd-pstate-ut-convert-nominal_freq-to-khz-du.patch from older trees X-Git-Tag: v6.1.103~15^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=db53e4776244bbbdb83c295b0af0331f4eca7985;p=thirdparty%2Fkernel%2Fstable-queue.git Drop cpufreq-amd-pstate-ut-convert-nominal_freq-to-khz-du.patch from older trees Signed-off-by: Sasha Levin --- 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 index 4cc5394fc26..00000000000 --- a/queue-6.1/cpufreq-amd-pstate-ut-convert-nominal_freq-to-khz-du.patch +++ /dev/null @@ -1,73 +0,0 @@ -From f85ae19ed758f5a5c7e84c8a7f73149be6ed491a Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 2 Jul 2024 08:14:13 +0000 -Subject: cpufreq/amd-pstate-ut: Convert nominal_freq to khz during comparisons - -From: Dhananjay Ugwekar - -[ 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 -Signed-off-by: Dhananjay Ugwekar -Reviewed-by: Mario Limonciello -Reviewed-by: Gautham R. Shenoy -Link: https://lore.kernel.org/r/20240702081413.5688-2-Dhananjay.Ugwekar@amd.com -Signed-off-by: Mario Limonciello -Signed-off-by: Sasha Levin ---- - 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 d3dd5aa95d2..14713bb544b 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -73,7 +73,6 @@ m68k-atari-fix-tt-bootup-freeze-unexpected-scu-inter.patch x86-xen-convert-comma-to-semicolon.patch arm64-dts-rockchip-add-missing-power-domains-for-rk3.patch arm64-dts-qcom-sm6350-add-missing-qcom-non-secure-do.patch -cpufreq-amd-pstate-ut-convert-nominal_freq-to-khz-du.patch m68k-cmpxchg-fix-return-value-for-default-case-in-__.patch arm-spitz-fix-gpio-assignment-for-backlight.patch vmlinux.lds.h-catch-.bss.l-sections-into-bss.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 index 0ef76ee322d..00000000000 --- a/queue-6.6/cpufreq-amd-pstate-ut-convert-nominal_freq-to-khz-du.patch +++ /dev/null @@ -1,73 +0,0 @@ -From ac333983a0338e3009be4d5a59af25fb2da7130c Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 2 Jul 2024 08:14:13 +0000 -Subject: cpufreq/amd-pstate-ut: Convert nominal_freq to khz during comparisons - -From: Dhananjay Ugwekar - -[ 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 -Signed-off-by: Dhananjay Ugwekar -Reviewed-by: Mario Limonciello -Reviewed-by: Gautham R. Shenoy -Link: https://lore.kernel.org/r/20240702081413.5688-2-Dhananjay.Ugwekar@amd.com -Signed-off-by: Mario Limonciello -Signed-off-by: Sasha Levin ---- - 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 e7203bd231f..dddb4caeb75 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -100,7 +100,6 @@ arm64-dts-rockchip-remove-unused-usb2-nodes-for-lunz.patch arm64-dts-rockchip-disable-display-subsystem-for-lun.patch arm64-dts-rockchip-fixes-phy-reset-for-lunzn-fastrhi.patch arm64-dts-qcom-sm6350-add-missing-qcom-non-secure-do.patch -cpufreq-amd-pstate-ut-convert-nominal_freq-to-khz-du.patch cpufreq-amd-pstate-fix-the-scaling_max_freq-setting-.patch m68k-cmpxchg-fix-return-value-for-default-case-in-__.patch arm-spitz-fix-gpio-assignment-for-backlight.patch