Remove VRING_USED_F_NO_NOTIFY flag in VirtQueue_kick and add barriers on QNX

[ipc/ipcdev.git] / qnx / src / ipc3x_dev / ti / syslink / ipc / hlos / knl / transports / virtio / VirtQueue.c

diff --git a/qnx/src/ipc3x_dev/ti/syslink/ipc/hlos/knl/transports/virtio/VirtQueue.c b/qnx/src/ipc3x_dev/ti/syslink/ipc/hlos/knl/transports/virtio/VirtQueue.c
index 90481866a0d3256c13c8fc1a76562ca518561b2c..94f210d0205b7289e275073cdb24289383c88871 100644 (file)
--- a/qnx/src/ipc3x_dev/ti/syslink/ipc/hlos/knl/transports/virtio/VirtQueue.c
+++ b/qnx/src/ipc3x_dev/ti/syslink/ipc/hlos/knl/transports/virtio/VirtQueue.c
@@ -57,12 +57,6 @@
 #include <ti/syslink/utils/Memory.h>
 #include <ti/syslink/utils/Trace.h>
 
-//#include <ti/sysbios/hal/Hwi.h>
-//#include <ti/sysbios/knl/Semaphore.h>
-//#include <ti/sysbios/knl/Clock.h>
-//#include <ti/sysbios/BIOS.h>
-//#include <ti/sysbios/hal/Cache.h>
-
 #include <_ArchIpcInt.h>
 #include <ArchIpcInt.h>
 #include "VirtQueue.h"
@@ -92,10 +86,7 @@ typedef struct VirtQueue_Object {
     /* Number of free buffers */
     UInt16                  num_free;
 
-    /* Last available index; updated by VirtQueue_getAvailBuf */
-    UInt16                  last_avail_idx;
-
-    /* Last available index; updated by VirtQueue_addUsedBuf */
+    /* Last available index; updated by VirtQueue_getUsedBuf */
     UInt16                  last_used_idx;
 
     /* Will eventually be used to kick remote processor */
@@ -147,12 +138,11 @@ Void VirtQueue_cb(Void *buf, VirtQueue_Handle vq)
  */
 Void VirtQueue_kick(VirtQueue_Handle vq)
 {
-    /* For now, simply interrupt remote processor */
-    if (vq->vring.used->flags & VRING_USED_F_NO_NOTIFY) {
-        GT_0trace(curTrace, GT_3CLASS,
-                "VirtQueue_kick: no kick because of VRING_USED_F_NO_NOTIFY");
-        return;
-    }
+    /*
+     * We need to expose available array entries before sending an
+     * interrupt.
+     */
+    asm("   DSB ST");
 
     GT_2trace(curTrace, GT_2CLASS,
             "VirtQueue_kick: Sending interrupt to proc %d with payload 0x%x",
@@ -164,37 +154,6 @@ Void VirtQueue_kick(VirtQueue_Handle vq)
     ArchIpcInt_sendInterrupt(vq->procId, vq->intId, vq->id);
 }
 
-/*!
- * ======== VirtQueue_addUsedBuf ========
- */
-Int VirtQueue_addUsedBuf(VirtQueue_Handle vq, Int16 head, UInt32 len)
-{
-    struct vring_used_elem *used;
-    Int status = 0;
-
-    if ((head > vq->vring.num) || (head < 0)) {
-        status = -1;
-        GT_setFailureReason (curTrace,
-                             GT_4CLASS,
-                             "VirtQueue_addUsedBuf",
-                             status,
-                             "head is invalid!");
-    }
-    else {
-        /*
-         * The virtqueue contains a ring of used buffers.  Get a pointer to the
-         * next entry in that used ring.
-         */
-        used = &vq->vring.used->ring[vq->vring.used->idx % vq->vring.num];
-        used->id = head;
-        used->len = len;
-
-        vq->vring.used->idx++;
-    }
-
-    return status;
-}
-
 /*!
  * ======== VirtQueue_addUsedBufAddr ========
  */
@@ -257,6 +216,12 @@ Int VirtQueue_addAvailBuf(VirtQueue_Handle vq, Void *buf, UInt32 len, Int16 head
         vq->vring.desc[head].len = len;
         vq->vring.desc[head].flags = 0;
 
+        /*
+         * Descriptors and available array need to be set before we expose the
+         * new available array entries.
+         */
+        asm("   DMB ST");
+
         vq->vring.avail->idx++;
     }
 
@@ -278,6 +243,9 @@ Int16 VirtQueue_getUsedBuf(VirtQueue_Object *vq, Void **buf)
         return (-1);
     }
 
+    /* Only get used array entries after they have been exposed. */
+    asm("   DMB");
+
     /* No need to know be kicked about added buffers anymore */
     //vq->vring.avail->flags |= VRING_AVAIL_F_NO_INTERRUPT; // disabling for now, since there seems to be a race condition where an M3->A9 message is not detected because the interrupt isn't sent.
 
@@ -290,42 +258,6 @@ Int16 VirtQueue_getUsedBuf(VirtQueue_Object *vq, Void **buf)
     return (head);
 }
 
-/*!
- * ======== VirtQueue_getAvailBuf ========
- */
-Int16 VirtQueue_getAvailBuf(VirtQueue_Handle vq, Void **buf)
-{
-    UInt16 head;
-
-    GT_6trace(curTrace, GT_2CLASS, "getAvailBuf vq: 0x%x %d %d %d 0x%x 0x%x",
-        (IArg)vq, vq->last_avail_idx, vq->vring.avail->idx, vq->vring.num,
-        (IArg)&vq->vring.avail, (IArg)vq->vring.avail);
-
-    /*  Clear flag here to avoid race condition with remote processor.
-     *  This is a negative flag, clearing it means that we want to
-     *  receive an interrupt when a buffer has been added to the pool.
-     */
-    vq->vring.used->flags &= ~VRING_USED_F_NO_NOTIFY;
-    /* There's nothing available? */
-    if (vq->last_avail_idx == vq->vring.avail->idx) {
-        /* We need to know about added buffers */
-        return (-1);
-    }
-
-    /* No need to know be kicked about added buffers anymore */
-    vq->vring.used->flags |= VRING_USED_F_NO_NOTIFY;
-
-    /*
-     * Grab the next descriptor number they're advertising, and increment
-     * the index we've seen.
-     */
-    head = vq->vring.avail->ring[vq->last_avail_idx++ % vq->vring.num];
-
-    *buf = mapPAtoVA(vq, vq->vring.desc[head].addr);
-
-    return (head);
-}
-
 /*!
  * ======== VirtQueue_disableCallback ========
  */
@@ -435,7 +367,6 @@ VirtQueue_Handle VirtQueue_create (VirtQueue_callback callback, UInt16 procId,
     numQueues++;
     vq->procId = procId;
     vq->intId = coreIntId[procId];
-    vq->last_avail_idx = 0;
     vq->arg = arg;
 
     /* init the vring */