fixed firmware invalid state issue for v0(k2hk/c6678)

1 files changed, 16 insertions, 12 deletions

diff --git a/fw/v0/classify1.p b/fw/v0/classify1.p
index 0cd8e2a..e6d0e2f 100644
--- a/fw/v0/classify1.p
+++ b/fw/v0/classify1.p
@@ -238,7 +238,7 @@ l_mainLoop00_ipReassem_4:
         

         // clear command flag

         mov  r1, 0

-            sbco  r1, FIRMWARE_MBOX, FIRMWARE_CMD_IP_REASSEM_CFG_OFFSET, 4

+        sbco  r1, FIRMWARE_MBOX, FIRMWARE_CMD_IP_REASSEM_CFG_OFFSET, 4

         

 #endif

         // pass through

@@ -248,7 +248,7 @@ l_mainLoop001:
    // Look for command (FIRMWARE_CMD_PKT_CTRL_CFG only) 

     qbbc l_mainLoop002, s_flags.info.tStatus_Command3

         // Process Packet Verification Configuration Update

-            lbco  r1, FIRMWARE_MBOX, FIRMWARE_CMD_PKT_CTRL_CFG_OFFSET, 4

+        lbco  r1, FIRMWARE_MBOX, FIRMWARE_CMD_PKT_CTRL_CFG_OFFSET, 4

         

         // Clear the valid bit fields 

         not r1.b2, r1.b1

@@ -263,7 +263,7 @@ l_mainLoop001:
 

         // clear the command flag

         mov   r1, 0           

-            sbco  r1, FIRMWARE_MBOX, FIRMWARE_CMD_PKT_CTRL_CFG_OFFSET, 4

+        sbco  r1, FIRMWARE_MBOX, FIRMWARE_CMD_PKT_CTRL_CFG_OFFSET, 4

         

         // pass through       

 

@@ -347,14 +347,16 @@ l_mainLoop3:
 l_mainLoop4:

             // write to the status register

             set s_statsFlags.event.t_nInvalidState

-

-

+            // Discard the packet held that caused invalid state

+            mov s_cdeCmdPkt.operation, CDE_CMD_HPKT_DISCARD

+            xout XID_CDECTRL, s_cdeCmdPkt, SIZE(s_cdeCmdPkt)

 

         // if ( (pendingConfig == FALSE) && (newPacket == TRUE) ) then parse

 l_mainLoop5:

     qbbs  fci_mainLoop6, s_runCxt.flags.t_pendingConfig

+      qbbs  fci_mainLoop6, s_runCxt.flags.t_fakeLookup       

         qbbs f_c1Parse,  s_flags.info.tStatus_CDENewPacket

-

+
         // if (  (pendingConfig == TRUE) && (Lut1Busy == FALSE) ) then complete modify

 fci_mainLoop6:

     qbbc  fci_mainLoop7,  s_runCxt.flags.t_pendingConfig

@@ -536,7 +538,7 @@ l_c1ForwardHeldPacketMatch0:
     .using  cdeScope

     .using  pktScope

     .using  usrStatsFifoScope

-        

+

 f_stdHeldPktForward:

     // Record the effective packet size for user statistics update

     // It will casue 3 cycles for all forwarding packets regardless of statistics update or not

@@ -755,7 +757,7 @@ l_stdHeldPktForward1_no_priority:
         qbeq l_stdHeldPktForward9,  s_matchRxCmdHdr.cmd, PA_RX_CMD_CMDSET_USR_STATS

         qbbs l_stdHeldPktForward2,  s_matchForward_host.ctrlBitMap.t_pa_multiroute

 l_stdHeldPktForward_normal_host_route:

-                // Normal host route: no special operation is required

+            // Normal host route: no special operation is required

             // Send the packet on its way

             ldi  r4,  CDE_CMD_HPKT_RELEASE | ((CDE_FLG_SET_THREADID | CDE_FLG_SET_FLOWID | CDE_FLG_SET_DESTQUEUE | CDE_FLG_SET_PSINFO) << 8) 

             mov  s_cdeCmdPkt.threadId,    PA_DEST_CDMA

@@ -1536,9 +1538,9 @@ f_c1Parse:
 

     set s_statsFlags.event.t_nPackets

 

-        lbco  r1, FIRMWARE_MBOX, 0, 4

-        add   r1, r1, 1

-        sbco  r1, FIRMWARE_MBOX, 0, 4

+    lbco  r1, FIRMWARE_MBOX, 0, 4

+    add   r1, r1, 1

+    sbco  r1, FIRMWARE_MBOX, 0, 4

 

     // Read the descriptor

     xin  XID_CDEDATA,   s_pktDescr,   SIZE(s_pktDescr)

@@ -1978,6 +1980,8 @@ l_c1Parse19:
            mov  s_cdeCmdPkt.operation,   CDE_CMD_PACKET_ADVANCE

            mov  s_cdeCmdPkt.optionsFlag, CDE_FLG_HOLD_PACKET

            xout XID_CDECTRL,             s_cdeCmdPkt,              SIZE(s_cdeCmdPkt)

+           // Wait for the held packet to appear in the CDE

+           wbs   s_flags.info.tStatus_CDEHeldPacket

            qbbs  l_c1Parse15, s_runCxt.flags.t_activeLookup

            jmp  fci_mainLoop6

             

@@ -1992,7 +1996,7 @@ l_c1Parse19:
 f_c1LocalInit:

 

      // Clear the LUT table of all 64 entries

-        .using lut1Scope

+     .using lut1Scope

      

      mov  r3, 0

 l_c1LocalInitD: