17 files changed, 374 insertions, 122 deletions

diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c
index 46997e177ee3..88f2fb193abe 100644
--- a/drivers/net/sfc/efx.c
+++ b/drivers/net/sfc/efx.c
@@ -1602,11 +1602,10 @@ static int efx_set_mac_address(struct net_device *net_dev, void *data)
 static void efx_set_multicast_list(struct net_device *net_dev)
 {
         struct efx_nic *efx = netdev_priv(net_dev);
-        struct dev_mc_list *mc_list = net_dev->mc_list;
+        struct dev_mc_list *mc_list;
         union efx_multicast_hash *mc_hash = &efx->multicast_hash;
         u32 crc;
         int bit;
-        int i;
 
         efx->promiscuous = !!(net_dev->flags & IFF_PROMISC);
 
@@ -1615,11 +1614,10 @@ static void efx_set_multicast_list(struct net_device *net_dev)
                 memset(mc_hash, 0xff, sizeof(*mc_hash));
         } else {
                 memset(mc_hash, 0x00, sizeof(*mc_hash));
-                for (i = 0; i < net_dev->mc_count; i++) {
+                netdev_for_each_mc_addr(mc_list, net_dev) {
                         crc = ether_crc_le(ETH_ALEN, mc_list->dmi_addr);
                         bit = crc & (EFX_MCAST_HASH_ENTRIES - 1);
                         set_bit_le(bit, mc_hash->byte);
-                        mc_list = mc_list->next;
                 }
 
                 /* Broadcast packets go through the multicast hash filter.
@@ -1940,7 +1938,7 @@ void efx_schedule_reset(struct efx_nic *efx, enum reset_type type)
  **************************************************************************/
 
 /* PCI device ID table */
-static struct pci_device_id efx_pci_table[] __devinitdata = {
+static DEFINE_PCI_DEVICE_TABLE(efx_pci_table) = {
         {PCI_DEVICE(EFX_VENDID_SFC, FALCON_A_P_DEVID),
          .driver_data = (unsigned long) &falcon_a1_nic_type},
         {PCI_DEVICE(EFX_VENDID_SFC, FALCON_B_P_DEVID),
diff --git a/drivers/net/sfc/efx.h b/drivers/net/sfc/efx.h
index a615ac051530..7eff0a615cb3 100644
--- a/drivers/net/sfc/efx.h
+++ b/drivers/net/sfc/efx.h
@@ -79,8 +79,6 @@ extern int efx_reset_up(struct efx_nic *efx, enum reset_type method, bool ok);
 
 /* Global */
 extern void efx_schedule_reset(struct efx_nic *efx, enum reset_type type);
-extern void efx_suspend(struct efx_nic *efx);
-extern void efx_resume(struct efx_nic *efx);
 extern void efx_init_irq_moderation(struct efx_nic *efx, int tx_usecs,
                                     int rx_usecs, bool rx_adaptive);
 extern int efx_request_power(struct efx_nic *efx, int mw, const char *name);
diff --git a/drivers/net/sfc/ethtool.c b/drivers/net/sfc/ethtool.c
index 6c0bbed8c477..d9f9c02a928e 100644
--- a/drivers/net/sfc/ethtool.c
+++ b/drivers/net/sfc/ethtool.c
@@ -196,7 +196,7 @@ int efx_ethtool_get_settings(struct net_device *net_dev,
         efx->phy_op->get_settings(efx, ecmd);
         mutex_unlock(&efx->mac_lock);
 
-        /* Falcon GMAC does not support 1000Mbps HD */
+        /* GMAC does not support 1000Mbps HD */
         ecmd->supported &= ~SUPPORTED_1000baseT_Half;
         /* Both MACs support pause frames (bidirectional and respond-only) */
         ecmd->supported |= SUPPORTED_Pause | SUPPORTED_Asym_Pause;
@@ -216,7 +216,7 @@ int efx_ethtool_set_settings(struct net_device *net_dev,
         struct efx_nic *efx = netdev_priv(net_dev);
         int rc;
 
-        /* Falcon GMAC does not support 1000Mbps HD */
+        /* GMAC does not support 1000Mbps HD */
         if (ecmd->speed == SPEED_1000 && ecmd->duplex != DUPLEX_FULL) {
                 EFX_LOG(efx, "rejecting unsupported 1000Mbps HD"
                         " setting\n");
@@ -342,8 +342,8 @@ static int efx_ethtool_fill_self_tests(struct efx_nic *efx,
         unsigned int n = 0, i;
         enum efx_loopback_mode mode;
 
-        efx_fill_test(n++, strings, data, &tests->mdio,
-                      "core", 0, "mdio", NULL);
+        efx_fill_test(n++, strings, data, &tests->phy_alive,
+                      "phy", 0, "alive", NULL);
         efx_fill_test(n++, strings, data, &tests->nvram,
                       "core", 0, "nvram", NULL);
         efx_fill_test(n++, strings, data, &tests->interrupt,
@@ -379,7 +379,7 @@ static int efx_ethtool_fill_self_tests(struct efx_nic *efx,
                         if (name == NULL)
                                 break;
 
-                        efx_fill_test(n++, strings, data, &tests->phy[i],
+                        efx_fill_test(n++, strings, data, &tests->phy_ext[i],
                                       "phy", 0, name, NULL);
                 }
         }
diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c
index 9d009c46e962..1b8d83657aaa 100644
--- a/drivers/net/sfc/falcon.c
+++ b/drivers/net/sfc/falcon.c
@@ -909,6 +909,8 @@ static int falcon_probe_port(struct efx_nic *efx)
                 efx->wanted_fc = EFX_FC_RX | EFX_FC_TX;
         else
                 efx->wanted_fc = EFX_FC_RX;
+        if (efx->mdio.mmds & MDIO_DEVS_AN)
+                efx->wanted_fc |= EFX_FC_AUTO;
 
         /* Allocate buffer for stats */
         rc = efx_nic_alloc_buffer(efx, &efx->stats_buffer,
@@ -1006,7 +1008,7 @@ static int falcon_test_nvram(struct efx_nic *efx)
 
 static const struct efx_nic_register_test falcon_b0_register_tests[] = {
         { FR_AZ_ADR_REGION,
-          EFX_OWORD32(0x0001FFFF, 0x0001FFFF, 0x0001FFFF, 0x0001FFFF) },
+          EFX_OWORD32(0x0003FFFF, 0x0003FFFF, 0x0003FFFF, 0x0003FFFF) },
         { FR_AZ_RX_CFG,
           EFX_OWORD32(0xFFFFFFFE, 0x00017FFF, 0x00000000, 0x00000000) },
         { FR_AZ_TX_CFG,
@@ -1728,7 +1730,7 @@ static int falcon_set_wol(struct efx_nic *efx, u32 type)
 
 /**************************************************************************
  *
- * Revision-dependent attributes used by efx.c
+ * Revision-dependent attributes used by efx.c and nic.c
  *
  **************************************************************************
  */
diff --git a/drivers/net/sfc/mcdi.c b/drivers/net/sfc/mcdi.c
index f66b3da6ddff..c48669c77414 100644
--- a/drivers/net/sfc/mcdi.c
+++ b/drivers/net/sfc/mcdi.c
@@ -896,29 +896,73 @@ fail:
         return rc;
 }
 
-int efx_mcdi_handle_assertion(struct efx_nic *efx)
+static int efx_mcdi_nvram_test(struct efx_nic *efx, unsigned int type)
+{
+        u8 inbuf[MC_CMD_NVRAM_TEST_IN_LEN];
+        u8 outbuf[MC_CMD_NVRAM_TEST_OUT_LEN];
+        int rc;
+
+        MCDI_SET_DWORD(inbuf, NVRAM_TEST_IN_TYPE, type);
+
+        rc = efx_mcdi_rpc(efx, MC_CMD_NVRAM_TEST, inbuf, sizeof(inbuf),
+                          outbuf, sizeof(outbuf), NULL);
+        if (rc)
+                return rc;
+
+        switch (MCDI_DWORD(outbuf, NVRAM_TEST_OUT_RESULT)) {
+        case MC_CMD_NVRAM_TEST_PASS:
+        case MC_CMD_NVRAM_TEST_NOTSUPP:
+                return 0;
+        default:
+                return -EIO;
+        }
+}
+
+int efx_mcdi_nvram_test_all(struct efx_nic *efx)
+{
+        u32 nvram_types;
+        unsigned int type;
+        int rc;
+
+        rc = efx_mcdi_nvram_types(efx, &nvram_types);
+        if (rc)
+                return rc;
+
+        type = 0;
+        while (nvram_types != 0) {
+                if (nvram_types & 1) {
+                        rc = efx_mcdi_nvram_test(efx, type);
+                        if (rc)
+                                return rc;
+                }
+                type++;
+                nvram_types >>= 1;
+        }
+
+        return 0;
+}
+
+static int efx_mcdi_read_assertion(struct efx_nic *efx)
 {
-        union {
-                u8 asserts[MC_CMD_GET_ASSERTS_IN_LEN];
-                u8 reboot[MC_CMD_REBOOT_IN_LEN];
-        } inbuf;
-        u8 assertion[MC_CMD_GET_ASSERTS_OUT_LEN];
+        u8 inbuf[MC_CMD_GET_ASSERTS_IN_LEN];
+        u8 outbuf[MC_CMD_GET_ASSERTS_OUT_LEN];
         unsigned int flags, index, ofst;
         const char *reason;
         size_t outlen;
         int retry;
         int rc;
 
-        /* Check if the MC is in the assertion handler, retrying twice. Once
+        /* Attempt to read any stored assertion state before we reboot
+         * the mcfw out of the assertion handler. Retry twice, once
          * because a boot-time assertion might cause this command to fail
          * with EINTR. And once again because GET_ASSERTS can race with
          * MC_CMD_REBOOT running on the other port. */
         retry = 2;
         do {
-                MCDI_SET_DWORD(inbuf.asserts, GET_ASSERTS_IN_CLEAR, 0);
+                MCDI_SET_DWORD(inbuf, GET_ASSERTS_IN_CLEAR, 1);
                 rc = efx_mcdi_rpc(efx, MC_CMD_GET_ASSERTS,
-                                  inbuf.asserts, MC_CMD_GET_ASSERTS_IN_LEN,
-                                  assertion, sizeof(assertion), &outlen);
+                                  inbuf, MC_CMD_GET_ASSERTS_IN_LEN,
+                                  outbuf, sizeof(outbuf), &outlen);
         } while ((rc == -EINTR || rc == -EIO) && retry-- > 0);
 
         if (rc)
@@ -926,21 +970,11 @@ int efx_mcdi_handle_assertion(struct efx_nic *efx)
         if (outlen < MC_CMD_GET_ASSERTS_OUT_LEN)
                 return -EINVAL;
 
-        flags = MCDI_DWORD(assertion, GET_ASSERTS_OUT_GLOBAL_FLAGS);
+        /* Print out any recorded assertion state */
+        flags = MCDI_DWORD(outbuf, GET_ASSERTS_OUT_GLOBAL_FLAGS);
         if (flags == MC_CMD_GET_ASSERTS_FLAGS_NO_FAILS)
                 return 0;
 
-        /* Reset the hardware atomically such that only one port with succeed.
-         * This command will succeed if a reboot is no longer required (because
-         * the other port did it first), but fail with EIO if it succeeds.
-         */
-        BUILD_BUG_ON(MC_CMD_REBOOT_OUT_LEN != 0);
-        MCDI_SET_DWORD(inbuf.reboot, REBOOT_IN_FLAGS,
-                       MC_CMD_REBOOT_FLAGS_AFTER_ASSERTION);
-        efx_mcdi_rpc(efx, MC_CMD_REBOOT, inbuf.reboot, MC_CMD_REBOOT_IN_LEN,
-                     NULL, 0, NULL);
-
-        /* Print out the assertion */
         reason = (flags == MC_CMD_GET_ASSERTS_FLAGS_SYS_FAIL)
                 ? "system-level assertion"
                 : (flags == MC_CMD_GET_ASSERTS_FLAGS_THR_FAIL)
@@ -949,20 +983,45 @@ int efx_mcdi_handle_assertion(struct efx_nic *efx)
                 ? "watchdog reset"
                 : "unknown assertion";
         EFX_ERR(efx, "MCPU %s at PC = 0x%.8x in thread 0x%.8x\n", reason,
-                MCDI_DWORD(assertion, GET_ASSERTS_OUT_SAVED_PC_OFFS),
-                MCDI_DWORD(assertion, GET_ASSERTS_OUT_THREAD_OFFS));
+                MCDI_DWORD(outbuf, GET_ASSERTS_OUT_SAVED_PC_OFFS),
+                MCDI_DWORD(outbuf, GET_ASSERTS_OUT_THREAD_OFFS));
 
         /* Print out the registers */
         ofst = MC_CMD_GET_ASSERTS_OUT_GP_REGS_OFFS_OFST;
         for (index = 1; index < 32; index++) {
                 EFX_ERR(efx, "R%.2d (?): 0x%.8x\n", index,
-                        MCDI_DWORD2(assertion, ofst));
+                        MCDI_DWORD2(outbuf, ofst));
                 ofst += sizeof(efx_dword_t);
         }
 
         return 0;
 }
 
+static void efx_mcdi_exit_assertion(struct efx_nic *efx)
+{
+        u8 inbuf[MC_CMD_REBOOT_IN_LEN];
+
+        /* Atomically reboot the mcfw out of the assertion handler */
+        BUILD_BUG_ON(MC_CMD_REBOOT_OUT_LEN != 0);
+        MCDI_SET_DWORD(inbuf, REBOOT_IN_FLAGS,
+                       MC_CMD_REBOOT_FLAGS_AFTER_ASSERTION);
+        efx_mcdi_rpc(efx, MC_CMD_REBOOT, inbuf, MC_CMD_REBOOT_IN_LEN,
+                     NULL, 0, NULL);
+}
+
+int efx_mcdi_handle_assertion(struct efx_nic *efx)
+{
+        int rc;
+
+        rc = efx_mcdi_read_assertion(efx);
+        if (rc)
+                return rc;
+
+        efx_mcdi_exit_assertion(efx);
+
+        return 0;
+}
+
 void efx_mcdi_set_id_led(struct efx_nic *efx, enum efx_led_mode mode)
 {
         u8 inbuf[MC_CMD_SET_ID_LED_IN_LEN];
diff --git a/drivers/net/sfc/mcdi.h b/drivers/net/sfc/mcdi.h
index 10ce98f4c0fb..f1f89ad4075a 100644
--- a/drivers/net/sfc/mcdi.h
+++ b/drivers/net/sfc/mcdi.h
@@ -116,6 +116,7 @@ extern int efx_mcdi_nvram_erase(struct efx_nic *efx, unsigned int type,
                                 loff_t offset, size_t length);
 extern int efx_mcdi_nvram_update_finish(struct efx_nic *efx,
                                         unsigned int type);
+extern int efx_mcdi_nvram_test_all(struct efx_nic *efx);
 extern int efx_mcdi_handle_assertion(struct efx_nic *efx);
 extern void efx_mcdi_set_id_led(struct efx_nic *efx, enum efx_led_mode mode);
 extern int efx_mcdi_reset_port(struct efx_nic *efx);
diff --git a/drivers/net/sfc/mcdi_pcol.h b/drivers/net/sfc/mcdi_pcol.h
index 73e71f420624..bd59302695b3 100644
--- a/drivers/net/sfc/mcdi_pcol.h
+++ b/drivers/net/sfc/mcdi_pcol.h
@@ -786,16 +786,18 @@
 #define MC_CMD_GET_PHY_CFG_OUT_FLAGS_OFST 0
 #define MC_CMD_GET_PHY_CFG_PRESENT_LBN 0
 #define MC_CMD_GET_PHY_CFG_PRESENT_WIDTH 1
-#define MC_CMD_GET_PHY_CFG_SHORTBIST_LBN 1
-#define MC_CMD_GET_PHY_CFG_SHORTBIST_WIDTH 1
-#define MC_CMD_GET_PHY_CFG_LONGBIST_LBN 2
-#define MC_CMD_GET_PHY_CFG_LONGBIST_WIDTH 1
+#define MC_CMD_GET_PHY_CFG_BIST_CABLE_SHORT_LBN 1
+#define MC_CMD_GET_PHY_CFG_BIST_CABLE_SHORT_WIDTH 1
+#define MC_CMD_GET_PHY_CFG_BIST_CABLE_LONG_LBN 2
+#define MC_CMD_GET_PHY_CFG_BIST_CABLE_LONG_WIDTH 1
 #define MC_CMD_GET_PHY_CFG_LOWPOWER_LBN 3
 #define MC_CMD_GET_PHY_CFG_LOWPOWER_WIDTH 1
 #define MC_CMD_GET_PHY_CFG_POWEROFF_LBN 4
 #define MC_CMD_GET_PHY_CFG_POWEROFF_WIDTH 1
 #define MC_CMD_GET_PHY_CFG_TXDIS_LBN 5
 #define MC_CMD_GET_PHY_CFG_TXDIS_WIDTH 1
+#define MC_CMD_GET_PHY_CFG_BIST_LBN 6
+#define MC_CMD_GET_PHY_CFG_BIST_WIDTH 1
 #define MC_CMD_GET_PHY_CFG_OUT_TYPE_OFST 4
 /* Bitmask of supported capabilities */
 #define MC_CMD_GET_PHY_CFG_OUT_SUPPORTED_CAP_OFST 8
@@ -832,7 +834,7 @@
 #define MC_CMD_GET_PHY_CFG_OUT_REVISION_OFST 52
 #define MC_CMD_GET_PHY_CFG_OUT_REVISION_LEN 20
 
-/* MC_CMD_START_PHY_BIST:
+/* MC_CMD_START_BIST:
  * Start a BIST test on the PHY.
  *
  * Locks required: PHY_LOCK if doing a  PHY BIST
@@ -840,34 +842,71 @@
  */
 #define MC_CMD_START_BIST 0x25
 #define MC_CMD_START_BIST_IN_LEN 4
-#define MC_CMD_START_BIST_TYPE_OFST 0
+#define MC_CMD_START_BIST_IN_TYPE_OFST 0
+#define MC_CMD_START_BIST_OUT_LEN 0
 
-/* Run the PHY's short BIST */
-#define MC_CMD_PHY_BIST_SHORT  1
-/* Run the PHY's long BIST */
-#define MC_CMD_PHY_BIST_LONG   2
+/* Run the PHY's short cable BIST */
+#define MC_CMD_PHY_BIST_CABLE_SHORT  1
+/* Run the PHY's long cable BIST */
+#define MC_CMD_PHY_BIST_CABLE_LONG   2
 /* Run BIST on the currently selected BPX Serdes (XAUI or XFI) */
 #define MC_CMD_BPX_SERDES_BIST 3
+/* Run the MC loopback tests */
+#define MC_CMD_MC_LOOPBACK_BIST 4
+/* Run the PHY's standard BIST */
+#define MC_CMD_PHY_BIST 5
 
 /* MC_CMD_POLL_PHY_BIST: (variadic output)
  * Poll for BIST completion
  *
- * Returns a single status code, and a binary blob of phy-specific
- * bist output. If the driver can't succesfully parse the BIST output,
- * it should still respect the Pass/Fail in OUT.RESULT.
+ * Returns a single status code, and optionally some PHY specific
+ * bist output. The driver should only consume the BIST output
+ * after validating OUTLEN and PHY_CFG.PHY_TYPE.
  *
- * Locks required: PHY_LOCK  if doing a  PHY BIST
+ * If a driver can't succesfully parse the BIST output, it should
+ * still respect the pass/Fail in OUT.RESULT
+ *
+ * Locks required: PHY_LOCK if doing a  PHY BIST
  * Return code: 0, EACCES (if PHY_LOCK is not held)
  */
 #define MC_CMD_POLL_BIST 0x26
 #define MC_CMD_POLL_BIST_IN_LEN 0
 #define MC_CMD_POLL_BIST_OUT_LEN UNKNOWN
+#define MC_CMD_POLL_BIST_OUT_SFT9001_LEN 40
+#define MC_CMD_POLL_BIST_OUT_MRSFP_LEN 8
 #define MC_CMD_POLL_BIST_OUT_RESULT_OFST 0
 #define MC_CMD_POLL_BIST_RUNNING 1
 #define MC_CMD_POLL_BIST_PASSED 2
 #define MC_CMD_POLL_BIST_FAILED 3
 #define MC_CMD_POLL_BIST_TIMEOUT 4
+/* Generic: */
 #define MC_CMD_POLL_BIST_OUT_PRIVATE_OFST 4
+/* SFT9001-specific: */
+/* (offset 4 unused?) */
+#define MC_CMD_POLL_BIST_OUT_SFT9001_CABLE_LENGTH_A_OFST 8
+#define MC_CMD_POLL_BIST_OUT_SFT9001_CABLE_LENGTH_B_OFST 12
+#define MC_CMD_POLL_BIST_OUT_SFT9001_CABLE_LENGTH_C_OFST 16
+#define MC_CMD_POLL_BIST_OUT_SFT9001_CABLE_LENGTH_D_OFST 20
+#define MC_CMD_POLL_BIST_OUT_SFT9001_CABLE_STATUS_A_OFST 24
+#define MC_CMD_POLL_BIST_OUT_SFT9001_CABLE_STATUS_B_OFST 28
+#define MC_CMD_POLL_BIST_OUT_SFT9001_CABLE_STATUS_C_OFST 32
+#define MC_CMD_POLL_BIST_OUT_SFT9001_CABLE_STATUS_D_OFST 36
+#define MC_CMD_POLL_BIST_SFT9001_PAIR_OK 1
+#define MC_CMD_POLL_BIST_SFT9001_PAIR_OPEN 2
+#define MC_CMD_POLL_BIST_SFT9001_INTRA_PAIR_SHORT 3
+#define MC_CMD_POLL_BIST_SFT9001_INTER_PAIR_SHORT 4
+#define MC_CMD_POLL_BIST_SFT9001_PAIR_BUSY 9
+/* mrsfp "PHY" driver: */
+#define MC_CMD_POLL_BIST_OUT_MRSFP_TEST_OFST 4
+#define MC_CMD_POLL_BIST_MRSFP_TEST_COMPLETE 0
+#define MC_CMD_POLL_BIST_MRSFP_TEST_BUS_SWITCH_OFF_I2C_WRITE 1
+#define MC_CMD_POLL_BIST_MRSFP_TEST_BUS_SWITCH_OFF_I2C_NO_ACCESS_IO_EXP 2
+#define MC_CMD_POLL_BIST_MRSFP_TEST_BUS_SWITCH_OFF_I2C_NO_ACCESS_MODULE 3
+#define MC_CMD_POLL_BIST_MRSFP_TEST_IO_EXP_I2C_CONFIGURE 4
+#define MC_CMD_POLL_BIST_MRSFP_TEST_BUS_SWITCH_I2C_NO_CROSSTALK 5
+#define MC_CMD_POLL_BIST_MRSFP_TEST_MODULE_PRESENCE 6
+#define MC_CMD_POLL_BIST_MRSFP_TEST_MODULE_ID_I2C_ACCESS 7
+#define MC_CMD_POLL_BIST_MRSFP_TEST_MODULE_ID_SANE_VALUE 8
 
 /* MC_CMD_PHY_SPI: (variadic in, variadic out)
  * Read/Write/Erase the PHY SPI device
@@ -1206,6 +1245,13 @@
 #define MC_CMD_WOL_FILTER_SET_IN_BITMAP_LAYER4_OFST     \
         (MC_CMD_WOL_FILTER_SET_IN_DATA_OFST + 178)
 
+#define MC_CMD_WOL_FILTER_SET_IN_LINK_MASK_OFST \
+        MC_CMD_WOL_FILTER_SET_IN_DATA_OFST
+#define MC_CMD_WOL_FILTER_SET_IN_LINK_UP_LBN    0
+#define MC_CMD_WOL_FILTER_SET_IN_LINK_UP_WIDTH  1
+#define MC_CMD_WOL_FILTER_SET_IN_LINK_DOWN_LBN  1
+#define MC_CMD_WOL_FILTER_SET_IN_LINK_DOWN_WIDTH 1
+
 #define MC_CMD_WOL_FILTER_SET_OUT_LEN 4
 #define MC_CMD_WOL_FILTER_SET_OUT_FILTER_ID_OFST 0
 
@@ -1216,7 +1262,8 @@
 #define MC_CMD_WOL_TYPE_IPV4_SYN   0x3
 #define MC_CMD_WOL_TYPE_IPV6_SYN   0x4
 #define MC_CMD_WOL_TYPE_BITMAP     0x5
-#define MC_CMD_WOL_TYPE_MAX        0x6
+#define MC_CMD_WOL_TYPE_LINK       0x6
+#define MC_CMD_WOL_TYPE_MAX        0x7
 
 #define MC_CMD_FILTER_MODE_SIMPLE     0x0
 #define MC_CMD_FILTER_MODE_STRUCTURED 0xffffffff
@@ -1357,14 +1404,24 @@
  * Returns: 0, EINVAL (bad type/offset/length), EACCES (if PHY_LOCK required and not held)
  */
 #define MC_CMD_NVRAM_UPDATE_FINISH 0x3c
-#define MC_CMD_NVRAM_UPDATE_FINISH_IN_LEN 4
+#define MC_CMD_NVRAM_UPDATE_FINISH_IN_LEN 8
 #define MC_CMD_NVRAM_UPDATE_FINISH_IN_TYPE_OFST 0
+#define MC_CMD_NVRAM_UPDATE_FINISH_IN_REBOOT_OFST 4
 #define MC_CMD_NVRAM_UPDATE_FINISH_OUT_LEN 0
 
 /* MC_CMD_REBOOT:
- * Reboot the MC. The AFTER_ASSERTION flag is intended to be used
- * when the driver notices an assertion failure, to allow two ports to
- * both recover (semi-)gracefully.
+ * Reboot the MC.
+ *
+ * The AFTER_ASSERTION flag is intended to be used when the driver notices
+ * an assertion failure (at which point it is expected to perform a complete
+ * tear down and reinitialise), to allow both ports to reset the MC once
+ * in an atomic fashion.
+ *
+ * Production mc firmwares are generally compiled with REBOOT_ON_ASSERT=1,
+ * which means that they will automatically reboot out of the assertion
+ * handler, so this is in practise an optional operation. It is still
+ * recommended that drivers execute this to support custom firmwares
+ * with REBOOT_ON_ASSERT=0.
  *
  * Locks required: NONE
  * Returns: Nothing. You get back a response with ERR=1, DATALEN=0
@@ -1469,11 +1526,10 @@
         ((_ofst) + 6)
 
 /* MC_CMD_READ_SENSORS
- * Returns the current (value, state) for each sensor
+ * Returns the current reading from each sensor
  *
- * Returns the current (value, state) [each 16bit] of each sensor supported by
- * this board, by DMA'ing a sparse array (indexed by the sensor type) into host
- * memory.
+ * Returns a sparse array of sensor readings (indexed by the sensor
+ * type) into host memory.  Each array element is a dword.
  *
  * The MC will send a SENSOREVT event every time any sensor changes state. The
  * driver is responsible for ensuring that it doesn't miss any events. The board
@@ -1486,6 +1542,12 @@
 #define MC_CMD_READ_SENSORS_IN_DMA_ADDR_HI_OFST 4
 #define MC_CMD_READ_SENSORS_OUT_LEN 0
 
+/* Sensor reading fields */
+#define MC_CMD_READ_SENSOR_VALUE_LBN 0
+#define MC_CMD_READ_SENSOR_VALUE_WIDTH 16
+#define MC_CMD_READ_SENSOR_STATE_LBN 16
+#define MC_CMD_READ_SENSOR_STATE_WIDTH 8
+
 
 /* MC_CMD_GET_PHY_STATE:
  * Report current state of PHY.  A "zombie" PHY is a PHY that has failed to
@@ -1577,4 +1639,98 @@
 #define MC_CMD_MAC_RESET_RESTORE_IN_LEN 0
 #define MC_CMD_MAC_RESET_RESTORE_OUT_LEN 0
 
+
+/* MC_CMD_TEST_ASSERT:
+ * Deliberately trigger an assert-detonation in the firmware for testing
+ * purposes (i.e. to allow tests that the driver copes gracefully).
+ *
+ * Locks required: None
+ * Returns: 0
+ */
+
+#define MC_CMD_TESTASSERT 0x49
+#define MC_CMD_TESTASSERT_IN_LEN 0
+#define MC_CMD_TESTASSERT_OUT_LEN 0
+
+/* MC_CMD_WORKAROUND 0x4a
+ *
+ * Enable/Disable a given workaround. The mcfw will return EINVAL if it
+ * doesn't understand the given workaround number - which should not
+ * be treated as a hard error by client code.
+ *
+ * This op does not imply any semantics about each workaround, that's between
+ * the driver and the mcfw on a per-workaround basis.
+ *
+ * Locks required: None
+ * Returns: 0, EINVAL
+ */
+#define MC_CMD_WORKAROUND 0x4a
+#define MC_CMD_WORKAROUND_IN_LEN 8
+#define MC_CMD_WORKAROUND_IN_TYPE_OFST 0
+#define MC_CMD_WORKAROUND_BUG17230 1
+#define MC_CMD_WORKAROUND_IN_ENABLED_OFST 4
+#define MC_CMD_WORKAROUND_OUT_LEN 0
+
+/* MC_CMD_GET_PHY_MEDIA_INFO:
+ * Read media-specific data from PHY (e.g. SFP/SFP+ module ID information for
+ * SFP+ PHYs).
+ *
+ * The "media type" can be found via GET_PHY_CFG (GET_PHY_CFG_OUT_MEDIA_TYPE);
+ * the valid "page number" input values, and the output data, are interpreted
+ * on a per-type basis.
+ *
+ * For SFP+: PAGE=0 or 1 returns a 128-byte block read from module I2C address
+ *           0xA0 offset 0 or 0x80.
+ * Anything else: currently undefined.
+ *
+ * Locks required: None
+ * Return code: 0
+ */
+#define MC_CMD_GET_PHY_MEDIA_INFO 0x4b
+#define MC_CMD_GET_PHY_MEDIA_INFO_IN_LEN 4
+#define MC_CMD_GET_PHY_MEDIA_INFO_IN_PAGE_OFST 0
+#define MC_CMD_GET_PHY_MEDIA_INFO_OUT_LEN(_num_bytes) (4 + (_num_bytes))
+#define MC_CMD_GET_PHY_MEDIA_INFO_OUT_DATALEN_OFST 0
+#define MC_CMD_GET_PHY_MEDIA_INFO_OUT_DATA_OFST 4
+
+/* MC_CMD_NVRAM_TEST:
+ * Test a particular NVRAM partition for valid contents (where "valid"
+ * depends on the type of partition).
+ *
+ * Locks required: None
+ * Return code: 0
+ */
+#define MC_CMD_NVRAM_TEST 0x4c
+#define MC_CMD_NVRAM_TEST_IN_LEN 4
+#define MC_CMD_NVRAM_TEST_IN_TYPE_OFST 0
+#define MC_CMD_NVRAM_TEST_OUT_LEN 4
+#define MC_CMD_NVRAM_TEST_OUT_RESULT_OFST 0
+#define MC_CMD_NVRAM_TEST_PASS 0
+#define MC_CMD_NVRAM_TEST_FAIL 1
+#define MC_CMD_NVRAM_TEST_NOTSUPP 2
+
+/* MC_CMD_MRSFP_TWEAK: (debug)
+ * Read status and/or set parameters for the "mrsfp" driver in mr_rusty builds.
+ * I2C I/O expander bits are always read; if equaliser parameters are supplied,
+ * they are configured first.
+ *
+ * Locks required: None
+ * Return code: 0, EINVAL
+ */
+#define MC_CMD_MRSFP_TWEAK 0x4d
+#define MC_CMD_MRSFP_TWEAK_IN_LEN_READ_ONLY 0
+#define MC_CMD_MRSFP_TWEAK_IN_LEN_EQ_CONFIG 16
+#define MC_CMD_MRSFP_TWEAK_IN_TXEQ_LEVEL_OFST 0    /* 0-6 low->high de-emph. */
+#define MC_CMD_MRSFP_TWEAK_IN_TXEQ_DT_CFG_OFST 4   /* 0-8 low->high ref.V */
+#define MC_CMD_MRSFP_TWEAK_IN_RXEQ_BOOST_OFST 8    /* 0-8 low->high boost */
+#define MC_CMD_MRSFP_TWEAK_IN_RXEQ_DT_CFG_OFST 12  /* 0-8 low->high ref.V */
+#define MC_CMD_MRSFP_TWEAK_OUT_LEN 12
+#define MC_CMD_MRSFP_TWEAK_OUT_IOEXP_INPUTS_OFST 0     /* input bits */
+#define MC_CMD_MRSFP_TWEAK_OUT_IOEXP_OUTPUTS_OFST 4    /* output bits */
+#define MC_CMD_MRSFP_TWEAK_OUT_IOEXP_DIRECTION_OFST 8  /* dirs: 0=out, 1=in */
+
+/* Do NOT add new commands beyond 0x4f as part of 3.0 : 0x50 - 0x7f will be
+ * used for post-3.0 extensions. If you run out of space, look for gaps or
+ * commands that are unused in the existing range. */
+
 #endif /* MCDI_PCOL_H */
diff --git a/drivers/net/sfc/mcdi_phy.c b/drivers/net/sfc/mcdi_phy.c
index eb694af7a473..34c22fa986e2 100644
--- a/drivers/net/sfc/mcdi_phy.c
+++ b/drivers/net/sfc/mcdi_phy.c
@@ -381,6 +381,18 @@ static int efx_mcdi_phy_probe(struct efx_nic *efx)
          * but by convention we don't */
         efx->loopback_modes &= ~(1 << LOOPBACK_NONE);
 
+        /* Set the initial link mode */
+        efx_mcdi_phy_decode_link(
+                efx, &efx->link_state,
+                MCDI_DWORD(outbuf, GET_LINK_OUT_LINK_SPEED),
+                MCDI_DWORD(outbuf, GET_LINK_OUT_FLAGS),
+                MCDI_DWORD(outbuf, GET_LINK_OUT_FCNTL));
+
+        /* Default to Autonegotiated flow control if the PHY supports it */
+        efx->wanted_fc = EFX_FC_RX | EFX_FC_TX;
+        if (phy_data->supported_cap & (1 << MC_CMD_PHY_CAP_AN_LBN))
+                efx->wanted_fc |= EFX_FC_AUTO;
+
         return 0;
 
 fail:
@@ -436,7 +448,7 @@ void efx_mcdi_phy_check_fcntl(struct efx_nic *efx, u32 lpa)
 
         /* The link partner capabilities are only relevent if the
          * link supports flow control autonegotiation */
-        if (~phy_cfg->supported_cap & (1 << MC_CMD_PHY_CAP_ASYM_LBN))
+        if (~phy_cfg->supported_cap & (1 << MC_CMD_PHY_CAP_AN_LBN))
                 return;
 
         /* If flow control autoneg is supported and enabled, then fine */
@@ -560,6 +572,27 @@ static int efx_mcdi_phy_set_settings(struct efx_nic *efx, struct ethtool_cmd *ec
         return 0;
 }
 
+static int efx_mcdi_phy_test_alive(struct efx_nic *efx)
+{
+        u8 outbuf[MC_CMD_GET_PHY_STATE_OUT_LEN];
+        size_t outlen;
+        int rc;
+
+        BUILD_BUG_ON(MC_CMD_GET_PHY_STATE_IN_LEN != 0);
+
+        rc = efx_mcdi_rpc(efx, MC_CMD_GET_PHY_STATE, NULL, 0,
+                          outbuf, sizeof(outbuf), &outlen);
+        if (rc)
+                return rc;
+
+        if (outlen < MC_CMD_GET_PHY_STATE_OUT_LEN)
+                return -EMSGSIZE;
+        if (MCDI_DWORD(outbuf, GET_PHY_STATE_STATE) != MC_CMD_PHY_STATE_OK)
+                return -EINVAL;
+
+        return 0;
+}
+
 struct efx_phy_operations efx_mcdi_phy_ops = {
         .probe          = efx_mcdi_phy_probe,
         .init           = efx_port_dummy_op_int,
@@ -569,6 +602,7 @@ struct efx_phy_operations efx_mcdi_phy_ops = {
         .remove         = efx_mcdi_phy_remove,
         .get_settings   = efx_mcdi_phy_get_settings,
         .set_settings   = efx_mcdi_phy_set_settings,
+        .test_alive     = efx_mcdi_phy_test_alive,
         .run_tests      = NULL,
         .test_name      = NULL,
 };
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;
+}
diff --git a/drivers/net/sfc/mdio_10g.h b/drivers/net/sfc/mdio_10g.h
index f6ac9503339d..f89e71929603 100644
--- a/drivers/net/sfc/mdio_10g.h
+++ b/drivers/net/sfc/mdio_10g.h
@@ -106,4 +106,7 @@ efx_mdio_set_flag(struct efx_nic *efx, int devad, int addr,
         mdio_set_flag(&efx->mdio, efx->mdio.prtad, devad, addr, mask, state);
 }
 
+/* Liveness self-test for MDIO PHYs */
+extern int efx_mdio_test_alive(struct efx_nic *efx);
+
 #endif /* EFX_MDIO_10G_H */
diff --git a/drivers/net/sfc/net_driver.h b/drivers/net/sfc/net_driver.h
index d5aab5b3fa06..cb018e272097 100644
--- a/drivers/net/sfc/net_driver.h
+++ b/drivers/net/sfc/net_driver.h
@@ -18,7 +18,6 @@
 #include <linux/etherdevice.h>
 #include <linux/ethtool.h>
 #include <linux/if_vlan.h>
-#include <linux/timer.h>
 #include <linux/mdio.h>
 #include <linux/list.h>
 #include <linux/pci.h>
@@ -101,9 +100,6 @@ do {if (net_ratelimit()) EFX_LOG(efx, fmt, ##args); } while (0)
  * Special buffers are used for the event queues and the TX and RX
  * descriptor queues for each channel.  They are *not* used for the
  * actual transmit and receive buffers.
- *
- * Note that for Falcon, TX and RX descriptor queues live in host memory.
- * Allocation and freeing procedures must take this into account.
  */
 struct efx_special_buffer {
         void *addr;
@@ -300,7 +296,7 @@ struct efx_rx_queue {
  * @dma_addr: DMA base address of the buffer
  * @len: Buffer length, in bytes
  *
- * Falcon uses these buffers for its interrupt status registers and
+ * The NIC uses these buffers for its interrupt status registers and
  * MAC stats dumps.
  */
 struct efx_buffer {
@@ -516,8 +512,9 @@ struct efx_mac_operations {
  * @set_settings: Set ethtool settings. Serialised by the mac_lock.
  * @set_npage_adv: Set abilities advertised in (Extended) Next Page
  *      (only needed where AN bit is set in mmds)
+ * @test_alive: Test that PHY is 'alive' (online)
  * @test_name: Get the name of a PHY-specific test/result
- * @run_tests: Run tests and record results as appropriate.
+ * @run_tests: Run tests and record results as appropriate (offline).
  *      Flags are the ethtool tests flags.
  */
 struct efx_phy_operations {
@@ -532,6 +529,7 @@ struct efx_phy_operations {
         int (*set_settings) (struct efx_nic *efx,
                              struct ethtool_cmd *ecmd);
         void (*set_npage_adv) (struct efx_nic *efx, u32);
+        int (*test_alive) (struct efx_nic *efx);
         const char *(*test_name) (struct efx_nic *efx, unsigned int index);
         int (*run_tests) (struct efx_nic *efx, int *results, unsigned flags);
 };
@@ -672,7 +670,7 @@ union efx_multicast_hash {
  * @irq_status: Interrupt status buffer
  * @last_irq_cpu: Last CPU to handle interrupt.
  *      This register is written with the SMP processor ID whenever an
- *      interrupt is handled.  It is used by falcon_test_interrupt()
+ *      interrupt is handled.  It is used by efx_nic_test_interrupt()
  *      to verify that an interrupt has occurred.
  * @spi_flash: SPI flash device
  *      This field will be %NULL if no flash device is present (or for Siena).
@@ -721,8 +719,7 @@ union efx_multicast_hash {
  * @loopback_modes: Supported loopback mode bitmask
  * @loopback_selftest: Offline self-test private state
  *
- * The @priv field of the corresponding &struct net_device points to
- * this.
+ * This is stored in the private area of the &struct net_device.
  */
 struct efx_nic {
         char name[IFNAMSIZ];
@@ -995,7 +992,7 @@ static inline void clear_bit_le(unsigned nr, unsigned char *addr)
  * that the net driver will program into the MAC as the maximum frame
  * length.
  *
- * The 10G MAC used in Falcon requires 8-byte alignment on the frame
+ * The 10G MAC requires 8-byte alignment on the frame
  * length, so we round up to the nearest 8.
  *
  * Re-clocking by the XGXS on RX can reduce an IPG to 32 bits (half an
diff --git a/drivers/net/sfc/nic.c b/drivers/net/sfc/nic.c
index db44224ed2ca..b06f8e348307 100644
--- a/drivers/net/sfc/nic.c
+++ b/drivers/net/sfc/nic.c
@@ -623,10 +623,6 @@ void efx_nic_remove_rx(struct efx_rx_queue *rx_queue)
  *
  * This writes the EVQ_RPTR_REG register for the specified channel's
  * event queue.
- *
- * Note that EVQ_RPTR_REG contains the index of the "last read" event,
- * whereas channel->eventq_read_ptr contains the index of the "next to
- * read" event.
  */
 void efx_nic_eventq_read_ack(struct efx_channel *channel)
 {
@@ -1384,6 +1380,15 @@ static irqreturn_t efx_legacy_interrupt(int irq, void *dev_id)
                 efx->last_irq_cpu = raw_smp_processor_id();
                 EFX_TRACE(efx, "IRQ %d on CPU %d status " EFX_DWORD_FMT "\n",
                           irq, raw_smp_processor_id(), EFX_DWORD_VAL(reg));
+        } else if (EFX_WORKAROUND_15783(efx)) {
+                /* We can't return IRQ_HANDLED more than once on seeing ISR0=0
+                 * because this might be a shared interrupt, but we do need to
+                 * check the channel every time and preemptively rearm it if
+                 * it's idle. */
+                efx_for_each_channel(channel, efx) {
+                        if (!channel->work_pending)
+                                efx_nic_eventq_read_ack(channel);
+                }
         }
 
         return result;
diff --git a/drivers/net/sfc/qt202x_phy.c b/drivers/net/sfc/qt202x_phy.c
index 67eec7a6e487..1bee62c83001 100644
--- a/drivers/net/sfc/qt202x_phy.c
+++ b/drivers/net/sfc/qt202x_phy.c
@@ -445,4 +445,5 @@ struct efx_phy_operations falcon_qt202x_phy_ops = {
         .remove          = qt202x_phy_remove,
         .get_settings    = qt202x_phy_get_settings,
         .set_settings    = efx_mdio_set_settings,
+        .test_alive      = efx_mdio_test_alive,
 };
diff --git a/drivers/net/sfc/selftest.c b/drivers/net/sfc/selftest.c
index 250c8827b842..cf0139a7d9a4 100644
--- a/drivers/net/sfc/selftest.c
+++ b/drivers/net/sfc/selftest.c
@@ -24,9 +24,6 @@
 #include "nic.h"
 #include "selftest.h"
 #include "workarounds.h"
-#include "spi.h"
-#include "io.h"
-#include "mdio_10g.h"
 
 /*
  * Loopback test packet structure
@@ -76,42 +73,15 @@ struct efx_loopback_state {
  *
  **************************************************************************/
 
-static int efx_test_mdio(struct efx_nic *efx, struct efx_self_tests *tests)
+static int efx_test_phy_alive(struct efx_nic *efx, struct efx_self_tests *tests)
 {
         int rc = 0;
-        int devad;
-        u16 physid1, physid2;
-
-        if (efx->mdio.mode_support & MDIO_SUPPORTS_C45)
-                devad = __ffs(efx->mdio.mmds);
-        else if (efx->mdio.mode_support & MDIO_SUPPORTS_C22)
-                devad = MDIO_DEVAD_NONE;
-        else
-                return 0;
-
-        mutex_lock(&efx->mac_lock);
-        tests->mdio = -1;
-
-        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;
-                goto out;
+        if (efx->phy_op->test_alive) {
+                rc = efx->phy_op->test_alive(efx);
+                tests->phy_alive = rc ? -1 : 1;
         }
 
-        if (EFX_IS10G(efx)) {
-                rc = efx_mdio_check_mmds(efx, efx->mdio.mmds, 0);
-                if (rc)
-                        goto out;
-        }
-
-out:
-        mutex_unlock(&efx->mac_lock);
-        tests->mdio = rc ? -1 : 1;
         return rc;
 }
 
@@ -258,7 +228,7 @@ static int efx_test_phy(struct efx_nic *efx, struct efx_self_tests *tests,
                 return 0;
 
         mutex_lock(&efx->mac_lock);
-        rc = efx->phy_op->run_tests(efx, tests->phy, flags);
+        rc = efx->phy_op->run_tests(efx, tests->phy_ext, flags);
         mutex_unlock(&efx->mac_lock);
         return rc;
 }
@@ -684,7 +654,7 @@ int efx_selftest(struct efx_nic *efx, struct efx_self_tests *tests,
         /* Online (i.e. non-disruptive) testing
          * This checks interrupt generation, event delivery and PHY presence. */
 
-        rc = efx_test_mdio(efx, tests);
+        rc = efx_test_phy_alive(efx, tests);
         if (rc && !rc_test)
                 rc_test = rc;
 
diff --git a/drivers/net/sfc/selftest.h b/drivers/net/sfc/selftest.h
index f6feee04c96b..643bef72b99d 100644
--- a/drivers/net/sfc/selftest.h
+++ b/drivers/net/sfc/selftest.h
@@ -32,7 +32,7 @@ struct efx_loopback_self_tests {
  */
 struct efx_self_tests {
         /* online tests */
-        int mdio;
+        int phy_alive;
         int nvram;
         int interrupt;
         int eventq_dma[EFX_MAX_CHANNELS];
@@ -40,7 +40,7 @@ struct efx_self_tests {
         int eventq_poll[EFX_MAX_CHANNELS];
         /* offline tests */
         int registers;
-        int phy[EFX_MAX_PHY_TESTS];
+        int phy_ext[EFX_MAX_PHY_TESTS];
         struct efx_loopback_self_tests loopback[LOOPBACK_TEST_MAX + 1];
 };
 
diff --git a/drivers/net/sfc/siena.c b/drivers/net/sfc/siena.c
index f8c6771e66d8..1619fb5a64f5 100644
--- a/drivers/net/sfc/siena.c
+++ b/drivers/net/sfc/siena.c
@@ -106,16 +106,11 @@ static int siena_probe_port(struct efx_nic *efx)
         efx->mdio.mdio_read = siena_mdio_read;
         efx->mdio.mdio_write = siena_mdio_write;
 
-        /* Fill out MDIO structure and loopback modes */
+        /* Fill out MDIO structure, loopback modes, and initial link state */
         rc = efx->phy_op->probe(efx);
         if (rc != 0)
                 return rc;
 
-        /* Initial assumption */
-        efx->link_state.speed = 10000;
-        efx->link_state.fd = true;
-        efx->wanted_fc = EFX_FC_RX | EFX_FC_TX;
-
         /* Allocate buffer for stats */
         rc = efx_nic_alloc_buffer(efx, &efx->stats_buffer,
                                   MC_CMD_MAC_NSTATS * sizeof(u64));
@@ -139,7 +134,7 @@ void siena_remove_port(struct efx_nic *efx)
 
 static const struct efx_nic_register_test siena_register_tests[] = {
         { FR_AZ_ADR_REGION,
-          EFX_OWORD32(0x0001FFFF, 0x0001FFFF, 0x0001FFFF, 0x0001FFFF) },
+          EFX_OWORD32(0x0003FFFF, 0x0003FFFF, 0x0003FFFF, 0x0003FFFF) },
         { FR_CZ_USR_EV_CFG,
           EFX_OWORD32(0x000103FF, 0x00000000, 0x00000000, 0x00000000) },
         { FR_AZ_RX_CFG,
@@ -181,6 +176,12 @@ static int siena_test_registers(struct efx_nic *efx)
 
 static int siena_reset_hw(struct efx_nic *efx, enum reset_type method)
 {
+        int rc;
+
+        /* Recover from a failed assertion pre-reset */
+        rc = efx_mcdi_handle_assertion(efx);
+        if (rc)
+                return rc;
 
         if (method == RESET_TYPE_WORLD)
                 return efx_mcdi_reset_mc(efx);
@@ -582,6 +583,7 @@ struct efx_nic_type siena_a0_nic_type = {
         .set_wol = siena_set_wol,
         .resume_wol = siena_init_wol,
         .test_registers = siena_test_registers,
+        .test_nvram = efx_mcdi_nvram_test_all,
         .default_mac_ops = &efx_mcdi_mac_operations,
 
         .revision = EFX_REV_SIENA_A0,
diff --git a/drivers/net/sfc/tenxpress.c b/drivers/net/sfc/tenxpress.c
index 3009c297c135..10db071bd837 100644
--- a/drivers/net/sfc/tenxpress.c
+++ b/drivers/net/sfc/tenxpress.c
@@ -842,6 +842,7 @@ struct efx_phy_operations falcon_sfx7101_phy_ops = {
         .get_settings     = tenxpress_get_settings,
         .set_settings     = tenxpress_set_settings,
         .set_npage_adv    = sfx7101_set_npage_adv,
+        .test_alive       = efx_mdio_test_alive,
         .test_name        = sfx7101_test_name,
         .run_tests        = sfx7101_run_tests,
 };
@@ -856,6 +857,7 @@ struct efx_phy_operations falcon_sft9001_phy_ops = {
         .get_settings     = tenxpress_get_settings,
         .set_settings     = tenxpress_set_settings,
         .set_npage_adv    = sft9001_set_npage_adv,
+        .test_alive       = efx_mdio_test_alive,
         .test_name        = sft9001_test_name,
         .run_tests        = sft9001_run_tests,
 };