summaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorAlexander Duyck <alexander.h.duyck@linux.intel.com>2020-04-17 09:35:31 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-10-01 11:11:56 +0200
commit233addb01f18b0d8374661e051f8079cfc458567 (patch)
treebc2e77ad87aaf74b8572c6c25aafc154d9786a66 /firmware
parent0ad482ca053285c76bdb960c386398c901ca8e36 (diff)
downloadlinux-stable-233addb01f18b0d8374661e051f8079cfc458567.tar.gz
linux-stable-233addb01f18b0d8374661e051f8079cfc458567.tar.bz2
linux-stable-233addb01f18b0d8374661e051f8079cfc458567.zip
e1000: Do not perform reset in reset_task if we are already down
[ Upstream commit 49ee3c2ab5234757bfb56a0b3a3cb422f427e3a3 ] We are seeing a deadlock in e1000 down when NAPI is being disabled. Looking over the kernel function trace of the system it appears that the interface is being closed and then a reset is hitting which deadlocks the interface as the NAPI interface is already disabled. To prevent this from happening I am disabling the reset task when __E1000_DOWN is already set. In addition code has been added so that we set the __E1000_DOWN while holding the __E1000_RESET flag in e1000_close in order to guarantee that the reset task will not run after we have started the close call. Signed-off-by: Alexander Duyck <alexander.h.duyck@linux.intel.com> Tested-by: Maxim Zhukov <mussitantesmortem@gmail.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'firmware')
0 files changed, 0 insertions, 0 deletions