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 7FE4EA04DD for ; Wed, 28 Oct 2020 11:50:04 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5C20CCA0C; Wed, 28 Oct 2020 11:50:03 +0100 (CET) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by dpdk.org (Postfix) with ESMTP id 078704CA7 for ; Wed, 28 Oct 2020 11:50:02 +0100 (CET) Received: by mail-wm1-f48.google.com with SMTP id l8so2622835wmg.3 for ; Wed, 28 Oct 2020 03:50:02 -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=CUVWM97mz8RSmPGTY8CZfw1UwmNr3eceaAq/9ZXbF/c=; b=Z7jij6E0SdjSRBMkngtduiyCn2pJYNbRbu1KitttirI+EOi2Ge31NQ0gv/pdNzA/S0 EtAVbG3y9VKlClHbgM8o/rTqqbkqkckHCUIJDy9tYFRbMJBylQ2JB9Je0bShF620ICEe uF3zA2/dCRiZGAyGGRjxv6xYnVD4ao7/PH21hgUsOGrLucAzt4/eSq5csRTDq1y68Nbf u5sSQ+mNGHZT790WAq3f0+ctYJ/+jwoRKXEEHShQNKz+15aV59Fd1DBFvjJs2rMXT1a1 R5pt1XyFo3CVUOutzM51GMrgQ/XUkuA4ku4z5sbxxKK/335a95UnHkj1wEiSL6gvAI52 vtag== 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=CUVWM97mz8RSmPGTY8CZfw1UwmNr3eceaAq/9ZXbF/c=; b=Jqyi/EZKnb6s8WYppTf82f9jVDyEhOtT0tNg5TbeqJld9vaTnCqwhv6lzvrkLbiJBd qNHUAAqOD8LSrpTRCSlLEXxxs/unbnbZflLpc3mKliot93Rhe0xH/MneL31//AJ8IohK A50KMg20OzVxQIYZlmHqgief1pDp6Ajiqr4Y5RvL2gcWPlihxTLJst5ouMme5rpGdPjC oxAr/1Ndtoq9Kz8/mNNAqvF40WtxbY4DwtbUUpN/hragBAUOqFMBiGyprui09TX1WAJm I+Eb/JOHgOG+CUAsHExg32eyxoyXUij+87aNpTiduS3OHh3PC4Z4AgT7mnhGG0sb389W lVew== X-Gm-Message-State: AOAM5339uy1EKL4PpD4g9cX+vepcUIm5vAYbqzQUAJo3S+F5mqqK23RO ebeDWwZbPLotwnm99Xm6Coc9vUDQaDW83m8T X-Google-Smtp-Source: ABdhPJyJvNJCtuYZhwKFIaNVwd70WOYKab5PtTL7l5ttoPvino2cgBxpuNKGc1c1xRlnh5TOMYR/9A== X-Received: by 2002:a1c:6546:: with SMTP id z67mr7198630wmb.98.1603882200769; Wed, 28 Oct 2020 03:50:00 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id d129sm6127198wmd.5.2020.10.28.03.50.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:50:00 -0700 (PDT) From: luca.boccassi@gmail.com To: Lance Richardson Cc: Somnath Kotur , Ajit Khaparde , dpdk stable Date: Wed, 28 Oct 2020 10:43:53 +0000 Message-Id: <20201028104606.3504127-74-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnxt: fix queue get info' has been queued to stable release 19.11.6 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.6 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/30/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 aca542737a31ca9fed96300d31e1d01810e86513 Mon Sep 17 00:00:00 2001 From: Lance Richardson Date: Tue, 22 Sep 2020 13:30:35 -0400 Subject: [PATCH] net/bnxt: fix queue get info [ upstream commit bd6345e4f48a737ec498d013953e785ab185e5f1 ] Return current offloads in rxq_info_get()/txq_info_get(). Fixes: 2fc201884be8 ("net/bnxt: support rxq/txq get information") Signed-off-by: Lance Richardson Reviewed-by: Somnath Kotur Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_ethdev.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index e219dbf0d0..c6e9ad8e6a 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -2205,6 +2205,7 @@ bnxt_rxq_info_get_op(struct rte_eth_dev *dev, uint16_t queue_id, qinfo->conf.rx_free_thresh = rxq->rx_free_thresh; qinfo->conf.rx_drop_en = rxq->drop_en; qinfo->conf.rx_deferred_start = rxq->rx_deferred_start; + qinfo->conf.offloads = dev->data->dev_conf.rxmode.offloads; } static void @@ -2228,6 +2229,7 @@ bnxt_txq_info_get_op(struct rte_eth_dev *dev, uint16_t queue_id, qinfo->conf.tx_free_thresh = txq->tx_free_thresh; qinfo->conf.tx_rs_thresh = 0; qinfo->conf.tx_deferred_start = txq->tx_deferred_start; + qinfo->conf.offloads = dev->data->dev_conf.txmode.offloads; } int bnxt_mtu_set_op(struct rte_eth_dev *eth_dev, uint16_t new_mtu) -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:14.071513227 +0000 +++ 0074-net-bnxt-fix-queue-get-info.patch 2020-10-28 10:35:11.576831083 +0000 @@ -1,12 +1,13 @@ -From bd6345e4f48a737ec498d013953e785ab185e5f1 Mon Sep 17 00:00:00 2001 +From aca542737a31ca9fed96300d31e1d01810e86513 Mon Sep 17 00:00:00 2001 From: Lance Richardson Date: Tue, 22 Sep 2020 13:30:35 -0400 Subject: [PATCH] net/bnxt: fix queue get info +[ upstream commit bd6345e4f48a737ec498d013953e785ab185e5f1 ] + Return current offloads in rxq_info_get()/txq_info_get(). Fixes: 2fc201884be8 ("net/bnxt: support rxq/txq get information") -Cc: stable@dpdk.org Signed-off-by: Lance Richardson Reviewed-by: Somnath Kotur @@ -16,10 +17,10 @@ 1 file changed, 2 insertions(+) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c -index d0d11a6d0e..bb6b25dff2 100644 +index e219dbf0d0..c6e9ad8e6a 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c -@@ -2645,6 +2645,7 @@ bnxt_rxq_info_get_op(struct rte_eth_dev *dev, uint16_t queue_id, +@@ -2205,6 +2205,7 @@ bnxt_rxq_info_get_op(struct rte_eth_dev *dev, uint16_t queue_id, qinfo->conf.rx_free_thresh = rxq->rx_free_thresh; qinfo->conf.rx_drop_en = rxq->drop_en; qinfo->conf.rx_deferred_start = rxq->rx_deferred_start; @@ -27,14 +28,14 @@ } static void -@@ -2668,6 +2669,7 @@ bnxt_txq_info_get_op(struct rte_eth_dev *dev, uint16_t queue_id, +@@ -2228,6 +2229,7 @@ bnxt_txq_info_get_op(struct rte_eth_dev *dev, uint16_t queue_id, qinfo->conf.tx_free_thresh = txq->tx_free_thresh; qinfo->conf.tx_rs_thresh = 0; qinfo->conf.tx_deferred_start = txq->tx_deferred_start; + qinfo->conf.offloads = dev->data->dev_conf.txmode.offloads; } - static const struct { + int bnxt_mtu_set_op(struct rte_eth_dev *eth_dev, uint16_t new_mtu) -- 2.20.1