From: Thomas Bogendoerfer <tbogendoerfer@suse.de>
To: Ralf Baechle <ralf@linux-mips.org>,
Paul Burton <paul.burton@mips.com>,
James Hogan <jhogan@kernel.org>,
"David S. Miller" <davem@davemloft.net>,
linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org,
netdev@vger.kernel.org
Subject: [PATCH v3 net-next 06/15] net: sgi: ioc3-eth: get rid of ioc3_clean_rx_ring()
Date: Fri, 30 Aug 2019 11:25:29 +0200 [thread overview]
Message-ID: <20190830092539.24550-7-tbogendoerfer@suse.de> (raw)
In-Reply-To: <20190830092539.24550-1-tbogendoerfer@suse.de>
Move clearing of the descriptor valid bit into ioc3_alloc_rings. This
makes ioc3_clean_rx_ring obsolete.
Signed-off-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
---
drivers/net/ethernet/sgi/ioc3-eth.c | 22 +---------------------
1 file changed, 1 insertion(+), 21 deletions(-)
diff --git a/drivers/net/ethernet/sgi/ioc3-eth.c b/drivers/net/ethernet/sgi/ioc3-eth.c
index e84239734338..fe77e4d7732f 100644
--- a/drivers/net/ethernet/sgi/ioc3-eth.c
+++ b/drivers/net/ethernet/sgi/ioc3-eth.c
@@ -761,26 +761,6 @@ static void ioc3_mii_start(struct ioc3_private *ip)
add_timer(&ip->ioc3_timer);
}
-static inline void ioc3_clean_rx_ring(struct ioc3_private *ip)
-{
- struct ioc3_erxbuf *rxb;
- struct sk_buff *skb;
- int i;
-
- for (i = ip->rx_ci; i & 15; i++) {
- ip->rx_skbs[ip->rx_pi] = ip->rx_skbs[ip->rx_ci];
- ip->rxr[ip->rx_pi++] = ip->rxr[ip->rx_ci++];
- }
- ip->rx_pi &= RX_RING_MASK;
- ip->rx_ci &= RX_RING_MASK;
-
- for (i = ip->rx_ci; i != ip->rx_pi; i = (i + 1) & RX_RING_MASK) {
- skb = ip->rx_skbs[i];
- rxb = (struct ioc3_erxbuf *)(skb->data - RX_OFFSET);
- rxb->w0 = 0;
- }
-}
-
static inline void ioc3_clean_tx_ring(struct ioc3_private *ip)
{
struct sk_buff *skb;
@@ -838,6 +818,7 @@ static void ioc3_alloc_rings(struct net_device *dev)
/* Because we reserve afterwards. */
skb_put(skb, (1664 + RX_OFFSET));
rxb = (struct ioc3_erxbuf *)skb->data;
+ rxb->w0 = 0; /* Clear valid flag */
ip->rxr[i] = cpu_to_be64(ioc3_map(rxb, 1));
skb_reserve(skb, RX_OFFSET);
}
@@ -857,7 +838,6 @@ static void ioc3_init_rings(struct net_device *dev)
ioc3_free_rings(ip);
ioc3_alloc_rings(dev);
- ioc3_clean_rx_ring(ip);
ioc3_clean_tx_ring(ip);
/* Now the rx ring base, consume & produce registers. */
--
2.13.7
next prev parent reply other threads:[~2019-08-30 9:26 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-30 9:25 [PATCH v3 net-next 00/15] ioc3-eth improvements Thomas Bogendoerfer
2019-08-30 9:25 ` [PATCH v3 net-next 01/15] MIPS: SGI-IP27: remove ioc3 ethernet init Thomas Bogendoerfer
2019-08-30 9:25 ` [PATCH v3 net-next 02/15] MIPS: SGI-IP27: restructure ioc3 register access Thomas Bogendoerfer
2019-08-30 9:25 ` [PATCH v3 net-next 03/15] net: sgi: ioc3-eth: remove checkpatch errors/warning Thomas Bogendoerfer
2019-08-30 9:25 ` [PATCH v3 net-next 04/15] net: sgi: ioc3-eth: use defines for constants dealing with desc rings Thomas Bogendoerfer
2019-08-30 9:25 ` [PATCH v3 net-next 05/15] net: sgi: ioc3-eth: allocate space for desc rings only once Thomas Bogendoerfer
2019-08-30 9:25 ` Thomas Bogendoerfer [this message]
2019-08-30 9:25 ` [PATCH v3 net-next 07/15] net: sgi: ioc3-eth: separate tx and rx ring handling Thomas Bogendoerfer
2019-08-30 9:25 ` [PATCH v3 net-next 08/15] net: sgi: ioc3-eth: introduce chip start function Thomas Bogendoerfer
2019-08-30 9:25 ` [PATCH v3 net-next 09/15] net: sgi: ioc3-eth: split ring cleaning/freeing and allocation Thomas Bogendoerfer
2019-08-30 9:25 ` [PATCH v3 net-next 10/15] net: sgi: ioc3-eth: refactor rx buffer allocation Thomas Bogendoerfer
2019-08-30 9:25 ` [PATCH v3 net-next 11/15] net: sgi: ioc3-eth: use dma-direct for dma allocations Thomas Bogendoerfer
2019-08-30 9:25 ` [PATCH v3 net-next 12/15] net: sgi: ioc3-eth: use csum_fold Thomas Bogendoerfer
2019-08-30 9:25 ` [PATCH v3 net-next 13/15] net: sgi: ioc3-eth: Fix IPG settings Thomas Bogendoerfer
2019-08-30 9:25 ` [PATCH v3 net-next 14/15] net: sgi: ioc3-eth: protect emcr in all cases Thomas Bogendoerfer
2019-08-30 9:25 ` [PATCH v3 net-next 15/15] net: sgi: ioc3-eth: no need to stop queue set_multicast_list Thomas Bogendoerfer
2019-08-30 20:55 ` [PATCH v3 net-next 00/15] ioc3-eth improvements David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190830092539.24550-7-tbogendoerfer@suse.de \
--to=tbogendoerfer@suse.de \
--cc=davem@davemloft.net \
--cc=jhogan@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=paul.burton@mips.com \
--cc=ralf@linux-mips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).