From patchwork Sat Jun 20 08:02:24 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike McCormack X-Patchwork-Id: 28926 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4CB34B70FA for ; Sat, 20 Jun 2009 18:02:38 +1000 (EST) Received: by ozlabs.org (Postfix) id 3CACCDDDA0; Sat, 20 Jun 2009 18:02:38 +1000 (EST) 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 C16FEDDD1B for ; Sat, 20 Jun 2009 18:02:37 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753498AbZFTICY (ORCPT ); Sat, 20 Jun 2009 04:02:24 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752133AbZFTICY (ORCPT ); Sat, 20 Jun 2009 04:02:24 -0400 Received: from mail-bw0-f213.google.com ([209.85.218.213]:38936 "EHLO mail-bw0-f213.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752097AbZFTICW (ORCPT ); Sat, 20 Jun 2009 04:02:22 -0400 Received: by bwz9 with SMTP id 9so2154118bwz.37 for ; Sat, 20 Jun 2009 01:02:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:sender:received:date :x-google-sender-auth:message-id:subject:from:to:content-type :content-transfer-encoding; bh=wlFMG4vSXpaBPFcEFhtuz3Z+1N4AypsfMfD/O2Hco24=; b=nrVgw3MK0nsmk5yrZnWSCztgU46yWgmDNxG53bIzEHHhJAZkRQdHhfxMwNq/0rDBS/ mmDyuiQFID7/+nlkI39mCTmaGurrajM6JusJG6iDqDnnJgsQqZTRICBwa1WlUGi5UDlV zhhtioixR4uWENZNYCw8jn29s9vgZm2I8NZwg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:date:x-google-sender-auth:message-id:subject :from:to:content-type:content-transfer-encoding; b=cHdkQwXJPshLdJZ89qzx9s9JR35hjodTmEzZidZFW+8DDmHyDwMRVbasaTKvbrbHtS DHJjspCvA/EaK6kKhCqMFeyFnTTny/iLUcvtqwnWxkizIzvKdkH8cIwPhcNIkQGQkwXi +zkaRYpsv/Dsk3J33vBDceiYIYYItzGiosftc= MIME-Version: 1.0 Received: by 10.223.125.144 with SMTP id y16mr2935543far.93.1245484944268; Sat, 20 Jun 2009 01:02:24 -0700 (PDT) Date: Sat, 20 Jun 2009 17:02:24 +0900 X-Google-Sender-Auth: 77f194364ac6cfd1 Message-ID: <392fb48f0906200102k57f7964ah9f74c2cf40ea64b0@mail.gmail.com> Subject: [PATCH] sky2: Avoid races in sky2_down From: Mike McCormack To: netdev@vger.kernel.org, Stephen Hemminger Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Reset rx chain before trying to drain it. Shut interrupts off last, in case there's something to report. --- drivers/net/sky2.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index ca1e9e5..3f67a60 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c @@ -1825,12 +1825,6 @@ static int sky2_down(struct net_device *dev) if (netif_msg_ifdown(sky2)) printk(KERN_INFO PFX "%s: disabling interface\n", dev->name); - /* Disable port IRQ */ - imask = sky2_read32(hw, B0_IMSK); - imask &= ~portirq_msk[port]; - sky2_write32(hw, B0_IMSK, imask); - sky2_read32(hw, B0_IMSK); - /* Force flow control off */ sky2_write8(hw, SK_REG(port, GMAC_CTRL), GMC_PAUSE_OFF); @@ -1870,8 +1864,6 @@ static int sky2_down(struct net_device *dev) sky2_write32(hw, RB_ADDR(txqaddr[port], RB_CTRL), RB_RST_SET); - sky2_rx_stop(sky2); - sky2_write8(hw, SK_REG(port, RX_GMF_CTRL_T), GMF_RST_SET); sky2_write8(hw, SK_REG(port, TX_GMF_CTRL_T), GMF_RST_SET); @@ -1881,6 +1873,14 @@ static int sky2_down(struct net_device *dev) sky2_write32(hw, STAT_ISR_TIMER_CNT, 0); sky2_read8(hw, STAT_ISR_TIMER_CTRL); + sky2_rx_stop(sky2); + + /* Disable port IRQ */ + imask = sky2_read32(hw, B0_IMSK); + imask &= ~portirq_msk[port]; + sky2_write32(hw, B0_IMSK, imask); + sky2_read32(hw, B0_IMSK); + synchronize_irq(hw->pdev->irq); napi_synchronize(&hw->napi);