ionic: Correctly print AQ errors if completions aren't received

Recent changes went into the driver to allow flexibility when
printing error messages. Unfortunately this had the unexpected
consequence of printing confusing messages like the following:

IONIC_CMD_RX_FILTER_ADD (31) failed: IONIC_RC_SUCCESS (-6)

In cases like this the completion of the admin queue command never
completes, so the completion status is 0, hence IONIC_RC_SUCCESS
is printed even though the command clearly failed. For example,
this could happen when the driver tries to add a filter and at
the same time the FW goes through a reset, so the AQ command
never completes.

Fix this by forcing the FW completion status to IONIC_RC_ERROR
in cases where we never get the completion.

Fixes: 8c9d956ab6fb ("ionic: allow adminq requests to override default error message")
Signed-off-by: Brett Creeley <brett@pensando.io>
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 04fc2342b055e542a3a4905062ba6c3199037e51..7693b433639413d571dc56d9b90f7564ea852474 100644 (file)
--- a/drivers/net/ethernet/pensando/ionic/ionic_main.c
+++ b/drivers/net/ethernet/pensando/ionic/ionic_main.c
@@ -322,6 +322,7 @@ int ionic_adminq_wait(struct ionic_lif *lif, struct ionic_admin_ctx *ctx,
                if (do_msg && !test_bit(IONIC_LIF_F_FW_RESET, lif->state))
                        netdev_err(netdev, "Posting of %s (%d) failed: %d\n",
                                   name, ctx->cmd.cmd.opcode, err);
+               ctx->comp.comp.status = IONIC_RC_ERROR;
                return err;
        }
 
@@ -342,6 +343,7 @@ int ionic_adminq_wait(struct ionic_lif *lif, struct ionic_admin_ctx *ctx,
                        if (do_msg)
                                netdev_err(netdev, "%s (%d) interrupted, FW in reset\n",
                                           name, ctx->cmd.cmd.opcode);
+                       ctx->comp.comp.status = IONIC_RC_ERROR;
                        return -ENXIO;
                }