~hc/RK356X_SDK_RELEASE.git

..	..	@@ -1,20 +1,10 @@
	1	+// SPDX-License-Identifier: GPL-2.0-only
1	2	/*******************************************************************************
2	3	This is the driver for the ST MAC 10/100/1000 on-chip Ethernet controllers.
3	4	ST Ethernet IPs are built around a Synopsys IP Core.
4	5
5	6	Copyright(C) 2007-2011 STMicroelectronics Ltd
6	7
7		- This program is free software; you can redistribute it and/or modify it
8		- under the terms and conditions of the GNU General Public License,
9		- version 2, as published by the Free Software Foundation.
10		-
11		- This program is distributed in the hope it will be useful, but WITHOUT
12		- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
13		- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
14		- more details.
15		-
16		- The full GNU General Public License is included in this distribution in
17		- the file called "COPYING".
18	8
19	9	Author: Giuseppe Cavallaro <peppe.cavallaro@st.com>
20	10
..	..	@@ -38,6 +28,7 @@
38	28	#include <linux/if_vlan.h>
39	29	#include <linux/dma-mapping.h>
40	30	#include <linux/slab.h>
	31	+#include <linux/pm_runtime.h>
41	32	#include <linux/prefetch.h>
42	33	#include <linux/pinctrl/consumer.h>
43	34	#ifdef CONFIG_DEBUG_FS
..	..	@@ -45,6 +36,7 @@
45	36	#include <linux/seq_file.h>
46	37	#endif /* CONFIG_DEBUG_FS */
47	38	#include <linux/net_tstamp.h>
	39	+#include <linux/phylink.h>
48	40	#include <linux/udp.h>
49	41	#include <net/pkt_cls.h>
50	42	#include "stmmac_ptp.h"
..	..	@@ -54,6 +46,13 @@
54	46	#include "dwmac1000.h"
55	47	#include "dwxgmac2.h"
56	48	#include "hwif.h"
	49	+
	50	+/* As long as the interface is active, we keep the timestamping counter enabled
	51	+ * with fine resolution and binary rollover. This avoid non-monotonic behavior
	52	+ * (clock jumps) when changing timestamping settings at runtime.
	53	+ */
	54	+#define STMMAC_HWTS_ACTIVE (PTP_TCR_TSENA \| PTP_TCR_TSCFUPDT \| \
	55	+ PTP_TCR_TSCTRLSSR)
57	56
58	57	#define STMMAC_ALIGN(x) ALIGN(ALIGN(x, SMP_CACHE_BYTES), 16)
59	58	#define TSO_MAX_BUFF_SIZE (SZ_16K - 1)
..	..	@@ -72,10 +71,10 @@
72	71	module_param(phyaddr, int, 0444);
73	72	MODULE_PARM_DESC(phyaddr, "Physical device address");
74	73
75		-#define STMMAC_TX_THRESH (DMA_TX_SIZE / 4)
76		-#define STMMAC_RX_THRESH (DMA_RX_SIZE / 4)
	74	+#define STMMAC_TX_THRESH(x) ((x)->dma_tx_size / 4)
	75	+#define STMMAC_RX_THRESH(x) ((x)->dma_rx_size / 4)
77	76
78		-static int flow_ctrl = FLOW_OFF;
	77	+static int flow_ctrl = FLOW_AUTO;
79	78	module_param(flow_ctrl, int, 0644);
80	79	MODULE_PARM_DESC(flow_ctrl, "Flow control ability [on/off]");
81	80
..	..	@@ -103,7 +102,7 @@
103	102	static int eee_timer = STMMAC_DEFAULT_LPI_TIMER;
104	103	module_param(eee_timer, int, 0644);
105	104	MODULE_PARM_DESC(eee_timer, "LPI tx expiration time in msec");
106		-#define STMMAC_LPI_T(x) (jiffies + msecs_to_jiffies(x))
	105	+#define STMMAC_LPI_T(x) (jiffies + usecs_to_jiffies(x))
107	106
108	107	/* By default the driver will use the ring mode to manage tx and rx descriptors,
109	108	* but allow user to force to use the chain instead of the ring
..	..	@@ -115,11 +114,34 @@
115	114	static irqreturn_t stmmac_interrupt(int irq, void *dev_id);
116	115
117	116	#ifdef CONFIG_DEBUG_FS
118		-static int stmmac_init_fs(struct net_device *dev);
	117	+static const struct net_device_ops stmmac_netdev_ops;
	118	+static void stmmac_init_fs(struct net_device *dev);
119	119	static void stmmac_exit_fs(struct net_device *dev);
120	120	#endif
121	121
122	122	#define STMMAC_COAL_TIMER(x) (jiffies + usecs_to_jiffies(x))
	123	+
	124	+int stmmac_bus_clks_config(struct stmmac_priv *priv, bool enabled)
	125	+{
	126	+ int ret = 0;
	127	+
	128	+ if (enabled) {
	129	+ ret = clk_prepare_enable(priv->plat->stmmac_clk);
	130	+ if (ret)
	131	+ return ret;
	132	+ ret = clk_prepare_enable(priv->plat->pclk);
	133	+ if (ret) {
	134	+ clk_disable_unprepare(priv->plat->stmmac_clk);
	135	+ return ret;
	136	+ }
	137	+ } else {
	138	+ clk_disable_unprepare(priv->plat->stmmac_clk);
	139	+ clk_disable_unprepare(priv->plat->pclk);
	140	+ }
	141	+
	142	+ return ret;
	143	+}
	144	+EXPORT_SYMBOL_GPL(stmmac_bus_clks_config);
123	145
124	146	/**
125	147	* stmmac_verify_args - verify the driver parameters.
..	..	@@ -156,7 +178,10 @@
156	178	for (queue = 0; queue < maxq; queue++) {
157	179	struct stmmac_channel *ch = &priv->channel[queue];
158	180
159		- napi_disable(&ch->napi);
	181	+ if (queue < rx_queues_cnt)
	182	+ napi_disable(&ch->rx_napi);
	183	+ if (queue < tx_queues_cnt)
	184	+ napi_disable(&ch->tx_napi);
160	185	}
161	186	}
162	187
..	..	@@ -174,7 +199,10 @@
174	199	for (queue = 0; queue < maxq; queue++) {
175	200	struct stmmac_channel *ch = &priv->channel[queue];
176	201
177		- napi_enable(&ch->napi);
	202	+ if (queue < rx_queues_cnt)
	203	+ napi_enable(&ch->rx_napi);
	204	+ if (queue < tx_queues_cnt)
	205	+ napi_enable(&ch->tx_napi);
178	206	}
179	207	}
180	208
..	..	@@ -273,7 +301,7 @@
273	301	if (tx_q->dirty_tx > tx_q->cur_tx)
274	302	avail = tx_q->dirty_tx - tx_q->cur_tx - 1;
275	303	else
276		- avail = DMA_TX_SIZE - tx_q->cur_tx + tx_q->dirty_tx - 1;
	304	+ avail = priv->dma_tx_size - tx_q->cur_tx + tx_q->dirty_tx - 1;
277	305
278	306	return avail;
279	307	}
..	..	@@ -291,24 +319,9 @@
291	319	if (rx_q->dirty_rx <= rx_q->cur_rx)
292	320	dirty = rx_q->cur_rx - rx_q->dirty_rx;
293	321	else
294		- dirty = DMA_RX_SIZE - rx_q->dirty_rx + rx_q->cur_rx;
	322	+ dirty = priv->dma_rx_size - rx_q->dirty_rx + rx_q->cur_rx;
295	323
296	324	return dirty;
297		-}
298		-
299		-/**
300		- * stmmac_hw_fix_mac_speed - callback for speed selection
301		- * @priv: driver private structure
302		- * Description: on some platforms (e.g. ST), some HW system configuration
303		- * registers have to be set according to the link speed negotiated.
304		- */
305		-static inline void stmmac_hw_fix_mac_speed(struct stmmac_priv *priv)
306		-{
307		- struct net_device *ndev = priv->dev;
308		- struct phy_device *phydev = ndev->phydev;
309		-
310		- if (likely(priv->plat->fix_mac_speed))
311		- priv->plat->fix_mac_speed(priv->plat->bsp_priv, phydev->speed);
312	325	}
313	326
314	327	/**
..	..	@@ -351,7 +364,7 @@
351	364
352	365	/**
353	366	* stmmac_eee_ctrl_timer - EEE TX SW timer.
354		- * @arg : data hook
	367	+ * @t: timer_list struct containing private info
355	368	* Description:
356	369	* if there is no data transfer and if we are not in LPI state,
357	370	* then MAC Transmitter can be moved to LPI state.
..	..	@@ -361,7 +374,7 @@
361	374	struct stmmac_priv *priv = from_timer(priv, t, eee_ctrl_timer);
362	375
363	376	stmmac_enable_eee_mode(priv);
364		- mod_timer(&priv->eee_ctrl_timer, STMMAC_LPI_T(eee_timer));
	377	+ mod_timer(&priv->eee_ctrl_timer, STMMAC_LPI_T(priv->tx_lpi_timer));
365	378	}
366	379
367	380	/**
..	..	@@ -374,67 +387,43 @@
374	387	*/
375	388	bool stmmac_eee_init(struct stmmac_priv *priv)
376	389	{
377		- struct net_device *ndev = priv->dev;
378		- int interface = priv->plat->interface;
379		- bool ret = false;
380		-
381		- if ((interface != PHY_INTERFACE_MODE_MII) &&
382		- (interface != PHY_INTERFACE_MODE_GMII) &&
383		- !phy_interface_mode_is_rgmii(interface))
384		- goto out;
	390	+ int eee_tw_timer = priv->eee_tw_timer;
385	391
386	392	/* Using PCS we cannot dial with the phy registers at this stage
387	393	* so we do not support extra feature like EEE.
388	394	*/
389		- if ((priv->hw->pcs == STMMAC_PCS_RGMII) \|\|
390		- (priv->hw->pcs == STMMAC_PCS_TBI) \|\|
391		- (priv->hw->pcs == STMMAC_PCS_RTBI))
392		- goto out;
	395	+ if (priv->hw->pcs == STMMAC_PCS_TBI \|\|
	396	+ priv->hw->pcs == STMMAC_PCS_RTBI)
	397	+ return false;
393	398
394		- /* MAC core supports the EEE feature. */
395		- if (priv->dma_cap.eee) {
396		- int tx_lpi_timer = priv->tx_lpi_timer;
	399	+ /* Check if MAC core supports the EEE feature. */
	400	+ if (!priv->dma_cap.eee)
	401	+ return false;
397	402
398		- /* Check if the PHY supports EEE */
399		- if (phy_init_eee(ndev->phydev, 1)) {
400		- /* To manage at run-time if the EEE cannot be supported
401		- * anymore (for example because the lp caps have been
402		- * changed).
403		- * In that case the driver disable own timers.
404		- */
405		- mutex_lock(&priv->lock);
406		- if (priv->eee_active) {
407		- netdev_dbg(priv->dev, "disable EEE\n");
408		- del_timer_sync(&priv->eee_ctrl_timer);
409		- stmmac_set_eee_timer(priv, priv->hw, 0,
410		- tx_lpi_timer);
411		- }
412		- priv->eee_active = 0;
413		- mutex_unlock(&priv->lock);
414		- goto out;
	403	+ mutex_lock(&priv->lock);
	404	+
	405	+ /* Check if it needs to be deactivated */
	406	+ if (!priv->eee_active) {
	407	+ if (priv->eee_enabled) {
	408	+ netdev_dbg(priv->dev, "disable EEE\n");
	409	+ del_timer_sync(&priv->eee_ctrl_timer);
	410	+ stmmac_set_eee_timer(priv, priv->hw, 0, eee_tw_timer);
415	411	}
416		- /* Activate the EEE and start timers */
417		- mutex_lock(&priv->lock);
418		- if (!priv->eee_active) {
419		- priv->eee_active = 1;
420		- timer_setup(&priv->eee_ctrl_timer,
421		- stmmac_eee_ctrl_timer, 0);
422		- mod_timer(&priv->eee_ctrl_timer,
423		- STMMAC_LPI_T(eee_timer));
424		-
425		- stmmac_set_eee_timer(priv, priv->hw,
426		- STMMAC_DEFAULT_LIT_LS, tx_lpi_timer);
427		- }
428		- /* Set HW EEE according to the speed */
429		- stmmac_set_eee_pls(priv, priv->hw, ndev->phydev->link);
430		-
431		- ret = true;
432	412	mutex_unlock(&priv->lock);
433		-
434		- netdev_dbg(priv->dev, "Energy-Efficient Ethernet initialized\n");
	413	+ return false;
435	414	}
436		-out:
437		- return ret;
	415	+
	416	+ if (priv->eee_active && !priv->eee_enabled) {
	417	+ timer_setup(&priv->eee_ctrl_timer, stmmac_eee_ctrl_timer, 0);
	418	+ stmmac_set_eee_timer(priv, priv->hw, STMMAC_DEFAULT_LIT_LS,
	419	+ eee_tw_timer);
	420	+ }
	421	+
	422	+ mod_timer(&priv->eee_ctrl_timer, STMMAC_LPI_T(priv->tx_lpi_timer));
	423	+
	424	+ mutex_unlock(&priv->lock);
	425	+ netdev_dbg(priv->dev, "Energy-Efficient Ethernet initialized\n");
	426	+ return true;
438	427	}
439	428
440	429	/* stmmac_get_tx_hwtstamp - get HW TX timestamps
..	..	@@ -449,6 +438,7 @@
449	438	struct dma_desc p, struct sk_buff skb)
450	439	{
451	440	struct skb_shared_hwtstamps shhwtstamp;
	441	+ bool found = false;
452	442	u64 ns = 0;
453	443
454	444	if (!priv->hwts_tx_en)
..	..	@@ -460,9 +450,13 @@
460	450
461	451	/* check tx tstamp status */
462	452	if (stmmac_get_tx_timestamp_status(priv, p)) {
463		- /* get the valid tstamp */
464	453	stmmac_get_timestamp(priv, p, priv->adv_ts, &ns);
	454	+ found = true;
	455	+ } else if (!stmmac_get_mac_tx_timestamp(priv, priv->hw, &ns)) {
	456	+ found = true;
	457	+ }
465	458
	459	+ if (found) {
466	460	memset(&shhwtstamp, 0, sizeof(struct skb_shared_hwtstamps));
467	461	shhwtstamp.hwtstamp = ns_to_ktime(ns);
468	462
..	..	@@ -470,8 +464,6 @@
470	464	/* pass tstamp to stack */
471	465	skb_tstamp_tx(skb, &shhwtstamp);
472	466	}
473		-
474		- return;
475	467	}
476	468
477	469	/* stmmac_get_rx_hwtstamp - get HW RX timestamps
..	..	@@ -508,7 +500,6 @@
508	500	}
509	501	}
510	502
511		-#ifdef CONFIG_STMMAC_PTP
512	503	/**
513	504	* stmmac_hwtstamp_set - control hardware timestamping.
514	505	* @dev: device pointer.
..	..	@@ -524,8 +515,6 @@
524	515	{
525	516	struct stmmac_priv *priv = netdev_priv(dev);
526	517	struct hwtstamp_config config;
527		- struct timespec64 now;
528		- u64 temp = 0;
529	518	u32 ptp_v2 = 0;
530	519	u32 tstamp_all = 0;
531	520	u32 ptp_over_ipv4_udp = 0;
..	..	@@ -534,11 +523,6 @@
534	523	u32 snap_type_sel = 0;
535	524	u32 ts_master_en = 0;
536	525	u32 ts_event_en = 0;
537		- u32 sec_inc = 0;
538		- u32 value = 0;
539		- bool xmac;
540		-
541		- xmac = priv->plat->has_gmac4 \|\| priv->plat->has_xgmac;
542	526
543	527	if (!(priv->dma_cap.time_stamp \|\| priv->adv_ts)) {
544	528	netdev_alert(priv->dev, "No support for HW time stamping\n");
..	..	@@ -644,7 +628,8 @@
644	628	config.rx_filter = HWTSTAMP_FILTER_PTP_V2_EVENT;
645	629	ptp_v2 = PTP_TCR_TSVER2ENA;
646	630	snap_type_sel = PTP_TCR_SNAPTYPSEL_1;
647		- ts_event_en = PTP_TCR_TSEVNTENA;
	631	+ if (priv->synopsys_id < DWMAC_CORE_4_10)
	632	+ ts_event_en = PTP_TCR_TSEVNTENA;
648	633	ptp_over_ipv4_udp = PTP_TCR_TSIPV4ENA;
649	634	ptp_over_ipv6_udp = PTP_TCR_TSIPV6ENA;
650	635	ptp_over_ethernet = PTP_TCR_TSIPENA;
..	..	@@ -699,41 +684,16 @@
699	684	priv->hwts_rx_en = ((config.rx_filter == HWTSTAMP_FILTER_NONE) ? 0 : 1);
700	685	priv->hwts_tx_en = config.tx_type == HWTSTAMP_TX_ON;
701	686
702		- if (!priv->hwts_tx_en && !priv->hwts_rx_en)
703		- stmmac_config_hw_tstamping(priv, priv->ptpaddr, 0);
704		- else {
705		- value = (PTP_TCR_TSENA \| PTP_TCR_TSCFUPDT \| PTP_TCR_TSCTRLSSR \|
706		- tstamp_all \| ptp_v2 \| ptp_over_ethernet \|
707		- ptp_over_ipv6_udp \| ptp_over_ipv4_udp \| ts_event_en \|
708		- ts_master_en \| snap_type_sel);
709		- stmmac_config_hw_tstamping(priv, priv->ptpaddr, value);
	687	+ priv->systime_flags = STMMAC_HWTS_ACTIVE;
710	688
711		- /* program Sub Second Increment reg */
712		- stmmac_config_sub_second_increment(priv,
713		- priv->ptpaddr, priv->plat->clk_ptp_rate,
714		- xmac, &sec_inc);
715		- temp = div_u64(1000000000ULL, sec_inc);
716		-
717		- /* Store sub second increment and flags for later use */
718		- priv->sub_second_inc = sec_inc;
719		- priv->systime_flags = value;
720		-
721		- /* calculate default added value:
722		- * formula is :
723		- * addend = (2^32)/freq_div_ratio;
724		- * where, freq_div_ratio = 1e9ns/sec_inc
725		- */
726		- temp = (u64)(temp << 32);
727		- priv->default_addend = div_u64(temp, priv->plat->clk_ptp_rate);
728		- stmmac_config_addend(priv, priv->ptpaddr, priv->default_addend);
729		-
730		- /* initialize system time */
731		- ktime_get_real_ts64(&now);
732		-
733		- /* lower 32 bits of tv_sec are safe until y2106 */
734		- stmmac_init_systime(priv, priv->ptpaddr,
735		- (u32)now.tv_sec, now.tv_nsec);
	689	+ if (priv->hwts_tx_en \|\| priv->hwts_rx_en) {
	690	+ priv->systime_flags \|= tstamp_all \| ptp_v2 \|
	691	+ ptp_over_ethernet \| ptp_over_ipv6_udp \|
	692	+ ptp_over_ipv4_udp \| ts_event_en \|
	693	+ ts_master_en \| snap_type_sel;
736	694	}
	695	+
	696	+ stmmac_config_hw_tstamping(priv, priv->ptpaddr, priv->systime_flags);
737	697
738	698	memcpy(&priv->tstamp_config, &config, sizeof(config));
739	699
..	..	@@ -748,7 +708,7 @@
748	708	* a proprietary structure used to pass information to the driver.
749	709	* Description:
750	710	* This function obtain the current hardware timestamping settings
751		- as requested.
	711	+ * as requested.
752	712	*/
753	713	static int stmmac_hwtstamp_get(struct net_device dev, struct ifreq ifr)
754	714	{
..	..	@@ -761,7 +721,57 @@
761	721	return copy_to_user(ifr->ifr_data, config,
762	722	sizeof(*config)) ? -EFAULT : 0;
763	723	}
764		-#endif /* CONFIG_STMMAC_PTP */
	724	+
	725	+/**
	726	+ * stmmac_init_tstamp_counter - init hardware timestamping counter
	727	+ * @priv: driver private structure
	728	+ * @systime_flags: timestamping flags
	729	+ * Description:
	730	+ * Initialize hardware counter for packet timestamping.
	731	+ * This is valid as long as the interface is open and not suspended.
	732	+ * Will be rerun after resuming from suspend, case in which the timestamping
	733	+ * flags updated by stmmac_hwtstamp_set() also need to be restored.
	734	+ */
	735	+int stmmac_init_tstamp_counter(struct stmmac_priv *priv, u32 systime_flags)
	736	+{
	737	+ bool xmac = priv->plat->has_gmac4 \|\| priv->plat->has_xgmac;
	738	+ struct timespec64 now;
	739	+ u32 sec_inc = 0;
	740	+ u64 temp = 0;
	741	+
	742	+ if (!(priv->dma_cap.time_stamp \|\| priv->dma_cap.atime_stamp))
	743	+ return -EOPNOTSUPP;
	744	+
	745	+ stmmac_config_hw_tstamping(priv, priv->ptpaddr, systime_flags);
	746	+ priv->systime_flags = systime_flags;
	747	+
	748	+ /* program Sub Second Increment reg */
	749	+ stmmac_config_sub_second_increment(priv, priv->ptpaddr,
	750	+ priv->plat->clk_ptp_rate,
	751	+ xmac, &sec_inc);
	752	+ temp = div_u64(1000000000ULL, sec_inc);
	753	+
	754	+ /* Store sub second increment for later use */
	755	+ priv->sub_second_inc = sec_inc;
	756	+
	757	+ /* calculate default added value:
	758	+ * formula is :
	759	+ * addend = (2^32)/freq_div_ratio;
	760	+ * where, freq_div_ratio = 1e9ns/sec_inc
	761	+ */
	762	+ temp = (u64)(temp << 32);
	763	+ priv->default_addend = div_u64(temp, priv->plat->clk_ptp_rate);
	764	+ stmmac_config_addend(priv, priv->ptpaddr, priv->default_addend);
	765	+
	766	+ /* initialize system time */
	767	+ ktime_get_real_ts64(&now);
	768	+
	769	+ /* lower 32 bits of tv_sec are safe until y2106 */
	770	+ stmmac_init_systime(priv, priv->ptpaddr, (u32)now.tv_sec, now.tv_nsec);
	771	+
	772	+ return 0;
	773	+}
	774	+EXPORT_SYMBOL_GPL(stmmac_init_tstamp_counter);
765	775
766	776	/**
767	777	* stmmac_init_ptp - init PTP
..	..	@@ -773,9 +783,11 @@
773	783	static int stmmac_init_ptp(struct stmmac_priv *priv)
774	784	{
775	785	bool xmac = priv->plat->has_gmac4 \|\| priv->plat->has_xgmac;
	786	+ int ret;
776	787
777		- if (!(priv->dma_cap.time_stamp \|\| priv->dma_cap.atime_stamp))
778		- return -EOPNOTSUPP;
	788	+ ret = stmmac_init_tstamp_counter(priv, STMMAC_HWTS_ACTIVE);
	789	+ if (ret)
	790	+ return ret;
779	791
780	792	priv->adv_ts = 0;
781	793	/* Check if adv_ts can be enabled for dwmac 4.x / xgmac core */
..	..	@@ -795,121 +807,274 @@
795	807	priv->hwts_tx_en = 0;
796	808	priv->hwts_rx_en = 0;
797	809
798		- stmmac_ptp_register(priv);
799		-
800	810	return 0;
801	811	}
802	812
803	813	static void stmmac_release_ptp(struct stmmac_priv *priv)
804	814	{
805		- if (priv->plat->clk_ptp_ref && IS_ENABLED(CONFIG_STMMAC_PTP))
806		- clk_disable_unprepare(priv->plat->clk_ptp_ref);
	815	+ clk_disable_unprepare(priv->plat->clk_ptp_ref);
807	816	stmmac_ptp_unregister(priv);
808	817	}
809	818
810	819	/**
811	820	* stmmac_mac_flow_ctrl - Configure flow control in all queues
812	821	* @priv: driver private structure
	822	+ * @duplex: duplex passed to the next function
813	823	* Description: It is used for configuring the flow control in all queues
814	824	*/
815	825	static void stmmac_mac_flow_ctrl(struct stmmac_priv *priv, u32 duplex)
816	826	{
817	827	u32 tx_cnt = priv->plat->tx_queues_to_use;
818	828
819		- stmmac_flow_ctrl(priv, priv->hw, duplex, priv->flow_ctrl,
820		- priv->pause, tx_cnt);
	829	+ stmmac_flow_ctrl(priv, priv->hw, duplex, priv->flow_ctrl & priv->plat->flow_ctrl,
	830	+ priv->pause, tx_cnt);
821	831	}
822	832
823		-/**
824		- * stmmac_adjust_link - adjusts the link parameters
825		- * @dev: net device structure
826		- * Description: this is the helper called by the physical abstraction layer
827		- * drivers to communicate the phy link status. According the speed and duplex
828		- * this driver can invoke registered glue-logic as well.
829		- * It also invoke the eee initialization because it could happen when switch
830		- * on different networks (that are eee capable).
831		- */
832		-static void stmmac_adjust_link(struct net_device *dev)
	833	+static void stmmac_validate(struct phylink_config *config,
	834	+ unsigned long *supported,
	835	+ struct phylink_link_state *state)
833	836	{
834		- struct stmmac_priv *priv = netdev_priv(dev);
835		- struct phy_device *phydev = dev->phydev;
836		- bool new_state = false;
	837	+ struct stmmac_priv *priv = netdev_priv(to_net_dev(config->dev));
	838	+ __ETHTOOL_DECLARE_LINK_MODE_MASK(mac_supported) = { 0, };
	839	+ __ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, };
	840	+ int tx_cnt = priv->plat->tx_queues_to_use;
	841	+ int max_speed = priv->plat->max_speed;
837	842
838		- if (!phydev)
839		- return;
	843	+ phylink_set(mac_supported, 10baseT_Half);
	844	+ phylink_set(mac_supported, 10baseT_Full);
	845	+ phylink_set(mac_supported, 100baseT_Half);
	846	+ phylink_set(mac_supported, 100baseT_Full);
	847	+ phylink_set(mac_supported, 1000baseT_Half);
	848	+ phylink_set(mac_supported, 1000baseT_Full);
	849	+ phylink_set(mac_supported, 1000baseKX_Full);
	850	+ phylink_set(mac_supported, 100baseT1_Full);
	851	+ phylink_set(mac_supported, 1000baseT1_Full);
840	852
841		- mutex_lock(&priv->lock);
	853	+ phylink_set(mac_supported, Autoneg);
	854	+ phylink_set(mac_supported, Pause);
	855	+ phylink_set(mac_supported, Asym_Pause);
	856	+ phylink_set_port_modes(mac_supported);
842	857
843		- if (phydev->link) {
844		- u32 ctrl = readl(priv->ioaddr + MAC_CTRL_REG);
845		-
846		- /* Now we make sure that we can be in full duplex mode.
847		- * If not, we operate in half-duplex mode. */
848		- if (phydev->duplex != priv->oldduplex) {
849		- new_state = true;
850		- if (!phydev->duplex)
851		- ctrl &= ~priv->hw->link.duplex;
852		- else
853		- ctrl \|= priv->hw->link.duplex;
854		- priv->oldduplex = phydev->duplex;
	858	+ /* Cut down 1G if asked to */
	859	+ if ((max_speed > 0) && (max_speed < 1000)) {
	860	+ phylink_set(mask, 1000baseT_Full);
	861	+ phylink_set(mask, 1000baseX_Full);
	862	+ } else if (priv->plat->has_xgmac) {
	863	+ if (!max_speed \|\| (max_speed >= 2500)) {
	864	+ phylink_set(mac_supported, 2500baseT_Full);
	865	+ phylink_set(mac_supported, 2500baseX_Full);
855	866	}
856		- /* Flow Control operation */
857		- if (phydev->pause)
858		- stmmac_mac_flow_ctrl(priv, phydev->duplex);
859		-
860		- if (phydev->speed != priv->speed) {
861		- new_state = true;
862		- ctrl &= ~priv->hw->link.speed_mask;
863		- switch (phydev->speed) {
864		- case SPEED_1000:
865		- ctrl \|= priv->hw->link.speed1000;
866		- break;
867		- case SPEED_100:
868		- ctrl \|= priv->hw->link.speed100;
869		- break;
870		- case SPEED_10:
871		- ctrl \|= priv->hw->link.speed10;
872		- break;
873		- default:
874		- netif_warn(priv, link, priv->dev,
875		- "broken speed: %d\n", phydev->speed);
876		- phydev->speed = SPEED_UNKNOWN;
877		- break;
878		- }
879		- if (phydev->speed != SPEED_UNKNOWN)
880		- stmmac_hw_fix_mac_speed(priv);
881		- priv->speed = phydev->speed;
	867	+ if (!max_speed \|\| (max_speed >= 5000)) {
	868	+ phylink_set(mac_supported, 5000baseT_Full);
882	869	}
883		-
884		- writel(ctrl, priv->ioaddr + MAC_CTRL_REG);
885		-
886		- if (!priv->oldlink) {
887		- new_state = true;
888		- priv->oldlink = true;
	870	+ if (!max_speed \|\| (max_speed >= 10000)) {
	871	+ phylink_set(mac_supported, 10000baseSR_Full);
	872	+ phylink_set(mac_supported, 10000baseLR_Full);
	873	+ phylink_set(mac_supported, 10000baseER_Full);
	874	+ phylink_set(mac_supported, 10000baseLRM_Full);
	875	+ phylink_set(mac_supported, 10000baseT_Full);
	876	+ phylink_set(mac_supported, 10000baseKX4_Full);
	877	+ phylink_set(mac_supported, 10000baseKR_Full);
889	878	}
890		- } else if (priv->oldlink) {
891		- new_state = true;
892		- priv->oldlink = false;
893		- priv->speed = SPEED_UNKNOWN;
894		- priv->oldduplex = DUPLEX_UNKNOWN;
	879	+ if (!max_speed \|\| (max_speed >= 25000)) {
	880	+ phylink_set(mac_supported, 25000baseCR_Full);
	881	+ phylink_set(mac_supported, 25000baseKR_Full);
	882	+ phylink_set(mac_supported, 25000baseSR_Full);
	883	+ }
	884	+ if (!max_speed \|\| (max_speed >= 40000)) {
	885	+ phylink_set(mac_supported, 40000baseKR4_Full);
	886	+ phylink_set(mac_supported, 40000baseCR4_Full);
	887	+ phylink_set(mac_supported, 40000baseSR4_Full);
	888	+ phylink_set(mac_supported, 40000baseLR4_Full);
	889	+ }
	890	+ if (!max_speed \|\| (max_speed >= 50000)) {
	891	+ phylink_set(mac_supported, 50000baseCR2_Full);
	892	+ phylink_set(mac_supported, 50000baseKR2_Full);
	893	+ phylink_set(mac_supported, 50000baseSR2_Full);
	894	+ phylink_set(mac_supported, 50000baseKR_Full);
	895	+ phylink_set(mac_supported, 50000baseSR_Full);
	896	+ phylink_set(mac_supported, 50000baseCR_Full);
	897	+ phylink_set(mac_supported, 50000baseLR_ER_FR_Full);
	898	+ phylink_set(mac_supported, 50000baseDR_Full);
	899	+ }
	900	+ if (!max_speed \|\| (max_speed >= 100000)) {
	901	+ phylink_set(mac_supported, 100000baseKR4_Full);
	902	+ phylink_set(mac_supported, 100000baseSR4_Full);
	903	+ phylink_set(mac_supported, 100000baseCR4_Full);
	904	+ phylink_set(mac_supported, 100000baseLR4_ER4_Full);
	905	+ phylink_set(mac_supported, 100000baseKR2_Full);
	906	+ phylink_set(mac_supported, 100000baseSR2_Full);
	907	+ phylink_set(mac_supported, 100000baseCR2_Full);
	908	+ phylink_set(mac_supported, 100000baseLR2_ER2_FR2_Full);
	909	+ phylink_set(mac_supported, 100000baseDR2_Full);
	910	+ }
895	911	}
896	912
897		- if (new_state && netif_msg_link(priv))
898		- phy_print_status(phydev);
	913	+ /* Half-Duplex can only work with single queue */
	914	+ if (tx_cnt > 1) {
	915	+ phylink_set(mask, 10baseT_Half);
	916	+ phylink_set(mask, 100baseT_Half);
	917	+ phylink_set(mask, 1000baseT_Half);
	918	+ }
899	919
900		- mutex_unlock(&priv->lock);
	920	+ linkmode_and(supported, supported, mac_supported);
	921	+ linkmode_andnot(supported, supported, mask);
901	922
902		- if (phydev->is_pseudo_fixed_link)
903		- /* Stop PHY layer to call the hook to adjust the link in case
904		- * of a switch is attached to the stmmac driver.
905		- */
906		- phydev->irq = PHY_IGNORE_INTERRUPT;
907		- else
908		- /* At this stage, init the EEE if supported.
909		- * Never called in case of fixed_link.
910		- */
911		- priv->eee_enabled = stmmac_eee_init(priv);
	923	+ linkmode_and(state->advertising, state->advertising, mac_supported);
	924	+ linkmode_andnot(state->advertising, state->advertising, mask);
	925	+
	926	+ /* If PCS is supported, check which modes it supports. */
	927	+ stmmac_xpcs_validate(priv, &priv->hw->xpcs_args, supported, state);
912	928	}
	929	+
	930	+static void stmmac_mac_pcs_get_state(struct phylink_config *config,
	931	+ struct phylink_link_state *state)
	932	+{
	933	+ struct stmmac_priv *priv = netdev_priv(to_net_dev(config->dev));
	934	+
	935	+ state->link = 0;
	936	+ stmmac_xpcs_get_state(priv, &priv->hw->xpcs_args, state);
	937	+}
	938	+
	939	+static void stmmac_mac_config(struct phylink_config *config, unsigned int mode,
	940	+ const struct phylink_link_state *state)
	941	+{
	942	+ struct stmmac_priv *priv = netdev_priv(to_net_dev(config->dev));
	943	+
	944	+ stmmac_xpcs_config(priv, &priv->hw->xpcs_args, state);
	945	+}
	946	+
	947	+static void stmmac_mac_an_restart(struct phylink_config *config)
	948	+{
	949	+ /* Not Supported */
	950	+}
	951	+
	952	+static void stmmac_mac_link_down(struct phylink_config *config,
	953	+ unsigned int mode, phy_interface_t interface)
	954	+{
	955	+ struct stmmac_priv *priv = netdev_priv(to_net_dev(config->dev));
	956	+
	957	+ stmmac_mac_set(priv, priv->ioaddr, false);
	958	+ priv->eee_active = false;
	959	+ priv->tx_lpi_enabled = false;
	960	+ stmmac_eee_init(priv);
	961	+ stmmac_set_eee_pls(priv, priv->hw, false);
	962	+}
	963	+
	964	+static void stmmac_mac_link_up(struct phylink_config *config,
	965	+ struct phy_device *phy,
	966	+ unsigned int mode, phy_interface_t interface,
	967	+ int speed, int duplex,
	968	+ bool tx_pause, bool rx_pause)
	969	+{
	970	+ struct stmmac_priv *priv = netdev_priv(to_net_dev(config->dev));
	971	+ u32 ctrl;
	972	+
	973	+ stmmac_xpcs_link_up(priv, &priv->hw->xpcs_args, speed, interface);
	974	+
	975	+ ctrl = readl(priv->ioaddr + MAC_CTRL_REG);
	976	+ ctrl &= ~priv->hw->link.speed_mask;
	977	+
	978	+ if (interface == PHY_INTERFACE_MODE_USXGMII) {
	979	+ switch (speed) {
	980	+ case SPEED_10000:
	981	+ ctrl \|= priv->hw->link.xgmii.speed10000;
	982	+ break;
	983	+ case SPEED_5000:
	984	+ ctrl \|= priv->hw->link.xgmii.speed5000;
	985	+ break;
	986	+ case SPEED_2500:
	987	+ ctrl \|= priv->hw->link.xgmii.speed2500;
	988	+ break;
	989	+ default:
	990	+ return;
	991	+ }
	992	+ } else if (interface == PHY_INTERFACE_MODE_XLGMII) {
	993	+ switch (speed) {
	994	+ case SPEED_100000:
	995	+ ctrl \|= priv->hw->link.xlgmii.speed100000;
	996	+ break;
	997	+ case SPEED_50000:
	998	+ ctrl \|= priv->hw->link.xlgmii.speed50000;
	999	+ break;
	1000	+ case SPEED_40000:
	1001	+ ctrl \|= priv->hw->link.xlgmii.speed40000;
	1002	+ break;
	1003	+ case SPEED_25000:
	1004	+ ctrl \|= priv->hw->link.xlgmii.speed25000;
	1005	+ break;
	1006	+ case SPEED_10000:
	1007	+ ctrl \|= priv->hw->link.xgmii.speed10000;
	1008	+ break;
	1009	+ case SPEED_2500:
	1010	+ ctrl \|= priv->hw->link.speed2500;
	1011	+ break;
	1012	+ case SPEED_1000:
	1013	+ ctrl \|= priv->hw->link.speed1000;
	1014	+ break;
	1015	+ default:
	1016	+ return;
	1017	+ }
	1018	+ } else {
	1019	+ switch (speed) {
	1020	+ case SPEED_2500:
	1021	+ ctrl \|= priv->hw->link.speed2500;
	1022	+ break;
	1023	+ case SPEED_1000:
	1024	+ ctrl \|= priv->hw->link.speed1000;
	1025	+ break;
	1026	+ case SPEED_100:
	1027	+ ctrl \|= priv->hw->link.speed100;
	1028	+ break;
	1029	+ case SPEED_10:
	1030	+ ctrl \|= priv->hw->link.speed10;
	1031	+ break;
	1032	+ default:
	1033	+ return;
	1034	+ }
	1035	+ }
	1036	+
	1037	+ priv->speed = speed;
	1038	+
	1039	+ if (priv->plat->fix_mac_speed)
	1040	+ priv->plat->fix_mac_speed(priv->plat->bsp_priv, speed);
	1041	+
	1042	+ if (!duplex)
	1043	+ ctrl &= ~priv->hw->link.duplex;
	1044	+ else
	1045	+ ctrl \|= priv->hw->link.duplex;
	1046	+
	1047	+ /* Flow Control operation */
	1048	+ if (rx_pause && tx_pause)
	1049	+ priv->flow_ctrl = FLOW_AUTO;
	1050	+ else if (rx_pause && !tx_pause)
	1051	+ priv->flow_ctrl = FLOW_RX;
	1052	+ else if (!rx_pause && tx_pause)
	1053	+ priv->flow_ctrl = FLOW_TX;
	1054	+ else
	1055	+ priv->flow_ctrl = FLOW_OFF;
	1056	+
	1057	+ stmmac_mac_flow_ctrl(priv, duplex);
	1058	+
	1059	+ writel(ctrl, priv->ioaddr + MAC_CTRL_REG);
	1060	+
	1061	+ stmmac_mac_set(priv, priv->ioaddr, true);
	1062	+ if (phy && priv->dma_cap.eee) {
	1063	+ priv->eee_active = phy_init_eee(phy, 1) >= 0;
	1064	+ priv->eee_enabled = stmmac_eee_init(priv);
	1065	+ priv->tx_lpi_enabled = priv->eee_enabled;
	1066	+ stmmac_set_eee_pls(priv, priv->hw, true);
	1067	+ }
	1068	+}
	1069	+
	1070	+static const struct phylink_mac_ops stmmac_phylink_mac_ops = {
	1071	+ .validate = stmmac_validate,
	1072	+ .mac_pcs_get_state = stmmac_mac_pcs_get_state,
	1073	+ .mac_config = stmmac_mac_config,
	1074	+ .mac_an_restart = stmmac_mac_an_restart,
	1075	+ .mac_link_down = stmmac_mac_link_down,
	1076	+ .mac_link_up = stmmac_mac_link_up,
	1077	+};
913	1078
914	1079	/**
915	1080	* stmmac_check_pcs_mode - verify if RGMII/SGMII is supported
..	..	@@ -936,6 +1101,62 @@
936	1101	}
937	1102	}
938	1103
	1104	+#if 0
	1105	+static void rtl8211F_led_control(struct phy_device *phydev)
	1106	+{
	1107	+ printk("ben debug:rtl8211F_led_control...1 \n");
	1108	+
	1109	+ if(!phydev) return;
	1110	+ if(phydev->phy_id!=0x001cc916) return; /* only for 8211E*/
	1111	+
	1112	+ /switch to extension page44/
	1113	+ phy_write(phydev, 31, 0x0d04);
	1114	+//add hc 1000M --> orange
	1115	+// 100M --> green
	1116	+ phy_write(phydev, 16, 0x6D02);
	1117	+//add hc 1000M&100M --> green
	1118	+// phy_write(phydev, 16, 0x6C0A);
	1119	+ printk("ben debug:rtl8211F_led_control...2 \n");
	1120	+}
	1121	+#endif
	1122	+#define RTL_8211F_PHY_ID 0x001cc916
	1123	+#define RTL_8211F_PHY_ID_MASK 0x001fffff
	1124	+#define RTL_8211F_PAGE_SELECT 0x1f
	1125	+#define RTL_8211F_LCR_ADDR 0x10
	1126	+
	1127	+#define GREEN_LED 0 // ÂÌµÆÊÇLED0
	1128	+#define YELLOW0_LED 1 // »ÆµÆÊÇLED1
	1129	+#define YELLOW1_LED 2 // »ÆµÆÊÇLED2
	1130	+
	1131	+static int rtl8211F_led_control(struct phy_device *phydev)
	1132	+{
	1133	+ unsigned int temp;
	1134	+
	1135	+ printk("<<<<<<ben test led ctrl start... %s\n",__FUNCTION__);
	1136	+ if(!phydev) return 0;
	1137	+ if(phydev->phy_id!=0x001cc916) return 0; /* only for 8211E*/
	1138	+
	1139	+ // ÅäÖÃÍø¿ÚLEDµÆ
	1140	+ phy_write(phydev, 31, 0xd04);
	1141	+ temp = 0x02 << (5 * GREEN_LED); // ÂÌµÆ±íÊ¾Á¬½Ó×´Ì¬
	1142	+ temp \|= 0x08 << (5 * YELLOW0_LED); // »ÆµÆ±íÊ¾Á¬½Ó×´Ì¬
	1143	+
	1144	+ temp \|= 0x1b << (5 * YELLOW1_LED); // »ÆµÆ±íÊ¾Êý¾Ý°üÊÕ·¢×´Ì¬
	1145	+ phy_write(phydev, 0x10, temp);
	1146	+
	1147	+ temp = 1 << (YELLOW1_LED + 1); // ÂÌµÆ²»Ö¸Ê¾EEE½ÚÄÜ×´Ì¬, ²åÁËÍøÏßºóµÆÒª³£ÁÁ
	1148	+ // µ«»ÆµÆÒªÖ¸Ê¾EEE½ÚÄÜ×´Ì¬, Ã»ÓÐÊý¾Ý°üÊ±µÆÒªÏ¨Ãð
	1149	+ phy_write(phydev, 0x11, 0x00);
	1150	+ phy_write(phydev, 31, 0);
	1151	+
	1152	+ // ²åÉÏÍøÏßºó, ÂÌµÆ³£ÁÁ; °ÎµôÍøÏßºó, ÂÌµÆÏ¨Ãð
	1153	+ // Á´Â·Ö§³ÖEEE½ÚÄÜ: ÓÐÊý¾Ý´«Êä, »ÆµÆÉÁË¸, ·ñÔòÏ¨Ãð
	1154	+ // Á´Â·²»Ö§³ÖEEE½ÚÄÜ: ÓÐÊý¾Ý´«Êä, »ÆµÆÉÁË¸, ·ñÔò³£ÁÁ
	1155	+
	1156	+ printk("<<<<<<<ben test led ctrl end %s\n",__FUNCTION__);
	1157	+ return 0;
	1158	+}
	1159	+
939	1160	/**
940	1161	* stmmac_init_phy - PHY initialization
941	1162	* @dev: net device structure
..	..	@@ -947,85 +1168,83 @@
947	1168	static int stmmac_init_phy(struct net_device *dev)
948	1169	{
949	1170	struct stmmac_priv *priv = netdev_priv(dev);
950		- u32 tx_cnt = priv->plat->tx_queues_to_use;
951		- struct phy_device *phydev;
952		- char phy_id_fmt[MII_BUS_ID_SIZE + 3];
953		- char bus_id[MII_BUS_ID_SIZE];
954		- int interface = priv->plat->interface;
955		- int max_speed = priv->plat->max_speed;
956		- priv->oldlink = false;
957		- priv->speed = SPEED_UNKNOWN;
958		- priv->oldduplex = DUPLEX_UNKNOWN;
	1171	+ struct device_node *node;
	1172	+ int ret;
959	1173
	1174	+
	1175	+ printk("ben stmmac_init_phy .. \n");
	1176	+ mdelay(2000);
	1177	+ printk("ben stmmac_init_phy delay .. \n");
960	1178	if (priv->plat->integrated_phy_power)
961		- priv->plat->integrated_phy_power(priv->plat->bsp_priv, true);
	1179	+ ret = priv->plat->integrated_phy_power(priv->plat->bsp_priv, true);
962	1180
963		- if (priv->plat->phy_node) {
964		- phydev = of_phy_connect(dev, priv->plat->phy_node,
965		- &stmmac_adjust_link, 0, interface);
966		- } else {
967		- snprintf(bus_id, MII_BUS_ID_SIZE, "stmmac-%x",
968		- priv->plat->bus_id);
	1181	+ node = priv->plat->phylink_node;
969	1182
970		- snprintf(phy_id_fmt, MII_BUS_ID_SIZE + 3, PHY_ID_FMT, bus_id,
971		- priv->plat->phy_addr);
972		- netdev_dbg(priv->dev, "%s: trying to attach to %s\n", __func__,
973		- phy_id_fmt);
	1183	+ if (node)
	1184	+ {
	1185	+ //printk("ben ttt.. \n");
	1186	+ ret = phylink_of_phy_connect(priv->phylink, node, 0);
	1187	+ //printk("ben ttt:%d \n", ret);
	1188	+ }
974	1189
975		- phydev = phy_connect(dev, phy_id_fmt, &stmmac_adjust_link,
976		- interface);
977		- }
	1190	+ /* Some DT bindings do not set-up the PHY handle. Let's try to
	1191	+ * manually parse it
	1192	+ */
	1193	+ //printk("ben:stmmac_init_phy..1 \n");
	1194	+ if (!node \|\| ret) {
	1195	+ //if (1) {
	1196	+ int addr = priv->plat->phy_addr;
	1197	+ struct phy_device *phydev;
978	1198
979		- if (IS_ERR_OR_NULL(phydev)) {
980		- netdev_err(priv->dev, "Could not attach to PHY\n");
981		- if (!phydev)
	1199	+ //printk("ben:stmmac_init_phy..2 \n");
	1200	+ phydev = mdiobus_get_phy(priv->mii, addr);
	1201	+ if (!phydev) {
	1202	+ netdev_err(priv->dev, "no phy at addr %d\n", addr);
982	1203	return -ENODEV;
	1204	+ }
983	1205
984		- return PTR_ERR(phydev);
	1206	+ //rtl8211F_led_control(phydev);
	1207	+
	1208	+ //printk("ben:stmmac_init_phy..3 \n");
	1209	+ ret = phylink_connect_phy(priv->phylink, phydev);
	1210	+ //rtl8211F_led_control(phydev);
985	1211	}
986	1212
987		- /* Stop Advertising 1000BASE Capability if interface is not GMII */
988		- if ((interface == PHY_INTERFACE_MODE_MII) \|\|
989		- (interface == PHY_INTERFACE_MODE_RMII) \|\|
990		- (max_speed < 1000 && max_speed > 0))
991		- phydev->advertising &= ~(SUPPORTED_1000baseT_Half \|
992		- SUPPORTED_1000baseT_Full);
	1213	+ if (!priv->plat->pmt) {
	1214	+ struct ethtool_wolinfo wol = { .cmd = ETHTOOL_GWOL };
993	1215
994		- /*
995		- * Half-duplex mode not supported with multiqueue
996		- * half-duplex can only works with single queue
997		- */
998		- if (tx_cnt > 1)
999		- phydev->supported &= ~(SUPPORTED_1000baseT_Half \|
1000		- SUPPORTED_100baseT_Half \|
1001		- SUPPORTED_10baseT_Half);
1002		-
1003		- /*
1004		- * Broken HW is sometimes missing the pull-up resistor on the
1005		- * MDIO line, which results in reads to non-existent devices returning
1006		- * 0 rather than 0xffff. Catch this here and treat 0 as a non-existent
1007		- * device as well.
1008		- * Note: phydev->phy_id is the result of reading the UID PHY registers.
1009		- */
1010		- if (!priv->plat->phy_node && phydev->phy_id == 0) {
1011		- phy_disconnect(phydev);
1012		- return -ENODEV;
	1216	+ phylink_ethtool_get_wol(priv->phylink, &wol);
	1217	+ device_set_wakeup_capable(priv->device, !!wol.supported);
1013	1218	}
	1219	+ return ret;
	1220	+}
1014	1221
1015		- /* stmmac_adjust_link will change this to PHY_IGNORE_INTERRUPT to avoid
1016		- * subsequent PHY polling, make sure we force a link transition if
1017		- * we have a UP/DOWN/UP transition
1018		- */
1019		- if (phydev->is_pseudo_fixed_link)
1020		- phydev->irq = PHY_POLL;
	1222	+static int stmmac_phy_setup(struct stmmac_priv *priv)
	1223	+{
	1224	+ struct fwnode_handle *fwnode = of_fwnode_handle(priv->plat->phylink_node);
	1225	+ int mode = priv->plat->phy_interface;
	1226	+ struct phylink *phylink;
1021	1227
1022		- phy_attached_info(phydev);
	1228	+ priv->phylink_config.dev = &priv->dev->dev;
	1229	+ priv->phylink_config.type = PHYLINK_NETDEV;
	1230	+ priv->phylink_config.pcs_poll = true;
	1231	+
	1232	+ if (!fwnode)
	1233	+ fwnode = dev_fwnode(priv->device);
	1234	+
	1235	+ phylink = phylink_create(&priv->phylink_config, fwnode,
	1236	+ mode, &stmmac_phylink_mac_ops);
	1237	+ if (IS_ERR(phylink))
	1238	+ return PTR_ERR(phylink);
	1239	+
	1240	+ priv->phylink = phylink;
1023	1241	return 0;
1024	1242	}
1025	1243
1026	1244	static void stmmac_display_rx_rings(struct stmmac_priv *priv)
1027	1245	{
1028	1246	u32 rx_cnt = priv->plat->rx_queues_to_use;
	1247	+ unsigned int desc_size;
1029	1248	void *head_rx;
1030	1249	u32 queue;
1031	1250
..	..	@@ -1035,19 +1254,24 @@
1035	1254
1036	1255	pr_info("\tRX Queue %u rings\n", queue);
1037	1256
1038		- if (priv->extend_desc)
	1257	+ if (priv->extend_desc) {
1039	1258	head_rx = (void *)rx_q->dma_erx;
1040		- else
	1259	+ desc_size = sizeof(struct dma_extended_desc);
	1260	+ } else {
1041	1261	head_rx = (void *)rx_q->dma_rx;
	1262	+ desc_size = sizeof(struct dma_desc);
	1263	+ }
1042	1264
1043	1265	/* Display RX ring */
1044		- stmmac_display_ring(priv, head_rx, DMA_RX_SIZE, true);
	1266	+ stmmac_display_ring(priv, head_rx, priv->dma_rx_size, true,
	1267	+ rx_q->dma_rx_phy, desc_size);
1045	1268	}
1046	1269	}
1047	1270
1048	1271	static void stmmac_display_tx_rings(struct stmmac_priv *priv)
1049	1272	{
1050	1273	u32 tx_cnt = priv->plat->tx_queues_to_use;
	1274	+ unsigned int desc_size;
1051	1275	void *head_tx;
1052	1276	u32 queue;
1053	1277
..	..	@@ -1057,12 +1281,19 @@
1057	1281
1058	1282	pr_info("\tTX Queue %d rings\n", queue);
1059	1283
1060		- if (priv->extend_desc)
	1284	+ if (priv->extend_desc) {
1061	1285	head_tx = (void *)tx_q->dma_etx;
1062		- else
	1286	+ desc_size = sizeof(struct dma_extended_desc);
	1287	+ } else if (tx_q->tbs & STMMAC_TBS_AVAIL) {
	1288	+ head_tx = (void *)tx_q->dma_entx;
	1289	+ desc_size = sizeof(struct dma_edesc);
	1290	+ } else {
1063	1291	head_tx = (void *)tx_q->dma_tx;
	1292	+ desc_size = sizeof(struct dma_desc);
	1293	+ }
1064	1294
1065		- stmmac_display_ring(priv, head_tx, DMA_TX_SIZE, false);
	1295	+ stmmac_display_ring(priv, head_tx, priv->dma_tx_size, false,
	1296	+ tx_q->dma_tx_phy, desc_size);
1066	1297	}
1067	1298	}
1068	1299
..	..	@@ -1106,16 +1337,16 @@
1106	1337	int i;
1107	1338
1108	1339	/* Clear the RX descriptors */
1109		- for (i = 0; i < DMA_RX_SIZE; i++)
	1340	+ for (i = 0; i < priv->dma_rx_size; i++)
1110	1341	if (priv->extend_desc)
1111	1342	stmmac_init_rx_desc(priv, &rx_q->dma_erx[i].basic,
1112	1343	priv->use_riwt, priv->mode,
1113		- (i == DMA_RX_SIZE - 1),
	1344	+ (i == priv->dma_rx_size - 1),
1114	1345	priv->dma_buf_sz);
1115	1346	else
1116	1347	stmmac_init_rx_desc(priv, &rx_q->dma_rx[i],
1117	1348	priv->use_riwt, priv->mode,
1118		- (i == DMA_RX_SIZE - 1),
	1349	+ (i == priv->dma_rx_size - 1),
1119	1350	priv->dma_buf_sz);
1120	1351	}
1121	1352
..	..	@@ -1132,13 +1363,19 @@
1132	1363	int i;
1133	1364
1134	1365	/* Clear the TX descriptors */
1135		- for (i = 0; i < DMA_TX_SIZE; i++)
	1366	+ for (i = 0; i < priv->dma_tx_size; i++) {
	1367	+ int last = (i == (priv->dma_tx_size - 1));
	1368	+ struct dma_desc *p;
	1369	+
1136	1370	if (priv->extend_desc)
1137		- stmmac_init_tx_desc(priv, &tx_q->dma_etx[i].basic,
1138		- priv->mode, (i == DMA_TX_SIZE - 1));
	1371	+ p = &tx_q->dma_etx[i].basic;
	1372	+ else if (tx_q->tbs & STMMAC_TBS_AVAIL)
	1373	+ p = &tx_q->dma_entx[i].basic;
1139	1374	else
1140		- stmmac_init_tx_desc(priv, &tx_q->dma_tx[i],
1141		- priv->mode, (i == DMA_TX_SIZE - 1));
	1375	+ p = &tx_q->dma_tx[i];
	1376	+
	1377	+ stmmac_init_tx_desc(priv, p, priv->mode, last);
	1378	+ }
1142	1379	}
1143	1380
1144	1381	/**
..	..	@@ -1176,26 +1413,30 @@
1176	1413	int i, gfp_t flags, u32 queue)
1177	1414	{
1178	1415	struct stmmac_rx_queue *rx_q = &priv->rx_queue[queue];
1179		- struct sk_buff *skb;
	1416	+ struct stmmac_rx_buffer *buf = &rx_q->buf_pool[i];
	1417	+ gfp_t gfp = (GFP_ATOMIC \| __GFP_NOWARN);
1180	1418
1181		- skb = __netdev_alloc_skb_ip_align(priv->dev, priv->dma_buf_sz, flags);
1182		- if (!skb) {
1183		- netdev_err(priv->dev,
1184		- "%s: Rx init fails; skb is NULL\n", __func__);
	1419	+ if (priv->dma_cap.addr64 <= 32)
	1420	+ gfp \|= GFP_DMA32;
	1421	+
	1422	+ buf->page = page_pool_alloc_pages(rx_q->page_pool, gfp);
	1423	+ if (!buf->page)
1185	1424	return -ENOMEM;
1186		- }
1187		- rx_q->rx_skbuff[i] = skb;
1188		- rx_q->rx_skbuff_dma[i] = dma_map_single(priv->device, skb->data,
1189		- priv->dma_buf_sz,
1190		- DMA_FROM_DEVICE);
1191		- if (dma_mapping_error(priv->device, rx_q->rx_skbuff_dma[i])) {
1192		- netdev_err(priv->dev, "%s: DMA mapping error\n", __func__);
1193		- dev_kfree_skb_any(skb);
1194		- return -EINVAL;
	1425	+
	1426	+ if (priv->sph) {
	1427	+ buf->sec_page = page_pool_alloc_pages(rx_q->page_pool, gfp);
	1428	+ if (!buf->sec_page)
	1429	+ return -ENOMEM;
	1430	+
	1431	+ buf->sec_addr = page_pool_get_dma_addr(buf->sec_page);
	1432	+ stmmac_set_desc_sec_addr(priv, p, buf->sec_addr, true);
	1433	+ } else {
	1434	+ buf->sec_page = NULL;
	1435	+ stmmac_set_desc_sec_addr(priv, p, buf->sec_addr, false);
1195	1436	}
1196	1437
1197		- stmmac_set_desc_addr(priv, p, rx_q->rx_skbuff_dma[i]);
1198		-
	1438	+ buf->addr = page_pool_get_dma_addr(buf->page);
	1439	+ stmmac_set_desc_addr(priv, p, buf->addr);
1199	1440	if (priv->dma_buf_sz == BUF_SIZE_16KiB)
1200	1441	stmmac_init_desc3(priv, p);
1201	1442
..	..	@@ -1211,13 +1452,15 @@
1211	1452	static void stmmac_free_rx_buffer(struct stmmac_priv *priv, u32 queue, int i)
1212	1453	{
1213	1454	struct stmmac_rx_queue *rx_q = &priv->rx_queue[queue];
	1455	+ struct stmmac_rx_buffer *buf = &rx_q->buf_pool[i];
1214	1456
1215		- if (rx_q->rx_skbuff[i]) {
1216		- dma_unmap_single(priv->device, rx_q->rx_skbuff_dma[i],
1217		- priv->dma_buf_sz, DMA_FROM_DEVICE);
1218		- dev_kfree_skb_any(rx_q->rx_skbuff[i]);
1219		- }
1220		- rx_q->rx_skbuff[i] = NULL;
	1457	+ if (buf->page)
	1458	+ page_pool_put_full_page(rx_q->page_pool, buf->page, false);
	1459	+ buf->page = NULL;
	1460	+
	1461	+ if (buf->sec_page)
	1462	+ page_pool_put_full_page(rx_q->page_pool, buf->sec_page, false);
	1463	+ buf->sec_page = NULL;
1221	1464	}
1222	1465
1223	1466	/**
..	..	@@ -1264,18 +1507,8 @@
1264	1507	struct stmmac_priv *priv = netdev_priv(dev);
1265	1508	u32 rx_count = priv->plat->rx_queues_to_use;
1266	1509	int ret = -ENOMEM;
1267		- int bfsize = 0;
1268	1510	int queue;
1269	1511	int i;
1270		-
1271		- bfsize = stmmac_set_16kib_bfsize(priv, dev->mtu);
1272		- if (bfsize < 0)
1273		- bfsize = 0;
1274		-
1275		- if (bfsize < BUF_SIZE_16KiB)
1276		- bfsize = stmmac_set_bfsize(dev->mtu, priv->dma_buf_sz);
1277		-
1278		- priv->dma_buf_sz = bfsize;
1279	1512
1280	1513	/* RX INITIALIZATION */
1281	1514	netif_dbg(priv, probe, priv->dev,
..	..	@@ -1288,7 +1521,9 @@
1288	1521	"(%s) dma_rx_phy=0x%08x\n", __func__,
1289	1522	(u32)rx_q->dma_rx_phy);
1290	1523
1291		- for (i = 0; i < DMA_RX_SIZE; i++) {
	1524	+ stmmac_clear_rx_descriptors(priv, queue);
	1525	+
	1526	+ for (i = 0; i < priv->dma_rx_size; i++) {
1292	1527	struct dma_desc *p;
1293	1528
1294	1529	if (priv->extend_desc)
..	..	@@ -1300,29 +1535,23 @@
1300	1535	queue);
1301	1536	if (ret)
1302	1537	goto err_init_rx_buffers;
1303		-
1304		- netif_dbg(priv, probe, priv->dev, "[%p]\t[%p]\t[%x]\n",
1305		- rx_q->rx_skbuff[i], rx_q->rx_skbuff[i]->data,
1306		- (unsigned int)rx_q->rx_skbuff_dma[i]);
1307	1538	}
1308	1539
1309	1540	rx_q->cur_rx = 0;
1310		- rx_q->dirty_rx = (unsigned int)(i - DMA_RX_SIZE);
1311		-
1312		- stmmac_clear_rx_descriptors(priv, queue);
	1541	+ rx_q->dirty_rx = (unsigned int)(i - priv->dma_rx_size);
1313	1542
1314	1543	/* Setup the chained descriptor addresses */
1315	1544	if (priv->mode == STMMAC_CHAIN_MODE) {
1316	1545	if (priv->extend_desc)
1317	1546	stmmac_mode_init(priv, rx_q->dma_erx,
1318		- rx_q->dma_rx_phy, DMA_RX_SIZE, 1);
	1547	+ rx_q->dma_rx_phy,
	1548	+ priv->dma_rx_size, 1);
1319	1549	else
1320	1550	stmmac_mode_init(priv, rx_q->dma_rx,
1321		- rx_q->dma_rx_phy, DMA_RX_SIZE, 0);
	1551	+ rx_q->dma_rx_phy,
	1552	+ priv->dma_rx_size, 0);
1322	1553	}
1323	1554	}
1324		-
1325		- buf_sz = bfsize;
1326	1555
1327	1556	return 0;
1328	1557
..	..	@@ -1334,7 +1563,7 @@
1334	1563	if (queue == 0)
1335	1564	break;
1336	1565
1337		- i = DMA_RX_SIZE;
	1566	+ i = priv->dma_rx_size;
1338	1567	queue--;
1339	1568	}
1340	1569
..	..	@@ -1366,16 +1595,20 @@
1366	1595	if (priv->mode == STMMAC_CHAIN_MODE) {
1367	1596	if (priv->extend_desc)
1368	1597	stmmac_mode_init(priv, tx_q->dma_etx,
1369		- tx_q->dma_tx_phy, DMA_TX_SIZE, 1);
1370		- else
	1598	+ tx_q->dma_tx_phy,
	1599	+ priv->dma_tx_size, 1);
	1600	+ else if (!(tx_q->tbs & STMMAC_TBS_AVAIL))
1371	1601	stmmac_mode_init(priv, tx_q->dma_tx,
1372		- tx_q->dma_tx_phy, DMA_TX_SIZE, 0);
	1602	+ tx_q->dma_tx_phy,
	1603	+ priv->dma_tx_size, 0);
1373	1604	}
1374	1605
1375		- for (i = 0; i < DMA_TX_SIZE; i++) {
	1606	+ for (i = 0; i < priv->dma_tx_size; i++) {
1376	1607	struct dma_desc *p;
1377	1608	if (priv->extend_desc)
1378	1609	p = &((tx_q->dma_etx + i)->basic);
	1610	+ else if (tx_q->tbs & STMMAC_TBS_AVAIL)
	1611	+ p = &((tx_q->dma_entx + i)->basic);
1379	1612	else
1380	1613	p = tx_q->dma_tx + i;
1381	1614
..	..	@@ -1434,7 +1667,7 @@
1434	1667	{
1435	1668	int i;
1436	1669
1437		- for (i = 0; i < DMA_RX_SIZE; i++)
	1670	+ for (i = 0; i < priv->dma_rx_size; i++)
1438	1671	stmmac_free_rx_buffer(priv, queue, i);
1439	1672	}
1440	1673
..	..	@@ -1447,7 +1680,7 @@
1447	1680	{
1448	1681	int i;
1449	1682
1450		- for (i = 0; i < DMA_TX_SIZE; i++)
	1683	+ for (i = 0; i < priv->dma_tx_size; i++)
1451	1684	stmmac_free_tx_buffer(priv, queue, i);
1452	1685	}
1453	1686
..	..	@@ -1482,16 +1715,17 @@
1482	1715
1483	1716	/* Free DMA regions of consistent memory previously allocated */
1484	1717	if (!priv->extend_desc)
1485		- dma_free_coherent(priv->device,
1486		- DMA_RX_SIZE * sizeof(struct dma_desc),
	1718	+ dma_free_coherent(priv->device, priv->dma_rx_size *
	1719	+ sizeof(struct dma_desc),
1487	1720	rx_q->dma_rx, rx_q->dma_rx_phy);
1488	1721	else
1489		- dma_free_coherent(priv->device, DMA_RX_SIZE *
	1722	+ dma_free_coherent(priv->device, priv->dma_rx_size *
1490	1723	sizeof(struct dma_extended_desc),
1491	1724	rx_q->dma_erx, rx_q->dma_rx_phy);
1492	1725
1493		- kfree(rx_q->rx_skbuff_dma);
1494		- kfree(rx_q->rx_skbuff);
	1726	+ kfree(rx_q->buf_pool);
	1727	+ if (rx_q->page_pool)
	1728	+ page_pool_destroy(rx_q->page_pool);
1495	1729	}
1496	1730	}
1497	1731
..	..	@@ -1507,19 +1741,26 @@
1507	1741	/* Free TX queue resources */
1508	1742	for (queue = 0; queue < tx_count; queue++) {
1509	1743	struct stmmac_tx_queue *tx_q = &priv->tx_queue[queue];
	1744	+ size_t size;
	1745	+ void *addr;
1510	1746
1511	1747	/* Release the DMA TX socket buffers */
1512	1748	dma_free_tx_skbufs(priv, queue);
1513	1749
1514		- /* Free DMA regions of consistent memory previously allocated */
1515		- if (!priv->extend_desc)
1516		- dma_free_coherent(priv->device,
1517		- DMA_TX_SIZE * sizeof(struct dma_desc),
1518		- tx_q->dma_tx, tx_q->dma_tx_phy);
1519		- else
1520		- dma_free_coherent(priv->device, DMA_TX_SIZE *
1521		- sizeof(struct dma_extended_desc),
1522		- tx_q->dma_etx, tx_q->dma_tx_phy);
	1750	+ if (priv->extend_desc) {
	1751	+ size = sizeof(struct dma_extended_desc);
	1752	+ addr = tx_q->dma_etx;
	1753	+ } else if (tx_q->tbs & STMMAC_TBS_AVAIL) {
	1754	+ size = sizeof(struct dma_edesc);
	1755	+ addr = tx_q->dma_entx;
	1756	+ } else {
	1757	+ size = sizeof(struct dma_desc);
	1758	+ addr = tx_q->dma_tx;
	1759	+ }
	1760	+
	1761	+ size *= priv->dma_tx_size;
	1762	+
	1763	+ dma_free_coherent(priv->device, size, addr, tx_q->dma_tx_phy);
1523	1764
1524	1765	kfree(tx_q->tx_skbuff_dma);
1525	1766	kfree(tx_q->tx_skbuff);
..	..	@@ -1543,39 +1784,49 @@
1543	1784	/* RX queues buffers and DMA */
1544	1785	for (queue = 0; queue < rx_count; queue++) {
1545	1786	struct stmmac_rx_queue *rx_q = &priv->rx_queue[queue];
	1787	+ struct page_pool_params pp_params = { 0 };
	1788	+ unsigned int num_pages;
1546	1789
1547	1790	rx_q->queue_index = queue;
1548	1791	rx_q->priv_data = priv;
1549	1792
1550		- rx_q->rx_skbuff_dma = kmalloc_array(DMA_RX_SIZE,
1551		- sizeof(dma_addr_t),
1552		- GFP_KERNEL);
1553		- if (!rx_q->rx_skbuff_dma)
1554		- goto err_dma;
	1793	+ pp_params.flags = PP_FLAG_DMA_MAP \| PP_FLAG_DMA_SYNC_DEV;
	1794	+ pp_params.pool_size = priv->dma_rx_size;
	1795	+ num_pages = DIV_ROUND_UP(priv->dma_buf_sz, PAGE_SIZE);
	1796	+ pp_params.order = ilog2(num_pages);
	1797	+ pp_params.nid = dev_to_node(priv->device);
	1798	+ pp_params.dev = priv->device;
	1799	+ pp_params.dma_dir = DMA_FROM_DEVICE;
	1800	+ pp_params.max_len = num_pages * PAGE_SIZE;
1555	1801
1556		- rx_q->rx_skbuff = kmalloc_array(DMA_RX_SIZE,
1557		- sizeof(struct sk_buff *),
1558		- GFP_KERNEL);
1559		- if (!rx_q->rx_skbuff)
	1802	+ rx_q->page_pool = page_pool_create(&pp_params);
	1803	+ if (IS_ERR(rx_q->page_pool)) {
	1804	+ ret = PTR_ERR(rx_q->page_pool);
	1805	+ rx_q->page_pool = NULL;
	1806	+ goto err_dma;
	1807	+ }
	1808	+
	1809	+ rx_q->buf_pool = kcalloc(priv->dma_rx_size,
	1810	+ sizeof(*rx_q->buf_pool),
	1811	+ GFP_KERNEL);
	1812	+ if (!rx_q->buf_pool)
1560	1813	goto err_dma;
1561	1814
1562	1815	if (priv->extend_desc) {
1563		- rx_q->dma_erx = dma_zalloc_coherent(priv->device,
1564		- DMA_RX_SIZE *
1565		- sizeof(struct
1566		- dma_extended_desc),
1567		- &rx_q->dma_rx_phy,
1568		- GFP_KERNEL);
	1816	+ rx_q->dma_erx = dma_alloc_coherent(priv->device,
	1817	+ priv->dma_rx_size *
	1818	+ sizeof(struct dma_extended_desc),
	1819	+ &rx_q->dma_rx_phy,
	1820	+ GFP_KERNEL);
1569	1821	if (!rx_q->dma_erx)
1570	1822	goto err_dma;
1571	1823
1572	1824	} else {
1573		- rx_q->dma_rx = dma_zalloc_coherent(priv->device,
1574		- DMA_RX_SIZE *
1575		- sizeof(struct
1576		- dma_desc),
1577		- &rx_q->dma_rx_phy,
1578		- GFP_KERNEL);
	1825	+ rx_q->dma_rx = dma_alloc_coherent(priv->device,
	1826	+ priv->dma_rx_size *
	1827	+ sizeof(struct dma_desc),
	1828	+ &rx_q->dma_rx_phy,
	1829	+ GFP_KERNEL);
1579	1830	if (!rx_q->dma_rx)
1580	1831	goto err_dma;
1581	1832	}
..	..	@@ -1606,48 +1857,50 @@
1606	1857	/* TX queues buffers and DMA */
1607	1858	for (queue = 0; queue < tx_count; queue++) {
1608	1859	struct stmmac_tx_queue *tx_q = &priv->tx_queue[queue];
	1860	+ size_t size;
	1861	+ void *addr;
1609	1862
1610	1863	tx_q->queue_index = queue;
1611	1864	tx_q->priv_data = priv;
1612	1865
1613		- tx_q->tx_skbuff_dma = kmalloc_array(DMA_TX_SIZE,
1614		- sizeof(*tx_q->tx_skbuff_dma),
1615		- GFP_KERNEL);
	1866	+ tx_q->tx_skbuff_dma = kcalloc(priv->dma_tx_size,
	1867	+ sizeof(*tx_q->tx_skbuff_dma),
	1868	+ GFP_KERNEL);
1616	1869	if (!tx_q->tx_skbuff_dma)
1617	1870	goto err_dma;
1618	1871
1619		- tx_q->tx_skbuff = kmalloc_array(DMA_TX_SIZE,
1620		- sizeof(struct sk_buff *),
1621		- GFP_KERNEL);
	1872	+ tx_q->tx_skbuff = kcalloc(priv->dma_tx_size,
	1873	+ sizeof(struct sk_buff *),
	1874	+ GFP_KERNEL);
1622	1875	if (!tx_q->tx_skbuff)
1623	1876	goto err_dma;
1624	1877
1625		- if (priv->extend_desc) {
1626		- tx_q->dma_etx = dma_zalloc_coherent(priv->device,
1627		- DMA_TX_SIZE *
1628		- sizeof(struct
1629		- dma_extended_desc),
1630		- &tx_q->dma_tx_phy,
1631		- GFP_KERNEL);
1632		- if (!tx_q->dma_etx)
1633		- goto err_dma;
1634		- } else {
1635		- tx_q->dma_tx = dma_zalloc_coherent(priv->device,
1636		- DMA_TX_SIZE *
1637		- sizeof(struct
1638		- dma_desc),
1639		- &tx_q->dma_tx_phy,
1640		- GFP_KERNEL);
1641		- if (!tx_q->dma_tx)
1642		- goto err_dma;
1643		- }
	1878	+ if (priv->extend_desc)
	1879	+ size = sizeof(struct dma_extended_desc);
	1880	+ else if (tx_q->tbs & STMMAC_TBS_AVAIL)
	1881	+ size = sizeof(struct dma_edesc);
	1882	+ else
	1883	+ size = sizeof(struct dma_desc);
	1884	+
	1885	+ size *= priv->dma_tx_size;
	1886	+
	1887	+ addr = dma_alloc_coherent(priv->device, size,
	1888	+ &tx_q->dma_tx_phy, GFP_KERNEL);
	1889	+ if (!addr)
	1890	+ goto err_dma;
	1891	+
	1892	+ if (priv->extend_desc)
	1893	+ tx_q->dma_etx = addr;
	1894	+ else if (tx_q->tbs & STMMAC_TBS_AVAIL)
	1895	+ tx_q->dma_entx = addr;
	1896	+ else
	1897	+ tx_q->dma_tx = addr;
1644	1898	}
1645	1899
1646	1900	return 0;
1647	1901
1648	1902	err_dma:
1649	1903	free_dma_tx_desc_resources(priv);
1650		-
1651	1904	return ret;
1652	1905	}
1653	1906
..	..	@@ -1858,6 +2111,7 @@
1858	2111	/**
1859	2112	* stmmac_tx_clean - to manage the transmission completion
1860	2113	* @priv: driver private structure
	2114	+ * @budget: napi budget limiting this functions packet handling
1861	2115	* @queue: TX queue index
1862	2116	* Description: it reclaims the transmit resources after transmission completes.
1863	2117	*/
..	..	@@ -1879,6 +2133,8 @@
1879	2133
1880	2134	if (priv->extend_desc)
1881	2135	p = (struct dma_desc *)(tx_q->dma_etx + entry);
	2136	+ else if (tx_q->tbs & STMMAC_TBS_AVAIL)
	2137	+ p = &tx_q->dma_entx[entry].basic;
1882	2138	else
1883	2139	p = tx_q->dma_tx + entry;
1884	2140
..	..	@@ -1937,7 +2193,7 @@
1937	2193
1938	2194	stmmac_release_tx_desc(priv, p, priv->mode);
1939	2195
1940		- entry = STMMAC_GET_ENTRY(entry, DMA_TX_SIZE);
	2196	+ entry = STMMAC_GET_ENTRY(entry, priv->dma_tx_size);
1941	2197	}
1942	2198	tx_q->dirty_tx = entry;
1943	2199
..	..	@@ -1946,7 +2202,7 @@
1946	2202
1947	2203	if (unlikely(netif_tx_queue_stopped(netdev_get_tx_queue(priv->dev,
1948	2204	queue))) &&
1949		- stmmac_tx_avail(priv, queue) > STMMAC_TX_THRESH) {
	2205	+ stmmac_tx_avail(priv, queue) > STMMAC_TX_THRESH(priv)) {
1950	2206
1951	2207	netif_dbg(priv, tx_done, priv->dev,
1952	2208	"%s: restart transmit\n", __func__);
..	..	@@ -1955,8 +2211,12 @@
1955	2211
1956	2212	if ((priv->eee_enabled) && (!priv->tx_path_in_lpi_mode)) {
1957	2213	stmmac_enable_eee_mode(priv);
1958		- mod_timer(&priv->eee_ctrl_timer, STMMAC_LPI_T(eee_timer));
	2214	+ mod_timer(&priv->eee_ctrl_timer, STMMAC_LPI_T(priv->tx_lpi_timer));
1959	2215	}
	2216	+
	2217	+ /* We still have pending packets, let's call for a new scheduling */
	2218	+ if (tx_q->dirty_tx != tx_q->cur_tx)
	2219	+ mod_timer(&tx_q->txtimer, STMMAC_COAL_TIMER(priv->tx_coal_timer));
1960	2220
1961	2221	__netif_tx_unlock_bh(netdev_get_tx_queue(priv->dev, queue));
1962	2222
..	..	@@ -1973,23 +2233,18 @@
1973	2233	static void stmmac_tx_err(struct stmmac_priv *priv, u32 chan)
1974	2234	{
1975	2235	struct stmmac_tx_queue *tx_q = &priv->tx_queue[chan];
1976		- int i;
1977	2236
1978	2237	netif_tx_stop_queue(netdev_get_tx_queue(priv->dev, chan));
1979	2238
1980	2239	stmmac_stop_tx_dma(priv, chan);
1981	2240	dma_free_tx_skbufs(priv, chan);
1982		- for (i = 0; i < DMA_TX_SIZE; i++)
1983		- if (priv->extend_desc)
1984		- stmmac_init_tx_desc(priv, &tx_q->dma_etx[i].basic,
1985		- priv->mode, (i == DMA_TX_SIZE - 1));
1986		- else
1987		- stmmac_init_tx_desc(priv, &tx_q->dma_tx[i],
1988		- priv->mode, (i == DMA_TX_SIZE - 1));
	2241	+ stmmac_clear_tx_descriptors(priv, chan);
1989	2242	tx_q->dirty_tx = 0;
1990	2243	tx_q->cur_tx = 0;
1991	2244	tx_q->mss = 0;
1992	2245	netdev_tx_reset_queue(netdev_get_tx_queue(priv->dev, chan));
	2246	+ stmmac_init_tx_chan(priv, priv->ioaddr, priv->plat->dma_cfg,
	2247	+ tx_q->dma_tx_phy, chan);
1993	2248	stmmac_start_tx_dma(priv, chan);
1994	2249
1995	2250	priv->dev->stats.tx_errors++;
..	..	@@ -2048,23 +2303,24 @@
2048	2303	int status = stmmac_dma_interrupt_status(priv, priv->ioaddr,
2049	2304	&priv->xstats, chan);
2050	2305	struct stmmac_channel *ch = &priv->channel[chan];
2051		- bool needs_work = false;
	2306	+ unsigned long flags;
2052	2307
2053		- if ((status & handle_rx) && ch->has_rx) {
2054		- needs_work = true;
2055		- } else {
2056		- status &= ~handle_rx;
	2308	+ if ((status & handle_rx) && (chan < priv->plat->rx_queues_to_use)) {
	2309	+ if (napi_schedule_prep(&ch->rx_napi)) {
	2310	+ spin_lock_irqsave(&ch->lock, flags);
	2311	+ stmmac_disable_dma_irq(priv, priv->ioaddr, chan, 1, 0);
	2312	+ spin_unlock_irqrestore(&ch->lock, flags);
	2313	+ __napi_schedule(&ch->rx_napi);
	2314	+ }
2057	2315	}
2058	2316
2059		- if ((status & handle_tx) && ch->has_tx) {
2060		- needs_work = true;
2061		- } else {
2062		- status &= ~handle_tx;
2063		- }
2064		-
2065		- if (needs_work && napi_schedule_prep(&ch->napi)) {
2066		- stmmac_disable_dma_irq(priv, priv->ioaddr, chan);
2067		- __napi_schedule(&ch->napi);
	2317	+ if ((status & handle_tx) && (chan < priv->plat->tx_queues_to_use)) {
	2318	+ if (napi_schedule_prep(&ch->tx_napi)) {
	2319	+ spin_lock_irqsave(&ch->lock, flags);
	2320	+ stmmac_disable_dma_irq(priv, priv->ioaddr, chan, 0, 1);
	2321	+ spin_unlock_irqrestore(&ch->lock, flags);
	2322	+ __napi_schedule(&ch->tx_napi);
	2323	+ }
2068	2324	}
2069	2325
2070	2326	return status;
..	..	@@ -2127,10 +2383,10 @@
2127	2383	unsigned int mode = MMC_CNTRL_RESET_ON_READ \| MMC_CNTRL_COUNTER_RESET \|
2128	2384	MMC_CNTRL_PRESET \| MMC_CNTRL_FULL_HALF_PRESET;
2129	2385
2130		- dwmac_mmc_intr_all_mask(priv->mmcaddr);
	2386	+ stmmac_mmc_intr_all_mask(priv, priv->mmcaddr);
2131	2387
2132	2388	if (priv->dma_cap.rmon) {
2133		- dwmac_mmc_ctrl(priv->mmcaddr, mode);
	2389	+ stmmac_mmc_ctrl(priv, priv->mmcaddr, mode);
2134	2390	memset(&priv->mmc, 0, sizeof(struct stmmac_counters));
2135	2391	} else
2136	2392	netdev_info(priv->dev, "No MAC Management Counters available\n");
..	..	@@ -2159,7 +2415,8 @@
2159	2415	*/
2160	2416	static void stmmac_check_ether_addr(struct stmmac_priv *priv)
2161	2417	{
2162		- if (!is_valid_ether_addr(priv->dev->dev_addr)) {
	2418	+// if (!is_valid_ether_addr(priv->dev->dev_addr)) {
	2419	+ if (1) {
2163	2420	stmmac_get_umac_addr(priv, priv->hw, priv->dev->dev_addr, 0);
2164	2421	if (likely(priv->plat->get_eth_addr))
2165	2422	priv->plat->get_eth_addr(priv->plat->bsp_priv,
..	..	@@ -2222,7 +2479,8 @@
2222	2479	rx_q->dma_rx_phy, chan);
2223	2480
2224	2481	rx_q->rx_tail_addr = rx_q->dma_rx_phy +
2225		- (DMA_RX_SIZE * sizeof(struct dma_desc));
	2482	+ (priv->dma_rx_size *
	2483	+ sizeof(struct dma_desc));
2226	2484	stmmac_set_rx_tail_ptr(priv, priv->ioaddr,
2227	2485	rx_q->rx_tail_addr, chan);
2228	2486	}
..	..	@@ -2251,7 +2509,7 @@
2251	2509
2252	2510	/**
2253	2511	* stmmac_tx_timer - mitigation sw timer for tx.
2254		- * @data: data pointer
	2512	+ * @t: data pointer
2255	2513	* Description:
2256	2514	* This is the timer handler to directly invoke the stmmac_tx_clean.
2257	2515	*/
..	..	@@ -2263,25 +2521,32 @@
2263	2521
2264	2522	ch = &priv->channel[tx_q->queue_index];
2265	2523
2266		- if (likely(napi_schedule_prep(&ch->napi)))
2267		- __napi_schedule(&ch->napi);
	2524	+ if (likely(napi_schedule_prep(&ch->tx_napi))) {
	2525	+ unsigned long flags;
	2526	+
	2527	+ spin_lock_irqsave(&ch->lock, flags);
	2528	+ stmmac_disable_dma_irq(priv, priv->ioaddr, ch->index, 0, 1);
	2529	+ spin_unlock_irqrestore(&ch->lock, flags);
	2530	+ __napi_schedule(&ch->tx_napi);
	2531	+ }
2268	2532	}
2269	2533
2270	2534	/**
2271		- * stmmac_init_tx_coalesce - init tx mitigation options.
	2535	+ * stmmac_init_coalesce - init mitigation options.
2272	2536	* @priv: driver private structure
2273	2537	* Description:
2274		- * This inits the transmit coalesce parameters: i.e. timer rate,
	2538	+ * This inits the coalesce parameters: i.e. timer rate,
2275	2539	* timer handler and default threshold used for enabling the
2276	2540	* interrupt on completion bit.
2277	2541	*/
2278		-static void stmmac_init_tx_coalesce(struct stmmac_priv *priv)
	2542	+static void stmmac_init_coalesce(struct stmmac_priv *priv)
2279	2543	{
2280	2544	u32 tx_channel_count = priv->plat->tx_queues_to_use;
2281	2545	u32 chan;
2282	2546
2283	2547	priv->tx_coal_frames = STMMAC_TX_FRAMES;
2284	2548	priv->tx_coal_timer = STMMAC_COAL_TX_TIMER;
	2549	+ priv->rx_coal_frames = STMMAC_RX_FRAMES;
2285	2550
2286	2551	for (chan = 0; chan < tx_channel_count; chan++) {
2287	2552	struct stmmac_tx_queue *tx_q = &priv->tx_queue[chan];
..	..	@@ -2299,12 +2564,12 @@
2299	2564	/* set TX ring length */
2300	2565	for (chan = 0; chan < tx_channels_count; chan++)
2301	2566	stmmac_set_tx_ring_len(priv, priv->ioaddr,
2302		- (DMA_TX_SIZE - 1), chan);
	2567	+ (priv->dma_tx_size - 1), chan);
2303	2568
2304	2569	/* set RX ring length */
2305	2570	for (chan = 0; chan < rx_channels_count; chan++)
2306	2571	stmmac_set_rx_ring_len(priv, priv->ioaddr,
2307		- (DMA_RX_SIZE - 1), chan);
	2572	+ (priv->dma_rx_size - 1), chan);
2308	2573	}
2309	2574
2310	2575	/**
..	..	@@ -2428,6 +2693,22 @@
2428	2693	}
2429	2694	}
2430	2695
	2696	+static void stmmac_mac_config_rss(struct stmmac_priv *priv)
	2697	+{
	2698	+ if (!priv->dma_cap.rssen \|\| !priv->plat->rss_en) {
	2699	+ priv->rss.enable = false;
	2700	+ return;
	2701	+ }
	2702	+
	2703	+ if (priv->dev->features & NETIF_F_RXHASH)
	2704	+ priv->rss.enable = true;
	2705	+ else
	2706	+ priv->rss.enable = false;
	2707	+
	2708	+ stmmac_rss_configure(priv, priv->hw, &priv->rss,
	2709	+ priv->plat->rx_queues_to_use);
	2710	+}
	2711	+
2431	2712	/**
2432	2713	* stmmac_mtl_configuration - Configure MTL
2433	2714	* @priv: driver private structure
..	..	@@ -2472,6 +2753,10 @@
2472	2753	/* Set RX routing */
2473	2754	if (rx_queues_count > 1)
2474	2755	stmmac_mac_config_rx_queues_routing(priv);
	2756	+
	2757	+ /* Receive Side Scaling */
	2758	+ if (rx_queues_count > 1)
	2759	+ stmmac_mac_config_rss(priv);
2475	2760	}
2476	2761
2477	2762	static void stmmac_safety_feat_configuration(struct stmmac_priv *priv)
..	..	@@ -2487,6 +2772,7 @@
2487	2772	/**
2488	2773	* stmmac_hw_setup - setup mac in a usable state.
2489	2774	* @dev : pointer to the device structure.
	2775	+ * @ptp_register: register PTP if set
2490	2776	* Description:
2491	2777	* this is the main function to setup the HW in a usable state because the
2492	2778	* dma engine is reset, the core registers are configured (e.g. AXI,
..	..	@@ -2496,7 +2782,7 @@
2496	2782	* 0 on success and an appropriate (-)ve integer as defined in errno.h
2497	2783	* file on failure.
2498	2784	*/
2499		-static int stmmac_hw_setup(struct net_device *dev, bool init_ptp)
	2785	+static int stmmac_hw_setup(struct net_device *dev, bool ptp_register)
2500	2786	{
2501	2787	struct stmmac_priv *priv = netdev_priv(dev);
2502	2788	u32 rx_cnt = priv->plat->rx_queues_to_use;
..	..	@@ -2552,37 +2838,75 @@
2552	2838
2553	2839	stmmac_mmc_setup(priv);
2554	2840
2555		- if (IS_ENABLED(CONFIG_STMMAC_PTP) && init_ptp) {
	2841	+ if (ptp_register) {
2556	2842	ret = clk_prepare_enable(priv->plat->clk_ptp_ref);
2557	2843	if (ret < 0)
2558		- netdev_warn(priv->dev, "failed to enable PTP reference clock: %d\n", ret);
2559		-
2560		- ret = stmmac_init_ptp(priv);
2561		- if (ret == -EOPNOTSUPP)
2562		- netdev_warn(priv->dev, "PTP not supported by HW\n");
2563		- else if (ret)
2564		- netdev_warn(priv->dev, "PTP init failed\n");
	2844	+ netdev_warn(priv->dev,
	2845	+ "failed to enable PTP reference clock: %pe\n",
	2846	+ ERR_PTR(ret));
2565	2847	}
2566	2848
2567		- priv->tx_lpi_timer = STMMAC_DEFAULT_TWT_LS;
	2849	+ ret = stmmac_init_ptp(priv);
	2850	+ if (ret == -EOPNOTSUPP)
	2851	+ netdev_warn(priv->dev, "PTP not supported by HW\n");
	2852	+ else if (ret)
	2853	+ netdev_warn(priv->dev, "PTP init failed\n");
	2854	+ else if (ptp_register)
	2855	+ stmmac_ptp_register(priv);
	2856	+
	2857	+ priv->eee_tw_timer = STMMAC_DEFAULT_TWT_LS;
	2858	+
	2859	+ /* Convert the timer from msec to usec */
	2860	+ if (!priv->tx_lpi_timer)
	2861	+ priv->tx_lpi_timer = eee_timer * 1000;
2568	2862
2569	2863	if (priv->use_riwt) {
2570		- ret = stmmac_rx_watchdog(priv, priv->ioaddr, MAX_DMA_RIWT, rx_cnt);
2571		- if (!ret)
2572		- priv->rx_riwt = MAX_DMA_RIWT;
	2864	+ if (!priv->rx_riwt)
	2865	+ priv->rx_riwt = DEF_DMA_RIWT;
	2866	+
	2867	+ ret = stmmac_rx_watchdog(priv, priv->ioaddr, priv->rx_riwt, rx_cnt);
2573	2868	}
2574	2869
2575	2870	if (priv->hw->pcs)
2576		- stmmac_pcs_ctrl_ane(priv, priv->hw, 1, priv->hw->ps, 0);
	2871	+ stmmac_pcs_ctrl_ane(priv, priv->ioaddr, 1, priv->hw->ps, 0);
2577	2872
2578	2873	/* set TX and RX rings length */
2579	2874	stmmac_set_rings_length(priv);
2580	2875
2581	2876	/* Enable TSO */
2582	2877	if (priv->tso) {
2583		- for (chan = 0; chan < tx_cnt; chan++)
	2878	+ for (chan = 0; chan < tx_cnt; chan++) {
	2879	+ struct stmmac_tx_queue *tx_q = &priv->tx_queue[chan];
	2880	+
	2881	+ /* TSO and TBS cannot co-exist */
	2882	+ if (tx_q->tbs & STMMAC_TBS_AVAIL)
	2883	+ continue;
	2884	+
2584	2885	stmmac_enable_tso(priv, priv->ioaddr, 1, chan);
	2886	+ }
2585	2887	}
	2888	+
	2889	+ /* Enable Split Header */
	2890	+ if (priv->sph && priv->hw->rx_csum) {
	2891	+ for (chan = 0; chan < rx_cnt; chan++)
	2892	+ stmmac_enable_sph(priv, priv->ioaddr, 1, chan);
	2893	+ }
	2894	+
	2895	+ /* VLAN Tag Insertion */
	2896	+ if (priv->dma_cap.vlins)
	2897	+ stmmac_enable_vlan(priv, priv->hw, STMMAC_VLAN_INSERT);
	2898	+
	2899	+ /* TBS */
	2900	+ for (chan = 0; chan < tx_cnt; chan++) {
	2901	+ struct stmmac_tx_queue *tx_q = &priv->tx_queue[chan];
	2902	+ int enable = tx_q->tbs & STMMAC_TBS_AVAIL;
	2903	+
	2904	+ stmmac_enable_tbs(priv, priv->ioaddr, enable, chan);
	2905	+ }
	2906	+
	2907	+ /* Configure real RX and TX queues */
	2908	+ netif_set_real_num_rx_queues(dev, priv->plat->rx_queues_to_use);
	2909	+ netif_set_real_num_tx_queues(dev, priv->plat->tx_queues_to_use);
2586	2910
2587	2911	/* Start the ball rolling... */
2588	2912	stmmac_start_all_dma(priv);
..	..	@@ -2594,8 +2918,7 @@
2594	2918	{
2595	2919	struct stmmac_priv *priv = netdev_priv(dev);
2596	2920
2597		- if (IS_ENABLED(CONFIG_STMMAC_PTP))
2598		- clk_disable_unprepare(priv->plat->clk_ptp_ref);
	2921	+ clk_disable_unprepare(priv->plat->clk_ptp_ref);
2599	2922	}
2600	2923
2601	2924	/**
..	..	@@ -2610,18 +2933,26 @@
2610	2933	static int stmmac_open(struct net_device *dev)
2611	2934	{
2612	2935	struct stmmac_priv *priv = netdev_priv(dev);
	2936	+ int bfsize = 0;
2613	2937	u32 chan;
2614	2938	int ret;
2615	2939
2616		- if (priv->hw->pcs != STMMAC_PCS_RGMII &&
2617		- priv->hw->pcs != STMMAC_PCS_TBI &&
2618		- priv->hw->pcs != STMMAC_PCS_RTBI) {
	2940	+ //printk("ben:stmmac_open.. \n");
	2941	+ ret = pm_runtime_get_sync(priv->device);
	2942	+ if (ret < 0) {
	2943	+ pm_runtime_put_noidle(priv->device);
	2944	+ return ret;
	2945	+ }
	2946	+
	2947	+ if (priv->hw->pcs != STMMAC_PCS_TBI &&
	2948	+ priv->hw->pcs != STMMAC_PCS_RTBI &&
	2949	+ priv->hw->xpcs == NULL) {
2619	2950	ret = stmmac_init_phy(dev);
2620	2951	if (ret) {
2621	2952	netdev_err(priv->dev,
2622	2953	"%s: Cannot attach to PHY (error: %d)\n",
2623	2954	__func__, ret);
2624		- return ret;
	2955	+ goto init_phy_error;
2625	2956	}
2626	2957	}
2627	2958
..	..	@@ -2629,8 +2960,34 @@
2629	2960	memset(&priv->xstats, 0, sizeof(struct stmmac_extra_stats));
2630	2961	priv->xstats.threshold = tc;
2631	2962
2632		- priv->dma_buf_sz = STMMAC_ALIGN(buf_sz);
	2963	+ bfsize = stmmac_set_16kib_bfsize(priv, dev->mtu);
	2964	+ if (bfsize < 0)
	2965	+ bfsize = 0;
	2966	+
	2967	+ if (bfsize < BUF_SIZE_16KiB)
	2968	+ bfsize = stmmac_set_bfsize(dev->mtu, priv->dma_buf_sz);
	2969	+
	2970	+ priv->dma_buf_sz = bfsize;
	2971	+ buf_sz = bfsize;
	2972	+
2633	2973	priv->rx_copybreak = STMMAC_RX_COPYBREAK;
	2974	+
	2975	+ if (!priv->dma_tx_size)
	2976	+ priv->dma_tx_size = priv->plat->dma_tx_size ? priv->plat->dma_tx_size :
	2977	+ DMA_DEFAULT_TX_SIZE;
	2978	+
	2979	+ if (!priv->dma_rx_size)
	2980	+ priv->dma_rx_size = priv->plat->dma_rx_size ? priv->plat->dma_rx_size :
	2981	+ DMA_DEFAULT_RX_SIZE;
	2982	+
	2983	+ /* Earlier check for TBS */
	2984	+ for (chan = 0; chan < priv->plat->tx_queues_to_use; chan++) {
	2985	+ struct stmmac_tx_queue *tx_q = &priv->tx_queue[chan];
	2986	+ int tbs_en = priv->plat->tx_queues_cfg[chan].tbs_en;
	2987	+
	2988	+ /* Setup per-TXQ tbs flag before TX descriptor alloc */
	2989	+ tx_q->tbs \|= tbs_en ? STMMAC_TBS_AVAIL : 0;
	2990	+ }
2634	2991
2635	2992	ret = alloc_dma_desc_resources(priv);
2636	2993	if (ret < 0) {
..	..	@@ -2646,16 +3003,32 @@
2646	3003	goto init_error;
2647	3004	}
2648	3005
	3006	+ if (priv->plat->serdes_powerup) {
	3007	+ ret = priv->plat->serdes_powerup(dev, priv->plat->bsp_priv);
	3008	+ if (ret < 0) {
	3009	+ netdev_err(priv->dev, "%s: Serdes powerup failed\n",
	3010	+ __func__);
	3011	+ goto init_error;
	3012	+ }
	3013	+ }
	3014	+
	3015	+
	3016	+ #if 1
	3017	+ printk("ben -------bootup add 2s delay time.\n");
	3018	+ mdelay(2500);
	3019	+ #endif
	3020	+
2649	3021	ret = stmmac_hw_setup(dev, true);
2650	3022	if (ret < 0) {
2651	3023	netdev_err(priv->dev, "%s: Hw setup failed\n", __func__);
2652	3024	goto init_error;
2653	3025	}
2654	3026
2655		- stmmac_init_tx_coalesce(priv);
	3027	+ stmmac_init_coalesce(priv);
2656	3028
2657		- if (dev->phydev)
2658		- phy_start(dev->phydev);
	3029	+ phylink_start(priv->phylink);
	3030	+ /* We may have called phylink_speed_down before */
	3031	+ phylink_speed_up(priv->phylink);
2659	3032
2660	3033	/* Request the IRQ lines */
2661	3034	ret = request_irq(dev->irq, stmmac_interrupt,
..	..	@@ -2702,8 +3075,7 @@
2702	3075	wolirq_error:
2703	3076	free_irq(dev->irq, dev);
2704	3077	irq_error:
2705		- if (dev->phydev)
2706		- phy_stop(dev->phydev);
	3078	+ phylink_stop(priv->phylink);
2707	3079
2708	3080	for (chan = 0; chan < priv->plat->tx_queues_to_use; chan++)
2709	3081	del_timer_sync(&priv->tx_queue[chan].txtimer);
..	..	@@ -2712,9 +3084,9 @@
2712	3084	init_error:
2713	3085	free_dma_desc_resources(priv);
2714	3086	dma_desc_error:
2715		- if (dev->phydev)
2716		- phy_disconnect(dev->phydev);
2717		-
	3087	+ phylink_disconnect_phy(priv->phylink);
	3088	+init_phy_error:
	3089	+ pm_runtime_put(priv->device);
2718	3090	return ret;
2719	3091	}
2720	3092
..	..	@@ -2729,14 +3101,14 @@
2729	3101	struct stmmac_priv *priv = netdev_priv(dev);
2730	3102	u32 chan;
2731	3103
	3104	+ if (device_may_wakeup(priv->device))
	3105	+ phylink_speed_down(priv->phylink, false);
2732	3106	/* Stop and disconnect the PHY */
2733		- if (dev->phydev) {
2734		- phy_stop(dev->phydev);
2735		- phy_disconnect(dev->phydev);
2736		- if (priv->plat->integrated_phy_power)
2737		- priv->plat->integrated_phy_power(priv->plat->bsp_priv,
2738		- false);
2739		- }
	3107	+ phylink_stop(priv->phylink);
	3108	+ phylink_disconnect_phy(priv->phylink);
	3109	+
	3110	+ if (priv->plat->integrated_phy_power)
	3111	+ priv->plat->integrated_phy_power(priv->plat->bsp_priv, false);
2740	3112
2741	3113	stmmac_disable_all_queues(priv);
2742	3114
..	..	@@ -2764,12 +3136,48 @@
2764	3136	/* Disable the MAC Rx/Tx */
2765	3137	stmmac_mac_set(priv, priv->ioaddr, false);
2766	3138
	3139	+ /* Powerdown Serdes if there is */
	3140	+ if (priv->plat->serdes_powerdown)
	3141	+ priv->plat->serdes_powerdown(dev, priv->plat->bsp_priv);
	3142	+
2767	3143	netif_carrier_off(dev);
2768	3144
2769		- if (IS_ENABLED(CONFIG_STMMAC_PTP))
2770		- stmmac_release_ptp(priv);
	3145	+ stmmac_release_ptp(priv);
	3146	+
	3147	+ pm_runtime_put(priv->device);
2771	3148
2772	3149	return 0;
	3150	+}
	3151	+
	3152	+static bool stmmac_vlan_insert(struct stmmac_priv priv, struct sk_buff skb,
	3153	+ struct stmmac_tx_queue *tx_q)
	3154	+{
	3155	+ u16 tag = 0x0, inner_tag = 0x0;
	3156	+ u32 inner_type = 0x0;
	3157	+ struct dma_desc *p;
	3158	+
	3159	+ if (!priv->dma_cap.vlins)
	3160	+ return false;
	3161	+ if (!skb_vlan_tag_present(skb))
	3162	+ return false;
	3163	+ if (skb->vlan_proto == htons(ETH_P_8021AD)) {
	3164	+ inner_tag = skb_vlan_tag_get(skb);
	3165	+ inner_type = STMMAC_VLAN_INSERT;
	3166	+ }
	3167	+
	3168	+ tag = skb_vlan_tag_get(skb);
	3169	+
	3170	+ if (tx_q->tbs & STMMAC_TBS_AVAIL)
	3171	+ p = &tx_q->dma_entx[tx_q->cur_tx].basic;
	3172	+ else
	3173	+ p = &tx_q->dma_tx[tx_q->cur_tx];
	3174	+
	3175	+ if (stmmac_set_desc_vlan_tag(priv, p, tag, inner_tag, inner_type))
	3176	+ return false;
	3177	+
	3178	+ stmmac_set_tx_owner(priv, p);
	3179	+ tx_q->cur_tx = STMMAC_GET_ENTRY(tx_q->cur_tx, priv->dma_tx_size);
	3180	+ return true;
2773	3181	}
2774	3182
2775	3183	/**
..	..	@@ -2777,13 +3185,13 @@
2777	3185	* @priv: driver private structure
2778	3186	* @des: buffer start address
2779	3187	* @total_len: total length to fill in descriptors
2780		- * @last_segmant: condition for the last descriptor
	3188	+ * @last_segment: condition for the last descriptor
2781	3189	* @queue: TX queue index
2782	3190	* Description:
2783	3191	* This function fills descriptor and request new descriptors according to
2784	3192	* buffer length to fill
2785	3193	*/
2786		-static void stmmac_tso_allocator(struct stmmac_priv *priv, unsigned int des,
	3194	+static void stmmac_tso_allocator(struct stmmac_priv *priv, dma_addr_t des,
2787	3195	int total_len, bool last_segment, u32 queue)
2788	3196	{
2789	3197	struct stmmac_tx_queue *tx_q = &priv->tx_queue[queue];
..	..	@@ -2794,11 +3202,23 @@
2794	3202	tmp_len = total_len;
2795	3203
2796	3204	while (tmp_len > 0) {
2797		- tx_q->cur_tx = STMMAC_GET_ENTRY(tx_q->cur_tx, DMA_TX_SIZE);
2798		- WARN_ON(tx_q->tx_skbuff[tx_q->cur_tx]);
2799		- desc = tx_q->dma_tx + tx_q->cur_tx;
	3205	+ dma_addr_t curr_addr;
2800	3206
2801		- desc->des0 = cpu_to_le32(des + (total_len - tmp_len));
	3207	+ tx_q->cur_tx = STMMAC_GET_ENTRY(tx_q->cur_tx,
	3208	+ priv->dma_tx_size);
	3209	+ WARN_ON(tx_q->tx_skbuff[tx_q->cur_tx]);
	3210	+
	3211	+ if (tx_q->tbs & STMMAC_TBS_AVAIL)
	3212	+ desc = &tx_q->dma_entx[tx_q->cur_tx].basic;
	3213	+ else
	3214	+ desc = &tx_q->dma_tx[tx_q->cur_tx];
	3215	+
	3216	+ curr_addr = des + (total_len - tmp_len);
	3217	+ if (priv->dma_cap.addr64 <= 32)
	3218	+ desc->des0 = cpu_to_le32(curr_addr);
	3219	+ else
	3220	+ stmmac_set_desc_addr(priv, desc, curr_addr);
	3221	+
2802	3222	buff_size = tmp_len >= TSO_MAX_BUFF_SIZE ?
2803	3223	TSO_MAX_BUFF_SIZE : tmp_len;
2804	3224
..	..	@@ -2842,16 +3262,19 @@
2842	3262	{
2843	3263	struct dma_desc desc, first, *mss_desc = NULL;
2844	3264	struct stmmac_priv *priv = netdev_priv(dev);
	3265	+ int desc_size, tmp_pay_len = 0, first_tx;
2845	3266	int nfrags = skb_shinfo(skb)->nr_frags;
2846	3267	u32 queue = skb_get_queue_mapping(skb);
2847		- unsigned int first_entry, des;
2848		- u8 proto_hdr_len, hdr;
	3268	+ unsigned int first_entry, tx_packets;
2849	3269	struct stmmac_tx_queue *tx_q;
2850		- int tmp_pay_len = 0;
	3270	+ bool has_vlan, set_ic;
	3271	+ u8 proto_hdr_len, hdr;
2851	3272	u32 pay_len, mss;
	3273	+ dma_addr_t des;
2852	3274	int i;
2853	3275
2854	3276	tx_q = &priv->tx_queue[queue];
	3277	+ first_tx = tx_q->cur_tx;
2855	3278
2856	3279	/* Compute header lengths */
2857	3280	if (skb_shinfo(skb)->gso_type & SKB_GSO_UDP_L4) {
..	..	@@ -2882,10 +3305,15 @@
2882	3305
2883	3306	/* set new MSS value if needed */
2884	3307	if (mss != tx_q->mss) {
2885		- mss_desc = tx_q->dma_tx + tx_q->cur_tx;
	3308	+ if (tx_q->tbs & STMMAC_TBS_AVAIL)
	3309	+ mss_desc = &tx_q->dma_entx[tx_q->cur_tx].basic;
	3310	+ else
	3311	+ mss_desc = &tx_q->dma_tx[tx_q->cur_tx];
	3312	+
2886	3313	stmmac_set_mss(priv, mss_desc, mss);
2887	3314	tx_q->mss = mss;
2888		- tx_q->cur_tx = STMMAC_GET_ENTRY(tx_q->cur_tx, DMA_TX_SIZE);
	3315	+ tx_q->cur_tx = STMMAC_GET_ENTRY(tx_q->cur_tx,
	3316	+ priv->dma_tx_size);
2889	3317	WARN_ON(tx_q->tx_skbuff[tx_q->cur_tx]);
2890	3318	}
2891	3319
..	..	@@ -2896,11 +3324,20 @@
2896	3324	skb->data_len);
2897	3325	}
2898	3326
	3327	+ /* Check if VLAN can be inserted by HW */
	3328	+ has_vlan = stmmac_vlan_insert(priv, skb, tx_q);
	3329	+
2899	3330	first_entry = tx_q->cur_tx;
2900	3331	WARN_ON(tx_q->tx_skbuff[first_entry]);
2901	3332
2902		- desc = tx_q->dma_tx + first_entry;
	3333	+ if (tx_q->tbs & STMMAC_TBS_AVAIL)
	3334	+ desc = &tx_q->dma_entx[first_entry].basic;
	3335	+ else
	3336	+ desc = &tx_q->dma_tx[first_entry];
2903	3337	first = desc;
	3338	+
	3339	+ if (has_vlan)
	3340	+ stmmac_set_desc_vlan(priv, first, STMMAC_VLAN_INSERT);
2904	3341
2905	3342	/* first descriptor: fill Headers on Buf1 */
2906	3343	des = dma_map_single(priv->device, skb->data, skb_headlen(skb),
..	..	@@ -2911,14 +3348,21 @@
2911	3348	tx_q->tx_skbuff_dma[first_entry].buf = des;
2912	3349	tx_q->tx_skbuff_dma[first_entry].len = skb_headlen(skb);
2913	3350
2914		- first->des0 = cpu_to_le32(des);
	3351	+ if (priv->dma_cap.addr64 <= 32) {
	3352	+ first->des0 = cpu_to_le32(des);
2915	3353
2916		- /* Fill start of payload in buff2 of first descriptor */
2917		- if (pay_len)
2918		- first->des1 = cpu_to_le32(des + proto_hdr_len);
	3354	+ /* Fill start of payload in buff2 of first descriptor */
	3355	+ if (pay_len)
	3356	+ first->des1 = cpu_to_le32(des + proto_hdr_len);
2919	3357
2920		- /* If needed take extra descriptors to fill the remaining payload */
2921		- tmp_pay_len = pay_len - TSO_MAX_BUFF_SIZE;
	3358	+ /* If needed take extra descriptors to fill the remaining payload */
	3359	+ tmp_pay_len = pay_len - TSO_MAX_BUFF_SIZE;
	3360	+ } else {
	3361	+ stmmac_set_desc_addr(priv, first, des);
	3362	+ tmp_pay_len = pay_len;
	3363	+ des += proto_hdr_len;
	3364	+ pay_len = 0;
	3365	+ }
2922	3366
2923	3367	stmmac_tso_allocator(priv, des, tmp_pay_len, (nfrags == 0), queue);
2924	3368
..	..	@@ -2945,12 +3389,38 @@
2945	3389	/* Only the last descriptor gets to point to the skb. */
2946	3390	tx_q->tx_skbuff[tx_q->cur_tx] = skb;
2947	3391
	3392	+ /* Manage tx mitigation */
	3393	+ tx_packets = (tx_q->cur_tx + 1) - first_tx;
	3394	+ tx_q->tx_count_frames += tx_packets;
	3395	+
	3396	+ if ((skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP) && priv->hwts_tx_en)
	3397	+ set_ic = true;
	3398	+ else if (!priv->tx_coal_frames)
	3399	+ set_ic = false;
	3400	+ else if (tx_packets > priv->tx_coal_frames)
	3401	+ set_ic = true;
	3402	+ else if ((tx_q->tx_count_frames % priv->tx_coal_frames) < tx_packets)
	3403	+ set_ic = true;
	3404	+ else
	3405	+ set_ic = false;
	3406	+
	3407	+ if (set_ic) {
	3408	+ if (tx_q->tbs & STMMAC_TBS_AVAIL)
	3409	+ desc = &tx_q->dma_entx[tx_q->cur_tx].basic;
	3410	+ else
	3411	+ desc = &tx_q->dma_tx[tx_q->cur_tx];
	3412	+
	3413	+ tx_q->tx_count_frames = 0;
	3414	+ stmmac_set_tx_ic(priv, desc);
	3415	+ priv->xstats.tx_set_ic_bit++;
	3416	+ }
	3417	+
2948	3418	/* We've used all descriptors we need for this skb, however,
2949	3419	* advance cur_tx so that it references a fresh descriptor.
2950	3420	* ndo_start_xmit will fill this descriptor the next time it's
2951	3421	* called and stmmac_tx_clean may clean up to this descriptor.
2952	3422	*/
2953		- tx_q->cur_tx = STMMAC_GET_ENTRY(tx_q->cur_tx, DMA_TX_SIZE);
	3423	+ tx_q->cur_tx = STMMAC_GET_ENTRY(tx_q->cur_tx, priv->dma_tx_size);
2954	3424
2955	3425	if (unlikely(stmmac_tx_avail(priv, queue) <= (MAX_SKB_FRAGS + 1))) {
2956	3426	netif_dbg(priv, hw, priv->dev, "%s: stop transmitted packets\n",
..	..	@@ -2962,18 +3432,8 @@
2962	3432	priv->xstats.tx_tso_frames++;
2963	3433	priv->xstats.tx_tso_nfrags += nfrags;
2964	3434
2965		- /* Manage tx mitigation */
2966		- tx_q->tx_count_frames += nfrags + 1;
2967		- if (likely(priv->tx_coal_frames > tx_q->tx_count_frames) &&
2968		- !(priv->synopsys_id >= DWMAC_CORE_4_00 &&
2969		- (skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP) &&
2970		- priv->hwts_tx_en)) {
2971		- stmmac_tx_timer_arm(priv, queue);
2972		- } else {
2973		- tx_q->tx_count_frames = 0;
2974		- stmmac_set_tx_ic(priv, desc);
2975		- priv->xstats.tx_set_ic_bit++;
2976		- }
	3435	+ if (priv->sarc_type)
	3436	+ stmmac_set_desc_sarc(priv, first, priv->sarc_type);
2977	3437
2978	3438	skb_tx_timestamp(skb);
2979	3439
..	..	@@ -3012,16 +3472,18 @@
3012	3472	pr_info("%s: curr=%d dirty=%d f=%d, e=%d, f_p=%p, nfrags %d\n",
3013	3473	__func__, tx_q->cur_tx, tx_q->dirty_tx, first_entry,
3014	3474	tx_q->cur_tx, first, nfrags);
3015		-
3016		- stmmac_display_ring(priv, (void *)tx_q->dma_tx, DMA_TX_SIZE, 0);
3017		-
3018	3475	pr_info(">>> frame to be transmitted: ");
3019	3476	print_pkt(skb->data, skb_headlen(skb));
3020	3477	}
3021	3478
3022	3479	netdev_tx_sent_queue(netdev_get_tx_queue(dev, queue), skb->len);
3023	3480
3024		- tx_q->tx_tail_addr = tx_q->dma_tx_phy + (tx_q->cur_tx * sizeof(*desc));
	3481	+ if (tx_q->tbs & STMMAC_TBS_AVAIL)
	3482	+ desc_size = sizeof(struct dma_edesc);
	3483	+ else
	3484	+ desc_size = sizeof(struct dma_desc);
	3485	+
	3486	+ tx_q->tx_tail_addr = tx_q->dma_tx_phy + (tx_q->cur_tx * desc_size);
3025	3487	stmmac_set_tx_tail_ptr(priv, priv->ioaddr, tx_q->tx_tail_addr, queue);
3026	3488	stmmac_tx_timer_arm(priv, queue);
3027	3489
..	..	@@ -3044,20 +3506,22 @@
3044	3506	*/
3045	3507	static netdev_tx_t stmmac_xmit(struct sk_buff skb, struct net_device dev)
3046	3508	{
	3509	+ unsigned int first_entry, tx_packets, enh_desc;
3047	3510	struct stmmac_priv *priv = netdev_priv(dev);
3048	3511	unsigned int nopaged_len = skb_headlen(skb);
3049	3512	int i, csum_insertion = 0, is_jumbo = 0;
3050	3513	u32 queue = skb_get_queue_mapping(skb);
3051	3514	int nfrags = skb_shinfo(skb)->nr_frags;
3052	3515	int gso = skb_shinfo(skb)->gso_type;
3053		- int entry;
3054		- unsigned int first_entry;
	3516	+ struct dma_edesc *tbs_desc = NULL;
	3517	+ int entry, desc_size, first_tx;
3055	3518	struct dma_desc desc, first;
3056	3519	struct stmmac_tx_queue *tx_q;
3057		- unsigned int enh_desc;
3058		- unsigned int des;
	3520	+ bool has_vlan, set_ic;
	3521	+ dma_addr_t des;
3059	3522
3060	3523	tx_q = &priv->tx_queue[queue];
	3524	+ first_tx = tx_q->cur_tx;
3061	3525
3062	3526	if (priv->tx_path_in_lpi_mode)
3063	3527	stmmac_disable_eee_mode(priv);
..	..	@@ -3082,6 +3546,9 @@
3082	3546	return NETDEV_TX_BUSY;
3083	3547	}
3084	3548
	3549	+ /* Check if VLAN can be inserted by HW */
	3550	+ has_vlan = stmmac_vlan_insert(priv, skb, tx_q);
	3551	+
3085	3552	entry = tx_q->cur_tx;
3086	3553	first_entry = entry;
3087	3554	WARN_ON(tx_q->tx_skbuff[first_entry]);
..	..	@@ -3090,10 +3557,15 @@
3090	3557
3091	3558	if (likely(priv->extend_desc))
3092	3559	desc = (struct dma_desc *)(tx_q->dma_etx + entry);
	3560	+ else if (tx_q->tbs & STMMAC_TBS_AVAIL)
	3561	+ desc = &tx_q->dma_entx[entry].basic;
3093	3562	else
3094	3563	desc = tx_q->dma_tx + entry;
3095	3564
3096	3565	first = desc;
	3566	+
	3567	+ if (has_vlan)
	3568	+ stmmac_set_desc_vlan(priv, first, STMMAC_VLAN_INSERT);
3097	3569
3098	3570	enh_desc = priv->plat->enh_desc;
3099	3571	/* To program the descriptors according to the size of the frame */
..	..	@@ -3111,11 +3583,13 @@
3111	3583	int len = skb_frag_size(frag);
3112	3584	bool last_segment = (i == (nfrags - 1));
3113	3585
3114		- entry = STMMAC_GET_ENTRY(entry, DMA_TX_SIZE);
	3586	+ entry = STMMAC_GET_ENTRY(entry, priv->dma_tx_size);
3115	3587	WARN_ON(tx_q->tx_skbuff[entry]);
3116	3588
3117	3589	if (likely(priv->extend_desc))
3118	3590	desc = (struct dma_desc *)(tx_q->dma_etx + entry);
	3591	+ else if (tx_q->tbs & STMMAC_TBS_AVAIL)
	3592	+ desc = &tx_q->dma_entx[entry].basic;
3119	3593	else
3120	3594	desc = tx_q->dma_tx + entry;
3121	3595
..	..	@@ -3140,28 +3614,51 @@
3140	3614	/* Only the last descriptor gets to point to the skb. */
3141	3615	tx_q->tx_skbuff[entry] = skb;
3142	3616
	3617	+ /* According to the coalesce parameter the IC bit for the latest
	3618	+ * segment is reset and the timer re-started to clean the tx status.
	3619	+ * This approach takes care about the fragments: desc is the first
	3620	+ * element in case of no SG.
	3621	+ */
	3622	+ tx_packets = (entry + 1) - first_tx;
	3623	+ tx_q->tx_count_frames += tx_packets;
	3624	+
	3625	+ if ((skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP) && priv->hwts_tx_en)
	3626	+ set_ic = true;
	3627	+ else if (!priv->tx_coal_frames)
	3628	+ set_ic = false;
	3629	+ else if (tx_packets > priv->tx_coal_frames)
	3630	+ set_ic = true;
	3631	+ else if ((tx_q->tx_count_frames % priv->tx_coal_frames) < tx_packets)
	3632	+ set_ic = true;
	3633	+ else
	3634	+ set_ic = false;
	3635	+
	3636	+ if (set_ic) {
	3637	+ if (likely(priv->extend_desc))
	3638	+ desc = &tx_q->dma_etx[entry].basic;
	3639	+ else if (tx_q->tbs & STMMAC_TBS_AVAIL)
	3640	+ desc = &tx_q->dma_entx[entry].basic;
	3641	+ else
	3642	+ desc = &tx_q->dma_tx[entry];
	3643	+
	3644	+ tx_q->tx_count_frames = 0;
	3645	+ stmmac_set_tx_ic(priv, desc);
	3646	+ priv->xstats.tx_set_ic_bit++;
	3647	+ }
	3648	+
3143	3649	/* We've used all descriptors we need for this skb, however,
3144	3650	* advance cur_tx so that it references a fresh descriptor.
3145	3651	* ndo_start_xmit will fill this descriptor the next time it's
3146	3652	* called and stmmac_tx_clean may clean up to this descriptor.
3147	3653	*/
3148		- entry = STMMAC_GET_ENTRY(entry, DMA_TX_SIZE);
	3654	+ entry = STMMAC_GET_ENTRY(entry, priv->dma_tx_size);
3149	3655	tx_q->cur_tx = entry;
3150	3656
3151	3657	if (netif_msg_pktdata(priv)) {
3152		- void *tx_head;
3153		-
3154	3658	netdev_dbg(priv->dev,
3155	3659	"%s: curr=%d dirty=%d f=%d, e=%d, first=%p, nfrags=%d",
3156	3660	__func__, tx_q->cur_tx, tx_q->dirty_tx, first_entry,
3157	3661	entry, first, nfrags);
3158		-
3159		- if (priv->extend_desc)
3160		- tx_head = (void *)tx_q->dma_etx;
3161		- else
3162		- tx_head = (void *)tx_q->dma_tx;
3163		-
3164		- stmmac_display_ring(priv, tx_head, DMA_TX_SIZE, false);
3165	3662
3166	3663	netdev_dbg(priv->dev, ">>> frame to be transmitted: ");
3167	3664	print_pkt(skb->data, skb->len);
..	..	@@ -3175,22 +3672,8 @@
3175	3672
3176	3673	dev->stats.tx_bytes += skb->len;
3177	3674
3178		- /* According to the coalesce parameter the IC bit for the latest
3179		- * segment is reset and the timer re-started to clean the tx status.
3180		- * This approach takes care about the fragments: desc is the first
3181		- * element in case of no SG.
3182		- */
3183		- tx_q->tx_count_frames += nfrags + 1;
3184		- if (likely(priv->tx_coal_frames > tx_q->tx_count_frames) &&
3185		- !(priv->synopsys_id >= DWMAC_CORE_4_00 &&
3186		- (skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP) &&
3187		- priv->hwts_tx_en)) {
3188		- stmmac_tx_timer_arm(priv, queue);
3189		- } else {
3190		- tx_q->tx_count_frames = 0;
3191		- stmmac_set_tx_ic(priv, desc);
3192		- priv->xstats.tx_set_ic_bit++;
3193		- }
	3675	+ if (priv->sarc_type)
	3676	+ stmmac_set_desc_sarc(priv, first, priv->sarc_type);
3194	3677
3195	3678	skb_tx_timestamp(skb);
3196	3679
..	..	@@ -3222,11 +3705,18 @@
3222	3705
3223	3706	/* Prepare the first descriptor setting the OWN bit too */
3224	3707	stmmac_prepare_tx_desc(priv, first, 1, nopaged_len,
3225		- csum_insertion, priv->mode, 1, last_segment,
	3708	+ csum_insertion, priv->mode, 0, last_segment,
3226	3709	skb->len);
3227		- } else {
3228		- stmmac_set_tx_owner(priv, first);
3229	3710	}
	3711	+
	3712	+ if (tx_q->tbs & STMMAC_TBS_EN) {
	3713	+ struct timespec64 ts = ns_to_timespec64(skb->tstamp);
	3714	+
	3715	+ tbs_desc = &tx_q->dma_entx[first_entry];
	3716	+ stmmac_set_desc_tbs(priv, tbs_desc, ts.tv_sec, ts.tv_nsec);
	3717	+ }
	3718	+
	3719	+ stmmac_set_tx_owner(priv, first);
3230	3720
3231	3721	/* The own bit must be the latest setting done when prepare the
3232	3722	* descriptor and then barrier is needed to make sure that
..	..	@@ -3238,7 +3728,14 @@
3238	3728
3239	3729	stmmac_enable_dma_transmission(priv, priv->ioaddr);
3240	3730
3241		- tx_q->tx_tail_addr = tx_q->dma_tx_phy + (tx_q->cur_tx * sizeof(*desc));
	3731	+ if (likely(priv->extend_desc))
	3732	+ desc_size = sizeof(struct dma_extended_desc);
	3733	+ else if (tx_q->tbs & STMMAC_TBS_AVAIL)
	3734	+ desc_size = sizeof(struct dma_edesc);
	3735	+ else
	3736	+ desc_size = sizeof(struct dma_desc);
	3737	+
	3738	+ tx_q->tx_tail_addr = tx_q->dma_tx_phy + (tx_q->cur_tx * desc_size);
3242	3739	stmmac_set_tx_tail_ptr(priv, priv->ioaddr, tx_q->tx_tail_addr, queue);
3243	3740	stmmac_tx_timer_arm(priv, queue);
3244	3741
..	..	@@ -3272,15 +3769,6 @@
3272	3769	}
3273	3770	}
3274	3771
3275		-
3276		-static inline int stmmac_rx_threshold_count(struct stmmac_rx_queue *rx_q)
3277		-{
3278		- if (rx_q->rx_zeroc_thresh < STMMAC_RX_THRESH)
3279		- return 0;
3280		-
3281		- return 1;
3282		-}
3283		-
3284	3772	/**
3285	3773	* stmmac_rx_refill - refill used skb preallocated buffers
3286	3774	* @priv: driver private structure
..	..	@@ -3291,63 +3779,115 @@
3291	3779	static inline void stmmac_rx_refill(struct stmmac_priv *priv, u32 queue)
3292	3780	{
3293	3781	struct stmmac_rx_queue *rx_q = &priv->rx_queue[queue];
3294		- int dirty = stmmac_rx_dirty(priv, queue);
	3782	+ int len, dirty = stmmac_rx_dirty(priv, queue);
3295	3783	unsigned int entry = rx_q->dirty_rx;
	3784	+ gfp_t gfp = (GFP_ATOMIC \| __GFP_NOWARN);
3296	3785
3297		- int bfsize = priv->dma_buf_sz;
	3786	+ if (priv->dma_cap.addr64 <= 32)
	3787	+ gfp \|= GFP_DMA32;
	3788	+
	3789	+ len = DIV_ROUND_UP(priv->dma_buf_sz, PAGE_SIZE) * PAGE_SIZE;
3298	3790
3299	3791	while (dirty-- > 0) {
	3792	+ struct stmmac_rx_buffer *buf = &rx_q->buf_pool[entry];
3300	3793	struct dma_desc *p;
	3794	+ bool use_rx_wd;
3301	3795
3302	3796	if (priv->extend_desc)
3303	3797	p = (struct dma_desc *)(rx_q->dma_erx + entry);
3304	3798	else
3305	3799	p = rx_q->dma_rx + entry;
3306	3800
3307		- if (likely(!rx_q->rx_skbuff[entry])) {
3308		- struct sk_buff *skb;
3309		-
3310		- skb = netdev_alloc_skb_ip_align(priv->dev, bfsize);
3311		- if (unlikely(!skb)) {
3312		- /* so for a while no zero-copy! */
3313		- rx_q->rx_zeroc_thresh = STMMAC_RX_THRESH;
3314		- if (unlikely(net_ratelimit()))
3315		- dev_err(priv->device,
3316		- "fail to alloc skb entry %d\n",
3317		- entry);
	3801	+ if (!buf->page) {
	3802	+ buf->page = page_pool_alloc_pages(rx_q->page_pool, gfp);
	3803	+ if (!buf->page)
3318	3804	break;
3319		- }
3320		-
3321		- rx_q->rx_skbuff[entry] = skb;
3322		- rx_q->rx_skbuff_dma[entry] =
3323		- dma_map_single(priv->device, skb->data, bfsize,
3324		- DMA_FROM_DEVICE);
3325		- if (dma_mapping_error(priv->device,
3326		- rx_q->rx_skbuff_dma[entry])) {
3327		- netdev_err(priv->dev, "Rx DMA map failed\n");
3328		- dev_kfree_skb(skb);
3329		- break;
3330		- }
3331		-
3332		- stmmac_set_desc_addr(priv, p, rx_q->rx_skbuff_dma[entry]);
3333		- stmmac_refill_desc3(priv, rx_q, p);
3334		-
3335		- if (rx_q->rx_zeroc_thresh > 0)
3336		- rx_q->rx_zeroc_thresh--;
3337		-
3338		- netif_dbg(priv, rx_status, priv->dev,
3339		- "refill entry #%d\n", entry);
3340	3805	}
3341		- dma_wmb();
3342	3806
3343		- stmmac_set_rx_owner(priv, p, priv->use_riwt);
	3807	+ if (priv->sph && !buf->sec_page) {
	3808	+ buf->sec_page = page_pool_alloc_pages(rx_q->page_pool, gfp);
	3809	+ if (!buf->sec_page)
	3810	+ break;
	3811	+
	3812	+ buf->sec_addr = page_pool_get_dma_addr(buf->sec_page);
	3813	+ }
	3814	+
	3815	+ buf->addr = page_pool_get_dma_addr(buf->page);
	3816	+ stmmac_set_desc_addr(priv, p, buf->addr);
	3817	+ if (priv->sph)
	3818	+ stmmac_set_desc_sec_addr(priv, p, buf->sec_addr, true);
	3819	+ else
	3820	+ stmmac_set_desc_sec_addr(priv, p, buf->sec_addr, false);
	3821	+ stmmac_refill_desc3(priv, rx_q, p);
	3822	+
	3823	+ rx_q->rx_count_frames++;
	3824	+ rx_q->rx_count_frames += priv->rx_coal_frames;
	3825	+ if (rx_q->rx_count_frames > priv->rx_coal_frames)
	3826	+ rx_q->rx_count_frames = 0;
	3827	+
	3828	+ use_rx_wd = !priv->rx_coal_frames;
	3829	+ use_rx_wd \|= rx_q->rx_count_frames > 0;
	3830	+ if (!priv->use_riwt)
	3831	+ use_rx_wd = false;
3344	3832
3345	3833	dma_wmb();
	3834	+ stmmac_set_rx_owner(priv, p, use_rx_wd);
3346	3835
3347		- entry = STMMAC_GET_ENTRY(entry, DMA_RX_SIZE);
	3836	+ entry = STMMAC_GET_ENTRY(entry, priv->dma_rx_size);
3348	3837	}
3349	3838	rx_q->dirty_rx = entry;
	3839	+ rx_q->rx_tail_addr = rx_q->dma_rx_phy +
	3840	+ (rx_q->dirty_rx * sizeof(struct dma_desc));
3350	3841	stmmac_set_rx_tail_ptr(priv, priv->ioaddr, rx_q->rx_tail_addr, queue);
	3842	+}
	3843	+
	3844	+static unsigned int stmmac_rx_buf1_len(struct stmmac_priv *priv,
	3845	+ struct dma_desc *p,
	3846	+ int status, unsigned int len)
	3847	+{
	3848	+ unsigned int plen = 0, hlen = 0;
	3849	+ int coe = priv->hw->rx_csum;
	3850	+
	3851	+ /* Not first descriptor, buffer is always zero */
	3852	+ if (priv->sph && len)
	3853	+ return 0;
	3854	+
	3855	+ /* First descriptor, get split header length */
	3856	+ stmmac_get_rx_header_len(priv, p, &hlen);
	3857	+ if (priv->sph && hlen) {
	3858	+ priv->xstats.rx_split_hdr_pkt_n++;
	3859	+ return hlen;
	3860	+ }
	3861	+
	3862	+ /* First descriptor, not last descriptor and not split header */
	3863	+ if (status & rx_not_ls)
	3864	+ return priv->dma_buf_sz;
	3865	+
	3866	+ plen = stmmac_get_rx_frame_len(priv, p, coe);
	3867	+
	3868	+ /* First descriptor and last descriptor and not split header */
	3869	+ return min_t(unsigned int, priv->dma_buf_sz, plen);
	3870	+}
	3871	+
	3872	+static unsigned int stmmac_rx_buf2_len(struct stmmac_priv *priv,
	3873	+ struct dma_desc *p,
	3874	+ int status, unsigned int len)
	3875	+{
	3876	+ int coe = priv->hw->rx_csum;
	3877	+ unsigned int plen = 0;
	3878	+
	3879	+ /* Not split header, buffer is not available */
	3880	+ if (!priv->sph)
	3881	+ return 0;
	3882	+
	3883	+ /* Not last descriptor */
	3884	+ if (status & rx_not_ls)
	3885	+ return priv->dma_buf_sz;
	3886	+
	3887	+ plen = stmmac_get_rx_frame_len(priv, p, coe);
	3888	+
	3889	+ /* Last descriptor */
	3890	+ return plen - len;
3351	3891	}
3352	3892
3353	3893	/**
..	..	@@ -3362,30 +3902,54 @@
3362	3902	{
3363	3903	struct stmmac_rx_queue *rx_q = &priv->rx_queue[queue];
3364	3904	struct stmmac_channel *ch = &priv->channel[queue];
	3905	+ unsigned int count = 0, error = 0, len = 0;
	3906	+ int status = 0, coe = priv->hw->rx_csum;
3365	3907	unsigned int next_entry = rx_q->cur_rx;
3366		- int coe = priv->hw->rx_csum;
3367		- unsigned int count = 0;
3368		- bool xmac;
3369		-
3370		- xmac = priv->plat->has_gmac4 \|\| priv->plat->has_xgmac;
	3908	+ unsigned int desc_size;
	3909	+ struct sk_buff *skb = NULL;
3371	3910
3372	3911	if (netif_msg_rx_status(priv)) {
3373	3912	void *rx_head;
3374	3913
3375	3914	netdev_dbg(priv->dev, "%s: descriptor ring:\n", __func__);
3376		- if (priv->extend_desc)
	3915	+ if (priv->extend_desc) {
3377	3916	rx_head = (void *)rx_q->dma_erx;
3378		- else
	3917	+ desc_size = sizeof(struct dma_extended_desc);
	3918	+ } else {
3379	3919	rx_head = (void *)rx_q->dma_rx;
	3920	+ desc_size = sizeof(struct dma_desc);
	3921	+ }
3380	3922
3381		- stmmac_display_ring(priv, rx_head, DMA_RX_SIZE, true);
	3923	+ stmmac_display_ring(priv, rx_head, priv->dma_rx_size, true,
	3924	+ rx_q->dma_rx_phy, desc_size);
3382	3925	}
3383	3926	while (count < limit) {
3384		- int entry, status;
3385		- struct dma_desc *p;
3386		- struct dma_desc *np;
	3927	+ unsigned int buf1_len = 0, buf2_len = 0;
	3928	+ enum pkt_hash_types hash_type;
	3929	+ struct stmmac_rx_buffer *buf;
	3930	+ struct dma_desc np, p;
	3931	+ int entry;
	3932	+ u32 hash;
3387	3933
	3934	+ if (!count && rx_q->state_saved) {
	3935	+ skb = rx_q->state.skb;
	3936	+ error = rx_q->state.error;
	3937	+ len = rx_q->state.len;
	3938	+ } else {
	3939	+ rx_q->state_saved = false;
	3940	+ skb = NULL;
	3941	+ error = 0;
	3942	+ len = 0;
	3943	+ }
	3944	+
	3945	+ if ((count >= limit - 1) && limit > 1)
	3946	+ break;
	3947	+
	3948	+read_again:
	3949	+ buf1_len = 0;
	3950	+ buf2_len = 0;
3388	3951	entry = next_entry;
	3952	+ buf = &rx_q->buf_pool[entry];
3389	3953
3390	3954	if (priv->extend_desc)
3391	3955	p = (struct dma_desc *)(rx_q->dma_erx + entry);
..	..	@@ -3399,9 +3963,8 @@
3399	3963	if (unlikely(status & dma_own))
3400	3964	break;
3401	3965
3402		- count++;
3403		-
3404		- rx_q->cur_rx = STMMAC_GET_ENTRY(rx_q->cur_rx, DMA_RX_SIZE);
	3966	+ rx_q->cur_rx = STMMAC_GET_ENTRY(rx_q->cur_rx,
	3967	+ priv->dma_rx_size);
3405	3968	next_entry = rx_q->cur_rx;
3406	3969
3407	3970	if (priv->extend_desc)
..	..	@@ -3415,133 +3978,126 @@
3415	3978	stmmac_rx_extended_status(priv, &priv->dev->stats,
3416	3979	&priv->xstats, rx_q->dma_erx + entry);
3417	3980	if (unlikely(status == discard_frame)) {
3418		- priv->dev->stats.rx_errors++;
3419		- if (priv->hwts_rx_en && !priv->extend_desc) {
3420		- /* DESC2 & DESC3 will be overwritten by device
3421		- * with timestamp value, hence reinitialize
3422		- * them in stmmac_rx_refill() function so that
3423		- * device can reuse it.
3424		- */
3425		- dev_kfree_skb_any(rx_q->rx_skbuff[entry]);
3426		- rx_q->rx_skbuff[entry] = NULL;
3427		- dma_unmap_single(priv->device,
3428		- rx_q->rx_skbuff_dma[entry],
3429		- priv->dma_buf_sz,
3430		- DMA_FROM_DEVICE);
3431		- }
3432		- } else {
3433		- struct sk_buff *skb;
3434		- int frame_len;
3435		- unsigned int des;
3436		-
3437		- stmmac_get_desc_addr(priv, p, &des);
3438		- frame_len = stmmac_get_rx_frame_len(priv, p, coe);
3439		-
3440		- /* If frame length is greater than skb buffer size
3441		- * (preallocated during init) then the packet is
3442		- * ignored
3443		- */
3444		- if (frame_len > priv->dma_buf_sz) {
3445		- if (net_ratelimit())
3446		- netdev_err(priv->dev,
3447		- "len %d larger than size (%d)\n",
3448		- frame_len, priv->dma_buf_sz);
3449		- priv->dev->stats.rx_length_errors++;
3450		- continue;
3451		- }
3452		-
3453		- /* ACS is set; GMAC core strips PAD/FCS for IEEE 802.3
3454		- * Type frames (LLC/LLC-SNAP)
3455		- *
3456		- * llc_snap is never checked in GMAC >= 4, so this ACS
3457		- * feature is always disabled and packets need to be
3458		- * stripped manually.
3459		- */
3460		- if (unlikely(priv->synopsys_id >= DWMAC_CORE_4_00) \|\|
3461		- unlikely(status != llc_snap))
3462		- frame_len -= ETH_FCS_LEN;
3463		-
3464		- if (netif_msg_rx_status(priv)) {
3465		- netdev_dbg(priv->dev, "\tdesc: %p [entry %d] buff=0x%x\n",
3466		- p, entry, des);
3467		- netdev_dbg(priv->dev, "frame size %d, COE: %d\n",
3468		- frame_len, status);
3469		- }
3470		-
3471		- /* The zero-copy is always used for all the sizes
3472		- * in case of GMAC4 because it needs
3473		- * to refill the used descriptors, always.
3474		- */
3475		- if (unlikely(!xmac &&
3476		- ((frame_len < priv->rx_copybreak) \|\|
3477		- stmmac_rx_threshold_count(rx_q)))) {
3478		- skb = netdev_alloc_skb_ip_align(priv->dev,
3479		- frame_len);
3480		- if (unlikely(!skb)) {
3481		- if (net_ratelimit())
3482		- dev_warn(priv->device,
3483		- "packet dropped\n");
3484		- priv->dev->stats.rx_dropped++;
3485		- continue;
3486		- }
3487		-
3488		- dma_sync_single_for_cpu(priv->device,
3489		- rx_q->rx_skbuff_dma
3490		- [entry], frame_len,
3491		- DMA_FROM_DEVICE);
3492		- skb_copy_to_linear_data(skb,
3493		- rx_q->
3494		- rx_skbuff[entry]->data,
3495		- frame_len);
3496		-
3497		- skb_put(skb, frame_len);
3498		- dma_sync_single_for_device(priv->device,
3499		- rx_q->rx_skbuff_dma
3500		- [entry], frame_len,
3501		- DMA_FROM_DEVICE);
3502		- } else {
3503		- skb = rx_q->rx_skbuff[entry];
3504		- if (unlikely(!skb)) {
3505		- if (net_ratelimit())
3506		- netdev_err(priv->dev,
3507		- "%s: Inconsistent Rx chain\n",
3508		- priv->dev->name);
3509		- priv->dev->stats.rx_dropped++;
3510		- continue;
3511		- }
3512		- prefetch(skb->data - NET_IP_ALIGN);
3513		- rx_q->rx_skbuff[entry] = NULL;
3514		- rx_q->rx_zeroc_thresh++;
3515		-
3516		- skb_put(skb, frame_len);
3517		- dma_unmap_single(priv->device,
3518		- rx_q->rx_skbuff_dma[entry],
3519		- priv->dma_buf_sz,
3520		- DMA_FROM_DEVICE);
3521		- }
3522		-
3523		- if (netif_msg_pktdata(priv)) {
3524		- netdev_dbg(priv->dev, "frame received (%dbytes)",
3525		- frame_len);
3526		- print_pkt(skb->data, frame_len);
3527		- }
3528		-
3529		- stmmac_get_rx_hwtstamp(priv, p, np, skb);
3530		-
3531		- stmmac_rx_vlan(priv->dev, skb);
3532		-
3533		- skb->protocol = eth_type_trans(skb, priv->dev);
3534		-
3535		- if (unlikely(!coe))
3536		- skb_checksum_none_assert(skb);
3537		- else
3538		- skb->ip_summed = CHECKSUM_UNNECESSARY;
3539		-
3540		- napi_gro_receive(&ch->napi, skb);
3541		-
3542		- priv->dev->stats.rx_packets++;
3543		- priv->dev->stats.rx_bytes += frame_len;
	3981	+ page_pool_recycle_direct(rx_q->page_pool, buf->page);
	3982	+ buf->page = NULL;
	3983	+ error = 1;
	3984	+ if (!priv->hwts_rx_en)
	3985	+ priv->dev->stats.rx_errors++;
3544	3986	}
	3987	+
	3988	+ if (unlikely(error && (status & rx_not_ls)))
	3989	+ goto read_again;
	3990	+ if (unlikely(error)) {
	3991	+ dev_kfree_skb(skb);
	3992	+ skb = NULL;
	3993	+ count++;
	3994	+ continue;
	3995	+ }
	3996	+
	3997	+ /* Buffer is good. Go on. */
	3998	+
	3999	+ prefetch(page_address(buf->page));
	4000	+ if (buf->sec_page)
	4001	+ prefetch(page_address(buf->sec_page));
	4002	+
	4003	+ buf1_len = stmmac_rx_buf1_len(priv, p, status, len);
	4004	+ len += buf1_len;
	4005	+ buf2_len = stmmac_rx_buf2_len(priv, p, status, len);
	4006	+ len += buf2_len;
	4007	+
	4008	+ /* ACS is set; GMAC core strips PAD/FCS for IEEE 802.3
	4009	+ * Type frames (LLC/LLC-SNAP)
	4010	+ *
	4011	+ * llc_snap is never checked in GMAC >= 4, so this ACS
	4012	+ * feature is always disabled and packets need to be
	4013	+ * stripped manually.
	4014	+ */
	4015	+ if (likely(!(status & rx_not_ls)) &&
	4016	+ (likely(priv->synopsys_id >= DWMAC_CORE_4_00) \|\|
	4017	+ unlikely(status != llc_snap))) {
	4018	+ if (buf2_len)
	4019	+ buf2_len -= ETH_FCS_LEN;
	4020	+ else
	4021	+ buf1_len -= ETH_FCS_LEN;
	4022	+
	4023	+ len -= ETH_FCS_LEN;
	4024	+ }
	4025	+
	4026	+ if (!skb) {
	4027	+ skb = napi_alloc_skb(&ch->rx_napi, buf1_len);
	4028	+ if (!skb) {
	4029	+ priv->dev->stats.rx_dropped++;
	4030	+ count++;
	4031	+ goto drain_data;
	4032	+ }
	4033	+
	4034	+ dma_sync_single_for_cpu(priv->device, buf->addr,
	4035	+ buf1_len, DMA_FROM_DEVICE);
	4036	+ skb_copy_to_linear_data(skb, page_address(buf->page),
	4037	+ buf1_len);
	4038	+ skb_put(skb, buf1_len);
	4039	+
	4040	+ /* Data payload copied into SKB, page ready for recycle */
	4041	+ page_pool_recycle_direct(rx_q->page_pool, buf->page);
	4042	+ buf->page = NULL;
	4043	+ } else if (buf1_len) {
	4044	+ dma_sync_single_for_cpu(priv->device, buf->addr,
	4045	+ buf1_len, DMA_FROM_DEVICE);
	4046	+ skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags,
	4047	+ buf->page, 0, buf1_len,
	4048	+ priv->dma_buf_sz);
	4049	+
	4050	+ /* Data payload appended into SKB */
	4051	+ page_pool_release_page(rx_q->page_pool, buf->page);
	4052	+ buf->page = NULL;
	4053	+ }
	4054	+
	4055	+ if (buf2_len) {
	4056	+ dma_sync_single_for_cpu(priv->device, buf->sec_addr,
	4057	+ buf2_len, DMA_FROM_DEVICE);
	4058	+ skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags,
	4059	+ buf->sec_page, 0, buf2_len,
	4060	+ priv->dma_buf_sz);
	4061	+
	4062	+ /* Data payload appended into SKB */
	4063	+ page_pool_release_page(rx_q->page_pool, buf->sec_page);
	4064	+ buf->sec_page = NULL;
	4065	+ }
	4066	+
	4067	+drain_data:
	4068	+ if (likely(status & rx_not_ls))
	4069	+ goto read_again;
	4070	+ if (!skb)
	4071	+ continue;
	4072	+
	4073	+ /* Got entire packet into SKB. Finish it. */
	4074	+
	4075	+ stmmac_get_rx_hwtstamp(priv, p, np, skb);
	4076	+ stmmac_rx_vlan(priv->dev, skb);
	4077	+ skb->protocol = eth_type_trans(skb, priv->dev);
	4078	+
	4079	+ if (unlikely(!coe))
	4080	+ skb_checksum_none_assert(skb);
	4081	+ else
	4082	+ skb->ip_summed = CHECKSUM_UNNECESSARY;
	4083	+
	4084	+ if (!stmmac_get_rx_hash(priv, p, &hash, &hash_type))
	4085	+ skb_set_hash(skb, hash, hash_type);
	4086	+
	4087	+ skb_record_rx_queue(skb, queue);
	4088	+ napi_gro_receive(&ch->rx_napi, skb);
	4089	+ skb = NULL;
	4090	+
	4091	+ priv->dev->stats.rx_packets++;
	4092	+ priv->dev->stats.rx_bytes += len;
	4093	+ count++;
	4094	+ }
	4095	+
	4096	+ if (status & rx_not_ls \|\| skb) {
	4097	+ rx_q->state_saved = true;
	4098	+ rx_q->state.skb = skb;
	4099	+ rx_q->state.error = error;
	4100	+ rx_q->state.len = len;
3545	4101	}
3546	4102
3547	4103	stmmac_rx_refill(priv, queue);
..	..	@@ -3551,40 +4107,47 @@
3551	4107	return count;
3552	4108	}
3553	4109
3554		-/**
3555		- * stmmac_poll - stmmac poll method (NAPI)
3556		- * @napi : pointer to the napi structure.
3557		- * @budget : maximum number of packets that the current CPU can receive from
3558		- * all interfaces.
3559		- * Description :
3560		- * To look at the incoming frames and clear the tx resources.
3561		- */
3562		-static int stmmac_napi_poll(struct napi_struct *napi, int budget)
	4110	+static int stmmac_napi_poll_rx(struct napi_struct *napi, int budget)
3563	4111	{
3564	4112	struct stmmac_channel *ch =
3565		- container_of(napi, struct stmmac_channel, napi);
	4113	+ container_of(napi, struct stmmac_channel, rx_napi);
3566	4114	struct stmmac_priv *priv = ch->priv_data;
3567		- int work_done, rx_done = 0, tx_done = 0;
3568	4115	u32 chan = ch->index;
	4116	+ int work_done;
3569	4117
3570	4118	priv->xstats.napi_poll++;
3571	4119
3572		- if (ch->has_tx)
3573		- tx_done = stmmac_tx_clean(priv, budget, chan);
3574		- if (ch->has_rx)
3575		- rx_done = stmmac_rx(priv, budget, chan);
	4120	+ work_done = stmmac_rx(priv, budget, chan);
	4121	+ if (work_done < budget && napi_complete_done(napi, work_done)) {
	4122	+ unsigned long flags;
3576	4123
3577		- work_done = max(rx_done, tx_done);
	4124	+ spin_lock_irqsave(&ch->lock, flags);
	4125	+ stmmac_enable_dma_irq(priv, priv->ioaddr, chan, 1, 0);
	4126	+ spin_unlock_irqrestore(&ch->lock, flags);
	4127	+ }
	4128	+
	4129	+ return work_done;
	4130	+}
	4131	+
	4132	+static int stmmac_napi_poll_tx(struct napi_struct *napi, int budget)
	4133	+{
	4134	+ struct stmmac_channel *ch =
	4135	+ container_of(napi, struct stmmac_channel, tx_napi);
	4136	+ struct stmmac_priv *priv = ch->priv_data;
	4137	+ u32 chan = ch->index;
	4138	+ int work_done;
	4139	+
	4140	+ priv->xstats.napi_poll++;
	4141	+
	4142	+ work_done = stmmac_tx_clean(priv, priv->dma_tx_size, chan);
3578	4143	work_done = min(work_done, budget);
3579	4144
3580	4145	if (work_done < budget && napi_complete_done(napi, work_done)) {
3581		- int stat;
	4146	+ unsigned long flags;
3582	4147
3583		- stmmac_enable_dma_irq(priv, priv->ioaddr, chan);
3584		- stat = stmmac_dma_interrupt_status(priv, priv->ioaddr,
3585		- &priv->xstats, chan);
3586		- if (stat && napi_reschedule(napi))
3587		- stmmac_disable_dma_irq(priv, priv->ioaddr, chan);
	4148	+ spin_lock_irqsave(&ch->lock, flags);
	4149	+ stmmac_enable_dma_irq(priv, priv->ioaddr, chan, 0, 1);
	4150	+ spin_unlock_irqrestore(&ch->lock, flags);
3588	4151	}
3589	4152
3590	4153	return work_done;
..	..	@@ -3593,12 +4156,13 @@
3593	4156	/**
3594	4157	* stmmac_tx_timeout
3595	4158	* @dev : Pointer to net device structure
	4159	+ * @txqueue: the index of the hanging transmit queue
3596	4160	* Description: this function is called when a packet transmission fails to
3597	4161	* complete within a reasonable time. The driver will mark the error in the
3598	4162	* netdev structure and arrange for the device to be reset to a sane state
3599	4163	* in order to transmit a new packet.
3600	4164	*/
3601		-static void stmmac_tx_timeout(struct net_device *dev)
	4165	+static void stmmac_tx_timeout(struct net_device *dev, unsigned int txqueue)
3602	4166	{
3603	4167	struct stmmac_priv *priv = netdev_priv(dev);
3604	4168
..	..	@@ -3695,6 +4259,8 @@
3695	4259	netdev_features_t features)
3696	4260	{
3697	4261	struct stmmac_priv *priv = netdev_priv(netdev);
	4262	+ bool sph_en;
	4263	+ u32 chan;
3698	4264
3699	4265	/* Keep the COE Type in case of csum is supporting */
3700	4266	if (features & NETIF_F_RXCSUM)
..	..	@@ -3705,6 +4271,10 @@
3705	4271	* fixed in case of issue.
3706	4272	*/
3707	4273	stmmac_rx_ipc(priv, priv->hw);
	4274	+
	4275	+ sph_en = (priv->hw->rx_csum > 0) && priv->sph;
	4276	+ for (chan = 0; chan < priv->plat->rx_queues_to_use; chan++)
	4277	+ stmmac_enable_sph(priv, priv->ioaddr, sph_en, chan);
3708	4278
3709	4279	return 0;
3710	4280	}
..	..	@@ -3798,6 +4368,7 @@
3798	4368	*/
3799	4369	static int stmmac_ioctl(struct net_device dev, struct ifreq rq, int cmd)
3800	4370	{
	4371	+ struct stmmac_priv *priv = netdev_priv (dev);
3801	4372	int ret = -EOPNOTSUPP;
3802	4373
3803	4374	if (!netif_running(dev))
..	..	@@ -3807,18 +4378,14 @@
3807	4378	case SIOCGMIIPHY:
3808	4379	case SIOCGMIIREG:
3809	4380	case SIOCSMIIREG:
3810		- if (!dev->phydev)
3811		- return -EINVAL;
3812		- ret = phy_mii_ioctl(dev->phydev, rq, cmd);
	4381	+ ret = phylink_mii_ioctl(priv->phylink, rq, cmd);
3813	4382	break;
3814		-#ifdef CONFIG_STMMAC_PTP
3815	4383	case SIOCSHWTSTAMP:
3816	4384	ret = stmmac_hwtstamp_set(dev, rq);
3817	4385	break;
3818	4386	case SIOCGHWTSTAMP:
3819	4387	ret = stmmac_hwtstamp_get(dev, rq);
3820	4388	break;
3821		-#endif
3822	4389	default:
3823	4390	break;
3824	4391	}
..	..	@@ -3832,12 +4399,17 @@
3832	4399	struct stmmac_priv *priv = cb_priv;
3833	4400	int ret = -EOPNOTSUPP;
3834	4401
	4402	+ if (!tc_cls_can_offload_and_chain0(priv->dev, type_data))
	4403	+ return ret;
	4404	+
3835	4405	stmmac_disable_all_queues(priv);
3836	4406
3837	4407	switch (type) {
3838	4408	case TC_SETUP_CLSU32:
3839		- if (tc_cls_can_offload_and_chain0(priv->dev, type_data))
3840		- ret = stmmac_tc_setup_cls_u32(priv, priv, type_data);
	4409	+ ret = stmmac_tc_setup_cls_u32(priv, priv, type_data);
	4410	+ break;
	4411	+ case TC_SETUP_CLSFLOWER:
	4412	+ ret = stmmac_tc_setup_cls(priv, priv, type_data);
3841	4413	break;
3842	4414	default:
3843	4415	break;
..	..	@@ -3847,23 +4419,7 @@
3847	4419	return ret;
3848	4420	}
3849	4421
3850		-static int stmmac_setup_tc_block(struct stmmac_priv *priv,
3851		- struct tc_block_offload *f)
3852		-{
3853		- if (f->binder_type != TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS)
3854		- return -EOPNOTSUPP;
3855		-
3856		- switch (f->command) {
3857		- case TC_BLOCK_BIND:
3858		- return tcf_block_cb_register(f->block, stmmac_setup_tc_block_cb,
3859		- priv, priv, f->extack);
3860		- case TC_BLOCK_UNBIND:
3861		- tcf_block_cb_unregister(f->block, stmmac_setup_tc_block_cb, priv);
3862		- return 0;
3863		- default:
3864		- return -EOPNOTSUPP;
3865		- }
3866		-}
	4422	+static LIST_HEAD(stmmac_block_cb_list);
3867	4423
3868	4424	static int stmmac_setup_tc(struct net_device *ndev, enum tc_setup_type type,
3869	4425	void *type_data)
..	..	@@ -3872,17 +4428,23 @@
3872	4428
3873	4429	switch (type) {
3874	4430	case TC_SETUP_BLOCK:
3875		- return stmmac_setup_tc_block(priv, type_data);
	4431	+ return flow_block_cb_setup_simple(type_data,
	4432	+ &stmmac_block_cb_list,
	4433	+ stmmac_setup_tc_block_cb,
	4434	+ priv, priv, true);
3876	4435	case TC_SETUP_QDISC_CBS:
3877	4436	return stmmac_tc_setup_cbs(priv, priv, type_data);
	4437	+ case TC_SETUP_QDISC_TAPRIO:
	4438	+ return stmmac_tc_setup_taprio(priv, priv, type_data);
	4439	+ case TC_SETUP_QDISC_ETF:
	4440	+ return stmmac_tc_setup_etf(priv, priv, type_data);
3878	4441	default:
3879	4442	return -EOPNOTSUPP;
3880	4443	}
3881	4444	}
3882	4445
3883	4446	static u16 stmmac_select_queue(struct net_device dev, struct sk_buff skb,
3884		- struct net_device *sb_dev,
3885		- select_queue_fallback_t fallback)
	4447	+ struct net_device *sb_dev)
3886	4448	{
3887	4449	int gso = skb_shinfo(skb)->gso_type;
3888	4450
..	..	@@ -3896,7 +4458,7 @@
3896	4458	return 0;
3897	4459	}
3898	4460
3899		- return fallback(dev, skb, NULL) % dev->real_num_tx_queues;
	4461	+ return netdev_pick_tx(dev, skb, NULL) % dev->real_num_tx_queues;
3900	4462	}
3901	4463
3902	4464	static int stmmac_set_mac_address(struct net_device ndev, void addr)
..	..	@@ -3904,11 +4466,20 @@
3904	4466	struct stmmac_priv *priv = netdev_priv(ndev);
3905	4467	int ret = 0;
3906	4468
	4469	+ ret = pm_runtime_get_sync(priv->device);
	4470	+ if (ret < 0) {
	4471	+ pm_runtime_put_noidle(priv->device);
	4472	+ return ret;
	4473	+ }
	4474	+
3907	4475	ret = eth_mac_addr(ndev, addr);
3908	4476	if (ret)
3909		- return ret;
	4477	+ goto set_mac_error;
3910	4478
3911	4479	stmmac_set_umac_addr(priv, priv->hw, ndev->dev_addr, 0);
	4480	+
	4481	+set_mac_error:
	4482	+ pm_runtime_put(priv->device);
3912	4483
3913	4484	return ret;
3914	4485	}
..	..	@@ -3917,24 +4488,27 @@
3917	4488	static struct dentry *stmmac_fs_dir;
3918	4489
3919	4490	static void sysfs_display_ring(void *head, int size, int extend_desc,
3920		- struct seq_file *seq)
	4491	+ struct seq_file *seq, dma_addr_t dma_phy_addr)
3921	4492	{
3922	4493	int i;
3923	4494	struct dma_extended_desc ep = (struct dma_extended_desc )head;
3924	4495	struct dma_desc p = (struct dma_desc )head;
	4496	+ dma_addr_t dma_addr;
3925	4497
3926	4498	for (i = 0; i < size; i++) {
3927	4499	if (extend_desc) {
3928		- seq_printf(seq, "%d [0x%x]: 0x%x 0x%x 0x%x 0x%x\n",
3929		- i, (unsigned int)virt_to_phys(ep),
	4500	+ dma_addr = dma_phy_addr + i * sizeof(*ep);
	4501	+ seq_printf(seq, "%d [%pad]: 0x%x 0x%x 0x%x 0x%x\n",
	4502	+ i, &dma_addr,
3930	4503	le32_to_cpu(ep->basic.des0),
3931	4504	le32_to_cpu(ep->basic.des1),
3932	4505	le32_to_cpu(ep->basic.des2),
3933	4506	le32_to_cpu(ep->basic.des3));
3934	4507	ep++;
3935	4508	} else {
3936		- seq_printf(seq, "%d [0x%x]: 0x%x 0x%x 0x%x 0x%x\n",
3937		- i, (unsigned int)virt_to_phys(p),
	4509	+ dma_addr = dma_phy_addr + i * sizeof(*p);
	4510	+ seq_printf(seq, "%d [%pad]: 0x%x 0x%x 0x%x 0x%x\n",
	4511	+ i, &dma_addr,
3938	4512	le32_to_cpu(p->des0), le32_to_cpu(p->des1),
3939	4513	le32_to_cpu(p->des2), le32_to_cpu(p->des3));
3940	4514	p++;
..	..	@@ -3943,7 +4517,7 @@
3943	4517	}
3944	4518	}
3945	4519
3946		-static int stmmac_sysfs_ring_read(struct seq_file seq, void v)
	4520	+static int stmmac_rings_status_show(struct seq_file seq, void v)
3947	4521	{
3948	4522	struct net_device *dev = seq->private;
3949	4523	struct stmmac_priv *priv = netdev_priv(dev);
..	..	@@ -3962,11 +4536,11 @@
3962	4536	if (priv->extend_desc) {
3963	4537	seq_printf(seq, "Extended descriptor ring:\n");
3964	4538	sysfs_display_ring((void *)rx_q->dma_erx,
3965		- DMA_RX_SIZE, 1, seq);
	4539	+ priv->dma_rx_size, 1, seq, rx_q->dma_rx_phy);
3966	4540	} else {
3967	4541	seq_printf(seq, "Descriptor ring:\n");
3968	4542	sysfs_display_ring((void *)rx_q->dma_rx,
3969		- DMA_RX_SIZE, 0, seq);
	4543	+ priv->dma_rx_size, 0, seq, rx_q->dma_rx_phy);
3970	4544	}
3971	4545	}
3972	4546
..	..	@@ -3978,33 +4552,19 @@
3978	4552	if (priv->extend_desc) {
3979	4553	seq_printf(seq, "Extended descriptor ring:\n");
3980	4554	sysfs_display_ring((void *)tx_q->dma_etx,
3981		- DMA_TX_SIZE, 1, seq);
3982		- } else {
	4555	+ priv->dma_tx_size, 1, seq, tx_q->dma_tx_phy);
	4556	+ } else if (!(tx_q->tbs & STMMAC_TBS_AVAIL)) {
3983	4557	seq_printf(seq, "Descriptor ring:\n");
3984	4558	sysfs_display_ring((void *)tx_q->dma_tx,
3985		- DMA_TX_SIZE, 0, seq);
	4559	+ priv->dma_tx_size, 0, seq, tx_q->dma_tx_phy);
3986	4560	}
3987	4561	}
3988	4562
3989	4563	return 0;
3990	4564	}
	4565	+DEFINE_SHOW_ATTRIBUTE(stmmac_rings_status);
3991	4566
3992		-static int stmmac_sysfs_ring_open(struct inode inode, struct file file)
3993		-{
3994		- return single_open(file, stmmac_sysfs_ring_read, inode->i_private);
3995		-}
3996		-
3997		-/* Debugfs files, should appear in /sys/kernel/debug/stmmaceth/eth0 */
3998		-
3999		-static const struct file_operations stmmac_rings_status_fops = {
4000		- .owner = THIS_MODULE,
4001		- .open = stmmac_sysfs_ring_open,
4002		- .read = seq_read,
4003		- .llseek = seq_lseek,
4004		- .release = single_release,
4005		-};
4006		-
4007		-static int stmmac_sysfs_dma_cap_read(struct seq_file seq, void v)
	4567	+static int stmmac_dma_cap_show(struct seq_file seq, void v)
4008	4568	{
4009	4569	struct net_device *dev = seq->private;
4010	4570	struct stmmac_priv *priv = netdev_priv(dev);
..	..	@@ -4062,64 +4622,94 @@
4062	4622	priv->dma_cap.number_rx_channel);
4063	4623	seq_printf(seq, "\tNumber of Additional TX channel: %d\n",
4064	4624	priv->dma_cap.number_tx_channel);
	4625	+ seq_printf(seq, "\tNumber of Additional RX queues: %d\n",
	4626	+ priv->dma_cap.number_rx_queues);
	4627	+ seq_printf(seq, "\tNumber of Additional TX queues: %d\n",
	4628	+ priv->dma_cap.number_tx_queues);
4065	4629	seq_printf(seq, "\tEnhanced descriptors: %s\n",
4066	4630	(priv->dma_cap.enh_desc) ? "Y" : "N");
4067		-
	4631	+ seq_printf(seq, "\tTX Fifo Size: %d\n", priv->dma_cap.tx_fifo_size);
	4632	+ seq_printf(seq, "\tRX Fifo Size: %d\n", priv->dma_cap.rx_fifo_size);
	4633	+ seq_printf(seq, "\tHash Table Size: %d\n", priv->dma_cap.hash_tb_sz);
	4634	+ seq_printf(seq, "\tTSO: %s\n", priv->dma_cap.tsoen ? "Y" : "N");
	4635	+ seq_printf(seq, "\tNumber of PPS Outputs: %d\n",
	4636	+ priv->dma_cap.pps_out_num);
	4637	+ seq_printf(seq, "\tSafety Features: %s\n",
	4638	+ priv->dma_cap.asp ? "Y" : "N");
	4639	+ seq_printf(seq, "\tFlexible RX Parser: %s\n",
	4640	+ priv->dma_cap.frpsel ? "Y" : "N");
	4641	+ seq_printf(seq, "\tEnhanced Addressing: %d\n",
	4642	+ priv->dma_cap.addr64);
	4643	+ seq_printf(seq, "\tReceive Side Scaling: %s\n",
	4644	+ priv->dma_cap.rssen ? "Y" : "N");
	4645	+ seq_printf(seq, "\tVLAN Hash Filtering: %s\n",
	4646	+ priv->dma_cap.vlhash ? "Y" : "N");
	4647	+ seq_printf(seq, "\tSplit Header: %s\n",
	4648	+ priv->dma_cap.sphen ? "Y" : "N");
	4649	+ seq_printf(seq, "\tVLAN TX Insertion: %s\n",
	4650	+ priv->dma_cap.vlins ? "Y" : "N");
	4651	+ seq_printf(seq, "\tDouble VLAN: %s\n",
	4652	+ priv->dma_cap.dvlan ? "Y" : "N");
	4653	+ seq_printf(seq, "\tNumber of L3/L4 Filters: %d\n",
	4654	+ priv->dma_cap.l3l4fnum);
	4655	+ seq_printf(seq, "\tARP Offloading: %s\n",
	4656	+ priv->dma_cap.arpoffsel ? "Y" : "N");
	4657	+ seq_printf(seq, "\tEnhancements to Scheduled Traffic (EST): %s\n",
	4658	+ priv->dma_cap.estsel ? "Y" : "N");
	4659	+ seq_printf(seq, "\tFrame Preemption (FPE): %s\n",
	4660	+ priv->dma_cap.fpesel ? "Y" : "N");
	4661	+ seq_printf(seq, "\tTime-Based Scheduling (TBS): %s\n",
	4662	+ priv->dma_cap.tbssel ? "Y" : "N");
4068	4663	return 0;
4069	4664	}
	4665	+DEFINE_SHOW_ATTRIBUTE(stmmac_dma_cap);
4070	4666
4071		-static int stmmac_sysfs_dma_cap_open(struct inode inode, struct file file)
	4667	+/* Use network device events to rename debugfs file entries.
	4668	+ */
	4669	+static int stmmac_device_event(struct notifier_block *unused,
	4670	+ unsigned long event, void *ptr)
4072	4671	{
4073		- return single_open(file, stmmac_sysfs_dma_cap_read, inode->i_private);
	4672	+ struct net_device *dev = netdev_notifier_info_to_dev(ptr);
	4673	+ struct stmmac_priv *priv = netdev_priv(dev);
	4674	+
	4675	+ if (dev->netdev_ops != &stmmac_netdev_ops)
	4676	+ goto done;
	4677	+
	4678	+ switch (event) {
	4679	+ case NETDEV_CHANGENAME:
	4680	+ if (priv->dbgfs_dir)
	4681	+ priv->dbgfs_dir = debugfs_rename(stmmac_fs_dir,
	4682	+ priv->dbgfs_dir,
	4683	+ stmmac_fs_dir,
	4684	+ dev->name);
	4685	+ break;
	4686	+ }
	4687	+done:
	4688	+ return NOTIFY_DONE;
4074	4689	}
4075	4690
4076		-static const struct file_operations stmmac_dma_cap_fops = {
4077		- .owner = THIS_MODULE,
4078		- .open = stmmac_sysfs_dma_cap_open,
4079		- .read = seq_read,
4080		- .llseek = seq_lseek,
4081		- .release = single_release,
	4691	+static struct notifier_block stmmac_notifier = {
	4692	+ .notifier_call = stmmac_device_event,
4082	4693	};
4083	4694
4084		-static int stmmac_init_fs(struct net_device *dev)
	4695	+static void stmmac_init_fs(struct net_device *dev)
4085	4696	{
4086	4697	struct stmmac_priv *priv = netdev_priv(dev);
	4698	+
	4699	+ rtnl_lock();
4087	4700
4088	4701	/* Create per netdev entries */
4089	4702	priv->dbgfs_dir = debugfs_create_dir(dev->name, stmmac_fs_dir);
4090	4703
4091		- if (!priv->dbgfs_dir \|\| IS_ERR(priv->dbgfs_dir)) {
4092		- netdev_err(priv->dev, "ERROR failed to create debugfs directory\n");
4093		-
4094		- return -ENOMEM;
4095		- }
4096		-
4097	4704	/* Entry to report DMA RX/TX rings */
4098		- priv->dbgfs_rings_status =
4099		- debugfs_create_file("descriptors_status", 0444,
4100		- priv->dbgfs_dir, dev,
4101		- &stmmac_rings_status_fops);
4102		-
4103		- if (!priv->dbgfs_rings_status \|\| IS_ERR(priv->dbgfs_rings_status)) {
4104		- netdev_err(priv->dev, "ERROR creating stmmac ring debugfs file\n");
4105		- debugfs_remove_recursive(priv->dbgfs_dir);
4106		-
4107		- return -ENOMEM;
4108		- }
	4705	+ debugfs_create_file("descriptors_status", 0444, priv->dbgfs_dir, dev,
	4706	+ &stmmac_rings_status_fops);
4109	4707
4110	4708	/* Entry to report the DMA HW features */
4111		- priv->dbgfs_dma_cap = debugfs_create_file("dma_cap", 0444,
4112		- priv->dbgfs_dir,
4113		- dev, &stmmac_dma_cap_fops);
	4709	+ debugfs_create_file("dma_cap", 0444, priv->dbgfs_dir, dev,
	4710	+ &stmmac_dma_cap_fops);
4114	4711
4115		- if (!priv->dbgfs_dma_cap \|\| IS_ERR(priv->dbgfs_dma_cap)) {
4116		- netdev_err(priv->dev, "ERROR creating stmmac MMC debugfs file\n");
4117		- debugfs_remove_recursive(priv->dbgfs_dir);
4118		-
4119		- return -ENOMEM;
4120		- }
4121		-
4122		- return 0;
	4712	+ rtnl_unlock();
4123	4713	}
4124	4714
4125	4715	static void stmmac_exit_fs(struct net_device *dev)
..	..	@@ -4129,6 +4719,111 @@
4129	4719	debugfs_remove_recursive(priv->dbgfs_dir);
4130	4720	}
4131	4721	#endif /* CONFIG_DEBUG_FS */
	4722	+
	4723	+static u32 stmmac_vid_crc32_le(__le16 vid_le)
	4724	+{
	4725	+ unsigned char data = (unsigned char )&vid_le;
	4726	+ unsigned char data_byte = 0;
	4727	+ u32 crc = ~0x0;
	4728	+ u32 temp = 0;
	4729	+ int i, bits;
	4730	+
	4731	+ bits = get_bitmask_order(VLAN_VID_MASK);
	4732	+ for (i = 0; i < bits; i++) {
	4733	+ if ((i % 8) == 0)
	4734	+ data_byte = data[i / 8];
	4735	+
	4736	+ temp = ((crc & 1) ^ data_byte) & 1;
	4737	+ crc >>= 1;
	4738	+ data_byte >>= 1;
	4739	+
	4740	+ if (temp)
	4741	+ crc ^= 0xedb88320;
	4742	+ }
	4743	+
	4744	+ return crc;
	4745	+}
	4746	+
	4747	+static int stmmac_vlan_update(struct stmmac_priv *priv, bool is_double)
	4748	+{
	4749	+ u32 crc, hash = 0;
	4750	+ __le16 pmatch = 0;
	4751	+ int count = 0;
	4752	+ u16 vid = 0;
	4753	+
	4754	+ for_each_set_bit(vid, priv->active_vlans, VLAN_N_VID) {
	4755	+ __le16 vid_le = cpu_to_le16(vid);
	4756	+ crc = bitrev32(~stmmac_vid_crc32_le(vid_le)) >> 28;
	4757	+ hash \|= (1 << crc);
	4758	+ count++;
	4759	+ }
	4760	+
	4761	+ if (!priv->dma_cap.vlhash) {
	4762	+ if (count > 2) /* VID = 0 always passes filter */
	4763	+ return -EOPNOTSUPP;
	4764	+
	4765	+ pmatch = cpu_to_le16(vid);
	4766	+ hash = 0;
	4767	+ }
	4768	+
	4769	+ return stmmac_update_vlan_hash(priv, priv->hw, hash, pmatch, is_double);
	4770	+}
	4771	+
	4772	+static int stmmac_vlan_rx_add_vid(struct net_device *ndev, __be16 proto, u16 vid)
	4773	+{
	4774	+ struct stmmac_priv *priv = netdev_priv(ndev);
	4775	+ bool is_double = false;
	4776	+ int ret;
	4777	+
	4778	+ if (be16_to_cpu(proto) == ETH_P_8021AD)
	4779	+ is_double = true;
	4780	+
	4781	+ set_bit(vid, priv->active_vlans);
	4782	+ ret = stmmac_vlan_update(priv, is_double);
	4783	+ if (ret) {
	4784	+ clear_bit(vid, priv->active_vlans);
	4785	+ return ret;
	4786	+ }
	4787	+
	4788	+ if (priv->hw->num_vlan) {
	4789	+ ret = stmmac_add_hw_vlan_rx_fltr(priv, ndev, priv->hw, proto, vid);
	4790	+ if (ret)
	4791	+ return ret;
	4792	+ }
	4793	+
	4794	+ return 0;
	4795	+}
	4796	+
	4797	+static int stmmac_vlan_rx_kill_vid(struct net_device *ndev, __be16 proto, u16 vid)
	4798	+{
	4799	+ struct stmmac_priv *priv = netdev_priv(ndev);
	4800	+ bool is_double = false;
	4801	+ int ret;
	4802	+
	4803	+ ret = pm_runtime_get_sync(priv->device);
	4804	+ if (ret < 0) {
	4805	+ pm_runtime_put_noidle(priv->device);
	4806	+ return ret;
	4807	+ }
	4808	+
	4809	+ if (be16_to_cpu(proto) == ETH_P_8021AD)
	4810	+ is_double = true;
	4811	+
	4812	+ clear_bit(vid, priv->active_vlans);
	4813	+
	4814	+ if (priv->hw->num_vlan) {
	4815	+ ret = stmmac_del_hw_vlan_rx_fltr(priv, ndev, priv->hw, proto, vid);
	4816	+ if (ret)
	4817	+ goto del_vlan_error;
	4818	+ }
	4819	+
	4820	+ ret = stmmac_vlan_update(priv, is_double);
	4821	+
	4822	+del_vlan_error:
	4823	+ pm_runtime_put(priv->device);
	4824	+
	4825	+ return ret;
	4826	+}
4132	4827
4133	4828	static const struct net_device_ops stmmac_netdev_ops = {
4134	4829	.ndo_open = stmmac_open,
..	..	@@ -4146,6 +4841,8 @@
4146	4841	.ndo_poll_controller = stmmac_poll_controller,
4147	4842	#endif
4148	4843	.ndo_set_mac_address = stmmac_set_mac_address,
	4844	+ .ndo_vlan_rx_add_vid = stmmac_vlan_rx_add_vid,
	4845	+ .ndo_vlan_rx_kill_vid = stmmac_vlan_rx_kill_vid,
4149	4846	};
4150	4847
4151	4848	static void stmmac_reset_subtask(struct stmmac_priv *priv)
..	..	@@ -4164,7 +4861,7 @@
4164	4861
4165	4862	set_bit(STMMAC_DOWN, &priv->state);
4166	4863	dev_close(priv->dev);
4167		- dev_open(priv->dev);
	4864	+ dev_open(priv->dev, NULL);
4168	4865	clear_bit(STMMAC_DOWN, &priv->state);
4169	4866	clear_bit(STMMAC_RESETING, &priv->state);
4170	4867	rtnl_unlock();
..	..	@@ -4214,6 +4911,12 @@
4214	4911	priv->plat->enh_desc = priv->dma_cap.enh_desc;
4215	4912	priv->plat->pmt = priv->dma_cap.pmt_remote_wake_up;
4216	4913	priv->hw->pmt = priv->plat->pmt;
	4914	+ if (priv->dma_cap.hash_tb_sz) {
	4915	+ priv->hw->multicast_filter_bins =
	4916	+ (BIT(priv->dma_cap.hash_tb_sz) << 5);
	4917	+ priv->hw->mcast_bits_log2 =
	4918	+ ilog2(priv->hw->multicast_filter_bins);
	4919	+ }
4217	4920
4218	4921	/* TXCOE doesn't work in thresh DMA mode */
4219	4922	if (priv->plat->force_thresh_dma_mode)
..	..	@@ -4250,6 +4953,9 @@
4250	4953	if (priv->dma_cap.tsoen)
4251	4954	dev_info(priv->device, "TSO supported\n");
4252	4955
	4956	+ priv->hw->vlan_fail_q_en = priv->plat->vlan_fail_q_en;
	4957	+ priv->hw->vlan_fail_q = priv->plat->vlan_fail_q;
	4958	+
4253	4959	/* Run HW quirks, if any */
4254	4960	if (priv->hwif_quirks) {
4255	4961	ret = priv->hwif_quirks(priv);
..	..	@@ -4272,6 +4978,92 @@
4272	4978	return 0;
4273	4979	}
4274	4980
	4981	+static void stmmac_napi_add(struct net_device *dev)
	4982	+{
	4983	+ struct stmmac_priv *priv = netdev_priv(dev);
	4984	+ u32 queue, maxq;
	4985	+
	4986	+ maxq = max(priv->plat->rx_queues_to_use, priv->plat->tx_queues_to_use);
	4987	+
	4988	+ for (queue = 0; queue < maxq; queue++) {
	4989	+ struct stmmac_channel *ch = &priv->channel[queue];
	4990	+ int rx_budget = ((priv->plat->dma_rx_size < NAPI_POLL_WEIGHT) &&
	4991	+ (priv->plat->dma_rx_size > 0)) ?
	4992	+ priv->plat->dma_rx_size : NAPI_POLL_WEIGHT;
	4993	+ int tx_budget = ((priv->plat->dma_tx_size < NAPI_POLL_WEIGHT) &&
	4994	+ (priv->plat->dma_tx_size > 0)) ?
	4995	+ priv->plat->dma_tx_size : NAPI_POLL_WEIGHT;
	4996	+
	4997	+ ch->priv_data = priv;
	4998	+ ch->index = queue;
	4999	+ spin_lock_init(&ch->lock);
	5000	+
	5001	+ if (queue < priv->plat->rx_queues_to_use) {
	5002	+ netif_napi_add(dev, &ch->rx_napi, stmmac_napi_poll_rx,
	5003	+ rx_budget);
	5004	+ }
	5005	+ if (queue < priv->plat->tx_queues_to_use) {
	5006	+ netif_tx_napi_add(dev, &ch->tx_napi,
	5007	+ stmmac_napi_poll_tx, tx_budget);
	5008	+ }
	5009	+ }
	5010	+}
	5011	+
	5012	+static void stmmac_napi_del(struct net_device *dev)
	5013	+{
	5014	+ struct stmmac_priv *priv = netdev_priv(dev);
	5015	+ u32 queue, maxq;
	5016	+
	5017	+ maxq = max(priv->plat->rx_queues_to_use, priv->plat->tx_queues_to_use);
	5018	+
	5019	+ for (queue = 0; queue < maxq; queue++) {
	5020	+ struct stmmac_channel *ch = &priv->channel[queue];
	5021	+
	5022	+ if (queue < priv->plat->rx_queues_to_use)
	5023	+ netif_napi_del(&ch->rx_napi);
	5024	+ if (queue < priv->plat->tx_queues_to_use)
	5025	+ netif_napi_del(&ch->tx_napi);
	5026	+ }
	5027	+}
	5028	+
	5029	+int stmmac_reinit_queues(struct net_device *dev, u32 rx_cnt, u32 tx_cnt)
	5030	+{
	5031	+ struct stmmac_priv *priv = netdev_priv(dev);
	5032	+ int ret = 0;
	5033	+
	5034	+ if (netif_running(dev))
	5035	+ stmmac_release(dev);
	5036	+
	5037	+ stmmac_napi_del(dev);
	5038	+
	5039	+ priv->plat->rx_queues_to_use = rx_cnt;
	5040	+ priv->plat->tx_queues_to_use = tx_cnt;
	5041	+
	5042	+ stmmac_napi_add(dev);
	5043	+
	5044	+ if (netif_running(dev))
	5045	+ ret = stmmac_open(dev);
	5046	+
	5047	+ return ret;
	5048	+}
	5049	+
	5050	+int stmmac_reinit_ringparam(struct net_device *dev, u32 rx_size, u32 tx_size)
	5051	+{
	5052	+ struct stmmac_priv *priv = netdev_priv(dev);
	5053	+ int ret = 0;
	5054	+
	5055	+ if (netif_running(dev))
	5056	+ stmmac_release(dev);
	5057	+
	5058	+ priv->dma_rx_size = rx_size;
	5059	+ priv->dma_tx_size = tx_size;
	5060	+
	5061	+ if (netif_running(dev))
	5062	+ ret = stmmac_open(dev);
	5063	+
	5064	+ return ret;
	5065	+}
	5066	+
4275	5067	/**
4276	5068	* stmmac_dvr_probe
4277	5069	* @device: device pointer
..	..	@@ -4288,12 +5080,11 @@
4288	5080	{
4289	5081	struct net_device *ndev = NULL;
4290	5082	struct stmmac_priv *priv;
4291		- u32 queue, maxq;
4292		- int ret = 0;
	5083	+ u32 rxq;
	5084	+ int i, ret = 0;
4293	5085
4294		- ndev = alloc_etherdev_mqs(sizeof(struct stmmac_priv),
4295		- MTL_MAX_TX_QUEUES,
4296		- MTL_MAX_RX_QUEUES);
	5086	+ ndev = devm_alloc_etherdev_mqs(device, sizeof(struct stmmac_priv),
	5087	+ MTL_MAX_TX_QUEUES, MTL_MAX_RX_QUEUES);
4297	5088	if (!ndev)
4298	5089	return -ENOMEM;
4299	5090
..	..	@@ -4313,7 +5104,7 @@
4313	5104	priv->wol_irq = res->wol_irq;
4314	5105	priv->lpi_irq = res->lpi_irq;
4315	5106
4316		- if (res->mac)
	5107	+ if (!IS_ERR_OR_NULL(res->mac))
4317	5108	memcpy(priv->dev->dev_addr, res->mac, ETH_ALEN);
4318	5109
4319	5110	dev_set_drvdata(device, priv->dev);
..	..	@@ -4325,8 +5116,7 @@
4325	5116	priv->wq = create_singlethread_workqueue("stmmac_wq");
4326	5117	if (!priv->wq) {
4327	5118	dev_err(priv->device, "failed to create workqueue\n");
4328		- ret = -ENOMEM;
4329		- goto error_wq;
	5119	+ return -ENOMEM;
4330	5120	}
4331	5121
4332	5122	INIT_WORK(&priv->service_task, stmmac_service_task);
..	..	@@ -4354,10 +5144,6 @@
4354	5144
4355	5145	stmmac_check_ether_addr(priv);
4356	5146
4357		- /* Configure real RX and TX queues */
4358		- netif_set_real_num_rx_queues(ndev, priv->plat->rx_queues_to_use);
4359		- netif_set_real_num_tx_queues(ndev, priv->plat->tx_queues_to_use);
4360		-
4361	5147	ndev->netdev_ops = &stmmac_netdev_ops;
4362	5148
4363	5149	ndev->hw_features = NETIF_F_SG \| NETIF_F_IP_CSUM \| NETIF_F_IPV6_CSUM \|
..	..	@@ -4375,20 +5161,79 @@
4375	5161	priv->tso = true;
4376	5162	dev_info(priv->device, "TSO feature enabled\n");
4377	5163	}
	5164	+
	5165	+ if (priv->dma_cap.sphen && !priv->plat->sph_disable) {
	5166	+ ndev->hw_features \|= NETIF_F_GRO;
	5167	+ if (!priv->plat->sph_disable) {
	5168	+ priv->sph = true;
	5169	+ dev_info(priv->device, "SPH feature enabled\n");
	5170	+ }
	5171	+ }
	5172	+
	5173	+ /* The current IP register MAC_HW_Feature1[ADDR64] only define
	5174	+ * 32/40/64 bit width, but some SOC support others like i.MX8MP
	5175	+ * support 34 bits but it map to 40 bits width in MAC_HW_Feature1[ADDR64].
	5176	+ * So overwrite dma_cap.addr64 according to HW real design.
	5177	+ */
	5178	+ if (priv->plat->addr64)
	5179	+ priv->dma_cap.addr64 = priv->plat->addr64;
	5180	+
	5181	+ if (priv->dma_cap.addr64) {
	5182	+ ret = dma_set_mask_and_coherent(device,
	5183	+ DMA_BIT_MASK(priv->dma_cap.addr64));
	5184	+ if (!ret) {
	5185	+ dev_info(priv->device, "Using %d bits DMA width\n",
	5186	+ priv->dma_cap.addr64);
	5187	+
	5188	+ /*
	5189	+ * If more than 32 bits can be addressed, make sure to
	5190	+ * enable enhanced addressing mode.
	5191	+ */
	5192	+ if (IS_ENABLED(CONFIG_ARCH_DMA_ADDR_T_64BIT))
	5193	+ priv->plat->dma_cfg->eame = true;
	5194	+ } else {
	5195	+ ret = dma_set_mask_and_coherent(device, DMA_BIT_MASK(32));
	5196	+ if (ret) {
	5197	+ dev_err(priv->device, "Failed to set DMA Mask\n");
	5198	+ goto error_hw_init;
	5199	+ }
	5200	+
	5201	+ priv->dma_cap.addr64 = 32;
	5202	+ }
	5203	+ }
	5204	+
4378	5205	ndev->features \|= ndev->hw_features \| NETIF_F_HIGHDMA;
4379	5206	ndev->watchdog_timeo = msecs_to_jiffies(watchdog);
4380	5207	#ifdef STMMAC_VLAN_TAG_USED
4381	5208	/* Both mac100 and gmac support receive VLAN tag detection */
4382	5209	ndev->features \|= NETIF_F_HW_VLAN_CTAG_RX \| NETIF_F_HW_VLAN_STAG_RX;
	5210	+ if (priv->dma_cap.vlhash) {
	5211	+ ndev->features \|= NETIF_F_HW_VLAN_CTAG_FILTER;
	5212	+ ndev->features \|= NETIF_F_HW_VLAN_STAG_FILTER;
	5213	+ }
	5214	+ if (priv->dma_cap.vlins) {
	5215	+ ndev->features \|= NETIF_F_HW_VLAN_CTAG_TX;
	5216	+ if (priv->dma_cap.dvlan)
	5217	+ ndev->features \|= NETIF_F_HW_VLAN_STAG_TX;
	5218	+ }
4383	5219	#endif
4384	5220	priv->msg_enable = netif_msg_init(debug, default_msg_level);
4385	5221
	5222	+ /* Initialize RSS */
	5223	+ rxq = priv->plat->rx_queues_to_use;
	5224	+ netdev_rss_key_fill(priv->rss.key, sizeof(priv->rss.key));
	5225	+ for (i = 0; i < ARRAY_SIZE(priv->rss.table); i++)
	5226	+ priv->rss.table[i] = ethtool_rxfh_indir_default(i, rxq);
	5227	+
	5228	+ if (priv->dma_cap.rssen && priv->plat->rss_en)
	5229	+ ndev->features \|= NETIF_F_RXHASH;
	5230	+
4386	5231	/* MTU range: 46 - hw-specific max */
4387	5232	ndev->min_mtu = ETH_ZLEN - ETH_HLEN;
4388		- if ((priv->plat->enh_desc) \|\| (priv->synopsys_id >= DWMAC_CORE_4_00))
4389		- ndev->max_mtu = JUMBO_LEN;
4390		- else if (priv->plat->has_xgmac)
	5233	+ if (priv->plat->has_xgmac)
4391	5234	ndev->max_mtu = XGMAC_JUMBO_LEN;
	5235	+ else if ((priv->plat->enh_desc) \|\| (priv->synopsys_id >= DWMAC_CORE_4_00))
	5236	+ ndev->max_mtu = JUMBO_LEN;
4392	5237	else
4393	5238	ndev->max_mtu = SKB_MAX_HEAD(NET_SKB_PAD + NET_IP_ALIGN);
4394	5239	/* Will not overwrite ndev->max_mtu if plat->maxmtu > ndev->max_mtu
..	..	@@ -4406,22 +5251,7 @@
4406	5251	priv->flow_ctrl = FLOW_AUTO; /* RX/TX pause on */
4407	5252
4408	5253	/* Setup channels NAPI */
4409		- maxq = max(priv->plat->rx_queues_to_use, priv->plat->tx_queues_to_use);
4410		-
4411		- for (queue = 0; queue < maxq; queue++) {
4412		- struct stmmac_channel *ch = &priv->channel[queue];
4413		-
4414		- ch->priv_data = priv;
4415		- ch->index = queue;
4416		-
4417		- if (queue < priv->plat->rx_queues_to_use)
4418		- ch->has_rx = true;
4419		- if (queue < priv->plat->tx_queues_to_use)
4420		- ch->has_tx = true;
4421		-
4422		- netif_napi_add(ndev, &ch->napi, stmmac_napi_poll,
4423		- NAPI_POLL_WEIGHT);
4424		- }
	5254	+ stmmac_napi_add(ndev);
4425	5255
4426	5256	mutex_init(&priv->lock);
4427	5257
..	..	@@ -4431,15 +5261,18 @@
4431	5261	* set the MDC clock dynamically according to the csr actual
4432	5262	* clock input.
4433	5263	*/
4434		- if (!priv->plat->clk_csr)
4435		- stmmac_clk_csr_set(priv);
4436		- else
	5264	+ if (priv->plat->clk_csr >= 0)
4437	5265	priv->clk_csr = priv->plat->clk_csr;
	5266	+ else
	5267	+ stmmac_clk_csr_set(priv);
4438	5268
4439	5269	stmmac_check_pcs_mode(priv);
4440	5270
4441		- if (priv->hw->pcs != STMMAC_PCS_RGMII &&
4442		- priv->hw->pcs != STMMAC_PCS_TBI &&
	5271	+ pm_runtime_get_noresume(device);
	5272	+ pm_runtime_set_active(device);
	5273	+ pm_runtime_enable(device);
	5274	+
	5275	+ if (priv->hw->pcs != STMMAC_PCS_TBI &&
4443	5276	priv->hw->pcs != STMMAC_PCS_RTBI) {
4444	5277	/* MDIO bus Registration */
4445	5278	ret = stmmac_mdio_register(ndev);
..	..	@@ -4451,6 +5284,12 @@
4451	5284	}
4452	5285	}
4453	5286
	5287	+ ret = stmmac_phy_setup(priv);
	5288	+ if (ret) {
	5289	+ netdev_err(ndev, "failed to setup phy (%d)\n", ret);
	5290	+ goto error_phy_setup;
	5291	+ }
	5292	+
4454	5293	ret = register_netdev(ndev);
4455	5294	if (ret) {
4456	5295	dev_err(priv->device, "%s: ERROR %i registering the device\n",
..	..	@@ -4459,29 +5298,29 @@
4459	5298	}
4460	5299
4461	5300	#ifdef CONFIG_DEBUG_FS
4462		- ret = stmmac_init_fs(ndev);
4463		- if (ret < 0)
4464		- netdev_warn(priv->dev, "%s: failed debugFS registration\n",
4465		- __func__);
	5301	+ stmmac_init_fs(ndev);
4466	5302	#endif
	5303	+
	5304	+ /* Let pm_runtime_put() disable the clocks.
	5305	+ * If CONFIG_PM is not enabled, the clocks will stay powered.
	5306	+ */
	5307	+ pm_runtime_put(device);
	5308	+
	5309	+ //add
	5310	+ phy_register_fixup_for_uid(RTL_8211F_PHY_ID, RTL_8211F_PHY_ID_MASK, rtl8211F_led_control);
4467	5311
4468	5312	return ret;
4469	5313
4470	5314	error_netdev_register:
4471		- if (priv->hw->pcs != STMMAC_PCS_RGMII &&
4472		- priv->hw->pcs != STMMAC_PCS_TBI &&
	5315	+ phylink_destroy(priv->phylink);
	5316	+error_phy_setup:
	5317	+ if (priv->hw->pcs != STMMAC_PCS_TBI &&
4473	5318	priv->hw->pcs != STMMAC_PCS_RTBI)
4474	5319	stmmac_mdio_unregister(ndev);
4475	5320	error_mdio_register:
4476		- for (queue = 0; queue < maxq; queue++) {
4477		- struct stmmac_channel *ch = &priv->channel[queue];
4478		-
4479		- netif_napi_del(&ch->napi);
4480		- }
	5321	+ stmmac_napi_del(ndev);
4481	5322	error_hw_init:
4482	5323	destroy_workqueue(priv->wq);
4483		-error_wq:
4484		- free_netdev(ndev);
4485	5324
4486	5325	return ret;
4487	5326	}
..	..	@@ -4500,25 +5339,30 @@
4500	5339
4501	5340	netdev_info(priv->dev, "%s: removing driver", __func__);
4502	5341
4503		-#ifdef CONFIG_DEBUG_FS
4504		- stmmac_exit_fs(ndev);
4505		-#endif
4506	5342	stmmac_stop_all_dma(priv);
4507		-
4508	5343	stmmac_mac_set(priv, priv->ioaddr, false);
4509	5344	netif_carrier_off(ndev);
4510	5345	unregister_netdev(ndev);
	5346	+
	5347	+ /* Serdes power down needs to happen after VLAN filter
	5348	+ * is deleted that is triggered by unregister_netdev().
	5349	+ */
	5350	+ if (priv->plat->serdes_powerdown)
	5351	+ priv->plat->serdes_powerdown(ndev, priv->plat->bsp_priv);
	5352	+
	5353	+#ifdef CONFIG_DEBUG_FS
	5354	+ stmmac_exit_fs(ndev);
	5355	+#endif
	5356	+ phylink_destroy(priv->phylink);
4511	5357	if (priv->plat->stmmac_rst)
4512	5358	reset_control_assert(priv->plat->stmmac_rst);
4513		- clk_disable_unprepare(priv->plat->pclk);
4514		- clk_disable_unprepare(priv->plat->stmmac_clk);
4515		- if (priv->hw->pcs != STMMAC_PCS_RGMII &&
4516		- priv->hw->pcs != STMMAC_PCS_TBI &&
	5359	+ pm_runtime_put(dev);
	5360	+ pm_runtime_disable(dev);
	5361	+ if (priv->hw->pcs != STMMAC_PCS_TBI &&
4517	5362	priv->hw->pcs != STMMAC_PCS_RTBI)
4518	5363	stmmac_mdio_unregister(ndev);
4519	5364	destroy_workqueue(priv->wq);
4520	5365	mutex_destroy(&priv->lock);
4521		- free_netdev(ndev);
4522	5366
4523	5367	return 0;
4524	5368	}
..	..	@@ -4540,8 +5384,7 @@
4540	5384	if (!ndev \|\| !netif_running(ndev))
4541	5385	return 0;
4542	5386
4543		- if (ndev->phydev)
4544		- phy_stop(ndev->phydev);
	5387	+ phylink_mac_change(priv->phylink, false);
4545	5388
4546	5389	mutex_lock(&priv->lock);
4547	5390
..	..	@@ -4560,34 +5403,38 @@
4560	5403	/* Stop TX/RX DMA */
4561	5404	stmmac_stop_all_dma(priv);
4562	5405
	5406	+ if (priv->plat->serdes_powerdown)
	5407	+ priv->plat->serdes_powerdown(ndev, priv->plat->bsp_priv);
	5408	+
4563	5409	/* Enable Power down mode by programming the PMT regs */
4564		- if (device_may_wakeup(priv->device)) {
	5410	+ if (device_may_wakeup(priv->device) && priv->plat->pmt) {
4565	5411	stmmac_pmt(priv, priv->hw, priv->wolopts);
4566	5412	priv->irq_wake = 1;
4567	5413	} else {
	5414	+ mutex_unlock(&priv->lock);
	5415	+ rtnl_lock();
	5416	+ if (device_may_wakeup(priv->device))
	5417	+ phylink_speed_down(priv->phylink, false);
4568	5418	if (priv->plat->integrated_phy_power)
4569	5419	priv->plat->integrated_phy_power(priv->plat->bsp_priv,
4570	5420	false);
	5421	+ phylink_stop(priv->phylink);
	5422	+ rtnl_unlock();
	5423	+ mutex_lock(&priv->lock);
	5424	+
4571	5425	stmmac_mac_set(priv, priv->ioaddr, false);
4572	5426	pinctrl_pm_select_sleep_state(priv->device);
4573		- /* Disable clock in case of PWM is off */
4574		- if (priv->plat->clk_ptp_ref && IS_ENABLED(CONFIG_STMMAC_PTP))
4575		- clk_disable_unprepare(priv->plat->clk_ptp_ref);
4576		- clk_disable_unprepare(priv->plat->pclk);
4577		- clk_disable_unprepare(priv->plat->stmmac_clk);
4578	5427	}
4579	5428	mutex_unlock(&priv->lock);
4580	5429
4581		- priv->oldlink = false;
4582	5430	priv->speed = SPEED_UNKNOWN;
4583		- priv->oldduplex = DUPLEX_UNKNOWN;
4584	5431	return 0;
4585	5432	}
4586	5433	EXPORT_SYMBOL_GPL(stmmac_suspend);
4587	5434
4588	5435	/**
4589	5436	* stmmac_reset_queues_param - reset queue parameters
4590		- * @dev: device pointer
	5437	+ * @priv: device pointer
4591	5438	*/
4592	5439	static void stmmac_reset_queues_param(struct stmmac_priv *priv)
4593	5440	{
..	..	@@ -4623,6 +5470,7 @@
4623	5470	{
4624	5471	struct net_device *ndev = dev_get_drvdata(dev);
4625	5472	struct stmmac_priv *priv = netdev_priv(ndev);
	5473	+ int ret;
4626	5474
4627	5475	if (!netif_running(ndev))
4628	5476	return 0;
..	..	@@ -4633,18 +5481,13 @@
4633	5481	* this bit because it can generate problems while resuming
4634	5482	* from another devices (e.g. serial console).
4635	5483	*/
4636		- if (device_may_wakeup(priv->device)) {
	5484	+ if (device_may_wakeup(priv->device) && priv->plat->pmt) {
4637	5485	mutex_lock(&priv->lock);
4638	5486	stmmac_pmt(priv, priv->hw, 0);
4639	5487	mutex_unlock(&priv->lock);
4640	5488	priv->irq_wake = 0;
4641	5489	} else {
4642	5490	pinctrl_pm_select_default_state(priv->device);
4643		- /* enable the clk previously disabled */
4644		- clk_prepare_enable(priv->plat->stmmac_clk);
4645		- clk_prepare_enable(priv->plat->pclk);
4646		- if (priv->plat->clk_ptp_ref && IS_ENABLED(CONFIG_STMMAC_PTP))
4647		- clk_prepare_enable(priv->plat->clk_ptp_ref);
4648	5491	/* reset the phy so that it's ready */
4649	5492	if (priv->mii)
4650	5493	stmmac_mdio_reset(priv->mii);
..	..	@@ -4653,6 +5496,23 @@
4653	5496	true);
4654	5497	}
4655	5498
	5499	+ if (priv->plat->serdes_powerup) {
	5500	+ ret = priv->plat->serdes_powerup(ndev,
	5501	+ priv->plat->bsp_priv);
	5502	+
	5503	+ if (ret < 0)
	5504	+ return ret;
	5505	+ }
	5506	+
	5507	+ if (!device_may_wakeup(priv->device) \|\| !priv->plat->pmt) {
	5508	+ rtnl_lock();
	5509	+ phylink_start(priv->phylink);
	5510	+ /* We may have called phylink_speed_down before */
	5511	+ phylink_speed_up(priv->phylink);
	5512	+ rtnl_unlock();
	5513	+ }
	5514	+
	5515	+ rtnl_lock();
4656	5516	mutex_lock(&priv->lock);
4657	5517
4658	5518	stmmac_reset_queues_param(priv);
..	..	@@ -4660,18 +5520,26 @@
4660	5520	stmmac_free_tx_skbufs(priv);
4661	5521	stmmac_clear_descriptors(priv);
4662	5522
	5523	+#if 1
	5524	+ printk("ben -------resume add 2s delay time.\n");
	5525	+ mdelay(2000);
	5526	+
	5527	+#endif
	5528	+
4663	5529	stmmac_hw_setup(ndev, false);
4664		- stmmac_init_tx_coalesce(priv);
	5530	+ stmmac_init_coalesce(priv);
4665	5531	stmmac_set_rx_mode(ndev);
	5532	+
	5533	+ stmmac_restore_hw_vlan_rx_fltr(priv, ndev, priv->hw);
4666	5534
4667	5535	stmmac_enable_all_queues(priv);
4668	5536
4669		- netif_device_attach(ndev);
4670		-
4671	5537	mutex_unlock(&priv->lock);
	5538	+ rtnl_unlock();
4672	5539
4673		- if (ndev->phydev)
4674		- phy_start(ndev->phydev);
	5540	+ phylink_mac_change(priv->phylink, true);
	5541	+
	5542	+ netif_device_attach(ndev);
4675	5543
4676	5544	return 0;
4677	5545	}
..	..	@@ -4683,7 +5551,7 @@
4683	5551	char *opt;
4684	5552
4685	5553	if (!str \|\| !*str)
4686		- return -EINVAL;
	5554	+ return 1;
4687	5555	while ((opt = strsep(&str, ",")) != NULL) {
4688	5556	if (!strncmp(opt, "debug:", 6)) {
4689	5557	if (kstrtoint(opt + 6, 0, &debug))
..	..	@@ -4714,11 +5582,11 @@
4714	5582	goto err;
4715	5583	}
4716	5584	}
4717		- return 0;
	5585	+ return 1;
4718	5586
4719	5587	err:
4720	5588	pr_err("%s: ERROR broken module parameter conversion", __func__);
4721		- return -EINVAL;
	5589	+ return 1;
4722	5590	}
4723	5591
4724	5592	__setup("stmmaceth=", stmmac_cmdline_opt);
..	..	@@ -4728,16 +5596,9 @@
4728	5596	{
4729	5597	#ifdef CONFIG_DEBUG_FS
4730	5598	/* Create debugfs main directory if it doesn't exist yet */
4731		- if (!stmmac_fs_dir) {
	5599	+ if (!stmmac_fs_dir)
4732	5600	stmmac_fs_dir = debugfs_create_dir(STMMAC_RESOURCE_NAME, NULL);
4733		-
4734		- if (!stmmac_fs_dir \|\| IS_ERR(stmmac_fs_dir)) {
4735		- pr_err("ERROR %s, debugfs create directory failed\n",
4736		- STMMAC_RESOURCE_NAME);
4737		-
4738		- return -ENOMEM;
4739		- }
4740		- }
	5601	+ register_netdevice_notifier(&stmmac_notifier);
4741	5602	#endif
4742	5603
4743	5604	return 0;
..	..	@@ -4746,6 +5607,7 @@
4746	5607	static void __exit stmmac_exit(void)
4747	5608	{
4748	5609	#ifdef CONFIG_DEBUG_FS
	5610	+ unregister_netdevice_notifier(&stmmac_notifier);
4749	5611	debugfs_remove_recursive(stmmac_fs_dir);
4750	5612	#endif
4751	5613	}