Commit 7b83c5f4 authored by Cristian Marussi's avatar Cristian Marussi Committed by Sudeep Holla
Browse files

firmware: arm_scmi: Add SCMI v3.0 sensor configuration support 

Add SCMI v3.0 sensor support for CONFIG_GET/CONFIG_SET commands.

Link: https://lore.kernel.org/r/20201119174906.43862-6-cristian.marussi@arm.com


Signed-off-by: default avatarCristian Marussi <cristian.marussi@arm.com>
Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
parent e2083d36

drivers/firmware/arm_scmi/sensors.c

+63 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ enum scmi_sensor_protocol_cmd { 
	SENSOR_READING_GET = 0x6,

	SENSOR_AXIS_DESCRIPTION_GET = 0x7,

	SENSOR_LIST_UPDATE_INTERVALS = 0x8,

	SENSOR_CONFIG_GET = 0x9,

	SENSOR_CONFIG_SET = 0xA,

};



struct scmi_msg_resp_sensor_attributes {
@@ -149,6 +151,11 @@ struct scmi_msg_set_sensor_trip_point { 
	__le32 value_high;

};



struct scmi_msg_sensor_config_set {

	__le32 id;

	__le32 sensor_config;

};



struct scmi_msg_sensor_reading_get {

	__le32 id;

	__le32 flags;
@@ -592,6 +599,60 @@ scmi_sensor_trip_point_config(const struct scmi_handle *handle, u32 sensor_id, 
	return ret;

}



static int scmi_sensor_config_get(const struct scmi_handle *handle,

				  u32 sensor_id, u32 *sensor_config)

{

	int ret;

	struct scmi_xfer *t;



	ret = scmi_xfer_get_init(handle, SENSOR_CONFIG_GET,

				 SCMI_PROTOCOL_SENSOR, sizeof(__le32),

				 sizeof(__le32), &t);

	if (ret)

		return ret;



	put_unaligned_le32(cpu_to_le32(sensor_id), t->tx.buf);

	ret = scmi_do_xfer(handle, t);

	if (!ret) {

		struct sensors_info *si = handle->sensor_priv;

		struct scmi_sensor_info *s = si->sensors + sensor_id;



		*sensor_config = get_unaligned_le64(t->rx.buf);

		s->sensor_config = *sensor_config;

	}



	scmi_xfer_put(handle, t);

	return ret;

}



static int scmi_sensor_config_set(const struct scmi_handle *handle,

				  u32 sensor_id, u32 sensor_config)

{

	int ret;

	struct scmi_xfer *t;

	struct scmi_msg_sensor_config_set *msg;



	ret = scmi_xfer_get_init(handle, SENSOR_CONFIG_SET,

				 SCMI_PROTOCOL_SENSOR, sizeof(*msg), 0, &t);

	if (ret)

		return ret;



	msg = t->tx.buf;

	msg->id = cpu_to_le32(sensor_id);

	msg->sensor_config = cpu_to_le32(sensor_config);



	ret = scmi_do_xfer(handle, t);

	if (!ret) {

		struct sensors_info *si = handle->sensor_priv;

		struct scmi_sensor_info *s = si->sensors + sensor_id;



		s->sensor_config = sensor_config;

	}



	scmi_xfer_put(handle, t);

	return ret;

}



/**

 * scmi_sensor_reading_get  - Read scalar sensor value

 * @handle: Platform handle
@@ -745,6 +806,8 @@ static const struct scmi_sensor_ops sensor_ops = { 
	.trip_point_config = scmi_sensor_trip_point_config,

	.reading_get = scmi_sensor_reading_get,

	.reading_get_timestamped = scmi_sensor_reading_get_timestamped,

	.config_get = scmi_sensor_config_get,

	.config_set = scmi_sensor_config_set,

};



static int scmi_sensor_set_notify_enabled(const struct scmi_handle *handle,

include/linux/scmi_protocol.h

+37 −0
Original line number Diff line number Diff line
@@ -286,7 +286,38 @@ struct scmi_sensor_info { 
	unsigned int num_axis;

	struct scmi_sensor_axis_info *axis;

	struct scmi_sensor_intervals_info intervals;

	unsigned int sensor_config;

#define SCMI_SENS_CFG_UPDATE_SECS_MASK		GENMASK(31, 16)

#define SCMI_SENS_CFG_GET_UPDATE_SECS(x)				\

	FIELD_GET(SCMI_SENS_CFG_UPDATE_SECS_MASK, (x))



#define SCMI_SENS_CFG_UPDATE_EXP_MASK		GENMASK(15, 11)

#define SCMI_SENS_CFG_GET_UPDATE_EXP(x)					\

	({								\

		int __signed_exp =					\

			FIELD_GET(SCMI_SENS_CFG_UPDATE_EXP_MASK, (x));	\

									\

		if (__signed_exp & BIT(4))				\

			__signed_exp |= GENMASK(31, 5);			\

		__signed_exp;						\

	})



#define SCMI_SENS_CFG_ROUND_MASK		GENMASK(10, 9)

#define SCMI_SENS_CFG_ROUND_AUTO		2

#define SCMI_SENS_CFG_ROUND_UP			1

#define SCMI_SENS_CFG_ROUND_DOWN		0



#define SCMI_SENS_CFG_TSTAMP_ENABLED_MASK	BIT(1)

#define SCMI_SENS_CFG_TSTAMP_ENABLE		1

#define SCMI_SENS_CFG_TSTAMP_DISABLE		0

#define SCMI_SENS_CFG_IS_TSTAMP_ENABLED(x)				\

	FIELD_GET(SCMI_SENS_CFG_TSTAMP_ENABLED_MASK, (x))



#define SCMI_SENS_CFG_SENSOR_ENABLED_MASK	BIT(0)

#define SCMI_SENS_CFG_SENSOR_ENABLE		1

#define SCMI_SENS_CFG_SENSOR_DISABLE		0

	char name[SCMI_MAX_STR_SIZE];

#define SCMI_SENS_CFG_IS_ENABLED(x)		FIELD_GET(BIT(0), (x))

	bool extended_scalar_attrs;

	unsigned int sensor_power;

	unsigned int resolution;
@@ -409,6 +440,8 @@ enum scmi_sensor_class { 
 *			     Supports multi-axis sensors for sensors which

 *			     supports it and if the @reading array size of

 *			     @count entry equals the sensor num_axis

 * @config_get: Get sensor current configuration

 * @config_set: Set sensor current configuration

 */

struct scmi_sensor_ops {

	int (*count_get)(const struct scmi_handle *handle);
@@ -421,6 +454,10 @@ struct scmi_sensor_ops { 
	int (*reading_get_timestamped)(const struct scmi_handle *handle,

				       u32 sensor_id, u8 count,

				       struct scmi_sensor_reading *readings);

	int (*config_get)(const struct scmi_handle *handle,

			  u32 sensor_id, u32 *sensor_config);

	int (*config_set)(const struct scmi_handle *handle,

			  u32 sensor_id, u32 sensor_config);

};



/**

CRA Git | Maintained and supported by SUSTech CRA and CCSE