OSDN Git Service

cpufreq: powernow-k8: Re-order the init checks
authorMario Limonciello <mario.limonciello@amd.com>
Wed, 16 Mar 2022 21:55:48 +0000 (16:55 -0500)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 17 Mar 2022 13:54:11 +0000 (14:54 +0100)
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: Mario Limonciello <mario.limonciello@amd.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: Huang Rui <ray.huang@amd.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/cpufreq/powernow-k8.c

index 12ab401..d289036 100644 (file)
@@ -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);