diff mbox series

remoteproc: core: avoid duplicated rproc-virtio.[x] device

Message ID 20221013123214.750320-1-peng.fan@oss.nxp.com
State New
Headers
Series remoteproc: core: avoid duplicated rproc-virtio.[x] device |

Commit Message

Peng Fan (OSS) Oct. 13, 2022, 12:32 p.m. UTC 
  From: Peng Fan <peng.fan@nxp.com>

When there are multiple remoteproc cores(i.MX8QM has dual CM4), there
will be duplicated platform device created. When 1st CM4 rproc got
probed, rproc-virtio.0 was registered. Then 2nd CM4 rproc continue
register rproc-virtio.o will report failure.

So use PLATFORM_DEVID_AUTO here. Then the kernel log will has such:
rproc-virtio rproc-virtio.1.auto: registered virtio0 (type 7)

Fixes: 1d7b61c06dc3 ("remoteproc: virtio: Create platform device for the remoteproc_virtio")
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---

V1:
  I think this issue will happen when more than one rproc, saying CM4 + DSP,
or CM4 + CM4.
  I thought to add a index to rproc, then use
  'rproc->index * rvdev_data.index' as the id, but seems a bit complicated
  compared with use PLATFORM_DEVID_AUTO.


 drivers/remoteproc/remoteproc_core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Mukesh Ojha Oct. 13, 2022, 12:42 p.m. UTC | #1 
Hi,

On 10/13/2022 6:02 PM, Peng Fan (OSS) wrote:
> From: Peng Fan <peng.fan@nxp.com>
> 
> When there are multiple remoteproc cores(i.MX8QM has dual CM4), there
> will be duplicated platform device created. When 1st CM4 rproc got
> probed, rproc-virtio.0 was registered. Then 2nd CM4 rproc continue
> register rproc-virtio.o will report failure.
> 
> So use PLATFORM_DEVID_AUTO here. Then the kernel log will has such:
> rproc-virtio rproc-virtio.1.auto: registered virtio0 (type 7)
> 
> Fixes: 1d7b61c06dc3 ("remoteproc: virtio: Create platform device for the remoteproc_virtio")
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
> ---
> 
> V1:
>    I think this issue will happen when more than one rproc, saying CM4 + DSP,
> or CM4 + CM4.
>    I thought to add a index to rproc, then use
>    'rproc->index * rvdev_data.index' as the id, but seems a bit complicated
>    compared with use PLATFORM_DEVID_AUTO.
> 
> 
>   drivers/remoteproc/remoteproc_core.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
> index 8768cb64f560..03a26498e879 100644
> --- a/drivers/remoteproc/remoteproc_core.c
> +++ b/drivers/remoteproc/remoteproc_core.c
> @@ -509,7 +509,7 @@ static int rproc_handle_vdev(struct rproc *rproc, void *ptr,
>   	rvdev_data.rsc_offset = offset;
>   	rvdev_data.rsc = rsc;
>   
> -	pdev = platform_device_register_data(dev, "rproc-virtio", rvdev_data.index, &rvdev_data,
> +	pdev = platform_device_register_data(dev, "rproc-virtio", PLATFORM_DEVID_AUTO, &rvdev_data,
>   					     sizeof(rvdev_data));
>   	if (IS_ERR(pdev)) {
>   		dev_err(dev, "failed to create rproc-virtio device\n");


Looks to be same as

https://lore.kernel.org/lkml/1665628087-20829-1-git-send-email-shengjiu.wang@nxp.com/

-Mukesh
Peng Fan Oct. 13, 2022, 12:44 p.m. UTC | #2 
> Subject: Re: [PATCH] remoteproc: core: avoid duplicated rproc-virtio.[x]
> device
> 
> Hi,
> 
> On 10/13/2022 6:02 PM, Peng Fan (OSS) wrote:
> > From: Peng Fan <peng.fan@nxp.com>
> >
> > When there are multiple remoteproc cores(i.MX8QM has dual CM4), there
> > will be duplicated platform device created. When 1st CM4 rproc got
> > probed, rproc-virtio.0 was registered. Then 2nd CM4 rproc continue
> > register rproc-virtio.o will report failure.
> >
> > So use PLATFORM_DEVID_AUTO here. Then the kernel log will has such:
> > rproc-virtio rproc-virtio.1.auto: registered virtio0 (type 7)
> >
> > Fixes: 1d7b61c06dc3 ("remoteproc: virtio: Create platform device for
> > the remoteproc_virtio")
> > Signed-off-by: Peng Fan <peng.fan@nxp.com>
> > ---
> >
> > V1:
> >    I think this issue will happen when more than one rproc, saying CM4
> > + DSP, or CM4 + CM4.
> >    I thought to add a index to rproc, then use
> >    'rproc->index * rvdev_data.index' as the id, but seems a bit complicated
> >    compared with use PLATFORM_DEVID_AUTO.
> >
> >
> >   drivers/remoteproc/remoteproc_core.c | 2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/remoteproc/remoteproc_core.c
> > b/drivers/remoteproc/remoteproc_core.c
> > index 8768cb64f560..03a26498e879 100644
> > --- a/drivers/remoteproc/remoteproc_core.c
> > +++ b/drivers/remoteproc/remoteproc_core.c
> > @@ -509,7 +509,7 @@ static int rproc_handle_vdev(struct rproc *rproc,
> void *ptr,
> >   	rvdev_data.rsc_offset = offset;
> >   	rvdev_data.rsc = rsc;
> >
> > -	pdev = platform_device_register_data(dev, "rproc-virtio",
> rvdev_data.index, &rvdev_data,
> > +	pdev = platform_device_register_data(dev, "rproc-virtio",
> > +PLATFORM_DEVID_AUTO, &rvdev_data,
> >   					     sizeof(rvdev_data));
> >   	if (IS_ERR(pdev)) {
> >   		dev_err(dev, "failed to create rproc-virtio device\n");
> 
> 
> Looks to be same as
> 
> https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Flore.
> kernel.org%2Flkml%2F1665628087-20829-1-git-send-email-
> shengjiu.wang%40nxp.com%2F&amp;data=05%7C01%7Cpeng.fan%40nxp.c
> om%7C668b13ed67d24714d51008daad185d69%7C686ea1d3bc2b4c6fa92cd
> 99c5c301635%7C0%7C0%7C638012617398936051%7CUnknown%7CTWFpb
> GZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI
> 6Mn0%3D%7C3000%7C%7C%7C&amp;sdata=Blv30z3AYk6v3GTS4aEizM62v2
> zrTmK1rDFAdlxagB8%3D&amp;reserved=0

Ohh! Duplicated effort, I should check list before working on this (:

Thanks,
Peng.
> 
> -Mukesh
diff mbox series

Patch

diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index 8768cb64f560..03a26498e879 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -509,7 +509,7 @@  static int rproc_handle_vdev(struct rproc *rproc, void *ptr,
 	rvdev_data.rsc_offset = offset;
 	rvdev_data.rsc = rsc;
 
-	pdev = platform_device_register_data(dev, "rproc-virtio", rvdev_data.index, &rvdev_data,
+	pdev = platform_device_register_data(dev, "rproc-virtio", PLATFORM_DEVID_AUTO, &rvdev_data,
 					     sizeof(rvdev_data));
 	if (IS_ERR(pdev)) {
 		dev_err(dev, "failed to create rproc-virtio device\n");