summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2020-02-14 13:32:36 +0000
committerRussell King <rmk+kernel@armlinux.org.uk>2020-06-29 01:20:10 +0100
commite037d1d99b3d34cde3b73cebdd50682d7afe40f7 (patch)
tree799f45860b637df4f8d5696e18f8a9488aa3a040
parent852d91c1edc668cc9f44e2a52e3504a10b849152 (diff)
net: dsa: debugging prints
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
-rw-r--r--drivers/net/dsa/mv88e6xxx/port.c12
-rw-r--r--net/dsa/port.c6
2 files changed, 18 insertions, 0 deletions
diff --git a/drivers/net/dsa/mv88e6xxx/port.c b/drivers/net/dsa/mv88e6xxx/port.c
index 8128dc607cf4..a574cff80826 100644
--- a/drivers/net/dsa/mv88e6xxx/port.c
+++ b/drivers/net/dsa/mv88e6xxx/port.c
@@ -53,6 +53,10 @@ int mv88e6185_port_set_pause(struct mv88e6xxx_chip *chip, int port,
else
reg &= ~MV88E6XXX_PORT_STS_MY_PAUSE;
+ if (reg & MV88E6XXX_PORT_MAC_CTL_FORCE_LINK &&
+ reg & MV88E6XXX_PORT_MAC_CTL_LINK_UP)
+ dev_err(chip->dev, "p%d: %s with port up\n", port, __func__);
+
return mv88e6xxx_port_write(chip, port, MV88E6XXX_PORT_STS, reg);
}
@@ -95,6 +99,10 @@ static int mv88e6xxx_port_set_rgmii_delay(struct mv88e6xxx_chip *chip, int port,
return 0;
}
+ if (reg & MV88E6XXX_PORT_MAC_CTL_FORCE_LINK &&
+ reg & MV88E6XXX_PORT_MAC_CTL_LINK_UP)
+ dev_err(chip->dev, "p%d: %s with port up\n", port, __func__);
+
err = mv88e6xxx_port_write(chip, port, MV88E6XXX_PORT_MAC_CTL, reg);
if (err)
return err;
@@ -234,6 +242,10 @@ static int mv88e6xxx_port_set_speed_duplex(struct mv88e6xxx_chip *chip,
}
reg |= ctrl;
+ if (reg & MV88E6XXX_PORT_MAC_CTL_FORCE_LINK &&
+ reg & MV88E6XXX_PORT_MAC_CTL_LINK_UP)
+ dev_err(chip->dev, "p%d: %s with port up\n", port, __func__);
+
err = mv88e6xxx_port_write(chip, port, MV88E6XXX_PORT_MAC_CTL, reg);
if (err)
return err;
diff --git a/net/dsa/port.c b/net/dsa/port.c
index a58fdd362574..ebd2b805680d 100644
--- a/net/dsa/port.c
+++ b/net/dsa/port.c
@@ -496,6 +496,8 @@ static void dsa_port_phylink_mac_config(struct phylink_config *config,
if (!ds->ops->phylink_mac_config)
return;
+ dev_printk(KERN_DEBUG, ds->dev, "p%d: %s()\n", dp->index, __func__);
+
ds->ops->phylink_mac_config(ds, dp->index, mode, state);
}
@@ -518,6 +520,8 @@ static void dsa_port_phylink_mac_link_down(struct phylink_config *config,
struct phy_device *phydev = NULL;
struct dsa_switch *ds = dp->ds;
+ dev_printk(KERN_DEBUG, ds->dev, "p%d: %s()\n", dp->index, __func__);
+
if (dsa_is_user_port(ds, dp->index))
phydev = dp->slave->phydev;
@@ -540,6 +544,8 @@ static void dsa_port_phylink_mac_link_up(struct phylink_config *config,
struct dsa_port *dp = container_of(config, struct dsa_port, pl_config);
struct dsa_switch *ds = dp->ds;
+ dev_printk(KERN_DEBUG, ds->dev, "p%d: %s()\n", dp->index, __func__);
+
if (!ds->ops->phylink_mac_link_up) {
if (ds->ops->adjust_link && phydev)
ds->ops->adjust_link(ds, dp->index, phydev);