From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Garzik Subject: Re: [PATCH 3/3] e1000e: fix EEH recovery during reset on PPC Date: Fri, 27 Jun 2008 00:56:17 -0400 Message-ID: <486472F1.4050900@garzik.org> References: <20080625000036.16592.6621.stgit@localhost.localdomain> <20080625000120.16592.89100.stgit@localhost.localdomain> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Cc: davem@davemloft.net, netdev@vger.kernel.org, pl@us.ibm.com To: Jeff Kirsher Return-path: Received: from srv5.dvmed.net ([207.36.208.214]:40793 "EHLO mail.dvmed.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752755AbYF0E4Y (ORCPT ); Fri, 27 Jun 2008 00:56:24 -0400 In-Reply-To: <20080625000120.16592.89100.stgit@localhost.localdomain> Sender: netdev-owner@vger.kernel.org List-ID: Jeff Kirsher wrote: > EEH is not recovering in a reasonable amount of time on PPC during > e1000e_down(). > > Signed-off-by: Jeff Kirsher > Signed-off-by: Jesse Brandeburg > --- > > drivers/net/e1000e/netdev.c | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c > index ccb8ca2..0320925 100644 > --- a/drivers/net/e1000e/netdev.c > +++ b/drivers/net/e1000e/netdev.c > @@ -2535,7 +2535,8 @@ void e1000e_down(struct e1000_adapter *adapter) > adapter->link_speed = 0; > adapter->link_duplex = 0; > > - e1000e_reset(adapter); > + if (!pci_channel_offline(adapter->pdev)) > + e1000e_reset(adapter); > e1000_clean_tx_ring(adapter); > e1000_clean_rx_ring(adapter); IMO for this type of change, you should consider putting all these changes into a single patch. It's exactly the same logical change, so no need to split it up into three patches.