sfc: Rename 'xfp' file and functions to reflect reality
authorBen Hutchings <bhutchings@solarflare.com>
Fri, 23 Oct 2009 08:33:42 +0000 (08:33 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sat, 24 Oct 2009 11:27:28 +0000 (04:27 -0700)
The 'XFP' driver is really a driver for the QT2022C2 and QT2025C PHYs,
covering both more and less than XFP.  Rename its functions and
constants to reflect reality and to reduce namespace pollution when
sfc is a built-in driver.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/sfc/Makefile
drivers/net/sfc/falcon.c
drivers/net/sfc/falcon_boards.c
drivers/net/sfc/phy.h
drivers/net/sfc/qt202x_phy.c [new file with mode: 0644]
drivers/net/sfc/xfp_phy.c [deleted file]

index 9c98d06ada7d89872cc36c1980c67ba5d829516b..7b52fe10d38f94270c3352b5816a9472e68a91fb 100644 (file)
@@ -1,5 +1,5 @@
 sfc-y                  += efx.o falcon.o tx.o rx.o falcon_gmac.o \
-                          falcon_xmac.o selftest.o ethtool.o xfp_phy.o \
+                          falcon_xmac.o selftest.o ethtool.o qt202x_phy.o \
                           mdio_10g.o tenxpress.o falcon_boards.o
 sfc-$(CONFIG_SFC_MTD)  += mtd.o
 
index d9ce21edfa6a5ee73588943919daf4bd25460c45..8776432f683c6f62e0c075bf93a904116b5c15bb 100644 (file)
@@ -2239,7 +2239,7 @@ int falcon_probe_port(struct efx_nic *efx)
                break;
        case PHY_TYPE_QT2022C2:
        case PHY_TYPE_QT2025C:
-               efx->phy_op = &falcon_xfp_phy_ops;
+               efx->phy_op = &falcon_qt202x_phy_ops;
                break;
        default:
                EFX_ERR(efx, "Unknown PHY type %d\n",
index f65738bb55369350089cfa497515ee459925d158..99f737223b100ea74718c478199d7910969d226e 100644 (file)
@@ -612,17 +612,17 @@ static void sfe4002_init_leds(struct efx_nic *efx)
 {
        /* Set the TX and RX LEDs to reflect status and activity, and the
         * fault LED off */
-       xfp_set_led(efx, SFE4002_TX_LED,
-                   QUAKE_LED_TXLINK | QUAKE_LED_LINK_ACTSTAT);
-       xfp_set_led(efx, SFE4002_RX_LED,
-                   QUAKE_LED_RXLINK | QUAKE_LED_LINK_ACTSTAT);
-       xfp_set_led(efx, SFE4002_FAULT_LED, QUAKE_LED_OFF);
+       falcon_qt202x_set_led(efx, SFE4002_TX_LED,
+                             QUAKE_LED_TXLINK | QUAKE_LED_LINK_ACTSTAT);
+       falcon_qt202x_set_led(efx, SFE4002_RX_LED,
+                             QUAKE_LED_RXLINK | QUAKE_LED_LINK_ACTSTAT);
+       falcon_qt202x_set_led(efx, SFE4002_FAULT_LED, QUAKE_LED_OFF);
 }
 
 static void sfe4002_set_id_led(struct efx_nic *efx, bool state)
 {
-       xfp_set_led(efx, SFE4002_FAULT_LED, state ? QUAKE_LED_ON :
-                       QUAKE_LED_OFF);
+       falcon_qt202x_set_led(efx, SFE4002_FAULT_LED, state ? QUAKE_LED_ON :
+                             QUAKE_LED_OFF);
 }
 
 static int sfe4002_check_hw(struct efx_nic *efx)
@@ -677,16 +677,16 @@ static struct i2c_board_info sfn4112f_hwmon_info = {
 
 static void sfn4112f_init_leds(struct efx_nic *efx)
 {
-       xfp_set_led(efx, SFN4112F_ACT_LED,
-                   QUAKE_LED_RXLINK | QUAKE_LED_LINK_ACT);
-       xfp_set_led(efx, SFN4112F_LINK_LED,
-                   QUAKE_LED_RXLINK | QUAKE_LED_LINK_STAT);
+       falcon_qt202x_set_led(efx, SFN4112F_ACT_LED,
+                             QUAKE_LED_RXLINK | QUAKE_LED_LINK_ACT);
+       falcon_qt202x_set_led(efx, SFN4112F_LINK_LED,
+                             QUAKE_LED_RXLINK | QUAKE_LED_LINK_STAT);
 }
 
 static void sfn4112f_set_id_led(struct efx_nic *efx, bool state)
 {
-       xfp_set_led(efx, SFN4112F_LINK_LED,
-                   state ? QUAKE_LED_ON : QUAKE_LED_OFF);
+       falcon_qt202x_set_led(efx, SFN4112F_LINK_LED,
+                             state ? QUAKE_LED_ON : QUAKE_LED_OFF);
 }
 
 static int sfn4112f_check_hw(struct efx_nic *efx)
index c1cff9c0c17331db7462af39bd96ec1866406788..b5150f3bca310b12bcca40a1a5deed46d2bb731a 100644 (file)
@@ -23,9 +23,9 @@ extern void tenxpress_phy_blink(struct efx_nic *efx, bool blink);
 extern int sft9001_wait_boot(struct efx_nic *efx);
 
 /****************************************************************************
- * AMCC/Quake QT20xx PHYs
+ * AMCC/Quake QT202x PHYs
  */
-extern struct efx_phy_operations falcon_xfp_phy_ops;
+extern struct efx_phy_operations falcon_qt202x_phy_ops;
 
 /* These PHYs provide various H/W control states for LEDs */
 #define QUAKE_LED_LINK_INVAL   (0)
@@ -39,6 +39,6 @@ extern struct efx_phy_operations falcon_xfp_phy_ops;
 #define QUAKE_LED_TXLINK       (0)
 #define QUAKE_LED_RXLINK       (8)
 
-extern void xfp_set_led(struct efx_nic *p, int led, int state);
+extern void falcon_qt202x_set_led(struct efx_nic *p, int led, int state);
 
 #endif
diff --git a/drivers/net/sfc/qt202x_phy.c b/drivers/net/sfc/qt202x_phy.c
new file mode 100644 (file)
index 0000000..560eb18
--- /dev/null
@@ -0,0 +1,250 @@
+/****************************************************************************
+ * Driver for Solarflare Solarstorm network controllers and boards
+ * Copyright 2006-2008 Solarflare Communications Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation, incorporated herein by reference.
+ */
+/*
+ * Driver for AMCC QT202x SFP+ and XFP adapters; see www.amcc.com for details
+ */
+
+#include <linux/timer.h>
+#include <linux/delay.h>
+#include "efx.h"
+#include "mdio_10g.h"
+#include "phy.h"
+#include "falcon.h"
+
+#define QT202X_REQUIRED_DEVS (MDIO_DEVS_PCS |          \
+                             MDIO_DEVS_PMAPMD |        \
+                             MDIO_DEVS_PHYXS)
+
+#define QT202X_LOOPBACKS ((1 << LOOPBACK_PCS) |                \
+                         (1 << LOOPBACK_PMAPMD) |      \
+                         (1 << LOOPBACK_NETWORK))
+
+/****************************************************************************/
+/* Quake-specific MDIO registers */
+#define MDIO_QUAKE_LED0_REG    (0xD006)
+
+/* QT2025C only */
+#define PCS_FW_HEARTBEAT_REG   0xd7ee
+#define PCS_FW_HEARTB_LBN      0
+#define PCS_FW_HEARTB_WIDTH    8
+#define PCS_UC8051_STATUS_REG  0xd7fd
+#define PCS_UC_STATUS_LBN      0
+#define PCS_UC_STATUS_WIDTH    8
+#define PCS_UC_STATUS_FW_SAVE  0x20
+#define PMA_PMD_FTX_CTRL2_REG  0xc309
+#define PMA_PMD_FTX_STATIC_LBN 13
+#define PMA_PMD_VEND1_REG      0xc001
+#define PMA_PMD_VEND1_LBTXD_LBN        15
+#define PCS_VEND1_REG          0xc000
+#define PCS_VEND1_LBTXD_LBN    5
+
+void falcon_qt202x_set_led(struct efx_nic *p, int led, int mode)
+{
+       int addr = MDIO_QUAKE_LED0_REG + led;
+       efx_mdio_write(p, MDIO_MMD_PMAPMD, addr, mode);
+}
+
+struct qt202x_phy_data {
+       enum efx_phy_mode phy_mode;
+};
+
+#define QT2022C2_MAX_RESET_TIME 500
+#define QT2022C2_RESET_WAIT 10
+
+static int qt2025c_wait_reset(struct efx_nic *efx)
+{
+       unsigned long timeout = jiffies + 10 * HZ;
+       int reg, old_counter = 0;
+
+       /* Wait for firmware heartbeat to start */
+       for (;;) {
+               int counter;
+               reg = efx_mdio_read(efx, MDIO_MMD_PCS, PCS_FW_HEARTBEAT_REG);
+               if (reg < 0)
+                       return reg;
+               counter = ((reg >> PCS_FW_HEARTB_LBN) &
+                           ((1 << PCS_FW_HEARTB_WIDTH) - 1));
+               if (old_counter == 0)
+                       old_counter = counter;
+               else if (counter != old_counter)
+                       break;
+               if (time_after(jiffies, timeout))
+                       return -ETIMEDOUT;
+               msleep(10);
+       }
+
+       /* Wait for firmware status to look good */
+       for (;;) {
+               reg = efx_mdio_read(efx, MDIO_MMD_PCS, PCS_UC8051_STATUS_REG);
+               if (reg < 0)
+                       return reg;
+               if ((reg &
+                    ((1 << PCS_UC_STATUS_WIDTH) - 1) << PCS_UC_STATUS_LBN) >=
+                   PCS_UC_STATUS_FW_SAVE)
+                       break;
+               if (time_after(jiffies, timeout))
+                       return -ETIMEDOUT;
+               msleep(100);
+       }
+
+       return 0;
+}
+
+static int qt202x_reset_phy(struct efx_nic *efx)
+{
+       int rc;
+
+       if (efx->phy_type == PHY_TYPE_QT2025C) {
+               /* Wait for the reset triggered by falcon_reset_hw()
+                * to complete */
+               rc = qt2025c_wait_reset(efx);
+               if (rc < 0)
+                       goto fail;
+       } else {
+               /* Reset the PHYXS MMD. This is documented as doing
+                * a complete soft reset. */
+               rc = efx_mdio_reset_mmd(efx, MDIO_MMD_PHYXS,
+                                       QT2022C2_MAX_RESET_TIME /
+                                       QT2022C2_RESET_WAIT,
+                                       QT2022C2_RESET_WAIT);
+               if (rc < 0)
+                       goto fail;
+       }
+
+       /* Wait 250ms for the PHY to complete bootup */
+       msleep(250);
+
+       /* Check that all the MMDs we expect are present and responding. We
+        * expect faults on some if the link is down, but not on the PHY XS */
+       rc = efx_mdio_check_mmds(efx, QT202X_REQUIRED_DEVS, MDIO_DEVS_PHYXS);
+       if (rc < 0)
+               goto fail;
+
+       efx->board_info.init_leds(efx);
+
+       return rc;
+
+ fail:
+       EFX_ERR(efx, "PHY reset timed out\n");
+       return rc;
+}
+
+static int qt202x_phy_init(struct efx_nic *efx)
+{
+       struct qt202x_phy_data *phy_data;
+       u32 devid = efx_mdio_read_id(efx, MDIO_MMD_PHYXS);
+       int rc;
+
+       phy_data = kzalloc(sizeof(struct qt202x_phy_data), GFP_KERNEL);
+       if (!phy_data)
+               return -ENOMEM;
+       efx->phy_data = phy_data;
+
+       EFX_INFO(efx, "PHY ID reg %x (OUI %06x model %02x revision %x)\n",
+                devid, efx_mdio_id_oui(devid), efx_mdio_id_model(devid),
+                efx_mdio_id_rev(devid));
+
+       phy_data->phy_mode = efx->phy_mode;
+
+       rc = qt202x_reset_phy(efx);
+
+       EFX_INFO(efx, "PHY init %s.\n",
+                rc ? "failed" : "successful");
+       if (rc < 0)
+               goto fail;
+
+       return 0;
+
+ fail:
+       kfree(efx->phy_data);
+       efx->phy_data = NULL;
+       return rc;
+}
+
+static void qt202x_phy_clear_interrupt(struct efx_nic *efx)
+{
+       /* Read to clear link status alarm */
+       efx_mdio_read(efx, MDIO_MMD_PMAPMD, MDIO_PMA_LASI_STAT);
+}
+
+static int qt202x_link_ok(struct efx_nic *efx)
+{
+       return efx_mdio_links_ok(efx, QT202X_REQUIRED_DEVS);
+}
+
+static void qt202x_phy_poll(struct efx_nic *efx)
+{
+       int link_up = qt202x_link_ok(efx);
+       /* Simulate a PHY event if link state has changed */
+       if (link_up != efx->link_up)
+               falcon_sim_phy_event(efx);
+}
+
+static void qt202x_phy_reconfigure(struct efx_nic *efx)
+{
+       struct qt202x_phy_data *phy_data = efx->phy_data;
+
+       if (efx->phy_type == PHY_TYPE_QT2025C) {
+               /* There are several different register bits which can
+                * disable TX (and save power) on direct-attach cables
+                * or optical transceivers, varying somewhat between
+                * firmware versions.  Only 'static mode' appears to
+                * cover everything. */
+               mdio_set_flag(
+                       &efx->mdio, efx->mdio.prtad, MDIO_MMD_PMAPMD,
+                       PMA_PMD_FTX_CTRL2_REG, 1 << PMA_PMD_FTX_STATIC_LBN,
+                       efx->phy_mode & PHY_MODE_TX_DISABLED ||
+                       efx->phy_mode & PHY_MODE_LOW_POWER ||
+                       efx->loopback_mode == LOOPBACK_PCS ||
+                       efx->loopback_mode == LOOPBACK_PMAPMD);
+       } else {
+               /* Reset the PHY when moving from tx off to tx on */
+               if (!(efx->phy_mode & PHY_MODE_TX_DISABLED) &&
+                   (phy_data->phy_mode & PHY_MODE_TX_DISABLED))
+                       qt202x_reset_phy(efx);
+
+               efx_mdio_transmit_disable(efx);
+       }
+
+       efx_mdio_phy_reconfigure(efx);
+
+       phy_data->phy_mode = efx->phy_mode;
+       efx->link_up = qt202x_link_ok(efx);
+       efx->link_speed = 10000;
+       efx->link_fd = true;
+       efx->link_fc = efx->wanted_fc;
+}
+
+static void qt202x_phy_get_settings(struct efx_nic *efx, struct ethtool_cmd *ecmd)
+{
+       mdio45_ethtool_gset(&efx->mdio, ecmd);
+}
+
+static void qt202x_phy_fini(struct efx_nic *efx)
+{
+       /* Clobber the LED if it was blinking */
+       efx->board_info.blink(efx, false);
+
+       /* Free the context block */
+       kfree(efx->phy_data);
+       efx->phy_data = NULL;
+}
+
+struct efx_phy_operations falcon_qt202x_phy_ops = {
+       .macs            = EFX_XMAC,
+       .init            = qt202x_phy_init,
+       .reconfigure     = qt202x_phy_reconfigure,
+       .poll            = qt202x_phy_poll,
+       .fini            = qt202x_phy_fini,
+       .clear_interrupt = qt202x_phy_clear_interrupt,
+       .get_settings    = qt202x_phy_get_settings,
+       .set_settings    = efx_mdio_set_settings,
+       .mmds            = QT202X_REQUIRED_DEVS,
+       .loopbacks       = QT202X_LOOPBACKS,
+};
diff --git a/drivers/net/sfc/xfp_phy.c b/drivers/net/sfc/xfp_phy.c
deleted file mode 100644 (file)
index e6b3d5e..0000000
+++ /dev/null
@@ -1,250 +0,0 @@
-/****************************************************************************
- * Driver for Solarflare Solarstorm network controllers and boards
- * Copyright 2006-2008 Solarflare Communications Inc.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation, incorporated herein by reference.
- */
-/*
- * Driver for SFP+ and XFP optical PHYs plus some support specific to the
- * AMCC QT20xx adapters; see www.amcc.com for details
- */
-
-#include <linux/timer.h>
-#include <linux/delay.h>
-#include "efx.h"
-#include "mdio_10g.h"
-#include "phy.h"
-#include "falcon.h"
-
-#define XFP_REQUIRED_DEVS (MDIO_DEVS_PCS |     \
-                          MDIO_DEVS_PMAPMD |   \
-                          MDIO_DEVS_PHYXS)
-
-#define XFP_LOOPBACKS ((1 << LOOPBACK_PCS) |           \
-                      (1 << LOOPBACK_PMAPMD) |         \
-                      (1 << LOOPBACK_NETWORK))
-
-/****************************************************************************/
-/* Quake-specific MDIO registers */
-#define MDIO_QUAKE_LED0_REG    (0xD006)
-
-/* QT2025C only */
-#define PCS_FW_HEARTBEAT_REG   0xd7ee
-#define PCS_FW_HEARTB_LBN      0
-#define PCS_FW_HEARTB_WIDTH    8
-#define PCS_UC8051_STATUS_REG  0xd7fd
-#define PCS_UC_STATUS_LBN      0
-#define PCS_UC_STATUS_WIDTH    8
-#define PCS_UC_STATUS_FW_SAVE  0x20
-#define PMA_PMD_FTX_CTRL2_REG  0xc309
-#define PMA_PMD_FTX_STATIC_LBN 13
-#define PMA_PMD_VEND1_REG      0xc001
-#define PMA_PMD_VEND1_LBTXD_LBN        15
-#define PCS_VEND1_REG          0xc000
-#define PCS_VEND1_LBTXD_LBN    5
-
-void xfp_set_led(struct efx_nic *p, int led, int mode)
-{
-       int addr = MDIO_QUAKE_LED0_REG + led;
-       efx_mdio_write(p, MDIO_MMD_PMAPMD, addr, mode);
-}
-
-struct xfp_phy_data {
-       enum efx_phy_mode phy_mode;
-};
-
-#define XFP_MAX_RESET_TIME 500
-#define XFP_RESET_WAIT 10
-
-static int qt2025c_wait_reset(struct efx_nic *efx)
-{
-       unsigned long timeout = jiffies + 10 * HZ;
-       int reg, old_counter = 0;
-
-       /* Wait for firmware heartbeat to start */
-       for (;;) {
-               int counter;
-               reg = efx_mdio_read(efx, MDIO_MMD_PCS, PCS_FW_HEARTBEAT_REG);
-               if (reg < 0)
-                       return reg;
-               counter = ((reg >> PCS_FW_HEARTB_LBN) &
-                           ((1 << PCS_FW_HEARTB_WIDTH) - 1));
-               if (old_counter == 0)
-                       old_counter = counter;
-               else if (counter != old_counter)
-                       break;
-               if (time_after(jiffies, timeout))
-                       return -ETIMEDOUT;
-               msleep(10);
-       }
-
-       /* Wait for firmware status to look good */
-       for (;;) {
-               reg = efx_mdio_read(efx, MDIO_MMD_PCS, PCS_UC8051_STATUS_REG);
-               if (reg < 0)
-                       return reg;
-               if ((reg &
-                    ((1 << PCS_UC_STATUS_WIDTH) - 1) << PCS_UC_STATUS_LBN) >=
-                   PCS_UC_STATUS_FW_SAVE)
-                       break;
-               if (time_after(jiffies, timeout))
-                       return -ETIMEDOUT;
-               msleep(100);
-       }
-
-       return 0;
-}
-
-static int xfp_reset_phy(struct efx_nic *efx)
-{
-       int rc;
-
-       if (efx->phy_type == PHY_TYPE_QT2025C) {
-               /* Wait for the reset triggered by falcon_reset_hw()
-                * to complete */
-               rc = qt2025c_wait_reset(efx);
-               if (rc < 0)
-                       goto fail;
-       } else {
-               /* Reset the PHYXS MMD. This is documented as doing
-                * a complete soft reset. */
-               rc = efx_mdio_reset_mmd(efx, MDIO_MMD_PHYXS,
-                                       XFP_MAX_RESET_TIME / XFP_RESET_WAIT,
-                                       XFP_RESET_WAIT);
-               if (rc < 0)
-                       goto fail;
-       }
-
-       /* Wait 250ms for the PHY to complete bootup */
-       msleep(250);
-
-       /* Check that all the MMDs we expect are present and responding. We
-        * expect faults on some if the link is down, but not on the PHY XS */
-       rc = efx_mdio_check_mmds(efx, XFP_REQUIRED_DEVS, MDIO_DEVS_PHYXS);
-       if (rc < 0)
-               goto fail;
-
-       efx->board_info.init_leds(efx);
-
-       return rc;
-
- fail:
-       EFX_ERR(efx, "PHY reset timed out\n");
-       return rc;
-}
-
-static int xfp_phy_init(struct efx_nic *efx)
-{
-       struct xfp_phy_data *phy_data;
-       u32 devid = efx_mdio_read_id(efx, MDIO_MMD_PHYXS);
-       int rc;
-
-       phy_data = kzalloc(sizeof(struct xfp_phy_data), GFP_KERNEL);
-       if (!phy_data)
-               return -ENOMEM;
-       efx->phy_data = phy_data;
-
-       EFX_INFO(efx, "PHY ID reg %x (OUI %06x model %02x revision %x)\n",
-                devid, efx_mdio_id_oui(devid), efx_mdio_id_model(devid),
-                efx_mdio_id_rev(devid));
-
-       phy_data->phy_mode = efx->phy_mode;
-
-       rc = xfp_reset_phy(efx);
-
-       EFX_INFO(efx, "PHY init %s.\n",
-                rc ? "failed" : "successful");
-       if (rc < 0)
-               goto fail;
-
-       return 0;
-
- fail:
-       kfree(efx->phy_data);
-       efx->phy_data = NULL;
-       return rc;
-}
-
-static void xfp_phy_clear_interrupt(struct efx_nic *efx)
-{
-       /* Read to clear link status alarm */
-       efx_mdio_read(efx, MDIO_MMD_PMAPMD, MDIO_PMA_LASI_STAT);
-}
-
-static int xfp_link_ok(struct efx_nic *efx)
-{
-       return efx_mdio_links_ok(efx, XFP_REQUIRED_DEVS);
-}
-
-static void xfp_phy_poll(struct efx_nic *efx)
-{
-       int link_up = xfp_link_ok(efx);
-       /* Simulate a PHY event if link state has changed */
-       if (link_up != efx->link_up)
-               falcon_sim_phy_event(efx);
-}
-
-static void xfp_phy_reconfigure(struct efx_nic *efx)
-{
-       struct xfp_phy_data *phy_data = efx->phy_data;
-
-       if (efx->phy_type == PHY_TYPE_QT2025C) {
-               /* There are several different register bits which can
-                * disable TX (and save power) on direct-attach cables
-                * or optical transceivers, varying somewhat between
-                * firmware versions.  Only 'static mode' appears to
-                * cover everything. */
-               mdio_set_flag(
-                       &efx->mdio, efx->mdio.prtad, MDIO_MMD_PMAPMD,
-                       PMA_PMD_FTX_CTRL2_REG, 1 << PMA_PMD_FTX_STATIC_LBN,
-                       efx->phy_mode & PHY_MODE_TX_DISABLED ||
-                       efx->phy_mode & PHY_MODE_LOW_POWER ||
-                       efx->loopback_mode == LOOPBACK_PCS ||
-                       efx->loopback_mode == LOOPBACK_PMAPMD);
-       } else {
-               /* Reset the PHY when moving from tx off to tx on */
-               if (!(efx->phy_mode & PHY_MODE_TX_DISABLED) &&
-                   (phy_data->phy_mode & PHY_MODE_TX_DISABLED))
-                       xfp_reset_phy(efx);
-
-               efx_mdio_transmit_disable(efx);
-       }
-
-       efx_mdio_phy_reconfigure(efx);
-
-       phy_data->phy_mode = efx->phy_mode;
-       efx->link_up = xfp_link_ok(efx);
-       efx->link_speed = 10000;
-       efx->link_fd = true;
-       efx->link_fc = efx->wanted_fc;
-}
-
-static void xfp_phy_get_settings(struct efx_nic *efx, struct ethtool_cmd *ecmd)
-{
-       mdio45_ethtool_gset(&efx->mdio, ecmd);
-}
-
-static void xfp_phy_fini(struct efx_nic *efx)
-{
-       /* Clobber the LED if it was blinking */
-       efx->board_info.blink(efx, false);
-
-       /* Free the context block */
-       kfree(efx->phy_data);
-       efx->phy_data = NULL;
-}
-
-struct efx_phy_operations falcon_xfp_phy_ops = {
-       .macs            = EFX_XMAC,
-       .init            = xfp_phy_init,
-       .reconfigure     = xfp_phy_reconfigure,
-       .poll            = xfp_phy_poll,
-       .fini            = xfp_phy_fini,
-       .clear_interrupt = xfp_phy_clear_interrupt,
-       .get_settings    = xfp_phy_get_settings,
-       .set_settings    = efx_mdio_set_settings,
-       .mmds            = XFP_REQUIRED_DEVS,
-       .loopbacks       = XFP_LOOPBACKS,
-};