From patchwork Sat Oct 23 19:31:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Chan X-Patchwork-Id: 12579759 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8CBFDC433F5 for ; Sat, 23 Oct 2021 19:32:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7688E60E8B for ; Sat, 23 Oct 2021 19:32:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231469AbhJWTer (ORCPT ); Sat, 23 Oct 2021 15:34:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39360 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230463AbhJWTeq (ORCPT ); Sat, 23 Oct 2021 15:34:46 -0400 Received: from mail-pf1-x42f.google.com (mail-pf1-x42f.google.com [IPv6:2607:f8b0:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 22F91C061764 for ; Sat, 23 Oct 2021 12:32:27 -0700 (PDT) Received: by mail-pf1-x42f.google.com with SMTP id d5so6757033pfu.1 for ; Sat, 23 Oct 2021 12:32:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=FBNTlum7vK3Z6YhDIQeGv50aVWl9VisJ3yup2NiFleI=; b=gtaR7Wwt+/1ApSVu9FbG84JwGlYzMRlL4wo+8gY2fct4exE6ZoDWWABT+sci4B9lUR dOnsOP9M4PtbemvcOTnGm+i594tO066zemTMrEzD+h5VCQGy/mM11TLz9nCofHAEmEpx Ak0fWvSmwSicg9uLX30w2Hw2eA0Dl4HkvEtjo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=FBNTlum7vK3Z6YhDIQeGv50aVWl9VisJ3yup2NiFleI=; b=b9AqMpwoTf/shybjJEl+i6hJSBmacCSaW/69LG2mEcHq/Zj7w2QVW4bCg8l3qcKGqH bYtDuYI5y28cyV9F9zM9SEelkPTOsS7i8FBuI/2TsT5FpS3qeHOk8VjmajgzPIo97gIM lE0gIT8SH0Qbd5/VbefumHJugQaVnFZOJfqALUn2CprGC3bFIuKrUhztRwfww9q57/S0 84IKwhLU25zhbP7o+Gs6ee3/b22YIpQHnMEzVFfytINj2hJlzD2AfeRibRAcoldGaF0Z me6kJgdl7LOHnxOC1iRY2vfMTWJc328g1OyHqzCw3fJdTYeGp4tMTxzE+Tk0xMAaWY9k XGDA== X-Gm-Message-State: AOAM530Q/91CnNP9ThaUf+sKsIVLbA6uFq3StmvmRukwUx6yl8v3m4lD pDQ8R9WiE2TK1vUgLOdKQxhBgQ== X-Google-Smtp-Source: ABdhPJxFIgMEz3Fa/p0RhSsIvvKv4Emh92grZIzMjmFiiaQyFaPF8pNQtP9OHDtXOGxbqRhQi59PUg== X-Received: by 2002:a63:920b:: with SMTP id o11mr5758914pgd.314.1635017545938; Sat, 23 Oct 2021 12:32:25 -0700 (PDT) Received: from localhost.swdvt.lab.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id f7sm2461532pfv.152.2021.10.23.12.32.24 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 23 Oct 2021 12:32:25 -0700 (PDT) From: Michael Chan To: davem@davemloft.net Cc: netdev@vger.kernel.org, kuba@kernel.org, edwin.peer@broadcom.com, gospo@broadcom.com, jiri@nvidia.com Subject: [PATCH net-next 06/19] bnxt_en: improve error recovery information messages Date: Sat, 23 Oct 2021 15:31:53 -0400 Message-Id: <1635017526-16963-7-git-send-email-michael.chan@broadcom.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1635017526-16963-1-git-send-email-michael.chan@broadcom.com> References: <1635017526-16963-1-git-send-email-michael.chan@broadcom.com> Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Edwin Peer The recovery election messages are often mistaken for errors. Improve the wording to clarify the meaning of these frequent and expected events. Also, take the first step towards more inclusive language. Signed-off-by: Edwin Peer Signed-off-by: Michael Chan --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 20 ++++++++++++-------- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 2 +- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 44653a8255bb..8752c1dcc66e 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -2150,17 +2150,18 @@ static int bnxt_async_event_process(struct bnxt *bp, } case ASYNC_EVENT_CMPL_EVENT_ID_ERROR_RECOVERY: { struct bnxt_fw_health *fw_health = bp->fw_health; + char *status_desc = "healthy"; + u32 status; if (!fw_health) goto async_event_process_exit; if (!EVENT_DATA1_RECOVERY_ENABLED(data1)) { fw_health->enabled = false; - netif_info(bp, drv, bp->dev, - "Error recovery info: error recovery[0]\n"); + netif_info(bp, drv, bp->dev, "Driver recovery watchdog is disabled\n"); break; } - fw_health->master = EVENT_DATA1_RECOVERY_MASTER_FUNC(data1); + fw_health->primary = EVENT_DATA1_RECOVERY_MASTER_FUNC(data1); fw_health->tmr_multiplier = DIV_ROUND_UP(fw_health->polling_dsecs * HZ, bp->current_interval * 10); @@ -2170,10 +2171,13 @@ static int bnxt_async_event_process(struct bnxt *bp, bnxt_fw_health_readl(bp, BNXT_FW_HEARTBEAT_REG); fw_health->last_fw_reset_cnt = bnxt_fw_health_readl(bp, BNXT_FW_RESET_CNT_REG); + status = bnxt_fw_health_readl(bp, BNXT_FW_HEALTH_REG); + if (status != BNXT_FW_STATUS_HEALTHY) + status_desc = "unhealthy"; netif_info(bp, drv, bp->dev, - "Error recovery info: error recovery[1], master[%d], reset count[%u], health status: 0x%x\n", - fw_health->master, fw_health->last_fw_reset_cnt, - bnxt_fw_health_readl(bp, BNXT_FW_HEALTH_REG)); + "Driver recovery watchdog, role: %s, firmware status: 0x%x (%s), resets: %u\n", + fw_health->primary ? "primary" : "backup", status, + status_desc, fw_health->last_fw_reset_cnt); if (!fw_health->enabled) { /* Make sure tmr_counter is set and visible to * bnxt_health_check() before setting enabled to true. @@ -11469,7 +11473,7 @@ static void bnxt_force_fw_reset(struct bnxt *bp) } bnxt_fw_reset_close(bp); wait_dsecs = fw_health->master_func_wait_dsecs; - if (fw_health->master) { + if (fw_health->primary) { if (fw_health->flags & ERROR_RECOVERY_QCFG_RESP_FLAGS_CO_CPU) wait_dsecs = 0; bp->fw_reset_state = BNXT_FW_RESET_STATE_RESET_FW; @@ -12141,7 +12145,7 @@ static void bnxt_fw_reset_task(struct work_struct *work) return; } - if (!bp->fw_health->master) { + if (!bp->fw_health->primary) { u32 wait_dsecs = bp->fw_health->normal_func_wait_dsecs; bp->fw_reset_state = BNXT_FW_RESET_STATE_ENABLE_DEV; diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h index e56f2a27c67a..16d33d00973e 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h @@ -1536,7 +1536,7 @@ struct bnxt_fw_health { u32 last_fw_heartbeat; u32 last_fw_reset_cnt; u8 enabled:1; - u8 master:1; + u8 primary:1; u8 fatal:1; u8 status_reliable:1; u8 tmr_multiplier;