net/hns3: increase readability in logs

Some logs format u64 variables, mostly using hexadecimal which was not
readable.
This patch formats most u64 variables in decimal, and add '0x' prefix
to the ones that are not adjusted.

Fixes: c37ca66f2b27 ("net/hns3: support RSS")
Fixes: 2790c6464725 ("net/hns3: support device reset")
Fixes: 8839c5e202f3 ("net/hns3: support device stats")
Cc: stable@dpdk.org
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
Signed-off-by: Min Hu (Connor) <humin29@huawei.com>

diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c
index 49d6568b229687618d996255ffb8922c7643d9e4..65c7f6ed88d340cd6fc5cac2ea8d68480b5402a7 100644 (file)
--- a/drivers/net/hns3/hns3_flow.c
+++ b/drivers/net/hns3/hns3_flow.c
@@ -1556,7 +1556,7 @@ hns3_config_rss_filter(struct rte_eth_dev *dev,
                     hw->rss_info.conf.types;
        if (flow_types != rss_flow_conf.types)
                hns3_warn(hw, "modified RSS types based on hardware support, "
-                             "requested:%" PRIx64 " configured:%" PRIx64,
+                             "requested:0x%" PRIx64 " configured:0x%" PRIx64,
                          rss_flow_conf.types, flow_types);
        /* Update the useful flow types */
        rss_flow_conf.types = flow_types;

diff --git a/drivers/net/hns3/hns3_intr.c b/drivers/net/hns3/hns3_intr.c
index 62e89a960b62e9cf16e7703bdaa0184fcd76b150..905c6d951342d4e3c7c58f102ed44189a9b8774e 100644 (file)
--- a/drivers/net/hns3/hns3_intr.c
+++ b/drivers/net/hns3/hns3_intr.c
@@ -2570,7 +2570,7 @@ hns3_clear_reset_level(struct hns3_hw *hw, uint64_t *levels)
        if (merge_cnt != hw->reset.stats.merge_cnt)
                hns3_warn(hw,
                          "No need to do low-level reset after %s reset. "
-                         "merge cnt: %" PRIx64 " total merge cnt: %" PRIx64,
+                         "merge cnt: %" PRIu64 " total merge cnt: %" PRIu64,
                          reset_string[hw->reset.level],
                          hw->reset.stats.merge_cnt - merge_cnt,
                          hw->reset.stats.merge_cnt);
@@ -2590,7 +2590,7 @@ hns3_reset_err_handle(struct hns3_adapter *hns)
                hw->reset.attempts = 0;
                hw->reset.stats.fail_cnt++;
                hns3_warn(hw, "%s reset fail because new Reset is pending "
-                             "attempts:%" PRIx64,
+                             "attempts:%" PRIu64,
                          reset_string[hw->reset.level],
                          hw->reset.stats.fail_cnt);
                hw->reset.level = HNS3_NONE_RESET;
@@ -2617,10 +2617,10 @@ hns3_reset_err_handle(struct hns3_adapter *hns)
 reset_fail:
        hw->reset.attempts = 0;
        hw->reset.stats.fail_cnt++;
-       hns3_warn(hw, "%s reset fail fail_cnt:%" PRIx64 " success_cnt:%" PRIx64
-                 " global_cnt:%" PRIx64 " imp_cnt:%" PRIx64
-                 " request_cnt:%" PRIx64 " exec_cnt:%" PRIx64
-                 " merge_cnt:%" PRIx64 "adapter_state:%d",
+       hns3_warn(hw, "%s reset fail fail_cnt:%" PRIu64 " success_cnt:%" PRIu64
+                 " global_cnt:%" PRIu64 " imp_cnt:%" PRIu64
+                 " request_cnt:%" PRIu64 " exec_cnt:%" PRIu64
+                 " merge_cnt:%" PRIu64 "adapter_state:%d",
                  reset_string[hw->reset.level], hw->reset.stats.fail_cnt,
                  hw->reset.stats.success_cnt, hw->reset.stats.global_cnt,
                  hw->reset.stats.imp_cnt, hw->reset.stats.request_cnt,
@@ -2736,10 +2736,10 @@ hns3_reset_post(struct hns3_adapter *hns)
                rte_spinlock_unlock(&hw->lock);
                hns3_clock_gettime(&tv);
                timersub(&tv, &hw->reset.start_time, &tv_delta);
-               hns3_warn(hw, "%s reset done fail_cnt:%" PRIx64
-                         " success_cnt:%" PRIx64 " global_cnt:%" PRIx64
-                         " imp_cnt:%" PRIx64 " request_cnt:%" PRIx64
-                         " exec_cnt:%" PRIx64 " merge_cnt:%" PRIx64,
+               hns3_warn(hw, "%s reset done fail_cnt:%" PRIu64
+                         " success_cnt:%" PRIu64 " global_cnt:%" PRIu64
+                         " imp_cnt:%" PRIu64 " request_cnt:%" PRIu64
+                         " exec_cnt:%" PRIu64 " merge_cnt:%" PRIu64,
                          reset_string[hw->reset.level],
                          hw->reset.stats.fail_cnt, hw->reset.stats.success_cnt,
                          hw->reset.stats.global_cnt, hw->reset.stats.imp_cnt,

diff --git a/drivers/net/hns3/hns3_stats.c b/drivers/net/hns3/hns3_stats.c
index 3afef4a04b8f2acc7f8411302eb9e1bfaf4fd5c7..e09dc0da800f9d95f3f9460098c67f557054f243 100644 (file)
--- a/drivers/net/hns3/hns3_stats.c
+++ b/drivers/net/hns3/hns3_stats.c
@@ -1325,7 +1325,7 @@ hns3_dev_xstats_get_by_id(struct rte_eth_dev *dev, const uint64_t *ids,
        len = cnt_stats * sizeof(struct rte_eth_xstat);
        values_copy = rte_zmalloc("hns3_xstats_values", len, 0);
        if (values_copy == NULL) {
-               hns3_err(hw, "Failed to allocate %" PRIx64 " bytes needed "
+               hns3_err(hw, "Failed to allocate 0x%" PRIx64 " bytes needed "
                             "to store statistics values", len);
                return -ENOMEM;
        }
@@ -1347,7 +1347,7 @@ hns3_dev_xstats_get_by_id(struct rte_eth_dev *dev, const uint64_t *ids,
 
        for (i = 0; i < size; i++) {
                if (ids[i] >= cnt_stats) {
-                       hns3_err(hw, "ids[%u] (%" PRIx64 ") is invalid, "
+                       hns3_err(hw, "ids[%u] (%" PRIu64 ") is invalid, "
                                     "should < %u", i, ids[i], cnt_stats);
                        rte_free(values_copy);
                        return -EINVAL;
@@ -1406,7 +1406,7 @@ hns3_dev_xstats_get_names_by_id(struct rte_eth_dev *dev,
        len = cnt_stats * sizeof(struct rte_eth_xstat_name);
        names_copy = rte_zmalloc("hns3_xstats_names", len, 0);
        if (names_copy == NULL) {
-               hns3_err(hw, "Failed to allocate %" PRIx64 " bytes needed "
+               hns3_err(hw, "Failed to allocate 0x%" PRIx64 " bytes needed "
                             "to store statistics names", len);
                return -ENOMEM;
        }
@@ -1415,7 +1415,7 @@ hns3_dev_xstats_get_names_by_id(struct rte_eth_dev *dev,
 
        for (i = 0; i < size; i++) {
                if (ids[i] >= cnt_stats) {
-                       hns3_err(hw, "ids[%u] (%" PRIx64 ") is invalid, "
+                       hns3_err(hw, "ids[%u] (%" PRIu64 ") is invalid, "
                                     "should < %u", i, ids[i], cnt_stats);
                        rte_free(names_copy);
                        return -EINVAL;