net: hns3: Set tx ring' tc info when netdev is up

BugLink: https://bugs.launchpad.net/bugs/1802023
The HNS3_RING_TX_RING_TC_REG register is used to map tx ring to
specific tc, the tx queue to tc mapping is needed by the hardware
to do the correct tx schedule.

Signed-off-by: Yunsheng Lin <linyunsheng@huawei.com>
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Salil Mehta <salil.mehta@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(backported from commit 1c77215480bcfa0852575180f997bd156f2aef17)
[ dannf: Trivial offset fix in hns3_enet.h ]
Signed-off-by: dann frazier <dann.frazier@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Kleber Souza <kleber.souza@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
index 18c93eb9c045e2372b891ff234ea72ae1267b203..f6ca760ea65c88604bd99c60f8d17bebc7985814 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
@@ -2998,6 +2998,28 @@ static void hns3_init_ring_hw(struct hns3_enet_ring *ring)
        }
 }
 
+static void hns3_init_tx_ring_tc(struct hns3_nic_priv *priv)
+{
+       struct hnae3_knic_private_info *kinfo = &priv->ae_handle->kinfo;
+       int i;
+
+       for (i = 0; i < HNAE3_MAX_TC; i++) {
+               struct hnae3_tc_info *tc_info = &kinfo->tc_info[i];
+               int j;
+
+               if (!tc_info->enable)
+                       continue;
+
+               for (j = 0; j < tc_info->tqp_count; j++) {
+                       struct hnae3_queue *q;
+
+                       q = priv->ring_data[tc_info->tqp_offset + j].ring->tqp;
+                       hns3_write_dev(q, HNS3_RING_TX_RING_TC_REG,
+                                      tc_info->tc);
+               }
+       }
+}
+
 int hns3_init_all_ring(struct hns3_nic_priv *priv)
 {
        struct hnae3_handle *h = priv->ae_handle;
@@ -3409,6 +3431,8 @@ int hns3_nic_reset_all_ring(struct hnae3_handle *h)
                rx_ring->next_to_use = 0;
        }
 
+       hns3_init_tx_ring_tc(priv);
+
        return 0;
 }
 

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h
index e4b4a8f2ceaab58a1a2ed534e058ee937a67e27f..902b751206608abef63dcc7ef658af0278f5ddcb 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h
@@ -38,6 +38,7 @@ enum hns3_nic_state {
 #define HNS3_RING_TX_RING_BASEADDR_H_REG       0x00044
 #define HNS3_RING_TX_RING_BD_NUM_REG           0x00048
 #define HNS3_RING_TX_RING_BD_LEN_REG           0x0004C
+#define HNS3_RING_TX_RING_TC_REG               0x00050
 #define HNS3_RING_TX_RING_TAIL_REG             0x00058
 #define HNS3_RING_TX_RING_HEAD_REG             0x0005C
 #define HNS3_RING_TX_RING_FBDNUM_REG           0x00060