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

Commit c4259dda authored by Denis Bolotin's avatar Denis Bolotin Committed by David S. Miller
Browse files

qed: Add a flag which indicates if offload TC is set 



Distinguish not set offload_tc from offload_tc 0 and add getters and
setters.

Signed-off-by: default avatarMichal Kalderon <michal.kalderon@cavium.com>
Signed-off-by: default avatarAriel Elior <ariel.elior@cavium.com>
Signed-off-by: default avatarDenis Bolotin <denis.bolotin@cavium.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2a1cb1bf

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

+3 −0
Original line number Diff line number Diff line
@@ -336,6 +336,7 @@ struct qed_hw_info { 
	 */

	u8 num_active_tc;

	u8				offload_tc;

	bool				offload_tc_set;



	u32				concrete_fid;

	u16				opaque_fid;
@@ -921,4 +922,6 @@ int qed_mfw_tlv_req(struct qed_hwfn *hwfn); 
int qed_mfw_fill_tlv_data(struct qed_hwfn *hwfn,

			  enum qed_mfw_tlv_type type,

			  union qed_mfw_tlv_data *tlv_data);



void qed_hw_info_set_offload_tc(struct qed_hw_info *p_info, u8 tc);

#endif /* _QED_H */

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

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ qed_dcbx_set_params(struct qed_dcbx_results *p_data, 


	/* QM reconf data */

	if (p_info->personality == personality)

		p_info->offload_tc = tc;

		qed_hw_info_set_offload_tc(p_info, tc);

}



/* Update app protocol data and hw_info fields with the TLV info */

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

+27 −5
Original line number Diff line number Diff line
@@ -394,7 +394,25 @@ static void qed_init_qm_advance_vport(struct qed_hwfn *p_hwfn) 
/* defines for pq init */

#define PQ_INIT_DEFAULT_WRR_GROUP       1

#define PQ_INIT_DEFAULT_TC              0

#define PQ_INIT_OFLD_TC                 (p_hwfn->hw_info.offload_tc)



void qed_hw_info_set_offload_tc(struct qed_hw_info *p_info, u8 tc)

{

	p_info->offload_tc = tc;

	p_info->offload_tc_set = true;

}



static bool qed_is_offload_tc_set(struct qed_hwfn *p_hwfn)

{

	return p_hwfn->hw_info.offload_tc_set;

}



static u32 qed_get_offload_tc(struct qed_hwfn *p_hwfn)

{

	if (qed_is_offload_tc_set(p_hwfn))

		return p_hwfn->hw_info.offload_tc;



	return PQ_INIT_DEFAULT_TC;

}



static void qed_init_qm_pq(struct qed_hwfn *p_hwfn,

			   struct qed_qm_info *qm_info,
@@ -538,7 +556,8 @@ static void qed_init_qm_pure_ack_pq(struct qed_hwfn *p_hwfn) 
		return;



	qed_init_qm_set_idx(p_hwfn, PQ_FLAGS_ACK, qm_info->num_pqs);

	qed_init_qm_pq(p_hwfn, qm_info, PQ_INIT_OFLD_TC, PQ_INIT_SHARE_VPORT);

	qed_init_qm_pq(p_hwfn, qm_info, qed_get_offload_tc(p_hwfn),

		       PQ_INIT_SHARE_VPORT);

}



static void qed_init_qm_offload_pq(struct qed_hwfn *p_hwfn)
@@ -549,7 +568,8 @@ static void qed_init_qm_offload_pq(struct qed_hwfn *p_hwfn) 
		return;



	qed_init_qm_set_idx(p_hwfn, PQ_FLAGS_OFLD, qm_info->num_pqs);

	qed_init_qm_pq(p_hwfn, qm_info, PQ_INIT_OFLD_TC, PQ_INIT_SHARE_VPORT);

	qed_init_qm_pq(p_hwfn, qm_info, qed_get_offload_tc(p_hwfn),

		       PQ_INIT_SHARE_VPORT);

}



static void qed_init_qm_low_latency_pq(struct qed_hwfn *p_hwfn)
@@ -560,7 +580,8 @@ static void qed_init_qm_low_latency_pq(struct qed_hwfn *p_hwfn) 
		return;



	qed_init_qm_set_idx(p_hwfn, PQ_FLAGS_LLT, qm_info->num_pqs);

	qed_init_qm_pq(p_hwfn, qm_info, PQ_INIT_OFLD_TC, PQ_INIT_SHARE_VPORT);

	qed_init_qm_pq(p_hwfn, qm_info, qed_get_offload_tc(p_hwfn),

		       PQ_INIT_SHARE_VPORT);

}



static void qed_init_qm_mcos_pqs(struct qed_hwfn *p_hwfn)
@@ -601,7 +622,8 @@ static void qed_init_qm_rl_pqs(struct qed_hwfn *p_hwfn) 


	qed_init_qm_set_idx(p_hwfn, PQ_FLAGS_RLS, qm_info->num_pqs);

	for (pf_rls_idx = 0; pf_rls_idx < num_pf_rls; pf_rls_idx++)

		qed_init_qm_pq(p_hwfn, qm_info, PQ_INIT_OFLD_TC, PQ_INIT_PF_RL);

		qed_init_qm_pq(p_hwfn, qm_info, qed_get_offload_tc(p_hwfn),

			       PQ_INIT_PF_RL);

}



static void qed_init_qm_pq_params(struct qed_hwfn *p_hwfn)

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

+2 −1
Original line number Diff line number Diff line
@@ -1552,7 +1552,8 @@ qed_mcp_handle_ufp_event(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt) 


	if (p_hwfn->ufp_info.mode == QED_UFP_MODE_VNIC_BW) {

		p_hwfn->qm_info.ooo_tc = p_hwfn->ufp_info.tc;

		p_hwfn->hw_info.offload_tc = p_hwfn->ufp_info.tc;

		qed_hw_info_set_offload_tc(&p_hwfn->hw_info,

					   p_hwfn->ufp_info.tc);



		qed_qm_reconf(p_hwfn, p_ptt);

	} else if (p_hwfn->ufp_info.mode == QED_UFP_MODE_ETS) {