]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net/phy: fix DP83865 10 Mbps HDX loopback disable function
authorPeter Mamonov <pmamonov@gmail.com>
Wed, 18 Sep 2019 16:27:55 +0000 (19:27 +0300)
committerBen Hutchings <ben@decadent.org.uk>
Tue, 10 Dec 2019 18:01:23 +0000 (18:01 +0000)
commit e47488b2df7f9cb405789c7f5d4c27909fc597ae upstream.

According to the DP83865 datasheet "the 10 Mbps HDX loopback can be
disabled in the expanded memory register 0x1C0.1". The driver erroneously
used bit 0 instead of bit 1.

Fixes: 4621bf129856 ("phy: Add file missed in previous commit.")
Signed-off-by: Peter Mamonov <pmamonov@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/net/phy/national.c

index 9a5f234d95b05189cfed229a03164dba2adbc486..a63a32a35fc6bbb6cf3b3e8deeb7ca528af6d914 100644 (file)
@@ -110,14 +110,17 @@ static void ns_giga_speed_fallback(struct phy_device *phydev, int mode)
 
 static void ns_10_base_t_hdx_loopack(struct phy_device *phydev, int disable)
 {
+       u16 lb_dis = BIT(1);
+
        if (disable)
-               ns_exp_write(phydev, 0x1c0, ns_exp_read(phydev, 0x1c0) | 1);
+               ns_exp_write(phydev, 0x1c0,
+                            ns_exp_read(phydev, 0x1c0) | lb_dis);
        else
                ns_exp_write(phydev, 0x1c0,
-                            ns_exp_read(phydev, 0x1c0) & 0xfffe);
+                            ns_exp_read(phydev, 0x1c0) & ~lb_dis);
 
        pr_debug("10BASE-T HDX loopback %s\n",
-                (ns_exp_read(phydev, 0x1c0) & 0x0001) ? "off" : "on");
+                (ns_exp_read(phydev, 0x1c0) & lb_dis) ? "off" : "on");
 }
 
 static int ns_config_init(struct phy_device *phydev)