From patchwork Sun May 4 22:43:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soren Brinkmann X-Patchwork-Id: 4111031 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 15B419F271 for ; Sun, 4 May 2014 22:48:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 402F72040F for ; Sun, 4 May 2014 22:48:03 +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 77120203E6 for ; Sun, 4 May 2014 22:48:02 +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 1Wh59i-0007BV-7J; Sun, 04 May 2014 22:45:10 +0000 Received: from mail-qc0-x229.google.com ([2607:f8b0:400d:c01::229]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Wh59R-000637-08 for linux-arm-kernel@lists.infradead.org; Sun, 04 May 2014 22:44:53 +0000 Received: by mail-qc0-f169.google.com with SMTP id e16so4528531qcx.14 for ; Sun, 04 May 2014 15:44:31 -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=eBoNZ54Boj1oYNg3MjI47x/9gFI05eXsvF2c2rYK0AY=; b=cdPdF6b0q1OhwGEL/G9kr8r1Ahdcr1DEcU/0lwsTbGCeDT7LfgkyML+vTtFomxxu0U YDh6gKNSPH7ESvHAefKYJPAJDLJBbp8J4DOzcLlVoyNUQcC+7EUrI2vWU09nnO5l72Y7 NXf6MH99JZ95pSdsHbgqm6Acy2p/uAMzVgNYiS6ZOPA0zmZyc5/FsPVF3EO7y+/GXHYu kcRK7Ru598JrIdwYgzBFH23Ov3dghUu4c3ATKMYkhIrfF9i6ooFhWdgYGnKKpt6dUwrU w9wXKFMqXqFYQIZDQufcLhJsMVrBvIfhciIkqpALQHTupGHf0nbYHxMwXnJBJUP3iXRu vzmA== X-Received: by 10.224.49.67 with SMTP id u3mr40455143qaf.63.1399243471723; Sun, 04 May 2014 15:44:31 -0700 (PDT) Received: from localhost ([149.199.62.254]) by mx.google.com with ESMTPSA id o11sm13203958qay.39.2014.05.04.15.44.30 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 04 May 2014 15:44:30 -0700 (PDT) From: Soren Brinkmann To: Michal Simek , Nicolas Ferre Subject: [PATCH 4/5] net: macb: Remove 'unlikely' optimization Date: Sun, 4 May 2014 15:43:01 -0700 Message-Id: <1399243382-12528-5-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_154453_116103_C0373853 X-CRM114-Status: GOOD ( 10.39 ) 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 Coverage data suggests that the unlikely case of receiving data while the receive handler is running may not be that unlikely. Coverage data after running iperf for a while: 91320: 891: work_done = bp->macbgem_ops.mog_rx(bp, budget); 91320: 892: if (work_done < budget) { 2362: 893: napi_complete(napi); -: 894: -: 895: /* Packets received while interrupts were disabled */ 4724: 896: status = macb_readl(bp, RSR); 2362: 897: if (unlikely(status)) { 762: 898: if (bp->caps & MACB_CAPS_ISR_CLEAR_ON_WRITE) 762: 899: macb_writel(bp, ISR, MACB_BIT(RCOMP)); -: 900: napi_reschedule(napi); -: 901: } else { 1600: 902: macb_writel(bp, IER, MACB_RX_INT_FLAGS); -: 903: } -: 904: } Signed-off-by: Soren Brinkmann --- drivers/net/ethernet/cadence/macb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c index 3f4b8ee0b0e7..3e13aa31548a 100644 --- a/drivers/net/ethernet/cadence/macb.c +++ b/drivers/net/ethernet/cadence/macb.c @@ -893,7 +893,7 @@ static int macb_poll(struct napi_struct *napi, int budget) /* Packets received while interrupts were disabled */ status = macb_readl(bp, RSR); - if (unlikely(status)) { + if (status) { if (bp->caps & MACB_CAPS_ISR_CLEAR_ON_WRITE) macb_writel(bp, ISR, MACB_BIT(RCOMP)); napi_reschedule(napi);