This is a note to let you know that I've just added the patch titled
iio: imu: fxos8700: fix IMU data bits returned to user space
to the 5.15-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
iio-imu-fxos8700-fix-imu-data-bits-returned-to-user-space.patch
and it can be found in the queue-5.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From a53f945879c0cb9de3a4c05a665f5157884b5208 Mon Sep 17 00:00:00 2001
From: Carlos Song <carlos.song@xxxxxxx>
Date: Thu, 8 Dec 2022 15:19:08 +0800
Subject: iio: imu: fxos8700: fix IMU data bits returned to user space
From: Carlos Song <carlos.song@xxxxxxx>
commit a53f945879c0cb9de3a4c05a665f5157884b5208 upstream.
ACCEL output data registers contain the X-axis, Y-axis, and Z-axis
14-bit left-justified sample data and MAGN output data registers
contain the X-axis, Y-axis, and Z-axis 16-bit sample data. The ACCEL
raw register output data should be divided by 4 before sent to
userspace.
Apply a 2 bits signed right shift to the raw data from ACCEL output
data register but keep that from MAGN sensor as the origin.
Fixes: 84e5ddd5c46e ("iio: imu: Add support for the FXOS8700 IMU")
Signed-off-by: Carlos Song <carlos.song@xxxxxxx>
Link: https://lore.kernel.org/r/20221208071911.2405922-5-carlos.song@xxxxxxx
Cc: <Stable@xxxxxxxxxxxxxxx>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/iio/imu/fxos8700_core.c | 28 +++++++++++++++++++++++++++-
1 file changed, 27 insertions(+), 1 deletion(-)
--- a/drivers/iio/imu/fxos8700_core.c
+++ b/drivers/iio/imu/fxos8700_core.c
@@ -418,6 +418,7 @@ static int fxos8700_get_data(struct fxos
int axis, int *val)
{
u8 base, reg;
+ s16 tmp;
int ret;
enum fxos8700_sensor type = fxos8700_to_sensor(chan_type);
@@ -432,8 +433,33 @@ static int fxos8700_get_data(struct fxos
/* Convert axis to buffer index */
reg = axis - IIO_MOD_X;
+ /*
+ * Convert to native endianness. The accel data and magn data
+ * are signed, so a forced type conversion is needed.
+ */
+ tmp = be16_to_cpu(data->buf[reg]);
+
+ /*
+ * ACCEL output data registers contain the X-axis, Y-axis, and Z-axis
+ * 14-bit left-justified sample data and MAGN output data registers
+ * contain the X-axis, Y-axis, and Z-axis 16-bit sample data. Apply
+ * a signed 2 bits right shift to the readback raw data from ACCEL
+ * output data register and keep that from MAGN sensor as the origin.
+ * Value should be extended to 32 bit.
+ */
+ switch (chan_type) {
+ case IIO_ACCEL:
+ tmp = tmp >> 2;
+ break;
+ case IIO_MAGN:
+ /* Nothing to do */
+ break;
+ default:
+ return -EINVAL;
+ }
+
/* Convert to native endianness */
- *val = sign_extend32(be16_to_cpu(data->buf[reg]), 15);
+ *val = sign_extend32(tmp, 15);
return 0;
}
Patches currently in stable-queue which might be from carlos.song@xxxxxxx are
queue-5.15/iio-imu-fxos8700-fix-map-label-of-channel-type-to-magn-sensor.patch
queue-5.15/iio-imu-fxos8700-fix-incomplete-accel-and-magn-channels-readback.patch
queue-5.15/iio-imu-fxos8700-fix-failed-initialization-odr-mode-assignment.patch
queue-5.15/iio-imu-fxos8700-remove-definition-fxos8700_ctrl_odr_min.patch
queue-5.15/iio-imu-fxos8700-fix-imu-data-bits-returned-to-user-space.patch
queue-5.15/iio-imu-fxos8700-fix-incorrect-odr-mode-readback.patch
queue-5.15/iio-imu-fxos8700-fix-accel-measurement-range-selection.patch
queue-5.15/iio-imu-fxos8700-fix-swapped-accel-and-magn-channels-readback.patch
queue-5.15/iio-imu-fxos8700-fix-magn-sensor-scale-and-unit.patch
