Skip to content

Commit 6194472

Browse files
committed
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: Jakub Kicinski <kuba@kernel.org>
2 parents 2d25372 + 2f5a601 commit 6194472

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,6 +564,9 @@ static int esw_qos_vport_enable(struct mlx5_vport *vport, struct mlx5_esw_sched_
564564
return err;
565565

566566
esw_qos_normalize_min_rate(parent->esw, parent, extack);
567+
trace_mlx5_esw_vport_qos_create(vport->dev, vport,
568+
vport->qos.sched_node->max_rate,
569+
vport->qos.sched_node->bw_share);
567570

568571
return 0;
569572
}
@@ -591,8 +594,11 @@ static int mlx5_esw_qos_vport_enable(struct mlx5_vport *vport, enum sched_node_t
591594
sched_node->vport = vport;
592595
vport->qos.sched_node = sched_node;
593596
err = esw_qos_vport_enable(vport, parent, extack);
594-
if (err)
597+
if (err) {
598+
__esw_qos_free_node(sched_node);
595599
esw_qos_put(esw);
600+
vport->qos.sched_node = NULL;
601+
}
596602

597603
return err;
598604
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,7 @@ irq_pool_alloc(struct mlx5_core_dev *dev, int start, int size, char *name,
572572
pool->min_threshold = min_threshold * MLX5_EQ_REFS_PER_IRQ;
573573
pool->max_threshold = max_threshold * MLX5_EQ_REFS_PER_IRQ;
574574
mlx5_core_dbg(dev, "pool->name = %s, pool->size = %d, pool->start = %d",
575-
name, size, start);
575+
name ? name : "mlx5_pcif_pool", size, start);
576576
return pool;
577577
}
578578

0 commit comments

Comments
 (0)