Commit d25a0fc4 authored by Dave Ertman's avatar Dave Ertman Committed by Tony Nguyen
Browse files

ice: Initialize RDMA support 



Probe the device's capabilities to see if it supports RDMA. If so, allocate
and reserve resources to support its operation; populate structures with
initial values.

Signed-off-by: default avatarDave Ertman <david.m.ertman@intel.com>
Signed-off-by: default avatarShiraz Saleem <shiraz.saleem@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent e860fa9b

drivers/net/ethernet/intel/ice/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ ice-y := ice_main.o \ 
	 ice_ethtool_fdir.o \

	 ice_flex_pipe.o \

	 ice_flow.o	\

	 ice_idc.o	\

	 ice_devlink.o	\

	 ice_fw_update.o \

	 ice_lag.o	\

drivers/net/ethernet/intel/ice/ice.h

+29 −1
Original line number Diff line number Diff line
@@ -78,6 +78,8 @@ 
#define ICE_MIN_LAN_OICR_MSIX	1

#define ICE_MIN_MSIX		(ICE_MIN_LAN_TXRX_MSIX + ICE_MIN_LAN_OICR_MSIX)

#define ICE_FDIR_MSIX		2

#define ICE_RDMA_NUM_AEQ_MSIX	4

#define ICE_MIN_RDMA_MSIX	2

#define ICE_NO_VSI		0xffff

#define ICE_VSI_MAP_CONTIG	0

#define ICE_VSI_MAP_SCATTER	1
@@ -88,8 +90,9 @@ 
#define ICE_MAX_LG_RSS_QS	256

#define ICE_RES_VALID_BIT	0x8000

#define ICE_RES_MISC_VEC_ID	(ICE_RES_VALID_BIT - 1)

#define ICE_RES_RDMA_VEC_ID	(ICE_RES_MISC_VEC_ID - 1)

/* All VF control VSIs share the same IRQ, so assign a unique ID for them */

#define ICE_RES_VF_CTRL_VEC_ID	(ICE_RES_MISC_VEC_ID - 1)

#define ICE_RES_VF_CTRL_VEC_ID	(ICE_RES_RDMA_VEC_ID - 1)

#define ICE_INVAL_Q_INDEX	0xffff

#define ICE_INVAL_VFID		256
@@ -373,12 +376,14 @@ struct ice_q_vector { 


enum ice_pf_flags {

	ICE_FLAG_FLTR_SYNC,

	ICE_FLAG_RDMA_ENA,

	ICE_FLAG_RSS_ENA,

	ICE_FLAG_SRIOV_ENA,

	ICE_FLAG_SRIOV_CAPABLE,

	ICE_FLAG_DCB_CAPABLE,

	ICE_FLAG_DCB_ENA,

	ICE_FLAG_FD_ENA,

	ICE_FLAG_AUX_ENA,

	ICE_FLAG_ADV_FEATURES,

	ICE_FLAG_LINK_DOWN_ON_CLOSE_ENA,

	ICE_FLAG_TOTAL_PORT_SHUTDOWN_ENA,
@@ -439,6 +444,8 @@ struct ice_pf { 
	struct mutex sw_mutex;		/* lock for protecting VSI alloc flow */

	struct mutex tc_mutex;		/* lock to protect TC changes */

	u32 msg_enable;

	u16 num_rdma_msix;		/* Total MSIX vectors for RDMA driver */

	u16 rdma_base_vector;



	/* spinlock to protect the AdminQ wait list */

	spinlock_t aq_wait_lock;
@@ -471,6 +478,8 @@ struct ice_pf { 
	unsigned long tx_timeout_last_recovery;

	u32 tx_timeout_recovery_level;

	char int_name[ICE_INT_NAME_STR_LEN];

	struct auxiliary_device *adev;

	int aux_idx;

	u32 sw_int_count;



	__le64 nvm_phy_type_lo; /* NVM PHY type low */
@@ -636,6 +645,7 @@ int ice_get_rss_key(struct ice_vsi *vsi, u8 *seed); 
void ice_fill_rss_lut(u8 *lut, u16 rss_table_size, u16 rss_size);

int ice_schedule_reset(struct ice_pf *pf, enum ice_reset_req reset);

void ice_print_link_msg(struct ice_vsi *vsi, bool isup);

int ice_init_rdma(struct ice_pf *pf);

const char *ice_stat_str(enum ice_status stat_err);

const char *ice_aq_str(enum ice_aq_err aq_err);

bool ice_is_wol_supported(struct ice_hw *hw);
@@ -660,4 +670,22 @@ int ice_open_internal(struct net_device *netdev); 
int ice_stop(struct net_device *netdev);

void ice_service_task_schedule(struct ice_pf *pf);



/**

 * ice_set_rdma_cap - enable RDMA support

 * @pf: PF struct

 */

static inline void ice_set_rdma_cap(struct ice_pf *pf)

{

	if (pf->hw.func_caps.common_cap.rdma && pf->num_rdma_msix)

		set_bit(ICE_FLAG_RDMA_ENA, pf->flags);

}



/**

 * ice_clear_rdma_cap - disable RDMA support

 * @pf: PF struct

 */

static inline void ice_clear_rdma_cap(struct ice_pf *pf)

{

	clear_bit(ICE_FLAG_RDMA_ENA, pf->flags);

}

#endif /* _ICE_H_ */

drivers/net/ethernet/intel/ice/ice_adminq_cmd.h

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ struct ice_aqc_list_caps_elem { 
#define ICE_AQC_CAPS_PENDING_OROM_VER			0x004B

#define ICE_AQC_CAPS_NET_VER				0x004C

#define ICE_AQC_CAPS_PENDING_NET_VER			0x004D

#define ICE_AQC_CAPS_RDMA				0x0051

#define ICE_AQC_CAPS_NVM_MGMT				0x0080



	u8 major_ver;

drivers/net/ethernet/intel/ice/ice_common.c

+16 −1
Original line number Diff line number Diff line
@@ -1062,7 +1062,8 @@ enum ice_status ice_check_reset(struct ice_hw *hw) 
				 GLNVM_ULD_POR_DONE_1_M |\

				 GLNVM_ULD_PCIER_DONE_2_M)



	uld_mask = ICE_RESET_DONE_MASK;

	uld_mask = ICE_RESET_DONE_MASK | (hw->func_caps.common_cap.rdma ?

					  GLNVM_ULD_PE_DONE_M : 0);



	/* Device is Active; check Global Reset processes are done */

	for (cnt = 0; cnt < ICE_PF_RESET_WAIT_COUNT; cnt++) {
@@ -1938,6 +1939,10 @@ ice_parse_common_caps(struct ice_hw *hw, struct ice_hw_common_caps *caps, 
		ice_debug(hw, ICE_DBG_INIT, "%s: nvm_unified_update = %d\n", prefix,

			  caps->nvm_unified_update);

		break;

	case ICE_AQC_CAPS_RDMA:

		caps->rdma = (number == 1);

		ice_debug(hw, ICE_DBG_INIT, "%s: rdma = %d\n", prefix, caps->rdma);

		break;

	case ICE_AQC_CAPS_MAX_MTU:

		caps->max_mtu = number;

		ice_debug(hw, ICE_DBG_INIT, "%s: max_mtu = %d\n",
@@ -1971,6 +1976,16 @@ ice_recalc_port_limited_caps(struct ice_hw *hw, struct ice_hw_common_caps *caps) 
		caps->maxtc = 4;

		ice_debug(hw, ICE_DBG_INIT, "reducing maxtc to %d (based on #ports)\n",

			  caps->maxtc);

		if (caps->rdma) {

			ice_debug(hw, ICE_DBG_INIT, "forcing RDMA off\n");

			caps->rdma = 0;

		}



		/* print message only when processing device capabilities

		 * during initialization.

		 */

		if (caps == &hw->dev_caps.common_cap)

			dev_info(ice_hw_to_dev(hw), "RDMA functionality is not available with the current device configuration.\n");

	}

}

drivers/net/ethernet/intel/ice/ice_idc.c

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

/* Copyright (C) 2021, Intel Corporation. */



/* Inter-Driver Communication */

#include "ice.h"

#include "ice_lib.h"

#include "ice_dcb_lib.h"



/**

 * ice_reserve_rdma_qvector - Reserve vector resources for RDMA driver

 * @pf: board private structure to initialize

 */

static int ice_reserve_rdma_qvector(struct ice_pf *pf)

{

	if (test_bit(ICE_FLAG_RDMA_ENA, pf->flags)) {

		int index;



		index = ice_get_res(pf, pf->irq_tracker, pf->num_rdma_msix,

				    ICE_RES_RDMA_VEC_ID);

		if (index < 0)

			return index;

		pf->num_avail_sw_msix -= pf->num_rdma_msix;

		pf->rdma_base_vector = (u16)index;

	}

	return 0;

}



/**

 * ice_init_rdma - initializes PF for RDMA use

 * @pf: ptr to ice_pf

 */

int ice_init_rdma(struct ice_pf *pf)

{

	struct device *dev = &pf->pdev->dev;

	int ret;



	/* Reserve vector resources */

	ret = ice_reserve_rdma_qvector(pf);

	if (ret < 0)

		dev_err(dev, "failed to reserve vectors for RDMA\n");



	return ret;

}