Update DPDK version from 19.11 to 20.11 and also support hns3 PMD for Kunpeng 920 and Kunpeng 930. Signed-off-by: speech_white <humin29@huawei.com>
60 lines
2.1 KiB
Diff
60 lines
2.1 KiB
Diff
From 7fab993aa57ba5f2e4bce07949de602e1a40daf1 Mon Sep 17 00:00:00 2001
|
|
From: Chengchang Tang <tangchengchang@huawei.com>
|
|
Date: Thu, 14 Jan 2021 21:33:34 +0800
|
|
Subject: [PATCH 015/189] net/hns3: fix register length when dumping registers
|
|
|
|
Currently, the reg length return by HNS3 is the total length of all the
|
|
registers. But for upper layer user, the total register length is the
|
|
length multiplied by width. This can lead to a waste of memory and print
|
|
some invalid information.
|
|
|
|
This patch corrects the length and width of the register.
|
|
|
|
Fixes: 936eda25e8da ("net/hns3: support dump register")
|
|
Cc: stable@dpdk.org
|
|
|
|
Signed-off-by: Chengchang Tang <tangchengchang@huawei.com>
|
|
Signed-off-by: Lijun Ou <oulijun@huawei.com>
|
|
---
|
|
drivers/net/hns3/hns3_regs.c | 10 +++++++---
|
|
1 file changed, 7 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/drivers/net/hns3/hns3_regs.c b/drivers/net/hns3/hns3_regs.c
|
|
index b2cc599..32597fe 100644
|
|
--- a/drivers/net/hns3/hns3_regs.c
|
|
+++ b/drivers/net/hns3/hns3_regs.c
|
|
@@ -104,6 +104,7 @@ hns3_get_regs_length(struct hns3_hw *hw, uint32_t *length)
|
|
struct hns3_adapter *hns = HNS3_DEV_HW_TO_ADAPTER(hw);
|
|
uint32_t cmdq_lines, common_lines, ring_lines, tqp_intr_lines;
|
|
uint32_t regs_num_32_bit, regs_num_64_bit;
|
|
+ uint32_t dfx_reg_lines;
|
|
uint32_t len;
|
|
int ret;
|
|
|
|
@@ -117,7 +118,7 @@ hns3_get_regs_length(struct hns3_hw *hw, uint32_t *length)
|
|
tqp_intr_lines = sizeof(tqp_intr_reg_addrs) / REG_LEN_PER_LINE + 1;
|
|
|
|
len = (cmdq_lines + common_lines + ring_lines * hw->tqps_num +
|
|
- tqp_intr_lines * hw->num_msi) * REG_LEN_PER_LINE;
|
|
+ tqp_intr_lines * hw->num_msi) * REG_NUM_PER_LINE;
|
|
|
|
if (!hns->is_vf) {
|
|
ret = hns3_get_regs_num(hw, ®s_num_32_bit, ®s_num_64_bit);
|
|
@@ -126,8 +127,11 @@ hns3_get_regs_length(struct hns3_hw *hw, uint32_t *length)
|
|
ret);
|
|
return -ENOTSUP;
|
|
}
|
|
- len += regs_num_32_bit * sizeof(uint32_t) +
|
|
- regs_num_64_bit * sizeof(uint64_t);
|
|
+ dfx_reg_lines = regs_num_32_bit * sizeof(uint32_t) /
|
|
+ REG_LEN_PER_LINE + 1;
|
|
+ dfx_reg_lines += regs_num_64_bit * sizeof(uint64_t) /
|
|
+ REG_LEN_PER_LINE + 1;
|
|
+ len += dfx_reg_lines * REG_NUM_PER_LINE;
|
|
}
|
|
|
|
*length = len;
|
|
--
|
|
2.7.4
|
|
|