From: Lorenzo Bianconi <lorenzo@kernel.org>
To: Sean Nyekjaer <sean@geanix.com>
Cc: linux-iio@vger.kernel.org, jic23@kernel.org,
lorenzo.bianconi83@gmail.com, martin@geanix.com
Subject: Re: [PATCH 4/5] iio: imu: st_lsm6dsx: always enter interrupt thread
Date: Tue, 18 Jun 2019 17:55:27 +0200 [thread overview]
Message-ID: <20190618155527.GD20044@localhost.localdomain> (raw)
In-Reply-To: <20190618125939.105903-5-sean@geanix.com>
[-- Attachment #1: Type: text/plain, Size: 2323 bytes --]
> The interrupt source can come from multiple sources, fifo and wake interrupts.
> Enter interrupt thread to check which interrupt that has fired.
>
> Signed-off-by: Sean Nyekjaer <sean@geanix.com>
> ---
> drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 30 +++++++++++++++-----
> 1 file changed, 23 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> index 59a34894e495..76aec5024d83 100644
> --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> @@ -78,6 +78,12 @@
> #define ST_LSM6DSX_REG_GYRO_OUT_Y_L_ADDR 0x24
> #define ST_LSM6DSX_REG_GYRO_OUT_Z_L_ADDR 0x26
>
> +#define ST_LSM6DSX_REG_WAKE_UP_SRC_ADDR 0x1B
> +#define ST_LSM6DSX_REG_WAKE_UP_SRC_Z_WU_MASK BIT(0)
> +#define ST_LSM6DSX_REG_WAKE_UP_SRC_Y_WU_MASK BIT(1)
> +#define ST_LSM6DSX_REG_WAKE_UP_SRC_X_WU_MASK BIT(2)
> +#define ST_LSM6DSX_REG_WAKE_UP_SRC_WU_MASK BIT(4)
> +
> #define ST_LSM6DSX_REG_TAP_CFG_ADDR 0x58
> #define ST_LSM6DSX_REG_TAP_CFG_INT_EN_MASK BIT(7)
> #define ST_LSM6DSX_REG_TAP_CFG_INACT_EN_MASK GENMASK(6, 5)
> @@ -946,19 +952,29 @@ int st_lsm6dsx_event_setup(struct st_lsm6dsx_hw *hw)
>
> static irqreturn_t st_lsm6dsx_handler_irq(int irq, void *private)
> {
> - struct st_lsm6dsx_hw *hw = private;
> -
> - return hw->sip > 0 ? IRQ_WAKE_THREAD : IRQ_NONE;
> + return IRQ_WAKE_THREAD;
I guess this will break shared interrupt, isn't it?
> }
>
> static irqreturn_t st_lsm6dsx_handler_thread(int irq, void *private)
> {
> struct st_lsm6dsx_hw *hw = private;
> - int count;
> + int count = 0;
> + int data, err;
> +
> + if (hw->enable_event) {
> + err = regmap_read(hw->regmap,
> + ST_LSM6DSX_REG_WAKE_UP_SRC_ADDR, &data);
> + if (err < 0)
> + goto try_fifo;
You can simplify this just doing something like:
if (err < 0 && !hw->sip)
return IRQ_NONE;
> +
> + }
>
> - mutex_lock(&hw->fifo_lock);
> - count = st_lsm6dsx_read_fifo(hw);
> - mutex_unlock(&hw->fifo_lock);
> +try_fifo:
> + if (hw->sip > 0) {
> + mutex_lock(&hw->fifo_lock);
> + count = st_lsm6dsx_read_fifo(hw);
> + mutex_unlock(&hw->fifo_lock);
> + }
>
> return !count ? IRQ_NONE : IRQ_HANDLED;
> }
> --
> 2.22.0
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
next prev parent reply other threads:[~2019-06-18 15:55 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-18 12:59 [PATCH 0/5] iio: imu: st_lsm6dsx: add event reporting and wakeup Sean Nyekjaer
2019-06-18 12:59 ` [PATCH 1/5] iio: imu: st_lsm6dsx: move interrupt thread to core Sean Nyekjaer
2019-06-18 15:57 ` Lorenzo Bianconi
2019-06-18 16:56 ` Sean Nyekjær
2019-06-19 5:58 ` Lorenzo Bianconi
2019-06-19 6:01 ` Sean Nyekjaer
2019-06-18 12:59 ` [PATCH 2/5] iio: imu: st_lsm6dsx: add motion events Sean Nyekjaer
2019-06-18 15:49 ` Lorenzo Bianconi
2019-06-18 19:14 ` Sean Nyekjaer
2019-06-18 20:21 ` Lorenzo Bianconi
2019-06-19 6:30 ` Sean Nyekjaer
2019-06-18 12:59 ` [PATCH 3/5] iio: imu: st_lsm6dsx: add wakeup-source option Sean Nyekjaer
2019-06-18 15:51 ` Lorenzo Bianconi
2019-06-18 19:19 ` Sean Nyekjaer
2019-06-18 20:27 ` Lorenzo Bianconi
2019-07-01 11:06 ` Sean Nyekjaer
2019-06-18 12:59 ` [PATCH 4/5] iio: imu: st_lsm6dsx: always enter interrupt thread Sean Nyekjaer
2019-06-18 15:55 ` Lorenzo Bianconi [this message]
2019-06-18 19:31 ` Sean Nyekjaer
2019-06-18 20:24 ` Lorenzo Bianconi
2019-06-22 9:55 ` Jonathan Cameron
2019-06-22 12:23 ` Lorenzo Bianconi
2019-06-18 12:59 ` [PATCH 5/5] iio: imu: st_lsm6dsx: add motion report function and call from interrupt Sean Nyekjaer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190618155527.GD20044@localhost.localdomain \
--to=lorenzo@kernel.org \
--cc=jic23@kernel.org \
--cc=linux-iio@vger.kernel.org \
--cc=lorenzo.bianconi83@gmail.com \
--cc=martin@geanix.com \
--cc=sean@geanix.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).