]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
can: mscan: mscan_rx_poll(): fix rx path lockup when returning from polling to irq...
authorFlorian Faber <faber@faberman.de>
Thu, 26 Dec 2019 18:51:24 +0000 (19:51 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 14 Jan 2020 19:05:41 +0000 (20:05 +0100)
commite08e3dda248f115c77fc59016d26fdc1fd19cf58
tree74ba91d3b01bf58c0be8cab64b8dfd03d4dba222
parent1df54fdd3f989a140ab3fa6c9f1c485288421a96
can: mscan: mscan_rx_poll(): fix rx path lockup when returning from polling to irq mode

commit 2d77bd61a2927be8f4e00d9478fe6996c47e8d45 upstream.

Under load, the RX side of the mscan driver can get stuck while TX still
works. Restarting the interface locks up the system. This behaviour
could be reproduced reliably on a MPC5121e based system.

The patch fixes the return value of the NAPI polling function (should be
the number of processed packets, not constant 1) and the condition under
which IRQs are enabled again after polling is finished.

With this patch, no more lockups were observed over a test period of ten
days.

Fixes: afa17a500a36 ("net/can: add driver for mscan family & mpc52xx_mscan")
Signed-off-by: Florian Faber <faber@faberman.de>
Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/can/mscan/mscan.c