Commit 3870a44d authored by Mario Limonciello's avatar Mario Limonciello Committed by Rafael J. Wysocki
Browse files

cpufreq: powernow-k8: Re-order the init checks



The powernow-k8 driver will do checks at startup that the current
active driver is acpi-cpufreq and show a warning when they're not
expected.

Because of this the following warning comes up on systems that
support amd-pstate and compiled in both drivers:
`WTF driver: amd-pstate`

The systems that support powernow-k8 will not support amd-pstate,
so re-order the checks to validate the CPU model number first to
avoid this warning being displayed on modern SOCs.

Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: default avatarHuang Rui <ray.huang@amd.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 3d13058e
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -1172,14 +1172,14 @@ static int powernowk8_init(void)
	unsigned int i, supported_cpus = 0;
	int ret;

	if (!x86_match_cpu(powernow_k8_ids))
		return -ENODEV;

	if (boot_cpu_has(X86_FEATURE_HW_PSTATE)) {
		__request_acpi_cpufreq();
		return -ENODEV;
	}

	if (!x86_match_cpu(powernow_k8_ids))
		return -ENODEV;

	cpus_read_lock();
	for_each_online_cpu(i) {
		smp_call_function_single(i, check_supported_cpu, &ret, 1);