zhao
b34543084f
All checks were successful
target_linux_generic / Update target_linux_generic (openwrt-25.12) (push) Successful in 8s
108 lines
3.8 KiB
Diff
108 lines
3.8 KiB
Diff
From bb78b71faf60d11a15f07e3390fcfd31e5e523bb Mon Sep 17 00:00:00 2001
|
|
From: Vladimir Oltean <vladimir.oltean@nxp.com>
|
|
Date: Tue, 18 Nov 2025 01:40:32 +0200
|
|
Subject: [PATCH] net: phy: realtek: eliminate priv->phycr1 variable
|
|
|
|
Previous changes have replaced the machine-level priv->phycr2 with a
|
|
high-level priv->disable_clk_out. This created a discrepancy with
|
|
priv->phycr1 which is resolved here, for uniformity.
|
|
|
|
One advantage of this new implementation is that we don't read
|
|
priv->phycr1 in rtl821x_probe() if we're never going to modify it.
|
|
|
|
We never test the positive return code from phy_modify_mmd_changed(), so
|
|
we could just as well use phy_modify_mmd().
|
|
|
|
I took the ALDPS feature description from commit d90db36a9e74 ("net:
|
|
phy: realtek: add dt property to enable ALDPS mode") and transformed it
|
|
into a function comment - the feature is sufficiently non-obvious to
|
|
deserve that.
|
|
|
|
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
|
|
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
|
|
Link: https://patch.msgid.link/20251117234033.345679-6-vladimir.oltean@nxp.com
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/phy/realtek/realtek_main.c | 44 ++++++++++++++++----------
|
|
1 file changed, 28 insertions(+), 16 deletions(-)
|
|
|
|
--- a/drivers/net/phy/realtek/realtek_main.c
|
|
+++ b/drivers/net/phy/realtek/realtek_main.c
|
|
@@ -201,7 +201,7 @@ MODULE_AUTHOR("Johnson Leung");
|
|
MODULE_LICENSE("GPL");
|
|
|
|
struct rtl821x_priv {
|
|
- u16 phycr1;
|
|
+ bool enable_aldps;
|
|
bool disable_clk_out;
|
|
struct clk *clk;
|
|
/* rtl8211f */
|
|
@@ -252,7 +252,6 @@ static int rtl821x_probe(struct phy_devi
|
|
{
|
|
struct device *dev = &phydev->mdio.dev;
|
|
struct rtl821x_priv *priv;
|
|
- int ret;
|
|
|
|
priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
|
|
if (!priv)
|
|
@@ -263,14 +262,8 @@ static int rtl821x_probe(struct phy_devi
|
|
return dev_err_probe(dev, PTR_ERR(priv->clk),
|
|
"failed to get phy clock\n");
|
|
|
|
- ret = phy_read_paged(phydev, RTL8211F_PHYCR_PAGE, RTL8211F_PHYCR1);
|
|
- if (ret < 0)
|
|
- return ret;
|
|
-
|
|
- priv->phycr1 = ret & (RTL8211F_ALDPS_PLL_OFF | RTL8211F_ALDPS_ENABLE | RTL8211F_ALDPS_XTAL_OFF);
|
|
- if (of_property_read_bool(dev->of_node, "realtek,aldps-enable"))
|
|
- priv->phycr1 |= RTL8211F_ALDPS_PLL_OFF | RTL8211F_ALDPS_ENABLE | RTL8211F_ALDPS_XTAL_OFF;
|
|
-
|
|
+ priv->enable_aldps = of_property_read_bool(dev->of_node,
|
|
+ "realtek,aldps-enable");
|
|
priv->disable_clk_out = of_property_read_bool(dev->of_node,
|
|
"realtek,clkout-disable");
|
|
|
|
@@ -674,17 +667,36 @@ static int rtl8211f_config_clk_out(struc
|
|
return genphy_soft_reset(phydev);
|
|
}
|
|
|
|
-static int rtl8211f_config_init(struct phy_device *phydev)
|
|
+/* Advance Link Down Power Saving (ALDPS) mode changes crystal/clock behaviour,
|
|
+ * which causes the RXC clock signal to stop for tens to hundreds of
|
|
+ * milliseconds.
|
|
+ *
|
|
+ * Some MACs need the RXC clock to support their internal RX logic, so ALDPS is
|
|
+ * only enabled based on an opt-in device tree property.
|
|
+ */
|
|
+static int rtl8211f_config_aldps(struct phy_device *phydev)
|
|
{
|
|
struct rtl821x_priv *priv = phydev->priv;
|
|
+ u16 mask = RTL8211F_ALDPS_PLL_OFF |
|
|
+ RTL8211F_ALDPS_ENABLE |
|
|
+ RTL8211F_ALDPS_XTAL_OFF;
|
|
+
|
|
+ /* The value is preserved if the device tree property is absent */
|
|
+ if (!priv->enable_aldps)
|
|
+ return 0;
|
|
+
|
|
+ return phy_modify_paged(phydev, RTL8211F_PHYCR_PAGE, RTL8211F_PHYCR1,
|
|
+ mask, mask);
|
|
+}
|
|
+
|
|
+static int rtl8211f_config_init(struct phy_device *phydev)
|
|
+{
|
|
struct device *dev = &phydev->mdio.dev;
|
|
int ret;
|
|
|
|
- ret = phy_modify_paged_changed(phydev, RTL8211F_PHYCR_PAGE, RTL8211F_PHYCR1,
|
|
- RTL8211F_ALDPS_PLL_OFF | RTL8211F_ALDPS_ENABLE | RTL8211F_ALDPS_XTAL_OFF,
|
|
- priv->phycr1);
|
|
- if (ret < 0) {
|
|
- dev_err(dev, "aldps mode configuration failed: %pe\n",
|
|
+ ret = rtl8211f_config_aldps(phydev);
|
|
+ if (ret) {
|
|
+ dev_err(dev, "aldps mode configuration failed: %pe\n",
|
|
ERR_PTR(ret));
|
|
return ret;
|
|
}
|