From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755203AbcH2Qhb (ORCPT ); Mon, 29 Aug 2016 12:37:31 -0400 Received: from nat-hk.nvidia.com ([203.18.50.4]:15573 "EHLO hkmmgate102.nvidia.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754389AbcH2Qh0 (ORCPT ); Mon, 29 Aug 2016 12:37:26 -0400 X-PGP-Universal: processed; by hkpgpgate102.nvidia.com on Mon, 29 Aug 2016 09:37:00 -0700 From: Shardar Shariff Md To: , , , , , , , , Subject: [PATCH v9 3/4] i2c: tegra: use atomic poll function during configuration Date: Mon, 29 Aug 2016 22:06:38 +0530 Message-ID: <1472488599-13562-3-git-send-email-smohammed@nvidia.com> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <1472488599-13562-1-git-send-email-smohammed@nvidia.com> References: <1472488599-13562-1-git-send-email-smohammed@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use readl_poll_timeout_atomic() function as *wait_for_config_load() function can be called from atomic context. Signed-off-by: Shardar Shariff Md --- drivers/i2c/busses/i2c-tegra.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c index da79c5e..e849a44 100644 --- a/drivers/i2c/busses/i2c-tegra.c +++ b/drivers/i2c/busses/i2c-tegra.c @@ -437,8 +437,13 @@ static int tegra_i2c_wait_for_config_load(struct tegra_i2c_dev *i2c_dev) 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); - err = readl_poll_timeout(addr, val, val == 0, 1000, - I2C_CONFIG_LOAD_TIMEOUT); + if (in_atomic() || irqs_disabled()) + err = readl_poll_timeout_atomic(addr, val, val == 0, + 1000, I2C_CONFIG_LOAD_TIMEOUT); + else + 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"); -- 1.8.1.5