Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfd91928 authored by Harini Katakam's avatar Harini Katakam Committed by Greg Kroah-Hartman
Browse files

net: macb: Change interrupt and napi enable order in open 



[ Upstream commit 0504453139ef5a593c9587e1e851febee859c7d8 ]

Current order in open:
-> Enable interrupts (macb_init_hw)
-> Enable NAPI
-> Start PHY

Sequence of RX handling:
-> RX interrupt occurs
-> Interrupt is cleared and interrupt bits disabled in handler
-> NAPI is scheduled
-> In NAPI, RX budget is processed and RX interrupts are re-enabled

With the above, on QEMU or fixed link setups (where PHY state doesn't
matter), there's a chance macb RX interrupt occurs before NAPI is
enabled. This will result in NAPI being scheduled before it is enabled.
Fix this macb open by changing the order.

Fixes: ae1f2a56 ("net: macb: Added support for many RX queues")
Signed-off-by: default avatarHarini Katakam <harini.katakam@xilinx.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@microchip.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 68df8383

drivers/net/ethernet/cadence/macb_main.c

+3 −3
Original line number Diff line number Diff line
@@ -2419,12 +2419,12 @@ static int macb_open(struct net_device *dev) 
		return err;

	}



	bp->macbgem_ops.mog_init_rings(bp);

	macb_init_hw(bp);



	for (q = 0, queue = bp->queues; q < bp->num_queues; ++q, ++queue)

		napi_enable(&queue->napi);



	bp->macbgem_ops.mog_init_rings(bp);

	macb_init_hw(bp);



	/* schedule a link state check */

	phy_start(dev->phydev);