[RFC PATCH v3 02/12] firmware: arm_scmi: Add transport init/deinit

From: Peter Hilber
Date: Mon May 10 2021 - 20:28:43 EST


From: Cristian Marussi <cristian.marussi@xxxxxxx>

Signed-off-by: Cristian Marussi <cristian.marussi@xxxxxxx>
[ Peter: Adapted RFC patch by Cristian for submission to upstream. ]
Signed-off-by: Peter Hilber <peter.hilber@xxxxxxxxxxxxxxx>
---
drivers/firmware/arm_scmi/common.h | 2 ++
drivers/firmware/arm_scmi/driver.c | 45 ++++++++++++++++++++++++++++++
2 files changed, 47 insertions(+)

diff --git a/drivers/firmware/arm_scmi/common.h b/drivers/firmware/arm_scmi/common.h
index 94dcfb8c0176..961a3c63cc42 100644
--- a/drivers/firmware/arm_scmi/common.h
+++ b/drivers/firmware/arm_scmi/common.h
@@ -324,6 +324,8 @@ struct scmi_device *scmi_child_dev_find(struct device *parent,
* @max_msg_size: Maximum size of data per message that can be handled.
*/
struct scmi_desc {
+ int (*init)(void);
+ void (*exit)(void);
const struct scmi_transport_ops *ops;
int max_rx_timeout_ms;
int max_msg;
diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c
index 41d80bbaa9a2..471c5de827c1 100644
--- a/drivers/firmware/arm_scmi/driver.c
+++ b/drivers/firmware/arm_scmi/driver.c
@@ -1588,10 +1588,53 @@ static struct platform_driver scmi_driver = {
.remove = scmi_remove,
};

+static inline int __scmi_transports_setup(bool init)
+{
+ int ret = 0;
+ const struct of_device_id *trans;
+
+ for (trans = scmi_of_match; trans->data; trans++) {
+ const struct scmi_desc *tdesc = trans->data;
+
+ if ((init && !tdesc->init) || !tdesc->exit)
+ continue;
+ pr_info("SCMI %sInitializing %s transport\n", init ? "" : "De-",
+ trans->compatible);
+ if (init)
+ ret = tdesc->init();
+ else
+ tdesc->exit();
+
+ if (ret) {
+ pr_err("SCMI transport %s FAILED initialization!\n",
+ trans->compatible);
+ break;
+ }
+ }
+
+ return ret;
+}
+
+static int __init scmi_transports_init(void)
+{
+ return __scmi_transports_setup(true);
+}
+
+static void __exit scmi_transports_exit(void)
+{
+ __scmi_transports_setup(false);
+}
+
static int __init scmi_driver_init(void)
{
+ int ret;
+
scmi_bus_init();

+ ret = scmi_transports_init();
+ if (ret)
+ return ret;
+
scmi_base_register();

scmi_clock_register();
@@ -1618,6 +1661,8 @@ static void __exit scmi_driver_exit(void)
scmi_voltage_unregister();
scmi_system_unregister();

+ scmi_transports_exit();
+
scmi_bus_exit();

platform_driver_unregister(&scmi_driver);
--
2.25.1