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

Merge branch 'mlx5-misc-fixes-2025-03-18' 

Tariq Toukan says:

====================
mlx5 misc fixes 2025-03-18

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

Link: https://patch.msgid.link/1742331077-102038-1-git-send-email-tariqt@nvidia.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents d7a550d6 1726ad03

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

+4 −0
Original line number Diff line number Diff line
@@ -1052,6 +1052,10 @@ static void mlx5_do_bond(struct mlx5_lag *ldev) 
		if (err) {

			if (shared_fdb || roce_lag)

				mlx5_lag_add_devices(ldev);

			if (shared_fdb) {

				mlx5_ldev_for_each(i, 0, ldev)

					mlx5_eswitch_reload_ib_reps(ldev->pf[i].dev->priv.eswitch);

			}



			return;

		} else if (roce_lag) {

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

+7 −8
Original line number Diff line number Diff line
@@ -1205,24 +1205,24 @@ static int mlx5_function_enable(struct mlx5_core_dev *dev, bool boot, u64 timeou 
	dev->caps.embedded_cpu = mlx5_read_embedded_cpu(dev);

	mlx5_cmd_set_state(dev, MLX5_CMDIF_STATE_UP);



	mlx5_start_health_poll(dev);



	err = mlx5_core_enable_hca(dev, 0);

	if (err) {

		mlx5_core_err(dev, "enable hca failed\n");

		goto stop_health_poll;

		goto err_cmd_cleanup;

	}



	mlx5_start_health_poll(dev);



	err = mlx5_core_set_issi(dev);

	if (err) {

		mlx5_core_err(dev, "failed to set issi\n");

		goto err_disable_hca;

		goto stop_health_poll;

	}



	err = mlx5_satisfy_startup_pages(dev, 1);

	if (err) {

		mlx5_core_err(dev, "failed to allocate boot pages\n");

		goto err_disable_hca;

		goto stop_health_poll;

	}



	err = mlx5_tout_query_dtor(dev);
@@ -1235,10 +1235,9 @@ static int mlx5_function_enable(struct mlx5_core_dev *dev, bool boot, u64 timeou 


reclaim_boot_pages:

	mlx5_reclaim_startup_pages(dev);

err_disable_hca:

	mlx5_core_disable_hca(dev, 0);

stop_health_poll:

	mlx5_stop_health_poll(dev, boot);

	mlx5_core_disable_hca(dev, 0);

err_cmd_cleanup:

	mlx5_cmd_set_state(dev, MLX5_CMDIF_STATE_DOWN);

	mlx5_cmd_disable(dev);
@@ -1249,8 +1248,8 @@ static int mlx5_function_enable(struct mlx5_core_dev *dev, bool boot, u64 timeou 
static void mlx5_function_disable(struct mlx5_core_dev *dev, bool boot)

{

	mlx5_reclaim_startup_pages(dev);

	mlx5_core_disable_hca(dev, 0);

	mlx5_stop_health_poll(dev, boot);

	mlx5_core_disable_hca(dev, 0);

	mlx5_cmd_set_state(dev, MLX5_CMDIF_STATE_DOWN);

	mlx5_cmd_disable(dev);

}