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

Merge branch 'mlx5-misc-fixes-2025-02-25' 

Tariq Toukan says:

====================
mlx5 misc fixes 2025-02-25

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

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 2d253726 2f5a6014

drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c

+7 −1
Original line number Diff line number Diff line
@@ -564,6 +564,9 @@ static int esw_qos_vport_enable(struct mlx5_vport *vport, struct mlx5_esw_sched_ 
		return err;



	esw_qos_normalize_min_rate(parent->esw, parent, extack);

	trace_mlx5_esw_vport_qos_create(vport->dev, vport,

					vport->qos.sched_node->max_rate,

					vport->qos.sched_node->bw_share);



	return 0;

}
@@ -591,8 +594,11 @@ static int mlx5_esw_qos_vport_enable(struct mlx5_vport *vport, enum sched_node_t 
	sched_node->vport = vport;

	vport->qos.sched_node = sched_node;

	err = esw_qos_vport_enable(vport, parent, extack);

	if (err)

	if (err) {

		__esw_qos_free_node(sched_node);

		esw_qos_put(esw);

		vport->qos.sched_node = NULL;

	}



	return err;

}

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

+1 −1
Original line number Diff line number Diff line
@@ -572,7 +572,7 @@ irq_pool_alloc(struct mlx5_core_dev *dev, int start, int size, char *name, 
	pool->min_threshold = min_threshold * MLX5_EQ_REFS_PER_IRQ;

	pool->max_threshold = max_threshold * MLX5_EQ_REFS_PER_IRQ;

	mlx5_core_dbg(dev, "pool->name = %s, pool->size = %d, pool->start = %d",

		      name, size, start);

		      name ? name : "mlx5_pcif_pool", size, start);

	return pool;

}