sfc: Replace PHY MDIO test with an 'alive' test

SFC9000-family boards do not all use MDIO PHYs, so we need a different
test for PHY aliveness.

Introduce a PHY operation test_alive().  For PHYs attached to Falcon,
use a common implementation based on the existing PHY MDIO test.
For PHYs managed through MCDI, use the appropriate MCDI request.

Change test name in ethtool from 'core mdio' to 'phy alive'.

Rename test_results::mdio to phy_alive and test_results::phy to phy_ext.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 24 insertions, 0 deletions

diff --git a/drivers/net/sfc/mdio_10g.c b/drivers/net/sfc/mdio_10g.c
index 1574e52f0594..0548fcbbdcd0 100644
--- a/drivers/net/sfc/mdio_10g.c
+++ b/drivers/net/sfc/mdio_10g.c
@@ -335,3 +335,27 @@ enum efx_fc_type efx_mdio_get_pause(struct efx_nic *efx)
                 mii_advertise_flowctrl(efx->wanted_fc),
                 efx_mdio_read(efx, MDIO_MMD_AN, MDIO_AN_LPA));
 }
+
+int efx_mdio_test_alive(struct efx_nic *efx)
+{
+        int rc;
+        int devad = __ffs(efx->mdio.mmds);
+        u16 physid1, physid2;
+
+        mutex_lock(&efx->mac_lock);
+
+        physid1 = efx_mdio_read(efx, devad, MDIO_DEVID1);
+        physid2 = efx_mdio_read(efx, devad, MDIO_DEVID2);
+
+        if ((physid1 == 0x0000) || (physid1 == 0xffff) ||
+            (physid2 == 0x0000) || (physid2 == 0xffff)) {
+                EFX_ERR(efx, "no MDIO PHY present with ID %d\n",
+                        efx->mdio.prtad);
+                rc = -EINVAL;
+        } else {
+                rc = efx_mdio_check_mmds(efx, efx->mdio.mmds, 0);
+        }
+
+        mutex_unlock(&efx->mac_lock);
+        return rc;
+}