From: Sven Peter via B4 Relay <devnull+sven.svenpeter.dev@kernel.org>
To: Janne Grunau <j@jannau.net>,
Alyssa Rosenzweig <alyssa@rosenzweig.io>,
Madhavan Srinivasan <maddy@linux.ibm.com>,
Michael Ellerman <mpe@ellerman.id.au>,
Nicholas Piggin <npiggin@gmail.com>,
Christophe Leroy <christophe.leroy@csgroup.eu>,
Naveen N Rao <naveen@kernel.org>,
Andi Shyti <andi.shyti@kernel.org>
Cc: linuxppc-dev@lists.ozlabs.org, asahi@lists.linux.dev,
linux-arm-kernel@lists.infradead.org, linux-i2c@vger.kernel.org,
linux-kernel@vger.kernel.org, Sven Peter <sven@svenpeter.dev>,
Hector Martin <marcan@marcan.st>
Subject: [PATCH 3/4] i2c: pasemi: Enable the unjam machine
Date: Sat, 22 Feb 2025 13:38:35 +0000 [thread overview]
Message-ID: <20250222-pasemi-fixes-v1-3-d7ea33d50c5e@svenpeter.dev> (raw)
In-Reply-To: <20250222-pasemi-fixes-v1-0-d7ea33d50c5e@svenpeter.dev>
From: Hector Martin <marcan@marcan.st>
The I2C bus can get stuck under some conditions (desync between
controller and device). The pasemi controllers include an unjam feature
that is enabled on reset, but was being disabled by the driver. Keep it
enabled by explicitly setting the UJM bit in the CTL register. This
should help recover the bus from certain conditions, which would
otherwise remain stuck forever.
Signed-off-by: Hector Martin <marcan@marcan.st>
Signed-off-by: Sven Peter <sven@svenpeter.dev>
---
drivers/i2c/busses/i2c-pasemi-core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/i2c/busses/i2c-pasemi-core.c b/drivers/i2c/busses/i2c-pasemi-core.c
index 770b86b92a10..8f0ba975172f 100644
--- a/drivers/i2c/busses/i2c-pasemi-core.c
+++ b/drivers/i2c/busses/i2c-pasemi-core.c
@@ -73,7 +73,7 @@ static inline int reg_read(struct pasemi_smbus *smbus, int reg)
static void pasemi_reset(struct pasemi_smbus *smbus)
{
- u32 val = (CTL_MTR | CTL_MRR | (smbus->clk_div & CTL_CLK_M));
+ u32 val = (CTL_MTR | CTL_MRR | CTL_UJM | (smbus->clk_div & CTL_CLK_M));
if (smbus->hw_rev >= 6)
val |= CTL_EN;
--
2.34.1
next prev parent reply other threads:[~2025-02-22 22:46 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-22 13:38 [PATCH 0/4] Apple/PASemi i2c error recovery fixes Sven Peter via B4 Relay
2025-02-22 13:38 ` [PATCH 1/4] i2c: pasemi: Add registers bits and switch to BIT() Sven Peter via B4 Relay
2025-03-20 0:23 ` Andi Shyti
2025-03-22 13:23 ` Andy Shevchenko
2025-03-30 8:50 ` Sven Peter
2025-02-22 13:38 ` [PATCH 2/4] i2c: pasemi: Improve error recovery Sven Peter via B4 Relay
2025-03-20 0:17 ` Andi Shyti
2025-03-22 10:25 ` Sven Peter
2025-02-22 13:38 ` Sven Peter via B4 Relay [this message]
2025-02-22 13:38 ` [PATCH 4/4] i2c: pasemi: Log bus reset causes Sven Peter via B4 Relay
2025-02-24 18:14 ` [PATCH 0/4] Apple/PASemi i2c error recovery fixes Alyssa Rosenzweig
2025-02-24 21:48 ` Neal Gompa
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=20250222-pasemi-fixes-v1-3-d7ea33d50c5e@svenpeter.dev \
--to=devnull+sven.svenpeter.dev@kernel.org \
--cc=alyssa@rosenzweig.io \
--cc=andi.shyti@kernel.org \
--cc=asahi@lists.linux.dev \
--cc=christophe.leroy@csgroup.eu \
--cc=j@jannau.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=maddy@linux.ibm.com \
--cc=marcan@marcan.st \
--cc=mpe@ellerman.id.au \
--cc=naveen@kernel.org \
--cc=npiggin@gmail.com \
--cc=sven@svenpeter.dev \
/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).