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.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, 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 A9664C43331 for ; Tue, 24 Mar 2020 13:07:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 774DE208C3 for ; Tue, 24 Mar 2020 13:07:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727216AbgCXNHc (ORCPT ); Tue, 24 Mar 2020 09:07:32 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:39125 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726190AbgCXNHc (ORCPT ); Tue, 24 Mar 2020 09:07:32 -0400 Received: from 61-220-137-37.hinet-ip.hinet.net ([61.220.137.37] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jGjHB-0004Ch-2C; Tue, 24 Mar 2020 13:07:25 +0000 From: Kai-Heng Feng To: ajayg@nvidia.com Cc: Kai-Heng Feng , Andy Shevchenko , Wolfram Sang , linux-i2c@vger.kernel.org (open list:I2C CONTROLLER DRIVER FOR NVIDIA GPU), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v2] i2c: nvidia-gpu: Handle timeout correctly in gpu_i2c_check_status() Date: Tue, 24 Mar 2020 21:07:12 +0800 Message-Id: <20200324130712.12289-1-kai.heng.feng@canonical.com> X-Mailer: git-send-email 2.17.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Nvidia card may come with a "phantom" UCSI device, and its driver gets stuck in probe routine, prevents any system PM operations like suspend. When the target time equals to jiffies, it's not included by time_is_before_jiffies(). So let's use a boolean to make sure the operation is done or timeout. Fixes: c71bcdcb42a7 ("i2c: add i2c bus driver for NVIDIA GPU") Signed-off-by: Kai-Heng Feng --- v2: - Use a boolean to make sure the operation is timeout or not. drivers/i2c/busses/i2c-nvidia-gpu.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/i2c/busses/i2c-nvidia-gpu.c b/drivers/i2c/busses/i2c-nvidia-gpu.c index 62e18b4db0ed..bdb48600af0e 100644 --- a/drivers/i2c/busses/i2c-nvidia-gpu.c +++ b/drivers/i2c/busses/i2c-nvidia-gpu.c @@ -77,18 +77,20 @@ static int gpu_i2c_check_status(struct gpu_i2c_dev *i2cd) { unsigned long target = jiffies + msecs_to_jiffies(1000); u32 val; + bool done = false; do { val = readl(i2cd->regs + I2C_MST_CNTL); - if (!(val & I2C_MST_CNTL_CYCLE_TRIGGER)) - break; - if ((val & I2C_MST_CNTL_STATUS) != - I2C_MST_CNTL_STATUS_BUS_BUSY) + if (!(val & I2C_MST_CNTL_CYCLE_TRIGGER) + || (val & I2C_MST_CNTL_STATUS) != + I2C_MST_CNTL_STATUS_BUS_BUSY) { + done = true; break; + } usleep_range(500, 600); } while (time_is_after_jiffies(target)); - if (time_is_before_jiffies(target)) { + if (!done) { dev_err(i2cd->dev, "i2c timeout error %x\n", val); return -ETIMEDOUT; } -- 2.17.1