Skip to contentSkip to conversation

intel_idle: remove a couple of useless variables

PATCH Superseded Artem Bityutskiy 2 participants 4 messages Sep 24, 2021 – Sep 27, 2021 Intel idle driver

lore
Share & tools
lore

Artem Bityutskiy

author maintainer
#0 lore raw

PATCH 1/1 intel_idle: remove a couple of useless variables

From: Artem Bityutskiy <[email protected]>

This patch is a cleanup and has no functional impact.

Remove the 'auto_demotion_disable_flags' and 'disable_promotion_to_c1e' global variables because we already have them in the global 'icpu' structure. Other 'icpu' members like 'use_acpi' are not duplicated, and it's better to be consistent on this. Consistency improves readability.

---
 drivers/idle/intel_idle.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)
drivers/idle/intel_idle.c +3 -8
index 70c2237a7261..eb28c3059351 100644
@@ -67,9 +67,6 @@ static unsigned int disabled_states_mask;
 
 static struct cpuidle_device __percpu *intel_idle_cpuidle_devices;
 
-static unsigned long auto_demotion_disable_flags;
-static bool disable_promotion_to_c1e;
-
 struct idle_cpu {
 	struct cpuidle_state *state_table;
 
@@ -1644,7 +1641,7 @@ static void auto_demotion_disable(void)
 	unsigned long long msr_bits;
 
 	rdmsrl(MSR_PKG_CST_CONFIG_CONTROL, msr_bits);
-	msr_bits &= ~auto_demotion_disable_flags;
+	msr_bits &= ~icpu->auto_demotion_disable_flags;
 	wrmsrl(MSR_PKG_CST_CONFIG_CONTROL, msr_bits);
 }
 
@@ -1676,10 +1673,10 @@ static int intel_idle_cpu_init(unsigned int cpu)
 		return -EIO;
 	}
 
-	if (auto_demotion_disable_flags)
+	if (icpu->auto_demotion_disable_flags)
 		auto_demotion_disable();
 
-	if (disable_promotion_to_c1e)
+	if (icpu->disable_promotion_to_c1e)
 		c1e_promotion_disable();
 
 	return 0;
@@ -1757,8 +1754,6 @@ static int __init intel_idle_init(void)
 	icpu = (const struct idle_cpu *)id->driver_data;
 	if (icpu) {
 		cpuidle_state_table = icpu->state_table;
-		auto_demotion_disable_flags = icpu->auto_demotion_disable_flags;
-		disable_promotion_to_c1e = icpu->disable_promotion_to_c1e;
 		if (icpu->use_acpi || force_use_acpi)
 			intel_idle_acpi_cst_extract();
 	} else if (!intel_idle_acpi_cst_extract()) {
Signature · 1 line
2.31.1
author maintainer
#1 lore raw

PATCH v2 1/1 intel_idle: remove a couple of useless variables

From: Artem Bityutskiy <[email protected]>

This patch is a cleanup and has no functional impact.

Remove the 'auto_demotion_disable_flags' and 'disable_promotion_to_c1e' global variables because we already have them in the global 'icpu' structure. Other 'icpu' members like 'use_acpi' are not duplicated, and it's better to be consistent on this. Consistency improves readability.

---

Changes since v1:
* fixed crash on a platform for which the driver does not have a table. In this case 'icpu' is NULL and we need to check for NULL in 'intel_idle_cpu_init()'.

 drivers/idle/intel_idle.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/idle/intel_idle.c +6 -8
index 70c2237a7261..a73183016dd4 100644
@@ -67,9 +67,6 @@ static unsigned int disabled_states_mask;
 
 static struct cpuidle_device __percpu *intel_idle_cpuidle_devices;
 
-static unsigned long auto_demotion_disable_flags;
-static bool disable_promotion_to_c1e;
-
 struct idle_cpu {
 	struct cpuidle_state *state_table;
 
@@ -1644,7 +1641,7 @@ static void auto_demotion_disable(void)
 	unsigned long long msr_bits;
 
 	rdmsrl(MSR_PKG_CST_CONFIG_CONTROL, msr_bits);
-	msr_bits &= ~auto_demotion_disable_flags;
+	msr_bits &= ~icpu->auto_demotion_disable_flags;
 	wrmsrl(MSR_PKG_CST_CONFIG_CONTROL, msr_bits);
 }
 
@@ -1676,10 +1673,13 @@ static int intel_idle_cpu_init(unsigned int cpu)
 		return -EIO;
 	}
 
-	if (auto_demotion_disable_flags)
+	if (!icpu)
+		return 0;
+
+	if (icpu->auto_demotion_disable_flags)
 		auto_demotion_disable();
 
-	if (disable_promotion_to_c1e)
+	if (icpu->disable_promotion_to_c1e)
 		c1e_promotion_disable();
 
 	return 0;
@@ -1757,8 +1757,6 @@ static int __init intel_idle_init(void)
 	icpu = (const struct idle_cpu *)id->driver_data;
 	if (icpu) {
 		cpuidle_state_table = icpu->state_table;
-		auto_demotion_disable_flags = icpu->auto_demotion_disable_flags;
-		disable_promotion_to_c1e = icpu->disable_promotion_to_c1e;
 		if (icpu->use_acpi || force_use_acpi)
 			intel_idle_acpi_cst_extract();
 	} else if (!intel_idle_acpi_cst_extract()) {
Signature · 1 line
2.31.1
#2 lore raw
Quoted 4 lines · Artem Bityutskiy

From: Artem Bityutskiy <[email protected]>

This patch is a cleanup and has no functional impact.

Are you sure?

Quoted 2 lines

Remove the 'auto_demotion_disable_flags' and 'disable_promotion_to_c1e' global variables because we already have them in the global 'icpu' structure.

Which is __initdata and these variables aren't.

Quoted 1 line

Other 'icpu' members like 'use_acpi' are not duplicated,

Because it is not necessary to access them after initialization.

Quoted 1 line

and it's better to be consistent on this.

Well, the code is as consistent as it can be.

Quoted 1 line

Consistency improves readability.

That's true, but it has no bearing in this particular case IMO.

Quoted 62 lines

---

Changes since v1:
* fixed crash on a platform for which the driver does not have a table. In this case 'icpu' is NULL and we need to check for NULL in 'intel_idle_cpu_init()'.

 drivers/idle/intel_idle.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/idle/intel_idle.c +6 -9
index 70c2237a7261..a73183016dd4 100644
@@ -67,9 +67,6 @@ static unsigned int disabled_states_mask;
 
 static struct cpuidle_device __percpu *intel_idle_cpuidle_devices;
 
-static unsigned long auto_demotion_disable_flags;
-static bool disable_promotion_to_c1e;
-
 struct idle_cpu {
        struct cpuidle_state *state_table;
 
@@ -1644,7 +1641,7 @@ static void auto_demotion_disable(void)
        unsigned long long msr_bits;
 
        rdmsrl(MSR_PKG_CST_CONFIG_CONTROL, msr_bits);
-       msr_bits &= ~auto_demotion_disable_flags;
+       msr_bits &= ~icpu->auto_demotion_disable_flags;
        wrmsrl(MSR_PKG_CST_CONFIG_CONTROL, msr_bits);
 }
 
@@ -1676,10 +1673,13 @@ static int intel_idle_cpu_init(unsigned int cpu)
                return -EIO;
        }
 
-       if (auto_demotion_disable_flags)
+       if (!icpu)
+               return 0;
+
+       if (icpu->auto_demotion_disable_flags)
                auto_demotion_disable();
 
-       if (disable_promotion_to_c1e)
+       if (icpu->disable_promotion_to_c1e)
                c1e_promotion_disable();
 
        return 0;
@@ -1757,8 +1757,6 @@ static int __init intel_idle_init(void)
        icpu = (const struct idle_cpu *)id->driver_data;
        if (icpu) {
                cpuidle_state_table = icpu->state_table;
-               auto_demotion_disable_flags = icpu->auto_demotion_disable_flags;
-               disable_promotion_to_c1e = icpu->disable_promotion_to_c1e;
                if (icpu->use_acpi || force_use_acpi)
                        intel_idle_acpi_cst_extract();
        } else if (!intel_idle_acpi_cst_extract()) {
--

2.31.1

author maintainer
#3 lore raw
Quoted 7 lines · Rafael J. Wysocki
Quoted 4 lines · Artem Bityutskiy

From: Artem Bityutskiy <[email protected]>

This patch is a cleanup and has no functional impact.

Are you sure?

Not anymore. I shouldn't have sent this patch out so quickly, sorry. Thanks for review.

Artem.