ionic: leave dev cmd request contents alone on FW timeout

It is possible (but unlikely) that FW was busy and missed a heartbeat
check but is still alive and will process the pending request, so don't
clean the dev_cmd in this case.  This occasionally occurs when working
with a card that is supporting many devices and is trying to shut them
all down at once, but still wants to see that last LIF disable request.

Fixes: 97ca486592c0 ("ionic: add heartbeat check")
Signed-off-by: Shannon Nelson <snelson@pensando.io>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/pensando/ionic/ionic_main.c b/drivers/net/ethernet/pensando/ionic/ionic_main.c
index c5e3d7639f7eb907ca58b0c4592a9f7704912bd8..a0dc100b12e69efae32f631d30d1f8a31272b395 100644 (file)
--- a/drivers/net/ethernet/pensando/ionic/ionic_main.c
+++ b/drivers/net/ethernet/pensando/ionic/ionic_main.c
@@ -360,7 +360,10 @@ try_again:
                done, duration / HZ, duration);
 
        if (!done && hb) {
-               ionic_dev_cmd_clean(ionic);
+               /* It is possible (but unlikely) that FW was busy and missed a
+                * heartbeat check but is still alive and will process this
+                * request, so don't clean the dev_cmd in this case.
+                */
                dev_warn(ionic->dev, "DEVCMD %s (%d) failed - FW halted\n",
                         ionic_opcode_to_str(opcode), opcode);
                return -ENXIO;