From mboxrd@z Thu Jan 1 00:00:00 1970 From: Troy Kisky Subject: [PATCH net-next V2 05/16] net: fec: split off napi routine with 3 queues Date: Wed, 24 Feb 2016 17:36:48 -0700 Message-ID: <1456360619-24390-6-git-send-email-troy.kisky@boundarydevices.com> References: <1456360619-24390-1-git-send-email-troy.kisky@boundarydevices.com> Cc: fabio.estevam@freescale.com, l.stach@pengutronix.de, andrew@lunn.ch, tremyfr@gmail.com, linux@arm.linux.org.uk, linux-arm-kernel@lists.infradead.org, laci@boundarydevices.com, shawnguo@kernel.org, johannes@sipsolutions.net, stillcompiling@gmail.com, sergei.shtylyov@cogentembedded.com, arnd@arndb.de, Troy Kisky To: netdev@vger.kernel.org, davem@davemloft.net, B38611@freescale.com Return-path: Received: from mail-pf0-f181.google.com ([209.85.192.181]:35315 "EHLO mail-pf0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758264AbcBYAkU (ORCPT ); Wed, 24 Feb 2016 19:40:20 -0500 Received: by mail-pf0-f181.google.com with SMTP id c10so23032478pfc.2 for ; Wed, 24 Feb 2016 16:40:20 -0800 (PST) In-Reply-To: <1456360619-24390-1-git-send-email-troy.kisky@boundarydevices.com> Sender: netdev-owner@vger.kernel.org List-ID: If we only have 1 tx/rx queue, we need not check the other queues. Signed-off-by: Troy Kisky --- drivers/net/ethernet/freescale/fec_main.c | 39 +++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index 4a218b9..610cf6c 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -1521,7 +1521,7 @@ fec_enet_interrupt(int irq, void *dev_id) return IRQ_HANDLED; } -static int fec_enet_rx_napi(struct napi_struct *napi, int budget) +static int fec_enet_napi_q3(struct napi_struct *napi, int budget) { struct net_device *ndev = napi->dev; struct fec_enet_private *fep = netdev_priv(ndev); @@ -1564,6 +1564,39 @@ static int fec_enet_rx_napi(struct napi_struct *napi, int budget) return pkts; } +static int fec_enet_napi_q1(struct napi_struct *napi, int budget) +{ + struct net_device *ndev = napi->dev; + struct fec_enet_private *fep = netdev_priv(ndev); + int pkts = 0; + uint events; + + do { + events = readl(fep->hwp + FEC_IEVENT); + if (fep->events) { + events |= fep->events; + fep->events = 0; + } + events &= FEC_ENET_RXF_0 | FEC_ENET_TXF_0; + if (!events) { + if (budget) { + napi_complete(napi); + writel(FEC_DEFAULT_IMASK, fep->hwp + FEC_IMASK); + } + return pkts; + } + + writel(events, fep->hwp + FEC_IEVENT); + if (events & FEC_ENET_RXF_0) + pkts += fec_rxq(ndev, fep, fep->rx_queue[0], + budget - pkts); + if (events & FEC_ENET_TXF_0) + fec_txq(ndev, fep, fep->tx_queue[0]); + } while (pkts < budget); + fep->events |= FEC_ENET_RXF_0; /* save for next callback */ + return pkts; +} + /* ------------------------------------------------------------------------- */ static void fec_get_mac(struct net_device *ndev) { @@ -3123,7 +3156,9 @@ static int fec_enet_init(struct net_device *ndev) ndev->ethtool_ops = &fec_enet_ethtool_ops; writel(FEC_RX_DISABLED_IMASK, fep->hwp + FEC_IMASK); - netif_napi_add(ndev, &fep->napi, fec_enet_rx_napi, NAPI_POLL_WEIGHT); + netif_napi_add(ndev, &fep->napi, (fep->num_rx_queues | + fep->num_tx_queues) == 1 ? fec_enet_napi_q1 : + fec_enet_napi_q3, NAPI_POLL_WEIGHT); if (fep->quirks & FEC_QUIRK_HAS_VLAN) /* enable hw VLAN support */ -- 2.5.0