From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@osdl.org Subject: [patch 05/10] e1000: prevent statistics from getting garbled during reset Date: Tue, 18 Apr 2006 21:04:15 -0700 Message-ID: <200604190404.k3J44vOX007992@shell0.pdx.osdl.net> Cc: linville@tuxdriver.com, netdev@vger.kernel.org, akpm@osdl.org, linas@austin.ibm.com, jeffrey.t.kirsher@intel.com, jesse.brandeburg@intel.com, john.ronciak@intel.com Return-path: Received: from smtp.osdl.org ([65.172.181.4]:48843 "EHLO smtp.osdl.org") by vger.kernel.org with ESMTP id S1750770AbWDSEFT (ORCPT ); Wed, 19 Apr 2006 00:05:19 -0400 To: jeff@garzik.org Sender: netdev-owner@vger.kernel.org List-Id: netdev.vger.kernel.org From: Linas Vepstas If a PCI bus error/fault triggers a PCI bus reset, attempts to get the ethernet packet count statistics from the hardware will fail, returning garbage data upstream. This patch skips statistics data collection if the PCI device is not on the bus. This patch presumes that an earlier patch, [PATCH] PCI Error Recovery: e1000 network device driver has already been applied. Signed-off-by: Linas Vepstas Cc: John Ronciak Cc: Jesse Brandeburg Cc: Jeff Kirsher Cc: Jeff Garzik Signed-off-by: Andrew Morton --- drivers/net/e1000/e1000_main.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletion(-) diff -puN drivers/net/e1000/e1000_main.c~e1000-prevent-statistics-from-getting-garbled-during-reset drivers/net/e1000/e1000_main.c --- devel/drivers/net/e1000/e1000_main.c~e1000-prevent-statistics-from-getting-garbled-during-reset 2006-04-14 23:41:34.000000000 -0700 +++ devel-akpm/drivers/net/e1000/e1000_main.c 2006-04-14 23:41:34.000000000 -0700 @@ -3082,14 +3082,20 @@ void e1000_update_stats(struct e1000_adapter *adapter) { struct e1000_hw *hw = &adapter->hw; + struct pci_dev *pdev = adapter->pdev; unsigned long flags; uint16_t phy_tmp; #define PHY_IDLE_ERROR_COUNT_MASK 0x00FF - /* Prevent stats update while adapter is being reset */ + /* + * Prevent stats update while adapter is being reset, or if the pci + * connection is down. + */ if (adapter->link_speed == 0) return; + if (pdev->error_state && pdev->error_state != pci_channel_io_normal) + return; spin_lock_irqsave(&adapter->stats_lock, flags); _