bnxt_en: add dynamic debug support for HWRM messages

Add logging of firmware messages. These can be useful for diagnosing
issues in the field, but due to their verbosity are only appropriate
at a debug message level.

Signed-off-by: Edwin Peer <edwin.peer@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 4d7ea62e24fb925f577de1492aaa2ea6a25a9bf6..203d2ddb5504afa45b05326a89df4bc1758c57cc 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -2086,6 +2086,9 @@ static int bnxt_async_event_process(struct bnxt *bp,
        u32 data1 = le32_to_cpu(cmpl->event_data1);
        u32 data2 = le32_to_cpu(cmpl->event_data2);
 
+       netdev_dbg(bp->dev, "hwrm event 0x%x {0x%x, 0x%x}\n",
+                  event_id, data1, data2);
+
        /* TODO CHIMP_FW: Define event id's for link change, error etc */
        switch (event_id) {
        case ASYNC_EVENT_CMPL_EVENT_ID_LINK_SPEED_CFG_CHANGE: {

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_hwrm.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_hwrm.c
index bb7327b82d0b2511e363264eb7ab730fc67fa4f2..a16d1ff6359c07852113813b1c2eb663f8c73845 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_hwrm.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_hwrm.c
@@ -416,6 +416,32 @@ hwrm_update_token(struct bnxt *bp, u16 seq_id, enum bnxt_hwrm_wait_state state)
        netdev_err(bp->dev, "Invalid hwrm seq id %d\n", seq_id);
 }
 
+static void hwrm_req_dbg(struct bnxt *bp, struct input *req)
+{
+       u32 ring = le16_to_cpu(req->cmpl_ring);
+       u32 type = le16_to_cpu(req->req_type);
+       u32 tgt = le16_to_cpu(req->target_id);
+       u32 seq = le16_to_cpu(req->seq_id);
+       char opt[32] = "\n";
+
+       if (unlikely(ring != (u16)BNXT_HWRM_NO_CMPL_RING))
+               snprintf(opt, 16, " ring %d\n", ring);
+
+       if (unlikely(tgt != BNXT_HWRM_TARGET))
+               snprintf(opt + strlen(opt) - 1, 16, " tgt 0x%x\n", tgt);
+
+       netdev_dbg(bp->dev, "sent hwrm req_type 0x%x seq id 0x%x%s",
+                  type, seq, opt);
+}
+
+#define hwrm_err(bp, ctx, fmt, ...)                                   \
+       do {                                                           \
+               if ((ctx)->flags & BNXT_HWRM_CTX_SILENT)               \
+                       netdev_dbg((bp)->dev, fmt, __VA_ARGS__);       \
+               else                                                   \
+                       netdev_err((bp)->dev, fmt, __VA_ARGS__);       \
+       } while (0)
+
 static int __hwrm_send(struct bnxt *bp, struct bnxt_hwrm_ctx *ctx)
 {
        u32 doorbell_offset = BNXT_GRCPF_REG_CHIMP_COMM_TRIGGER;
@@ -436,8 +462,11 @@ static int __hwrm_send(struct bnxt *bp, struct bnxt_hwrm_ctx *ctx)
                memset(ctx->resp, 0, PAGE_SIZE);
 
        req_type = le16_to_cpu(ctx->req->req_type);
-       if (BNXT_NO_FW_ACCESS(bp) && req_type != HWRM_FUNC_RESET)
+       if (BNXT_NO_FW_ACCESS(bp) && req_type != HWRM_FUNC_RESET) {
+               netdev_dbg(bp->dev, "hwrm req_type 0x%x skipped, FW channel down\n",
+                          req_type);
                goto exit;
+       }
 
        if (msg_len > BNXT_HWRM_MAX_REQ_LEN &&
            msg_len > bp->hwrm_max_ext_req_len) {
@@ -490,6 +519,8 @@ static int __hwrm_send(struct bnxt *bp, struct bnxt_hwrm_ctx *ctx)
        /* Ring channel doorbell */
        writel(1, bp->bar0 + doorbell_offset);
 
+       hwrm_req_dbg(bp, ctx->req);
+
        if (!pci_is_enabled(bp->pdev)) {
                rc = -ENODEV;
                goto exit;
@@ -531,9 +562,8 @@ static int __hwrm_send(struct bnxt *bp, struct bnxt_hwrm_ctx *ctx)
                }
 
                if (READ_ONCE(token->state) != BNXT_HWRM_COMPLETE) {
-                       if (!(ctx->flags & BNXT_HWRM_CTX_SILENT))
-                               netdev_err(bp->dev, "Resp cmpl intr err msg: 0x%x\n",
-                                          le16_to_cpu(ctx->req->req_type));
+                       hwrm_err(bp, ctx, "Resp cmpl intr err msg: 0x%x\n",
+                                req_type);
                        goto exit;
                }
                len = le16_to_cpu(READ_ONCE(ctx->resp->resp_len));
@@ -565,7 +595,7 @@ static int __hwrm_send(struct bnxt *bp, struct bnxt_hwrm_ctx *ctx)
                                if (resp_seq != seen_out_of_seq) {
                                        netdev_warn(bp->dev, "Discarding out of seq response: 0x%x for msg {0x%x 0x%x}\n",
                                                    le16_to_cpu(resp_seq),
-                                                   le16_to_cpu(ctx->req->req_type),
+                                                   req_type,
                                                    le16_to_cpu(ctx->req->seq_id));
                                        seen_out_of_seq = resp_seq;
                                }
@@ -585,11 +615,9 @@ static int __hwrm_send(struct bnxt *bp, struct bnxt_hwrm_ctx *ctx)
 
                if (i >= tmo_count) {
 timeout_abort:
-                       if (!(ctx->flags & BNXT_HWRM_CTX_SILENT))
-                               netdev_err(bp->dev, "Error (timeout: %u) msg {0x%x 0x%x} len:%d\n",
-                                          hwrm_total_timeout(i),
-                                          le16_to_cpu(ctx->req->req_type),
-                                          le16_to_cpu(ctx->req->seq_id), len);
+                       hwrm_err(bp, ctx, "Error (timeout: %u) msg {0x%x 0x%x} len:%d\n",
+                                hwrm_total_timeout(i), req_type,
+                                le16_to_cpu(ctx->req->seq_id), len);
                        goto exit;
                }
 
@@ -604,12 +632,9 @@ timeout_abort:
                }
 
                if (j >= HWRM_VALID_BIT_DELAY_USEC) {
-                       if (!(ctx->flags & BNXT_HWRM_CTX_SILENT))
-                               netdev_err(bp->dev, "Error (timeout: %u) msg {0x%x 0x%x} len:%d v:%d\n",
-                                          hwrm_total_timeout(i),
-                                          le16_to_cpu(ctx->req->req_type),
-                                          le16_to_cpu(ctx->req->seq_id), len,
-                                          *valid);
+                       hwrm_err(bp, ctx, "Error (timeout: %u) msg {0x%x 0x%x} len:%d v:%d\n",
+                                hwrm_total_timeout(i), req_type,
+                                le16_to_cpu(ctx->req->seq_id), len, *valid);
                        goto exit;
                }
        }
@@ -620,11 +645,12 @@ timeout_abort:
         */
        *valid = 0;
        rc = le16_to_cpu(ctx->resp->error_code);
-       if (rc && !(ctx->flags & BNXT_HWRM_CTX_SILENT)) {
-               netdev_err(bp->dev, "hwrm req_type 0x%x seq id 0x%x error 0x%x\n",
-                          le16_to_cpu(ctx->resp->req_type),
-                          le16_to_cpu(ctx->resp->seq_id), rc);
-       }
+       if (rc == HWRM_ERR_CODE_BUSY && !(ctx->flags & BNXT_HWRM_CTX_SILENT))
+               netdev_warn(bp->dev, "FW returned busy, hwrm req_type 0x%x\n",
+                           req_type);
+       else if (rc)
+               hwrm_err(bp, ctx, "hwrm req_type 0x%x seq id 0x%x error 0x%x\n",
+                        req_type, token->seq_id, rc);
        rc = __hwrm_to_stderr(rc);
 exit:
        if (token)