Skip to content

Commit 5603b10

Browse files
Guilherme G Piccoligregkh
authored andcommitted
igb: re-assign hw address pointer on reset after PCI error
[ Upstream commit 69b97cf6dbce7403845a28bbc75d57f5be7b12ac ] Whenever the igb driver detects the result of a read operation returns a value composed only by F's (like 0xFFFFFFFF), it will detach the net_device, clear the hw_addr pointer and warn to the user that adapter's link is lost - those steps happen on igb_rd32(). In case a PCI error happens on Power architecture, there's a recovery mechanism called EEH, that will reset the PCI slot and call driver's handlers to reset the adapter and network functionality as well. We observed that once hw_addr is NULL after the error is detected on igb_rd32(), it's never assigned back, so in the process of resetting the network functionality we got a NULL pointer dereference in both igb_configure_tx_ring() and igb_configure_rx_ring(). In order to avoid such bug, this patch re-assigns the hw_addr value in the slot_reset handler. Reported-by: Anthony H Thai <ahthai@us.ibm.com> Reported-by: Harsha Thyagaraja <hathyaga@in.ibm.com> Signed-off-by: Guilherme G Piccoli <gpiccoli@linux.vnet.ibm.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Sasha Levin <alexander.levin@verizon.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 1c3ef07 commit 5603b10

1 file changed

Lines changed: 5 additions & 0 deletions

File tree

drivers/net/ethernet/intel/igb/igb_main.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7658,6 +7658,11 @@ static pci_ers_result_t igb_io_slot_reset(struct pci_dev *pdev)
76587658
pci_enable_wake(pdev, PCI_D3hot, 0);
76597659
pci_enable_wake(pdev, PCI_D3cold, 0);
76607660

7661+
/* In case of PCI error, adapter lose its HW address
7662+
* so we should re-assign it here.
7663+
*/
7664+
hw->hw_addr = adapter->io_addr;
7665+
76617666
igb_reset(adapter);
76627667
wr32(E1000_WUS, ~0);
76637668
result = PCI_ERS_RESULT_RECOVERED;

0 commit comments

Comments
 (0)