Commit 09990ad1 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue 



Jeff Kirsher says:

====================
100GbE Intel Wired LAN Driver Updates 2018-08-28

This series contains new features and implementation updates for the
ice driver.

Anirudh reworks the current flex programming logic to add support for
a second flex descriptor profile.  Updated the transmit scheduler
code to handle changes to the spec, specifically the firmware expects
a 4KB buffer at all times so fix the default scheduler topology buffer
size.  Also the maximum children per node per layer is replaced by
maximum sibling group size.  Adds a check to ensure a reset is not in
progress before exercising a control queue operation.  Refactored the
switch rule management functions and structures to simply the logic and
to add a common function to search for a rule entry and add a new rule
entry.  Refactored the VSI allocation, deletion and rebuild flow so that
on reset we can restore all the filters that were previously added.  Did
some spring cleaning of define names and macros.

Dan updates the admin queue command for requesting resource ownership
to the latest specification by adding new enum's and change the locks.

Zhenning optimizes the driver by using the existing buffer in a
structure directly versus a local array.

Chinh implements handlers for ethtool for get and set link settings.

Sudheer implements transmit hang/timeout detection and malicious driver
detection in the driver.

Md Fahad Iqbal implements the get and set bridge mode operations.

Hieu adds the ability for firmware logging during initialization.

Brett updates the driver to only enable VSI transmit and receive pruning
when VLAN 0 is active, and when VLAN 0 is removed/not active, pruning is
disabled.

Akeem adds a flag to use for stopping the service task.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b537f584 9ea47d81

drivers/net/ethernet/intel/ice/ice.h

+7 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ extern const char ice_drv_ver[]; 
#define ICE_RES_VALID_BIT	0x8000

#define ICE_RES_MISC_VEC_ID	(ICE_RES_VALID_BIT - 1)

#define ICE_INVAL_Q_INDEX	0xffff

#define ICE_INVAL_VFID		256



#define ICE_VSIQF_HKEY_ARRAY_SIZE	((VSIQF_HKEY_MAX_INDEX + 1) *	4)
@@ -122,6 +123,7 @@ struct ice_sw { 
enum ice_state {

	__ICE_DOWN,

	__ICE_NEEDS_RESTART,

	__ICE_PREPARED_FOR_RESET,	/* set by driver when prepared */

	__ICE_RESET_RECOVERY_PENDING,	/* set by driver when reset starts */

	__ICE_PFR_REQ,			/* set by driver and peers */

	__ICE_CORER_REQ,		/* set by driver and peers */
@@ -132,9 +134,11 @@ enum ice_state { 
	__ICE_SUSPENDED,		/* set on module remove path */

	__ICE_RESET_FAILED,		/* set by reset/rebuild */

	__ICE_ADMINQ_EVENT_PENDING,

	__ICE_MDD_EVENT_PENDING,

	__ICE_FLTR_OVERFLOW_PROMISC,

	__ICE_CFG_BUSY,

	__ICE_SERVICE_SCHED,

	__ICE_SERVICE_DIS,

	__ICE_STATE_NBITS		/* must be last */

};
@@ -270,6 +274,9 @@ struct ice_pf { 
	struct ice_hw_port_stats stats_prev;

	struct ice_hw hw;

	u8 stat_prev_loaded;	/* has previous stats been loaded */

	u32 tx_timeout_count;

	unsigned long tx_timeout_last_recovery;

	u32 tx_timeout_recovery_level;

	char int_name[ICE_INT_NAME_STR_LEN];

};

drivers/net/ethernet/intel/ice/ice_adminq_cmd.h

+93 −6
Original line number Diff line number Diff line
@@ -443,6 +443,8 @@ struct ice_aqc_vsi_props { 
	u8 reserved[24];

};



#define ICE_MAX_NUM_RECIPES 64



/* Add/Update/Remove/Get switch rules (indirect 0x02A0, 0x02A1, 0x02A2, 0x02A3)

 */

struct ice_aqc_sw_rules {
@@ -771,9 +773,8 @@ struct ice_aqc_layer_props { 
	u8 chunk_size;

	__le16 max_device_nodes;

	__le16 max_pf_nodes;

	u8 rsvd0[2];

	__le16 max_shared_rate_lmtr;

	__le16 max_children;

	u8 rsvd0[4];

	__le16 max_sibl_grp_sz;

	__le16 max_cir_rl_profiles;

	__le16 max_eir_rl_profiles;

	__le16 max_srl_profiles;
@@ -921,7 +922,9 @@ struct ice_aqc_set_phy_cfg_data { 
#define ICE_AQ_PHY_ENA_RX_PAUSE_ABILITY		BIT(1)

#define ICE_AQ_PHY_ENA_LOW_POWER	BIT(2)

#define ICE_AQ_PHY_ENA_LINK		BIT(3)

#define ICE_AQ_PHY_ENA_ATOMIC_LINK		BIT(5)

#define ICE_AQ_PHY_ENA_AUTO_LINK_UPDT	BIT(5)

#define ICE_AQ_PHY_ENA_LESM		BIT(6)

#define ICE_AQ_PHY_ENA_AUTO_FEC		BIT(7)

	u8 low_power_ctrl;

	__le16 eee_cap; /* Value from ice_aqc_get_phy_caps */

	__le16 eeer_value;
@@ -1203,6 +1206,84 @@ struct ice_aqc_dis_txq { 
	struct ice_aqc_dis_txq_item qgrps[1];

};



/* Configure Firmware Logging Command (indirect 0xFF09)

 * Logging Information Read Response (indirect 0xFF10)

 * Note: The 0xFF10 command has no input parameters.

 */

struct ice_aqc_fw_logging {

	u8 log_ctrl;

#define ICE_AQC_FW_LOG_AQ_EN		BIT(0)

#define ICE_AQC_FW_LOG_UART_EN		BIT(1)

	u8 rsvd0;

	u8 log_ctrl_valid; /* Not used by 0xFF10 Response */

#define ICE_AQC_FW_LOG_AQ_VALID		BIT(0)

#define ICE_AQC_FW_LOG_UART_VALID	BIT(1)

	u8 rsvd1[5];

	__le32 addr_high;

	__le32 addr_low;

};



enum ice_aqc_fw_logging_mod {

	ICE_AQC_FW_LOG_ID_GENERAL = 0,

	ICE_AQC_FW_LOG_ID_CTRL,

	ICE_AQC_FW_LOG_ID_LINK,

	ICE_AQC_FW_LOG_ID_LINK_TOPO,

	ICE_AQC_FW_LOG_ID_DNL,

	ICE_AQC_FW_LOG_ID_I2C,

	ICE_AQC_FW_LOG_ID_SDP,

	ICE_AQC_FW_LOG_ID_MDIO,

	ICE_AQC_FW_LOG_ID_ADMINQ,

	ICE_AQC_FW_LOG_ID_HDMA,

	ICE_AQC_FW_LOG_ID_LLDP,

	ICE_AQC_FW_LOG_ID_DCBX,

	ICE_AQC_FW_LOG_ID_DCB,

	ICE_AQC_FW_LOG_ID_NETPROXY,

	ICE_AQC_FW_LOG_ID_NVM,

	ICE_AQC_FW_LOG_ID_AUTH,

	ICE_AQC_FW_LOG_ID_VPD,

	ICE_AQC_FW_LOG_ID_IOSF,

	ICE_AQC_FW_LOG_ID_PARSER,

	ICE_AQC_FW_LOG_ID_SW,

	ICE_AQC_FW_LOG_ID_SCHEDULER,

	ICE_AQC_FW_LOG_ID_TXQ,

	ICE_AQC_FW_LOG_ID_RSVD,

	ICE_AQC_FW_LOG_ID_POST,

	ICE_AQC_FW_LOG_ID_WATCHDOG,

	ICE_AQC_FW_LOG_ID_TASK_DISPATCH,

	ICE_AQC_FW_LOG_ID_MNG,

	ICE_AQC_FW_LOG_ID_MAX,

};



/* This is the buffer for both of the logging commands.

 * The entry array size depends on the datalen parameter in the descriptor.

 * There will be a total of datalen / 2 entries.

 */

struct ice_aqc_fw_logging_data {

	__le16 entry[1];

#define ICE_AQC_FW_LOG_ID_S		0

#define ICE_AQC_FW_LOG_ID_M		(0xFFF << ICE_AQC_FW_LOG_ID_S)



#define ICE_AQC_FW_LOG_CONF_SUCCESS	0	/* Used by response */

#define ICE_AQC_FW_LOG_CONF_BAD_INDX	BIT(12)	/* Used by response */



#define ICE_AQC_FW_LOG_EN_S		12

#define ICE_AQC_FW_LOG_EN_M		(0xF << ICE_AQC_FW_LOG_EN_S)

#define ICE_AQC_FW_LOG_INFO_EN		BIT(12)	/* Used by command */

#define ICE_AQC_FW_LOG_INIT_EN		BIT(13)	/* Used by command */

#define ICE_AQC_FW_LOG_FLOW_EN		BIT(14)	/* Used by command */

#define ICE_AQC_FW_LOG_ERR_EN		BIT(15)	/* Used by command */

};



/* Get/Clear FW Log (indirect 0xFF11) */

struct ice_aqc_get_clear_fw_log {

	u8 flags;

#define ICE_AQC_FW_LOG_CLEAR		BIT(0)

#define ICE_AQC_FW_LOG_MORE_DATA_AVAIL	BIT(1)

	u8 rsvd1[7];

	__le32 addr_high;

	__le32 addr_low;

};



/**

 * struct ice_aq_desc - Admin Queue (AQ) descriptor

 * @flags: ICE_AQ_FLAG_* flags
@@ -1252,6 +1333,9 @@ struct ice_aq_desc { 
		struct ice_aqc_add_txqs add_txqs;

		struct ice_aqc_dis_txqs dis_txqs;

		struct ice_aqc_add_get_update_free_vsi vsi_cmd;

		struct ice_aqc_add_update_free_vsi_resp add_update_free_vsi_res;

		struct ice_aqc_fw_logging fw_logging;

		struct ice_aqc_get_clear_fw_log get_clear_fw_log;

		struct ice_aqc_alloc_free_res_cmd sw_res_ctrl;

		struct ice_aqc_set_event_mask set_event_mask;

		struct ice_aqc_get_link_status get_link_status;
@@ -1349,6 +1433,9 @@ enum ice_adminq_opc { 
	/* TX queue handling commands/events */

	ice_aqc_opc_add_txqs				= 0x0C30,

	ice_aqc_opc_dis_txqs				= 0x0C31,



	/* debug commands */

	ice_aqc_opc_fw_logging				= 0xFF09,

};



#endif /* _ICE_ADMINQ_CMD_H_ */

drivers/net/ethernet/intel/ice/ice_common.c

+454 −71

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/intel/ice/ice_common.h

+15 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ enum ice_status 
ice_get_link_status(struct ice_port_info *pi, bool *link_up);

enum ice_status

ice_acquire_res(struct ice_hw *hw, enum ice_aq_res_ids res,

		enum ice_aq_res_access_type access);

		enum ice_aq_res_access_type access, u32 timeout);

void ice_release_res(struct ice_hw *hw, enum ice_aq_res_ids res);

enum ice_status ice_init_nvm(struct ice_hw *hw);

enum ice_status
@@ -58,12 +58,24 @@ enum ice_status 
ice_aq_send_cmd(struct ice_hw *hw, struct ice_aq_desc *desc,

		void *buf, u16 buf_size, struct ice_sq_cd *cd);

enum ice_status ice_aq_get_fw_ver(struct ice_hw *hw, struct ice_sq_cd *cd);



enum ice_status

ice_aq_get_phy_caps(struct ice_port_info *pi, bool qual_mods, u8 report_mode,

		    struct ice_aqc_get_phy_caps_data *caps,

		    struct ice_sq_cd *cd);

void

ice_update_phy_type(u64 *phy_type_low, u16 link_speeds_bitmap);

enum ice_status

ice_aq_manage_mac_write(struct ice_hw *hw, u8 *mac_addr, u8 flags,

			struct ice_sq_cd *cd);

enum ice_status ice_clear_pf_cfg(struct ice_hw *hw);

enum ice_status

ice_set_fc(struct ice_port_info *pi, u8 *aq_failures, bool atomic_restart);

ice_aq_set_phy_cfg(struct ice_hw *hw, u8 lport,

		   struct ice_aqc_set_phy_cfg_data *cfg, struct ice_sq_cd *cd);

enum ice_status

ice_set_fc(struct ice_port_info *pi, u8 *aq_failures,

	   bool ena_auto_link_update);



enum ice_status

ice_aq_set_link_restart_an(struct ice_port_info *pi, bool ena_link,

			   struct ice_sq_cd *cd);
@@ -83,4 +95,5 @@ enum ice_status 
ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_id, u8 tc, u8 num_qgrps,

		struct ice_aqc_add_tx_qgrp *buf, u16 buf_size,

		struct ice_sq_cd *cd);

void ice_output_fw_log(struct ice_hw *hw, struct ice_aq_desc *desc, void *buf);

#endif /* _ICE_COMMON_H_ */

drivers/net/ethernet/intel/ice/ice_controlq.c

+3 −0
Original line number Diff line number Diff line
@@ -806,6 +806,9 @@ ice_sq_send_cmd(struct ice_hw *hw, struct ice_ctl_q_info *cq, 
	u16 retval = 0;

	u32 val = 0;



	/* if reset is in progress return a soft error */

	if (hw->reset_ongoing)

		return ICE_ERR_RESET_ONGOING;

	mutex_lock(&cq->sq_lock);



	cq->sq_last_status = ICE_AQ_RC_OK;

CRA Git | Maintained and supported by SUSTech CRA and CCSE