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 2227643829 for ; Tue, 5 Mar 2024 16:36:24 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BC43642E80; Tue, 5 Mar 2024 16:36:21 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 204EC410D3 for ; Tue, 5 Mar 2024 16:36:19 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709652978; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QrcsIVHYpqAUMwK6xV0QTRRTCUfM7P1tRSE/jgKi4Fc=; b=NS7htFCaZmjD5gWlvTkvHP3UrQ9JP5hYxIFTEA53ecLMvcw+dVG5ksM+T2fy7F9KtaJMxX Ii4tc52dt8gKA/CCx4KoVlK0MX/0fn1Ks3UWONoPcj5rH7l3HyStvvjOzN5ib2Kxu4IwAT KqfkELtKaUDJJyTQABmusnCihI7Av34= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-615-ebxBfPvPMPuV0Q0LrKacDA-1; Tue, 05 Mar 2024 10:36:15 -0500 X-MC-Unique: ebxBfPvPMPuV0Q0LrKacDA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 13DCD8007A3; Tue, 5 Mar 2024 15:36:14 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6C3252022EDB; Tue, 5 Mar 2024 15:36:13 +0000 (UTC) From: Kevin Traynor To: Kalesh AP Cc: Ajit Khaparde , dpdk stable Subject: patch 'net/bnxt: fix backward firmware compatibility' has been queued to stable release 21.11.7 Date: Tue, 5 Mar 2024 15:34:34 +0000 Message-ID: <20240305153449.263666-61-ktraynor@redhat.com> In-Reply-To: <20240305153449.263666-1-ktraynor@redhat.com> References: <20240305153449.263666-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/11/24. 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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/f7380ba80901ef3e6c762944b2ff5f330fa5b7e5 Thanks. Kevin --- >From f7380ba80901ef3e6c762944b2ff5f330fa5b7e5 Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Thu, 7 Dec 2023 07:56:26 -0800 Subject: [PATCH] net/bnxt: fix backward firmware compatibility [ upstream commit 589619999b0411a4266e335fe105e1c7cba6e02b ] On older firmware versions, HWRM_FUNC_QCAPS response is not returning the maximum number of multicast filters that can be supported by the function. As a result, memory allocation with size 0 fails. Bugzilla ID: 1309 Signed-off-by: Kalesh AP Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt.h | 1 + drivers/net/bnxt/bnxt_hwrm.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h index 31761f4804..b70d8d3f98 100644 --- a/drivers/net/bnxt/bnxt.h +++ b/drivers/net/bnxt/bnxt.h @@ -868,4 +868,5 @@ struct bnxt { rte_iova_t mc_list_dma_addr; uint32_t nb_mc_addr; +#define BNXT_DFLT_MAX_MC_ADDR 16 /* for compatibility with older firmware */ uint32_t max_mcast_addr; /* maximum number of mcast filters supported */ diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index 098f84fbae..3ade65456b 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -908,4 +908,6 @@ static int __bnxt_hwrm_func_qcaps(struct bnxt *bp) bp->max_stat_ctx = rte_le_to_cpu_16(resp->max_stat_ctx); bp->max_mcast_addr = rte_le_to_cpu_32(resp->max_mcast_filters); + if (!bp->max_mcast_addr) + bp->max_mcast_addr = BNXT_DFLT_MAX_MC_ADDR; if (BNXT_PF(bp)) { -- 2.43.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 14:08:56.095819225 +0000 +++ 0061-net-bnxt-fix-backward-firmware-compatibility.patch 2024-03-05 14:08:54.718520945 +0000 @@ -1 +1 @@ -From 589619999b0411a4266e335fe105e1c7cba6e02b Mon Sep 17 00:00:00 2001 +From f7380ba80901ef3e6c762944b2ff5f330fa5b7e5 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 589619999b0411a4266e335fe105e1c7cba6e02b ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 3290c57a72..4b8a691f80 100644 +index 31761f4804..b70d8d3f98 100644 @@ -25 +26 @@ -@@ -975,4 +975,5 @@ struct bnxt { +@@ -868,4 +868,5 @@ struct bnxt { @@ -32 +33 @@ -index 441e3aef51..9260bcb4cd 100644 +index 098f84fbae..3ade65456b 100644 @@ -35 +36 @@ -@@ -902,4 +902,6 @@ static int __bnxt_hwrm_func_qcaps(struct bnxt *bp) +@@ -908,4 +908,6 @@ static int __bnxt_hwrm_func_qcaps(struct bnxt *bp) @@ -40 +40,0 @@ - memcpy(bp->dsn, resp->device_serial_number, sizeof(bp->dsn)); @@ -41,0 +42 @@ + if (BNXT_PF(bp)) {