[PATCH net-next v2 09/10] net: phy: Put interface into oper testing during cable test

[Andrew Lunn]

Since running a cable test is disruptive, put the interface into
operative state testing while the test is running.

Signed-off-by: Andrew Lunn <and...@lunn.ch>
---
 drivers/net/phy/phy.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 039e41e15c7e..2117e3347d59 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -490,6 +490,7 @@ static void phy_abort_cable_test(struct phy_device *phydev)
 int phy_start_cable_test(struct phy_device *phydev,
                         struct netlink_ext_ack *extack)
 {
+       struct net_device *dev = phydev->attached_dev;
        int err = -ENOMEM;
 
        if (!(phydev->drv &&
@@ -523,8 +524,10 @@ int phy_start_cable_test(struct phy_device *phydev,
        /* Mark the carrier down until the test is complete */
        phy_link_down(phydev, true);
 
+       netif_testing_on(dev);
        err = phydev->drv->cable_test_start(phydev);
        if (err) {
+               netif_testing_off(dev);
                phy_link_up(phydev);
                goto out_free;
        }
@@ -877,6 +880,8 @@ EXPORT_SYMBOL(phy_free_interrupt);
  */
 void phy_stop(struct phy_device *phydev)
 {
+       struct net_device *dev = phydev->attached_dev;
+
        if (!phy_is_started(phydev)) {
                WARN(1, "called from state %s\n",
                     phy_state_to_str(phydev->state));
@@ -885,8 +890,10 @@ void phy_stop(struct phy_device *phydev)
 
        mutex_lock(&phydev->lock);
 
-       if (phydev->state == PHY_CABLETEST)
+       if (phydev->state == PHY_CABLETEST) {
                phy_abort_cable_test(phydev);
+               netif_testing_off(dev);
+       }
 
        if (phydev->sfp_bus)
                sfp_upstream_stop(phydev->sfp_bus);
@@ -948,6 +955,7 @@ void phy_state_machine(struct work_struct *work)
        struct delayed_work *dwork = to_delayed_work(work);
        struct phy_device *phydev =
                        container_of(dwork, struct phy_device, state_queue);
+       struct net_device *dev = phydev->attached_dev;
        bool needs_aneg = false, do_suspend = false;
        enum phy_state old_state;
        bool finished = false;
@@ -973,6 +981,7 @@ void phy_state_machine(struct work_struct *work)
                err = phydev->drv->cable_test_get_status(phydev, &finished);
                if (err) {
                        phy_abort_cable_test(phydev);
+                       netif_testing_off(dev);
                        needs_aneg = true;
                        phydev->state = PHY_UP;
                        break;
@@ -980,6 +989,7 @@ void phy_state_machine(struct work_struct *work)
 
                if (finished) {
                        ethnl_cable_test_finished(phydev);
+                       netif_testing_off(dev);
                        needs_aneg = true;
                        phydev->state = PHY_UP;
                }
-- 
2.26.2