Skip to content

Commit 6188593

Browse files
nxpfrankligregkh
authored andcommitted
i3c: master: svc: fix probe failure when no i3c device exist
commit 6e13d65 upstream. I3C masters are expected to support hot-join. This means at initialization time we might not yet discover any device and this should not be treated as a fatal error. During the DAA procedure which happens at probe time, if no device has joined, all CCC will be NACKed (from a bus perspective). This leads to an early return with an error code which fails the probe of the master. Let's avoid this by just telling the core through an I3C_ERROR_M2 return command code that no device was discovered, which is a valid situation. This way the master will no longer bail out and fail to probe for a wrong reason. Cc: [email protected] Fixes: dd3c528 ("i3c: master: svc: Add Silvaco I3C master driver") Signed-off-by: Frank Li <[email protected]> Acked-by: Miquel Raynal <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Alexandre Belloni <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 9b44580 commit 6188593

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

drivers/i3c/master/svc-i3c-master.c

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -782,6 +782,10 @@ static int svc_i3c_master_do_daa_locked(struct svc_i3c_master *master,
782782
*/
783783
break;
784784
} else if (SVC_I3C_MSTATUS_NACKED(reg)) {
785+
/* No I3C devices attached */
786+
if (dev_nb == 0)
787+
break;
788+
785789
/*
786790
* A slave device nacked the address, this is
787791
* allowed only once, DAA will be stopped and
@@ -1251,11 +1255,17 @@ static int svc_i3c_master_send_ccc_cmd(struct i3c_master_controller *m,
12511255
{
12521256
struct svc_i3c_master *master = to_svc_i3c_master(m);
12531257
bool broadcast = cmd->id < 0x80;
1258+
int ret;
12541259

12551260
if (broadcast)
1256-
return svc_i3c_master_send_bdcast_ccc_cmd(master, cmd);
1261+
ret = svc_i3c_master_send_bdcast_ccc_cmd(master, cmd);
12571262
else
1258-
return svc_i3c_master_send_direct_ccc_cmd(master, cmd);
1263+
ret = svc_i3c_master_send_direct_ccc_cmd(master, cmd);
1264+
1265+
if (ret)
1266+
cmd->err = I3C_ERROR_M2;
1267+
1268+
return ret;
12591269
}
12601270

12611271
static int svc_i3c_master_priv_xfers(struct i3c_dev_desc *dev,

0 commit comments

Comments
 (0)