Commit ffa88f37 authored by Eran Ben Elisha's avatar Eran Ben Elisha Committed by David S. Miller
Browse files

net/mlx4_en: Move statistics bitmap setting to the Ethernet driver 



The statistics bitmap belongs to the Ethernet driver, move it there.

Signed-off-by: default avatarEran Ben Elisha <eranbe@mellanox.com>
Signed-off-by: default avatarHadar Hen Zion <hadarh@mellanox.com>
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b4b6e842

drivers/net/ethernet/mellanox/mlx4/en_netdev.c

+21 −1
Original line number Diff line number Diff line
@@ -49,6 +49,11 @@ 
#include "mlx4_en.h"

#include "en_port.h"



#define MLX4_STATS_TRAFFIC_COUNTERS_MASK	0xfULL

#define MLX4_STATS_TRAFFIC_DROPS_MASK		0xc0ULL

#define MLX4_STATS_ERROR_COUNTERS_MASK		0x1ffc30ULL

#define MLX4_STATS_PORT_COUNTERS_MASK		0x7fe00000ULL



int mlx4_en_setup_tc(struct net_device *dev, u8 up)

{

	struct mlx4_en_priv *priv = netdev_priv(dev);
@@ -2648,6 +2653,21 @@ int mlx4_en_netdev_event(struct notifier_block *this, 
	return NOTIFY_DONE;

}



void mlx4_en_set_stats_bitmap(struct mlx4_dev *dev, u64 *stats_bitmap)

{

	if (!mlx4_is_mfunc(dev)) {

		*stats_bitmap = 0;

		return;

	}



	*stats_bitmap = (MLX4_STATS_TRAFFIC_COUNTERS_MASK |

			 MLX4_STATS_TRAFFIC_DROPS_MASK |

			 MLX4_STATS_PORT_COUNTERS_MASK);



	if (mlx4_is_master(dev))

		*stats_bitmap |= MLX4_STATS_ERROR_COUNTERS_MASK;

}



int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,

			struct mlx4_en_port_profile *prof)

{
@@ -2881,7 +2901,7 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port, 
		queue_delayed_work(mdev->workqueue, &priv->service_task,

				   SERVICE_TASK_DELAY);



	mlx4_set_stats_bitmap(mdev->dev, &priv->stats_bitmap);

	mlx4_en_set_stats_bitmap(mdev->dev, &priv->stats_bitmap);



	return 0;

drivers/net/ethernet/mellanox/mlx4/mlx4_en.h

+2 −0
Original line number Diff line number Diff line
@@ -730,6 +730,8 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port, 
int mlx4_en_start_port(struct net_device *dev);

void mlx4_en_stop_port(struct net_device *dev, int detach);



void mlx4_en_set_stats_bitmap(struct mlx4_dev *dev, u64 *stats_bitmap);



void mlx4_en_free_resources(struct mlx4_en_priv *priv);

int mlx4_en_alloc_resources(struct mlx4_en_priv *priv);

drivers/net/ethernet/mellanox/mlx4/port.c

+0 −21
Original line number Diff line number Diff line
@@ -45,11 +45,6 @@ 
#define MLX4_VLAN_VALID		(1u << 31)

#define MLX4_VLAN_MASK		0xfff



#define MLX4_STATS_TRAFFIC_COUNTERS_MASK	0xfULL

#define MLX4_STATS_TRAFFIC_DROPS_MASK		0xc0ULL

#define MLX4_STATS_ERROR_COUNTERS_MASK		0x1ffc30ULL

#define MLX4_STATS_PORT_COUNTERS_MASK		0x7fe00000ULL



void mlx4_init_mac_table(struct mlx4_dev *dev, struct mlx4_mac_table *table)

{

	int i;
@@ -1185,22 +1180,6 @@ int mlx4_DUMP_ETH_STATS_wrapper(struct mlx4_dev *dev, int slave, 
					  vhcr->in_modifier, outbox);

}



void mlx4_set_stats_bitmap(struct mlx4_dev *dev, u64 *stats_bitmap)

{

	if (!mlx4_is_mfunc(dev)) {

		*stats_bitmap = 0;

		return;

	}



	*stats_bitmap = (MLX4_STATS_TRAFFIC_COUNTERS_MASK |

			 MLX4_STATS_TRAFFIC_DROPS_MASK |

			 MLX4_STATS_PORT_COUNTERS_MASK);



	if (mlx4_is_master(dev))

		*stats_bitmap |= MLX4_STATS_ERROR_COUNTERS_MASK;

}

EXPORT_SYMBOL(mlx4_set_stats_bitmap);



int mlx4_get_slave_from_roce_gid(struct mlx4_dev *dev, int port, u8 *gid,

				 int *slave_id)

{

include/linux/mlx4/device.h

+0 −1
Original line number Diff line number Diff line
@@ -1300,7 +1300,6 @@ int mlx4_register_mac(struct mlx4_dev *dev, u8 port, u64 mac); 
void mlx4_unregister_mac(struct mlx4_dev *dev, u8 port, u64 mac);

int mlx4_get_base_qpn(struct mlx4_dev *dev, u8 port);

int __mlx4_replace_mac(struct mlx4_dev *dev, u8 port, int qpn, u64 new_mac);

void mlx4_set_stats_bitmap(struct mlx4_dev *dev, u64 *stats_bitmap);

int mlx4_SET_PORT_general(struct mlx4_dev *dev, u8 port, int mtu,

			  u8 pptx, u8 pfctx, u8 pprx, u8 pfcrx);

int mlx4_SET_PORT_qpn_calc(struct mlx4_dev *dev, u8 port, u32 base_qpn,

CRA Git | Maintained and supported by SUSTech CRA and CCSE