From: Alexandru Ardelean <alexandru.ardelean@analog.com>
To: <netdev@vger.kernel.org>, <devicetree@vger.kernel.org>,
<linux-kernel@vger.kernel.org>
Cc: <davem@davemloft.net>, <robh+dt@kernel.org>,
<mark.rutland@arm.com>, <f.fainelli@gmail.com>,
<hkallweit1@gmail.com>, <andrew@lunn.ch>,
Alexandru Ardelean <alexandru.ardelean@analog.com>
Subject: [PATCH v4 12/14] net: phy: adin: implement downshift configuration via phy-tunable
Date: Mon, 12 Aug 2019 14:23:48 +0300 [thread overview]
Message-ID: <20190812112350.15242-13-alexandru.ardelean@analog.com> (raw)
In-Reply-To: <20190812112350.15242-1-alexandru.ardelean@analog.com>
Down-speed auto-negotiation may not always be enabled, in which case the
PHY won't down-shift to 100 or 10 during auto-negotiation.
This change enables downshift and configures the number of retries to
default 4 (which is also in the datasheet
The downshift control mechanism can also be controlled via the phy-tunable
interface (ETHTOOL_PHY_DOWNSHIFT control).
The change has been adapted from the Aquantia PHY driver.
Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
---
drivers/net/phy/adin.c | 86 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 86 insertions(+)
diff --git a/drivers/net/phy/adin.c b/drivers/net/phy/adin.c
index 131a72567f25..e4afa8c2bec7 100644
--- a/drivers/net/phy/adin.c
+++ b/drivers/net/phy/adin.c
@@ -29,6 +29,17 @@
#define ADIN1300_NRG_PD_TX_EN BIT(2)
#define ADIN1300_NRG_PD_STATUS BIT(1)
+#define ADIN1300_PHY_CTRL2 0x0016
+#define ADIN1300_DOWNSPEED_AN_100_EN BIT(11)
+#define ADIN1300_DOWNSPEED_AN_10_EN BIT(10)
+#define ADIN1300_GROUP_MDIO_EN BIT(6)
+#define ADIN1300_DOWNSPEEDS_EN \
+ (ADIN1300_DOWNSPEED_AN_100_EN | ADIN1300_DOWNSPEED_AN_10_EN)
+
+#define ADIN1300_PHY_CTRL3 0x0017
+#define ADIN1300_LINKING_EN BIT(13)
+#define ADIN1300_DOWNSPEED_RETRIES_MSK GENMASK(12, 10)
+
#define ADIN1300_INT_MASK_REG 0x0018
#define ADIN1300_INT_MDIO_SYNC_EN BIT(9)
#define ADIN1300_INT_ANEG_STAT_CHNG_EN BIT(8)
@@ -257,6 +268,73 @@ static int adin_config_rmii_mode(struct phy_device *phydev)
ADIN1300_GE_RMII_CFG_REG, reg);
}
+static int adin_get_downshift(struct phy_device *phydev, u8 *data)
+{
+ int val, cnt, enable;
+
+ val = phy_read(phydev, ADIN1300_PHY_CTRL2);
+ if (val < 0)
+ return val;
+
+ cnt = phy_read(phydev, ADIN1300_PHY_CTRL3);
+ if (cnt < 0)
+ return cnt;
+
+ enable = FIELD_GET(ADIN1300_DOWNSPEEDS_EN, val);
+ cnt = FIELD_GET(ADIN1300_DOWNSPEED_RETRIES_MSK, cnt);
+
+ *data = enable & cnt ? cnt : DOWNSHIFT_DEV_DISABLE;
+
+ return 0;
+}
+
+static int adin_set_downshift(struct phy_device *phydev, u8 cnt)
+{
+ u16 val;
+ int rc;
+
+ if (cnt == DOWNSHIFT_DEV_DISABLE)
+ return phy_clear_bits(phydev, ADIN1300_PHY_CTRL2,
+ ADIN1300_DOWNSPEEDS_EN);
+
+ if (cnt > 8)
+ return -E2BIG;
+
+ val = FIELD_PREP(ADIN1300_DOWNSPEED_RETRIES_MSK, cnt);
+ val |= ADIN1300_LINKING_EN;
+
+ rc = phy_modify(phydev, ADIN1300_PHY_CTRL3,
+ ADIN1300_LINKING_EN | ADIN1300_DOWNSPEED_RETRIES_MSK,
+ val);
+ if (rc < 0)
+ return rc;
+
+ return phy_set_bits(phydev, ADIN1300_PHY_CTRL2,
+ ADIN1300_DOWNSPEEDS_EN);
+}
+
+static int adin_get_tunable(struct phy_device *phydev,
+ struct ethtool_tunable *tuna, void *data)
+{
+ switch (tuna->id) {
+ case ETHTOOL_PHY_DOWNSHIFT:
+ return adin_get_downshift(phydev, data);
+ default:
+ return -EOPNOTSUPP;
+ }
+}
+
+static int adin_set_tunable(struct phy_device *phydev,
+ struct ethtool_tunable *tuna, const void *data)
+{
+ switch (tuna->id) {
+ case ETHTOOL_PHY_DOWNSHIFT:
+ return adin_set_downshift(phydev, *(const u8 *)data);
+ default:
+ return -EOPNOTSUPP;
+ }
+}
+
static int adin_config_init_edpd(struct phy_device *phydev)
{
struct adin_priv *priv = phydev->priv;
@@ -287,6 +365,10 @@ static int adin_config_init(struct phy_device *phydev)
if (rc < 0)
return rc;
+ rc = adin_set_downshift(phydev, 4);
+ if (rc < 0)
+ return rc;
+
rc = adin_config_init_edpd(phydev);
if (rc < 0)
return rc;
@@ -532,6 +614,8 @@ static struct phy_driver adin_driver[] = {
.probe = adin_probe,
.config_aneg = adin_config_aneg,
.read_status = adin_read_status,
+ .get_tunable = adin_get_tunable,
+ .set_tunable = adin_set_tunable,
.ack_interrupt = adin_phy_ack_intr,
.config_intr = adin_phy_config_intr,
.resume = genphy_resume,
@@ -546,6 +630,8 @@ static struct phy_driver adin_driver[] = {
.probe = adin_probe,
.config_aneg = adin_config_aneg,
.read_status = adin_read_status,
+ .get_tunable = adin_get_tunable,
+ .set_tunable = adin_set_tunable,
.ack_interrupt = adin_phy_ack_intr,
.config_intr = adin_phy_config_intr,
.resume = genphy_resume,
--
2.20.1
next prev parent reply other threads:[~2019-08-12 11:24 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-12 11:23 [PATCH v4 00/14] net: phy: adin: add support for Analog Devices PHYs Alexandru Ardelean
2019-08-12 11:23 ` [PATCH v4 01/14] " Alexandru Ardelean
2019-08-14 17:47 ` Florian Fainelli
2019-08-12 11:23 ` [PATCH v4 02/14] net: phy: adin: hook genphy_{suspend,resume} into the driver Alexandru Ardelean
2019-08-14 17:47 ` Florian Fainelli
2019-08-12 11:23 ` [PATCH v4 03/14] net: phy: adin: add support for interrupts Alexandru Ardelean
2019-08-14 17:48 ` Florian Fainelli
2019-08-12 11:23 ` [PATCH v4 04/14] net: phy: adin: add {write,read}_mmd hooks Alexandru Ardelean
2019-08-12 14:06 ` Andrew Lunn
2019-08-14 17:49 ` Florian Fainelli
2019-08-12 11:23 ` [PATCH v4 05/14] net: phy: adin: configure RGMII/RMII/MII modes on config Alexandru Ardelean
2019-08-14 17:50 ` Florian Fainelli
2019-08-12 11:23 ` [PATCH v4 06/14] net: phy: adin: make RGMII internal delays configurable Alexandru Ardelean
2019-08-14 17:52 ` Florian Fainelli
2019-08-12 11:23 ` [PATCH v4 07/14] net: phy: adin: make RMII fifo depth configurable Alexandru Ardelean
2019-08-14 17:53 ` Florian Fainelli
2019-08-12 11:23 ` [PATCH v4 08/14] net: phy: adin: add support MDI/MDIX/Auto-MDI selection Alexandru Ardelean
2019-08-14 17:54 ` Florian Fainelli
2019-08-12 11:23 ` [PATCH v4 09/14] net: phy: adin: add EEE translation layer from Clause 45 to Clause 22 Alexandru Ardelean
2019-08-12 14:08 ` Andrew Lunn
2019-08-14 17:55 ` Florian Fainelli
2019-08-12 11:23 ` [PATCH v4 10/14] net: phy: adin: implement PHY subsystem software reset Alexandru Ardelean
2019-08-12 14:19 ` Andrew Lunn
2019-08-13 5:42 ` Ardelean, Alexandru
2019-08-12 11:23 ` [PATCH v4 11/14] net: phy: adin: implement Energy Detect Powerdown mode Alexandru Ardelean
2019-08-14 17:57 ` Florian Fainelli
2019-08-16 6:09 ` Ardelean, Alexandru
2019-08-12 11:23 ` Alexandru Ardelean [this message]
2019-08-12 14:21 ` [PATCH v4 12/14] net: phy: adin: implement downshift configuration via phy-tunable Andrew Lunn
2019-08-14 17:58 ` Florian Fainelli
2019-08-12 11:23 ` [PATCH v4 13/14] net: phy: adin: add ethtool get_stats support Alexandru Ardelean
2019-08-12 14:26 ` Andrew Lunn
2019-08-13 6:07 ` Ardelean, Alexandru
2019-08-12 14:33 ` Andrew Lunn
2019-08-13 5:48 ` Ardelean, Alexandru
2019-08-14 9:08 ` Ardelean, Alexandru
2019-08-14 14:04 ` Andrew Lunn
2019-08-12 11:23 ` [PATCH v4 14/14] dt-bindings: net: add bindings for ADIN PHY driver Alexandru Ardelean
2019-08-12 14:34 ` Andrew Lunn
2019-08-12 19:02 ` Rob Herring
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=20190812112350.15242-13-alexandru.ardelean@analog.com \
--to=alexandru.ardelean@analog.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=f.fainelli@gmail.com \
--cc=hkallweit1@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=netdev@vger.kernel.org \
--cc=robh+dt@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: link
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;
as well as URLs for NNTP newsgroup(s).