From: Piyush Malgujar <pmalgujar@marvell.com>
To: <linux-i2c@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<wsa@kernel.org>, <rric@kernel.org>
Cc: <jannadurai@marvell.com>, <cchavva@marvell.com>,
Suneel Garapati <sgarapati@marvell.com>,
Piyush Malgujar <pmalgujar@marvell.com>
Subject: [PATCH 3/3] i2c: octeon: Handle watchdog timeout
Date: Thu, 30 Mar 2023 06:39:53 -0700 [thread overview]
Message-ID: <20230330133953.21074-4-pmalgujar@marvell.com> (raw)
In-Reply-To: <20230330133953.21074-1-pmalgujar@marvell.com>
From: Suneel Garapati <sgarapati@marvell.com>
Status code 0xF0 refers to expiry of TWSI controller
access watchdog and needs bus monitor reset using MODE
register.
Signed-off-by: Suneel Garapati <sgarapati@marvell.com>
Signed-off-by: Piyush Malgujar <pmalgujar@marvell.com>
---
drivers/i2c/busses/i2c-octeon-core.c | 8 ++++++++
drivers/i2c/busses/i2c-octeon-core.h | 1 +
2 files changed, 9 insertions(+)
diff --git a/drivers/i2c/busses/i2c-octeon-core.c b/drivers/i2c/busses/i2c-octeon-core.c
index 7c49dc8ccbd2ef05fec675d282193b98f2b69835..3482db7165f243232937e0af148fe996858e9f2e 100644
--- a/drivers/i2c/busses/i2c-octeon-core.c
+++ b/drivers/i2c/busses/i2c-octeon-core.c
@@ -187,6 +187,7 @@ static int octeon_i2c_hlc_wait(struct octeon_i2c *i2c)
static int octeon_i2c_check_status(struct octeon_i2c *i2c, int final_read)
{
u8 stat;
+ u64 mode;
/*
* This is ugly... in HLC mode the status is not in the status register
@@ -249,6 +250,13 @@ static int octeon_i2c_check_status(struct octeon_i2c *i2c, int final_read)
case STAT_RXADDR_NAK:
case STAT_AD2W_NAK:
return -ENXIO;
+
+ case STAT_WDOG_TOUT:
+ mode = __raw_readq(i2c->twsi_base + MODE(i2c));
+ /* Set BUS_MON_RST to reset bus monitor */
+ mode |= BIT(3);
+ octeon_i2c_writeq_flush(mode, i2c->twsi_base + MODE(i2c));
+ return -EIO;
default:
dev_err(i2c->dev, "unhandled state: %d\n", stat);
return -EIO;
diff --git a/drivers/i2c/busses/i2c-octeon-core.h b/drivers/i2c/busses/i2c-octeon-core.h
index 89d7d3bb8e30bd5787978d17d5a9b20ab0d41e22..a8d1bf9e89b8b0d21f52ff9f77f0ecf5263b5843 100644
--- a/drivers/i2c/busses/i2c-octeon-core.h
+++ b/drivers/i2c/busses/i2c-octeon-core.h
@@ -72,6 +72,7 @@
#define STAT_SLAVE_ACK 0xC8
#define STAT_AD2W_ACK 0xD0
#define STAT_AD2W_NAK 0xD8
+#define STAT_WDOG_TOUT 0xF0
#define STAT_IDLE 0xF8
/* TWSI_INT values */
--
2.17.1
next prev parent reply other threads:[~2023-03-30 13:43 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-30 13:39 [PATCH 0/3] i2c: thunderx: Marvell thunderx i2c changes Piyush Malgujar
2023-03-30 13:39 ` [PATCH 1/3] i2c: thunderx: Clock divisor logic changes Piyush Malgujar
2023-06-10 12:29 ` Andi Shyti
2023-03-30 13:39 ` [PATCH 2/3] i2c: thunderx: Add support for High speed mode Piyush Malgujar
2023-03-30 15:46 ` kernel test robot
2023-03-30 17:39 ` kernel test robot
2023-06-10 12:42 ` Andi Shyti
2023-03-30 13:39 ` Piyush Malgujar [this message]
2023-06-10 13:24 ` [PATCH 3/3] i2c: octeon: Handle watchdog timeout Andi Shyti
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=20230330133953.21074-4-pmalgujar@marvell.com \
--to=pmalgujar@marvell.com \
--cc=cchavva@marvell.com \
--cc=jannadurai@marvell.com \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rric@kernel.org \
--cc=sgarapati@marvell.com \
--cc=wsa@kernel.org \
/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