sfc: Make PHY flash mode a device attribute, not a module parameter

This allows updating PHY firmware for one interface without removing
all other interfaces handled by the driver.

Replace tx_disabled flags and 10Xpress status enumeration with flags in
enum efx_phy_mode.

Prevent an interface from being brought up while in PHY flash mode.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

1 files changed, 5 insertions, 4 deletions

diff --git a/drivers/net/sfc/xfp_phy.c b/drivers/net/sfc/xfp_phy.c
index fd4045b4d9d0..f6edecc2e588 100644
--- a/drivers/net/sfc/xfp_phy.c
+++ b/drivers/net/sfc/xfp_phy.c
@@ -40,7 +40,7 @@ void xfp_set_led(struct efx_nic *p, int led, int mode)
 }
 
 struct xfp_phy_data {
-        bool tx_disabled;
+        enum efx_phy_mode phy_mode;
 };
 
 #define XFP_MAX_RESET_TIME 500
@@ -93,7 +93,7 @@ static int xfp_phy_init(struct efx_nic *efx)
                  " %x)\n", devid, MDIO_ID_OUI(devid), MDIO_ID_MODEL(devid),
                  MDIO_ID_REV(devid));
 
-        phy_data->tx_disabled = efx->tx_disabled;
+        phy_data->phy_mode = efx->phy_mode;
 
         rc = xfp_reset_phy(efx);
 
@@ -136,13 +136,14 @@ static void xfp_phy_reconfigure(struct efx_nic *efx)
         struct xfp_phy_data *phy_data = efx->phy_data;
 
         /* Reset the PHY when moving from tx off to tx on */
-        if (phy_data->tx_disabled && !efx->tx_disabled)
+        if (!(efx->phy_mode & PHY_MODE_TX_DISABLED) &&
+            (phy_data->phy_mode & PHY_MODE_TX_DISABLED))
                 xfp_reset_phy(efx);
 
         mdio_clause45_transmit_disable(efx);
         mdio_clause45_phy_reconfigure(efx);
 
-        phy_data->tx_disabled = efx->tx_disabled;
+        phy_data->phy_mode = efx->phy_mode;
         efx->link_up = xfp_link_ok(efx);
         efx->link_options = GM_LPA_10000FULL;
 }