From patchwork Sun May 4 22:43:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soren Brinkmann X-Patchwork-Id: 4110991 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 C2A309F271 for ; Sun, 4 May 2014 22:47:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F052B20411 for ; Sun, 4 May 2014 22:47:40 +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 DF636203E6 for ; Sun, 4 May 2014 22:47:39 +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 1Wh59b-0006F3-GY; Sun, 04 May 2014 22:45:03 +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-00062p-Bf 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 w8so6374008qac.19 for ; Sun, 04 May 2014 15:44:29 -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=9RksR+gAnCgE1L9fh6SiffqL+5ZwewEGraUDCUstYd8=; b=TuuOzSQDVOy91kLO8HdmsQTMZ4wP4DTTo56kPKQACRuhNXWRD6cHaATiArETeUzq93 PnCrtVa81F2oYmLuB08E/lVpuYHK00HIebXwkOIxKVcWX3n9hamiyg9OItZXLRCDdYMp /StUWuORAY8c0u43D0CW9jG6YHxioP/yzEnsg7Eo6BIr+ljMrmk/0g+CzOJZ23uW1JJ4 ZvYrcVQejWKdkylo2YiLUghXacAXrNI3B4H+8+tjT+ZD8zwcoTd9BKELOcZ/4vYkNBiB jZ694WvsbR3zW3h31jOL9SesYpuNcaoNWaeajjPsqoksr5BByhjFVQSJUzqljr+8DQ0m Y/KQ== X-Received: by 10.140.83.41 with SMTP id i38mr11950036qgd.7.1399243469201; Sun, 04 May 2014 15:44:29 -0700 (PDT) Received: from localhost ([149.199.62.254]) by mx.google.com with ESMTPSA id n105sm8809567qgd.7.2014.05.04.15.44.27 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 04 May 2014 15:44:28 -0700 (PDT) From: Soren Brinkmann To: Michal Simek , Nicolas Ferre Subject: [PATCH 3/5] net: macb: Re-enable RX interrupt only when RX is done Date: Sun, 4 May 2014 15:43:00 -0700 Message-Id: <1399243382-12528-4-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_476743_3F504E58 X-CRM114-Status: GOOD ( 12.23 ) 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 When data is received during the driver processing received data the NAPI is re-scheduled. In that case the RX interrupt should not be re-enabled. Signed-off-by: Soren Brinkmann --- drivers/net/ethernet/cadence/macb.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c index e38fe39d9589..3f4b8ee0b0e7 100644 --- a/drivers/net/ethernet/cadence/macb.c +++ b/drivers/net/ethernet/cadence/macb.c @@ -891,16 +891,15 @@ static int macb_poll(struct napi_struct *napi, int budget) if (work_done < budget) { napi_complete(napi); - /* - * We've done what we can to clean the buffers. Make sure we - * get notified when new packets arrive. - */ - macb_writel(bp, IER, MACB_RX_INT_FLAGS); - /* Packets received while interrupts were disabled */ status = macb_readl(bp, RSR); - if (unlikely(status)) + if (unlikely(status)) { + if (bp->caps & MACB_CAPS_ISR_CLEAR_ON_WRITE) + macb_writel(bp, ISR, MACB_BIT(RCOMP)); napi_reschedule(napi); + } else { + macb_writel(bp, IER, MACB_RX_INT_FLAGS); + } } /* TODO: Handle errors */