Commit 2cc8f499 authored by Paolo Abeni's avatar Paolo Abeni
Browse files

Merge branch 'net-ethernet-cortina-fix-various-rx-bugs' 



Linus Walleij says:

====================
net: ethernet: cortina: Fix various RX bugs

During review of a minor patch for a bug in the Cortina
ethernet driver, Sashiko jumped in and pointed out a number
of nasty bugs.

This series hopefully fixes all of them.

Signed-off-by: default avatarLinus Walleij <linusw@kernel.org>
====================

Link: https://patch.msgid.link/20260509-gemini-ethernet-fixes-v1-0-6c5d20ddc35b@kernel.org


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents 93d809ad ebd8ec2b

drivers/net/ethernet/cortina/gemini.c

+15 −3
Original line number Diff line number Diff line
@@ -122,6 +122,9 @@ struct gemini_ethernet_port { 
	struct napi_struct	napi;

	struct hrtimer		rx_coalesce_timer;

	unsigned int		rx_coalesce_nsecs;

	struct sk_buff		*rx_skb;

	unsigned int		rx_frag_nr;



	unsigned int		freeq_refill;

	struct gmac_txq		txq[TX_QUEUE_NUM];

	unsigned int		txq_order;
@@ -1442,10 +1445,11 @@ static unsigned int gmac_rx(struct net_device *netdev, unsigned int budget) 
	unsigned short m = (1 << port->rxq_order) - 1;

	struct gemini_ethernet *geth = port->geth;

	void __iomem *ptr_reg = port->rxq_rwptr;

	unsigned int frag_nr = port->rx_frag_nr;

	struct sk_buff *skb = port->rx_skb;

	unsigned int frame_len, frag_len;

	struct gmac_rxdesc *rx = NULL;

	struct gmac_queue_page *gpage;

	static struct sk_buff *skb;

	union gmac_rxdesc_0 word0;

	union gmac_rxdesc_1 word1;

	union gmac_rxdesc_3 word3;
@@ -1455,7 +1459,6 @@ static unsigned int gmac_rx(struct net_device *netdev, unsigned int budget) 
	unsigned short r, w;

	union dma_rwptr rw;

	dma_addr_t mapping;

	int frag_nr = 0;



	spin_lock_irqsave(&geth->irq_lock, flags);

	rw.bits32 = readl(ptr_reg);
@@ -1491,10 +1494,11 @@ static unsigned int gmac_rx(struct net_device *netdev, unsigned int budget) 
		gpage = gmac_get_queue_page(geth, port, mapping + PAGE_SIZE);

		if (!gpage) {

			dev_err(geth->dev, "could not find mapping\n");

			port->stats.rx_dropped++;

			if (skb) {

				napi_free_frags(&port->napi);

				port->stats.rx_dropped++;

				skb = NULL;

				frag_nr = 0;

			}

			continue;

		}
@@ -1504,6 +1508,8 @@ static unsigned int gmac_rx(struct net_device *netdev, unsigned int budget) 
			if (skb) {

				napi_free_frags(&port->napi);

				port->stats.rx_dropped++;

				skb = NULL;

				frag_nr = 0;

			}



			skb = gmac_skb_if_good_frame(port, word0, frame_len);
@@ -1538,6 +1544,7 @@ static unsigned int gmac_rx(struct net_device *netdev, unsigned int budget) 
		if (word3.bits32 & EOF_BIT) {

			napi_gro_frags(&port->napi);

			skb = NULL;

			frag_nr = 0;

			--budget;

		}

		continue;
@@ -1546,6 +1553,7 @@ static unsigned int gmac_rx(struct net_device *netdev, unsigned int budget) 
		if (skb) {

			napi_free_frags(&port->napi);

			skb = NULL;

			frag_nr = 0;

		}



		if (mapping)
@@ -1554,6 +1562,8 @@ static unsigned int gmac_rx(struct net_device *netdev, unsigned int budget) 
		port->stats.rx_dropped++;

	}



	port->rx_skb = skb;

	port->rx_frag_nr = frag_nr;

	writew(r, ptr_reg);

	return budget;

}
@@ -1881,6 +1891,8 @@ static int gmac_stop(struct net_device *netdev) 
	gmac_disable_tx_rx(netdev);

	gmac_stop_dma(port);

	napi_disable(&port->napi);

	port->rx_skb = NULL;

	port->rx_frag_nr = 0;



	gmac_enable_irq(netdev, 0);

	gmac_cleanup_rxq(netdev);