* [PATCH v3 1/1] i3c: master: svc: fix probe failure when no i3c device exist
@ 2023-08-31 14:13 ` Frank Li
0 siblings, 0 replies; 6+ messages in thread
From: Frank Li @ 2023-08-31 14:13 UTC (permalink / raw)
To: miquel.raynal
Cc: Frank.li, alexandre.belloni, conor.culhane, imx, linux-i3c, linux-kernel
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: dd3c52846d59 ("i3c: master: svc: Add Silvaco I3C master driver")
Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
Notes:
Change from v3 to v3
- No code change
- Remove patch i3c: master: fixes i3c bus driver probe failure if no i3c
device attached
- After test, only need this patch to fix probe failure because
i3c_master_rstdaa_locked() already correct handle error code.
Change from v1 to v2:
- rewrite commit message
- cc stable
- add empty line in daa()
drivers/i3c/master/svc-i3c-master.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/drivers/i3c/master/svc-i3c-master.c b/drivers/i3c/master/svc-i3c-master.c
index 770b40e28015e..cf932ee056ef9 100644
--- a/drivers/i3c/master/svc-i3c-master.c
+++ b/drivers/i3c/master/svc-i3c-master.c
@@ -789,6 +789,10 @@ static int svc_i3c_master_do_daa_locked(struct svc_i3c_master *master,
*/
break;
} else if (SVC_I3C_MSTATUS_NACKED(reg)) {
+ /* No I3C devices attached */
+ if (dev_nb == 0)
+ break;
+
/*
* A slave device nacked the address, this is
* allowed only once, DAA will be stopped and
@@ -1263,11 +1267,17 @@ static int svc_i3c_master_send_ccc_cmd(struct i3c_master_controller *m,
{
struct svc_i3c_master *master = to_svc_i3c_master(m);
bool broadcast = cmd->id < 0x80;
+ int ret;
if (broadcast)
- return svc_i3c_master_send_bdcast_ccc_cmd(master, cmd);
+ ret = svc_i3c_master_send_bdcast_ccc_cmd(master, cmd);
else
- return svc_i3c_master_send_direct_ccc_cmd(master, cmd);
+ ret = svc_i3c_master_send_direct_ccc_cmd(master, cmd);
+
+ if (ret)
+ cmd->err = I3C_ERROR_M2;
+
+ return ret;
}
static int svc_i3c_master_priv_xfers(struct i3c_dev_desc *dev,
--
2.34.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v3 1/1] i3c: master: svc: fix probe failure when no i3c device exist
@ 2023-08-31 14:13 ` Frank Li
0 siblings, 0 replies; 6+ messages in thread
From: Frank Li @ 2023-08-31 14:13 UTC (permalink / raw)
To: miquel.raynal
Cc: Frank.li, alexandre.belloni, conor.culhane, imx, linux-i3c, linux-kernel
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: dd3c52846d59 ("i3c: master: svc: Add Silvaco I3C master driver")
Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
Notes:
Change from v3 to v3
- No code change
- Remove patch i3c: master: fixes i3c bus driver probe failure if no i3c
device attached
- After test, only need this patch to fix probe failure because
i3c_master_rstdaa_locked() already correct handle error code.
Change from v1 to v2:
- rewrite commit message
- cc stable
- add empty line in daa()
drivers/i3c/master/svc-i3c-master.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/drivers/i3c/master/svc-i3c-master.c b/drivers/i3c/master/svc-i3c-master.c
index 770b40e28015e..cf932ee056ef9 100644
--- a/drivers/i3c/master/svc-i3c-master.c
+++ b/drivers/i3c/master/svc-i3c-master.c
@@ -789,6 +789,10 @@ static int svc_i3c_master_do_daa_locked(struct svc_i3c_master *master,
*/
break;
} else if (SVC_I3C_MSTATUS_NACKED(reg)) {
+ /* No I3C devices attached */
+ if (dev_nb == 0)
+ break;
+
/*
* A slave device nacked the address, this is
* allowed only once, DAA will be stopped and
@@ -1263,11 +1267,17 @@ static int svc_i3c_master_send_ccc_cmd(struct i3c_master_controller *m,
{
struct svc_i3c_master *master = to_svc_i3c_master(m);
bool broadcast = cmd->id < 0x80;
+ int ret;
if (broadcast)
- return svc_i3c_master_send_bdcast_ccc_cmd(master, cmd);
+ ret = svc_i3c_master_send_bdcast_ccc_cmd(master, cmd);
else
- return svc_i3c_master_send_direct_ccc_cmd(master, cmd);
+ ret = svc_i3c_master_send_direct_ccc_cmd(master, cmd);
+
+ if (ret)
+ cmd->err = I3C_ERROR_M2;
+
+ return ret;
}
static int svc_i3c_master_priv_xfers(struct i3c_dev_desc *dev,
--
2.34.1
--
linux-i3c mailing list
linux-i3c@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-i3c
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v3 1/1] i3c: master: svc: fix probe failure when no i3c device exist
2023-08-31 14:13 ` Frank Li
@ 2023-08-31 14:21 ` Miquel Raynal
-1 siblings, 0 replies; 6+ messages in thread
From: Miquel Raynal @ 2023-08-31 14:21 UTC (permalink / raw)
To: Frank Li; +Cc: alexandre.belloni, conor.culhane, imx, linux-i3c, linux-kernel
Hi Frank,
Frank.Li@nxp.com wrote on Thu, 31 Aug 2023 10:13:24 -0400:
> 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: dd3c52846d59 ("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>
Thanks,
Miquèl
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3 1/1] i3c: master: svc: fix probe failure when no i3c device exist
@ 2023-08-31 14:21 ` Miquel Raynal
0 siblings, 0 replies; 6+ messages in thread
From: Miquel Raynal @ 2023-08-31 14:21 UTC (permalink / raw)
To: Frank Li; +Cc: alexandre.belloni, conor.culhane, imx, linux-i3c, linux-kernel
Hi Frank,
Frank.Li@nxp.com wrote on Thu, 31 Aug 2023 10:13:24 -0400:
> 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: dd3c52846d59 ("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>
Thanks,
Miquèl
--
linux-i3c mailing list
linux-i3c@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-i3c
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3 1/1] i3c: master: svc: fix probe failure when no i3c device exist
2023-08-31 14:13 ` Frank Li
@ 2023-09-05 23:22 ` Alexandre Belloni
-1 siblings, 0 replies; 6+ messages in thread
From: Alexandre Belloni @ 2023-09-05 23:22 UTC (permalink / raw)
To: miquel.raynal, Frank Li
Cc: Frank.li, conor.culhane, imx, linux-i3c, linux-kernel
On Thu, 31 Aug 2023 10:13:24 -0400, Frank Li wrote:
> 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.
>
> [...]
Applied, thanks!
[1/1] i3c: master: svc: fix probe failure when no i3c device exist
commit: 6e13d6528be2f7e801af63c8153b87293f25d736
Best regards,
--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3 1/1] i3c: master: svc: fix probe failure when no i3c device exist
@ 2023-09-05 23:22 ` Alexandre Belloni
0 siblings, 0 replies; 6+ messages in thread
From: Alexandre Belloni @ 2023-09-05 23:22 UTC (permalink / raw)
To: miquel.raynal, Frank Li
Cc: Frank.li, conor.culhane, imx, linux-i3c, linux-kernel
On Thu, 31 Aug 2023 10:13:24 -0400, Frank Li wrote:
> 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.
>
> [...]
Applied, thanks!
[1/1] i3c: master: svc: fix probe failure when no i3c device exist
commit: 6e13d6528be2f7e801af63c8153b87293f25d736
Best regards,
--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
--
linux-i3c mailing list
linux-i3c@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-i3c
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-09-05 23:22 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-08-31 14:13 [PATCH v3 1/1] i3c: master: svc: fix probe failure when no i3c device exist Frank Li
2023-08-31 14:13 ` Frank Li
2023-08-31 14:21 ` Miquel Raynal
2023-08-31 14:21 ` Miquel Raynal
2023-09-05 23:22 ` Alexandre Belloni
2023-09-05 23:22 ` Alexandre Belloni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.