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

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

Merge tag 'mlx5-fixes-2017-05-12-V2' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mahameed says:

====================
Mellanox, mlx5 fixes 2017-05-12

This series contains some mlx5 fixes for net.
Please pull and let me know if there's any problem.

For -stable:
("net/mlx5e: Fix ethtool pause support and advertise reporting") kernels >= 4.8
("net/mlx5e: Use the correct pause values for ethtool advertising") kernels >= 4.8

v1->v2:
 Dropped statistics spinlock patch, it needs some extra work.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 66eb9f86 50854114

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

+1 −1
Original line number Diff line number Diff line
@@ -1003,7 +1003,7 @@ int mlx5e_create_direct_tirs(struct mlx5e_priv *priv); 
void mlx5e_destroy_direct_tirs(struct mlx5e_priv *priv);

void mlx5e_destroy_rqt(struct mlx5e_priv *priv, struct mlx5e_rqt *rqt);



int mlx5e_create_ttc_table(struct mlx5e_priv *priv, u32 underlay_qpn);

int mlx5e_create_ttc_table(struct mlx5e_priv *priv);

void mlx5e_destroy_ttc_table(struct mlx5e_priv *priv);



int mlx5e_create_tis(struct mlx5_core_dev *mdev, int tc,

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

+6 −3
Original line number Diff line number Diff line
@@ -794,7 +794,6 @@ static void get_supported(u32 eth_proto_cap, 
	ptys2ethtool_supported_port(link_ksettings, eth_proto_cap);

	ptys2ethtool_supported_link(supported, eth_proto_cap);

	ethtool_link_ksettings_add_link_mode(link_ksettings, supported, Pause);

	ethtool_link_ksettings_add_link_mode(link_ksettings, supported, Asym_Pause);

}



static void get_advertising(u32 eth_proto_cap, u8 tx_pause,
@@ -804,7 +803,7 @@ static void get_advertising(u32 eth_proto_cap, u8 tx_pause, 
	unsigned long *advertising = link_ksettings->link_modes.advertising;



	ptys2ethtool_adver_link(advertising, eth_proto_cap);

	if (tx_pause)

	if (rx_pause)

		ethtool_link_ksettings_add_link_mode(link_ksettings, advertising, Pause);

	if (tx_pause ^ rx_pause)

		ethtool_link_ksettings_add_link_mode(link_ksettings, advertising, Asym_Pause);
@@ -849,6 +848,8 @@ static int mlx5e_get_link_ksettings(struct net_device *netdev, 
	struct mlx5e_priv *priv    = netdev_priv(netdev);

	struct mlx5_core_dev *mdev = priv->mdev;

	u32 out[MLX5_ST_SZ_DW(ptys_reg)] = {0};

	u32 rx_pause = 0;

	u32 tx_pause = 0;

	u32 eth_proto_cap;

	u32 eth_proto_admin;

	u32 eth_proto_lp;
@@ -871,11 +872,13 @@ static int mlx5e_get_link_ksettings(struct net_device *netdev, 
	an_disable_admin = MLX5_GET(ptys_reg, out, an_disable_admin);

	an_status        = MLX5_GET(ptys_reg, out, an_status);



	mlx5_query_port_pause(mdev, &rx_pause, &tx_pause);



	ethtool_link_ksettings_zero_link_mode(link_ksettings, supported);

	ethtool_link_ksettings_zero_link_mode(link_ksettings, advertising);



	get_supported(eth_proto_cap, link_ksettings);

	get_advertising(eth_proto_admin, 0, 0, link_ksettings);

	get_advertising(eth_proto_admin, tx_pause, rx_pause, link_ksettings);

	get_speed_duplex(netdev, eth_proto_oper, link_ksettings);



	eth_proto_oper = eth_proto_oper ? eth_proto_oper : eth_proto_cap;

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

+2 −3
Original line number Diff line number Diff line
@@ -800,7 +800,7 @@ void mlx5e_destroy_ttc_table(struct mlx5e_priv *priv) 
	mlx5e_destroy_flow_table(&ttc->ft);

}



int mlx5e_create_ttc_table(struct mlx5e_priv *priv, u32 underlay_qpn)

int mlx5e_create_ttc_table(struct mlx5e_priv *priv)

{

	struct mlx5e_ttc_table *ttc = &priv->fs.ttc;

	struct mlx5_flow_table_attr ft_attr = {};
@@ -810,7 +810,6 @@ int mlx5e_create_ttc_table(struct mlx5e_priv *priv, u32 underlay_qpn) 
	ft_attr.max_fte = MLX5E_TTC_TABLE_SIZE;

	ft_attr.level = MLX5E_TTC_FT_LEVEL;

	ft_attr.prio = MLX5E_NIC_PRIO;

	ft_attr.underlay_qpn = underlay_qpn;



	ft->t = mlx5_create_flow_table(priv->fs.ns, &ft_attr);

	if (IS_ERR(ft->t)) {
@@ -1147,7 +1146,7 @@ int mlx5e_create_flow_steering(struct mlx5e_priv *priv) 
		priv->netdev->hw_features &= ~NETIF_F_NTUPLE;

	}



	err = mlx5e_create_ttc_table(priv, 0);

	err = mlx5e_create_ttc_table(priv);

	if (err) {

		netdev_err(priv->netdev, "Failed to create ttc table, err=%d\n",

			   err);

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

+1 −1
Original line number Diff line number Diff line
@@ -2976,7 +2976,7 @@ static int mlx5e_setup_tc(struct net_device *netdev, u8 tc) 
	new_channels.params = priv->channels.params;

	new_channels.params.num_tc = tc ? tc : 1;



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

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

		priv->channels.params = new_channels.params;

		goto out;

	}

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

+3 −6
Original line number Diff line number Diff line
@@ -40,28 +40,25 @@ 
#include "eswitch.h"



int mlx5_cmd_update_root_ft(struct mlx5_core_dev *dev,

			    struct mlx5_flow_table *ft)

			    struct mlx5_flow_table *ft, u32 underlay_qpn)

{

	u32 in[MLX5_ST_SZ_DW(set_flow_table_root_in)]   = {0};

	u32 out[MLX5_ST_SZ_DW(set_flow_table_root_out)] = {0};



	if ((MLX5_CAP_GEN(dev, port_type) == MLX5_CAP_PORT_TYPE_IB) &&

	    ft->underlay_qpn == 0)

	    underlay_qpn == 0)

		return 0;



	MLX5_SET(set_flow_table_root_in, in, opcode,

		 MLX5_CMD_OP_SET_FLOW_TABLE_ROOT);

	MLX5_SET(set_flow_table_root_in, in, table_type, ft->type);

	MLX5_SET(set_flow_table_root_in, in, table_id, ft->id);

	MLX5_SET(set_flow_table_root_in, in, underlay_qpn, underlay_qpn);

	if (ft->vport) {

		MLX5_SET(set_flow_table_root_in, in, vport_number, ft->vport);

		MLX5_SET(set_flow_table_root_in, in, other_vport, 1);

	}



	if ((MLX5_CAP_GEN(dev, port_type) == MLX5_CAP_PORT_TYPE_IB) &&

	    ft->underlay_qpn != 0)

		MLX5_SET(set_flow_table_root_in, in, underlay_qpn, ft->underlay_qpn);



	return mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out));

}