From a565f57e9e949f64ea25cc1188143db7f3d41bcc Mon Sep 17 00:00:00 2001 From: Jett Rink Date: Thu, 13 Jun 2019 13:27:38 -0600 Subject: motionsense: prevent loop after missing events We don't need to loop to figure out when to schedule the next sensor collection event, just schedule it as soon as possible. This eliminates a watchdog reset when we miss scheduling the sensor task and get really far behind. BRANCH=none BUG=b:133190570 TEST=normal operation is fine, based on longs of failing results in bug, this should prevent the watch reset. Change-Id: I3001028ba393b51d1958f0136ba040eaee5e52d1 Signed-off-by: Jett Rink Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1658521 Reviewed-by: Yuval Peress Reviewed-by: Jack Rosenthal (cherry picked from commit 8374923a60c8b63b7bb2c1823e4f5b6078544e44) Signed-off-by: Gwendal Grignou Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3508416 Reviewed-by: Yuval Peress --- common/motion_sense.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/common/motion_sense.c b/common/motion_sense.c index 64fc5f6bf8..2e044e1671 100644 --- a/common/motion_sense.c +++ b/common/motion_sense.c @@ -703,19 +703,21 @@ static inline void increment_sensor_collection(struct motion_sensor_t *sensor, { sensor->next_collection += sensor->collection_rate; - while (time_after(ts->le.lo, sensor->next_collection)) { + if (time_after(ts->le.lo, sensor->next_collection)) { /* * If we get here it means that we completely missed a sensor - * collection time and we attempt to recover by incrementing - * the next collection time until we recover. This should not - * happen and if it does it means that the ec cannot handle the - * requested data rate. + * collection time and we attempt to recover by scheduling as + * soon as possible. This should not happen and if it does it + * means that the ec cannot handle the requested data rate. */ + int missed_events = + time_until(sensor->next_collection, ts->le.lo) / + sensor->collection_rate; - CPRINTS("%s Missed data collection at %u - rate: %d", - sensor->name, sensor->next_collection, + CPRINTS("%s Missed %d data collections at %u - rate: %d", + sensor->name, missed_events, sensor->next_collection, sensor->collection_rate); - sensor->next_collection += sensor->collection_rate; + sensor->next_collection = ts->le.lo + motion_min_interval; } } -- cgit v1.2.1