Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-31 23:40:19 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

drivers/rpmsg_virtio: Add VIRTIO_RPMSG_F_BUFADDR to support specify the address

Browse Source 
support specify the address by h2r_buf_addr and r2h_buf_addr
so is can split shared memory pool

Signed-off-by: yintao <yintao@xiaomi.com>
Signed-off-by: Bowen Wang <wangbowen6@xiaomi.com>
This commit is contained in:
yintao
2025-04-15 17:53:24 +08:00
committed by Xiang Xiao
parent 440ad137b8
commit 621da5bc5c
1 changed files with 51 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/rpmsg/rpmsg_virtio.c
+51 -3
View File
@@ -49,7 +49,8 @@
#define RPMSG_VIRTIO_FEATURES (1 << VIRTIO_RPMSG_F_NS | \ #define RPMSG_VIRTIO_FEATURES (1 << VIRTIO_RPMSG_F_NS | \
1 << VIRTIO_RPMSG_F_ACK | \ 1 << VIRTIO_RPMSG_F_ACK | \
1 << VIRTIO_RPMSG_F_BUFSZ | \ 1 << VIRTIO_RPMSG_F_BUFSZ | \
1 << VIRTIO_RPMSG_F_CPUNAME) 1 << VIRTIO_RPMSG_F_CPUNAME | \
1 << VIRTIO_RPMSG_F_BUFADDR)
#ifdef CONFIG_OPENAMP_CACHE #ifdef CONFIG_OPENAMP_CACHE
# define RPMSG_VIRTIO_INVALIDATE(x) metal_cache_invalidate(&x, sizeof(x)) # define RPMSG_VIRTIO_INVALIDATE(x) metal_cache_invalidate(&x, sizeof(x))
@@ -541,10 +542,57 @@ static int rpmsg_virtio_notify_wait(FAR struct rpmsg_device *rdev,
static int rpmsg_virtio_start(FAR struct rpmsg_virtio_priv_s *priv) static int rpmsg_virtio_start(FAR struct rpmsg_virtio_priv_s *priv)
{ {
FAR struct virtio_device *vdev = priv->vdev; FAR struct virtio_device *vdev = priv->vdev;
struct rpmsg_virtio_config config =
{
RPMSG_BUFFER_SIZE,
RPMSG_BUFFER_SIZE,
false,
};
int ret; int ret;
ret = rpmsg_init_vdev(&priv->rvdev, vdev, rpmsg_ns_bind, if (virtio_has_feature(vdev, VIRTIO_RPMSG_F_BUFSZ))
metal_io_get_region(), priv->pool); {
virtio_read_config_member(vdev, struct fw_rsc_config, h2r_buf_size,
&config.h2r_buf_size)
virtio_read_config_member(vdev, struct fw_rsc_config, r2h_buf_size,
&config.r2h_buf_size);
}
if (vdev->role == VIRTIO_DEV_DRIVER &&
virtio_has_feature(vdev, VIRTIO_RPMSG_F_BUFADDR))
{
FAR void *shmbuf_va0;
FAR void *shmbuf_va1;
uint64_t shmbuf_pa0;
uint64_t shmbuf_pa1;
/* In OpenAMP, priv->pool[0] is the RX share memory pool, should use
* r2h_buf_addr and r2h_buf_size
*/
virtio_read_config_member(vdev, struct fw_rsc_config, r2h_buf_addr,
&shmbuf_pa0);
shmbuf_va0 = up_addrenv_pa_to_va((uintptr_t)shmbuf_pa0);
rpmsg_virtio_init_shm_pool(&priv->pool[0], shmbuf_va0,
config.r2h_buf_size * vdev->vrings_info[0].info.num_descs);
/* In OpenAMP, priv->pool[1] is the TX share memory pool, should use
* h2r_buf_addr and h2r_buf_size
*/
virtio_read_config_member(vdev, struct fw_rsc_config, h2r_buf_addr,
&shmbuf_pa1);
shmbuf_va1 = up_addrenv_pa_to_va((uintptr_t)shmbuf_pa1);
rpmsg_virtio_init_shm_pool(&priv->pool[1], shmbuf_va1,
config.h2r_buf_size * vdev->vrings_info[1].info.num_descs);
config.split_shpool = true;
}
ret = rpmsg_init_vdev_with_config(&priv->rvdev, vdev, rpmsg_ns_bind,
metal_io_get_region(),
priv->pool, &config);
if (ret < 0) if (ret < 0)
{ {
rpmsgerr("rpmsg_init_vdev failed, ret=%d\n", ret); rpmsgerr("rpmsg_init_vdev failed, ret=%d\n", ret);