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 F0917C432C0 for ; Sun, 1 Dec 2019 21:17:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C1F8C215E5 for ; Sun, 1 Dec 2019 21:17:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575235022; bh=hxffSSBiUVohs7ESp6jXDGth0v/4IDOkXA9QDXmD7w4=; h=Date:From:To:Cc:Subject:In-Reply-To:References:List-ID:From; b=FHMIf9L6Aqzx2NYHl1V95r/yE3KBXCclIA4Ttdidrm06XMaCRcv1yAVoJe7R17cam bSzYPQV03jrifHB1lr6ShsaODToTcGaTAV97jE5bUHSyuwrRlhWOCJJCqzS7+j/s8C fTcTCPMn9s3u27j8prGJrlTfYuz1ynfCNK09lCfg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727167AbfLAVRC (ORCPT ); Sun, 1 Dec 2019 16:17:02 -0500 Received: from mail.kernel.org ([198.145.29.99]:52144 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726982AbfLAVRC (ORCPT ); Sun, 1 Dec 2019 16:17:02 -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 085B320865; Sun, 1 Dec 2019 21:16:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575235020; bh=hxffSSBiUVohs7ESp6jXDGth0v/4IDOkXA9QDXmD7w4=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=IKwc8gmwo9nzdG6F3q0qGBlAWt/IP11Uos5xTxkdmAdMFb9aB0Nyc8Gy2Jn0i3usw O7BEYK6ZcD/9RTxR/rmVQFpsCoCJu94EXJaOM8a/0vfkJ1X2aNma8x56BLq5Atp+PO CcyWmqAquv5Z/d9PRyXpohkQ3uFxUgxLFTpXSCDY= Date: Sun, 1 Dec 2019 21:16:57 +0000 From: Jonathan Cameron To: Lorenzo Bianconi Cc: lorenzo.bianconi@redhat.com, linux-iio@vger.kernel.org, sean@geanix.com Subject: Re: [PATCH] iio: imu: st_lsm6dsx: track hw FIFO buffering with fifo_mask Message-ID: <20191201211657.20c371c7@archlinux> In-Reply-To: <20191201210426.GA11638@localhost.localdomain> References: <844cd314df8ff354859bad1e43b13778f60b08bb.1574954314.git.lorenzo@kernel.org> <20191201204936.0c4c3ded@archlinux> <20191201210426.GA11638@localhost.localdomain> 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 Sun, 1 Dec 2019 23:04:26 +0200 Lorenzo Bianconi wrote: > > On Thu, 28 Nov 2019 17:42:30 +0200 > > Lorenzo Bianconi wrote: > > > > > Track hw FIFO state introducing fifo_mask since now the accel sensor > > > can be enabled during suspend/resume in order to trigger the wake-up > > > enabling the FIFO in st_lsm6dsx_resume even if it was disabled before > > > the suspend > > > > What is the user visible result of not having this patch? > > > > Otherwise looks fine to me. > > Hi Jonathan, > > I discovered the issue looking at the code. The main point here is after commit > 4c997dfa692d enable_mask can be modified even by event code and not just by > FIFO one, so it can't be used to track FIFO status (e.g during suspend-resume). Ah got it now. I tweaked the explanation a tiny bit and applied to the fixes-togreg branch of iio.git. I guess I might be able to apply that other fix now as well. Will check. Thanks, Jonathan > > Regards, > Lorenzo > > > > > Jonathan > > > > > > > > Fixes: 4c997dfa692d ("iio: imu: st_lsm6dsx: add wakeup-source option") > > > Signed-off-by: Lorenzo Bianconi > > > --- > > > drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 4 +-- > > > .../iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 25 +++++++++++-------- > > > drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 4 +-- > > > 3 files changed, 18 insertions(+), 15 deletions(-) > > > > > > diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h > > > index c605b153be41..b54aefcdaad4 100644 > > > --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h > > > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h > > > @@ -351,9 +351,9 @@ struct st_lsm6dsx_sensor { > > > * @fifo_lock: Mutex to prevent concurrent access to the hw FIFO. > > > * @conf_lock: Mutex to prevent concurrent FIFO configuration update. > > > * @page_lock: Mutex to prevent concurrent memory page configuration. > > > - * @fifo_mode: FIFO operating mode supported by the device. > > > * @suspend_mask: Suspended sensor bitmask. > > > * @enable_mask: Enabled sensor bitmask. > > > + * @fifo_mask: Enabled hw FIFO bitmask. > > > * @ts_gain: Hw timestamp rate after internal calibration. > > > * @ts_sip: Total number of timestamp samples in a given pattern. > > > * @sip: Total number of samples (acc/gyro/ts) in a given pattern. > > > @@ -373,9 +373,9 @@ struct st_lsm6dsx_hw { > > > struct mutex conf_lock; > > > struct mutex page_lock; > > > > > > - enum st_lsm6dsx_fifo_mode fifo_mode; > > > u8 suspend_mask; > > > u8 enable_mask; > > > + u8 fifo_mask; > > > s64 ts_gain; > > > u8 ts_sip; > > > u8 sip; > > > diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c > > > index d416990ae309..bfd4c6306c0b 100644 > > > --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c > > > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c > > > @@ -176,17 +176,10 @@ int st_lsm6dsx_set_fifo_mode(struct st_lsm6dsx_hw *hw, > > > enum st_lsm6dsx_fifo_mode fifo_mode) > > > { > > > unsigned int data; > > > - int err; > > > > > > data = FIELD_PREP(ST_LSM6DSX_FIFO_MODE_MASK, fifo_mode); > > > - err = st_lsm6dsx_update_bits_locked(hw, ST_LSM6DSX_REG_FIFO_MODE_ADDR, > > > - ST_LSM6DSX_FIFO_MODE_MASK, data); > > > - if (err < 0) > > > - return err; > > > - > > > - hw->fifo_mode = fifo_mode; > > > - > > > - return 0; > > > + return st_lsm6dsx_update_bits_locked(hw, ST_LSM6DSX_REG_FIFO_MODE_ADDR, > > > + ST_LSM6DSX_FIFO_MODE_MASK, data); > > > } > > > > > > static int st_lsm6dsx_set_fifo_odr(struct st_lsm6dsx_sensor *sensor, > > > @@ -608,11 +601,17 @@ int st_lsm6dsx_flush_fifo(struct st_lsm6dsx_hw *hw) > > > int st_lsm6dsx_update_fifo(struct st_lsm6dsx_sensor *sensor, bool enable) > > > { > > > struct st_lsm6dsx_hw *hw = sensor->hw; > > > + u8 fifo_mask; > > > int err; > > > > > > mutex_lock(&hw->conf_lock); > > > > > > - if (hw->fifo_mode != ST_LSM6DSX_FIFO_BYPASS) { > > > + if (enable) > > > + fifo_mask = hw->fifo_mask | BIT(sensor->id); > > > + else > > > + fifo_mask = hw->fifo_mask & ~BIT(sensor->id); > > > + > > > + if (hw->fifo_mask) { > > > err = st_lsm6dsx_flush_fifo(hw); > > > if (err < 0) > > > goto out; > > > @@ -642,15 +641,19 @@ int st_lsm6dsx_update_fifo(struct st_lsm6dsx_sensor *sensor, bool enable) > > > if (err < 0) > > > goto out; > > > > > > - if (hw->enable_mask) { > > > + if (fifo_mask) { > > > /* reset hw ts counter */ > > > err = st_lsm6dsx_reset_hw_ts(hw); > > > if (err < 0) > > > goto out; > > > > > > err = st_lsm6dsx_set_fifo_mode(hw, ST_LSM6DSX_FIFO_CONT); > > > + if (err < 0) > > > + goto out; > > > } > > > > > > + hw->fifo_mask = fifo_mask; > > > + > > > out: > > > mutex_unlock(&hw->conf_lock); > > > > > > diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c > > > index 11b2c7bc8041..6f628c3cd133 100644 > > > --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c > > > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c > > > @@ -2300,7 +2300,7 @@ static int __maybe_unused st_lsm6dsx_suspend(struct device *dev) > > > hw->suspend_mask |= BIT(sensor->id); > > > } > > > > > > - if (hw->fifo_mode != ST_LSM6DSX_FIFO_BYPASS) > > > + if (hw->fifo_mask) > > > err = st_lsm6dsx_flush_fifo(hw); > > > > > > return err; > > > @@ -2336,7 +2336,7 @@ static int __maybe_unused st_lsm6dsx_resume(struct device *dev) > > > hw->suspend_mask &= ~BIT(sensor->id); > > > } > > > > > > - if (hw->enable_mask) > > > + if (hw->fifo_mask) > > > err = st_lsm6dsx_set_fifo_mode(hw, ST_LSM6DSX_FIFO_CONT); > > > > > > return err; > >