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 F3440A0C47 for ; Tue, 10 Aug 2021 17:42:57 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id ECDEB4114F; Tue, 10 Aug 2021 17:42:57 +0200 (CEST) Received: from smtp-relay-canonical-0.canonical.com (smtp-relay-canonical-0.canonical.com [185.125.188.120]) by mails.dpdk.org (Postfix) with ESMTP id 1BB9E4014F for ; Tue, 10 Aug 2021 17:42:56 +0200 (CEST) Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-0.canonical.com (Postfix) with ESMTPS id 01AB63F047 for ; Tue, 10 Aug 2021 15:42:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628610176; bh=xpHFVsnFyz13tKkC/5dGh0nKIT3p25YvYMyqtBTVxEU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=pE3Zvex0hKxUD6a9zuCxlVxSw8TNlnTSpfuqyoBd6xoLG2m3cl5DR9NZgrVqkc3hI 2fVd2JDu6OQhHF1j/LY6ZKm+dEolKIdRFWlEvvVHHHymIXHFya4yWxml8d8icSOYzW e2AXXzp60x2lKSoHuHac+F7+PCQ+y07MDFS3AlSt8IJd0w4+GzNPc9ro/CzfA18/GM MMMj2j74cd/oLVHoeeeVAHC3+t5SdmH6dLKo8yeoQqJX8rlrQb9RhGT5vIJ9LtjA9u 72YHEgkE+GCXrWjEzFz9sopPuvw0/PDEGzWTuycY9h18DSAQHxTmY5Euqdi5xD9xqQ mjv7y23mKvnaw== Received: by mail-ed1-f70.google.com with SMTP id a23-20020a50ff170000b02903b85a16b672so10960619edu.1 for ; Tue, 10 Aug 2021 08:42:55 -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=xpHFVsnFyz13tKkC/5dGh0nKIT3p25YvYMyqtBTVxEU=; b=Qfcy5Ph4Np+jaZRe73vr7ZrXFHznnV3ZSkvi3YsHg01Xi5QfP6r7ByZM+bb+aCjjg2 fKQcTtolCa6q23Qr7Yw6/7O5JXShn90wX2aQDEbV/NLDkH4fdwICKR2VFXffaKPTMEV6 DtClNKguyYwXGm+ifeiv+uut5GrvcvGYtFvUFDC1eLSU8L230cGtSdSPXWs0IlxjfrB0 GNk8mHzQEtguLEkHv7LszRLk+1zxb06R2S+1UCBnp68bIOHGXjT0cnPMxuW+wTsSwUQe 2II+bTSoOyxkIS6dulrMRgBeDfdw4kkP55Uavwkts1YMgxMMv6KCV7yMVf+JkV240YEx JxcA== X-Gm-Message-State: AOAM532row6CX9fWp/MNUXTKXbePpSFl3bCzp9Krrub0cWyvZRCM7onz V3GSbdl9+L4ExNHDj0EUUnAY3sQJs5wnBzjcTYSxNMKyBRLg8fpaJgIbMhxMkGe8kNhSzawDBsT kvfu4whXQtg5zyRN6X+1kob6m X-Received: by 2002:aa7:c1cf:: with SMTP id d15mr5605900edp.201.1628610175425; Tue, 10 Aug 2021 08:42:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxC/3pfR0D/KrHSAs1qfIPBl83FwCt3uXQu2PBCp2IXiZsmXKSZ+bqq28KAw1IsgOsU7mv+xg== X-Received: by 2002:aa7:c1cf:: with SMTP id d15mr5605886edp.201.1628610175262; Tue, 10 Aug 2021 08:42:55 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id 8sm783795ejy.65.2021.08.10.08.42.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Aug 2021 08:42:54 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Kalesh AP Cc: Ajit Khaparde , dpdk stable Date: Tue, 10 Aug 2021 17:39:27 +0200 Message-Id: <20210810154022.749358-47-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810154022.749358-1-christian.ehrhardt@canonical.com> References: <20210810154022.749358-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnxt: cleanup code' has been queued to stable release 19.11.10 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 19.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/12/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/f21240d13a040bf074c17e4fe269050cce8c7848 Thanks. Christian Ehrhardt --- >From f21240d13a040bf074c17e4fe269050cce8c7848 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 | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 7f5045c55f..90cee73e51 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -530,7 +530,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 */ @@ -1469,7 +1469,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 0701347003..23c5f7c3a2 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -2938,7 +2938,6 @@ error: return rc; } -/* JIRA 22088 */ int bnxt_hwrm_func_qcfg(struct bnxt *bp, uint16_t *mtu) { struct hwrm_func_qcfg_input req = {0}; @@ -2953,8 +2952,8 @@ 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; + flags = rte_le_to_cpu_16(resp->flags); if (BNXT_PF(bp) && (flags & HWRM_FUNC_QCFG_OUTPUT_FLAGS_MULTI_HOST)) bp->flags |= BNXT_FLAG_MULTI_HOST; -- 2.32.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-08-10 15:11:14.844513926 +0200 +++ 0047-net-bnxt-cleanup-code.patch 2021-08-10 15:11:13.018638100 +0200 @@ -1 +1 @@ -From 8879ece56832b7f2dd5e5ee10f36e848089f09df Mon Sep 17 00:00:00 2001 +From f21240d13a040bf074c17e4fe269050cce8c7848 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8879ece56832b7f2dd5e5ee10f36e848089f09df ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -19,2 +20,2 @@ - drivers/net/bnxt/bnxt_hwrm.c | 4 +--- - 2 files changed, 2 insertions(+), 5 deletions(-) + drivers/net/bnxt/bnxt_hwrm.c | 5 ++--- + 2 files changed, 3 insertions(+), 5 deletions(-) @@ -23 +24 @@ -index 1579d797ce..e7fc254173 100644 +index 7f5045c55f..90cee73e51 100644 @@ -26 +27 @@ -@@ -966,7 +966,7 @@ static int bnxt_dev_info_get_op(struct rte_eth_dev *eth_dev, +@@ -530,7 +530,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, +@@ -1469,7 +1469,6 @@ static int bnxt_reta_query_op(struct rte_eth_dev *eth_dev, @@ -44 +45 @@ -index be595487e5..13c2b88104 100644 +index 0701347003..23c5f7c3a2 100644 @@ -47 +48 @@ -@@ -3313,7 +3313,6 @@ error: +@@ -2938,7 +2938,6 @@ error: @@ -55 +56 @@ -@@ -3330,8 +3329,7 @@ int bnxt_hwrm_func_qcfg(struct bnxt *bp, uint16_t *mtu) +@@ -2953,8 +2952,8 @@ int bnxt_hwrm_func_qcfg(struct bnxt *bp, uint16_t *mtu) @@ -62,3 +63,4 @@ - - svif_info = rte_le_to_cpu_16(resp->svif_info); - if (svif_info & HWRM_FUNC_QCFG_OUTPUT_SVIF_INFO_SVIF_VALID) ++ + flags = rte_le_to_cpu_16(resp->flags); + if (BNXT_PF(bp) && (flags & HWRM_FUNC_QCFG_OUTPUT_FLAGS_MULTI_HOST)) + bp->flags |= BNXT_FLAG_MULTI_HOST;