netdev - [PATCH net-next 5/6] bnxt_en: add .get_module_eeprom_by

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Tue, 27 Sep 2022 20:58:43 -0400
From:   Michael Chan <michael.chan@...adcom.com>
To:     davem@...emloft.net
Cc:     netdev@...r.kernel.org, kuba@...nel.org, edumazet@...gle.com,
        pabeni@...hat.com, gospo@...adcom.com, vikas.gupta@...adcom.com
Subject: [PATCH net-next 5/6] bnxt_en: add .get_module_eeprom_by_page() support

From: Vikas Gupta <vikas.gupta@...adcom.com>

Add support for .get_module_eeprom_by_page() callback
which enables CMIS for pluggable modules.
In the case that bank select is not enabled by f/w then
all the requests fallback to .get_module_eeprom() callback.

Reviewed-by: Pavan Chebbi <pavan.chebbi@...adcom.com>
Signed-off-by: Vikas Gupta <vikas.gupta@...adcom.com>
Signed-off-by: Michael Chan <michael.chan@...adcom.com>
---
 drivers/net/ethernet/broadcom/bnxt/bnxt.h     |  9 +++
 .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 55 +++++++++++++++++++
 2 files changed, 64 insertions(+)

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
index 0209f7caf490..03b1a0301a46 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
@@ -2207,6 +2207,15 @@ struct bnxt {
 #define SFF_MODULE_ID_QSFP			0xc
 #define SFF_MODULE_ID_QSFP_PLUS			0xd
 #define SFF_MODULE_ID_QSFP28			0x11
+#define SFF_MODULE_ID_QSFP_DD			0x18
+#define SFF_MODULE_ID_DSFP			0x1b
+#define SFF_MODULE_ID_QSFP_PLUS_CMIS		0x1e
+
+#define BNXT_SFF_MODULE_BANK_SUPPORTED(module_id)	\
+	((module_id) == SFF_MODULE_ID_QSFP_DD ||	\
+	 (module_id) == SFF_MODULE_ID_QSFP28 ||		\
+	 (module_id) == SFF_MODULE_ID_QSFP_PLUS_CMIS)
+
 #define SFF8636_FLATMEM_OFFSET			0x2
 #define SFF8636_FLATMEM_MASK			0x4
 #define SFF8636_OPT_PAGES_OFFSET		0xc3
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
index 379afa670494..2b18af95aacb 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
@@ -3363,6 +3363,60 @@ static int bnxt_get_module_eeprom(struct net_device *dev,
 	return 0;
 }
 
+static int bnxt_get_module_eeprom_by_page(struct net_device *dev,
+					  const struct ethtool_module_eeprom *page_data,
+					  struct netlink_ext_ack *extack)
+{
+	struct bnxt *bp = netdev_priv(dev);
+	u16 length = page_data->length;
+	u8 *data = page_data->data;
+	u8 page = page_data->page;
+	u8 bank = page_data->bank;
+	u16 bytes_copied = 0;
+	u8 module_id;
+	int rc;
+
+	/* Return -EOPNOTSUPP to fallback on .get_module_eeprom */
+	if (!(bp->phy_flags & BNXT_PHY_FL_BANK_SEL))
+		return -EOPNOTSUPP;
+
+	rc = bnxt_module_status_check(bp);
+	if (rc)
+		return rc;
+
+	rc = bnxt_read_sfp_module_eeprom_info(bp, I2C_DEV_ADDR_A0, 0, 0, false,
+					      0, 1, &module_id);
+	if (rc)
+		return rc;
+
+	if (!BNXT_SFF_MODULE_BANK_SUPPORTED(module_id))
+		return -EOPNOTSUPP;
+
+	while (length > 0) {
+		u16 chunk = ETH_MODULE_EEPROM_PAGE_LEN;
+		int rc;
+
+		/* Do not access more than required */
+		if (length < ETH_MODULE_EEPROM_PAGE_LEN)
+			chunk = length;
+
+		rc = bnxt_read_sfp_module_eeprom_info(bp,
+						      I2C_DEV_ADDR_A0,
+						      page, bank,
+						      true, page_data->offset,
+						      chunk, data);
+		if (rc)
+			return rc;
+
+		data += chunk;
+		length -= chunk;
+		bytes_copied += chunk;
+		page++;
+	}
+
+	return bytes_copied;
+}
+
 static int bnxt_nway_reset(struct net_device *dev)
 {
 	int rc = 0;
@@ -4172,6 +4226,7 @@ const struct ethtool_ops bnxt_ethtool_ops = {
 	.set_eee		= bnxt_set_eee,
 	.get_module_info	= bnxt_get_module_info,
 	.get_module_eeprom	= bnxt_get_module_eeprom,
+	.get_module_eeprom_by_page = bnxt_get_module_eeprom_by_page,
 	.nway_reset		= bnxt_nway_reset,
 	.set_phys_id		= bnxt_set_phys_id,
 	.self_test		= bnxt_self_test,
-- 
2.18.1


Download attachment "smime.p7s" of type "application/pkcs7-signature" (4209 bytes)