mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 15:18:19 +00:00
i3c: master: svc: return actual transfer data len
[ Upstream commit6d1a19d34e
] I3C allow devices early terminate data transfer. So set "actual_len" to indicate how much data get by i3c_priv_xfer. Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com> Signed-off-by: Frank Li <Frank.Li@nxp.com> Link: https://lore.kernel.org/r/20231201222532.2431484-6-Frank.Li@nxp.com Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Stable-dep-of:7f3d633b46
("i3c: master: svc: change ENXIO to EAGAIN when IBI occurs during start frame") Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
46fb7121fc
commit
3dc730aa1b
1 changed files with 8 additions and 0 deletions
|
@ -135,6 +135,7 @@ struct svc_i3c_cmd {
|
|||
const void *out;
|
||||
unsigned int len;
|
||||
unsigned int actual_len;
|
||||
struct i3c_priv_xfer *xfer;
|
||||
bool continued;
|
||||
};
|
||||
|
||||
|
@ -1047,6 +1048,7 @@ static int svc_i3c_master_xfer(struct svc_i3c_master *master,
|
|||
|
||||
if (readl(master->regs + SVC_I3C_MERRWARN) & SVC_I3C_MERRWARN_NACK) {
|
||||
ret = -ENXIO;
|
||||
*actual_len = 0;
|
||||
goto emit_stop;
|
||||
}
|
||||
|
||||
|
@ -1064,6 +1066,7 @@ static int svc_i3c_master_xfer(struct svc_i3c_master *master,
|
|||
*/
|
||||
if (SVC_I3C_MSTATUS_IBIWON(reg)) {
|
||||
ret = -ENXIO;
|
||||
*actual_len = 0;
|
||||
goto emit_stop;
|
||||
}
|
||||
|
||||
|
@ -1159,6 +1162,10 @@ 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);
|
||||
/* cmd->xfer is NULL if I2C or CCC transfer */
|
||||
if (cmd->xfer)
|
||||
cmd->xfer->actual_len = cmd->actual_len;
|
||||
|
||||
if (ret)
|
||||
break;
|
||||
}
|
||||
|
@ -1346,6 +1353,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;
|
||||
|
|
Loading…
Reference in a new issue