Commit 4d995c1b authored by Saeed Mahameed's avatar Saeed Mahameed
Browse files

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



FW is not ready, fix was sent too soon.
This reverts commit f05ec8d9.

Fixes: f05ec8d9 ("net/mlx5e: Allow relaxed ordering over VFs")
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent ed872f92

drivers/net/ethernet/mellanox/mlx5/core/en/params.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

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

+3 −2
Original line number Diff line number Diff line
@@ -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,