Skip to contentSkip to conversation

ixgbevf: restore hw_addr on resume or error

PATCH Superseded Emil Tantilov 2 participants 2 messages Nov 23, 2016

Subsystems (2)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 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.

v2 - restore hw_addr pnly if pci_enable_device_mem() succeeds in ixgbevf_io_slot_reset()

---
 drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c |    2 ++
 1 file changed, 2 insertions(+)
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c +2 -0
index 88c5352..1093b41 100644
@@ -3840,6 +3840,7 @@ static int ixgbevf_resume(struct pci_dev *pdev)
 	struct ixgbevf_adapter *adapter = netdev_priv(netdev);
 	u32 err;
 
+	adapter->hw.hw_addr = adapter->io_addr;
 	pci_restore_state(pdev);
 	/* pci_restore_state clears dev->state_saved so call
 	 * pci_save_state to restore it.
@@ -4289,6 +4290,7 @@ static pci_ers_result_t ixgbevf_io_slot_reset(struct pci_dev *pdev)
 		return PCI_ERS_RESULT_DISCONNECT;
 	}
 
+	adapter->hw.hw_addr = adapter->io_addr;
 	smp_mb__before_atomic();
 	clear_bit(__IXGBEVF_DISABLED, &adapter->state);
 	pci_set_master(pdev);
#1 lore raw

PATCH v2 1/1 ixgbevf: restore hw_addr on resume or error

Quoted 25 lines

-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Emil Tantilov
Sent: Wednesday, November 23, 2016 10:12 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH v2] 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.

v2 - restore hw_addr pnly if pci_enable_device_mem() succeeds in ixgbevf_io_slot_reset()

---
 drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c |    2 ++
 1 file changed, 2 insertions(+)
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c +0 -0
index 88c5352..1093b41 100644

drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c static int ixgbevf_resume(struct pci_dev *pdev) · line 3846

Quoted 7 lines
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c +1 -0
@@ -3840,6 +3840,7 @@ static int ixgbevf_resume(struct pci_dev *pdev)
 	struct ixgbevf_adapter *adapter = netdev_priv(netdev);
 	u32 err;
 
+	adapter->hw.hw_addr = adapter->io_addr;
 	pci_restore_state(pdev);
 	/* pci_restore_state clears dev->state_saved so call
 	 * pci_save_state to restore it.

So this piece needs the same change that we made below. You need to reset hw_addr after pci_enable_device_mem() and before we call smp_mb__before_atomic()

Quoted 14 lines
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c +1 -0
@@ -4289,6 +4290,7 @@ static pci_ers_result_t ixgbevf_io_slot_reset(struct
 pci_dev *pdev)
 		return PCI_ERS_RESULT_DISCONNECT;
 	}
 
+	adapter->hw.hw_addr = adapter->io_addr;
 	smp_mb__before_atomic();
 	clear_bit(__IXGBEVF_DISABLED, &adapter->state);

pci_set_master(pdev);

_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan at lists.osuosl.org
http://lists.osuosl.org/mailman/listinfo/intel-wired-lan