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

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

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



Saeed Mahameed says:

====================
Mellanox, mlx5 fixes 2017-08-30

This series contains some misc fixes to the mlx5 driver.

Please pull and let me know if there's any problem.

For -stable:

Kernels >= 4.12
	net/mlx5e: Fix CQ moderation mode not set properly
	net/mlx5e: Don't override user RSS upon set channels

Kernels >= 4.11
	net/mlx5e: Properly resolve TC offloaded ipv6 vxlan tunnel source address

Kernels >= 4.10
	net/mlx5e: Fix DCB_CAP_ATTR_DCBX capability for DCBNL getcap
	net/mlx5e: Check for qos capability in dcbnl_initialize

Kernels >= 4.9
	net/mlx5e: Fix dangling page pointer on DMA mapping error

Kernels >= 4.8
	net/mlx5e: Fix inline header size for small packets
	net/mlx5: E-Switch, Unload the representors in the correct order
    	net/mlx5: Fix arm SRQ command for ISSI version 0
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents df191632 1213ad28

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

+1 −0
Original line number Diff line number Diff line
@@ -263,6 +263,7 @@ struct mlx5e_dcbx { 


	/* The only setting that cannot be read from FW */

	u8                         tc_tsa[IEEE_8021QAZ_MAX_TCS];

	u8                         cap;

};

#endif

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

+15 −9
Original line number Diff line number Diff line
@@ -288,13 +288,8 @@ static int mlx5e_dcbnl_ieee_setpfc(struct net_device *dev, 
static u8 mlx5e_dcbnl_getdcbx(struct net_device *dev)

{

	struct mlx5e_priv *priv = netdev_priv(dev);

	struct mlx5e_dcbx *dcbx = &priv->dcbx;

	u8 mode = DCB_CAP_DCBX_VER_IEEE | DCB_CAP_DCBX_VER_CEE;



	if (dcbx->mode == MLX5E_DCBX_PARAM_VER_OPER_HOST)

		mode |= DCB_CAP_DCBX_HOST;



	return mode;

	return priv->dcbx.cap;

}



static u8 mlx5e_dcbnl_setdcbx(struct net_device *dev, u8 mode)
@@ -312,6 +307,7 @@ static u8 mlx5e_dcbnl_setdcbx(struct net_device *dev, u8 mode) 
		/* set dcbx to fw controlled */

		if (!mlx5e_dcbnl_set_dcbx_mode(priv, MLX5E_DCBX_PARAM_VER_OPER_AUTO)) {

			dcbx->mode = MLX5E_DCBX_PARAM_VER_OPER_AUTO;

			dcbx->cap &= ~DCB_CAP_DCBX_HOST;

			return 0;

		}
@@ -324,6 +320,8 @@ static u8 mlx5e_dcbnl_setdcbx(struct net_device *dev, u8 mode) 
	if (mlx5e_dcbnl_switch_to_host_mode(netdev_priv(dev)))

		return 1;



	dcbx->cap = mode;



	return 0;

}
@@ -628,9 +626,9 @@ static u8 mlx5e_dcbnl_getcap(struct net_device *netdev, 
		*cap = false;

		break;

	case DCB_CAP_ATTR_DCBX:

		*cap = (DCB_CAP_DCBX_LLD_MANAGED |

		*cap = priv->dcbx.cap |

		       DCB_CAP_DCBX_VER_CEE |

			DCB_CAP_DCBX_STATIC);

		       DCB_CAP_DCBX_VER_IEEE;

		break;

	default:

		*cap = 0;
@@ -754,8 +752,16 @@ void mlx5e_dcbnl_initialize(struct mlx5e_priv *priv) 
{

	struct mlx5e_dcbx *dcbx = &priv->dcbx;



	if (!MLX5_CAP_GEN(priv->mdev, qos))

		return;



	if (MLX5_CAP_GEN(priv->mdev, dcbx))

		mlx5e_dcbnl_query_dcbx_mode(priv, &dcbx->mode);



	priv->dcbx.cap = DCB_CAP_DCBX_VER_CEE |

			 DCB_CAP_DCBX_VER_IEEE;

	if (priv->dcbx.mode == MLX5E_DCBX_PARAM_VER_OPER_HOST)

		priv->dcbx.cap |= DCB_CAP_DCBX_HOST;



	mlx5e_ets_init(priv);

}

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

+4 −2
Original line number Diff line number Diff line
@@ -641,7 +641,9 @@ int mlx5e_ethtool_set_channels(struct mlx5e_priv *priv, 


	new_channels.params = priv->channels.params;

	new_channels.params.num_channels = count;

	mlx5e_build_default_indir_rqt(priv->mdev, new_channels.params.indirection_rqt,

	if (!netif_is_rxfh_configured(priv->netdev))

		mlx5e_build_default_indir_rqt(priv->mdev,

					      new_channels.params.indirection_rqt,

					      MLX5E_INDIR_RQT_SIZE, count);



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

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

+1 −0
Original line number Diff line number Diff line
@@ -1969,6 +1969,7 @@ static void mlx5e_build_rx_cq_param(struct mlx5e_priv *priv, 
	}



	mlx5e_build_common_cq_param(priv, param);

	param->cq_period_mode = params->rx_cq_period_mode;

}



static void mlx5e_build_tx_cq_param(struct mlx5e_priv *priv,

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

+1 −1
Original line number Diff line number Diff line
@@ -222,13 +222,13 @@ static inline int mlx5e_page_alloc_mapped(struct mlx5e_rq *rq, 
	if (unlikely(!page))

		return -ENOMEM;



	dma_info->page = page;

	dma_info->addr = dma_map_page(rq->pdev, page, 0,

				      RQ_PAGE_SIZE(rq), rq->buff.map_dir);

	if (unlikely(dma_mapping_error(rq->pdev, dma_info->addr))) {

		put_page(page);

		return -ENOMEM;

	}

	dma_info->page = page;



	return 0;

}