All of lore.kernel.org
 help / color / mirror / Atom feed
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 v2 08/13] net: phy: add qca8081 config_aneg
Date: Fri, 15 Oct 2021 15:35:00 +0800	[thread overview]
Message-ID: <20211015073505.1893-9-luoj@codeaurora.org> (raw)
In-Reply-To: <20211015073505.1893-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 7aec37593983..b12cad633b98 100644
--- a/drivers/net/phy/at803x.c
+++ b/drivers/net/phy/at803x.c
@@ -1084,7 +1084,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)
@@ -1503,6 +1526,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


  parent reply	other threads:[~2021-10-15  7:37 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-15  7:34 [PATCH v2 0/13] net: phy: Add qca8081 ethernet phy driver Luo Jie
2021-10-15  7:34 ` [PATCH v2 01/13] net: phy: at803x: replace AT803X_DEVICE_ADDR with MDIO_MMD_PCS Luo Jie
2021-10-15  7:34 ` [PATCH v2 02/13] net: phy: at803x: use phy_modify() Luo Jie
2021-10-15  7:34 ` [PATCH v2 03/13] net: phy: at803x: improve the WOL feature Luo Jie
2021-10-15  7:34 ` [PATCH v2 04/13] net: phy: at803x: use GENMASK() for speed status Luo Jie
2021-10-15  7:34 ` [PATCH v2 05/13] net: phy: add qca8081 ethernet phy driver Luo Jie
2021-10-15  7:54   ` Russell King (Oracle)
2021-10-16  9:51     ` Jie Luo
2021-10-15  7:34 ` [PATCH v2 06/13] net: phy: add qca8081 read_status Luo Jie
2021-10-15  7:34 ` [PATCH v2 07/13] net: phy: add qca8081 get_features Luo Jie
2021-10-15  7:35 ` Luo Jie [this message]
2021-10-15  7:35 ` [PATCH v2 09/13] net: phy: add constants for fast retrain related register Luo Jie
2021-10-15  7:35 ` [PATCH v2 10/13] net: phy: add qca8081 config_init Luo Jie
2021-10-15  7:35 ` [PATCH v2 11/13] net: phy: add qca8081 soft_reset and enable master/slave seed Luo Jie
2021-10-15  7:35 ` [PATCH v2 12/13] net: phy: adjust qca8081 master/slave seed value if link down Luo Jie
2021-10-15  8:01   ` Russell King (Oracle)
2021-10-16  9:52     ` Jie Luo
2021-10-15  7:35 ` [PATCH v2 13/13] 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=20211015073505.1893-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.