bnx2: Try to recover from PCI block reset

If the PCI block has reset, the memory enable bit will be reset and
the device will not respond to MMIO access.  bnx2_reset_task() currently
will not recover when this happens.  Add code to detect this condition
and restore the PCI state.  This scenario has been reported by some
users.

Signed-off-by: Michael Chan <[email protected]>
Signed-off-by: David S. Miller <[email protected]>

diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c
index 0ced154129a995cf19fcad6f2347c2b246129e31..79cebd8525ce3d451e30b935484dac18535939f2 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2.c
+++ b/drivers/net/ethernet/broadcom/bnx2.c
@@ -6388,6 +6388,7 @@ bnx2_reset_task(struct work_struct *work)
 {
        struct bnx2 *bp = container_of(work, struct bnx2, reset_task);
        int rc;
+       u16 pcicmd;
 
        rtnl_lock();
        if (!netif_running(bp->dev)) {
@@ -6397,6 +6398,12 @@ bnx2_reset_task(struct work_struct *work)
 
        bnx2_netif_stop(bp, true);
 
+       pci_read_config_word(bp->pdev, PCI_COMMAND, &pcicmd);
+       if (!(pcicmd & PCI_COMMAND_MEMORY)) {
+               /* in case PCI block has reset */
+               pci_restore_state(bp->pdev);
+               pci_save_state(bp->pdev);
+       }
        rc = bnx2_init_nic(bp, 1);
        if (rc) {
                netdev_err(bp->dev, "failed to reset NIC, closing\n");