Commit 5403d39b 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/nex 


t-queue

Tony Nguyen says:

====================
Intel Wired LAN Driver Updates 2024-01-02 (ice)

This series contains updates to ice driver only.

Karol adds support for capable devices to receive timestamp via
interrupt rather than polling to allow for less delay.

Andrii adds support switchdev hardware packet mirroring.

Jake reworks VF rebuild to avoid destroying objects that do not need to
be.

Jan S removes reporting of rx_len_errors as they are incorrectly reported
by hardware.

Jan G adds const modifier to some uses that are applicable.

Kunwu Chan adds some checks for failed memory allocations.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a562c0a2 3027e7b1

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

+2 −1
Original line number Diff line number Diff line
@@ -518,7 +518,6 @@ enum ice_pf_flags { 
};



enum ice_misc_thread_tasks {

	ICE_MISC_THREAD_EXTTS_EVENT,

	ICE_MISC_THREAD_TX_TSTAMP,

	ICE_MISC_THREAD_NBITS		/* must be last */

};
@@ -609,6 +608,7 @@ struct ice_pf { 
	u32 hw_csum_rx_error;

	u32 oicr_err_reg;

	struct msi_map oicr_irq;	/* Other interrupt cause MSIX vector */

	struct msi_map ll_ts_irq;	/* LL_TS interrupt MSIX vector */

	u16 max_pf_txqs;	/* Total Tx queues PF wide */

	u16 max_pf_rxqs;	/* Total Rx queues PF wide */

	u16 num_lan_msix;	/* Total MSIX vectors for base driver */
@@ -633,6 +633,7 @@ struct ice_pf { 
	unsigned long tx_timeout_last_recovery;

	u32 tx_timeout_recovery_level;

	char int_name[ICE_INT_NAME_STR_LEN];

	char int_name_ll_ts[ICE_INT_NAME_STR_LEN];

	struct auxiliary_device *adev;

	int aux_idx;

	u32 sw_int_count;

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

+3 −3
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ static u16 ice_calc_txq_handle(struct ice_vsi *vsi, struct ice_tx_ring *ring, u8 
 */

static u16 ice_eswitch_calc_txq_handle(struct ice_tx_ring *ring)

{

	struct ice_vsi *vsi = ring->vsi;

	const struct ice_vsi *vsi = ring->vsi;

	int i;



	ice_for_each_txq(vsi, i) {
@@ -975,7 +975,7 @@ ice_cfg_rxq_interrupt(struct ice_vsi *vsi, u16 rxq, u16 msix_idx, u16 itr_idx) 
 * @hw: pointer to the HW structure

 * @q_vector: interrupt vector to trigger the software interrupt for

 */

void ice_trigger_sw_intr(struct ice_hw *hw, struct ice_q_vector *q_vector)

void ice_trigger_sw_intr(struct ice_hw *hw, const struct ice_q_vector *q_vector)

{

	wr32(hw, GLINT_DYN_CTL(q_vector->reg_idx),

	     (ICE_ITR_NONE << GLINT_DYN_CTL_ITR_INDX_S) |
@@ -1050,7 +1050,7 @@ ice_vsi_stop_tx_ring(struct ice_vsi *vsi, enum ice_disq_rst_src rst_src, 
 * are needed for stopping Tx queue

 */

void

ice_fill_txq_meta(struct ice_vsi *vsi, struct ice_tx_ring *ring,

ice_fill_txq_meta(const struct ice_vsi *vsi, struct ice_tx_ring *ring,

		  struct ice_txq_meta *txq_meta)

{

	struct ice_channel *ch = ring->ch;

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

+2 −2
Original line number Diff line number Diff line
@@ -22,12 +22,12 @@ void 
ice_cfg_txq_interrupt(struct ice_vsi *vsi, u16 txq, u16 msix_idx, u16 itr_idx);

void

ice_cfg_rxq_interrupt(struct ice_vsi *vsi, u16 rxq, u16 msix_idx, u16 itr_idx);

void ice_trigger_sw_intr(struct ice_hw *hw, struct ice_q_vector *q_vector);

void ice_trigger_sw_intr(struct ice_hw *hw, const struct ice_q_vector *q_vector);

int

ice_vsi_stop_tx_ring(struct ice_vsi *vsi, enum ice_disq_rst_src rst_src,

		     u16 rel_vmvf_num, struct ice_tx_ring *ring,

		     struct ice_txq_meta *txq_meta);

void

ice_fill_txq_meta(struct ice_vsi *vsi, struct ice_tx_ring *ring,

ice_fill_txq_meta(const struct ice_vsi *vsi, struct ice_tx_ring *ring,

		  struct ice_txq_meta *txq_meta);

#endif /* _ICE_BASE_H_ */

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

+3 −0
Original line number Diff line number Diff line
@@ -2451,6 +2451,7 @@ ice_parse_1588_dev_caps(struct ice_hw *hw, struct ice_hw_dev_caps *dev_p, 
	info->tmr1_ena = ((number & ICE_TS_TMR1_ENA_M) != 0);



	info->ts_ll_read = ((number & ICE_TS_LL_TX_TS_READ_M) != 0);

	info->ts_ll_int_read = ((number & ICE_TS_LL_TX_TS_INT_READ_M) != 0);



	info->ena_ports = logical_id;

	info->tmr_own_map = phys_id;
@@ -2471,6 +2472,8 @@ ice_parse_1588_dev_caps(struct ice_hw *hw, struct ice_hw_dev_caps *dev_p, 
		  info->tmr1_ena);

	ice_debug(hw, ICE_DBG_INIT, "dev caps: ts_ll_read = %u\n",

		  info->ts_ll_read);

	ice_debug(hw, ICE_DBG_INIT, "dev caps: ts_ll_int_read = %u\n",

		  info->ts_ll_int_read);

	ice_debug(hw, ICE_DBG_INIT, "dev caps: ieee_1588 ena_ports = %u\n",

		  info->ena_ports);

	ice_debug(hw, ICE_DBG_INIT, "dev caps: tmr_own_map = %u\n",

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

+0 −1
Original line number Diff line number Diff line
@@ -129,7 +129,6 @@ static const struct ice_stats ice_gstrings_pf_stats[] = { 
	ICE_PF_STAT("rx_oversize.nic", stats.rx_oversize),

	ICE_PF_STAT("rx_jabber.nic", stats.rx_jabber),

	ICE_PF_STAT("rx_csum_bad.nic", hw_csum_rx_error),

	ICE_PF_STAT("rx_length_errors.nic", stats.rx_len_errors),

	ICE_PF_STAT("rx_dropped.nic", stats.eth.rx_discards),

	ICE_PF_STAT("rx_crc_errors.nic", stats.crc_errors),

	ICE_PF_STAT("illegal_bytes.nic", stats.illegal_bytes),