common/cnxk: convert warning to debug print

[dpdk.git] / drivers / net / hns3 / hns3_ethdev_vf.c

diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c
index 06ddf64..589de0a 100644 (file)
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -495,7 +495,6 @@ hns3vf_dev_configure(struct rte_eth_dev *dev)
        /* When RSS is not configured, redirect the packet queue 0 */
        if ((uint32_t)mq_mode & RTE_ETH_MQ_RX_RSS_FLAG) {
                conf->rxmode.offloads |= RTE_ETH_RX_OFFLOAD_RSS_HASH;
-               hw->rss_dis_flag = false;
                rss_conf = conf->rx_adv_conf.rss_conf;
                ret = hns3_dev_rss_hash_update(dev, &rss_conf);
                if (ret)
@@ -997,7 +996,6 @@ hns3vf_get_configuration(struct hns3_hw *hw)
        int ret;
 
        hw->mac.media_type = HNS3_MEDIA_TYPE_NONE;
-       hw->rss_dis_flag = false;
 
        /* Get device capability */
        ret = hns3vf_get_capability(hw);
@@ -1337,10 +1335,12 @@ hns3vf_service_handler(void *param)
         * Before querying the link status, check whether there is a reset
         * pending, and if so, abandon the query.
         */
-       if (!hns3vf_is_reset_pending(hns))
+       if (!hns3vf_is_reset_pending(hns)) {
                hns3vf_request_link_info(hw);
-       else
+               hns3_update_hw_stats(hw);
+       } else {
                hns3_warn(hw, "Cancel the query when reset is pending");
+       }
 
        rte_eal_alarm_set(HNS3VF_SERVICE_INTERVAL, hns3vf_service_handler,
                          eth_dev);
@@ -1510,17 +1510,10 @@ hns3vf_init_vf(struct rte_eth_dev *eth_dev)
                goto err_get_config;
        }
 
-       ret = hns3_tqp_stats_init(hw);
+       ret = hns3_stats_init(hw);
        if (ret)
                goto err_get_config;
 
-       /* Hardware statistics of imissed registers cleared. */
-       ret = hns3_update_imissed_stats(hw, true);
-       if (ret) {
-               hns3_err(hw, "clear imissed stats failed, ret = %d", ret);
-               goto err_set_tc_queue;
-       }
-
        ret = hns3_queue_to_tc_mapping(hw, hw->tqps_num, hw->tqps_num);
        if (ret) {
                PMD_INIT_LOG(ERR, "failed to set tc info, ret = %d.", ret);
@@ -1548,7 +1541,7 @@ hns3vf_init_vf(struct rte_eth_dev *eth_dev)
        return 0;
 
 err_set_tc_queue:
-       hns3_tqp_stats_uninit(hw);
+       hns3_stats_uninit(hw);
 
 err_get_config:
        hns3vf_disable_irq0(hw);
@@ -1579,7 +1572,7 @@ hns3vf_uninit_vf(struct rte_eth_dev *eth_dev)
        (void)hns3vf_set_alive(hw, false);
        (void)hns3vf_set_promisc_mode(hw, false, false, false);
        hns3_flow_uninit(eth_dev);
-       hns3_tqp_stats_uninit(hw);
+       hns3_stats_uninit(hw);
        hns3vf_disable_irq0(hw);
        rte_intr_disable(pci_dev->intr_handle);
        hns3_intr_unregister(pci_dev->intr_handle, hns3vf_interrupt_handler,
@@ -1877,6 +1870,7 @@ hns3vf_is_reset_pending(struct hns3_adapter *hns)
 static int
 hns3vf_wait_hardware_ready(struct hns3_adapter *hns)
 {
+#define HNS3_WAIT_PF_RESET_READY_TIME 5
        struct hns3_hw *hw = &hns->hw;
        struct hns3_wait_data *wait_data = hw->reset.wait_data;
        struct timeval tv;
@@ -1897,12 +1891,14 @@ hns3vf_wait_hardware_ready(struct hns3_adapter *hns)
                        return 0;
 
                wait_data->check_completion = NULL;
-               wait_data->interval = 1 * MSEC_PER_SEC * USEC_PER_MSEC;
+               wait_data->interval = HNS3_WAIT_PF_RESET_READY_TIME *
+                       MSEC_PER_SEC * USEC_PER_MSEC;
                wait_data->count = 1;
                wait_data->result = HNS3_WAIT_REQUEST;
                rte_eal_alarm_set(wait_data->interval, hns3_wait_callback,
                                  wait_data);
-               hns3_warn(hw, "hardware is ready, delay 1 sec for PF reset complete");
+               hns3_warn(hw, "hardware is ready, delay %d sec for PF reset complete",
+                               HNS3_WAIT_PF_RESET_READY_TIME);
                return -EAGAIN;
        } else if (wait_data->result == HNS3_WAIT_TIMEOUT) {
                hns3_clock_gettime(&tv);