qed: Add llh ppfid interface and 100g support for offload protocols (79284ade) · Commits · e / devices / android_kernel_fairphone_FP5

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

+19 −2

Original line number	Original line	Diff line number	Diff line
	@@ -140,6 +140,7 @@ struct qed_cxt_mngr;
	struct qed_sb_sp_info;		struct qed_sb_sp_info;
	struct qed_ll2_info;		struct qed_ll2_info;
	struct qed_mcp_info;		struct qed_mcp_info;
			struct qed_llh_info;

	struct qed_rt_data {		struct qed_rt_data {
	u32 *init_val;		u32 *init_val;
	@@ -741,6 +742,7 @@ struct qed_dev {
	#define QED_DEV_ID_MASK 0xff00		#define QED_DEV_ID_MASK 0xff00
	#define QED_DEV_ID_MASK_BB 0x1600		#define QED_DEV_ID_MASK_BB 0x1600
	#define QED_DEV_ID_MASK_AH 0x8000		#define QED_DEV_ID_MASK_AH 0x8000
			#define QED_IS_E4(dev) (QED_IS_BB(dev) \|\| QED_IS_AH(dev))

	u16 chip_num;		u16 chip_num;
	#define CHIP_NUM_MASK 0xffff		#define CHIP_NUM_MASK 0xffff
	@@ -801,6 +803,11 @@ struct qed_dev {
	u8 num_hwfns;		u8 num_hwfns;
	struct qed_hwfn hwfns[MAX_HWFNS_PER_DEVICE];		struct qed_hwfn hwfns[MAX_HWFNS_PER_DEVICE];

			/* Engine affinity */
			u8 l2_affin_hint;
			u8 fir_affin;
			u8 iwarp_affin;

	/* SRIOV */		/* SRIOV */
	struct qed_hw_sriov_info *p_iov_info;		struct qed_hw_sriov_info *p_iov_info;
	#define IS_QED_SRIOV(cdev) (!!(cdev)->p_iov_info)		#define IS_QED_SRIOV(cdev) (!!(cdev)->p_iov_info)
	@@ -815,6 +822,10 @@ struct qed_dev {
	/* Recovery */		/* Recovery */
	bool recov_in_prog;		bool recov_in_prog;

			/* LLH info */
			u8 ppfid_bitmap;
			struct qed_llh_info *p_llh_info;

	/* Linux specific here */		/* Linux specific here */
	struct qede_dev *edev;		struct qede_dev *edev;
	struct pci_dev *pdev;		struct pci_dev *pdev;
	@@ -904,6 +915,14 @@ void qed_set_fw_mac_addr(__le16 *fw_msb,
	__le16 fw_mid, __le16 fw_lsb, u8 *mac);		__le16 fw_mid, __le16 fw_lsb, u8 *mac);

	#define QED_LEADING_HWFN(dev) (&dev->hwfns[0])		#define QED_LEADING_HWFN(dev) (&dev->hwfns[0])
			#define QED_IS_CMT(dev) ((dev)->num_hwfns > 1)
			/* Macros for getting the engine-affinitized hwfn (FIR: fcoe,iscsi,roce) */
			#define QED_FIR_AFFIN_HWFN(dev) (&(dev)->hwfns[dev->fir_affin])
			#define QED_IWARP_AFFIN_HWFN(dev) (&(dev)->hwfns[dev->iwarp_affin])
			#define QED_AFFIN_HWFN(dev) \
			(QED_IS_IWARP_PERSONALITY(QED_LEADING_HWFN(dev)) ? \
			QED_IWARP_AFFIN_HWFN(dev) : QED_FIR_AFFIN_HWFN(dev))
			#define QED_AFFIN_HWFN_IDX(dev) (IS_LEAD_HWFN(QED_AFFIN_HWFN(dev)) ? 0 : 1)

	/* Flags for indication of required queues */		/* Flags for indication of required queues */
	#define PQ_FLAGS_RLS (BIT(0))		#define PQ_FLAGS_RLS (BIT(0))
	@@ -923,8 +942,6 @@ u16 qed_get_cm_pq_idx_vf(struct qed_hwfn *p_hwfn, u16 vf);
	u16 qed_get_cm_pq_idx_ofld_mtc(struct qed_hwfn *p_hwfn, u8 tc);		u16 qed_get_cm_pq_idx_ofld_mtc(struct qed_hwfn *p_hwfn, u8 tc);
	u16 qed_get_cm_pq_idx_llt_mtc(struct qed_hwfn *p_hwfn, u8 tc);		u16 qed_get_cm_pq_idx_llt_mtc(struct qed_hwfn *p_hwfn, u8 tc);

	#define QED_LEADING_HWFN(dev) (&dev->hwfns[0])

	/* doorbell recovery mechanism */		/* doorbell recovery mechanism */
	void qed_db_recovery_dp(struct qed_hwfn *p_hwfn);		void qed_db_recovery_dp(struct qed_hwfn *p_hwfn);
	void qed_db_recovery_execute(struct qed_hwfn *p_hwfn);		void qed_db_recovery_execute(struct qed_hwfn *p_hwfn);

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

+983 −263

File changed.

Preview size limit exceeded, changes collapsed.

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

+69 −28

Original line number	Original line	Diff line number	Diff line
	@@ -374,26 +374,66 @@ int qed_fw_rss_eng(struct qed_hwfn *p_hwfn,
	u8 *dst_id);		u8 *dst_id);

	/**		/**
	* @brief qed_llh_add_mac_filter - configures a MAC filter in llh		* @brief qed_llh_get_num_ppfid - Return the allocated number of LLH filter
			* banks that are allocated to the PF.
	*		*
	* @param p_hwfn		* @param cdev
	* @param p_ptt		*
	* @param p_filter - MAC to add		* @return u8 - Number of LLH filter banks
	*/		*/
	int qed_llh_add_mac_filter(struct qed_hwfn *p_hwfn,		u8 qed_llh_get_num_ppfid(struct qed_dev *cdev);
	struct qed_ptt p_ptt, u8 p_filter);
			enum qed_eng {
			QED_ENG0,
			QED_ENG1,
			QED_BOTH_ENG,
			};

	/**		/**
	* @brief qed_llh_remove_mac_filter - removes a MAC filter from llh		* @brief qed_llh_set_ppfid_affinity - Set the engine affinity for the given
			* LLH filter bank.
			*
			* @param cdev
			* @param ppfid - relative within the allocated ppfids ('0' is the default one).
			* @param eng
			*
			* @return int
			*/
			int qed_llh_set_ppfid_affinity(struct qed_dev *cdev,
			u8 ppfid, enum qed_eng eng);

			/**
			* @brief qed_llh_set_roce_affinity - Set the RoCE engine affinity
			*
			* @param cdev
			* @param eng
			*
			* @return int
			*/
			int qed_llh_set_roce_affinity(struct qed_dev *cdev, enum qed_eng eng);

			/**
			* @brief qed_llh_add_mac_filter - Add a LLH MAC filter into the given filter
			* bank.
			*
			* @param cdev
			* @param ppfid - relative within the allocated ppfids ('0' is the default one).
			* @param mac_addr - MAC to add
			*/
			int qed_llh_add_mac_filter(struct qed_dev *cdev,
			u8 ppfid, u8 mac_addr[ETH_ALEN]);

			/**
			* @brief qed_llh_remove_mac_filter - Remove a LLH MAC filter from the given
			* filter bank.
	*		*
	* @param p_hwfn
	* @param p_ptt		* @param p_ptt
	* @param p_filter - MAC to remove		* @param p_filter - MAC to remove
	*/		*/
	void qed_llh_remove_mac_filter(struct qed_hwfn *p_hwfn,		void qed_llh_remove_mac_filter(struct qed_dev *cdev,
	struct qed_ptt p_ptt, u8 p_filter);		u8 ppfid, u8 mac_addr[ETH_ALEN]);

	enum qed_llh_port_filter_type_t {		enum qed_llh_prot_filter_type_t {
	QED_LLH_FILTER_ETHERTYPE,		QED_LLH_FILTER_ETHERTYPE,
	QED_LLH_FILTER_TCP_SRC_PORT,		QED_LLH_FILTER_TCP_SRC_PORT,
	QED_LLH_FILTER_TCP_DEST_PORT,		QED_LLH_FILTER_TCP_DEST_PORT,
	@@ -404,36 +444,37 @@ enum qed_llh_port_filter_type_t {
	};		};

	/**		/**
	* @brief qed_llh_add_protocol_filter - configures a protocol filter in llh		* @brief qed_llh_add_protocol_filter - Add a LLH protocol filter into the
			* given filter bank.
	*		*
	* @param p_hwfn		* @param cdev
	* @param p_ptt		* @param ppfid - relative within the allocated ppfids ('0' is the default one).
			* @param type - type of filters and comparing
	* @param source_port_or_eth_type - source port or ethertype to add		* @param source_port_or_eth_type - source port or ethertype to add
	* @param dest_port - destination port to add		* @param dest_port - destination port to add
	* @param type - type of filters and comparing		* @param type - type of filters and comparing
	*/		*/
	int		int
	qed_llh_add_protocol_filter(struct qed_hwfn *p_hwfn,		qed_llh_add_protocol_filter(struct qed_dev *cdev,
	struct qed_ptt *p_ptt,		u8 ppfid,
	u16 source_port_or_eth_type,		enum qed_llh_prot_filter_type_t type,
	u16 dest_port,		u16 source_port_or_eth_type, u16 dest_port);
	enum qed_llh_port_filter_type_t type);

	/**		/**
	* @brief qed_llh_remove_protocol_filter - remove a protocol filter in llh		* @brief qed_llh_remove_protocol_filter - Remove a LLH protocol filter from
			* the given filter bank.
	*		*
	* @param p_hwfn		* @param cdev
	* @param p_ptt		* @param ppfid - relative within the allocated ppfids ('0' is the default one).
			* @param type - type of filters and comparing
	* @param source_port_or_eth_type - source port or ethertype to add		* @param source_port_or_eth_type - source port or ethertype to add
	* @param dest_port - destination port to add		* @param dest_port - destination port to add
	* @param type - type of filters and comparing
	*/		*/
	void		void
	qed_llh_remove_protocol_filter(struct qed_hwfn *p_hwfn,		qed_llh_remove_protocol_filter(struct qed_dev *cdev,
	struct qed_ptt *p_ptt,		u8 ppfid,
	u16 source_port_or_eth_type,		enum qed_llh_prot_filter_type_t type,
	u16 dest_port,		u16 source_port_or_eth_type, u16 dest_port);
	enum qed_llh_port_filter_type_t type);

	/**		/**
	* *@brief Cleanup of previous driver remains prior to load		* *@brief Cleanup of previous driver remains prior to load

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

+15 −1

Original line number	Original line	Diff line number	Diff line
	@@ -12614,6 +12614,8 @@ struct public_drv_mb {
	#define DRV_MSG_CODE_SET_LED_MODE 0x00200000		#define DRV_MSG_CODE_SET_LED_MODE 0x00200000
	#define DRV_MSG_CODE_RESOURCE_CMD 0x00230000		#define DRV_MSG_CODE_RESOURCE_CMD 0x00230000
	#define DRV_MSG_CODE_GET_TLV_DONE 0x002f0000		#define DRV_MSG_CODE_GET_TLV_DONE 0x002f0000
			#define DRV_MSG_CODE_GET_ENGINE_CONFIG 0x00370000
			#define DRV_MSG_CODE_GET_PPFID_BITMAP 0x43000000

	#define RESOURCE_CMD_REQ_RESC_MASK 0x0000001F		#define RESOURCE_CMD_REQ_RESC_MASK 0x0000001F
	#define RESOURCE_CMD_REQ_RESC_SHIFT 0		#define RESOURCE_CMD_REQ_RESC_SHIFT 0
	@@ -12802,6 +12804,18 @@ struct public_drv_mb {

	#define FW_MB_PARAM_LOAD_DONE_DID_EFUSE_ERROR (1 << 0)		#define FW_MB_PARAM_LOAD_DONE_DID_EFUSE_ERROR (1 << 0)

			#define FW_MB_PARAM_ENG_CFG_FIR_AFFIN_VALID_MASK 0x00000001
			#define FW_MB_PARAM_ENG_CFG_FIR_AFFIN_VALID_SHIFT 0
			#define FW_MB_PARAM_ENG_CFG_FIR_AFFIN_VALUE_MASK 0x00000002
			#define FW_MB_PARAM_ENG_CFG_FIR_AFFIN_VALUE_SHIFT 1
			#define FW_MB_PARAM_ENG_CFG_L2_AFFIN_VALID_MASK 0x00000004
			#define FW_MB_PARAM_ENG_CFG_L2_AFFIN_VALID_SHIFT 2
			#define FW_MB_PARAM_ENG_CFG_L2_AFFIN_VALUE_MASK 0x00000008
			#define FW_MB_PARAM_ENG_CFG_L2_AFFIN_VALUE_SHIFT 3

			#define FW_MB_PARAM_PPFID_BITMAP_MASK 0xFF
			#define FW_MB_PARAM_PPFID_BITMAP_SHIFT 0

	u32 drv_pulse_mb;		u32 drv_pulse_mb;
	#define DRV_PULSE_SEQ_MASK 0x00007fff		#define DRV_PULSE_SEQ_MASK 0x00007fff
	#define DRV_PULSE_SYSTEM_TIME_MASK 0xffff0000		#define DRV_PULSE_SYSTEM_TIME_MASK 0xffff0000

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

+12 −12

Original line number	Original line	Diff line number	Diff line
	@@ -2528,7 +2528,7 @@ qed_iwarp_ll2_slowpath(void *cxt,
	memset(fpdu, 0, sizeof(*fpdu));		memset(fpdu, 0, sizeof(*fpdu));
	}		}

	static int qed_iwarp_ll2_stop(struct qed_hwfn p_hwfn, struct qed_ptt p_ptt)		static int qed_iwarp_ll2_stop(struct qed_hwfn *p_hwfn)
	{		{
	struct qed_iwarp_info *iwarp_info = &p_hwfn->p_rdma_info->iwarp;		struct qed_iwarp_info *iwarp_info = &p_hwfn->p_rdma_info->iwarp;
	int rc = 0;		int rc = 0;
	@@ -2563,8 +2563,9 @@ static int qed_iwarp_ll2_stop(struct qed_hwfn p_hwfn, struct qed_ptt p_ptt)
	iwarp_info->ll2_mpa_handle = QED_IWARP_HANDLE_INVAL;		iwarp_info->ll2_mpa_handle = QED_IWARP_HANDLE_INVAL;
	}		}

	qed_llh_remove_mac_filter(p_hwfn,		qed_llh_remove_mac_filter(p_hwfn->cdev, 0,
	p_ptt, p_hwfn->p_rdma_info->iwarp.mac_addr);		p_hwfn->p_rdma_info->iwarp.mac_addr);

	return rc;		return rc;
	}		}

	@@ -2608,8 +2609,7 @@ qed_iwarp_ll2_alloc_buffers(struct qed_hwfn *p_hwfn,

	static int		static int
	qed_iwarp_ll2_start(struct qed_hwfn *p_hwfn,		qed_iwarp_ll2_start(struct qed_hwfn *p_hwfn,
	struct qed_rdma_start_in_params *params,		struct qed_rdma_start_in_params *params)
	struct qed_ptt *p_ptt)
	{		{
	struct qed_iwarp_info *iwarp_info;		struct qed_iwarp_info *iwarp_info;
	struct qed_ll2_acquire_data data;		struct qed_ll2_acquire_data data;
	@@ -2628,7 +2628,7 @@ qed_iwarp_ll2_start(struct qed_hwfn *p_hwfn,

	ether_addr_copy(p_hwfn->p_rdma_info->iwarp.mac_addr, params->mac_addr);		ether_addr_copy(p_hwfn->p_rdma_info->iwarp.mac_addr, params->mac_addr);

	rc = qed_llh_add_mac_filter(p_hwfn, p_ptt, params->mac_addr);		rc = qed_llh_add_mac_filter(p_hwfn->cdev, 0, params->mac_addr);
	if (rc)		if (rc)
	return rc;		return rc;

	@@ -2653,7 +2653,7 @@ qed_iwarp_ll2_start(struct qed_hwfn *p_hwfn,
	rc = qed_ll2_acquire_connection(p_hwfn, &data);		rc = qed_ll2_acquire_connection(p_hwfn, &data);
	if (rc) {		if (rc) {
	DP_NOTICE(p_hwfn, "Failed to acquire LL2 connection\n");		DP_NOTICE(p_hwfn, "Failed to acquire LL2 connection\n");
	qed_llh_remove_mac_filter(p_hwfn, p_ptt, params->mac_addr);		qed_llh_remove_mac_filter(p_hwfn->cdev, 0, params->mac_addr);
	return rc;		return rc;
	}		}

	@@ -2757,12 +2757,12 @@ qed_iwarp_ll2_start(struct qed_hwfn *p_hwfn,
	&iwarp_info->mpa_buf_list);		&iwarp_info->mpa_buf_list);
	return rc;		return rc;
	err:		err:
	qed_iwarp_ll2_stop(p_hwfn, p_ptt);		qed_iwarp_ll2_stop(p_hwfn);

	return rc;		return rc;
	}		}

	int qed_iwarp_setup(struct qed_hwfn p_hwfn, struct qed_ptt p_ptt,		int qed_iwarp_setup(struct qed_hwfn *p_hwfn,
	struct qed_rdma_start_in_params *params)		struct qed_rdma_start_in_params *params)
	{		{
	struct qed_iwarp_info *iwarp_info;		struct qed_iwarp_info *iwarp_info;
	@@ -2794,10 +2794,10 @@ int qed_iwarp_setup(struct qed_hwfn p_hwfn, struct qed_ptt p_ptt,
	qed_iwarp_async_event);		qed_iwarp_async_event);
	qed_ooo_setup(p_hwfn);		qed_ooo_setup(p_hwfn);

	return qed_iwarp_ll2_start(p_hwfn, params, p_ptt);		return qed_iwarp_ll2_start(p_hwfn, params);
	}		}

	int qed_iwarp_stop(struct qed_hwfn p_hwfn, struct qed_ptt p_ptt)		int qed_iwarp_stop(struct qed_hwfn *p_hwfn)
	{		{
	int rc;		int rc;

	@@ -2808,7 +2808,7 @@ int qed_iwarp_stop(struct qed_hwfn p_hwfn, struct qed_ptt p_ptt)

	qed_spq_unregister_async_cb(p_hwfn, PROTOCOLID_IWARP);		qed_spq_unregister_async_cb(p_hwfn, PROTOCOLID_IWARP);

	return qed_iwarp_ll2_stop(p_hwfn, p_ptt);		return qed_iwarp_ll2_stop(p_hwfn);
	}		}

	static void qed_iwarp_qp_in_error(struct qed_hwfn *p_hwfn,		static void qed_iwarp_qp_in_error(struct qed_hwfn *p_hwfn,