These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / net / phy / mdio-bitbang.c

diff --git a/kernel/drivers/net/phy/mdio-bitbang.c b/kernel/drivers/net/phy/mdio-bitbang.c
index daec9b0..61a543c 100644 (file)
--- a/kernel/drivers/net/phy/mdio-bitbang.c
+++ b/kernel/drivers/net/phy/mdio-bitbang.c
@@ -165,8 +165,11 @@ static int mdiobb_read(struct mii_bus *bus, int phy, int reg)
 
        ctrl->ops->set_mdio_dir(ctrl, 0);
 
-       /* check the turnaround bit: the PHY should be driving it to zero */
-       if (mdiobb_get_bit(ctrl) != 0) {
+       /* check the turnaround bit: the PHY should be driving it to zero, if this
+        * PHY is listed in phy_ignore_ta_mask as having broken TA, skip that
+        */
+       if (mdiobb_get_bit(ctrl) != 0 &&
+           !(bus->phy_ignore_ta_mask & (1 << phy))) {
                /* PHY didn't drive TA low -- flush any bits it
                 * may be trying to send.
                 */