openamp: decouple rpmsg virtio and remoteproc

lib/include/openamp/remoteproc.h

@@ -462,17 +462,6 @@ struct remoteproc_ops {
 	/** Notify the remote */
 	int (*notify)(struct remoteproc *rproc, uint32_t id);
 
-	/**
-	 * @brief Wait for remote notified, when there is no TX buffer anymore.
-	 * Set to NULL means use usleep to wait TX buffer available.
-	 *
-	 * @param rproc		pointer to remoteproc instance
-	 * @param id		the notifyid
-	 *
-	 * return 0 means there is notify available, otherwise negative value.
-	 */
-	int (*wait_notified)(struct remoteproc *rproc, uint32_t id);
-
 	/**
 	 * @brief Get remoteproc memory I/O region by either name, virtual
 	 * address, physical address or device address.
@@ -508,7 +497,6 @@ struct remoteproc_ops {
 #define RPROC_ERR_RSC_TAB_NP          (RPROC_EBASE + 10)
 #define RPROC_ERR_RSC_TAB_NS          (RPROC_EBASE + 11)
 #define RPROC_ERR_LOADER_STATE (RPROC_EBASE + 12)
-#define RPROC_EOPNOTSUPP	(RPROC_EBASE + 13)
 #define RPROC_EMAX	(RPROC_EBASE + 16)
 #define RPROC_EPTR	(void *)(-1)
 #define RPROC_EOF	(void *)(-1)

lib/include/openamp/remoteproc_virtio.h

@@ -39,12 +39,6 @@ extern "C" {
 /* define vdev notification function user should implement */
 typedef int (*rpvdev_notify_func)(void *priv, uint32_t id);
 
-/*
- * Define vdev wait notified function, user can implement this
- * function to wait available Tx buffers.
- */
-typedef int (*rpvdev_wait_notified_func)(void *priv, uint32_t id);
-
 /** @brief Virtio structure for remoteproc instance */
 struct remoteproc_virtio {
 	/** Pointer to private data */
@@ -59,9 +53,6 @@ struct remoteproc_virtio {
 	/** Notification function */
 	rpvdev_notify_func notify;
 
-	/** Wait notification function (optional) */
-	rpvdev_wait_notified_func wait_notified;
-
 	/** Virtio device */
 	struct virtio_device vdev;
 
@@ -135,20 +126,6 @@ int rproc_virtio_notified(struct virtio_device *vdev, uint32_t notifyid);
  */
 void rproc_virtio_wait_remote_ready(struct virtio_device *vdev);
 
-/**
- * @brief Set the remoteproc virtio wait notified function.
- *
- * This \ref wait_notified_cb function will be called to customize the wait, when
- * no Tx buffer is available.
- *
- * @param vdev			Pointer to the virtio device.
- * @param wait_notified_cb	The wait notified callback function.
- *
- * @return 0 for successful, negative value for failure.
- */
-int rproc_virtio_set_wait_notified(struct virtio_device *vdev,
-				   rpvdev_wait_notified_func wait_notified_cb);
-
 #if defined __cplusplus
 }
 #endif

lib/include/openamp/rpmsg_virtio.h

@@ -41,6 +41,9 @@ extern "C" {
 #define BUFFER_INVALIDATE(x, s)		do { } while (0)
 #endif /* VIRTIO_CACHED_BUFFERS || VIRTIO_USE_DCACHE */
 
+/* Callback handler for rpmsg virtio service */
+typedef int (*rpmsg_virtio_notify_wait_cb)(struct rpmsg_device *rdev, uint32_t id);
+
 /** @brief Shared memory pool used for RPMsg buffers */
 struct rpmsg_virtio_shm_pool {
 	/** Base address of the memory pool */
@@ -98,6 +101,12 @@ struct rpmsg_virtio_device {
 	 * \ref rpmsg_virtio_release_tx_buffer function
 	 */
 	struct metal_list reclaimer;
+
+	/**
+	 * Callback handler for rpmsg virtio service, called when service
+	 * can't get tx buffer
+	 */
+	rpmsg_virtio_notify_wait_cb notify_wait_cb;
 };
 
 #define RPMSG_REMOTE	VIRTIO_DEV_DEVICE

lib/include/openamp/virtio.h

@@ -275,9 +275,6 @@ struct virtio_dispatch {
 
 	/** Notify the other side that a virtio vring as been updated. */
 	void (*notify)(struct virtqueue *vq);
-
-	/** Customize the wait, when no Tx buffer is available (optional) */
-	int (*wait_notified)(struct virtio_device *dev, struct virtqueue *vq);
 };
 
 /**

lib/remoteproc/remoteproc.c

@@ -901,16 +901,6 @@ static int remoteproc_virtio_notify(void *priv, uint32_t id)
 	return 0;
 }
 
-static int remoteproc_wait_notified(void *priv, uint32_t id)
-{
-	struct remoteproc *rproc = priv;
-
-	if (rproc->ops->wait_notified)
-		return rproc->ops->wait_notified(rproc, id);
-
-	return -RPROC_EOPNOTSUPP;
-}
-
 struct virtio_device *
 remoteproc_create_virtio(struct remoteproc *rproc,
 			 int vdev_id, unsigned int role,
@@ -969,7 +959,6 @@ remoteproc_create_virtio(struct remoteproc *rproc,
 	rproc_virtio_wait_remote_ready(vdev);
 
 	rpvdev = metal_container_of(vdev, struct remoteproc_virtio, vdev);
-	rproc_virtio_set_wait_notified(vdev, remoteproc_wait_notified);
 	metal_list_add_tail(&rproc->vdevs, &rpvdev->node);
 	num_vrings = vdev_rsc->num_of_vrings;
 

lib/remoteproc/remoteproc_virtio.c

@@ -30,21 +30,6 @@ static void rproc_virtio_virtqueue_notify(struct virtqueue *vq)
 	rpvdev->notify(rpvdev->priv, vring_info->notifyid);
 }
 
-static int rproc_virtio_wait_notified(struct virtio_device *vdev,
-				      struct virtqueue *vq)
-{
-	struct remoteproc_virtio *rpvdev;
-	struct virtio_vring_info *vring_info;
-	unsigned int vq_id = vq->vq_queue_index;
-
-	rpvdev = metal_container_of(vdev, struct remoteproc_virtio, vdev);
-	vring_info = &vdev->vrings_info[vq_id];
-
-	return rpvdev->wait_notified ?
-	       rpvdev->wait_notified(rpvdev->priv, vring_info->notifyid) :
-	       -RPROC_EOPNOTSUPP;
-}
-
 static unsigned char rproc_virtio_get_status(struct virtio_device *vdev)
 {
 	struct remoteproc_virtio *rpvdev;
@@ -202,7 +187,6 @@ static const struct virtio_dispatch remoteproc_virtio_dispatch_funcs = {
 	.get_features = rproc_virtio_get_features,
 	.read_config = rproc_virtio_read_config,
 	.notify = rproc_virtio_virtqueue_notify,
-	.wait_notified = rproc_virtio_wait_notified,
 #ifndef VIRTIO_DEVICE_ONLY
 	/*
 	 * We suppose here that the vdev is in a shared memory so that can
@@ -381,16 +365,3 @@ void rproc_virtio_wait_remote_ready(struct virtio_device *vdev)
 		metal_cpu_yield();
 	}
 }
-
-int rproc_virtio_set_wait_notified(struct virtio_device *vdev,
-				   rpvdev_wait_notified_func wait_notified_cb)
-{
-	struct remoteproc_virtio *rpvdev;
-
-	if (!vdev || !wait_notified_cb)
-		return -RPROC_EINVAL;
-	rpvdev = metal_container_of(vdev, struct remoteproc_virtio, vdev);
-	rpvdev->wait_notified = wait_notified_cb;
-
-	return 0;
-}

lib/rpmsg/rpmsg_virtio.c

@@ -358,12 +358,16 @@ static void rpmsg_virtio_release_rx_buffer(struct rpmsg_device *rdev,
 	metal_mutex_release(&rdev->lock);
 }
 
-static int rpmsg_virtio_wait_notified(struct rpmsg_virtio_device *rvdev,
-				      struct virtqueue *vq)
+static int rpmsg_virtio_notify_wait(struct rpmsg_virtio_device *rvdev, struct virtqueue *vq)
 {
-	return rvdev->vdev->func->wait_notified ?
-	       rvdev->vdev->func->wait_notified(rvdev->vdev, vq) :
-	       RPMSG_EOPNOTSUPP;
+	struct virtio_vring_info *vring_info;
+
+	vring_info = &rvdev->vdev->vrings_info[vq->vq_queue_index];
+
+	if (!rvdev->notify_wait_cb)
+		return RPMSG_EOPNOTSUPP;
+
+	return rvdev->notify_wait_cb(&rvdev->rdev, vring_info->notifyid);
 }
 
 static void *rpmsg_virtio_get_tx_payload_buffer(struct rpmsg_device *rdev,
@@ -400,10 +404,12 @@ static void *rpmsg_virtio_get_tx_payload_buffer(struct rpmsg_device *rdev,
 		 * Try to use wait loop implemented in the virtio dispatcher and
 		 * use metal_sleep_usec() method by default.
 		 */
-		status = rpmsg_virtio_wait_notified(rvdev, rvdev->rvq);
-		if (status != RPMSG_SUCCESS) {
+		status = rpmsg_virtio_notify_wait(rvdev, rvdev->rvq);
+		if (status == RPMSG_EOPNOTSUPP) {
 			metal_sleep_usec(RPMSG_TICKS_PER_INTERVAL);
 			tick_count--;
+		} else if (status == RPMSG_SUCCESS) {
+			break;
 		}
 	}