Skip to content

Commit 6e13d65

Browse files
nxpfranklialexandrebelloni
authored andcommitted
i3c: master: svc: fix probe failure when no i3c device exist
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: stable@vger.kernel.org Fixes: dd3c528 ("i3c: master: svc: Add Silvaco I3C master driver") Signed-off-by: Frank Li <Frank.Li@nxp.com> Acked-by: Miquel Raynal <miquel.raynal@bootlin.com> Link: https://lore.kernel.org/r/20230831141324.2841525-1-Frank.Li@nxp.com Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
1 parent c6a7550 commit 6e13d65

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
@@ -790,6 +790,10 @@ static int svc_i3c_master_do_daa_locked(struct svc_i3c_master *master,
790790
*/
791791
break;
792792
} else if (SVC_I3C_MSTATUS_NACKED(reg)) {
793+
/* No I3C devices attached */
794+
if (dev_nb == 0)
795+
break;
796+
793797
/*
794798
* A slave device nacked the address, this is
795799
* allowed only once, DAA will be stopped and
@@ -1264,11 +1268,17 @@ static int svc_i3c_master_send_ccc_cmd(struct i3c_master_controller *m,
12641268
{
12651269
struct svc_i3c_master *master = to_svc_i3c_master(m);
12661270
bool broadcast = cmd->id < 0x80;
1271+
int ret;
12671272

12681273
if (broadcast)
1269-
return svc_i3c_master_send_bdcast_ccc_cmd(master, cmd);
1274+
ret = svc_i3c_master_send_bdcast_ccc_cmd(master, cmd);
12701275
else
1271-
return svc_i3c_master_send_direct_ccc_cmd(master, cmd);
1276+
ret = svc_i3c_master_send_direct_ccc_cmd(master, cmd);
1277+
1278+
if (ret)
1279+
cmd->err = I3C_ERROR_M2;
1280+
1281+
return ret;
12721282
}
12731283

12741284
static int svc_i3c_master_priv_xfers(struct i3c_dev_desc *dev,

0 commit comments

Comments
 (0)