From: Sudeep Holla <sudeep.holla@arm.com>
To: ALKML <linux-arm-kernel@lists.infradead.org>,
LKML <linux-kernel@vger.kernel.org>,
DTML <devicetree@vger.kernel.org>
Cc: Sudeep Holla <sudeep.holla@arm.com>,
Roy Franz <roy.franz@cavium.com>,
Harb Abdulhamid <harba@codeaurora.org>,
Nishanth Menon <nm@ti.com>, Arnd Bergmann <arnd@arndb.de>,
Loc Ho <lho@apm.com>, Alexey Klimov <alexey.klimov@arm.com>,
Matt Sealey <neko@bakuhatsu.net>
Subject: [PATCH 9/9] firmware: arm_scmi: probe and initialise all the supported protocols
Date: Mon, 26 Jun 2017 16:55:13 +0100 [thread overview]
Message-ID: <1498492513-29771-10-git-send-email-sudeep.holla@arm.com> (raw)
In-Reply-To: <1498492513-29771-1-git-send-email-sudeep.holla@arm.com>
Now that we have basic support for all the protocols in the
specification, let's probe them individually and initialise them.
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
---
drivers/firmware/arm_scmi/common.h | 5 +++
drivers/firmware/arm_scmi/driver.c | 71 +++++++++++++++++++++++++++++++++++++-
2 files changed, 75 insertions(+), 1 deletion(-)
diff --git a/drivers/firmware/arm_scmi/common.h b/drivers/firmware/arm_scmi/common.h
index 7473dfcad4ee..d7c73a8d260b 100644
--- a/drivers/firmware/arm_scmi/common.h
+++ b/drivers/firmware/arm_scmi/common.h
@@ -118,4 +118,9 @@ int scmi_version_get(const struct scmi_handle *h, u8 protocol, u32 *version);
void scmi_setup_protocol_implemented(const struct scmi_handle *handle,
u8 *prot_imp);
+typedef int (*scmi_init_fn_t)(struct scmi_handle *);
int scmi_base_protocol_init(struct scmi_handle *h);
+int scmi_perf_protocol_init(struct scmi_handle *h);
+int scmi_sensors_protocol_init(struct scmi_handle *h);
+int scmi_power_protocol_init(struct scmi_handle *h);
+int scmi_clock_protocol_init(struct scmi_handle *h);
diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c
index 45f31eaf085a..d3d289f7a174 100644
--- a/drivers/firmware/arm_scmi/driver.c
+++ b/drivers/firmware/arm_scmi/driver.c
@@ -157,6 +157,12 @@ struct scmi_shared_mem {
u8 msg_payload[0];
};
+struct scmi_protocol_match {
+ u8 protocol_id;
+ scmi_init_fn_t fn;
+ char name[32];
+};
+
static int scmi_linux_errmap[] = {
/* better than switch case as long as return value is continuous */
0, /* SCMI_SUCCESS */
@@ -680,6 +686,41 @@ static int scmi_xfer_info_init(struct scmi_info *sinfo)
return 0;
}
+static const struct scmi_protocol_match scmi_protocols[] = {
+ {
+ .protocol_id = SCMI_PROTOCOL_PERF,
+ .fn = scmi_perf_protocol_init,
+ .name = "scmi-cpufreq",
+ }, {
+ .protocol_id = SCMI_PROTOCOL_CLOCK,
+ .fn = scmi_clock_protocol_init,
+ .name = "scmi-clocks",
+ }, {
+ .protocol_id = SCMI_PROTOCOL_POWER,
+ .fn = scmi_power_protocol_init,
+ .name = "scmi-power-domain",
+ }, {
+ .protocol_id = SCMI_PROTOCOL_SENSOR,
+ .fn = scmi_sensors_protocol_init,
+ .name = "scmi-hwmon",
+ },
+ {}
+};
+
+static const struct scmi_protocol_match *scmi_protocol_match_get(u8 protocol_id)
+{
+ int i;
+ const struct scmi_protocol_match *match = NULL, *loop = scmi_protocols;
+
+ for (i = 0; i < ARRAY_SIZE(scmi_protocols); i++, loop++)
+ if (loop->protocol_id == protocol_id) {
+ match = loop;
+ break;
+ }
+
+ return match;
+}
+
static int scmi_probe(struct platform_device *pdev)
{
int ret = -EINVAL;
@@ -690,7 +731,7 @@ static int scmi_probe(struct platform_device *pdev)
const struct scmi_desc *desc;
struct scmi_info *info = NULL;
struct device *dev = &pdev->dev;
- struct device_node *shmem, *np = dev->of_node;
+ struct device_node *child, *shmem, *np = dev->of_node;
desc = of_match_device(scmi_of_match, dev)->data;
@@ -755,6 +796,34 @@ static int scmi_probe(struct platform_device *pdev)
list_add_tail(&info->node, &scmi_list);
mutex_unlock(&scmi_list_mutex);
+ for_each_available_child_of_node(np, child) {
+ int init_ret;
+ u32 protocol_id;
+ const struct scmi_protocol_match *match;
+
+ if (of_property_read_u32(child, "reg", &protocol_id))
+ continue;
+
+ protocol_id &= MSG_PROTOCOL_ID_MASK;
+
+ if (!scmi_is_protocol_implemented(handle, protocol_id)) {
+ dev_err(dev, "SCMI protocol %d not implemented\n",
+ protocol_id);
+ continue;
+ }
+
+ match = scmi_protocol_match_get(protocol_id);
+ if (match) {
+ init_ret = match->fn(handle);
+ if (!init_ret)
+ of_platform_device_create(child, match->name,
+ dev);
+ else
+ dev_err(dev, "SCMI protocol %d init error %d\n",
+ protocol_id, init_ret);
+ }
+ }
+
return 0;
out:
if (!IS_ERR(info->tx_chan))
--
2.7.4
prev parent reply other threads:[~2017-06-26 15:55 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-26 15:55 [PATCH 0/9] firmware: ARM System Control and Management Interface(SCMI) support Sudeep Holla
2017-06-26 15:55 ` [PATCH 1/9] Documentation: dt-bindings: add support for mailbox client shared memory Sudeep Holla
[not found] ` <1498492513-29771-2-git-send-email-sudeep.holla-5wv7dgnIgG8@public.gmane.org>
2017-06-28 22:56 ` Rob Herring
2017-06-30 10:24 ` Sudeep Holla
2017-06-26 15:55 ` [PATCH 4/9] firmware: arm_scmi: add common infrastructure and support for base protocol Sudeep Holla
[not found] ` <1498492513-29771-1-git-send-email-sudeep.holla-5wv7dgnIgG8@public.gmane.org>
2017-06-26 15:55 ` [PATCH 2/9] Documentation: add DT binding for ARM System Control and Management Interface(SCMI) protocol Sudeep Holla
[not found] ` <1498492513-29771-3-git-send-email-sudeep.holla-5wv7dgnIgG8@public.gmane.org>
2017-06-28 23:04 ` Rob Herring
2017-06-30 10:31 ` Sudeep Holla
2017-06-26 15:55 ` [PATCH 3/9] firmware: arm_scmi: add basic driver infrastructure for SCMI Sudeep Holla
[not found] ` <1499446341-5956-1-git-send-email-jaswinder.singh@linaro.org>
[not found] ` <1499446341-5956-1-git-send-email-jaswinder.singh-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2017-07-07 17:39 ` Sudeep Holla
2017-07-08 5:32 ` Jassi Brar
[not found] ` <CABb+yY3Xo-meg5bTZ5Cj1DAvf_0yOw0QB5Kq6U7VG+L_L+Mo3w-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-07-24 9:50 ` Sudeep Holla
[not found] ` <f165d171-a55b-662f-888c-3be2c3e8f11a-5wv7dgnIgG8@public.gmane.org>
2017-07-24 15:41 ` Jassi Brar
[not found] ` <CABb+yY3NNUE7YXAhBLpMzVZkB7Kgx6iZk8a--crHa9Wpw6Ls4Q-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-07-24 16:21 ` Sudeep Holla
2017-07-24 17:21 ` Jassi Brar
2017-07-24 17:30 ` Sudeep Holla
2017-06-26 15:55 ` [PATCH 5/9] firmware: arm_scmi: add initial support for performance protocol Sudeep Holla
2017-06-26 15:55 ` [PATCH 6/9] firmware: arm_scmi: add initial support for clock protocol Sudeep Holla
2017-06-26 15:55 ` [PATCH 7/9] firmware: arm_scmi: add initial support for power protocol Sudeep Holla
2017-06-26 15:55 ` [PATCH 8/9] firmware: arm_scmi: add initial support for sensor protocol Sudeep Holla
2017-06-26 15:55 ` Sudeep Holla [this message]
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=1498492513-29771-10-git-send-email-sudeep.holla@arm.com \
--to=sudeep.holla@arm.com \
--cc=alexey.klimov@arm.com \
--cc=arnd@arndb.de \
--cc=devicetree@vger.kernel.org \
--cc=harba@codeaurora.org \
--cc=lho@apm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=neko@bakuhatsu.net \
--cc=nm@ti.com \
--cc=roy.franz@cavium.com \
/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).