[rdma-rc] RDMA/mlx5: Fix port number for counter query in multi-port configuration

Commit Message

Leon Romanovsky April 3, 2024, 9:03 a.m. UTC

From: Michael Guralnik <[e-mail]>

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: Michael Guralnik <[e-mail]>
Signed-off-by: Leon Romanovsky <[e-mail]>
---
 drivers/infiniband/hw/mlx5/mad.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Leon Romanovsky April 8, 2024, 10:33 a.m. UTC | #1

On Wed, 03 Apr 2024 12:03:46 +0300, Leon Romanovsky wrote:
> 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.
> 
> 

Applied, thanks!

[1/1] RDMA/mlx5: Fix port number for counter query in multi-port configuration
      https://git.kernel.org/rdma/rdma/c/be121ffb384f53

Best regards,

Patch

diff --git a/drivers/infiniband/hw/mlx5/mad.c b/drivers/infiniband/hw/mlx5/mad.c
index 0c3c4e64812c..3e43687a7f6f 100644
--- a/drivers/infiniband/hw/mlx5/mad.c
+++ b/drivers/infiniband/hw/mlx5/mad.c
@@ -188,7 +188,8 @@  static int process_pma_cmd(struct mlx5_ib_dev *dev, u32 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;