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 054CAA0C41 for ; Tue, 30 Nov 2021 17:37:07 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 001AE410F7; Tue, 30 Nov 2021 17:37:06 +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 D263A410F7 for ; Tue, 30 Nov 2021 17:37:05 +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 AFCD93F1ED for ; Tue, 30 Nov 2021 16:37:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290225; bh=KsfqvfKL7C5uEHF2K3DfMu9TSPrPIWlg65Gp3PfnzQg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=hsXgIYw3U3biL9IX+U1FB4RNYxPSYU1DckH6e3RVmvEgm1nR9Z0ZAKMsSO5Bby3YC iDbj5mUeuRbZuzx1nPeAxmbAdP/+nQjsf9ShEFP5BR4c97po43a9bvu3s+Ft/t20I3 PpROIYqCAhtctislCp5KWYwG2/i9RwiI8xFyln/y9mAyKh+60JtEZjGulDq00wyZJQ MjsKpnD2iZQ/KVwzRxvmbKfXvsbgYJR17x6VW62Ybwl3swk26lu2pbjKq/SpLIKNke rA36N6ir8usdcXbxIJUkLfHNAdc8ErFenlybdFNyQij5STtpTkQCFwanuIj/LITPcd KmH5M1TPsYEbg== Received: by mail-ed1-f70.google.com with SMTP id a3-20020a05640213c300b003e7d12bb925so17538990edx.9 for ; Tue, 30 Nov 2021 08:37:05 -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=KsfqvfKL7C5uEHF2K3DfMu9TSPrPIWlg65Gp3PfnzQg=; b=Hy8HjjwgkoQ2lgfBa3i+Vicx3YHNf/rRbO3NrOh7fSKXHN1sPCY2aq1sLcwamcFoLJ nEUkOGpQCE2DGFamxaF44iBW6DYFR7wSozpXk8yagC4zIVfNs6+3iH0AISWANaVjZe+8 3SZOqgO8OY8m7P+veXUz1mgeYXZ68AsxmRfIH7R22tn1DHE7NGmiKE1ztc07GkdWJPvQ wZOG+6VyQ0ycJz/V6xYbaTMglUgi4p86vhHS9fb1VJXVXbPpsuIa6hQ6CYLlzErKvLlk KKlI73QBdnSMewKotrW3dYIav5hg/ShsGxwaNKfo1zILmX5B+U7SoXxEfV31QaZKdBVS I9/g== X-Gm-Message-State: AOAM533VgB1CsxszQv1YCbF4IkoC/kpMB7fTv9zdfZVXGJtfR1SJap/B LNC05GejtCN5S7NbuJXXupuTGXbGAsCR5Vi01LJn2hBNMqzzDe91pi6OeDqx1TAkj7Gn6dmD3Xi MGHgeEqLbvpaMYjwlY09uQQ48 X-Received: by 2002:a05:6402:270a:: with SMTP id y10mr107236edd.152.1638290224868; Tue, 30 Nov 2021 08:37:04 -0800 (PST) X-Google-Smtp-Source: ABdhPJxxgoi3PUTB8Wftg84w2V7udUKN0lMLkjcb0yxyZ4lOMADXU8Z6vfMRosG/gDqaUvhOzcJQaw== X-Received: by 2002:a05:6402:270a:: with SMTP id y10mr107218edd.152.1638290224742; Tue, 30 Nov 2021 08:37:04 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id dy4sm11442914edb.92.2021.11.30.08.37.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:37:04 -0800 (PST) From: christian.ehrhardt@canonical.com To: Kalesh AP Cc: Ajit Khaparde , Lance Richardson , Somnath Kotur , dpdk stable Subject: patch 'net/bnxt: fix ring group free' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:33:41 +0100 Message-Id: <20211130163605.2460997-17-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/843921a929394883928e5cf4cbbc702100ad6842 Thanks. Christian Ehrhardt --- >From 843921a929394883928e5cf4cbbc702100ad6842 Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Mon, 30 Aug 2021 09:28:11 +0530 Subject: [PATCH] net/bnxt: fix ring group free [ upstream commit 8269a4e8af5fa7632578fc1f4fa7d44711440e4f ] Added an invalid fw_grp_id check inside bnxt_hwrm_ring_grp_free(). This will prevent invalid fw_grp_id to be passed to the FW which can result in an error. This fixes the following failure in the "port stop" -> "port start" sequence: bnxt_hwrm_ring_grp_free(): error 2:0:00000000:0204 bnxt_hwrm_ring_grp_free(): error 2:0:00000000:0204 Fixes: 9b63c6fd70e3 ("net/bnxt: support Rx/Tx queue start/stop") Signed-off-by: Kalesh AP Reviewed-by: Ajit Khaparde Reviewed-by: Lance Richardson Reviewed-by: Somnath Kotur --- drivers/net/bnxt/bnxt_hwrm.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index c61e9789b7..9904d5117f 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -1586,6 +1586,9 @@ int bnxt_hwrm_ring_grp_free(struct bnxt *bp, unsigned int idx) struct hwrm_ring_grp_free_input req = {.req_type = 0 }; struct hwrm_ring_grp_free_output *resp = bp->hwrm_cmd_resp_addr; + if (bp->grp_info[idx].fw_grp_id == INVALID_HW_RING_ID) + return 0; + HWRM_PREP(req, RING_GRP_FREE, BNXT_USE_CHIMP_MB); req.ring_group_id = rte_cpu_to_le_16(bp->grp_info[idx].fw_grp_id); -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:07.125646774 +0100 +++ 0017-net-bnxt-fix-ring-group-free.patch 2021-11-30 16:50:05.550871769 +0100 @@ -1 +1 @@ -From 8269a4e8af5fa7632578fc1f4fa7d44711440e4f Mon Sep 17 00:00:00 2001 +From 843921a929394883928e5cf4cbbc702100ad6842 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8269a4e8af5fa7632578fc1f4fa7d44711440e4f ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -27 +28 @@ -index 02613bd00b..0e0e266589 100644 +index c61e9789b7..9904d5117f 100644 @@ -30 +31 @@ -@@ -1897,6 +1897,9 @@ int bnxt_hwrm_ring_grp_free(struct bnxt *bp, unsigned int idx) +@@ -1586,6 +1586,9 @@ int bnxt_hwrm_ring_grp_free(struct bnxt *bp, unsigned int idx) @@ -37 +38 @@ - HWRM_PREP(&req, HWRM_RING_GRP_FREE, BNXT_USE_CHIMP_MB); + HWRM_PREP(req, RING_GRP_FREE, BNXT_USE_CHIMP_MB);