From: Punit Agrawal <punit.agrawal@arm.com>
To: linux-pm@vger.kernel.org
Cc: Punit Agrawal <punit.agrawal@arm.com>,
lm-sensors@lm-sensors.org, linux-kernel@vger.kernel.org,
devicetree@vger.kernel.org, liviu.dudau@arm.com,
Sudeep Holla <sudeep.holla@arm.com>
Subject: [PATCH v2 06/10] firmware: arm_scpi: Extend to support sensors
Date: Mon, 3 Aug 2015 16:22:54 +0100 [thread overview]
Message-ID: <1438615378-14241-7-git-send-email-punit.agrawal@arm.com> (raw)
In-Reply-To: <1438615378-14241-1-git-send-email-punit.agrawal@arm.com>
ARM System Control Processor (SCP) provides an API to query and use
the sensors available in the system. Extend the SCPI driver to support
sensor messages.
Signed-off-by: Punit Agrawal <punit.agrawal@arm.com>
Cc: Sudeep Holla <sudeep.holla@arm.com>
---
drivers/firmware/arm_scpi.c | 60 +++++++++++++++++++++++++++++++++++++++++++
include/linux/scpi_protocol.h | 17 ++++++++++++
2 files changed, 77 insertions(+)
diff --git a/drivers/firmware/arm_scpi.c b/drivers/firmware/arm_scpi.c
index cb75c75..321680e 100644
--- a/drivers/firmware/arm_scpi.c
+++ b/drivers/firmware/arm_scpi.c
@@ -219,6 +219,21 @@ struct dvfs_set {
u8 index;
} __packed;
+struct sensor_capabilities {
+ __le16 sensors;
+} __packed;
+
+struct _scpi_sensor_info {
+ __le16 sensor_id;
+ u8 class;
+ u8 trigger_type;
+ char name[20];
+};
+
+struct sensor_value {
+ __le32 val;
+} __packed;
+
static struct scpi_drvinfo *scpi_info;
static int scpi_linux_errmap[SCPI_ERR_MAX] = {
@@ -481,6 +496,48 @@ static struct scpi_dvfs_info *scpi_dvfs_get_info(u8 domain)
return info;
}
+static int scpi_sensor_get_capability(u16 *sensors)
+{
+ struct sensor_capabilities cap_buf;
+ int ret;
+
+ ret = scpi_send_message(SCPI_CMD_SENSOR_CAPABILITIES, NULL, 0, &cap_buf,
+ sizeof(cap_buf));
+ if (!ret)
+ *sensors = le16_to_cpu(cap_buf.sensors);
+
+ return ret;
+}
+
+static int scpi_sensor_get_info(u16 sensor_id, struct scpi_sensor_info *info)
+{
+ __le16 id = cpu_to_le16(sensor_id);
+ struct _scpi_sensor_info _info;
+ int ret;
+
+ ret = scpi_send_message(SCPI_CMD_SENSOR_INFO, &id,
+ sizeof(id), &_info, sizeof(_info));
+ if (!ret) {
+ memcpy(info, &_info, sizeof(*info));
+ info->sensor_id = le16_to_cpu(_info.sensor_id);
+ }
+
+ return ret;
+}
+
+int scpi_sensor_get_value(u16 sensor, u32 *val)
+{
+ struct sensor_value buf;
+ int ret;
+
+ ret = scpi_send_message(SCPI_CMD_SENSOR_VALUE, &sensor, sizeof(sensor),
+ &buf, sizeof(buf));
+ if (!ret)
+ *val = le32_to_cpu(buf.val);
+
+ return ret;
+}
+
static struct scpi_ops scpi_ops = {
.get_version = scpi_get_version,
.clk_get_range = scpi_clk_get_range,
@@ -489,6 +546,9 @@ static struct scpi_ops scpi_ops = {
.dvfs_get_idx = scpi_dvfs_get_idx,
.dvfs_set_idx = scpi_dvfs_set_idx,
.dvfs_get_info = scpi_dvfs_get_info,
+ .sensor_get_capability = scpi_sensor_get_capability,
+ .sensor_get_info = scpi_sensor_get_info,
+ .sensor_get_value = scpi_sensor_get_value,
};
struct scpi_ops *get_scpi_ops(void)
diff --git a/include/linux/scpi_protocol.h b/include/linux/scpi_protocol.h
index e7169cd..80af3cd 100644
--- a/include/linux/scpi_protocol.h
+++ b/include/linux/scpi_protocol.h
@@ -28,6 +28,20 @@ struct scpi_dvfs_info {
struct scpi_opp *opps;
};
+enum scpi_sensor_class {
+ TEMPERATURE,
+ VOLTAGE,
+ CURRENT,
+ POWER,
+};
+
+struct scpi_sensor_info {
+ u16 sensor_id;
+ u8 class;
+ u8 trigger_type;
+ char name[20];
+} __packed;
+
/**
* struct scpi_ops - represents the various operations provided
* by SCP through SCPI message protocol
@@ -52,6 +66,9 @@ struct scpi_ops {
int (*dvfs_get_idx)(u8);
int (*dvfs_set_idx)(u8, u8);
struct scpi_dvfs_info *(*dvfs_get_info)(u8);
+ int (*sensor_get_capability)(u16 *sensors);
+ int (*sensor_get_info)(u16 sensor_id, struct scpi_sensor_info *);
+ int (*sensor_get_value)(u16, u32 *);
};
#if IS_ENABLED(CONFIG_ARM_SCPI_PROTOCOL)
--
2.1.4
next prev parent reply other threads:[~2015-08-03 15:24 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-03 15:22 [PATCH v2 00/10] Platform support for thermal management on Juno Punit Agrawal
2015-08-03 15:22 ` [PATCH v2 01/10] devicetree: bindings: Add optional dynamic-power-coefficient property Punit Agrawal
2015-08-03 15:22 ` [PATCH v2 02/10] cpufreq-dt: Supply power coefficient when registering cooling devices Punit Agrawal
2015-08-03 15:22 ` [PATCH v2 03/10] cpufreq: arm_big_little: Add support to register a cpufreq cooling device Punit Agrawal
2015-08-03 15:22 ` [PATCH v2 04/10] thermal: Fix thermal_zone_of_sensor_register to match documentation Punit Agrawal
2015-08-03 15:56 ` Guenter Roeck
2015-08-04 11:00 ` Punit Agrawal
2015-08-05 9:57 ` [PATCH v3] " Punit Agrawal
2015-08-05 14:51 ` Guenter Roeck
2015-08-03 15:22 ` [PATCH v2 05/10] Documentation: add DT bindings for ARM SCPI sensors Punit Agrawal
2015-09-03 15:08 ` Punit Agrawal
2015-08-03 15:22 ` Punit Agrawal [this message]
2015-08-03 15:22 ` [PATCH v2 07/10] hwmon: Support sensors exported via ARM SCP interface Punit Agrawal
2015-08-04 21:32 ` Guenter Roeck
2015-08-05 10:17 ` Punit Agrawal
2015-08-03 15:22 ` [PATCH v2 08/10] hwmon: Support registration of thermal zones for SCP temperature sensors Punit Agrawal
2015-08-04 21:39 ` Guenter Roeck
2015-08-05 10:17 ` Punit Agrawal
2015-08-03 15:22 ` [PATCH v2 09/10] arm64: dts: Add sensor node to Juno dt Punit Agrawal
2015-08-03 15:22 ` [PATCH v2 10/10] arm64: dts: Create SoC thermal zone for Juno Punit Agrawal
2015-08-12 15:55 ` Liviu Dudau
2015-08-13 14:28 ` Punit Agrawal
2015-08-14 12:38 ` Punit Agrawal
2015-08-14 12:44 ` Punit Agrawal
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=1438615378-14241-7-git-send-email-punit.agrawal@arm.com \
--to=punit.agrawal@arm.com \
--cc=devicetree@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=liviu.dudau@arm.com \
--cc=lm-sensors@lm-sensors.org \
--cc=sudeep.holla@arm.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).