diff options
| author | Paul Ma <magf@bitland.corp-partner.google.com> | 2019-10-24 09:56:48 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-10-25 14:48:37 +0000 |
| commit | 22f0b5d206fd41f0d079108144871b9844875b26 (patch) | |
| tree | 212157367b341283015fed43bcd9172fcd225afe | |
| parent | 362bd9c25b04227c8f2af760aa1e25a35292f4be (diff) | |
| download | chrome-ec-22f0b5d206fd41f0d079108144871b9844875b26.tar.gz | |
driver: lis2dw12/lis2dwl: fix wrong __fls usage
__fls(n) is defined as (31 - __builtin_clz(n)) in include/common.h.
Because of the definition, n can't be 0. When n is 0, __fls(0)
will be -1 and it is a wrong result.
Since sensor data rate can be set lower than LIS2DW12_ODR_MIN_VAL,
it is possible for __fls() to get a 0 parameter. This CL will fix
this condition.
Because macros are getting complex, move them to c file and convert
to functions.
BUG=b:143242489
BRANCH=none
TEST=run 'suspend_stress_test --suspend_min=10 --wake_min=10 \
--count=2500' on DUTs, test pass and no EC crash.
Change-Id: I46febb602b47624ba5d0106abaedd34a23ebe96f
Signed-off-by: Paul Ma <magf@bitland.corp-partner.google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1876297
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
(cherry picked from commit 16275bb36d338dd952b9312450c0cee110d5468c)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1880349
Reviewed-by: Edward Hill <ecgh@chromium.org>
Commit-Queue: Edward Hill <ecgh@chromium.org>
Tested-by: Edward Hill <ecgh@chromium.org>
| -rw-r--r-- | driver/accel_lis2dw12.c | 26 | ||||
| -rw-r--r-- | driver/accel_lis2dw12.h | 8 |
2 files changed, 24 insertions, 10 deletions
diff --git a/driver/accel_lis2dw12.c b/driver/accel_lis2dw12.c index a38e7e91c6..3e8afbfd77 100644 --- a/driver/accel_lis2dw12.c +++ b/driver/accel_lis2dw12.c @@ -355,6 +355,28 @@ static int get_range(const struct motion_sensor_t *s) return data->base.range; } +/** + * ODR reg value from selected data rate in mHz. + */ +static uint8_t odr_to_reg(int odr) +{ + if (odr <= LIS2DW12_ODR_MIN_VAL) + return LIS2DW12_ODR_12HZ_VAL; + + return (__fls(odr / LIS2DW12_ODR_MIN_VAL) + LIS2DW12_ODR_12HZ_VAL); +} + +/** + * Normalized ODR value from selected data rate in mHz. + */ +static int odr_to_normalize(int odr) +{ + if (odr <= LIS2DW12_ODR_MIN_VAL) + return LIS2DW12_ODR_MIN_VAL; + + return (LIS2DW12_ODR_MIN_VAL << (__fls(odr / LIS2DW12_ODR_MIN_VAL))); +} + static int set_data_rate(const struct motion_sensor_t *s, int rate, int rnd) { int ret, normalized_rate; @@ -380,8 +402,8 @@ static int set_data_rate(const struct motion_sensor_t *s, int rate, int rnd) goto unlock_rate; } - reg_val = LIS2DW12_ODR_TO_REG(rate); - normalized_rate = LIS2DW12_ODR_TO_NORMALIZE(rate); + reg_val = odr_to_reg(rate); + normalized_rate = odr_to_normalize(rate); if (rnd && (normalized_rate < rate)) { reg_val++; diff --git a/driver/accel_lis2dw12.h b/driver/accel_lis2dw12.h index a4d183de78..225af1b748 100644 --- a/driver/accel_lis2dw12.h +++ b/driver/accel_lis2dw12.h @@ -178,14 +178,6 @@ enum lis2dw12_odr { #define LIS2DW12_ODR_MIN_VAL 12500 #define LIS2DW12_ODR_MAX_VAL 1600000 -/* ODR reg value from selected data rate in mHz. */ -#define LIS2DW12_ODR_TO_REG(_odr) \ - (__fls(_odr / LIS2DW12_ODR_MIN_VAL) + LIS2DW12_ODR_12HZ_VAL) - -/* Normalized ODR value from selected data rate in mHz. */ -#define LIS2DW12_ODR_TO_NORMALIZE(_odr) \ - (LIS2DW12_ODR_MIN_VAL << (__fls(_odr / LIS2DW12_ODR_MIN_VAL))) - /* Full scale range registers. */ #define LIS2DW12_FS_ADDR LIS2DW12_CTRL6_ADDR #define LIS2DW12_FS_MASK 0x30 |