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

Commit b462d22b authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'qed-qedr-infrastructure' 



Yuval Mintz says:

====================
qed*: Add qedr infrastructure support

In the last couple of weeks we've been sending RFCs for the qedr
driver - the RoCE driver for QLogic FastLinQ 4xxxx line of adapters.
Latest RFC can be found at [1].

At Doug's advice [2], we've decided to split the series into two:
 - first part contains the qed backbone that's necessary for all the
configurations relating to the qedr driver, as well as the qede
infrastructure that is used for communication between the qedr and qede.
 - Second part consists of the actual qedr driver and introduces almost
no changes to qed/qede.

This is the first of said two parts. The second half would be sent
later this week.

The only 'oddity' in the devision are the Kconfig options -
As this series introduces both LL2 and QEDR-based logic in qed/qede,
I wanted to add the CONFIG_INFINIBAND_QEDR option here [with default n].
Otherwise, a lot of the code introduced would be dead-code [won't even
be compiled] until qedr is accepted.
As a result I've placed the config option in an odd place - under
qlogic's Kconfig. The second series would then remove that option
and add it in its correct place under the infiniband Kconfig.
[I'm fine with pushing it there to begin with, but I didn't want to
'contaminate' non-qlogic configuration files with half-baked options].

Dave - I don't think you were E-mailed with Doug's suggestion.
I think the notion was to have the two halves accepted side-by-side,
but actually the first has no dependency issues, so it's also
possible to simply take this first to net-next, and push the qedr
into rdma once it's merged. But it's basically up to you and Doug;
We'd align with whatever suits you best.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b9118b72 abd49676

drivers/net/ethernet/qlogic/Kconfig

+14 −0
Original line number Diff line number Diff line
@@ -88,6 +88,9 @@ config QED 
	---help---

	  This enables the support for ...



config QED_LL2

	bool



config QED_SRIOV

	bool "QLogic QED 25/40/100Gb SR-IOV support"

	depends on QED && PCI_IOV
@@ -104,4 +107,15 @@ config QEDE 
	---help---

	  This enables the support for ...



config INFINIBAND_QEDR

	tristate "QLogic qede RoCE sources [debug]"

	depends on QEDE && 64BIT

	select QED_LL2

	default n

	---help---

	  This provides a temporary node that allows the compilation

	  and logical testing of the InfiniBand over Ethernet support

	  for QLogic QED. This would be replaced by the 'real' option

	  once the QEDR driver is added [+relocated].



endif # NET_VENDOR_QLOGIC

drivers/net/ethernet/qlogic/qed/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -4,3 +4,5 @@ qed-y := qed_cxt.o qed_dev.o qed_hw.o qed_init_fw_funcs.o qed_init_ops.o \ 
	 qed_int.o qed_main.o qed_mcp.o qed_sp_commands.o qed_spq.o qed_l2.o \

	 qed_selftest.o qed_dcbx.o qed_debug.o

qed-$(CONFIG_QED_SRIOV) += qed_sriov.o qed_vf.o

qed-$(CONFIG_QED_LL2) += qed_ll2.o

qed-$(CONFIG_INFINIBAND_QEDR) += qed_roce.o

drivers/net/ethernet/qlogic/qed/qed.h

+42 −1
Original line number Diff line number Diff line
@@ -35,6 +35,9 @@ extern const struct qed_common_ops qed_common_ops_pass; 


#define QED_WFQ_UNIT	100



#define QED_WID_SIZE            (1024)

#define QED_PF_DEMS_SIZE        (4)



/* cau states */

enum qed_coalescing_mode {

	QED_COAL_MODE_DISABLE,
@@ -48,6 +51,14 @@ enum qed_mcp_protocol_type; 


/* helpers */

static inline u32 qed_db_addr(u32 cid, u32 DEMS)

{

	u32 db_addr = FIELD_VALUE(DB_LEGACY_ADDR_DEMS, DEMS) |

		      (cid * QED_PF_DEMS_SIZE);



	return db_addr;

}



static inline u32 qed_db_addr_vf(u32 cid, u32 DEMS)

{

	u32 db_addr = FIELD_VALUE(DB_LEGACY_ADDR_DEMS, DEMS) |

		      FIELD_VALUE(DB_LEGACY_ADDR_ICID, cid);
@@ -72,6 +83,7 @@ struct qed_sb_info; 
struct qed_sb_attn_info;

struct qed_cxt_mngr;

struct qed_sb_sp_info;

struct qed_ll2_info;

struct qed_mcp_info;



struct qed_rt_data {
@@ -151,13 +163,17 @@ enum QED_RESOURCES { 
	QED_RL,

	QED_MAC,

	QED_VLAN,

	QED_RDMA_CNQ_RAM,

	QED_ILT,

	QED_LL2_QUEUE,

	QED_RDMA_STATS_QUEUE,

	QED_MAX_RESC,

};



enum QED_FEATURE {

	QED_PF_L2_QUE,

	QED_VF,

	QED_RDMA_CNQ,

	QED_MAX_FEATURES,

};
@@ -360,6 +376,9 @@ struct qed_hwfn { 
	struct qed_sb_attn_info		*p_sb_attn;



	/* Protocol related */

	bool				using_ll2;

	struct qed_ll2_info		*p_ll2_info;

	struct qed_rdma_info		*p_rdma_info;

	struct qed_pf_params		pf_params;



	bool b_rdma_enabled_in_prs;
@@ -398,6 +417,17 @@ struct qed_hwfn { 


	struct dbg_tools_data		dbg_info;



	/* PWM region specific data */

	u32				dpi_size;

	u32				dpi_count;



	/* This is used to calculate the doorbell address */

	u32 dpi_start_offset;



	/* If one of the following is set then EDPM shouldn't be used */

	u8 dcbx_no_edpm;

	u8 db_bar_no_edpm;



	struct qed_simd_fp_handler	simd_proto_handler[64];



#ifdef CONFIG_QED_SRIOV
@@ -407,6 +437,7 @@ struct qed_hwfn { 
#endif



	struct z_stream_s		*stream;

	struct qed_roce_ll2_info	*ll2;

};



struct pci_params {
@@ -431,6 +462,8 @@ struct qed_int_params { 
	bool			fp_initialized;

	u8			fp_msix_base;

	u8			fp_msix_cnt;

	u8			rdma_msix_base;

	u8			rdma_msix_cnt;

};



struct qed_dbg_feature {
@@ -537,7 +570,6 @@ struct qed_dev { 


	bool				b_is_vf;

	u32				drv_type;



	struct qed_eth_stats		*reset_stats;

	struct qed_fw_data		*fw_data;
@@ -564,7 +596,16 @@ struct qed_dev { 


	struct qed_dbg_params		dbg_params;



#ifdef CONFIG_QED_LL2

	struct qed_cb_ll2_info		*ll2;

	u8				ll2_mac_address[ETH_ALEN];

#endif



	const struct firmware		*firmware;



	u32 rdma_max_sge;

	u32 rdma_max_inline;

	u32 rdma_max_srq_sge;

};



#define NUM_OF_VFS(dev)         MAX_NUM_VFS_BB

drivers/net/ethernet/qlogic/qed/qed_cxt.c

+8 −0
Original line number Diff line number Diff line
@@ -48,7 +48,13 @@ 
#define TM_ELEM_SIZE    4



/* ILT constants */

#if IS_ENABLED(CONFIG_INFINIBAND_QEDR)

/* For RoCE we configure to 64K to cover for RoCE max tasks 256K purpose. */

#define ILT_DEFAULT_HW_P_SIZE		4

#else

#define ILT_DEFAULT_HW_P_SIZE		3

#endif



#define ILT_PAGE_IN_BYTES(hw_p_size)	(1U << ((hw_p_size) + 12))

#define ILT_CFG_REG(cli, reg)	PSWRQ2_REG_ ## cli ## _ ## reg ## _RT_OFFSET
@@ -1839,6 +1845,8 @@ int qed_cxt_set_pf_params(struct qed_hwfn *p_hwfn) 
	/* Set the number of required CORE connections */

	u32 core_cids = 1; /* SPQ */



	if (p_hwfn->using_ll2)

		core_cids += 4;

	qed_cxt_set_proto_cid_count(p_hwfn, PROTOCOLID_CORE, core_cids, 0);



	switch (p_hwfn->hw_info.personality) {

drivers/net/ethernet/qlogic/qed/qed_cxt.h

+7 −0
Original line number Diff line number Diff line
@@ -170,6 +170,13 @@ int qed_qm_reconf(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt); 
 */

void qed_cxt_release_cid(struct qed_hwfn *p_hwfn,

			 u32 cid);

int qed_cxt_dynamic_ilt_alloc(struct qed_hwfn *p_hwfn,

			      enum qed_cxt_elem_type elem_type, u32 iid);

u32 qed_cxt_get_proto_tid_count(struct qed_hwfn *p_hwfn,

				enum protocol_type type);

u32 qed_cxt_get_proto_cid_start(struct qed_hwfn *p_hwfn,

				enum protocol_type type);

int qed_cxt_free_proto_ilt(struct qed_hwfn *p_hwfn, enum protocol_type proto);



#define QED_CTX_WORKING_MEM 0

#define QED_CTX_FL_MEM 1