Commit 0109841f authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'mlx5-updates-2021-12-02' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 

Saeed Mahameed says:

====================
mlx5-updates-2021-12-02

Misc updates to mlx5 driver

1) Various code cleanups
2) Error path handling fixes of latest features
3) Print more information on pci error handling
4) Dynamically resize flow counters query buffer
====================

Link: https://lore.kernel.org/r/20211203005622.183325-1-saeed@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents fc993be3 b247f32a

drivers/net/ethernet/mellanox/mlx5/core/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ config MLX5_TC_CT 
config MLX5_TC_SAMPLE

	bool "MLX5 TC sample offload support"

	depends on MLX5_CLS_ACT

	depends on PSAMPLE=y || PSAMPLE=n || MLX5_CORE=m

	default y

	help

	  Say Y here if you want to support offloading sample rules via tc

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

+1 −2
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ struct page_pool; 
#define MLX5E_KLM_ENTRIES_PER_WQE(wqe_size)\

	ALIGN_DOWN(MLX5E_KLM_MAX_ENTRIES_PER_WQE(wqe_size), MLX5_UMR_KLM_ALIGNMENT)



#define MLX5E_MAX_KLM_PER_WQE(mdev) \

#define MLX5E_MAX_KLM_PER_WQE \

	MLX5E_KLM_ENTRIES_PER_WQE(MLX5E_TX_MPW_MAX_NUM_DS << MLX5_MKEY_BSF_OCTO_SIZE)



#define MLX5E_MSG_LEVEL			NETIF_MSG_LINK
@@ -1057,7 +1057,6 @@ int mlx5e_safe_switch_params(struct mlx5e_priv *priv, 
			     mlx5e_fp_preactivate preactivate,

			     void *context, bool reset);

int mlx5e_update_tx_netdev_queues(struct mlx5e_priv *priv);

int mlx5e_num_channels_changed(struct mlx5e_priv *priv);

int mlx5e_num_channels_changed_ctx(struct mlx5e_priv *priv, void *context);

void mlx5e_activate_priv_channels(struct mlx5e_priv *priv);

void mlx5e_deactivate_priv_channels(struct mlx5e_priv *priv);

drivers/net/ethernet/mellanox/mlx5/core/en/params.c

+1 −1
Original line number Diff line number Diff line
@@ -717,7 +717,7 @@ static u32 mlx5e_shampo_icosq_sz(struct mlx5_core_dev *mdev, 
	int wq_size = BIT(MLX5_GET(wq, wqc, log_wq_sz));

	u32 wqebbs;



	max_klm_per_umr = MLX5E_MAX_KLM_PER_WQE(mdev);

	max_klm_per_umr = MLX5E_MAX_KLM_PER_WQE;

	max_hd_per_wqe = mlx5e_shampo_hd_per_wqe(mdev, params, rq_param);

	max_num_of_umr_per_wqe = max_hd_per_wqe / max_klm_per_umr;

	rest = max_hd_per_wqe % max_klm_per_umr;

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

+1 −1
Original line number Diff line number Diff line
@@ -2598,7 +2598,7 @@ static void mlx5e_set_default_xps_cpumasks(struct mlx5e_priv *priv, 
	}

}



int mlx5e_num_channels_changed(struct mlx5e_priv *priv)

static int mlx5e_num_channels_changed(struct mlx5e_priv *priv)

{

	u16 count = priv->channels.params.num_channels;

	int err;

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

+1 −1
Original line number Diff line number Diff line
@@ -619,7 +619,7 @@ static int mlx5e_alloc_rx_hd_mpwqe(struct mlx5e_rq *rq) 
	struct mlx5e_icosq *sq = rq->icosq;

	int i, err, max_klm_entries, len;



	max_klm_entries = MLX5E_MAX_KLM_PER_WQE(rq->mdev);

	max_klm_entries = MLX5E_MAX_KLM_PER_WQE;

	klm_entries = bitmap_find_window(shampo->bitmap,

					 shampo->hd_per_wqe,

					 shampo->hd_per_wq, shampo->pi);