Commit 0908fafc authored by zhuyikai's avatar zhuyikai Committed by s00851154
Browse files

net/hinic3: Support New SDK and NIC features 

driver inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/IB5BV0?from=project-issue


CVE: NA

--------------------------------

Add new cmdq ops.
Support new cmdq cqe format and new mode.
Change cmdq buffer size.
Change VAT RQ buffer size.
Add new RQ cqe format.
Add new RQ CI ctx.
Change tx wqe type and task section.

Signed-off-by: default avatarzhuyikai <zhuyikai1@h-partners.com>
parent c6c933e9

drivers/net/ethernet/huawei/hinic3/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
ccflags-y += -I$(srctree)/drivers/net/ethernet/huawei/hinic3/

ccflags-y += -I$(srctree)/drivers/net/ethernet/huawei/hinic3/hw/

ccflags-y += -I$(srctree)/drivers/net/ethernet/huawei/hinic3/cqm/

ccflags-y += -I$(srctree)/drivers/net/ethernet/huawei/hinic3/adapter/hw_cmdq/

ccflags-y += -I$(srctree)/drivers/net/ethernet/huawei/hinic3/adapter/sw_cmdq/

ccflags-y += -I$(srctree)/drivers/net/ethernet/huawei/hinic3/include/

ccflags-y += -I$(srctree)/drivers/net/ethernet/huawei/hinic3/include/cqm/

ccflags-y += -I$(srctree)/drivers/net/ethernet/huawei/hinic3/include/public/
@@ -31,10 +33,14 @@ hinic3-objs := hw/hinic3_hwdev.o \ 
			hw/hinic3_hw_mt.o \

			hw/hinic3_nictool.o \

			hw/hinic3_devlink.o \

			hw/hinic3_cmdq_enhance.o \

			hw/ossl_knl_linux.o \

			hw/hinic3_multi_host_mgmt.o \

			adapter/hw_cmdq/hw_cmdq_ops.o \

			adapter/sw_cmdq/sw_cmdq_ops.o \

			bond/hinic3_bond.o \

			hinic3_main.o \

			hinic3_cmdq_adapter.o \

			hinic3_tx.o \

			hinic3_rx.o \

			hinic3_rss.o \

drivers/net/ethernet/huawei/hinic3/adapter/hw_cmdq/hw_cmdq_ops.c

0 → 100644
+144 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* Copyright(c) 2021 Huawei Technologies Co., Ltd */



#include "hinic3_nic_cmdq.h"

#include "hw_cmdq_ops.h"



static void hinic3_qp_prepare_cmdq_header(struct hinic3_qp_ctxt_header *qp_ctxt_hdr,

					  enum hinic3_qp_ctxt_type ctxt_type, u16 num_queues,

					  u16 q_id, u16 func_id)

{

	qp_ctxt_hdr->queue_type = ctxt_type;

	qp_ctxt_hdr->num_queues = num_queues;

	qp_ctxt_hdr->start_qid = q_id;

	qp_ctxt_hdr->dest_func_id = func_id;



	hinic3_cpu_to_be32(qp_ctxt_hdr, sizeof(*qp_ctxt_hdr));

}



static u8 prepare_cmd_buf_qp_context_multi_store(struct hinic3_nic_io *nic_io,

						 struct hinic3_cmd_buf *cmd_buf,

						 enum hinic3_qp_ctxt_type ctxt_type,

	u16 start_qid, u16 max_ctxts)

{

	struct hinic3_qp_ctxt_block *qp_ctxt_block = NULL;

	u16 func_id;

	u16 i;



	qp_ctxt_block = cmd_buf->buf;

	func_id = hinic3_global_func_id(nic_io->hwdev);

	hinic3_qp_prepare_cmdq_header(&qp_ctxt_block->cmdq_hdr, ctxt_type,

				      max_ctxts, start_qid, func_id);



	for (i = 0; i < max_ctxts; i++) {

		if (ctxt_type == HINIC3_QP_CTXT_TYPE_RQ)

			hinic3_rq_prepare_ctxt(&nic_io->rq[start_qid + i],

					       &qp_ctxt_block->rq_ctxt[i]);

		else

			hinic3_sq_prepare_ctxt(&nic_io->sq[start_qid + i],

					       start_qid + i,

					       &qp_ctxt_block->sq_ctxt[i]);

	}



	return (u8)HINIC3_HTN_CMD_SQ_RQ_CONTEXT_MULTI_ST;

}



static u8 prepare_cmd_buf_clean_tso_lro_space(struct hinic3_nic_io *nic_io,

					      struct hinic3_cmd_buf *cmd_buf,

	enum hinic3_qp_ctxt_type ctxt_type)

{

	struct hinic3_clean_queue_ctxt *ctxt_block = NULL;



	ctxt_block = cmd_buf->buf;

	ctxt_block->cmdq_hdr.dest_func_id = hinic3_global_func_id(nic_io->hwdev);

	ctxt_block->cmdq_hdr.num_queues = nic_io->max_qps;

	ctxt_block->cmdq_hdr.queue_type = ctxt_type;

	ctxt_block->cmdq_hdr.start_qid = 0;



	hinic3_cpu_to_be32(ctxt_block, sizeof(*ctxt_block));



	cmd_buf->size = sizeof(*ctxt_block);

	return (u8)HINIC3_HTN_CMD_TSO_LRO_SPACE_CLEAN;

}



static void prepare_rss_indir_table_cmd_header(const struct hinic3_nic_io *nic_io,

					       const struct hinic3_cmd_buf *cmd_buf)

{

	struct hinic3_rss_cmd_header *header = cmd_buf->buf;



	header->dest_func_id = hinic3_global_func_id(nic_io->hwdev);

	hinic3_cpu_to_be32(header, sizeof(*header));

}



static u8 prepare_cmd_buf_set_rss_indir_table(const struct hinic3_nic_io *nic_io,

					      const u32 *indir_table,

					      struct hinic3_cmd_buf *cmd_buf)

{

	u32 i;

	u8 *indir_tbl = NULL;



	indir_tbl = (u8 *)cmd_buf->buf + sizeof(struct hinic3_rss_cmd_header);

	cmd_buf->size = sizeof(struct hinic3_rss_cmd_header) + NIC_RSS_INDIR_SIZE;

	memset(indir_tbl, 0, NIC_RSS_INDIR_SIZE);



	prepare_rss_indir_table_cmd_header(nic_io, cmd_buf);



	for (i = 0; i < NIC_RSS_INDIR_SIZE; i++)

		indir_tbl[i] = (u8)(*(indir_table + i));



	hinic3_cpu_to_be32(indir_tbl, NIC_RSS_INDIR_SIZE);



	return (u8)HINIC3_HTN_CMD_SET_RSS_INDIR_TABLE;

}



static u8 prepare_cmd_buf_get_rss_indir_table(const struct hinic3_nic_io *nic_io,

					      const struct hinic3_cmd_buf *cmd_buf)

{

	memset(cmd_buf->buf, 0, cmd_buf->size);

	prepare_rss_indir_table_cmd_header(nic_io, cmd_buf);



	return (u8)HINIC3_HTN_CMD_GET_RSS_INDIR_TABLE;

}



static void cmd_buf_to_rss_indir_table(const struct hinic3_cmd_buf *cmd_buf, u32 *indir_table)

{

	u32 i;

	u8 *indir_tbl = NULL;



	indir_tbl = (u8 *)cmd_buf->buf;

	hinic3_be32_to_cpu(cmd_buf->buf, NIC_RSS_INDIR_SIZE);

	for (i = 0; i < NIC_RSS_INDIR_SIZE; i++)

		indir_table[i] = *(indir_tbl + i);

}



static u8 prepare_cmd_buf_modify_svlan(struct hinic3_cmd_buf *cmd_buf,

				       u16 func_id, u16 vlan_tag, u16 q_id, u8 vlan_mode)

{

	struct hinic3_vlan_ctx *vlan_ctx = NULL;



	cmd_buf->size = sizeof(struct hinic3_vlan_ctx);

	vlan_ctx = (struct hinic3_vlan_ctx *)cmd_buf->buf;



	vlan_ctx->dest_func_id = func_id;

	vlan_ctx->start_qid = q_id;

	vlan_ctx->vlan_tag = vlan_tag;

	vlan_ctx->vlan_sel = 0; /* TPID0 in IPSU */

	vlan_ctx->vlan_mode = vlan_mode;



	hinic3_cpu_to_be32(vlan_ctx, sizeof(struct hinic3_vlan_ctx));

	return (u8)HINIC3_HTN_CMD_SVLAN_MODIFY;

}



struct hinic3_nic_cmdq_ops *hinic3_nic_cmdq_get_hw_ops(void)

{

	static struct hinic3_nic_cmdq_ops cmdq_hw_ops = {

		.prepare_cmd_buf_clean_tso_lro_space = prepare_cmd_buf_clean_tso_lro_space,

		.prepare_cmd_buf_qp_context_multi_store = prepare_cmd_buf_qp_context_multi_store,

		.prepare_cmd_buf_modify_svlan = prepare_cmd_buf_modify_svlan,

		.prepare_cmd_buf_set_rss_indir_table = prepare_cmd_buf_set_rss_indir_table,

		.prepare_cmd_buf_get_rss_indir_table = prepare_cmd_buf_get_rss_indir_table,

		.cmd_buf_to_rss_indir_table = cmd_buf_to_rss_indir_table,

	};



	return &cmdq_hw_ops;

}

drivers/net/ethernet/huawei/hinic3/adapter/hw_cmdq/hw_cmdq_ops.h

0 → 100644
+55 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/* Copyright(c) 2021 Huawei Technologies Co., Ltd */



#ifndef _HW_CMDQ_PRIVATE_H_

#define _HW_CMDQ_PRIVATE_H_



#include "ossl_knl.h"

#include "hinic3_nic_cmdq.h"



struct hinic3_qp_ctxt_header {

	u32 rsvd[2];

	u16 num_queues;

	u16 queue_type;

	u16 start_qid;

	u16 dest_func_id;

};



struct hinic3_clean_queue_ctxt {

	struct hinic3_qp_ctxt_header cmdq_hdr;

};



struct hinic3_qp_ctxt_block {

	struct hinic3_qp_ctxt_header	cmdq_hdr;

	union {

		struct hinic3_sq_ctxt	sq_ctxt[HINIC3_Q_CTXT_MAX];

		struct hinic3_rq_ctxt	rq_ctxt[HINIC3_Q_CTXT_MAX];

	};

};



struct hinic3_rss_cmd_header {

	u32 rsv[3];

	u16 rsv1;

	u16 dest_func_id;

};



/* NIC HTN CMD */

enum hinic3_htn_cmd {

	HINIC3_HTN_CMD_SQ_RQ_CONTEXT_MULTI_ST = 0x20,

	HINIC3_HTN_CMD_SQ_RQ_CONTEXT_MULTI_LD,

	HINIC3_HTN_CMD_TSO_LRO_SPACE_CLEAN,

	HINIC3_HTN_CMD_SVLAN_MODIFY,

	HINIC3_HTN_CMD_SET_RSS_INDIR_TABLE,

	HINIC3_HTN_CMD_GET_RSS_INDIR_TABLE

};



struct hinic3_vlan_ctx {

	u32 rsv[2];

	u16 vlan_tag;

	u8 vlan_sel;

	u8 vlan_mode;

	u16 start_qid;

	u16 dest_func_id;

};



#endif

drivers/net/ethernet/huawei/hinic3/adapter/sw_cmdq/sw_cmdq_ops.c

0 → 100644
+134 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* Copyright(c) 2021 Huawei Technologies Co., Ltd */



#include "hinic3_nic_cmd.h"

#include "hinic3_nic_cmdq.h"

#include "sw_cmdq_ops.h"



static void hinic3_qp_prepare_cmdq_header(struct hinic3_qp_ctxt_header *qp_ctxt_hdr,

					  enum hinic3_qp_ctxt_type ctxt_type, u16 num_queues,

					  u16 q_id)

{

	qp_ctxt_hdr->queue_type = ctxt_type;

	qp_ctxt_hdr->num_queues = num_queues;

	qp_ctxt_hdr->start_qid = q_id;

	qp_ctxt_hdr->rsvd = 0;



	hinic3_cpu_to_be32(qp_ctxt_hdr, sizeof(*qp_ctxt_hdr));

}



static u8 prepare_cmd_buf_qp_context_multi_store(struct hinic3_nic_io *nic_io,

						 struct hinic3_cmd_buf *cmd_buf,

						 enum hinic3_qp_ctxt_type ctxt_type,

	u16 start_qid, u16 max_ctxts)

{

	struct hinic3_qp_ctxt_block *qp_ctxt_block = NULL;

	u16 i;



	qp_ctxt_block = cmd_buf->buf;



	hinic3_qp_prepare_cmdq_header(&qp_ctxt_block->cmdq_hdr, ctxt_type,

				      max_ctxts, start_qid);



	for (i = 0; i < max_ctxts; i++) {

		if (ctxt_type == HINIC3_QP_CTXT_TYPE_RQ)

			hinic3_rq_prepare_ctxt(&nic_io->rq[start_qid + i],

					       &qp_ctxt_block->rq_ctxt[i]);

		else

			hinic3_sq_prepare_ctxt(&nic_io->sq[start_qid + i], start_qid + i,

					       &qp_ctxt_block->sq_ctxt[i]);

	}



	return (u8)HINIC3_UCODE_CMD_MODIFY_QUEUE_CTX;

}



static u8 prepare_cmd_buf_clean_tso_lro_space(struct hinic3_nic_io *nic_io,

					      struct hinic3_cmd_buf *cmd_buf,

					      enum hinic3_qp_ctxt_type ctxt_type)

{

	struct hinic3_clean_queue_ctxt *ctxt_block = NULL;



	ctxt_block = cmd_buf->buf;

	ctxt_block->cmdq_hdr.num_queues = nic_io->max_qps;

	ctxt_block->cmdq_hdr.queue_type = ctxt_type;

	ctxt_block->cmdq_hdr.start_qid = 0;



	hinic3_cpu_to_be32(ctxt_block, sizeof(*ctxt_block));



	cmd_buf->size = sizeof(*ctxt_block);

	return (u8)HINIC3_UCODE_CMD_CLEAN_QUEUE_CONTEXT;

}



static u8 prepare_cmd_buf_set_rss_indir_table(const struct hinic3_nic_io *nic_io,

					      const u32 *indir_table,

					      struct hinic3_cmd_buf *cmd_buf)

{

	u32 i, size;

	u32 *temp = NULL;

	struct nic_rss_indirect_tbl *indir_tbl = NULL;



	indir_tbl = (struct nic_rss_indirect_tbl *)cmd_buf->buf;

	cmd_buf->size = sizeof(struct nic_rss_indirect_tbl);

	memset(indir_tbl, 0, sizeof(*indir_tbl));



	for (i = 0; i < NIC_RSS_INDIR_SIZE; i++)

		indir_tbl->entry[i] = (u16)(*(indir_table + i));



	size = sizeof(indir_tbl->entry) / sizeof(u32);

	temp = (u32 *)indir_tbl->entry;

	for (i = 0; i < size; i++)

		temp[i] = cpu_to_be32(temp[i]);



	return (u8)HINIC3_UCODE_CMD_SET_RSS_INDIR_TABLE;

}



static u8 prepare_cmd_buf_get_rss_indir_table(const struct hinic3_nic_io *nic_io,

					      const struct hinic3_cmd_buf *cmd_buf)

{

	(void)nic_io;

	memset(cmd_buf->buf, 0, cmd_buf->size);



	return (u8)HINIC3_UCODE_CMD_GET_RSS_INDIR_TABLE;

}



static void cmd_buf_to_rss_indir_table(const struct hinic3_cmd_buf *cmd_buf, u32 *indir_table)

{

	u32 i;

	u16 *indir_tbl = NULL;



	indir_tbl = (u16 *)cmd_buf->buf;

	for (i = 0; i < NIC_RSS_INDIR_SIZE; i++)

		indir_table[i] = *(indir_tbl + i);

}



static u8 prepare_cmd_buf_modify_svlan(struct hinic3_cmd_buf *cmd_buf,

				       u16 func_id, u16 vlan_tag, u16 q_id, u8 vlan_mode)

{

	struct nic_vlan_ctx *vlan_ctx = NULL;



	cmd_buf->size = sizeof(struct nic_vlan_ctx);

	vlan_ctx = (struct nic_vlan_ctx *)cmd_buf->buf;



	vlan_ctx->func_id = func_id;

	vlan_ctx->qid = q_id;

	vlan_ctx->vlan_tag = vlan_tag;

	vlan_ctx->vlan_sel = 0; /* TPID0 in IPSU */

	vlan_ctx->vlan_mode = vlan_mode;



	hinic3_cpu_to_be32(vlan_ctx, sizeof(struct nic_vlan_ctx));

	return (u8)HINIC3_UCODE_CMD_MODIFY_VLAN_CTX;

}



struct hinic3_nic_cmdq_ops *hinic3_nic_cmdq_get_sw_ops(void)

{

	static struct hinic3_nic_cmdq_ops cmdq_sw_ops = {

		.prepare_cmd_buf_clean_tso_lro_space = prepare_cmd_buf_clean_tso_lro_space,

		.prepare_cmd_buf_qp_context_multi_store = prepare_cmd_buf_qp_context_multi_store,

		.prepare_cmd_buf_modify_svlan = prepare_cmd_buf_modify_svlan,

		.prepare_cmd_buf_set_rss_indir_table = prepare_cmd_buf_set_rss_indir_table,

		.prepare_cmd_buf_get_rss_indir_table = prepare_cmd_buf_get_rss_indir_table,

		.cmd_buf_to_rss_indir_table = cmd_buf_to_rss_indir_table,

	};



	return &cmdq_sw_ops;

}

drivers/net/ethernet/huawei/hinic3/adapter/sw_cmdq/sw_cmdq_ops.h

0 → 100644
+38 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/* Copyright(c) 2021 Huawei Technologies Co., Ltd */



#ifndef _SW_CMDQ_PRIVATE_H_

#define _SW_CMDQ_PRIVATE_H_



#include "ossl_knl.h"

#include "hinic3_nic_cmdq.h"



struct hinic3_qp_ctxt_header {

	u16	num_queues;

	u16	queue_type;

	u16	start_qid;

	u16	rsvd;

};



struct hinic3_clean_queue_ctxt {

	struct hinic3_qp_ctxt_header cmdq_hdr;

	u32 rsvd;

};



struct hinic3_qp_ctxt_block {

	struct hinic3_qp_ctxt_header	cmdq_hdr;

	union {

		struct hinic3_sq_ctxt	sq_ctxt[HINIC3_Q_CTXT_MAX];

		struct hinic3_rq_ctxt	rq_ctxt[HINIC3_Q_CTXT_MAX];

	};

};



struct hinic3_vlan_ctx {

	u32 func_id;

	u32 qid; /* if qid = 0xFFFF, config current function all queue */

	u32 vlan_id;

	u32 vlan_mode;

	u32 vlan_sel;

};



#endif