Commit 26403b7f authored by Emil Tantilov's avatar Emil Tantilov Committed by Jeff Kirsher

ixgbevf: restore hw_addr on resume or error

Restore adapter->hw.hw_addr after handling an error, or a resume
operation to make sure we can access the registers.
Signed-off-by: default avatarEmil Tantilov <emil.s.tantilov@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent aeb4c731
...@@ -3851,6 +3851,8 @@ static int ixgbevf_resume(struct pci_dev *pdev) ...@@ -3851,6 +3851,8 @@ static int ixgbevf_resume(struct pci_dev *pdev)
dev_err(&pdev->dev, "Cannot enable PCI device from suspend\n"); dev_err(&pdev->dev, "Cannot enable PCI device from suspend\n");
return err; return err;
} }
adapter->hw.hw_addr = adapter->io_addr;
smp_mb__before_atomic(); smp_mb__before_atomic();
clear_bit(__IXGBEVF_DISABLED, &adapter->state); clear_bit(__IXGBEVF_DISABLED, &adapter->state);
pci_set_master(pdev); pci_set_master(pdev);
...@@ -4285,6 +4287,7 @@ static pci_ers_result_t ixgbevf_io_slot_reset(struct pci_dev *pdev) ...@@ -4285,6 +4287,7 @@ static pci_ers_result_t ixgbevf_io_slot_reset(struct pci_dev *pdev)
return PCI_ERS_RESULT_DISCONNECT; return PCI_ERS_RESULT_DISCONNECT;
} }
adapter->hw.hw_addr = adapter->io_addr;
smp_mb__before_atomic(); smp_mb__before_atomic();
clear_bit(__IXGBEVF_DISABLED, &adapter->state); clear_bit(__IXGBEVF_DISABLED, &adapter->state);
pci_set_master(pdev); pci_set_master(pdev);
......
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