mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 00:20:32 +00:00
ionic: catch transition back to RUNNING with fw_generation 0
In some graceful updates that get initially triggered by the
RESET event, especially with older firmware, the fw_generation
bits don't change but the fw_status is seen to go to 0 then back
to 1. However, the driver didn't perform the restart, remained
waiting for fw_generation to change, and got left in limbo.
This is because the clearing of idev->fw_status_ready to 0
didn't happen correctly as it was buried in the transition
trigger: since the transition down was triggered not here
but in the RESET event handler, the clear to 0 didn't happen,
so the transition back to 1 wasn't detected.
Fix this particular case by bringing the setting of
idev->fw_status_ready back out to where it was before.
Fixes: 398d1e37f9
("ionic: add FW_STOPPING state")
Signed-off-by: Shannon Nelson <snelson@pensando.io>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
parent
86213f80da
commit
12b1b997c0
1 changed files with 2 additions and 2 deletions
|
@ -206,6 +206,8 @@ int ionic_heartbeat_check(struct ionic *ionic)
|
|||
if (fw_status_ready != idev->fw_status_ready) {
|
||||
bool trigger = false;
|
||||
|
||||
idev->fw_status_ready = fw_status_ready;
|
||||
|
||||
if (!fw_status_ready && lif &&
|
||||
!test_bit(IONIC_LIF_F_FW_RESET, lif->state) &&
|
||||
!test_and_set_bit(IONIC_LIF_F_FW_STOPPING, lif->state)) {
|
||||
|
@ -222,8 +224,6 @@ int ionic_heartbeat_check(struct ionic *ionic)
|
|||
if (trigger) {
|
||||
struct ionic_deferred_work *work;
|
||||
|
||||
idev->fw_status_ready = fw_status_ready;
|
||||
|
||||
work = kzalloc(sizeof(*work), GFP_ATOMIC);
|
||||
if (work) {
|
||||
work->type = IONIC_DW_TYPE_LIF_RESET;
|
||||
|
|
Loading…
Reference in a new issue