From: Oleksij Rempel <o.rempel@pengutronix.de> To: Shawn Guo <shawnguo@kernel.org>, Sascha Hauer <s.hauer@pengutronix.de>, Andrew Lunn <andrew@lunn.ch>, Florian Fainelli <f.fainelli@gmail.com>, Heiner Kallweit <hkallweit1@gmail.com>, Fugang Duan <fugang.duan@nxp.com> Cc: Oleksij Rempel <o.rempel@pengutronix.de>, kernel@pengutronix.de, netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-imx@nxp.com, Fabio Estevam <festevam@gmail.com>, David Jander <david@protonic.nl>, Russell King <linux@armlinux.org.uk>, Philippe Schenker <philippe.schenker@toradex.com> Subject: [PATCH net-next v3 2/6] net: phy: genphy_loopback: add link speed configuration Date: Mon, 19 Apr 2021 15:01:02 +0200 [thread overview] Message-ID: <20210419130106.6707-3-o.rempel@pengutronix.de> (raw) In-Reply-To: <20210419130106.6707-1-o.rempel@pengutronix.de> In case of loopback, in most cases we need to disable autoneg support and force some speed configuration. Otherwise, depending on currently active auto negotiated link speed, the loopback may or may not work. This patch was tested with following PHYs: TJA1102, KSZ8081, KSZ9031, AT8035, AR9331. Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> --- drivers/net/phy/phy.c | 3 ++- drivers/net/phy/phy_device.c | 28 ++++++++++++++++++++++++++-- include/linux/phy.h | 1 + 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index fc2e7cb5b2e5..1f0512e39c65 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -701,7 +701,7 @@ int phy_start_cable_test_tdr(struct phy_device *phydev, } EXPORT_SYMBOL(phy_start_cable_test_tdr); -static int phy_config_aneg(struct phy_device *phydev) +int phy_config_aneg(struct phy_device *phydev) { if (phydev->drv->config_aneg) return phydev->drv->config_aneg(phydev); @@ -714,6 +714,7 @@ static int phy_config_aneg(struct phy_device *phydev) return genphy_config_aneg(phydev); } +EXPORT_SYMBOL(phy_config_aneg); /** * phy_check_link_status - check link status and set state accordingly diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 320a3e5cd10a..0a2d8bedf73d 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -2565,8 +2565,32 @@ EXPORT_SYMBOL(genphy_resume); int genphy_loopback(struct phy_device *phydev, bool enable) { - return phy_modify(phydev, MII_BMCR, BMCR_LOOPBACK, - enable ? BMCR_LOOPBACK : 0); + if (enable) { + u16 val, ctl = BMCR_LOOPBACK; + int ret; + + if (phydev->speed == SPEED_1000) + ctl |= BMCR_SPEED1000; + else if (phydev->speed == SPEED_100) + ctl |= BMCR_SPEED100; + + if (phydev->duplex == DUPLEX_FULL) + ctl |= BMCR_FULLDPLX; + + phy_modify(phydev, MII_BMCR, ~0, ctl); + + ret = phy_read_poll_timeout(phydev, MII_BMSR, val, + val & BMSR_LSTATUS, + 5000, 500000, true); + if (ret) + return ret; + } else { + phy_modify(phydev, MII_BMCR, BMCR_LOOPBACK, 0); + + phy_config_aneg(phydev); + } + + return 0; } EXPORT_SYMBOL(genphy_loopback); diff --git a/include/linux/phy.h b/include/linux/phy.h index 98fb441dd72e..98e351bb0964 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -1410,6 +1410,7 @@ void phy_disconnect(struct phy_device *phydev); void phy_detach(struct phy_device *phydev); void phy_start(struct phy_device *phydev); void phy_stop(struct phy_device *phydev); +int phy_config_aneg(struct phy_device *phydev); int phy_start_aneg(struct phy_device *phydev); int phy_aneg_done(struct phy_device *phydev); int phy_speed_down(struct phy_device *phydev, bool sync); -- 2.29.2
WARNING: multiple messages have this Message-ID (diff)
From: Oleksij Rempel <o.rempel@pengutronix.de> To: Shawn Guo <shawnguo@kernel.org>, Sascha Hauer <s.hauer@pengutronix.de>, Andrew Lunn <andrew@lunn.ch>, Florian Fainelli <f.fainelli@gmail.com>, Heiner Kallweit <hkallweit1@gmail.com>, Fugang Duan <fugang.duan@nxp.com> Cc: Oleksij Rempel <o.rempel@pengutronix.de>, kernel@pengutronix.de, netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-imx@nxp.com, Fabio Estevam <festevam@gmail.com>, David Jander <david@protonic.nl>, Russell King <linux@armlinux.org.uk>, Philippe Schenker <philippe.schenker@toradex.com> Subject: [PATCH net-next v3 2/6] net: phy: genphy_loopback: add link speed configuration Date: Mon, 19 Apr 2021 15:01:02 +0200 [thread overview] Message-ID: <20210419130106.6707-3-o.rempel@pengutronix.de> (raw) In-Reply-To: <20210419130106.6707-1-o.rempel@pengutronix.de> In case of loopback, in most cases we need to disable autoneg support and force some speed configuration. Otherwise, depending on currently active auto negotiated link speed, the loopback may or may not work. This patch was tested with following PHYs: TJA1102, KSZ8081, KSZ9031, AT8035, AR9331. Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> --- drivers/net/phy/phy.c | 3 ++- drivers/net/phy/phy_device.c | 28 ++++++++++++++++++++++++++-- include/linux/phy.h | 1 + 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index fc2e7cb5b2e5..1f0512e39c65 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -701,7 +701,7 @@ int phy_start_cable_test_tdr(struct phy_device *phydev, } EXPORT_SYMBOL(phy_start_cable_test_tdr); -static int phy_config_aneg(struct phy_device *phydev) +int phy_config_aneg(struct phy_device *phydev) { if (phydev->drv->config_aneg) return phydev->drv->config_aneg(phydev); @@ -714,6 +714,7 @@ static int phy_config_aneg(struct phy_device *phydev) return genphy_config_aneg(phydev); } +EXPORT_SYMBOL(phy_config_aneg); /** * phy_check_link_status - check link status and set state accordingly diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 320a3e5cd10a..0a2d8bedf73d 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -2565,8 +2565,32 @@ EXPORT_SYMBOL(genphy_resume); int genphy_loopback(struct phy_device *phydev, bool enable) { - return phy_modify(phydev, MII_BMCR, BMCR_LOOPBACK, - enable ? BMCR_LOOPBACK : 0); + if (enable) { + u16 val, ctl = BMCR_LOOPBACK; + int ret; + + if (phydev->speed == SPEED_1000) + ctl |= BMCR_SPEED1000; + else if (phydev->speed == SPEED_100) + ctl |= BMCR_SPEED100; + + if (phydev->duplex == DUPLEX_FULL) + ctl |= BMCR_FULLDPLX; + + phy_modify(phydev, MII_BMCR, ~0, ctl); + + ret = phy_read_poll_timeout(phydev, MII_BMSR, val, + val & BMSR_LSTATUS, + 5000, 500000, true); + if (ret) + return ret; + } else { + phy_modify(phydev, MII_BMCR, BMCR_LOOPBACK, 0); + + phy_config_aneg(phydev); + } + + return 0; } EXPORT_SYMBOL(genphy_loopback); diff --git a/include/linux/phy.h b/include/linux/phy.h index 98fb441dd72e..98e351bb0964 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -1410,6 +1410,7 @@ void phy_disconnect(struct phy_device *phydev); void phy_detach(struct phy_device *phydev); void phy_start(struct phy_device *phydev); void phy_stop(struct phy_device *phydev); +int phy_config_aneg(struct phy_device *phydev); int phy_start_aneg(struct phy_device *phydev); int phy_aneg_done(struct phy_device *phydev); int phy_speed_down(struct phy_device *phydev, bool sync); -- 2.29.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-04-19 13:01 UTC|newest] Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-04-19 13:01 [PATCH net-next v3 0/6] provide generic net selftest support Oleksij Rempel 2021-04-19 13:01 ` Oleksij Rempel 2021-04-19 13:01 ` [PATCH net-next v3 1/6] net: phy: execute genphy_loopback() per default on all PHYs Oleksij Rempel 2021-04-19 13:01 ` Oleksij Rempel 2021-04-19 13:01 ` Oleksij Rempel [this message] 2021-04-19 13:01 ` [PATCH net-next v3 2/6] net: phy: genphy_loopback: add link speed configuration Oleksij Rempel 2021-04-19 13:01 ` [PATCH net-next v3 3/6] net: add generic selftest support Oleksij Rempel 2021-04-19 13:01 ` Oleksij Rempel 2021-04-30 6:45 ` Geert Uytterhoeven 2021-04-30 6:45 ` Geert Uytterhoeven 2021-04-30 7:26 ` Oleksij Rempel 2021-04-30 7:26 ` Oleksij Rempel 2021-04-30 7:49 ` Geert Uytterhoeven 2021-04-30 7:49 ` Geert Uytterhoeven 2021-04-30 12:31 ` Andrew Lunn 2021-04-30 12:31 ` Andrew Lunn 2021-04-19 13:01 ` [PATCH net-next v3 4/6] net: fec: make use of generic NET_SELFTESTS library Oleksij Rempel 2021-04-19 13:01 ` Oleksij Rempel 2021-04-19 13:01 ` [PATCH net-next v3 5/6] net: ag71xx: " Oleksij Rempel 2021-04-19 13:01 ` Oleksij Rempel 2021-04-19 13:01 ` [PATCH net-next v3 6/6] net: dsa: enable selftest support for all switches by default Oleksij Rempel 2021-04-19 13:01 ` Oleksij Rempel 2021-04-23 3:18 ` [PATCH net-next v3 0/6] provide generic net selftest support Joakim Zhang 2021-04-23 3:18 ` Joakim Zhang 2021-04-23 4:37 ` Oleksij Rempel 2021-04-23 4:37 ` Oleksij Rempel 2021-04-27 4:48 ` Joakim Zhang 2021-04-27 4:48 ` Joakim Zhang 2021-04-27 7:15 ` Oleksij Rempel 2021-04-27 7:15 ` Oleksij Rempel 2021-04-27 16:40 ` Florian Fainelli 2021-04-27 16:40 ` Florian Fainelli 2021-04-28 8:06 ` Joakim Zhang 2021-04-28 8:06 ` Joakim Zhang 2021-04-28 8:51 ` Oleksij Rempel 2021-04-28 8:51 ` Oleksij Rempel
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210419130106.6707-3-o.rempel@pengutronix.de \ --to=o.rempel@pengutronix.de \ --cc=andrew@lunn.ch \ --cc=david@protonic.nl \ --cc=f.fainelli@gmail.com \ --cc=festevam@gmail.com \ --cc=fugang.duan@nxp.com \ --cc=hkallweit1@gmail.com \ --cc=kernel@pengutronix.de \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-imx@nxp.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux@armlinux.org.uk \ --cc=netdev@vger.kernel.org \ --cc=philippe.schenker@toradex.com \ --cc=s.hauer@pengutronix.de \ --cc=shawnguo@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.