Commit efdfad32 authored by Michael Chan's avatar Michael Chan Committed by David S. Miller

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: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent aed93e0b
...@@ -6388,6 +6388,7 @@ bnx2_reset_task(struct work_struct *work) ...@@ -6388,6 +6388,7 @@ bnx2_reset_task(struct work_struct *work)
{ {
struct bnx2 *bp = container_of(work, struct bnx2, reset_task); struct bnx2 *bp = container_of(work, struct bnx2, reset_task);
int rc; int rc;
u16 pcicmd;
rtnl_lock(); rtnl_lock();
if (!netif_running(bp->dev)) { if (!netif_running(bp->dev)) {
...@@ -6397,6 +6398,12 @@ bnx2_reset_task(struct work_struct *work) ...@@ -6397,6 +6398,12 @@ bnx2_reset_task(struct work_struct *work)
bnx2_netif_stop(bp, true); 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); rc = bnx2_init_nic(bp, 1);
if (rc) { if (rc) {
netdev_err(bp->dev, "failed to reset NIC, closing\n"); netdev_err(bp->dev, "failed to reset NIC, closing\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment