From d5240e5fdf7908cf3c5c30794c5b30d7b1ea9c2c Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Thu, 3 Jan 2019 14:20:48 +0800 Subject: [PATCH] implement rproc_virtio_read_config/rproc_virtio_write_config so the rpmsg could access the configuration space as needed Signed-off-by: Xiang Xiao --- lib/include/openamp/virtio.h | 1 + lib/remoteproc/remoteproc_virtio.c | 40 ++++++++++++++++++++++++------ 2 files changed, 33 insertions(+), 8 deletions(-) diff --git a/lib/include/openamp/virtio.h b/lib/include/openamp/virtio.h index abce47002..20ce8f8df 100644 --- a/lib/include/openamp/virtio.h +++ b/lib/include/openamp/virtio.h @@ -126,6 +126,7 @@ struct virtio_device { virtio_dev_reset_cb reset_cb; /**< user registered device callback */ const struct virtio_dispatch *func; /**< Virtio dispatch table */ void *priv; /**< TODO: remove pointer to virtio_device private data */ + unsigned int config_len; /**< config space length */ unsigned int vrings_num; /**< number of vrings */ struct virtio_vring_info *vrings_info; }; diff --git a/lib/remoteproc/remoteproc_virtio.c b/lib/remoteproc/remoteproc_virtio.c index d0d463d86..0fe1fb18f 100644 --- a/lib/remoteproc/remoteproc_virtio.c +++ b/lib/remoteproc/remoteproc_virtio.c @@ -111,20 +111,43 @@ static uint32_t rproc_virtio_negotiate_features(struct virtio_device *vdev, static void rproc_virtio_read_config(struct virtio_device *vdev, uint32_t offset, void *dst, int length) { - (void)vdev; - (void)offset; - (void)dst; - (void)length; + struct remoteproc_virtio *rpvdev; + struct fw_rsc_vdev *vdev_rsc; + struct metal_io_region *io; + char *config; + + if (offset + length > vdev->config_len || offset + length < length) + return; + + rpvdev = metal_container_of(vdev, struct remoteproc_virtio, vdev); + vdev_rsc = rpvdev->vdev_rsc; + config = (char *)(&vdev_rsc->vring[vdev->vrings_num]); + io = rpvdev->vdev_rsc_io; + metal_io_block_read(io, + metal_io_virt_to_offset(io, config + offset), + dst, length); } #ifndef VIRTIO_SLAVE_ONLY static void rproc_virtio_write_config(struct virtio_device *vdev, uint32_t offset, void *src, int length) { - (void)vdev; - (void)offset; - (void)src; - (void)length; + struct remoteproc_virtio *rpvdev; + struct fw_rsc_vdev *vdev_rsc; + struct metal_io_region *io; + char *config; + + if (offset + length > vdev->config_len || offset + length < length) + return; + + rpvdev = metal_container_of(vdev, struct remoteproc_virtio, vdev); + vdev_rsc = rpvdev->vdev_rsc; + config = (char *)(&vdev_rsc->vring[vdev->vrings_num]); + io = rpvdev->vdev_rsc_io; + metal_io_block_write(io, + metal_io_virt_to_offset(io, config + offset), + src, length); + rpvdev->notify(rpvdev->priv, vdev->notifyid); } static void rproc_virtio_reset_device(struct virtio_device *vdev) @@ -205,6 +228,7 @@ rproc_virtio_create_vdev(unsigned int role, unsigned int notifyid, vdev->notifyid = notifyid; vdev->role = role; vdev->reset_cb = rst_cb; + vdev->config_len = vdev_rsc->config_len; vdev->vrings_num = num_vrings; vdev->func = &remoteproc_virtio_dispatch_funcs; /* TODO: Shall we set features here ? */