Commit fc79b955 authored by Marek Szyprowski's avatar Marek Szyprowski Committed by sanglipeng1
Browse files

i2c: s3c24xx: fix transferring more than one message in polling mode 

stable inclusion
from stable-v5.10.209
commit 2e23761beb90f6c20b20d5ce22556876584d26d2
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I9U3NW

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=2e23761beb90f6c20b20d5ce22556876584d26d2



--------------------------------

[ Upstream commit 990489e1042c6c5d6bccf56deca68f8dbeed8180 ]

To properly handle ACK on the bus when transferring more than one
message in polling mode, move the polling handling loop from
s3c24xx_i2c_message_start() to s3c24xx_i2c_doxfer(). This way
i2c_s3c_irq_nextbyte() is always executed till the end, properly
acknowledging the IRQ bits and no recursive calls to
i2c_s3c_irq_nextbyte() are made.

While touching this, also fix finishing transfers in polling mode by
using common code path and always waiting for the bus to become idle
and disabled.

Fixes: 117053f7 ("i2c: s3c2410: Add polling mode support")
Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: default avatarAndi Shyti <andi.shyti@kernel.org>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarsanglipeng1 <sanglipeng1@jd.com>
parent cbfe9d56

drivers/i2c/busses/i2c-s3c2410.c

+10 −17
Original line number Diff line number Diff line
@@ -286,16 +286,6 @@ static void s3c24xx_i2c_message_start(struct s3c24xx_i2c *i2c, 


	stat |= S3C2410_IICSTAT_START;

	writel(stat, i2c->regs + S3C2410_IICSTAT);



	if (i2c->quirks & QUIRK_POLL) {

		while ((i2c->msg_num != 0) && is_ack(i2c)) {

			i2c_s3c_irq_nextbyte(i2c, stat);

			stat = readl(i2c->regs + S3C2410_IICSTAT);



			if (stat & S3C2410_IICSTAT_ARBITR)

				dev_err(i2c->dev, "deal with arbitration loss\n");

		}

	}

}



static inline void s3c24xx_i2c_stop(struct s3c24xx_i2c *i2c, int ret)
@@ -702,7 +692,7 @@ static void s3c24xx_i2c_wait_idle(struct s3c24xx_i2c *i2c) 
static int s3c24xx_i2c_doxfer(struct s3c24xx_i2c *i2c,

			      struct i2c_msg *msgs, int num)

{

	unsigned long timeout;

	unsigned long timeout = 0;

	int ret;



	ret = s3c24xx_i2c_set_master(i2c);
@@ -722,15 +712,18 @@ static int s3c24xx_i2c_doxfer(struct s3c24xx_i2c *i2c, 
	s3c24xx_i2c_message_start(i2c, msgs);



	if (i2c->quirks & QUIRK_POLL) {

		ret = i2c->msg_idx;

		while ((i2c->msg_num != 0) && is_ack(i2c)) {

			unsigned long stat = readl(i2c->regs + S3C2410_IICSTAT);



		if (ret != num)

			dev_dbg(i2c->dev, "incomplete xfer (%d)\n", ret);

			i2c_s3c_irq_nextbyte(i2c, stat);



		goto out;

			stat = readl(i2c->regs + S3C2410_IICSTAT);

			if (stat & S3C2410_IICSTAT_ARBITR)

				dev_err(i2c->dev, "deal with arbitration loss\n");

		}



	} else {

		timeout = wait_event_timeout(i2c->wait, i2c->msg_num == 0, HZ * 5);

	}



	ret = i2c->msg_idx;