Commit aa3494f3 authored by Yoshihiro Shimoda's avatar Yoshihiro Shimoda Committed by sanglipeng
Browse files

net: ravb: Fix possible hang if RIS2_QFF1 happen 

stable inclusion
from stable-v5.10.166
commit 3af20f63212d04ad68e370ac17603829b3121362
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I7TH9O

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=3af20f63212d04ad68e370ac17603829b3121362



--------------------------------

[ Upstream commit f3c07758 ]

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: c156633f ("Renesas Ethernet AVB driver proper")
Signed-off-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Reviewed-by: default avatarSergey Shtylyov <s.shtylyov@omp.ru>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent a79c12db

drivers/net/ethernet/renesas/ravb_main.c

+2 −2
Original line number Diff line number Diff line
@@ -736,7 +736,7 @@ static void ravb_error_interrupt(struct net_device *ndev) 
	ravb_write(ndev, ~(EIS_QFS | EIS_RESERVED), EIS);

	if (eis & EIS_QFS) {

		ris2 = ravb_read(ndev, RIS2);

		ravb_write(ndev, ~(RIS2_QFF0 | RIS2_RFFF | RIS2_RESERVED),

		ravb_write(ndev, ~(RIS2_QFF0 | RIS2_QFF1 | RIS2_RFFF | RIS2_RESERVED),

			   RIS2);



		/* Receive Descriptor Empty int */