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 4A67843C60 for ; Thu, 7 Mar 2024 02:37:15 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 41FA442F21; Thu, 7 Mar 2024 02:37:15 +0100 (CET) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mails.dpdk.org (Postfix) with ESMTP id 1477B42F01 for ; Thu, 7 Mar 2024 02:37:14 +0100 (CET) Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-4130fefef75so1011135e9.2 for ; Wed, 06 Mar 2024 17:37:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709775434; x=1710380234; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VJgEBn5PKb8QjjJjbmgnlEtwFesYI+dtZst8MPC+8K4=; b=OuC2x5bKbgdm21cWflVVGuDr7mo9wirdu17+f1TK0umYAQ6tC4hNZpfDavnJgvTX+T DvEdV3Dek3FYsuuUk16+4Rp5AkbZKZQAhd74IcT/qWx9Fv6T5ukebygQOHNsJZuDG1ui HiecsA3DJfQUX4C6Qm+YraG/0jf77JtPx432Ei9PrcW5ByXykJZ8jhZnD1DP+nN4B/wg 9dk4ZZ21zYCAhSIR0M4dfcroeWZ4WG78M/43fgNlKyLAUVG720eOlGC8WxHnbdCpyweM I4gkmPZw4XPsxBS9Vt/1+fOeaUFPkQoLS0xB6ukwP756zlxSrOjb5oRfdGdXqkBkxNI+ H2eQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709775434; x=1710380234; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VJgEBn5PKb8QjjJjbmgnlEtwFesYI+dtZst8MPC+8K4=; b=HxtgKgwMzgCwpqyv+4VG65f2Xl7a1Jk8VwjgL5G7X4LFWNmeqGm4CUZHA2qJ9AJwWj iyPXSEWwNFms9oyhsxud+/iO8vbDWoBHaDrwn7S4aWYlpBUV/nKOZtuE66yTUvr70XL6 bLj+rGIM7UyYUxCSSPWbIumgstInOGkb5oLL2yOujuphC+iBhHZpZV/8Nr7XbHeRaFn7 EXu6z4OydBGrzOlrqV/gZ9i5NW+/v9Ri+BFcnVW9nRCaLoM4M5S64UNZVAq6gpFPEYfO dF41VLsmIh5JAVc0uDuDvI3uX43zgN5cpcFh8jeWYxXo/3WmEdHz6BqoIjLULMsRdhBT ZMMQ== X-Forwarded-Encrypted: i=1; AJvYcCWitUwUETbTYrlA7bup7oCdkK7gBCLRoD7JEyltxQWB/Fp9p0MNcb1/BHY4wJngiUTEMxGAGOcw9MMy4gTnoUY= X-Gm-Message-State: AOJu0YyESSUtQDkIID4iEz7lTVeiAeXYHzDEe5+1xFiIit7J/uvkcxVR BfzDF46sJhZz5YRX/U3Jx9BiTh5ODCTn1tTLypBgsdXwtMAuGMBxyIKNr+7lWFU= X-Google-Smtp-Source: AGHT+IHS92+H2stpWgaD8NWDXVi6j91TIXmjFtx+VdxeLsqFFHv9vcQuWx+OH2TYrEDmLN2CcTAdGA== X-Received: by 2002:a05:600c:3555:b0:412:f015:6fa6 with SMTP id i21-20020a05600c355500b00412f0156fa6mr3829718wmq.28.1709775433730; Wed, 06 Mar 2024 17:37:13 -0800 (PST) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id q8-20020a05600c46c800b00413099fc248sm875714wmo.3.2024.03.06.17.37.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Mar 2024 17:37:13 -0800 (PST) From: luca.boccassi@gmail.com To: Kalesh AP Cc: Ajit Khaparde , dpdk stable Subject: patch 'net/bnxt: fix backward firmware compatibility' has been queued to stable release 22.11.5 Date: Thu, 7 Mar 2024 01:31:45 +0000 Message-Id: <20240307013159.1735343-88-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240307013159.1735343-1-luca.boccassi@gmail.com> References: <20240307013159.1735343-1-luca.boccassi@gmail.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 22.11.5 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/09/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/e2cfac4357b258fd569754b7bf13f6a3e858418d Thanks. Luca Boccassi --- >From e2cfac4357b258fd569754b7bf13f6a3e858418d 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 | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h index df6442abc4..5ea6f9b69a 100644 --- a/drivers/net/bnxt/bnxt.h +++ b/drivers/net/bnxt/bnxt.h @@ -867,6 +867,7 @@ struct bnxt { struct rte_ether_addr *mcast_addr_list; 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 */ struct rte_eth_rss_conf rss_conf; /* RSS configuration. */ diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index 098f84fbae..ad756337da 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -907,7 +907,8 @@ static int __bnxt_hwrm_func_qcaps(struct bnxt *bp) bp->max_l2_ctx, bp->max_vnics); 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)) { bp->pf->total_vnics = rte_le_to_cpu_16(resp->max_vnics); if (flags & HWRM_FUNC_QCAPS_OUTPUT_FLAGS_PTP_SUPPORTED) { -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-07 01:05:42.204526909 +0000 +++ 0088-net-bnxt-fix-backward-firmware-compatibility.patch 2024-03-07 01:05:34.978943837 +0000 @@ -1 +1 @@ -From 589619999b0411a4266e335fe105e1c7cba6e02b Mon Sep 17 00:00:00 2001 +From e2cfac4357b258fd569754b7bf13f6a3e858418d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 589619999b0411a4266e335fe105e1c7cba6e02b ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -18,2 +19,2 @@ - drivers/net/bnxt/bnxt_hwrm.c | 2 ++ - 2 files changed, 3 insertions(+) + drivers/net/bnxt/bnxt_hwrm.c | 3 ++- + 2 files changed, 3 insertions(+), 1 deletion(-) @@ -22 +23 @@ -index 3290c57a72..4b8a691f80 100644 +index df6442abc4..5ea6f9b69a 100644 @@ -25 +26 @@ -@@ -974,6 +974,7 @@ struct bnxt { +@@ -867,6 +867,7 @@ struct bnxt { @@ -34 +35 @@ -index 441e3aef51..9260bcb4cd 100644 +index 098f84fbae..ad756337da 100644 @@ -37 +38 @@ -@@ -901,6 +901,8 @@ static int __bnxt_hwrm_func_qcaps(struct bnxt *bp) +@@ -907,7 +907,8 @@ static int __bnxt_hwrm_func_qcaps(struct bnxt *bp) @@ -40,0 +42 @@ +- @@ -43,3 +45,3 @@ - memcpy(bp->dsn, resp->device_serial_number, sizeof(bp->dsn)); - - if (BNXT_PF(bp)) + if (BNXT_PF(bp)) { + bp->pf->total_vnics = rte_le_to_cpu_16(resp->max_vnics); + if (flags & HWRM_FUNC_QCAPS_OUTPUT_FLAGS_PTP_SUPPORTED) {