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

Commit 23537b73 authored by Hadar Hen Zion's avatar Hadar Hen Zion Committed by David S. Miller
Browse files

net/mlx4_core: Use firmware driven flow steering hash mode 



The Firmware dynamically changes flow steering hash configuration from covering
L2 only to "full" L2/L3/L4 mode needed.  The dynamic change allows the driver
to set hard coded hash configuration which is changed by the firmware from L2
to L2/L3/L4 when attaching the first L3/L4 flow steering rule and back to L2
when there are no more such rules.

Signed-off-by: default avatarHadar Hen Zion <hadarh@mellanox.com>
Signed-off-by: default avatarAmir Vadai <amirv@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0d256c0e

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

+2 −2
Original line number Diff line number Diff line
@@ -1287,14 +1287,14 @@ int mlx4_INIT_HCA(struct mlx4_dev *dev, struct mlx4_init_hca_param *param) 
		/* Enable Ethernet flow steering

		 * with udp unicast and tcp unicast

		 */

		MLX4_PUT(inbox, param->fs_hash_enable_bits,

		MLX4_PUT(inbox, (u8) (MLX4_FS_UDP_UC_EN | MLX4_FS_TCP_UC_EN),

			 INIT_HCA_FS_ETH_BITS_OFFSET);

		MLX4_PUT(inbox, (u16) MLX4_FS_NUM_OF_L2_ADDR,

			 INIT_HCA_FS_ETH_NUM_ADDRS_OFFSET);

		/* Enable IPoIB flow steering

		 * with udp unicast and tcp unicast

		 */

		MLX4_PUT(inbox, param->fs_hash_enable_bits,

		MLX4_PUT(inbox, (u8) (MLX4_FS_UDP_UC_EN | MLX4_FS_TCP_UC_EN),

			 INIT_HCA_FS_IB_BITS_OFFSET);

		MLX4_PUT(inbox, (u16) MLX4_FS_NUM_OF_L2_ADDR,

			 INIT_HCA_FS_IB_NUM_ADDRS_OFFSET);

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

+0 −1
Original line number Diff line number Diff line
@@ -171,7 +171,6 @@ struct mlx4_init_hca_param { 
	u8  log_mpt_sz;

	u8  log_uar_sz;

	u8  uar_page_sz; /* log pg sz in 4k chunks */

	u8  fs_hash_enable_bits;

	u8  steering_mode; /* for QUERY_HCA */

	u64 dev_cap_enabled;

};

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

+0 −16
Original line number Diff line number Diff line
@@ -1415,22 +1415,6 @@ static int mlx4_init_hca(struct mlx4_dev *dev) 
		if (mlx4_is_master(dev))

			mlx4_parav_master_pf_caps(dev);



		priv->fs_hash_mode = MLX4_FS_L2_HASH;



		switch (priv->fs_hash_mode) {

		case MLX4_FS_L2_HASH:

			init_hca.fs_hash_enable_bits = 0;

			break;



		case MLX4_FS_L2_L3_L4_HASH:

			/* Enable flow steering with

			 * udp unicast and tcp unicast

			 */

			init_hca.fs_hash_enable_bits =

				MLX4_FS_UDP_UC_EN | MLX4_FS_TCP_UC_EN;

			break;

		}



		profile = default_profile;

		if (dev->caps.steering_mode ==

		    MLX4_STEERING_MODE_DEVICE_MANAGED)

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

+0 −5
Original line number Diff line number Diff line
@@ -60,11 +60,6 @@ 
#define MLX4_FS_MGM_LOG_ENTRY_SIZE	7

#define MLX4_FS_NUM_MCG			(1 << 17)



enum {

	MLX4_FS_L2_HASH = 0,

	MLX4_FS_L2_L3_L4_HASH,

};



#define MLX4_NUM_UP		8

#define MLX4_NUM_TC		8

#define MLX4_RATELIMIT_UNITS 3 /* 100 Mbps */