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 B080945DB9 for ; Wed, 27 Nov 2024 18:23:01 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id ABC8D4066E; Wed, 27 Nov 2024 18:23:01 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 15D164066E for ; Wed, 27 Nov 2024 18:23:01 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732728180; 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=7rNmvDezTLwttq7AH1LX3CILXQWy146Mj34Hj3Miv+0=; b=S4oyspzBZoxQhwtdCwqFBSPtp6ABqwKDj5wHcpyUSVXXPEEREqu7/j2GvonkFCtU+lHwt4 FKhBtYS63OOSFPoEJCEKq55nssmL4cKMg9AtupHMnjkKkgRLKhI3t5C8H8JtRXNILJ8WbO Sw/6s0/YIgUcMO2FokOLpAI7xE5rDuc= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-60-7F8wHsBwP4W1NdMmrPSgTw-1; Wed, 27 Nov 2024 12:22:57 -0500 X-MC-Unique: 7F8wHsBwP4W1NdMmrPSgTw-1 X-Mimecast-MFC-AGG-ID: 7F8wHsBwP4W1NdMmrPSgTw Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.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 mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DA80619560B5; Wed, 27 Nov 2024 17:22:55 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.52]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6123F300019E; Wed, 27 Nov 2024 17:22:54 +0000 (UTC) From: Kevin Traynor To: Peter Morrow Cc: Ajit Khaparde , dpdk stable Subject: patch 'net/bnxt: fix reading SFF-8436 SFP EEPROMs' has been queued to stable release 21.11.9 Date: Wed, 27 Nov 2024 17:18:45 +0000 Message-ID: <20241127171916.690404-98-ktraynor@redhat.com> In-Reply-To: <20241127171916.690404-1-ktraynor@redhat.com> References: <20241127171916.690404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 1keiFTADEdV6K9vP7Kcw56zUigpDEeAkErtX-zUsXpY_1732728176 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.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/02/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/477074d478d0ae8064a496f6efbdb9d7a9211267 Thanks. Kevin --- >From 477074d478d0ae8064a496f6efbdb9d7a9211267 Mon Sep 17 00:00:00 2001 From: Peter Morrow Date: Mon, 12 Aug 2024 11:34:05 +0100 Subject: [PATCH] net/bnxt: fix reading SFF-8436 SFP EEPROMs [ upstream commit 7b8400464f14637ed2669dbf732c256bf2447de6 ] If a SFP which supports SFF-8436 is present then currently the DDM information present in the eeprom is not read. Furthermore bnxt_get_module_eeprom() will return -EINVAL for these eeproms since the length of these eeproms is 512 bytes but we are only ever selecting 2 pages (256 bytes) to read. Fixes: 6253a23491a4 ("net/bnxt: dump SFP module info") Signed-off-by: Peter Morrow Reviewed-by: Ajit Khaparde --- .mailmap | 1 + drivers/net/bnxt/bnxt_ethdev.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index 5e0de73ae0..0317d15bc4 100644 --- a/.mailmap +++ b/.mailmap @@ -1077,4 +1077,5 @@ Peng Zhang Pengzhen Liu Peter Mccarthy +Peter Morrow Peter Spreadborough Petr Houska diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 63ef5593b0..347080df6c 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -3959,5 +3959,4 @@ static int bnxt_get_module_eeprom(struct rte_eth_dev *dev, switch (module_info[0]) { case SFF_MODULE_ID_SFP: - module_info[SFF_DIAG_SUPPORT_OFFSET] = 0; if (module_info[SFF_DIAG_SUPPORT_OFFSET]) { pg_addr[2] = I2C_DEV_ADDR_A2; -- 2.47.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-27 17:17:41.340314995 +0000 +++ 0098-net-bnxt-fix-reading-SFF-8436-SFP-EEPROMs.patch 2024-11-27 17:17:38.310269814 +0000 @@ -1 +1 @@ -From 7b8400464f14637ed2669dbf732c256bf2447de6 Mon Sep 17 00:00:00 2001 +From 477074d478d0ae8064a496f6efbdb9d7a9211267 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7b8400464f14637ed2669dbf732c256bf2447de6 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index f293f89167..5a8ec89d47 100644 +index 5e0de73ae0..0317d15bc4 100644 @@ -27 +28 @@ -@@ -1180,4 +1180,5 @@ Peng Zhang +@@ -1077,4 +1077,5 @@ Peng Zhang @@ -31 +31,0 @@ - Peter Nilsson @@ -32,0 +33 @@ + Petr Houska @@ -34 +35 @@ -index 2f5c055086..5edb162430 100644 +index 63ef5593b0..347080df6c 100644 @@ -37 +38 @@ -@@ -4223,5 +4223,4 @@ static int bnxt_get_module_eeprom(struct rte_eth_dev *dev, +@@ -3959,5 +3959,4 @@ static int bnxt_get_module_eeprom(struct rte_eth_dev *dev,