net: dsa: mv88e6xxx: drop adjust_link to enabled phylink
Subsystems (4)
PATCH 1/1 net: dsa: mv88e6xxx: drop adjust_link to enabled phylink
We have to drop the adjust_link callback in order to finally migrate to phylink.
Otherwise we get the following warning during startup:
"mv88e6xxx 2188000.ethernet-1:10: Using legacy PHYLIB callbacks. Please
migrate to PHYLINK!"
The warning is generated in the function dsa_port_link_register_of in dsa/port.c:
int dsa_port_link_register_of(struct dsa_port *dp)
{
struct dsa_switch *ds = dp->ds;
if (!ds->ops->adjust_link)
return dsa_port_phylink_register(dp); dev_warn(ds->dev,
"Using legacy PHYLIB callbacks. Please migrate to PHYLINK!\n");
[...]
}
--- drivers/net/dsa/mv88e6xxx/chip.c | 26 -------------------------- 1 file changed, 26 deletions(-)
drivers/net/dsa/mv88e6xxx/chip.c +0 -26
@@ -27,7 +27,6 @@#include <linux/platform_data/mv88e6xxx.h> #include <linux/netdevice.h> #include <linux/gpio/consumer.h> -#include <linux/phy.h> #include <linux/phylink.h> #include <net/dsa.h>
@@ -482,30 +481,6 @@ static int mv88e6xxx_phy_is_internal(struct dsa_switch *ds, int port)return port < chip->info->num_internal_phys; } -/* We expect the switch to perform auto negotiation if there is a real -* phy. However, in the case of a fixed link phy, we force the port -* settings from the fixed link settings. -*/ -static void mv88e6xxx_adjust_link (struct dsa_switch *ds,int port, -struct phy_device *phydev) -{ -struct mv88e6xxx_chip *chip = ds->priv; -int err; - -if (!phy_is_pseudo_fixed_link (phydev) && -mv88e6xxx_phy_is_internal (ds, port)) -return ; - -mv88e6xxx_reg_lock (chip); - err =mv88e6xxx_port_setup_mac (chip, port, phydev->link, phydev->speed, - phydev->duplex, phydev->pause, - phydev->interface); -mv88e6xxx_reg_unlock (chip); - -if (err && err != -EOPNOTSUPP ) -dev_err (ds->dev,"p%d: failed to configure MAC\n" , port); -} -static void mv88e6065_phylink_validate (struct mv88e6xxx_chip *chip,int port,unsigned long *mask,struct phylink_link_state *state)
@@ -4755,7 +4730,6 @@ static int mv88e6xxx_port_egress_floods(struct dsa_switch *ds, int port,static const struct dsa_switch_ops mv88e6xxx_switch_ops = { .get_tag_protocol = mv88e6xxx_get_tag_protocol, .setup = mv88e6xxx_setup, - .adjust_link = mv88e6xxx_adjust_link, .phylink_validate = mv88e6xxx_validate, .phylink_mac_link_state = mv88e6xxx_link_state, .phylink_mac_config = mv88e6xxx_mac_config,
Signature · 1 line
2.22.0
Quoted 17 lines · Hubert Feurstein
We have to drop the
adjust_linkcallback in order to finally migrate to phylink.Otherwise we get the following warning during startup:
"mv88e6xxx 2188000.ethernet-1:10: Using legacy PHYLIB callbacks. Please
migrate to PHYLINK!"The warning is generated in the function
dsa_port_link_register_ofindsa/port.c:int dsa_port_link_register_of(struct dsa_port *dp) { struct dsa_switch *ds = dp->ds; if (!ds->ops->adjust_link) return dsa_port_phylink_register(dp);
Quoted 6 lines
dev_warn(ds->dev,
"Using legacy PHYLIB callbacks. Please migrate to PHYLINK!\n");
[...]
}Signed-off-by Hubert Feurstein <[email protected]>
Andrew
Andrew Lunn
maintainerQuoted 6 lines · Hubert Feurstein
We have to drop the
adjust_linkcallback in order to finally migrate to phylink.Otherwise we get the following warning during startup:
"mv88e6xxx 2188000.ethernet-1:10: Using legacy PHYLIB callbacks. Please
migrate to PHYLINK!"
Hi Hubert
Do we need the same patch for the b53 driver?
Andrew
Hi Andrew,
It looks like some work is still needed in b53_phylink_mac_config to take over the
functionality of the current adjust_link implementation.
Hubert
Am So., 4. Aug. 2019 um 17:10 Uhr schrieb Andrew Lunn <[email protected]>:
Quoted 14 lines · Hubert Feurstein
Quoted 6 lines
We have to drop the
adjust_linkcallback in order to finally migrate to phylink.Otherwise we get the following warning during startup:
"mv88e6xxx 2188000.ethernet-1:10: Using legacy PHYLIB callbacks. Please
migrate to PHYLINK!"Hi Hubert
Do we need the same patch for the b53 driver?
Andrew
Quoted 5 lines · Hubert Feurstein
Hi Andrew,
It looks like some work is still needed in
b53_phylink_mac_configto take over the
functionality of the currentadjust_linkimplementation.
Indeed, I will look into it in the next few weeks.
Signature · 1 line
Florian
Quoted 21 lines · Hubert Feurstein
We have to drop the
adjust_linkcallback in order to finally migrate to phylink.Otherwise we get the following warning during startup:
"mv88e6xxx 2188000.ethernet-1:10: Using legacy PHYLIB callbacks. Please
migrate to PHYLINK!"The warning is generated in the function
dsa_port_link_register_ofindsa/port.c:int dsa_port_link_register_of(struct dsa_port *dp) { struct dsa_switch *ds = dp->ds;if (!ds->ops->adjust_link) return dsa_port_phylink_register(dp); dev_warn(ds->dev, "Using legacy PHYLIB callbacks. Please migrate to PHYLINK!\n"); [...]
Quoted 4 lines
}
Signed-off-by Hubert Feurstein <[email protected]>---
Quoted 57 lines
drivers/net/dsa/mv88e6xxx/chip.c | 26 -------------------------- 1 file changed, 26 deletions(-)drivers/net/dsa/mv88e6xxx/chip.c +0
-27@@ -27,7 +27,6 @@#include <linux/platform_data/mv88e6xxx.h> #include <linux/netdevice.h> #include <linux/gpio/consumer.h> -#include <linux/phy.h> #include <linux/phylink.h> #include <net/dsa.h> @@ -482,30 +481,6 @@ static int mv88e6xxx_phy_is_internal(struct dsa_switch *ds, int port)return port < chip->info->num_internal_phys; } -/* We expect the switch to perform auto negotiation if there is a real -* phy. However, in the case of a fixed link phy, we force the port -* settings from the fixed link settings. -*/ -static void mv88e6xxx_adjust_link (struct dsa_switch *ds,int port, -struct phy_device *phydev) -{ -struct mv88e6xxx_chip *chip = ds->priv; -int err; - -if (!phy_is_pseudo_fixed_link (phydev) && -mv88e6xxx_phy_is_internal (ds, port)) -return ; - -mv88e6xxx_reg_lock (chip); - err =mv88e6xxx_port_setup_mac (chip, port, phydev->link, phydev->speed, - phydev->duplex, phydev->pause, - phydev->interface); -mv88e6xxx_reg_unlock (chip); - -if (err && err != -EOPNOTSUPP ) -dev_err (ds->dev,"p%d: failed to configure MAC\n" , port); -} -static void mv88e6065_phylink_validate (struct mv88e6xxx_chip *chip,int port,unsigned long *mask,struct phylink_link_state *state)@@ -4755,7 +4730,6 @@ static int mv88e6xxx_port_egress_floods(struct dsa_switch *ds, int port,static const struct dsa_switch_ops mv88e6xxx_switch_ops = { .get_tag_protocol = mv88e6xxx_get_tag_protocol, .setup = mv88e6xxx_setup, - .adjust_link = mv88e6xxx_adjust_link, .phylink_validate = mv88e6xxx_validate, .phylink_mac_link_state = mv88e6xxx_link_state, .phylink_mac_config = mv88e6xxx_mac_config, --2.22.0
From: Hubert Feurstein <[email protected]>
Date: Wed, 31 Jul 2019 17:42:39 +0200
Quoted 17 lines
We have to drop the
adjust_linkcallback in order to finally migrate to phylink.Otherwise we get the following warning during startup:
"mv88e6xxx 2188000.ethernet-1:10: Using legacy PHYLIB callbacks. Please
migrate to PHYLINK!"The warning is generated in the function
dsa_port_link_register_ofindsa/port.c:int dsa_port_link_register_of(struct dsa_port *dp) { struct dsa_switch *ds = dp->ds; if (!ds->ops->adjust_link) return dsa_port_phylink_register(dp);
Quoted 6 lines
dev_warn(ds->dev,
"Using legacy PHYLIB callbacks. Please migrate to PHYLINK!\n");
[...]
}Signed-off-by Hubert Feurstein <[email protected]>
Applied.