Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/net/ethernet/broadcom/bnx2.c

+7 −0
Original line number Diff line number Diff line
@@ -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");