sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rptun: divide shram to TX & RX

Browse Source 
Signed-off-by: ligd <liguiding1@xiaomi.com>
This commit is contained in:
ligd 2022-02-07 20:28:25 +08:00 committed by Petro Karashchenko
parent be49f6b87c
commit 5599f4e24a
1 changed files with 49 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
drivers/rptun/rptun.c
View File

@ -66,7 +66,8 @@ struct rptun_priv_s
FAR struct rptun_dev_s *dev; FAR struct rptun_dev_s *dev;
struct remoteproc rproc; struct remoteproc rproc;
struct rpmsg_virtio_device vdev; struct rpmsg_virtio_device vdev;
struct rpmsg_virtio_shm_pool shm_pool; struct rpmsg_virtio_shm_pool tx_shpool;
struct rpmsg_virtio_shm_pool rx_shpool;
struct metal_list bind; struct metal_list bind;
struct metal_list node; struct metal_list node;
sem_t sem; sem_t sem;
@ -636,30 +637,48 @@ static int rptun_dev_start(FAR struct remoteproc *rproc)
align0 = rsc->rpmsg_vring0.align; align0 = rsc->rpmsg_vring0.align;
align1 = rsc->rpmsg_vring1.align; align1 = rsc->rpmsg_vring1.align;
tbsz = ALIGN_UP(sizeof(struct rptun_rsc_s), MAX(align0, align1));
v0sz = ALIGN_UP(vring_size(rsc->rpmsg_vring0.num, align0), align0); v0sz = ALIGN_UP(vring_size(rsc->rpmsg_vring0.num, align0), align0);
v1sz = ALIGN_UP(vring_size(rsc->rpmsg_vring1.num, align1), align1); v1sz = ALIGN_UP(vring_size(rsc->rpmsg_vring1.num, align1), align1);
va0 = (FAR char *)rsc + tbsz; if (rsc->rpmsg_vring0.da == 0 || rsc->rpmsg_vring1.da == 0)
va1 = (FAR char *)rsc + tbsz + v0sz; {
tbsz = ALIGN_UP(sizeof(struct rptun_rsc_s), MAX(align0, align1));
io = metal_io_get_region(); va0 = (FAR char *)rsc + tbsz;
pa0 = metal_io_virt_to_phys(io, va0); va1 = (FAR char *)rsc + tbsz + v0sz;
pa1 = metal_io_virt_to_phys(io, va1);
da0 = da1 = METAL_BAD_PHYS; io = metal_io_get_region();
pa0 = metal_io_virt_to_phys(io, va0);
pa1 = metal_io_virt_to_phys(io, va1);
remoteproc_mmap(rproc, &pa0, &da0, v0sz, 0, NULL); da0 = da1 = METAL_BAD_PHYS;
remoteproc_mmap(rproc, &pa1, &da1, v1sz, 0, NULL);
rsc->rpmsg_vring0.da = da0; remoteproc_mmap(rproc, &pa0, &da0, v0sz, 0, NULL);
rsc->rpmsg_vring1.da = da1; remoteproc_mmap(rproc, &pa1, &da1, v1sz, 0, NULL);
shbuf = (FAR char *)rsc + tbsz + v0sz + v1sz; rsc->rpmsg_vring0.da = da0;
shbufsz = rsc->config.txbuf_size * rsc->rpmsg_vring0.num + rsc->rpmsg_vring1.da = da1;
rsc->config.rxbuf_size * rsc->rpmsg_vring1.num;
rpmsg_virtio_init_shm_pool(&priv->shm_pool, shbuf, shbufsz); shbuf = (FAR char *)rsc + tbsz + v0sz + v1sz;
shbufsz = rsc->config.txbuf_size * rsc->rpmsg_vring0.num +
rsc->config.rxbuf_size * rsc->rpmsg_vring1.num;
rpmsg_virtio_init_shm_pool(&priv->tx_shpool, shbuf, shbufsz);
}
else
{
da0 = rsc->rpmsg_vring0.da;
shbuf = (FAR char *)remoteproc_mmap(rproc, NULL, &da0,
v0sz, 0, NULL) + v0sz;
shbufsz = rsc->config.rxbuf_size * rsc->rpmsg_vring0.num;
rpmsg_virtio_init_shm_pool(&priv->rx_shpool, shbuf, shbufsz);
da1 = rsc->rpmsg_vring1.da;
shbuf = (FAR char *)remoteproc_mmap(rproc, NULL, &da1,
v1sz, 0, NULL) + v1sz;
shbufsz = rsc->config.txbuf_size * rsc->rpmsg_vring1.num;
rpmsg_virtio_init_shm_pool(&priv->tx_shpool, shbuf, shbufsz);
}
role = RPMSG_MASTER; role = RPMSG_MASTER;
} }
@ -672,8 +691,18 @@ static int rptun_dev_start(FAR struct remoteproc *rproc)
return -ENOMEM; return -ENOMEM;
} }
ret = rpmsg_init_vdev(&priv->vdev, vdev, rptun_ns_bind, if (priv->rx_shpool.base)
metal_io_get_region(), &priv->shm_pool); {
ret = rpmsg_init_vdev_ext(&priv->vdev, vdev, rptun_ns_bind,
metal_io_get_region(),
&priv->tx_shpool, &priv->rx_shpool);
}
else
{
ret = rpmsg_init_vdev(&priv->vdev, vdev, rptun_ns_bind,
metal_io_get_region(), &priv->tx_shpool);
}
if (ret) if (ret)
{ {
remoteproc_remove_virtio(rproc, vdev); remoteproc_remove_virtio(rproc, vdev);
@ -967,7 +996,7 @@ int rpmsg_post(FAR struct rpmsg_endpoint *ept, FAR sem_t *sem)
{ {
rptun_post(priv); rptun_post(priv);
} }
return ret; return ret;
} }
@ -1140,6 +1169,7 @@ int rptun_initialize(FAR struct rptun_dev_s *dev)
goto err_driver; goto err_driver;
} }
#endif #endif
nxsem_set_protocol(&priv->sem, SEM_PRIO_NONE); nxsem_set_protocol(&priv->sem, SEM_PRIO_NONE);
return OK; return OK;