From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 28 Aug 2023 12:12:05 +0000 (+0200)
Subject: Merge tag 'cpufreq-arm-updates-6.6' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v6.6.17~4115^2~1^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6e2f78c8b01345e785806352dec4f44d8d992f7e;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'cpufreq-arm-updates-6.6' of git://git./linux/kernel/git/vireshk/pm

Pull ARM cpufreq updates for 6.6 from Viresh Kumar:

"- Migrate various platforms to use remove callback returning void
   (Yangtao Li).

 - Add online/offline/exit hooks for Tegra driver (Sumit Gupta).

 - Explicitly include correct DT includes (Rob Herring).

 - Frequency domain updates for qcom-hw driver (Neil Armstrong).

 - Modify AMD pstate driver return the highest_perf value (Meng Li).

 - Generic cleanups for cppc, mediatek and powernow driver (Liao Chang
   and Konrad Dybcio).

 - Add more platforms to cpufreq-arm driver's blocklist (AngeloGioacchino
   Del Regno and Konrad Dybcio).

 - brcmstb-avs-cpufreq: Fix -Warray-bounds bug (Gustavo A. R. Silva)."

* tag 'cpufreq-arm-updates-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm: (33 commits)
  cpufreq: tegra194: remove opp table in exit hook
  cpufreq: powernow-k8: Use related_cpus instead of cpus in driver.exit()
  cpufreq: tegra194: add online/offline hooks
  cpufreq: qcom-cpufreq-hw: add support for 4 freq domains
  dt-bindings: cpufreq: qcom-hw: add a 4th frequency domain
  cpufreq: cppc: Set fie_disabled to FIE_DISABLED if fails to create kworker_fie
  cpufreq: cppc: cppc_cpufreq_get_rate() returns zero in all error cases.
  cpufreq: Prefer to print cpuid in MIN/MAX QoS register error message
  cpufreq: amd-pstate-ut: Modify the function to get the highest_perf value
  cpufreq: mediatek-hw: Remove unused define
  cpufreq: blocklist more Qualcomm platforms in cpufreq-dt-platdev
  cpufreq: brcmstb-avs-cpufreq: Fix -Warray-bounds bug
  cpufreq: blocklist MSM8998 in cpufreq-dt-platdev
  cpufreq: omap: Convert to platform remove callback returning void
  cpufreq: qoriq: Convert to platform remove callback returning void
  cpufreq: acpi: Convert to platform remove callback returning void
  cpufreq: tegra186: Convert to platform remove callback returning void
  cpufreq: qcom-nvmem: Convert to platform remove callback returning void
  cpufreq: kirkwood: Convert to platform remove callback returning void
  cpufreq: pcc-cpufreq: Convert to platform remove callback returning void
  ...
---

6e2f78c8b01345e785806352dec4f44d8d992f7e
diff --cc drivers/cpufreq/amd-pstate-ut.c
index 502d494,9c889a4a..f04ae67
--- a/drivers/cpufreq/amd-pstate-ut.c
+++ b/drivers/cpufreq/amd-pstate-ut.c
@@@ -140,9 -156,10 +138,10 @@@ static void amd_pstate_ut_check_perf(u3
  			if (ret) {
  				amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_FAIL;
  				pr_err("%s cppc_get_perf_caps ret=%d error!\n", __func__, ret);
 -				return;
 +				goto skip_test;
  			}
  
+ 			highest_perf = cppc_perf.highest_perf;
  			nominal_perf = cppc_perf.nominal_perf;
  			lowest_nonlinear_perf = cppc_perf.lowest_nonlinear_perf;
  			lowest_perf = cppc_perf.lowest_perf;
@@@ -151,9 -168,10 +150,10 @@@
  			if (ret) {
  				amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_FAIL;
  				pr_err("%s read CPPC_CAP1 ret=%d error!\n", __func__, ret);
 -				return;
 +				goto skip_test;
  			}
  
+ 			highest_perf = AMD_CPPC_HIGHEST_PERF(cap1);
  			nominal_perf = AMD_CPPC_NOMINAL_PERF(cap1);
  			lowest_nonlinear_perf = AMD_CPPC_LOWNONLIN_PERF(cap1);
  			lowest_perf = AMD_CPPC_LOWEST_PERF(cap1);