iio: cros_ec: Register to cros_ec_sensorhub when EC supports FIFO
authorGwendal Grignou <gwendal@chromium.org>
Fri, 27 Mar 2020 22:34:38 +0000 (15:34 -0700)
committerEnric Balletbo i Serra <enric.balletbo@collabora.com>
Sat, 28 Mar 2020 21:04:32 +0000 (22:04 +0100)
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.

Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
drivers/iio/accel/cros_ec_accel_legacy.c
drivers/iio/common/cros_ec_sensors/cros_ec_lid_angle.c
drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c
drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c
drivers/iio/light/cros_ec_light_prox.c
drivers/iio/pressure/cros_ec_baro.c
include/linux/iio/common/cros_ec_sensors_core.h

index 68e847c6255e37f40acea684ec422b582016d1ba..2532b9ad33842501e8b00b3138dd60b956376552 100644 (file)
@@ -170,7 +170,8 @@ static int cros_ec_accel_legacy_probe(struct platform_device *pdev)
        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;
 
@@ -190,11 +191,6 @@ static int cros_ec_accel_legacy_probe(struct platform_device *pdev)
                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);
 }
 
index 1dcc2a16ab2dd806ccd4f21651635bef5c719dbb..e30a59fcf0f952e581d2cd66c84ac22c9e4c5bd2 100644 (file)
@@ -97,7 +97,7 @@ static int cros_ec_lid_angle_probe(struct platform_device *pdev)
        if (!indio_dev)
                return -ENOMEM;
 
-       ret = cros_ec_sensors_core_init(pdev, indio_dev, false);
+       ret = cros_ec_sensors_core_init(pdev, indio_dev, false, NULL, NULL);
        if (ret)
                return ret;
 
index 576e45faafaffb4fdee3792583022561246ddd17..711134d67ddeea3364cad88077a4dea8962537d3 100644 (file)
@@ -230,7 +230,9 @@ static int cros_ec_sensors_probe(struct platform_device *pdev)
        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;
 
@@ -292,11 +294,6 @@ static int cros_ec_sensors_probe(struct platform_device *pdev)
        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);
 }
 
index f3c000448b90e6ffcd007f506ac4a7b2cf636722..01513cb933653d3c1da1e0a98494249450457104 100644 (file)
@@ -12,6 +12,7 @@
 #include <linux/iio/iio.h>
 #include <linux/iio/kfifo_buf.h>
 #include <linux/iio/trigger_consumer.h>
+#include <linux/iio/triggered_buffer.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/slab.h>
@@ -82,17 +83,71 @@ static void get_default_min_max_freq(enum motionsensor_type type,
        }
 }
 
+int cros_ec_sensors_push_data(struct iio_dev *indio_dev,
+                             s16 *data,
+                             s64 timestamp)
+{
+       struct cros_ec_sensors_core_state *st = iio_priv(indio_dev);
+       s16 *out;
+       s64 delta;
+       unsigned int i;
+
+       /*
+        * Ignore samples if the buffer is not set: it is needed if the ODR is
+        * set but the buffer is not enabled yet.
+        */
+       if (!iio_buffer_enabled(indio_dev))
+               return 0;
+
+       out = (s16 *)st->samples;
+       for_each_set_bit(i,
+                        indio_dev->active_scan_mask,
+                        indio_dev->masklength) {
+               *out = data[i];
+               out++;
+       }
+
+       if (iio_device_get_clock(indio_dev) != CLOCK_BOOTTIME)
+               delta = iio_get_time_ns(indio_dev) - cros_ec_get_time_ns();
+       else
+               delta = 0;
+
+       iio_push_to_buffers_with_timestamp(indio_dev, st->samples,
+                                          timestamp + delta);
+
+       return 0;
+}
+EXPORT_SYMBOL_GPL(cros_ec_sensors_push_data);
+
+static void cros_ec_sensors_core_clean(void *arg)
+{
+       struct platform_device *pdev = (struct platform_device *)arg;
+       struct cros_ec_sensorhub *sensor_hub =
+               dev_get_drvdata(pdev->dev.parent);
+       struct iio_dev *indio_dev = platform_get_drvdata(pdev);
+       struct cros_ec_sensors_core_state *st = iio_priv(indio_dev);
+       u8 sensor_num = st->param.info.sensor_num;
+
+       cros_ec_sensorhub_unregister_push_data(sensor_hub, sensor_num);
+}
+
 /**
  * cros_ec_sensors_core_init() - basic initialization of the core structure
  * @pdev:              platform device created for the sensors
  * @indio_dev:         iio device structure of the device
  * @physical_device:   true if the device refers to a physical device
+ * @trigger_capture:    function pointer to call buffer is triggered,
+ *    for backward compatibility.
+ * @push_data:          function to call when cros_ec_sensorhub receives
+ *    a sample for that sensor.
  *
  * Return: 0 on success, -errno on failure.
  */
 int cros_ec_sensors_core_init(struct platform_device *pdev,
                              struct iio_dev *indio_dev,
-                             bool physical_device)
+                             bool physical_device,
+                             cros_ec_sensors_capture_t trigger_capture,
+                             cros_ec_sensorhub_push_data_cb_t push_data)
 {
        struct device *dev = &pdev->dev;
        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,
        indio_dev->name = pdev->name;
 
        if (physical_device) {
-               indio_dev->modes = INDIO_DIRECT_MODE;
-
                state->param.cmd = MOTIONSENSE_CMD_INFO;
                state->param.info.sensor_num = sensor_platform->sensor_num;
                ret = cros_ec_motion_send_host_cmd(state, 0);
@@ -161,6 +214,48 @@ int cros_ec_sensors_core_init(struct platform_device *pdev,
                        state->frequencies[2] =
                            state->resp->info_3.max_frequency;
                }
+
+               if (cros_ec_check_features(ec, EC_FEATURE_MOTION_SENSE_FIFO)) {
+                       /*
+                        * Create a software buffer, feed by the EC FIFO.
+                        * We can not use trigger here, as events are generated
+                        * as soon as sample_frequency is set.
+                        */
+                       struct iio_buffer *buffer;
+
+                       buffer = devm_iio_kfifo_allocate(dev);
+                       if (!buffer)
+                               return -ENOMEM;
+
+                       iio_device_attach_buffer(indio_dev, buffer);
+                       indio_dev->modes = INDIO_BUFFER_SOFTWARE;
+
+                       ret = cros_ec_sensorhub_register_push_data(
+                                       sensor_hub, sensor_platform->sensor_num,
+                                       indio_dev, push_data);
+                       if (ret)
+                               return ret;
+
+                       ret = devm_add_action_or_reset(
+                                       dev, cros_ec_sensors_core_clean, pdev);
+                       if (ret)
+                               return ret;
+
+                       /* Timestamp coming from FIFO are in ns since boot. */
+                       ret = iio_device_set_clock(indio_dev, CLOCK_BOOTTIME);
+                       if (ret)
+                               return ret;
+               } else {
+                       /*
+                        * The only way to get samples in buffer is to set a
+                        * software tigger (systrig, hrtimer).
+                        */
+                       ret = devm_iio_triggered_buffer_setup(
+                                       dev, indio_dev, NULL, trigger_capture,
+                                       NULL);
+                       if (ret)
+                               return ret;
+               }
        }
 
        return 0;
index 7a838e2956f40eba88e12c69a159828065eb1031..03c951ff4a3c3ca10e7d03183ec3711edc150ae1 100644 (file)
@@ -177,7 +177,9 @@ static int cros_ec_light_prox_probe(struct platform_device *pdev)
        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;
 
@@ -236,11 +238,6 @@ static int cros_ec_light_prox_probe(struct platform_device *pdev)
 
        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);
 }
 
index b521bebd551c7e7dea178a4b06c5b488f1f333f6..6add499f11aa61abc5dc88ced5d6b35c78028fe6 100644 (file)
@@ -134,7 +134,9 @@ static int cros_ec_baro_probe(struct platform_device *pdev)
        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;
 
@@ -182,11 +184,6 @@ static int cros_ec_baro_probe(struct platform_device *pdev)
 
        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);
 }
 
index 0af918978f975f0c3149b71c1af579a6a8fd3858..b8f573ca9dcc996886f5ea82956a2e0e63d6e8a5 100644 (file)
@@ -12,6 +12,7 @@
 #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,
@@ -32,6 +33,8 @@ enum {
 /* 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
@@ -87,9 +90,14 @@ int cros_ec_sensors_read_cmd(struct iio_dev *indio_dev, unsigned long scan_mask,
 
 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);