Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions examples/legacy_apps/examples/echo/rpmsg-echo.c
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ int rpmsg_echo_app(struct rpmsg_device *rdev, void *priv)
"created rpmsg channel %s, src=0x%x, dst=0x%x\r\n",
RPMSG_SERVICE_NAME, lept.addr, lept.dest_addr);

metal_dbg("RPMsg device TX buffer size: %#x\r\n", rpmsg_get_tx_buffer_size(&lept));
metal_dbg("RPMsg device RX buffer size: %#x\r\n", rpmsg_get_rx_buffer_size(&lept));
metal_info("RPMsg device TX buffer size: %d\r\n", rpmsg_get_tx_buffer_size(&lept));
metal_info("RPMsg device RX buffer size: %d\r\n", rpmsg_get_rx_buffer_size(&lept));

while(1) {
platform_poll(priv);
Expand Down
9 changes: 6 additions & 3 deletions examples/legacy_apps/machine/xlnx/zynqmp_r5/platform_info.c
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,7 @@ platform_create_rpmsg_vdev(void *platform, unsigned int vdev_index,
void (*rst_cb)(struct virtio_device *vdev),
rpmsg_ns_bind_cb ns_bind_cb)
{
struct remote_resource_table *rsc_tbl;
struct remoteproc *rproc = platform;
struct rpmsg_virtio_device *rpmsg_vdev;
struct virtio_device *vdev;
Expand All @@ -417,6 +418,8 @@ platform_create_rpmsg_vdev(void *platform, unsigned int vdev_index,

restore_initial_rsc_table();

rsc_tbl = rproc->rsc_table;

rpmsg_vdev = metal_allocate_memory(sizeof(*rpmsg_vdev));
if (!rpmsg_vdev)
return NULL;
Expand All @@ -440,9 +443,9 @@ platform_create_rpmsg_vdev(void *platform, unsigned int vdev_index,

metal_dbg("initializing rpmsg vdev\r\n");
/* RPMsg virtio device can set shared buffers pool argument to NULL */
ret = rpmsg_init_vdev(rpmsg_vdev, vdev, ns_bind_cb,
shbuf_io,
&shpool);
ret = rpmsg_init_vdev_with_config(rpmsg_vdev, vdev, ns_bind_cb,
shbuf_io, &shpool,
&rsc_tbl->vdev_config);
if (ret) {
metal_err("failed rpmsg_init_vdev\r\n");
goto err2;
Expand Down
18 changes: 14 additions & 4 deletions examples/legacy_apps/machine/xlnx/zynqmp_r5/rsc_table.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@

#define RSC_TBL_XLNX_MAGIC ((uint32_t)'x' << 24 | (uint32_t)'a' << 16 | \
(uint32_t)'m' << 8 | (uint32_t)'p')

#define RPMSG_VDEV_DFEATURES (1 << VIRTIO_RPMSG_F_NS)

#define RPMSG_VDEV_DFEATURES (1 << VIRTIO_RPMSG_F_NS | \
1 << VIRTIO_RPMSG_F_BUFSZ)

/* VirtIO rpmsg device id */
#define VIRTIO_ID_RPMSG_ 7
Expand Down Expand Up @@ -58,14 +59,23 @@ struct remote_resource_table __resource resources = {

/* Virtio device entry */
.rpmsg_vdev = {
RSC_VDEV, VIRTIO_ID_RPMSG_, 31, RPMSG_VDEV_DFEATURES, 0, 0, 0,
RSC_VDEV, VIRTIO_ID_RPMSG_, 31, RPMSG_VDEV_DFEATURES, 0,
/* vdev config space len */
sizeof(struct rpmsg_virtio_config), 0,
NUM_VRINGS, {0, 0},
},

/* Vring rsc entry - part of vdev rsc entry */
{RING_TX, VRING_ALIGN, VRING_SIZE, 1, 0},
{RING_RX, VRING_ALIGN, VRING_SIZE, 2, 0},

/* vdev config space */
.vdev_config = {
.version = 1,
.size = (uint16_t)sizeof(struct rpmsg_virtio_config),
.h2r_buf_size = 512, /* host to remote, i.e. tx for host */
.r2h_buf_size = 512, /* remote to host, i.e. rx for host */
.split_shpool = false
},
/* trace buffer for logs, accessible via debugfs */
.rsc_trace = {
.type = RSC_TRACE,
Expand Down
1 change: 1 addition & 0 deletions examples/legacy_apps/machine/xlnx/zynqmp_r5/rsc_table.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ struct remote_resource_table {
struct fw_rsc_vdev rpmsg_vdev;
struct fw_rsc_vdev_vring rpmsg_vring0;
struct fw_rsc_vdev_vring rpmsg_vring1;
struct rpmsg_virtio_config vdev_config;
struct fw_rsc_trace rsc_trace;
}__attribute__((packed, aligned(0x100)));

Expand Down