Skip to content

Commit e7395a9

Browse files
ubiedakartben
ubieda
authored and
kartben
committed
bmp581: stream: Add FIFO Watermark support
Configurable through dts property: fifo-watermark. Signed-off-by: Luis Ubieda <[email protected]>
1 parent 7e3d567 commit e7395a9

File tree

6 files changed

+310
-77
lines changed

6 files changed

+310
-77
lines changed

‎drivers/sensor/bosch/bmp581/bmp581.c

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ static int validate_chip_id(struct bmp581_data *drv)
221221
return -EINVAL;
222222
}
223223

224-
if ((drv->chip_id == BMP5_CHIP_ID_PRIM) || (drv->chip_id == BMP5_CHIP_ID_SEC)) {
224+
if (drv->chip_id == BMP5_CHIP_ID_PRIM || drv->chip_id == BMP5_CHIP_ID_SEC) {
225225
rslt = BMP5_OK;
226226
} else {
227227
drv->chip_id = 0;
@@ -457,7 +457,7 @@ static int set_iir_config(const struct sensor_value *iir, const struct device *d
457457
struct bmp581_config *conf = (struct bmp581_config *)dev->config;
458458
int ret = BMP5_OK;
459459

460-
CHECKIF((iir == NULL) | (dev == NULL)) {
460+
CHECKIF(iir == NULL || dev == NULL) {
461461
return -EINVAL;
462462
}
463463

@@ -707,7 +707,14 @@ static DEVICE_API(sensor, bmp581_driver_api) = {
707707

708708
#define BMP581_INIT(i) \
709709
\
710-
RTIO_DEFINE(bmp581_rtio_ctx_##i, 8, 8); \
710+
BUILD_ASSERT(COND_CODE_1(DT_INST_NODE_HAS_PROP(i, fifo_watermark), \
711+
(DT_INST_PROP(i, fifo_watermark) > 0 && \
712+
DT_INST_PROP(i, fifo_watermark) < 16), \
713+
(true)), \
714+
"fifo-watermark must be between 1 and 15. Please set it in " \
715+
"the device-tree node properties"); \
716+
\
717+
RTIO_DEFINE(bmp581_rtio_ctx_##i, 16, 16); \
711718
I2C_DT_IODEV_DEFINE(bmp581_bus_##i, DT_DRV_INST(i)); \
712719
\
713720
static struct bmp581_data bmp581_data_##i = { \
@@ -720,6 +727,9 @@ static DEVICE_API(sensor, bmp581_driver_api) = {
720727
.iir_p = DT_INST_PROP(i, press_iir), \
721728
.power_mode = DT_INST_PROP(i, power_mode), \
722729
}, \
730+
.stream = { \
731+
.fifo_thres = DT_INST_PROP_OR(i, fifo_watermark, 0), \
732+
}, \
723733
}; \
724734
\
725735
static const struct bmp581_config bmp581_config_##i = { \

‎drivers/sensor/bosch/bmp581/bmp581.h

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,11 @@
120120
#define BMP5_FIFO_MAX_THRESHOLD_P_T_MODE 0x0F
121121
#define BMP5_FIFO_MAX_THRESHOLD_P_MODE 0x1F
122122

123+
#define BMP5_FIFO_FRAME_SEL_OFF 0
124+
#define BMP5_FIFO_FRAME_SEL_TEMP 1
125+
#define BMP5_FIFO_FRAME_SEL_PRESS 2
126+
#define BMP5_FIFO_FRAME_SEL_ALL 3
127+
123128
/* Macro is used to bypass both iir_t and iir_p together */
124129
#define BMP5_IIR_BYPASS 0xC0
125130

@@ -239,9 +244,12 @@
239244
#define BMP5_FIFO_DEC_SEL_MSK 0x1C
240245
#define BMP5_FIFO_DEC_SEL_POS 2
241246

242-
#define BMP5_FIFO_COUNT_MSK 0x3F
247+
/* This driver only supports both Pressure and Temperature FIFO mode. */
248+
#define BMP5_FIFO_COUNT_MSK BMP5_FIFO_MAX_THRESHOLD_P_T_MODE
249+
#define BMP5_FIFO_COUNT_POS 0
243250

244251
#define BMP5_FIFO_FRAME_SEL_MSK 0x03
252+
#define BMP5_FIFO_FRAME_SEL_POS 0
245253

246254
/* Out-of-range configuration */
247255
#define BMP5_OOR_THR_P_LSB_MSK 0x0000FF
@@ -316,10 +324,18 @@ struct bmp581_sample {
316324
struct sensor_value temperature;
317325
};
318326

327+
/** Aligned with register bitmask to easily match on data-readout */
328+
enum bmp581_event {
329+
BMP581_EVENT_DRDY = BIT(0),
330+
BMP581_EVENT_FIFO_WM = BIT(2),
331+
};
332+
319333
struct bmp581_stream {
320334
const struct device *dev;
321335
struct gpio_callback cb;
322336
struct rtio_iodev_sqe *iodev_sqe;
337+
enum bmp581_event enabled_mask;
338+
uint8_t fifo_thres;
323339
atomic_t state;
324340
};
325341

‎drivers/sensor/bosch/bmp581/bmp581_decoder.c

Lines changed: 70 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ int bmp581_encode(const struct device *dev,
4949

5050
if (trigger_status) {
5151
edata->header.channels |= bmp581_encode_channel(SENSOR_CHAN_ALL);
52+
edata->header.fifo_count = data->stream.fifo_thres;
5253
} else {
5354
const struct sensor_chan_spec *const channels = read_config->channels;
5455
size_t num_channels = read_config->count;
@@ -63,7 +64,7 @@ int bmp581_encode(const struct device *dev,
6364
return err;
6465
}
6566

66-
edata->header.events = trigger_status ? BIT(0) : 0;
67+
edata->header.events = trigger_status;
6768
edata->header.timestamp = sensor_clock_cycles_to_ns(cycles);
6869

6970
return 0;
@@ -86,7 +87,11 @@ static int bmp581_decoder_get_frame_count(const uint8_t *buffer,
8687
return -ENODATA;
8788
}
8889

89-
*frame_count = 1;
90+
if (edata->header.events & BMP581_EVENT_FIFO_WM) {
91+
*frame_count = edata->header.fifo_count;
92+
} else {
93+
*frame_count = 1;
94+
}
9095
return 0;
9196
}
9297

@@ -105,53 +110,37 @@ static int bmp581_decoder_get_size_info(struct sensor_chan_spec chan_spec,
105110
}
106111
}
107112

108-
static int bmp581_decoder_decode(const uint8_t *buffer,
109-
struct sensor_chan_spec chan_spec,
110-
uint32_t *fit,
111-
uint16_t max_count,
112-
void *data_out)
113+
static int bmp581_convert_raw_to_q31_value(const struct bmp581_encoded_header *header,
114+
struct sensor_chan_spec *chan_spec,
115+
const struct bmp581_frame *frame,
116+
uint32_t *fit,
117+
struct sensor_q31_data *out)
113118
{
114-
const struct bmp581_encoded_data *edata = (const struct bmp581_encoded_data *)buffer;
115-
uint8_t channel_request;
116-
117-
if (*fit != 0) {
118-
return 0;
119-
}
120-
121-
if (max_count == 0 || chan_spec.chan_idx != 0) {
122-
return -EINVAL;
123-
}
124-
125-
channel_request = bmp581_encode_channel(chan_spec.chan_type);
126-
if ((channel_request & edata->header.channels) != channel_request) {
119+
if (((header->events & BMP581_EVENT_FIFO_WM) != 0 && *fit >= header->fifo_count) ||
120+
((header->events & BMP581_EVENT_FIFO_WM) == 0 && *fit != 0)) {
127121
return -ENODATA;
128122
}
129123

130-
struct sensor_q31_data *out = data_out;
131-
132-
out->header.base_timestamp_ns = edata->header.timestamp;
133-
out->header.reading_count = 1;
134-
135-
switch (chan_spec.chan_type) {
124+
switch (chan_spec->chan_type) {
136125
case SENSOR_CHAN_AMBIENT_TEMP: {
137126
/* Temperature is in data[2:0], data[2] is integer part */
138-
uint32_t raw_temp = ((uint32_t)edata->payload[2] << 16) |
139-
((uint16_t)edata->payload[1] << 8) |
140-
edata->payload[0];
127+
uint32_t raw_temp = ((uint32_t)frame[*fit].payload[2] << 16) |
128+
((uint16_t)frame[*fit].payload[1] << 8) |
129+
frame[*fit].payload[0];
141130
int32_t raw_temp_signed = sign_extend(raw_temp, 23);
142131

143132
out->shift = (31 - 16); /* 16 left shifts gives us the value in celsius */
144-
out->readings[0].value = raw_temp_signed;
133+
out->readings[*fit].value = raw_temp_signed;
145134
break;
146135
}
147-
case SENSOR_CHAN_PRESS:
148-
if (!edata->header.press_en) {
136+
case SENSOR_CHAN_PRESS: {
137+
if (!header->press_en) {
149138
return -ENODATA;
150139
}
151140
/* Shift by 10 bits because we'll divide by 1000 to make it kPa */
152-
uint64_t raw_press = (((uint32_t)edata->payload[5] << 16) |
153-
((uint16_t)edata->payload[4] << 8) |
154-
edata->payload[3]);
141+
uint64_t raw_press = (((uint32_t)frame[*fit].payload[5] << 16) |
142+
((uint16_t)frame[*fit].payload[4] << 8) |
143+
frame[*fit].payload[3]);
155144

156145
int64_t raw_press_signed = sign_extend_64(raw_press, 23);
157146

@@ -163,21 +152,63 @@ static int bmp581_decoder_decode(const uint8_t *buffer,
163152
* converting to kPa. Hence, left-shift 16 spaces.
164153
*/
165154
out->shift = (31 - 6 - 10);
166-
out->readings[0].value = (int32_t)raw_press_signed;
155+
out->readings[*fit].value = (int32_t)raw_press_signed;
167156
break;
157+
}
168158
default:
169159
return -EINVAL;
170160
}
171161

172-
*fit = 1;
173-
return 1;
162+
*fit = (*fit) + 1;
163+
return 0;
164+
}
165+
166+
static int bmp581_decoder_decode(const uint8_t *buffer,
167+
struct sensor_chan_spec chan_spec,
168+
uint32_t *fit,
169+
uint16_t max_count,
170+
void *data_out)
171+
{
172+
const struct bmp581_encoded_data *edata = (const struct bmp581_encoded_data *)buffer;
173+
uint8_t channel_request;
174+
175+
if (max_count == 0 || chan_spec.chan_idx != 0) {
176+
return -EINVAL;
177+
}
178+
179+
channel_request = bmp581_encode_channel(chan_spec.chan_type);
180+
if ((channel_request & edata->header.channels) != channel_request) {
181+
return -ENODATA;
182+
}
183+
184+
struct sensor_q31_data *out = data_out;
185+
186+
out->header.base_timestamp_ns = edata->header.timestamp;
187+
188+
int err;
189+
uint32_t fit_0 = *fit;
190+
191+
do {
192+
err = bmp581_convert_raw_to_q31_value(&edata->header, &chan_spec,
193+
edata->frame, fit, out);
194+
} while ((err == 0) && (*fit < max_count));
195+
196+
if (*fit == fit_0 || err != 0) {
197+
return err;
198+
}
199+
200+
out->header.reading_count = *fit;
201+
return *fit - fit_0;
174202
}
175203

176204
static bool bmp581_decoder_has_trigger(const uint8_t *buffer, enum sensor_trigger_type trigger)
177205
{
178206
const struct bmp581_encoded_data *edata = (const struct bmp581_encoded_data *)buffer;
179207

180-
if ((trigger == SENSOR_TRIG_DATA_READY) && (edata->header.events != 0)) {
208+
if (((trigger == SENSOR_TRIG_DATA_READY) &&
209+
(edata->header.events & BMP581_EVENT_DRDY)) ||
210+
((trigger == SENSOR_TRIG_FIFO_WATERMARK) &&
211+
(edata->header.events & BMP581_EVENT_FIFO_WM))) {
181212
return true;
182213
}
183214

‎drivers/sensor/bosch/bmp581/bmp581_decoder.h

Lines changed: 38 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,50 @@
1212
#include <zephyr/drivers/sensor.h>
1313
#include "bmp581.h"
1414

15-
struct bmp581_encoded_data {
16-
struct {
15+
struct bmp581_encoded_header {
1716
uint8_t channels;
1817
uint8_t events;
1918
uint64_t timestamp;
2019
uint8_t press_en;
21-
} header;
22-
uint8_t payload[6]; /* 3 bytes temp + 3 bytes press */
20+
uint8_t fifo_count;
21+
};
22+
23+
struct bmp581_frame {
24+
uint8_t payload[6];
2325
};
2426

27+
struct bmp581_encoded_data {
28+
struct bmp581_encoded_header header;
29+
union {
30+
uint8_t payload[6]; /* 3 bytes temp + 3 bytes press */
31+
struct bmp581_frame frame[0]; /* Used for FIFO frames */
32+
};
33+
};
34+
35+
static inline enum bmp581_event bmp581_encode_events_bitmask(
36+
const struct sensor_stream_trigger *const triggers,
37+
size_t count)
38+
{
39+
enum bmp581_event result = 0;
40+
41+
for (size_t i = 0 ; i < count ; i++) {
42+
switch (triggers[i].trigger) {
43+
case SENSOR_TRIG_DATA_READY:
44+
result |= ((triggers[i].opt == SENSOR_STREAM_DATA_INCLUDE) ?
45+
BMP581_EVENT_DRDY : 0);
46+
break;
47+
case SENSOR_TRIG_FIFO_WATERMARK:
48+
result |= ((triggers[i].opt == SENSOR_STREAM_DATA_INCLUDE) ?
49+
BMP581_EVENT_FIFO_WM : 0);
50+
break;
51+
default:
52+
break;
53+
}
54+
}
55+
56+
return result;
57+
}
58+
2559
int bmp581_encode(const struct device *dev,
2660
const struct sensor_read_config *read_config,
2761
uint8_t trigger_status,

0 commit comments

Comments
 (0)