net: phy: Add support for polling cable test

Some PHYs are not capable of generating interrupts when a cable test
finished. They do however support interrupts for normal operations,
like link up/down. As such, the PHY state machine would normally not
poll the PHY.

Add support for indicating the PHY state machine must poll the PHY
when performing a cable test.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 0f4b272154299947e4a9a7f6ef597fae3deceb43..9fa61019533f3f77d0ad73b4103b3897131a8cc9 100644 (file)
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -523,6 +523,8 @@ int phy_start_cable_test(struct phy_device *phydev,
 
        phydev->state = PHY_CABLETEST;
 
+       if (phy_polling_mode(phydev))
+               phy_trigger_machine(phydev);
 out:
        mutex_unlock(&phydev->lock);
 

diff --git a/include/linux/phy.h b/include/linux/phy.h
index 632403fc34f420bb7c5d5ed40066a1c93ecef5fb..f58eee735a4512a0d1af4719d92a3e331c6adc40 100644 (file)
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -79,6 +79,7 @@ extern const int phy_10gbit_features_array[1];
 
 #define PHY_IS_INTERNAL                0x00000001
 #define PHY_RST_AFTER_CLK_EN   0x00000002
+#define PHY_POLL_CABLE_TEST    0x00000004
 #define MDIO_DEVICE_IS_PHY     0x80000000
 
 /* Interface Mode definitions */
@@ -1061,6 +1062,10 @@ static inline bool phy_interrupt_is_valid(struct phy_device *phydev)
  */
 static inline bool phy_polling_mode(struct phy_device *phydev)
 {
+       if (phydev->state == PHY_CABLETEST)
+               if (phydev->drv->flags & PHY_POLL_CABLE_TEST)
+                       return true;
+
        return phydev->irq == PHY_POLL;
 }