Commit dfff1808 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 2025-09-19 (ice, idpf, iavf, ixgbevf, fm10k)

Paul adds support for Earliest TxTime First (ETF) hardware offload
for E830 devices on ice. ETF is configured per-queue using tc-etf Qdisc;
a new Tx flow mechanism utilizes a dedicated timestamp ring alongside
the standard Tx ring. The timestamp ring contains descriptors that
specify when hardware should transmit packets; up to 2048 Tx queues can
be supported.

Additional info: https://lore.kernel.org/intel-wired-lan/20250818132257.21720-1-paul.greenwalt@intel.com/

Dave removes excess cleanup call to ice_lag_move_new_vf_nodes() in error
path.

Milena adds reporting of timestamping statistics to idpf.

Alex changes error variable type for code clarity for iavf and ixgbevf.

Brahmajit Das removes unused parameter from fm10k_unbind_hw_stats_q().

* '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue:
  net: intel: fm10k: Fix parameter idx set but not used
  ixgbevf: fix proper type for error code in ixgbevf_resume()
  iavf: fix proper type for error code in iavf_resume()
  idpf: add HW timestamping statistics
  ice: Remove deprecated ice_lag_move_new_vf_nodes() call
  ice: add E830 Earliest TxTime First Offload support
  ice: move ice_qp_[ena|dis] for reuse
====================

Link: https://patch.msgid.link/20250919175412.653707-1-anthony.l.nguyen@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 530ae8ec 99e9c5ff

drivers/net/ethernet/intel/fm10k/fm10k_common.c

+2 −3
Original line number Diff line number Diff line
@@ -447,17 +447,16 @@ void fm10k_update_hw_stats_q(struct fm10k_hw *hw, struct fm10k_hw_stats_q *q, 
/**

 *  fm10k_unbind_hw_stats_q - Unbind the queue counters from their queues

 *  @q: pointer to the ring of hardware statistics queue

 *  @idx: index pointing to the start of the ring iteration

 *  @count: number of queues to iterate over

 *

 *  Function invalidates the index values for the queues so any updates that

 *  may have happened are ignored and the base for the queue stats is reset.

 **/

void fm10k_unbind_hw_stats_q(struct fm10k_hw_stats_q *q, u32 idx, u32 count)

void fm10k_unbind_hw_stats_q(struct fm10k_hw_stats_q *q, u32 count)

{

	u32 i;



	for (i = 0; i < count; i++, idx++, q++) {

	for (i = 0; i < count; i++, q++) {

		q->rx_stats_idx = 0;

		q->tx_stats_idx = 0;

	}

drivers/net/ethernet/intel/fm10k/fm10k_common.h

+1 −1
Original line number Diff line number Diff line
@@ -43,6 +43,6 @@ u32 fm10k_read_hw_stats_32b(struct fm10k_hw *hw, u32 addr, 
void fm10k_update_hw_stats_q(struct fm10k_hw *hw, struct fm10k_hw_stats_q *q,

			     u32 idx, u32 count);

#define fm10k_unbind_hw_stats_32b(s) ((s)->base_h = 0)

void fm10k_unbind_hw_stats_q(struct fm10k_hw_stats_q *q, u32 idx, u32 count);

void fm10k_unbind_hw_stats_q(struct fm10k_hw_stats_q *q, u32 count);

s32 fm10k_get_host_state_generic(struct fm10k_hw *hw, bool *host_ready);

#endif /* _FM10K_COMMON_H_ */

drivers/net/ethernet/intel/fm10k/fm10k_pf.c

+1 −1
Original line number Diff line number Diff line
@@ -1389,7 +1389,7 @@ static void fm10k_rebind_hw_stats_pf(struct fm10k_hw *hw, 
	fm10k_unbind_hw_stats_32b(&stats->nodesc_drop);



	/* Unbind Queue Statistics */

	fm10k_unbind_hw_stats_q(stats->q, 0, hw->mac.max_queues);

	fm10k_unbind_hw_stats_q(stats->q, hw->mac.max_queues);



	/* Reinitialize bases for all stats */

	fm10k_update_hw_stats_pf(hw, stats);

drivers/net/ethernet/intel/fm10k/fm10k_vf.c

+1 −1
Original line number Diff line number Diff line
@@ -465,7 +465,7 @@ static void fm10k_rebind_hw_stats_vf(struct fm10k_hw *hw, 
				     struct fm10k_hw_stats *stats)

{

	/* Unbind Queue Statistics */

	fm10k_unbind_hw_stats_q(stats->q, 0, hw->mac.max_queues);

	fm10k_unbind_hw_stats_q(stats->q, hw->mac.max_queues);



	/* Reinitialize bases for all stats */

	fm10k_update_hw_stats_vf(hw, stats);

drivers/net/ethernet/intel/iavf/iavf_main.c

+1 −1
Original line number Diff line number Diff line
@@ -5491,7 +5491,7 @@ static int iavf_resume(struct device *dev_d) 
{

	struct pci_dev *pdev = to_pci_dev(dev_d);

	struct iavf_adapter *adapter;

	u32 err;

	int err;



	adapter = iavf_pdev_to_adapter(pdev);