From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by dpdk.org (Postfix) with ESMTP id 7AA61B62 for ; Mon, 15 Oct 2018 13:52:22 +0200 (CEST) Received: by mail-wm1-f67.google.com with SMTP id 189-v6so18597688wmw.2 for ; Mon, 15 Oct 2018 04:52:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=s0EUNr31v4hQeF4ng1FUC0SQAfohWQEZj/Z9N/yo/3U=; b=Rwx6cuqLoEkxgD2xEIDFZHwx9l1rhaMq1D+XxUuC6CI8xpp4JhMhzDx+mq7MbK+0Jk 9hbKCPgmyjln91O6r0bVoWhDBIxWuDLBAw0P92mR22v9I+dtdxxrLadiKA3WXY78+xB2 QvGFYcKkseFRlXWRuxrcn1Ajr8fD5r1PAJmAxyZRW+Y3aSmBfDKRc2HswKrcA/iEPk7W Z8hQHp27VDFnRNKQ/oGeTVTQvE1Pel/j2mGVjx0NSW74VKS6l/j1RWkrCeH7oTBCNai5 /9pgfipxsgaxhPcsZ2ozcEPlLH2UfahLXM66Cb7lfdKwgm4U6EPFeU222JXfhCwKIB0I MeSQ== X-Gm-Message-State: ABuFfoiGrA6b4tbS/c0Gz5YL1HD+8e4fbe+XvsppkSMj59zRWRBwtYlJ juHTAzy1UiE/rbtEvtyu6uc= X-Google-Smtp-Source: ACcGV62qyxNyy7ItP88x3luFIJPfnsjvU63Vovn79yW+LhUECC78jiQ+mkDF9fFDHZQ3qJwwXKftEA== X-Received: by 2002:a1c:af07:: with SMTP id y7-v6mr13469973wme.33.1539604342041; Mon, 15 Oct 2018 04:52:22 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id 74-v6sm8485969wmi.23.2018.10.15.04.52.20 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 15 Oct 2018 04:52:21 -0700 (PDT) From: Luca Boccassi To: Ajit Khaparde Cc: dpdk stable Date: Mon, 15 Oct 2018 12:51:37 +0100 Message-Id: <20181015115144.27626-17-bluca@debian.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181015115144.27626-1-bluca@debian.org> References: <20181003162121.16364-1-bluca@debian.org> <20181015115144.27626-1-bluca@debian.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnxt: remove excess log messages' has been queued to LTS release 16.11.9 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Oct 2018 11:52:22 -0000 Hi, FYI, your patch has been queued to LTS release 16.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/17/18. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Luca Boccassi --- >>From 4f2b1c7cbe65b129120f3502cb09a87a1d2bc560 Mon Sep 17 00:00:00 2001 From: Ajit Khaparde Date: Fri, 28 Sep 2018 19:00:05 -0700 Subject: [PATCH] net/bnxt: remove excess log messages [ upstream commit 6f93b2aa2da8a1b0d1c5149e88b6428ac00296a5 ] When the firmware version and the driver HWRM version do not match, we are logging some messages. These messages unnecessarily clutter the logs and can add to the noise. We are logging the HWRM version and the firmware version anyway. The difference in version numbers can be gleaned from that. Removing the remaining log messages. Fixes: 804e746c7b73 ("net/bnxt: add hardware resource manager init code") Signed-off-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_hwrm.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index b86a7e227f..a644fb9c91 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -381,7 +381,6 @@ int bnxt_hwrm_ver_get(struct bnxt *bp) int rc = 0; struct hwrm_ver_get_input req = {.req_type = 0 }; struct hwrm_ver_get_output *resp = bp->hwrm_cmd_resp_addr; - uint32_t my_version; uint32_t fw_version; uint16_t max_resp_len; char type[RTE_MEMZONE_NAMESIZE]; @@ -407,10 +406,6 @@ int bnxt_hwrm_ver_get(struct bnxt *bp) RTE_LOG(INFO, PMD, "Driver HWRM version: %d.%d.%d\n", HWRM_VERSION_MAJOR, HWRM_VERSION_MINOR, HWRM_VERSION_UPDATE); - my_version = HWRM_VERSION_MAJOR << 16; - my_version |= HWRM_VERSION_MINOR << 8; - my_version |= HWRM_VERSION_UPDATE; - fw_version = resp->hwrm_intf_maj << 16; fw_version |= resp->hwrm_intf_min << 8; fw_version |= resp->hwrm_intf_upd; @@ -421,21 +416,6 @@ int bnxt_hwrm_ver_get(struct bnxt *bp) goto error; } - if (my_version != fw_version) { - RTE_LOG(INFO, PMD, "BNXT Driver/HWRM API mismatch.\n"); - if (my_version < fw_version) { - RTE_LOG(INFO, PMD, - "Firmware API version is newer than driver.\n"); - RTE_LOG(INFO, PMD, - "The driver may be missing features.\n"); - } else { - RTE_LOG(INFO, PMD, - "Firmware API version is older than driver.\n"); - RTE_LOG(INFO, PMD, - "Not all driver features may be functional.\n"); - } - } - if (bp->max_req_len > resp->max_req_win_len) { RTE_LOG(ERR, PMD, "Unsupported request length\n"); rc = -EINVAL; -- 2.19.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-10-15 12:48:35.040780720 +0100 +++ 0017-net-bnxt-remove-excess-log-messages.patch 2018-10-15 12:48:34.581096017 +0100 @@ -1,8 +1,10 @@ -From 6f93b2aa2da8a1b0d1c5149e88b6428ac00296a5 Mon Sep 17 00:00:00 2001 +From 4f2b1c7cbe65b129120f3502cb09a87a1d2bc560 Mon Sep 17 00:00:00 2001 From: Ajit Khaparde Date: Fri, 28 Sep 2018 19:00:05 -0700 Subject: [PATCH] net/bnxt: remove excess log messages +[ upstream commit 6f93b2aa2da8a1b0d1c5149e88b6428ac00296a5 ] + When the firmware version and the driver HWRM version do not match, we are logging some messages. These messages unnecessarily clutter the logs and can add to the noise. We are logging the HWRM version @@ -10,7 +12,6 @@ can be gleaned from that. Removing the remaining log messages. Fixes: 804e746c7b73 ("net/bnxt: add hardware resource manager init code") -Cc: stable@dpdk.org Signed-off-by: Ajit Khaparde --- @@ -18,10 +19,10 @@ 1 file changed, 20 deletions(-) diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c -index 38698e214c..76e443ec18 100644 +index b86a7e227f..a644fb9c91 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c -@@ -789,7 +789,6 @@ int bnxt_hwrm_ver_get(struct bnxt *bp) +@@ -381,7 +381,6 @@ int bnxt_hwrm_ver_get(struct bnxt *bp) int rc = 0; struct hwrm_ver_get_input req = {.req_type = 0 }; struct hwrm_ver_get_output *resp = bp->hwrm_cmd_resp_addr; @@ -29,38 +30,38 @@ uint32_t fw_version; uint16_t max_resp_len; char type[RTE_MEMZONE_NAMESIZE]; -@@ -817,10 +816,6 @@ int bnxt_hwrm_ver_get(struct bnxt *bp) - PMD_DRV_LOG(INFO, "Driver HWRM version: %d.%d.%d\n", +@@ -407,10 +406,6 @@ int bnxt_hwrm_ver_get(struct bnxt *bp) + RTE_LOG(INFO, PMD, "Driver HWRM version: %d.%d.%d\n", HWRM_VERSION_MAJOR, HWRM_VERSION_MINOR, HWRM_VERSION_UPDATE); - my_version = HWRM_VERSION_MAJOR << 16; - my_version |= HWRM_VERSION_MINOR << 8; - my_version |= HWRM_VERSION_UPDATE; - - fw_version = resp->hwrm_intf_maj_8b << 16; - fw_version |= resp->hwrm_intf_min_8b << 8; - fw_version |= resp->hwrm_intf_upd_8b; -@@ -832,21 +827,6 @@ int bnxt_hwrm_ver_get(struct bnxt *bp) + fw_version = resp->hwrm_intf_maj << 16; + fw_version |= resp->hwrm_intf_min << 8; + fw_version |= resp->hwrm_intf_upd; +@@ -421,21 +416,6 @@ int bnxt_hwrm_ver_get(struct bnxt *bp) goto error; } - if (my_version != fw_version) { -- PMD_DRV_LOG(INFO, "BNXT Driver/HWRM API mismatch.\n"); +- RTE_LOG(INFO, PMD, "BNXT Driver/HWRM API mismatch.\n"); - if (my_version < fw_version) { -- PMD_DRV_LOG(INFO, +- RTE_LOG(INFO, PMD, - "Firmware API version is newer than driver.\n"); -- PMD_DRV_LOG(INFO, +- RTE_LOG(INFO, PMD, - "The driver may be missing features.\n"); - } else { -- PMD_DRV_LOG(INFO, +- RTE_LOG(INFO, PMD, - "Firmware API version is older than driver.\n"); -- PMD_DRV_LOG(INFO, +- RTE_LOG(INFO, PMD, - "Not all driver features may be functional.\n"); - } - } - if (bp->max_req_len > resp->max_req_win_len) { - PMD_DRV_LOG(ERR, "Unsupported request length\n"); + RTE_LOG(ERR, PMD, "Unsupported request length\n"); rc = -EINVAL; -- 2.19.1