Commit 0b24a441 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mlx5-fixes-2019-08-15' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mahameed says:

====================
Mellanox, mlx5 fixes 2019-08-15

This series introduces two fixes to mlx5 driver.

1) Eran fixes a compatibility issue with ethtool flash.
2) Maxim fixes a race in XSK wakeup flow.

Please pull and let me know if there is any problem.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2aafdf5a f43d48d1

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

+2 −0
Original line number Diff line number Diff line
@@ -1105,6 +1105,8 @@ u32 mlx5e_ethtool_get_rxfh_key_size(struct mlx5e_priv *priv); 
u32 mlx5e_ethtool_get_rxfh_indir_size(struct mlx5e_priv *priv);

int mlx5e_ethtool_get_ts_info(struct mlx5e_priv *priv,

			      struct ethtool_ts_info *info);

int mlx5e_ethtool_flash_device(struct mlx5e_priv *priv,

			       struct ethtool_flash *flash);

void mlx5e_ethtool_get_pauseparam(struct mlx5e_priv *priv,

				  struct ethtool_pauseparam *pauseparam);

int mlx5e_ethtool_set_pauseparam(struct mlx5e_priv *priv,

drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c

+3 −0
Original line number Diff line number Diff line
@@ -143,7 +143,10 @@ void mlx5e_activate_xsk(struct mlx5e_channel *c) 
{

	set_bit(MLX5E_RQ_STATE_ENABLED, &c->xskrq.state);

	/* TX queue is created active. */



	spin_lock(&c->xskicosq_lock);

	mlx5e_trigger_irq(&c->xskicosq);

	spin_unlock(&c->xskicosq_lock);

}



void mlx5e_deactivate_xsk(struct mlx5e_channel *c)

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

+35 −0
Original line number Diff line number Diff line
@@ -1690,6 +1690,40 @@ static int mlx5e_get_module_eeprom(struct net_device *netdev, 
	return 0;

}



int mlx5e_ethtool_flash_device(struct mlx5e_priv *priv,

			       struct ethtool_flash *flash)

{

	struct mlx5_core_dev *mdev = priv->mdev;

	struct net_device *dev = priv->netdev;

	const struct firmware *fw;

	int err;



	if (flash->region != ETHTOOL_FLASH_ALL_REGIONS)

		return -EOPNOTSUPP;



	err = request_firmware_direct(&fw, flash->data, &dev->dev);

	if (err)

		return err;



	dev_hold(dev);

	rtnl_unlock();



	err = mlx5_firmware_flash(mdev, fw, NULL);

	release_firmware(fw);



	rtnl_lock();

	dev_put(dev);

	return err;

}



static int mlx5e_flash_device(struct net_device *dev,

			      struct ethtool_flash *flash)

{

	struct mlx5e_priv *priv = netdev_priv(dev);



	return mlx5e_ethtool_flash_device(priv, flash);

}



static int set_pflag_cqe_based_moder(struct net_device *netdev, bool enable,

				     bool is_rx_cq)

{
@@ -1972,6 +2006,7 @@ const struct ethtool_ops mlx5e_ethtool_ops = { 
	.set_wol	   = mlx5e_set_wol,

	.get_module_info   = mlx5e_get_module_info,

	.get_module_eeprom = mlx5e_get_module_eeprom,

	.flash_device      = mlx5e_flash_device,

	.get_priv_flags    = mlx5e_get_priv_flags,

	.set_priv_flags    = mlx5e_set_priv_flags,

	.self_test         = mlx5e_self_test,

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

+9 −0
Original line number Diff line number Diff line
@@ -122,6 +122,14 @@ static int mlx5i_get_ts_info(struct net_device *netdev, 
	return mlx5e_ethtool_get_ts_info(priv, info);

}



static int mlx5i_flash_device(struct net_device *netdev,

			      struct ethtool_flash *flash)

{

	struct mlx5e_priv *priv = mlx5i_epriv(netdev);



	return mlx5e_ethtool_flash_device(priv, flash);

}



enum mlx5_ptys_width {

	MLX5_PTYS_WIDTH_1X	= 1 << 0,

	MLX5_PTYS_WIDTH_2X	= 1 << 1,
@@ -233,6 +241,7 @@ const struct ethtool_ops mlx5i_ethtool_ops = { 
	.get_ethtool_stats  = mlx5i_get_ethtool_stats,

	.get_ringparam      = mlx5i_get_ringparam,

	.set_ringparam      = mlx5i_set_ringparam,

	.flash_device       = mlx5i_flash_device,

	.get_channels       = mlx5i_get_channels,

	.set_channels       = mlx5i_set_channels,

	.get_coalesce       = mlx5i_get_coalesce,

CRA Git | Maintained and supported by SUSTech CRA and CCSE