iio: cros_ec: Register to cros_ec_sensorhub when EC supports FIFO

When EC supports FIFO, each IIO device registers a callback, to put samples in the buffer when they arrives from the FIFO. When no FIFO, the user space app needs to call trigger_new, or better register a high precision timer.

Gwendal Grignou committed 6 years ago

Commit aa984f11 parent 69f07937 files · +119 −29Browse files

Unified · Split

7 files

drivers/iio/accel/cros_ec_accel_legacy.c +2 −6
drivers/iio/common/cros_ec_sensors/cros_ec_lid_angle.c +1 −1
drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c +3 −6
drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c +98 −3
drivers/iio/light/cros_ec_light_prox.c +3 −6
drivers/iio/pressure/cros_ec_baro.c +3 −6
include/linux/iio/common/cros_ec_sensors_core.h +9 −1

drivers/iio/accel/cros_ec_accel_legacy.c+2−6

 	if (!indio_dev)
 		return -ENOMEM;
-	ret = cros_ec_sensors_core_init(pdev, indio_dev, true);
+	ret = cros_ec_sensors_core_init(pdev, indio_dev, true,
+					cros_ec_sensors_capture, NULL);
 	if (ret)
 		return ret;
 		state->sign[CROS_EC_SENSOR_Z] = -1;
 	}
-	ret = devm_iio_triggered_buffer_setup(dev, indio_dev, NULL,
-			cros_ec_sensors_capture, NULL);
-	if (ret)
-		return ret;
 	return devm_iio_device_register(dev, indio_dev);
 }

drivers/iio/common/cros_ec_sensors/cros_ec_lid_angle.c+1−1

@@ -97,7 +97,7 @@ static int cros_ec_lid_angle_probe(struct platform_device *pdev) · 96 unmodified lines
97	if (!indio_dev)	97	if (!indio_dev)
98	return -ENOMEM;	98	return -ENOMEM;
99		99
100	ret = cros_ec_sensors_core_init(pdev, indio_dev, false);	100	ret = cros_ec_sensors_core_init(pdev, indio_dev, false, NULL, NULL);
101	if (ret)	101	if (ret)
102	return ret;	102	return ret;
103		103

drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c+3−6

 	if (!indio_dev)
 		return -ENOMEM;
-	ret = cros_ec_sensors_core_init(pdev, indio_dev, true);
+	ret = cros_ec_sensors_core_init(pdev, indio_dev, true,
+					cros_ec_sensors_capture,
+					cros_ec_sensors_push_data);
 	if (ret)
 		return ret;
 	else
 		state->core.read_ec_sensors_data = cros_ec_sensors_read_cmd;
-	ret = devm_iio_triggered_buffer_setup(dev, indio_dev, NULL,
-			cros_ec_sensors_capture, NULL);
-	if (ret)
-		return ret;
 	return devm_iio_device_register(dev, indio_dev);
 }

drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c+98−3

@@ -12,6 +12,7 @@ · 11 unmodified lines
12	#include <linux/iio/iio.h>	12	#include <linux/iio/iio.h>
13	#include <linux/iio/kfifo_buf.h>	13	#include <linux/iio/kfifo_buf.h>
14	#include <linux/iio/trigger_consumer.h>	14	#include <linux/iio/trigger_consumer.h>
		15	#include <linux/iio/triggered_buffer.h>
15	#include <linux/kernel.h>	16	#include <linux/kernel.h>
16	#include <linux/module.h>	17	#include <linux/module.h>
17	#include <linux/slab.h>	18	#include <linux/slab.h>
@@ -82,17 +83,71 @@ static void get_default_min_max_freq(enum motionsensor_type type, · 64 unmodified lines
82	}	83	}
83	}	84	}
84		85
		86	int cros_ec_sensors_push_data(struct iio_dev *indio_dev,
		87	s16 *data,
		88	s64 timestamp)
		89	{
		90	struct cros_ec_sensors_core_state *st = iio_priv(indio_dev);
		91	s16 *out;
		92	s64 delta;
		93	unsigned int i;
		94
		95	/*
		96	* Ignore samples if the buffer is not set: it is needed if the ODR is
		97	* set but the buffer is not enabled yet.
		98	*/
		99	if (!iio_buffer_enabled(indio_dev))
		100	return 0;
		101
		102	out = (s16 *)st->samples;
		103	for_each_set_bit(i,
		104	indio_dev->active_scan_mask,
		105	indio_dev->masklength) {
		106	*out = data[i];
		107	out++;
		108	}
		109
		110	if (iio_device_get_clock(indio_dev) != CLOCK_BOOTTIME)
		111	delta = iio_get_time_ns(indio_dev) - cros_ec_get_time_ns();
		112	else
		113	delta = 0;
		114
		115	iio_push_to_buffers_with_timestamp(indio_dev, st->samples,
		116	timestamp + delta);
		117
		118	return 0;
		119	}
		120	EXPORT_SYMBOL_GPL(cros_ec_sensors_push_data);
		121
		122	static void cros_ec_sensors_core_clean(void *arg)
		123	{
		124	struct platform_device pdev = (struct platform_device )arg;
		125	struct cros_ec_sensorhub *sensor_hub =
		126	dev_get_drvdata(pdev->dev.parent);
		127	struct iio_dev *indio_dev = platform_get_drvdata(pdev);
		128	struct cros_ec_sensors_core_state *st = iio_priv(indio_dev);
		129	u8 sensor_num = st->param.info.sensor_num;
		130
		131	cros_ec_sensorhub_unregister_push_data(sensor_hub, sensor_num);
		132	}
		133
85	/**	134	/**
86	* cros_ec_sensors_core_init() - basic initialization of the core structure	135	* cros_ec_sensors_core_init() - basic initialization of the core structure
87	* @pdev: platform device created for the sensors	136	* @pdev: platform device created for the sensors
88	* @indio_dev: iio device structure of the device	137	* @indio_dev: iio device structure of the device
89	* @physical_device: true if the device refers to a physical device	138	* @physical_device: true if the device refers to a physical device
		139	* @trigger_capture: function pointer to call buffer is triggered,
		140	* for backward compatibility.
		141	* @push_data: function to call when cros_ec_sensorhub receives
		142	* a sample for that sensor.
90	*	143	*
91	* Return: 0 on success, -errno on failure.	144	* Return: 0 on success, -errno on failure.
92	*/	145	*/
93	int cros_ec_sensors_core_init(struct platform_device *pdev,	146	int cros_ec_sensors_core_init(struct platform_device *pdev,
94	struct iio_dev *indio_dev,	147	struct iio_dev *indio_dev,
95	bool physical_device)	148	bool physical_device,
		149	cros_ec_sensors_capture_t trigger_capture,
		150	cros_ec_sensorhub_push_data_cb_t push_data)
96	{	151	{
97	struct device *dev = &pdev->dev;	152	struct device *dev = &pdev->dev;
98	struct cros_ec_sensors_core_state *state = iio_priv(indio_dev);	153	struct cros_ec_sensors_core_state *state = iio_priv(indio_dev);
@@ -131,8 +186,6 @@ int cros_ec_sensors_core_init(struct platform_device *pdev, · 32 unmodified lines
131	indio_dev->name = pdev->name;	186	indio_dev->name = pdev->name;
132		187
133	if (physical_device) {	188	if (physical_device) {
134	indio_dev->modes = INDIO_DIRECT_MODE;
135
136	state->param.cmd = MOTIONSENSE_CMD_INFO;	189	state->param.cmd = MOTIONSENSE_CMD_INFO;
137	state->param.info.sensor_num = sensor_platform->sensor_num;	190	state->param.info.sensor_num = sensor_platform->sensor_num;
138	ret = cros_ec_motion_send_host_cmd(state, 0);	191	ret = cros_ec_motion_send_host_cmd(state, 0);
@@ -161,6 +214,48 @@ int cros_ec_sensors_core_init(struct platform_device *pdev, · 22 unmodified lines
161	state->frequencies[2] =	214	state->frequencies[2] =
162	state->resp->info_3.max_frequency;	215	state->resp->info_3.max_frequency;
163	}	216	}
		217
		218	if (cros_ec_check_features(ec, EC_FEATURE_MOTION_SENSE_FIFO)) {
		219	/*
		220	* Create a software buffer, feed by the EC FIFO.
		221	* We can not use trigger here, as events are generated
		222	* as soon as sample_frequency is set.
		223	*/
		224	struct iio_buffer *buffer;
		225
		226	buffer = devm_iio_kfifo_allocate(dev);
		227	if (!buffer)
		228	return -ENOMEM;
		229
		230	iio_device_attach_buffer(indio_dev, buffer);
		231	indio_dev->modes = INDIO_BUFFER_SOFTWARE;
		232
		233	ret = cros_ec_sensorhub_register_push_data(
		234	sensor_hub, sensor_platform->sensor_num,
		235	indio_dev, push_data);
		236	if (ret)
		237	return ret;
		238
		239	ret = devm_add_action_or_reset(
		240	dev, cros_ec_sensors_core_clean, pdev);
		241	if (ret)
		242	return ret;
		243
		244	/* Timestamp coming from FIFO are in ns since boot. */
		245	ret = iio_device_set_clock(indio_dev, CLOCK_BOOTTIME);
		246	if (ret)
		247	return ret;
		248	} else {
		249	/*
		250	* The only way to get samples in buffer is to set a
		251	* software tigger (systrig, hrtimer).
		252	*/
		253	ret = devm_iio_triggered_buffer_setup(
		254	dev, indio_dev, NULL, trigger_capture,
		255	NULL);
		256	if (ret)
		257	return ret;
		258	}
164	}	259	}
165		260
166	return 0;	261	return 0;

drivers/iio/light/cros_ec_light_prox.c+3−6

 	if (!indio_dev)
 		return -ENOMEM;
-	ret = cros_ec_sensors_core_init(pdev, indio_dev, true);
+	ret = cros_ec_sensors_core_init(pdev, indio_dev, true,
+					cros_ec_sensors_capture,
+					cros_ec_sensors_push_data);
 	if (ret)
 		return ret;
 	state->core.read_ec_sensors_data = cros_ec_sensors_read_cmd;
-	ret = devm_iio_triggered_buffer_setup(dev, indio_dev, NULL,
-					      cros_ec_sensors_capture, NULL);
-	if (ret)
-		return ret;
 	return devm_iio_device_register(dev, indio_dev);
 }

drivers/iio/pressure/cros_ec_baro.c+3−6

 	if (!indio_dev)
 		return -ENOMEM;
-	ret = cros_ec_sensors_core_init(pdev, indio_dev, true);
+	ret = cros_ec_sensors_core_init(pdev, indio_dev, true,
+					cros_ec_sensors_capture,
+					cros_ec_sensors_push_data);
 	if (ret)
 		return ret;
 	state->core.read_ec_sensors_data = cros_ec_sensors_read_cmd;
-	ret = devm_iio_triggered_buffer_setup(dev, indio_dev, NULL,
-					      cros_ec_sensors_capture, NULL);
-	if (ret)
-		return ret;
 	return devm_iio_device_register(dev, indio_dev);
 }

include/linux/iio/common/cros_ec_sensors_core.h+9−1

 #include <linux/irqreturn.h>
 #include <linux/platform_data/cros_ec_commands.h>
 #include <linux/platform_data/cros_ec_proto.h>
+#include <linux/platform_data/cros_ec_sensorhub.h>
 enum {
 	CROS_EC_SENSOR_X,
 /* Minimum sampling period to use when device is suspending */
 #define CROS_EC_MIN_SUSPEND_SAMPLING_FREQUENCY 1000  /* 1 second */
+typedef irqreturn_t (*cros_ec_sensors_capture_t)(int irq, void *p);
 /**
  * struct cros_ec_sensors_core_state - state data for EC sensors IIO driver
  * @ec:				cros EC device structure
 struct platform_device;
 int cros_ec_sensors_core_init(struct platform_device *pdev,
-			      struct iio_dev *indio_dev, bool physical_device);
+			      struct iio_dev *indio_dev, bool physical_device,
+			      cros_ec_sensors_capture_t trigger_capture,
+			      cros_ec_sensorhub_push_data_cb_t push_data);
 irqreturn_t cros_ec_sensors_capture(int irq, void *p);
+int cros_ec_sensors_push_data(struct iio_dev *indio_dev,
+			      s16 *data,
+			      s64 timestamp);
 int cros_ec_motion_send_host_cmd(struct cros_ec_sensors_core_state *st,
 				 u16 opt_length);