From: Heiner Kallweit <hkallweit1@gmail•com>
To: Andrew Lunn <andrew@lunn•ch>,
Florian Fainelli <f.fainelli@gmail•com>,
David Miller <davem@davemloft•net>,
Russell King - ARM Linux <linux@armlinux•org.uk>
Cc: "netdev@vger•kernel.org" <netdev@vger•kernel.org>
Subject: [PATCH net-next 4/4] net: phy: marvell10g: check for newly set aneg in mv3310_config_aneg
Date: Sat, 16 Feb 2019 20:53:29 +0100 [thread overview]
Message-ID: <249c09b1-e4b2-6d72-b0cc-018fef336a4b@gmail.com> (raw)
In-Reply-To: <0423e795-0215-053f-57ff-386242a6d7ce@gmail.com>
Even if the advertisement registers content didn't change, we may have
just switched to aneg, and therefore have to trigger an aneg restart.
This matches the behavior of genphy_config_aneg().
Signed-off-by: Heiner Kallweit <hkallweit1@gmail•com>
---
drivers/net/phy/marvell10g.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c
index 03fa50087..4d8a290eb 100644
--- a/drivers/net/phy/marvell10g.c
+++ b/drivers/net/phy/marvell10g.c
@@ -288,6 +288,16 @@ static int mv3310_config_aneg(struct phy_device *phydev)
if (ret > 0)
changed = true;
+ if (!changed) {
+ /* Configure and restart aneg if it wasn't set before */
+ ret = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_CTRL1);
+ if (ret < 0)
+ return ret;
+
+ if (!(ret & MDIO_AN_CTRL1_ENABLE))
+ changed = 1;
+ }
+
if (changed)
ret = genphy_c45_restart_aneg(phydev);
--
2.20.1
next prev parent reply other threads:[~2019-02-16 19:53 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-16 19:49 [PATCH net-next 0/4] net: phy: add and use genphy_c45_an_config_an Heiner Kallweit
2019-02-16 19:50 ` [PATCH net-next 1/4] net: phy: add helper linkmode_adv_to_mii_10gbt_adv_t Heiner Kallweit
2019-02-17 2:38 ` Florian Fainelli
2019-02-16 19:51 ` [PATCH net-next 2/4] net: phy: add genphy_c45_an_config_an Heiner Kallweit
2019-02-17 2:44 ` Florian Fainelli
2019-02-17 4:18 ` Andrew Lunn
2019-02-17 8:14 ` Heiner Kallweit
2019-02-16 19:52 ` [PATCH net-next 3/4] net: phy: marvell10g: use genphy_c45_an_config_an Heiner Kallweit
2019-02-17 2:47 ` Florian Fainelli
2019-02-17 4:22 ` Andrew Lunn
2019-02-16 19:53 ` Heiner Kallweit [this message]
2019-02-17 2:49 ` [PATCH net-next 4/4] net: phy: marvell10g: check for newly set aneg in mv3310_config_aneg Florian Fainelli
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=249c09b1-e4b2-6d72-b0cc-018fef336a4b@gmail.com \
--to=hkallweit1@gmail$(echo .)com \
--cc=andrew@lunn$(echo .)ch \
--cc=davem@davemloft$(echo .)net \
--cc=f.fainelli@gmail$(echo .)com \
--cc=linux@armlinux$(echo .)org.uk \
--cc=netdev@vger$(echo .)kernel.org \
/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