From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 19C82A0093 for ; Tue, 19 May 2020 15:16:13 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0DD4A1D702; Tue, 19 May 2020 15:16:13 +0200 (CEST) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by dpdk.org (Postfix) with ESMTP id 7438A1D702 for ; Tue, 19 May 2020 15:16:12 +0200 (CEST) Received: by mail-wm1-f68.google.com with SMTP id m12so3046189wmc.0 for ; Tue, 19 May 2020 06:16:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kD6wNWIwmxZqWFEHc8Y8/JHJr6ZDUrTt3nAT88P6vuY=; b=Pqkd9hpYNNahwqI6c7+kXYrQ9Rt63teJgdD0EdWth07A0i0n/S47SHbRczvxD14EuT Bglt2tjtSBf74lrZVZFCvaW2Sx/WJaHRqWkNrbmySNi4ID8J8dpHUzPgoh3EApOO7mp/ DgQEvhQIHezuFpYTBh0pPJUOxp5T+TyCDiGgsODoDthn8AtZkEYPWi2DXtkqQiz03GNb VvEbjYeWDt48uM+92o8s+LLHEXPEvBgVDeFZ4X/kBKPMMj3dVKK7LU6jz0lXjqCI7KGR q4gmICtsZnRAhF+QHhf4zlkwS2n8RpXv1bqeqdyuXtkTwyBM95qQJymqoxrG9eb9kGn2 8dKQ== 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=kD6wNWIwmxZqWFEHc8Y8/JHJr6ZDUrTt3nAT88P6vuY=; b=h8ekQr199cKLGDidcgmC1i7rrnaH+ULWRNr67FZvZW/MVniZ61vN+REv9OY5FrOK5m xfrfaPt9izAHY+dryuGdU1Bo09an6zPG/IzNaHxVNrimo/YCA8+jhFG7AKZ0exXGbnN+ NmLssPKlcGTsqupQ4YXgiwOXbj+35SJdiUwDz7U6RTJtwSnW4qiISNLt0Vzd2Nlu9q0w W99YGlA2Ry6S66pZ/GQqUmKpDQRu+Xvgs96mFyXdHXoVXNOILMgZFOJIkxlzsTtkIUXg qinbvfBgW6711yZELOyZqCF9rNh62ZB5HCgBCz+1Q0PHnBtcLl5tmVU7JB/KdBEMkCxe irGg== X-Gm-Message-State: AOAM532U+nKhSjRkdK9Mgjqw2Y9+PgUMPenVHCqF3Hdi/L8pHGIWOaCo MOLzA8MsaXiYmHbmm1metnY= X-Google-Smtp-Source: ABdhPJxpXzJ+/cLYaU7PR3rh9ho+xYJJtcAb1XAsysWe7lVHQxEapsSjMPYGMwfdEF2+W68KowbU5A== X-Received: by 2002:a1c:1b0d:: with SMTP id b13mr5682524wmb.171.1589894172188; Tue, 19 May 2020 06:16:12 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id f5sm21460677wro.18.2020.05.19.06.16.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:16:11 -0700 (PDT) From: luca.boccassi@gmail.com To: Ajit Khaparde Cc: dpdk stable Date: Tue, 19 May 2020 14:05:31 +0100 Message-Id: <20200519130549.112823-196-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnxt: fix FW version query' has been queued to stable release 19.11.3 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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/20. 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. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From e428b51c180ef54098f846e4c81681965d2e4f2f Mon Sep 17 00:00:00 2001 From: Ajit Khaparde Date: Wed, 6 May 2020 22:43:28 -0700 Subject: [PATCH] net/bnxt: fix FW version query [ upstream commit cfa9e98d3c135e4f937265263feb7377330219f6 ] bnxt_fw_version_get is not indicating the complete FW version. Fix it to indicate complete version string. Fixes: e2652b0a20a0 ("net/bnxt: support get FW version") Signed-off-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_ethdev.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index fe134108b6..c1e5dfa936 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -2171,10 +2171,11 @@ bnxt_fw_version_get(struct rte_eth_dev *dev, char *fw_version, size_t fw_size) uint8_t fw_major = (bp->fw_ver >> 24) & 0xff; uint8_t fw_minor = (bp->fw_ver >> 16) & 0xff; uint8_t fw_updt = (bp->fw_ver >> 8) & 0xff; + uint8_t fw_rsvd = bp->fw_ver & 0xff; int ret; - ret = snprintf(fw_version, fw_size, "%d.%d.%d", - fw_major, fw_minor, fw_updt); + ret = snprintf(fw_version, fw_size, "%d.%d.%d.%d", + fw_major, fw_minor, fw_updt, fw_rsvd); ret += 1; /* add the size of '\0' */ if (fw_size < (uint32_t)ret) -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:52.578226630 +0100 +++ 0196-net-bnxt-fix-FW-version-query.patch 2020-05-19 14:04:44.556654535 +0100 @@ -1,13 +1,14 @@ -From cfa9e98d3c135e4f937265263feb7377330219f6 Mon Sep 17 00:00:00 2001 +From e428b51c180ef54098f846e4c81681965d2e4f2f Mon Sep 17 00:00:00 2001 From: Ajit Khaparde Date: Wed, 6 May 2020 22:43:28 -0700 Subject: [PATCH] net/bnxt: fix FW version query +[ upstream commit cfa9e98d3c135e4f937265263feb7377330219f6 ] + bnxt_fw_version_get is not indicating the complete FW version. Fix it to indicate complete version string. Fixes: e2652b0a20a0 ("net/bnxt: support get FW version") -Cc: stable@dpdk.org Signed-off-by: Ajit Khaparde --- @@ -15,10 +16,10 @@ 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c -index dab291c7ce..ee0550b324 100644 +index fe134108b6..c1e5dfa936 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c -@@ -2404,10 +2404,11 @@ bnxt_fw_version_get(struct rte_eth_dev *dev, char *fw_version, size_t fw_size) +@@ -2171,10 +2171,11 @@ bnxt_fw_version_get(struct rte_eth_dev *dev, char *fw_version, size_t fw_size) uint8_t fw_major = (bp->fw_ver >> 24) & 0xff; uint8_t fw_minor = (bp->fw_ver >> 16) & 0xff; uint8_t fw_updt = (bp->fw_ver >> 8) & 0xff;