Commit 0a9d74d1 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin
Browse files

Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux into HEAD 



Merge shared code that's necessary for mlx5 vdpa bits to build.

The branch itself includes a small number of patches and is also
independently merged by a couple of other trees.
That shouldn't cause any conflicts by itself.

Saeed Mahameed <saeedm@mellanox.com> says:

---

mlx5-next is a very small branch based on a very early rc that includes
mlx5 shared stuff between rdma and net-next, and now virtio as well.

---

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parents 4c05433b 042dd05b

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

+9 −2
Original line number Diff line number Diff line
@@ -299,11 +299,18 @@ void mlx5_fill_page_array(struct mlx5_frag_buf *buf, __be64 *pas) 
}

EXPORT_SYMBOL_GPL(mlx5_fill_page_array);



void mlx5_fill_page_frag_array(struct mlx5_frag_buf *buf, __be64 *pas)

void mlx5_fill_page_frag_array_perm(struct mlx5_frag_buf *buf, __be64 *pas, u8 perm)

{

	int i;



	WARN_ON(perm & 0xfc);

	for (i = 0; i < buf->npages; i++)

		pas[i] = cpu_to_be64(buf->frags[i].map);

		pas[i] = cpu_to_be64(buf->frags[i].map | perm);

}

EXPORT_SYMBOL_GPL(mlx5_fill_page_frag_array_perm);



void mlx5_fill_page_frag_array(struct mlx5_frag_buf *buf, __be64 *pas)

{

	mlx5_fill_page_frag_array_perm(buf, pas, 0);

}

EXPORT_SYMBOL_GPL(mlx5_fill_page_frag_array);

drivers/net/ethernet/mellanox/mlx5/core/diag/rsc_dump.c

+6 −0
Original line number Diff line number Diff line
@@ -23,6 +23,9 @@ static const char *const mlx5_rsc_sgmt_name[] = { 
	MLX5_SGMT_STR_ASSING(SX_SLICE_ALL),

	MLX5_SGMT_STR_ASSING(RDB),

	MLX5_SGMT_STR_ASSING(RX_SLICE_ALL),

	MLX5_SGMT_STR_ASSING(PRM_QUERY_QP),

	MLX5_SGMT_STR_ASSING(PRM_QUERY_CQ),

	MLX5_SGMT_STR_ASSING(PRM_QUERY_MKEY),

};



struct mlx5_rsc_dump {
@@ -130,11 +133,13 @@ struct mlx5_rsc_dump_cmd *mlx5_rsc_dump_cmd_create(struct mlx5_core_dev *dev, 
	cmd->mem_size = key->size;

	return cmd;

}

EXPORT_SYMBOL(mlx5_rsc_dump_cmd_create);



void mlx5_rsc_dump_cmd_destroy(struct mlx5_rsc_dump_cmd *cmd)

{

	kfree(cmd);

}

EXPORT_SYMBOL(mlx5_rsc_dump_cmd_destroy);



int mlx5_rsc_dump_next(struct mlx5_core_dev *dev, struct mlx5_rsc_dump_cmd *cmd,

		       struct page *page, int *size)
@@ -155,6 +160,7 @@ int mlx5_rsc_dump_next(struct mlx5_core_dev *dev, struct mlx5_rsc_dump_cmd *cmd, 


	return more_dump;

}

EXPORT_SYMBOL(mlx5_rsc_dump_next);



#define MLX5_RSC_DUMP_MENU_SEGMENT 0xffff

static int mlx5_rsc_dump_menu(struct mlx5_core_dev *dev)

drivers/net/ethernet/mellanox/mlx5/core/diag/rsc_dump.h

+1 −32
Original line number Diff line number Diff line
@@ -4,41 +4,10 @@ 
#ifndef __MLX5_RSC_DUMP_H

#define __MLX5_RSC_DUMP_H



#include <linux/mlx5/rsc_dump.h>

#include <linux/mlx5/driver.h>

#include "mlx5_core.h"



enum mlx5_sgmt_type {

	MLX5_SGMT_TYPE_HW_CQPC,

	MLX5_SGMT_TYPE_HW_SQPC,

	MLX5_SGMT_TYPE_HW_RQPC,

	MLX5_SGMT_TYPE_FULL_SRQC,

	MLX5_SGMT_TYPE_FULL_CQC,

	MLX5_SGMT_TYPE_FULL_EQC,

	MLX5_SGMT_TYPE_FULL_QPC,

	MLX5_SGMT_TYPE_SND_BUFF,

	MLX5_SGMT_TYPE_RCV_BUFF,

	MLX5_SGMT_TYPE_SRQ_BUFF,

	MLX5_SGMT_TYPE_CQ_BUFF,

	MLX5_SGMT_TYPE_EQ_BUFF,

	MLX5_SGMT_TYPE_SX_SLICE,

	MLX5_SGMT_TYPE_SX_SLICE_ALL,

	MLX5_SGMT_TYPE_RDB,

	MLX5_SGMT_TYPE_RX_SLICE_ALL,

	MLX5_SGMT_TYPE_MENU,

	MLX5_SGMT_TYPE_TERMINATE,



	MLX5_SGMT_TYPE_NUM, /* Keep last */

};



struct mlx5_rsc_key {

	enum mlx5_sgmt_type rsc;

	int index1;

	int index2;

	int num_of_obj1;

	int num_of_obj2;

	int size;

};



#define MLX5_RSC_DUMP_ALL 0xFFFF

struct mlx5_rsc_dump_cmd;

struct mlx5_rsc_dump;

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

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ mlx5e_notify_hw(struct mlx5_wq_cyc *wq, u16 pc, void __iomem *uar_map, 


static inline bool mlx5e_transport_inline_tx_wqe(struct mlx5_wqe_ctrl_seg *cseg)

{

	return cseg && !!cseg->tisn;

	return cseg && !!cseg->tis_tir_num;

}



static inline u8

drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 


#define MLX5E_KTLS_PROGRESS_WQE_SZ \

	(offsetof(struct mlx5e_tx_wqe, tls_progress_params_ctx) + \

	 MLX5_ST_SZ_BYTES(tls_progress_params))

	 sizeof(struct mlx5_wqe_tls_progress_params_seg))

#define MLX5E_KTLS_PROGRESS_WQEBBS \

	(DIV_ROUND_UP(MLX5E_KTLS_PROGRESS_WQE_SZ, MLX5_SEND_WQE_BB))

CRA Git | Maintained and supported by SUSTech CRA and CCSE