Commit 72bc7f16 authored by Jakub Kicinski's avatar Jakub Kicinski
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-02-14 (ice)

This series contains updates to ice driver only.

Karol extends support for GPIO pins to E823 devices.

Daniel Vacek stops processing of PTP packets when link is down.

Pawel adds support for BIG TCP for IPv6.

Tony changes return type of ice_vsi_realloc_stat_arrays() as it always
returns success.

Zhu Yanjun updates kdoc stating supported TLVs.

* '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue:
  ice: Mention CEE DCBX in code comment
  ice: Change ice_vsi_realloc_stat_arrays() to void
  ice: add support BIG TCP on IPv6
  ice/ptp: fix the PTP worker retrying indefinitely if the link went down
  ice: Add GPIO pin support for E823 products
====================

Link: https://lore.kernel.org/r/20230214213003.2117125-1-anthony.l.nguyen@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 1f26c8b7 13b599f1

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

+2 −0
Original line number Diff line number Diff line
@@ -123,6 +123,8 @@ 


#define ICE_MAX_MTU	(ICE_AQ_SET_MAC_FRAME_SIZE_MAX - ICE_ETH_PKT_HDR_PAD)



#define ICE_MAX_TSO_SIZE 131072



#define ICE_UP_TABLE_TRANSLATE(val, i) \

		(((val) << ICE_AQ_VSI_UP_TABLE_UP##i##_S) & \

		  ICE_AQ_VSI_UP_TABLE_UP##i##_M)

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

+25 −0
Original line number Diff line number Diff line
@@ -207,6 +207,31 @@ bool ice_is_e810t(struct ice_hw *hw) 
	return false;

}



/**

 * ice_is_e823

 * @hw: pointer to the hardware structure

 *

 * returns true if the device is E823-L or E823-C based, false if not.

 */

bool ice_is_e823(struct ice_hw *hw)

{

	switch (hw->device_id) {

	case ICE_DEV_ID_E823L_BACKPLANE:

	case ICE_DEV_ID_E823L_SFP:

	case ICE_DEV_ID_E823L_10G_BASE_T:

	case ICE_DEV_ID_E823L_1GBE:

	case ICE_DEV_ID_E823L_QSFP:

	case ICE_DEV_ID_E823C_BACKPLANE:

	case ICE_DEV_ID_E823C_QSFP:

	case ICE_DEV_ID_E823C_SFP:

	case ICE_DEV_ID_E823C_10G_BASE_T:

	case ICE_DEV_ID_E823C_SGMII:

		return true;

	default:

		return false;

	}

}



/**

 * ice_clear_pf_cfg - Clear PF configuration

 * @hw: pointer to the hardware structure

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

+1 −0
Original line number Diff line number Diff line
@@ -199,6 +199,7 @@ void 
ice_stat_update32(struct ice_hw *hw, u32 reg, bool prev_stat_loaded,

		  u64 *prev_stat, u64 *cur_stat);

bool ice_is_e810t(struct ice_hw *hw);

bool ice_is_e823(struct ice_hw *hw);

int

ice_sched_query_elem(struct ice_hw *hw, u32 node_teid,

		     struct ice_aqc_txsched_elem_data *buf);

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

+2 −2
Original line number Diff line number Diff line
@@ -569,7 +569,7 @@ ice_parse_cee_tlv(struct ice_lldp_org_tlv *tlv, struct ice_dcbx_cfg *dcbcfg) 
 * @tlv: Organization specific TLV

 * @dcbcfg: Local store to update ETS REC data

 *

 * Currently only IEEE 802.1Qaz TLV is supported, all others

 * Currently IEEE 802.1Qaz and CEE DCBX TLV are supported, others

 * will be returned

 */

static void
@@ -588,7 +588,7 @@ ice_parse_org_tlv(struct ice_lldp_org_tlv *tlv, struct ice_dcbx_cfg *dcbcfg) 
		ice_parse_cee_tlv(tlv, dcbcfg);

		break;

	default:

		break;

		break; /* Other OUIs not supported */

	}

}

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

+4 −7
Original line number Diff line number Diff line
@@ -3426,7 +3426,7 @@ ice_vsi_rebuild_set_coalesce(struct ice_vsi *vsi, 
 * @prev_txq: Number of Tx rings before ring reallocation

 * @prev_rxq: Number of Rx rings before ring reallocation

 */

static int

static void

ice_vsi_realloc_stat_arrays(struct ice_vsi *vsi, int prev_txq, int prev_rxq)

{

	struct ice_vsi_stats *vsi_stat;
@@ -3434,9 +3434,9 @@ ice_vsi_realloc_stat_arrays(struct ice_vsi *vsi, int prev_txq, int prev_rxq) 
	int i;



	if (!prev_txq || !prev_rxq)

		return 0;

		return;

	if (vsi->type == ICE_VSI_CHNL)

		return 0;

		return;



	vsi_stat = pf->vsi_stats[vsi->idx];
@@ -3457,8 +3457,6 @@ ice_vsi_realloc_stat_arrays(struct ice_vsi *vsi, int prev_txq, int prev_rxq) 
			}

		}

	}



	return 0;

}



/**
@@ -3515,8 +3513,7 @@ int ice_vsi_rebuild(struct ice_vsi *vsi, u32 vsi_flags) 
		}

	}



	if (ice_vsi_realloc_stat_arrays(vsi, prev_txq, prev_rxq))

		goto err_vsi_cfg_tc_lan;

	ice_vsi_realloc_stat_arrays(vsi, prev_txq, prev_rxq);



	ice_vsi_rebuild_set_coalesce(vsi, coalesce, prev_num_q_vectors);

	kfree(coalesce);