From: Jonathan McDowell <noodles@earth•li>
To: Andrew Lunn <andrew@lunn•ch>,
Heiner Kallweit <hkallweit1@gmail•com>,
Russell King <linux@armlinux•org.uk>,
David Miller <davem@davemloft•net>,
Jakub Kicinski <kuba@kernel•org>, Luo Jie <luoj@codeaurora•org>
Cc: netdev@vger•kernel.org, linux-kernel@vger•kernel.org,
Robert Marko <robimarko@gmail•com>
Subject: [PATCH net v2] net: phy: Fix qca8081 with speeds lower than 2.5Gb/s
Date: Mon, 31 Jan 2022 13:56:41 +0000 [thread overview]
Message-ID: <YffqmcR4iC3xKaRm@earth.li> (raw)
In-Reply-To: <YfZnmMteVry/A1XR@earth.li>
A typo in qca808x_read_status means we try to set SMII mode on the port
rather than SGMII when the link speed is not 2.5Gb/s. This results in no
traffic due to the mismatch in configuration between the phy and the
mac.
v2:
Only change interface mode when the link is up
Fixes: 79c7bc0521545 ("net: phy: add qca8081 read_status")
Cc: stable@vger•kernel.org
Signed-off-by: Jonathan McDowell <noodles@earth•li>
---
drivers/net/phy/at803x.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
index 5b6c0d120e09..29aa811af430 100644
--- a/drivers/net/phy/at803x.c
+++ b/drivers/net/phy/at803x.c
@@ -1688,19 +1688,19 @@ static int qca808x_read_status(struct phy_device *phydev)
if (ret < 0)
return ret;
- if (phydev->link && phydev->speed == SPEED_2500)
- phydev->interface = PHY_INTERFACE_MODE_2500BASEX;
- else
- phydev->interface = PHY_INTERFACE_MODE_SMII;
-
- /* generate seed as a lower random value to make PHY linked as SLAVE easily,
- * except for master/slave configuration fault detected.
- * the reason for not putting this code into the function link_change_notify is
- * the corner case where the link partner is also the qca8081 PHY and the seed
- * value is configured as the same value, the link can't be up and no link change
- * occurs.
- */
- if (!phydev->link) {
+ if (phydev->link) {
+ if (phydev->speed == SPEED_2500)
+ phydev->interface = PHY_INTERFACE_MODE_2500BASEX;
+ else
+ phydev->interface = PHY_INTERFACE_MODE_SGMII;
+ } else {
+ /* generate seed as a lower random value to make PHY linked as SLAVE easily,
+ * except for master/slave configuration fault detected.
+ * the reason for not putting this code into the function link_change_notify is
+ * the corner case where the link partner is also the qca8081 PHY and the seed
+ * value is configured as the same value, the link can't be up and no link change
+ * occurs.
+ */
if (phydev->master_slave_state == MASTER_SLAVE_STATE_ERR) {
qca808x_phy_ms_seed_enable(phydev, false);
} else {
--
2.30.2
next prev parent reply other threads:[~2022-01-31 13:56 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-30 10:25 [PATCH net] net: phy: Fix qca8081 with speeds lower than 2.5Gb/s Jonathan McDowell
2022-01-30 12:40 ` Russell King (Oracle)
2022-01-30 15:18 ` Jonathan McDowell
2022-01-30 18:09 ` Russell King (Oracle)
2022-01-31 8:41 ` Jonathan McDowell
2022-01-31 13:56 ` Jonathan McDowell [this message]
2022-01-31 14:19 ` [PATCH net v2] " Russell King (Oracle)
2022-02-01 14:30 ` patchwork-bot+netdevbpf
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=YffqmcR4iC3xKaRm@earth.li \
--to=noodles@earth$(echo .)li \
--cc=andrew@lunn$(echo .)ch \
--cc=davem@davemloft$(echo .)net \
--cc=hkallweit1@gmail$(echo .)com \
--cc=kuba@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux@armlinux$(echo .)org.uk \
--cc=luoj@codeaurora$(echo .)org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=robimarko@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox