Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63bfc508 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mlx5-updates-2017-08-17-V2' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mahameed says:

====================
mlx5-updates-2017-08-17

Some updates for mlx5 ethernet and IPoIB device driver.

Eran added the support for manage physical link state from netdevice upon
interface open/close requests.

Feras fixed the driver name showed in ethtool for IPoIB interfaces.
Shalom Added the support for IPoIB netdevice ethtool get link settings.

Gal and Eran exposed new diagnostic counters for outbound PCIe stalls and overflow
and RX buffer fullness statistics.

Code cleanups from Or Gerlitz.
Variable types cleanup from Gal.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d6e1e46f 9da5106c

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

+1 −0
Original line number Diff line number Diff line
@@ -258,6 +258,7 @@ EXPORT_SYMBOL_GPL(mlx5_db_alloc); 
void mlx5_db_free(struct mlx5_core_dev *dev, struct mlx5_db *db)

{

	u32 db_per_page = PAGE_SIZE / cache_line_size();



	mutex_lock(&dev->priv.pgdir_mutex);



	__set_bit(db->index, db->u.pgdir->bitmap);

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

+0 −1
Original line number Diff line number Diff line
@@ -802,7 +802,6 @@ static void cmd_work_handler(struct work_struct *work) 
	bool poll_cmd = ent->polling;

	int alloc_ret;





	sem = ent->page_queue ? &cmd->pages_sem : &cmd->sem;

	down(sem);

	if (!ent->page_queue) {

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

+44 −20
Original line number Diff line number Diff line
@@ -176,7 +176,6 @@ static bool mlx5e_query_global_pause_combined(struct mlx5e_priv *priv) 


int mlx5e_ethtool_get_sset_count(struct mlx5e_priv *priv, int sset)

{



	switch (sset) {

	case ETH_SS_STATS:

		return NUM_SW_COUNTERS +
@@ -207,7 +206,7 @@ static int mlx5e_get_sset_count(struct net_device *dev, int sset) 
	return mlx5e_ethtool_get_sset_count(priv, sset);

}



static void mlx5e_fill_stats_strings(struct mlx5e_priv *priv, uint8_t *data)

static void mlx5e_fill_stats_strings(struct mlx5e_priv *priv, u8 *data)

{

	int i, j, tc, prio, idx = 0;

	unsigned long pfc_combined;
@@ -242,10 +241,22 @@ static void mlx5e_fill_stats_strings(struct mlx5e_priv *priv, uint8_t *data) 
		strcpy(data + (idx++) * ETH_GSTRING_LEN,

		       pport_phy_statistical_stats_desc[i].format);



	for (i = 0; i < NUM_PPORT_ETH_EXT_COUNTERS(priv); i++)

		strcpy(data + (idx++) * ETH_GSTRING_LEN,

		       pport_eth_ext_stats_desc[i].format);



	for (i = 0; i < NUM_PCIE_PERF_COUNTERS(priv); i++)

		strcpy(data + (idx++) * ETH_GSTRING_LEN,

		       pcie_perf_stats_desc[i].format);



	for (i = 0; i < NUM_PCIE_PERF_COUNTERS64(priv); i++)

		strcpy(data + (idx++) * ETH_GSTRING_LEN,

		       pcie_perf_stats_desc64[i].format);



	for (i = 0; i < NUM_PCIE_PERF_STALL_COUNTERS(priv); i++)

	 strcpy(data + (idx++) * ETH_GSTRING_LEN,

		pcie_perf_stall_stats_desc[i].format);



	for (prio = 0; prio < NUM_PPORT_PRIO; prio++) {

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

			sprintf(data + (idx++) * ETH_GSTRING_LEN,
@@ -297,8 +308,7 @@ static void mlx5e_fill_stats_strings(struct mlx5e_priv *priv, uint8_t *data) 
					priv->channel_tc2txq[i][tc]);

}



void mlx5e_ethtool_get_strings(struct mlx5e_priv *priv,

			       uint32_t stringset, uint8_t *data)

void mlx5e_ethtool_get_strings(struct mlx5e_priv *priv, u32 stringset, u8 *data)

{

	int i;
@@ -320,8 +330,7 @@ void mlx5e_ethtool_get_strings(struct mlx5e_priv *priv, 
	}

}



static void mlx5e_get_strings(struct net_device *dev,

			      uint32_t stringset, uint8_t *data)

static void mlx5e_get_strings(struct net_device *dev, u32 stringset, u8 *data)

{

	struct mlx5e_priv *priv = netdev_priv(dev);
@@ -373,10 +382,22 @@ void mlx5e_ethtool_get_ethtool_stats(struct mlx5e_priv *priv, 
		data[idx++] = MLX5E_READ_CTR64_BE(&priv->stats.pport.phy_statistical_counters,

						  pport_phy_statistical_stats_desc, i);



	for (i = 0; i < NUM_PPORT_ETH_EXT_COUNTERS(priv); i++)

		data[idx++] = MLX5E_READ_CTR64_BE(&priv->stats.pport.eth_ext_counters,

						  pport_eth_ext_stats_desc, i);



	for (i = 0; i < NUM_PCIE_PERF_COUNTERS(priv); i++)

		data[idx++] = MLX5E_READ_CTR32_BE(&priv->stats.pcie.pcie_perf_counters,

						  pcie_perf_stats_desc, i);



	for (i = 0; i < NUM_PCIE_PERF_COUNTERS64(priv); i++)

		data[idx++] = MLX5E_READ_CTR64_BE(&priv->stats.pcie.pcie_perf_counters,

						  pcie_perf_stats_desc64, i);



	for (i = 0; i < NUM_PCIE_PERF_STALL_COUNTERS(priv); i++)

		data[idx++] = MLX5E_READ_CTR32_BE(&priv->stats.pcie.pcie_perf_counters,

						  pcie_perf_stall_stats_desc, i);



	for (prio = 0; prio < NUM_PPORT_PRIO; prio++) {

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

			data[idx++] = MLX5E_READ_CTR64_BE(&priv->stats.pport.per_prio_counters[prio],
@@ -964,23 +985,26 @@ static u8 get_connector_port(u32 eth_proto, u8 connector_type) 
	if (connector_type && connector_type < MLX5E_CONNECTOR_TYPE_NUMBER)

		return ptys2connector_type[connector_type];



	if (eth_proto & (MLX5E_PROT_MASK(MLX5E_10GBASE_SR)

			 | MLX5E_PROT_MASK(MLX5E_40GBASE_SR4)

			 | MLX5E_PROT_MASK(MLX5E_100GBASE_SR4)

			 | MLX5E_PROT_MASK(MLX5E_1000BASE_CX_SGMII))) {

	if (eth_proto &

	    (MLX5E_PROT_MASK(MLX5E_10GBASE_SR)   |

	     MLX5E_PROT_MASK(MLX5E_40GBASE_SR4)  |

	     MLX5E_PROT_MASK(MLX5E_100GBASE_SR4) |

	     MLX5E_PROT_MASK(MLX5E_1000BASE_CX_SGMII))) {

		return PORT_FIBRE;

	}



	if (eth_proto & (MLX5E_PROT_MASK(MLX5E_40GBASE_CR4)

			 | MLX5E_PROT_MASK(MLX5E_10GBASE_CR)

			 | MLX5E_PROT_MASK(MLX5E_100GBASE_CR4))) {

	if (eth_proto &

	    (MLX5E_PROT_MASK(MLX5E_40GBASE_CR4) |

	     MLX5E_PROT_MASK(MLX5E_10GBASE_CR)  |

	     MLX5E_PROT_MASK(MLX5E_100GBASE_CR4))) {

		return PORT_DA;

	}



	if (eth_proto & (MLX5E_PROT_MASK(MLX5E_10GBASE_KX4)

			 | MLX5E_PROT_MASK(MLX5E_10GBASE_KR)

			 | MLX5E_PROT_MASK(MLX5E_40GBASE_KR4)

			 | MLX5E_PROT_MASK(MLX5E_100GBASE_KR4))) {

	if (eth_proto &

	    (MLX5E_PROT_MASK(MLX5E_10GBASE_KX4) |

	     MLX5E_PROT_MASK(MLX5E_10GBASE_KR)  |

	     MLX5E_PROT_MASK(MLX5E_40GBASE_KR4) |

	     MLX5E_PROT_MASK(MLX5E_100GBASE_KR4))) {

		return PORT_NONE;

	}

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

+13 −0
Original line number Diff line number Diff line
@@ -288,6 +288,12 @@ static void mlx5e_update_pport_counters(struct mlx5e_priv *priv, bool full) 
		mlx5_core_access_reg(mdev, in, sz, out, sz, MLX5_REG_PPCNT, 0, 0);

	}



	if (MLX5_CAP_PCAM_FEATURE(mdev, rx_buffer_fullness_counters)) {

		out = pstats->eth_ext_counters;

		MLX5_SET(ppcnt_reg, in, grp, MLX5_ETHERNET_EXTENDED_COUNTERS_GROUP);

		mlx5_core_access_reg(mdev, in, sz, out, sz, MLX5_REG_PPCNT, 0, 0);

	}



	MLX5_SET(ppcnt_reg, in, grp, MLX5_PER_PRIORITY_COUNTERS_GROUP);

	for (prio = 0; prio < NUM_PPORT_PRIO; prio++) {

		out = pstats->per_prio_counters[prio];
@@ -2682,6 +2688,8 @@ int mlx5e_open(struct net_device *netdev) 


	mutex_lock(&priv->state_lock);

	err = mlx5e_open_locked(netdev);

	if (!err)

		mlx5_set_port_admin_status(priv->mdev, MLX5_PORT_UP);

	mutex_unlock(&priv->state_lock);



	return err;
@@ -2716,6 +2724,7 @@ int mlx5e_close(struct net_device *netdev) 
		return -ENODEV;



	mutex_lock(&priv->state_lock);

	mlx5_set_port_admin_status(priv->mdev, MLX5_PORT_DOWN);

	err = mlx5e_close_locked(netdev);

	mutex_unlock(&priv->state_lock);
@@ -4187,6 +4196,10 @@ static void mlx5e_nic_enable(struct mlx5e_priv *priv) 


	mlx5e_init_l2_addr(priv);



	/* Marking the link as currently not needed by the Driver */

	if (!netif_running(netdev))

		mlx5_set_port_admin_status(mdev, MLX5_PORT_DOWN);



	/* MTU range: 68 - hw-specific max */

	netdev->min_mtu = ETH_MIN_MTU;

	mlx5_query_port_max_mtu(priv->mdev, &max_mtu, 1);

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

+13 −7
Original line number Diff line number Diff line
@@ -613,15 +613,18 @@ static int mlx5e_rep_open(struct net_device *dev) 
	struct mlx5_eswitch *esw = priv->mdev->priv.eswitch;

	int err;



	err = mlx5e_open(dev);

	mutex_lock(&priv->state_lock);

	err = mlx5e_open_locked(dev);

	if (err)

		return err;

		goto unlock;



	err = mlx5_eswitch_set_vport_state(esw, rep->vport, MLX5_ESW_VPORT_ADMIN_STATE_UP);

	if (!err)

	if (!mlx5_eswitch_set_vport_state(esw, rep->vport,

					  MLX5_ESW_VPORT_ADMIN_STATE_UP))

		netif_carrier_on(dev);



	return 0;

unlock:

	mutex_unlock(&priv->state_lock);

	return err;

}



static int mlx5e_rep_close(struct net_device *dev)
@@ -630,10 +633,13 @@ static int mlx5e_rep_close(struct net_device *dev) 
	struct mlx5e_rep_priv *rpriv = priv->ppriv;

	struct mlx5_eswitch_rep *rep = rpriv->rep;

	struct mlx5_eswitch *esw = priv->mdev->priv.eswitch;

	int ret;



	mutex_lock(&priv->state_lock);

	(void)mlx5_eswitch_set_vport_state(esw, rep->vport, MLX5_ESW_VPORT_ADMIN_STATE_DOWN);



	return mlx5e_close(dev);

	ret = mlx5e_close_locked(dev);

	mutex_unlock(&priv->state_lock);

	return ret;

}



static int mlx5e_rep_get_phys_port_name(struct net_device *dev,