From patchwork Mon Apr 24 16:01:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Breathitt Gray X-Patchwork-Id: 13222338 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A286FC77B61 for ; Mon, 24 Apr 2023 16:01:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231861AbjDXQBR (ORCPT ); Mon, 24 Apr 2023 12:01:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59548 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231396AbjDXQBP (ORCPT ); Mon, 24 Apr 2023 12:01:15 -0400 Received: from mail-ej1-x636.google.com (mail-ej1-x636.google.com [IPv6:2a00:1450:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6825D6A6B for ; Mon, 24 Apr 2023 09:01:14 -0700 (PDT) Received: by mail-ej1-x636.google.com with SMTP id a640c23a62f3a-959a3e2dc72so256006766b.2 for ; Mon, 24 Apr 2023 09:01:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1682352073; x=1684944073; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Sll20Qvo96Pu0tmrXLoBnzqOrXx0GuRY8gBuzLvCX8I=; b=aH3+3yqkYqqOWyeUC/DjCwm29/sOAO/ezgePl+sTlC72v33GrjEBFutmsCWXd3UYDZ TbQvXw8g+awlKJjzX5/JvTMAC81dJsYt+uRu9oWDPMdW73G1PJhMLSUTq9v+If4uTeha BQTew3WXVL4rwfHajrx0P/vfyxVgyW5cth3hyEZj57SRATufB+2+7i9MMa7zKKW3JJT2 bCzHYd5OQTHTN2n6bisjKkfqB3P98fERujPc2Z9d2PkvQReQ5555FtsmysIIvDX9VFGg 6JtmiS3xKUSfVMra/AVyLYXgZ/gEOsTGlkdrR0xrmjJ6ORkBEDEhWFbR9aCiIT7drysZ O00Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682352073; x=1684944073; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Sll20Qvo96Pu0tmrXLoBnzqOrXx0GuRY8gBuzLvCX8I=; b=hSIrzA/dLAi8ono9cqF2PKfvOVLN+wjrMnIU90ou44KNdILL0fNggTZiCROkIwLp7f qASkExxTOcvyg60ry1kwvyzXdZW6yvz2C+JfaUauTgv4NDovGsqNlWRhORVQQrQxdYG3 e7GsamqM9UdApS0mhAClCZ6dclmbZ7HxPhmKOtvWxM4DsQAkZq69Jvy6IlM1W4NIoZDo 1ajpRG12wcOHk4qCUBOq1+a4Ht/w3vLce0DhMVJMBGJB/6vc+WWd6paKJWVtxkCphJwD UVqQf60BMrWlavsSD2CZa52T8SzS0rtmmYzWKx6QQZtJo+0jxS0xzV9Q+WfwbEWwfdF7 drsA== X-Gm-Message-State: AAQBX9euTK9Wd059mRIpKVwwx/s0CREVQohja4EAb0pHM+2c8SY1+VZS BHUClRBTL6hfx/yIqD8VYrmj/7ASMdUVcIorhbJy/Q== X-Google-Smtp-Source: AKy350ZslENU0n/+EW9o/PtF7iqsmAR6mRvFkYStLGKHWxRBGPkEUrNXTT1bUsZSHShxzVdcEjJIaQ== X-Received: by 2002:a17:907:7f04:b0:94e:3d6f:9c0f with SMTP id qf4-20020a1709077f0400b0094e3d6f9c0fmr12384686ejc.55.1682352072898; Mon, 24 Apr 2023 09:01:12 -0700 (PDT) Received: from fedora.. ([195.167.132.10]) by smtp.gmail.com with ESMTPSA id g10-20020a170906594a00b008cecb8f374asm5665879ejr.0.2023.04.24.09.01.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Apr 2023 09:01:12 -0700 (PDT) From: William Breathitt Gray To: Greg Kroah-Hartman Cc: linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, Jonathan Cameron , William Breathitt Gray , stable@vger.kernel.org Subject: [PATCH 5.10 v5 2/2] counter: 104-quad-8: Fix race condition between FLAG and CNTR reads Date: Mon, 24 Apr 2023 12:01:05 -0400 Message-Id: <20230424160106.4415-2-william.gray@linaro.org> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230424160106.4415-1-william.gray@linaro.org> References: <20230424160106.4415-1-william.gray@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org 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: # 5.10.x Signed-off-by: William Breathitt Gray --- drivers/counter/104-quad-8.c | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) base-commit: 791a854ae5a5f5988f1291ae91168a149bd5ba57 diff --git a/drivers/counter/104-quad-8.c b/drivers/counter/104-quad-8.c index 21bb2bb767a..89c9cb850a3 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 */ @@ -104,9 +100,6 @@ static int quad8_read_raw(struct iio_dev *indio_dev, { struct quad8_iio *const priv = iio_priv(indio_dev); const int base_offset = priv->base + 2 * chan->channel; - unsigned int flags; - unsigned int borrow; - unsigned int carry; int i; switch (mask) { @@ -117,12 +110,7 @@ static int quad8_read_raw(struct iio_dev *indio_dev, return IIO_VAL_INT; } - flags = inb(base_offset + 1); - borrow = flags & QUAD8_FLAG_BT; - carry = !!(flags & QUAD8_FLAG_CT); - - /* Borrow XOR Carry effectively doubles count range */ - *val = (borrow ^ carry) << 24; + *val = 0; mutex_lock(&priv->lock); @@ -643,17 +631,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 +1178,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,