aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c42
-rw-r--r--drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h21
2 files changed, 56 insertions, 7 deletions
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index 24d75ca788ce..d7352f5f75c3 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -295,8 +295,24 @@ static const struct hclge_comm_stats_str g_mac_stats_string[] = {
295 HCLGE_MAC_STATS_FIELD_OFF(mac_tx_512_1023_oct_pkt_num)}, 295 HCLGE_MAC_STATS_FIELD_OFF(mac_tx_512_1023_oct_pkt_num)},
296 {"mac_tx_1024_1518_oct_pkt_num", 296 {"mac_tx_1024_1518_oct_pkt_num",
297 HCLGE_MAC_STATS_FIELD_OFF(mac_tx_1024_1518_oct_pkt_num)}, 297 HCLGE_MAC_STATS_FIELD_OFF(mac_tx_1024_1518_oct_pkt_num)},
298 {"mac_tx_1519_max_oct_pkt_num", 298 {"mac_tx_1519_2047_oct_pkt_num",
299 HCLGE_MAC_STATS_FIELD_OFF(mac_tx_1519_max_oct_pkt_num)}, 299 HCLGE_MAC_STATS_FIELD_OFF(mac_tx_1519_2047_oct_pkt_num)},
300 {"mac_tx_2048_4095_oct_pkt_num",
301 HCLGE_MAC_STATS_FIELD_OFF(mac_tx_2048_4095_oct_pkt_num)},
302 {"mac_tx_4096_8191_oct_pkt_num",
303 HCLGE_MAC_STATS_FIELD_OFF(mac_tx_4096_8191_oct_pkt_num)},
304 {"mac_tx_8192_12287_oct_pkt_num",
305 HCLGE_MAC_STATS_FIELD_OFF(mac_tx_8192_12287_oct_pkt_num)},
306 {"mac_tx_8192_9216_oct_pkt_num",
307 HCLGE_MAC_STATS_FIELD_OFF(mac_tx_8192_9216_oct_pkt_num)},
308 {"mac_tx_9217_12287_oct_pkt_num",
309 HCLGE_MAC_STATS_FIELD_OFF(mac_tx_9217_12287_oct_pkt_num)},
310 {"mac_tx_12288_16383_oct_pkt_num",
311 HCLGE_MAC_STATS_FIELD_OFF(mac_tx_12288_16383_oct_pkt_num)},
312 {"mac_tx_1519_max_good_pkt_num",
313 HCLGE_MAC_STATS_FIELD_OFF(mac_tx_1519_max_good_oct_pkt_num)},
314 {"mac_tx_1519_max_bad_pkt_num",
315 HCLGE_MAC_STATS_FIELD_OFF(mac_tx_1519_max_bad_oct_pkt_num)},
300 {"mac_rx_total_pkt_num", 316 {"mac_rx_total_pkt_num",
301 HCLGE_MAC_STATS_FIELD_OFF(mac_rx_total_pkt_num)}, 317 HCLGE_MAC_STATS_FIELD_OFF(mac_rx_total_pkt_num)},
302 {"mac_rx_total_oct_num", 318 {"mac_rx_total_oct_num",
@@ -331,8 +347,24 @@ static const struct hclge_comm_stats_str g_mac_stats_string[] = {
331 HCLGE_MAC_STATS_FIELD_OFF(mac_rx_512_1023_oct_pkt_num)}, 347 HCLGE_MAC_STATS_FIELD_OFF(mac_rx_512_1023_oct_pkt_num)},
332 {"mac_rx_1024_1518_oct_pkt_num", 348 {"mac_rx_1024_1518_oct_pkt_num",
333 HCLGE_MAC_STATS_FIELD_OFF(mac_rx_1024_1518_oct_pkt_num)}, 349 HCLGE_MAC_STATS_FIELD_OFF(mac_rx_1024_1518_oct_pkt_num)},
334 {"mac_rx_1519_max_oct_pkt_num", 350 {"mac_rx_1519_2047_oct_pkt_num",
335 HCLGE_MAC_STATS_FIELD_OFF(mac_rx_1519_max_oct_pkt_num)}, 351 HCLGE_MAC_STATS_FIELD_OFF(mac_rx_1519_2047_oct_pkt_num)},
352 {"mac_rx_2048_4095_oct_pkt_num",
353 HCLGE_MAC_STATS_FIELD_OFF(mac_rx_2048_4095_oct_pkt_num)},
354 {"mac_rx_4096_8191_oct_pkt_num",
355 HCLGE_MAC_STATS_FIELD_OFF(mac_rx_4096_8191_oct_pkt_num)},
356 {"mac_rx_8192_12287_oct_pkt_num",
357 HCLGE_MAC_STATS_FIELD_OFF(mac_rx_8192_12287_oct_pkt_num)},
358 {"mac_rx_8192_9216_oct_pkt_num",
359 HCLGE_MAC_STATS_FIELD_OFF(mac_rx_8192_9216_oct_pkt_num)},
360 {"mac_rx_9217_12287_oct_pkt_num",
361 HCLGE_MAC_STATS_FIELD_OFF(mac_rx_9217_12287_oct_pkt_num)},
362 {"mac_rx_12288_16383_oct_pkt_num",
363 HCLGE_MAC_STATS_FIELD_OFF(mac_rx_12288_16383_oct_pkt_num)},
364 {"mac_rx_1519_max_good_pkt_num",
365 HCLGE_MAC_STATS_FIELD_OFF(mac_rx_1519_max_good_oct_pkt_num)},
366 {"mac_rx_1519_max_bad_pkt_num",
367 HCLGE_MAC_STATS_FIELD_OFF(mac_rx_1519_max_bad_oct_pkt_num)},
336 368
337 {"mac_tx_fragment_pkt_num", 369 {"mac_tx_fragment_pkt_num",
338 HCLGE_MAC_STATS_FIELD_OFF(mac_tx_fragment_pkt_num)}, 370 HCLGE_MAC_STATS_FIELD_OFF(mac_tx_fragment_pkt_num)},
@@ -465,7 +497,7 @@ static int hclge_32_bit_update_stats(struct hclge_dev *hdev)
465 497
466static int hclge_mac_update_stats(struct hclge_dev *hdev) 498static int hclge_mac_update_stats(struct hclge_dev *hdev)
467{ 499{
468#define HCLGE_MAC_CMD_NUM 17 500#define HCLGE_MAC_CMD_NUM 21
469#define HCLGE_RTN_DATA_NUM 4 501#define HCLGE_RTN_DATA_NUM 4
470 502
471 u64 *data = (u64 *)(&hdev->hw_stats.mac_stats); 503 u64 *data = (u64 *)(&hdev->hw_stats.mac_stats);
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
index 83fb195856aa..eeb6c8d66e4e 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
@@ -394,7 +394,16 @@ struct hclge_mac_stats {
394 u64 mac_tx_256_511_oct_pkt_num; 394 u64 mac_tx_256_511_oct_pkt_num;
395 u64 mac_tx_512_1023_oct_pkt_num; 395 u64 mac_tx_512_1023_oct_pkt_num;
396 u64 mac_tx_1024_1518_oct_pkt_num; 396 u64 mac_tx_1024_1518_oct_pkt_num;
397 u64 mac_tx_1519_max_oct_pkt_num; 397 u64 mac_tx_1519_2047_oct_pkt_num;
398 u64 mac_tx_2048_4095_oct_pkt_num;
399 u64 mac_tx_4096_8191_oct_pkt_num;
400 u64 mac_tx_8192_12287_oct_pkt_num; /* valid for GE MAC only */
401 u64 mac_tx_8192_9216_oct_pkt_num; /* valid for LGE & CGE MAC only */
402 u64 mac_tx_9217_12287_oct_pkt_num; /* valid for LGE & CGE MAC */
403 u64 mac_tx_12288_16383_oct_pkt_num;
404 u64 mac_tx_1519_max_good_oct_pkt_num;
405 u64 mac_tx_1519_max_bad_oct_pkt_num;
406
398 u64 mac_rx_total_pkt_num; 407 u64 mac_rx_total_pkt_num;
399 u64 mac_rx_total_oct_num; 408 u64 mac_rx_total_oct_num;
400 u64 mac_rx_good_pkt_num; 409 u64 mac_rx_good_pkt_num;
@@ -412,7 +421,15 @@ struct hclge_mac_stats {
412 u64 mac_rx_256_511_oct_pkt_num; 421 u64 mac_rx_256_511_oct_pkt_num;
413 u64 mac_rx_512_1023_oct_pkt_num; 422 u64 mac_rx_512_1023_oct_pkt_num;
414 u64 mac_rx_1024_1518_oct_pkt_num; 423 u64 mac_rx_1024_1518_oct_pkt_num;
415 u64 mac_rx_1519_max_oct_pkt_num; 424 u64 mac_rx_1519_2047_oct_pkt_num;
425 u64 mac_rx_2048_4095_oct_pkt_num;
426 u64 mac_rx_4096_8191_oct_pkt_num;
427 u64 mac_rx_8192_12287_oct_pkt_num;/* valid for GE MAC only */
428 u64 mac_rx_8192_9216_oct_pkt_num; /* valid for LGE & CGE MAC only */
429 u64 mac_rx_9217_12287_oct_pkt_num; /* valid for LGE & CGE MAC only */
430 u64 mac_rx_12288_16383_oct_pkt_num;
431 u64 mac_rx_1519_max_good_oct_pkt_num;
432 u64 mac_rx_1519_max_bad_oct_pkt_num;
416 433
417 u64 mac_tx_fragment_pkt_num; 434 u64 mac_tx_fragment_pkt_num;
418 u64 mac_tx_undermin_pkt_num; 435 u64 mac_tx_undermin_pkt_num;