From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id DBBBEA0C4C for ; Mon, 12 Jul 2021 15:14:29 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D5F314119C; Mon, 12 Jul 2021 15:14:29 +0200 (CEST) Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mails.dpdk.org (Postfix) with ESMTP id BBC484119C for ; Mon, 12 Jul 2021 15:14:28 +0200 (CEST) Received: by mail-wr1-f51.google.com with SMTP id k4so19249632wrc.8 for ; Mon, 12 Jul 2021 06:14:28 -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=ApOCd05tsAeea3fX3f/uafZVMZEo5I2zgu1r6W5knhs=; b=RypZGdaDtq4RiIPsDQ55x/pzrkatUIn5hNeFxJ/eBFkKhzmhccTbENPwuzx15fr0AN uOUs5JCuqwK7sjR0dbExnfqwQsE6bzItrydICyxDn+4+a1IxTiUJX+MzNQML4bYck8Ji bWAJNFbSlvXkYdkC8JjLG8GrTtzveq3NXWnVWWUDv8HJr1ikhw7NLCFX1X8vAGRj1hpM NRQr0b6npNHBBdl5U2D3xMpjL3uZJMZrZs4LGOTeCAu0MpDDdGTjb7WgxT26W1UoO256 LHi8oyajLahKs3LonYuuMwq6JTsORUPfol5cnCepmiWiAMFikGfS7WjmT/Bx7+en9jDt EEQQ== 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=ApOCd05tsAeea3fX3f/uafZVMZEo5I2zgu1r6W5knhs=; b=U8/k33VJ5df/bFLSBa0WaeEyRARNcGynZPXTVFAFo0+Ip5jyV8xnlyJkyQXtz0pbyY 2MJ0iR8E32M/AMrlBjKdZo/gPDx3OlZSLkYOpqeeUVmpv5vBczYxxN7wHoKUrB2tWbPa pTK1TKIAOKz7S0as1sfY4B1GeLBDo8MA6NJufvgcICJ1sfa+NIkoB2JhHkfpSc0qsfxQ 02EreUTrvwdetikwHGSxEFgpZPT4zrJDm8iAjnObBMAHLDIPJFP8j+zLeA70W+of7EmP fHa9ysMsh+o3r6pbfLj9hm8kli6g53WSikG/hHL7Fc2/sfFCtnmiRFgsDPRfHk/dXSxb WSvg== X-Gm-Message-State: AOAM531M0s3FzWVfz8hOaMQOdXguoA+/rrAXovbFp9uwYWtiY/xBn8an xnqJRh0+DCalYt0qbMTV2SA= X-Google-Smtp-Source: ABdhPJycRWOd9koJJiaBtbkd8kDYcBQ1fdyHyy7UJWtCC0Dbg6UJ9BAZ+SQX+ye3oSg2j4K1Axf1Yw== X-Received: by 2002:a5d:4252:: with SMTP id s18mr58495066wrr.88.1626095668568; Mon, 12 Jul 2021 06:14:28 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id c10sm12557497wmb.40.2021.07.12.06.14.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 06:14:28 -0700 (PDT) From: luca.boccassi@gmail.com To: Kalesh AP Cc: Ajit Khaparde , dpdk stable Date: Mon, 12 Jul 2021 14:05:19 +0100 Message-Id: <20210712130551.2462159-84-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210712130551.2462159-1-luca.boccassi@gmail.com> References: <20210712130551.2462159-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnxt: cleanup code' has been queued to stable release 20.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 20.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 07/14/21. 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. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/a35ea38039fc72d9ff3ae3cb276e712358715d85 Thanks. Luca Boccassi --- >From a35ea38039fc72d9ff3ae3cb276e712358715d85 Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Wed, 9 Jun 2021 08:43:29 +0530 Subject: [PATCH] net/bnxt: cleanup code [ upstream commit 8879ece56832b7f2dd5e5ee10f36e848089f09df ] This is a cleanup commit and no functional change. 1. use macros instead of hard coded values 2. remove unnecessary comments Fixes: 5cd0e2889c43 ("net/bnxt: support NIC Partitioning") Fixes: 2ba07b7dbd9d ("net/bnxt: set the hash key size") Signed-off-by: Kalesh AP Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_ethdev.c | 3 +-- drivers/net/bnxt/bnxt_hwrm.c | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 9ffd81e7f3..99194c9c44 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -965,7 +965,7 @@ static int bnxt_dev_info_get_op(struct rte_eth_dev *eth_dev, dev_info->max_rx_queues = max_rx_rings; dev_info->max_tx_queues = max_rx_rings; dev_info->reta_size = bnxt_rss_hash_tbl_size(bp); - dev_info->hash_key_size = 40; + dev_info->hash_key_size = HW_HASH_KEY_SIZE; max_vnics = bp->max_vnics; /* MTU specifics */ @@ -1996,7 +1996,6 @@ static int bnxt_reta_query_op(struct rte_eth_dev *eth_dev, if (rc) return rc; - /* Retrieve from the default VNIC */ if (!vnic) return -EINVAL; if (!vnic->rss_table) diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index be9c7eb75e..6af7e62721 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -3149,7 +3149,6 @@ error: return rc; } -/* JIRA 22088 */ int bnxt_hwrm_func_qcfg(struct bnxt *bp, uint16_t *mtu) { struct hwrm_func_qcfg_input req = {0}; @@ -3166,8 +3165,7 @@ int bnxt_hwrm_func_qcfg(struct bnxt *bp, uint16_t *mtu) HWRM_CHECK_RESULT(); - /* Hard Coded.. 0xfff VLAN ID mask */ - bp->vlan = rte_le_to_cpu_16(resp->vlan) & 0xfff; + bp->vlan = rte_le_to_cpu_16(resp->vlan) & ETH_VLAN_ID_MAX; svif_info = rte_le_to_cpu_16(resp->svif_info); if (svif_info & HWRM_FUNC_QCFG_OUTPUT_SVIF_INFO_SVIF_VALID) -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-07-12 13:41:40.961878461 +0100 +++ 0084-net-bnxt-cleanup-code.patch 2021-07-12 13:41:36.718127360 +0100 @@ -1 +1 @@ -From 8879ece56832b7f2dd5e5ee10f36e848089f09df Mon Sep 17 00:00:00 2001 +From a35ea38039fc72d9ff3ae3cb276e712358715d85 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8879ece56832b7f2dd5e5ee10f36e848089f09df ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 1579d797ce..e7fc254173 100644 +index 9ffd81e7f3..99194c9c44 100644 @@ -26 +27 @@ -@@ -966,7 +966,7 @@ static int bnxt_dev_info_get_op(struct rte_eth_dev *eth_dev, +@@ -965,7 +965,7 @@ static int bnxt_dev_info_get_op(struct rte_eth_dev *eth_dev, @@ -35 +36 @@ -@@ -2071,7 +2071,6 @@ static int bnxt_reta_query_op(struct rte_eth_dev *eth_dev, +@@ -1996,7 +1996,6 @@ static int bnxt_reta_query_op(struct rte_eth_dev *eth_dev, @@ -44 +45 @@ -index be595487e5..13c2b88104 100644 +index be9c7eb75e..6af7e62721 100644 @@ -47 +48 @@ -@@ -3313,7 +3313,6 @@ error: +@@ -3149,7 +3149,6 @@ error: @@ -55 +56 @@ -@@ -3330,8 +3329,7 @@ int bnxt_hwrm_func_qcfg(struct bnxt *bp, uint16_t *mtu) +@@ -3166,8 +3165,7 @@ int bnxt_hwrm_func_qcfg(struct bnxt *bp, uint16_t *mtu)