[PATCH] net/hns3: fix variable type

[PATCH] net/hns3: fix variable type

[Jie Hai]

The patch fixes variable type in case of data trunction.

Fixes: dd4b8bba785f ("net/hns3: support reporting names of registers")
Cc: stable@dpdk.org

Signed-off-by: Jie Hai <haijie1@huawei.com>
---
 drivers/net/hns3/hns3_regs.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/hns3/hns3_regs.c b/drivers/net/hns3/hns3_regs.c
index e8bc7fbc66e1..be6929738942 100644
--- a/drivers/net/hns3/hns3_regs.c
+++ b/drivers/net/hns3/hns3_regs.c
@@ -1178,9 +1178,9 @@ hns3_direct_access_tqp_regs_help(struct hns3_hw *hw, struct rte_dev_reg_info *re
 				 uint32_t modules, enum hns3_reg_modules idx)
 {
 	const struct hns3_dirt_reg_entry *reg_list;
-	uint16_t tqp_num, reg_offset;
+	uint32_t reg_num, i, j, reg_offset;
 	uint32_t *data = regs->data;
-	uint32_t reg_num, i, j;
+	uint16_t tqp_num;
 
 	if ((modules & HNS3_MODULE_MASK(idx)) == 0)
 		return;
-- 
2.22.0

[PATCH v2 0/2] net/hns3: bugfix on register dump

[Jie Hai]

Jie Hai (2):
  net/hns3: fix variable type
  net/hns3: fix pointer offset

 drivers/net/hns3/hns3_regs.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

-- 
2.22.0

[PATCH v2 1/2] net/hns3: fix variable type

[Jie Hai]

The patch fixes variable type in case of data trunction.

Fixes: dd4b8bba785f ("net/hns3: support reporting names of registers")
Cc: stable@dpdk.org

Signed-off-by: Jie Hai <haijie1@huawei.com>
---
 drivers/net/hns3/hns3_regs.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/hns3/hns3_regs.c b/drivers/net/hns3/hns3_regs.c
index e8bc7fbc66e1..be6929738942 100644
--- a/drivers/net/hns3/hns3_regs.c
+++ b/drivers/net/hns3/hns3_regs.c
@@ -1178,9 +1178,9 @@ hns3_direct_access_tqp_regs_help(struct hns3_hw *hw, struct rte_dev_reg_info *re
 				 uint32_t modules, enum hns3_reg_modules idx)
 {
 	const struct hns3_dirt_reg_entry *reg_list;
-	uint16_t tqp_num, reg_offset;
+	uint32_t reg_num, i, j, reg_offset;
 	uint32_t *data = regs->data;
-	uint32_t reg_num, i, j;
+	uint16_t tqp_num;
 
 	if ((modules & HNS3_MODULE_MASK(idx)) == 0)
 		return;
-- 
2.22.0

[PATCH v2 2/2] net/hns3: fix pointer offset

[Jie Hai]

If the register values of multiple modules are obtained at a time,
the register values are incorrect because the data field to be filled
pointing to a wrong address. Update the pointer offset of data to
get the correct address.

Fixes: dd4b8bba785f ("net/hns3: support reporting names of registers")
Cc: stable@dpdk.org

Signed-off-by: Jie Hai <haijie1@huawei.com>
---
 drivers/net/hns3/hns3_regs.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/hns3/hns3_regs.c b/drivers/net/hns3/hns3_regs.c
index be6929738942..fef904a296c0 100644
--- a/drivers/net/hns3/hns3_regs.c
+++ b/drivers/net/hns3/hns3_regs.c
@@ -1274,6 +1274,7 @@ hns3_get_dfx_regs(struct hns3_hw *hw, struct rte_dev_reg_info *regs, uint32_t mo
 	if (cmd_descs == NULL)
 		return -ENOMEM;
 
+	data += regs->length;
 	for (i = 0; i < opcode_num; i++) {
 		opcode = hns3_dfx_reg_opcode_list[i];
 		bd_num = bd_num_list[i];
@@ -1285,7 +1286,6 @@ hns3_get_dfx_regs(struct hns3_hw *hw, struct rte_dev_reg_info *regs, uint32_t mo
 		if (ret)
 			break;
 
-		data += regs->length;
 		regs_num = hns3_dfx_reg_fetch_data(cmd_descs, bd_num, data);
 		if (regs_num !=  hns3_reg_lists[i].entry_num) {
 			hns3_err(hw, "Query register number differ from the list for module %s!",
@@ -1294,6 +1294,7 @@ hns3_get_dfx_regs(struct hns3_hw *hw, struct rte_dev_reg_info *regs, uint32_t mo
 		}
 		hns3_fill_dfx_regs_name(hw, regs, hns3_reg_lists[i].reg_list, regs_num);
 		regs->length += regs_num;
+		data += regs_num;
 	}
 	rte_free(cmd_descs);
 
-- 
2.22.0

Re: [PATCH v2 1/2] net/hns3: fix variable type

[fengchengwen]

Acked-by: Chengwen Feng <fengchengwen@huawei.com>

On 2024/10/22 12:01, Jie Hai wrote:
> The patch fixes variable type in case of data trunction.
> 
> Fixes: dd4b8bba785f ("net/hns3: support reporting names of registers")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Jie Hai <haijie1@huawei.com>
> ---
>  drivers/net/hns3/hns3_regs.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/hns3/hns3_regs.c b/drivers/net/hns3/hns3_regs.c
> index e8bc7fbc66e1..be6929738942 100644
> --- a/drivers/net/hns3/hns3_regs.c
> +++ b/drivers/net/hns3/hns3_regs.c
> @@ -1178,9 +1178,9 @@ hns3_direct_access_tqp_regs_help(struct hns3_hw *hw, struct rte_dev_reg_info *re
>  				 uint32_t modules, enum hns3_reg_modules idx)
>  {
>  	const struct hns3_dirt_reg_entry *reg_list;
> -	uint16_t tqp_num, reg_offset;
> +	uint32_t reg_num, i, j, reg_offset;
>  	uint32_t *data = regs->data;
> -	uint32_t reg_num, i, j;
> +	uint16_t tqp_num;
>  
>  	if ((modules & HNS3_MODULE_MASK(idx)) == 0)
>  		return;

Re: [PATCH v2 2/2] net/hns3: fix pointer offset

[fengchengwen]

Acked-by: Chengwen Feng <fengchengwen@huawei.com>

On 2024/10/22 12:01, Jie Hai wrote:
> If the register values of multiple modules are obtained at a time,
> the register values are incorrect because the data field to be filled
> pointing to a wrong address. Update the pointer offset of data to
> get the correct address.
> 
> Fixes: dd4b8bba785f ("net/hns3: support reporting names of registers")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Jie Hai <haijie1@huawei.com>
> ---

Re: [PATCH v2 1/2] net/hns3: fix variable type

[lihuisong (C)]

Acked-by: Huisong Li <lihuisong@huawei.com>

在 2024/10/22 12:01, Jie Hai 写道:
> The patch fixes variable type in case of data trunction.
>
> Fixes: dd4b8bba785f ("net/hns3: support reporting names of registers")
> Cc: stable@dpdk.org
>
> Signed-off-by: Jie Hai <haijie1@huawei.com>
> ---
>   drivers/net/hns3/hns3_regs.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/hns3/hns3_regs.c b/drivers/net/hns3/hns3_regs.c
> index e8bc7fbc66e1..be6929738942 100644
> --- a/drivers/net/hns3/hns3_regs.c
> +++ b/drivers/net/hns3/hns3_regs.c
> @@ -1178,9 +1178,9 @@ hns3_direct_access_tqp_regs_help(struct hns3_hw *hw, struct rte_dev_reg_info *re
>   				 uint32_t modules, enum hns3_reg_modules idx)
>   {
>   	const struct hns3_dirt_reg_entry *reg_list;
> -	uint16_t tqp_num, reg_offset;
> +	uint32_t reg_num, i, j, reg_offset;
>   	uint32_t *data = regs->data;
> -	uint32_t reg_num, i, j;
> +	uint16_t tqp_num;
>   
>   	if ((modules & HNS3_MODULE_MASK(idx)) == 0)
>   		return;

Re: [PATCH v2 2/2] net/hns3: fix pointer offset

[lihuisong (C)]

Acked-by: Huisong Li <lihuisong@huawei.com>

在 2024/10/22 12:01, Jie Hai 写道:
> If the register values of multiple modules are obtained at a time,
> the register values are incorrect because the data field to be filled
> pointing to a wrong address. Update the pointer offset of data to
> get the correct address.
>
> Fixes: dd4b8bba785f ("net/hns3: support reporting names of registers")
> Cc: stable@dpdk.org
>
> Signed-off-by: Jie Hai <haijie1@huawei.com>
> ---
>   drivers/net/hns3/hns3_regs.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/hns3/hns3_regs.c b/drivers/net/hns3/hns3_regs.c
> index be6929738942..fef904a296c0 100644
> --- a/drivers/net/hns3/hns3_regs.c
> +++ b/drivers/net/hns3/hns3_regs.c
> @@ -1274,6 +1274,7 @@ hns3_get_dfx_regs(struct hns3_hw *hw, struct rte_dev_reg_info *regs, uint32_t mo
>   	if (cmd_descs == NULL)
>   		return -ENOMEM;
>   
> +	data += regs->length;
>   	for (i = 0; i < opcode_num; i++) {
>   		opcode = hns3_dfx_reg_opcode_list[i];
>   		bd_num = bd_num_list[i];
> @@ -1285,7 +1286,6 @@ hns3_get_dfx_regs(struct hns3_hw *hw, struct rte_dev_reg_info *regs, uint32_t mo
>   		if (ret)
>   			break;
>   
> -		data += regs->length;
>   		regs_num = hns3_dfx_reg_fetch_data(cmd_descs, bd_num, data);
>   		if (regs_num !=  hns3_reg_lists[i].entry_num) {
>   			hns3_err(hw, "Query register number differ from the list for module %s!",
> @@ -1294,6 +1294,7 @@ hns3_get_dfx_regs(struct hns3_hw *hw, struct rte_dev_reg_info *regs, uint32_t mo
>   		}
>   		hns3_fill_dfx_regs_name(hw, regs, hns3_reg_lists[i].reg_list, regs_num);
>   		regs->length += regs_num;
> +		data += regs_num;
>   	}
>   	rte_free(cmd_descs);
>   

Re: [PATCH v2 0/2] net/hns3: bugfix on register dump

[Ferruh Yigit]

On 10/22/2024 5:01 AM, Jie Hai wrote:
> 
> Jie Hai (2):
>   net/hns3: fix variable type
>   net/hns3: fix pointer offset
>

Series applied to dpdk-next-net/main, thanks.