Commit 07071e47 authored by Gal Pressman's avatar Gal Pressman Committed by Saeed Mahameed
Browse files

net/mlx5e: Report header-data split state through ethtool 



HW-GRO (SHAMPO) packet merger scheme implies header-data split in the
driver, report it through the ethtool interface.

Signed-off-by: default avatarGal Pressman <gal@nvidia.com>
Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 769e2695

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

+2 −1
Original line number Diff line number Diff line
@@ -1181,7 +1181,8 @@ int mlx5e_ethtool_get_sset_count(struct mlx5e_priv *priv, int sset); 
void mlx5e_ethtool_get_ethtool_stats(struct mlx5e_priv *priv,

				     struct ethtool_stats *stats, u64 *data);

void mlx5e_ethtool_get_ringparam(struct mlx5e_priv *priv,

				 struct ethtool_ringparam *param);

				 struct ethtool_ringparam *param,

				 struct kernel_ethtool_ringparam *kernel_param);

int mlx5e_ethtool_set_ringparam(struct mlx5e_priv *priv,

				struct ethtool_ringparam *param);

void mlx5e_ethtool_get_channels(struct mlx5e_priv *priv,

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

+10 −2
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ 
 * SOFTWARE.

 */



#include <linux/ethtool_netlink.h>



#include "en.h"

#include "en/port.h"

#include "en/params.h"
@@ -305,12 +307,18 @@ static void mlx5e_get_ethtool_stats(struct net_device *dev, 
}



void mlx5e_ethtool_get_ringparam(struct mlx5e_priv *priv,

				 struct ethtool_ringparam *param)

				 struct ethtool_ringparam *param,

				 struct kernel_ethtool_ringparam *kernel_param)

{

	param->rx_max_pending = 1 << MLX5E_PARAMS_MAXIMUM_LOG_RQ_SIZE;

	param->tx_max_pending = 1 << MLX5E_PARAMS_MAXIMUM_LOG_SQ_SIZE;

	param->rx_pending     = 1 << priv->channels.params.log_rq_mtu_frames;

	param->tx_pending     = 1 << priv->channels.params.log_sq_size;



	kernel_param->tcp_data_split =

		(priv->channels.params.packet_merge.type == MLX5E_PACKET_MERGE_SHAMPO) ?

		ETHTOOL_TCP_DATA_SPLIT_ENABLED :

		ETHTOOL_TCP_DATA_SPLIT_DISABLED;

}



static void mlx5e_get_ringparam(struct net_device *dev,
@@ -320,7 +328,7 @@ static void mlx5e_get_ringparam(struct net_device *dev, 
{

	struct mlx5e_priv *priv = netdev_priv(dev);



	mlx5e_ethtool_get_ringparam(priv, param);

	mlx5e_ethtool_get_ringparam(priv, param, kernel_param);

}



int mlx5e_ethtool_set_ringparam(struct mlx5e_priv *priv,

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

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ mlx5e_rep_get_ringparam(struct net_device *dev, 
{

	struct mlx5e_priv *priv = netdev_priv(dev);



	mlx5e_ethtool_get_ringparam(priv, param);

	mlx5e_ethtool_get_ringparam(priv, param, kernel_param);

}



static int

drivers/net/ethernet/mellanox/mlx5/core/ipoib/ethtool.c

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static void mlx5i_get_ringparam(struct net_device *dev, 
{

	struct mlx5e_priv *priv = mlx5i_epriv(dev);



	mlx5e_ethtool_get_ringparam(priv, param);

	mlx5e_ethtool_get_ringparam(priv, param, kernel_param);

}



static int mlx5i_set_channels(struct net_device *dev,