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

Commit 0b55e27d authored by Yuval Mintz's avatar Yuval Mintz Committed by David S. Miller
Browse files

qed: IOV configure and FLR 



While previous patches have already added the necessary logic to probe
VFs as well as enabling them in the HW, this patch adds the ability to
support VF FLR & SRIOV disable.

It then wraps both flows together into the first IOV callback to be
provided to the protocol driver - `configure'. This would later to be used
to enable and disable SRIOV in the adapter.

Signed-off-by: default avatarYuval Mintz <Yuval.Mintz@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1408cc1f

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

+11 −6
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include "qed_reg_addr.h"

#include "qed_sp.h"

#include "qed_sriov.h"

#include "qed_vf.h"



/* API common to all protocols */

enum BAR_ID {
@@ -420,8 +421,7 @@ void qed_resc_setup(struct qed_dev *cdev) 
#define FINAL_CLEANUP_POLL_CNT          (100)

#define FINAL_CLEANUP_POLL_TIME         (10)

int qed_final_cleanup(struct qed_hwfn *p_hwfn,

		      struct qed_ptt *p_ptt,

		      u16 id)

		      struct qed_ptt *p_ptt, u16 id, bool is_vf)

{

	u32 command = 0, addr, count = FINAL_CLEANUP_POLL_CNT;

	int rc = -EBUSY;
@@ -429,6 +429,9 @@ int qed_final_cleanup(struct qed_hwfn *p_hwfn, 
	addr = GTT_BAR0_MAP_REG_USDM_RAM +

		USTORM_FLR_FINAL_ACK_OFFSET(p_hwfn->rel_pf_id);



	if (is_vf)

		id += 0x10;



	command |= X_FINAL_CLEANUP_AGG_INT <<

		SDM_AGG_INT_COMP_PARAMS_AGG_INT_INDEX_SHIFT;

	command |= 1 << SDM_AGG_INT_COMP_PARAMS_AGG_VECTOR_ENABLE_SHIFT;
@@ -663,7 +666,7 @@ static int qed_hw_init_pf(struct qed_hwfn *p_hwfn, 
	STORE_RT_REG(p_hwfn, PRS_REG_SEARCH_ROCE_RT_OFFSET, 0);



	/* Cleanup chip from previous driver if such remains exist */

	rc = qed_final_cleanup(p_hwfn, p_ptt, rel_pf_id);

	rc = qed_final_cleanup(p_hwfn, p_ptt, rel_pf_id, false);

	if (rc != 0)

		return rc;
@@ -880,7 +883,7 @@ int qed_hw_stop(struct qed_dev *cdev) 
		DP_VERBOSE(p_hwfn, NETIF_MSG_IFDOWN, "Stopping hw/fw\n");



		if (IS_VF(cdev)) {

			/* To be implemented in a later patch */

			qed_vf_pf_int_cleanup(p_hwfn);

			continue;

		}
@@ -989,7 +992,9 @@ int qed_hw_reset(struct qed_dev *cdev) 
		struct qed_hwfn *p_hwfn = &cdev->hwfns[i];



		if (IS_VF(cdev)) {

			/* Will be implemented in a later patch */

			rc = qed_vf_pf_reset(p_hwfn);

			if (rc)

				return rc;

			continue;

		}
@@ -1590,7 +1595,7 @@ void qed_hw_remove(struct qed_dev *cdev) 
		struct qed_hwfn *p_hwfn = &cdev->hwfns[i];



		if (IS_VF(cdev)) {

			/* Will be implemented in a later patch */

			qed_vf_pf_release(p_hwfn);

			continue;

		}

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

+2 −2
Original line number Diff line number Diff line
@@ -303,11 +303,11 @@ int qed_fw_rss_eng(struct qed_hwfn *p_hwfn, 
 * @param p_hwfn

 * @param p_ptt

 * @param id - For PF, engine-relative. For VF, PF-relative.

 * @param is_vf - true iff cleanup is made for a VF.

 *

 * @return int

 */

int qed_final_cleanup(struct qed_hwfn *p_hwfn,

		      struct qed_ptt *p_ptt,

		      u16 id);

		      struct qed_ptt *p_ptt, u16 id, bool is_vf);



#endif

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

+9 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ enum common_event_opcode { 
	COMMON_EVENT_PF_START,

	COMMON_EVENT_PF_STOP,

	COMMON_EVENT_VF_START,

	COMMON_EVENT_RESERVED2,

	COMMON_EVENT_VF_STOP,

	COMMON_EVENT_VF_PF_CHANNEL,

	COMMON_EVENT_RESERVED4,

	COMMON_EVENT_RESERVED5,
@@ -45,7 +45,7 @@ enum common_ramrod_cmd_id { 
	COMMON_RAMROD_PF_START /* PF Function Start Ramrod */,

	COMMON_RAMROD_PF_STOP /* PF Function Stop Ramrod */,

	COMMON_RAMROD_VF_START,

	COMMON_RAMROD_RESERVED2,

	COMMON_RAMROD_VF_STOP,

	COMMON_RAMROD_PF_UPDATE,

	COMMON_RAMROD_EMPTY,

	MAX_COMMON_RAMROD_CMD_ID
@@ -741,6 +741,13 @@ struct vf_start_ramrod_data { 
	u8 reserved[3];

};



struct vf_stop_ramrod_data {

	u8 vf_id;

	u8 reserved0;

	__le16 reserved1;

	__le32 reserved2;

};



struct atten_status_block {

	__le32	atten_bits;

	__le32	atten_ack;

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

+7 −0
Original line number Diff line number Diff line
@@ -2066,8 +2066,15 @@ static int qed_fp_cqe_completion(struct qed_dev *dev, 
				      cqe);

}



#ifdef CONFIG_QED_SRIOV

extern const struct qed_iov_hv_ops qed_iov_ops_pass;

#endif



static const struct qed_eth_ops qed_eth_ops_pass = {

	.common = &qed_common_ops_pass,

#ifdef CONFIG_QED_SRIOV

	.iov = &qed_iov_ops_pass,

#endif

	.fill_dev_info = &qed_fill_eth_dev_info,

	.register_ops = &qed_register_eth_ops,

	.vport_start = &qed_start_vport,

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

+1 −0
Original line number Diff line number Diff line
@@ -897,6 +897,7 @@ static int qed_slowpath_stop(struct qed_dev *cdev) 


	if (IS_PF(cdev)) {

		qed_free_stream_mem(cdev);

		qed_sriov_disable(cdev, true);



		qed_nic_stop(cdev);

		qed_slowpath_irq_free(cdev);