From patchwork Sun May 4 22:42:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soren Brinkmann X-Patchwork-Id: 345517 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 C486214019A for ; Mon, 5 May 2014 08:45:55 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754040AbaEDWpk (ORCPT ); Sun, 4 May 2014 18:45:40 -0400 Received: from mail-qa0-f44.google.com ([209.85.216.44]:45542 "EHLO mail-qa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753909AbaEDWo1 (ORCPT ); Sun, 4 May 2014 18:44:27 -0400 Received: by mail-qa0-f44.google.com with SMTP id j7so771987qaq.31 for ; Sun, 04 May 2014 15:44:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=5glw7CJcY5FZ4PDFlA2qtZL+ffrkPVjUur3tAp90wjo=; b=Pt6AL36TYxUAfCapVsHCysQbOfF5FAgdmxM1dsoiopsm8hQOLDpE64iwDZd8pycUjb DEdC8Dtm130MzFj+FFHL0KR6NgDbjQtRJa9XFr2cVF7o/ZZY5d+1BgGziNTpeMrDwx1C LlsAvmYvLpI9IF48Zx9CtT/sV0A9pSrJ2cMDGSrTgs/xij8A56XQ4AdQ92kEv/ZRPWfd TvfhYA7llWnRLAwL2cbJJAco3Wf0jnyQe7ro89HnSV6TqHbL88ykLmGZ33jNJt7VlFOg FLJYLTaRGAY1oFA6g2JPDx1j8AT0YDOhTLzn9h6mtf5LkAJ84NqWr5eIYAjS1ydqOOAr fIwg== X-Received: by 10.224.126.9 with SMTP id a9mr40352062qas.39.1399243466822; Sun, 04 May 2014 15:44:26 -0700 (PDT) Received: from localhost ([149.199.62.254]) by mx.google.com with ESMTPSA id r4sm13226869qat.16.2014.05.04.15.44.25 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 04 May 2014 15:44:26 -0700 (PDT) From: Soren Brinkmann To: Michal Simek , Nicolas Ferre Cc: =?UTF-8?q?S=C3=B6ren=20Brinkmann?= , git@xilinx.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org Subject: [PATCH 2/5] net: macb: Clear interrupt flags Date: Sun, 4 May 2014 15:42:59 -0700 Message-Id: <1399243382-12528-3-git-send-email-soren.brinkmann@xilinx.com> X-Mailer: git-send-email 1.9.2.1.g06c4abd In-Reply-To: <1399243382-12528-1-git-send-email-soren.brinkmann@xilinx.com> References: <1399243382-12528-1-git-send-email-soren.brinkmann@xilinx.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org A few interrupt flags were not cleared in the ISR, resulting in a sytem trapped in the ISR in cases one of those interrupts occurred. Clear all flags to avoid such situations. Signed-off-by: Soren Brinkmann --- drivers/net/ethernet/cadence/macb.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c index 18fdcd9d51b3..e38fe39d9589 100644 --- a/drivers/net/ethernet/cadence/macb.c +++ b/drivers/net/ethernet/cadence/macb.c @@ -951,6 +951,10 @@ static irqreturn_t macb_interrupt(int irq, void *dev_id) if (unlikely(status & (MACB_TX_ERR_FLAGS))) { macb_writel(bp, IDR, MACB_TX_INT_FLAGS); schedule_work(&bp->tx_error_task); + + if (bp->caps & MACB_CAPS_ISR_CLEAR_ON_WRITE) + macb_writel(bp, ISR, MACB_TX_ERR_FLAGS); + break; } @@ -968,6 +972,9 @@ static irqreturn_t macb_interrupt(int irq, void *dev_id) bp->hw_stats.gem.rx_overruns++; else bp->hw_stats.macb.rx_overruns++; + + if (bp->caps & MACB_CAPS_ISR_CLEAR_ON_WRITE) + macb_writel(bp, ISR, MACB_BIT(ISR_ROVR)); } if (status & MACB_BIT(HRESP)) { @@ -977,6 +984,9 @@ static irqreturn_t macb_interrupt(int irq, void *dev_id) * (work queue?) */ netdev_err(dev, "DMA bus error: HRESP not OK\n"); + + if (bp->caps & MACB_CAPS_ISR_CLEAR_ON_WRITE) + macb_writel(bp, ISR, MACB_BIT(HRESP)); } status = macb_readl(bp, ISR);