imx.lists.linux.dev archive mirror
 help / color / mirror / Atom feed
From: Frank Li <Frank.Li@nxp.com>
To: miquel.raynal@bootlin.com
Cc: Frank.Li@nxp.com, alexandre.belloni@bootlin.com,
	conor.culhane@silvaco.com, imx@lists.linux.dev,
	linux-i3c@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: [RFC PATCH 3/9] i3c: master: svc return actual transfer data len
Date: Tue,  5 Sep 2023 17:38:36 -0400	[thread overview]
Message-ID: <20230905213842.3035779-4-Frank.Li@nxp.com> (raw)
In-Reply-To: <20230905213842.3035779-1-Frank.Li@nxp.com>

I3C allow devices early terminate data transfer. So set "actual" to
indicate how much data get by i3c_priv_xfer.

Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
 drivers/i3c/master/svc-i3c-master.c | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/drivers/i3c/master/svc-i3c-master.c b/drivers/i3c/master/svc-i3c-master.c
index 14185ee7dd19b..74c4ce8789daf 100644
--- a/drivers/i3c/master/svc-i3c-master.c
+++ b/drivers/i3c/master/svc-i3c-master.c
@@ -134,6 +134,7 @@ struct svc_i3c_cmd {
 	const void *out;
 	unsigned int len;
 	unsigned int actual_len;
+	struct i3c_priv_xfer *xfer;
 	bool continued;
 };
 
@@ -972,12 +973,14 @@ static int svc_i3c_master_read(struct svc_i3c_master *master,
 }
 
 static int svc_i3c_master_write(struct svc_i3c_master *master,
-				const u8 *out, unsigned int len)
+				const u8 *out, unsigned int len, unsigned int *actual)
 {
-	int offset = 0, ret;
+	int ret;
 	u32 mdctrl;
 
-	while (offset < len) {
+	*actual = 0;
+
+	while (*actual < len) {
 		ret = readl_poll_timeout(master->regs + SVC_I3C_MDATACTRL,
 					 mdctrl,
 					 !(mdctrl & SVC_I3C_MDATACTRL_TXFULL),
@@ -989,10 +992,10 @@ static int svc_i3c_master_write(struct svc_i3c_master *master,
 		 * The last byte to be sent over the bus must either have the
 		 * "end" bit set or be written in MWDATABE.
 		 */
-		if (likely(offset < (len - 1)))
-			writel(out[offset++], master->regs + SVC_I3C_MWDATAB);
+		if (likely(*actual < (len - 1)))
+			writel(out[(*actual)++], master->regs + SVC_I3C_MWDATAB);
 		else
-			writel(out[offset++], master->regs + SVC_I3C_MWDATABE);
+			writel(out[(*actual)++], master->regs + SVC_I3C_MWDATABE);
 	}
 
 	return 0;
@@ -1027,7 +1030,8 @@ static int svc_i3c_master_xfer(struct svc_i3c_master *master,
 	if (rnw)
 		ret = svc_i3c_master_read(master, in, xfer_len);
 	else
-		ret = svc_i3c_master_write(master, out, xfer_len);
+		ret = svc_i3c_master_write(master, out, xfer_len, actual_len);
+
 	if (ret < 0)
 		goto emit_stop;
 
@@ -1047,6 +1051,10 @@ static int svc_i3c_master_xfer(struct svc_i3c_master *master,
 		/* Wait idle if stop is sent. */
 		readl_poll_timeout(master->regs + SVC_I3C_MSTATUS, reg,
 				   SVC_I3C_MSTATUS_STATE_IDLE(reg), 0, 1000);
+
+		if (!rnw)
+			*actual_len -= SVC_I3C_MDATACTRL_RXCOUNT(
+							readl(master->regs + SVC_I3C_MDATACTRL));
 	}
 
 	return 0;
@@ -1116,6 +1124,9 @@ static void svc_i3c_master_start_xfer_locked(struct svc_i3c_master *master)
 					  cmd->addr, cmd->in, cmd->out,
 					  cmd->len, &cmd->actual_len,
 					  cmd->continued);
+		if (cmd->xfer)
+			cmd->xfer->actual = cmd->actual_len;
+
 		if (ret)
 			break;
 	}
@@ -1299,6 +1310,7 @@ static int svc_i3c_master_priv_xfers(struct i3c_dev_desc *dev,
 	for (i = 0; i < nxfers; i++) {
 		struct svc_i3c_cmd *cmd = &xfer->cmds[i];
 
+		cmd->xfer = xfers + i;
 		cmd->addr = master->addrs[data->index];
 		cmd->rnw = xfers[i].rnw;
 		cmd->in = xfers[i].rnw ? xfers[i].data.in : NULL;
-- 
2.34.1


  parent reply	other threads:[~2023-09-05 21:39 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-05 21:38 [RFC PATCH 0/9] I3C Slave Mode support Frank Li
2023-09-05 21:38 ` [RFC PATCH 1/9] i3c: add actual in i3c_priv_xfer Frank Li
2023-09-05 21:38 ` [RFC PATCH 2/9] i3c: svc: rename read_len as actual_len Frank Li
2023-09-05 21:38 ` Frank Li [this message]
2023-09-05 21:38 ` [RFC PATCH 4/9] dt-bindings: i3c: svc: add compatible string i3c: silvaco,i3c-slave-v1 Frank Li
2023-09-06  8:01   ` Krzysztof Kozlowski
2023-09-07 14:28     ` Frank Li
2023-09-13 15:49       ` Krzysztof Kozlowski
2023-09-05 21:38 ` [RFC PATCH 5/9] i3c: add slave mode support Frank Li
2023-09-11 11:14   ` Joshua Yeong
2023-09-11 22:17     ` Frank Li
2023-09-05 21:38 ` [RFC PATCH 6/9] i3c: slave: add svc slave controller support Frank Li
2023-09-05 21:38 ` [RFC PATCH 7/9] i3c: slave: func: add tty driver Frank Li
2023-09-05 21:38 ` [RFC PATCH 8/9] tty: serial: add tty over I3C master side driver Frank Li
2023-09-06  8:02   ` Krzysztof Kozlowski
2023-09-05 21:38 ` [RFC PATCH 9/9] Documentation: i3c: Add I3C slave mode controller and function Frank Li

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=20230905213842.3035779-4-Frank.Li@nxp.com \
    --to=frank.li@nxp.com \
    --cc=alexandre.belloni@bootlin.com \
    --cc=conor.culhane@silvaco.com \
    --cc=imx@lists.linux.dev \
    --cc=linux-i3c@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=miquel.raynal@bootlin.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).