Commit 559f4c32 authored by Gal Pressman's avatar Gal Pressman Committed by Saeed Mahameed
Browse files

net/mlx5e: Remove mlx5e_dbg() and msglvl support 



The msglvl support was implemented using the mlx5e_dbg() macro which is
rarely used in the driver, and is not very useful when you can just use
dynamic debug instead.
Remove mlx5e_dbg() and convert its usages to netdev_dbg().

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 8a955da2

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

+0 −10
Original line number Diff line number Diff line
@@ -165,15 +165,6 @@ struct page_pool; 
#define MLX5E_MAX_KLM_PER_WQE(mdev) \

	MLX5E_KLM_ENTRIES_PER_WQE(MLX5_SEND_WQE_BB * mlx5e_get_max_sq_aligned_wqebbs(mdev))



#define MLX5E_MSG_LEVEL			NETIF_MSG_LINK



#define mlx5e_dbg(mlevel, priv, format, ...)                    \

do {                                                            \

	if (NETIF_MSG_##mlevel & (priv)->msglevel)              \

		netdev_warn(priv->netdev, format,               \

			    ##__VA_ARGS__);                     \

} while (0)



#define mlx5e_state_dereference(priv, p) \

	rcu_dereference_protected((p), lockdep_is_held(&(priv)->state_lock))
@@ -880,7 +871,6 @@ struct mlx5e_priv { 
#endif

	/* priv data path fields - end */



	u32                        msglevel;

	unsigned long              state;

	struct mutex               state_lock; /* Protects Interface state */

	struct mlx5e_rq            drop_rq;

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

+23 −21
Original line number Diff line number Diff line
@@ -65,7 +65,8 @@ int mlx5e_port_query_buffer(struct mlx5e_priv *priv, 
			MLX5_GET(bufferx_reg, buffer, xoff_threshold) * port_buff_cell_sz;

		total_used += port_buffer->buffer[i].size;



		mlx5e_dbg(HW, priv, "buffer %d: size=%d, xon=%d, xoff=%d, epsb=%d, lossy=%d\n", i,

		netdev_dbg(priv->netdev, "buffer %d: size=%d, xon=%d, xoff=%d, epsb=%d, lossy=%d\n",

			   i,

			   port_buffer->buffer[i].size,

			   port_buffer->buffer[i].xon,

			   port_buffer->buffer[i].xoff,
@@ -87,7 +88,7 @@ int mlx5e_port_query_buffer(struct mlx5e_priv *priv, 
					 port_buffer->internal_buffers_size -

					 port_buffer->headroom_size;



	mlx5e_dbg(HW, priv,

	netdev_dbg(priv->netdev,

		   "total buffer size=%u, headroom buffer size=%u, internal buffers size=%u, spare buffer size=%u\n",

		   port_buffer->port_buffer_size, port_buffer->headroom_size,

		   port_buffer->internal_buffers_size,
@@ -352,7 +353,7 @@ static u32 calculate_xoff(struct mlx5e_priv *priv, unsigned int mtu) 


	xoff = (301 + 216 * priv->dcbx.cable_len / 100) * speed / 1000 + 272 * mtu / 100;



	mlx5e_dbg(HW, priv, "%s: xoff=%d\n", __func__, xoff);

	netdev_dbg(priv->netdev, "%s: xoff=%d\n", __func__, xoff);

	return xoff;

}
@@ -484,6 +485,7 @@ int mlx5e_port_manual_buffer_config(struct mlx5e_priv *priv, 
				    u8 *prio2buffer)

{

	u16 port_buff_cell_sz = priv->dcbx.port_buff_cell_sz;

	struct net_device *netdev = priv->netdev;

	struct mlx5e_port_buffer port_buffer;

	u32 xoff = calculate_xoff(priv, mtu);

	bool update_prio2buffer = false;
@@ -495,7 +497,7 @@ int mlx5e_port_manual_buffer_config(struct mlx5e_priv *priv, 
	int err;

	int i;



	mlx5e_dbg(HW, priv, "%s: change=%x\n", __func__, change);

	netdev_dbg(netdev, "%s: change=%x\n", __func__, change);

	max_mtu = max_t(unsigned int, priv->netdev->max_mtu, MINIMUM_MAX_MTU);



	err = mlx5e_port_query_buffer(priv, &port_buffer);
@@ -510,7 +512,7 @@ int mlx5e_port_manual_buffer_config(struct mlx5e_priv *priv, 
	}



	if (change & MLX5E_PORT_BUFFER_PFC) {

		mlx5e_dbg(HW, priv, "%s: requested PFC per priority bitmask: 0x%x\n",

		netdev_dbg(netdev, "%s: requested PFC per priority bitmask: 0x%x\n",

			   __func__, pfc->pfc_en);

		err = mlx5e_port_query_priority2buffer(priv->mdev, buffer);

		if (err)
@@ -526,7 +528,7 @@ int mlx5e_port_manual_buffer_config(struct mlx5e_priv *priv, 
	if (change & MLX5E_PORT_BUFFER_PRIO2BUFFER) {

		update_prio2buffer = true;

		for (i = 0; i < MLX5E_MAX_NETWORK_BUFFER; i++)

			mlx5e_dbg(HW, priv, "%s: requested to map prio[%d] to buffer %d\n",

			netdev_dbg(priv->netdev, "%s: requested to map prio[%d] to buffer %d\n",

				   __func__, i, prio2buffer[i]);



		err = fill_pfc_en(priv->mdev, &curr_pfc_en);
@@ -541,9 +543,9 @@ int mlx5e_port_manual_buffer_config(struct mlx5e_priv *priv, 


	if (change & MLX5E_PORT_BUFFER_SIZE) {

		for (i = 0; i < MLX5E_MAX_NETWORK_BUFFER; i++) {

			mlx5e_dbg(HW, priv, "%s: buffer[%d]=%d\n", __func__, i, buffer_size[i]);

			netdev_dbg(priv->netdev, "%s: buffer[%d]=%d\n", __func__, i, buffer_size[i]);

			if (!port_buffer.buffer[i].lossy && !buffer_size[i]) {

				mlx5e_dbg(HW, priv, "%s: lossless buffer[%d] size cannot be zero\n",

				netdev_dbg(priv->netdev, "%s: lossless buffer[%d] size cannot be zero\n",

					   __func__, i);

				return -EINVAL;

			}
@@ -552,7 +554,7 @@ int mlx5e_port_manual_buffer_config(struct mlx5e_priv *priv, 
			total_used += buffer_size[i];

		}



		mlx5e_dbg(HW, priv, "%s: total buffer requested=%d\n", __func__, total_used);

		netdev_dbg(priv->netdev, "%s: total buffer requested=%d\n", __func__, total_used);



		if (total_used > port_buffer.headroom_size &&

		    (total_used - port_buffer.headroom_size) >

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

+4 −4
Original line number Diff line number Diff line
@@ -570,7 +570,7 @@ static struct mlx5_flow_handle *arfs_add_rule(struct mlx5e_priv *priv, 
	if (IS_ERR(rule)) {

		err = PTR_ERR(rule);

		priv->channel_stats[arfs_rule->rxq]->rq.arfs_err++;

		mlx5e_dbg(HW, priv,

		netdev_dbg(priv->netdev,

			   "%s: add rule(filter id=%d, rq idx=%d, ip proto=0x%x) failed,err=%d\n",

			   __func__, arfs_rule->filter_id, arfs_rule->rxq,

			   tuple->ip_proto, err);

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

+13 −13
Original line number Diff line number Diff line
@@ -275,9 +275,9 @@ static int mlx5e_dcbnl_ieee_setets_core(struct mlx5e_priv *priv, struct ieee_ets 
	memcpy(priv->dcbx.tc_tsa, ets->tc_tsa, sizeof(ets->tc_tsa));



	for (i = 0; i < IEEE_8021QAZ_MAX_TCS; i++) {

		mlx5e_dbg(HW, priv, "%s: prio_%d <=> tc_%d\n",

		netdev_dbg(priv->netdev, "%s: prio_%d <=> tc_%d\n",

			   __func__, i, ets->prio_tc[i]);

		mlx5e_dbg(HW, priv, "%s: tc_%d <=> tx_bw_%d%%, group_%d\n",

		netdev_dbg(priv->netdev, "%s: tc_%d <=> tx_bw_%d%%, group_%d\n",

			   __func__, i, tc_tx_bw[i], tc_group[i]);

	}
@@ -399,7 +399,7 @@ static int mlx5e_dcbnl_ieee_setpfc(struct net_device *dev, 
	}



	if (!ret) {

		mlx5e_dbg(HW, priv,

		netdev_dbg(dev,

			   "%s: PFC per priority bit mask: 0x%x\n",

			   __func__, pfc->pfc_en);

	}
@@ -611,7 +611,7 @@ static int mlx5e_dcbnl_ieee_setmaxrate(struct net_device *netdev, 
	}



	for (i = 0; i < IEEE_8021QAZ_MAX_TCS; i++) {

		mlx5e_dbg(HW, priv, "%s: tc_%d <=> max_bw %d Gbps\n",

		netdev_dbg(netdev, "%s: tc_%d <=> max_bw %d Gbps\n",

			   __func__, i, max_bw_value[i]);

	}
@@ -640,7 +640,7 @@ static u8 mlx5e_dcbnl_setall(struct net_device *netdev) 
		ets.tc_rx_bw[i] = cee_cfg->pg_bw_pct[i];

		ets.tc_tsa[i]   = IEEE_8021QAZ_TSA_ETS;

		ets.prio_tc[i]  = cee_cfg->prio_to_pg_map[i];

		mlx5e_dbg(HW, priv,

		netdev_dbg(netdev,

			   "%s: Priority group %d: tx_bw %d, rx_bw %d, prio_tc %d\n",

			   __func__, i, ets.tc_tx_bw[i], ets.tc_rx_bw[i],

			   ets.prio_tc[i]);

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

+3 −15
Original line number Diff line number Diff line
@@ -1689,16 +1689,6 @@ static int mlx5e_set_fecparam(struct net_device *netdev, 
	return 0;

}



static u32 mlx5e_get_msglevel(struct net_device *dev)

{

	return ((struct mlx5e_priv *)netdev_priv(dev))->msglevel;

}



static void mlx5e_set_msglevel(struct net_device *dev, u32 val)

{

	((struct mlx5e_priv *)netdev_priv(dev))->msglevel = val;

}



static int mlx5e_set_phys_id(struct net_device *dev,

			     enum ethtool_phys_id_state state)

{
@@ -1952,7 +1942,7 @@ int mlx5e_modify_rx_cqe_compression_locked(struct mlx5e_priv *priv, bool new_val 
	if (err)

		return err;



	mlx5e_dbg(DRV, priv, "MLX5E: RxCqeCmprss was turned %s\n",

	netdev_dbg(priv->netdev, "MLX5E: RxCqeCmprss was turned %s\n",

		   MLX5E_GET_PFLAG(&priv->channels.params,

				   MLX5E_PFLAG_RX_CQE_COMPRESS) ? "ON" : "OFF");
@@ -2444,8 +2434,6 @@ const struct ethtool_ops mlx5e_ethtool_ops = { 
	.get_priv_flags    = mlx5e_get_priv_flags,

	.set_priv_flags    = mlx5e_set_priv_flags,

	.self_test         = mlx5e_self_test,

	.get_msglevel      = mlx5e_get_msglevel,

	.set_msglevel      = mlx5e_set_msglevel,

	.get_fec_stats     = mlx5e_get_fec_stats,

	.get_fecparam      = mlx5e_get_fecparam,

	.set_fecparam      = mlx5e_set_fecparam,