net: phy: Put interface into oper testing during cable test

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

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

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index afdc1c2146eeb280faebbeff6e0e44ed60eda733..9bdc924eea83aec783ee06515d50f4f6debcac46 100644 (file)
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -492,6 +492,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 &&
@@ -525,8 +526,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;
        }
@@ -879,6 +882,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));
@@ -887,8 +892,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);
@@ -950,6 +957,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;
@@ -975,6 +983,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;
@@ -982,6 +991,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;
                }