From: Eddie James <eajames@linux.ibm.com>
To: linux-fsi@lists.ozlabs.org
Cc: eajames@linux.ibm.com, linux-kernel@vger.kernel.org,
linux-i2c@vger.kernel.org, linux-spi@vger.kernel.org,
broonie@kernel.org, andi.shyti@kernel.org, joel@jms.id.au,
alistair@popple.id.au, jk@ozlabs.org,
andrew@codeconstruct.com.au, linux-aspeed@lists.ozlabs.org,
ninad@linux.ibm.com, lakshmiy@us.ibm.com
Subject: [PATCH v4 30/40] i2c: fsi: Define a function to check status error bits
Date: Wed, 5 Jun 2024 16:23:02 -0500 [thread overview]
Message-ID: <20240605212312.349188-31-eajames@linux.ibm.com> (raw)
In-Reply-To: <20240605212312.349188-1-eajames@linux.ibm.com>
This will be used more than once with interrupt support, so split
the error bit checks into a function.
Signed-off-by: Eddie James <eajames@linux.ibm.com>
---
drivers/i2c/busses/i2c-fsi.c | 38 ++++++++++++++++++++----------------
1 file changed, 21 insertions(+), 17 deletions(-)
diff --git a/drivers/i2c/busses/i2c-fsi.c b/drivers/i2c/busses/i2c-fsi.c
index f3b97bf88d0f9..022f1287aa0e3 100644
--- a/drivers/i2c/busses/i2c-fsi.c
+++ b/drivers/i2c/busses/i2c-fsi.c
@@ -507,6 +507,26 @@ static int fsi_i2c_abort(struct fsi_i2c_port *port, u32 status)
return -ETIMEDOUT;
}
+static int fsi_i2c_error_status_to_rc(u32 status)
+{
+ if (status & I2C_STAT_INV_CMD)
+ return -EINVAL;
+
+ if (status & (I2C_STAT_PARITY | I2C_STAT_BE_OVERRUN | I2C_STAT_BE_ACCESS))
+ return -EPROTO;
+
+ if (status & I2C_STAT_NACK)
+ return -ENXIO;
+
+ if (status & I2C_STAT_LOST_ARB)
+ return -EAGAIN;
+
+ if (status & I2C_STAT_STOP_ERR)
+ return -EBADMSG;
+
+ return -EIO;
+}
+
static int fsi_i2c_handle_status(struct fsi_i2c_port *port,
struct i2c_msg *msg, u32 status)
{
@@ -518,23 +538,7 @@ static int fsi_i2c_handle_status(struct fsi_i2c_port *port,
if (rc)
return rc;
- if (status & I2C_STAT_INV_CMD)
- return -EINVAL;
-
- if (status & (I2C_STAT_PARITY | I2C_STAT_BE_OVERRUN |
- I2C_STAT_BE_ACCESS))
- return -EPROTO;
-
- if (status & I2C_STAT_NACK)
- return -ENXIO;
-
- if (status & I2C_STAT_LOST_ARB)
- return -EAGAIN;
-
- if (status & I2C_STAT_STOP_ERR)
- return -EBADMSG;
-
- return -EIO;
+ return fsi_i2c_error_status_to_rc(status);
}
if (status & I2C_STAT_DAT_REQ) {
--
2.39.3
next prev parent reply other threads:[~2024-06-05 21:23 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-05 21:22 [PATCH v4 00/40] fsi: Add interrupt support Eddie James
2024-06-05 21:22 ` [PATCH v4 01/40] fsi: hub: Set master index to link number plus one Eddie James
2024-06-05 21:22 ` [PATCH v4 02/40] fsi: Move slave definitions to fsi-slave.h Eddie James
2024-06-05 21:22 ` [PATCH v4 03/40] fsi: Fix slave addressing after break command Eddie James
2024-06-05 21:22 ` [PATCH v4 04/40] fsi: Use a defined value for default echo delay Eddie James
2024-06-05 21:22 ` [PATCH v4 05/40] fsi: Calculate local bus clock frequency Eddie James
2024-06-05 21:22 ` [PATCH v4 06/40] fsi: core: Improve master read/write/error traces Eddie James
2024-06-05 21:22 ` [PATCH v4 07/40] fsi: core: Add slave error trace Eddie James
2024-06-05 21:22 ` [PATCH v4 08/40] fsi: core: Reset errors instead of clearing interrupts Eddie James
2024-06-05 21:22 ` [PATCH v4 09/40] fsi: aspeed: Add AST2700 support Eddie James
2024-06-05 21:22 ` [PATCH v4 10/40] fsi: core: Add slave spinlock Eddie James
2024-06-05 21:22 ` [PATCH v4 11/40] fsi: core: Allow cfam device type aliases Eddie James
2024-06-05 21:22 ` [PATCH v4 12/40] fsi: core: Add common regmap master functions Eddie James
2024-06-05 21:22 ` [PATCH v4 13/40] fsi: core: Disable relative addressing during scan Eddie James
2024-06-05 21:22 ` [PATCH v4 14/40] fsi: hub: Use common initialization and link enable Eddie James
2024-06-05 21:22 ` [PATCH v4 15/40] fsi: aspeed: " Eddie James
2024-06-05 21:22 ` [PATCH v4 16/40] fsi: aspeed: Remove cfam reset sysfs file in error path and remove Eddie James
2024-06-05 21:22 ` [PATCH v4 17/40] fsi: aspeed: Refactor trace functions Eddie James
2024-06-05 21:22 ` [PATCH v4 18/40] fsi: aspeed: Don't clear all IRQs during OPB transfers Eddie James
2024-06-05 21:22 ` [PATCH v4 19/40] fsi: aspeed: Only read result register for successful read Eddie James
2024-06-05 21:22 ` [PATCH v4 20/40] fsi: aspeed: Switch to spinlock Eddie James
2024-06-05 21:22 ` [PATCH v4 21/40] fsi: aspeed: Disable relative addressing and IPOLL for cfam reset Eddie James
2024-06-05 21:22 ` [PATCH v4 22/40] fsi: aspeed: Use common master error handler Eddie James
2024-06-05 21:22 ` [PATCH v4 23/40] fsi: core: Add interrupt support Eddie James
2024-06-05 21:22 ` [PATCH v4 24/40] fsi: aspeed: " Eddie James
2024-06-05 21:22 ` [PATCH v4 25/40] fsi: hub: " Eddie James
2024-06-05 21:22 ` [PATCH v4 26/40] i2c: fsi: Calculate clock divider from local bus frequency Eddie James
2024-06-05 21:22 ` [PATCH v4 27/40] i2c: fsi: Improve formatting Eddie James
2024-06-05 21:23 ` [PATCH v4 28/40] i2c: fsi: Change fsi_i2c_write_reg to accept data instead of a pointer Eddie James
2024-06-05 21:23 ` [PATCH v4 29/40] i2c: fsi: Remove list structure of ports Eddie James
2024-06-05 21:23 ` Eddie James [this message]
2024-06-05 21:23 ` [PATCH v4 31/40] i2c: fsi: Add boolean for skip stop command on abort Eddie James
2024-06-05 21:23 ` [PATCH v4 32/40] i2c: fsi: Add interrupt support Eddie James
2024-06-05 21:23 ` [PATCH v4 33/40] fsi: hub master: Reset hub master after errors Eddie James
2024-06-05 21:23 ` [PATCH v4 34/40] fsi: core: Add master register read-only sysfs Eddie James
2024-06-05 21:23 ` [PATCH v4 35/40] fsi: core: Add slave " Eddie James
2024-06-05 21:23 ` [PATCH v4 36/40] fsi: i2cr: Adjust virtual CFAM ID to match Odyssey chip Eddie James
2024-06-05 21:23 ` [PATCH v4 37/40] fsi: core: Add different types of CFAM Eddie James
2024-06-05 21:23 ` [PATCH v4 38/40] spi: fsi: Calculate clock divider from local bus frequency Eddie James
2024-06-05 21:23 ` [PATCH v4 39/40] ARM: dts: aspeed: P10 and tacoma: Set FSI clock frequency Eddie James
2024-06-05 21:23 ` [PATCH v4 40/40] ARM: dts: aspeed: P10: Bump SPI max frequencies Eddie James
2024-06-06 1:02 ` [PATCH v4 00/40] fsi: Add interrupt support Andrew Jeffery
2024-07-01 15:29 ` Eddie James
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=20240605212312.349188-31-eajames@linux.ibm.com \
--to=eajames@linux.ibm.com \
--cc=alistair@popple.id.au \
--cc=andi.shyti@kernel.org \
--cc=andrew@codeconstruct.com.au \
--cc=broonie@kernel.org \
--cc=jk@ozlabs.org \
--cc=joel@jms.id.au \
--cc=lakshmiy@us.ibm.com \
--cc=linux-aspeed@lists.ozlabs.org \
--cc=linux-fsi@lists.ozlabs.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=ninad@linux.ibm.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