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=-9.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT 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 5B543C7618F for ; Wed, 24 Jul 2019 08:33:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2D46D21951 for ; Wed, 24 Jul 2019 08:33:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="aP58wc/2" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726469AbfGXIdL (ORCPT ); Wed, 24 Jul 2019 04:33:11 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:41259 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725870AbfGXIdL (ORCPT ); Wed, 24 Jul 2019 04:33:11 -0400 Received: by mail-pf1-f193.google.com with SMTP id m30so20576967pff.8 for ; Wed, 24 Jul 2019 01:33:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id; bh=3mpFcJm52vqDHrD294AKdjpEOxw1VpKoEQduQjdZ2L0=; b=aP58wc/2YXAfkX+FuNWDMlnhsNNEHFzP+2c9ml9eyP9dsH8O2zrW8VgKkX0U27kQok 5PZkqjYKRV4mtv49n+YdTe545LnKECNwSbDAHqSKQjj+suwiYOvHIOjiJWoxPWoX5n7u Y34+2axR8FY2IfI4L4AAFMlxsdd3ah+OaExm0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=3mpFcJm52vqDHrD294AKdjpEOxw1VpKoEQduQjdZ2L0=; b=IPzezY8epFt/NE1W+hUgDwpuuILmd/eSRfrvE9q/4+u60nfJ7EJnWwlctH7qHVgM50 KfAFuEU+XUjqfkhO3hHSbZcu7mBPcEz1NFQpxdFWTudrtXQlHepA6MOcZ/jn2yKEZQk1 tSoLsHA64nKq4nGotPg46vudkiFPgx6VIgDhxUw6DXtdApF8zAvGuArcKV+XpcPbt2Wu FjQyyonDqBbSGRVT7NhWBBIqyCzbRCzwdWATk8qNDZi/3cwXwFajCM949zqNP15AkLXP Vwm6Hh+gNbqLWPzfSP9srHr2RpZk8XclSV4eXgBc2HxclA2vAxnSZjienXII/bY23vcW 0aMA== X-Gm-Message-State: APjAAAUjtXDXvyOotUfS5NMz3b+ANp+5/CbWHoEHq3P/kfNhW9rWEvz2 uDyM3Lth4jgFG4Qwsnf0wnx+QQ== X-Google-Smtp-Source: APXvYqxs7n3SvBSpEfhTxVDDL+ugCuHHYVOhhtmhsxZtMi/aqCqQ5OTABjBfpafmHW8kNT3gZ4b7jQ== X-Received: by 2002:a63:4f58:: with SMTP id p24mr16283806pgl.50.1563957190508; Wed, 24 Jul 2019 01:33:10 -0700 (PDT) Received: from rayagonda.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id u128sm52437425pfu.48.2019.07.24.01.33.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 24 Jul 2019 01:33:09 -0700 (PDT) From: Rayagonda Kokatanur To: Wolfram Sang , Rob Herring , Mark Rutland Cc: linux-i2c@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, Ray Jui , Rayagonda Kokatanur , Florian Fainelli Subject: [PATCH v1 1/1] i2c: iproc: Fix i2c master read more than 63 bytes Date: Wed, 24 Jul 2019 13:58:27 +0530 Message-Id: <1563956907-21255-1-git-send-email-rayagonda.kokatanur@broadcom.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use SMBUS_MASTER_DATA_READ.MASTER_RD_STATUS bit to check for RX FIFO empty condition because SMBUS_MASTER_FIFO_CONTROL.MASTER_RX_PKT_COUNT is not updated for read >= 64 bytes. This fixes the issue when trying to read from the I2C slave more than 63 bytes. Fixes: c24b8d574b7c ("i2c: iproc: Extend I2C read up to 255 bytes") Signed-off-by: Rayagonda Kokatanur --- drivers/i2c/busses/i2c-bcm-iproc.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/i2c/busses/i2c-bcm-iproc.c b/drivers/i2c/busses/i2c-bcm-iproc.c index 2c7f145..d7fd76b 100644 --- a/drivers/i2c/busses/i2c-bcm-iproc.c +++ b/drivers/i2c/busses/i2c-bcm-iproc.c @@ -392,16 +392,18 @@ static bool bcm_iproc_i2c_slave_isr(struct bcm_iproc_i2c_dev *iproc_i2c, static void bcm_iproc_i2c_read_valid_bytes(struct bcm_iproc_i2c_dev *iproc_i2c) { struct i2c_msg *msg = iproc_i2c->msg; + uint32_t val; /* Read valid data from RX FIFO */ while (iproc_i2c->rx_bytes < msg->len) { - if (!((iproc_i2c_rd_reg(iproc_i2c, M_FIFO_CTRL_OFFSET) >> M_FIFO_RX_CNT_SHIFT) - & M_FIFO_RX_CNT_MASK)) + val = iproc_i2c_rd_reg(iproc_i2c, M_RX_OFFSET); + + /* rx fifo empty */ + if (!((val >> M_RX_STATUS_SHIFT) & M_RX_STATUS_MASK)) break; msg->buf[iproc_i2c->rx_bytes] = - (iproc_i2c_rd_reg(iproc_i2c, M_RX_OFFSET) >> - M_RX_DATA_SHIFT) & M_RX_DATA_MASK; + (val >> M_RX_DATA_SHIFT) & M_RX_DATA_MASK; iproc_i2c->rx_bytes++; } } -- 1.9.1