Message ID | 20191016234711.21823-2-jeffrey.t.kirsher@intel.com |
---|---|
State | Changes Requested |
Delegated to: | David Miller |
Headers | show |
Series | 1GbE Intel Wired LAN Driver Updates 2019-10-16 | expand |
On Wed, 16 Oct 2019 16:47:05 -0700, Jeff Kirsher wrote: > From: Lyude Paul <lyude@redhat.com> > > Fatal read errors are worth warning about, unless of course the device > was just unplugged from the machine - something that's a rather normal > occurence when the igb/igc adapter is located on a Thunderbolt dock. So, > let's only WARN() if there's a fatal read error while the device is > still present. > > This fixes the following WARN splat that's been appearing whenever I > unplug my Caldigit TS3 Thunderbolt dock from my laptop: > > [...] > > Signed-off-by: Lyude Paul <lyude@redhat.com> > Fixes: 47e16692b26b ("igb/igc: warn when fatal read failure happens") > Acked-by: Sasha Neftin <sasha.neftin@intel.com> > Tested-by: Aaron Brown <aaron.f.brown@intel.com> > Acked-by: Feng Tang <feng.tang@intel.com> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Any plans to start sending fixes to net? :(
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index 105b0624081a..31b9e02875cc 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -753,7 +753,8 @@ u32 igb_rd32(struct e1000_hw *hw, u32 reg) struct net_device *netdev = igb->netdev; hw->hw_addr = NULL; netdev_err(netdev, "PCIe link lost\n"); - WARN(1, "igb: Failed to read reg 0x%x!\n", reg); + WARN(pci_device_is_present(igb->pdev), + "igb: Failed to read reg 0x%x!\n", reg); } return value; diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c index 63b62d74f961..8e424dfab12e 100644 --- a/drivers/net/ethernet/intel/igc/igc_main.c +++ b/drivers/net/ethernet/intel/igc/igc_main.c @@ -4047,7 +4047,8 @@ u32 igc_rd32(struct igc_hw *hw, u32 reg) hw->hw_addr = NULL; netif_device_detach(netdev); netdev_err(netdev, "PCIe link lost, device now detached\n"); - WARN(1, "igc: Failed to read reg 0x%x!\n", reg); + WARN(pci_device_is_present(igc->pdev), + "igc: Failed to read reg 0x%x!\n", reg); } return value;