From: Tyrone Ting <warp5tw@gmail.com> To: avifishman70@gmail.com, tmaimon77@gmail.com, tali.perry1@gmail.com, venture@google.com, yuenn@google.com, benjaminfair@google.com, robh+dt@kernel.org, krzysztof.kozlowski@canonical.com, semen.protsenko@linaro.org, yangyicong@hisilicon.com, wsa@kernel.org, jie.deng@intel.com, sven@svenpeter.dev, bence98@sch.bme.hu, christophe.leroy@csgroup.eu, lukas.bulwahn@gmail.com, olof@lixom.net, arnd@arndb.de, digetx@gmail.com, andriy.shevchenko@linux.intel.com, warp5tw@gmail.com, tali.perry@nuvoton.com, Avi.Fishman@nuvoton.com, tomer.maimon@nuvoton.com, KWLIU@nuvoton.com, JJLIU0@nuvoton.com, kfting@nuvoton.com Cc: openbmc@lists.ozlabs.org, linux-i2c@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 06/11] i2c: npcm: Fix timeout calculation Date: Sun, 20 Feb 2022 11:53:16 +0800 [thread overview] Message-ID: <20220220035321.3870-7-warp5tw@gmail.com> (raw) In-Reply-To: <20220220035321.3870-1-warp5tw@gmail.com> From: Tali Perry <tali.perry1@gmail.com> Use adap.timeout for timeout calculation instead of hard-coded value of 35ms. Fixes: 56a1485b102e ("i2c: npcm7xx: Add Nuvoton NPCM I2C controller driver") Signed-off-by: Tali Perry <tali.perry1@gmail.com> Signed-off-by: Tyrone Ting <kfting@nuvoton.com> Reported-by: kernel test robot <lkp@intel.com> --- drivers/i2c/busses/i2c-npcm7xx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/i2c/busses/i2c-npcm7xx.c b/drivers/i2c/busses/i2c-npcm7xx.c index 9ccb9958945e..1e6e3f7f59a3 100644 --- a/drivers/i2c/busses/i2c-npcm7xx.c +++ b/drivers/i2c/busses/i2c-npcm7xx.c @@ -2047,7 +2047,7 @@ static int npcm_i2c_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, u16 nwrite, nread; u8 *write_data, *read_data; u8 slave_addr; - int timeout; + unsigned long timeout; int ret = 0; bool read_block = false; bool read_PEC = false; @@ -2099,13 +2099,13 @@ static int npcm_i2c_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, * 9: bits per transaction (including the ack/nack) */ timeout_usec = (2 * 9 * USEC_PER_SEC / bus->bus_freq) * (2 + nread + nwrite); - timeout = max(msecs_to_jiffies(35), usecs_to_jiffies(timeout_usec)); + timeout = max_t(unsigned long, bus->adap.timeout, usecs_to_jiffies(timeout_usec)); if (nwrite >= 32 * 1024 || nread >= 32 * 1024) { dev_err(bus->dev, "i2c%d buffer too big\n", bus->num); return -EINVAL; } - time_left = jiffies + msecs_to_jiffies(DEFAULT_STALL_COUNT) + 1; + time_left = jiffies + timeout + 1; do { /* * we must clear slave address immediately when the bus is not @@ -2265,7 +2265,7 @@ static int npcm_i2c_probe_bus(struct platform_device *pdev) adap = &bus->adap; adap->owner = THIS_MODULE; adap->retries = 3; - adap->timeout = HZ; + adap->timeout = msecs_to_jiffies(35); adap->algo = &npcm_i2c_algo; adap->quirks = &npcm_i2c_quirks; adap->algo_data = bus; -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Tyrone Ting <warp5tw@gmail.com> To: avifishman70@gmail.com, tmaimon77@gmail.com, tali.perry1@gmail.com, venture@google.com, yuenn@google.com, benjaminfair@google.com, robh+dt@kernel.org, krzysztof.kozlowski@canonical.com, semen.protsenko@linaro.org, yangyicong@hisilicon.com, wsa@kernel.org, jie.deng@intel.com, sven@svenpeter.dev, bence98@sch.bme.hu, christophe.leroy@csgroup.eu, lukas.bulwahn@gmail.com, olof@lixom.net, arnd@arndb.de, digetx@gmail.com, andriy.shevchenko@linux.intel.com, warp5tw@gmail.com, tali.perry@nuvoton.com, Avi.Fishman@nuvoton.com, tomer.maimon@nuvoton.com, KWLIU@nuvoton.com, JJLIU0@nuvoton.com, kfting@nuvoton.com Cc: devicetree@vger.kernel.org, openbmc@lists.ozlabs.org, linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 06/11] i2c: npcm: Fix timeout calculation Date: Sun, 20 Feb 2022 11:53:16 +0800 [thread overview] Message-ID: <20220220035321.3870-7-warp5tw@gmail.com> (raw) In-Reply-To: <20220220035321.3870-1-warp5tw@gmail.com> From: Tali Perry <tali.perry1@gmail.com> Use adap.timeout for timeout calculation instead of hard-coded value of 35ms. Fixes: 56a1485b102e ("i2c: npcm7xx: Add Nuvoton NPCM I2C controller driver") Signed-off-by: Tali Perry <tali.perry1@gmail.com> Signed-off-by: Tyrone Ting <kfting@nuvoton.com> Reported-by: kernel test robot <lkp@intel.com> --- drivers/i2c/busses/i2c-npcm7xx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/i2c/busses/i2c-npcm7xx.c b/drivers/i2c/busses/i2c-npcm7xx.c index 9ccb9958945e..1e6e3f7f59a3 100644 --- a/drivers/i2c/busses/i2c-npcm7xx.c +++ b/drivers/i2c/busses/i2c-npcm7xx.c @@ -2047,7 +2047,7 @@ static int npcm_i2c_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, u16 nwrite, nread; u8 *write_data, *read_data; u8 slave_addr; - int timeout; + unsigned long timeout; int ret = 0; bool read_block = false; bool read_PEC = false; @@ -2099,13 +2099,13 @@ static int npcm_i2c_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, * 9: bits per transaction (including the ack/nack) */ timeout_usec = (2 * 9 * USEC_PER_SEC / bus->bus_freq) * (2 + nread + nwrite); - timeout = max(msecs_to_jiffies(35), usecs_to_jiffies(timeout_usec)); + timeout = max_t(unsigned long, bus->adap.timeout, usecs_to_jiffies(timeout_usec)); if (nwrite >= 32 * 1024 || nread >= 32 * 1024) { dev_err(bus->dev, "i2c%d buffer too big\n", bus->num); return -EINVAL; } - time_left = jiffies + msecs_to_jiffies(DEFAULT_STALL_COUNT) + 1; + time_left = jiffies + timeout + 1; do { /* * we must clear slave address immediately when the bus is not @@ -2265,7 +2265,7 @@ static int npcm_i2c_probe_bus(struct platform_device *pdev) adap = &bus->adap; adap->owner = THIS_MODULE; adap->retries = 3; - adap->timeout = HZ; + adap->timeout = msecs_to_jiffies(35); adap->algo = &npcm_i2c_algo; adap->quirks = &npcm_i2c_quirks; adap->algo_data = bus; -- 2.17.1
next prev parent reply other threads:[~2022-02-20 3:57 UTC|newest] Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-02-20 3:53 [PATCH v2 00/11] i2c: npcm: Bug fixes timeout, spurious interrupts Tyrone Ting 2022-02-20 3:53 ` Tyrone Ting 2022-02-20 3:53 ` [PATCH v2 01/11] arm: dts: add new property for NPCM i2c module Tyrone Ting 2022-02-20 3:53 ` Tyrone Ting 2022-02-20 3:53 ` [PATCH v2 02/11] dt-bindings: i2c: npcm: support NPCM845 Tyrone Ting 2022-02-20 3:53 ` Tyrone Ting 2022-02-21 2:36 ` Rob Herring 2022-02-21 2:36 ` Rob Herring 2022-02-21 8:31 ` Tyrone Ting 2022-02-21 8:31 ` Tyrone Ting 2022-02-22 17:56 ` Rob Herring 2022-02-22 17:56 ` Rob Herring 2022-02-23 3:41 ` Tyrone Ting 2022-02-23 3:41 ` Tyrone Ting 2022-02-20 3:53 ` [PATCH v2 03/11] i2c: npcm: Fix client address calculation Tyrone Ting 2022-02-20 3:53 ` Tyrone Ting 2022-02-20 3:53 ` [PATCH v2 04/11] i2c: npcm: Update gcr property name Tyrone Ting 2022-02-20 3:53 ` Tyrone Ting 2022-02-20 9:32 ` Krzysztof Kozlowski 2022-02-20 9:32 ` Krzysztof Kozlowski 2022-02-21 8:29 ` Tyrone Ting 2022-02-21 8:29 ` Tyrone Ting 2022-02-20 3:53 ` [PATCH v2 05/11] i2c: npcm: Remove unused clock node Tyrone Ting 2022-02-20 3:53 ` Tyrone Ting 2022-02-21 11:49 ` Jonathan Neuschäfer 2022-02-21 11:49 ` Jonathan Neuschäfer 2022-02-22 2:15 ` Tyrone Ting 2022-02-22 2:15 ` Tyrone Ting 2022-02-22 15:58 ` Jonathan Neuschäfer 2022-02-22 15:58 ` Jonathan Neuschäfer 2022-02-23 3:38 ` Tyrone Ting 2022-02-23 3:38 ` Tyrone Ting 2022-02-20 3:53 ` Tyrone Ting [this message] 2022-02-20 3:53 ` [PATCH v2 06/11] i2c: npcm: Fix timeout calculation Tyrone Ting 2022-02-20 3:53 ` [PATCH v2 07/11] i2c: npcm: Add tx complete counter Tyrone Ting 2022-02-20 3:53 ` Tyrone Ting 2022-02-20 3:53 ` [PATCH v2 08/11] i2c: npcm: Correct register access width Tyrone Ting 2022-02-20 3:53 ` Tyrone Ting 2022-02-21 11:55 ` Jonathan Neuschäfer 2022-02-21 11:55 ` Jonathan Neuschäfer 2022-02-20 3:53 ` [PATCH v2 09/11] i2c: npcm: Handle spurious interrupts Tyrone Ting 2022-02-20 3:53 ` Tyrone Ting 2022-02-20 3:53 ` [PATCH v2 10/11] i2c: npcm: Remove own slave addresses 2:10 Tyrone Ting 2022-02-20 3:53 ` Tyrone Ting 2022-02-20 3:53 ` [PATCH v2 11/11] i2c: npcm: Support NPCM845 Tyrone Ting 2022-02-20 3:53 ` Tyrone Ting 2022-02-20 9:36 ` Krzysztof Kozlowski 2022-02-20 9:36 ` Krzysztof Kozlowski 2022-02-21 8:33 ` Tyrone Ting 2022-02-21 8:33 ` Tyrone Ting 2022-02-20 9:30 ` [PATCH v2 00/11] i2c: npcm: Bug fixes timeout, spurious interrupts Krzysztof Kozlowski 2022-02-20 9:30 ` Krzysztof Kozlowski 2022-02-21 8:16 ` Tyrone Ting 2022-02-21 8:16 ` Tyrone Ting 2022-02-21 8:32 ` Krzysztof Kozlowski 2022-02-21 8:32 ` Krzysztof Kozlowski 2022-02-21 8:47 ` Tyrone Ting 2022-02-21 8:47 ` Tyrone Ting 2022-03-01 19:45 ` Wolfram Sang 2022-03-01 19:45 ` Wolfram Sang 2022-03-02 12:53 ` Tyrone Ting
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=20220220035321.3870-7-warp5tw@gmail.com \ --to=warp5tw@gmail.com \ --cc=Avi.Fishman@nuvoton.com \ --cc=JJLIU0@nuvoton.com \ --cc=KWLIU@nuvoton.com \ --cc=andriy.shevchenko@linux.intel.com \ --cc=arnd@arndb.de \ --cc=avifishman70@gmail.com \ --cc=bence98@sch.bme.hu \ --cc=benjaminfair@google.com \ --cc=christophe.leroy@csgroup.eu \ --cc=devicetree@vger.kernel.org \ --cc=digetx@gmail.com \ --cc=jie.deng@intel.com \ --cc=kfting@nuvoton.com \ --cc=krzysztof.kozlowski@canonical.com \ --cc=linux-i2c@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=lukas.bulwahn@gmail.com \ --cc=olof@lixom.net \ --cc=openbmc@lists.ozlabs.org \ --cc=robh+dt@kernel.org \ --cc=semen.protsenko@linaro.org \ --cc=sven@svenpeter.dev \ --cc=tali.perry1@gmail.com \ --cc=tali.perry@nuvoton.com \ --cc=tmaimon77@gmail.com \ --cc=tomer.maimon@nuvoton.com \ --cc=venture@google.com \ --cc=wsa@kernel.org \ --cc=yangyicong@hisilicon.com \ --cc=yuenn@google.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.