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

Commit d502ce01 authored by Anjali Singhai Jain's avatar Anjali Singhai Jain Committed by Jeff Kirsher
Browse files

i40e/i40evf: Add flags for X722 capabilities 



Add capabilities flags specific to X722.

Signed-off-by: default avatarAnjali Singhai Jain <anjali.singhai@intel.com>
Signed-off-by: default avatarCatherine Sullivan <catherine.sullivan@intel.com>
Tested-by: default avatarJim Young <james.m.young@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 87e6c1d7

drivers/net/ethernet/intel/i40e/i40e.h

+7 −0
Original line number Diff line number Diff line
@@ -298,6 +298,7 @@ struct i40e_pf { 
#define I40E_FLAG_VMDQ_ENABLED			BIT_ULL(7)

#define I40E_FLAG_FDIR_REQUIRES_REINIT		BIT_ULL(8)

#define I40E_FLAG_NEED_LINK_UPDATE		BIT_ULL(9)

#define I40E_FLAG_IWARP_ENABLED			BIT_ULL(10)

#ifdef I40E_FCOE

#define I40E_FLAG_FCOE_ENABLED			BIT_ULL(11)

#endif /* I40E_FCOE */
@@ -318,6 +319,12 @@ struct i40e_pf { 
#endif

#define I40E_FLAG_PORT_ID_VALID			BIT_ULL(28)

#define I40E_FLAG_DCB_CAPABLE			BIT_ULL(29)

#define I40E_FLAG_RSS_AQ_CAPABLE		BIT_ULL(31)

#define I40E_FLAG_HW_ATR_EVICT_CAPABLE		BIT_ULL(32)

#define I40E_FLAG_OUTER_UDP_CSUM_CAPABLE	BIT_ULL(33)

#define I40E_FLAG_128_QP_RSS_CAPABLE		BIT_ULL(34)

#define I40E_FLAG_WB_ON_ITR_CAPABLE		BIT_ULL(35)

#define I40E_FLAG_MULTIPLE_TCP_UDP_RSS_PCTYPE	BIT_ULL(38)

#define I40E_FLAG_VEB_MODE_ENABLED		BIT_ULL(40)



	/* tracks features that get auto disabled by errors */

drivers/net/ethernet/intel/i40e/i40e_main.c

+8 −0
Original line number Diff line number Diff line
@@ -7785,6 +7785,14 @@ static int i40e_sw_init(struct i40e_pf *pf) 
					I40E_MAX_VF_COUNT);

	}

#endif /* CONFIG_PCI_IOV */

	if (pf->hw.mac.type == I40E_MAC_X722) {

		pf->flags |= I40E_FLAG_RSS_AQ_CAPABLE |

			     I40E_FLAG_128_QP_RSS_CAPABLE |

			     I40E_FLAG_HW_ATR_EVICT_CAPABLE |

			     I40E_FLAG_OUTER_UDP_CSUM_CAPABLE |

			     I40E_FLAG_WB_ON_ITR_CAPABLE |

			     I40E_FLAG_MULTIPLE_TCP_UDP_RSS_PCTYPE;

	}

	pf->eeprom_version = 0xDEAD;

	pf->lan_veb = I40E_NO_VEB;

	pf->lan_vsi = I40E_NO_VSI;

drivers/net/ethernet/intel/i40evf/i40evf.h

+6 −1
Original line number Diff line number Diff line
@@ -218,11 +218,15 @@ struct i40evf_adapter { 
#define I40EVF_FLAG_PF_COMMS_FAILED              BIT(8)

#define I40EVF_FLAG_RESET_PENDING                BIT(9)

#define I40EVF_FLAG_RESET_NEEDED                 BIT(10)

/* duplcates for common code */

#define I40EVF_FLAG_WB_ON_ITR_CAPABLE		BIT(11)

#define I40EVF_FLAG_OUTER_UDP_CSUM_CAPABLE	BIT(12)

/* duplicates for common code */

#define I40E_FLAG_FDIR_ATR_ENABLED		 0

#define I40E_FLAG_DCB_ENABLED			 0

#define I40E_FLAG_IN_NETPOLL			 I40EVF_FLAG_IN_NETPOLL

#define I40E_FLAG_RX_CSUM_ENABLED                I40EVF_FLAG_RX_CSUM_ENABLED

#define I40E_FLAG_WB_ON_ITR_CAPABLE		I40EVF_FLAG_WB_ON_ITR_CAPABLE

#define I40E_FLAG_OUTER_UDP_CSUM_CAPABLE	I40EVF_FLAG_OUTER_UDP_CSUM_CAPABLE

	/* flags for admin queue service task */

	u32 aq_required;

#define I40EVF_FLAG_AQ_ENABLE_QUEUES		BIT(0)
@@ -234,6 +238,7 @@ struct i40evf_adapter { 
#define I40EVF_FLAG_AQ_CONFIGURE_QUEUES		BIT(6)

#define I40EVF_FLAG_AQ_MAP_VECTORS		BIT(7)

#define I40EVF_FLAG_AQ_HANDLE_RESET		BIT(8)

#define I40EVF_FLAG_AQ_CONFIGURE_RSS		BIT(9)

#define I40EVF_FLAG_AQ_GET_CONFIG		BIT(10)



	/* OS defined structs */