| Message ID | 20230423232047.12589-4-william.gray@linaro.org (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | [4.14,v4,1/5] iio: counter: 104-quad-8: Fix race condition between FLAG and CNTR reads | expand |
On Sun, Apr 23, 2023 at 07:20:46PM -0400, William Breathitt Gray wrote: > commit 4aa3b75c74603c3374877d5fd18ad9cc3a9a62ed upstream. > > The Counter (CNTR) register is 24 bits wide, but we can have an > effective 25-bit count value by setting bit 24 to the XOR of the Borrow > flag and Carry flag. The flags can be read from the FLAG register, but a > race condition exists: the Borrow flag and Carry flag are instantaneous > and could change by the time the count value is read from the CNTR > register. > > Since the race condition could result in an incorrect 25-bit count > value, remove support for 25-bit count values from this driver. > > Fixes: 28e5d3bb0325 ("iio: 104-quad-8: Add IIO support for the ACCES 104-QUAD-8") > Cc: <stable@vger.kernel.org> # 5.10.x > Signed-off-by: William Breathitt Gray <william.gray@linaro.org> > --- > drivers/counter/104-quad-8.c | 18 +++--------------- > 1 file changed, 3 insertions(+), 15 deletions(-) This patch breaks the build: CC [M] drivers/counter/104-quad-8.o drivers/counter/104-quad-8.c: In function ‘quad8_read_raw’: drivers/counter/104-quad-8.c:117:34: error: ‘QUAD8_FLAG_BT’ undeclared (first use in this function); did you mean ‘QUAD8_FLAG_E’? 117 | borrow = flags & QUAD8_FLAG_BT; | ^~~~~~~~~~~~~ | QUAD8_FLAG_E drivers/counter/104-quad-8.c:117:34: note: each undeclared identifier is reported only once for each function it appears in drivers/counter/104-quad-8.c:118:36: error: ‘QUAD8_FLAG_CT’ undeclared (first use in this function); did you mean ‘QUAD8_FLAG_E’? 118 | carry = !!(flags & QUAD8_FLAG_CT); | ^~~~~~~~~~~~~ | QUAD8_FLAG_E
On Mon, Apr 24, 2023 at 08:33:18AM +0200, Greg Kroah-Hartman wrote: > On Sun, Apr 23, 2023 at 07:20:46PM -0400, William Breathitt Gray wrote: > > commit 4aa3b75c74603c3374877d5fd18ad9cc3a9a62ed upstream. > > > > The Counter (CNTR) register is 24 bits wide, but we can have an > > effective 25-bit count value by setting bit 24 to the XOR of the Borrow > > flag and Carry flag. The flags can be read from the FLAG register, but a > > race condition exists: the Borrow flag and Carry flag are instantaneous > > and could change by the time the count value is read from the CNTR > > register. > > > > Since the race condition could result in an incorrect 25-bit count > > value, remove support for 25-bit count values from this driver. > > > > Fixes: 28e5d3bb0325 ("iio: 104-quad-8: Add IIO support for the ACCES 104-QUAD-8") > > Cc: <stable@vger.kernel.org> # 5.10.x > > Signed-off-by: William Breathitt Gray <william.gray@linaro.org> > > --- > > drivers/counter/104-quad-8.c | 18 +++--------------- > > 1 file changed, 3 insertions(+), 15 deletions(-) > > This patch breaks the build: > > CC [M] drivers/counter/104-quad-8.o > drivers/counter/104-quad-8.c: In function ‘quad8_read_raw’: > drivers/counter/104-quad-8.c:117:34: error: ‘QUAD8_FLAG_BT’ undeclared (first use in this function); did you mean ‘QUAD8_FLAG_E’? > 117 | borrow = flags & QUAD8_FLAG_BT; > | ^~~~~~~~~~~~~ > | QUAD8_FLAG_E > drivers/counter/104-quad-8.c:117:34: note: each undeclared identifier is reported only once for each function it appears in > drivers/counter/104-quad-8.c:118:36: error: ‘QUAD8_FLAG_CT’ undeclared (first use in this function); did you mean ‘QUAD8_FLAG_E’? > 118 | carry = !!(flags & QUAD8_FLAG_CT); > | ^~~~~~~~~~~~~ > | QUAD8_FLAG_E > > Ah, the 5.4 and 5.10 patches are missing the IIO changes from the 4.19 patch. I'll adjust and resubmit these two patches. William Breathitt Gray
diff --git a/drivers/counter/104-quad-8.c b/drivers/counter/104-quad-8.c index 21bb2bb767..1b4fdee9d9 100644 --- a/drivers/counter/104-quad-8.c +++ b/drivers/counter/104-quad-8.c @@ -62,10 +62,6 @@ struct quad8_iio { #define QUAD8_REG_CHAN_OP 0x11 #define QUAD8_REG_INDEX_INPUT_LEVELS 0x16 #define QUAD8_DIFF_ENCODER_CABLE_STATUS 0x17 -/* Borrow Toggle flip-flop */ -#define QUAD8_FLAG_BT BIT(0) -/* Carry Toggle flip-flop */ -#define QUAD8_FLAG_CT BIT(1) /* Error flag */ #define QUAD8_FLAG_E BIT(4) /* Up/Down flag */ @@ -643,17 +639,9 @@ static int quad8_count_read(struct counter_device *counter, { struct quad8_iio *const priv = counter->priv; const int base_offset = priv->base + 2 * count->id; - unsigned int flags; - unsigned int borrow; - unsigned int carry; int i; - flags = inb(base_offset + 1); - borrow = flags & QUAD8_FLAG_BT; - carry = !!(flags & QUAD8_FLAG_CT); - - /* Borrow XOR Carry effectively doubles count range */ - *val = (unsigned long)(borrow ^ carry) << 24; + *val = 0; mutex_lock(&priv->lock); @@ -1198,8 +1186,8 @@ static ssize_t quad8_count_ceiling_read(struct counter_device *counter, mutex_unlock(&priv->lock); - /* By default 0x1FFFFFF (25 bits unsigned) is maximum count */ - return sprintf(buf, "33554431\n"); + /* By default 0xFFFFFF (24 bits unsigned) is maximum count */ + return sprintf(buf, "16777215\n"); } static ssize_t quad8_count_ceiling_write(struct counter_device *counter,
commit 4aa3b75c74603c3374877d5fd18ad9cc3a9a62ed upstream. The Counter (CNTR) register is 24 bits wide, but we can have an effective 25-bit count value by setting bit 24 to the XOR of the Borrow flag and Carry flag. The flags can be read from the FLAG register, but a race condition exists: the Borrow flag and Carry flag are instantaneous and could change by the time the count value is read from the CNTR register. Since the race condition could result in an incorrect 25-bit count value, remove support for 25-bit count values from this driver. Fixes: 28e5d3bb0325 ("iio: 104-quad-8: Add IIO support for the ACCES 104-QUAD-8") Cc: <stable@vger.kernel.org> # 5.10.x Signed-off-by: William Breathitt Gray <william.gray@linaro.org> --- drivers/counter/104-quad-8.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) base-commit: 791a854ae5a5f5988f1291ae91168a149bd5ba57