middleware: multicore: open-amp: Update open-amp for Vybrid

Update open-amp for Vybrid bringing it in sync with FreeRTOS BSP
1.0.1 release from NXP for iMX7.

The file and directory structure for "porting" which contains
the platform specific part of open-amp has been kept same. Only
the implementation has either been updated or added.

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>

3 files changed, 16 insertions, 17 deletions

diff --git a/middleware/multicore/open-amp/virtio/virtio_ring.h b/middleware/multicore/open-amp/virtio/virtio_ring.h
index fc3eb08..7a861f3 100644
--- a/middleware/multicore/open-amp/virtio/virtio_ring.h
+++ b/middleware/multicore/open-amp/virtio/virtio_ring.h
@@ -38,7 +38,7 @@
 /* This marks a buffer as write-only (otherwise read-only). */
 #define VRING_DESC_F_WRITE      2
 /* This means the buffer contains a list of buffer descriptors. */
-#define VRING_DESC_F_INDIRECT	4   /*not used?*/
+#define VRING_DESC_F_INDIRECT	4
 
 /* The Host uses this in used->flags to advise the Guest: don't kick me
  * when you add a buffer.  It's unreliable, so it's simply an
@@ -65,7 +65,7 @@ struct vring_desc {
 struct vring_avail {
         uint16_t flags;
         uint16_t idx;
-        uint16_t ring[0];
+        uint16_t ring[1];
 };
 
 /* uint32_t is used here for ids for padding reasons. */
@@ -79,7 +79,7 @@ struct vring_used_elem {
 struct vring_used {
         uint16_t flags;
         uint16_t idx;
-        struct vring_used_elem ring[0];
+        struct vring_used_elem ring[1];
 };
 
 struct vring {
@@ -121,7 +121,7 @@ struct vring {
  * versa. They are at the end for backwards compatibility.
  */
 #define vring_used_event(vr)	((vr)->avail->ring[(vr)->num])
-#define vring_avail_event(vr)	((vr)->used->ring[(vr)->num].id & 0xFFFF)
+#define vring_avail_event(vr) ((vr)->used->ring[(vr)->num].id & 0xFFFF)
 
 static inline int
 vring_size(unsigned int num, unsigned long align)
@@ -145,7 +145,7 @@ vring_init(struct vring *vr, unsigned int num, uint8_t *p,
         vr->desc = (struct vring_desc *) p;
         vr->avail = (struct vring_avail *) (p +
 	    num * sizeof(struct vring_desc));
-        vr->used = (void *)
+        vr->used = (struct vring_used *)
 	    (((unsigned long) &vr->avail->ring[num] + align-1) & ~(align-1));
 }
 
diff --git a/middleware/multicore/open-amp/virtio/virtqueue.c b/middleware/multicore/open-amp/virtio/virtqueue.c
index 2ea87cd..46b2af7 100644
--- a/middleware/multicore/open-amp/virtio/virtqueue.c
+++ b/middleware/multicore/open-amp/virtio/virtqueue.c
@@ -74,22 +74,20 @@ int virtqueue_create(struct virtio_device *virt_dev, unsigned short id, char *na
                 + (ring->num_descs) * sizeof(struct vq_desc_extra);
         vq = (struct virtqueue *) env_allocate_memory(vq_size);
 
-
         if (vq == VQ_NULL) {
             return (ERROR_NO_MEM);
         }
 
         env_memset(vq, 0x00, vq_size);
 
-
         vq->vq_dev = virt_dev;
         env_strncpy(vq->vq_name, name, VIRTQUEUE_MAX_NAME_SZ);
         vq->vq_queue_index = id;
-        vq->vq_alignment = ring->align;         /*ring info comes from proc_table*/
+        vq->vq_alignment = ring->align;
         vq->vq_nentries = ring->num_descs;
         vq->vq_free_cnt = vq->vq_nentries;
-        vq->callback = callback;            /*rpmsg_tx_callback, rpmsg_rx_callback*/
-        vq->notify = notify;                /*hil_vring_notify*/
+        vq->callback = callback;
+        vq->notify = notify;
 
         //TODO : Whether we want to support indirect addition or not.
         vq->vq_ring_size = vring_size(ring->num_descs, ring->align);
@@ -134,7 +132,7 @@ int virtqueue_add_buffer(struct virtqueue *vq, struct llist *buffer,
     uint16_t idx;
     int needed;
 
-    needed = readable + writable;   /*only one can be set to 1*/
+    needed = readable + writable;
 
     VQ_PARAM_CHK(vq == VQ_NULL, status, ERROR_VQUEUE_INVLD_PARAM);
     VQ_PARAM_CHK(needed < 1, status, ERROR_VQUEUE_INVLD_PARAM);
@@ -160,7 +158,7 @@ int virtqueue_add_buffer(struct virtqueue *vq, struct llist *buffer,
         dxp->ndescs = needed;
 
         /* Enqueue buffer onto the ring. */
-        idx = vq_ring_add_buffer(vq, vq->vq_ring.desc, head_idx, buffer,        /*idx now "desc.next"*/
+        idx = vq_ring_add_buffer(vq, vq->vq_ring.desc, head_idx, buffer,
                 readable, writable);
 
         vq->vq_desc_head_idx = idx;
@@ -196,7 +194,7 @@ int virtqueue_add_buffer(struct virtqueue *vq, struct llist *buffer,
  *
  * @return                      - Function status
  */
-int virtqueue_add_single_buffer(struct virtqueue *vq, void *cookie,             /*this function is not used at all*/
+int virtqueue_add_single_buffer(struct virtqueue *vq, void *cookie,
         void *buffer_addr, uint_t len, int writable, boolean has_next) {
 
     struct vq_desc_extra *dxp;
@@ -326,7 +324,8 @@ void *virtqueue_get_available_buffer(struct virtqueue *vq, uint16_t *avail_idx,
     uint16_t head_idx = 0;
     void *buffer;
 
-    if (vq->vq_available_idx == vq->vq_ring.avail->idx) {       /*vq->vq_ring.avial->idx is updated in "rpmsg_rdev_create_virtqueues" "virtqueue_add_buffer" */
+    /*vq->vq_ring.avial->idx is updated in "rpmsg_rdev_create_virtqueues" "virtqueue_add_buffer" */
+    if (vq->vq_available_idx == vq->vq_ring.avail->idx) {
         return (VQ_NULL);
     }
 
@@ -673,7 +672,7 @@ static int vq_ring_must_notify_host(struct virtqueue *vq) {
 static void vq_ring_notify_host(struct virtqueue *vq) {
 
     if (vq->notify != VQ_NULL)
-        vq->notify(vq);     /*hil_vring_notify*/
+        vq->notify(vq);
 }
 
 /**
diff --git a/middleware/multicore/open-amp/virtio/virtqueue.h b/middleware/multicore/open-amp/virtio/virtqueue.h
index 4671f6e..3e11d39 100644
--- a/middleware/multicore/open-amp/virtio/virtqueue.h
+++ b/middleware/multicore/open-amp/virtio/virtqueue.h
@@ -95,7 +95,7 @@ struct virtqueue {
     uint16_t vq_nentries;
     uint32_t vq_flags;
     int vq_alignment;
-    int vq_ring_size;       /*Seems not used at all*/
+    int vq_ring_size;
     boolean vq_inuse;
     void *vq_ring_mem;
     void (*callback)(struct virtqueue *vq);
@@ -138,7 +138,7 @@ struct virtqueue {
         struct vring_desc *indirect;
         uint32_t indirect_paddr;
         uint16_t ndescs;
-    } vq_descx[0];
+    } vq_descx[1];
 };
 
 /* struct to hold vring specific information */