Revert "net/mlx5e: Allow relaxed ordering over VFs"

Saeed Mahameed · Saeed Mahameed · commit 4d995c1b9d49 · 2022-06-08T11:39:43.000-07:00
FW is not ready, fix was sent too soon. This reverts commit f05ec8d. Fixes: f05ec8d ("net/mlx5e: Allow relaxed ordering over VFs") Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/params.c b/drivers/net/ethernet/mellanox/mlx5/core/en/params.c
@@ -565,7 +565,8 @@ static void mlx5e_build_rx_cq_param(struct mlx5_core_dev *mdev,
 static u8 rq_end_pad_mode(struct mlx5_core_dev *mdev, struct mlx5e_params *params)
 {
 	bool lro_en = params->packet_merge.type == MLX5E_PACKET_MERGE_LRO;
-	bool ro = MLX5_CAP_GEN(mdev, relaxed_ordering_write);
+	bool ro = pcie_relaxed_ordering_enabled(mdev->pdev) &&
+		MLX5_CAP_GEN(mdev, relaxed_ordering_write);
 
 	return ro && lro_en ?
 		MLX5_WQ_END_PAD_MODE_NONE : MLX5_WQ_END_PAD_MODE_ALIGN;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_common.c b/drivers/net/ethernet/mellanox/mlx5/core/en_common.c
@@ -38,11 +38,12 @@
 
 void mlx5e_mkey_set_relaxed_ordering(struct mlx5_core_dev *mdev, void *mkc)
 {
+	bool ro_pci_enable = pcie_relaxed_ordering_enabled(mdev->pdev);
 	bool ro_write = MLX5_CAP_GEN(mdev, relaxed_ordering_write);
 	bool ro_read = MLX5_CAP_GEN(mdev, relaxed_ordering_read);
 
-	MLX5_SET(mkc, mkc, relaxed_ordering_read, ro_read);
-	MLX5_SET(mkc, mkc, relaxed_ordering_write, ro_write);
+	MLX5_SET(mkc, mkc, relaxed_ordering_read, ro_pci_enable && ro_read);
+	MLX5_SET(mkc, mkc, relaxed_ordering_write, ro_pci_enable && ro_write);
 }
 
 static int mlx5e_create_mkey(struct mlx5_core_dev *mdev, u32 pdn,

Original file line number	Diff line number	Diff line change
`@@ -565,7 +565,8 @@ static void mlx5e_build_rx_cq_param(struct mlx5_core_dev *mdev,`
`565`	`565`	`static u8 rq_end_pad_mode(struct mlx5_core_dev mdev, struct mlx5e_params params)`
`566`	`566`	`{`
`567`	`567`	`bool lro_en = params->packet_merge.type == MLX5E_PACKET_MERGE_LRO;`
`568`		`- bool ro = MLX5_CAP_GEN(mdev, relaxed_ordering_write);`
	`568`	`+ bool ro = pcie_relaxed_ordering_enabled(mdev->pdev) &&`
	`569`	`+ MLX5_CAP_GEN(mdev, relaxed_ordering_write);`
`569`	`570`
`570`	`571`	`return ro && lro_en ?`
`571`	`572`	`MLX5_WQ_END_PAD_MODE_NONE : MLX5_WQ_END_PAD_MODE_ALIGN;`
Original file line number	Diff line number	Diff line change
`@@ -38,11 +38,12 @@`
`38`	`38`
`39`	`39`	`void mlx5e_mkey_set_relaxed_ordering(struct mlx5_core_dev mdev, void mkc)`
`40`	`40`	`{`
	`41`	`+ bool ro_pci_enable = pcie_relaxed_ordering_enabled(mdev->pdev);`
`41`	`42`	`bool ro_write = MLX5_CAP_GEN(mdev, relaxed_ordering_write);`
`42`	`43`	`bool ro_read = MLX5_CAP_GEN(mdev, relaxed_ordering_read);`
`43`	`44`
`44`		`- MLX5_SET(mkc, mkc, relaxed_ordering_read, ro_read);`
`45`		`- MLX5_SET(mkc, mkc, relaxed_ordering_write, ro_write);`
	`45`	`+ MLX5_SET(mkc, mkc, relaxed_ordering_read, ro_pci_enable && ro_read);`
	`46`	`+ MLX5_SET(mkc, mkc, relaxed_ordering_write, ro_pci_enable && ro_write);`
`46`	`47`	`}`
`47`	`48`
`48`	`49`	`static int mlx5e_create_mkey(struct mlx5_core_dev *mdev, u32 pdn,`