vnet: store hw interface speed in kbps instead of using flags

[vpp.git] / src / plugins / avf / input.c

diff --git a/src/plugins/avf/input.c b/src/plugins/avf/input.c
index 0b1ac74..6d39ed6 100644 (file)
--- a/src/plugins/avf/input.c
+++ b/src/plugins/avf/input.c
@@ -48,10 +48,11 @@ static __clib_unused char *avf_input_error_strings[] = {
 #define AVF_INPUT_REFILL_TRESHOLD 32
 static_always_inline void
 avf_rxq_refill (vlib_main_t * vm, vlib_node_runtime_t * node, avf_rxq_t * rxq,
-               int use_iova)
+               int use_va_dma)
 {
   u16 n_refill, mask, n_alloc, slot;
   u32 s0, s1, s2, s3;
+  vlib_buffer_t *b[4];
   avf_rx_desc_t *d[4];
 
   n_refill = rxq->size - 1 - rxq->n_enqueued;
@@ -97,28 +98,24 @@ avf_rxq_refill (vlib_main_t * vm, vlib_node_runtime_t * node, avf_rxq_t * rxq,
       d[1] = ((avf_rx_desc_t *) rxq->descs) + s1;
       d[2] = ((avf_rx_desc_t *) rxq->descs) + s2;
       d[3] = ((avf_rx_desc_t *) rxq->descs) + s3;
-      if (use_iova)
+      b[0] = vlib_get_buffer (vm, rxq->bufs[s0]);
+      b[1] = vlib_get_buffer (vm, rxq->bufs[s1]);
+      b[2] = vlib_get_buffer (vm, rxq->bufs[s2]);
+      b[3] = vlib_get_buffer (vm, rxq->bufs[s3]);
+
+      if (use_va_dma)
        {
-         vlib_buffer_t *b;
-         b = vlib_get_buffer (vm, rxq->bufs[s0]);
-         d[0]->qword[0] = pointer_to_uword (b->data);
-         b = vlib_get_buffer (vm, rxq->bufs[s1]);
-         d[1]->qword[0] = pointer_to_uword (b->data);
-         b = vlib_get_buffer (vm, rxq->bufs[s2]);
-         d[2]->qword[0] = pointer_to_uword (b->data);
-         b = vlib_get_buffer (vm, rxq->bufs[s3]);
-         d[3]->qword[0] = pointer_to_uword (b->data);
+         d[0]->qword[0] = vlib_buffer_get_va (b[0]);
+         d[1]->qword[0] = vlib_buffer_get_va (b[1]);
+         d[2]->qword[0] = vlib_buffer_get_va (b[2]);
+         d[3]->qword[0] = vlib_buffer_get_va (b[3]);
        }
       else
        {
-         d[0]->qword[0] =
-           vlib_get_buffer_data_physical_address (vm, rxq->bufs[s0]);
-         d[1]->qword[0] =
-           vlib_get_buffer_data_physical_address (vm, rxq->bufs[s1]);
-         d[2]->qword[0] =
-           vlib_get_buffer_data_physical_address (vm, rxq->bufs[s2]);
-         d[3]->qword[0] =
-           vlib_get_buffer_data_physical_address (vm, rxq->bufs[s3]);
+         d[0]->qword[0] = vlib_buffer_get_pa (vm, b[0]);
+         d[1]->qword[0] = vlib_buffer_get_pa (vm, b[1]);
+         d[2]->qword[0] = vlib_buffer_get_pa (vm, b[2]);
+         d[3]->qword[0] = vlib_buffer_get_pa (vm, b[3]);
        }
 
       d[0]->qword[1] = 0;
@@ -134,14 +131,11 @@ avf_rxq_refill (vlib_main_t * vm, vlib_node_runtime_t * node, avf_rxq_t * rxq,
     {
       s0 = slot;
       d[0] = ((avf_rx_desc_t *) rxq->descs) + s0;
-      if (use_iova)
-       {
-         vlib_buffer_t *b = vlib_get_buffer (vm, rxq->bufs[s0]);
-         d[0]->qword[0] = pointer_to_uword (b->data);
-       }
+      b[0] = vlib_get_buffer (vm, rxq->bufs[s0]);
+      if (use_va_dma)
+       d[0]->qword[0] = vlib_buffer_get_va (b[0]);
       else
-       d[0]->qword[0] =
-         vlib_get_buffer_data_physical_address (vm, rxq->bufs[s0]);
+       d[0]->qword[0] = vlib_buffer_get_pa (vm, b[0]);
       d[0]->qword[1] = 0;
 
       /* next */
@@ -439,10 +433,10 @@ avf_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
     goto done;
 
   /* refill rx ring */
-  if (ad->flags & AVF_DEVICE_F_IOVA)
-    avf_rxq_refill (vm, node, rxq, 1 /* use_iova */ );
+  if (ad->flags & AVF_DEVICE_F_VA_DMA)
+    avf_rxq_refill (vm, node, rxq, 1 /* use_va_dma */ );
   else
-    avf_rxq_refill (vm, node, rxq, 0 /* use_iova */ );
+    avf_rxq_refill (vm, node, rxq, 0 /* use_va_dma */ );
 
   vlib_get_buffers (vm, buffer_indices, bufs, n_rxv);
   n_rx_packets = n_rxv;