From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757587AbZBITkW (ORCPT ); Mon, 9 Feb 2009 14:40:22 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757055AbZBITjy (ORCPT ); Mon, 9 Feb 2009 14:39:54 -0500 Received: from mail-bw0-f161.google.com ([209.85.218.161]:55700 "EHLO mail-bw0-f161.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756221AbZBITjw (ORCPT ); Mon, 9 Feb 2009 14:39:52 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=hKriumxmg3m2ekSUhkWKMczajx7p4NFQf5Revl0MSRmmsYz/pKq/rNztbR0OaQX9Nl wvx8yW12cDy1XmYLhjjclHQqbepg2JG5Jnvk3xQpi2iLmJe3qNAikyUfH7qNNIHb+oA7 MttV3+lYN84YAGr5nvmhxnDEmdX0mXiTdK86s= Date: Mon, 9 Feb 2009 20:40:27 +0100 From: Jarek Poplawski To: Jeff Garzik , David Miller Cc: Ira Snyder , Peter Korsgaard , Dai Haruki , Andy Fleming , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v2 net] gianfar: Fix boot hangs while bringing up gianfar ethernet Message-ID: <20090209194027.GB2537@ami.dom.local> References: <20090129194145.GA4647@ovro.caltech.edu> <20090207225555.GA2680@ami.dom.local> <20090209172216.GA11312@ovro.caltech.edu> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20090209172216.GA11312@ovro.caltech.edu> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org > PS#2: Andy, this changelog is really a lot harder than the patch... Hmm... -------------------> (take 2 - signed-off fix only) gianfar: Fix boot hangs while bringing up gianfar ethernet Ira Snyder found that commit 8c7396aebb68994c0519e438eecdf4d5fa9c7844 "gianfar: Merge Tx and Rx interrupt for scheduling clean up ring" can cause hangs. It's because there was removed clearing of interrupts in gfar_schedule_cleanup() (which is called by an interrupt handler) in case when netif scheduling has been disabled. This patch brings back this action and a comment. Reported-by: Ira Snyder Reported-by: Peter Korsgaard Bisected-by: Ira Snyder Tested-by: Peter Korsgaard Tested-by: Ira Snyder Signed-off-by: Jarek Poplawski --- drivers/net/gianfar.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index acae2d8..9b12a13 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c @@ -1629,6 +1629,12 @@ static void gfar_schedule_cleanup(struct net_device *dev) if (netif_rx_schedule_prep(&priv->napi)) { gfar_write(&priv->regs->imask, IMASK_RTX_DISABLED); __netif_rx_schedule(&priv->napi); + } else { + /* + * Clear IEVENT, so interrupts aren't called again + * because of the packets that have already arrived. + */ + gfar_write(&priv->regs->ievent, IEVENT_RTX_MASK); } spin_unlock(&priv->rxlock);