From: Luo Jie <luoj@codeaurora.org>
To: andrew@lunn.ch, hkallweit1@gmail.com, linux@armlinux.org.uk,
davem@davemloft.net, kuba@kernel.org
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
sricharan@codeaurora.org, Luo Jie <luoj@codeaurora.org>
Subject: [PATCH v4 08/14] net: phy: add qca8081 config_aneg
Date: Fri, 22 Oct 2021 20:06:18 +0800 [thread overview]
Message-ID: <20211022120624.18069-9-luoj@codeaurora.org> (raw)
In-Reply-To: <20211022120624.18069-1-luoj@codeaurora.org>
Reuse at803x phy driver config_aneg excepting
adding 2500M auto-negotiation.
Signed-off-by: Luo Jie <luoj@codeaurora.org>
---
drivers/net/phy/at803x.c | 26 +++++++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
index 987497e39e50..8d230e4fd1a3 100644
--- a/drivers/net/phy/at803x.c
+++ b/drivers/net/phy/at803x.c
@@ -1101,7 +1101,30 @@ static int at803x_config_aneg(struct phy_device *phydev)
return ret;
}
- return genphy_config_aneg(phydev);
+ /* Do not restart auto-negotiation by setting ret to 0 defautly,
+ * when calling __genphy_config_aneg later.
+ */
+ ret = 0;
+
+ if (phydev->drv->phy_id == QCA8081_PHY_ID) {
+ int phy_ctrl = 0;
+
+ /* The reg MII_BMCR also needs to be configured for force mode, the
+ * genphy_config_aneg is also needed.
+ */
+ if (phydev->autoneg == AUTONEG_DISABLE)
+ genphy_c45_pma_setup_forced(phydev);
+
+ if (linkmode_test_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, phydev->advertising))
+ phy_ctrl = MDIO_AN_10GBT_CTRL_ADV2_5G;
+
+ ret = phy_modify_mmd_changed(phydev, MDIO_MMD_AN, MDIO_AN_10GBT_CTRL,
+ MDIO_AN_10GBT_CTRL_ADV2_5G, phy_ctrl);
+ if (ret < 0)
+ return ret;
+ }
+
+ return __genphy_config_aneg(phydev, ret);
}
static int at803x_get_downshift(struct phy_device *phydev, u8 *d)
@@ -1552,6 +1575,7 @@ static struct phy_driver at803x_driver[] = {
.set_wol = at803x_set_wol,
.get_wol = at803x_get_wol,
.get_features = at803x_get_features,
+ .config_aneg = at803x_config_aneg,
.suspend = genphy_suspend,
.resume = genphy_resume,
.read_status = qca808x_read_status,
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
next prev parent reply other threads:[~2021-10-22 12:08 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-22 12:06 [PATCH v4 0/14] net: phy: Add qca8081 ethernet phy driver Luo Jie
2021-10-22 12:06 ` [PATCH v4 01/14] net: phy: at803x: replace AT803X_DEVICE_ADDR with MDIO_MMD_PCS Luo Jie
2021-10-22 12:13 ` Russell King (Oracle)
2021-10-23 1:53 ` Jie Luo
2021-10-23 8:19 ` Russell King (Oracle)
2021-10-22 12:06 ` [PATCH v4 02/14] net: phy: at803x: use phy_modify() Luo Jie
2021-10-22 12:15 ` Russell King (Oracle)
2021-10-23 1:54 ` Jie Luo
2021-10-22 12:06 ` [PATCH v4 03/14] net: phy: at803x: improve the WOL feature Luo Jie
2021-10-22 12:06 ` [PATCH v4 04/14] net: phy: at803x: use GENMASK() for speed status Luo Jie
2021-10-22 12:06 ` [PATCH v4 05/14] net: phy: add qca8081 ethernet phy driver Luo Jie
2021-10-22 16:03 ` Jakub Kicinski
2021-10-23 1:55 ` Jie Luo
2021-10-22 12:06 ` [PATCH v4 06/14] net: phy: add qca8081 read_status Luo Jie
2021-10-22 12:06 ` [PATCH v4 07/14] net: phy: add qca8081 get_features Luo Jie
2021-10-22 12:06 ` Luo Jie [this message]
2021-10-22 12:06 ` [PATCH v4 09/14] net: phy: add constants for fast retrain related register Luo Jie
2021-10-22 12:06 ` [PATCH v4 10/14] net: phy: add genphy_c45_fast_retrain Luo Jie
2021-10-22 12:06 ` [PATCH v4 11/14] net: phy: add qca8081 config_init Luo Jie
2021-10-22 12:06 ` [PATCH v4 12/14] net: phy: add qca8081 soft_reset and enable master/slave seed Luo Jie
2021-10-22 12:06 ` [PATCH v4 13/14] net: phy: adjust qca8081 master/slave seed value if link down Luo Jie
2021-10-22 12:06 ` [PATCH v4 14/14] net: phy: add qca8081 cdt feature Luo Jie
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=20211022120624.18069-9-luoj@codeaurora.org \
--to=luoj@codeaurora.org \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=hkallweit1@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=netdev@vger.kernel.org \
--cc=sricharan@codeaurora.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 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.