Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b1930bd authored by Michael Guralnik's avatar Michael Guralnik Committed by Greg Kroah-Hartman
Browse files

RDMA/mlx5: Fix port number for counter query in multi-port configuration 



[ Upstream commit be121ffb384f53e966ee7299ffccc6eeb61bc73d ]

Set the correct port when querying PPCNT in multi-port configuration.
Distinguish between cases where switchdev mode was enabled to multi-port
configuration and don't overwrite the queried port to 1 in multi-port
case.

Fixes: 74b30b3ad5ce ("RDMA/mlx5: Set local port to one when accessing counters")
Signed-off-by: default avatarMichael Guralnik <michaelgur@nvidia.com>
Link: https://lore.kernel.org/r/9bfcc8ade958b760a51408c3ad654a01b11f7d76.1712134988.git.leon@kernel.org


Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 80997511

drivers/infiniband/hw/mlx5/mad.c

+2 −1
Original line number Diff line number Diff line
@@ -219,7 +219,8 @@ static int process_pma_cmd(struct mlx5_ib_dev *dev, u8 port_num, 
		mdev = dev->mdev;

		mdev_port_num = 1;

	}

	if (MLX5_CAP_GEN(dev->mdev, num_ports) == 1) {

	if (MLX5_CAP_GEN(dev->mdev, num_ports) == 1 &&

	    !mlx5_core_mp_enabled(mdev)) {

		/* set local port to one for Function-Per-Port HCA. */

		mdev = dev->mdev;

		mdev_port_num = 1;