Merge tag 'mlx5-updates-2020-09-15' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux (045e42f3) · Commits · 戴 / test

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -265,6 +265,7 @@ enum {
		MLX5E_RQ_STATE_NO_CSUM_COMPLETE,
		MLX5E_RQ_STATE_CSUM_FULL, /* cqe_csum_full hw bit is set */
		MLX5E_RQ_STATE_FPGA_TLS, /* FPGA TLS enabled */
		MLX5E_RQ_STATE_MINI_CQE_HW_STRIDX /* set when mini_cqe_resp_stride_index cap is used */
		};

		struct mlx5e_cq {

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -242,8 +242,8 @@ static int mlx5e_health_rsc_fmsg_binary(struct devlink_fmsg *fmsg,

		{
		u32 data_size;
		int err = 0;
		u32 offset;
		int err;

		for (offset = 0; offset < value_len; offset += data_size) {
		data_size = value_len - offset;

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -243,7 +243,6 @@ int mlx5e_ethtool_get_sset_count(struct mlx5e_priv *priv, int sset)
		return MLX5E_NUM_PFLAGS;
		case ETH_SS_TEST:
		return mlx5e_self_test_num(priv);
		fallthrough;
		default:
		return -EOPNOTSUPP;
		}

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

+11 −1

Original line number	Diff line number	Diff line
		@@ -848,6 +848,13 @@ int mlx5e_open_rq(struct mlx5e_channel c, struct mlx5e_params params,
		if (MLX5E_GET_PFLAG(params, MLX5E_PFLAG_RX_NO_CSUM_COMPLETE) \|\| c->xdp)
		__set_bit(MLX5E_RQ_STATE_NO_CSUM_COMPLETE, &c->rq.state);

		/* For CQE compression on striding RQ, use stride index provided by
		* HW if capability is supported.
		*/
		if (MLX5E_GET_PFLAG(params, MLX5E_PFLAG_RX_STRIDING_RQ) &&
		MLX5_CAP_GEN(c->mdev, mini_cqe_resp_stride_index))
		__set_bit(MLX5E_RQ_STATE_MINI_CQE_HW_STRIDX, &c->rq.state);

		return 0;

		err_destroy_rq:
		@@ -2182,6 +2189,7 @@ void mlx5e_build_rx_cq_param(struct mlx5e_priv *priv,
		struct mlx5e_cq_param *param)
		{
		struct mlx5_core_dev *mdev = priv->mdev;
		bool hw_stridx = false;
		void *cqc = param->cqc;
		u8 log_cq_size;

		@@ -2189,6 +2197,7 @@ void mlx5e_build_rx_cq_param(struct mlx5e_priv *priv,
		case MLX5_WQ_TYPE_LINKED_LIST_STRIDING_RQ:
		log_cq_size = mlx5e_mpwqe_get_log_rq_size(params, xsk) +
		mlx5e_mpwqe_get_log_num_strides(mdev, params, xsk);
		hw_stridx = MLX5_CAP_GEN(mdev, mini_cqe_resp_stride_index);
		break;
		default: /* MLX5_WQ_TYPE_CYCLIC */
		log_cq_size = params->log_rq_mtu_frames;
		@@ -2196,7 +2205,8 @@ void mlx5e_build_rx_cq_param(struct mlx5e_priv *priv,

		MLX5_SET(cqc, cqc, log_cq_size, log_cq_size);
		if (MLX5E_GET_PFLAG(params, MLX5E_PFLAG_RX_CQE_COMPRESS)) {
		MLX5_SET(cqc, cqc, mini_cqe_res_format, MLX5_CQE_FORMAT_CSUM);
		MLX5_SET(cqc, cqc, mini_cqe_res_format, hw_stridx ?
		MLX5_CQE_FORMAT_CSUM_STRIDX : MLX5_CQE_FORMAT_CSUM);
		MLX5_SET(cqc, cqc, cqe_comp_en, 1);
		}

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

+10 −1

Original line number	Diff line number	Diff line
		@@ -137,8 +137,17 @@ static inline void mlx5e_decompress_cqe(struct mlx5e_rq *rq,
		title->check_sum = mini_cqe->checksum;
		title->op_own &= 0xf0;
		title->op_own \|= 0x01 & (cqcc >> wq->fbc.log_sz);
		title->wqe_counter = cpu_to_be16(cqd->wqe_counter);

		/* state bit set implies linked-list striding RQ wq type and
		* HW stride index capability supported
		*/
		if (test_bit(MLX5E_RQ_STATE_MINI_CQE_HW_STRIDX, &rq->state)) {
		title->wqe_counter = mini_cqe->stridx;
		return;
		}

		/* HW stride index capability not supported */
		title->wqe_counter = cpu_to_be16(cqd->wqe_counter);
		if (rq->wq_type == MLX5_WQ_TYPE_LINKED_LIST_STRIDING_RQ)
		cqd->wqe_counter += mpwrq_get_cqe_consumed_strides(title);
		else

Admin message