From: Ansuel Smith <ansuelsmth@gmail.com>
To: Andrew Lunn <andrew@lunn.ch>,
Vivien Didelot <vivien.didelot@gmail.com>,
Florian Fainelli <f.fainelli@gmail.com>,
Vladimir Oltean <olteanv@gmail.com>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Rob Herring <robh+dt@kernel.org>,
Heiner Kallweit <hkallweit1@gmail.com>,
Russell King <linux@armlinux.org.uk>,
Ansuel Smith <ansuelsmth@gmail.com>,
netdev@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [net PATCH v2 02/15] drivers: net: phy: at803x: add DAC amplitude fix for 8327 phy
Date: Fri, 8 Oct 2021 02:22:12 +0200 [thread overview]
Message-ID: <20211008002225.2426-3-ansuelsmth@gmail.com> (raw)
In-Reply-To: <20211008002225.2426-1-ansuelsmth@gmail.com>
QCA8327 internal phy require DAC amplitude adjustement set to +6% with
100m speed. Also add additional define to report a change of the same
reg in QCA8337. (different scope it does set 1000m voltage)
Add link_change_notify function to set the proper amplitude adjustement
on PHY_RUNNING state and disable on any other state.
Fixes: c6bcec0d6928 ("net: phy: at803x: add support for qca 8327 A variant internal phy")
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
---
drivers/net/phy/at803x.c | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
index c6c87b82c95c..5208ea8fdd69 100644
--- a/drivers/net/phy/at803x.c
+++ b/drivers/net/phy/at803x.c
@@ -87,6 +87,8 @@
#define AT803X_PSSR_MR_AN_COMPLETE 0x0200
#define AT803X_DEBUG_REG_0 0x00
+#define QCA8327_DEBUG_MANU_CTRL_EN BIT(2)
+#define QCA8337_DEBUG_MANU_CTRL_EN GENMASK(3, 2)
#define AT803X_DEBUG_RX_CLK_DLY_EN BIT(15)
#define AT803X_DEBUG_REG_5 0x05
@@ -1314,9 +1316,37 @@ static int qca83xx_config_init(struct phy_device *phydev)
break;
}
+ /* QCA8327 require DAC amplitude adjustment for 100m set to +6%.
+ * Disable on init and enable only with 100m speed following
+ * qca original source code.
+ */
+ if (phydev->drv->phy_id == QCA8327_A_PHY_ID ||
+ phydev->drv->phy_id == QCA8327_B_PHY_ID)
+ at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_0,
+ QCA8327_DEBUG_MANU_CTRL_EN, 0);
+
return 0;
}
+static void qca83xx_link_change_notify(struct phy_device *phydev)
+{
+ /* QCA8337 doesn't require DAC Amplitude adjustement */
+ if (phydev->drv->phy_id == QCA8337_PHY_ID)
+ return;
+
+ /* Set DAC Amplitude adjustment to +6% for 100m on link running */
+ if (phydev->state == PHY_RUNNING) {
+ if (phydev->speed == SPEED_100)
+ at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_0,
+ QCA8327_DEBUG_MANU_CTRL_EN,
+ QCA8327_DEBUG_MANU_CTRL_EN);
+ } else {
+ /* Reset DAC Amplitude adjustment */
+ at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_0,
+ QCA8327_DEBUG_MANU_CTRL_EN, 0);
+ }
+}
+
static int qca83xx_resume(struct phy_device *phydev)
{
int ret, val;
@@ -1471,6 +1501,7 @@ static struct phy_driver at803x_driver[] = {
.phy_id_mask = QCA8K_PHY_ID_MASK,
.name = "Qualcomm Atheros 8337 internal PHY",
/* PHY_GBIT_FEATURES */
+ .link_change_notify = qca83xx_link_change_notify,
.probe = at803x_probe,
.flags = PHY_IS_INTERNAL,
.config_init = qca83xx_config_init,
@@ -1486,6 +1517,7 @@ static struct phy_driver at803x_driver[] = {
.phy_id_mask = QCA8K_PHY_ID_MASK,
.name = "Qualcomm Atheros 8327-A internal PHY",
/* PHY_GBIT_FEATURES */
+ .link_change_notify = qca83xx_link_change_notify,
.probe = at803x_probe,
.flags = PHY_IS_INTERNAL,
.config_init = qca83xx_config_init,
@@ -1501,6 +1533,7 @@ static struct phy_driver at803x_driver[] = {
.phy_id_mask = QCA8K_PHY_ID_MASK,
.name = "Qualcomm Atheros 8327-B internal PHY",
/* PHY_GBIT_FEATURES */
+ .link_change_notify = qca83xx_link_change_notify,
.probe = at803x_probe,
.flags = PHY_IS_INTERNAL,
.config_init = qca83xx_config_init,
--
2.32.0
next prev parent reply other threads:[~2021-10-08 0:23 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-08 0:22 [net-next PATCH v2 00/15] Multiple improvement for qca8337 switch Ansuel Smith
2021-10-08 0:22 ` [net PATCH v2 01/15] drivers: net: phy: at803x: fix resume for QCA8327 phy Ansuel Smith
2021-10-08 2:23 ` Jakub Kicinski
2021-10-08 8:45 ` Ansuel Smith
2021-10-08 14:21 ` Jakub Kicinski
2021-10-08 0:22 ` Ansuel Smith [this message]
2021-10-08 0:22 ` [net-next PATCH v2 03/15] drivers: net: phy: at803x: enable prefer master for 83xx internal phy Ansuel Smith
2021-10-08 0:22 ` [net-next PATCH v2 04/15] drivers: net: phy: at803x: better describe debug regs Ansuel Smith
2021-10-09 15:08 ` Andrew Lunn
2021-10-08 0:22 ` [net-next PATCH v2 05/15] net: dsa: qca8k: add mac_power_sel support Ansuel Smith
2021-10-08 0:22 ` [net-next PATCH v2 06/15] dt-bindings: net: dsa: qca8k: document rgmii_1_8v bindings Ansuel Smith
2021-10-09 15:18 ` Andrew Lunn
2021-10-09 15:30 ` Ansuel Smith
2021-10-09 17:29 ` Andrew Lunn
2021-10-08 0:22 ` [net-next PATCH v2 07/15] net: dsa: qca8k: add support for mac6_exchange, sgmii falling edge Ansuel Smith
2021-10-08 0:22 ` [net-next PATCH v2 08/15] dt-bindings: net: dsa: qca8k: Add MAC swap and clock phase properties Ansuel Smith
2021-10-09 17:07 ` Andrew Lunn
2021-10-09 18:08 ` Ansuel Smith
2021-10-09 19:47 ` Andrew Lunn
2021-10-09 20:06 ` Ansuel Smith
2021-10-09 21:37 ` Andrew Lunn
2021-10-09 22:23 ` Ansuel Smith
2021-10-08 0:22 ` [net-next PATCH v2 09/15] net: dsa: qca8k: move rgmii delay detection to phylink mac_config Ansuel Smith
2021-10-08 0:22 ` [net-next PATCH v2 10/15] net: dsa: qca8k: add explicit SGMII PLL enable Ansuel Smith
2021-10-08 0:22 ` [net-next PATCH v2 11/15] dt-bindings: net: dsa: qca8k: Document qca,sgmii-enable-pll Ansuel Smith
2021-10-09 17:13 ` Andrew Lunn
2021-10-09 18:14 ` Ansuel Smith
2021-10-08 0:22 ` [net-next PATCH v2 12/15] drivers: net: dsa: qca8k: add support for pws config reg Ansuel Smith
2021-10-08 0:22 ` [net-next PATCH v2 13/15] dt-bindings: net: dsa: qca8k: document open drain binding Ansuel Smith
2021-10-09 17:20 ` Andrew Lunn
2021-10-09 23:16 ` Ansuel Smith
2021-10-08 0:22 ` [net-next PATCH v2 14/15] drivers: net: dsa: qca8k: add support for QCA8328 Ansuel Smith
2021-10-08 0:22 ` [net-next PATCH v2 15/15] dt-bindings: net: dsa: qca8k: document support for qca8328 Ansuel Smith
2021-10-09 17:24 ` Andrew Lunn
2021-10-09 18:17 ` Ansuel Smith
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=20211008002225.2426-3-ansuelsmth@gmail.com \
--to=ansuelsmth@gmail.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=f.fainelli@gmail.com \
--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=olteanv@gmail.com \
--cc=robh+dt@kernel.org \
--cc=vivien.didelot@gmail.com \
/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).