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 4B956A0C41 for ; Tue, 30 Nov 2021 17:38:42 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 45F0141190; Tue, 30 Nov 2021 17:38:42 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id 7C84A411CB for ; Tue, 30 Nov 2021 17:38:41 +0100 (CET) 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-internal-0.canonical.com (Postfix) with ESMTPS id 56B9F3F1B2 for ; Tue, 30 Nov 2021 16:38:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290321; bh=K8v8uAVRUMHYWh2XwAxSbfQhXidp/52JGkiKtobC9yA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=as9a2yTc9rxdI4k/VklmWDpG80nL1e4jPq9oB/+eUYddQfh/oP5/XeDvPXHJgk6dZ h2OikHN9BL7H6jxylbtxkcAp1Qo58NFkEVEAfkcx6m0E4k82JPujzWHP4hOouB2Ew5 lsvriAboeGXlk2Odfgoo7jDFwsHMosuKzjoenUWdmICq8OYRn8io8g+hUEiPbLzfOy R8QIEEQNLV8khnpHQo8QAgjXdEpDqJ9T1uP7hlM9COgqRf2+G4H9937Cl7+xi9EO9B +gwNtDbnrdzRV5FCDiY7JlRirdfUeB7F7bab6OYx3JVyMFNzoEhLEpa5eXpDQZHDzW dBvqiYNaYXWHA== Received: by mail-ed1-f70.google.com with SMTP id d13-20020a056402516d00b003e7e67a8f93so17522094ede.0 for ; Tue, 30 Nov 2021 08:38:41 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=K8v8uAVRUMHYWh2XwAxSbfQhXidp/52JGkiKtobC9yA=; b=dtFI1znnzuAsxbBgv2lEQzPG4EtQz1/R3XoOALAaVCfkfg81GfYVvvUXp0Fsy5kBQF DtDux4BKDkLr2zv4nUI8j187Iz8+O3x2UAjCdyo3/QxAGqlj+BnGSQ/EQgcWhntbQw7Q gtbVlwop5b96+Vq42wMKqEC+v4QZv77ixdRs8w+bC4XpAl3X2kvYYQw0rIBn2C7o0Ms/ ZGM85tkCR1ZefWAW4wX3jFjIGanFt7raWdz/ShRythvM11VfoZIShk6y2jfCzCvTSEUb R2Uvxwwod9Y/my7sS7edS7DgjnUxS3kGtsGOitlU+TgV7z23JLNnXhGduFhc3pNVqVBj fBGw== X-Gm-Message-State: AOAM533DoZrVhv9uqKlMYMRAQnfTD0COi+JbsElZoRZY6rgdPU2JV0Ho U8GMGGaGQvCrKRhgvigkaEQNg/aHtte7rOM4t/uwARyXOiu+Tjc2/AOZZZysxJ3xBVlqTwsfHiR vcuTwZjH1YrK/b9KTbUrzc7B5 X-Received: by 2002:a17:906:fca3:: with SMTP id qw3mr175088ejb.285.1638290319521; Tue, 30 Nov 2021 08:38:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJwlaqIIP4/zCwgjKcrQyGqwVdJ3uqopNG/B+u3MOpJJ34polike1+0hw+g02IDm9ipGgEx8fg== X-Received: by 2002:a17:906:fca3:: with SMTP id qw3mr175066ejb.285.1638290319363; Tue, 30 Nov 2021 08:38:39 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id hd15sm9784708ejc.69.2021.11.30.08.38.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:38:38 -0800 (PST) From: christian.ehrhardt@canonical.com To: Ajit Khaparde Cc: Lance Richardson , dpdk stable Subject: patch 'net/bnxt: fix Tx queue startup state' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:34:14 +0100 Message-Id: <20211130163605.2460997-50-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> References: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Hi, FYI, your patch has been queued to stable release 19.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before December 10th 2021. 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/fdfed7e0ab02c2ea05a036d671845d44015637e0 Thanks. Christian Ehrhardt --- >From fdfed7e0ab02c2ea05a036d671845d44015637e0 Mon Sep 17 00:00:00 2001 From: Ajit Khaparde Date: Fri, 17 Sep 2021 13:20:45 -0700 Subject: [PATCH] net/bnxt: fix Tx queue startup state [ upstream commit 0f22fe124bffcbfa15a8179b9cc835ae64b1a3fe ] Default queue state of Tx queues on startup is not correct. Fix this by setting the state when the port is started. Fixes: 6eb3cc2294fd ("net/bnxt: add initial Tx code") Signed-off-by: Ajit Khaparde Reviewed-by: Lance Richardson --- drivers/net/bnxt/bnxt_ethdev.c | 10 ++++++++++ drivers/net/bnxt/bnxt_txq.c | 5 ----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 2a58496d71..69ecc6d21a 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -444,6 +444,16 @@ skip_cosq_cfg: goto err_out; } + for (j = 0; j < bp->tx_nr_rings; j++) { + struct bnxt_tx_queue *txq = bp->tx_queues[j]; + + if (!txq->tx_deferred_start) { + bp->eth_dev->data->tx_queue_state[j] = + RTE_ETH_QUEUE_STATE_STARTED; + txq->tx_started = true; + } + } + rc = bnxt_hwrm_cfa_l2_set_rx_mask(bp, &bp->vnic_info[0], 0, NULL); if (rc) { PMD_DRV_LOG(ERR, diff --git a/drivers/net/bnxt/bnxt_txq.c b/drivers/net/bnxt/bnxt_txq.c index 8f5ba73c09..129bd5b541 100644 --- a/drivers/net/bnxt/bnxt_txq.c +++ b/drivers/net/bnxt/bnxt_txq.c @@ -160,11 +160,6 @@ int bnxt_tx_queue_setup_op(struct rte_eth_dev *eth_dev, eth_dev->data->tx_queues[queue_idx] = txq; - if (txq->tx_deferred_start) - txq->tx_started = false; - else - txq->tx_started = true; - return 0; err: bnxt_tx_queue_release_op(txq); -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:08.996139765 +0100 +++ 0050-net-bnxt-fix-Tx-queue-startup-state.patch 2021-11-30 16:50:05.686872767 +0100 @@ -1 +1 @@ -From 0f22fe124bffcbfa15a8179b9cc835ae64b1a3fe Mon Sep 17 00:00:00 2001 +From fdfed7e0ab02c2ea05a036d671845d44015637e0 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0f22fe124bffcbfa15a8179b9cc835ae64b1a3fe ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index dc7dee1d2a..08537d8b87 100644 +index 2a58496d71..69ecc6d21a 100644 @@ -23,2 +24,2 @@ -@@ -814,6 +814,16 @@ skip_cosq_cfg: - } +@@ -444,6 +444,16 @@ skip_cosq_cfg: + goto err_out; @@ -41 +42 @@ -index 830416af3d..3ffc334cff 100644 +index 8f5ba73c09..129bd5b541 100644 @@ -44 +45 @@ -@@ -166,11 +166,6 @@ int bnxt_tx_queue_setup_op(struct rte_eth_dev *eth_dev, +@@ -160,11 +160,6 @@ int bnxt_tx_queue_setup_op(struct rte_eth_dev *eth_dev,