From patchwork Sun Oct 17 11:48:59 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Hogan X-Patchwork-Id: 68077 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.180.67]) by ozlabs.org (Postfix) with ESMTP id C6D56B70F8 for ; Sun, 17 Oct 2010 22:49:43 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751829Ab0JQLtM (ORCPT ); Sun, 17 Oct 2010 07:49:12 -0400 Received: from mail-wy0-f174.google.com ([74.125.82.174]:45120 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750896Ab0JQLtL (ORCPT ); Sun, 17 Oct 2010 07:49:11 -0400 Received: by wyb28 with SMTP id 28so2163432wyb.19 for ; Sun, 17 Oct 2010 04:49:10 -0700 (PDT) Received: by 10.216.87.20 with SMTP id x20mr3808242wee.52.1287316149770; Sun, 17 Oct 2010 04:49:09 -0700 (PDT) Received: from gandalf.localnet (jahogan.plus.com [212.159.75.221]) by mx.google.com with ESMTPS id y15sm1133056weq.30.2010.10.17.04.49.07 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 17 Oct 2010 04:49:08 -0700 (PDT) From: James Hogan To: Gary Zambrano Subject: [PATCH v2] b44: fix resume, request_irq after hw reset Date: Sun, 17 Oct 2010 12:48:59 +0100 User-Agent: KMail/1.13.5 (Linux/2.6.36-rc8+; KDE/4.4.5; x86_64; ; ) Cc: "David S. Miller" , Jiri Pirko , FUJITA Tomonori , Hauke Mehrtens , Larry Finger , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Andrew Morton MIME-Version: 1.0 Message-Id: <201010171249.00485.james@albanarts.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On resume, call request_irq() after resetting the hardware rather than before. It's a shared interrupt so the handler could be called immediately if another device on the same irq interrupts (and will be called immediately if CONFIG_DEBUG_SHIRQ=y), but unless the hardware is reinitialised with b44_init_hw() the read of the interrupt status register will hang the system. Signed-off-by: James Hogan --- drivers/net/b44.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/drivers/net/b44.c b/drivers/net/b44.c index efeffdf..f950505 100644 --- a/drivers/net/b44.c +++ b/drivers/net/b44.c @@ -2296,18 +2296,27 @@ static int b44_resume(struct ssb_device *sdev) if (!netif_running(dev)) return 0; + spin_lock_irq(&bp->lock); + b44_init_rings(bp); + b44_init_hw(bp, B44_FULL_RESET); + spin_unlock_irq(&bp->lock); + + /* + * As a shared interrupt, the handler can be called immediately. To be + * able to check the interrupt status the hardware must already be + * powered back on (b44_init_hw). + */ rc = request_irq(dev->irq, b44_interrupt, IRQF_SHARED, dev->name, dev); if (rc) { netdev_err(dev, "request_irq failed\n"); + spin_lock_irq(&bp->lock); + b44_halt(bp); + b44_free_rings(bp); + spin_unlock_irq(&bp->lock); return rc; } - spin_lock_irq(&bp->lock); - - b44_init_rings(bp); - b44_init_hw(bp, B44_FULL_RESET); netif_device_attach(bp->dev); - spin_unlock_irq(&bp->lock); b44_enable_ints(bp); netif_wake_queue(dev);