From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Kai-Heng Feng <kai.heng.feng@canonical.com>
Cc: ajayg@nvidia.com, Wolfram Sang <wsa@the-dreams.de>,
"open list:I2C CONTROLLER DRIVER FOR NVIDIA GPU"
<linux-i2c@vger.kernel.org>,
open list <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v3] i2c: nvidia-gpu: Handle timeout correctly in gpu_i2c_check_status()
Date: Tue, 24 Mar 2020 17:35:18 +0200 [thread overview]
Message-ID: <20200324153518.GP1922688@smile.fi.intel.com> (raw)
In-Reply-To: <20200324152812.20231-1-kai.heng.feng@canonical.com>
On Tue, Mar 24, 2020 at 11:28:11PM +0800, Kai-Heng Feng wrote:
> Nvidia card may come with a "phantom" UCSI device, and its driver gets
> stuck in probe routine, prevents any system PM operations like suspend.
>
> There's an unaccounted case that the target time can equal to jiffies in
> gpu_i2c_check_status(), let's solve that by using readl_poll_timeout()
> instead of jiffies comparison functions.
>
Thank you!
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> Fixes: c71bcdcb42a7 ("i2c: add i2c bus driver for NVIDIA GPU")
> Suggested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
> ---
> v3:
> - Use readl_poll_timeout to make the retry loop simpler.
>
> v2:
> - Use a boolean to make sure the operation is timeout or not.
>
> drivers/i2c/busses/i2c-nvidia-gpu.c | 20 ++++++++------------
> 1 file changed, 8 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-nvidia-gpu.c b/drivers/i2c/busses/i2c-nvidia-gpu.c
> index 62e18b4db0ed..f5d25ce00f03 100644
> --- a/drivers/i2c/busses/i2c-nvidia-gpu.c
> +++ b/drivers/i2c/busses/i2c-nvidia-gpu.c
> @@ -8,6 +8,7 @@
> #include <linux/delay.h>
> #include <linux/i2c.h>
> #include <linux/interrupt.h>
> +#include <linux/iopoll.h>
> #include <linux/module.h>
> #include <linux/pci.h>
> #include <linux/platform_device.h>
> @@ -75,20 +76,15 @@ static void gpu_enable_i2c_bus(struct gpu_i2c_dev *i2cd)
>
> static int gpu_i2c_check_status(struct gpu_i2c_dev *i2cd)
> {
> - unsigned long target = jiffies + msecs_to_jiffies(1000);
> u32 val;
> + int ret;
>
> - 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)
> - break;
> - usleep_range(500, 600);
> - } while (time_is_after_jiffies(target));
> -
> - if (time_is_before_jiffies(target)) {
> + ret = readl_poll_timeout(i2cd->regs + I2C_MST_CNTL, val,
> + !(val & I2C_MST_CNTL_CYCLE_TRIGGER) ||
> + (val & I2C_MST_CNTL_STATUS) != I2C_MST_CNTL_STATUS_BUS_BUSY,
> + 500, 1000 * USEC_PER_MSEC);
> +
> + if (ret) {
> dev_err(i2cd->dev, "i2c timeout error %x\n", val);
> return -ETIMEDOUT;
> }
> --
> 2.17.1
>
--
With Best Regards,
Andy Shevchenko
next prev parent reply other threads:[~2020-03-24 15:35 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-24 15:28 [PATCH v3] i2c: nvidia-gpu: Handle timeout correctly in gpu_i2c_check_status() Kai-Heng Feng
2020-03-24 15:35 ` Andy Shevchenko [this message]
2020-03-24 20:57 ` Wolfram Sang
2020-03-24 21:16 ` Ajay Gupta
2020-03-24 21:47 ` Wolfram Sang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200324153518.GP1922688@smile.fi.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=ajayg@nvidia.com \
--cc=kai.heng.feng@canonical.com \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=wsa@the-dreams.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).