netxen_nic: Error logging on firmware hang

Log states of essential registers on firmware hang detection.

Signed-off-by: Sritej Velaga <sritej.velaga@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_hdr.h b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hdr.h
index dc1967c1f312497e7d680c501a8c71d2091c4b2e..b1a897cd9a8d54366b39dcd46bcb943dae575356 100644 (file)
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_hdr.h
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hdr.h
@@ -969,6 +969,7 @@ enum {
 #define NX_RCODE_FATAL_ERROR           0x80000000
 #define NX_FWERROR_PEGNUM(code)                ((code) & 0xff)
 #define NX_FWERROR_CODE(code)          ((code >> 8) & 0xfffff)
+#define NX_FWERROR_PEGSTAT1(code)      ((code >> 8) & 0x1fffff)
 
 #define FW_POLL_DELAY                  (2 * HZ)
 #define FW_FAIL_THRESH                 3

diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
index f67655f3462c7d628e4a18847f3ad12319dab375..f517c16bfa3fecc9d62d0858cdf3c14545d10aed 100644 (file)
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
@@ -2596,6 +2596,7 @@ static int
 netxen_check_health(struct netxen_adapter *adapter)
 {
        u32 state, heartbit;
+       u32 peg_status;
        struct net_device *netdev = adapter->netdev;
 
        state = NXRD32(adapter, NX_CRB_DEV_STATE);
@@ -2642,8 +2643,24 @@ netxen_check_health(struct netxen_adapter *adapter)
 
        clear_bit(__NX_FW_ATTACHED, &adapter->state);
 
-       dev_info(&netdev->dev, "firmware hang detected\n");
-
+       dev_err(&netdev->dev, "firmware hang detected\n");
+       peg_status = NXRD32(adapter, NETXEN_PEG_HALT_STATUS1);
+       dev_err(&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",
+                       peg_status,
+                       NXRD32(adapter, NETXEN_PEG_HALT_STATUS2),
+                       NXRD32(adapter, NETXEN_CRB_PEG_NET_0 + 0x3c),
+                       NXRD32(adapter, NETXEN_CRB_PEG_NET_1 + 0x3c),
+                       NXRD32(adapter, NETXEN_CRB_PEG_NET_2 + 0x3c),
+                       NXRD32(adapter, NETXEN_CRB_PEG_NET_3 + 0x3c),
+                       NXRD32(adapter, NETXEN_CRB_PEG_NET_4 + 0x3c));
+       if (NX_FWERROR_PEGSTAT1(peg_status) == 0x67)
+               dev_err(&adapter->pdev->dev,
+                       "Firmware aborted with error code 0x00006700. "
+                               "Device is being reset.\n");
 detach:
        if ((auto_fw_reset == AUTO_FW_RESET_ENABLED) &&
                        !test_and_set_bit(__NX_RESETTING, &adapter->state))