mlxsw: core: Add support for module EEPROM read by page

Add support for ethtool_ops::get_module_eeprom_by_page() which allows
user space to read transceiver module EEPROM based on passed parameters.

The I2C address is not validated in order to avoid module-specific code.
In case of wrong address, error will be returned from device's firmware.

Tested by comparing output with legacy method (ioctl) output.

Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Tested-by: Vadim Pasternak <vadimp@nvidia.com>
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_env.c b/drivers/net/ethernet/mellanox/mlxsw/core_env.c
index b3ca5bd..4a0dbdb 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/core_env.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/core_env.c
@@ -3,6 +3,7 @@
 
 #include <linux/kernel.h>
 #include <linux/err.h>
+#include <linux/ethtool.h>
 #include <linux/sfp.h>
 
 #include "core.h"
@@ -315,6 +316,79 @@ int mlxsw_env_get_module_eeprom(struct net_device *netdev,
 }
 EXPORT_SYMBOL(mlxsw_env_get_module_eeprom);
 
+static int mlxsw_env_mcia_status_process(const char *mcia_pl,
+                                        struct netlink_ext_ack *extack)
+{
+       u8 status = mlxsw_reg_mcia_status_get(mcia_pl);
+
+       switch (status) {
+       case MLXSW_REG_MCIA_STATUS_GOOD:
+               return 0;
+       case MLXSW_REG_MCIA_STATUS_NO_EEPROM_MODULE:
+               NL_SET_ERR_MSG_MOD(extack, "No response from module's EEPROM");
+               return -EIO;
+       case MLXSW_REG_MCIA_STATUS_MODULE_NOT_SUPPORTED:
+               NL_SET_ERR_MSG_MOD(extack, "Module type not supported by the device");
+               return -EOPNOTSUPP;
+       case MLXSW_REG_MCIA_STATUS_MODULE_NOT_CONNECTED:
+               NL_SET_ERR_MSG_MOD(extack, "No module present indication");
+               return -EIO;
+       case MLXSW_REG_MCIA_STATUS_I2C_ERROR:
+               NL_SET_ERR_MSG_MOD(extack, "Error occurred while trying to access module's EEPROM using I2C");
+               return -EIO;
+       case MLXSW_REG_MCIA_STATUS_MODULE_DISABLED:
+               NL_SET_ERR_MSG_MOD(extack, "Module is disabled");
+               return -EIO;
+       default:
+               NL_SET_ERR_MSG_MOD(extack, "Unknown error");
+               return -EIO;
+       }
+}
+
+int
+mlxsw_env_get_module_eeprom_by_page(struct mlxsw_core *mlxsw_core, u8 module,
+                                   const struct ethtool_module_eeprom *page,
+                                   struct netlink_ext_ack *extack)
+{
+       u32 bytes_read = 0;
+       u16 device_addr;
+
+       /* Offset cannot be larger than 2 * ETH_MODULE_EEPROM_PAGE_LEN */
+       device_addr = page->offset;
+
+       while (bytes_read < page->length) {
+               char eeprom_tmp[MLXSW_REG_MCIA_EEPROM_SIZE];
+               char mcia_pl[MLXSW_REG_MCIA_LEN];
+               u8 size;
+               int err;
+
+               size = min_t(u8, page->length - bytes_read,
+                            MLXSW_REG_MCIA_EEPROM_SIZE);
+
+               mlxsw_reg_mcia_pack(mcia_pl, module, 0, page->page,
+                                   device_addr + bytes_read, size,
+                                   page->i2c_address);
+               mlxsw_reg_mcia_bank_number_set(mcia_pl, page->bank);
+
+               err = mlxsw_reg_query(mlxsw_core, MLXSW_REG(mcia), mcia_pl);
+               if (err) {
+                       NL_SET_ERR_MSG_MOD(extack, "Failed to access module's EEPROM");
+                       return err;
+               }
+
+               err = mlxsw_env_mcia_status_process(mcia_pl, extack);
+               if (err)
+                       return err;
+
+               mlxsw_reg_mcia_eeprom_memcpy_from(mcia_pl, eeprom_tmp);
+               memcpy(page->data + bytes_read, eeprom_tmp, size);
+               bytes_read += size;
+       }
+
+       return bytes_read;
+}
+EXPORT_SYMBOL(mlxsw_env_get_module_eeprom_by_page);
+
 static int mlxsw_env_module_has_temp_sensor(struct mlxsw_core *mlxsw_core,
                                            u8 module,
                                            bool *p_has_temp_sensor)

diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_env.h b/drivers/net/ethernet/mellanox/mlxsw/core_env.h
index 2b23f8a..0bf5bd0 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/core_env.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/core_env.h
@@ -4,6 +4,8 @@
 #ifndef _MLXSW_CORE_ENV_H
 #define _MLXSW_CORE_ENV_H
 
+#include <linux/ethtool.h>
+
 struct ethtool_modinfo;
 struct ethtool_eeprom;
 
@@ -18,6 +20,11 @@ int mlxsw_env_get_module_eeprom(struct net_device *netdev,
                                struct ethtool_eeprom *ee, u8 *data);
 
 int
+mlxsw_env_get_module_eeprom_by_page(struct mlxsw_core *mlxsw_core, u8 module,
+                                   const struct ethtool_module_eeprom *page,
+                                   struct netlink_ext_ack *extack);
+
+int
 mlxsw_env_module_overheat_counter_get(struct mlxsw_core *mlxsw_core, u8 module,
                                      u64 *p_counter);
 int mlxsw_env_init(struct mlxsw_core *core, struct mlxsw_env **p_env);

diff --git a/drivers/net/ethernet/mellanox/mlxsw/minimal.c b/drivers/net/ethernet/mellanox/mlxsw/minimal.c
index 6810272..d9d56c4 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/minimal.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/minimal.c
@@ -112,10 +112,23 @@ mlxsw_m_get_module_eeprom(struct net_device *netdev, struct ethtool_eeprom *ee,
                                           ee, data);
 }
 
+static int
+mlxsw_m_get_module_eeprom_by_page(struct net_device *netdev,
+                                 const struct ethtool_module_eeprom *page,
+                                 struct netlink_ext_ack *extack)
+{
+       struct mlxsw_m_port *mlxsw_m_port = netdev_priv(netdev);
+       struct mlxsw_core *core = mlxsw_m_port->mlxsw_m->core;
+
+       return mlxsw_env_get_module_eeprom_by_page(core, mlxsw_m_port->module,
+                                                  page, extack);
+}
+
 static const struct ethtool_ops mlxsw_m_port_ethtool_ops = {
        .get_drvinfo            = mlxsw_m_module_get_drvinfo,
        .get_module_info        = mlxsw_m_get_module_info,
        .get_module_eeprom      = mlxsw_m_get_module_eeprom,
+       .get_module_eeprom_by_page = mlxsw_m_get_module_eeprom_by_page,
 };
 
 static int

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_ethtool.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_ethtool.c
index c8061be..267590a 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_ethtool.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_ethtool.c
@@ -1051,6 +1051,19 @@ static int mlxsw_sp_get_module_eeprom(struct net_device *netdev,
 }
 
 static int
+mlxsw_sp_get_module_eeprom_by_page(struct net_device *dev,
+                                  const struct ethtool_module_eeprom *page,
+                                  struct netlink_ext_ack *extack)
+{
+       struct mlxsw_sp_port *mlxsw_sp_port = netdev_priv(dev);
+       struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;
+       u8 module = mlxsw_sp_port->mapping.module;
+
+       return mlxsw_env_get_module_eeprom_by_page(mlxsw_sp->core, module, page,
+                                                  extack);
+}
+
+static int
 mlxsw_sp_get_ts_info(struct net_device *netdev, struct ethtool_ts_info *info)
 {
        struct mlxsw_sp_port *mlxsw_sp_port = netdev_priv(netdev);
@@ -1199,6 +1212,7 @@ const struct ethtool_ops mlxsw_sp_port_ethtool_ops = {
        .set_link_ksettings             = mlxsw_sp_port_set_link_ksettings,
        .get_module_info                = mlxsw_sp_get_module_info,
        .get_module_eeprom              = mlxsw_sp_get_module_eeprom,
+       .get_module_eeprom_by_page      = mlxsw_sp_get_module_eeprom_by_page,
        .get_ts_info                    = mlxsw_sp_get_ts_info,
        .get_eth_phy_stats              = mlxsw_sp_get_eth_phy_stats,
        .get_eth_mac_stats              = mlxsw_sp_get_eth_mac_stats,