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 E5D3645D5D for ; Thu, 21 Nov 2024 00:42:25 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DB33040296; Thu, 21 Nov 2024 00:42:25 +0100 (CET) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mails.dpdk.org (Postfix) with ESMTP id 85C1A40296 for ; Thu, 21 Nov 2024 00:42:24 +0100 (CET) Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-43168d9c6c9so2138645e9.3 for ; Wed, 20 Nov 2024 15:42:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1732146144; x=1732750944; 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=WVd7RhIhS23pohDJTZ+fbIxh3WWI4PhexMvfcjjl6B4=; b=jiK4bI5ZlRntT2FUFWaXe0DkjqrwDyyIwqNs5gnlFCVDr1KwpARaVdyud+BXonGeVH ymTSIp4c1jQgdtW1eTQOW8CUAcOW/dtbbOiquGelkG+VQBOxlh7QbV7FP3SolT/VLxNN 7qv/dTcqb0J/vH1KZs0gAr1xEyknbjL2O5cWBg3Q8ZZdegVx7vRgzHRNUucd7QrvjtNt YeZWacQ/yqXNUqwxdaIeEo2MEvnLMj0G4wI1+YqtwVe/6XcE5G82oo1ICYZ+Ex6EJCqd ijqYdN9P3eNsvEHT/k9y28P7dF8sG2Iwk2dqqG9Dwot+GoJ3+mmVEgQQLPVmt6sk/8KL 8IXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732146144; x=1732750944; 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=WVd7RhIhS23pohDJTZ+fbIxh3WWI4PhexMvfcjjl6B4=; b=eMjp+uBA3tSKoA1bYRsKIt6AriEdPUAt3ZqMTu79UM+VhgCfJiPEMADVc/sT7WrvIB G0UonP30hwop2HFkGtYHwOW6vP/EbDK9Zj3AKuJ45Xo/juASFCytAtWoxCQ+THp76yIz QSI1xRkP02i8J4GToIgA9oo5m/7GGDspnseFGOwP1DBvVHK+9UKVciy96OWvDCEm/B9X Pf9BoHgbIgFtcRS/ahGjITW5Hw1oRVA7JcDptwSb7v6lXH/5BuO+u3u8Z2LpIj2bpl5D 2Io37IINbb6d0CCFhwLZxhDbYY5z6z8mLUy+0/osgIAdH+DGnxFnEPecs5vZNl4+7OF3 sjww== X-Forwarded-Encrypted: i=1; AJvYcCXwayIPaTOoyUgtG1LibRdpw/9tiGNpLC2cQq7stjVFz8hAYGAR67L6aPMTqgJrXWhUIvaZAWQ=@dpdk.org X-Gm-Message-State: AOJu0YwvI/Xu5WhVgoSwZZH5eRZiWdOXYMtDFxWFhWR58AcrfYYgn2Ey EerbalB30Kf0bVFrBwVNByyGF6RhjY1P3izhgeLSwBPjQCrO4ofQYC8//D6O X-Gm-Gg: ASbGncvqTqkAQwWg8GIMPkC5JcP8gxDSmT4QARHpwadJIJcWvi1CJJY0n/ITnfz666s D9xN0vjnug34ob+eKpV2X9xwMVivDiAEI4ASDKWORyakVvLSonXtWPJHO/9sPn96G8w4rmFFYmo NwKqJnEBOJOVZQCMTPH6ZX4tvjV2GJ5gkOhpZLiWHFZ072AlJc8UFDaumI0c3PKfUlRNN2knFS+ wH5sMRAiAL+WhY8QgpOkNcQmktWRobP6VQ3HUB5zO1Yt8DTszemvQBO X-Google-Smtp-Source: AGHT+IHE+DFWuOHi5BDF1Z+O5daS9Ih/LdxUDTdzKJW1t2vtRwKNW7gnGhjXzfFU0gmPsdV9/u1dmw== X-Received: by 2002:a05:600c:524b:b0:42c:cd88:d0f4 with SMTP id 5b1f17b1804b1-4334f016edbmr36321965e9.22.1732146144081; Wed, 20 Nov 2024 15:42:24 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:21cd:def0:a01d:d2aa]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43366cbcdd8sm35276445e9.1.2024.11.20.15.42.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Nov 2024 15:42:23 -0800 (PST) From: luca.boccassi@gmail.com To: Peter Morrow Cc: Ajit Khaparde , dpdk stable Subject: patch 'net/bnxt: fix reading SFF-8436 SFP EEPROMs' has been queued to stable release 22.11.7 Date: Wed, 20 Nov 2024 23:41:28 +0000 Message-ID: <20241120234215.233355-3-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241120234215.233355-1-luca.boccassi@gmail.com> References: <20241112220754.666489-40-luca.boccassi@gmail.com> <20241120234215.233355-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.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 11/22/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/881d93b7093baa2bd22489799a4dc106a7ff82de Thanks. Luca Boccassi --- >From 881d93b7093baa2bd22489799a4dc106a7ff82de 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 8ed3b479e1..bef76e5fd9 100644 --- a/.mailmap +++ b/.mailmap @@ -1078,6 +1078,7 @@ Peng Yu Peng Zhang Pengzhen Liu Peter Mccarthy +Peter Morrow Peter Spreadborough Petr Houska Phanendra Vukkisala diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index cb52ef2f84..e44fa4405c 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -3959,7 +3959,6 @@ 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; pg_addr[3] = I2C_DEV_ADDR_A2; -- 2.45.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-20 23:41:22.862691175 +0000 +++ 0003-net-bnxt-fix-reading-SFF-8436-SFP-EEPROMs.patch 2024-11-20 23:41:22.684195466 +0000 @@ -1 +1 @@ -From 7b8400464f14637ed2669dbf732c256bf2447de6 Mon Sep 17 00:00:00 2001 +From 881d93b7093baa2bd22489799a4dc106a7ff82de 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 8ed3b479e1..bef76e5fd9 100644 @@ -27 +28 @@ -@@ -1179,6 +1179,7 @@ Peng Yu +@@ -1078,6 +1078,7 @@ Peng Yu @@ -32 +32,0 @@ - Peter Nilsson @@ -34,0 +35 @@ + Phanendra Vukkisala @@ -36 +37 @@ -index 2f5c055086..5edb162430 100644 +index cb52ef2f84..e44fa4405c 100644 @@ -39 +40 @@ -@@ -4222,7 +4222,6 @@ static int bnxt_get_module_eeprom(struct rte_eth_dev *dev, +@@ -3959,7 +3959,6 @@ static int bnxt_get_module_eeprom(struct rte_eth_dev *dev,