Commit 025cf931 authored by Satish Kharat's avatar Satish Kharat Committed by Paolo Abeni
Browse files

enic: Move function from header file to c file 



Moves cq_enet_rq_desc_dec from cq_enet_desc.h to enic_rq.c.
This is in preparation for enic extended completion queue
enabling.

Co-developed-by: default avatarNelson Escobar <neescoba@cisco.com>
Signed-off-by: default avatarNelson Escobar <neescoba@cisco.com>
Co-developed-by: default avatarJohn Daley <johndale@cisco.com>
Signed-off-by: default avatarJohn Daley <johndale@cisco.com>
Signed-off-by: default avatarSatish Kharat <satishkh@cisco.com>
Link: https://patch.msgid.link/20250304-enic_cleanup_and_ext_cq-v2-1-85804263dad8@cisco.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 71ca3561

drivers/net/ethernet/cisco/enic/cq_enet_desc.h

+0 −81
Original line number Diff line number Diff line
@@ -88,85 +88,4 @@ struct cq_enet_rq_desc { 
#define CQ_ENET_RQ_DESC_FLAGS_IPV4_FRAGMENT         (0x1 << 6)

#define CQ_ENET_RQ_DESC_FLAGS_FCS_OK                (0x1 << 7)



static inline void cq_enet_rq_desc_dec(struct cq_enet_rq_desc *desc,

	u8 *type, u8 *color, u16 *q_number, u16 *completed_index,

	u8 *ingress_port, u8 *fcoe, u8 *eop, u8 *sop, u8 *rss_type,

	u8 *csum_not_calc, u32 *rss_hash, u16 *bytes_written, u8 *packet_error,

	u8 *vlan_stripped, u16 *vlan_tci, u16 *checksum, u8 *fcoe_sof,

	u8 *fcoe_fc_crc_ok, u8 *fcoe_enc_error, u8 *fcoe_eof,

	u8 *tcp_udp_csum_ok, u8 *udp, u8 *tcp, u8 *ipv4_csum_ok,

	u8 *ipv6, u8 *ipv4, u8 *ipv4_fragment, u8 *fcs_ok)

{

	u16 completed_index_flags;

	u16 q_number_rss_type_flags;

	u16 bytes_written_flags;



	cq_desc_dec((struct cq_desc *)desc, type,

		color, q_number, completed_index);



	completed_index_flags = le16_to_cpu(desc->completed_index_flags);

	q_number_rss_type_flags =

		le16_to_cpu(desc->q_number_rss_type_flags);

	bytes_written_flags = le16_to_cpu(desc->bytes_written_flags);



	*ingress_port = (completed_index_flags &

		CQ_ENET_RQ_DESC_FLAGS_INGRESS_PORT) ? 1 : 0;

	*fcoe = (completed_index_flags & CQ_ENET_RQ_DESC_FLAGS_FCOE) ?

		1 : 0;

	*eop = (completed_index_flags & CQ_ENET_RQ_DESC_FLAGS_EOP) ?

		1 : 0;

	*sop = (completed_index_flags & CQ_ENET_RQ_DESC_FLAGS_SOP) ?

		1 : 0;



	*rss_type = (u8)((q_number_rss_type_flags >> CQ_DESC_Q_NUM_BITS) &

		CQ_ENET_RQ_DESC_RSS_TYPE_MASK);

	*csum_not_calc = (q_number_rss_type_flags &

		CQ_ENET_RQ_DESC_FLAGS_CSUM_NOT_CALC) ? 1 : 0;



	*rss_hash = le32_to_cpu(desc->rss_hash);



	*bytes_written = bytes_written_flags &

		CQ_ENET_RQ_DESC_BYTES_WRITTEN_MASK;

	*packet_error = (bytes_written_flags &

		CQ_ENET_RQ_DESC_FLAGS_TRUNCATED) ? 1 : 0;

	*vlan_stripped = (bytes_written_flags &

		CQ_ENET_RQ_DESC_FLAGS_VLAN_STRIPPED) ? 1 : 0;



	/*

	 * Tag Control Information(16) = user_priority(3) + cfi(1) + vlan(12)

	 */

	*vlan_tci = le16_to_cpu(desc->vlan);



	if (*fcoe) {

		*fcoe_sof = (u8)(le16_to_cpu(desc->checksum_fcoe) &

			CQ_ENET_RQ_DESC_FCOE_SOF_MASK);

		*fcoe_fc_crc_ok = (desc->flags &

			CQ_ENET_RQ_DESC_FCOE_FC_CRC_OK) ? 1 : 0;

		*fcoe_enc_error = (desc->flags &

			CQ_ENET_RQ_DESC_FCOE_ENC_ERROR) ? 1 : 0;

		*fcoe_eof = (u8)((le16_to_cpu(desc->checksum_fcoe) >>

			CQ_ENET_RQ_DESC_FCOE_EOF_SHIFT) &

			CQ_ENET_RQ_DESC_FCOE_EOF_MASK);

		*checksum = 0;

	} else {

		*fcoe_sof = 0;

		*fcoe_fc_crc_ok = 0;

		*fcoe_enc_error = 0;

		*fcoe_eof = 0;

		*checksum = le16_to_cpu(desc->checksum_fcoe);

	}



	*tcp_udp_csum_ok =

		(desc->flags & CQ_ENET_RQ_DESC_FLAGS_TCP_UDP_CSUM_OK) ? 1 : 0;

	*udp = (desc->flags & CQ_ENET_RQ_DESC_FLAGS_UDP) ? 1 : 0;

	*tcp = (desc->flags & CQ_ENET_RQ_DESC_FLAGS_TCP) ? 1 : 0;

	*ipv4_csum_ok =

		(desc->flags & CQ_ENET_RQ_DESC_FLAGS_IPV4_CSUM_OK) ? 1 : 0;

	*ipv6 = (desc->flags & CQ_ENET_RQ_DESC_FLAGS_IPV6) ? 1 : 0;

	*ipv4 = (desc->flags & CQ_ENET_RQ_DESC_FLAGS_IPV4) ? 1 : 0;

	*ipv4_fragment =

		(desc->flags & CQ_ENET_RQ_DESC_FLAGS_IPV4_FRAGMENT) ? 1 : 0;

	*fcs_ok = (desc->flags & CQ_ENET_RQ_DESC_FLAGS_FCS_OK) ? 1 : 0;

}



#endif /* _CQ_ENET_DESC_H_ */

drivers/net/ethernet/cisco/enic/enic_rq.c

+84 −0
Original line number Diff line number Diff line
@@ -101,6 +101,90 @@ static void enic_rq_set_skb_flags(struct vnic_rq *vrq, u8 type, u32 rss_hash, 
	}

}



static void cq_enet_rq_desc_dec(struct cq_enet_rq_desc *desc, u8 *type,

				u8 *color, u16 *q_number, u16 *completed_index,

				u8 *ingress_port, u8 *fcoe, u8 *eop, u8 *sop,

				u8 *rss_type, u8 *csum_not_calc, u32 *rss_hash,

				u16 *bytes_written, u8 *packet_error,

				u8 *vlan_stripped, u16 *vlan_tci,

				u16 *checksum, u8 *fcoe_sof,

				u8 *fcoe_fc_crc_ok, u8 *fcoe_enc_error,

				u8 *fcoe_eof, u8 *tcp_udp_csum_ok, u8 *udp,

				u8 *tcp, u8 *ipv4_csum_ok, u8 *ipv6, u8 *ipv4,

				u8 *ipv4_fragment, u8 *fcs_ok)

{

	u16 completed_index_flags;

	u16 q_number_rss_type_flags;

	u16 bytes_written_flags;



	cq_desc_dec((struct cq_desc *)desc, type,

		    color, q_number, completed_index);



	completed_index_flags = le16_to_cpu(desc->completed_index_flags);

	q_number_rss_type_flags =

		le16_to_cpu(desc->q_number_rss_type_flags);

	bytes_written_flags = le16_to_cpu(desc->bytes_written_flags);



	*ingress_port = (completed_index_flags &

		CQ_ENET_RQ_DESC_FLAGS_INGRESS_PORT) ? 1 : 0;

	*fcoe = (completed_index_flags & CQ_ENET_RQ_DESC_FLAGS_FCOE) ?

		1 : 0;

	*eop = (completed_index_flags & CQ_ENET_RQ_DESC_FLAGS_EOP) ?

		1 : 0;

	*sop = (completed_index_flags & CQ_ENET_RQ_DESC_FLAGS_SOP) ?

		1 : 0;



	*rss_type = (u8)((q_number_rss_type_flags >> CQ_DESC_Q_NUM_BITS) &

		CQ_ENET_RQ_DESC_RSS_TYPE_MASK);

	*csum_not_calc = (q_number_rss_type_flags &

		CQ_ENET_RQ_DESC_FLAGS_CSUM_NOT_CALC) ? 1 : 0;



	*rss_hash = le32_to_cpu(desc->rss_hash);



	*bytes_written = bytes_written_flags &

		CQ_ENET_RQ_DESC_BYTES_WRITTEN_MASK;

	*packet_error = (bytes_written_flags &

		CQ_ENET_RQ_DESC_FLAGS_TRUNCATED) ? 1 : 0;

	*vlan_stripped = (bytes_written_flags &

		CQ_ENET_RQ_DESC_FLAGS_VLAN_STRIPPED) ? 1 : 0;



	/*

	 * Tag Control Information(16) = user_priority(3) + cfi(1) + vlan(12)

	 */

	*vlan_tci = le16_to_cpu(desc->vlan);



	if (*fcoe) {

		*fcoe_sof = (u8)(le16_to_cpu(desc->checksum_fcoe) &

			CQ_ENET_RQ_DESC_FCOE_SOF_MASK);

		*fcoe_fc_crc_ok = (desc->flags &

			CQ_ENET_RQ_DESC_FCOE_FC_CRC_OK) ? 1 : 0;

		*fcoe_enc_error = (desc->flags &

			CQ_ENET_RQ_DESC_FCOE_ENC_ERROR) ? 1 : 0;

		*fcoe_eof = (u8)((le16_to_cpu(desc->checksum_fcoe) >>

			CQ_ENET_RQ_DESC_FCOE_EOF_SHIFT) &

			CQ_ENET_RQ_DESC_FCOE_EOF_MASK);

		*checksum = 0;

	} else {

		*fcoe_sof = 0;

		*fcoe_fc_crc_ok = 0;

		*fcoe_enc_error = 0;

		*fcoe_eof = 0;

		*checksum = le16_to_cpu(desc->checksum_fcoe);

	}



	*tcp_udp_csum_ok =

		(desc->flags & CQ_ENET_RQ_DESC_FLAGS_TCP_UDP_CSUM_OK) ? 1 : 0;

	*udp = (desc->flags & CQ_ENET_RQ_DESC_FLAGS_UDP) ? 1 : 0;

	*tcp = (desc->flags & CQ_ENET_RQ_DESC_FLAGS_TCP) ? 1 : 0;

	*ipv4_csum_ok =

		(desc->flags & CQ_ENET_RQ_DESC_FLAGS_IPV4_CSUM_OK) ? 1 : 0;

	*ipv6 = (desc->flags & CQ_ENET_RQ_DESC_FLAGS_IPV6) ? 1 : 0;

	*ipv4 = (desc->flags & CQ_ENET_RQ_DESC_FLAGS_IPV4) ? 1 : 0;

	*ipv4_fragment =

		(desc->flags & CQ_ENET_RQ_DESC_FLAGS_IPV4_FRAGMENT) ? 1 : 0;

	*fcs_ok = (desc->flags & CQ_ENET_RQ_DESC_FLAGS_FCS_OK) ? 1 : 0;

}



static bool enic_rq_pkt_error(struct vnic_rq *vrq, u8 packet_error, u8 fcs_ok,

			      u16 bytes_written)

{