From: Jakub Kicinski <kuba@kernel.org>
Date: Fri, 6 Sep 2024 03:27:09 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Tag: v6.12-rc1~232^2~92
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=502cc061de6692a9a8ca9bcf486de78e2664e869;p=thirdparty%2Flinux.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR.

Conflicts:

drivers/net/phy/phy_device.c
  2560db6ede1a ("net: phy: Fix missing of_node_put() for leds")
  1dce520abd46 ("net: phy: Use for_each_available_child_of_node_scoped()")
https://lore.kernel.org/20240904115823.74333648@canb.auug.org.au

Adjacent changes:

drivers/net/ethernet/xilinx/xilinx_axienet.h
drivers/net/ethernet/xilinx/xilinx_axienet_main.c
  858430db28a5 ("net: xilinx: axienet: Fix race in axienet_stop")
  76abb5d675c4 ("net: xilinx: axienet: Add statistics support")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

502cc061de6692a9a8ca9bcf486de78e2664e869
diff --cc drivers/net/ethernet/xilinx/xilinx_axienet.h
index c301dd2ee0839,1223fcc1a8dae..43d81b40f7618
--- a/drivers/net/ethernet/xilinx/xilinx_axienet.h
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet.h
@@@ -505,17 -435,9 +505,19 @@@ struct skbuf_dma_descriptor 
   * @tx_packets: TX packet count for statistics
   * @tx_bytes:	TX byte count for statistics
   * @tx_stat_sync: Synchronization object for TX stats
 + * @hw_stat_base: Base offset for statistics counters. This may be nonzero if
 + *                the statistics counteres were reset or wrapped around.
 + * @hw_last_counter: Last-seen value of each statistic counter
 + * @reset_in_progress: Set while we are performing a reset and statistics
 + *                     counters may be invalid
 + * @hw_stats_seqcount: Sequence counter for @hw_stat_base, @hw_last_counter,
 + *                     and @reset_in_progress.
 + * @stats_lock: Lock for @hw_stats_seqcount
 + * @stats_work: Work for reading the hardware statistics counters often enough
 + *              to catch overflows.
   * @dma_err_task: Work structure to process Axi DMA errors
+  * @stopping:   Set when @dma_err_task shouldn't do anything because we are
+  *              about to stop the device.
   * @tx_irq:	Axidma TX IRQ number
   * @rx_irq:	Axidma RX IRQ number
   * @eth_irq:	Ethernet core IRQ number
@@@ -586,14 -508,8 +588,15 @@@ struct axienet_local 
  	u64_stats_t tx_bytes;
  	struct u64_stats_sync tx_stat_sync;
  
 +	u64 hw_stat_base[STAT_COUNT];
 +	u32 hw_last_counter[STAT_COUNT];
 +	seqcount_mutex_t hw_stats_seqcount;
 +	struct mutex stats_lock;
 +	struct delayed_work stats_work;
 +	bool reset_in_progress;
 +
  	struct work_struct dma_err_task;
+ 	bool stopping;
  
  	int tx_irq;
  	int rx_irq;
diff --cc drivers/net/ethernet/xilinx/xilinx_axienet_main.c
index fe6a0e2e463f8,9eb300fc35909..374dff70ef0db
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
@@@ -1641,7 -1578,12 +1642,10 @@@ static int axienet_stop(struct net_devi
  	struct axienet_local *lp = netdev_priv(ndev);
  	int i;
  
 -	dev_dbg(&ndev->dev, "axienet_close()\n");
 -
  	if (!lp->use_dmaengine) {
+ 		WRITE_ONCE(lp->stopping, true);
+ 		flush_work(&lp->dma_err_task);
+ 
  		napi_disable(&lp->napi_tx);
  		napi_disable(&lp->napi_rx);
  	}
diff --cc drivers/net/phy/phy_device.c
index 7c4a09455493c,6bb2793de0a94..560e338b307a4
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@@ -3420,9 -3343,11 +3420,10 @@@ static int of_phy_leds(struct phy_devic
  	if (!leds)
  		return 0;
  
 -	for_each_available_child_of_node(leds, led) {
 +	for_each_available_child_of_node_scoped(leds, led) {
  		err = of_phy_led(phydev, led);
  		if (err) {
 -			of_node_put(led);
+ 			of_node_put(leds);
  			phy_leds_unregister(phydev);
  			return err;
  		}