From patchwork Fri Aug 30 21:49:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 271450 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 A9D6B2C00C4 for ; Sat, 31 Aug 2013 07:50:19 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756879Ab3H3VuO (ORCPT ); Fri, 30 Aug 2013 17:50:14 -0400 Received: from mail-oa0-f51.google.com ([209.85.219.51]:40341 "EHLO mail-oa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755709Ab3H3VuF (ORCPT ); Fri, 30 Aug 2013 17:50:05 -0400 Received: by mail-oa0-f51.google.com with SMTP id h1so2913822oag.24 for ; Fri, 30 Aug 2013 14:50:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=qGQ6fATa1TPnsA63RmbHJSwdSlP5bleALQap5XdXKQ8=; b=VWgfkAJm/FLgxOM2A9j0ncawXop2Ahv2te7QwAjRSal+1ZKqBamqEd1PrWR+T86iUv wqoMtoRwvOwIgkj5O9wB2g4+QgdXkqNQt/ESmd3OyAWQVumXmErb5JVmV7ItjI3oSb6m GR72lpu3tqB67/pENFh6SrxE5LI4mZ5l/Xi6eHv9wEqzzcy7WNeVqSU3SWk+Mqzedn6y fk085Q12I5rc5NWDeZahEJk0REGeqBzlr5OPTziebFgMoY0Gj74ebPsDpw3ER187Ic/0 bwvFrR/VJR2i+RMNDgqGSTAEa56daGiOyE6qw7AlgRDLHf1JggK7P6HWJh7RxD/Tvg9+ T6Vw== X-Received: by 10.182.242.37 with SMTP id wn5mr8452890obc.56.1377899404876; Fri, 30 Aug 2013 14:50:04 -0700 (PDT) Received: from rob-laptop.calxeda.com ([173.226.190.126]) by mx.google.com with ESMTPSA id qi5sm47974obb.6.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 30 Aug 2013 14:50:03 -0700 (PDT) From: Rob Herring To: netdev@vger.kernel.org Cc: Ben Hutchings , Lennert Buytenhek , Rob Herring Subject: [PATCH v3 07/11] net: calxedaxgmac: enable interrupts after napi_enable Date: Fri, 30 Aug 2013 16:49:25 -0500 Message-Id: <1377899369-23252-7-git-send-email-robherring2@gmail.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1377899369-23252-1-git-send-email-robherring2@gmail.com> References: <1377899369-23252-1-git-send-email-robherring2@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Rob Herring Fix a race condition where the interrupt handler may have called napi_schedule before napi_enable is called. This would disable interrupts and never actually schedule napi to run. Reported-by: Lennert Buytenhek Signed-off-by: Rob Herring --- drivers/net/ethernet/calxeda/xgmac.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/calxeda/xgmac.c b/drivers/net/ethernet/calxeda/xgmac.c index 5d0b61a..73d3f83 100644 --- a/drivers/net/ethernet/calxeda/xgmac.c +++ b/drivers/net/ethernet/calxeda/xgmac.c @@ -959,9 +959,7 @@ static int xgmac_hw_init(struct net_device *dev) DMA_BUS_MODE_FB | DMA_BUS_MODE_ATDS | DMA_BUS_MODE_AAL; writel(value, ioaddr + XGMAC_DMA_BUS_MODE); - /* Enable interrupts */ - writel(DMA_INTR_DEFAULT_MASK, ioaddr + XGMAC_DMA_STATUS); - writel(DMA_INTR_DEFAULT_MASK, ioaddr + XGMAC_DMA_INTR_ENA); + writel(0, ioaddr + XGMAC_DMA_INTR_ENA); /* Mask power mgt interrupt */ writel(XGMAC_INT_STAT_PMTIM, ioaddr + XGMAC_INT_STAT); @@ -1029,6 +1027,10 @@ static int xgmac_open(struct net_device *dev) napi_enable(&priv->napi); netif_start_queue(dev); + /* Enable interrupts */ + writel(DMA_INTR_DEFAULT_MASK, ioaddr + XGMAC_DMA_STATUS); + writel(DMA_INTR_DEFAULT_MASK, ioaddr + XGMAC_DMA_INTR_ENA); + return 0; }