Commit 6c72cb05 authored by Tariq Toukan's avatar Tariq Toukan Committed by Saeed Mahameed
Browse files

net/mlx5e: Use bitmap field for profile features 



Use a features bitmap field in mlx5e_profile to declare profile support
state of the different features.  Let it replace the existing
rx_ptp_support boolean. It will be extended to cover more features in a
downstream patch.

Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 08ab0ff4

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

+8 −1
Original line number Diff line number Diff line
@@ -956,6 +956,10 @@ struct mlx5e_rx_handlers { 


extern const struct mlx5e_rx_handlers mlx5e_rx_handlers_nic;



enum mlx5e_profile_feature {

	MLX5E_PROFILE_FEATURE_PTP_RX,

};



struct mlx5e_profile {

	int	(*init)(struct mlx5_core_dev *mdev,

			struct net_device *netdev);
@@ -974,9 +978,12 @@ struct mlx5e_profile { 
	const struct mlx5e_rx_handlers *rx_handlers;

	int	max_tc;

	u8	rq_groups;

	bool	rx_ptp_support;

	u32     features;

};



#define mlx5e_profile_feature_cap(profile, feature)	\

	((profile)->features & (MLX5E_PROFILE_FEATURE_## feature))



void mlx5e_build_ptys2ethtool_map(void);



bool mlx5e_check_fragmented_striding_rq_cap(struct mlx5_core_dev *mdev);

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

+3 −3
Original line number Diff line number Diff line
@@ -768,7 +768,7 @@ int mlx5e_ptp_alloc_rx_fs(struct mlx5e_priv *priv) 
{

	struct mlx5e_ptp_fs *ptp_fs;



	if (!priv->profile->rx_ptp_support)

	if (!mlx5e_profile_feature_cap(priv->profile, PTP_RX))

		return 0;



	ptp_fs = kzalloc(sizeof(*ptp_fs), GFP_KERNEL);
@@ -783,7 +783,7 @@ void mlx5e_ptp_free_rx_fs(struct mlx5e_priv *priv) 
{

	struct mlx5e_ptp_fs *ptp_fs = priv->fs.ptp_fs;



	if (!priv->profile->rx_ptp_support)

	if (!mlx5e_profile_feature_cap(priv->profile, PTP_RX))

		return;



	mlx5e_ptp_rx_unset_fs(priv);
@@ -794,7 +794,7 @@ int mlx5e_ptp_rx_manage_fs(struct mlx5e_priv *priv, bool set) 
{

	struct mlx5e_ptp *c = priv->channels.ptp;



	if (!priv->profile->rx_ptp_support)

	if (!mlx5e_profile_feature_cap(priv->profile, PTP_RX))

		return 0;



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

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

+1 −1
Original line number Diff line number Diff line
@@ -1934,7 +1934,7 @@ int mlx5e_modify_rx_cqe_compression_locked(struct mlx5e_priv *priv, bool new_val 
	if (curr_val == new_val)

		return 0;



	if (new_val && !priv->profile->rx_ptp_support && rx_filter) {

	if (new_val && !mlx5e_profile_feature_cap(priv->profile, PTP_RX) && rx_filter) {

		netdev_err(priv->netdev,

			   "Profile doesn't support enabling of CQE compression while hardware time-stamping is enabled.\n");

		return -EINVAL;

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

+2 −2
Original line number Diff line number Diff line
@@ -4038,7 +4038,7 @@ int mlx5e_hwstamp_set(struct mlx5e_priv *priv, struct ifreq *ifr) 
		goto err_unlock;

	}



	if (!priv->profile->rx_ptp_support)

	if (!mlx5e_profile_feature_cap(priv->profile, PTP_RX))

		err = mlx5e_hwstamp_config_no_ptp_rx(priv,

						     config.rx_filter != HWTSTAMP_FILTER_NONE);

	else
@@ -5093,7 +5093,7 @@ static const struct mlx5e_profile mlx5e_nic_profile = { 
	.rq_groups	   = MLX5E_NUM_RQ_GROUPS(XSK),

	.stats_grps	   = mlx5e_nic_stats_grps,

	.stats_grps_num	   = mlx5e_nic_stats_grps_num,

	.rx_ptp_support    = true,

	.features          = BIT(MLX5E_PROFILE_FEATURE_PTP_RX),

};



static unsigned int

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

+0 −2
Original line number Diff line number Diff line
@@ -1113,7 +1113,6 @@ static const struct mlx5e_profile mlx5e_rep_profile = { 
	.rq_groups		= MLX5E_NUM_RQ_GROUPS(REGULAR),

	.stats_grps		= mlx5e_rep_stats_grps,

	.stats_grps_num		= mlx5e_rep_stats_grps_num,

	.rx_ptp_support		= false,

};



static const struct mlx5e_profile mlx5e_uplink_rep_profile = {
@@ -1134,7 +1133,6 @@ static const struct mlx5e_profile mlx5e_uplink_rep_profile = { 
	.rq_groups		= MLX5E_NUM_RQ_GROUPS(XSK),

	.stats_grps		= mlx5e_ul_rep_stats_grps,

	.stats_grps_num		= mlx5e_ul_rep_stats_grps_num,

	.rx_ptp_support		= false,

};



/* e-Switch vport representors */