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_MUTT 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 B5087C31E5B for ; Tue, 18 Jun 2019 15:49:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7F48821530 for ; Tue, 18 Jun 2019 15:49:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560872977; bh=RjKkUtA5E6Sk8AaUxCCe3o8gBV41n3gkYysxNHLRG2Q=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=tOIu1+qYAE5WYqZbRGRUwIHcwZ8VzCujR/8zV2HY0wVqZY5qY476CCbmXtH0q6EmU O1cgmyKmu3CK5yim/bxiZoR6HaoyDu5AkqJR4gLYwki+wj9F4vN0uAvTIH3ZVXvOtI rDazf74Fw3c1q4SBS1Bz9KORDzZIm+2wvFCuD4Yc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729308AbfFRPth (ORCPT ); Tue, 18 Jun 2019 11:49:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:36464 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729272AbfFRPtg (ORCPT ); Tue, 18 Jun 2019 11:49:36 -0400 Received: from localhost.localdomain (nat-pool-mxp-t.redhat.com [149.6.153.186]) (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 E31F820673; Tue, 18 Jun 2019 15:49:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560872975; bh=RjKkUtA5E6Sk8AaUxCCe3o8gBV41n3gkYysxNHLRG2Q=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=OG2s1vGckmR2J6ucmfrhQdHIZNzev8kXXWEESzcRBGCXQsMBiF9BLt86GTwqLoRZf qJfS5SgpEX6JZMcL3Rheqm3gEVSL15W5gX2j4B9odtGSxGd+kDbTk/uRZqEkR0lL5p 0wSWFG/Zm07PJsrfkcXv3JpAl2qZ/GgOwmOhUTms= Date: Tue, 18 Jun 2019 17:49:29 +0200 From: Lorenzo Bianconi To: Sean Nyekjaer Cc: linux-iio@vger.kernel.org, jic23@kernel.org, lorenzo.bianconi83@gmail.com, martin@geanix.com Subject: Re: [PATCH 2/5] iio: imu: st_lsm6dsx: add motion events Message-ID: <20190618154928.GB20044@localhost.localdomain> References: <20190618125939.105903-1-sean@geanix.com> <20190618125939.105903-3-sean@geanix.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="U+BazGySraz5kW0T" Content-Disposition: inline In-Reply-To: <20190618125939.105903-3-sean@geanix.com> User-Agent: Mutt/1.11.4 (2019-03-13) Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org --U+BazGySraz5kW0T Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable > Add event channels that controls the creation of motion events. >=20 > Signed-off-by: Sean Nyekjaer > --- > drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 2 + > drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 148 ++++++++++++++++++- > 2 files changed, 144 insertions(+), 6 deletions(-) >=20 > diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h b/drivers/iio/imu/st= _lsm6dsx/st_lsm6dsx.h > index a5e373680e9c..966cc6e91c7f 100644 > --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h > @@ -155,6 +155,8 @@ struct st_lsm6dsx_hw { > u8 enable_mask; > u8 ts_sip; > u8 sip; > + u8 event_threshold; > + bool enable_event; > =20 > u8 *buff; > =20 > diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/i= mu/st_lsm6dsx/st_lsm6dsx_core.c > index b5d3fa354de7..351c46f01662 100644 > --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c > @@ -78,6 +78,17 @@ > #define ST_LSM6DSX_REG_GYRO_OUT_Y_L_ADDR 0x24 > #define ST_LSM6DSX_REG_GYRO_OUT_Z_L_ADDR 0x26 > =20 > +#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) > + > +#define ST_LSM6DSX_DEFAULT_WAKE_THRESH 0 > +#define ST_LSM6DSX_REG_WAKE_UP_THS_ADDR 0x5B > +#define ST_LSM6DSX_REG_WAKE_UP_THS_THRES_MASK GENMASK(5, 0) Could you please verify this registermap is used for all supported devices? (e.g. LSM6DS3 or LSM6DS3H) > + > +#define ST_LSM6DSX_REG_MD1_CFG_ADDR 0x5E > +#define ST_LSM6DSX_REG_MD1_CFG_INT1_WU_MASK BIT(5) > + > #define ST_LSM6DSX_ACC_FS_2G_GAIN IIO_G_TO_M_S_2(61) > #define ST_LSM6DSX_ACC_FS_4G_GAIN IIO_G_TO_M_S_2(122) > #define ST_LSM6DSX_ACC_FS_8G_GAIN IIO_G_TO_M_S_2(244) > @@ -303,6 +314,13 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_s= ensor_settings[] =3D { > }, > }; > =20 > +static const struct iio_event_spec st_lsm6dsx_event =3D { > + .type =3D IIO_EV_TYPE_THRESH, > + .dir =3D IIO_EV_DIR_EITHER, > + .mask_separate =3D BIT(IIO_EV_INFO_VALUE) | > + BIT(IIO_EV_INFO_ENABLE) > +}; > + > #define ST_LSM6DSX_CHANNEL(chan_type, addr, mod, scan_idx) \ > { \ > .type =3D chan_type, \ > @@ -319,6 +337,8 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_se= nsor_settings[] =3D { > .storagebits =3D 16, \ > .endianness =3D IIO_LE, \ > }, \ > + .event_spec =3D &st_lsm6dsx_event, \ > + .num_event_specs =3D 1, \ > } ST_LSM6DSX_CHANNEL is used even for sensor-hub so I do not think you can us= e in this way > =20 > static const struct iio_chan_spec st_lsm6dsx_acc_channels[] =3D { > @@ -435,6 +455,20 @@ static int st_lsm6dsx_set_odr(struct st_lsm6dsx_sens= or *sensor, u16 odr) > ST_LSM6DSX_SHIFT_VAL(val, reg->mask)); > } > =20 > +static int st_lsm6dsx_set_event_threshold(struct st_lsm6dsx_hw *hw, u8 t= hreshold) > +{ > + int err =3D 0; > + > + err =3D regmap_update_bits(hw->regmap, ST_LSM6DSX_REG_WAKE_UP_THS_ADDR, > + ST_LSM6DSX_REG_WAKE_UP_THS_THRES_MASK, > + threshold); > + > + if (!err) > + hw->event_threshold =3D threshold; > + > + return err; I think we can just move this configuration in st_lsm6dsx_write_event() > +} > + > int st_lsm6dsx_sensor_enable(struct st_lsm6dsx_sensor *sensor) > { > int err; > @@ -472,18 +506,21 @@ static int st_lsm6dsx_read_oneshot(struct st_lsm6ds= x_sensor *sensor, > int err, delay; > __le16 data; > =20 > - err =3D st_lsm6dsx_sensor_enable(sensor); > - if (err < 0) > - return err; > + if (!hw->enable_event) { > + err =3D st_lsm6dsx_sensor_enable(sensor); > + if (err < 0) > + return err; > =20 > - delay =3D 1000000 / sensor->odr; > - usleep_range(delay, 2 * delay); > + delay =3D 1000000 / sensor->odr; > + usleep_range(delay, 2 * delay); > + } > =20 > err =3D regmap_bulk_read(hw->regmap, addr, &data, sizeof(data)); > if (err < 0) > return err; > =20 > - st_lsm6dsx_sensor_disable(sensor); > + if (!hw->enable_event) > + st_lsm6dsx_sensor_disable(sensor); > =20 > *val =3D (s16)le16_to_cpu(data); > =20 > @@ -556,6 +593,75 @@ static int st_lsm6dsx_write_raw(struct iio_dev *iio_= dev, > return err; > } > =20 > +static int st_lsm6dsx_read_event(struct iio_dev *iio_dev, > + const struct iio_chan_spec *chan, > + enum iio_event_type type, > + enum iio_event_direction dir, > + enum iio_event_info info, > + int *val, int *val2) > +{ > + struct st_lsm6dsx_sensor *sensor =3D iio_priv(iio_dev); > + > + *val2 =3D 0; > + *val =3D sensor->hw->event_threshold; > + > + return IIO_VAL_INT; > +} > + > +static int st_lsm6dsx_write_event(struct iio_dev *iio_dev, > + const struct iio_chan_spec *chan, > + enum iio_event_type type, > + enum iio_event_direction dir, > + enum iio_event_info info, > + int val, int val2) > +{ > + struct st_lsm6dsx_sensor *sensor =3D iio_priv(iio_dev); > + struct st_lsm6dsx_hw *hw =3D sensor->hw; > + > + if (!hw->enable_event) > + return -EBUSY; > + > + if ((val < 0) || (val > 31)) unnecessary brackets > + return -EINVAL; > + > + if (st_lsm6dsx_set_event_threshold(sensor->hw, val)) > + return -EINVAL; > + > + return 0; > +} > + > +static int st_lsm6dsx_read_event_config(struct iio_dev *iio_dev, > + const struct iio_chan_spec *chan, > + enum iio_event_type type, > + enum iio_event_direction dir) > +{ > + struct st_lsm6dsx_sensor *sensor =3D iio_priv(iio_dev); > + struct st_lsm6dsx_hw *hw =3D sensor->hw; > + > + return hw->enable_event; > +} > + > +static int st_lsm6dsx_write_event_config(struct iio_dev *iio_dev, > + const struct iio_chan_spec *chan, > + enum iio_event_type type, > + enum iio_event_direction dir, > + int state) > +{ > + struct st_lsm6dsx_sensor *sensor =3D iio_priv(iio_dev); > + struct st_lsm6dsx_hw *hw =3D sensor->hw; > + > + if (state && hw->enable_event) > + return 0; > + > + hw->enable_event =3D state; > + if (state) > + st_lsm6dsx_sensor_enable(sensor); please correct me if I am wrong but in this way we break normal operation (= e.g. if we are reading acc data from the FIFO). You need to check enabled_mask. Moreover we should check event type > + else > + st_lsm6dsx_sensor_disable(sensor); > + > + return 0; > +} > + > static int st_lsm6dsx_set_watermark(struct iio_dev *iio_dev, unsigned in= t val) > { > struct st_lsm6dsx_sensor *sensor =3D iio_priv(iio_dev); > @@ -632,6 +738,10 @@ static const struct iio_info st_lsm6dsx_acc_info =3D= { > .attrs =3D &st_lsm6dsx_acc_attribute_group, > .read_raw =3D st_lsm6dsx_read_raw, > .write_raw =3D st_lsm6dsx_write_raw, > + .read_event_value =3D st_lsm6dsx_read_event, > + .write_event_value =3D st_lsm6dsx_write_event, > + .read_event_config =3D st_lsm6dsx_read_event_config, > + .write_event_config =3D st_lsm6dsx_write_event_config, > .hwfifo_set_watermark =3D st_lsm6dsx_set_watermark, > }; > =20 > @@ -761,6 +871,8 @@ static int st_lsm6dsx_init_device(struct st_lsm6dsx_h= w *hw) > if (err < 0) > return err; > =20 > + st_lsm6dsx_set_event_threshold(hw, ST_LSM6DSX_DEFAULT_WAKE_THRESH); we do not need this since default value is already 0 > + > return st_lsm6dsx_init_hw_timer(hw); > } > =20 > @@ -811,6 +923,27 @@ static struct iio_dev *st_lsm6dsx_alloc_iiodev(struc= t st_lsm6dsx_hw *hw, > return iio_dev; > } > =20 > +int st_lsm6dsx_event_setup(struct st_lsm6dsx_hw *hw) > +{ > + int err; > + > + /* Enable inactivity function - low power ACC, GYRO powered-down */ > + err =3D regmap_update_bits(hw->regmap, ST_LSM6DSX_REG_TAP_CFG_ADDR, > + ST_LSM6DSX_REG_TAP_CFG_INT_EN_MASK | > + ST_LSM6DSX_REG_TAP_CFG_INACT_EN_MASK, > + ST_LSM6DSX_REG_TAP_CFG_INT_EN_MASK | > + ST_LSM6DSX_REG_TAP_CFG_INACT_EN_MASK); > + if (err < 0) > + return err; > + > + /* Enable wakeup interrupt */ > + err =3D regmap_update_bits(hw->regmap, ST_LSM6DSX_REG_MD1_CFG_ADDR, > + ST_LSM6DSX_REG_MD1_CFG_INT1_WU_MASK, > + ST_LSM6DSX_REG_MD1_CFG_INT1_WU_MASK); > + > + return err; > +} > + > static irqreturn_t st_lsm6dsx_handler_irq(int irq, void *private) > { > struct st_lsm6dsx_hw *hw =3D private; > @@ -932,6 +1065,9 @@ int st_lsm6dsx_probe(struct device *dev, int irq, in= t hw_id, const char *name, > err =3D st_lsm6dsx_fifo_setup(hw); > if (err < 0) > return err; > + err =3D st_lsm6dsx_event_setup(hw); > + if (err < 0) > + return err; > } > =20 > for (i =3D 0; i < ST_LSM6DSX_ID_MAX; i++) { > --=20 > 2.22.0 >=20 --U+BazGySraz5kW0T Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEABYIAB0WIQTquNwa3Txd3rGGn7Y6cBh0uS2trAUCXQkIBgAKCRA6cBh0uS2t rCr0AQDMsJJgSJAxJ5dGCiI8wLox/+bdoFVJYH/IEMz6tkzAcwD/UUmxemTHsqPg jX8Fgxy70C2Nf2qs1sTn8IVgljzBHAg= =LyEY -----END PGP SIGNATURE----- --U+BazGySraz5kW0T--