Commit 7da33a8f 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 2019-05-29

This series contains updates to ice driver only.

Bruce cleans up white space issues and fixes complaints about using
bitop assignments using operands of different sizes.

Anirudh cleans up code that is no longer needed now that the firmware
supports the functionality.  Adds support for ethtool selftestto the ice
driver, which includes testing link, interrupts, eeprom, registers and
packet loopback.  Also, cleaned up duplicate code.

Tony implements support for toggling receive VLAN filter via ethtool.

Brett bumps up the minimum receive descriptor count per queue to resolve
dropped packets.  Refactored the interrupt tracking for the ice driver
to resolve issues seen with the co-existence of features and SR-IOV, so
instead of having a hardware IRQ tracker and a software IRQ tracker,
simply use one tracker.  Also adds a helper function to trigger software
interrupts.

Mitch changes how Malicious Driver Detection (MDD) events are handled,
to ensure all VFs checked for MDD events and just log the event instead
of disabling the VF, which was preventing proper release of resources if
the VF is rebooted or the VF driver reloaded.

Dave cleans up a redundant call to register LLDP MIB change events.

Dan adds support to retrieve the current setting of firmware logging
from the hardware to properly initialize the hardware structure.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a3e2f6ad e89e899f

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

+31 −17
Original line number Diff line number Diff line
@@ -46,13 +46,20 @@ extern const char ice_drv_ver[]; 
#define ICE_REQ_DESC_MULTIPLE	32

#define ICE_MIN_NUM_DESC	ICE_REQ_DESC_MULTIPLE

#define ICE_MAX_NUM_DESC	8160

/* set default number of Rx/Tx descriptors to the minimum between

 * ICE_MAX_NUM_DESC and the number of descriptors to fill up an entire page

#define ICE_DFLT_MIN_RX_DESC	512

/* if the default number of Rx descriptors between ICE_MAX_NUM_DESC and the

 * number of descriptors to fill up an entire page is greater than or equal to

 * ICE_DFLT_MIN_RX_DESC set it based on page size, otherwise set it to

 * ICE_DFLT_MIN_RX_DESC

 */

#define ICE_DFLT_NUM_RX_DESC \

	min_t(u16, ICE_MAX_NUM_DESC, \

	      max_t(u16, ALIGN(PAGE_SIZE / sizeof(union ice_32byte_rx_desc), \

			       ICE_REQ_DESC_MULTIPLE), \

		    ICE_DFLT_MIN_RX_DESC))

/* set default number of Tx descriptors to the minimum between ICE_MAX_NUM_DESC

 * and the number of descriptors to fill up an entire page

 */

#define ICE_DFLT_NUM_RX_DESC	min_t(u16, ICE_MAX_NUM_DESC, \

				      ALIGN(PAGE_SIZE / \

					    sizeof(union ice_32byte_rx_desc), \

					    ICE_REQ_DESC_MULTIPLE))

#define ICE_DFLT_NUM_TX_DESC	min_t(u16, ICE_MAX_NUM_DESC, \

				      ALIGN(PAGE_SIZE / \

					    sizeof(struct ice_tx_desc), \
@@ -160,7 +167,7 @@ struct ice_tc_cfg { 


struct ice_res_tracker {

	u16 num_entries;

	u16 search_hint;

	u16 end;

	u16 list[1];

};
@@ -182,6 +189,7 @@ struct ice_sw { 
};



enum ice_state {

	__ICE_TESTING,

	__ICE_DOWN,

	__ICE_NEEDS_RESTART,

	__ICE_PREPARED_FOR_RESET,	/* set by driver when prepared */
@@ -244,8 +252,7 @@ struct ice_vsi { 
	u32 rx_buf_failed;

	u32 rx_page_failed;

	int num_q_vectors;

	int sw_base_vector;		/* Irq base for OS reserved vectors */

	int hw_base_vector;		/* HW (absolute) index of a vector */

	int base_vector;		/* IRQ base for OS reserved vectors */

	enum ice_vsi_type type;

	u16 vsi_num;			/* HW (absolute) index of this VSI */

	u16 idx;			/* software index in pf->vsi[] */
@@ -340,10 +347,12 @@ struct ice_pf { 


	/* OS reserved IRQ details */

	struct msix_entry *msix_entries;

	struct ice_res_tracker *sw_irq_tracker;



	/* HW reserved Interrupts for this PF */

	struct ice_res_tracker *hw_irq_tracker;

	struct ice_res_tracker *irq_tracker;

	/* First MSIX vector used by SR-IOV VFs. Calculated by subtracting the

	 * number of MSIX vectors needed for all SR-IOV VFs from the number of

	 * MSIX vectors allowed on this PF.

	 */

	u16 sriov_base_vector;



	struct ice_vsi **vsi;		/* VSIs created by the driver */

	struct ice_sw *first_sw;	/* first switch created by firmware */
@@ -365,10 +374,8 @@ struct ice_pf { 
	struct mutex sw_mutex;		/* lock for protecting VSI alloc flow */

	u32 msg_enable;

	u32 hw_csum_rx_error;

	u32 sw_oicr_idx;	/* Other interrupt cause SW vector index */

	u32 oicr_idx;		/* Other interrupt cause MSIX vector index */

	u32 num_avail_sw_msix;	/* remaining MSIX SW vectors left unclaimed */

	u32 hw_oicr_idx;	/* Other interrupt cause vector HW index */

	u32 num_avail_hw_msix;	/* remaining HW MSIX vectors left unclaimed */

	u32 num_lan_msix;	/* Total MSIX vectors for base driver */

	u16 num_lan_tx;		/* num LAN Tx queues setup */

	u16 num_lan_rx;		/* num LAN Rx queues setup */
@@ -392,6 +399,7 @@ struct ice_pf { 
	unsigned long tx_timeout_last_recovery;

	u32 tx_timeout_recovery_level;

	char int_name[ICE_INT_NAME_STR_LEN];

	u32 sw_int_count;

};



struct ice_netdev_priv {
@@ -409,7 +417,7 @@ ice_irq_dynamic_ena(struct ice_hw *hw, struct ice_vsi *vsi, 
		    struct ice_q_vector *q_vector)

{

	u32 vector = (vsi && q_vector) ? q_vector->reg_idx :

				((struct ice_pf *)hw->back)->hw_oicr_idx;

				((struct ice_pf *)hw->back)->oicr_idx;

	int itr = ICE_ITR_NONE;

	u32 val;
@@ -444,9 +452,13 @@ ice_find_vsi_by_type(struct ice_pf *pf, enum ice_vsi_type type) 
	return NULL;

}



int ice_vsi_setup_tx_rings(struct ice_vsi *vsi);

int ice_vsi_setup_rx_rings(struct ice_vsi *vsi);

void ice_set_ethtool_ops(struct net_device *netdev);

int ice_up(struct ice_vsi *vsi);

int ice_down(struct ice_vsi *vsi);

int ice_vsi_cfg(struct ice_vsi *vsi);

struct ice_vsi *ice_lb_vsi_setup(struct ice_pf *pf, struct ice_port_info *pi);

int ice_set_rss(struct ice_vsi *vsi, u8 *seed, u8 *lut, u16 lut_size);

int ice_get_rss(struct ice_vsi *vsi, u8 *seed, u8 *lut, u16 lut_size);

void ice_fill_rss_lut(u8 *lut, u16 rss_table_size, u16 rss_size);
@@ -455,5 +467,7 @@ void ice_print_link_msg(struct ice_vsi *vsi, bool isup); 
int ice_pf_ena_all_vsi(struct ice_pf *pf, bool locked);

void ice_pf_dis_all_vsi(struct ice_pf *pf, bool locked);

#endif /* CONFIG_DCB */

int ice_open(struct net_device *netdev);

int ice_stop(struct net_device *netdev);



#endif /* _ICE_H_ */

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

+24 −0
Original line number Diff line number Diff line
@@ -1112,6 +1112,14 @@ struct ice_aqc_set_event_mask { 
	u8	reserved1[6];

};



/* Set MAC Loopback command (direct 0x0620) */

struct ice_aqc_set_mac_lb {

	u8 lb_mode;

#define ICE_AQ_MAC_LB_EN		BIT(0)

#define ICE_AQ_MAC_LB_OSC_CLK		BIT(1)

	u8 reserved[15];

};



/* Set Port Identification LED (direct, 0x06E9) */

struct ice_aqc_set_port_id_led {

	u8 lport_num;
@@ -1145,6 +1153,17 @@ struct ice_aqc_nvm { 
	__le32 addr_low;

};



/* NVM Checksum Command (direct, 0x0706) */

struct ice_aqc_nvm_checksum {

	u8 flags;

#define ICE_AQC_NVM_CHECKSUM_VERIFY	BIT(0)

#define ICE_AQC_NVM_CHECKSUM_RECALC	BIT(1)

	u8 rsvd;

	__le16 checksum; /* Used only by response */

#define ICE_AQC_NVM_CHECKSUM_CORRECT	0xBABA

	u8 rsvd2[12];

};



/**

 * Send to PF command (indirect 0x0801) ID is only used by PF

 *
@@ -1539,6 +1558,7 @@ struct ice_aq_desc { 
		struct ice_aqc_query_txsched_res query_sched_res;

		struct ice_aqc_query_port_ets port_ets;

		struct ice_aqc_nvm nvm;

		struct ice_aqc_nvm_checksum nvm_checksum;

		struct ice_aqc_pf_vf_msg virt;

		struct ice_aqc_lldp_get_mib lldp_get_mib;

		struct ice_aqc_lldp_set_mib_change lldp_set_event;
@@ -1554,6 +1574,7 @@ struct ice_aq_desc { 
		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_set_mac_lb set_mac_lb;

		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;
@@ -1642,10 +1663,12 @@ enum ice_adminq_opc { 
	ice_aqc_opc_restart_an				= 0x0605,

	ice_aqc_opc_get_link_status			= 0x0607,

	ice_aqc_opc_set_event_mask			= 0x0613,

	ice_aqc_opc_set_mac_lb				= 0x0620,

	ice_aqc_opc_set_port_id_led			= 0x06E9,



	/* NVM commands */

	ice_aqc_opc_nvm_read				= 0x0701,

	ice_aqc_opc_nvm_checksum			= 0x0706,



	/* PF/VF mailbox commands */

	ice_mbx_opc_send_msg_to_pf			= 0x0801,
@@ -1671,6 +1694,7 @@ enum ice_adminq_opc { 


	/* debug commands */

	ice_aqc_opc_fw_logging				= 0xFF09,

	ice_aqc_opc_fw_logging_info			= 0xFF10,

};



#endif /* _ICE_ADMINQ_CMD_H_ */

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

+71 −4
Original line number Diff line number Diff line
@@ -51,9 +51,6 @@ static enum ice_status ice_set_mac_type(struct ice_hw *hw) 
 */

void ice_dev_onetime_setup(struct ice_hw *hw)

{

	/* configure Rx - set non pxe mode */

	wr32(hw, GLLAN_RCTL_0, 0x1);



#define MBX_PF_VT_PFALLOC	0x00231E80

	/* set VFs per PF */

	wr32(hw, MBX_PF_VT_PFALLOC, rd32(hw, PF_VT_PFALLOC_HIF));
@@ -475,6 +472,49 @@ static void ice_cleanup_fltr_mgmt_struct(struct ice_hw *hw) 
#define ICE_FW_LOG_DESC_SIZE_MAX	\

	ICE_FW_LOG_DESC_SIZE(ICE_AQC_FW_LOG_ID_MAX)



/**

 * ice_get_fw_log_cfg - get FW logging configuration

 * @hw: pointer to the HW struct

 */

static enum ice_status ice_get_fw_log_cfg(struct ice_hw *hw)

{

	struct ice_aqc_fw_logging_data *config;

	struct ice_aq_desc desc;

	enum ice_status status;

	u16 size;



	size = ICE_FW_LOG_DESC_SIZE_MAX;

	config = devm_kzalloc(ice_hw_to_dev(hw), size, GFP_KERNEL);

	if (!config)

		return ICE_ERR_NO_MEMORY;



	ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_fw_logging_info);



	desc.flags |= cpu_to_le16(ICE_AQ_FLAG_BUF);

	desc.flags |= cpu_to_le16(ICE_AQ_FLAG_RD);



	status = ice_aq_send_cmd(hw, &desc, config, size, NULL);

	if (!status) {

		u16 i;



		/* Save fw logging information into the hw structure */

		for (i = 0; i < ICE_AQC_FW_LOG_ID_MAX; i++) {

			u16 v, m, flgs;



			v = le16_to_cpu(config->entry[i]);

			m = (v & ICE_AQC_FW_LOG_ID_M) >> ICE_AQC_FW_LOG_ID_S;

			flgs = (v & ICE_AQC_FW_LOG_EN_M) >> ICE_AQC_FW_LOG_EN_S;



			if (m < ICE_AQC_FW_LOG_ID_MAX)

				hw->fw_log.evnts[m].cur = flgs;

		}

	}



	devm_kfree(ice_hw_to_dev(hw), config);



	return status;

}



/**

 * ice_cfg_fw_log - configure FW logging

 * @hw: pointer to the HW struct
@@ -529,6 +569,11 @@ static enum ice_status ice_cfg_fw_log(struct ice_hw *hw, bool enable) 
	    (!hw->fw_log.actv_evnts || !ice_check_sq_alive(hw, &hw->adminq)))

		return 0;



	/* Get current FW log settings */

	status = ice_get_fw_log_cfg(hw);

	if (status)

		return status;



	ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_fw_logging);

	cmd = &desc.params.fw_logging;
@@ -2172,6 +2217,29 @@ ice_aq_set_event_mask(struct ice_hw *hw, u8 port_num, u16 mask, 
	return ice_aq_send_cmd(hw, &desc, NULL, 0, cd);

}



/**

 * ice_aq_set_mac_loopback

 * @hw: pointer to the HW struct

 * @ena_lpbk: Enable or Disable loopback

 * @cd: pointer to command details structure or NULL

 *

 * Enable/disable loopback on a given port

 */

enum ice_status

ice_aq_set_mac_loopback(struct ice_hw *hw, bool ena_lpbk, struct ice_sq_cd *cd)

{

	struct ice_aqc_set_mac_lb *cmd;

	struct ice_aq_desc desc;



	cmd = &desc.params.set_mac_lb;



	ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_set_mac_lb);

	if (ena_lpbk)

		cmd->lb_mode = ICE_AQ_MAC_LB_EN;



	return ice_aq_send_cmd(hw, &desc, NULL, 0, cd);

}



/**

 * ice_aq_set_port_id_led

 * @pi: pointer to the port information
@@ -2928,7 +2996,6 @@ ice_dis_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u8 num_queues, 
	if (!pi || pi->port_state != ICE_SCHED_PORT_STATE_READY)

		return ICE_ERR_CFG;





	if (!num_queues) {

		/* if queue is disabled already yet the disable queue command

		 * has to be sent to complete the VF reset, then call

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

+5 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ 
#include "ice_switch.h"

#include <linux/avf/virtchnl.h>



enum ice_status ice_nvm_validate_checksum(struct ice_hw *hw);



void

ice_debug_cq(struct ice_hw *hw, u32 mask, void *desc, void *buf, u16 buf_len);

enum ice_status ice_init_hw(struct ice_hw *hw);
@@ -94,6 +96,9 @@ ice_aq_get_link_info(struct ice_port_info *pi, bool ena_lse, 
enum ice_status

ice_aq_set_event_mask(struct ice_hw *hw, u8 port_num, u16 mask,

		      struct ice_sq_cd *cd);

enum ice_status

ice_aq_set_mac_loopback(struct ice_hw *hw, bool ena_lpbk, struct ice_sq_cd *cd);



enum ice_status

ice_aq_set_port_id_led(struct ice_port_info *pi, bool is_orig_mode,

		       struct ice_sq_cd *cd);

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

+593 −8

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE