net/qede: align dynamic log names with standard

[dpdk.git] / drivers / net / qede / qede_ethdev.c

diff --git a/drivers/net/qede/qede_ethdev.c b/drivers/net/qede/qede_ethdev.c
index 895a0da..20a1c31 100644 (file)
--- a/drivers/net/qede/qede_ethdev.c
+++ b/drivers/net/qede/qede_ethdev.c
@@ -387,6 +387,60 @@ static void qede_print_adapter_info(struct qede_dev *qdev)
        DP_INFO(edev, "*********************************\n");
 }
 
+static void qede_reset_queue_stats(struct qede_dev *qdev, bool xstats)
+{
+       struct ecore_dev *edev = QEDE_INIT_EDEV(qdev);
+       unsigned int i = 0, j = 0, qid;
+       unsigned int rxq_stat_cntrs, txq_stat_cntrs;
+       struct qede_tx_queue *txq;
+
+       DP_VERBOSE(edev, ECORE_MSG_DEBUG, "Clearing queue stats\n");
+
+       rxq_stat_cntrs = RTE_MIN(QEDE_RSS_COUNT(qdev),
+                              RTE_ETHDEV_QUEUE_STAT_CNTRS);
+       txq_stat_cntrs = RTE_MIN(QEDE_TSS_COUNT(qdev),
+                              RTE_ETHDEV_QUEUE_STAT_CNTRS);
+
+       for_each_rss(qid) {
+               OSAL_MEMSET(((char *)(qdev->fp_array[qid].rxq)) +
+                            offsetof(struct qede_rx_queue, rcv_pkts), 0,
+                           sizeof(uint64_t));
+               OSAL_MEMSET(((char *)(qdev->fp_array[qid].rxq)) +
+                            offsetof(struct qede_rx_queue, rx_hw_errors), 0,
+                           sizeof(uint64_t));
+               OSAL_MEMSET(((char *)(qdev->fp_array[qid].rxq)) +
+                            offsetof(struct qede_rx_queue, rx_alloc_errors), 0,
+                           sizeof(uint64_t));
+
+               if (xstats)
+                       for (j = 0; j < RTE_DIM(qede_rxq_xstats_strings); j++)
+                               OSAL_MEMSET((((char *)
+                                             (qdev->fp_array[qid].rxq)) +
+                                            qede_rxq_xstats_strings[j].offset),
+                                           0,
+                                           sizeof(uint64_t));
+
+               i++;
+               if (i == rxq_stat_cntrs)
+                       break;
+       }
+
+       i = 0;
+
+       for_each_tss(qid) {
+               txq = qdev->fp_array[qid].txq;
+
+               OSAL_MEMSET((uint64_t *)(uintptr_t)
+                               (((uint64_t)(uintptr_t)(txq)) +
+                                offsetof(struct qede_tx_queue, xmit_pkts)), 0,
+                           sizeof(uint64_t));
+
+               i++;
+               if (i == txq_stat_cntrs)
+                       break;
+       }
+}
+
 static int
 qede_start_vport(struct qede_dev *qdev, uint16_t mtu)
 {
@@ -412,6 +466,8 @@ qede_start_vport(struct qede_dev *qdev, uint16_t mtu)
                }
        }
        ecore_reset_vport_stats(edev);
+       if (IS_PF(edev))
+               qede_reset_queue_stats(qdev, true);
        DP_INFO(edev, "VPORT started with MTU = %u\n", mtu);
 
        return 0;
@@ -625,7 +681,16 @@ qede_tunnel_update(struct qede_dev *qdev,
 
        for_each_hwfn(edev, i) {
                p_hwfn = &edev->hwfns[i];
-               p_ptt = IS_PF(edev) ? ecore_ptt_acquire(p_hwfn) : NULL;
+               if (IS_PF(edev)) {
+                       p_ptt = ecore_ptt_acquire(p_hwfn);
+                       if (!p_ptt) {
+                               DP_ERR(p_hwfn, "Can't acquire PTT\n");
+                               return -EAGAIN;
+                       }
+               } else {
+                       p_ptt = NULL;
+               }
+
                rc = ecore_sp_pf_update_tunn_cfg(p_hwfn, p_ptt,
                                tunn_info, ECORE_SPQ_MODE_CB, NULL);
                if (IS_PF(edev))
@@ -1885,6 +1950,7 @@ qede_reset_xstats(struct rte_eth_dev *dev)
        struct ecore_dev *edev = &qdev->edev;
 
        ecore_reset_vport_stats(edev);
+       qede_reset_queue_stats(qdev, true);
 }
 
 int qede_dev_set_link_state(struct rte_eth_dev *eth_dev, bool link_up)
@@ -1920,6 +1986,7 @@ static void qede_reset_stats(struct rte_eth_dev *eth_dev)
        struct ecore_dev *edev = &qdev->edev;
 
        ecore_reset_vport_stats(edev);
+       qede_reset_queue_stats(qdev, false);
 }
 
 static void qede_allmulticast_enable(struct rte_eth_dev *eth_dev)
@@ -3231,10 +3298,10 @@ RTE_INIT(qede_init_log);
 static void
 qede_init_log(void)
 {
-       qede_logtype_init = rte_log_register("pmd.qede.init");
+       qede_logtype_init = rte_log_register("pmd.net.qede.init");
        if (qede_logtype_init >= 0)
                rte_log_set_level(qede_logtype_init, RTE_LOG_NOTICE);
-       qede_logtype_driver = rte_log_register("pmd.qede.driver");
+       qede_logtype_driver = rte_log_register("pmd.net.qede.driver");
        if (qede_logtype_driver >= 0)
                rte_log_set_level(qede_logtype_driver, RTE_LOG_NOTICE);
 }