1 files changed, 206 insertions, 98 deletions
diff --git a/src/v1/pa.c b/src/v1/pa.c
index a08bf43..7bef36a 100644
--- a/src/v1/pa.c
+++ b/src/v1/pa.c
@@ -423,7 +423,57 @@ static int  pa_verify_usr_stats(paInst_t *paInst, int32_t cntIndex, int fCache)
    }
    return (ret);
 } /* pa_verify_usr_stats */
+/*******************************************************************************************
+ * FUNCTION PURPOSE: Derive the destination queue Id
+ *******************************************************************************************
+ * DESCRIPTION: This function is used to derive the destination queue Id with the embedded
+ *              control bits based on the input queue Id, the Queue Bounce configuration
+ *              and the traffic class associated with the originated API.
+ *
+ *  return queueId with embedded control bits
+ *
+ ********************************************************************************************/
+static uint16_t  pa_convert_queue_id(paInst_t *paInst, int routingClass, uint16_t queue)
+{
+    paQueueBounceConfig_t* pQueueBounceCfg = &paInst->cfg.queueBounceConfig;
+    uint16_t queueBounceCtrlType = queue >> pa_QUEUE_BOUNCE_CTRL_LOC;
+    uint16_t queueNum = queue & pa_QUEUE_BOUNCE_QUEUE_MASK;
+    if (!pQueueBounceCfg->enable)
+    {
+        return(queueNum);
+    }
+    if ((queueNum >= pQueueBounceCfg->hwQueueBegin) &&
+       (queueNum <= pQueueBounceCfg->hwQueueEnd))
+    {
+        /* It is a hardware queue, queue bounce is not required */
+        return(queueNum);
+    }
+    if (queueBounceCtrlType == pa_QUEUE_BOUNCE_CTRL_DEFAULT)
+    {
+        /*
+        * Error check is not required here because routingClass is set by internal
+        * function and the range check of default operation mode has been performed
+        * at Queue Bounce Configuration time
+        */
+        uint16_t defOp = pQueueBounceCfg->defOp[routingClass];
+        return(queueNum | (defOp << pa_QUEUE_BOUNCE_CTRL_LOC));
+    }
+    else if ((queueBounceCtrlType == pa_QUEUE_BOUNCE_CTRL_DDR) ||
+             (queueBounceCtrlType == pa_QUEUE_BOUNCE_CTRL_MSMC))
+    {
+        return(queue);
+    }
+    else /* pa_QUEUE_BOUNCE_CTRL_NONE */
+    {
+        return(queueNum);
+    }
+}
 /*************************************************************************
 * FUNCTION PURPOSE: Convert RouteInfo 
 ************************************************************************* 
@@ -666,7 +716,7 @@ static void pa_format_lut2ParamDesc(paLut2ParamDesc *params,
 *              firmware forward information
 * Returns FALSE if error occurs
 *************************************************************************/
-static paReturn_t pa_conv_routing_info2 (paInst_t *paInst, pafrmForward_t *fwdInfo, paRouteInfo2_t *routeInfo, int cmdDest, uint16_t failRoute, uint16_t destPdsp, uint8_t paFlags)
+static paReturn_t pa_conv_routing_info2 (paInst_t *paInst, pafrmForward_t *fwdInfo, paRouteInfo2_t *routeInfo, int cmdDest, uint16_t failRoute, uint16_t destPdsp, uint8_t paFlags, int routingClass)
 {
  /*
@@ -680,9 +730,7 @@ static paReturn_t pa_conv_routing_info2 (paInst_t *paInst, pafrmForward_t *fwdIn
  uint8_t psFlags = 0;                                    
  uint8_t *pCmd = fwdInfo->u.host.cmd;
  int     fcmdSetNotSupport = FALSE;
-  
+  uint16_t queue = routeInfo->queue;
-  fwdInfo->flowId = routeInfo->flowId;
-  fwdInfo->queue = SWIZ(routeInfo->queue);
  
  if ((routeInfo->dest == pa_DEST_HOST) || (routeInfo->dest == pa_DEST_EMAC)) {
    if (routeInfo->validBitMap & pa_ROUTE_INFO_VALID_PKTTYPE_EMAC) 
@@ -703,10 +751,12 @@ static paReturn_t pa_conv_routing_info2 (paInst_t *paInst, pafrmForward_t *fwdIn
      if(routeInfo->priorityType == pa_ROUTE_PRIORITY_VLAN)
      {
        fwdInfo->u.host.ctrlBitMap   |= PAFRM_ROUTING_PRIORITY_VLAN_ENABLE;
+        routingClass = pa_QUEUE_BOUNCE_ROUTING_CLASS_QoS;
      }
      else if(routeInfo->priorityType == pa_ROUTE_PRIORITY_DSCP)
      {
        fwdInfo->u.host.ctrlBitMap   |= PAFRM_ROUTING_PRIORITY_DSCP_ENABLE;
+        routingClass = pa_QUEUE_BOUNCE_ROUTING_CLASS_QoS;
      }
      else if (routeInfo->priorityType ==  pa_ROUTE_INTF)
      {
@@ -728,6 +778,7 @@ static paReturn_t pa_conv_routing_info2 (paInst_t *paInst, pafrmForward_t *fwdIn
           
        fwdInfo->u.host.ctrlBitMap   |= (PAFRM_ROUTING_IF_DEST_SELECT_ENABLE |
                                         PAFRM_ROUTING_FLOW_EQOS_IF_ENABLE);
+        routingClass = pa_QUEUE_BOUNCE_ROUTING_CLASS_QoS;
      }
      else
      {
@@ -735,6 +786,8 @@ static paReturn_t pa_conv_routing_info2 (paInst_t *paInst, pafrmForward_t *fwdIn
      }
    }
+    queue = pa_convert_queue_id(paInst, routingClass, queue);
    if (routeInfo->validBitMap & pa_ROUTE_INFO_VALID_MROUTEINDEX)  {
      if (routeInfo->mRouteIndex >= pa_MAX_MULTI_ROUTE_SETS) {
        return (pa_ERR_CONFIG);
@@ -865,6 +918,9 @@ static paReturn_t pa_conv_routing_info2 (paInst_t *paInst, pafrmForward_t *fwdIn
    return (pa_ERR_CONFIG);
  }
  
+  fwdInfo->flowId = routeInfo->flowId;
+  fwdInfo->queue = SWIZ(queue);
  if (pCmd && (routeInfo->validBitMap & pa_ROUTE_INFO_VALID_PCMD))  {
  
    paCmdInfo_t* paCmd = routeInfo->pCmd;
@@ -941,13 +997,13 @@ static paReturn_t pa_conv_routing_info2 (paInst_t *paInst, pafrmForward_t *fwdIn
 *              firmware forward information
 * Returns FALSE if error occurs
 *************************************************************************/
-static paReturn_t pa_conv_routing_info (paInst_t *paInst, pafrmForward_t *fwdInfo, paRouteInfo_t *routeInfo, int cmdDest, uint16_t failRoute, uint16_t destPdsp)
+static paReturn_t pa_conv_routing_info (paInst_t *paInst, pafrmForward_t *fwdInfo, paRouteInfo_t *routeInfo, int cmdDest, uint16_t failRoute, uint16_t destPdsp, int routingClass)
 {
  paRouteInfo2_t routeInfo2; 
  
  pa_convert_routeInfo_to_routeInfo2(routeInfo, &routeInfo2);
  
-  return(pa_conv_routing_info2(paInst, fwdInfo, &routeInfo2, cmdDest, failRoute, destPdsp, 0));
+  return(pa_conv_routing_info2(paInst, fwdInfo, &routeInfo2, cmdDest, failRoute, destPdsp, 0, routingClass));
    
 } /* pa_conv_routing_info */
@@ -1075,7 +1131,7 @@ static paReturn_t pa_set_emac_port_cfg_frm_cmd(
      {
        /* Obtain the information from the configuration */
        capturePort = pktCapCfg[i].portToBeCaptured;
-        queue       = pktCapCfg[i].queue;
+        queue       = pa_convert_queue_id(paInst, pa_QUEUE_BOUNCE_ROUTING_CLASS_CAPTURE, pktCapCfg[i].queue);
        flow        = pktCapCfg[i].flowId;
        swInfo0     = pktCapCfg[i].swInfo0;
        
@@ -1208,7 +1264,7 @@ static paReturn_t pa_set_emac_port_cfg_frm_cmd(
        /* store multi cast default route information if enabled */
        if (ctrlBitMap & pa_EMAC_IF_DEFAULT_ROUTE_MC_ENABLE)
        {
-          retCode = pa_conv_routing_info2 (paInst, &pDefRoutefrmCfg->routeCfg[i].dRoute[pa_DROUTE_MULTICAST], &pDefRouteCfg[i].dRouteInfo[pa_DROUTE_MULTICAST], pa_CMD_TX_DEST_0, TRUE, 0, 0);
+          retCode = pa_conv_routing_info2 (paInst, &pDefRoutefrmCfg->routeCfg[i].dRoute[pa_DROUTE_MULTICAST], &pDefRouteCfg[i].dRouteInfo[pa_DROUTE_MULTICAST], pa_CMD_TX_DEST_0, TRUE, 0, 0, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);
          /* Error checking */
          if (retCode != pa_OK)
            return (retCode);
@@ -1216,7 +1272,7 @@ static paReturn_t pa_set_emac_port_cfg_frm_cmd(
        /* Store broad cast default route information if enabled */
        if (ctrlBitMap & pa_EMAC_IF_DEFAULT_ROUTE_BC_ENABLE)
        {
-          retCode = pa_conv_routing_info2 (paInst, &pDefRoutefrmCfg->routeCfg[i].dRoute[pa_DROUTE_BROADCAST], &pDefRouteCfg[i].dRouteInfo[pa_DROUTE_BROADCAST], pa_CMD_TX_DEST_0, TRUE, 0, 0);
+          retCode = pa_conv_routing_info2 (paInst, &pDefRoutefrmCfg->routeCfg[i].dRoute[pa_DROUTE_BROADCAST], &pDefRouteCfg[i].dRouteInfo[pa_DROUTE_BROADCAST], pa_CMD_TX_DEST_0, TRUE, 0, 0, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);
          /* Error checking */
          if (retCode != pa_OK)
            return (retCode);        
@@ -1224,7 +1280,7 @@ static paReturn_t pa_set_emac_port_cfg_frm_cmd(
        if (ctrlBitMap & pa_EMAC_IF_DEFAULT_ROUTE_UC_ENABLE)
        {
-          retCode = pa_conv_routing_info2 (paInst, &pDefRoutefrmCfg->routeCfg[i].dRoute[pa_DROUTE_NO_MATCH], &pDefRouteCfg[i].dRouteInfo[pa_DROUTE_NO_MATCH], pa_CMD_TX_DEST_0, TRUE, 0, 0);
+          retCode = pa_conv_routing_info2 (paInst, &pDefRoutefrmCfg->routeCfg[i].dRoute[pa_DROUTE_NO_MATCH], &pDefRouteCfg[i].dRouteInfo[pa_DROUTE_NO_MATCH], pa_CMD_TX_DEST_0, TRUE, 0, 0, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);
          /* Error checking */
          if (retCode != pa_OK)
            return (retCode);        
@@ -1315,7 +1371,7 @@ static paReturn_t pa_set_emac_port_cfg_frm_cmd(
 * DESCRIPTION: Clear and construct the firmware command header
 * Returns pointer to the firmware command
 *************************************************************************/
-static pafrmCommand_t* pa_format_fcmd_header (void *pCmd, paCmdReply_t *reply, uint8_t cmd, uint16_t comId, uint8_t firstPdsp, uint16_t cmdSize)
+static pafrmCommand_t* pa_format_fcmd_header (paInst_t *paInst, void *pCmd, paCmdReply_t *reply, uint8_t cmd, uint16_t comId, uint8_t firstPdsp, uint16_t cmdSize)
 {
  pafrmCommand_t *fcmd = (pafrmCommand_t *) pCmd;
  
@@ -1327,7 +1383,7 @@ static pafrmCommand_t* pa_format_fcmd_header (void *pCmd, paCmdReply_t *reply, u
  fcmd->magic         = PAFRM_CONFIG_COMMAND_SEC_BYTE;
  fcmd->comId         = SWIZ(comId);
  fcmd->retContext    = SWIZ(reply->replyId);
-  fcmd->replyQueue    = SWIZ(reply->queue);
+  fcmd->replyQueue    = SWIZ(pa_convert_queue_id(paInst, pa_QUEUE_BOUNCE_ROUTING_CLASS_CMD_RET, reply->queue));
  fcmd->flowId        = SWIZ(reply->flowId);
  
  return(fcmd);
@@ -2086,7 +2142,7 @@ Pa_addMac2_send_cmd:
  *handle = (paLnkHandle_t)pa_CONV_BASE_TO_OFFSET(paLObj.cfg.instPoolBaseAddr,&l2Table[i]);
  /* Create the command */
-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_ADDREP_LUT1, PA_COMID_L2  | i, 0, csize);
+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_ADDREP_LUT1, PA_COMID_L2  | i, 0, csize);
  /* Validity of the destination was already checked (HOST), so no other cases 
   * must be considered */
@@ -2192,14 +2248,14 @@ Pa_addMac2_send_cmd:
  al1->bitMask  = SWIZ(bitMask);
  /* Forwarding information */
-  ret1 = pa_conv_routing_info2(paInst, &al1->match, routeInfo, pa_CMD_TX_DEST_0, FALSE, 0, 0);
+  ret1 = pa_conv_routing_info2(paInst, &al1->match, routeInfo, pa_CMD_TX_DEST_0, FALSE, 0, 0, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);
  if (ret1 != pa_OK) {
    ret = ret1;
    goto Pa_addMac2_end;
  }
  /* Next fail information */
-  ret1 = pa_conv_routing_info2(paInst, &al1->nextFail, nextRtFail, pa_CMD_TX_DEST_0, TRUE, 0, 0);
+  ret1 = pa_conv_routing_info2(paInst, &al1->nextFail, nextRtFail, pa_CMD_TX_DEST_0, TRUE, 0, 0, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);
  if (ret1 != pa_OK) {
    ret = ret1;
    goto Pa_addMac2_end;
@@ -2500,7 +2556,7 @@ Pa_addSrio_send_cmd:
  *handle = (paHandleL2L3_t)pa_CONV_BASE_TO_OFFSET(paLObj.cfg.instPoolBaseAddr,&l2Table[i]);
  /* Create the command */
-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_ADDREP_LUT1, PA_COMID_L2  | i, 0, csize);
+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_ADDREP_LUT1, PA_COMID_L2  | i, 0, csize);
  /* Validity of the destination was already checked (HOST), so no other cases 
   * must be considered */
@@ -2574,14 +2630,14 @@ Pa_addSrio_send_cmd:
  al1->bitMask  = SWIZ(bitMask);
  /* Forwarding information */
-  ret1 = pa_conv_routing_info(paInst, &al1->match, routeInfo, pa_CMD_TX_DEST_0, FALSE, 0);
+  ret1 = pa_conv_routing_info(paInst, &al1->match, routeInfo, pa_CMD_TX_DEST_0, FALSE, 0, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);
  if (ret1 != pa_OK) {
    ret = ret1; 
    goto Pa_addSrio_end;                 
  }
  /* Next fail information */
-  ret1 = pa_conv_routing_info(paInst, &al1->nextFail, nextRtFail, pa_CMD_TX_DEST_0, TRUE, 0);
+  ret1 = pa_conv_routing_info(paInst, &al1->nextFail, nextRtFail, pa_CMD_TX_DEST_0, TRUE, 0, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);
  if (ret != pa_OK) {
    ret = ret1;
    goto Pa_addSrio_end;                 
@@ -2756,7 +2812,7 @@ paReturn_t Pa_delHandle (Pa_Handle       iHandle,
  /* Create the command */
  if (fDelLnk)
  {
-    fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_MULTI_CMDS, 0, pdsp, csize);
+    fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_MULTI_CMDS, 0, pdsp, csize);
    cmdHdr = (pafrmCommandCmdHdr_t *) &(fcmd->cmd);
    cmdHdr->command = PAFRM_CONFIG_COMMAND_DEL_LUT1;
    cmdHdr->offset =  sizeof(pafrmCommand_t)+sizeof(pafrmCommandDelLut1_t)+sizeof(pafrmCommandCmdHdr_t)-sizeof(uint32_t);
@@ -2768,7 +2824,7 @@ paReturn_t Pa_delHandle (Pa_Handle       iHandle,
  }
  else
  {
-    fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_DEL_LUT1, comId, pdsp, csize);
+    fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_DEL_LUT1, comId, pdsp, csize);
    del = (pafrmCommandDelLut1_t *)&(fcmd->cmd);
    del->index = SWIZ((uint16_t)hdr->lutIdx);
  }  
@@ -2926,7 +2982,7 @@ paReturn_t Pa_delAclHandle (Pa_Handle       iHandle,
  }
  
  /* Create the command */
-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_DEL_LUT1, comId, pdsp, csize);
+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_DEL_LUT1, comId, pdsp, csize);
  del = (pafrmCommandDelLut1_t *)&(fcmd->cmd);
  del->index = SWIZ((uint16_t) hdr->lutIdx);
  
@@ -3032,7 +3088,7 @@ paReturn_t Pa_delEoamHandle (Pa_Handle       iHandle,
  }
  
  /* Create the command */
-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_DEL_LUT1, comId, pdsp, csize);
+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_DEL_LUT1, comId, pdsp, csize);
  del = (pafrmCommandDelLut1_t *)&(fcmd->cmd);
  del->index = SWIZ((uint16_t) hdr->lutIdx);
  
@@ -3123,7 +3179,7 @@ paReturn_t Pa_delFcHandle (Pa_Handle       iHandle,
  *cmdDest = pa_CMD_TX_DEST_6;
  
  /* Create the command */
-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_DEL_LUT1, comId, 0, csize);
+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_DEL_LUT1, comId, 0, csize);
  del = (pafrmCommandDelLut1_t *)&(fcmd->cmd);
  del->index = SWIZ((uint16_t) hdr->lutIdx);
  
@@ -4111,7 +4167,7 @@ Pa_addIp2_send_cmd:
  /* Create the command */                            
  if (fl3Entry2)
  {
-    fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_MULTI_CMDS, 0, 0, csize);
+    fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_MULTI_CMDS, 0, 0, csize);
    cmdHdr = (pafrmCommandCmdHdr_t *) &(fcmd->cmd);
    cmdHdr->command = PAFRM_CONFIG_COMMAND_ADDREP_LUT1;
    cmdHdr->offset =  sizeof(pafrmCommand_t)+sizeof(pafrmCommandAddLut1_t)+sizeof(pafrmCommandCmdHdr_t)-sizeof(uint32_t);
@@ -4123,7 +4179,7 @@ Pa_addIp2_send_cmd:
  }
  else
  {
-    fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_ADDREP_LUT1, PA_COMID_L3  | i, firstPdsp, csize);
+    fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_ADDREP_LUT1, PA_COMID_L3  | i, firstPdsp, csize);
    al1  = (pafrmCommandAddLut1_t *) &(fcmd->cmd);
  } 
@@ -4319,14 +4375,14 @@ Pa_addIp2_send_cmd:
    nfRoute = nextRtFail;
  }
  
-  ret1 = pa_conv_routing_info2(paInst, &al1->match, mRoute, *cmdDest, FALSE, firstPdsp, 0);
+  ret1 = pa_conv_routing_info2(paInst, &al1->match, mRoute, *cmdDest, FALSE, firstPdsp, 0, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);
  if (ret1 != pa_OK) {
      ret = ret1;
      goto Pa_addIp2_end;
  }
  /* Next fail information */
-  ret1 = pa_conv_routing_info2(paInst, &al1->nextFail, nfRoute, *cmdDest, TRUE, firstPdsp, 0);
+  ret1 = pa_conv_routing_info2(paInst, &al1->nextFail, nfRoute, *cmdDest, TRUE, firstPdsp, 0, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);
  if (ret1 != pa_OK) {
      ret = ret1;
      goto Pa_addIp2_end;
@@ -4395,14 +4451,14 @@ Pa_addIp2_send_cmd:
    al1->CBWords1 = SWIZ(CBWords1); 
    al1->priority = SWIZ(priority);  
    
-    ret1 = pa_conv_routing_info2(paInst, &al1->match, routeInfo, *cmdDest, FALSE, 1, 0);
+    ret1 = pa_conv_routing_info2(paInst, &al1->match, routeInfo, *cmdDest, FALSE, 1, 0, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);
    if (ret1 != pa_OK) {
        ret = ret1;
        goto Pa_addIp2_end;
    }
    /* Next fail information */
-    ret1 = pa_conv_routing_info2(paInst, &al1->nextFail, nextRtFail, *cmdDest, TRUE, 1, 0);
+    ret1 = pa_conv_routing_info2(paInst, &al1->nextFail, nextRtFail, *cmdDest, TRUE, 1, 0, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);
    if (ret1 != pa_OK) {
        ret = ret1;
        goto Pa_addIp2_end;
@@ -4590,7 +4646,7 @@ Pa_addEoamFlow_send_cmd:
  *handle = (paHandleEoam_t)pa_CONV_BASE_TO_OFFSET(paLObj.cfg.instPoolBaseAddr,&eoamTable[i]);
  /* Create the command */
-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_ADDREP_LUT1, PA_COMID_EOAM  | i, 1, csize);
+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_ADDREP_LUT1, PA_COMID_EOAM  | i, 1, csize);
  /* Validity of the destination was already checked (HOST), so no other cases 
   * must be considered */
@@ -5020,7 +5076,7 @@ paReturn_t  Pa_addAcl  (Pa_Handle          iHandle,
  *retHandle =  (paHandleAcl_t)pa_CONV_BASE_TO_OFFSET(paLObj.cfg.instPoolBaseAddr,&(aclTable[i]));
  /* Create the command */                            
-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_ADDREP_LUT1, PA_COMID_ACL  | i, firstPdsp, csize);
+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_ADDREP_LUT1, PA_COMID_ACL  | i, firstPdsp, csize);
  al1  = (pafrmCommandAddLut1_t *) &(fcmd->cmd);
  /* Validity of the destination was already checked (HOST), so no other cases 
@@ -5210,8 +5266,8 @@ paReturn_t  Pa_addAcl  (Pa_Handle          iHandle,
  }
  /* Insert the entry to the Link List */
-  ret1 = pa_insert_entry(listElemTable, paInst->nAcl, listInfoTable, insertMode,
+  ret1 = pa_insert_entry(listElemTable, paInst->nAcl, listInfoTable, insertMode,
-                         (paHandleAcl_t) (nextEntry?pa_CONV_BASE_TO_OFFSET(paLObj.cfg.instPoolBaseAddr,nextEntry):0),
+                         nextEntry?(paHandleAcl_t)pa_CONV_BASE_TO_OFFSET(paLObj.cfg.instPoolBaseAddr,nextEntry):0,
                         i, &priority, *retHandle);
  if (ret1 != pa_OK) {
@@ -5269,14 +5325,14 @@ paReturn_t  Pa_addAcl  (Pa_Handle          iHandle,
  
  nfRoute = &pauFailRoute;
  
-  ret1 = pa_conv_routing_info2(paInst, &al1->match, mRoute, *cmdDest, FALSE, firstPdsp, paFlags);
+  ret1 = pa_conv_routing_info2(paInst, &al1->match, mRoute, *cmdDest, FALSE, firstPdsp, paFlags, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);
  if (ret1 != pa_OK) {
      ret = ret1;
      goto Pa_addAcl_end;
  }
  
  /* Next fail information */
-  ret1 = pa_conv_routing_info2(paInst, &al1->nextFail, nfRoute, *cmdDest, TRUE, firstPdsp, 0);
+  ret1 = pa_conv_routing_info2(paInst, &al1->nextFail, nfRoute, *cmdDest, TRUE, firstPdsp, 0, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);
  if (ret1 != pa_OK) {
      ret = ret1;
      goto Pa_addAcl_end;
@@ -5538,7 +5594,7 @@ Pa_addFc_send_cmd:
  *retHandle =  (paHandleFc_t)pa_CONV_BASE_TO_OFFSET(paLObj.cfg.instPoolBaseAddr,&(fcTable[i]));
  /* Create the command */                            
-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_ADDREP_LUT1, PA_COMID_FC  | i, 0, csize);
+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_ADDREP_LUT1, PA_COMID_FC  | i, 0, csize);
  al1  = (pafrmCommandAddLut1_t *) &(fcmd->cmd);
  /* Validity of the destination was already checked (HOST), so no other cases 
@@ -5929,7 +5985,7 @@ paReturn_t  Pa_addPort2 (Pa_Handle        iHandle,
  }
  /* Create the command */   
-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_ADDREP_LUT2, 0, 1, csize);
+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_ADDREP_LUT2, 0, 1, csize);
  /* Validity of the destination was already checked (HOST), so no other cases 
   * must be considered */
@@ -5981,7 +6037,7 @@ paReturn_t  Pa_addPort2 (Pa_Handle        iHandle,
  al2->ctrlBitMap   = SWIZ(al2->ctrlBitMap);  
     
  /* Forwarding information */
-  ret1 = pa_conv_routing_info2(paInst, &al2->match, routeInfo, pa_CMD_TX_DEST_4, FALSE, 1, 0);
+  ret1 = pa_conv_routing_info2(paInst, &al2->match, routeInfo, pa_CMD_TX_DEST_4, FALSE, 1, 0, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);
  if (ret1 != pa_OK) {
    ret = ret1;
    goto Pa_addPort_end;
@@ -6029,6 +6085,8 @@ paReturn_t Pa_setCustomLUT1 ( Pa_Handle       iHandle,
  uint16_t                csize;
  pafrmCommand_t         *fcmd;
  pafrmCommandSysConfigPa_t *ccfg;
+  paInst_t              *paInst = (paInst_t *) pa_CONV_OFFSET_TO_BASE(paLObj.cfg.instPoolBaseAddr, iHandle);
+  uint32_t               mtCsKey;
  
  if((byteMasks == NULL) || (cmd == NULL) || (cmdSize == NULL) || (reply == NULL) || (cmdDest == NULL))
  {
@@ -6054,8 +6112,12 @@ paReturn_t Pa_setCustomLUT1 ( Pa_Handle       iHandle,
  if (reply->dest != pa_DEST_HOST)
    return (pa_INVALID_CMD_REPLY_DEST);
+  /* Refresh PA Instance */
+  Pa_osalMtCsEnter(&mtCsKey);
+  Pa_osalBeginMemAccess (paInst, sizeof(paInst_t));
  /* Create the command */
-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_SYS_CONFIG, 0, 0, csize);
+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_SYS_CONFIG, 0, 0, csize);
  /* Validity of the destination was already checked (HOST), so no other cases 
   * must be considered */
@@ -6074,6 +6136,9 @@ paReturn_t Pa_setCustomLUT1 ( Pa_Handle       iHandle,
  /* Any PDSP can be used to handle the command. POST PDSP0 is chosen
   * since it is typically lightly loaded */
  *cmdDest = pa_CMD_TX_DEST_5;
+  Pa_osalEndMemAccess (paInst, sizeof(paInst_t));
+  Pa_osalMtCsExit(mtCsKey);
  return (pa_OK);
@@ -6244,7 +6309,7 @@ Pa_addCustomLut1_send_cmd:
  *retHandle = (paHandleL2L3_t)pa_CONV_BASE_TO_OFFSET(paLObj.cfg.instPoolBaseAddr,&l3Table[i]);
  /* Create the command */
-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_ADDREP_LUT1, PA_COMID_L3 | i, 0, csize);
+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_ADDREP_LUT1, PA_COMID_L3 | i, 0, csize);
  /* Validity of the destination was already checked (HOST), so no other cases 
   * must be considered */
@@ -6326,14 +6391,14 @@ Pa_addCustomLut1_send_cmd:
  }    
  
  /* Forwarding information */
-  ret1 = pa_conv_routing_info(paInst, &al1->match, routeInfo, *cmdDest, FALSE, 0);
+  ret1 = pa_conv_routing_info(paInst, &al1->match, routeInfo, *cmdDest, FALSE, 0, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);
  if (ret1 != pa_OK) {
    ret = ret1;
    goto Pa_addCustomLUT1_end;
  }
  /* Next fail information */
-  ret1 = pa_conv_routing_info(paInst, &al1->nextFail, nextRtFail, *cmdDest, TRUE, 0);
+  ret1 = pa_conv_routing_info(paInst, &al1->nextFail, nextRtFail, *cmdDest, TRUE, 0, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);
  if (ret1 != pa_OK) {
    ret = ret1;
    goto Pa_addCustomLUT1_end;
@@ -6383,6 +6448,8 @@ paReturn_t Pa_setCustomLUT2 ( Pa_Handle       iHandle,
                              paCmdReply_t   *reply,
                              int            *cmdDest )
 {
+  paInst_t              *paInst = (paInst_t *) pa_CONV_OFFSET_TO_BASE(paLObj.cfg.instPoolBaseAddr, iHandle);
+  uint32_t               mtCsKey;
  uint16_t                csize;
  pafrmCommand_t         *fcmd;
  pafrmCommandSysConfigPa_t *ccfg;
@@ -6414,8 +6481,12 @@ paReturn_t Pa_setCustomLUT2 ( Pa_Handle       iHandle,
    if (byteOffsets[i] >= byteOffsets[i+1])
      return (pa_ERR_CONFIG);
+  /* Refresh PA Instance */
+  Pa_osalMtCsEnter(&mtCsKey);
+  Pa_osalBeginMemAccess (paInst, sizeof(paInst_t));
  /* Create the command */
-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_SYS_CONFIG, 0, 1, csize);
+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_SYS_CONFIG, 0, 1, csize);
  
  /* Validity of the destination was already checked (HOST), so no other cases 
   * must be considered */
@@ -6436,6 +6507,9 @@ paReturn_t Pa_setCustomLUT2 ( Pa_Handle       iHandle,
  /* LUT2 resides at Ingress4 PDSP1 */
  *cmdDest = pa_CMD_TX_DEST_4;
+  Pa_osalEndMemAccess (paInst, sizeof(paInst_t));
+  Pa_osalMtCsExit(mtCsKey);
  return (pa_OK);
 } /* Pa_setCustomLUT2 */
@@ -6541,7 +6615,7 @@ paReturn_t Pa_addCustomLUT2 ( Pa_Handle       iHandle,
  hl4->lnk = PAFRM_MK_SRC_VC(hdr->pdspNum, hdr->lutIdx);
  
  /* Create the command */   
-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_ADDREP_LUT2, 0, 1, csize);
+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_ADDREP_LUT2, 0, 1, csize);
  /* Validity of the destination was already checked (HOST), so no other cases 
   * must be considered */
@@ -6571,7 +6645,7 @@ paReturn_t Pa_addCustomLUT2 ( Pa_Handle       iHandle,
  al2->ctrlBitMap   = SWIZ(al2->ctrlBitMap);  
  /* Forwarding information */
-  ret1 = pa_conv_routing_info(paInst, &al2->match, routeInfo, pa_CMD_TX_DEST_4, FALSE, 1);
+  ret1 = pa_conv_routing_info(paInst, &al2->match, routeInfo, pa_CMD_TX_DEST_4, FALSE, 1, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);
  if (ret1 != pa_OK) {
    ret = ret1;
    goto Pa_addCustomLUT2_end;
@@ -6643,11 +6717,11 @@ paReturn_t Pa_delL4Handle (Pa_Handle      iHandle,
      (hl4->lnkType != PA_TABLE_ENTRY_TYPE_NONE))
    return (pa_INVALID_INPUT_HANDLE);
    
-  if (hl4->lnkType == PA_TABLE_ENTRY_TYPE_L3) {
+  /* Refresh PA Instance */
-    /* Refresh PA Instance */
+  Pa_osalMtCsEnter(&mtCsKey);
-    Pa_osalMtCsEnter(&mtCsKey);
+  Pa_osalBeginMemAccess (paInst, sizeof(paInst_t));
-    Pa_osalBeginMemAccess (paInst, sizeof(paInst_t));
  
+  if (hl4->lnkType == PA_TABLE_ENTRY_TYPE_L3) {
    /* Inform the host a table entry will be changed */ 
    Pa_osalBeginMemAccess ((void *) l3Table,
                           paInst->paBufs[PA_BUFFNUM_L3_TABLE].size);
@@ -6665,14 +6739,8 @@ paReturn_t Pa_delL4Handle (Pa_Handle      iHandle,
    Pa_osalEndMemAccess ((void *) l3Table,
                         paInst->paBufs[PA_BUFFNUM_L3_TABLE].size);
-    Pa_osalEndMemAccess (paInst, sizeof(paInst_t));
-    Pa_osalMtCsExit(mtCsKey);  
  }
  else if (hl4->lnkType == PA_TABLE_ENTRY_TYPE_VL)  {
-    /* Refresh PA Instance */
-    Pa_osalMtCsEnter(&mtCsKey);
-    Pa_osalBeginMemAccess (paInst, sizeof(paInst_t));
-  
    /* Inform the host a table entry will be changed */ 
    Pa_osalBeginMemAccess ((void *) vlnkTable,
                           paInst->paBufs[PA_BUFFNUM_VIRTUAL_LNK_TABLE].size);
@@ -6690,11 +6758,13 @@ paReturn_t Pa_delL4Handle (Pa_Handle      iHandle,
    Pa_osalEndMemAccess ((void *) vlnkTable,
                         paInst->paBufs[PA_BUFFNUM_VIRTUAL_LNK_TABLE].size);
-    Pa_osalEndMemAccess (paInst, sizeof(paInst_t));
+  }
-    Pa_osalMtCsExit(mtCsKey);  
-  }
+  Pa_osalEndMemAccess (paInst, sizeof(paInst_t));
+  Pa_osalMtCsExit(mtCsKey);
  /* Create the command */   
-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_DEL_LUT2, 0, 1, csize);
+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_DEL_LUT2, 0, 1, csize);
  /* Validity of the destination was already checked (HOST), so no other cases 
   * must be considered */
@@ -7117,8 +7187,12 @@ paReturn_t Pa_configExceptionRoute2(Pa_Handle       iHandle,
  if ((nRoute <= 0) || (nRoute > pa_EROUTE_MAX))
    return (pa_ERR_CONFIG);
+  /* Refresh PA Instance */
+  Pa_osalMtCsEnter(&mtCsKey);
+  Pa_osalBeginMemAccess (paInst, sizeof(paInst_t));
  /* Create the command */
-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_SYS_CONFIG, 0, 0, csize);
+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_SYS_CONFIG, 0, 0, csize);
  /* Validity of the destination was already checked (HOST, DISCARD), so no other cases 
   * must be considered */
@@ -7133,10 +7207,6 @@ paReturn_t Pa_configExceptionRoute2(Pa_Handle       iHandle,
  cpa->u.eroute.routeBitMap = 0;
  
-  /* Refresh PA Instance */
-  Pa_osalMtCsEnter(&mtCsKey);
-  Pa_osalBeginMemAccess (paInst, sizeof(paInst_t));
-  
  for (i = 0; i < nRoute; i++)  {
    if (  (eRoutes[i].dest != pa_DEST_HOST)    &&
@@ -7155,7 +7225,7 @@ paReturn_t Pa_configExceptionRoute2(Pa_Handle       iHandle,
    cpa->u.eroute.routeBitMap |=  (1 << routeTypes[i]);
    
-    retCode =  pa_conv_routing_info2 (paInst, &cpa->u.eroute.eRoute[routeTypes[i]], &eRoutes[i], pa_CMD_TX_DEST_5, FALSE, 0, 0);
+    retCode =  pa_conv_routing_info2 (paInst, &cpa->u.eroute.eRoute[routeTypes[i]], &eRoutes[i], pa_CMD_TX_DEST_5, FALSE, 0, 0, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);
    
    if(retCode != pa_OK)
      break;
@@ -7224,8 +7294,12 @@ paReturn_t Pa_configExceptionRouteCommon(Pa_Handle       iHandle,
  if (nRoute <= 0)
    return (pa_ERR_CONFIG);
+  /* Refresh PA Instance for read only */
+  Pa_osalBeginMemAccess (paInst, sizeof(paInst_t));
+  Pa_osalEndMemAccess (paInst, sizeof(paInst_t));
  /* Create the command */
-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_SYS_CONFIG, 0, 0, csize);
+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_SYS_CONFIG, 0, 0, csize);
  /* Validity of the destination was already checked (HOST, DISCARD), so no other cases 
   * must be considered */
@@ -7240,10 +7314,6 @@ paReturn_t Pa_configExceptionRouteCommon(Pa_Handle       iHandle,
  cpa->u.eroute.routeBitMap = 0;
  
-  /* Refresh PA Instance for read only */
-  Pa_osalBeginMemAccess (paInst, sizeof(paInst_t));
-  Pa_osalEndMemAccess (paInst, sizeof(paInst_t));
  for (i = 0; i < nRoute; i++)  {
    if (  (eRoutes[i].dest != pa_DEST_HOST)    &&
@@ -7256,7 +7326,7 @@ paReturn_t Pa_configExceptionRouteCommon(Pa_Handle       iHandle,
    cpa->u.eroute.routeBitMap |=  (1 << routeTypes[i]);
    
-    retCode =  pa_conv_routing_info (paInst, &cpa->u.eroute.eRoute[routeTypes[i]], &eRoutes[i], dest, FALSE, 0);
+    retCode =  pa_conv_routing_info (paInst, &cpa->u.eroute.eRoute[routeTypes[i]], &eRoutes[i], dest, FALSE, 0, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC);
    if(retCode != pa_OK)
        return(retCode);
    
@@ -7327,6 +7397,8 @@ paReturn_t Pa_configMultiRoute (Pa_Handle               iHandle,
                                paCmdReply_t           *reply,
                                int                    *cmdDest)
 {
+  paInst_t              *paInst = (paInst_t *) pa_CONV_OFFSET_TO_BASE(paLObj.cfg.instPoolBaseAddr, iHandle);
+  uint32_t               mtCsKey;
  pafrmCommand_t           *fcmd;
  pafrmCommandMultiRoute_t *mr;
  int                       i;
@@ -7360,8 +7432,15 @@ paReturn_t Pa_configMultiRoute (Pa_Handle               iHandle,
  if((mode != pa_MULTI_ROUTE_MODE_CONFIG) && (mode != pa_MULTI_ROUTE_MODE_RESET))
    return (pa_ERR_CONFIG);  
+  if ((mode == pa_MULTI_ROUTE_MODE_CONFIG) && (routeEntry == NULL))
+    return (pa_ERR_CONFIG);
+  /* Refresh PA Instance */
+  Pa_osalMtCsEnter(&mtCsKey);
+  Pa_osalBeginMemAccess (paInst, sizeof(paInst_t));
  /* Create the command */
-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_MULTI_ROUTE, 0, 1, csize);
+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_MULTI_ROUTE, 0, 1, csize);
  /* Validity of the destination was already checked (HOST, DISCARD), so no other cases 
   * must be considered */
@@ -7378,14 +7457,11 @@ paReturn_t Pa_configMultiRoute (Pa_Handle               iHandle,
    mr->mode = PAFRM_COMMAND_MULTI_ROUTE_MODE_ADD;
    mr->nRoutes = (uint8_t)nRoute;
  
-    if(routeEntry == NULL)
-        return (pa_INSUFFICIENT_CMD_BUFFER_SIZE);
-  
    for (i = 0; i < nRoute; i++)  {
      mr->quFl[i].ctrlFlags = routeEntry[i].ctrlBitfield | PAFRM_MULTI_RUOTE_CTRL_ACTIVE;
      mr->quFl[i].ctrlFlags = SWIZ(mr->quFl[i].ctrlFlags);
      mr->quFl[i].flowId = SWIZ(routeEntry[i].flowId);
-      mr->quFl[i].queue = SWIZ(routeEntry[i].queue);
+      mr->quFl[i].queue = SWIZ(pa_convert_queue_id(paInst, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC, routeEntry[i].queue));
      mr->quFl[i].swInfo0 = SWIZ(routeEntry[i].swInfo0);
    }
  }
@@ -7396,6 +7472,9 @@ paReturn_t Pa_configMultiRoute (Pa_Handle               iHandle,
  /* Multi-route processing PDSP: POST PDSP1 */
  *cmdDest = pa_CMD_TX_DEST_5;
+  Pa_osalEndMemAccess (paInst, sizeof(paInst_t));
+  Pa_osalMtCsExit(mtCsKey);
  return (pa_OK);
 } /* Pa_configMultiRoute */
@@ -7561,7 +7640,7 @@ paReturn_t Pa_configCmdSet (Pa_Handle       iHandle,
                                  64 - offsetof(pafrmCommandCmdSet_t, cmd);  
    
  /* Create the command */
-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_CMD_SET, 0, 0, csize);
+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_CMD_SET, 0, 0, csize);
  /* Validity of the destination was already checked (HOST, DISCARD), so no other cases 
   * must be considered */
@@ -7742,7 +7821,7 @@ paReturn_t Pa_configCmdSet (Pa_Handle       iHandle,
          }
          pCmdSplit->ctrlFlags = SWIZ(pCmdSplit->ctrlFlags);
          pCmdSplit->flowId    = (uint8_t)split->flowId;
-          pCmdSplit->destQueue = SWIZ(split->destQueue);
+          pCmdSplit->destQueue = SWIZ(pa_convert_queue_id(paInst, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC, split->destQueue));
          pCmdSplit->startOffset = (uint8_t)split->startOffset;
          
        }
@@ -7821,7 +7900,7 @@ paReturn_t Pa_configCmdSet (Pa_Handle       iHandle,
            case pa_DEST_HOST:
                pCmdVerifyPktErr->forwardType = PAFRM_FORWARD_TYPE_HOST;   
                pCmdVerifyPktErr->flowId  = SWIZ(verifyPktErr->flowId);
-                pCmdVerifyPktErr->queue   = SWIZ(verifyPktErr->queue);
+                pCmdVerifyPktErr->queue   = SWIZ(pa_convert_queue_id(paInst, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC, verifyPktErr->queue));
                pCmdVerifyPktErr->swInfo0 = SWIZ(verifyPktErr->swInfo0);
                break;
                    
@@ -7981,7 +8060,7 @@ paReturn_t Pa_configUsrStats (Pa_Handle                iHandle,
  memcpy(usrStatsLnkTbl, uslnkTable, paInst->nUsrStats * sizeof(paUsrStatsLnkEntry_t));                       
    
  /* Create the command */
-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_USR_STATS, 0, 0, csize);
+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_USR_STATS, 0, 0, csize);
  /* Validity of the destination was already checked (HOST, DISCARD), so no other cases 
   * must be considered */
@@ -8637,8 +8716,11 @@ paReturn_t Pa_control (Pa_Handle      iHandle,
  {
    pafrmCommandConfigPa_t *cpa;
+    Pa_osalMtCsEnter(&mtCsKey);
+    Pa_osalBeginMemAccess (paInst, sizeof(paInst_t));
    /* Create the command */
-    fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_CONFIG_PA, 0, 0, csize);
+    fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_CONFIG_PA, 0, 0, csize);
    /* Validity of the destination was already checked (HOST, DISCARD), so no other cases 
    * must be considered */
@@ -8649,9 +8731,6 @@ paReturn_t Pa_control (Pa_Handle      iHandle,
    
    cpa = (pafrmCommandConfigPa_t *)&(fcmd->cmd);
  
-    Pa_osalMtCsEnter(&mtCsKey);
-    Pa_osalBeginMemAccess (paInst, sizeof(paInst_t));
-  
    /* Protocol Limitations */
    if (cfg->pProtoLimit)
    {
@@ -8675,6 +8754,35 @@ paReturn_t Pa_control (Pa_Handle      iHandle,
  
    }
  
+    /* Queue Bounce configuration */
+    if (cfg->pQueueBounceConfig)
+    {
+        int i;
+        paQueueBounceConfig_t* pQueueBounceCfg = cfg->pQueueBounceConfig;
+        paInst->cfg.queueBounceConfig = *pQueueBounceCfg;
+        for (i = 0; i < PA_MAX_QUEUE_BOUNCE_ROUTING_CLASSES; i++)
+        {
+            if (pQueueBounceCfg->defOp[i] > pa_QUEUE_BOUNCE_OP_MAX)
+            {
+                paInst->cfg.queueBounceConfig.enable = FALSE;
+                ret = pa_ERR_CONFIG;
+                break;
+            }
+        }
+        if (ret == pa_OK)
+        {
+            cpa->validFlag |= PAFRM_COMMAND_CONFIG_VALID_QUEUE_BOUNCE;
+            cpa->queueBounce.ddrQueue     = SWIZ(pQueueBounceCfg->ddrQueueId);
+            cpa->queueBounce.msmcQueue    = SWIZ(pQueueBounceCfg->msmcQueueId);
+        }
+        /* the return queue may be updated per this configuration */
+        fcmd->replyQueue = SWIZ(pa_convert_queue_id(paInst, pa_QUEUE_BOUNCE_ROUTING_CLASS_CMD_RET, reply->queue));
+    }
    /* Outer IP configuration */
    if (cfg->pOutIpReassmConfig)
    {
@@ -8691,7 +8799,7 @@ paReturn_t Pa_control (Pa_Handle      iHandle,
            cpa->validFlag |= PAFRM_COMMAND_CONFIG_VALID_OUT_IP_REASSEM;
            cpa->outIpReasm.numTrafficFlow = SWIZ(pIpReassmCfg->numTrafficFlow);
            cpa->outIpReasm.destFlowId     = SWIZ(pIpReassmCfg->destFlowId);
-            cpa->outIpReasm.destQueue      = SWIZ(pIpReassmCfg->destQueue);
+            cpa->outIpReasm.destQueue      = SWIZ(pa_convert_queue_id(paInst, pa_QUEUE_BOUNCE_ROUTING_CLASS_IP_REASSEMBLY, pIpReassmCfg->destQueue));
        }
    }
  
@@ -8711,7 +8819,7 @@ paReturn_t Pa_control (Pa_Handle      iHandle,
            cpa->validFlag |= PAFRM_COMMAND_CONFIG_VALID_IN_IP_REASSEM;
            cpa->inIpReasm.numTrafficFlow = SWIZ(pIpReassmCfg->numTrafficFlow);
            cpa->inIpReasm.destFlowId     = SWIZ(pIpReassmCfg->destFlowId);
-            cpa->inIpReasm.destQueue      = SWIZ(pIpReassmCfg->destQueue);
+            cpa->inIpReasm.destQueue      = SWIZ(pa_convert_queue_id(paInst, pa_QUEUE_BOUNCE_ROUTING_CLASS_IP_REASSEMBLY, pIpReassmCfg->destQueue));
        }
    }
  
@@ -8878,7 +8986,7 @@ paReturn_t Pa_control (Pa_Handle      iHandle,
            
            }
            cpa->outAcl.destFlowId     = SWIZ(pAclCfg->destFlowId);
-            cpa->outAcl.destQueue      = SWIZ(pAclCfg->destQueue);
+            cpa->outAcl.destQueue      = SWIZ(pa_convert_queue_id(paInst, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC, pAclCfg->destQueue));
        }
    }
    
@@ -8923,7 +9031,7 @@ paReturn_t Pa_control (Pa_Handle      iHandle,
            
            }
            cpa->inAcl.destFlowId     = SWIZ(pAclCfg->destFlowId);
-            cpa->inAcl.destQueue      = SWIZ(pAclCfg->destQueue);
+            cpa->inAcl.destQueue      = SWIZ(pa_convert_queue_id(paInst, pa_QUEUE_BOUNCE_ROUTING_CLASS_MISC, pAclCfg->destQueue));
        }
    }
    
@@ -9073,11 +9181,14 @@ paReturn_t Pa_control (Pa_Handle      iHandle,
  else
  {
    pafrmCommandSysConfigPa_t *ccfg;
+    Pa_osalMtCsEnter(&mtCsKey);
+    Pa_osalBeginMemAccess (paInst, sizeof(paInst_t));
  
    if (csize)
    {
        /* Create the command */
-        fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_SYS_CONFIG, 0, 
+        fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_SYS_CONFIG, 0,
                                    ((ctrl->code == pa_CONTROL_802_1ag_CONFIG) || (ctrl->code == pa_CONTROL_EMAC_PORT_CONFIG))?0:1, csize);
        /* Validity of the destination was already checked (HOST, DISCARD), so no other cases 
@@ -9124,9 +9235,6 @@ paReturn_t Pa_control (Pa_Handle      iHandle,
        {
            paGtpuConfig_t *gtpuCfg = &ctrl->params.gtpuCfg;
          
-            Pa_osalMtCsEnter(&mtCsKey);
-            Pa_osalBeginMemAccess (paInst, sizeof(paInst_t));
-          
            ccfg->cfgCode = PAFRM_SYSTEM_CONFIG_CODE_GTPU;
          
            if (gtpuCfg->ctrlBitMap & pa_GTPU_CTRL_USE_LINK)
@@ -9148,8 +9256,6 @@ paReturn_t Pa_control (Pa_Handle      iHandle,
            /* GTP-U classification is at Ingress4 PDSP1 only */
            *cmdDest = pa_CMD_TX_DEST_4;
    
-            Pa_osalEndMemAccess (paInst, sizeof(paInst_t));
-            Pa_osalMtCsExit(mtCsKey);
            break;
        }
        
@@ -9173,8 +9279,6 @@ paReturn_t Pa_control (Pa_Handle      iHandle,
        
            pa_ra_global_cfg(&ctrl->params.raCfg, paLObj.pSysRegs);
    
-            Pa_osalEndMemAccess (paInst, sizeof(paInst_t));
-            Pa_osalMtCsExit(mtCsKey);
            break;
        }
@@ -9198,6 +9302,10 @@ paReturn_t Pa_control (Pa_Handle      iHandle,
          ret = pa_ERR_CONFIG;
          break;       
    }
+    Pa_osalEndMemAccess (paInst, sizeof(paInst_t));
+    Pa_osalMtCsExit(mtCsKey);
  }
  return (ret);
@@ -9240,7 +9348,7 @@ static paReturn_t pa_format_stats_request  (paInst_t      *paInst,
    return (pa_ERR_CONFIG);
  /* Form the command */
-  fcmd = pa_format_fcmd_header (cmd, reply, PAFRM_CONFIG_COMMAND_REQ_STATS, 0, 0, csize);
+  fcmd = pa_format_fcmd_header (paInst, cmd, reply, PAFRM_CONFIG_COMMAND_REQ_STATS, 0, 0, csize);
  /* Validity of the destination was already checked (HOST), so no other cases 
   * must be considered */