net: phy: fix wrong masks to phy_modify()

The mask argument for phy_modify() in several locations was inverted.

Fixes: fea23fb591cc ("net: phy: convert read-modify-write to phy_modify()")
Reported-by: Heiner Kallweit <hkallweit1@gmail.com>
Tested-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
index c2715908d43ecaae0dd756bcb4d71c054f7e11bd..411cf1072bae57967034e51b543aa6e154fc5e06 100644 (file)
--- a/drivers/net/phy/at803x.c
+++ b/drivers/net/phy/at803x.c
@@ -230,7 +230,7 @@ static int at803x_suspend(struct phy_device *phydev)
 
 static int at803x_resume(struct phy_device *phydev)
 {
-       return phy_modify(phydev, MII_BMCR, ~(BMCR_PDOWN | BMCR_ISOLATE), 0);
+       return phy_modify(phydev, MII_BMCR, BMCR_PDOWN | BMCR_ISOLATE, 0);
 }
 
 static int at803x_probe(struct phy_device *phydev)

diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index 2bd38962b5d2eacc9e8e4755972def4b4e903666..fd66304f18b7fbe1aff9ed94744550b8f5bbf495 100644 (file)
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -668,7 +668,7 @@ static int m88e3016_config_init(struct phy_device *phydev)
 
        /* Enable Scrambler and Auto-Crossover */
        ret = phy_modify(phydev, MII_88E3016_PHY_SPEC_CTRL,
-                        ~MII_88E3016_DISABLE_SCRAMBLER,
+                        MII_88E3016_DISABLE_SCRAMBLER,
                         MII_88E3016_AUTO_MDIX_CROSSOVER);
        if (ret < 0)
                return ret;
@@ -684,9 +684,9 @@ static int m88e1111_config_init_hwcfg_mode(struct phy_device *phydev,
                mode |= MII_M1111_HWCFG_FIBER_COPPER_AUTO;
 
        return phy_modify(phydev, MII_M1111_PHY_EXT_SR,
-                         (u16)~(MII_M1111_HWCFG_MODE_MASK |
-                                MII_M1111_HWCFG_FIBER_COPPER_AUTO |
-                                MII_M1111_HWCFG_FIBER_COPPER_RES),
+                         MII_M1111_HWCFG_MODE_MASK |
+                         MII_M1111_HWCFG_FIBER_COPPER_AUTO |
+                         MII_M1111_HWCFG_FIBER_COPPER_RES,
                          mode);
 }
 
@@ -705,8 +705,7 @@ static int m88e1111_config_init_rgmii_delays(struct phy_device *phydev)
        }
 
        return phy_modify(phydev, MII_M1111_PHY_EXT_CR,
-                         (u16)~(MII_M1111_RGMII_RX_DELAY |
-                                MII_M1111_RGMII_TX_DELAY),
+                         MII_M1111_RGMII_RX_DELAY | MII_M1111_RGMII_TX_DELAY,
                          delay);
 }
 
@@ -833,7 +832,7 @@ static int m88e1510_config_init(struct phy_device *phydev)
 
                /* In reg 20, write MODE[2:0] = 0x1 (SGMII to Copper) */
                err = phy_modify(phydev, MII_88E1510_GEN_CTRL_REG_1,
-                                ~MII_88E1510_GEN_CTRL_REG_1_MODE_MASK,
+                                MII_88E1510_GEN_CTRL_REG_1_MODE_MASK,
                                 MII_88E1510_GEN_CTRL_REG_1_MODE_SGMII);
                if (err < 0)
                        return err;
@@ -957,7 +956,7 @@ static int m88e1145_config_init_rgmii(struct phy_device *phydev)
                if (err < 0)
                        return err;
 
-               err = phy_modify(phydev, 0x1e, 0xf03f,
+               err = phy_modify(phydev, 0x1e, 0x0fc0,
                                 2 << 9 | /* 36 ohm */
                                 2 << 6); /* 39 ohm */
                if (err < 0)
@@ -1379,7 +1378,7 @@ static int m88e1318_set_wol(struct phy_device *phydev,
 
                /* Setup LED[2] as interrupt pin (active low) */
                err = __phy_modify(phydev, MII_88E1318S_PHY_LED_TCR,
-                                  (u16)~MII_88E1318S_PHY_LED_TCR_FORCE_INT,
+                                  MII_88E1318S_PHY_LED_TCR_FORCE_INT,
                                   MII_88E1318S_PHY_LED_TCR_INTn_ENABLE |
                                   MII_88E1318S_PHY_LED_TCR_INT_ACTIVE_LOW);
                if (err < 0)
@@ -1419,7 +1418,7 @@ static int m88e1318_set_wol(struct phy_device *phydev,
 
                /* Clear WOL status and disable magic packet matching */
                err = __phy_modify(phydev, MII_88E1318S_PHY_WOL_CTRL,
-                                  (u16)~MII_88E1318S_PHY_WOL_CTRL_MAGIC_PACKET_MATCH_ENABLE,
+                                  MII_88E1318S_PHY_WOL_CTRL_MAGIC_PACKET_MATCH_ENABLE,
                                   MII_88E1318S_PHY_WOL_CTRL_CLEAR_WOL_STATUS);
                if (err < 0)
                        goto error;

diff --git a/drivers/net/phy/phy-core.c b/drivers/net/phy/phy-core.c
index 44d09b1920149379694f9d40feb277140e245e49..e75989ce88500398b5d8b3548c2ac8c41b91c84c 100644 (file)
--- a/drivers/net/phy/phy-core.c
+++ b/drivers/net/phy/phy-core.c
@@ -332,7 +332,7 @@ EXPORT_SYMBOL(phy_write_mmd);
  * @set: bit mask of bits to set
  *
  * Unlocked helper function which allows a PHY register to be modified as
- * new register value = (old register value & mask) | set
+ * new register value = (old register value & ~mask) | set
  */
 int __phy_modify(struct phy_device *phydev, u32 regnum, u16 mask, u16 set)
 {

diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 2c5b2e041c0feb4bd0515fc6f2f6a0b0a42ae9d4..6bd11a070ec8147b1222ac92ddc880c1d3e32ca0 100644 (file)
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -1393,7 +1393,7 @@ EXPORT_SYMBOL(genphy_setup_forced);
 int genphy_restart_aneg(struct phy_device *phydev)
 {
        /* Don't isolate the PHY if we're negotiating */
-       return phy_modify(phydev, MII_BMCR, ~BMCR_ISOLATE,
+       return phy_modify(phydev, MII_BMCR, BMCR_ISOLATE,
                          BMCR_ANENABLE | BMCR_ANRESTART);
 }
 EXPORT_SYMBOL(genphy_restart_aneg);
@@ -1666,13 +1666,13 @@ EXPORT_SYMBOL(genphy_suspend);
 
 int genphy_resume(struct phy_device *phydev)
 {
-       return phy_modify(phydev, MII_BMCR, ~BMCR_PDOWN, 0);
+       return phy_modify(phydev, MII_BMCR, BMCR_PDOWN, 0);
 }
 EXPORT_SYMBOL(genphy_resume);
 
 int genphy_loopback(struct phy_device *phydev, bool enable)
 {
-       return phy_modify(phydev, MII_BMCR, ~BMCR_LOOPBACK,
+       return phy_modify(phydev, MII_BMCR, BMCR_LOOPBACK,
                          enable ? BMCR_LOOPBACK : 0);
 }
 EXPORT_SYMBOL(genphy_loopback);