Skip to contentSkip to conversation

cpufreq/amd-pstate: Refactor amd_pstate_init()

PATCH In review Dhananjay Ugwekar 4 participants 9 messages Oct 17, 2024 – Oct 27, 2024

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

cover cpufreq/amd-pstate: Refactor amd_pstate_init()

Replace code chunks with function calls, improve readability and reduce redundancy.

Base: superm1/linux-next + https://lore.kernel.org/linux-pm/[email protected]/

Dhananjay Ugwekar (4):
cpufreq/amd-pstate: Call amd_pstate_register() in amd_pstate_init() cpufreq/amd-pstate: Call amd_pstate_set_driver() in
amd_pstate_register_driver()
cpufreq/amd-pstate: Remove the switch case in amd_pstate_init() cpufreq/amd-pstate: Remove the redundant amd_pstate_set_driver() call

 drivers/cpufreq/amd-pstate.c | 79 +++++++++++++-----------------------
 1 file changed, 29 insertions(+), 50 deletions(-)
Signature · 1 line
2.34.1
#1 lore raw

PATCH 1/4 cpufreq/amd-pstate: Call amd_pstate_register() in amd_pstate_init()

Replace a similar chunk of code in amd_pstate_init() with amd_pstate_register() call.

---
 drivers/cpufreq/amd-pstate.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)
drivers/cpufreq/amd-pstate.c +2 -10
index b0a1c472cc3b..856f0d11983e 100644
@@ -1879,17 +1879,10 @@ static int __init amd_pstate_init(void)
 			return ret;
 	}
 
-	/* enable amd pstate feature */
-	ret = amd_pstate_enable(true);
-	if (ret) {
-		pr_err("failed to enable driver mode(%d)\n", cppc_state);
-		return ret;
-	}
-
-	ret = cpufreq_register_driver(current_pstate_driver);
+	ret = amd_pstate_register_driver(cppc_state);
 	if (ret) {
 		pr_err("failed to register with return %d\n", ret);
-		goto disable_driver;
+		return ret;
 	}
 
 	dev_root = bus_get_dev_root(&cpu_subsys);
@@ -1906,7 +1899,6 @@ static int __init amd_pstate_init(void)
 
 global_attr_free:
 	cpufreq_unregister_driver(current_pstate_driver);
-disable_driver:
 	amd_pstate_enable(false);
 	return ret;
 }
Signature · 1 line
2.34.1
#2 lore raw

PATCH 2/4 cpufreq/amd-pstate: Call amd_pstate_set_driver() in amd_pstate_register_driver()

In reply to Dhananjay Ugwekar

Replace a similar chunk of code in amd_pstate_register_driver() with amd_pstate_set_driver() call.

---
 drivers/cpufreq/amd-pstate.c | 47 +++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 25 deletions(-)
drivers/cpufreq/amd-pstate.c +22 -25
index 856f0d11983e..5155fc0019df 100644
@@ -1191,16 +1191,32 @@ static void amd_pstate_driver_cleanup(void)
 	current_pstate_driver = NULL;
 }
 
+static int amd_pstate_set_driver(int mode_idx)
+{
+	if (mode_idx >= AMD_PSTATE_DISABLE && mode_idx < AMD_PSTATE_MAX) {
+		cppc_state = mode_idx;
+		if (cppc_state == AMD_PSTATE_DISABLE)
+			pr_info("driver is explicitly disabled\n");
+
+		if (cppc_state == AMD_PSTATE_ACTIVE)
+			current_pstate_driver = &amd_pstate_epp_driver;
+
+		if (cppc_state == AMD_PSTATE_PASSIVE || cppc_state == AMD_PSTATE_GUIDED)
+			current_pstate_driver = &amd_pstate_driver;
+
+		return 0;
+	}
+
+	return -EINVAL;
+}
+
 static int amd_pstate_register_driver(int mode)
 {
 	int ret;
 
-	if (mode == AMD_PSTATE_PASSIVE || mode == AMD_PSTATE_GUIDED)
-		current_pstate_driver = &amd_pstate_driver;
-	else if (mode == AMD_PSTATE_ACTIVE)
-		current_pstate_driver = &amd_pstate_epp_driver;
-	else
-		return -EINVAL;
+	ret = amd_pstate_set_driver(mode);
+	if (ret)
+		return ret;
 
 	cppc_state = mode;
 
@@ -1726,25 +1742,6 @@ static struct cpufreq_driver amd_pstate_epp_driver = {
 	.attr		= amd_pstate_epp_attr,
 };
 
-static int __init amd_pstate_set_driver(int mode_idx)
-{
-	if (mode_idx >= AMD_PSTATE_DISABLE && mode_idx < AMD_PSTATE_MAX) {
-		cppc_state = mode_idx;
-		if (cppc_state == AMD_PSTATE_DISABLE)
-			pr_info("driver is explicitly disabled\n");
-
-		if (cppc_state == AMD_PSTATE_ACTIVE)
-			current_pstate_driver = &amd_pstate_epp_driver;
-
-		if (cppc_state == AMD_PSTATE_PASSIVE || cppc_state == AMD_PSTATE_GUIDED)
-			current_pstate_driver = &amd_pstate_driver;
-
-		return 0;
-	}
-
-	return -EINVAL;
-}
-
 /*
  * CPPC function is not supported for family ID 17H with model_ID ranging from 0x10 to 0x2F.
  * show the debug message that helps to check if the CPU has CPPC support for loading issue.
Signature · 1 line
2.34.1
#3 lore raw

PATCH 3/4 cpufreq/amd-pstate: Remove the switch case in amd_pstate_init()

In reply to Dhananjay Ugwekar

Replace the switch case with a more readable if condition.

---
 drivers/cpufreq/amd-pstate.c | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)
drivers/cpufreq/amd-pstate.c +5 -11
index 5155fc0019df..13ee5cac901d 100644
@@ -1843,21 +1843,15 @@ static int __init amd_pstate_init(void)
 		cppc_state = CONFIG_X86_AMD_PSTATE_DEFAULT_MODE;
 	}
 
-	switch (cppc_state) {
-	case AMD_PSTATE_DISABLE:
+	if (cppc_state == AMD_PSTATE_DISABLE) {
 		pr_info("driver load is disabled, boot with specific mode to enable this\n");
 		return -ENODEV;
-	case AMD_PSTATE_PASSIVE:
-	case AMD_PSTATE_ACTIVE:
-	case AMD_PSTATE_GUIDED:
-		ret = amd_pstate_set_driver(cppc_state);
-		if (ret)
-			return ret;
-		break;
-	default:
-		return -EINVAL;
 	}
 
+	ret = amd_pstate_set_driver(cppc_state);
+	if (ret)
+		return ret;
+
 	/* capability check */
 	if (cpu_feature_enabled(X86_FEATURE_CPPC)) {
 		pr_debug("AMD CPPC MSR based functionality is supported\n");
Signature · 1 line
2.34.1
#4 lore raw

PATCH 4/4 cpufreq/amd-pstate: Remove the redundant amd_pstate_set_driver() call

In reply to Dhananjay Ugwekar

amd_pstate_set_driver() is called twice, once in amd_pstate_init() and once as part of amd_pstate_register_driver(). Move around code and eliminate the redundancy.

---
 drivers/cpufreq/amd-pstate.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
drivers/cpufreq/amd-pstate.c +4 -8
index 13ee5cac901d..6f6d961879cc 100644
@@ -1848,9 +1848,11 @@ static int __init amd_pstate_init(void)
 		return -ENODEV;
 	}
 
-	ret = amd_pstate_set_driver(cppc_state);
-	if (ret)
+	ret = amd_pstate_register_driver(cppc_state);
+	if (ret) {
+		pr_err("failed to register with return %d\n", ret);
 		return ret;
+	}
 
 	/* capability check */
 	if (cpu_feature_enabled(X86_FEATURE_CPPC)) {
@@ -1870,12 +1872,6 @@ static int __init amd_pstate_init(void)
 			return ret;
 	}
 
-	ret = amd_pstate_register_driver(cppc_state);
-	if (ret) {
-		pr_err("failed to register with return %d\n", ret);
-		return ret;
-	}
-
 	dev_root = bus_get_dev_root(&cpu_subsys);
 	if (dev_root) {
 		ret = sysfs_create_group(&dev_root->kobj, &amd_pstate_global_attr_group);
Signature · 1 line
2.34.1
#5 lore raw

Re: [PATCH 4/4] cpufreq/amd-pstate: Remove the redundant amd_pstate_set_driver() call

Hi,

Quoted 30 lines · Dhananjay Ugwekar

amd_pstate_set_driver() is called twice, once in amd_pstate_init() and once as part of amd_pstate_register_driver(). Move around code and eliminate the redundancy.

---
  drivers/cpufreq/amd-pstate.c | 12 ++++--------
  1 file changed, 4 insertions(+), 8 deletions(-)
drivers/cpufreq/amd-pstate.c +4 -2
index 13ee5cac901d..6f6d961879cc 100644
@@ -1848,9 +1848,11 @@ static int __init amd_pstate_init(void)
  		return -ENODEV;
  	}
 
-	ret = amd_pstate_set_driver(cppc_state);
-	if (ret)
+	ret = amd_pstate_register_driver(cppc_state);
+	if (ret) {
+		pr_err("failed to register with return %d\n", ret);
  		return ret;
+	}
 
  	/* capability check */
  	if (cpu_feature_enabled(X86_FEATURE_CPPC)) {
@@ -1870,12 +1872,6 @@ static int __init amd_pstate_init(void)
  			return ret;
  	}

drivers/cpufreq/amd-pstate.c static int __init amd_pstate_init(void) · line 1877

Quoted 10 lines
drivers/cpufreq/amd-pstate.c +0 -6
 
-	ret = amd_pstate_register_driver(cppc_state);
-	if (ret) {
-		pr_err("failed to register with return %d\n", ret);
-		return ret;
-	}
-
  	dev_root = bus_get_dev_root(&cpu_subsys);
  	if (dev_root) {
  		ret = sysfs_create_group(&dev_root->kobj, &amd_pstate_global_attr_group);

This seems to break boot on my Zen 2 desktop (my Zen 4 laptop is fine, however). I don't see any messages on the console and nothing shows up in the pstore either.

I'll attach the kernel log from a normal boot (with the patch reverted) in case it helps.

Please let me know if there's anything else you need.

Regards,
Klara Modin

# bad: [e99058f87395eb9a263bcadca0ae402d34a96326] crypto: rsassa-pkcs1 - Migrate to sig_alg backend
git bisect start 'HEAD'
# status: waiting for good commit(s), bad commit known
# good: [4e46774408d942efe4eb35dc62e5af3af71b9a30] Merge tag 'for-6.12-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux
git bisect good 4e46774408d942efe4eb35dc62e5af3af71b9a30
# bad: [8f803f3cc3ecbdb5ea61dbe6c38461f6ff75adae] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git
git bisect bad 8f803f3cc3ecbdb5ea61dbe6c38461f6ff75adae
# good: [b5ad19502c85ad4d8c8237d614e383dd31a920b3] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git
git bisect good b5ad19502c85ad4d8c8237d614e383dd31a920b3
# bad: [ba516a4971bb3ca67dff6dcd13d04dc63fbde292] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git
git bisect bad ba516a4971bb3ca67dff6dcd13d04dc63fbde292
# good: [e4f77835fcb3e30655e8a631358715ace26e3675] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git
git bisect good e4f77835fcb3e30655e8a631358715ace26e3675
# good: [21b9c329c48d88fb5adc1dbdc34f78b3da0d91a6] Merge branch 'docs-next' of git://git.lwn.net/linux.git
git bisect good 21b9c329c48d88fb5adc1dbdc34f78b3da0d91a6
# good: [e96c6b4a04e1ae12e0144300057af6939dfd35eb] Merge branch 'next' of git://git.linuxtv.org/media
git bisect good e96c6b4a04e1ae12e0144300057af6939dfd35eb
# good: [8a79bf447d8948d136ec64b7070bf7923c60dafd] Merge branch 'thermal-core' into linux-next
git bisect good 8a79bf447d8948d136ec64b7070bf7923c60dafd
# bad: [4ae7df8e2051753c5b6bed657a8d114d9faf02b7] Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git
git bisect bad 4ae7df8e2051753c5b6bed657a8d114d9faf02b7
# bad: [9609386c86eedfb402b6c7d0c49f1b7cbb90729b] Merge tag 'amd-pstate-v6.13-2024-10-22' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/superm1/linux git bisect bad 9609386c86eedfb402b6c7d0c49f1b7cbb90729b
# good: [2af8e3e7d80086b617d4b952bff512fec2b9c909] cpufreq/amd-pstate: Remove the redundant verify() function
git bisect good 2af8e3e7d80086b617d4b952bff512fec2b9c909
# good: [55776e5ca936184bcb6805a7cfabbf5c7c7aaf17] cpufreq/amd-pstate: Remove the switch case in amd_pstate_init()
git bisect good 55776e5ca936184bcb6805a7cfabbf5c7c7aaf17
# bad: [61e9559176a1d7ebe7492f5203259ecf272e52b0] amd-pstate: Set min_perf to nominal_perf for active mode performance gov
git bisect bad 61e9559176a1d7ebe7492f5203259ecf272e52b0
# bad: [e238968a2087a0f7799ba3c5ae5d9a666c52e324] cpufreq/amd-pstate: Remove the redundant amd_pstate_set_driver() call
git bisect bad e238968a2087a0f7799ba3c5ae5d9a666c52e324

# first bad commit: [e238968a2087a0f7799ba3c5ae5d9a666c52e324] cpufreq/amd-pstate: Remove the redundant amd_pstate_set_driver() call
#6 lore raw

Re: [PATCH 4/4] cpufreq/amd-pstate: Remove the redundant amd_pstate_set_driver() call

Quoted 44 lines · Klara Modin

Hi,

Quoted 27 lines · Dhananjay Ugwekar

amd_pstate_set_driver() is called twice, once in amd_pstate_init() and once as part of amd_pstate_register_driver(). Move around code and eliminate the redundancy.

---
  drivers/cpufreq/amd-pstate.c | 12 ++++--------

  1 file changed, 4 insertions(+), 8 deletions(-)
drivers/cpufreq/amd-pstate.c +4 -2
index 13ee5cac901d..6f6d961879cc 100644
@@ -1848,9 +1848,11 @@ static int __init amd_pstate_init(void)
           return -ENODEV;
       }
-    ret = amd_pstate_set_driver(cppc_state);
-    if (ret)
+    ret = amd_pstate_register_driver(cppc_state);
+    if (ret) {
+        pr_err("failed to register with return %d\n", ret);
           return ret;
+    }
       /* capability check */
       if (cpu_feature_enabled(X86_FEATURE_CPPC)) {
@@ -1870,12 +1872,6 @@ static int __init amd_pstate_init(void)
               return ret;

drivers/cpufreq/amd-pstate.c static int __init amd_pstate_init(void) · line 1876

Quoted 10 lines
drivers/cpufreq/amd-pstate.c +0 -6
       }
-    ret = amd_pstate_register_driver(cppc_state);
-    if (ret) {
-        pr_err("failed to register with return %d\n", ret);
-        return ret;
-    }
-
       dev_root = bus_get_dev_root(&cpu_subsys);
       if (dev_root) {
           ret = sysfs_create_group(&dev_root->kobj, &amd_pstate_global_attr_group);

This seems to break boot on my Zen 2 desktop (my Zen 4 laptop is fine, however). I don't see any messages on the console and nothing shows up in the pstore either.

Quoted 6 lines

I'll attach the kernel log from a normal boot (with the patch reverted) in case it helps.

Please let me know if there's anything else you need.

Regards,
Klara Modin

Hi,

Thanks for reporting. I think this might be a regression on shared memory designs specifically because static calls weren't updated yet.

Can you try this below diff?

drivers/cpufreq/amd-pstate.c +0 -6
index 206725219d8c9..2f0e29b05963d 100644
@@ -1857,12 +1857,6 @@ static int __init amd_pstate_init(void)
                return -ENODEV;
        }
 
-       ret = amd_pstate_register_driver(cppc_state);
-       if (ret) {
-               pr_err("failed to register with return %d\n", ret);
-               return ret;
-       }
-
        /* capability check */
        if (cpu_feature_enabled(X86_FEATURE_CPPC)) {
                pr_debug("AMD CPPC MSR based functionality is 

supported\n");
@@ -1881,6 +1875,12 @@ static int __init amd_pstate_init(void)

                        return ret;
        }

+ ret = amd_pstate_register_driver(cppc_state);
+ if (ret) {
+ pr_err("failed to register with return %d\n", ret);
+ return ret;
+ }
+

        dev_root = bus_get_dev_root(&cpu_subsys);
        if (dev_root) {
                ret = sysfs_create_group(&dev_root->kobj, 

&amd_pstate_global_attr_group);

Tested-by
#7 lore raw

Re: [PATCH 4/4] cpufreq/amd-pstate: Remove the redundant amd_pstate_set_driver() call

Quoted 91 lines · Mario Limonciello
Quoted 44 lines · Klara Modin

Hi,

Quoted 27 lines · Dhananjay Ugwekar

amd_pstate_set_driver() is called twice, once in amd_pstate_init() and once as part of amd_pstate_register_driver(). Move around code and eliminate the redundancy.

---
  drivers/cpufreq/amd-pstate.c | 12 ++++--------

  1 file changed, 4 insertions(+), 8 deletions(-)
drivers/cpufreq/amd-pstate.c +4 -2
index 13ee5cac901d..6f6d961879cc 100644
@@ -1848,9 +1848,11 @@ static int __init amd_pstate_init(void)
           return -ENODEV;
       }
-    ret = amd_pstate_set_driver(cppc_state);
-    if (ret)
+    ret = amd_pstate_register_driver(cppc_state);
+    if (ret) {
+        pr_err("failed to register with return %d\n", ret);
           return ret;
+    }
       /* capability check */
       if (cpu_feature_enabled(X86_FEATURE_CPPC)) {
@@ -1870,12 +1872,6 @@ static int __init amd_pstate_init(void)
               return ret;

drivers/cpufreq/amd-pstate.c static int __init amd_pstate_init(void) · line 1876

Quoted 10 lines
drivers/cpufreq/amd-pstate.c +0 -6
       }
-    ret = amd_pstate_register_driver(cppc_state);
-    if (ret) {
-        pr_err("failed to register with return %d\n", ret);
-        return ret;
-    }
-
       dev_root = bus_get_dev_root(&cpu_subsys);
       if (dev_root) {
           ret = sysfs_create_group(&dev_root->kobj, &amd_pstate_global_attr_group);

This seems to break boot on my Zen 2 desktop (my Zen 4 laptop is fine, however). I don't see any messages on the console and nothing shows up in the pstore either.

Quoted 6 lines

I'll attach the kernel log from a normal boot (with the patch reverted) in case it helps.

Please let me know if there's anything else you need.

Regards,
Klara Modin

Hi,

Thanks for reporting.  I think this might be a regression on shared memory designs specifically because static calls weren't updated yet.

Can you try this below diff?

drivers/cpufreq/amd-pstate.c +0 -6
index 206725219d8c9..2f0e29b05963d 100644
@@ -1857,12 +1857,6 @@ static int __init amd_pstate_init(void)
                 return -ENODEV;
         }
 
-       ret = amd_pstate_register_driver(cppc_state);
-       if (ret) {
-               pr_err("failed to register with return %d\n", ret);
-               return ret;
-       }
-
         /* capability check */
         if (cpu_feature_enabled(X86_FEATURE_CPPC)) {
                 pr_debug("AMD CPPC MSR based functionality is 

supported\n");

drivers/cpufreq/amd-pstate.c +6 -0
@@ -1881,6 +1875,12 @@ static int __init amd_pstate_init(void)
                         return ret;
         }
 
+       ret = amd_pstate_register_driver(cppc_state);
+       if (ret) {
+               pr_err("failed to register with return %d\n", ret);
+               return ret;
+       }
+
         dev_root = bus_get_dev_root(&cpu_subsys);
         if (dev_root) {
                 ret = sysfs_create_group(&dev_root->kobj, 
Quoted 2 lines

&amd_pstate_global_attr_group);

Moving the it afterwards does fix the issue, thanks!

maintainer Reviewed-by on the v1 series
#8 lore raw
In reply to Dhananjay Ugwekar
Quoted 12 lines · Dhananjay Ugwekar

Replace code chunks with function calls, improve readability and reduce redundancy.

Base: superm1/linux-next + https://lore.kernel.org/linux-pm/[email protected]/

Dhananjay Ugwekar (4):
cpufreq/amd-pstate: Call amd_pstate_register() in amd_pstate_init() cpufreq/amd-pstate: Call amd_pstate_set_driver() in
amd_pstate_register_driver()
cpufreq/amd-pstate: Remove the switch case in amd_pstate_init() cpufreq/amd-pstate: Remove the redundant amd_pstate_set_driver() call

Quoted 3 lines
  drivers/cpufreq/amd-pstate.c | 79 +++++++++++++-----------------------
  1 file changed, 29 insertions(+), 50 deletions(-)

Thanks for the improvement.