1 files changed, 37 insertions, 3 deletions

diff --git a/test/PAUnitTest/src/tests/test10.c b/test/PAUnitTest/src/tests/test10.c
index 5ba898e..9fcf920 100644
--- a/test/PAUnitTest/src/tests/test10.c
+++ b/test/PAUnitTest/src/tests/test10.c
@@ -121,6 +121,8 @@
  #define Q_IP_REASSM2             7             /* IP Reassembly Input Queue 2 (Inner IP) */

 

  #define Q_IP_FRAG           13     /* IP Fragmentation */

+ #define Q_BOUNCE_DDR        21     /* Queue Bounce DDR queue */

+ #define Q_BOUNCE_MSMC       22     /* Queue Bounce MSMC queue */

 

 #include "test10pkts.h"

 

@@ -244,6 +246,22 @@ static paPacketControlConfig_t  t10PktCtrlCfg =
             0                   /* txPaddingStatsIndex */

         };

 

+static  paQueueBounceConfig_t t10QueueBounceCfg =

+                {

+                    1,      /* Enable */

+                Q_BOUNCE_DDR  + TF_FIRST_GEN_QUEUE,             /* ddrQueueId */

+                Q_BOUNCE_MSMC + TF_FIRST_GEN_QUEUE,             /* msmcQueueId */

+                TF_PA_TX_QUEUE_BASE,                            /* hwQueueBegin */

+                TF_PA_TX_QUEUE_BASE + NSS_NUM_TX_QUEUES - 1,    /* hwQueueEnd */

+                {

+                    pa_QUEUE_BOUNCE_OP_NONE,    /* Command Return */

+                    pa_QUEUE_BOUNCE_OP_NONE,    /* QoS mode */

+                    pa_QUEUE_BOUNCE_OP_NONE,    /* Capture Capture */

+                    pa_QUEUE_BOUNCE_OP_DDR,     /* IP Reassembly-assisted packets */

+                    pa_QUEUE_BOUNCE_OP_NONE     /* All traffics */

+                }

+                };

+

 #ifdef NSS_GEN2

 

 static  paRaGroupConfig_t t10OutRaGroupCfg =

@@ -324,6 +342,7 @@ static  paSysConfig_t  t10GlobalCfg =
             &t10UsrStatsCfg,    /* pUsrStatsConfig */

             NULL,               /* pQueueDivertConfig */

             NULL,               /* pPktControl */

+            &t10QueueBounceCfg, /* pQueueBounceConfig */

             NULL,               /* pOutAclConfig */

             NULL,               /* pInAclConfig */

             #ifdef NSS_GEN2

@@ -345,6 +364,7 @@ static  paSysConfig_t  t10GlobalCfg2 =
             NULL,               /* pUsrStatsConfig */

             NULL,               /* pQueueDivertConfig */

             &t10PktCtrlCfg,     /* pPktControl */

+            NULL,               /* pQueueBounceConfig */

             NULL,               /* pOutAclConfig */

             NULL,               /* pInAclConfig */

             NULL,               /* pOutIpRaGroupConfig */

@@ -1013,7 +1033,7 @@ static void t10UpdatesStats(paSysStats_t *stats, int pktIndex, uint16_t pktLen,
             stats->classify1.nPackets += numFrags;

     }

 }

-

+#ifndef PA_USE_HW_RA

 #ifndef SIMULATOR_SUPPORT

 static void t10IpRreassemTimeoutUpdatesStats(paSysStats_t *stats, uint32_t count)

 {

@@ -1024,6 +1044,7 @@ static void t10IpRreassemTimeoutUpdatesStats(paSysStats_t *stats, uint32_t count
 

 }

 #endif

+#endif

 

 #if 0

 

@@ -1386,6 +1407,7 @@ static void t10SendDataPkts (t10TestEncap_t *tencap, int nL4Handles, int group,
         }

 

 }

+#ifndef PA_USE_HW_RA

 

 #define MAX_RX_FRAGS_PER_CALL       20

 

@@ -1398,6 +1420,7 @@ static int t10RxFrags(t10TestEncap_t *tencap, Qmss_QueueHnd inQ, Qmss_QueueHnd o
 

     q.qMgr = 0;

         q.qNum = TF_DEF_RET_Q;

+

         /* Process the received fragments */

         while ((Qmss_getQueueEntryCount(inQ) > 0) && (fragCnt < MAX_RX_FRAGS_PER_CALL))  {

 

@@ -1510,7 +1533,7 @@ static int t10RxFrags(t10TestEncap_t *tencap, Qmss_QueueHnd inQ, Qmss_QueueHnd o
 

     return (0);

 }

-

+#endif

 

 /* Search the receive data packet queue for received data packets. Remain in

  * this function until all buffers are restored to their respective queues */

@@ -1525,12 +1548,17 @@ static int t10ReceiveDataPkts (t10TestEncap_t *tencap, int expCount)
         uint32_t                          flags;

     unsigned int              eflags;

     int               count = 0;

-

+#ifndef PA_USE_HW_RA

+    int               ddrBounceCount=0;

+#endif

 

         for (i = 0; i < 100; i++)  {

 

         utilCycleDelay (5000);

 

+#ifndef PA_USE_HW_RA

+        testCommonRelayQueueBouncePkts (tencap->tf, tfName, Q_BOUNCE_DDR, Q_BOUNCE_MSMC, &ddrBounceCount, NULL);

+

         /* Process OutIp fragments */

         if (t10RxFrags(tencap, tencap->tf->QGen[Q_IP_REASSM1], tencap->tf->QPaTx[TF_PA_Q_OUTER_IP], &expCount))

         {

@@ -1544,6 +1572,7 @@ static int t10ReceiveDataPkts (t10TestEncap_t *tencap, int expCount)
             return (-1);

         }

 

+#endif

             /* Look for packets in the rx packet queue, verify that the UDP port found matches the next value in

             * the fifo, then verify the receive packet information */

             while (Qmss_getQueueEntryCount(tencap->tf->QGen[Q_MATCH]) > 0)  {

@@ -1627,6 +1656,7 @@ static int t10ReceiveDataPkts (t10TestEncap_t *tencap, int expCount)
                 return (-1);

         }

 

+

         /* Since the packets went to the modify PDSP and then back to the QM, a descriptor

          * and linked buffer was required while the packet was in the QM. This will

          * be recycled to the default recycle queue */

@@ -1641,6 +1671,10 @@ static int t10ReceiveDataPkts (t10TestEncap_t *tencap, int expCount)
 

         }

 

+#ifndef PA_USE_HW_RA

+    if(ddrBounceCount != count)

+        System_printf("t10ReceiveDataPkts: receives %d queue bounce packets and %d final reassembled packets\n", ddrBounceCount, count);

+#endif

         return (0);

 

 }