Skip to contentSkip to conversation

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

PATCH Superseded John Stultz 2 participants 2 messages Mar 19, 2020 – Mar 20, 2020

Subsystems (2)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

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

This patch allow the rpmpd driver to be loaded as a permenent module. Meaning it can be loaded from a module, but then cannot be unloaded.

Ideally, it would include a remove hook and related logic, but apparently the genpd code isn't able to track usage and cleaning things up? (See: https://lkml.org/lkml/2019/1/24/38)

So making it a permenent module at least improves things slightly over requiring it to be a built in driver.

Feedback would be appreciated!

Cc Todd Kjos <[email protected]>
Cc Saravana Kannan <[email protected]>
Cc Andy Gross <[email protected]>
Cc Bjorn Andersson <[email protected]>
Cc Rajendra Nayak <[email protected]>

---
v2:
* Fix MODULE_LICENSE to be GPL v2 as suggested by Bjorn
* Leave initcall as core_initcall, since that switches to module_initcall only when built as a module, also suggested by Bjorn
* Add module tags taken from Rajendra's earlier patch

---
 drivers/soc/qcom/Kconfig | 4 ++--
 drivers/soc/qcom/rpmpd.c | 6 ++++++
 2 files changed, 8 insertions(+), 2 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 +6 -0
index 2b1834c5609a..22fe94c03e79 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)
 {
@@ -422,3 +424,7 @@ static int __init rpmpd_init(void)
 	return platform_driver_register(&rpmpd_driver);
 }
 core_initcall(rpmpd_init);
+
+MODULE_DESCRIPTION("Qualcomm Technologies, Inc. RPM Power Domain Driver");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:qcom-rpmpd");
Signature · 1 line
2.17.1
Acked-by on v2 1/1
#1 lore raw
Quoted 76 lines · John Stultz

This patch allow the rpmpd driver to be loaded as a permenent module. Meaning it can be loaded from a module, but then cannot be unloaded.

Ideally, it would include a remove hook and related logic, but apparently the genpd code isn't able to track usage and cleaning things up? (See: https://lkml.org/lkml/2019/1/24/38)

So making it a permenent module at least improves things slightly over requiring it to be a built in driver.

Feedback would be appreciated!

Cc Todd Kjos <[email protected]>
Cc Saravana Kannan <[email protected]>
Cc Andy Gross <[email protected]>
Cc Bjorn Andersson <[email protected]>
Cc Rajendra Nayak <[email protected]>

---
v2:
* Fix MODULE_LICENSE to be GPL v2 as suggested by Bjorn
* Leave initcall as core_initcall, since that switches to module_initcall only when built as a module, also suggested by Bjorn
* Add module tags taken from Rajendra's earlier patch

---
 drivers/soc/qcom/Kconfig | 4 ++--
 drivers/soc/qcom/rpmpd.c | 6 ++++++
 2 files changed, 8 insertions(+), 2 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 +6 -1
index 2b1834c5609a..22fe94c03e79 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)
 {
@@ -422,3 +424,7 @@ static int __init rpmpd_init(void)
        return platform_driver_register(&rpmpd_driver);
 }
 core_initcall(rpmpd_init);
+
+MODULE_DESCRIPTION("Qualcomm Technologies, Inc. RPM Power Domain Driver");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:qcom-rpmpd");
--
Quoted 2 lines

2.17.1

I think making it a permanent module is still very useful and a good first step.

-Saravana