BACKPORT qed: fix dump of context data

already part of official version
Currently when dumping a context data only word number '1' is read for the
entire context.

Signed-off-by: Michal Kalderon <michal.kalderon@cavium.com>

diff --git a/linux-next-cherry-picks/0204-qed-fix-dump-of-context-data.patch b/linux-next-cherry-picks/0204-qed-fix-dump-of-context-data.patch
new file mode 100644 (file)
index 0000000..93e6c4b
--- /dev/null
+++ b/linux-next-cherry-picks/0204-qed-fix-dump-of-context-data.patch
@@ -0,0 +1,32 @@
+From eb4a9956485c25bffc4c939beea26b46929486cf Mon Sep 17 00:00:00 2001
+From: Michal Kalderon <michal.kalderon@cavium.com>
+Date: Tue, 6 Feb 2018 12:29:35 +0200
+Subject: [PATCH 1/2] qed: fix dump of context data
+
+Currently when dumping a context data only word number '1' is read for the
+entire context.
+
+Fixes: c965db444629 ("qed: Add support for debug data collection")
+
+Signed-off-by: Tomer Tayar <Tomer.Tayar@cavium.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ drivers/net/ethernet/qlogic/qed/qed_debug.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/net/ethernet/qlogic/qed/qed_debug.c b/drivers/net/ethernet/qlogic/qed/qed_debug.c
+index 483241b..a672f6a 100644
+--- a/drivers/net/ethernet/qlogic/qed/qed_debug.c
++++ b/drivers/net/ethernet/qlogic/qed/qed_debug.c
+@@ -2956,7 +2956,7 @@ static u32 qed_grc_dump_ctx_data(struct qed_hwfn *p_hwfn,
+                               qed_wr(p_hwfn,
+                                      p_ptt,
+                                      s_storm_defs[storm_id].cm_ctx_wr_addr,
+-                                     BIT(9) | lid);
++                                     (i << 9) | lid);
+                               *(dump_buf + offset) = qed_rd(p_hwfn,
+                                                             p_ptt,
+                                                             rd_reg_addr);
+-- 
+1.8.3.1
+