From: Cristian Marussi <cristian.marussi@arm.com>
To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Cc: sudeep.holla@arm.com, lukasz.luba@arm.com,
james.quinlan@broadcom.com, Jonathan.Cameron@Huawei.com,
f.fainelli@gmail.com, etienne.carriere@linaro.org,
thara.gopinath@linaro.org, vincent.guittot@linaro.org,
souvik.chakravarty@arm.com, cristian.marussi@arm.com
Subject: [PATCH v5 21/36] reset: reset-scmi: port driver to the new scmi_reset_proto_ops interface
Date: Tue, 12 Jan 2021 19:20:03 +0000 [thread overview]
Message-ID: <20210112192018.34994-22-cristian.marussi@arm.com> (raw)
In-Reply-To: <20210112192018.34994-1-cristian.marussi@arm.com>
Port driver to the new SCMI Reset interface based on protocol handles
and common devm_get_ops().
Signed-off-by: Cristian Marussi <cristian.marussi@arm.com>
---
v4 --> v5
- using renamed devm_get/put_protocol
---
drivers/reset/reset-scmi.c | 33 ++++++++++++++++++++-------------
1 file changed, 20 insertions(+), 13 deletions(-)
diff --git a/drivers/reset/reset-scmi.c b/drivers/reset/reset-scmi.c
index 8d3a858e3b19..161846ee44c8 100644
--- a/drivers/reset/reset-scmi.c
+++ b/drivers/reset/reset-scmi.c
@@ -2,7 +2,7 @@
/*
* ARM System Control and Management Interface (ARM SCMI) reset driver
*
- * Copyright (C) 2019 ARM Ltd.
+ * Copyright (C) 2019-2020 ARM Ltd.
*/
#include <linux/module.h>
@@ -11,18 +11,20 @@
#include <linux/reset-controller.h>
#include <linux/scmi_protocol.h>
+static const struct scmi_reset_proto_ops *reset_ops;
+
/**
* struct scmi_reset_data - reset controller information structure
* @rcdev: reset controller entity
- * @handle: ARM SCMI handle used for communication with system controller
+ * @ph: ARM SCMI protocol handle used for communication with system controller
*/
struct scmi_reset_data {
struct reset_controller_dev rcdev;
- const struct scmi_handle *handle;
+ const struct scmi_protocol_handle *ph;
};
#define to_scmi_reset_data(p) container_of((p), struct scmi_reset_data, rcdev)
-#define to_scmi_handle(p) (to_scmi_reset_data(p)->handle)
+#define to_scmi_handle(p) (to_scmi_reset_data(p)->ph)
/**
* scmi_reset_assert() - assert device reset
@@ -37,9 +39,9 @@ struct scmi_reset_data {
static int
scmi_reset_assert(struct reset_controller_dev *rcdev, unsigned long id)
{
- const struct scmi_handle *handle = to_scmi_handle(rcdev);
+ const struct scmi_protocol_handle *ph = to_scmi_handle(rcdev);
- return handle->reset_ops->assert(handle, id);
+ return reset_ops->assert(ph, id);
}
/**
@@ -55,9 +57,9 @@ scmi_reset_assert(struct reset_controller_dev *rcdev, unsigned long id)
static int
scmi_reset_deassert(struct reset_controller_dev *rcdev, unsigned long id)
{
- const struct scmi_handle *handle = to_scmi_handle(rcdev);
+ const struct scmi_protocol_handle *ph = to_scmi_handle(rcdev);
- return handle->reset_ops->deassert(handle, id);
+ return reset_ops->deassert(ph, id);
}
/**
@@ -73,9 +75,9 @@ scmi_reset_deassert(struct reset_controller_dev *rcdev, unsigned long id)
static int
scmi_reset_reset(struct reset_controller_dev *rcdev, unsigned long id)
{
- const struct scmi_handle *handle = to_scmi_handle(rcdev);
+ const struct scmi_protocol_handle *ph = to_scmi_handle(rcdev);
- return handle->reset_ops->reset(handle, id);
+ return reset_ops->reset(ph, id);
}
static const struct reset_control_ops scmi_reset_ops = {
@@ -90,10 +92,15 @@ static int scmi_reset_probe(struct scmi_device *sdev)
struct device *dev = &sdev->dev;
struct device_node *np = dev->of_node;
const struct scmi_handle *handle = sdev->handle;
+ struct scmi_protocol_handle *ph;
- if (!handle || !handle->reset_ops)
+ if (!handle)
return -ENODEV;
+ reset_ops = handle->devm_get_protocol(sdev, SCMI_PROTOCOL_RESET, &ph);
+ if (IS_ERR(reset_ops))
+ return PTR_ERR(reset_ops);
+
data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
if (!data)
return -ENOMEM;
@@ -101,8 +108,8 @@ static int scmi_reset_probe(struct scmi_device *sdev)
data->rcdev.ops = &scmi_reset_ops;
data->rcdev.owner = THIS_MODULE;
data->rcdev.of_node = np;
- data->rcdev.nr_resets = handle->reset_ops->num_domains_get(handle);
- data->handle = handle;
+ data->rcdev.nr_resets = reset_ops->num_domains_get(ph);
+ data->ph = ph;
return devm_reset_controller_register(dev, &data->rcdev);
}
--
2.17.1
next prev parent reply other threads:[~2021-01-12 19:23 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-12 19:19 [PATCH v5 0/36] SCMI vendor protocols and modularization Cristian Marussi
2021-01-12 19:19 ` [PATCH v5 01/36] firmware: arm_scmi: review protocol registration interface Cristian Marussi
2021-01-12 19:19 ` [PATCH v5 02/36] firmware: arm_scmi: introduce protocol handle definitions Cristian Marussi
2021-01-12 19:19 ` [PATCH v5 03/36] firmware: arm_scmi: introduce devres get/put protocols operations Cristian Marussi
2021-01-12 19:19 ` [PATCH v5 04/36] firmware: arm_scmi: make notifications aware of protocols users Cristian Marussi
2021-01-12 19:19 ` [PATCH v5 05/36] firmware: arm_scmi: introduce new devres notification ops Cristian Marussi
2021-01-12 19:19 ` [PATCH v5 06/36] firmware: arm_scmi: refactor events registration Cristian Marussi
2021-01-12 19:19 ` [PATCH v5 07/36] firmware: arm_scmi: convert events registration to protocol handles Cristian Marussi
2021-01-12 19:19 ` [PATCH v5 08/36] firmware: arm_scmi: add new protocol handle core xfer ops Cristian Marussi
2021-01-12 19:19 ` [PATCH v5 09/36] firmware: arm_scmi: add helper to access revision area memory Cristian Marussi
2021-01-12 19:19 ` [PATCH v5 10/36] firmware: arm_scmi: port Base protocol to new interface Cristian Marussi
2021-01-12 19:19 ` [PATCH v5 11/36] firmware: arm_scmi: port Perf protocol to new protocols interface Cristian Marussi
2021-01-12 19:19 ` [PATCH v5 12/36] cpufreq: scmi: port driver to the new scmi_perf_proto_ops interface Cristian Marussi
2021-01-12 19:19 ` [PATCH v5 13/36] firmware: arm_scmi: remove legacy scmi_perf_ops protocol interface Cristian Marussi
2021-01-12 19:19 ` [PATCH v5 14/36] firmware: arm_scmi: port Power protocol to new protocols interface Cristian Marussi
2021-01-12 19:19 ` [PATCH v5 15/36] firmware: arm_scmi: port GenPD driver to the new scmi_power_proto_ops interface Cristian Marussi
2021-01-12 19:19 ` [PATCH v5 16/36] firmware: arm_scmi: remove legacy scmi_power_ops protocol interface Cristian Marussi
2021-01-12 19:19 ` [PATCH v5 17/36] firmware: arm_scmi: port Clock protocol to new protocols interface Cristian Marussi
2021-01-12 19:20 ` [PATCH v5 18/36] clk: scmi: port driver to the new scmi_clk_proto_ops interface Cristian Marussi
2021-01-12 19:20 ` [PATCH v5 19/36] firmware: arm_scmi: remove legacy scmi_clk_ops protocol interface Cristian Marussi
2021-01-12 19:20 ` [PATCH v5 20/36] firmware: arm_scmi: port Reset protocol to new protocols interface Cristian Marussi
2021-01-12 19:20 ` Cristian Marussi [this message]
2021-01-12 19:20 ` [PATCH v5 22/36] firmware: arm_scmi: remove legacy scmi_reset_ops protocol interface Cristian Marussi
2021-01-12 19:20 ` [PATCH v5 23/36] firmware: arm_scmi: port Sensor protocol to new protocols interface Cristian Marussi
2021-01-12 19:20 ` [PATCH v5 24/36] hwmon: (scmi) port driver to the new scmi_sensor_proto_ops interface Cristian Marussi
2021-01-12 19:20 ` [PATCH v5 25/36] firmware: arm_scmi: remove legacy scmi_sensor_ops protocol interface Cristian Marussi
2021-01-12 19:20 ` [PATCH v5 26/36] firmware: arm_scmi: port SystemPower protocol to new protocols interface Cristian Marussi
2021-01-12 19:20 ` [PATCH v5 27/36] firmware: arm_scmi: port Voltage " Cristian Marussi
2021-01-12 19:20 ` [PATCH v5 28/36] regulator: scmi: port driver to the new scmi_voltage_proto_ops interface Cristian Marussi
2021-01-12 19:20 ` [PATCH v5 29/36] firmware: arm_scmi: remove legacy scmi_voltage_ops protocol interface Cristian Marussi
2021-01-12 19:20 ` [PATCH v5 30/36] firmware: arm_scmi: make references to handle const Cristian Marussi
2021-01-12 19:20 ` [PATCH v5 31/36] firmware: arm_scmi: cleanup legacy protocol init code Cristian Marussi
2021-01-12 19:20 ` [PATCH v5 32/36] firmware: arm_scmi: cleanup unused core xfer wrappers Cristian Marussi
2021-01-12 19:20 ` [PATCH v5 33/36] firmware: arm_scmi: cleanup events registration transient code Cristian Marussi
2021-01-12 19:20 ` [PATCH v5 34/36] firmware: arm_scmi: make notify_priv really private Cristian Marussi
2021-01-12 19:20 ` [PATCH v5 35/36] firmware: arm_scmi: add protocol modularization support Cristian Marussi
2021-01-12 19:20 ` [PATCH v5 36/36] firmware: arm_scmi: add dynamic scmi devices creation Cristian Marussi
2021-01-27 16:21 ` [PATCH v5 0/36] SCMI vendor protocols and modularization Vincent Guittot
2021-01-27 16:26 ` Cristian Marussi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210112192018.34994-22-cristian.marussi@arm.com \
--to=cristian.marussi@arm.com \
--cc=Jonathan.Cameron@Huawei.com \
--cc=etienne.carriere@linaro.org \
--cc=f.fainelli@gmail.com \
--cc=james.quinlan@broadcom.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lukasz.luba@arm.com \
--cc=souvik.chakravarty@arm.com \
--cc=sudeep.holla@arm.com \
--cc=thara.gopinath@linaro.org \
--cc=vincent.guittot@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).