Commit ba197fde 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/next-queue 



Tony Nguyen says:

====================
Intel Wired LAN Driver Updates 2023-01-19 (ice)

This series contains updates to ice driver only.

Tsotne and Anatolii implement new handling, and AdminQ command, for
firmware LLDP, adding a pending notification to allow for proper
cleanup between TC changes.

Amritha extends support for drop action outside of switchdev.

Siddaraju adjusts restriction for PTP HW clock adjustments.

Ani removes an unneeded non-null check and improves reporting of some link
modes to utilize more appropriate values.

Jesse adds checks to ensure PF VSI type.

Przemek combines duplicate checks of the same condition into one check.

Tony makes various cleanups to code: removes comments for cppcheck
suppressions, reduces scope of some variables, changes some return
statements to reflect an explicit 0 return, matches naming for function
declaration and definition, adds local variable for readability, and
fixes indenting.

Sergey separates DDP (Dynamic Device Personalization) code into its own
file.
====================

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

drivers/net/ethernet/intel/ice/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ ice-y := ice_main.o \ 
	 ice_flow.o	\

	 ice_idc.o	\

	 ice_devlink.o	\

	 ice_ddp.o	\

	 ice_fw_update.o \

	 ice_lag.o	\

	 ice_ethtool.o  \

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

+16 −2
Original line number Diff line number Diff line
@@ -1659,14 +1659,24 @@ struct ice_aqc_lldp_get_mib { 
#define ICE_AQ_LLDP_TX_ACTIVE			0

#define ICE_AQ_LLDP_TX_SUSPENDED		1

#define ICE_AQ_LLDP_TX_FLUSHED			3

/* DCBX mode */

#define ICE_AQ_LLDP_DCBX_M			GENMASK(7, 6)

#define ICE_AQ_LLDP_DCBX_NA			0

#define ICE_AQ_LLDP_DCBX_CEE			1

#define ICE_AQ_LLDP_DCBX_IEEE			2



	u8 state;

#define ICE_AQ_LLDP_MIB_CHANGE_STATE_M		BIT(0)

#define ICE_AQ_LLDP_MIB_CHANGE_EXECUTED		0

#define ICE_AQ_LLDP_MIB_CHANGE_PENDING		1



/* The following bytes are reserved for the Get LLDP MIB command (0x0A00)

 * and in the LLDP MIB Change Event (0x0A01). They are valid for the

 * Get LLDP MIB (0x0A00) response only.

 */

	u8 reserved1;

	__le16 local_len;

	__le16 remote_len;

	u8 reserved2[2];

	u8 reserved[2];

	__le32 addr_high;

	__le32 addr_low;

};
@@ -1677,6 +1687,9 @@ struct ice_aqc_lldp_set_mib_change { 
	u8 command;

#define ICE_AQ_LLDP_MIB_UPDATE_ENABLE		0x0

#define ICE_AQ_LLDP_MIB_UPDATE_DIS		0x1

#define ICE_AQ_LLDP_MIB_PENDING_M		BIT(1)

#define ICE_AQ_LLDP_MIB_PENDING_DISABLE		0

#define ICE_AQ_LLDP_MIB_PENDING_ENABLE		1

	u8 reserved[15];

};
@@ -2329,6 +2342,7 @@ enum ice_adminq_opc { 
	ice_aqc_opc_lldp_set_local_mib			= 0x0A08,

	ice_aqc_opc_lldp_stop_start_specific_agent	= 0x0A09,

	ice_aqc_opc_lldp_filter_ctrl			= 0x0A0A,

	ice_aqc_opc_lldp_execute_pending_mib		= 0x0A0B,



	/* RSS commands */

	ice_aqc_opc_set_rss_key				= 0x0B02,

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

+13 −0
Original line number Diff line number Diff line
@@ -5503,6 +5503,19 @@ ice_lldp_fltr_add_remove(struct ice_hw *hw, u16 vsi_num, bool add) 
	return ice_aq_send_cmd(hw, &desc, NULL, 0, NULL);

}



/**

 * ice_lldp_execute_pending_mib - execute LLDP pending MIB request

 * @hw: pointer to HW struct

 */

int ice_lldp_execute_pending_mib(struct ice_hw *hw)

{

	struct ice_aq_desc desc;



	ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_lldp_execute_pending_mib);



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

}



/**

 * ice_fw_supports_report_dflt_cfg

 * @hw: pointer to the hardware structure

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

+2 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ ice_set_fc(struct ice_port_info *pi, u8 *aq_failures, 
	   bool ena_auto_link_update);

int

ice_cfg_phy_fc(struct ice_port_info *pi, struct ice_aqc_set_phy_cfg_data *cfg,

	       enum ice_fc_mode fc);

	       enum ice_fc_mode req_mode);

bool

ice_phy_caps_equals_cfg(struct ice_aqc_get_phy_caps_data *caps,

			struct ice_aqc_set_phy_cfg_data *cfg);
@@ -221,6 +221,7 @@ ice_aq_set_lldp_mib(struct ice_hw *hw, u8 mib_type, void *buf, u16 buf_size, 
bool ice_fw_supports_lldp_fltr_ctrl(struct ice_hw *hw);

int

ice_lldp_fltr_add_remove(struct ice_hw *hw, u16 vsi_num, bool add);

int ice_lldp_execute_pending_mib(struct ice_hw *hw);

int

ice_aq_read_i2c(struct ice_hw *hw, struct ice_aqc_link_topo_addr topo_addr,

		u16 bus_addr, __le16 addr, u8 params, u8 *data,

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

+39 −0
Original line number Diff line number Diff line
@@ -73,6 +73,9 @@ ice_aq_cfg_lldp_mib_change(struct ice_hw *hw, bool ena_update, 


	if (!ena_update)

		cmd->command |= ICE_AQ_LLDP_MIB_UPDATE_DIS;

	else

		cmd->command |= FIELD_PREP(ICE_AQ_LLDP_MIB_PENDING_M,

					   ICE_AQ_LLDP_MIB_PENDING_ENABLE);



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

}
@@ -963,6 +966,42 @@ int ice_get_dcb_cfg(struct ice_port_info *pi) 
	return ret;

}



/**

 * ice_get_dcb_cfg_from_mib_change

 * @pi: port information structure

 * @event: pointer to the admin queue receive event

 *

 * Set DCB configuration from received MIB Change event

 */

void ice_get_dcb_cfg_from_mib_change(struct ice_port_info *pi,

				     struct ice_rq_event_info *event)

{

	struct ice_dcbx_cfg *dcbx_cfg = &pi->qos_cfg.local_dcbx_cfg;

	struct ice_aqc_lldp_get_mib *mib;

	u8 change_type, dcbx_mode;



	mib = (struct ice_aqc_lldp_get_mib *)&event->desc.params.raw;



	change_type = FIELD_GET(ICE_AQ_LLDP_MIB_TYPE_M,  mib->type);

	if (change_type == ICE_AQ_LLDP_MIB_REMOTE)

		dcbx_cfg = &pi->qos_cfg.remote_dcbx_cfg;



	dcbx_mode = FIELD_GET(ICE_AQ_LLDP_DCBX_M, mib->type);



	switch (dcbx_mode) {

	case ICE_AQ_LLDP_DCBX_IEEE:

		dcbx_cfg->dcbx_mode = ICE_DCBX_MODE_IEEE;

		ice_lldp_to_dcb_cfg(event->msg_buf, dcbx_cfg);

		break;



	case ICE_AQ_LLDP_DCBX_CEE:

		pi->qos_cfg.desired_dcbx_cfg = pi->qos_cfg.local_dcbx_cfg;

		ice_cee_to_dcb_cfg((struct ice_aqc_get_cee_dcb_cfg_resp *)

				   event->msg_buf, pi);

		break;

	}

}



/**

 * ice_init_dcb

 * @hw: pointer to the HW struct