From patchwork Thu Feb 25 00:36:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Troy Kisky X-Patchwork-Id: 8415481 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 80D9EC0553 for ; Thu, 25 Feb 2016 00:43:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 818AD2026F for ; Thu, 25 Feb 2016 00:43:11 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 62806202D1 for ; Thu, 25 Feb 2016 00:43:10 +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 1aYjzq-0008S6-LT; Thu, 25 Feb 2016 00:41:34 +0000 Received: from mail-pf0-x229.google.com ([2607:f8b0:400e:c00::229]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aYjyw-000801-Ns for linux-arm-kernel@lists.infradead.org; Thu, 25 Feb 2016 00:40:41 +0000 Received: by mail-pf0-x229.google.com with SMTP id c10so23032023pfc.2 for ; Wed, 24 Feb 2016 16:40:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=boundarydevices-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=l/vwX8Pz2aPHbMYsC8Qpf9MAsqrEWu8CZPcSruNQK6g=; b=y6tZH3oEGo0sGjsKHpYs52g1HFv4K0r+y90g00Flc2eG54tANTUg+9Kuo2FawH5aE9 TPL/8V4oGsC5pT7qyLlc6c0puwSR5xssNCbt++9eChj6d2aY/NLi2FC7BGIV6ZBMYHtM yrW6GW869YUkPWAjcT447mv3gFJc0p3zdhpLtgILP3BKcl7oc47zi+QgDmnVY2QmjRSB jm1HUKLu8qAGN9NcHZt9jdRijDn/npZU0QxMoHf3c7BKgUAIKKiad5fIFWJiSYg0ZYpB s4w6kvL2x9gt8euVDaVZ9gHw8Rc6Bv/lDd8LGLeWWZb6X0prEvhBO/FPEBhL6PTU9n8y pKlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=l/vwX8Pz2aPHbMYsC8Qpf9MAsqrEWu8CZPcSruNQK6g=; b=dwT5/CdM5ggyn/f1vYa1/sJj+52XQVBoGNdrU+rIWIF9UvRvJfDmwLhHZh/dZIJNLC T9pdC6TqaIxiDxOQboO2MOZ05/3ZA+IKTz5V5iEp0IPldrRi1+osN9jvqW1jDXrfgwlL D18+/CdpkSdawzst8C+M9I0jL4Ad685ClBnMZPs7fkFkwafW4BChGO0rldolE/e6b5Xn RtNDSlKGANDcGjNXcStuQ/XFAOxS7j7jwAm7OdVyraqt/0U7yjBDR1JPRlC4F+amo5X2 jp8jMkJdWPWQP7ZdNxMaegDzBuUbTTovzKOXjmLAoqTGP4e55vT9Netst+n2WarIFsnQ KWXA== X-Gm-Message-State: AG10YOSd61jd0aoDV2ua4l/cBoSJ1MXAZvEPcY/6rqHOPRgV7FV780d4mHXlJ9hPnvCPkw== X-Received: by 10.98.18.201 with SMTP id 70mr59483704pfs.104.1456360818117; Wed, 24 Feb 2016 16:40:18 -0800 (PST) Received: from localhost.localdomain (wsip-70-184-93-199.ph.ph.cox.net. [70.184.93.199]) by smtp.googlemail.com with ESMTPSA id 79sm7561982pfr.22.2016.02.24.16.40.16 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 24 Feb 2016 16:40:17 -0800 (PST) From: Troy Kisky To: netdev@vger.kernel.org, davem@davemloft.net, B38611@freescale.com Subject: [PATCH net-next V2 04/16] net: fec: reduce interrupts Date: Wed, 24 Feb 2016 17:36:47 -0700 Message-Id: <1456360619-24390-5-git-send-email-troy.kisky@boundarydevices.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1456360619-24390-1-git-send-email-troy.kisky@boundarydevices.com> References: <1456360619-24390-1-git-send-email-troy.kisky@boundarydevices.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160224_164039_011664_BE5DF34C X-CRM114-Status: GOOD ( 16.22 ) X-Spam-Score: -2.6 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fabio.estevam@freescale.com, andrew@lunn.ch, stillcompiling@gmail.com, linux@arm.linux.org.uk, arnd@arndb.de, sergei.shtylyov@cogentembedded.com, Troy Kisky , laci@boundarydevices.com, johannes@sipsolutions.net, l.stach@pengutronix.de, shawnguo@kernel.org, linux-arm-kernel@lists.infradead.org, tremyfr@gmail.com 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=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable 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 By clearing the NAPI interrupts in the NAPI routine and not in the interrupt handler, we can reduce the number of interrupts. We also don't need any status variables as the registers are still valid. Also, notice that if budget pkts are received, the next call to fec_enet_rx_napi will now continue to receive the previously pending packets. Signed-off-by: Troy Kisky --- drivers/net/ethernet/freescale/fec.h | 6 +- drivers/net/ethernet/freescale/fec_main.c | 127 ++++++++++++------------------ 2 files changed, 50 insertions(+), 83 deletions(-) diff --git a/drivers/net/ethernet/freescale/fec.h b/drivers/net/ethernet/freescale/fec.h index 195122e..001200b 100644 --- a/drivers/net/ethernet/freescale/fec.h +++ b/drivers/net/ethernet/freescale/fec.h @@ -505,11 +505,7 @@ struct fec_enet_private { unsigned int total_tx_ring_size; unsigned int total_rx_ring_size; - - unsigned long work_tx; - unsigned long work_rx; - unsigned long work_ts; - unsigned long work_mdio; + uint events; struct platform_device *pdev; diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index c517194..4a218b9 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -70,8 +70,6 @@ static void fec_enet_itr_coal_init(struct net_device *ndev); #define DRIVER_NAME "fec" -#define FEC_ENET_GET_QUQUE(_x) ((_x == 0) ? 1 : ((_x == 1) ? 2 : 0)) - /* Pause frame feild and FIFO threshold */ #define FEC_ENET_FCE (1 << 5) #define FEC_ENET_RSEM_V 0x84 @@ -1257,21 +1255,6 @@ static void fec_txq(struct net_device *ndev, struct fec_enet_private *fep, writel(0, txq->bd.reg_desc_active); } -static void -fec_enet_tx(struct net_device *ndev) -{ - struct fec_enet_private *fep = netdev_priv(ndev); - struct fec_enet_priv_tx_q *txq; - u16 queue_id; - /* First process class A queue, then Class B and Best Effort queue */ - for_each_set_bit(queue_id, &fep->work_tx, FEC_ENET_MAX_TX_QS) { - clear_bit(queue_id, &fep->work_tx); - txq = fep->tx_queue[FEC_ENET_GET_QUQUE(queue_id)]; - fec_txq(ndev, fep, txq); - } - return; -} - static int fec_enet_new_rxbdp(struct net_device *ndev, struct bufdesc *bdp, struct sk_buff *skb) { @@ -1504,92 +1487,80 @@ rx_processing_done: return pkt_received; } -static int -fec_enet_rx(struct net_device *ndev, int budget) -{ - int pkt_received = 0; - u16 queue_id; - struct fec_enet_private *fep = netdev_priv(ndev); - struct fec_enet_priv_rx_q *rxq; - - for_each_set_bit(queue_id, &fep->work_rx, FEC_ENET_MAX_RX_QS) { - clear_bit(queue_id, &fep->work_rx); - rxq = fep->rx_queue[FEC_ENET_GET_QUQUE(queue_id)]; - pkt_received += fec_rxq(ndev, fep, rxq, budget - pkt_received); - } - return pkt_received; -} - -static bool -fec_enet_collect_events(struct fec_enet_private *fep, uint int_events) -{ - if (int_events == 0) - return false; - - if (int_events & FEC_ENET_RXF_0) - fep->work_rx |= (1 << 2); - if (int_events & FEC_ENET_RXF_1) - fep->work_rx |= (1 << 0); - if (int_events & FEC_ENET_RXF_2) - fep->work_rx |= (1 << 1); - - if (int_events & FEC_ENET_TXF_0) - fep->work_tx |= (1 << 2); - if (int_events & FEC_ENET_TXF_1) - fep->work_tx |= (1 << 0); - if (int_events & FEC_ENET_TXF_2) - fep->work_tx |= (1 << 1); - - return true; -} - static irqreturn_t fec_enet_interrupt(int irq, void *dev_id) { struct net_device *ndev = dev_id; struct fec_enet_private *fep = netdev_priv(ndev); - uint int_events; - irqreturn_t ret = IRQ_NONE; + uint eir = readl(fep->hwp + FEC_IEVENT); + uint int_events = eir & readl(fep->hwp + FEC_IMASK); - int_events = readl(fep->hwp + FEC_IEVENT); - writel(int_events, fep->hwp + FEC_IEVENT); - fec_enet_collect_events(fep, int_events); - - if ((fep->work_tx || fep->work_rx) && fep->link) { - ret = IRQ_HANDLED; + if (!int_events) + return IRQ_NONE; + if (int_events & (FEC_ENET_RXF | FEC_ENET_TXF)) { if (napi_schedule_prep(&fep->napi)) { /* Disable the NAPI interrupts */ writel(FEC_NAPI_IMASK, fep->hwp + FEC_IMASK); __napi_schedule(&fep->napi); + int_events &= ~(FEC_ENET_RXF | FEC_ENET_TXF); + if (!int_events) + return IRQ_HANDLED; + } else { + fep->events |= int_events; + pr_info("%s: couldn't schedule NAPI\n", __func__); } } - if (int_events & FEC_ENET_MII) { - ret = IRQ_HANDLED; + writel(int_events, fep->hwp + FEC_IEVENT); + if (int_events & FEC_ENET_MII) complete(&fep->mdio_done); - } - if (fep->ptp_clock) + if ((int_events & FEC_ENET_TS_TIMER) && fep->ptp_clock) fec_ptp_check_pps_event(fep); - - return ret; + return IRQ_HANDLED; } static int fec_enet_rx_napi(struct napi_struct *napi, int budget) { struct net_device *ndev = napi->dev; struct fec_enet_private *fep = netdev_priv(ndev); - int pkts; - - pkts = fec_enet_rx(ndev, budget); + int pkts = 0; + uint events; - fec_enet_tx(ndev); + do { + events = readl(fep->hwp + FEC_IEVENT); + if (fep->events) { + events |= fep->events; + fep->events = 0; + } + events &= FEC_ENET_RXF | FEC_ENET_TXF; + if (!events) { + if (budget) { + napi_complete(napi); + writel(FEC_DEFAULT_IMASK, fep->hwp + FEC_IMASK); + } + return pkts; + } - if (pkts < budget) { - napi_complete(napi); - writel(FEC_DEFAULT_IMASK, fep->hwp + FEC_IMASK); - } + writel(events, fep->hwp + FEC_IEVENT); + if (events & FEC_ENET_RXF_1) + pkts += fec_rxq(ndev, fep, fep->rx_queue[1], + budget - pkts); + if (events & FEC_ENET_RXF_2) + pkts += fec_rxq(ndev, fep, fep->rx_queue[2], + budget - pkts); + if (events & FEC_ENET_RXF_0) + pkts += fec_rxq(ndev, fep, fep->rx_queue[0], + budget - pkts); + if (events & FEC_ENET_TXF_1) + fec_txq(ndev, fep, fep->tx_queue[1]); + if (events & FEC_ENET_TXF_2) + fec_txq(ndev, fep, fep->tx_queue[2]); + if (events & FEC_ENET_TXF_0) + fec_txq(ndev, fep, fep->tx_queue[0]); + } while (pkts < budget); + fep->events |= events & FEC_ENET_RXF; /* save for next callback */ return pkts; }