Commit ca441a71 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/tnguy/net-queue 



Tony Nguyen says:

====================
Intel Wired LAN Driver Updates 2021-03-29

This series contains updates to ice driver only.

Ani does not fail on link/PHY errors during probe as this is not a fatal
error to prevent the user from remedying the problem. He also corrects
checking Wake on LAN support to be port number, not PF ID.

Fabio increases the AdminQ timeout as some commands can take longer than
the current value.

Chinh fixes iSCSI to use be able to use port 860 by using information
from DCBx and other QoS configuration info.

Krzysztof fixes a possible race between ice_open() and ice_stop().

Bruce corrects the ordering of arguments in a memory allocation call.

Dave removes DCBNL device reset bit which is blocking changes coming
from DCBNL interface.

Jacek adds error handling for filter allocation failure.

Robert ensures memory is freed if VSI filter list issues are
encountered.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 4cd7bd59 b7eeb527

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

+2 −2
Original line number Diff line number Diff line
@@ -196,7 +196,6 @@ enum ice_state { 
	__ICE_NEEDS_RESTART,

	__ICE_PREPARED_FOR_RESET,	/* set by driver when prepared */

	__ICE_RESET_OICR_RECV,		/* set by driver after rcv reset OICR */

	__ICE_DCBNL_DEVRESET,		/* set by dcbnl devreset */

	__ICE_PFR_REQ,			/* set by driver and peers */

	__ICE_CORER_REQ,		/* set by driver and peers */

	__ICE_GLOBR_REQ,		/* set by driver and peers */
@@ -624,7 +623,7 @@ int ice_schedule_reset(struct ice_pf *pf, enum ice_reset_req reset); 
void ice_print_link_msg(struct ice_vsi *vsi, bool isup);

const char *ice_stat_str(enum ice_status stat_err);

const char *ice_aq_str(enum ice_aq_err aq_err);

bool ice_is_wol_supported(struct ice_pf *pf);

bool ice_is_wol_supported(struct ice_hw *hw);

int

ice_fdir_write_fltr(struct ice_pf *pf, struct ice_fdir_fltr *input, bool add,

		    bool is_tun);
@@ -642,6 +641,7 @@ int ice_fdir_create_dflt_rules(struct ice_pf *pf); 
int ice_aq_wait_for_event(struct ice_pf *pf, u16 opcode, unsigned long timeout,

			  struct ice_rq_event_info *event);

int ice_open(struct net_device *netdev);

int ice_open_internal(struct net_device *netdev);

int ice_stop(struct net_device *netdev);

void ice_service_task_schedule(struct ice_pf *pf);

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

+1 −1
Original line number Diff line number Diff line
@@ -717,8 +717,8 @@ static enum ice_status ice_cfg_fw_log(struct ice_hw *hw, bool enable) 


			if (!data) {

				data = devm_kcalloc(ice_hw_to_dev(hw),

						    sizeof(*data),

						    ICE_AQC_FW_LOG_ID_MAX,

						    sizeof(*data),

						    GFP_KERNEL);

				if (!data)

					return ICE_ERR_NO_MEMORY;

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

+2 −2
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ enum ice_ctl_q { 
	ICE_CTL_Q_MAILBOX,

};



/* Control Queue timeout settings - max delay 250ms */

#define ICE_CTL_Q_SQ_CMD_TIMEOUT	2500  /* Count 2500 times */

/* Control Queue timeout settings - max delay 1s */

#define ICE_CTL_Q_SQ_CMD_TIMEOUT	10000 /* Count 10000 times */

#define ICE_CTL_Q_SQ_CMD_USEC		100   /* Check every 100usec */

#define ICE_CTL_Q_ADMIN_INIT_TIMEOUT	10    /* Count 10 times */

#define ICE_CTL_Q_ADMIN_INIT_MSEC	100   /* Check every 100msec */

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

+29 −9
Original line number Diff line number Diff line
@@ -738,22 +738,27 @@ ice_aq_get_cee_dcb_cfg(struct ice_hw *hw, 
/**

 * ice_cee_to_dcb_cfg

 * @cee_cfg: pointer to CEE configuration struct

 * @dcbcfg: DCB configuration struct

 * @pi: port information structure

 *

 * Convert CEE configuration from firmware to DCB configuration

 */

static void

ice_cee_to_dcb_cfg(struct ice_aqc_get_cee_dcb_cfg_resp *cee_cfg,

		   struct ice_dcbx_cfg *dcbcfg)

		   struct ice_port_info *pi)

{

	u32 status, tlv_status = le32_to_cpu(cee_cfg->tlv_status);

	u32 ice_aqc_cee_status_mask, ice_aqc_cee_status_shift;

	u8 i, j, err, sync, oper, app_index, ice_app_sel_type;

	u16 app_prio = le16_to_cpu(cee_cfg->oper_app_prio);

	u8 i, err, sync, oper, app_index, ice_app_sel_type;

	u16 ice_aqc_cee_app_mask, ice_aqc_cee_app_shift;

	struct ice_dcbx_cfg *cmp_dcbcfg, *dcbcfg;

	u16 ice_app_prot_id_type;



	/* CEE PG data to ETS config */

	dcbcfg = &pi->qos_cfg.local_dcbx_cfg;

	dcbcfg->dcbx_mode = ICE_DCBX_MODE_CEE;

	dcbcfg->tlv_status = tlv_status;



	/* CEE PG data */

	dcbcfg->etscfg.maxtcs = cee_cfg->oper_num_tc;



	/* Note that the FW creates the oper_prio_tc nibbles reversed
@@ -780,10 +785,16 @@ ice_cee_to_dcb_cfg(struct ice_aqc_get_cee_dcb_cfg_resp *cee_cfg, 
		}

	}



	/* CEE PFC data to ETS config */

	/* CEE PFC data */

	dcbcfg->pfc.pfcena = cee_cfg->oper_pfc_en;

	dcbcfg->pfc.pfccap = ICE_MAX_TRAFFIC_CLASS;



	/* CEE APP TLV data */

	if (dcbcfg->app_mode == ICE_DCBX_APPS_NON_WILLING)

		cmp_dcbcfg = &pi->qos_cfg.desired_dcbx_cfg;

	else

		cmp_dcbcfg = &pi->qos_cfg.remote_dcbx_cfg;



	app_index = 0;

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

		if (i == 0) {
@@ -802,6 +813,18 @@ ice_cee_to_dcb_cfg(struct ice_aqc_get_cee_dcb_cfg_resp *cee_cfg, 
			ice_aqc_cee_app_shift = ICE_AQC_CEE_APP_ISCSI_S;

			ice_app_sel_type = ICE_APP_SEL_TCPIP;

			ice_app_prot_id_type = ICE_APP_PROT_ID_ISCSI;



			for (j = 0; j < cmp_dcbcfg->numapps; j++) {

				u16 prot_id = cmp_dcbcfg->app[j].prot_id;

				u8 sel = cmp_dcbcfg->app[j].selector;



				if  (sel == ICE_APP_SEL_TCPIP &&

				     (prot_id == ICE_APP_PROT_ID_ISCSI ||

				      prot_id == ICE_APP_PROT_ID_ISCSI_860)) {

					ice_app_prot_id_type = prot_id;

					break;

				}

			}

		} else {

			/* FIP APP */

			ice_aqc_cee_status_mask = ICE_AQC_CEE_FIP_STATUS_M;
@@ -892,11 +915,8 @@ enum ice_status ice_get_dcb_cfg(struct ice_port_info *pi) 
	ret = ice_aq_get_cee_dcb_cfg(pi->hw, &cee_cfg, NULL);

	if (!ret) {

		/* CEE mode */

		dcbx_cfg = &pi->qos_cfg.local_dcbx_cfg;

		dcbx_cfg->dcbx_mode = ICE_DCBX_MODE_CEE;

		dcbx_cfg->tlv_status = le32_to_cpu(cee_cfg.tlv_status);

		ice_cee_to_dcb_cfg(&cee_cfg, dcbx_cfg);

		ret = ice_get_ieee_or_cee_dcb_cfg(pi, ICE_DCBX_MODE_CEE);

		ice_cee_to_dcb_cfg(&cee_cfg, pi);

	} else if (pi->hw->adminq.sq_last_status == ICE_AQ_RC_ENOENT) {

		/* CEE mode not enabled try querying IEEE data */

		dcbx_cfg = &pi->qos_cfg.local_dcbx_cfg;

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

+0 −2
Original line number Diff line number Diff line
@@ -18,12 +18,10 @@ static void ice_dcbnl_devreset(struct net_device *netdev) 
	while (ice_is_reset_in_progress(pf->state))

		usleep_range(1000, 2000);



	set_bit(__ICE_DCBNL_DEVRESET, pf->state);

	dev_close(netdev);

	netdev_state_change(netdev);

	dev_open(netdev, NULL);

	netdev_state_change(netdev);

	clear_bit(__ICE_DCBNL_DEVRESET, pf->state);

}



/**