drivers/cpufreq: Convert some slow-path static_cpu_has() callers to boot_cpu_has()

Using static_cpu_has() is pointless on those paths, convert them to the
boot_cpu_has() variant.

No functional changes.

Signed-off-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/cpufreq/amd_freq_sensitivity.c b/drivers/cpufreq/amd_freq_sensitivity.c
index 4ac7c3cf34bef93ab2070d1c5f69a7c3a8b0ec25..6927a8c0e748055480b62bbea7f0f1a6165d3693 100644 (file)
--- a/drivers/cpufreq/amd_freq_sensitivity.c
+++ b/drivers/cpufreq/amd_freq_sensitivity.c
@@ -124,7 +124,7 @@ static int __init amd_freq_sensitivity_init(void)
                        PCI_DEVICE_ID_AMD_KERNCZ_SMBUS, NULL);
 
        if (!pcidev) {
-               if (!static_cpu_has(X86_FEATURE_PROC_FEEDBACK))
+               if (!boot_cpu_has(X86_FEATURE_PROC_FEEDBACK))
                        return -ENODEV;
        }
 

diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index 08d1a1e845aaec65061e728404c40ba6729306b7..840500b457c63ed12247e23953a3fcc7efb6d698 100644 (file)
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -527,7 +527,7 @@ static s16 intel_pstate_get_epb(struct cpudata *cpu_data)
        u64 epb;
        int ret;
 
-       if (!static_cpu_has(X86_FEATURE_EPB))
+       if (!boot_cpu_has(X86_FEATURE_EPB))
                return -ENXIO;
 
        ret = rdmsrl_on_cpu(cpu_data->cpu, MSR_IA32_ENERGY_PERF_BIAS, &epb);
@@ -541,7 +541,7 @@ static s16 intel_pstate_get_epp(struct cpudata *cpu_data, u64 hwp_req_data)
 {
        s16 epp;
 
-       if (static_cpu_has(X86_FEATURE_HWP_EPP)) {
+       if (boot_cpu_has(X86_FEATURE_HWP_EPP)) {
                /*
                 * When hwp_req_data is 0, means that caller didn't read
                 * MSR_HWP_REQUEST, so need to read and get EPP.
@@ -566,7 +566,7 @@ static int intel_pstate_set_epb(int cpu, s16 pref)
        u64 epb;
        int ret;
 
-       if (!static_cpu_has(X86_FEATURE_EPB))
+       if (!boot_cpu_has(X86_FEATURE_EPB))
                return -ENXIO;
 
        ret = rdmsrl_on_cpu(cpu, MSR_IA32_ENERGY_PERF_BIAS, &epb);
@@ -614,7 +614,7 @@ static int intel_pstate_get_energy_pref_index(struct cpudata *cpu_data)
        if (epp < 0)
                return epp;
 
-       if (static_cpu_has(X86_FEATURE_HWP_EPP)) {
+       if (boot_cpu_has(X86_FEATURE_HWP_EPP)) {
                if (epp == HWP_EPP_PERFORMANCE)
                        return 1;
                if (epp <= HWP_EPP_BALANCE_PERFORMANCE)
@@ -623,7 +623,7 @@ static int intel_pstate_get_energy_pref_index(struct cpudata *cpu_data)
                        return 3;
                else
                        return 4;
-       } else if (static_cpu_has(X86_FEATURE_EPB)) {
+       } else if (boot_cpu_has(X86_FEATURE_EPB)) {
                /*
                 * Range:
                 *      0x00-0x03       :       Performance
@@ -651,7 +651,7 @@ static int intel_pstate_set_energy_pref_index(struct cpudata *cpu_data,
 
        mutex_lock(&intel_pstate_limits_lock);
 
-       if (static_cpu_has(X86_FEATURE_HWP_EPP)) {
+       if (boot_cpu_has(X86_FEATURE_HWP_EPP)) {
                u64 value;
 
                ret = rdmsrl_on_cpu(cpu_data->cpu, MSR_HWP_REQUEST, &value);
@@ -826,7 +826,7 @@ static void intel_pstate_hwp_set(unsigned int cpu)
                epp = cpu_data->epp_powersave;
        }
 update_epp:
-       if (static_cpu_has(X86_FEATURE_HWP_EPP)) {
+       if (boot_cpu_has(X86_FEATURE_HWP_EPP)) {
                value &= ~GENMASK_ULL(31, 24);
                value |= (u64)epp << 24;
        } else {
@@ -851,7 +851,7 @@ static void intel_pstate_hwp_force_min_perf(int cpu)
        value |= HWP_MIN_PERF(min_perf);
 
        /* Set EPP/EPB to min */
-       if (static_cpu_has(X86_FEATURE_HWP_EPP))
+       if (boot_cpu_has(X86_FEATURE_HWP_EPP))
                value |= HWP_ENERGY_PERF_PREFERENCE(HWP_EPP_POWERSAVE);
        else
                intel_pstate_set_epb(cpu, HWP_EPP_BALANCE_POWERSAVE);
@@ -1241,7 +1241,7 @@ static void __init intel_pstate_sysfs_expose_params(void)
 static void intel_pstate_hwp_enable(struct cpudata *cpudata)
 {
        /* First disable HWP notification interrupt as we don't process them */
-       if (static_cpu_has(X86_FEATURE_HWP_NOTIFY))
+       if (boot_cpu_has(X86_FEATURE_HWP_NOTIFY))
                wrmsrl_on_cpu(cpudata->cpu, MSR_HWP_INTERRUPT, 0x00);
 
        wrmsrl_on_cpu(cpudata->cpu, MSR_PM_ENABLE, 0x1);

diff --git a/drivers/cpufreq/powernow-k8.c b/drivers/cpufreq/powernow-k8.c
index fb77b39a4ce36b21047c744e906e163bf2e34fe0..3c12e03fa3430b848af5843207ac1fd84361ed7f 100644 (file)
--- a/drivers/cpufreq/powernow-k8.c
+++ b/drivers/cpufreq/powernow-k8.c
@@ -1178,7 +1178,7 @@ static int powernowk8_init(void)
        unsigned int i, supported_cpus = 0;
        int ret;
 
-       if (static_cpu_has(X86_FEATURE_HW_PSTATE)) {
+       if (boot_cpu_has(X86_FEATURE_HW_PSTATE)) {
                __request_acpi_cpufreq();
                return -ENODEV;
        }