linux-kernel - Re: [PATCH] staging:iio:ad7150: fix threshold mode config bit

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Mon, 20 May 2019 12:59:47 +0300
From:   Alexandru Ardelean <ardeleanalex@...il.com>
To:     Jonathan Cameron <jic23@...nel.org>
Cc:     Melissa Wen <melissa.srw@...il.com>,
        Lars-Peter Clausen <lars@...afoo.de>,
        Michael Hennerich <Michael.Hennerich@...log.com>,
        Stefan Popa <stefan.popa@...log.com>,
        Hartmut Knaack <knaack.h@....de>,
        Peter Meerwald-Stadler <pmeerw@...erw.net>,
        Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        Barry Song <21cnbao@...il.com>, linux-iio@...r.kernel.org,
        devel@...verdev.osuosl.org, LKML <linux-kernel@...r.kernel.org>,
        kernel-usp@...glegroups.com,
        Alexandru Ardelean <alexandru.ardelean@...log.com>
Subject: Re: [PATCH] staging:iio:ad7150: fix threshold mode config bit

On Sun, May 19, 2019 at 8:38 PM Jonathan Cameron <jic23@...nel.org> wrote:
>
> On Sat, 18 May 2019 22:04:56 -0300
> Melissa Wen <melissa.srw@...il.com> wrote:
>
> > According to the AD7150 configuration register description, bit 7 assumes
> > value 1 when the threshold mode is fixed and 0 when it is adaptive,
> > however, the operation that identifies this mode was considering the
> > opposite values.
> >
> > This patch renames the boolean variable to describe it correctly and
> > properly replaces it in the places where it is used.
> >
> > Fixes: 531efd6aa0991 ("staging:iio:adc:ad7150: chan_spec conv + i2c_smbus commands + drop unused poweroff timeout control.")
> > Signed-off-by: Melissa Wen <melissa.srw@...il.com>
>
> Looks good to me.  Applied to the fixes-togreg branch of iio.git pushed out as
> as testing-fixes for the autobuilders to see if they can find anything
> we have missed.
>
> Thanks,
>
> Jonathan
>
> > ---
> >  drivers/staging/iio/cdc/ad7150.c | 19 +++++++++++--------
> >  1 file changed, 11 insertions(+), 8 deletions(-)
> >
> > diff --git a/drivers/staging/iio/cdc/ad7150.c b/drivers/staging/iio/cdc/ad7150.c
> > index dd7fcab8e19e..e075244c602b 100644
> > --- a/drivers/staging/iio/cdc/ad7150.c
> > +++ b/drivers/staging/iio/cdc/ad7150.c
> > @@ -5,6 +5,7 @@
> >   * Copyright 2010-2011 Analog Devices Inc.
> >   */
> >
> > +#include <linux/bitfield.h>
> >  #include <linux/interrupt.h>
> >  #include <linux/device.h>
> >  #include <linux/kernel.h>
> > @@ -130,7 +131,7 @@ static int ad7150_read_event_config(struct iio_dev *indio_dev,
> >  {
> >       int ret;
> >       u8 threshtype;
> > -     bool adaptive;
> > +     bool thrfixed;
> >       struct ad7150_chip_info *chip = iio_priv(indio_dev);
> >
> >       ret = i2c_smbus_read_byte_data(chip->client, AD7150_CFG);
> > @@ -138,21 +139,23 @@ static int ad7150_read_event_config(struct iio_dev *indio_dev,
> >               return ret;
> >
> >       threshtype = (ret >> 5) & 0x03;
> > -     adaptive = !!(ret & 0x80);
> > +
> > +     /*check if threshold mode is fixed or adaptive*/
> > +     thrfixed = FIELD_GET(AD7150_CFG_FIX, ret);

nitpick: i would have kept the original variable name as "adaptive",
mostly for consistency.
"adaptive" is used in other places as well;

as i recall, the fix is just oneliner in this case:

- adaptive = !!(ret & 0x80);
+ adaptive = !(ret & 0x80);


> >
> >       switch (type) {
> >       case IIO_EV_TYPE_MAG_ADAPTIVE:
> >               if (dir == IIO_EV_DIR_RISING)
> > -                     return adaptive && (threshtype == 0x1);
> > -             return adaptive && (threshtype == 0x0);
> > +                     return !thrfixed && (threshtype == 0x1);
> > +             return !thrfixed && (threshtype == 0x0);
> >       case IIO_EV_TYPE_THRESH_ADAPTIVE:
> >               if (dir == IIO_EV_DIR_RISING)
> > -                     return adaptive && (threshtype == 0x3);
> > -             return adaptive && (threshtype == 0x2);
> > +                     return !thrfixed && (threshtype == 0x3);
> > +             return !thrfixed && (threshtype == 0x2);
> >       case IIO_EV_TYPE_THRESH:
> >               if (dir == IIO_EV_DIR_RISING)
> > -                     return !adaptive && (threshtype == 0x1);
> > -             return !adaptive && (threshtype == 0x0);
> > +                     return thrfixed && (threshtype == 0x1);
> > +             return thrfixed && (threshtype == 0x0);
> >       default:
> >               break;
> >       }
>