From patchwork Mon Feb 9 19:40:27 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarek Poplawski X-Patchwork-Id: 22774 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id B0A50474C2 for ; Tue, 10 Feb 2009 06:40:17 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754756AbZBITjy (ORCPT ); Mon, 9 Feb 2009 14:39:54 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756938AbZBITjx (ORCPT ); Mon, 9 Feb 2009 14:39:53 -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 Received: by bwz5 with SMTP id 5so1772352bwz.13 for ; Mon, 09 Feb 2009 11:39:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:references:mime-version:content-type:content-disposition :in-reply-to:user-agent; bh=v8HalAZHXSDbs4Icv+ZBVHrHdO7ESc1mnuTiouo1Aog=; b=SYTICP1KUJJKOS8bgBddCyn7TIB/epzMknGJRQUDDK1xB5FTPiTrXjz9bW5oZwXJlU rZkDufaUjW8DRBzo26GGQlmvHmIQ/deE8Xr723cXi/NwY+ZJW803L/tmPrM44x56vinA hufWAMjHX1Wm3j0e943VIvV1xzGe8qU2TLvzM= 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= Received: by 10.223.110.6 with SMTP id l6mr1991911fap.52.1234208389263; Mon, 09 Feb 2009 11:39:49 -0800 (PST) Received: from ami.dom.local (public43823.xdsl.centertel.pl [79.163.171.47]) by mx.google.com with ESMTPS id 35sm6441861fkt.3.2009.02.09.11.39.45 (version=SSLv3 cipher=RC4-MD5); Mon, 09 Feb 2009 11:39:47 -0800 (PST) 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-Disposition: inline In-Reply-To: <20090209172216.GA11312@ovro.caltech.edu> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@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(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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);