From patchwork Wed Aug 31 13:22:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shardar Shariff Md X-Patchwork-Id: 664538 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3sPR156hNCz9sCj for ; Wed, 31 Aug 2016 23:23:53 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933442AbcHaNXg (ORCPT ); Wed, 31 Aug 2016 09:23:36 -0400 Received: from hqemgate16.nvidia.com ([216.228.121.65]:1266 "EHLO hqemgate16.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932393AbcHaNXK (ORCPT ); Wed, 31 Aug 2016 09:23:10 -0400 Received: from hqnvupgp08.nvidia.com (Not Verified[216.228.121.13]) by hqemgate16.nvidia.com id ; Wed, 31 Aug 2016 06:22:39 -0700 Received: from HQMAIL103.nvidia.com ([172.20.187.11]) by hqnvupgp08.nvidia.com (PGP Universal service); Wed, 31 Aug 2016 06:18:17 -0700 X-PGP-Universal: processed; by hqnvupgp08.nvidia.com on Wed, 31 Aug 2016 06:18:17 -0700 Received: from UKMAIL102.nvidia.com (10.26.138.15) by HQMAIL103.nvidia.com (172.20.187.11) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Wed, 31 Aug 2016 13:22:47 +0000 Received: from HQMAIL101.nvidia.com (172.20.187.10) by UKMAIL102.nvidia.com (10.26.138.15) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Wed, 31 Aug 2016 13:22:44 +0000 Received: from shardar-build-machine.nvidia.com (172.20.13.39) by HQMAIL101.nvidia.com (172.20.187.10) with Microsoft SMTP Server (TLS) id 15.0.1210.3 via Frontend Transport; Wed, 31 Aug 2016 13:22:40 +0000 From: Shardar Shariff Md To: , , , , , , , , Subject: [PATCH 1/5] i2c: tegra: use readl_poll_timeout after config_load reg programmed Date: Wed, 31 Aug 2016 18:52:34 +0530 Message-ID: <1472649758-5608-1-git-send-email-smohammed@nvidia.com> X-Mailer: git-send-email 1.8.1.5 MIME-Version: 1.0 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org After CONFIG_LOAD register is programmed instead of explicitly waiting for timeout, use readl_poll_timeout() to check for register value to get updated or wait till timeout. Signed-off-by: Shardar Shariff Md --- Changes in v4: - Split timeout calculation to separate patch Changes in v5: - Move disabling of clock to separate patch Changes in v8: - 1st change of [PATCH v7] series is merged, v8 is rebased on top of merged change, here patch series is changed accordingly. - Updated the commit message as per review to properly reflect change. - calculate the register offset seperately to make code more readable. Changes in v9: - Use readl_poll_timeout() instead of readx_poll_timeout() Changes in V10: - Rebase on top of [PATCH V2 0/9] Some Tegra I2C Updates Changes in V11: - Fix sparse error --- --- drivers/i2c/busses/i2c-tegra.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c index d86a993..e93c72a 100644 --- a/drivers/i2c/busses/i2c-tegra.c +++ b/drivers/i2c/busses/i2c-tegra.c @@ -30,6 +30,7 @@ #include #include #include +#include #include @@ -112,6 +113,8 @@ #define I2C_CLKEN_OVERRIDE 0x090 #define I2C_MST_CORE_CLKEN_OVR BIT(0) +#define I2C_CONFIG_LOAD_TIMEOUT 1000000 + /* * msg_end_type: The bus control which need to be send at end of transfer. * @MSG_END_STOP: Send stop pulse at end of transfer. @@ -448,7 +451,6 @@ static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev) u32 val; int err; u32 clk_divisor; - unsigned long timeout = jiffies + HZ; err = pm_runtime_get_sync(i2c_dev->dev); if (err < 0) { @@ -497,15 +499,18 @@ static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev) i2c_writel(i2c_dev, I2C_MST_CORE_CLKEN_OVR, I2C_CLKEN_OVERRIDE); if (i2c_dev->hw->has_config_load_reg) { + unsigned long reg_offset; + void __iomem *addr; + + reg_offset = tegra_i2c_reg_addr(i2c_dev, I2C_CONFIG_LOAD); + addr = i2c_dev->base + reg_offset; i2c_writel(i2c_dev, I2C_MSTR_CONFIG_LOAD, I2C_CONFIG_LOAD); - while (i2c_readl(i2c_dev, I2C_CONFIG_LOAD) != 0) { - if (time_after(jiffies, timeout)) { - dev_warn(i2c_dev->dev, - "timeout waiting for config load\n"); - err = -ETIMEDOUT; - goto err; - } - msleep(1); + err = readl_poll_timeout(addr, val, val == 0, 1000, + I2C_CONFIG_LOAD_TIMEOUT); + if (err) { + dev_warn(i2c_dev->dev, + "timeout waiting for config load\n"); + goto err; } }