Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9bbd7efb authored by Vadim Pasternak's avatar Vadim Pasternak Committed by David S. Miller
Browse files

mlxsw: i2c: Extend initialization with querying firmware info 



Extend initialization flow with query request for firmware info in
order to obtain firmware version info.
This info is to be provided to minimal driver to support ethtool
get_drvinfo() interface.

Signed-off-by: default avatarVadim Pasternak <vadimp@mellanox.com>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 18a49727

drivers/net/ethernet/mellanox/mlxsw/i2c.c

+12 −0
Original line number Diff line number Diff line
@@ -509,8 +509,20 @@ mlxsw_i2c_init(void *bus_priv, struct mlxsw_core *mlxsw_core, 
	if (!mbox)

		return -ENOMEM;



	err = mlxsw_cmd_query_fw(mlxsw_core, mbox);

	if (err)

		goto mbox_put;



	mlxsw_i2c->bus_info.fw_rev.major =

		mlxsw_cmd_mbox_query_fw_fw_rev_major_get(mbox);

	mlxsw_i2c->bus_info.fw_rev.minor =

		mlxsw_cmd_mbox_query_fw_fw_rev_minor_get(mbox);

	mlxsw_i2c->bus_info.fw_rev.subminor =

		mlxsw_cmd_mbox_query_fw_fw_rev_subminor_get(mbox);



	err = mlxsw_core_resources_query(mlxsw_core, mbox, res);



mbox_put:

	mlxsw_cmd_mbox_free(mbox);

	return err;

}

drivers/net/ethernet/mellanox/mlxsw/minimal.c

+18 −0
Original line number Diff line number Diff line
@@ -67,6 +67,23 @@ static const struct net_device_ops mlxsw_m_port_netdev_ops = { 
	.ndo_get_devlink_port	= mlxsw_m_port_get_devlink_port,

};



static void mlxsw_m_module_get_drvinfo(struct net_device *dev,

				       struct ethtool_drvinfo *drvinfo)

{

	struct mlxsw_m_port *mlxsw_m_port = netdev_priv(dev);

	struct mlxsw_m *mlxsw_m = mlxsw_m_port->mlxsw_m;



	strlcpy(drvinfo->driver, mlxsw_m->bus_info->device_kind,

		sizeof(drvinfo->driver));

	snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version),

		 "%d.%d.%d",

		 mlxsw_m->bus_info->fw_rev.major,

		 mlxsw_m->bus_info->fw_rev.minor,

		 mlxsw_m->bus_info->fw_rev.subminor);

	strlcpy(drvinfo->bus_info, mlxsw_m->bus_info->device_name,

		sizeof(drvinfo->bus_info));

}



static int mlxsw_m_get_module_info(struct net_device *netdev,

				   struct ethtool_modinfo *modinfo)

{
@@ -88,6 +105,7 @@ mlxsw_m_get_module_eeprom(struct net_device *netdev, struct ethtool_eeprom *ee, 
}



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,

};