bnxt_en: Remap TC to hardware queues when configuring PFC.

Initially, the MQPRIO TCs are mapped 1:1 directly to the hardware
queues.  Some of these hardware queues are configured to be lossless.
When PFC is enabled on one of more TCs, we now need to remap the
TCs that have PFC enabled to the lossless hardware queues.

After remapping, we need to close and open the NIC for the new
mapping to take effect.  We also need to reprogram all ETS parameters.

Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c
index 1b72f8a..d5bc72c 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c
@@ -173,44 +173,59 @@ static int bnxt_hwrm_queue_cos2bw_qcfg(struct bnxt *bp, struct ieee_ets *ets)
        return 0;
 }
 
-static int bnxt_hwrm_queue_cfg(struct bnxt *bp, unsigned int lltc_mask)
+static int bnxt_queue_remap(struct bnxt *bp, unsigned int lltc_mask)
 {
-       struct hwrm_queue_cfg_input req = {0};
-       int i;
+       unsigned long qmap = 0;
+       int max = bp->max_tc;
+       int i, j, rc;
 
-       if (netif_running(bp->dev))
-               bnxt_tx_disable(bp);
+       /* Assign lossless TCs first */
+       for (i = 0, j = 0; i < max; ) {
+               if (lltc_mask & (1 << i)) {
+                       if (BNXT_LLQ(bp->q_info[j].queue_profile)) {
+                               bp->tc_to_qidx[i] = j;
+                               __set_bit(j, &qmap);
+                               i++;
+                       }
+                       j++;
+                       continue;
+               }
+               i++;
+       }
 
-       bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_QUEUE_CFG, -1, -1);
-       req.flags = cpu_to_le32(QUEUE_CFG_REQ_FLAGS_PATH_BIDIR);
-       req.enables = cpu_to_le32(QUEUE_CFG_REQ_ENABLES_SERVICE_PROFILE);
+       for (i = 0, j = 0; i < max; i++) {
+               if (lltc_mask & (1 << i))
+                       continue;
+               j = find_next_zero_bit(&qmap, max, j);
+               bp->tc_to_qidx[i] = j;
+               __set_bit(j, &qmap);
+               j++;
+       }
 
-       /* Configure lossless queues to lossy first */
-       req.service_profile = QUEUE_CFG_REQ_SERVICE_PROFILE_LOSSY;
-       for (i = 0; i < bp->max_tc; i++) {
-               if (BNXT_LLQ(bp->q_info[i].queue_profile)) {
-                       req.queue_id = cpu_to_le32(bp->q_info[i].queue_id);
-                       hwrm_send_message(bp, &req, sizeof(req),
-                                         HWRM_CMD_TIMEOUT);
-                       bp->q_info[i].queue_profile =
-                               QUEUE_CFG_REQ_SERVICE_PROFILE_LOSSY;
+       if (netif_running(bp->dev)) {
+               bnxt_close_nic(bp, false, false);
+               rc = bnxt_open_nic(bp, false, false);
+               if (rc) {
+                       netdev_warn(bp->dev, "failed to open NIC, rc = %d\n", rc);
+                       return rc;
                }
        }
-
-       /* Now configure desired queues to lossless */
-       req.service_profile = QUEUE_CFG_REQ_SERVICE_PROFILE_LOSSLESS;
-       for (i = 0; i < bp->max_tc; i++) {
-               if (lltc_mask & (1 << i)) {
-                       req.queue_id = cpu_to_le32(bp->q_info[i].queue_id);
-                       hwrm_send_message(bp, &req, sizeof(req),
-                                         HWRM_CMD_TIMEOUT);
-                       bp->q_info[i].queue_profile =
-                               QUEUE_CFG_REQ_SERVICE_PROFILE_LOSSLESS;
+       if (bp->ieee_ets) {
+               int tc = netdev_get_num_tc(bp->dev);
+
+               if (!tc)
+                       tc = 1;
+               rc = bnxt_hwrm_queue_cos2bw_cfg(bp, bp->ieee_ets, tc);
+               if (rc) {
+                       netdev_warn(bp->dev, "failed to config BW, rc = %d\n", rc);
+                       return rc;
+               }
+               rc = bnxt_hwrm_queue_pri2cos_cfg(bp, bp->ieee_ets);
+               if (rc) {
+                       netdev_warn(bp->dev, "failed to config prio, rc = %d\n", rc);
+                       return rc;
                }
        }
-       if (netif_running(bp->dev))
-               bnxt_tx_enable(bp);
-
        return 0;
 }
 
@@ -220,7 +235,7 @@ static int bnxt_hwrm_queue_pfc_cfg(struct bnxt *bp, struct ieee_pfc *pfc)
        struct ieee_ets *my_ets = bp->ieee_ets;
        unsigned int tc_mask = 0, pri_mask = 0;
        u8 i, pri, lltc_count = 0;
-       bool need_q_recfg = false;
+       bool need_q_remap = false;
        int rc;
 
        if (!my_ets)
@@ -240,21 +255,25 @@ static int bnxt_hwrm_queue_pfc_cfg(struct bnxt *bp, struct ieee_pfc *pfc)
        if (lltc_count > bp->max_lltc)
                return -EINVAL;
 
-       bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_QUEUE_PFCENABLE_CFG, -1, -1);
-       req.flags = cpu_to_le32(pri_mask);
-       rc = hwrm_send_message(bp, &req, sizeof(req), HWRM_CMD_TIMEOUT);
-       if (rc)
-               return rc;
-
        for (i = 0; i < bp->max_tc; i++) {
                if (tc_mask & (1 << i)) {
-                       if (!BNXT_LLQ(bp->q_info[i].queue_profile))
-                               need_q_recfg = true;
+                       u8 qidx = bp->tc_to_qidx[i];
+
+                       if (!BNXT_LLQ(bp->q_info[qidx].queue_profile)) {
+                               need_q_remap = true;
+                               break;
+                       }
                }
        }
 
-       if (need_q_recfg)
-               rc = bnxt_hwrm_queue_cfg(bp, tc_mask);
+       if (need_q_remap)
+               rc = bnxt_queue_remap(bp, tc_mask);
+
+       bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_QUEUE_PFCENABLE_CFG, -1, -1);
+       req.flags = cpu_to_le32(pri_mask);
+       rc = hwrm_send_message(bp, &req, sizeof(req), HWRM_CMD_TIMEOUT);
+       if (rc)
+               return rc;
 
        return rc;
 }