Commit a59dc0f8 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'mlx5-misc-fixes-2026-03-30' 

Tariq Toukan says:

====================
mlx5 misc fixes 2026-03-30

This patchset provides misc bug fixes from the team to the mlx5
core driver.
====================

Link: https://patch.msgid.link/20260330194015.53585-1-tariqt@nvidia.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents f0f367a4 40318640

drivers/net/ethernet/mellanox/mlx5/core/devlink.c

+1 −3
Original line number Diff line number Diff line
@@ -107,9 +107,7 @@ mlx5_devlink_info_get(struct devlink *devlink, struct devlink_info_req *req, 
	if (err)

		return err;



	err = mlx5_fw_version_query(dev, &running_fw, &stored_fw);

	if (err)

		return err;

	mlx5_fw_version_query(dev, &running_fw, &stored_fw);



	snprintf(version_str, sizeof(version_str), "%d.%d.%04d",

		 mlx5_fw_ver_major(running_fw), mlx5_fw_ver_minor(running_fw),

drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c

+2 −0
Original line number Diff line number Diff line
@@ -3761,6 +3761,8 @@ int esw_offloads_enable(struct mlx5_eswitch *esw) 
	return 0;



err_vports:

	/* rollback to legacy, indicates don't unregister the uplink netdev */

	esw->dev->priv.flags |= MLX5_PRIV_FLAGS_SWITCH_LEGACY;

	mlx5_esw_offloads_rep_unload(esw, MLX5_VPORT_UPLINK);

err_uplink:

	esw_offloads_steering_cleanup(esw);

drivers/net/ethernet/mellanox/mlx5/core/fw.c

+34 −19
Original line number Diff line number Diff line
@@ -822,7 +822,7 @@ mlx5_fw_image_pending(struct mlx5_core_dev *dev, 
	return 0;

}



int mlx5_fw_version_query(struct mlx5_core_dev *dev,

void mlx5_fw_version_query(struct mlx5_core_dev *dev,

			   u32 *running_ver, u32 *pending_ver)

{

	u32 reg_mcqi_version[MLX5_ST_SZ_DW(mcqi_version)] = {};
@@ -830,40 +830,55 @@ int mlx5_fw_version_query(struct mlx5_core_dev *dev, 
	int component_index;

	int err;



	*running_ver = 0;

	*pending_ver = 0;



	if (!MLX5_CAP_GEN(dev, mcam_reg) || !MLX5_CAP_MCAM_REG(dev, mcqi) ||

	    !MLX5_CAP_MCAM_REG(dev, mcqs)) {

		mlx5_core_warn(dev, "fw query isn't supported by the FW\n");

		return -EOPNOTSUPP;

		return;

	}



	component_index = mlx5_get_boot_img_component_index(dev);

	if (component_index < 0)

		return component_index;

	if (component_index < 0) {

		mlx5_core_warn(dev, "fw query failed to find boot img component index, err %d\n",

			       component_index);

		return;

	}



	*running_ver = U32_MAX; /* indicate failure */

	err = mlx5_reg_mcqi_version_query(dev, component_index,

					  MCQI_FW_RUNNING_VERSION,

					  reg_mcqi_version);

	if (err)

		return err;



	*running_ver = MLX5_GET(mcqi_version, reg_mcqi_version, version);



	if (!err)

		*running_ver = MLX5_GET(mcqi_version, reg_mcqi_version,

					version);

	else

		mlx5_core_warn(dev, "failed to query running version, err %d\n",

			       err);



	*pending_ver = U32_MAX; /* indicate failure */

	err = mlx5_fw_image_pending(dev, component_index, &pending_version_exists);

	if (err)

		return err;

	if (err) {

		mlx5_core_warn(dev, "failed to query pending image, err %d\n",

			       err);

		return;

	}



	if (!pending_version_exists) {

		*pending_ver = 0;

		return 0;

		return;

	}



	err = mlx5_reg_mcqi_version_query(dev, component_index,

					  MCQI_FW_STORED_VERSION,

					  reg_mcqi_version);

	if (err)

		return err;



	*pending_ver = MLX5_GET(mcqi_version, reg_mcqi_version, version);



	return 0;

	if (!err)

		*pending_ver = MLX5_GET(mcqi_version, reg_mcqi_version,

					version);

	else

		mlx5_core_warn(dev, "failed to query pending version, err %d\n",

			       err);



	return;

}

drivers/net/ethernet/mellanox/mlx5/core/lag/debugfs.c

+3 −0
Original line number Diff line number Diff line
@@ -160,8 +160,11 @@ DEFINE_SHOW_ATTRIBUTE(members); 


void mlx5_ldev_add_debugfs(struct mlx5_core_dev *dev)

{

	struct mlx5_lag *ldev = mlx5_lag_dev(dev);

	struct dentry *dbg;



	if (!ldev)

		return;

	dbg = debugfs_create_dir("lag", mlx5_debugfs_get_dev_root(dev));

	dev->priv.dbg.lag_debugfs = dbg;

drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h

+2 −2
Original line number Diff line number Diff line
@@ -393,8 +393,8 @@ int mlx5_port_max_linkspeed(struct mlx5_core_dev *mdev, u32 *speed); 


int mlx5_firmware_flash(struct mlx5_core_dev *dev, const struct firmware *fw,

			struct netlink_ext_ack *extack);

int mlx5_fw_version_query(struct mlx5_core_dev *dev,

			  u32 *running_ver, u32 *stored_ver);

void mlx5_fw_version_query(struct mlx5_core_dev *dev, u32 *running_ver,

			   u32 *stored_ver);



#ifdef CONFIG_MLX5_CORE_EN

int mlx5e_init(void);