Commit 143a102e authored by Codrin Ciubotariu's avatar Codrin Ciubotariu Committed by David S. Miller
Browse files

net: dsa: microchip: split adjust_link() in phylink_mac_link_{up|down}() 



The DSA subsystem moved to phylink and adjust_link() became deprecated in
the process. This patch removes adjust_link from the KSZ DSA switches and
adds phylink_mac_link_up() and phylink_mac_link_down().

Signed-off-by: default avatarCodrin Ciubotariu <codrin.ciubotariu@microchip.com>
Reviewed-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bdd2ed27

drivers/net/dsa/microchip/ksz8795.c

+2 −1
Original line number Diff line number Diff line
@@ -1111,7 +1111,8 @@ static const struct dsa_switch_ops ksz8795_switch_ops = { 
	.setup			= ksz8795_setup,

	.phy_read		= ksz_phy_read16,

	.phy_write		= ksz_phy_write16,

	.adjust_link		= ksz_adjust_link,

	.phylink_mac_link_down	= ksz_mac_link_down,

	.phylink_mac_link_up	= ksz_mac_link_up,

	.port_enable		= ksz_enable_port,

	.port_disable		= ksz_disable_port,

	.get_strings		= ksz8795_get_strings,

drivers/net/dsa/microchip/ksz9477.c

+2 −1
Original line number Diff line number Diff line
@@ -1399,7 +1399,8 @@ static const struct dsa_switch_ops ksz9477_switch_ops = { 
	.setup			= ksz9477_setup,

	.phy_read		= ksz9477_phy_read16,

	.phy_write		= ksz9477_phy_write16,

	.adjust_link		= ksz_adjust_link,

	.phylink_mac_link_down	= ksz_mac_link_down,

	.phylink_mac_link_up	= ksz_mac_link_up,

	.port_enable		= ksz_enable_port,

	.port_disable		= ksz_disable_port,

	.get_strings		= ksz9477_get_strings,

drivers/net/dsa/microchip/ksz_common.c

+20 −12
Original line number Diff line number Diff line
@@ -135,26 +135,34 @@ int ksz_phy_write16(struct dsa_switch *ds, int addr, int reg, u16 val) 
}

EXPORT_SYMBOL_GPL(ksz_phy_write16);



void ksz_adjust_link(struct dsa_switch *ds, int port,

		     struct phy_device *phydev)

void ksz_mac_link_down(struct dsa_switch *ds, int port, unsigned int mode,

		       phy_interface_t interface)

{

	struct ksz_device *dev = ds->priv;

	struct ksz_port *p = &dev->ports[port];



	/* Read all MIB counters when the link is going down. */

	if (!phydev->link) {

	p->read = true;

	schedule_delayed_work(&dev->mib_read, 0);

	}



	mutex_lock(&dev->dev_mutex);

	if (!phydev->link)

	dev->live_ports &= ~(1 << port);

	else

	mutex_unlock(&dev->dev_mutex);

}

EXPORT_SYMBOL_GPL(ksz_mac_link_down);



void ksz_mac_link_up(struct dsa_switch *ds, int port, unsigned int mode,

		     phy_interface_t interface, struct phy_device *phydev,

		     int speed, int duplex, bool tx_pause, bool rx_pause)

{

	struct ksz_device *dev = ds->priv;



	/* Remember which port is connected and active. */

	mutex_lock(&dev->dev_mutex);

	dev->live_ports |= (1 << port) & dev->on_ports;

	mutex_unlock(&dev->dev_mutex);

}

EXPORT_SYMBOL_GPL(ksz_adjust_link);

EXPORT_SYMBOL_GPL(ksz_mac_link_up);



int ksz_sset_count(struct dsa_switch *ds, int port, int sset)

{

drivers/net/dsa/microchip/ksz_common.h

+5 −2
Original line number Diff line number Diff line
@@ -159,8 +159,11 @@ void ksz_init_mib_timer(struct ksz_device *dev); 


int ksz_phy_read16(struct dsa_switch *ds, int addr, int reg);

int ksz_phy_write16(struct dsa_switch *ds, int addr, int reg, u16 val);

void ksz_adjust_link(struct dsa_switch *ds, int port,

		     struct phy_device *phydev);

void ksz_mac_link_down(struct dsa_switch *ds, int port, unsigned int mode,

		       phy_interface_t interface);

void ksz_mac_link_up(struct dsa_switch *ds, int port, unsigned int mode,

		     phy_interface_t interface, struct phy_device *phydev,

		     int speed, int duplex, bool tx_pause, bool rx_pause);

int ksz_sset_count(struct dsa_switch *ds, int port, int sset);

void ksz_get_ethtool_stats(struct dsa_switch *ds, int port, uint64_t *buf);

int ksz_port_bridge_join(struct dsa_switch *ds, int port,