sfc: Prepare for RX scatter on EF10
[deliverable/linux.git] / drivers / net / ethernet / sfc / falcon.c
index 71998e7995d9b3af015653eee2a80f1ec097c3ab..a7b30ddbd4e0c47af54989194106ecdea3d0d001 100644 (file)
 #include "net_driver.h"
 #include "bitfield.h"
 #include "efx.h"
-#include "spi.h"
 #include "nic.h"
-#include "regs.h"
+#include "farch_regs.h"
 #include "io.h"
 #include "phy.h"
 #include "workarounds.h"
 #include "selftest.h"
+#include "mdio_10g.h"
 
 /* Hardware control for SFC4000 (aka Falcon). */
 
+/**************************************************************************
+ *
+ * NIC stats
+ *
+ **************************************************************************
+ */
+
+#define FALCON_MAC_STATS_SIZE 0x100
+
+#define XgRxOctets_offset 0x0
+#define XgRxOctets_WIDTH 48
+#define XgRxOctetsOK_offset 0x8
+#define XgRxOctetsOK_WIDTH 48
+#define XgRxPkts_offset 0x10
+#define XgRxPkts_WIDTH 32
+#define XgRxPktsOK_offset 0x14
+#define XgRxPktsOK_WIDTH 32
+#define XgRxBroadcastPkts_offset 0x18
+#define XgRxBroadcastPkts_WIDTH 32
+#define XgRxMulticastPkts_offset 0x1C
+#define XgRxMulticastPkts_WIDTH 32
+#define XgRxUnicastPkts_offset 0x20
+#define XgRxUnicastPkts_WIDTH 32
+#define XgRxUndersizePkts_offset 0x24
+#define XgRxUndersizePkts_WIDTH 32
+#define XgRxOversizePkts_offset 0x28
+#define XgRxOversizePkts_WIDTH 32
+#define XgRxJabberPkts_offset 0x2C
+#define XgRxJabberPkts_WIDTH 32
+#define XgRxUndersizeFCSerrorPkts_offset 0x30
+#define XgRxUndersizeFCSerrorPkts_WIDTH 32
+#define XgRxDropEvents_offset 0x34
+#define XgRxDropEvents_WIDTH 32
+#define XgRxFCSerrorPkts_offset 0x38
+#define XgRxFCSerrorPkts_WIDTH 32
+#define XgRxAlignError_offset 0x3C
+#define XgRxAlignError_WIDTH 32
+#define XgRxSymbolError_offset 0x40
+#define XgRxSymbolError_WIDTH 32
+#define XgRxInternalMACError_offset 0x44
+#define XgRxInternalMACError_WIDTH 32
+#define XgRxControlPkts_offset 0x48
+#define XgRxControlPkts_WIDTH 32
+#define XgRxPausePkts_offset 0x4C
+#define XgRxPausePkts_WIDTH 32
+#define XgRxPkts64Octets_offset 0x50
+#define XgRxPkts64Octets_WIDTH 32
+#define XgRxPkts65to127Octets_offset 0x54
+#define XgRxPkts65to127Octets_WIDTH 32
+#define XgRxPkts128to255Octets_offset 0x58
+#define XgRxPkts128to255Octets_WIDTH 32
+#define XgRxPkts256to511Octets_offset 0x5C
+#define XgRxPkts256to511Octets_WIDTH 32
+#define XgRxPkts512to1023Octets_offset 0x60
+#define XgRxPkts512to1023Octets_WIDTH 32
+#define XgRxPkts1024to15xxOctets_offset 0x64
+#define XgRxPkts1024to15xxOctets_WIDTH 32
+#define XgRxPkts15xxtoMaxOctets_offset 0x68
+#define XgRxPkts15xxtoMaxOctets_WIDTH 32
+#define XgRxLengthError_offset 0x6C
+#define XgRxLengthError_WIDTH 32
+#define XgTxPkts_offset 0x80
+#define XgTxPkts_WIDTH 32
+#define XgTxOctets_offset 0x88
+#define XgTxOctets_WIDTH 48
+#define XgTxMulticastPkts_offset 0x90
+#define XgTxMulticastPkts_WIDTH 32
+#define XgTxBroadcastPkts_offset 0x94
+#define XgTxBroadcastPkts_WIDTH 32
+#define XgTxUnicastPkts_offset 0x98
+#define XgTxUnicastPkts_WIDTH 32
+#define XgTxControlPkts_offset 0x9C
+#define XgTxControlPkts_WIDTH 32
+#define XgTxPausePkts_offset 0xA0
+#define XgTxPausePkts_WIDTH 32
+#define XgTxPkts64Octets_offset 0xA4
+#define XgTxPkts64Octets_WIDTH 32
+#define XgTxPkts65to127Octets_offset 0xA8
+#define XgTxPkts65to127Octets_WIDTH 32
+#define XgTxPkts128to255Octets_offset 0xAC
+#define XgTxPkts128to255Octets_WIDTH 32
+#define XgTxPkts256to511Octets_offset 0xB0
+#define XgTxPkts256to511Octets_WIDTH 32
+#define XgTxPkts512to1023Octets_offset 0xB4
+#define XgTxPkts512to1023Octets_WIDTH 32
+#define XgTxPkts1024to15xxOctets_offset 0xB8
+#define XgTxPkts1024to15xxOctets_WIDTH 32
+#define XgTxPkts1519toMaxOctets_offset 0xBC
+#define XgTxPkts1519toMaxOctets_WIDTH 32
+#define XgTxUndersizePkts_offset 0xC0
+#define XgTxUndersizePkts_WIDTH 32
+#define XgTxOversizePkts_offset 0xC4
+#define XgTxOversizePkts_WIDTH 32
+#define XgTxNonTcpUdpPkt_offset 0xC8
+#define XgTxNonTcpUdpPkt_WIDTH 16
+#define XgTxMacSrcErrPkt_offset 0xCC
+#define XgTxMacSrcErrPkt_WIDTH 16
+#define XgTxIpSrcErrPkt_offset 0xD0
+#define XgTxIpSrcErrPkt_WIDTH 16
+#define XgDmaDone_offset 0xD4
+#define XgDmaDone_WIDTH 32
+
+#define FALCON_XMAC_STATS_DMA_FLAG(efx)                                \
+       (*(u32 *)((efx)->stats_buffer.addr + XgDmaDone_offset))
+
+#define FALCON_DMA_STAT(ext_name, hw_name)                             \
+       [FALCON_STAT_ ## ext_name] =                                    \
+       { #ext_name,                                                    \
+         /* 48-bit stats are zero-padded to 64 on DMA */               \
+         hw_name ## _ ## WIDTH == 48 ? 64 : hw_name ## _ ## WIDTH,     \
+         hw_name ## _ ## offset }
+#define FALCON_OTHER_STAT(ext_name)                                    \
+       [FALCON_STAT_ ## ext_name] = { #ext_name, 0, 0 }
+
+static const struct efx_hw_stat_desc falcon_stat_desc[FALCON_STAT_COUNT] = {
+       FALCON_DMA_STAT(tx_bytes, XgTxOctets),
+       FALCON_DMA_STAT(tx_packets, XgTxPkts),
+       FALCON_DMA_STAT(tx_pause, XgTxPausePkts),
+       FALCON_DMA_STAT(tx_control, XgTxControlPkts),
+       FALCON_DMA_STAT(tx_unicast, XgTxUnicastPkts),
+       FALCON_DMA_STAT(tx_multicast, XgTxMulticastPkts),
+       FALCON_DMA_STAT(tx_broadcast, XgTxBroadcastPkts),
+       FALCON_DMA_STAT(tx_lt64, XgTxUndersizePkts),
+       FALCON_DMA_STAT(tx_64, XgTxPkts64Octets),
+       FALCON_DMA_STAT(tx_65_to_127, XgTxPkts65to127Octets),
+       FALCON_DMA_STAT(tx_128_to_255, XgTxPkts128to255Octets),
+       FALCON_DMA_STAT(tx_256_to_511, XgTxPkts256to511Octets),
+       FALCON_DMA_STAT(tx_512_to_1023, XgTxPkts512to1023Octets),
+       FALCON_DMA_STAT(tx_1024_to_15xx, XgTxPkts1024to15xxOctets),
+       FALCON_DMA_STAT(tx_15xx_to_jumbo, XgTxPkts1519toMaxOctets),
+       FALCON_DMA_STAT(tx_gtjumbo, XgTxOversizePkts),
+       FALCON_DMA_STAT(tx_non_tcpudp, XgTxNonTcpUdpPkt),
+       FALCON_DMA_STAT(tx_mac_src_error, XgTxMacSrcErrPkt),
+       FALCON_DMA_STAT(tx_ip_src_error, XgTxIpSrcErrPkt),
+       FALCON_DMA_STAT(rx_bytes, XgRxOctets),
+       FALCON_DMA_STAT(rx_good_bytes, XgRxOctetsOK),
+       FALCON_OTHER_STAT(rx_bad_bytes),
+       FALCON_DMA_STAT(rx_packets, XgRxPkts),
+       FALCON_DMA_STAT(rx_good, XgRxPktsOK),
+       FALCON_DMA_STAT(rx_bad, XgRxFCSerrorPkts),
+       FALCON_DMA_STAT(rx_pause, XgRxPausePkts),
+       FALCON_DMA_STAT(rx_control, XgRxControlPkts),
+       FALCON_DMA_STAT(rx_unicast, XgRxUnicastPkts),
+       FALCON_DMA_STAT(rx_multicast, XgRxMulticastPkts),
+       FALCON_DMA_STAT(rx_broadcast, XgRxBroadcastPkts),
+       FALCON_DMA_STAT(rx_lt64, XgRxUndersizePkts),
+       FALCON_DMA_STAT(rx_64, XgRxPkts64Octets),
+       FALCON_DMA_STAT(rx_65_to_127, XgRxPkts65to127Octets),
+       FALCON_DMA_STAT(rx_128_to_255, XgRxPkts128to255Octets),
+       FALCON_DMA_STAT(rx_256_to_511, XgRxPkts256to511Octets),
+       FALCON_DMA_STAT(rx_512_to_1023, XgRxPkts512to1023Octets),
+       FALCON_DMA_STAT(rx_1024_to_15xx, XgRxPkts1024to15xxOctets),
+       FALCON_DMA_STAT(rx_15xx_to_jumbo, XgRxPkts15xxtoMaxOctets),
+       FALCON_DMA_STAT(rx_gtjumbo, XgRxOversizePkts),
+       FALCON_DMA_STAT(rx_bad_lt64, XgRxUndersizeFCSerrorPkts),
+       FALCON_DMA_STAT(rx_bad_gtjumbo, XgRxJabberPkts),
+       FALCON_DMA_STAT(rx_overflow, XgRxDropEvents),
+       FALCON_DMA_STAT(rx_symbol_error, XgRxSymbolError),
+       FALCON_DMA_STAT(rx_align_error, XgRxAlignError),
+       FALCON_DMA_STAT(rx_length_error, XgRxLengthError),
+       FALCON_DMA_STAT(rx_internal_error, XgRxInternalMACError),
+       FALCON_OTHER_STAT(rx_nodesc_drop_cnt),
+};
+static const unsigned long falcon_stat_mask[] = {
+       [0 ... BITS_TO_LONGS(FALCON_STAT_COUNT) - 1] = ~0UL,
+};
+
+/**************************************************************************
+ *
+ * Basic SPI command set and bit definitions
+ *
+ *************************************************************************/
+
+#define SPI_WRSR 0x01          /* Write status register */
+#define SPI_WRITE 0x02         /* Write data to memory array */
+#define SPI_READ 0x03          /* Read data from memory array */
+#define SPI_WRDI 0x04          /* Reset write enable latch */
+#define SPI_RDSR 0x05          /* Read status register */
+#define SPI_WREN 0x06          /* Set write enable latch */
+#define SPI_SST_EWSR 0x50      /* SST: Enable write to status register */
+
+#define SPI_STATUS_WPEN 0x80   /* Write-protect pin enabled */
+#define SPI_STATUS_BP2 0x10    /* Block protection bit 2 */
+#define SPI_STATUS_BP1 0x08    /* Block protection bit 1 */
+#define SPI_STATUS_BP0 0x04    /* Block protection bit 0 */
+#define SPI_STATUS_WEN 0x02    /* State of the write enable latch */
+#define SPI_STATUS_NRDY 0x01   /* Device busy flag */
+
+/**************************************************************************
+ *
+ * Non-volatile memory layout
+ *
+ **************************************************************************
+ */
+
+/* SFC4000 flash is partitioned into:
+ *     0-0x400       chip and board config (see struct falcon_nvconfig)
+ *     0x400-0x8000  unused (or may contain VPD if EEPROM not present)
+ *     0x8000-end    boot code (mapped to PCI expansion ROM)
+ * SFC4000 small EEPROM (size < 0x400) is used for VPD only.
+ * SFC4000 large EEPROM (size >= 0x400) is partitioned into:
+ *     0-0x400       chip and board config
+ *     configurable  VPD
+ *     0x800-0x1800  boot config
+ * Aside from the chip and board config, all of these are optional and may
+ * be absent or truncated depending on the devices used.
+ */
+#define FALCON_NVCONFIG_END 0x400U
+#define FALCON_FLASH_BOOTCODE_START 0x8000U
+#define FALCON_EEPROM_BOOTCONFIG_START 0x800U
+#define FALCON_EEPROM_BOOTCONFIG_END 0x1800U
+
+/* Board configuration v2 (v1 is obsolete; later versions are compatible) */
+struct falcon_nvconfig_board_v2 {
+       __le16 nports;
+       u8 port0_phy_addr;
+       u8 port0_phy_type;
+       u8 port1_phy_addr;
+       u8 port1_phy_type;
+       __le16 asic_sub_revision;
+       __le16 board_revision;
+} __packed;
+
+/* Board configuration v3 extra information */
+struct falcon_nvconfig_board_v3 {
+       __le32 spi_device_type[2];
+} __packed;
+
+/* Bit numbers for spi_device_type */
+#define SPI_DEV_TYPE_SIZE_LBN 0
+#define SPI_DEV_TYPE_SIZE_WIDTH 5
+#define SPI_DEV_TYPE_ADDR_LEN_LBN 6
+#define SPI_DEV_TYPE_ADDR_LEN_WIDTH 2
+#define SPI_DEV_TYPE_ERASE_CMD_LBN 8
+#define SPI_DEV_TYPE_ERASE_CMD_WIDTH 8
+#define SPI_DEV_TYPE_ERASE_SIZE_LBN 16
+#define SPI_DEV_TYPE_ERASE_SIZE_WIDTH 5
+#define SPI_DEV_TYPE_BLOCK_SIZE_LBN 24
+#define SPI_DEV_TYPE_BLOCK_SIZE_WIDTH 5
+#define SPI_DEV_TYPE_FIELD(type, field)                                        \
+       (((type) >> EFX_LOW_BIT(field)) & EFX_MASK32(EFX_WIDTH(field)))
+
+#define FALCON_NVCONFIG_OFFSET 0x300
+
+#define FALCON_NVCONFIG_BOARD_MAGIC_NUM 0xFA1C
+struct falcon_nvconfig {
+       efx_oword_t ee_vpd_cfg_reg;                     /* 0x300 */
+       u8 mac_address[2][8];                   /* 0x310 */
+       efx_oword_t pcie_sd_ctl0123_reg;                /* 0x320 */
+       efx_oword_t pcie_sd_ctl45_reg;                  /* 0x330 */
+       efx_oword_t pcie_pcs_ctl_stat_reg;              /* 0x340 */
+       efx_oword_t hw_init_reg;                        /* 0x350 */
+       efx_oword_t nic_stat_reg;                       /* 0x360 */
+       efx_oword_t glb_ctl_reg;                        /* 0x370 */
+       efx_oword_t srm_cfg_reg;                        /* 0x380 */
+       efx_oword_t spare_reg;                          /* 0x390 */
+       __le16 board_magic_num;                 /* 0x3A0 */
+       __le16 board_struct_ver;
+       __le16 board_checksum;
+       struct falcon_nvconfig_board_v2 board_v2;
+       efx_oword_t ee_base_page_reg;                   /* 0x3B0 */
+       struct falcon_nvconfig_board_v3 board_v3;       /* 0x3C0 */
+} __packed;
+
+/*************************************************************************/
+
 static int falcon_reset_hw(struct efx_nic *efx, enum reset_type method);
+static void falcon_reconfigure_mac_wrapper(struct efx_nic *efx);
 
 static const unsigned int
 /* "Large" EEPROM device: Atmel AT25640 or similar
@@ -146,7 +413,7 @@ static void falcon_prepare_flush(struct efx_nic *efx)
  *
  * NB most hardware supports MSI interrupts
  */
-inline void falcon_irq_ack_a1(struct efx_nic *efx)
+static inline void falcon_irq_ack_a1(struct efx_nic *efx)
 {
        efx_dword_t reg;
 
@@ -156,7 +423,7 @@ inline void falcon_irq_ack_a1(struct efx_nic *efx)
 }
 
 
-irqreturn_t falcon_legacy_interrupt_a1(int irq, void *dev_id)
+static irqreturn_t falcon_legacy_interrupt_a1(int irq, void *dev_id)
 {
        struct efx_nic *efx = dev_id;
        efx_oword_t *int_ker = efx->irq_status.addr;
@@ -177,10 +444,13 @@ irqreturn_t falcon_legacy_interrupt_a1(int irq, void *dev_id)
                   "IRQ %d on CPU %d status " EFX_OWORD_FMT "\n",
                   irq, raw_smp_processor_id(), EFX_OWORD_VAL(*int_ker));
 
+       if (!likely(ACCESS_ONCE(efx->irq_soft_enabled)))
+               return IRQ_HANDLED;
+
        /* Check to see if we have a serious error condition */
        syserr = EFX_OWORD_FIELD(*int_ker, FSF_AZ_NET_IVEC_FATAL_INT);
        if (unlikely(syserr))
-               return efx_nic_fatal_interrupt(efx);
+               return efx_farch_fatal_interrupt(efx);
 
        /* Determine interrupting queues, clear interrupt status
         * register and acknowledge the device interrupt.
@@ -241,9 +511,10 @@ static int falcon_spi_wait(struct efx_nic *efx)
        }
 }
 
-int falcon_spi_cmd(struct efx_nic *efx, const struct efx_spi_device *spi,
-                  unsigned int command, int address,
-                  const void *in, void *out, size_t len)
+static int
+falcon_spi_cmd(struct efx_nic *efx, const struct falcon_spi_device *spi,
+              unsigned int command, int address,
+              const void *in, void *out, size_t len)
 {
        bool addressed = (address >= 0);
        bool reading = (out != NULL);
@@ -297,48 +568,16 @@ int falcon_spi_cmd(struct efx_nic *efx, const struct efx_spi_device *spi,
        return 0;
 }
 
-static size_t
-falcon_spi_write_limit(const struct efx_spi_device *spi, size_t start)
-{
-       return min(FALCON_SPI_MAX_LEN,
-                  (spi->block_size - (start & (spi->block_size - 1))));
-}
-
 static inline u8
-efx_spi_munge_command(const struct efx_spi_device *spi,
-                     const u8 command, const unsigned int address)
+falcon_spi_munge_command(const struct falcon_spi_device *spi,
+                        const u8 command, const unsigned int address)
 {
        return command | (((address >> 8) & spi->munge_address) << 3);
 }
 
-/* Wait up to 10 ms for buffered write completion */
-int
-falcon_spi_wait_write(struct efx_nic *efx, const struct efx_spi_device *spi)
-{
-       unsigned long timeout = jiffies + 1 + DIV_ROUND_UP(HZ, 100);
-       u8 status;
-       int rc;
-
-       for (;;) {
-               rc = falcon_spi_cmd(efx, spi, SPI_RDSR, -1, NULL,
-                                   &status, sizeof(status));
-               if (rc)
-                       return rc;
-               if (!(status & SPI_STATUS_NRDY))
-                       return 0;
-               if (time_after_eq(jiffies, timeout)) {
-                       netif_err(efx, hw, efx->net_dev,
-                                 "SPI write timeout on device %d"
-                                 " last status=0x%02x\n",
-                                 spi->device_id, status);
-                       return -ETIMEDOUT;
-               }
-               schedule_timeout_uninterruptible(1);
-       }
-}
-
-int falcon_spi_read(struct efx_nic *efx, const struct efx_spi_device *spi,
-                   loff_t start, size_t len, size_t *retlen, u8 *buffer)
+static int
+falcon_spi_read(struct efx_nic *efx, const struct falcon_spi_device *spi,
+               loff_t start, size_t len, size_t *retlen, u8 *buffer)
 {
        size_t block_len, pos = 0;
        unsigned int command;
@@ -347,7 +586,7 @@ int falcon_spi_read(struct efx_nic *efx, const struct efx_spi_device *spi,
        while (pos < len) {
                block_len = min(len - pos, FALCON_SPI_MAX_LEN);
 
-               command = efx_spi_munge_command(spi, SPI_READ, start + pos);
+               command = falcon_spi_munge_command(spi, SPI_READ, start + pos);
                rc = falcon_spi_cmd(efx, spi, command, start + pos, NULL,
                                    buffer + pos, block_len);
                if (rc)
@@ -367,8 +606,52 @@ int falcon_spi_read(struct efx_nic *efx, const struct efx_spi_device *spi,
        return rc;
 }
 
-int
-falcon_spi_write(struct efx_nic *efx, const struct efx_spi_device *spi,
+#ifdef CONFIG_SFC_MTD
+
+struct falcon_mtd_partition {
+       struct efx_mtd_partition common;
+       const struct falcon_spi_device *spi;
+       size_t offset;
+};
+
+#define to_falcon_mtd_partition(mtd)                           \
+       container_of(mtd, struct falcon_mtd_partition, common.mtd)
+
+static size_t
+falcon_spi_write_limit(const struct falcon_spi_device *spi, size_t start)
+{
+       return min(FALCON_SPI_MAX_LEN,
+                  (spi->block_size - (start & (spi->block_size - 1))));
+}
+
+/* Wait up to 10 ms for buffered write completion */
+static int
+falcon_spi_wait_write(struct efx_nic *efx, const struct falcon_spi_device *spi)
+{
+       unsigned long timeout = jiffies + 1 + DIV_ROUND_UP(HZ, 100);
+       u8 status;
+       int rc;
+
+       for (;;) {
+               rc = falcon_spi_cmd(efx, spi, SPI_RDSR, -1, NULL,
+                                   &status, sizeof(status));
+               if (rc)
+                       return rc;
+               if (!(status & SPI_STATUS_NRDY))
+                       return 0;
+               if (time_after_eq(jiffies, timeout)) {
+                       netif_err(efx, hw, efx->net_dev,
+                                 "SPI write timeout on device %d"
+                                 " last status=0x%02x\n",
+                                 spi->device_id, status);
+                       return -ETIMEDOUT;
+               }
+               schedule_timeout_uninterruptible(1);
+       }
+}
+
+static int
+falcon_spi_write(struct efx_nic *efx, const struct falcon_spi_device *spi,
                 loff_t start, size_t len, size_t *retlen, const u8 *buffer)
 {
        u8 verify_buffer[FALCON_SPI_MAX_LEN];
@@ -383,7 +666,7 @@ falcon_spi_write(struct efx_nic *efx, const struct efx_spi_device *spi,
 
                block_len = min(len - pos,
                                falcon_spi_write_limit(spi, start + pos));
-               command = efx_spi_munge_command(spi, SPI_WRITE, start + pos);
+               command = falcon_spi_munge_command(spi, SPI_WRITE, start + pos);
                rc = falcon_spi_cmd(efx, spi, command, start + pos,
                                    buffer + pos, NULL, block_len);
                if (rc)
@@ -393,7 +676,7 @@ falcon_spi_write(struct efx_nic *efx, const struct efx_spi_device *spi,
                if (rc)
                        break;
 
-               command = efx_spi_munge_command(spi, SPI_READ, start + pos);
+               command = falcon_spi_munge_command(spi, SPI_READ, start + pos);
                rc = falcon_spi_cmd(efx, spi, command, start + pos,
                                    NULL, verify_buffer, block_len);
                if (memcmp(verify_buffer, buffer + pos, block_len)) {
@@ -416,6 +699,518 @@ falcon_spi_write(struct efx_nic *efx, const struct efx_spi_device *spi,
        return rc;
 }
 
+static int
+falcon_spi_slow_wait(struct falcon_mtd_partition *part, bool uninterruptible)
+{
+       const struct falcon_spi_device *spi = part->spi;
+       struct efx_nic *efx = part->common.mtd.priv;
+       u8 status;
+       int rc, i;
+
+       /* Wait up to 4s for flash/EEPROM to finish a slow operation. */
+       for (i = 0; i < 40; i++) {
+               __set_current_state(uninterruptible ?
+                                   TASK_UNINTERRUPTIBLE : TASK_INTERRUPTIBLE);
+               schedule_timeout(HZ / 10);
+               rc = falcon_spi_cmd(efx, spi, SPI_RDSR, -1, NULL,
+                                   &status, sizeof(status));
+               if (rc)
+                       return rc;
+               if (!(status & SPI_STATUS_NRDY))
+                       return 0;
+               if (signal_pending(current))
+                       return -EINTR;
+       }
+       pr_err("%s: timed out waiting for %s\n",
+              part->common.name, part->common.dev_type_name);
+       return -ETIMEDOUT;
+}
+
+static int
+falcon_spi_unlock(struct efx_nic *efx, const struct falcon_spi_device *spi)
+{
+       const u8 unlock_mask = (SPI_STATUS_BP2 | SPI_STATUS_BP1 |
+                               SPI_STATUS_BP0);
+       u8 status;
+       int rc;
+
+       rc = falcon_spi_cmd(efx, spi, SPI_RDSR, -1, NULL,
+                           &status, sizeof(status));
+       if (rc)
+               return rc;
+
+       if (!(status & unlock_mask))
+               return 0; /* already unlocked */
+
+       rc = falcon_spi_cmd(efx, spi, SPI_WREN, -1, NULL, NULL, 0);
+       if (rc)
+               return rc;
+       rc = falcon_spi_cmd(efx, spi, SPI_SST_EWSR, -1, NULL, NULL, 0);
+       if (rc)
+               return rc;
+
+       status &= ~unlock_mask;
+       rc = falcon_spi_cmd(efx, spi, SPI_WRSR, -1, &status,
+                           NULL, sizeof(status));
+       if (rc)
+               return rc;
+       rc = falcon_spi_wait_write(efx, spi);
+       if (rc)
+               return rc;
+
+       return 0;
+}
+
+#define FALCON_SPI_VERIFY_BUF_LEN 16
+
+static int
+falcon_spi_erase(struct falcon_mtd_partition *part, loff_t start, size_t len)
+{
+       const struct falcon_spi_device *spi = part->spi;
+       struct efx_nic *efx = part->common.mtd.priv;
+       unsigned pos, block_len;
+       u8 empty[FALCON_SPI_VERIFY_BUF_LEN];
+       u8 buffer[FALCON_SPI_VERIFY_BUF_LEN];
+       int rc;
+
+       if (len != spi->erase_size)
+               return -EINVAL;
+
+       if (spi->erase_command == 0)
+               return -EOPNOTSUPP;
+
+       rc = falcon_spi_unlock(efx, spi);
+       if (rc)
+               return rc;
+       rc = falcon_spi_cmd(efx, spi, SPI_WREN, -1, NULL, NULL, 0);
+       if (rc)
+               return rc;
+       rc = falcon_spi_cmd(efx, spi, spi->erase_command, start, NULL,
+                           NULL, 0);
+       if (rc)
+               return rc;
+       rc = falcon_spi_slow_wait(part, false);
+
+       /* Verify the entire region has been wiped */
+       memset(empty, 0xff, sizeof(empty));
+       for (pos = 0; pos < len; pos += block_len) {
+               block_len = min(len - pos, sizeof(buffer));
+               rc = falcon_spi_read(efx, spi, start + pos, block_len,
+                                    NULL, buffer);
+               if (rc)
+                       return rc;
+               if (memcmp(empty, buffer, block_len))
+                       return -EIO;
+
+               /* Avoid locking up the system */
+               cond_resched();
+               if (signal_pending(current))
+                       return -EINTR;
+       }
+
+       return rc;
+}
+
+static void falcon_mtd_rename(struct efx_mtd_partition *part)
+{
+       struct efx_nic *efx = part->mtd.priv;
+
+       snprintf(part->name, sizeof(part->name), "%s %s",
+                efx->name, part->type_name);
+}
+
+static int falcon_mtd_read(struct mtd_info *mtd, loff_t start,
+                          size_t len, size_t *retlen, u8 *buffer)
+{
+       struct falcon_mtd_partition *part = to_falcon_mtd_partition(mtd);
+       struct efx_nic *efx = mtd->priv;
+       struct falcon_nic_data *nic_data = efx->nic_data;
+       int rc;
+
+       rc = mutex_lock_interruptible(&nic_data->spi_lock);
+       if (rc)
+               return rc;
+       rc = falcon_spi_read(efx, part->spi, part->offset + start,
+                            len, retlen, buffer);
+       mutex_unlock(&nic_data->spi_lock);
+       return rc;
+}
+
+static int falcon_mtd_erase(struct mtd_info *mtd, loff_t start, size_t len)
+{
+       struct falcon_mtd_partition *part = to_falcon_mtd_partition(mtd);
+       struct efx_nic *efx = mtd->priv;
+       struct falcon_nic_data *nic_data = efx->nic_data;
+       int rc;
+
+       rc = mutex_lock_interruptible(&nic_data->spi_lock);
+       if (rc)
+               return rc;
+       rc = falcon_spi_erase(part, part->offset + start, len);
+       mutex_unlock(&nic_data->spi_lock);
+       return rc;
+}
+
+static int falcon_mtd_write(struct mtd_info *mtd, loff_t start,
+                           size_t len, size_t *retlen, const u8 *buffer)
+{
+       struct falcon_mtd_partition *part = to_falcon_mtd_partition(mtd);
+       struct efx_nic *efx = mtd->priv;
+       struct falcon_nic_data *nic_data = efx->nic_data;
+       int rc;
+
+       rc = mutex_lock_interruptible(&nic_data->spi_lock);
+       if (rc)
+               return rc;
+       rc = falcon_spi_write(efx, part->spi, part->offset + start,
+                             len, retlen, buffer);
+       mutex_unlock(&nic_data->spi_lock);
+       return rc;
+}
+
+static int falcon_mtd_sync(struct mtd_info *mtd)
+{
+       struct falcon_mtd_partition *part = to_falcon_mtd_partition(mtd);
+       struct efx_nic *efx = mtd->priv;
+       struct falcon_nic_data *nic_data = efx->nic_data;
+       int rc;
+
+       mutex_lock(&nic_data->spi_lock);
+       rc = falcon_spi_slow_wait(part, true);
+       mutex_unlock(&nic_data->spi_lock);
+       return rc;
+}
+
+static int falcon_mtd_probe(struct efx_nic *efx)
+{
+       struct falcon_nic_data *nic_data = efx->nic_data;
+       struct falcon_mtd_partition *parts;
+       struct falcon_spi_device *spi;
+       size_t n_parts;
+       int rc = -ENODEV;
+
+       ASSERT_RTNL();
+
+       /* Allocate space for maximum number of partitions */
+       parts = kcalloc(2, sizeof(*parts), GFP_KERNEL);
+       n_parts = 0;
+
+       spi = &nic_data->spi_flash;
+       if (falcon_spi_present(spi) && spi->size > FALCON_FLASH_BOOTCODE_START) {
+               parts[n_parts].spi = spi;
+               parts[n_parts].offset = FALCON_FLASH_BOOTCODE_START;
+               parts[n_parts].common.dev_type_name = "flash";
+               parts[n_parts].common.type_name = "sfc_flash_bootrom";
+               parts[n_parts].common.mtd.type = MTD_NORFLASH;
+               parts[n_parts].common.mtd.flags = MTD_CAP_NORFLASH;
+               parts[n_parts].common.mtd.size = spi->size - FALCON_FLASH_BOOTCODE_START;
+               parts[n_parts].common.mtd.erasesize = spi->erase_size;
+               n_parts++;
+       }
+
+       spi = &nic_data->spi_eeprom;
+       if (falcon_spi_present(spi) && spi->size > FALCON_EEPROM_BOOTCONFIG_START) {
+               parts[n_parts].spi = spi;
+               parts[n_parts].offset = FALCON_EEPROM_BOOTCONFIG_START;
+               parts[n_parts].common.dev_type_name = "EEPROM";
+               parts[n_parts].common.type_name = "sfc_bootconfig";
+               parts[n_parts].common.mtd.type = MTD_RAM;
+               parts[n_parts].common.mtd.flags = MTD_CAP_RAM;
+               parts[n_parts].common.mtd.size =
+                       min(spi->size, FALCON_EEPROM_BOOTCONFIG_END) -
+                       FALCON_EEPROM_BOOTCONFIG_START;
+               parts[n_parts].common.mtd.erasesize = spi->erase_size;
+               n_parts++;
+       }
+
+       rc = efx_mtd_add(efx, &parts[0].common, n_parts, sizeof(*parts));
+       if (rc)
+               kfree(parts);
+       return rc;
+}
+
+#endif /* CONFIG_SFC_MTD */
+
+/**************************************************************************
+ *
+ * XMAC operations
+ *
+ **************************************************************************
+ */
+
+/* Configure the XAUI driver that is an output from Falcon */
+static void falcon_setup_xaui(struct efx_nic *efx)
+{
+       efx_oword_t sdctl, txdrv;
+
+       /* Move the XAUI into low power, unless there is no PHY, in
+        * which case the XAUI will have to drive a cable. */
+       if (efx->phy_type == PHY_TYPE_NONE)
+               return;
+
+       efx_reado(efx, &sdctl, FR_AB_XX_SD_CTL);
+       EFX_SET_OWORD_FIELD(sdctl, FRF_AB_XX_HIDRVD, FFE_AB_XX_SD_CTL_DRV_DEF);
+       EFX_SET_OWORD_FIELD(sdctl, FRF_AB_XX_LODRVD, FFE_AB_XX_SD_CTL_DRV_DEF);
+       EFX_SET_OWORD_FIELD(sdctl, FRF_AB_XX_HIDRVC, FFE_AB_XX_SD_CTL_DRV_DEF);
+       EFX_SET_OWORD_FIELD(sdctl, FRF_AB_XX_LODRVC, FFE_AB_XX_SD_CTL_DRV_DEF);
+       EFX_SET_OWORD_FIELD(sdctl, FRF_AB_XX_HIDRVB, FFE_AB_XX_SD_CTL_DRV_DEF);
+       EFX_SET_OWORD_FIELD(sdctl, FRF_AB_XX_LODRVB, FFE_AB_XX_SD_CTL_DRV_DEF);
+       EFX_SET_OWORD_FIELD(sdctl, FRF_AB_XX_HIDRVA, FFE_AB_XX_SD_CTL_DRV_DEF);
+       EFX_SET_OWORD_FIELD(sdctl, FRF_AB_XX_LODRVA, FFE_AB_XX_SD_CTL_DRV_DEF);
+       efx_writeo(efx, &sdctl, FR_AB_XX_SD_CTL);
+
+       EFX_POPULATE_OWORD_8(txdrv,
+                            FRF_AB_XX_DEQD, FFE_AB_XX_TXDRV_DEQ_DEF,
+                            FRF_AB_XX_DEQC, FFE_AB_XX_TXDRV_DEQ_DEF,
+                            FRF_AB_XX_DEQB, FFE_AB_XX_TXDRV_DEQ_DEF,
+                            FRF_AB_XX_DEQA, FFE_AB_XX_TXDRV_DEQ_DEF,
+                            FRF_AB_XX_DTXD, FFE_AB_XX_TXDRV_DTX_DEF,
+                            FRF_AB_XX_DTXC, FFE_AB_XX_TXDRV_DTX_DEF,
+                            FRF_AB_XX_DTXB, FFE_AB_XX_TXDRV_DTX_DEF,
+                            FRF_AB_XX_DTXA, FFE_AB_XX_TXDRV_DTX_DEF);
+       efx_writeo(efx, &txdrv, FR_AB_XX_TXDRV_CTL);
+}
+
+int falcon_reset_xaui(struct efx_nic *efx)
+{
+       struct falcon_nic_data *nic_data = efx->nic_data;
+       efx_oword_t reg;
+       int count;
+
+       /* Don't fetch MAC statistics over an XMAC reset */
+       WARN_ON(nic_data->stats_disable_count == 0);
+
+       /* Start reset sequence */
+       EFX_POPULATE_OWORD_1(reg, FRF_AB_XX_RST_XX_EN, 1);
+       efx_writeo(efx, &reg, FR_AB_XX_PWR_RST);
+
+       /* Wait up to 10 ms for completion, then reinitialise */
+       for (count = 0; count < 1000; count++) {
+               efx_reado(efx, &reg, FR_AB_XX_PWR_RST);
+               if (EFX_OWORD_FIELD(reg, FRF_AB_XX_RST_XX_EN) == 0 &&
+                   EFX_OWORD_FIELD(reg, FRF_AB_XX_SD_RST_ACT) == 0) {
+                       falcon_setup_xaui(efx);
+                       return 0;
+               }
+               udelay(10);
+       }
+       netif_err(efx, hw, efx->net_dev,
+                 "timed out waiting for XAUI/XGXS reset\n");
+       return -ETIMEDOUT;
+}
+
+static void falcon_ack_status_intr(struct efx_nic *efx)
+{
+       struct falcon_nic_data *nic_data = efx->nic_data;
+       efx_oword_t reg;
+
+       if ((efx_nic_rev(efx) != EFX_REV_FALCON_B0) || LOOPBACK_INTERNAL(efx))
+               return;
+
+       /* We expect xgmii faults if the wireside link is down */
+       if (!efx->link_state.up)
+               return;
+
+       /* We can only use this interrupt to signal the negative edge of
+        * xaui_align [we have to poll the positive edge]. */
+       if (nic_data->xmac_poll_required)
+               return;
+
+       efx_reado(efx, &reg, FR_AB_XM_MGT_INT_MSK);
+}
+
+static bool falcon_xgxs_link_ok(struct efx_nic *efx)
+{
+       efx_oword_t reg;
+       bool align_done, link_ok = false;
+       int sync_status;
+
+       /* Read link status */
+       efx_reado(efx, &reg, FR_AB_XX_CORE_STAT);
+
+       align_done = EFX_OWORD_FIELD(reg, FRF_AB_XX_ALIGN_DONE);
+       sync_status = EFX_OWORD_FIELD(reg, FRF_AB_XX_SYNC_STAT);
+       if (align_done && (sync_status == FFE_AB_XX_STAT_ALL_LANES))
+               link_ok = true;
+
+       /* Clear link status ready for next read */
+       EFX_SET_OWORD_FIELD(reg, FRF_AB_XX_COMMA_DET, FFE_AB_XX_STAT_ALL_LANES);
+       EFX_SET_OWORD_FIELD(reg, FRF_AB_XX_CHAR_ERR, FFE_AB_XX_STAT_ALL_LANES);
+       EFX_SET_OWORD_FIELD(reg, FRF_AB_XX_DISPERR, FFE_AB_XX_STAT_ALL_LANES);
+       efx_writeo(efx, &reg, FR_AB_XX_CORE_STAT);
+
+       return link_ok;
+}
+
+static bool falcon_xmac_link_ok(struct efx_nic *efx)
+{
+       /*
+        * Check MAC's XGXS link status except when using XGMII loopback
+        * which bypasses the XGXS block.
+        * If possible, check PHY's XGXS link status except when using
+        * MAC loopback.
+        */
+       return (efx->loopback_mode == LOOPBACK_XGMII ||
+               falcon_xgxs_link_ok(efx)) &&
+               (!(efx->mdio.mmds & (1 << MDIO_MMD_PHYXS)) ||
+                LOOPBACK_INTERNAL(efx) ||
+                efx_mdio_phyxgxs_lane_sync(efx));
+}
+
+static void falcon_reconfigure_xmac_core(struct efx_nic *efx)
+{
+       unsigned int max_frame_len;
+       efx_oword_t reg;
+       bool rx_fc = !!(efx->link_state.fc & EFX_FC_RX);
+       bool tx_fc = !!(efx->link_state.fc & EFX_FC_TX);
+
+       /* Configure MAC  - cut-thru mode is hard wired on */
+       EFX_POPULATE_OWORD_3(reg,
+                            FRF_AB_XM_RX_JUMBO_MODE, 1,
+                            FRF_AB_XM_TX_STAT_EN, 1,
+                            FRF_AB_XM_RX_STAT_EN, 1);
+       efx_writeo(efx, &reg, FR_AB_XM_GLB_CFG);
+
+       /* Configure TX */
+       EFX_POPULATE_OWORD_6(reg,
+                            FRF_AB_XM_TXEN, 1,
+                            FRF_AB_XM_TX_PRMBL, 1,
+                            FRF_AB_XM_AUTO_PAD, 1,
+                            FRF_AB_XM_TXCRC, 1,
+                            FRF_AB_XM_FCNTL, tx_fc,
+                            FRF_AB_XM_IPG, 0x3);
+       efx_writeo(efx, &reg, FR_AB_XM_TX_CFG);
+
+       /* Configure RX */
+       EFX_POPULATE_OWORD_5(reg,
+                            FRF_AB_XM_RXEN, 1,
+                            FRF_AB_XM_AUTO_DEPAD, 0,
+                            FRF_AB_XM_ACPT_ALL_MCAST, 1,
+                            FRF_AB_XM_ACPT_ALL_UCAST, !efx->unicast_filter,
+                            FRF_AB_XM_PASS_CRC_ERR, 1);
+       efx_writeo(efx, &reg, FR_AB_XM_RX_CFG);
+
+       /* Set frame length */
+       max_frame_len = EFX_MAX_FRAME_LEN(efx->net_dev->mtu);
+       EFX_POPULATE_OWORD_1(reg, FRF_AB_XM_MAX_RX_FRM_SIZE, max_frame_len);
+       efx_writeo(efx, &reg, FR_AB_XM_RX_PARAM);
+       EFX_POPULATE_OWORD_2(reg,
+                            FRF_AB_XM_MAX_TX_FRM_SIZE, max_frame_len,
+                            FRF_AB_XM_TX_JUMBO_MODE, 1);
+       efx_writeo(efx, &reg, FR_AB_XM_TX_PARAM);
+
+       EFX_POPULATE_OWORD_2(reg,
+                            FRF_AB_XM_PAUSE_TIME, 0xfffe, /* MAX PAUSE TIME */
+                            FRF_AB_XM_DIS_FCNTL, !rx_fc);
+       efx_writeo(efx, &reg, FR_AB_XM_FC);
+
+       /* Set MAC address */
+       memcpy(&reg, &efx->net_dev->dev_addr[0], 4);
+       efx_writeo(efx, &reg, FR_AB_XM_ADR_LO);
+       memcpy(&reg, &efx->net_dev->dev_addr[4], 2);
+       efx_writeo(efx, &reg, FR_AB_XM_ADR_HI);
+}
+
+static void falcon_reconfigure_xgxs_core(struct efx_nic *efx)
+{
+       efx_oword_t reg;
+       bool xgxs_loopback = (efx->loopback_mode == LOOPBACK_XGXS);
+       bool xaui_loopback = (efx->loopback_mode == LOOPBACK_XAUI);
+       bool xgmii_loopback = (efx->loopback_mode == LOOPBACK_XGMII);
+       bool old_xgmii_loopback, old_xgxs_loopback, old_xaui_loopback;
+
+       /* XGXS block is flaky and will need to be reset if moving
+        * into our out of XGMII, XGXS or XAUI loopbacks. */
+       efx_reado(efx, &reg, FR_AB_XX_CORE_STAT);
+       old_xgxs_loopback = EFX_OWORD_FIELD(reg, FRF_AB_XX_XGXS_LB_EN);
+       old_xgmii_loopback = EFX_OWORD_FIELD(reg, FRF_AB_XX_XGMII_LB_EN);
+
+       efx_reado(efx, &reg, FR_AB_XX_SD_CTL);
+       old_xaui_loopback = EFX_OWORD_FIELD(reg, FRF_AB_XX_LPBKA);
+
+       /* The PHY driver may have turned XAUI off */
+       if ((xgxs_loopback != old_xgxs_loopback) ||
+           (xaui_loopback != old_xaui_loopback) ||
+           (xgmii_loopback != old_xgmii_loopback))
+               falcon_reset_xaui(efx);
+
+       efx_reado(efx, &reg, FR_AB_XX_CORE_STAT);
+       EFX_SET_OWORD_FIELD(reg, FRF_AB_XX_FORCE_SIG,
+                           (xgxs_loopback || xaui_loopback) ?
+                           FFE_AB_XX_FORCE_SIG_ALL_LANES : 0);
+       EFX_SET_OWORD_FIELD(reg, FRF_AB_XX_XGXS_LB_EN, xgxs_loopback);
+       EFX_SET_OWORD_FIELD(reg, FRF_AB_XX_XGMII_LB_EN, xgmii_loopback);
+       efx_writeo(efx, &reg, FR_AB_XX_CORE_STAT);
+
+       efx_reado(efx, &reg, FR_AB_XX_SD_CTL);
+       EFX_SET_OWORD_FIELD(reg, FRF_AB_XX_LPBKD, xaui_loopback);
+       EFX_SET_OWORD_FIELD(reg, FRF_AB_XX_LPBKC, xaui_loopback);
+       EFX_SET_OWORD_FIELD(reg, FRF_AB_XX_LPBKB, xaui_loopback);
+       EFX_SET_OWORD_FIELD(reg, FRF_AB_XX_LPBKA, xaui_loopback);
+       efx_writeo(efx, &reg, FR_AB_XX_SD_CTL);
+}
+
+
+/* Try to bring up the Falcon side of the Falcon-Phy XAUI link */
+static bool falcon_xmac_link_ok_retry(struct efx_nic *efx, int tries)
+{
+       bool mac_up = falcon_xmac_link_ok(efx);
+
+       if (LOOPBACK_MASK(efx) & LOOPBACKS_EXTERNAL(efx) & LOOPBACKS_WS ||
+           efx_phy_mode_disabled(efx->phy_mode))
+               /* XAUI link is expected to be down */
+               return mac_up;
+
+       falcon_stop_nic_stats(efx);
+
+       while (!mac_up && tries) {
+               netif_dbg(efx, hw, efx->net_dev, "bashing xaui\n");
+               falcon_reset_xaui(efx);
+               udelay(200);
+
+               mac_up = falcon_xmac_link_ok(efx);
+               --tries;
+       }
+
+       falcon_start_nic_stats(efx);
+
+       return mac_up;
+}
+
+static bool falcon_xmac_check_fault(struct efx_nic *efx)
+{
+       return !falcon_xmac_link_ok_retry(efx, 5);
+}
+
+static int falcon_reconfigure_xmac(struct efx_nic *efx)
+{
+       struct falcon_nic_data *nic_data = efx->nic_data;
+
+       efx_farch_filter_sync_rx_mode(efx);
+
+       falcon_reconfigure_xgxs_core(efx);
+       falcon_reconfigure_xmac_core(efx);
+
+       falcon_reconfigure_mac_wrapper(efx);
+
+       nic_data->xmac_poll_required = !falcon_xmac_link_ok_retry(efx, 5);
+       falcon_ack_status_intr(efx);
+
+       return 0;
+}
+
+static void falcon_poll_xmac(struct efx_nic *efx)
+{
+       struct falcon_nic_data *nic_data = efx->nic_data;
+
+       /* We expect xgmii faults if the wireside link is down */
+       if (!efx->link_state.up || !nic_data->xmac_poll_required)
+               return;
+
+       nic_data->xmac_poll_required = !falcon_xmac_link_ok_retry(efx, 1);
+       falcon_ack_status_intr(efx);
+}
+
 /**************************************************************************
  *
  * MAC wrapper
@@ -497,7 +1292,7 @@ static void falcon_reset_macs(struct efx_nic *efx)
        falcon_setup_xaui(efx);
 }
 
-void falcon_drain_tx_fifo(struct efx_nic *efx)
+static void falcon_drain_tx_fifo(struct efx_nic *efx)
 {
        efx_oword_t reg;
 
@@ -529,7 +1324,7 @@ static void falcon_deconfigure_mac_wrapper(struct efx_nic *efx)
        falcon_drain_tx_fifo(efx);
 }
 
-void falcon_reconfigure_mac_wrapper(struct efx_nic *efx)
+static void falcon_reconfigure_mac_wrapper(struct efx_nic *efx)
 {
        struct efx_link_state *link_state = &efx->link_state;
        efx_oword_t reg;
@@ -550,7 +1345,7 @@ void falcon_reconfigure_mac_wrapper(struct efx_nic *efx)
        EFX_POPULATE_OWORD_5(reg,
                             FRF_AB_MAC_XOFF_VAL, 0xffff /* max pause time */,
                             FRF_AB_MAC_BCAD_ACPT, 1,
-                            FRF_AB_MAC_UC_PROM, efx->promiscuous,
+                            FRF_AB_MAC_UC_PROM, !efx->unicast_filter,
                             FRF_AB_MAC_LINK_STATUS, 1, /* always set */
                             FRF_AB_MAC_SPEED, link_speed);
        /* On B0, MAC backpressure can be disabled and packets get
@@ -583,10 +1378,7 @@ static void falcon_stats_request(struct efx_nic *efx)
        WARN_ON(nic_data->stats_pending);
        WARN_ON(nic_data->stats_disable_count);
 
-       if (nic_data->stats_dma_done == NULL)
-               return; /* no mac selected */
-
-       *nic_data->stats_dma_done = FALCON_STATS_NOT_DONE;
+       FALCON_XMAC_STATS_DMA_FLAG(efx) = 0;
        nic_data->stats_pending = true;
        wmb(); /* ensure done flag is clear */
 
@@ -608,9 +1400,11 @@ static void falcon_stats_complete(struct efx_nic *efx)
                return;
 
        nic_data->stats_pending = false;
-       if (*nic_data->stats_dma_done == FALCON_STATS_DONE) {
+       if (FALCON_XMAC_STATS_DMA_FLAG(efx)) {
                rmb(); /* read the done flag before the stats */
-               falcon_update_stats_xmac(efx);
+               efx_nic_update_stats(falcon_stat_desc, FALCON_STAT_COUNT,
+                                    falcon_stat_mask, nic_data->stats,
+                                    efx->stats_buffer.addr, true);
        } else {
                netif_err(efx, hw, efx->net_dev,
                          "timed out waiting for statistics\n");
@@ -678,6 +1472,28 @@ static int falcon_reconfigure_port(struct efx_nic *efx)
        return 0;
 }
 
+/* TX flow control may automatically turn itself off if the link
+ * partner (intermittently) stops responding to pause frames. There
+ * isn't any indication that this has happened, so the best we do is
+ * leave it up to the user to spot this and fix it by cycling transmit
+ * flow control on this end.
+ */
+
+static void falcon_a1_prepare_enable_fc_tx(struct efx_nic *efx)
+{
+       /* Schedule a reset to recover */
+       efx_schedule_reset(efx, RESET_TYPE_INVISIBLE);
+}
+
+static void falcon_b0_prepare_enable_fc_tx(struct efx_nic *efx)
+{
+       /* Recover by resetting the EM block */
+       falcon_stop_nic_stats(efx);
+       falcon_drain_tx_fifo(efx);
+       falcon_reconfigure_xmac(efx);
+       falcon_start_nic_stats(efx);
+}
+
 /**************************************************************************
  *
  * PHY access via GMII
@@ -861,7 +1677,7 @@ static int falcon_probe_port(struct efx_nic *efx)
 
        /* Allocate buffer for stats */
        rc = efx_nic_alloc_buffer(efx, &efx->stats_buffer,
-                                 FALCON_MAC_STATS_SIZE);
+                                 FALCON_MAC_STATS_SIZE, GFP_KERNEL);
        if (rc)
                return rc;
        netif_dbg(efx, probe, efx->net_dev,
@@ -869,7 +1685,6 @@ static int falcon_probe_port(struct efx_nic *efx)
                  (u64)efx->stats_buffer.dma_addr,
                  efx->stats_buffer.addr,
                  (u64)virt_to_phys(efx->stats_buffer.addr));
-       nic_data->stats_dma_done = efx->stats_buffer.addr + XgDmaDone_offset;
 
        return 0;
 }
@@ -926,15 +1741,15 @@ falcon_read_nvram(struct efx_nic *efx, struct falcon_nvconfig *nvconfig_out)
 {
        struct falcon_nic_data *nic_data = efx->nic_data;
        struct falcon_nvconfig *nvconfig;
-       struct efx_spi_device *spi;
+       struct falcon_spi_device *spi;
        void *region;
        int rc, magic_num, struct_ver;
        __le16 *word, *limit;
        u32 csum;
 
-       if (efx_spi_present(&nic_data->spi_flash))
+       if (falcon_spi_present(&nic_data->spi_flash))
                spi = &nic_data->spi_flash;
-       else if (efx_spi_present(&nic_data->spi_eeprom))
+       else if (falcon_spi_present(&nic_data->spi_eeprom))
                spi = &nic_data->spi_eeprom;
        else
                return -EINVAL;
@@ -949,7 +1764,7 @@ falcon_read_nvram(struct efx_nic *efx, struct falcon_nvconfig *nvconfig_out)
        mutex_unlock(&nic_data->spi_lock);
        if (rc) {
                netif_err(efx, hw, efx->net_dev, "Failed to read %s\n",
-                         efx_spi_present(&nic_data->spi_flash) ?
+                         falcon_spi_present(&nic_data->spi_flash) ?
                          "flash" : "EEPROM");
                rc = -EIO;
                goto out;
@@ -998,7 +1813,7 @@ static int falcon_test_nvram(struct efx_nic *efx)
        return falcon_read_nvram(efx, NULL);
 }
 
-static const struct efx_nic_register_test falcon_b0_register_tests[] = {
+static const struct efx_farch_register_test falcon_b0_register_tests[] = {
        { FR_AZ_ADR_REGION,
          EFX_OWORD32(0x0003FFFF, 0x0003FFFF, 0x0003FFFF, 0x0003FFFF) },
        { FR_AZ_RX_CFG,
@@ -1058,8 +1873,8 @@ falcon_b0_test_chip(struct efx_nic *efx, struct efx_self_tests *tests)
        efx_reset_down(efx, reset_method);
 
        tests->registers =
-               efx_nic_test_registers(efx, falcon_b0_register_tests,
-                                      ARRAY_SIZE(falcon_b0_register_tests))
+               efx_farch_test_registers(efx, falcon_b0_register_tests,
+                                        ARRAY_SIZE(falcon_b0_register_tests))
                ? -1 : 1;
 
        rc = falcon_reset_hw(efx, reset_method);
@@ -1078,8 +1893,7 @@ static enum reset_type falcon_map_reset_reason(enum reset_type reason)
 {
        switch (reason) {
        case RESET_TYPE_RX_RECOVERY:
-       case RESET_TYPE_RX_DESC_FETCH:
-       case RESET_TYPE_TX_DESC_FETCH:
+       case RESET_TYPE_DMA_ERROR:
        case RESET_TYPE_TX_SKIP:
                /* These can occasionally occur due to hardware bugs.
                 * We try to reset without disrupting the link.
@@ -1294,7 +2108,7 @@ static int falcon_reset_sram(struct efx_nic *efx)
 }
 
 static void falcon_spi_device_init(struct efx_nic *efx,
-                                 struct efx_spi_device *spi_device,
+                                 struct falcon_spi_device *spi_device,
                                  unsigned int device_id, u32 device_type)
 {
        if (device_type != 0) {
@@ -1360,10 +2174,11 @@ out:
        return rc;
 }
 
-static void falcon_dimension_resources(struct efx_nic *efx)
+static int falcon_dimension_resources(struct efx_nic *efx)
 {
        efx->rx_dc_base = 0x20000;
        efx->tx_dc_base = 0x26000;
+       return 0;
 }
 
 /* Probe all SPI devices on the NIC */
@@ -1410,6 +2225,20 @@ static void falcon_probe_spi_devices(struct efx_nic *efx)
                                       large_eeprom_type);
 }
 
+static unsigned int falcon_a1_mem_map_size(struct efx_nic *efx)
+{
+       return 0x20000;
+}
+
+static unsigned int falcon_b0_mem_map_size(struct efx_nic *efx)
+{
+       /* Map everything up to and including the RSS indirection table.
+        * The PCI core takes care of mapping the MSI-X tables.
+        */
+       return FR_BZ_RX_INDIRECTION_TBL +
+               FR_BZ_RX_INDIRECTION_TBL_STEP * FR_BZ_RX_INDIRECTION_TBL_ROWS;
+}
+
 static int falcon_probe_nic(struct efx_nic *efx)
 {
        struct falcon_nic_data *nic_data;
@@ -1424,7 +2253,7 @@ static int falcon_probe_nic(struct efx_nic *efx)
 
        rc = -ENODEV;
 
-       if (efx_nic_fpga_ver(efx) != 0) {
+       if (efx_farch_fpga_ver(efx) != 0) {
                netif_err(efx, probe, efx->net_dev,
                          "Falcon FPGA not supported\n");
                goto fail1;
@@ -1478,7 +2307,8 @@ static int falcon_probe_nic(struct efx_nic *efx)
        }
 
        /* Allocate memory for INT_KER */
-       rc = efx_nic_alloc_buffer(efx, &efx->irq_status, sizeof(efx_oword_t));
+       rc = efx_nic_alloc_buffer(efx, &efx->irq_status, sizeof(efx_oword_t),
+                                 GFP_KERNEL);
        if (rc)
                goto fail4;
        BUG_ON(efx->irq_status.dma_addr & 0x0f);
@@ -1499,6 +2329,8 @@ static int falcon_probe_nic(struct efx_nic *efx)
                goto fail5;
        }
 
+       efx->max_channels = (efx_nic_rev(efx) <= EFX_REV_FALCON_A1 ? 4 :
+                            EFX_MAX_CHANNELS);
        efx->timer_quantum_ns = 4968; /* 621 cycles */
 
        /* Initialise I2C adapter */
@@ -1657,7 +2489,7 @@ static int falcon_init_nic(struct efx_nic *efx)
                efx_writeo(efx, &temp, FR_BZ_DP_CTRL);
        }
 
-       efx_nic_init_common(efx);
+       efx_farch_init_common(efx);
 
        return 0;
 }
@@ -1688,24 +2520,65 @@ static void falcon_remove_nic(struct efx_nic *efx)
        efx->nic_data = NULL;
 }
 
-static void falcon_update_nic_stats(struct efx_nic *efx)
+static size_t falcon_describe_nic_stats(struct efx_nic *efx, u8 *names)
+{
+       return efx_nic_describe_stats(falcon_stat_desc, FALCON_STAT_COUNT,
+                                     falcon_stat_mask, names);
+}
+
+static size_t falcon_update_nic_stats(struct efx_nic *efx, u64 *full_stats,
+                                     struct rtnl_link_stats64 *core_stats)
 {
        struct falcon_nic_data *nic_data = efx->nic_data;
+       u64 *stats = nic_data->stats;
        efx_oword_t cnt;
 
-       if (nic_data->stats_disable_count)
-               return;
+       if (!nic_data->stats_disable_count) {
+               efx_reado(efx, &cnt, FR_AZ_RX_NODESC_DROP);
+               stats[FALCON_STAT_rx_nodesc_drop_cnt] +=
+                       EFX_OWORD_FIELD(cnt, FRF_AB_RX_NODESC_DROP_CNT);
+
+               if (nic_data->stats_pending &&
+                   FALCON_XMAC_STATS_DMA_FLAG(efx)) {
+                       nic_data->stats_pending = false;
+                       rmb(); /* read the done flag before the stats */
+                       efx_nic_update_stats(
+                               falcon_stat_desc, FALCON_STAT_COUNT,
+                               falcon_stat_mask,
+                               stats, efx->stats_buffer.addr, true);
+               }
 
-       efx_reado(efx, &cnt, FR_AZ_RX_NODESC_DROP);
-       efx->n_rx_nodesc_drop_cnt +=
-               EFX_OWORD_FIELD(cnt, FRF_AB_RX_NODESC_DROP_CNT);
+               /* Update derived statistic */
+               efx_update_diff_stat(&stats[FALCON_STAT_rx_bad_bytes],
+                                    stats[FALCON_STAT_rx_bytes] -
+                                    stats[FALCON_STAT_rx_good_bytes] -
+                                    stats[FALCON_STAT_rx_control] * 64);
+       }
 
-       if (nic_data->stats_pending &&
-           *nic_data->stats_dma_done == FALCON_STATS_DONE) {
-               nic_data->stats_pending = false;
-               rmb(); /* read the done flag before the stats */
-               falcon_update_stats_xmac(efx);
+       if (full_stats)
+               memcpy(full_stats, stats, sizeof(u64) * FALCON_STAT_COUNT);
+
+       if (core_stats) {
+               core_stats->rx_packets = stats[FALCON_STAT_rx_packets];
+               core_stats->tx_packets = stats[FALCON_STAT_tx_packets];
+               core_stats->rx_bytes = stats[FALCON_STAT_rx_bytes];
+               core_stats->tx_bytes = stats[FALCON_STAT_tx_bytes];
+               core_stats->rx_dropped = stats[FALCON_STAT_rx_nodesc_drop_cnt];
+               core_stats->multicast = stats[FALCON_STAT_rx_multicast];
+               core_stats->rx_length_errors =
+                       stats[FALCON_STAT_rx_gtjumbo] +
+                       stats[FALCON_STAT_rx_length_error];
+               core_stats->rx_crc_errors = stats[FALCON_STAT_rx_bad];
+               core_stats->rx_frame_errors = stats[FALCON_STAT_rx_align_error];
+               core_stats->rx_fifo_errors = stats[FALCON_STAT_rx_overflow];
+
+               core_stats->rx_errors = (core_stats->rx_length_errors +
+                                        core_stats->rx_crc_errors +
+                                        core_stats->rx_frame_errors +
+                                        stats[FALCON_STAT_rx_symbol_error]);
        }
+
+       return FALCON_STAT_COUNT;
 }
 
 void falcon_start_nic_stats(struct efx_nic *efx)
@@ -1734,7 +2607,7 @@ void falcon_stop_nic_stats(struct efx_nic *efx)
        /* Wait enough time for the most recent transfer to
         * complete. */
        for (i = 0; i < 4 && nic_data->stats_pending; i++) {
-               if (*nic_data->stats_dma_done == FALCON_STATS_DONE)
+               if (FALCON_XMAC_STATS_DMA_FLAG(efx))
                        break;
                msleep(1);
        }
@@ -1778,11 +2651,12 @@ static int falcon_set_wol(struct efx_nic *efx, u32 type)
  */
 
 const struct efx_nic_type falcon_a1_nic_type = {
+       .mem_map_size = falcon_a1_mem_map_size,
        .probe = falcon_probe_nic,
        .remove = falcon_remove_nic,
        .init = falcon_init_nic,
        .dimension_resources = falcon_dimension_resources,
-       .fini = efx_port_dummy_op_void,
+       .fini = falcon_irq_ack_a1,
        .monitor = falcon_monitor,
        .map_reset_reason = falcon_map_reset_reason,
        .map_reset_flags = falcon_map_reset_flags,
@@ -1790,23 +2664,71 @@ const struct efx_nic_type falcon_a1_nic_type = {
        .probe_port = falcon_probe_port,
        .remove_port = falcon_remove_port,
        .handle_global_event = falcon_handle_global_event,
+       .fini_dmaq = efx_farch_fini_dmaq,
        .prepare_flush = falcon_prepare_flush,
        .finish_flush = efx_port_dummy_op_void,
+       .describe_stats = falcon_describe_nic_stats,
        .update_stats = falcon_update_nic_stats,
        .start_stats = falcon_start_nic_stats,
        .stop_stats = falcon_stop_nic_stats,
        .set_id_led = falcon_set_id_led,
        .push_irq_moderation = falcon_push_irq_moderation,
        .reconfigure_port = falcon_reconfigure_port,
+       .prepare_enable_fc_tx = falcon_a1_prepare_enable_fc_tx,
        .reconfigure_mac = falcon_reconfigure_xmac,
        .check_mac_fault = falcon_xmac_check_fault,
        .get_wol = falcon_get_wol,
        .set_wol = falcon_set_wol,
        .resume_wol = efx_port_dummy_op_void,
        .test_nvram = falcon_test_nvram,
+       .irq_enable_master = efx_farch_irq_enable_master,
+       .irq_test_generate = efx_farch_irq_test_generate,
+       .irq_disable_non_ev = efx_farch_irq_disable_master,
+       .irq_handle_msi = efx_farch_msi_interrupt,
+       .irq_handle_legacy = falcon_legacy_interrupt_a1,
+       .tx_probe = efx_farch_tx_probe,
+       .tx_init = efx_farch_tx_init,
+       .tx_remove = efx_farch_tx_remove,
+       .tx_write = efx_farch_tx_write,
+       .rx_push_indir_table = efx_farch_rx_push_indir_table,
+       .rx_probe = efx_farch_rx_probe,
+       .rx_init = efx_farch_rx_init,
+       .rx_remove = efx_farch_rx_remove,
+       .rx_write = efx_farch_rx_write,
+       .rx_defer_refill = efx_farch_rx_defer_refill,
+       .ev_probe = efx_farch_ev_probe,
+       .ev_init = efx_farch_ev_init,
+       .ev_fini = efx_farch_ev_fini,
+       .ev_remove = efx_farch_ev_remove,
+       .ev_process = efx_farch_ev_process,
+       .ev_read_ack = efx_farch_ev_read_ack,
+       .ev_test_generate = efx_farch_ev_test_generate,
+
+       /* We don't expose the filter table on Falcon A1 as it is not
+        * mapped into function 0, but these implementations still
+        * work with a degenerate case of all tables set to size 0.
+        */
+       .filter_table_probe = efx_farch_filter_table_probe,
+       .filter_table_restore = efx_farch_filter_table_restore,
+       .filter_table_remove = efx_farch_filter_table_remove,
+       .filter_insert = efx_farch_filter_insert,
+       .filter_remove_safe = efx_farch_filter_remove_safe,
+       .filter_get_safe = efx_farch_filter_get_safe,
+       .filter_clear_rx = efx_farch_filter_clear_rx,
+       .filter_count_rx_used = efx_farch_filter_count_rx_used,
+       .filter_get_rx_id_limit = efx_farch_filter_get_rx_id_limit,
+       .filter_get_rx_ids = efx_farch_filter_get_rx_ids,
+
+#ifdef CONFIG_SFC_MTD
+       .mtd_probe = falcon_mtd_probe,
+       .mtd_rename = falcon_mtd_rename,
+       .mtd_read = falcon_mtd_read,
+       .mtd_erase = falcon_mtd_erase,
+       .mtd_write = falcon_mtd_write,
+       .mtd_sync = falcon_mtd_sync,
+#endif
 
        .revision = EFX_REV_FALCON_A1,
-       .mem_map_size = 0x20000,
        .txd_ptr_tbl_base = FR_AA_TX_DESC_PTR_TBL_KER,
        .rxd_ptr_tbl_base = FR_AA_RX_DESC_PTR_TBL_KER,
        .buf_tbl_base = FR_AA_BUF_FULL_TBL_KER,
@@ -1816,12 +2738,13 @@ const struct efx_nic_type falcon_a1_nic_type = {
        .rx_buffer_padding = 0x24,
        .can_rx_scatter = false,
        .max_interrupt_mode = EFX_INT_MODE_MSI,
-       .phys_addr_channels = 4,
        .timer_period_max =  1 << FRF_AB_TC_TIMER_VAL_WIDTH,
        .offload_features = NETIF_F_IP_CSUM,
+       .mcdi_max_ver = -1,
 };
 
 const struct efx_nic_type falcon_b0_nic_type = {
+       .mem_map_size = falcon_b0_mem_map_size,
        .probe = falcon_probe_nic,
        .remove = falcon_remove_nic,
        .init = falcon_init_nic,
@@ -1834,14 +2757,17 @@ const struct efx_nic_type falcon_b0_nic_type = {
        .probe_port = falcon_probe_port,
        .remove_port = falcon_remove_port,
        .handle_global_event = falcon_handle_global_event,
+       .fini_dmaq = efx_farch_fini_dmaq,
        .prepare_flush = falcon_prepare_flush,
        .finish_flush = efx_port_dummy_op_void,
+       .describe_stats = falcon_describe_nic_stats,
        .update_stats = falcon_update_nic_stats,
        .start_stats = falcon_start_nic_stats,
        .stop_stats = falcon_stop_nic_stats,
        .set_id_led = falcon_set_id_led,
        .push_irq_moderation = falcon_push_irq_moderation,
        .reconfigure_port = falcon_reconfigure_port,
+       .prepare_enable_fc_tx = falcon_b0_prepare_enable_fc_tx,
        .reconfigure_mac = falcon_reconfigure_xmac,
        .check_mac_fault = falcon_xmac_check_fault,
        .get_wol = falcon_get_wol,
@@ -1849,28 +2775,67 @@ const struct efx_nic_type falcon_b0_nic_type = {
        .resume_wol = efx_port_dummy_op_void,
        .test_chip = falcon_b0_test_chip,
        .test_nvram = falcon_test_nvram,
+       .irq_enable_master = efx_farch_irq_enable_master,
+       .irq_test_generate = efx_farch_irq_test_generate,
+       .irq_disable_non_ev = efx_farch_irq_disable_master,
+       .irq_handle_msi = efx_farch_msi_interrupt,
+       .irq_handle_legacy = efx_farch_legacy_interrupt,
+       .tx_probe = efx_farch_tx_probe,
+       .tx_init = efx_farch_tx_init,
+       .tx_remove = efx_farch_tx_remove,
+       .tx_write = efx_farch_tx_write,
+       .rx_push_indir_table = efx_farch_rx_push_indir_table,
+       .rx_probe = efx_farch_rx_probe,
+       .rx_init = efx_farch_rx_init,
+       .rx_remove = efx_farch_rx_remove,
+       .rx_write = efx_farch_rx_write,
+       .rx_defer_refill = efx_farch_rx_defer_refill,
+       .ev_probe = efx_farch_ev_probe,
+       .ev_init = efx_farch_ev_init,
+       .ev_fini = efx_farch_ev_fini,
+       .ev_remove = efx_farch_ev_remove,
+       .ev_process = efx_farch_ev_process,
+       .ev_read_ack = efx_farch_ev_read_ack,
+       .ev_test_generate = efx_farch_ev_test_generate,
+       .filter_table_probe = efx_farch_filter_table_probe,
+       .filter_table_restore = efx_farch_filter_table_restore,
+       .filter_table_remove = efx_farch_filter_table_remove,
+       .filter_update_rx_scatter = efx_farch_filter_update_rx_scatter,
+       .filter_insert = efx_farch_filter_insert,
+       .filter_remove_safe = efx_farch_filter_remove_safe,
+       .filter_get_safe = efx_farch_filter_get_safe,
+       .filter_clear_rx = efx_farch_filter_clear_rx,
+       .filter_count_rx_used = efx_farch_filter_count_rx_used,
+       .filter_get_rx_id_limit = efx_farch_filter_get_rx_id_limit,
+       .filter_get_rx_ids = efx_farch_filter_get_rx_ids,
+#ifdef CONFIG_RFS_ACCEL
+       .filter_rfs_insert = efx_farch_filter_rfs_insert,
+       .filter_rfs_expire_one = efx_farch_filter_rfs_expire_one,
+#endif
+#ifdef CONFIG_SFC_MTD
+       .mtd_probe = falcon_mtd_probe,
+       .mtd_rename = falcon_mtd_rename,
+       .mtd_read = falcon_mtd_read,
+       .mtd_erase = falcon_mtd_erase,
+       .mtd_write = falcon_mtd_write,
+       .mtd_sync = falcon_mtd_sync,
+#endif
 
        .revision = EFX_REV_FALCON_B0,
-       /* Map everything up to and including the RSS indirection
-        * table.  Don't map MSI-X table, MSI-X PBA since Linux
-        * requires that they not be mapped.  */
-       .mem_map_size = (FR_BZ_RX_INDIRECTION_TBL +
-                        FR_BZ_RX_INDIRECTION_TBL_STEP *
-                        FR_BZ_RX_INDIRECTION_TBL_ROWS),
        .txd_ptr_tbl_base = FR_BZ_TX_DESC_PTR_TBL,
        .rxd_ptr_tbl_base = FR_BZ_RX_DESC_PTR_TBL,
        .buf_tbl_base = FR_BZ_BUF_FULL_TBL,
        .evq_ptr_tbl_base = FR_BZ_EVQ_PTR_TBL,
        .evq_rptr_tbl_base = FR_BZ_EVQ_RPTR,
        .max_dma_mask = DMA_BIT_MASK(FSF_AZ_TX_KER_BUF_ADDR_WIDTH),
-       .rx_buffer_hash_size = 0x10,
+       .rx_prefix_size = FS_BZ_RX_PREFIX_SIZE,
+       .rx_hash_offset = FS_BZ_RX_PREFIX_HASH_OFST,
        .rx_buffer_padding = 0,
        .can_rx_scatter = true,
        .max_interrupt_mode = EFX_INT_MODE_MSIX,
-       .phys_addr_channels = 32, /* Hardware limit is 64, but the legacy
-                                  * interrupt handler only supports 32
-                                  * channels */
        .timer_period_max =  1 << FRF_AB_TC_TIMER_VAL_WIDTH,
        .offload_features = NETIF_F_IP_CSUM | NETIF_F_RXHASH | NETIF_F_NTUPLE,
+       .mcdi_max_ver = -1,
+       .max_rx_ip_filters = FR_BZ_RX_FILTER_TBL0_ROWS,
 };
 
This page took 0.041539 seconds and 5 git commands to generate.