michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Revert "sensors: Fix overflow in default decoder"

Browse source 
This reverts commit b2a78ff679.

Causes CI fail on:

west build -p -b native_posix_64 -T
	tests/drivers/build_all/sensor/sensors.generic_test

Assertion failed at
WEST_TOPDIR/zephyr/tests/drivers/build_all/sensor/src/generic_test.c:204:
run_generic_test: (expected_shifted not within actual_shifted +/-
epsilon_shifted)

Expected -105484396736, got -103734438144 (shift 6, ch 8, iteration 1/5,
Error -1749958592, Epsilon 3221184)

Signed-off-by: Fabio Baltieri <fabiobaltieri@google.com>
This commit is contained in:
Fabio Baltieri 2023-08-09 10:31:13 +00:00 • committed by Fabio Baltieri
commit 4488a41f8c
1 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
drivers/sensor/default_rtio_sensor.c
View file

@ -183,8 +183,6 @@ static void sensor_submit_fallback(const struct device *dev, struct rtio_iodev_s
header->shift = new_shift;
}
__ASSERT_NO_MSG(header->shift <= 31);
/*
* Spread the q31 values. This is needed because some channels are 3D. If
* the user specified one of those then num_samples will be 3; and we need to
@ -194,7 +192,6 @@ static void sensor_submit_fallback(const struct device *dev, struct rtio_iodev_s
/* Check if the channel is already in the buffer */
int prev_computed_value_idx = check_header_contains_channel(
header, header->channels[sample_idx + sample], sample_idx + sample);
int float_bits = 31 - header->shift;
if (prev_computed_value_idx >= 0 &&
prev_computed_value_idx != sample_idx + sample) {
@ -205,17 +202,17 @@ static void sensor_submit_fallback(const struct device *dev, struct rtio_iodev_s
continue;
}
/* Convert the value to micro-units */
int64_t value_u = sensor_value_to_micro(&value[sample]);
/* Convert to q31 using the shift */
q[sample_idx + sample] =
((int64_t)value[sample].val1 << float_bits) |
((value[sample].val2 * BIT64(float_bits) / 1000000) &
GENMASK(float_bits - 1, 0));
((value_u * ((INT64_C(1) << 31) - 1)) / 1000000) >> header->shift;
LOG_DBG("value[%d]=%s%d.%06d, q[%d]@%p=%d, shift=%d", sample,
sensor_value_to_micro(&value[sample]) < 0 ? "-" : "",
LOG_DBG("value[%d]=%s%d.%06d, q[%d]@%p=%d", sample, value_u < 0 ? "-" : "",
abs((int)value[sample].val1), abs((int)value[sample].val2),
(int)(sample_idx + sample), (void *)&q[sample_idx + sample],
q[sample_idx + sample], header->shift);
q[sample_idx + sample]);
}
sample_idx += num_samples;
}
@ -317,8 +314,9 @@ static int decode(const uint8_t *buffer, sensor_frame_iterator_t *fit,
{
const struct sensor_data_generic_header *header =
(const struct sensor_data_generic_header *)buffer;
const q31_t *q = (const q31_t *)(buffer + sizeof(struct sensor_data_generic_header) +
header->num_channels * sizeof(enum sensor_channel));
const q31_t *q =
(const q31_t *)(buffer + sizeof(struct sensor_data_generic_header) +
header->num_channels * sizeof(enum sensor_channel));
int count = 0;
if (*fit != 0 || *cit >= header->num_channels) {