| From 3f911800613a3417101563b488c51a9b310ba7fa Mon Sep 17 00:00:00 2001 | 
 | From: Vladimir Oltean <vladimir.oltean@nxp.com> | 
 | Date: Fri, 27 Dec 2019 20:14:57 +0200 | 
 | Subject: [PATCH] net: dsa: Pass pcs_poll flag from driver to PHYLINK | 
 |  | 
 | The DSA drivers that implement .phylink_mac_link_state should normally | 
 | register an interrupt for the PCS, from which they should call | 
 | phylink_mac_change(). However not all switches implement this, and those | 
 | who don't should set this flag in dsa_switch in the .setup callback, so | 
 | that PHYLINK will poll for a few ms until the in-band AN link timer | 
 | expires and the PCS state settles. | 
 |  | 
 | Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> | 
 |  | 
 | Conflicts: | 
 | 	include/net/dsa.h | 
 |  | 
 | trivially with upstream commit 05f294a85235 ("net: dsa: allocate ports | 
 | on touch") which was merged in v5.4-rc3. | 
 | --- | 
 |  include/net/dsa.h | 5 +++++ | 
 |  net/dsa/port.c    | 1 + | 
 |  2 files changed, 6 insertions(+) | 
 |  | 
 | --- a/include/net/dsa.h | 
 | +++ b/include/net/dsa.h | 
 | @@ -291,6 +291,11 @@ struct dsa_switch { | 
 |  	 */ | 
 |  	bool			vlan_filtering; | 
 |   | 
 | +	/* MAC PCS does not provide link state change interrupt, and requires | 
 | +	 * polling. Flag passed on to PHYLINK. | 
 | +	 */ | 
 | +	bool			pcs_poll; | 
 | + | 
 |  	/* Dynamically allocated ports, keep last */ | 
 |  	size_t num_ports; | 
 |  	struct dsa_port ports[]; | 
 | --- a/net/dsa/port.c | 
 | +++ b/net/dsa/port.c | 
 | @@ -639,6 +639,7 @@ static int dsa_port_phylink_register(str | 
 |   | 
 |  	dp->pl_config.dev = ds->dev; | 
 |  	dp->pl_config.type = PHYLINK_DEV; | 
 | +	dp->pl_config.pcs_poll = ds->pcs_poll; | 
 |   | 
 |  	dp->pl = phylink_create(&dp->pl_config, of_fwnode_handle(port_dn), | 
 |  				mode, &dsa_port_phylink_mac_ops); |