Commit e1af35d6 authored by Paolo Abeni's avatar Paolo Abeni
Browse files

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

Tariq Toukan says:

====================
mlx5 misc fixes 2025-03-10

This patchset provides misc bug fixes from the team to the mlx5 core and
Eth drivers.
====================

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


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents 1063ae07 e92df790

drivers/net/ethernet/mellanox/mlx5/core/en/rep/bridge.c

+5 −7
Original line number Diff line number Diff line
@@ -48,15 +48,10 @@ mlx5_esw_bridge_lag_rep_get(struct net_device *dev, struct mlx5_eswitch *esw) 
	struct list_head *iter;



	netdev_for_each_lower_dev(dev, lower, iter) {

		struct mlx5_core_dev *mdev;

		struct mlx5e_priv *priv;



		if (!mlx5e_eswitch_rep(lower))

			continue;



		priv = netdev_priv(lower);

		mdev = priv->mdev;

		if (mlx5_lag_is_shared_fdb(mdev) && mlx5_esw_bridge_dev_same_esw(lower, esw))

		if (mlx5_esw_bridge_dev_same_esw(lower, esw))

			return lower;

	}
@@ -125,7 +120,7 @@ static bool mlx5_esw_bridge_is_local(struct net_device *dev, struct net_device * 
	priv = netdev_priv(rep);

	mdev = priv->mdev;

	if (netif_is_lag_master(dev))

		return mlx5_lag_is_shared_fdb(mdev) && mlx5_lag_is_master(mdev);

		return mlx5_lag_is_master(mdev);

	return true;

}
@@ -455,6 +450,9 @@ static int mlx5_esw_bridge_switchdev_event(struct notifier_block *nb, 
	if (!rep)

		return NOTIFY_DONE;



	if (netif_is_lag_master(dev) && !mlx5_lag_is_shared_fdb(esw->dev))

		return NOTIFY_DONE;



	switch (event) {

	case SWITCHDEV_FDB_ADD_TO_BRIDGE:

		fdb_info = container_of(info,

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

+2 −4
Original line number Diff line number Diff line
@@ -5132,11 +5132,9 @@ static int mlx5e_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq, 
	struct mlx5e_priv *priv = netdev_priv(dev);

	struct mlx5_core_dev *mdev = priv->mdev;

	u8 mode, setting;

	int err;



	err = mlx5_eswitch_get_vepa(mdev->priv.eswitch, &setting);

	if (err)

		return err;

	if (mlx5_eswitch_get_vepa(mdev->priv.eswitch, &setting))

		return -EOPNOTSUPP;

	mode = setting ? BRIDGE_MODE_VEPA : BRIDGE_MODE_VEB;

	return ndo_dflt_bridge_getlink(skb, pid, seq, dev,

				       mode,

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

+1 −1
Original line number Diff line number Diff line
@@ -871,8 +871,8 @@ static void comp_irq_release_sf(struct mlx5_core_dev *dev, u16 vecidx) 


static int comp_irq_request_sf(struct mlx5_core_dev *dev, u16 vecidx)

{

	struct mlx5_irq_pool *pool = mlx5_irq_table_get_comp_irq_pool(dev);

	struct mlx5_eq_table *table = dev->priv.eq_table;

	struct mlx5_irq_pool *pool = mlx5_irq_pool_get(dev);

	struct irq_affinity_desc af_desc = {};

	struct mlx5_irq *irq;

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

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ mlx5_irq_affinity_request(struct mlx5_core_dev *dev, struct mlx5_irq_pool *pool, 


void mlx5_irq_affinity_irq_release(struct mlx5_core_dev *dev, struct mlx5_irq *irq)

{

	struct mlx5_irq_pool *pool = mlx5_irq_pool_get(dev);

	struct mlx5_irq_pool *pool = mlx5_irq_get_pool(irq);

	int cpu;



	cpu = cpumask_first(mlx5_irq_get_affinity_mask(irq));

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

+2 −2
Original line number Diff line number Diff line
@@ -951,7 +951,7 @@ void mlx5_disable_lag(struct mlx5_lag *ldev) 
				mlx5_eswitch_reload_ib_reps(ldev->pf[i].dev->priv.eswitch);

}



static bool mlx5_shared_fdb_supported(struct mlx5_lag *ldev)

bool mlx5_lag_shared_fdb_supported(struct mlx5_lag *ldev)

{

	int idx = mlx5_lag_get_dev_index_by_seq(ldev, MLX5_LAG_P1);

	struct mlx5_core_dev *dev;
@@ -1038,7 +1038,7 @@ static void mlx5_do_bond(struct mlx5_lag *ldev) 
	}



	if (do_bond && !__mlx5_lag_is_active(ldev)) {

		bool shared_fdb = mlx5_shared_fdb_supported(ldev);

		bool shared_fdb = mlx5_lag_shared_fdb_supported(ldev);



		roce_lag = mlx5_lag_is_roce_lag(ldev);