Commit 885b8cfb authored by Aya Levin's avatar Aya Levin Committed by Saeed Mahameed
Browse files

net/mlx5e: Update ethtool setting of CQE compression 



Remove restriction blocking configuration of CQE compression when PTP rx
filter is set. Instead turn on indication for RX PTP, and try to reopen
the channels.

Signed-off-by: default avatarAya Levin <ayal@nvidia.com>
Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 960fbfe2

drivers/net/ethernet/mellanox/mlx5/core/en.h

+1 −0
Original line number Diff line number Diff line
@@ -1023,6 +1023,7 @@ int mlx5e_num_channels_changed(struct mlx5e_priv *priv); 
int mlx5e_num_channels_changed_ctx(struct mlx5e_priv *priv, void *context);

void mlx5e_activate_priv_channels(struct mlx5e_priv *priv);

void mlx5e_deactivate_priv_channels(struct mlx5e_priv *priv);

int mlx5e_ptp_rx_manage_fs_ctx(struct mlx5e_priv *priv, void *ctx);



void mlx5e_build_default_indir_rqt(u32 *indirection_rqt, int len,

				   int num_channels);

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

+8 −6
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include "en/port.h"

#include "en/params.h"

#include "en/xsk/pool.h"

#include "en/ptp.h"

#include "lib/clock.h"



void mlx5e_ethtool_get_drvinfo(struct mlx5e_priv *priv,
@@ -1865,13 +1866,19 @@ int mlx5e_modify_rx_cqe_compression_locked(struct mlx5e_priv *priv, bool new_val 


	new_channels.params = priv->channels.params;

	MLX5E_SET_PFLAG(&new_channels.params, MLX5E_PFLAG_RX_CQE_COMPRESS, new_val);

	if (priv->tstamp.rx_filter != HWTSTAMP_FILTER_NONE)

		new_channels.params.ptp_rx = new_val;



	if (!test_bit(MLX5E_STATE_OPENED, &priv->state)) {

		priv->channels.params = new_channels.params;

		return 0;

	}



	if (new_channels.params.ptp_rx == priv->channels.params.ptp_rx)

		err = mlx5e_safe_switch_channels(priv, &new_channels, NULL, NULL);

	else

		err = mlx5e_safe_switch_channels(priv, &new_channels, mlx5e_ptp_rx_manage_fs_ctx,

						 &new_channels.params.ptp_rx);

	if (err)

		return err;
@@ -1892,11 +1899,6 @@ static int set_pflag_rx_cqe_compress(struct net_device *netdev, 
	if (!MLX5_CAP_GEN(mdev, cqe_compression))

		return -EOPNOTSUPP;



	if (enable && priv->tstamp.rx_filter != HWTSTAMP_FILTER_NONE) {

		netdev_err(netdev, "Can't enable cqe compression while timestamping is enabled.\n");

		return -EINVAL;

	}



	err = mlx5e_modify_rx_cqe_compression_locked(priv, enable);

	if (err)

		return err;

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

+1 −1
Original line number Diff line number Diff line
@@ -3970,7 +3970,7 @@ static int mlx5e_change_nic_mtu(struct net_device *netdev, int new_mtu) 
	return mlx5e_change_mtu(netdev, new_mtu, mlx5e_set_dev_port_mtu_ctx);

}



static int mlx5e_ptp_rx_manage_fs_ctx(struct mlx5e_priv *priv, void *ctx)

int mlx5e_ptp_rx_manage_fs_ctx(struct mlx5e_priv *priv, void *ctx)

{

	bool set  = *(bool *)ctx;