Skip to contentSkip to conversation

soc: qcom: rpmpd: Allow RPMPD driver to be loaded as a module

RFC PATCH Superseded John Stultz 3 participants 6 messages Mar 5, 2020 – Mar 18, 2020

Subsystems (2)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/1 soc: qcom: rpmpd: Allow RPMPD driver to be loaded as a module

Allow the rpmpd driver to be loaded as a module.

Cc Todd Kjos <[email protected]>
Cc Saravana Kannan <[email protected]>
Cc Andy Gross <[email protected]>
Cc Bjorn Andersson <[email protected]>
---
 drivers/soc/qcom/Kconfig | 4 ++--
 drivers/soc/qcom/rpmpd.c | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)
drivers/soc/qcom/Kconfig +2 -2
index d0a73e76d563..af774555b9d2 100644
@@ -123,8 +123,8 @@ config QCOM_RPMHPD
 	  for the voltage rail.
 
 config QCOM_RPMPD
-	bool "Qualcomm RPM Power domain driver"
-	depends on QCOM_SMD_RPM=y
+	tristate "Qualcomm RPM Power domain driver"
+	depends on QCOM_SMD_RPM
 	help
 	  QCOM RPM Power domain driver to support power-domains with
 	  performance states. The driver communicates a performance state
drivers/soc/qcom/rpmpd.c +4 -1
index 2b1834c5609a..9c0834913f3f 100644
@@ -5,6 +5,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/mutex.h>
+#include <linux/module.h>
 #include <linux/pm_domain.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
@@ -226,6 +227,7 @@ static const struct of_device_id rpmpd_match_table[] = {
 	{ .compatible = "qcom,qcs404-rpmpd", .data = &qcs404_desc },
 	{ }
 };
+MODULE_DEVICE_TABLE(of, rpmpd_match_table);
 
 static int rpmpd_send_enable(struct rpmpd *pd, bool enable)
 {
@@ -421,4 +423,5 @@ static int __init rpmpd_init(void)
 {
 	return platform_driver_register(&rpmpd_driver);
 }
-core_initcall(rpmpd_init);
+module_init(rpmpd_init);
+MODULE_LICENSE("GPL");
Signature · 1 line
2.17.1
#1 lore raw
Quoted 49 lines · John Stultz

Allow the rpmpd driver to be loaded as a module.

Cc Todd Kjos <[email protected]>
Cc Saravana Kannan <[email protected]>
Cc Andy Gross <[email protected]>
Cc Bjorn Andersson <[email protected]>
---
 drivers/soc/qcom/Kconfig | 4 ++--
 drivers/soc/qcom/rpmpd.c | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)
drivers/soc/qcom/Kconfig +2 -2
index d0a73e76d563..af774555b9d2 100644
@@ -123,8 +123,8 @@ config QCOM_RPMHPD
 	  for the voltage rail.
 
 config QCOM_RPMPD
-	bool "Qualcomm RPM Power domain driver"
-	depends on QCOM_SMD_RPM=y
+	tristate "Qualcomm RPM Power domain driver"
+	depends on QCOM_SMD_RPM
 	help
 	  QCOM RPM Power domain driver to support power-domains with
 	  performance states. The driver communicates a performance state
drivers/soc/qcom/rpmpd.c +2 -0
index 2b1834c5609a..9c0834913f3f 100644
@@ -5,6 +5,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/mutex.h>
+#include <linux/module.h>
 #include <linux/pm_domain.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
@@ -226,6 +227,7 @@ static const struct of_device_id rpmpd_match_table[] = {
 	{ .compatible = "qcom,qcs404-rpmpd", .data = &qcs404_desc },
 	{ }
 };
+MODULE_DEVICE_TABLE(of, rpmpd_match_table);
 
 static int rpmpd_send_enable(struct rpmpd *pd, bool enable)
 {

drivers/soc/qcom/rpmpd.c static int __init rpmpd_init(void) · line 426

Quoted 5 lines
drivers/soc/qcom/rpmpd.c +1 -1
@@ -421,4 +423,5 @@ static int __init rpmpd_init(void)
 {
 	return platform_driver_register(&rpmpd_driver);
 }
-core_initcall(rpmpd_init);
+module_init(rpmpd_init);

Can't you keep this as core_initcall(), for the times when its builtin?

Additionally I believe you should add a call to unregister the driver, and drop the suppress_bind_attrs.

drivers/soc/qcom/rpmpd.c static int __init rpmpd_init(void) · line 427

Quoted 1 line
drivers/soc/qcom/rpmpd.c +1 -0
+MODULE_LICENSE("GPL");

"GPL v2" per the SPDX?

Regards,
Bjorn

Quoted 3 lines
Signature · 1 line
2.17.1
#2 lore raw
Quoted 7 lines

drivers/soc/qcom/rpmpd.c static int __init rpmpd_init(void) · line 426

Quoted 3 lines
drivers/soc/qcom/rpmpd.c +1 -1
-core_initcall(rpmpd_init);
+module_init(rpmpd_init);

Can't you keep this as core_initcall(), for the times when its builtin?

Additionally I believe you should add a call to unregister the driver,

and implement a .remove?

Quoted 12 lines

and drop the suppress_bind_attrs.

Quoted 1 line

+MODULE_LICENSE("GPL");

"GPL v2" per the SPDX?

Regards,
Bjorn

Quoted 3 lines
Signature · 1 line
2.17.1
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
#3 lore raw
In reply to Bjorn Andersson
Quoted 4 lines · Bjorn Andersson
Quoted 2 lines · John Stultz

Allow the rpmpd driver to be loaded as a module.

...

Quoted 18 lines
Quoted 18 lines
drivers/soc/qcom/rpmpd.c +2 -0
index 2b1834c5609a..9c0834913f3f 100644
@@ -5,6 +5,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/mutex.h>
+#include <linux/module.h>
 #include <linux/pm_domain.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
@@ -226,6 +227,7 @@ static const struct of_device_id rpmpd_match_table[] = {
      { .compatible = "qcom,qcs404-rpmpd", .data = &qcs404_desc },
      { }
 };
+MODULE_DEVICE_TABLE(of, rpmpd_match_table);
 
Quoted 10 lines

drivers/soc/qcom/rpmpd.c static int __init rpmpd_init(void) · line 426

Quoted 8 lines
drivers/soc/qcom/rpmpd.c +1 -1
 static int rpmpd_send_enable(struct rpmpd *pd, bool enable)
 {
@@ -421,4 +423,5 @@ static int __init rpmpd_init(void)
 {
      return platform_driver_register(&rpmpd_driver);
 }
-core_initcall(rpmpd_init);
+module_init(rpmpd_init);

Can't you keep this as core_initcall(), for the times when its builtin?

Sure!

Quoted 2 lines

Additionally I believe you should add a call to unregister the driver, and drop the suppress_bind_attrs.

So, I sort of took the simple swing here as adding it as a module w/o a unregister makes it a "permanent" module. It loads but cannot be unloaded. I know this isn't ideal, but it's also a big improvement over it being limited to it being required as a built-in. I'll take a look at it though to see if its workable to be removable.

Quoted 3 lines

drivers/soc/qcom/rpmpd.c static int __init rpmpd_init(void) · line 427

Quoted 1 line
drivers/soc/qcom/rpmpd.c +1 -0
+MODULE_LICENSE("GPL");

"GPL v2" per the SPDX?

Ah. Thanks, fixed!

thanks again for the review
-john

#4 lore raw
In reply to John Stultz
Quoted 1 line · John Stultz

Allow the rpmpd driver to be loaded as a module.

The last time I tried this [1], I hit a limitation with pm_genpd_remove not cleaning up things right, is that solved now?

[1] https://lkml.org/lkml/2019/1/17/1043

Quoted 55 lines
Cc Todd Kjos <[email protected]>
Cc Saravana Kannan <[email protected]>
Cc Andy Gross <[email protected]>
Cc Bjorn Andersson <[email protected]>
---
  drivers/soc/qcom/Kconfig | 4 ++--
  drivers/soc/qcom/rpmpd.c | 5 ++++-
  2 files changed, 6 insertions(+), 3 deletions(-)
drivers/soc/qcom/Kconfig +2 -2
index d0a73e76d563..af774555b9d2 100644
@@ -123,8 +123,8 @@ config QCOM_RPMHPD
  	  for the voltage rail.
 
  config QCOM_RPMPD
-	bool "Qualcomm RPM Power domain driver"
-	depends on QCOM_SMD_RPM=y
+	tristate "Qualcomm RPM Power domain driver"
+	depends on QCOM_SMD_RPM
  	help
  	  QCOM RPM Power domain driver to support power-domains with
  	  performance states. The driver communicates a performance state
drivers/soc/qcom/rpmpd.c +4 -1
index 2b1834c5609a..9c0834913f3f 100644
@@ -5,6 +5,7 @@
  #include <linux/init.h>
  #include <linux/kernel.h>
  #include <linux/mutex.h>
+#include <linux/module.h>
  #include <linux/pm_domain.h>
  #include <linux/of.h>
  #include <linux/of_device.h>
@@ -226,6 +227,7 @@ static const struct of_device_id rpmpd_match_table[] = {
  	{ .compatible = "qcom,qcs404-rpmpd", .data = &qcs404_desc },
  	{ }
  };
+MODULE_DEVICE_TABLE(of, rpmpd_match_table);
 
  static int rpmpd_send_enable(struct rpmpd *pd, bool enable)
  {
@@ -421,4 +423,5 @@ static int __init rpmpd_init(void)
  {
  	return platform_driver_register(&rpmpd_driver);
  }
-core_initcall(rpmpd_init);
+module_init(rpmpd_init);
+MODULE_LICENSE("GPL");
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
#5 lore raw
Quoted 10 lines · Rajendra Nayak
Quoted 1 line · John Stultz

Allow the rpmpd driver to be loaded as a module.

The last time I tried this [1], I hit a limitation with pm_genpd_remove not cleaning up things right, is that solved now?

[1] https://lkml.org/lkml/2019/1/17/1043

As I mentioned to Bjorn, I'll dig into this a bit to see if its doable, but having it being a permanent/unloadable module is still an improvement from it being stuck as a built in only.

thanks
-john