From: Kimriver Liu <kimriver.liu@siengine.com>
To: <jarkko.nikula@linux.intel.com>
Cc: <andriy.shevchenko@linux.intel.com>,
<mika.westerberg@linux.intel.com>, <jsd@semihalf.com>,
<andi.shyti@kernel.org>, <linux-i2c@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <kimriver.liu@siengine.com>
Subject: [PATCH] i2c: designware: fix master is holding SCL low while ENABLE bit is disabled
Date: Fri, 6 Sep 2024 14:54:49 +0800 [thread overview]
Message-ID: <20240906065449.2897-1-kimriver.liu@siengine.com> (raw)
It was observed issuing ABORT bit(IC_ENABLE[1]) will not work when
IC_ENABLE is already disabled.
Check if ENABLE bit(IC_ENABLE[0]) is disabled when the master is
holding SCL low. If ENABLE bit is disabled, the software need
enable it before trying to issue ABORT bit. otherwise,
the controller ignores any write to ABORT bit.
Signed-off-by: Kimriver Liu <kimriver.liu@siengine.com>
---
V4->V5: delete master idling checking
V3->V4:
1. update commit messages and add patch version and changelog
2. move print the error message in i2c_dw_xfer
V2->V3: change (!enable) to (!(enable & DW_IC_ENABLE_ENABLE))
V1->V2: used standard words in function names and addressed review comments
link to V1:
https://lore.kernel.org/lkml/20240904064224.2394-1-kimriver.liu@siengine.com/
---
drivers/i2c/busses/i2c-designware-common.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/drivers/i2c/busses/i2c-designware-common.c b/drivers/i2c/busses/i2c-designware-common.c
index e8a688d04aee..2b3398cd4382 100644
--- a/drivers/i2c/busses/i2c-designware-common.c
+++ b/drivers/i2c/busses/i2c-designware-common.c
@@ -453,6 +453,17 @@ void __i2c_dw_disable(struct dw_i2c_dev *dev)
abort_needed = raw_intr_stats & DW_IC_INTR_MST_ON_HOLD;
if (abort_needed) {
+ if (!(enable & DW_IC_ENABLE_ENABLE)) {
+ regmap_write(dev->map, DW_IC_ENABLE, DW_IC_ENABLE_ENABLE);
+ enable |= DW_IC_ENABLE_ENABLE;
+ /*
+ * Wait two ic_clk delay when enabling the I2C to ensure ENABLE bit
+ * is already set by the driver (for 400KHz this is 25us)
+ * as described in the DesignWare I2C databook.
+ */
+ fsleep(25);
+ }
+
regmap_write(dev->map, DW_IC_ENABLE, enable | DW_IC_ENABLE_ABORT);
ret = regmap_read_poll_timeout(dev->map, DW_IC_ENABLE, enable,
!(enable & DW_IC_ENABLE_ABORT), 10,
--
2.17.1
next reply other threads:[~2024-09-06 6:57 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-06 6:54 Kimriver Liu [this message]
2024-09-06 7:05 ` [PATCH] i2c: designware: fix master is holding SCL low while ENABLE bit is disabled Mika Westerberg
2024-09-06 11:50 ` Andy Shevchenko
-- strict thread matches above, loose matches on Subject: below --
2024-09-06 7:47 Kimriver Liu
2024-09-06 8:07 ` Mika Westerberg
2024-09-06 11:52 ` Andy Shevchenko
2024-09-06 16:03 ` Andi Shyti
2024-09-06 21:34 ` Andi Shyti
2024-09-08 2:56 ` Liu Kimriver/刘金河
2024-09-06 5:42 Kimriver Liu
2024-09-06 6:16 ` Mika Westerberg
2024-09-06 11:47 ` Andy Shevchenko
2024-09-08 2:12 ` Liu Kimriver/刘金河
2024-09-05 7:42 kimriver liu
2024-09-05 11:03 ` Andy Shevchenko
2024-09-08 13:31 ` kernel test robot
2024-09-09 1:31 ` Liu Kimriver/刘金河
2024-09-09 6:50 ` Liu Kimriver/刘金河
2024-09-05 5:57 kimriver liu
2024-09-05 11:00 ` Andy Shevchenko
2024-09-04 6:42 kimriver liu
2024-09-04 12:55 ` Andy Shevchenko
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=20240906065449.2897-1-kimriver.liu@siengine.com \
--to=kimriver.liu@siengine.com \
--cc=andi.shyti@kernel.org \
--cc=andriy.shevchenko@linux.intel.com \
--cc=jarkko.nikula@linux.intel.com \
--cc=jsd@semihalf.com \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mika.westerberg@linux.intel.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: 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).