| Message ID | 20191021055403.67849-18-gwendal@chromium.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | cros_ec: Add sensorhub driver and FIFO processing*** SUBJECT HERE | expand |
On Sun, 20 Oct 2019 22:54:02 -0700 Gwendal Grignou <gwendal@chromium.org> wrote: > Report the maximum amount of sample the EC can hold. > This is not tunable, but can be useful for application to find out the > maximum amount of time it can sleep when hwfifo_timeout is set to a > large number. > > Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > --- > Changes in v2: > - Remove double lines, add line before return for visibility. > > .../cros_ec_sensors/cros_ec_sensors_core.c | 34 +++++++++++++++++-- > .../linux/iio/common/cros_ec_sensors_core.h | 3 ++ > 2 files changed, 35 insertions(+), 2 deletions(-) > > diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c > index 92128c67a166e..f50e239f9a1e9 100644 > --- a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c > +++ b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c > @@ -23,6 +23,12 @@ > #include <linux/platform_data/cros_ec_sensorhub.h> > #include <linux/platform_device.h> > > +/* > + * Hard coded to the first device to support sensor fifo. The EC has a 2048 > + * byte fifo and will trigger an interrupt when fifo is 2/3 full. > + */ > +#define CROS_EC_FIFO_SIZE (2048 * 2 / 3) > + > static char *cros_ec_loc[] = { > [MOTIONSENSE_LOC_BASE] = "base", > [MOTIONSENSE_LOC_LID] = "lid", > @@ -56,8 +62,15 @@ static int cros_ec_get_host_cmd_version_mask(struct cros_ec_device *ec_dev, > > static void get_default_min_max_freq(enum motionsensor_type type, > u32 *min_freq, > - u32 *max_freq) > + u32 *max_freq, > + u32 *max_fifo_events) > { > + /* > + * We don't know fifo size, set to size previously used by older > + * hardware. > + */ > + *max_fifo_events = CROS_EC_FIFO_SIZE; > + > switch (type) { > case MOTIONSENSE_TYPE_ACCEL: > case MOTIONSENSE_TYPE_GYRO: > @@ -150,8 +163,22 @@ static IIO_DEVICE_ATTR(hwfifo_timeout, 0644, > cros_ec_sensor_get_report_latency, > cros_ec_sensor_set_report_latency, 0); > > +static ssize_t hwfifo_watermark_max_show( > + struct device *dev, > + struct device_attribute *attr, > + char *buf) > +{ > + struct iio_dev *indio_dev = dev_to_iio_dev(dev); > + struct cros_ec_sensors_core_state *st = iio_priv(indio_dev); > + > + return sprintf(buf, "%d\n", st->fifo_max_event_count); > +} > + > +static IIO_DEVICE_ATTR_RO(hwfifo_watermark_max, 0); > + > const struct attribute *cros_ec_sensor_fifo_attributes[] = { > &iio_dev_attr_hwfifo_timeout.dev_attr.attr, > + &iio_dev_attr_hwfifo_watermark_max.dev_attr.attr, > NULL, > }; > EXPORT_SYMBOL_GPL(cros_ec_sensor_fifo_attributes); > @@ -281,12 +308,15 @@ int cros_ec_sensors_core_init(struct platform_device *pdev, > if (state->msg->version < 3) { > get_default_min_max_freq(state->resp->info.type, > &state->frequencies[1], > - &state->frequencies[2]); > + &state->frequencies[2], > + &state->fifo_max_event_count); > } else { > state->frequencies[1] = > state->resp->info_3.min_frequency; > state->frequencies[2] = > state->resp->info_3.max_frequency; > + state->fifo_max_event_count = > + state->resp->info_3.fifo_max_event_count; > } > > ret = devm_iio_triggered_buffer_setup( > diff --git a/include/linux/iio/common/cros_ec_sensors_core.h b/include/linux/iio/common/cros_ec_sensors_core.h > index 387ca9e61dac8..4df3abd151fbf 100644 > --- a/include/linux/iio/common/cros_ec_sensors_core.h > +++ b/include/linux/iio/common/cros_ec_sensors_core.h > @@ -51,6 +51,7 @@ typedef irqreturn_t (*cros_ec_sensors_capture_t)(int irq, void *p); > * the timestamp. The timestamp is always last and > * is always 8-byte aligned. > * @read_ec_sensors_data: function used for accessing sensors values > + * @fifo_max_event_count: Size of the EC sensor FIFO > */ > struct cros_ec_sensors_core_state { > struct cros_ec_device *ec; > @@ -73,6 +74,8 @@ struct cros_ec_sensors_core_state { > int (*read_ec_sensors_data)(struct iio_dev *indio_dev, > unsigned long scan_mask, s16 *data); > > + u32 fifo_max_event_count; > + > /* Table of known available frequencies : 0, Min and Max in mHz */ > int frequencies[3]; > };
diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c index 92128c67a166e..f50e239f9a1e9 100644 --- a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c +++ b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c @@ -23,6 +23,12 @@ #include <linux/platform_data/cros_ec_sensorhub.h> #include <linux/platform_device.h> +/* + * Hard coded to the first device to support sensor fifo. The EC has a 2048 + * byte fifo and will trigger an interrupt when fifo is 2/3 full. + */ +#define CROS_EC_FIFO_SIZE (2048 * 2 / 3) + static char *cros_ec_loc[] = { [MOTIONSENSE_LOC_BASE] = "base", [MOTIONSENSE_LOC_LID] = "lid", @@ -56,8 +62,15 @@ static int cros_ec_get_host_cmd_version_mask(struct cros_ec_device *ec_dev, static void get_default_min_max_freq(enum motionsensor_type type, u32 *min_freq, - u32 *max_freq) + u32 *max_freq, + u32 *max_fifo_events) { + /* + * We don't know fifo size, set to size previously used by older + * hardware. + */ + *max_fifo_events = CROS_EC_FIFO_SIZE; + switch (type) { case MOTIONSENSE_TYPE_ACCEL: case MOTIONSENSE_TYPE_GYRO: @@ -150,8 +163,22 @@ static IIO_DEVICE_ATTR(hwfifo_timeout, 0644, cros_ec_sensor_get_report_latency, cros_ec_sensor_set_report_latency, 0); +static ssize_t hwfifo_watermark_max_show( + struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct iio_dev *indio_dev = dev_to_iio_dev(dev); + struct cros_ec_sensors_core_state *st = iio_priv(indio_dev); + + return sprintf(buf, "%d\n", st->fifo_max_event_count); +} + +static IIO_DEVICE_ATTR_RO(hwfifo_watermark_max, 0); + const struct attribute *cros_ec_sensor_fifo_attributes[] = { &iio_dev_attr_hwfifo_timeout.dev_attr.attr, + &iio_dev_attr_hwfifo_watermark_max.dev_attr.attr, NULL, }; EXPORT_SYMBOL_GPL(cros_ec_sensor_fifo_attributes); @@ -281,12 +308,15 @@ int cros_ec_sensors_core_init(struct platform_device *pdev, if (state->msg->version < 3) { get_default_min_max_freq(state->resp->info.type, &state->frequencies[1], - &state->frequencies[2]); + &state->frequencies[2], + &state->fifo_max_event_count); } else { state->frequencies[1] = state->resp->info_3.min_frequency; state->frequencies[2] = state->resp->info_3.max_frequency; + state->fifo_max_event_count = + state->resp->info_3.fifo_max_event_count; } ret = devm_iio_triggered_buffer_setup( diff --git a/include/linux/iio/common/cros_ec_sensors_core.h b/include/linux/iio/common/cros_ec_sensors_core.h index 387ca9e61dac8..4df3abd151fbf 100644 --- a/include/linux/iio/common/cros_ec_sensors_core.h +++ b/include/linux/iio/common/cros_ec_sensors_core.h @@ -51,6 +51,7 @@ typedef irqreturn_t (*cros_ec_sensors_capture_t)(int irq, void *p); * the timestamp. The timestamp is always last and * is always 8-byte aligned. * @read_ec_sensors_data: function used for accessing sensors values + * @fifo_max_event_count: Size of the EC sensor FIFO */ struct cros_ec_sensors_core_state { struct cros_ec_device *ec; @@ -73,6 +74,8 @@ struct cros_ec_sensors_core_state { int (*read_ec_sensors_data)(struct iio_dev *indio_dev, unsigned long scan_mask, s16 *data); + u32 fifo_max_event_count; + /* Table of known available frequencies : 0, Min and Max in mHz */ int frequencies[3]; };
Report the maximum amount of sample the EC can hold. This is not tunable, but can be useful for application to find out the maximum amount of time it can sleep when hwfifo_timeout is set to a large number. Signed-off-by: Gwendal Grignou <gwendal@chromium.org> --- Changes in v2: - Remove double lines, add line before return for visibility. .../cros_ec_sensors/cros_ec_sensors_core.c | 34 +++++++++++++++++-- .../linux/iio/common/cros_ec_sensors_core.h | 3 ++ 2 files changed, 35 insertions(+), 2 deletions(-)