xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i2c: npcm: Fix timeout calculation

Browse Source 
[ Upstream commit 288b204492fddf28889cea6dc95a23976632c7a0 ]

Use adap.timeout for timeout calculation instead of hard-coded
value of 35ms.

Fixes: 56a1485b10 ("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>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Tali Perry
2022-05-17 18:11:36 +08:00
committed by Greg Kroah-Hartman
parent de6f6b5400
commit 06cb0f056b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/i2c/busses/i2c-npcm7xx.c
View File

@@ -2047,7 +2047,7 @@ static int npcm_i2c_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs,
u16 nwrite, nread; u16 nwrite, nread;
u8 *write_data, *read_data; u8 *write_data, *read_data;
u8 slave_addr; u8 slave_addr;
int timeout; unsigned long timeout;
int ret = 0; int ret = 0;
bool read_block = false; bool read_block = false;
bool read_PEC = 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) * 9: bits per transaction (including the ack/nack)
*/ */
timeout_usec = (2 * 9 * USEC_PER_SEC / bus->bus_freq) * (2 + nread + nwrite); 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) { if (nwrite >= 32 * 1024 || nread >= 32 * 1024) {
dev_err(bus->dev, "i2c%d buffer too big\n", bus->num); dev_err(bus->dev, "i2c%d buffer too big\n", bus->num);
return -EINVAL; return -EINVAL;
} }
time_left = jiffies + msecs_to_jiffies(DEFAULT_STALL_COUNT) + 1; time_left = jiffies + timeout + 1;
do { do {
/* /*
* we must clear slave address immediately when the bus is not * we must clear slave address immediately when the bus is not
@@ -2269,7 +2269,7 @@ static int npcm_i2c_probe_bus(struct platform_device *pdev)
adap = &bus->adap; adap = &bus->adap;
adap->owner = THIS_MODULE; adap->owner = THIS_MODULE;
adap->retries = 3; adap->retries = 3;
adap->timeout = HZ; adap->timeout = msecs_to_jiffies(35);
adap->algo = &npcm_i2c_algo; adap->algo = &npcm_i2c_algo;
adap->quirks = &npcm_i2c_quirks; adap->quirks = &npcm_i2c_quirks;
adap->algo_data = bus; adap->algo_data = bus;