]> www.infradead.org Git - users/hch/misc.git/commitdiff
iio: cros_ec_sensors: add cros_ec_activity driver
authorGwendal Grignou <gwendal@chromium.org>
Wed, 4 Jun 2025 05:39:03 +0000 (22:39 -0700)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Thu, 26 Jun 2025 18:32:51 +0000 (19:32 +0100)
ChromeOS EC can report activity information derived from the
accelerometer:
- Reports on-body/off-body as a proximity event.
- Reports significant motion as an activity event.

This new sensor is a virtual sensor, included only when the EC firmware
is compiled with the appropriate module.

Signed-off-by: Gwendal Grignou <gwendal@google.com>
Reviewed-by: Tzung-Bi Shih <tzungbi@kernel.org>
Link: https://patch.msgid.link/20250604053903.1376465-1-gwendal@google.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/common/cros_ec_sensors/Kconfig
drivers/iio/common/cros_ec_sensors/Makefile
drivers/iio/common/cros_ec_sensors/cros_ec_activity.c [new file with mode: 0644]
drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c
include/linux/iio/common/cros_ec_sensors_core.h
include/linux/platform_data/cros_ec_commands.h

index fefad95727907d2b5971c727deaf51170c733b78..394e319c9c97fd391029f8456ebc73de0915a26f 100644 (file)
@@ -30,3 +30,12 @@ config IIO_CROS_EC_SENSORS_LID_ANGLE
          convertible devices.
          This module is loaded when the EC can calculate the angle between the base
          and the lid.
+
+config IIO_CROS_EC_ACTIVITY
+       tristate "ChromeOS EC Activity Sensors"
+       depends on IIO_CROS_EC_SENSORS_CORE
+       help
+         Module to handle activity events presented by the ChromeOS EC sensor hub.
+         Activities can be a proximity detector (on body/off body detection)
+         or a significant motion detector.
+         Creates an IIO device to manage all activities.
index c358fa0328abd127ca0cbf169326c58a9bab7e1f..a7dfb5794cae5c0bdd6b13a57c8bb8956e2f6d14 100644 (file)
@@ -7,3 +7,4 @@ cros-ec-sensors-core-objs += cros_ec_sensors_core.o cros_ec_sensors_trace.o
 obj-$(CONFIG_IIO_CROS_EC_SENSORS_CORE) += cros-ec-sensors-core.o
 obj-$(CONFIG_IIO_CROS_EC_SENSORS) += cros_ec_sensors.o
 obj-$(CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE) += cros_ec_lid_angle.o
+obj-$(CONFIG_IIO_CROS_EC_ACTIVITY) += cros_ec_activity.o
diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_activity.c b/drivers/iio/common/cros_ec_sensors/cros_ec_activity.c
new file mode 100644 (file)
index 0000000..6e38d11
--- /dev/null
@@ -0,0 +1,307 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * cros_ec_activity - Driver for activities/gesture recognition.
+ *
+ * Copyright 2025 Google, Inc
+ *
+ * This driver uses the cros-ec interface to communicate with the ChromeOS
+ * EC about activity data.
+ */
+
+#include <linux/bits.h>
+#include <linux/cleanup.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/mutex.h>
+#include <linux/platform_device.h>
+#include <linux/types.h>
+
+#include <linux/platform_data/cros_ec_commands.h>
+#include <linux/platform_data/cros_ec_proto.h>
+
+#include <linux/iio/common/cros_ec_sensors_core.h>
+#include <linux/iio/events.h>
+#include <linux/iio/iio.h>
+#include <linux/iio/trigger_consumer.h>
+
+#define DRV_NAME "cros-ec-activity"
+
+/* state data for ec_sensors iio driver. */
+struct cros_ec_sensors_state {
+       /* Shared by all sensors */
+       struct cros_ec_sensors_core_state core;
+
+       struct iio_chan_spec *channels;
+
+       int body_detection_channel_index;
+       int sig_motion_channel_index;
+};
+
+static const struct iio_event_spec cros_ec_activity_single_shot[] = {
+       {
+               .type = IIO_EV_TYPE_CHANGE,
+               /* significant motion trigger when we get out of still. */
+               .dir = IIO_EV_DIR_FALLING,
+               .mask_separate = BIT(IIO_EV_INFO_ENABLE),
+       },
+};
+
+static const struct iio_event_spec cros_ec_body_detect_events[] = {
+       {
+               .type = IIO_EV_TYPE_CHANGE,
+               .dir = IIO_EV_DIR_EITHER,
+               .mask_separate = BIT(IIO_EV_INFO_ENABLE),
+       },
+};
+
+static int cros_ec_activity_sensors_read_raw(struct iio_dev *indio_dev,
+                                            struct iio_chan_spec const *chan,
+                                            int *val, int *val2, long mask)
+{
+       struct cros_ec_sensors_state *st = iio_priv(indio_dev);
+       int ret;
+
+       if (chan->type != IIO_PROXIMITY || mask != IIO_CHAN_INFO_RAW)
+               return -EINVAL;
+
+       guard(mutex)(&st->core.cmd_lock);
+       st->core.param.cmd = MOTIONSENSE_CMD_GET_ACTIVITY;
+       st->core.param.get_activity.activity =
+               MOTIONSENSE_ACTIVITY_BODY_DETECTION;
+       ret = cros_ec_motion_send_host_cmd(&st->core, 0);
+       if (ret)
+               return ret;
+
+       /*
+        * EC actually report if a body is near (1) or far (0).
+        * Units for proximity sensor after scale is in meter,
+        * so invert the result to return 0m when near and 1m when far.
+        */
+       *val = !st->core.resp->get_activity.state;
+       return IIO_VAL_INT;
+}
+
+static int cros_ec_activity_read_event_config(struct iio_dev *indio_dev,
+                                             const struct iio_chan_spec *chan,
+                                             enum iio_event_type type,
+                                             enum iio_event_direction dir)
+{
+       struct cros_ec_sensors_state *st = iio_priv(indio_dev);
+       int ret;
+
+       if (chan->type != IIO_ACTIVITY && chan->type != IIO_PROXIMITY)
+               return -EINVAL;
+
+       guard(mutex)(&st->core.cmd_lock);
+       st->core.param.cmd = MOTIONSENSE_CMD_LIST_ACTIVITIES;
+       ret = cros_ec_motion_send_host_cmd(&st->core, 0);
+       if (ret)
+               return ret;
+
+       switch (chan->type) {
+       case IIO_PROXIMITY:
+               return !!(st->core.resp->list_activities.enabled &
+                        (1 << MOTIONSENSE_ACTIVITY_BODY_DETECTION));
+       case IIO_ACTIVITY:
+               if (chan->channel2 == IIO_MOD_STILL) {
+                       return !!(st->core.resp->list_activities.enabled &
+                                (1 << MOTIONSENSE_ACTIVITY_SIG_MOTION));
+               }
+
+               dev_warn(&indio_dev->dev, "Unknown activity: %d\n",
+                        chan->channel2);
+               return -EINVAL;
+       default:
+               dev_warn(&indio_dev->dev, "Unknown channel type: %d\n",
+                        chan->type);
+               return -EINVAL;
+       }
+}
+
+static int cros_ec_activity_write_event_config(struct iio_dev *indio_dev,
+                                              const struct iio_chan_spec *chan,
+                                              enum iio_event_type type,
+                                              enum iio_event_direction dir,
+                                              bool state)
+{
+       struct cros_ec_sensors_state *st = iio_priv(indio_dev);
+
+       guard(mutex)(&st->core.cmd_lock);
+       st->core.param.cmd = MOTIONSENSE_CMD_SET_ACTIVITY;
+       switch (chan->type) {
+       case IIO_PROXIMITY:
+               st->core.param.set_activity.activity =
+                       MOTIONSENSE_ACTIVITY_BODY_DETECTION;
+               break;
+       case IIO_ACTIVITY:
+               if (chan->channel2 == IIO_MOD_STILL) {
+                       st->core.param.set_activity.activity =
+                               MOTIONSENSE_ACTIVITY_SIG_MOTION;
+                       break;
+               }
+               dev_warn(&indio_dev->dev, "Unknown activity: %d\n",
+                        chan->channel2);
+               return -EINVAL;
+       default:
+               dev_warn(&indio_dev->dev, "Unknown channel type: %d\n",
+                        chan->type);
+               return -EINVAL;
+       }
+       st->core.param.set_activity.enable = state;
+       return cros_ec_motion_send_host_cmd(&st->core, 0);
+}
+
+static int cros_ec_activity_push_data(struct iio_dev *indio_dev,
+                                     s16 *data, s64 timestamp)
+{
+       struct ec_response_activity_data *activity_data =
+                       (struct ec_response_activity_data *)data;
+       enum motionsensor_activity activity = activity_data->activity;
+       u8 state = activity_data->state;
+       const struct cros_ec_sensors_state *st = iio_priv(indio_dev);
+       const struct iio_chan_spec *chan;
+       enum iio_event_direction dir;
+       int index;
+
+       switch (activity) {
+       case MOTIONSENSE_ACTIVITY_BODY_DETECTION:
+               index = st->body_detection_channel_index;
+               dir = state ? IIO_EV_DIR_FALLING : IIO_EV_DIR_RISING;
+               break;
+       case MOTIONSENSE_ACTIVITY_SIG_MOTION:
+               index = st->sig_motion_channel_index;
+               dir = IIO_EV_DIR_FALLING;
+               break;
+       default:
+               dev_warn(&indio_dev->dev, "Unknown activity: %d\n", activity);
+               return 0;
+       }
+       chan = &st->channels[index];
+       iio_push_event(indio_dev,
+                      IIO_UNMOD_EVENT_CODE(chan->type, index, chan->event_spec[0].type, dir),
+                      timestamp);
+       return 0;
+}
+
+static irqreturn_t cros_ec_activity_capture(int irq, void *p)
+{
+       struct iio_poll_func *pf = p;
+       struct iio_dev *indio_dev = pf->indio_dev;
+
+       /*
+        * This callback would be called when a software trigger is
+        * used. But when this virtual sensor is present, it is guaranteed
+        * the sensor hub is advanced enough to not need a software trigger.
+        */
+       dev_warn(&indio_dev->dev, "%s: Not Expected\n", __func__);
+       return IRQ_NONE;
+}
+
+static const struct iio_info ec_sensors_info = {
+       .read_raw = &cros_ec_activity_sensors_read_raw,
+       .read_event_config = cros_ec_activity_read_event_config,
+       .write_event_config = cros_ec_activity_write_event_config,
+};
+
+static int cros_ec_sensors_probe(struct platform_device *pdev)
+{
+       struct device *dev = &pdev->dev;
+       struct cros_ec_device *ec_device = dev_get_drvdata(dev->parent);
+       struct iio_dev *indio_dev;
+       struct cros_ec_sensors_state *st;
+       struct iio_chan_spec *channel;
+       unsigned long activities;
+       int i, index, ret, nb_activities;
+
+       if (!ec_device) {
+               dev_warn(dev, "No CROS EC device found.\n");
+               return -EINVAL;
+       }
+
+       indio_dev = devm_iio_device_alloc(dev, sizeof(*st));
+       if (!indio_dev)
+               return -ENOMEM;
+
+       ret = cros_ec_sensors_core_init(pdev, indio_dev, true,
+                                       cros_ec_activity_capture);
+       if (ret)
+               return ret;
+
+       indio_dev->info = &ec_sensors_info;
+       st = iio_priv(indio_dev);
+       st->core.type = st->core.resp->info.type;
+       st->core.read_ec_sensors_data = cros_ec_sensors_read_cmd;
+
+       st->core.param.cmd = MOTIONSENSE_CMD_LIST_ACTIVITIES;
+       ret = cros_ec_motion_send_host_cmd(&st->core, 0);
+       if (ret)
+               return ret;
+
+       activities = st->core.resp->list_activities.enabled |
+                    st->core.resp->list_activities.disabled;
+       if (!activities)
+               return -ENODEV;
+
+       /* Allocate a channel per activity and one for timestamp */
+       nb_activities = hweight_long(activities) + 1;
+       st->channels = devm_kcalloc(dev, nb_activities,
+                                   sizeof(*st->channels), GFP_KERNEL);
+       if (!st->channels)
+               return -ENOMEM;
+
+       channel = &st->channels[0];
+       index = 0;
+       for_each_set_bit(i, &activities, BITS_PER_LONG) {
+               /* List all available triggers */
+               if (i == MOTIONSENSE_ACTIVITY_BODY_DETECTION) {
+                       channel->type = IIO_PROXIMITY;
+                       channel->info_mask_separate = BIT(IIO_CHAN_INFO_RAW);
+                       channel->event_spec = cros_ec_body_detect_events;
+                       channel->num_event_specs =
+                               ARRAY_SIZE(cros_ec_body_detect_events);
+                       st->body_detection_channel_index = index;
+               } else {
+                       channel->type = IIO_ACTIVITY;
+                       channel->modified = 1;
+                       channel->event_spec = cros_ec_activity_single_shot;
+                       channel->num_event_specs =
+                               ARRAY_SIZE(cros_ec_activity_single_shot);
+                       if (i == MOTIONSENSE_ACTIVITY_SIG_MOTION) {
+                               channel->channel2 = IIO_MOD_STILL;
+                               st->sig_motion_channel_index = index;
+                       } else {
+                               dev_warn(dev, "Unknown activity: %d\n", i);
+                               continue;
+                       }
+               }
+               channel->ext_info = cros_ec_sensors_limited_info;
+               channel->scan_index = index++;
+               channel++;
+       }
+
+       /* Timestamp */
+       channel->scan_index = index;
+       channel->type = IIO_TIMESTAMP;
+       channel->channel = -1;
+       channel->scan_type.sign = 's';
+       channel->scan_type.realbits = 64;
+       channel->scan_type.storagebits = 64;
+
+       indio_dev->channels = st->channels;
+       indio_dev->num_channels = index + 1;
+
+       return cros_ec_sensors_core_register(dev, indio_dev,
+                                            cros_ec_activity_push_data);
+}
+
+static struct platform_driver cros_ec_sensors_platform_driver = {
+       .driver = {
+               .name   = DRV_NAME,
+       },
+       .probe          = cros_ec_sensors_probe,
+};
+module_platform_driver(cros_ec_sensors_platform_driver);
+
+MODULE_DESCRIPTION("ChromeOS EC activity sensors driver");
+MODULE_ALIAS("platform:" DRV_NAME);
+MODULE_LICENSE("GPL v2");
index 700ebcd68ff47306d3b55f92341ae64782c77db1..9ac80e4b7d756d048e7a1bba66070ed81fa49a81 100644 (file)
@@ -486,6 +486,16 @@ const struct iio_chan_spec_ext_info cros_ec_sensors_ext_info[] = {
 };
 EXPORT_SYMBOL_GPL(cros_ec_sensors_ext_info);
 
+const struct iio_chan_spec_ext_info cros_ec_sensors_limited_info[] = {
+       {
+               .name = "id",
+               .shared = IIO_SHARED_BY_ALL,
+               .read = cros_ec_sensors_id
+       },
+       { }
+};
+EXPORT_SYMBOL_GPL(cros_ec_sensors_limited_info);
+
 /**
  * cros_ec_sensors_idx_to_reg - convert index into offset in shared memory
  * @st:                pointer to state information for device
index e72167b96d27e77651c59c6d1e8de35ec4d3a3ba..bb966abcde53f15d3b61642cf22fb481c29a5c98 100644 (file)
@@ -126,5 +126,6 @@ extern const struct dev_pm_ops cros_ec_sensors_pm_ops;
 
 /* List of extended channel specification for all sensors. */
 extern const struct iio_chan_spec_ext_info cros_ec_sensors_ext_info[];
+extern const struct iio_chan_spec_ext_info cros_ec_sensors_limited_info[];
 
 #endif  /* __CROS_EC_SENSORS_CORE_H */
index 1f4e4f2b89bb936b4b1c3f4162fec203b196cbc8..c19b404e3d8d9ec895a17838aa6e271e235f0823 100644 (file)
@@ -2388,6 +2388,12 @@ enum motionsense_command {
         */
        MOTIONSENSE_CMD_SENSOR_SCALE = 18,
 
+       /*
+        * Activity management
+        * Retrieve current status of given activity.
+        */
+       MOTIONSENSE_CMD_GET_ACTIVITY = 20,
+
        /* Number of motionsense sub-commands. */
        MOTIONSENSE_NUM_CMDS
 };
@@ -2447,6 +2453,11 @@ enum motionsensor_orientation {
        MOTIONSENSE_ORIENTATION_UNKNOWN = 4,
 };
 
+struct ec_response_activity_data {
+       uint8_t activity; /* motionsensor_activity */
+       uint8_t state;
+} __ec_todo_packed;
+
 struct ec_response_motion_sensor_data {
        /* Flags for each sensor. */
        uint8_t flags;
@@ -2460,8 +2471,7 @@ struct ec_response_motion_sensor_data {
                        uint32_t    timestamp;
                };
                struct __ec_todo_unpacked {
-                       uint8_t     activity; /* motionsensor_activity */
-                       uint8_t     state;
+                       struct ec_response_activity_data activity_data;
                        int16_t     add_info[2];
                };
        };
@@ -2494,6 +2504,7 @@ enum motionsensor_activity {
        MOTIONSENSE_ACTIVITY_SIG_MOTION = 1,
        MOTIONSENSE_ACTIVITY_DOUBLE_TAP = 2,
        MOTIONSENSE_ACTIVITY_ORIENTATION = 3,
+       MOTIONSENSE_ACTIVITY_BODY_DETECTION = 4,
 };
 
 struct ec_motion_sense_activity {
@@ -2671,6 +2682,7 @@ struct ec_params_motion_sense {
                        uint32_t max_data_vector;
                } fifo_read;
 
+               /* Used for MOTIONSENSE_CMD_SET_ACTIVITY */
                struct ec_motion_sense_activity set_activity;
 
                /* Used for MOTIONSENSE_CMD_LID_ANGLE */
@@ -2716,6 +2728,12 @@ struct ec_params_motion_sense {
                         */
                        int16_t hys_degree;
                } tablet_mode_threshold;
+
+               /* Used for MOTIONSENSE_CMD_GET_ACTIVITY */
+               struct __ec_todo_unpacked {
+                       uint8_t sensor_num;
+                       uint8_t activity;  /* enum motionsensor_activity */
+               } get_activity;
        };
 } __ec_todo_packed;
 
@@ -2833,6 +2851,10 @@ struct ec_response_motion_sense {
                        uint16_t hys_degree;
                } tablet_mode_threshold;
 
+               /* USED for MOTIONSENSE_CMD_GET_ACTIVITY. */
+               struct __ec_todo_unpacked {
+                       uint8_t     state;
+               } get_activity;
        };
 } __ec_todo_packed;