[dpdk-stable] patch 'net/hns3: fix dump register out of range' has been queued to stable release 19.11.7

[Christian Ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.7

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/06/21. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/4ae7e3069a58554d0ddf8ef2b3a3c31ff11b31f3

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 4ae7e3069a58554d0ddf8ef2b3a3c31ff11b31f3 Mon Sep 17 00:00:00 2001
From: Chengchang Tang <tangchengchang at huawei.com>
Date: Thu, 14 Jan 2021 21:33:36 +0800
Subject: [PATCH] net/hns3: fix dump register out of range

[ upstream commit acb3260fac5c93d953876172ce322e9f2801a33c ]

Currently, when dump the queue interrupt registers, the number of
registers that should be dumped is calculated from num_msi. But the
value of num_msi includes the number of misc interrupts. So, for some
hardware version, like kupeng930, it will lead to an illegal access.

This patch replace num_msi with intr_tqps_num which indicate the
number of interrupts used by the tqps.

Fixes: 936eda25e8da ("net/hns3: support dump register")

Signed-off-by: Chengchang Tang <tangchengchang at huawei.com>
Signed-off-by: Lijun Ou <oulijun at huawei.com>
---
 drivers/net/hns3/hns3_regs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/hns3/hns3_regs.c b/drivers/net/hns3/hns3_regs.c
index 277404e692..2f34357d48 100644
--- a/drivers/net/hns3/hns3_regs.c
+++ b/drivers/net/hns3/hns3_regs.c
@@ -314,7 +314,7 @@ hns3_direct_access_regs(struct hns3_hw *hw, uint32_t *data)
 	}
 
 	reg_num = sizeof(tqp_intr_reg_addrs) / sizeof(uint32_t);
-	for (j = 0; j < hw->num_msi; j++) {
+	for (j = 0; j < hw->intr_tqps_num; j++) {
 		reg_offset = HNS3_TQP_INTR_REG_SIZE * j;
 		for (i = 0; i < reg_num; i++)
 			*data++ = hns3_read_dev(hw, tqp_intr_reg_addrs[i] +
-- 
2.30.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-02-04 12:04:33.412998273 +0100
+++ 0133-net-hns3-fix-dump-register-out-of-range.patch	2021-02-04 12:04:28.202789895 +0100
@@ -1 +1 @@
-From acb3260fac5c93d953876172ce322e9f2801a33c Mon Sep 17 00:00:00 2001
+From 4ae7e3069a58554d0ddf8ef2b3a3c31ff11b31f3 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit acb3260fac5c93d953876172ce322e9f2801a33c ]
+
@@ -15 +16,0 @@
-Cc: stable at dpdk.org
@@ -24 +25 @@
-index 775e0965f7..f2cb465eed 100644
+index 277404e692..2f34357d48 100644
@@ -27 +28 @@
-@@ -300,7 +300,7 @@ hns3_direct_access_regs(struct hns3_hw *hw, uint32_t *data)
+@@ -314,7 +314,7 @@ hns3_direct_access_regs(struct hns3_hw *hw, uint32_t *data)