Commit c86692fc authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

net: dsa: b53/bcm_sf2: implement .support_eee() method 



Implement the .support_eee() method to indicate that EEE is not
supported by two switch variants, rather than making these checks in
the .set_mac_eee() and .get_mac_eee() methods.

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarFlorian Fainelli <florian.fainelli@broadcom.com>
Reviewed-by: default avatarVladimir Oltean <olteanv@gmail.com>
Link: https://patch.msgid.link/E1tL14E-006cZU-Nc@rmk-PC.armlinux.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 99379f58

drivers/net/dsa/b53/b53_common.c

+7 −6
Original line number Diff line number Diff line
@@ -2224,13 +2224,16 @@ int b53_eee_init(struct dsa_switch *ds, int port, struct phy_device *phy) 
}

EXPORT_SYMBOL(b53_eee_init);



int b53_get_mac_eee(struct dsa_switch *ds, int port, struct ethtool_keee *e)

bool b53_support_eee(struct dsa_switch *ds, int port)

{

	struct b53_device *dev = ds->priv;



	if (is5325(dev) || is5365(dev))

		return -EOPNOTSUPP;

	return !is5325(dev) && !is5365(dev);

}

EXPORT_SYMBOL(b53_support_eee);



int b53_get_mac_eee(struct dsa_switch *ds, int port, struct ethtool_keee *e)

{

	return 0;

}

EXPORT_SYMBOL(b53_get_mac_eee);
@@ -2240,9 +2243,6 @@ int b53_set_mac_eee(struct dsa_switch *ds, int port, struct ethtool_keee *e) 
	struct b53_device *dev = ds->priv;

	struct ethtool_keee *p = &dev->ports[port].eee;



	if (is5325(dev) || is5365(dev))

		return -EOPNOTSUPP;



	p->eee_enabled = e->eee_enabled;

	b53_eee_enable_set(ds, port, e->eee_enabled);
@@ -2298,6 +2298,7 @@ static const struct dsa_switch_ops b53_switch_ops = { 
	.phylink_get_caps	= b53_phylink_get_caps,

	.port_enable		= b53_enable_port,

	.port_disable		= b53_disable_port,

	.support_eee		= b53_support_eee,

	.get_mac_eee		= b53_get_mac_eee,

	.set_mac_eee		= b53_set_mac_eee,

	.port_bridge_join	= b53_br_join,

drivers/net/dsa/b53/b53_priv.h

+1 −0
Original line number Diff line number Diff line
@@ -384,6 +384,7 @@ int b53_enable_port(struct dsa_switch *ds, int port, struct phy_device *phy); 
void b53_disable_port(struct dsa_switch *ds, int port);

void b53_brcm_hdr_setup(struct dsa_switch *ds, int port);

int b53_eee_init(struct dsa_switch *ds, int port, struct phy_device *phy);

bool b53_support_eee(struct dsa_switch *ds, int port);

int b53_get_mac_eee(struct dsa_switch *ds, int port, struct ethtool_keee *e);

int b53_set_mac_eee(struct dsa_switch *ds, int port, struct ethtool_keee *e);

drivers/net/dsa/bcm_sf2.c

+1 −0
Original line number Diff line number Diff line
@@ -1232,6 +1232,7 @@ static const struct dsa_switch_ops bcm_sf2_ops = { 
	.set_wol		= bcm_sf2_sw_set_wol,

	.port_enable		= bcm_sf2_port_setup,

	.port_disable		= bcm_sf2_port_disable,

	.support_eee		= b53_support_eee,

	.get_mac_eee		= b53_get_mac_eee,

	.set_mac_eee		= b53_set_mac_eee,

	.port_bridge_join	= b53_br_join,