[mellanox] Extend size of QSFP EEPROM for the cable type SSF8436 and …

…SFF8636. (#110)

Extend size of QSFP EEPROM for the cable type SSF8436, SFF8636
from 256 to 612 bytes in order to make available all the pages

Signed-off-by: Nazarii Hnydyn <nazariig@mellanox.com>

patch/0046-mlxsw-core-Extend-QSFP-EEPROM-supported-size-for-eth.patch

@@ -0,0 +1,168 @@
+From 701662a1dc781e18341974ec6cece31bead06fbd Mon Sep 17 00:00:00 2001
+From: Vadim Pasternak <vadimp@mellanox.com>
+Date: Mon, 12 Aug 2019 07:31:57 +0300
+Subject: [PATCH v1 1/1] mlxsw: core: Extend QSFP EEPROM supported size for
+ ethtool
+
+Extend size of QSFP EEPROM for the cable type SSF8436, SFF8636 from 256
+to 612 bytes in order to make available all the pages.
+
+Signed-off-by: Vadim Pasternak <vadimp@mellanox.com>
+---
+ drivers/net/ethernet/mellanox/mlxsw/core_env.c | 40 ++++++++++++++++++--------
+ drivers/net/ethernet/mellanox/mlxsw/reg.h | 5 ++++
+ include/uapi/linux/ethtool.h | 3 ++
+ 3 files changed, 36 insertions(+), 12 deletions(-)
+
+diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_env.c b/drivers/net/ethernet/mellanox/mlxsw/core_env.c
+index d2c7ce67c300..0a5495f9f4c7 100644
+--- a/drivers/net/ethernet/mellanox/mlxsw/core_env.c
++++ b/drivers/net/ethernet/mellanox/mlxsw/core_env.c
+@@ -44,12 +44,13 @@ static int mlxsw_env_validate_cable_ident(struct mlxsw_core *core, int id,
+
+ static int
+ mlxsw_env_query_module_eeprom(struct mlxsw_core *mlxsw_core, int module,
+- u16 offset, u16 size, void *data,
++ u16 offset, u16 size, bool qsfp, void *data,
+ unsigned int *p_read_size)
+ {
+ char eeprom_tmp[MLXSW_REG_MCIA_EEPROM_SIZE];
+ char mcia_pl[MLXSW_REG_MCIA_LEN];
+ u16 i2c_addr;
++ u8 page = 0;
+ int status;
+ int err;
+
+@@ -62,11 +63,19 @@ mlxsw_env_query_module_eeprom(struct mlxsw_core *mlxsw_core, int module,
+
+ i2c_addr = MLXSW_REG_MCIA_I2C_ADDR_LOW;
+ if (offset >= MLXSW_REG_MCIA_EEPROM_PAGE_LENGTH) {
+- i2c_addr = MLXSW_REG_MCIA_I2C_ADDR_HIGH;
+- offset -= MLXSW_REG_MCIA_EEPROM_PAGE_LENGTH;
++ if (qsfp) {
++ page = MLXSW_REG_MCIA_PAGE_GET(offset);
++ offset -= MLXSW_REG_MCIA_EEPROM_UP_PAGE_LENGTH * page;
++ if (offset + size > MLXSW_REG_MCIA_EEPROM_PAGE_LENGTH)
++ size = MLXSW_REG_MCIA_EEPROM_PAGE_LENGTH -
++ offset;
++ } else {
++ i2c_addr = MLXSW_REG_MCIA_I2C_ADDR_HIGH;
++ offset -= MLXSW_REG_MCIA_EEPROM_PAGE_LENGTH;
++ }
+ }
+
+- mlxsw_reg_mcia_pack(mcia_pl, module, 0, 0, offset, size, i2c_addr);
++ mlxsw_reg_mcia_pack(mcia_pl, module, 0, page, offset, size, i2c_addr);
+
+ err = mlxsw_reg_query(mlxsw_core, MLXSW_REG(mcia), mcia_pl);
+ if (err)
+@@ -152,10 +161,11 @@ int mlxsw_env_get_module_info(struct mlxsw_core *mlxsw_core, int module,
+ u16 offset = MLXSW_REG_MCIA_EEPROM_MODULE_INFO_SIZE;
+ u8 module_rev_id, module_id, diag_mon;
+ unsigned int read_size;
++ bool unused = false;
+ int err;
+
+ err = mlxsw_env_query_module_eeprom(mlxsw_core, module, 0, offset,
+- module_info, &read_size);
++ unused, module_info, &read_size);
+ if (err)
+ return err;
+
+@@ -168,7 +178,7 @@ int mlxsw_env_get_module_info(struct mlxsw_core *mlxsw_core, int module,
+ switch (module_id) {
+ case MLXSW_REG_MCIA_EEPROM_MODULE_INFO_ID_QSFP:
+ modinfo->type = ETH_MODULE_SFF_8436;
+- modinfo->eeprom_len = ETH_MODULE_SFF_8436_LEN;
++ modinfo->eeprom_len = ETH_MODULE_SFF_8436_MAX_LEN;
+ break;
+ case MLXSW_REG_MCIA_EEPROM_MODULE_INFO_ID_QSFP_PLUS: /* fall-through */
+ case MLXSW_REG_MCIA_EEPROM_MODULE_INFO_ID_QSFP28:
+@@ -176,17 +186,17 @@ int mlxsw_env_get_module_info(struct mlxsw_core *mlxsw_core, int module,
+ module_rev_id >=
+ MLXSW_REG_MCIA_EEPROM_MODULE_INFO_REV_ID_8636) {
+ modinfo->type = ETH_MODULE_SFF_8636;
+- modinfo->eeprom_len = ETH_MODULE_SFF_8636_LEN;
++ modinfo->eeprom_len = ETH_MODULE_SFF_8636_MAX_LEN;
+ } else {
+ modinfo->type = ETH_MODULE_SFF_8436;
+- modinfo->eeprom_len = ETH_MODULE_SFF_8436_LEN;
++ modinfo->eeprom_len = ETH_MODULE_SFF_8436_MAX_LEN;
+ }
+ break;
+ case MLXSW_REG_MCIA_EEPROM_MODULE_INFO_ID_SFP:
+ /* Verify if transceiver provides diagnostic monitoring page */
+ err = mlxsw_env_query_module_eeprom(mlxsw_core, module,
+- SFP_DIAGMON, 1, &diag_mon,
+- &read_size);
++ SFP_DIAGMON, 1, unused,
++ &diag_mon, &read_size);
+ if (err)
+ return err;
+
+@@ -213,6 +223,7 @@ int mlxsw_env_get_module_eeprom(struct net_device *netdev,
+ {
+ int offset = ee->offset;
+ unsigned int read_size;
++ bool qsfp;
+ int i = 0;
+ int err;
+
+@@ -221,10 +232,15 @@ int mlxsw_env_get_module_eeprom(struct net_device *netdev,
+
+ memset(data, 0, ee->len);
+
++ /* Validate module identifier type. */
++ err = mlxsw_env_validate_cable_ident(mlxsw_core, module, &qsfp);
++ if (err)
++ return err;
++
+ while (i < ee->len) {
+ err = mlxsw_env_query_module_eeprom(mlxsw_core, module, offset,
+- ee->len - i, data + i,
+- &read_size);
++ ee->len - i, qsfp,
++ data + i, &read_size);
+ if (err) {
+ netdev_err(netdev, "Eeprom query failed\n");
+ return err;
+diff --git a/drivers/net/ethernet/mellanox/mlxsw/reg.h b/drivers/net/ethernet/mellanox/mlxsw/reg.h
+index a8cd53f068ce..8d7a58472799 100644
+--- a/drivers/net/ethernet/mellanox/mlxsw/reg.h
++++ b/drivers/net/ethernet/mellanox/mlxsw/reg.h
+@@ -7823,6 +7823,7 @@ MLXSW_ITEM32(reg, mcia, device_address, 0x04, 0, 16);
+ MLXSW_ITEM32(reg, mcia, size, 0x08, 0, 16);
+
+ #define MLXSW_REG_MCIA_EEPROM_PAGE_LENGTH 256
++#define MLXSW_REG_MCIA_EEPROM_UP_PAGE_LENGTH 128
+ #define MLXSW_REG_MCIA_EEPROM_SIZE 48
+ #define MLXSW_REG_MCIA_I2C_ADDR_LOW 0x50
+ #define MLXSW_REG_MCIA_I2C_ADDR_HIGH 0x51
+@@ -7858,6 +7859,10 @@ enum mlxsw_reg_mcia_eeprom_module_info {
+ */
+ MLXSW_ITEM_BUF(reg, mcia, eeprom, 0x10, MLXSW_REG_MCIA_EEPROM_SIZE);
+
++#define MLXSW_REG_MCIA_PAGE_GET(off) (((off) - \
++ MLXSW_REG_MCIA_EEPROM_PAGE_LENGTH) / \
++ MLXSW_REG_MCIA_EEPROM_UP_PAGE_LENGTH + 1)
++
+ static inline void mlxsw_reg_mcia_pack(char *payload, u8 module, u8 lock,
+ u8 page_number, u16 device_addr,
+ u8 size, u8 i2c_device_addr)
+diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h
+index 8e547231c1b7..b868569344d1 100644
+--- a/include/uapi/linux/ethtool.h
++++ b/include/uapi/linux/ethtool.h
+@@ -1595,6 +1595,9 @@ static inline int ethtool_validate_duplex(__u8 duplex)
+ #define ETH_MODULE_SFF_8436 0x4
+ #define ETH_MODULE_SFF_8436_LEN 256
+
++#define ETH_MODULE_SFF_8636_MAX_LEN 640
++#define ETH_MODULE_SFF_8436_MAX_LEN 640
++
+ /* Reset flags */
+ /* The reset() operation must clear the flags for the components which
+ * were actually reset. On successful return, the flags indicate the
+-- 
+2.11.0
+

patch/series

@@ -81,7 +81,8 @@ linux-4.13-thermal-intel_pch_thermal-Fix-enable-check-on.patch
 0043-mellanox-platform-Backporting-Melanox-drivers-from-v.patch
 0044-mlxsw-minimal-Provide-optimization-for-module-number.patch
 0045-mlxsw-minimal-Add-validation-for-FW-version.patch
-0046-mfd-lpc-ich-extend-with-additional-chipsets-support.patch
+0046-mlxsw-core-Extend-QSFP-EEPROM-supported-size-for-eth.patch
+0047-mfd-lpc-ich-extend-with-additional-chipsets-support.patch
 linux-4.16-firmware-dmi-handle-missing-DMI-data-gracefully.patch
 mellanox-backport-introduce-psample-a-new-genetlink-channel.patch
 mellanox-backport-introduce-tc-sample-action.patch