From: Russell King <rmk+kernel@armlinux•org.uk>
To: Andrew Lunn <andrew@lunn•ch>, Florian Fainelli <f.fainelli@gmail•com>
Cc: netdev@vger•kernel.org
Subject: [PATCH 2/6] net: phy: avoid genphy_aneg_done() for PHYs without clause 22 support
Date: Mon, 05 Jun 2017 12:22:55 +0100 [thread overview]
Message-ID: <E1dHq63-0005Wr-K2@rmk-PC.armlinux.org.uk> (raw)
In-Reply-To: <20170605112203.GA10680@n2100.armlinux.org.uk>
Avoid calling genphy_aneg_done() for PHYs that do not implement the
Clause 22 register set.
Clause 45 PHYs may implement the Clause 22 register set along with the
Clause 22 extension MMD. Hence, we can't simply block access to the
Clause 22 functions based on the PHY being a Clause 45 PHY.
Signed-off-by: Russell King <rmk+kernel@armlinux•org.uk>
---
drivers/net/phy/phy.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 82ab8fb82587..788da83a5c7e 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -163,6 +163,12 @@ int phy_aneg_done(struct phy_device *phydev)
if (phydev->drv && phydev->drv->aneg_done)
return phydev->drv->aneg_done(phydev);
+ /* Avoid genphy_aneg_done() if the Clause 45 PHY does not
+ * implement Clause 22 registers
+ */
+ if (phydev->is_c45 && !(phydev->c45_ids.devices_in_package & BIT(0)))
+ return -EINVAL;
+
return genphy_aneg_done(phydev);
}
EXPORT_SYMBOL(phy_aneg_done);
--
2.7.4
next prev parent reply other threads:[~2017-06-05 11:22 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-01 10:23 [PATCH 0/5] Add phylib support for MV88X3310 10G phy Russell King - ARM Linux
2017-06-01 10:26 ` [PATCH 1/5] net: phy: add 802.3 clause 45 support to phylib Russell King
2017-06-01 12:28 ` Andrew Lunn
2017-06-01 17:15 ` Florian Fainelli
2017-06-02 12:39 ` Russell King - ARM Linux
2017-06-01 10:26 ` [PATCH 2/5] net: phy: hook up clause 45 autonegotiation restart Russell King
2017-06-01 12:23 ` Andrew Lunn
2017-06-01 12:51 ` Russell King - ARM Linux
2017-06-01 13:05 ` Andrew Lunn
2017-06-01 13:09 ` Russell King - ARM Linux
2017-06-01 13:19 ` Andrew Lunn
2017-06-01 15:47 ` Russell King - ARM Linux
2017-06-01 16:24 ` Russell King - ARM Linux
2017-06-01 17:16 ` Florian Fainelli
2017-06-02 12:43 ` Russell King - ARM Linux
2017-06-02 13:46 ` Andrew Lunn
2017-06-02 14:04 ` Russell King - ARM Linux
2017-06-01 10:26 ` [PATCH 3/5] net: phy: split out 10G genphy support Russell King
2017-06-01 12:29 ` Andrew Lunn
2017-06-01 17:17 ` Florian Fainelli
2017-06-01 10:26 ` [PATCH 4/5] net: phy: add XAUI and 10GBASE-KR PHY connection types Russell King
[not found] ` <E1dGNJX-00043v-3M-eh5Bv4kxaXIk46pC+1QYvQNdhmdF6hFW@public.gmane.org>
2017-06-01 12:30 ` Andrew Lunn
2017-06-01 16:56 ` Florian Fainelli
[not found] ` <fb1a81e0-b5b9-80e4-7852-cc65a574b9e9-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-06-01 17:32 ` Russell King - ARM Linux
2017-06-01 10:26 ` [PATCH 5/5] net: phy: add Marvell Alaska X 88X3310 10Gigabit PHY support Russell King
2017-06-01 12:51 ` Andrew Lunn
2017-06-01 13:06 ` Russell King - ARM Linux
2017-06-01 17:28 ` Florian Fainelli
2017-06-01 17:57 ` Russell King - ARM Linux
2017-06-01 16:07 ` [PATCH 0/5] Add phylib support for MV88X3310 10G phy David Miller
[not found] ` <20170601.120736.670167741447008364.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
2017-06-01 16:54 ` Russell King - ARM Linux
[not found] ` <20170601102327.GF27796-l+eeeJia6m9URfEZ8mYm6t73F7V6hmMc@public.gmane.org>
2017-06-05 11:22 ` [PATCH v2 0/6] " Russell King - ARM Linux
2017-06-05 11:22 ` [PATCH 1/6] net: phy: add 802.3 clause 45 support to phylib Russell King
2017-06-05 16:25 ` Florian Fainelli
2017-06-05 11:22 ` Russell King [this message]
2017-06-05 11:58 ` [PATCH 2/6] net: phy: avoid genphy_aneg_done() for PHYs without clause 22 support Andrew Lunn
2017-06-05 16:29 ` Florian Fainelli
2017-06-05 11:23 ` [PATCH 3/6] net: phy: hook up clause 45 autonegotiation restart Russell King
2017-06-05 11:59 ` Andrew Lunn
2017-06-05 16:30 ` Florian Fainelli
2017-06-05 11:23 ` [PATCH 4/6] net: phy: split out 10G genphy support Russell King
2017-06-05 11:23 ` [PATCH 5/6] net: phy: add XAUI and 10GBASE-KR PHY connection types Russell King
[not found] ` <E1dHq6I-0005XE-VR-eh5Bv4kxaXIk46pC+1QYvQNdhmdF6hFW@public.gmane.org>
2017-06-05 12:00 ` Andrew Lunn
2017-06-05 16:24 ` Florian Fainelli
2017-06-05 11:23 ` [PATCH 6/6] net: phy: add Marvell Alaska X 88X3310 10Gigabit PHY support Russell King
2017-06-05 18:20 ` Andrew Lunn
2017-06-05 18:21 ` Florian Fainelli
2017-06-05 18:21 ` Andrew Lunn
2017-06-05 22:10 ` Russell King - ARM Linux
[not found] ` <20170605112203.GA10680-l+eeeJia6m9URfEZ8mYm6t73F7V6hmMc@public.gmane.org>
2017-06-05 21:53 ` [PATCH v2 0/6] Add phylib support for MV88X3310 10G phy David Miller
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=E1dHq63-0005Wr-K2@rmk-PC.armlinux.org.uk \
--to=rmk+kernel@armlinux$(echo .)org.uk \
--cc=andrew@lunn$(echo .)ch \
--cc=f.fainelli@gmail$(echo .)com \
--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