Message ID | 1472584279-19924-1-git-send-email-smohammed@nvidia.com |
---|---|
State | Superseded, archived |
Delegated to: | Jon Hunter |
Headers | show |
On Wed, Aug 31, 2016 at 12:41:16AM +0530, Shardar Shariff Md wrote: > 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 <smohammed@nvidia.com> > --- > 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 Thanks for the rebase! However, my code checkers showed a few warnings: SPARSE drivers/i2c/busses/i2c-tegra.c:504:21: warning: symbol 'val' shadows an earlier one drivers/i2c/busses/i2c-tegra.c:451:13: originally declared here
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c index d86a993..5eb37ab 100644 --- a/drivers/i2c/busses/i2c-tegra.c +++ b/drivers/i2c/busses/i2c-tegra.c @@ -30,6 +30,7 @@ #include <linux/reset.h> #include <linux/pinctrl/consumer.h> #include <linux/pm_runtime.h> +#include <linux/iopoll.h> #include <asm/unaligned.h> @@ -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,19 @@ 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; + u32 val; + + 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; } }
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 <smohammed@nvidia.com> --- 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 --- --- drivers/i2c/busses/i2c-tegra.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-)