2 files changed, 14 insertions, 3 deletions

diff --git a/drivers/net/qlcnic/qlcnic.h b/drivers/net/qlcnic/qlcnic.h
index 5f0141be8ca9..53c6e5dcf26c 100644
--- a/drivers/net/qlcnic/qlcnic.h
+++ b/drivers/net/qlcnic/qlcnic.h
@@ -36,8 +36,8 @@
 
 #define _QLCNIC_LINUX_MAJOR 5
 #define _QLCNIC_LINUX_MINOR 0
-#define _QLCNIC_LINUX_SUBVERSION 21
-#define QLCNIC_LINUX_VERSIONID  "5.0.21"
+#define _QLCNIC_LINUX_SUBVERSION 22
+#define QLCNIC_LINUX_VERSIONID  "5.0.22"
 #define QLCNIC_DRV_IDC_VER  0x01
 #define QLCNIC_DRIVER_VERSION  ((_QLCNIC_LINUX_MAJOR << 16) |\
                  (_QLCNIC_LINUX_MINOR << 8) | (_QLCNIC_LINUX_SUBVERSION))
diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/qlcnic/qlcnic_main.c
index d287a2bd498d..ec8ef72d38d3 100644
--- a/drivers/net/qlcnic/qlcnic_main.c
+++ b/drivers/net/qlcnic/qlcnic_main.c
@@ -3109,7 +3109,18 @@ qlcnic_check_health(struct qlcnic_adapter *adapter)
                 clear_bit(__QLCNIC_FW_ATTACHED, &adapter->state);
 
         dev_info(&netdev->dev, "firmware hang detected\n");
-
+        dev_info(&adapter->pdev->dev, "Dumping hw/fw registers\n"
+                        "PEG_HALT_STATUS1: 0x%x, PEG_HALT_STATUS2: 0x%x,\n"
+                        "PEG_NET_0_PC: 0x%x, PEG_NET_1_PC: 0x%x,\n"
+                        "PEG_NET_2_PC: 0x%x, PEG_NET_3_PC: 0x%x,\n"
+                        "PEG_NET_4_PC: 0x%x\n",
+                        QLCRD32(adapter, QLCNIC_PEG_HALT_STATUS1),
+                        QLCRD32(adapter, QLCNIC_PEG_HALT_STATUS2),
+                        QLCRD32(adapter, QLCNIC_CRB_PEG_NET_0 + 0x3c),
+                        QLCRD32(adapter, QLCNIC_CRB_PEG_NET_1 + 0x3c),
+                        QLCRD32(adapter, QLCNIC_CRB_PEG_NET_2 + 0x3c),
+                        QLCRD32(adapter, QLCNIC_CRB_PEG_NET_3 + 0x3c),
+                        QLCRD32(adapter, QLCNIC_CRB_PEG_NET_4 + 0x3c));
 detach:
         adapter->dev_state = (state == QLCNIC_DEV_NEED_QUISCENT) ? state :
                 QLCNIC_DEV_NEED_RESET;