You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
109 lines
3.6 KiB
109 lines
3.6 KiB
Signed-off-by: Evgeni <evgeni.raikhel@intel.com>
|
|
From 001649b143e1a4e0924ac6fc47883a45ba28ff63 Mon Sep 17 00:00:00 2001
|
|
Date: Fri, 19 Jun 2020 12:38:24 +0300
|
|
Subject: [PATCH] Adding missing HID timestamp patch for Gyro sensor.
|
|
Ubuntu 18.04 Bionic Beaver with Kernel 5.4
|
|
A symmetric patch for Accelerator was already upstreamed,
|
|
this patch was skipped from upstream
|
|
The patch was written by Srinivas Pandruvada <srinivas.pandruvada@intel.com>
|
|
Additionally, timestamp conversion is fixed
|
|
|
|
---
|
|
drivers/iio/accel/hid-sensor-accel-3d.c | 1 +
|
|
drivers/iio/gyro/hid-sensor-gyro-3d.c | 31 ++++++++++++++++++-------
|
|
2 files changed, 24 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/drivers/iio/accel/hid-sensor-accel-3d.c b/drivers/iio/accel/hid-sensor-accel-3d.c
|
|
index 0d9e2def2b25..ad90203c87c1 100644
|
|
--- a/drivers/iio/accel/hid-sensor-accel-3d.c
|
|
+++ b/drivers/iio/accel/hid-sensor-accel-3d.c
|
|
@@ -276,6 +276,7 @@ static int accel_3d_capture_sample(struct hid_sensor_hub_device *hsdev,
|
|
hid_sensor_convert_timestamp(
|
|
&accel_state->common_attributes,
|
|
*(int64_t *)raw_data);
|
|
+ ret = 0;
|
|
break;
|
|
default:
|
|
break;
|
|
diff --git a/drivers/iio/gyro/hid-sensor-gyro-3d.c b/drivers/iio/gyro/hid-sensor-gyro-3d.c
|
|
index 08cacbbf31e6..f6e88eecd145 100644
|
|
--- a/drivers/iio/gyro/hid-sensor-gyro-3d.c
|
|
+++ b/drivers/iio/gyro/hid-sensor-gyro-3d.c
|
|
@@ -29,11 +29,13 @@ struct gyro_3d_state {
|
|
struct hid_sensor_hub_callbacks callbacks;
|
|
struct hid_sensor_common common_attributes;
|
|
struct hid_sensor_hub_attribute_info gyro[GYRO_3D_CHANNEL_MAX];
|
|
- u32 gyro_val[GYRO_3D_CHANNEL_MAX];
|
|
+ /* Reserve for 3 channels + padding + timestamp */
|
|
+ u32 gyro_val[GYRO_3D_CHANNEL_MAX + 3];
|
|
int scale_pre_decml;
|
|
int scale_post_decml;
|
|
int scale_precision;
|
|
int value_offset;
|
|
+ int64_t timestamp;
|
|
};
|
|
|
|
static const u32 gyro_3d_addresses[GYRO_3D_CHANNEL_MAX] = {
|
|
@@ -74,7 +76,8 @@ static const struct iio_chan_spec gyro_3d_channels[] = {
|
|
BIT(IIO_CHAN_INFO_SAMP_FREQ) |
|
|
BIT(IIO_CHAN_INFO_HYSTERESIS),
|
|
.scan_index = CHANNEL_SCAN_INDEX_Z,
|
|
- }
|
|
+ },
|
|
+ IIO_CHAN_SOFT_TIMESTAMP(3)
|
|
};
|
|
|
|
/* Adjust channel real bits based on report descriptor */
|
|
@@ -181,11 +184,11 @@ static const struct iio_info gyro_3d_info = {
|
|
};
|
|
|
|
/* Function to push data to buffer */
|
|
-static void hid_sensor_push_data(struct iio_dev *indio_dev, const void *data,
|
|
- int len)
|
|
+static void hid_sensor_push_data(struct iio_dev *indio_dev, void *data,
|
|
+ int len, int64_t timestamp)
|
|
{
|
|
dev_dbg(&indio_dev->dev, "hid_sensor_push_data\n");
|
|
- iio_push_to_buffers(indio_dev, data);
|
|
+ iio_push_to_buffers_with_timestamp(indio_dev, data, timestamp);
|
|
}
|
|
|
|
/* Callback handler to send event after all samples are received and captured */
|
|
@@ -197,11 +200,16 @@ static int gyro_3d_proc_event(struct hid_sensor_hub_device *hsdev,
|
|
struct gyro_3d_state *gyro_state = iio_priv(indio_dev);
|
|
|
|
dev_dbg(&indio_dev->dev, "gyro_3d_proc_event\n");
|
|
- if (atomic_read(&gyro_state->common_attributes.data_ready))
|
|
+ if (atomic_read(&gyro_state->common_attributes.data_ready)) {
|
|
+ if (!gyro_state->timestamp)
|
|
+ gyro_state->timestamp = iio_get_time_ns(indio_dev);
|
|
+
|
|
hid_sensor_push_data(indio_dev,
|
|
gyro_state->gyro_val,
|
|
- sizeof(gyro_state->gyro_val));
|
|
-
|
|
+ sizeof(gyro_state->gyro_val),
|
|
+ gyro_state->timestamp);
|
|
+ gyro_state->timestamp = 0;
|
|
+ }
|
|
return 0;
|
|
}
|
|
|
|
@@ -225,6 +233,13 @@ static int gyro_3d_capture_sample(struct hid_sensor_hub_device *hsdev,
|
|
*(u32 *)raw_data;
|
|
ret = 0;
|
|
break;
|
|
+ case HID_USAGE_SENSOR_TIME_TIMESTAMP:
|
|
+ gyro_state->timestamp =
|
|
+ hid_sensor_convert_timestamp(
|
|
+ &gyro_state->common_attributes,
|
|
+ *(int64_t *)raw_data);
|
|
+ ret = 0;
|
|
+ break;
|
|
default:
|
|
break;
|
|
}
|
|
--
|
|
2.17.1
|
|
|