From patchwork Tue Dec 6 07:57:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tnhuynh@apm.com X-Patchwork-Id: 9462125 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 16DCC60231 for ; Tue, 6 Dec 2016 07:58:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ED0E62815E for ; Tue, 6 Dec 2016 07:58:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DE1EE282DC; Tue, 6 Dec 2016 07:58:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CF2732815E for ; Tue, 6 Dec 2016 07:58:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751427AbcLFH6n (ORCPT ); Tue, 6 Dec 2016 02:58:43 -0500 Received: from mail-pg0-f46.google.com ([74.125.83.46]:35010 "EHLO mail-pg0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751443AbcLFH6m (ORCPT ); Tue, 6 Dec 2016 02:58:42 -0500 Received: by mail-pg0-f46.google.com with SMTP id p66so146694011pga.2 for ; Mon, 05 Dec 2016 23:58:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apm.com; s=apm; h=from:to:cc:subject:date:message-id; bh=VZY6aaeZWI1XInOpAy3wOviLgcdrY6KWTMKq5rv6VBU=; b=Mkl0sJyIn9zldAhlv/dci4me3yAzT82gEmga5eozLeqMh9LVh+JOEXxyf+bXPmI9ck +C0uPDmizKkXI3Tp5jqpXaoCzRgRUaf8v50Y32yqDgKq+Ves/WmXwdvS77PIrRP4KlkJ UXq3QFZ0nlboiMOS5fBPoZ2SF9Ja2cdZ4mkHU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=VZY6aaeZWI1XInOpAy3wOviLgcdrY6KWTMKq5rv6VBU=; b=W9v/R1WwsK6+zFVBezJw9T5kScH/fK8jc9nfKIjw0vCkXei6wnRw3TCIpEEZnGUJP0 qbWKC7j8hIcT8vCb5mrgnbB3jlBCF+Cha62YK8wx1OMp7Vpd1btNQLc20XfRSw4ahKZj E29nIKljFZpm0qT2IrM2qsZZI4oebglBbFNR/mkdxNkguf7SX0YaMvldh9nm+NgFQHyF xYgyXtOTEBSVUQCxxxrF0pXvd3zKJmzqSPdgGz+qBrzIk/Jl3hR77k2C4u41EvoaN3vO H1i1QIOecelU4RSoXYlUab77cQ+OZ9TYzvs+qu9JIBJRkb0XJ1rcAXX0V0oB4LLz4kzf abrA== X-Gm-Message-State: AKaTC02N0A4QTZP5A7DBUw6tzX3ysKiEfDtx0vuZNHPr2PH8MMDJPnxu3X16sCnBZxxP8gAO X-Received: by 10.98.223.25 with SMTP id u25mr61124667pfg.96.1481011087437; Mon, 05 Dec 2016 23:58:07 -0800 (PST) Received: from localhost.localdomain ([118.69.219.197]) by smtp.gmail.com with ESMTPSA id e11sm32648595pgp.10.2016.12.05.23.58.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Dec 2016 23:58:06 -0800 (PST) From: Tin Huynh To: Jarkko Nikula , Andy Shevchenko , Mika Westerberg , Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, Loc Ho , Thang Nguyen , Phong Vo , patches@apm.com, Tin Huynh Subject: [PATCH V2] i2c: designware: fix wrong tx/rx fifo for ACPI Date: Tue, 6 Dec 2016 14:57:53 +0700 Message-Id: <1481011073-29143-1-git-send-email-tnhuynh@apm.com> X-Mailer: git-send-email 1.7.1 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP ACPI always sets txfifo and rxfifo to 32. This configuration will cause problem if the IP core supports a fifo size of less than 32. The driver should read the fifo size from the IP and select the smaller one of the two. Signed-off-by: Tin Huynh --- drivers/i2c/busses/i2c-designware-platdrv.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) Change from V1: -Revert the default 32 for fifo, read parameter from IP core and pick the smaller one of the two. -Correct the title to describe new approach. diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c index 0b42a12..76b061f 100644 --- a/drivers/i2c/busses/i2c-designware-platdrv.c +++ b/drivers/i2c/busses/i2c-designware-platdrv.c @@ -153,6 +153,7 @@ static int i2c_dw_plat_prepare_clk(struct dw_i2c_dev *i_dev, bool prepare) static int dw_i2c_plat_probe(struct platform_device *pdev) { struct dw_i2c_platform_data *pdata = dev_get_platdata(&pdev->dev); + u32 param1, tx_fifo_depth, rx_fifo_depth; struct dw_i2c_dev *dev; struct i2c_adapter *adap; struct resource *mem; @@ -246,12 +247,18 @@ static int dw_i2c_plat_probe(struct platform_device *pdev) 1000000); } + param1 = i2c_dw_read_comp_param(dev); + tx_fifo_depth = ((param1 >> 16) & 0xff) + 1; + rx_fifo_depth = ((param1 >> 8) & 0xff) + 1; if (!dev->tx_fifo_depth) { - u32 param1 = i2c_dw_read_comp_param(dev); - - dev->tx_fifo_depth = ((param1 >> 16) & 0xff) + 1; - dev->rx_fifo_depth = ((param1 >> 8) & 0xff) + 1; + dev->tx_fifo_depth = tx_fifo_depth; + dev->rx_fifo_depth = rx_fifo_depth; dev->adapter.nr = pdev->id; + } else if (tx_fifo_depth) { + dev->tx_fifo_depth = min_t(u32, dev->tx_fifo_depth, + tx_fifo_depth); + dev->rx_fifo_depth = min_t(u32, dev->rx_fifo_depth, + rx_fifo_depth); } adap = &dev->adapter;