Skip to contentSkip to conversation

cpufreq: intel_pstate: Relocate platform preference check

PATCH In review Rafael J. Wysocki 3 participants 3 messages Feb 7, 2025 – Feb 21, 2025

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cpufreq: intel_pstate: Relocate platform preference check

From: Rafael J. Wysocki <[email protected]>

Move the invocation of intel_pstate_platform_pwr_mgmt_exists() before checking whether or not HWP is enabled because it does not depend on any code running before it except for the vendor check and if CPU performance scaling is going to be carried out by the platform, all of the code that runs before that function (again, except for the vendor check) is redundant.

This is not expected to alter any functionality except for the ordering of messages printed by intel_pstate_init() when it is going to return an error before attempting to register the driver.

---
 drivers/cpufreq/intel_pstate.c |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/cpufreq/intel_pstate.c +9 -9
@@ -3688,6 +3688,15 @@
 	if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL)
 		return -ENODEV;
 
+	/*
+	 * The Intel pstate driver will be ignored if the platform
+	 * firmware has its own power management modes.
+	 */
+	if (intel_pstate_platform_pwr_mgmt_exists()) {
+		pr_info("P-states controlled by the platform\n");
+		return -ENODEV;
+	}
+
 	id = x86_match_cpu(hwp_support_ids);
 	if (id) {
 		hwp_forced = intel_pstate_hwp_is_enabled();
@@ -3743,15 +3752,6 @@
 		default_driver = &intel_cpufreq;
 
 hwp_cpu_matched:
-	/*
-	 * The Intel pstate driver will be ignored if the platform
-	 * firmware has its own power management modes.
-	 */
-	if (intel_pstate_platform_pwr_mgmt_exists()) {
-		pr_info("P-states controlled by the platform\n");
-		return -ENODEV;
-	}
-
 	if (!hwp_active && hwp_only)
 		return -ENOTSUPP;
 
#1 lore raw
Quoted 10 lines · Rafael J. Wysocki

From: Rafael J. Wysocki <[email protected]>

Move the invocation of intel_pstate_platform_pwr_mgmt_exists() before checking whether or not HWP is enabled because it does not depend on any code running before it except for the vendor check and if CPU performance scaling is going to be carried out by the platform, all of the code that runs before that function (again, except for the vendor check) is redundant.

Quoted 5 lines

This is not expected to alter any functionality except for the ordering of messages printed by intel_pstate_init() when it is going to return an error before attempting to register the driver.

Srinivas, I'm wondering if you have any concerns regarding this one?

Quoted 42 lines
---
 drivers/cpufreq/intel_pstate.c |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/cpufreq/intel_pstate.c +9 -9
@@ -3688,6 +3688,15 @@
        if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL)
                return -ENODEV;
 
+       /*
+        * The Intel pstate driver will be ignored if the platform
+        * firmware has its own power management modes.
+        */
+       if (intel_pstate_platform_pwr_mgmt_exists()) {
+               pr_info("P-states controlled by the platform\n");
+               return -ENODEV;
+       }
+
        id = x86_match_cpu(hwp_support_ids);
        if (id) {
                hwp_forced = intel_pstate_hwp_is_enabled();
@@ -3743,15 +3752,6 @@
                default_driver = &intel_cpufreq;
 
 hwp_cpu_matched:
-       /*
-        * The Intel pstate driver will be ignored if the platform
-        * firmware has its own power management modes.
-        */
-       if (intel_pstate_platform_pwr_mgmt_exists()) {
-               pr_info("P-states controlled by the platform\n");
-               return -ENODEV;
-       }
-
        if (!hwp_active && hwp_only)
                return -ENOTSUPP;
 
maintainer Acked-by
#2 lore raw
Quoted 22 lines · Rafael J. Wysocki
Quoted 20 lines · Rafael J. Wysocki

From: Rafael J. Wysocki <[email protected]>

Move the invocation of intel_pstate_platform_pwr_mgmt_exists() before
checking whether or not HWP is enabled because it does not depend on
any code running before it except for the vendor check and if CPU performance scaling is going to be carried out by the platform, all of
the code that runs before that function (again, except for the vendor
check) is redundant.

This is not expected to alter any functionality except for the ordering
of messages printed by intel_pstate_init() when it is going to return an
error before attempting to register the driver.

Quoted 3 lines
Quoted 1 line

Srinivas, I'm wondering if you have any concerns regarding this one?

None.

Thanks,
Srinivas

Quoted 43 lines
Quoted 43 lines

---
 drivers/cpufreq/intel_pstate.c |   18 +++++++++---------

 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/cpufreq/intel_pstate.c +9 -0
@@ -3688,6 +3688,15 @@
         if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL)
                 return -ENODEV;
 
+       /*
+        * The Intel pstate driver will be ignored if the platform
+        * firmware has its own power management modes.
+        */
+       if (intel_pstate_platform_pwr_mgmt_exists()) {
+               pr_info("P-states controlled by the platform\n");
+               return -ENODEV;
+       }
+
         id = x86_match_cpu(hwp_support_ids);
         if (id) {
                 hwp_forced = intel_pstate_hwp_is_enabled();
@@ -3743,15 +3752,6 @@
                 default_driver = &intel_cpufreq;
 

 hwp_cpu_matched:
-       /*
-        * The Intel pstate driver will be ignored if the platform -        * firmware has its own power management modes. -        */
-       if (intel_pstate_platform_pwr_mgmt_exists()) { -               pr_info("P-states controlled by the platform\n"); -               return -ENODEV;
-       }
-
        if (!hwp_active && hwp_only)
                return -ENOTSUPP;