Skip to content

Commit 32cec7c

Browse files
shimodaysmb49
authored andcommitted
net: ravb: Fix possible hang if RIS2_QFF1 happen
BugLink: https://bugs.launchpad.net/bugs/2011226 [ Upstream commit f3c0775 ] Since this driver enables the interrupt by RIC2_QFE1, this driver should clear the interrupt flag if it happens. Otherwise, the interrupt causes to hang the system. Note that this also fix a minor coding style (a comment indentation) around the fixed code. Fixes: c156633 ("Renesas Ethernet AVB driver proper") Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Reviewed-by: Sergey Shtylyov <s.shtylyov@omp.ru> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Luke Nowakowski-Krijger <luke.nowakowskikrijger@canonical.com> Acked-by: Kamal Mostafa <kamal@canonical.com> Signed-off-by: Kamal Mostafa <kamal@canonical.com>
1 parent bc327e1 commit 32cec7c

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/net/ethernet/renesas/ravb_main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -736,14 +736,14 @@ static void ravb_error_interrupt(struct net_device *ndev)
736736
ravb_write(ndev, ~(EIS_QFS | EIS_RESERVED), EIS);
737737
if (eis & EIS_QFS) {
738738
ris2 = ravb_read(ndev, RIS2);
739-
ravb_write(ndev, ~(RIS2_QFF0 | RIS2_RFFF | RIS2_RESERVED),
739+
ravb_write(ndev, ~(RIS2_QFF0 | RIS2_QFF1 | RIS2_RFFF | RIS2_RESERVED),
740740
RIS2);
741741

742742
/* Receive Descriptor Empty int */
743743
if (ris2 & RIS2_QFF0)
744744
priv->stats[RAVB_BE].rx_over_errors++;
745745

746-
/* Receive Descriptor Empty int */
746+
/* Receive Descriptor Empty int */
747747
if (ris2 & RIS2_QFF1)
748748
priv->stats[RAVB_NC].rx_over_errors++;
749749

0 commit comments

Comments
 (0)