From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B296FC432C0 for ; Sun, 1 Dec 2019 20:56:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7B7F12146E for ; Sun, 1 Dec 2019 20:56:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575233787; bh=wttmuMN9Uz5uGipciF3iwMqy18w8Urio+PgjbRCaqmw=; h=Date:From:To:Cc:Subject:In-Reply-To:References:List-ID:From; b=ON2CcyBJJMdD+wY2+Olu4pAYe2ABoL+bkaqNDedBCRZVrVOpgqN9S2TY0XPnyd5Kc tk9rXWOqFlWbK4/va08kPGWa2JjRYx+2lwkZtymg/ppefAx49LnezdpzrJJJbZYgEp GADVFEK4VnwdvEGs/QzrR6gcaZBiq2rINOw5SyMA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725887AbfLAU40 (ORCPT ); Sun, 1 Dec 2019 15:56:26 -0500 Received: from mail.kernel.org ([198.145.29.99]:49706 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726982AbfLAU40 (ORCPT ); Sun, 1 Dec 2019 15:56:26 -0500 Received: from archlinux (cpc149474-cmbg20-2-0-cust94.5-4.cable.virginm.net [82.4.196.95]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id ABB7E2082E; Sun, 1 Dec 2019 20:56:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575233785; bh=wttmuMN9Uz5uGipciF3iwMqy18w8Urio+PgjbRCaqmw=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=SJjV3vc0gEm/T7qExvawc12U86lTRm0WrQwm9XmIQVckWSF7DXujnRf20ZXIgg329 2vSqxQ4tf2ftB8DK/GZ+cKcoSMCpsoDXhi3hgcM8cKNKJOyguvp3STmE2JMseOcZ1c AAe+eh5ydZk/UUNHaU55Lt18JWs8h2tmZUFhZoX4= Date: Sun, 1 Dec 2019 20:56:21 +0000 From: Jonathan Cameron To: Lorenzo Bianconi Cc: lorenzo.bianconi@redhat.com, mario.tesi@st.com, linux-iio@vger.kernel.org Subject: Re: [PATCH] iio: imu: st_lsm6dsx: fix decimation factor estimation Message-ID: <20191201205621.7d396b62@archlinux> In-Reply-To: <6d08e5a80bb0c49eb96dc883ff1ed2936f142bbb.1574956387.git.lorenzo@kernel.org> References: <6d08e5a80bb0c49eb96dc883ff1ed2936f142bbb.1574956387.git.lorenzo@kernel.org> X-Mailer: Claws Mail 3.17.4 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org On Thu, 28 Nov 2019 17:55:18 +0200 Lorenzo Bianconi wrote: > Fix decimation factor and sip estimation for LSM6DSM series > (max value for decimation factor is 32). > If gyro and accel sensors are enabled at 12.5Hz and 416Hz > respectively, decimation factor lookup will fail, producing > unaligned data. I'll confess I don't really follow how those values make sense (as opposed to 13Hz) but I'm sure they do :) > Remove unused decimator filed in st_lsm6dsx_sensor structure. > > Fixes: f8710f0357bc ("iio: imu: st_lsm6dsx: express odr in mHZ") > Signed-off-by: Lorenzo Bianconi Applied to the fixes-togreg branch of iio.git. Thanks, Jonathan > --- > drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 2 -- > .../iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 25 +++++++++++++------ > 2 files changed, 18 insertions(+), 9 deletions(-) > > diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h > index b54aefcdaad4..dc55d7dff3eb 100644 > --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h > @@ -320,7 +320,6 @@ enum st_lsm6dsx_fifo_mode { > * @odr: Output data rate of the sensor [Hz]. > * @watermark: Sensor watermark level. > * @sip: Number of samples in a given pattern. > - * @decimator: FIFO decimation factor. > * @ts_ref: Sensor timestamp reference for hw one. > * @ext_info: Sensor settings if it is connected to i2c controller > */ > @@ -334,7 +333,6 @@ struct st_lsm6dsx_sensor { > > u16 watermark; > u8 sip; > - u8 decimator; > s64 ts_ref; > > struct { > diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c > index bfd4c6306c0b..cb536b81a1c2 100644 > --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c > @@ -78,14 +78,20 @@ struct st_lsm6dsx_decimator_entry st_lsm6dsx_decimator_table[] = { > { 32, 0x7 }, > }; > > -static int st_lsm6dsx_get_decimator_val(u8 val) > +static int > +st_lsm6dsx_get_decimator_val(struct st_lsm6dsx_sensor *sensor, u32 max_odr) > { > const int max_size = ARRAY_SIZE(st_lsm6dsx_decimator_table); > + u32 decimator = max_odr / sensor->odr; > int i; > > - for (i = 0; i < max_size; i++) > - if (st_lsm6dsx_decimator_table[i].decimator == val) > + if (decimator > 1) > + decimator = round_down(decimator, 2); > + > + for (i = 0; i < max_size; i++) { > + if (st_lsm6dsx_decimator_table[i].decimator == decimator) > break; > + } > > return i == max_size ? 0 : st_lsm6dsx_decimator_table[i].val; > } > @@ -111,6 +117,13 @@ static void st_lsm6dsx_get_max_min_odr(struct st_lsm6dsx_hw *hw, > } > } > > +static u8 st_lsm6dsx_get_sip(struct st_lsm6dsx_sensor *sensor, u32 min_odr) > +{ > + u8 sip = sensor->odr / min_odr; > + > + return sip > 1 ? round_down(sip, 2) : sip; > +} > + > static int st_lsm6dsx_update_decimators(struct st_lsm6dsx_hw *hw) > { > const struct st_lsm6dsx_reg *ts_dec_reg; > @@ -131,12 +144,10 @@ static int st_lsm6dsx_update_decimators(struct st_lsm6dsx_hw *hw) > sensor = iio_priv(hw->iio_devs[i]); > /* update fifo decimators and sample in pattern */ > if (hw->enable_mask & BIT(sensor->id)) { > - sensor->sip = sensor->odr / min_odr; > - sensor->decimator = max_odr / sensor->odr; > - data = st_lsm6dsx_get_decimator_val(sensor->decimator); > + sensor->sip = st_lsm6dsx_get_sip(sensor, min_odr); > + data = st_lsm6dsx_get_decimator_val(sensor, max_odr); > } else { > sensor->sip = 0; > - sensor->decimator = 0; > data = 0; > } > ts_sip = max_t(u16, ts_sip, sensor->sip);