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: 4111011 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 368939F271 for ; Sun, 4 May 2014 22:47:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5D39E2040F for ; Sun, 4 May 2014 22:47:48 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8CB52203E6 for ; Sun, 4 May 2014 22:47:47 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Wh59U-00065j-RU; Sun, 04 May 2014 22:44:56 +0000 Received: from mail-qa0-x22e.google.com ([2607:f8b0:400d:c00::22e]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Wh59N-00062o-Be for linux-arm-kernel@lists.infradead.org; Sun, 04 May 2014 22:44:49 +0000 Received: by mail-qa0-f46.google.com with SMTP id w8so6352816qac.5 for ; Sun, 04 May 2014 15:44:27 -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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140504_154449_478539_F3F1DE61 X-CRM114-Status: UNSURE ( 8.59 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.0 (/) Cc: linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org, git@xilinx.com, =?UTF-8?q?S=C3=B6ren=20Brinkmann?= , linux-kernel@vger.kernel.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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);