leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ionic: no transition while stopping

Browse Source 
Make sure we don't try to transition the fw_status_ready
while we're still in the FW_STOPPING state, else we can
get stuck in limbo waiting on a transition that already
happened.

While we're here we can remove a superfluous check on
the lif pointer.

Signed-off-by: Shannon Nelson <snelson@pensando.io>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Shannon Nelson 2022-02-25 09:16:18 -08:00 committed by David S. Miller
parent b3483bc7a1
commit 688a5efe0c
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/net/ethernet/pensando/ionic/ionic_dev.c
View File

@ -202,21 +202,25 @@ do_check_time:
}
}
dev_dbg(ionic->dev, "fw_status 0x%02x ready %d idev->ready %d last_hb 0x%x state 0x%02lx\n",
fw_status, fw_status_ready, idev->fw_status_ready,
idev->last_fw_hb, lif->state[0]);
/* is this a transition? */
if (fw_status_ready != idev->fw_status_ready) {
if (fw_status_ready != idev->fw_status_ready &&
!test_bit(IONIC_LIF_F_FW_STOPPING, lif->state)) {
bool trigger = false;
idev->fw_status_ready = fw_status_ready;
if (!fw_status_ready && lif &&
if (!fw_status_ready &&
!test_bit(IONIC_LIF_F_FW_RESET, lif->state) &&
!test_and_set_bit(IONIC_LIF_F_FW_STOPPING, lif->state)) {
dev_info(ionic->dev, "FW stopped 0x%02x\n", fw_status);
trigger = true;
} else if (fw_status_ready && lif &&
test_bit(IONIC_LIF_F_FW_RESET, lif->state) &&
!test_bit(IONIC_LIF_F_FW_STOPPING, lif->state)) {
} else if (fw_status_ready &&
test_bit(IONIC_LIF_F_FW_RESET, lif->state)) {
dev_info(ionic->dev, "FW running 0x%02x\n", fw_status);
trigger = true;
}