Commit a5ab9ee0 authored by Joshua Hay's avatar Joshua Hay Committed by Tony Nguyen
Browse files

idpf: add singleq start_xmit and napi poll 



Add the start_xmit, TX and RX napi poll support for the single queue
model. Unlike split queue model, single queue uses same queue to post
buffer descriptors and completed descriptors.

Signed-off-by: default avatarJoshua Hay <joshua.a.hay@intel.com>
Co-developed-by: default avatarAlan Brady <alan.brady@intel.com>
Signed-off-by: default avatarAlan Brady <alan.brady@intel.com>
Co-developed-by: default avatarMadhu Chittim <madhu.chittim@intel.com>
Signed-off-by: default avatarMadhu Chittim <madhu.chittim@intel.com>
Co-developed-by: default avatarPhani Burra <phani.r.burra@intel.com>
Signed-off-by: default avatarPhani Burra <phani.r.burra@intel.com>
Reviewed-by: default avatarSridhar Samudrala <sridhar.samudrala@intel.com>
Reviewed-by: default avatarWillem de Bruijn <willemb@google.com>
Co-developed-by: default avatarPavan Kumar Linga <pavan.kumar.linga@intel.com>
Signed-off-by: default avatarPavan Kumar Linga <pavan.kumar.linga@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 3a8845af

drivers/net/ethernet/intel/idpf/idpf.h

+10 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ struct idpf_vport_max_q; 
#include <linux/etherdevice.h>

#include <linux/pci.h>

#include <linux/bitfield.h>

#include <linux/sctp.h>

#include <net/gro.h>

#include <linux/dim.h>
@@ -280,6 +281,7 @@ enum idpf_vport_flags { 
 * @txq_grps: Array of TX queue groups

 * @txq_model: Split queue or single queue queuing model

 * @txqs: Used only in hotpath to get to the right queue very fast

 * @crc_enable: Enable CRC insertion offload

 * @num_rxq: Number of allocated RX queues

 * @num_bufq: Number of allocated buffer queues

 * @rxq_desc_count: RX queue descriptor count. *MUST* have enough descriptors
@@ -326,6 +328,7 @@ struct idpf_vport { 
	struct idpf_txq_group *txq_grps;

	u32 txq_model;

	struct idpf_queue **txqs;

	bool crc_enable;



	u16 num_rxq;

	u16 num_bufq;
@@ -534,6 +537,9 @@ struct idpf_vport_config { 
 * @vc_state: Virtchnl message state

 * @vc_msg: Virtchnl message buffer

 * @dev_ops: See idpf_dev_ops

 * @num_vfs: Number of allocated VFs through sysfs. PF does not directly talk

 *	     to VFs but is used to initialize them

 * @crc_enable: Enable CRC insertion offload

 * @req_tx_splitq: TX split or single queue model to request

 * @req_rx_splitq: RX split or single queue model to request

 * @vport_ctrl_lock: Lock to protect the vport control flow
@@ -587,6 +593,8 @@ struct idpf_adapter { 
	DECLARE_BITMAP(vc_state, IDPF_VC_NBITS);

	char vc_msg[IDPF_CTLQ_MAX_BUF_LEN];

	struct idpf_dev_ops dev_ops;

	int num_vfs;

	bool crc_enable;

	bool req_tx_splitq;

	bool req_rx_splitq;
@@ -848,5 +856,7 @@ int idpf_send_create_vport_msg(struct idpf_adapter *adapter, 
			       struct idpf_vport_max_q *max_q);

int idpf_check_supported_desc_ids(struct idpf_vport *vport);

int idpf_send_map_unmap_queue_vector_msg(struct idpf_vport *vport, bool map);

int idpf_send_set_sriov_vfs_msg(struct idpf_adapter *adapter, u16 num_vfs);

int idpf_sriov_configure(struct pci_dev *pdev, int num_vfs);



#endif /* !_IDPF_H_ */

drivers/net/ethernet/intel/idpf/idpf_lan_txrx.h

+57 −0
Original line number Diff line number Diff line
@@ -64,6 +64,32 @@ enum idpf_rss_hash { 
#define IDPF_TXD_COMPLQ_QID_S		0

#define IDPF_TXD_COMPLQ_QID_M		GENMASK_ULL(9, 0)



/* For base mode TX descriptors */



#define IDPF_TXD_CTX_QW0_TUNN_L4T_CS_S	23

#define IDPF_TXD_CTX_QW0_TUNN_L4T_CS_M	BIT_ULL(IDPF_TXD_CTX_QW0_TUNN_L4T_CS_S)

#define IDPF_TXD_CTX_QW0_TUNN_DECTTL_S	19

#define IDPF_TXD_CTX_QW0_TUNN_DECTTL_M	\

	(0xFULL << IDPF_TXD_CTX_QW0_TUNN_DECTTL_S)

#define IDPF_TXD_CTX_QW0_TUNN_NATLEN_S	12

#define IDPF_TXD_CTX_QW0_TUNN_NATLEN_M	\

	(0X7FULL << IDPF_TXD_CTX_QW0_TUNN_NATLEN_S)

#define IDPF_TXD_CTX_QW0_TUNN_EIP_NOINC_S	11

#define IDPF_TXD_CTX_QW0_TUNN_EIP_NOINC_M    \

	BIT_ULL(IDPF_TXD_CTX_QW0_TUNN_EIP_NOINC_S)

#define IDPF_TXD_CTX_EIP_NOINC_IPID_CONST	\

	IDPF_TXD_CTX_QW0_TUNN_EIP_NOINC_M

#define IDPF_TXD_CTX_QW0_TUNN_NATT_S	        9

#define IDPF_TXD_CTX_QW0_TUNN_NATT_M	(0x3ULL << IDPF_TXD_CTX_QW0_TUNN_NATT_S)

#define IDPF_TXD_CTX_UDP_TUNNELING	BIT_ULL(IDPF_TXD_CTX_QW0_TUNN_NATT_S)

#define IDPF_TXD_CTX_GRE_TUNNELING	(0x2ULL << IDPF_TXD_CTX_QW0_TUNN_NATT_S)

#define IDPF_TXD_CTX_QW0_TUNN_EXT_IPLEN_S	2

#define IDPF_TXD_CTX_QW0_TUNN_EXT_IPLEN_M	\

	(0x3FULL << IDPF_TXD_CTX_QW0_TUNN_EXT_IPLEN_S)

#define IDPF_TXD_CTX_QW0_TUNN_EXT_IP_S	0

#define IDPF_TXD_CTX_QW0_TUNN_EXT_IP_M	\

	(0x3ULL << IDPF_TXD_CTX_QW0_TUNN_EXT_IP_S)



#define IDPF_TXD_CTX_QW1_MSS_S		50

#define IDPF_TXD_CTX_QW1_MSS_M		GENMASK_ULL(63, 50)

#define IDPF_TXD_CTX_QW1_TSO_LEN_S	30
@@ -112,6 +138,27 @@ enum idpf_tx_desc_dtype_value { 
	IDPF_TX_DESC_DTYPE_DESC_DONE			= 15,

};



enum idpf_tx_ctx_desc_cmd_bits {

	IDPF_TX_CTX_DESC_TSO		= 0x01,

	IDPF_TX_CTX_DESC_TSYN		= 0x02,

	IDPF_TX_CTX_DESC_IL2TAG2	= 0x04,

	IDPF_TX_CTX_DESC_RSVD		= 0x08,

	IDPF_TX_CTX_DESC_SWTCH_NOTAG	= 0x00,

	IDPF_TX_CTX_DESC_SWTCH_UPLINK	= 0x10,

	IDPF_TX_CTX_DESC_SWTCH_LOCAL	= 0x20,

	IDPF_TX_CTX_DESC_SWTCH_VSI	= 0x30,

	IDPF_TX_CTX_DESC_FILT_AU_EN	= 0x40,

	IDPF_TX_CTX_DESC_FILT_AU_EVICT	= 0x80,

	IDPF_TX_CTX_DESC_RSVD1		= 0xF00

};



enum idpf_tx_desc_len_fields {

	/* Note: These are predefined bit offsets */

	IDPF_TX_DESC_LEN_MACLEN_S	= 0, /* 7 BITS */

	IDPF_TX_DESC_LEN_IPLEN_S	= 7, /* 7 BITS */

	IDPF_TX_DESC_LEN_L4_LEN_S	= 14 /* 4 BITS */

};



enum idpf_tx_base_desc_cmd_bits {

	IDPF_TX_DESC_CMD_EOP			= BIT(0),

	IDPF_TX_DESC_CMD_RS			= BIT(1),
@@ -148,6 +195,16 @@ struct idpf_splitq_tx_compl_desc { 
	u8 rsvd; /* Reserved */

}; /* writeback used with completion queues */



/* Context descriptors */

struct idpf_base_tx_ctx_desc {

	struct {

		__le32 tunneling_params;

		__le16 l2tag2;

		__le16 rsvd1;

	} qw0;

	__le64 qw1; /* type_cmd_tlen_mss/rt_hint */

};



/* Common cmd field defines for all desc except Flex Flow Scheduler (0x0C) */

enum idpf_tx_flex_desc_cmd_bits {

	IDPF_TX_FLEX_DESC_CMD_EOP			= BIT(0),

drivers/net/ethernet/intel/idpf/idpf_lib.c

+1 −0
Original line number Diff line number Diff line
@@ -1565,4 +1565,5 @@ static const struct net_device_ops idpf_netdev_ops_splitq = { 
static const struct net_device_ops idpf_netdev_ops_singleq = {

	.ndo_open = idpf_open,

	.ndo_stop = idpf_stop,

	.ndo_start_xmit = idpf_tx_singleq_start,

};

drivers/net/ethernet/intel/idpf/idpf_main.c

+1 −0
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ static int idpf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		break;

	case IDPF_DEV_ID_VF:

		idpf_vf_dev_ops_init(adapter);

		adapter->crc_enable = true;

		break;

	default:

		err = -ENODEV;

drivers/net/ethernet/intel/idpf/idpf_singleq_txrx.c

+1117 −2

File changed.

Preview size limit exceeded, changes collapsed.