sfc: Really allow RX checksum offload to be disabled
[safe/jmp/linux-2.6] / drivers / net / sfc / falcon.c
index 82c10f4..865638b 100644 (file)
 #include "mac.h"
 #include "spi.h"
 #include "falcon.h"
-#include "falcon_hwdefs.h"
-#include "falcon_io.h"
+#include "regs.h"
+#include "io.h"
 #include "mdio_10g.h"
 #include "phy.h"
-#include "boards.h"
 #include "workarounds.h"
 
 /* Falcon hardware control.
 
 /**
  * struct falcon_nic_data - Falcon NIC state
- * @next_buffer_table: First available buffer table id
  * @pci_dev2: The secondary PCI device if present
  * @i2c_data: Operations and state for I2C bit-bashing algorithm
  */
 struct falcon_nic_data {
-       unsigned next_buffer_table;
        struct pci_dev *pci_dev2;
        struct i2c_algo_bit_data i2c_data;
 };
@@ -104,23 +101,12 @@ static int rx_xon_thresh_bytes = -1;
 module_param(rx_xon_thresh_bytes, int, 0644);
 MODULE_PARM_DESC(rx_xon_thresh_bytes, "RX fifo XON threshold");
 
-/* TX descriptor ring size - min 512 max 4k */
-#define FALCON_TXD_RING_ORDER TX_DESCQ_SIZE_1K
-#define FALCON_TXD_RING_SIZE 1024
-#define FALCON_TXD_RING_MASK (FALCON_TXD_RING_SIZE - 1)
-
-/* RX descriptor ring size - min 512 max 4k */
-#define FALCON_RXD_RING_ORDER RX_DESCQ_SIZE_1K
-#define FALCON_RXD_RING_SIZE 1024
-#define FALCON_RXD_RING_MASK (FALCON_RXD_RING_SIZE - 1)
-
-/* Event queue size - max 32k */
-#define FALCON_EVQ_ORDER EVQ_SIZE_4K
-#define FALCON_EVQ_SIZE 4096
-#define FALCON_EVQ_MASK (FALCON_EVQ_SIZE - 1)
-
-/* Max number of internal errors. After this resets will not be performed */
-#define FALCON_MAX_INT_ERRORS 4
+/* If FALCON_MAX_INT_ERRORS internal errors occur within
+ * FALCON_INT_ERROR_EXPIRE seconds, we consider the NIC broken and
+ * disable it.
+ */
+#define FALCON_INT_ERROR_EXPIRE 3600
+#define FALCON_MAX_INT_ERRORS 5
 
 /* We poll for events every FLUSH_INTERVAL ms, and check FLUSH_POLL_COUNT times
  */
@@ -134,25 +120,12 @@ MODULE_PARM_DESC(rx_xon_thresh_bytes, "RX fifo XON threshold");
  **************************************************************************
  */
 
-/* DMA address mask */
-#define FALCON_DMA_MASK DMA_BIT_MASK(46)
-
-/* TX DMA length mask (13-bit) */
-#define FALCON_TX_DMA_MASK (4096 - 1)
-
 /* Size and alignment of special buffers (4KB) */
 #define FALCON_BUF_SIZE 4096
 
 /* Dummy SRAM size code */
 #define SRM_NB_BSZ_ONCHIP_ONLY (-1)
 
-/* Be nice if these (or equiv.) were in linux/pci_regs.h, but they're not. */
-#define PCI_EXP_DEVCAP_PWR_VAL_LBN     18
-#define PCI_EXP_DEVCAP_PWR_SCL_LBN     26
-#define PCI_EXP_DEVCTL_PAYLOAD_LBN     5
-#define PCI_EXP_LNKSTA_LNK_WID         0x3f0
-#define PCI_EXP_LNKSTA_LNK_WID_LBN     4
-
 #define FALCON_IS_DUAL_FUNC(efx)               \
        (falcon_rev(efx) < FALCON_REV_B0)
 
@@ -162,6 +135,13 @@ MODULE_PARM_DESC(rx_xon_thresh_bytes, "RX fifo XON threshold");
  *
  **************************************************************************/
 
+static inline void falcon_write_buf_tbl(struct efx_nic *efx, efx_qword_t *value,
+                                       unsigned int index)
+{
+       efx_sram_writeq(efx, efx->membase + efx->type->buf_tbl_base,
+                       value, index);
+}
+
 /* Read the current event from the event queue */
 static inline efx_qword_t *falcon_event(struct efx_channel *channel,
                                        unsigned int index)
@@ -198,9 +178,9 @@ static void falcon_setsda(void *data, int state)
        struct efx_nic *efx = (struct efx_nic *)data;
        efx_oword_t reg;
 
-       falcon_read(efx, &reg, GPIO_CTL_REG_KER);
-       EFX_SET_OWORD_FIELD(reg, GPIO3_OEN, !state);
-       falcon_write(efx, &reg, GPIO_CTL_REG_KER);
+       efx_reado(efx, &reg, FR_AB_GPIO_CTL);
+       EFX_SET_OWORD_FIELD(reg, FRF_AB_GPIO3_OEN, !state);
+       efx_writeo(efx, &reg, FR_AB_GPIO_CTL);
 }
 
 static void falcon_setscl(void *data, int state)
@@ -208,9 +188,9 @@ static void falcon_setscl(void *data, int state)
        struct efx_nic *efx = (struct efx_nic *)data;
        efx_oword_t reg;
 
-       falcon_read(efx, &reg, GPIO_CTL_REG_KER);
-       EFX_SET_OWORD_FIELD(reg, GPIO0_OEN, !state);
-       falcon_write(efx, &reg, GPIO_CTL_REG_KER);
+       efx_reado(efx, &reg, FR_AB_GPIO_CTL);
+       EFX_SET_OWORD_FIELD(reg, FRF_AB_GPIO0_OEN, !state);
+       efx_writeo(efx, &reg, FR_AB_GPIO_CTL);
 }
 
 static int falcon_getsda(void *data)
@@ -218,8 +198,8 @@ static int falcon_getsda(void *data)
        struct efx_nic *efx = (struct efx_nic *)data;
        efx_oword_t reg;
 
-       falcon_read(efx, &reg, GPIO_CTL_REG_KER);
-       return EFX_OWORD_FIELD(reg, GPIO3_IN);
+       efx_reado(efx, &reg, FR_AB_GPIO_CTL);
+       return EFX_OWORD_FIELD(reg, FRF_AB_GPIO3_IN);
 }
 
 static int falcon_getscl(void *data)
@@ -227,8 +207,8 @@ static int falcon_getscl(void *data)
        struct efx_nic *efx = (struct efx_nic *)data;
        efx_oword_t reg;
 
-       falcon_read(efx, &reg, GPIO_CTL_REG_KER);
-       return EFX_OWORD_FIELD(reg, GPIO0_IN);
+       efx_reado(efx, &reg, FR_AB_GPIO_CTL);
+       return EFX_OWORD_FIELD(reg, FRF_AB_GPIO0_IN);
 }
 
 static struct i2c_algo_bit_data falcon_i2c_bit_operations = {
@@ -273,12 +253,11 @@ falcon_init_special_buffer(struct efx_nic *efx,
                dma_addr = buffer->dma_addr + (i * 4096);
                EFX_LOG(efx, "mapping special buffer %d at %llx\n",
                        index, (unsigned long long)dma_addr);
-               EFX_POPULATE_QWORD_4(buf_desc,
-                                    IP_DAT_BUF_SIZE, IP_DAT_BUF_SIZE_4K,
-                                    BUF_ADR_REGION, 0,
-                                    BUF_ADR_FBUF, (dma_addr >> 12),
-                                    BUF_OWNER_ID_FBUF, 0);
-               falcon_write_sram(efx, &buf_desc, index);
+               EFX_POPULATE_QWORD_3(buf_desc,
+                                    FRF_AZ_BUF_ADR_REGION, 0,
+                                    FRF_AZ_BUF_ADR_FBUF, dma_addr >> 12,
+                                    FRF_AZ_BUF_OWNER_ID_FBUF, 0);
+               falcon_write_buf_tbl(efx, &buf_desc, index);
        }
 }
 
@@ -298,11 +277,11 @@ falcon_fini_special_buffer(struct efx_nic *efx,
                buffer->index, buffer->index + buffer->entries - 1);
 
        EFX_POPULATE_OWORD_4(buf_tbl_upd,
-                            BUF_UPD_CMD, 0,
-                            BUF_CLR_CMD, 1,
-                            BUF_CLR_END_ID, end,
-                            BUF_CLR_START_ID, start);
-       falcon_write(efx, &buf_tbl_upd, BUF_TBL_UPD_REG_KER);
+                            FRF_AZ_BUF_UPD_CMD, 0,
+                            FRF_AZ_BUF_CLR_CMD, 1,
+                            FRF_AZ_BUF_CLR_END_ID, end,
+                            FRF_AZ_BUF_CLR_START_ID, start);
+       efx_writeo(efx, &buf_tbl_upd, FR_AZ_BUF_TBL_UPD);
 }
 
 /*
@@ -318,8 +297,6 @@ static int falcon_alloc_special_buffer(struct efx_nic *efx,
                                       struct efx_special_buffer *buffer,
                                       unsigned int len)
 {
-       struct falcon_nic_data *nic_data = efx->nic_data;
-
        len = ALIGN(len, FALCON_BUF_SIZE);
 
        buffer->addr = pci_alloc_consistent(efx->pci_dev, len,
@@ -334,14 +311,14 @@ static int falcon_alloc_special_buffer(struct efx_nic *efx,
        memset(buffer->addr, 0xff, len);
 
        /* Select new buffer ID */
-       buffer->index = nic_data->next_buffer_table;
-       nic_data->next_buffer_table += buffer->entries;
+       buffer->index = efx->next_buffer_table;
+       efx->next_buffer_table += buffer->entries;
 
        EFX_LOG(efx, "allocating special buffers %d-%d at %llx+%x "
-               "(virt %p phys %lx)\n", buffer->index,
+               "(virt %p phys %llx)\n", buffer->index,
                buffer->index + buffer->entries - 1,
-               (unsigned long long)buffer->dma_addr, len,
-               buffer->addr, virt_to_phys(buffer->addr));
+               (u64)buffer->dma_addr, len,
+               buffer->addr, (u64)virt_to_phys(buffer->addr));
 
        return 0;
 }
@@ -353,10 +330,10 @@ static void falcon_free_special_buffer(struct efx_nic *efx,
                return;
 
        EFX_LOG(efx, "deallocating special buffers %d-%d at %llx+%x "
-               "(virt %p phys %lx)\n", buffer->index,
+               "(virt %p phys %llx)\n", buffer->index,
                buffer->index + buffer->entries - 1,
-               (unsigned long long)buffer->dma_addr, buffer->len,
-               buffer->addr, virt_to_phys(buffer->addr));
+               (u64)buffer->dma_addr, buffer->len,
+               buffer->addr, (u64)virt_to_phys(buffer->addr));
 
        pci_free_consistent(efx->pci_dev, buffer->len, buffer->addr,
                            buffer->dma_addr);
@@ -413,10 +390,10 @@ static inline void falcon_notify_tx_desc(struct efx_tx_queue *tx_queue)
        unsigned write_ptr;
        efx_dword_t reg;
 
-       write_ptr = tx_queue->write_count & FALCON_TXD_RING_MASK;
-       EFX_POPULATE_DWORD_1(reg, TX_DESC_WPTR_DWORD, write_ptr);
-       falcon_writel_page(tx_queue->efx, &reg,
-                          TX_DESC_UPD_REG_KER_DWORD, tx_queue->queue);
+       write_ptr = tx_queue->write_count & EFX_TXQ_MASK;
+       EFX_POPULATE_DWORD_1(reg, FRF_AZ_TX_DESC_WPTR_DWORD, write_ptr);
+       efx_writed_page(tx_queue->efx, &reg,
+                       FR_AZ_TX_DESC_UPD_DWORD_P0, tx_queue->queue);
 }
 
 
@@ -434,18 +411,17 @@ void falcon_push_buffers(struct efx_tx_queue *tx_queue)
        BUG_ON(tx_queue->write_count == tx_queue->insert_count);
 
        do {
-               write_ptr = tx_queue->write_count & FALCON_TXD_RING_MASK;
+               write_ptr = tx_queue->write_count & EFX_TXQ_MASK;
                buffer = &tx_queue->buffer[write_ptr];
                txd = falcon_tx_desc(tx_queue, write_ptr);
                ++tx_queue->write_count;
 
                /* Create TX descriptor ring entry */
-               EFX_POPULATE_QWORD_5(*txd,
-                                    TX_KER_PORT, 0,
-                                    TX_KER_CONT, buffer->continuation,
-                                    TX_KER_BYTE_CNT, buffer->len,
-                                    TX_KER_BUF_REGION, 0,
-                                    TX_KER_BUF_ADR, buffer->dma_addr);
+               EFX_POPULATE_QWORD_4(*txd,
+                                    FSF_AZ_TX_KER_CONT, buffer->continuation,
+                                    FSF_AZ_TX_KER_BYTE_COUNT, buffer->len,
+                                    FSF_AZ_TX_KER_BUF_REGION, 0,
+                                    FSF_AZ_TX_KER_BUF_ADDR, buffer->dma_addr);
        } while (tx_queue->write_count != tx_queue->insert_count);
 
        wmb(); /* Ensure descriptors are written before they are fetched */
@@ -456,9 +432,10 @@ void falcon_push_buffers(struct efx_tx_queue *tx_queue)
 int falcon_probe_tx(struct efx_tx_queue *tx_queue)
 {
        struct efx_nic *efx = tx_queue->efx;
+       BUILD_BUG_ON(EFX_TXQ_SIZE < 512 || EFX_TXQ_SIZE > 4096 ||
+                    EFX_TXQ_SIZE & EFX_TXQ_MASK);
        return falcon_alloc_special_buffer(efx, &tx_queue->txd,
-                                          FALCON_TXD_RING_SIZE *
-                                          sizeof(efx_qword_t));
+                                          EFX_TXQ_SIZE * sizeof(efx_qword_t));
 }
 
 void falcon_init_tx(struct efx_tx_queue *tx_queue)
@@ -473,25 +450,28 @@ void falcon_init_tx(struct efx_tx_queue *tx_queue)
 
        /* Push TX descriptor ring to card */
        EFX_POPULATE_OWORD_10(tx_desc_ptr,
-                             TX_DESCQ_EN, 1,
-                             TX_ISCSI_DDIG_EN, 0,
-                             TX_ISCSI_HDIG_EN, 0,
-                             TX_DESCQ_BUF_BASE_ID, tx_queue->txd.index,
-                             TX_DESCQ_EVQ_ID, tx_queue->channel->channel,
-                             TX_DESCQ_OWNER_ID, 0,
-                             TX_DESCQ_LABEL, tx_queue->queue,
-                             TX_DESCQ_SIZE, FALCON_TXD_RING_ORDER,
-                             TX_DESCQ_TYPE, 0,
-                             TX_NON_IP_DROP_DIS_B0, 1);
+                             FRF_AZ_TX_DESCQ_EN, 1,
+                             FRF_AZ_TX_ISCSI_DDIG_EN, 0,
+                             FRF_AZ_TX_ISCSI_HDIG_EN, 0,
+                             FRF_AZ_TX_DESCQ_BUF_BASE_ID, tx_queue->txd.index,
+                             FRF_AZ_TX_DESCQ_EVQ_ID,
+                             tx_queue->channel->channel,
+                             FRF_AZ_TX_DESCQ_OWNER_ID, 0,
+                             FRF_AZ_TX_DESCQ_LABEL, tx_queue->queue,
+                             FRF_AZ_TX_DESCQ_SIZE,
+                             __ffs(tx_queue->txd.entries),
+                             FRF_AZ_TX_DESCQ_TYPE, 0,
+                             FRF_BZ_TX_NON_IP_DROP_DIS, 1);
 
        if (falcon_rev(efx) >= FALCON_REV_B0) {
                int csum = tx_queue->queue == EFX_TX_QUEUE_OFFLOAD_CSUM;
-               EFX_SET_OWORD_FIELD(tx_desc_ptr, TX_IP_CHKSM_DIS_B0, !csum);
-               EFX_SET_OWORD_FIELD(tx_desc_ptr, TX_TCP_CHKSM_DIS_B0, !csum);
+               EFX_SET_OWORD_FIELD(tx_desc_ptr, FRF_BZ_TX_IP_CHKSM_DIS, !csum);
+               EFX_SET_OWORD_FIELD(tx_desc_ptr, FRF_BZ_TX_TCP_CHKSM_DIS,
+                                   !csum);
        }
 
-       falcon_write_table(efx, &tx_desc_ptr, efx->type->txd_ptr_tbl_base,
-                          tx_queue->queue);
+       efx_writeo_table(efx, &tx_desc_ptr, efx->type->txd_ptr_tbl_base,
+                        tx_queue->queue);
 
        if (falcon_rev(efx) < FALCON_REV_B0) {
                efx_oword_t reg;
@@ -499,12 +479,12 @@ void falcon_init_tx(struct efx_tx_queue *tx_queue)
                /* Only 128 bits in this register */
                BUILD_BUG_ON(EFX_TX_QUEUE_COUNT >= 128);
 
-               falcon_read(efx, &reg, TX_CHKSM_CFG_REG_KER_A1);
+               efx_reado(efx, &reg, FR_AA_TX_CHKSM_CFG);
                if (tx_queue->queue == EFX_TX_QUEUE_OFFLOAD_CSUM)
                        clear_bit_le(tx_queue->queue, (void *)&reg);
                else
                        set_bit_le(tx_queue->queue, (void *)&reg);
-               falcon_write(efx, &reg, TX_CHKSM_CFG_REG_KER_A1);
+               efx_writeo(efx, &reg, FR_AA_TX_CHKSM_CFG);
        }
 }
 
@@ -515,9 +495,9 @@ static void falcon_flush_tx_queue(struct efx_tx_queue *tx_queue)
 
        /* Post a flush command */
        EFX_POPULATE_OWORD_2(tx_flush_descq,
-                            TX_FLUSH_DESCQ_CMD, 1,
-                            TX_FLUSH_DESCQ, tx_queue->queue);
-       falcon_write(efx, &tx_flush_descq, TX_FLUSH_DESCQ_REG_KER);
+                            FRF_AZ_TX_FLUSH_DESCQ_CMD, 1,
+                            FRF_AZ_TX_FLUSH_DESCQ, tx_queue->queue);
+       efx_writeo(efx, &tx_flush_descq, FR_AZ_TX_FLUSH_DESCQ);
 }
 
 void falcon_fini_tx(struct efx_tx_queue *tx_queue)
@@ -530,8 +510,8 @@ void falcon_fini_tx(struct efx_tx_queue *tx_queue)
 
        /* Remove TX descriptor ring from card */
        EFX_ZERO_OWORD(tx_desc_ptr);
-       falcon_write_table(efx, &tx_desc_ptr, efx->type->txd_ptr_tbl_base,
-                          tx_queue->queue);
+       efx_writeo_table(efx, &tx_desc_ptr, efx->type->txd_ptr_tbl_base,
+                        tx_queue->queue);
 
        /* Unpin TX descriptor ring */
        falcon_fini_special_buffer(efx, &tx_queue->txd);
@@ -566,11 +546,11 @@ static inline void falcon_build_rx_desc(struct efx_rx_queue *rx_queue,
        rxd = falcon_rx_desc(rx_queue, index);
        rx_buf = efx_rx_buffer(rx_queue, index);
        EFX_POPULATE_QWORD_3(*rxd,
-                            RX_KER_BUF_SIZE,
+                            FSF_AZ_RX_KER_BUF_SIZE,
                             rx_buf->len -
                             rx_queue->efx->type->rx_buffer_padding,
-                            RX_KER_BUF_REGION, 0,
-                            RX_KER_BUF_ADR, rx_buf->dma_addr);
+                            FSF_AZ_RX_KER_BUF_REGION, 0,
+                            FSF_AZ_RX_KER_BUF_ADDR, rx_buf->dma_addr);
 }
 
 /* This writes to the RX_DESC_WPTR register for the specified receive
@@ -584,23 +564,24 @@ void falcon_notify_rx_desc(struct efx_rx_queue *rx_queue)
        while (rx_queue->notified_count != rx_queue->added_count) {
                falcon_build_rx_desc(rx_queue,
                                     rx_queue->notified_count &
-                                    FALCON_RXD_RING_MASK);
+                                    EFX_RXQ_MASK);
                ++rx_queue->notified_count;
        }
 
        wmb();
-       write_ptr = rx_queue->added_count & FALCON_RXD_RING_MASK;
-       EFX_POPULATE_DWORD_1(reg, RX_DESC_WPTR_DWORD, write_ptr);
-       falcon_writel_page(rx_queue->efx, &reg,
-                          RX_DESC_UPD_REG_KER_DWORD, rx_queue->queue);
+       write_ptr = rx_queue->added_count & EFX_RXQ_MASK;
+       EFX_POPULATE_DWORD_1(reg, FRF_AZ_RX_DESC_WPTR_DWORD, write_ptr);
+       efx_writed_page(rx_queue->efx, &reg,
+                       FR_AZ_RX_DESC_UPD_DWORD_P0, rx_queue->queue);
 }
 
 int falcon_probe_rx(struct efx_rx_queue *rx_queue)
 {
        struct efx_nic *efx = rx_queue->efx;
+       BUILD_BUG_ON(EFX_RXQ_SIZE < 512 || EFX_RXQ_SIZE > 4096 ||
+                    EFX_RXQ_SIZE & EFX_RXQ_MASK);
        return falcon_alloc_special_buffer(efx, &rx_queue->rxd,
-                                          FALCON_RXD_RING_SIZE *
-                                          sizeof(efx_qword_t));
+                                          EFX_RXQ_SIZE * sizeof(efx_qword_t));
 }
 
 void falcon_init_rx(struct efx_rx_queue *rx_queue)
@@ -621,19 +602,21 @@ void falcon_init_rx(struct efx_rx_queue *rx_queue)
 
        /* Push RX descriptor ring to card */
        EFX_POPULATE_OWORD_10(rx_desc_ptr,
-                             RX_ISCSI_DDIG_EN, iscsi_digest_en,
-                             RX_ISCSI_HDIG_EN, iscsi_digest_en,
-                             RX_DESCQ_BUF_BASE_ID, rx_queue->rxd.index,
-                             RX_DESCQ_EVQ_ID, rx_queue->channel->channel,
-                             RX_DESCQ_OWNER_ID, 0,
-                             RX_DESCQ_LABEL, rx_queue->queue,
-                             RX_DESCQ_SIZE, FALCON_RXD_RING_ORDER,
-                             RX_DESCQ_TYPE, 0 /* kernel queue */ ,
+                             FRF_AZ_RX_ISCSI_DDIG_EN, iscsi_digest_en,
+                             FRF_AZ_RX_ISCSI_HDIG_EN, iscsi_digest_en,
+                             FRF_AZ_RX_DESCQ_BUF_BASE_ID, rx_queue->rxd.index,
+                             FRF_AZ_RX_DESCQ_EVQ_ID,
+                             rx_queue->channel->channel,
+                             FRF_AZ_RX_DESCQ_OWNER_ID, 0,
+                             FRF_AZ_RX_DESCQ_LABEL, rx_queue->queue,
+                             FRF_AZ_RX_DESCQ_SIZE,
+                             __ffs(rx_queue->rxd.entries),
+                             FRF_AZ_RX_DESCQ_TYPE, 0 /* kernel queue */ ,
                              /* For >=B0 this is scatter so disable */
-                             RX_DESCQ_JUMBO, !is_b0,
-                             RX_DESCQ_EN, 1);
-       falcon_write_table(efx, &rx_desc_ptr, efx->type->rxd_ptr_tbl_base,
-                          rx_queue->queue);
+                             FRF_AZ_RX_DESCQ_JUMBO, !is_b0,
+                             FRF_AZ_RX_DESCQ_EN, 1);
+       efx_writeo_table(efx, &rx_desc_ptr, efx->type->rxd_ptr_tbl_base,
+                        rx_queue->queue);
 }
 
 static void falcon_flush_rx_queue(struct efx_rx_queue *rx_queue)
@@ -643,9 +626,9 @@ static void falcon_flush_rx_queue(struct efx_rx_queue *rx_queue)
 
        /* Post a flush command */
        EFX_POPULATE_OWORD_2(rx_flush_descq,
-                            RX_FLUSH_DESCQ_CMD, 1,
-                            RX_FLUSH_DESCQ, rx_queue->queue);
-       falcon_write(efx, &rx_flush_descq, RX_FLUSH_DESCQ_REG_KER);
+                            FRF_AZ_RX_FLUSH_DESCQ_CMD, 1,
+                            FRF_AZ_RX_FLUSH_DESCQ, rx_queue->queue);
+       efx_writeo(efx, &rx_flush_descq, FR_AZ_RX_FLUSH_DESCQ);
 }
 
 void falcon_fini_rx(struct efx_rx_queue *rx_queue)
@@ -658,8 +641,8 @@ void falcon_fini_rx(struct efx_rx_queue *rx_queue)
 
        /* Remove RX descriptor ring from card */
        EFX_ZERO_OWORD(rx_desc_ptr);
-       falcon_write_table(efx, &rx_desc_ptr, efx->type->rxd_ptr_tbl_base,
-                          rx_queue->queue);
+       efx_writeo_table(efx, &rx_desc_ptr, efx->type->rxd_ptr_tbl_base,
+                        rx_queue->queue);
 
        /* Unpin RX descriptor ring */
        falcon_fini_special_buffer(efx, &rx_queue->rxd);
@@ -692,8 +675,8 @@ void falcon_eventq_read_ack(struct efx_channel *channel)
        efx_dword_t reg;
        struct efx_nic *efx = channel->efx;
 
-       EFX_POPULATE_DWORD_1(reg, EVQ_RPTR_DWORD, channel->eventq_read_ptr);
-       falcon_writel_table(efx, &reg, efx->type->evq_rptr_tbl_base,
+       EFX_POPULATE_DWORD_1(reg, FRF_AZ_EVQ_RPTR, channel->eventq_read_ptr);
+       efx_writed_table(efx, &reg, efx->type->evq_rptr_tbl_base,
                            channel->channel);
 }
 
@@ -702,11 +685,14 @@ void falcon_generate_event(struct efx_channel *channel, efx_qword_t *event)
 {
        efx_oword_t drv_ev_reg;
 
-       EFX_POPULATE_OWORD_2(drv_ev_reg,
-                            DRV_EV_QID, channel->channel,
-                            DRV_EV_DATA,
-                            EFX_QWORD_FIELD64(*event, WHOLE_EVENT));
-       falcon_write(channel->efx, &drv_ev_reg, DRV_EV_REG_KER);
+       BUILD_BUG_ON(FRF_AZ_DRV_EV_DATA_LBN != 0 ||
+                    FRF_AZ_DRV_EV_DATA_WIDTH != 64);
+       drv_ev_reg.u32[0] = event->u32[0];
+       drv_ev_reg.u32[1] = event->u32[1];
+       drv_ev_reg.u32[2] = 0;
+       drv_ev_reg.u32[3] = 0;
+       EFX_SET_OWORD_FIELD(drv_ev_reg, FRF_AZ_DRV_EV_QID, channel->channel);
+       efx_writeo(channel->efx, &drv_ev_reg, FR_AZ_DRV_EV);
 }
 
 /* Handle a transmit completion event
@@ -722,15 +708,18 @@ static void falcon_handle_tx_event(struct efx_channel *channel,
        struct efx_tx_queue *tx_queue;
        struct efx_nic *efx = channel->efx;
 
-       if (likely(EFX_QWORD_FIELD(*event, TX_EV_COMP))) {
+       if (likely(EFX_QWORD_FIELD(*event, FSF_AZ_TX_EV_COMP))) {
                /* Transmit completion */
-               tx_ev_desc_ptr = EFX_QWORD_FIELD(*event, TX_EV_DESC_PTR);
-               tx_ev_q_label = EFX_QWORD_FIELD(*event, TX_EV_Q_LABEL);
+               tx_ev_desc_ptr = EFX_QWORD_FIELD(*event, FSF_AZ_TX_EV_DESC_PTR);
+               tx_ev_q_label = EFX_QWORD_FIELD(*event, FSF_AZ_TX_EV_Q_LABEL);
                tx_queue = &efx->tx_queue[tx_ev_q_label];
+               channel->irq_mod_score +=
+                       (tx_ev_desc_ptr - tx_queue->read_count) &
+                       EFX_TXQ_MASK;
                efx_xmit_done(tx_queue, tx_ev_desc_ptr);
-       } else if (EFX_QWORD_FIELD(*event, TX_EV_WQ_FF_FULL)) {
+       } else if (EFX_QWORD_FIELD(*event, FSF_AZ_TX_EV_WQ_FF_FULL)) {
                /* Rewrite the FIFO write pointer */
-               tx_ev_q_label = EFX_QWORD_FIELD(*event, TX_EV_Q_LABEL);
+               tx_ev_q_label = EFX_QWORD_FIELD(*event, FSF_AZ_TX_EV_Q_LABEL);
                tx_queue = &efx->tx_queue[tx_ev_q_label];
 
                if (efx_dev_registered(efx))
@@ -738,7 +727,7 @@ static void falcon_handle_tx_event(struct efx_channel *channel,
                falcon_notify_tx_desc(tx_queue);
                if (efx_dev_registered(efx))
                        netif_tx_unlock(efx->net_dev);
-       } else if (EFX_QWORD_FIELD(*event, TX_EV_PKT_ERR) &&
+       } else if (EFX_QWORD_FIELD(*event, FSF_AZ_TX_EV_PKT_ERR) &&
                   EFX_WORKAROUND_10727(efx)) {
                efx_schedule_reset(efx, RESET_TYPE_TX_DESC_FETCH);
        } else {
@@ -762,22 +751,22 @@ static void falcon_handle_rx_not_ok(struct efx_rx_queue *rx_queue,
        bool rx_ev_ip_frag_err, rx_ev_hdr_type, rx_ev_mcast_pkt;
        unsigned rx_ev_pkt_type;
 
-       rx_ev_hdr_type = EFX_QWORD_FIELD(*event, RX_EV_HDR_TYPE);
-       rx_ev_mcast_pkt = EFX_QWORD_FIELD(*event, RX_EV_MCAST_PKT);
-       rx_ev_tobe_disc = EFX_QWORD_FIELD(*event, RX_EV_TOBE_DISC);
-       rx_ev_pkt_type = EFX_QWORD_FIELD(*event, RX_EV_PKT_TYPE);
+       rx_ev_hdr_type = EFX_QWORD_FIELD(*event, FSF_AZ_RX_EV_HDR_TYPE);
+       rx_ev_mcast_pkt = EFX_QWORD_FIELD(*event, FSF_AZ_RX_EV_MCAST_PKT);
+       rx_ev_tobe_disc = EFX_QWORD_FIELD(*event, FSF_AZ_RX_EV_TOBE_DISC);
+       rx_ev_pkt_type = EFX_QWORD_FIELD(*event, FSF_AZ_RX_EV_PKT_TYPE);
        rx_ev_buf_owner_id_err = EFX_QWORD_FIELD(*event,
-                                                RX_EV_BUF_OWNER_ID_ERR);
-       rx_ev_ip_frag_err = EFX_QWORD_FIELD(*event, RX_EV_IF_FRAG_ERR);
+                                                FSF_AZ_RX_EV_BUF_OWNER_ID_ERR);
+       rx_ev_ip_frag_err = EFX_QWORD_FIELD(*event, FSF_AZ_RX_EV_IP_FRAG_ERR);
        rx_ev_ip_hdr_chksum_err = EFX_QWORD_FIELD(*event,
-                                                 RX_EV_IP_HDR_CHKSUM_ERR);
+                                                 FSF_AZ_RX_EV_IP_HDR_CHKSUM_ERR);
        rx_ev_tcp_udp_chksum_err = EFX_QWORD_FIELD(*event,
-                                                  RX_EV_TCP_UDP_CHKSUM_ERR);
-       rx_ev_eth_crc_err = EFX_QWORD_FIELD(*event, RX_EV_ETH_CRC_ERR);
-       rx_ev_frm_trunc = EFX_QWORD_FIELD(*event, RX_EV_FRM_TRUNC);
+                                                  FSF_AZ_RX_EV_TCP_UDP_CHKSUM_ERR);
+       rx_ev_eth_crc_err = EFX_QWORD_FIELD(*event, FSF_AZ_RX_EV_ETH_CRC_ERR);
+       rx_ev_frm_trunc = EFX_QWORD_FIELD(*event, FSF_AZ_RX_EV_FRM_TRUNC);
        rx_ev_drib_nib = ((falcon_rev(efx) >= FALCON_REV_B0) ?
-                         0 : EFX_QWORD_FIELD(*event, RX_EV_DRIB_NIB));
-       rx_ev_pause_frm = EFX_QWORD_FIELD(*event, RX_EV_PAUSE_FRM_ERR);
+                         0 : EFX_QWORD_FIELD(*event, FSF_AA_RX_EV_DRIB_NIB));
+       rx_ev_pause_frm = EFX_QWORD_FIELD(*event, FSF_AZ_RX_EV_PAUSE_FRM_ERR);
 
        /* Every error apart from tobe_disc and pause_frm */
        rx_ev_other_err = (rx_ev_drib_nib | rx_ev_tcp_udp_chksum_err |
@@ -833,9 +822,8 @@ static void falcon_handle_rx_bad_index(struct efx_rx_queue *rx_queue,
        struct efx_nic *efx = rx_queue->efx;
        unsigned expected, dropped;
 
-       expected = rx_queue->removed_count & FALCON_RXD_RING_MASK;
-       dropped = ((index + FALCON_RXD_RING_SIZE - expected) &
-                  FALCON_RXD_RING_MASK);
+       expected = rx_queue->removed_count & EFX_RXQ_MASK;
+       dropped = (index - expected) & EFX_RXQ_MASK;
        EFX_INFO(efx, "dropped %d events (index=%d expected=%d)\n",
                dropped, index, expected);
 
@@ -861,17 +849,18 @@ static void falcon_handle_rx_event(struct efx_channel *channel,
        struct efx_nic *efx = channel->efx;
 
        /* Basic packet information */
-       rx_ev_byte_cnt = EFX_QWORD_FIELD(*event, RX_EV_BYTE_CNT);
-       rx_ev_pkt_ok = EFX_QWORD_FIELD(*event, RX_EV_PKT_OK);
-       rx_ev_hdr_type = EFX_QWORD_FIELD(*event, RX_EV_HDR_TYPE);
-       WARN_ON(EFX_QWORD_FIELD(*event, RX_EV_JUMBO_CONT));
-       WARN_ON(EFX_QWORD_FIELD(*event, RX_EV_SOP) != 1);
-       WARN_ON(EFX_QWORD_FIELD(*event, RX_EV_Q_LABEL) != channel->channel);
+       rx_ev_byte_cnt = EFX_QWORD_FIELD(*event, FSF_AZ_RX_EV_BYTE_CNT);
+       rx_ev_pkt_ok = EFX_QWORD_FIELD(*event, FSF_AZ_RX_EV_PKT_OK);
+       rx_ev_hdr_type = EFX_QWORD_FIELD(*event, FSF_AZ_RX_EV_HDR_TYPE);
+       WARN_ON(EFX_QWORD_FIELD(*event, FSF_AZ_RX_EV_JUMBO_CONT));
+       WARN_ON(EFX_QWORD_FIELD(*event, FSF_AZ_RX_EV_SOP) != 1);
+       WARN_ON(EFX_QWORD_FIELD(*event, FSF_AZ_RX_EV_Q_LABEL) !=
+               channel->channel);
 
        rx_queue = &efx->rx_queue[channel->channel];
 
-       rx_ev_desc_ptr = EFX_QWORD_FIELD(*event, RX_EV_DESC_PTR);
-       expected_ptr = rx_queue->removed_count & FALCON_RXD_RING_MASK;
+       rx_ev_desc_ptr = EFX_QWORD_FIELD(*event, FSF_AZ_RX_EV_DESC_PTR);
+       expected_ptr = rx_queue->removed_count & EFX_RXQ_MASK;
        if (unlikely(rx_ev_desc_ptr != expected_ptr))
                falcon_handle_rx_bad_index(rx_queue, rx_ev_desc_ptr);
 
@@ -879,7 +868,10 @@ static void falcon_handle_rx_event(struct efx_channel *channel,
                /* If packet is marked as OK and packet type is TCP/IPv4 or
                 * UDP/IPv4, then we can rely on the hardware checksum.
                 */
-               checksummed = RX_EV_HDR_TYPE_HAS_CHECKSUMS(rx_ev_hdr_type);
+               checksummed =
+                       efx->rx_checksum_enabled &&
+                       (rx_ev_hdr_type == FSE_AB_RX_EV_HDR_TYPE_IPV4_TCP ||
+                        rx_ev_hdr_type == FSE_AB_RX_EV_HDR_TYPE_IPV4_UDP);
        } else {
                falcon_handle_rx_not_ok(rx_queue, event, &rx_ev_pkt_ok,
                                        &discard);
@@ -887,15 +879,17 @@ static void falcon_handle_rx_event(struct efx_channel *channel,
        }
 
        /* Detect multicast packets that didn't match the filter */
-       rx_ev_mcast_pkt = EFX_QWORD_FIELD(*event, RX_EV_MCAST_PKT);
+       rx_ev_mcast_pkt = EFX_QWORD_FIELD(*event, FSF_AZ_RX_EV_MCAST_PKT);
        if (rx_ev_mcast_pkt) {
                unsigned int rx_ev_mcast_hash_match =
-                       EFX_QWORD_FIELD(*event, RX_EV_MCAST_HASH_MATCH);
+                       EFX_QWORD_FIELD(*event, FSF_AZ_RX_EV_MCAST_HASH_MATCH);
 
                if (unlikely(!rx_ev_mcast_hash_match))
                        discard = true;
        }
 
+       channel->irq_mod_score += 2;
+
        /* Handle received packet */
        efx_rx_packet(rx_queue, rx_ev_desc_ptr, rx_ev_byte_cnt,
                      checksummed, discard);
@@ -908,22 +902,23 @@ static void falcon_handle_global_event(struct efx_channel *channel,
        struct efx_nic *efx = channel->efx;
        bool handled = false;
 
-       if (EFX_QWORD_FIELD(*event, G_PHY0_INTR) ||
-           EFX_QWORD_FIELD(*event, G_PHY1_INTR) ||
-           EFX_QWORD_FIELD(*event, XG_PHY_INTR) ||
-           EFX_QWORD_FIELD(*event, XFP_PHY_INTR)) {
+       if (EFX_QWORD_FIELD(*event, FSF_AB_GLB_EV_G_PHY0_INTR) ||
+           EFX_QWORD_FIELD(*event, FSF_AB_GLB_EV_XG_PHY0_INTR) ||
+           EFX_QWORD_FIELD(*event, FSF_AB_GLB_EV_XFP_PHY0_INTR)) {
                efx->phy_op->clear_interrupt(efx);
                queue_work(efx->workqueue, &efx->phy_work);
                handled = true;
        }
 
        if ((falcon_rev(efx) >= FALCON_REV_B0) &&
-           EFX_QWORD_FIELD(*event, XG_MNT_INTR_B0)) {
+           EFX_QWORD_FIELD(*event, FSF_BB_GLB_EV_XG_MGT_INTR)) {
                queue_work(efx->workqueue, &efx->mac_work);
                handled = true;
        }
 
-       if (EFX_QWORD_FIELD_VER(efx, *event, RX_RECOVERY)) {
+       if (falcon_rev(efx) <= FALCON_REV_A1 ?
+           EFX_QWORD_FIELD(*event, FSF_AA_GLB_EV_RX_RECOVERY) :
+           EFX_QWORD_FIELD(*event, FSF_BB_GLB_EV_RX_RECOVERY)) {
                EFX_ERR(efx, "channel %d seen global RX_RESET "
                        "event. Resetting.\n", channel->channel);
 
@@ -946,35 +941,35 @@ static void falcon_handle_driver_event(struct efx_channel *channel,
        unsigned int ev_sub_code;
        unsigned int ev_sub_data;
 
-       ev_sub_code = EFX_QWORD_FIELD(*event, DRIVER_EV_SUB_CODE);
-       ev_sub_data = EFX_QWORD_FIELD(*event, DRIVER_EV_SUB_DATA);
+       ev_sub_code = EFX_QWORD_FIELD(*event, FSF_AZ_DRIVER_EV_SUBCODE);
+       ev_sub_data = EFX_QWORD_FIELD(*event, FSF_AZ_DRIVER_EV_SUBDATA);
 
        switch (ev_sub_code) {
-       case TX_DESCQ_FLS_DONE_EV_DECODE:
+       case FSE_AZ_TX_DESCQ_FLS_DONE_EV:
                EFX_TRACE(efx, "channel %d TXQ %d flushed\n",
                          channel->channel, ev_sub_data);
                break;
-       case RX_DESCQ_FLS_DONE_EV_DECODE:
+       case FSE_AZ_RX_DESCQ_FLS_DONE_EV:
                EFX_TRACE(efx, "channel %d RXQ %d flushed\n",
                          channel->channel, ev_sub_data);
                break;
-       case EVQ_INIT_DONE_EV_DECODE:
+       case FSE_AZ_EVQ_INIT_DONE_EV:
                EFX_LOG(efx, "channel %d EVQ %d initialised\n",
                        channel->channel, ev_sub_data);
                break;
-       case SRM_UPD_DONE_EV_DECODE:
+       case FSE_AZ_SRM_UPD_DONE_EV:
                EFX_TRACE(efx, "channel %d SRAM update done\n",
                          channel->channel);
                break;
-       case WAKE_UP_EV_DECODE:
+       case FSE_AZ_WAKE_UP_EV:
                EFX_TRACE(efx, "channel %d RXQ %d wakeup event\n",
                          channel->channel, ev_sub_data);
                break;
-       case TIMER_EV_DECODE:
+       case FSE_AZ_TIMER_EV:
                EFX_TRACE(efx, "channel %d RX queue %d timer expired\n",
                          channel->channel, ev_sub_data);
                break;
-       case RX_RECOVERY_EV_DECODE:
+       case FSE_AA_RX_RECOVER_EV:
                EFX_ERR(efx, "channel %d seen DRIVER RX_RESET event. "
                        "Resetting.\n", channel->channel);
                atomic_inc(&efx->rx_reset);
@@ -983,12 +978,12 @@ static void falcon_handle_driver_event(struct efx_channel *channel,
                                   RESET_TYPE_RX_RECOVERY :
                                   RESET_TYPE_DISABLE);
                break;
-       case RX_DSC_ERROR_EV_DECODE:
+       case FSE_BZ_RX_DSC_ERROR_EV:
                EFX_ERR(efx, "RX DMA Q %d reports descriptor fetch error."
                        " RX Q %d is disabled.\n", ev_sub_data, ev_sub_data);
                efx_schedule_reset(efx, RESET_TYPE_RX_DESC_FETCH);
                break;
-       case TX_DSC_ERROR_EV_DECODE:
+       case FSE_BZ_TX_DSC_ERROR_EV:
                EFX_ERR(efx, "TX DMA Q %d reports descriptor fetch error."
                        " TX Q %d is disabled.\n", ev_sub_data, ev_sub_data);
                efx_schedule_reset(efx, RESET_TYPE_TX_DESC_FETCH);
@@ -1024,27 +1019,27 @@ int falcon_process_eventq(struct efx_channel *channel, int rx_quota)
                /* Clear this event by marking it all ones */
                EFX_SET_QWORD(*p_event);
 
-               ev_code = EFX_QWORD_FIELD(event, EV_CODE);
+               ev_code = EFX_QWORD_FIELD(event, FSF_AZ_EV_CODE);
 
                switch (ev_code) {
-               case RX_IP_EV_DECODE:
+               case FSE_AZ_EV_CODE_RX_EV:
                        falcon_handle_rx_event(channel, &event);
                        ++rx_packets;
                        break;
-               case TX_IP_EV_DECODE:
+               case FSE_AZ_EV_CODE_TX_EV:
                        falcon_handle_tx_event(channel, &event);
                        break;
-               case DRV_GEN_EV_DECODE:
-                       channel->eventq_magic
-                               = EFX_QWORD_FIELD(event, EVQ_MAGIC);
+               case FSE_AZ_EV_CODE_DRV_GEN_EV:
+                       channel->eventq_magic = EFX_QWORD_FIELD(
+                               event, FSF_AZ_DRV_GEN_EV_MAGIC);
                        EFX_LOG(channel->efx, "channel %d received generated "
                                "event "EFX_QWORD_FMT"\n", channel->channel,
                                EFX_QWORD_VAL(event));
                        break;
-               case GLOBAL_EV_DECODE:
+               case FSE_AZ_EV_CODE_GLOBAL_EV:
                        falcon_handle_global_event(channel, &event);
                        break;
-               case DRIVER_EV_DECODE:
+               case FSE_AZ_EV_CODE_DRIVER_EV:
                        falcon_handle_driver_event(channel, &event);
                        break;
                default:
@@ -1054,7 +1049,7 @@ int falcon_process_eventq(struct efx_channel *channel, int rx_quota)
                }
 
                /* Increment read pointer */
-               read_ptr = (read_ptr + 1) & FALCON_EVQ_MASK;
+               read_ptr = (read_ptr + 1) & EFX_EVQ_MASK;
 
        } while (rx_packets < rx_quota);
 
@@ -1069,25 +1064,20 @@ void falcon_set_int_moderation(struct efx_channel *channel)
 
        /* Set timer register */
        if (channel->irq_moderation) {
-               /* Round to resolution supported by hardware.  The value we
-                * program is based at 0.  So actual interrupt moderation
-                * achieved is ((x + 1) * res).
-                */
-               unsigned int res = 5;
-               channel->irq_moderation -= (channel->irq_moderation % res);
-               if (channel->irq_moderation < res)
-                       channel->irq_moderation = res;
                EFX_POPULATE_DWORD_2(timer_cmd,
-                                    TIMER_MODE, TIMER_MODE_INT_HLDOFF,
-                                    TIMER_VAL,
-                                    (channel->irq_moderation / res) - 1);
+                                    FRF_AB_TC_TIMER_MODE,
+                                    FFE_BB_TIMER_MODE_INT_HLDOFF,
+                                    FRF_AB_TC_TIMER_VAL,
+                                    channel->irq_moderation - 1);
        } else {
                EFX_POPULATE_DWORD_2(timer_cmd,
-                                    TIMER_MODE, TIMER_MODE_DIS,
-                                    TIMER_VAL, 0);
+                                    FRF_AB_TC_TIMER_MODE,
+                                    FFE_BB_TIMER_MODE_DIS,
+                                    FRF_AB_TC_TIMER_VAL, 0);
        }
-       falcon_writel_page_locked(efx, &timer_cmd, TIMER_CMD_REG_KER,
-                                 channel->channel);
+       BUILD_BUG_ON(FR_AA_TIMER_COMMAND_KER != FR_BZ_TIMER_COMMAND_P0);
+       efx_writed_page_locked(efx, &timer_cmd, FR_BZ_TIMER_COMMAND_P0,
+                              channel->channel);
 
 }
 
@@ -1095,10 +1085,10 @@ void falcon_set_int_moderation(struct efx_channel *channel)
 int falcon_probe_eventq(struct efx_channel *channel)
 {
        struct efx_nic *efx = channel->efx;
-       unsigned int evq_size;
-
-       evq_size = FALCON_EVQ_SIZE * sizeof(efx_qword_t);
-       return falcon_alloc_special_buffer(efx, &channel->eventq, evq_size);
+       BUILD_BUG_ON(EFX_EVQ_SIZE < 512 || EFX_EVQ_SIZE > 32768 ||
+                    EFX_EVQ_SIZE & EFX_EVQ_MASK);
+       return falcon_alloc_special_buffer(efx, &channel->eventq,
+                                          EFX_EVQ_SIZE * sizeof(efx_qword_t));
 }
 
 void falcon_init_eventq(struct efx_channel *channel)
@@ -1118,11 +1108,11 @@ void falcon_init_eventq(struct efx_channel *channel)
 
        /* Push event queue to card */
        EFX_POPULATE_OWORD_3(evq_ptr,
-                            EVQ_EN, 1,
-                            EVQ_SIZE, FALCON_EVQ_ORDER,
-                            EVQ_BUF_BASE_ID, channel->eventq.index);
-       falcon_write_table(efx, &evq_ptr, efx->type->evq_ptr_tbl_base,
-                          channel->channel);
+                            FRF_AZ_EVQ_EN, 1,
+                            FRF_AZ_EVQ_SIZE, __ffs(channel->eventq.entries),
+                            FRF_AZ_EVQ_BUF_BASE_ID, channel->eventq.index);
+       efx_writeo_table(efx, &evq_ptr, efx->type->evq_ptr_tbl_base,
+                        channel->channel);
 
        falcon_set_int_moderation(channel);
 }
@@ -1134,8 +1124,8 @@ void falcon_fini_eventq(struct efx_channel *channel)
 
        /* Remove event queue from card */
        EFX_ZERO_OWORD(eventq_ptr);
-       falcon_write_table(efx, &eventq_ptr, efx->type->evq_ptr_tbl_base,
-                          channel->channel);
+       efx_writeo_table(efx, &eventq_ptr, efx->type->evq_ptr_tbl_base,
+                        channel->channel);
 
        /* Unpin event queue */
        falcon_fini_special_buffer(efx, &channel->eventq);
@@ -1156,9 +1146,9 @@ void falcon_generate_test_event(struct efx_channel *channel, unsigned int magic)
 {
        efx_qword_t test_event;
 
-       EFX_POPULATE_QWORD_2(test_event,
-                            EV_CODE, DRV_GEN_EV_DECODE,
-                            EVQ_MAGIC, magic);
+       EFX_POPULATE_QWORD_2(test_event, FSF_AZ_EV_CODE,
+                            FSE_AZ_EV_CODE_DRV_GEN_EV,
+                            FSF_AZ_DRV_GEN_EV_MAGIC, magic);
        falcon_generate_event(channel, &test_event);
 }
 
@@ -1166,11 +1156,12 @@ void falcon_sim_phy_event(struct efx_nic *efx)
 {
        efx_qword_t phy_event;
 
-       EFX_POPULATE_QWORD_1(phy_event, EV_CODE, GLOBAL_EV_DECODE);
+       EFX_POPULATE_QWORD_1(phy_event, FSF_AZ_EV_CODE,
+                            FSE_AZ_EV_CODE_GLOBAL_EV);
        if (EFX_IS10G(efx))
-               EFX_SET_OWORD_FIELD(phy_event, XG_PHY_INTR, 1);
+               EFX_SET_QWORD_FIELD(phy_event, FSF_AB_GLB_EV_XG_PHY0_INTR, 1);
        else
-               EFX_SET_OWORD_FIELD(phy_event, G_PHY0_INTR, 1);
+               EFX_SET_QWORD_FIELD(phy_event, FSF_AB_GLB_EV_G_PHY0_INTR, 1);
 
        falcon_generate_event(&efx->channel[0], &phy_event);
 }
@@ -1188,7 +1179,7 @@ static void falcon_poll_flush_events(struct efx_nic *efx)
        struct efx_tx_queue *tx_queue;
        struct efx_rx_queue *rx_queue;
        unsigned int read_ptr = channel->eventq_read_ptr;
-       unsigned int end_ptr = (read_ptr - 1) & FALCON_EVQ_MASK;
+       unsigned int end_ptr = (read_ptr - 1) & EFX_EVQ_MASK;
 
        do {
                efx_qword_t *event = falcon_event(channel, read_ptr);
@@ -1198,22 +1189,23 @@ static void falcon_poll_flush_events(struct efx_nic *efx)
                if (!falcon_event_present(event))
                        break;
 
-               ev_code = EFX_QWORD_FIELD(*event, EV_CODE);
-               ev_sub_code = EFX_QWORD_FIELD(*event, DRIVER_EV_SUB_CODE);
-               if (ev_code == DRIVER_EV_DECODE &&
-                   ev_sub_code == TX_DESCQ_FLS_DONE_EV_DECODE) {
+               ev_code = EFX_QWORD_FIELD(*event, FSF_AZ_EV_CODE);
+               ev_sub_code = EFX_QWORD_FIELD(*event,
+                                             FSF_AZ_DRIVER_EV_SUBCODE);
+               if (ev_code == FSE_AZ_EV_CODE_DRIVER_EV &&
+                   ev_sub_code == FSE_AZ_TX_DESCQ_FLS_DONE_EV) {
                        ev_queue = EFX_QWORD_FIELD(*event,
-                                                  DRIVER_EV_TX_DESCQ_ID);
+                                                  FSF_AZ_DRIVER_EV_SUBDATA);
                        if (ev_queue < EFX_TX_QUEUE_COUNT) {
                                tx_queue = efx->tx_queue + ev_queue;
                                tx_queue->flushed = true;
                        }
-               } else if (ev_code == DRIVER_EV_DECODE &&
-                          ev_sub_code == RX_DESCQ_FLS_DONE_EV_DECODE) {
-                       ev_queue = EFX_QWORD_FIELD(*event,
-                                                  DRIVER_EV_RX_DESCQ_ID);
-                       ev_failed = EFX_QWORD_FIELD(*event,
-                                                   DRIVER_EV_RX_FLUSH_FAIL);
+               } else if (ev_code == FSE_AZ_EV_CODE_DRIVER_EV &&
+                          ev_sub_code == FSE_AZ_RX_DESCQ_FLS_DONE_EV) {
+                       ev_queue = EFX_QWORD_FIELD(
+                               *event, FSF_AZ_DRIVER_EV_RX_DESCQ_ID);
+                       ev_failed = EFX_QWORD_FIELD(
+                               *event, FSF_AZ_DRIVER_EV_RX_FLUSH_FAIL);
                        if (ev_queue < efx->n_rx_queues) {
                                rx_queue = efx->rx_queue + ev_queue;
 
@@ -1225,7 +1217,7 @@ static void falcon_poll_flush_events(struct efx_nic *efx)
                        }
                }
 
-               read_ptr = (read_ptr + 1) & FALCON_EVQ_MASK;
+               read_ptr = (read_ptr + 1) & EFX_EVQ_MASK;
        } while (read_ptr != end_ptr);
 }
 
@@ -1303,9 +1295,9 @@ static inline void falcon_interrupts(struct efx_nic *efx, int enabled,
        efx_oword_t int_en_reg_ker;
 
        EFX_POPULATE_OWORD_2(int_en_reg_ker,
-                            KER_INT_KER, force,
-                            DRV_INT_EN_KER, enabled);
-       falcon_write(efx, &int_en_reg_ker, INT_EN_REG_KER);
+                            FRF_AZ_KER_INT_KER, force,
+                            FRF_AZ_DRV_INT_EN_KER, enabled);
+       efx_writeo(efx, &int_en_reg_ker, FR_AZ_INT_EN_KER);
 }
 
 void falcon_enable_interrupts(struct efx_nic *efx)
@@ -1318,9 +1310,10 @@ void falcon_enable_interrupts(struct efx_nic *efx)
 
        /* Program address */
        EFX_POPULATE_OWORD_2(int_adr_reg_ker,
-                            NORM_INT_VEC_DIS_KER, EFX_INT_MODE_USE_MSI(efx),
-                            INT_ADR_KER, efx->irq_status.dma_addr);
-       falcon_write(efx, &int_adr_reg_ker, INT_ADR_REG_KER);
+                            FRF_AZ_NORM_INT_VEC_DIS_KER,
+                            EFX_INT_MODE_USE_MSI(efx),
+                            FRF_AZ_INT_ADR_KER, efx->irq_status.dma_addr);
+       efx_writeo(efx, &int_adr_reg_ker, FR_AZ_INT_ADR_KER);
 
        /* Enable interrupts */
        falcon_interrupts(efx, 1, 0);
@@ -1360,9 +1353,9 @@ static inline void falcon_irq_ack_a1(struct efx_nic *efx)
 {
        efx_dword_t reg;
 
-       EFX_POPULATE_DWORD_1(reg, INT_ACK_DUMMY_DATA, 0xb7eb7e);
-       falcon_writel(efx, &reg, INT_ACK_REG_KER_A1);
-       falcon_readl(efx, &reg, WORK_AROUND_BROKEN_PCI_READS_REG_KER_A1);
+       EFX_POPULATE_DWORD_1(reg, FRF_AA_INT_ACK_KER_FIELD, 0xb7eb7e);
+       efx_writed(efx, &reg, FR_AA_INT_ACK_KER);
+       efx_readd(efx, &reg, FR_AA_WORK_AROUND_BROKEN_PCI_READS);
 }
 
 /* Process a fatal interrupt
@@ -1374,10 +1367,9 @@ static irqreturn_t falcon_fatal_interrupt(struct efx_nic *efx)
        efx_oword_t *int_ker = efx->irq_status.addr;
        efx_oword_t fatal_intr;
        int error, mem_perr;
-       static int n_int_errors;
 
-       falcon_read(efx, &fatal_intr, FATAL_INTR_REG_KER);
-       error = EFX_OWORD_FIELD(fatal_intr, INT_KER_ERROR);
+       efx_reado(efx, &fatal_intr, FR_AZ_FATAL_INTR_KER);
+       error = EFX_OWORD_FIELD(fatal_intr, FRF_AZ_FATAL_INTR);
 
        EFX_ERR(efx, "SYSTEM ERROR " EFX_OWORD_FMT " status "
                EFX_OWORD_FMT ": %s\n", EFX_OWORD_VAL(*int_ker),
@@ -1387,10 +1379,10 @@ static irqreturn_t falcon_fatal_interrupt(struct efx_nic *efx)
                goto out;
 
        /* If this is a memory parity error dump which blocks are offending */
-       mem_perr = EFX_OWORD_FIELD(fatal_intr, MEM_PERR_INT_KER);
+       mem_perr = EFX_OWORD_FIELD(fatal_intr, FRF_AZ_MEM_PERR_INT_KER);
        if (mem_perr) {
                efx_oword_t reg;
-               falcon_read(efx, &reg, MEM_STAT_REG_KER);
+               efx_reado(efx, &reg, FR_AZ_MEM_STAT);
                EFX_ERR(efx, "SYSTEM ERROR: memory parity error "
                        EFX_OWORD_FMT "\n", EFX_OWORD_VAL(reg));
        }
@@ -1401,7 +1393,14 @@ static irqreturn_t falcon_fatal_interrupt(struct efx_nic *efx)
                pci_clear_master(nic_data->pci_dev2);
        falcon_disable_interrupts(efx);
 
-       if (++n_int_errors < FALCON_MAX_INT_ERRORS) {
+       /* Count errors and reset or disable the NIC accordingly */
+       if (efx->int_error_count == 0 ||
+           time_after(jiffies, efx->int_error_expire)) {
+               efx->int_error_count = 0;
+               efx->int_error_expire =
+                       jiffies + FALCON_INT_ERROR_EXPIRE * HZ;
+       }
+       if (++efx->int_error_count < FALCON_MAX_INT_ERRORS) {
                EFX_ERR(efx, "SYSTEM ERROR - reset scheduled\n");
                efx_schedule_reset(efx, RESET_TYPE_INT_ERROR);
        } else {
@@ -1420,37 +1419,39 @@ static irqreturn_t falcon_legacy_interrupt_b0(int irq, void *dev_id)
 {
        struct efx_nic *efx = dev_id;
        efx_oword_t *int_ker = efx->irq_status.addr;
+       irqreturn_t result = IRQ_NONE;
        struct efx_channel *channel;
        efx_dword_t reg;
        u32 queues;
        int syserr;
 
        /* Read the ISR which also ACKs the interrupts */
-       falcon_readl(efx, &reg, INT_ISR0_B0);
+       efx_readd(efx, &reg, FR_BZ_INT_ISR0);
        queues = EFX_EXTRACT_DWORD(reg, 0, 31);
 
        /* Check to see if we have a serious error condition */
-       syserr = EFX_OWORD_FIELD(*int_ker, FATAL_INT);
+       syserr = EFX_OWORD_FIELD(*int_ker, FSF_AZ_NET_IVEC_FATAL_INT);
        if (unlikely(syserr))
                return falcon_fatal_interrupt(efx);
 
-       if (queues == 0)
-               return IRQ_NONE;
-
-       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));
-
        /* Schedule processing of any interrupting queues */
-       channel = &efx->channel[0];
-       while (queues) {
-               if (queues & 0x01)
+       efx_for_each_channel(channel, efx) {
+               if ((queues & 1) ||
+                   falcon_event_present(
+                           falcon_event(channel, channel->eventq_read_ptr))) {
                        efx_schedule_channel(channel);
-               channel++;
+                       result = IRQ_HANDLED;
+               }
                queues >>= 1;
        }
 
-       return IRQ_HANDLED;
+       if (result == IRQ_HANDLED) {
+               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));
+       }
+
+       return result;
 }
 
 
@@ -1475,7 +1476,7 @@ static irqreturn_t falcon_legacy_interrupt_a1(int irq, void *dev_id)
                  irq, raw_smp_processor_id(), EFX_OWORD_VAL(*int_ker));
 
        /* Check to see if we have a serious error condition */
-       syserr = EFX_OWORD_FIELD(*int_ker, FATAL_INT);
+       syserr = EFX_OWORD_FIELD(*int_ker, FSF_AZ_NET_IVEC_FATAL_INT);
        if (unlikely(syserr))
                return falcon_fatal_interrupt(efx);
 
@@ -1542,12 +1543,12 @@ static void falcon_setup_rss_indir_table(struct efx_nic *efx)
        if (falcon_rev(efx) < FALCON_REV_B0)
                return;
 
-       for (offset = RX_RSS_INDIR_TBL_B0;
-            offset < RX_RSS_INDIR_TBL_B0 + 0x800;
+       for (offset = FR_BZ_RX_INDIRECTION_TBL;
+            offset < FR_BZ_RX_INDIRECTION_TBL + 0x800;
             offset += 0x10) {
-               EFX_POPULATE_DWORD_1(dword, RX_RSS_INDIR_ENT_B0,
+               EFX_POPULATE_DWORD_1(dword, FRF_BZ_IT_QUEUE,
                                     i % efx->n_rx_queues);
-               falcon_writel(efx, &dword, offset);
+               efx_writed(efx, &dword, offset);
                i++;
        }
 }
@@ -1610,7 +1611,7 @@ void falcon_fini_interrupt(struct efx_nic *efx)
 
        /* ACK legacy interrupt */
        if (falcon_rev(efx) >= FALCON_REV_B0)
-               falcon_read(efx, &reg, INT_ISR0_B0);
+               efx_reado(efx, &reg, FR_BZ_INT_ISR0);
        else
                falcon_irq_ack_a1(efx);
 
@@ -1631,8 +1632,8 @@ void falcon_fini_interrupt(struct efx_nic *efx)
 static int falcon_spi_poll(struct efx_nic *efx)
 {
        efx_oword_t reg;
-       falcon_read(efx, &reg, EE_SPI_HCMD_REG_KER);
-       return EFX_OWORD_FIELD(reg, EE_SPI_HCMD_CMD_EN) ? -EBUSY : 0;
+       efx_reado(efx, &reg, FR_AB_EE_SPI_HCMD);
+       return EFX_OWORD_FIELD(reg, FRF_AB_EE_SPI_HCMD_CMD_EN) ? -EBUSY : 0;
 }
 
 /* Wait for SPI command completion */
@@ -1684,27 +1685,27 @@ int falcon_spi_cmd(const struct efx_spi_device *spi,
 
        /* Program address register, if we have an address */
        if (addressed) {
-               EFX_POPULATE_OWORD_1(reg, EE_SPI_HADR_ADR, address);
-               falcon_write(efx, &reg, EE_SPI_HADR_REG_KER);
+               EFX_POPULATE_OWORD_1(reg, FRF_AB_EE_SPI_HADR_ADR, address);
+               efx_writeo(efx, &reg, FR_AB_EE_SPI_HADR);
        }
 
        /* Program data register, if we have data */
        if (in != NULL) {
                memcpy(&reg, in, len);
-               falcon_write(efx, &reg, EE_SPI_HDATA_REG_KER);
+               efx_writeo(efx, &reg, FR_AB_EE_SPI_HDATA);
        }
 
        /* Issue read/write command */
        EFX_POPULATE_OWORD_7(reg,
-                            EE_SPI_HCMD_CMD_EN, 1,
-                            EE_SPI_HCMD_SF_SEL, spi->device_id,
-                            EE_SPI_HCMD_DABCNT, len,
-                            EE_SPI_HCMD_READ, reading,
-                            EE_SPI_HCMD_DUBCNT, 0,
-                            EE_SPI_HCMD_ADBCNT,
+                            FRF_AB_EE_SPI_HCMD_CMD_EN, 1,
+                            FRF_AB_EE_SPI_HCMD_SF_SEL, spi->device_id,
+                            FRF_AB_EE_SPI_HCMD_DABCNT, len,
+                            FRF_AB_EE_SPI_HCMD_READ, reading,
+                            FRF_AB_EE_SPI_HCMD_DUBCNT, 0,
+                            FRF_AB_EE_SPI_HCMD_ADBCNT,
                             (addressed ? spi->addr_len : 0),
-                            EE_SPI_HCMD_ENC, command);
-       falcon_write(efx, &reg, EE_SPI_HCMD_REG_KER);
+                            FRF_AB_EE_SPI_HCMD_ENC, command);
+       efx_writeo(efx, &reg, FR_AB_EE_SPI_HCMD);
 
        /* Wait for read/write to complete */
        rc = falcon_spi_wait(efx);
@@ -1713,7 +1714,7 @@ int falcon_spi_cmd(const struct efx_spi_device *spi,
 
        /* Read data */
        if (out != NULL) {
-               falcon_read(efx, &reg, EE_SPI_HDATA_REG_KER);
+               efx_reado(efx, &reg, FR_AB_EE_SPI_HDATA);
                memcpy(out, &reg, len);
        }
 
@@ -1854,21 +1855,22 @@ static int falcon_reset_macs(struct efx_nic *efx)
                 * macs, so instead use the internal MAC resets
                 */
                if (!EFX_IS10G(efx)) {
-                       EFX_POPULATE_OWORD_1(reg, GM_SW_RST, 1);
-                       falcon_write(efx, &reg, GM_CFG1_REG);
+                       EFX_POPULATE_OWORD_1(reg, FRF_AB_GM_SW_RST, 1);
+                       efx_writeo(efx, &reg, FR_AB_GM_CFG1);
                        udelay(1000);
 
-                       EFX_POPULATE_OWORD_1(reg, GM_SW_RST, 0);
-                       falcon_write(efx, &reg, GM_CFG1_REG);
+                       EFX_POPULATE_OWORD_1(reg, FRF_AB_GM_SW_RST, 0);
+                       efx_writeo(efx, &reg, FR_AB_GM_CFG1);
                        udelay(1000);
                        return 0;
                } else {
-                       EFX_POPULATE_OWORD_1(reg, XM_CORE_RST, 1);
-                       falcon_write(efx, &reg, XM_GLB_CFG_REG);
+                       EFX_POPULATE_OWORD_1(reg, FRF_AB_XM_CORE_RST, 1);
+                       efx_writeo(efx, &reg, FR_AB_XM_GLB_CFG);
 
                        for (count = 0; count < 10000; count++) {
-                               falcon_read(efx, &reg, XM_GLB_CFG_REG);
-                               if (EFX_OWORD_FIELD(reg, XM_CORE_RST) == 0)
+                               efx_reado(efx, &reg, FR_AB_XM_GLB_CFG);
+                               if (EFX_OWORD_FIELD(reg, FRF_AB_XM_CORE_RST) ==
+                                   0)
                                        return 0;
                                udelay(10);
                        }
@@ -1882,22 +1884,22 @@ static int falcon_reset_macs(struct efx_nic *efx)
         * the drain sequence with the statistics fetch */
        efx_stats_disable(efx);
 
-       falcon_read(efx, &reg, MAC0_CTRL_REG_KER);
-       EFX_SET_OWORD_FIELD(reg, TXFIFO_DRAIN_EN_B0, 1);
-       falcon_write(efx, &reg, MAC0_CTRL_REG_KER);
+       efx_reado(efx, &reg, FR_AB_MAC_CTRL);
+       EFX_SET_OWORD_FIELD(reg, FRF_BB_TXFIFO_DRAIN_EN, 1);
+       efx_writeo(efx, &reg, FR_AB_MAC_CTRL);
 
-       falcon_read(efx, &reg, GLB_CTL_REG_KER);
-       EFX_SET_OWORD_FIELD(reg, RST_XGTX, 1);
-       EFX_SET_OWORD_FIELD(reg, RST_XGRX, 1);
-       EFX_SET_OWORD_FIELD(reg, RST_EM, 1);
-       falcon_write(efx, &reg, GLB_CTL_REG_KER);
+       efx_reado(efx, &reg, FR_AB_GLB_CTL);
+       EFX_SET_OWORD_FIELD(reg, FRF_AB_RST_XGTX, 1);
+       EFX_SET_OWORD_FIELD(reg, FRF_AB_RST_XGRX, 1);
+       EFX_SET_OWORD_FIELD(reg, FRF_AB_RST_EM, 1);
+       efx_writeo(efx, &reg, FR_AB_GLB_CTL);
 
        count = 0;
        while (1) {
-               falcon_read(efx, &reg, GLB_CTL_REG_KER);
-               if (!EFX_OWORD_FIELD(reg, RST_XGTX) &&
-                   !EFX_OWORD_FIELD(reg, RST_XGRX) &&
-                   !EFX_OWORD_FIELD(reg, RST_EM)) {
+               efx_reado(efx, &reg, FR_AB_GLB_CTL);
+               if (!EFX_OWORD_FIELD(reg, FRF_AB_RST_XGTX) &&
+                   !EFX_OWORD_FIELD(reg, FRF_AB_RST_XGRX) &&
+                   !EFX_OWORD_FIELD(reg, FRF_AB_RST_EM)) {
                        EFX_LOG(efx, "Completed MAC reset after %d loops\n",
                                count);
                        break;
@@ -1928,9 +1930,9 @@ void falcon_drain_tx_fifo(struct efx_nic *efx)
            (efx->loopback_mode != LOOPBACK_NONE))
                return;
 
-       falcon_read(efx, &reg, MAC0_CTRL_REG_KER);
+       efx_reado(efx, &reg, FR_AB_MAC_CTRL);
        /* There is no point in draining more than once */
-       if (EFX_OWORD_FIELD(reg, TXFIFO_DRAIN_EN_B0))
+       if (EFX_OWORD_FIELD(reg, FRF_BB_TXFIFO_DRAIN_EN))
                return;
 
        falcon_reset_macs(efx);
@@ -1944,9 +1946,9 @@ void falcon_deconfigure_mac_wrapper(struct efx_nic *efx)
                return;
 
        /* Isolate the MAC -> RX */
-       falcon_read(efx, &reg, RX_CFG_REG_KER);
-       EFX_SET_OWORD_FIELD(reg, RX_INGR_EN_B0, 0);
-       falcon_write(efx, &reg, RX_CFG_REG_KER);
+       efx_reado(efx, &reg, FR_AZ_RX_CFG);
+       EFX_SET_OWORD_FIELD(reg, FRF_BZ_RX_INGR_EN, 0);
+       efx_writeo(efx, &reg, FR_AZ_RX_CFG);
 
        if (!efx->link_up)
                falcon_drain_tx_fifo(efx);
@@ -1969,19 +1971,19 @@ void falcon_reconfigure_mac_wrapper(struct efx_nic *efx)
         * indefinitely held and TX queue can be flushed at any point
         * while the link is down. */
        EFX_POPULATE_OWORD_5(reg,
-                            MAC_XOFF_VAL, 0xffff /* max pause time */,
-                            MAC_BCAD_ACPT, 1,
-                            MAC_UC_PROM, efx->promiscuous,
-                            MAC_LINK_STATUS, 1, /* always set */
-                            MAC_SPEED, link_speed);
+                            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_LINK_STATUS, 1, /* always set */
+                            FRF_AB_MAC_SPEED, link_speed);
        /* On B0, MAC backpressure can be disabled and packets get
         * discarded. */
        if (falcon_rev(efx) >= FALCON_REV_B0) {
-               EFX_SET_OWORD_FIELD(reg, TXFIFO_DRAIN_EN_B0,
+               EFX_SET_OWORD_FIELD(reg, FRF_BB_TXFIFO_DRAIN_EN,
                                    !efx->link_up);
        }
 
-       falcon_write(efx, &reg, MAC0_CTRL_REG_KER);
+       efx_writeo(efx, &reg, FR_AB_MAC_CTRL);
 
        /* Restore the multicast hash registers. */
        falcon_set_multicast_hash(efx);
@@ -1990,13 +1992,13 @@ void falcon_reconfigure_mac_wrapper(struct efx_nic *efx)
         * covered by RX_XOFF_MAC_EN and XM_TX_CFG_REG:XM_FCNTL.
         * Action on receipt of pause frames is controller by XM_DIS_FCNTL */
        tx_fc = !!(efx->link_fc & EFX_FC_TX);
-       falcon_read(efx, &reg, RX_CFG_REG_KER);
-       EFX_SET_OWORD_FIELD_VER(efx, reg, RX_XOFF_MAC_EN, tx_fc);
+       efx_reado(efx, &reg, FR_AZ_RX_CFG);
+       EFX_SET_OWORD_FIELD(reg, FRF_AZ_RX_XOFF_MAC_EN, tx_fc);
 
        /* Unisolate the MAC -> RX */
        if (falcon_rev(efx) >= FALCON_REV_B0)
-               EFX_SET_OWORD_FIELD(reg, RX_INGR_EN_B0, 1);
-       falcon_write(efx, &reg, RX_CFG_REG_KER);
+               EFX_SET_OWORD_FIELD(reg, FRF_BZ_RX_INGR_EN, 1);
+       efx_writeo(efx, &reg, FR_AZ_RX_CFG);
 }
 
 int falcon_dma_stats(struct efx_nic *efx, unsigned int done_offset)
@@ -2011,8 +2013,8 @@ int falcon_dma_stats(struct efx_nic *efx, unsigned int done_offset)
        /* Statistics fetch will fail if the MAC is in TX drain */
        if (falcon_rev(efx) >= FALCON_REV_B0) {
                efx_oword_t temp;
-               falcon_read(efx, &temp, MAC0_CTRL_REG_KER);
-               if (EFX_OWORD_FIELD(temp, TXFIFO_DRAIN_EN_B0))
+               efx_reado(efx, &temp, FR_AB_MAC_CTRL);
+               if (EFX_OWORD_FIELD(temp, FRF_BB_TXFIFO_DRAIN_EN))
                        return 0;
        }
 
@@ -2022,10 +2024,10 @@ int falcon_dma_stats(struct efx_nic *efx, unsigned int done_offset)
 
        /* Initiate DMA transfer of stats */
        EFX_POPULATE_OWORD_2(reg,
-                            MAC_STAT_DMA_CMD, 1,
-                            MAC_STAT_DMA_ADR,
+                            FRF_AB_MAC_STAT_DMA_CMD, 1,
+                            FRF_AB_MAC_STAT_DMA_ADR,
                             efx->stats_buffer.dma_addr);
-       falcon_write(efx, &reg, MAC0_STAT_DMA_REG_KER);
+       efx_writeo(efx, &reg, FR_AB_MAC_STAT_DMA);
 
        /* Wait for transfer to complete */
        for (i = 0; i < 400; i++) {
@@ -2047,26 +2049,6 @@ int falcon_dma_stats(struct efx_nic *efx, unsigned int done_offset)
  **************************************************************************
  */
 
-/* Use the top bit of the MII PHY id to indicate the PHY type
- * (1G/10G), with the remaining bits as the actual PHY id.
- *
- * This allows us to avoid leaking information from the mii_if_info
- * structure into other data structures.
- */
-#define FALCON_PHY_ID_ID_WIDTH  EFX_WIDTH(MD_PRT_DEV_ADR)
-#define FALCON_PHY_ID_ID_MASK   ((1 << FALCON_PHY_ID_ID_WIDTH) - 1)
-#define FALCON_PHY_ID_WIDTH     (FALCON_PHY_ID_ID_WIDTH + 1)
-#define FALCON_PHY_ID_MASK      ((1 << FALCON_PHY_ID_WIDTH) - 1)
-#define FALCON_PHY_ID_10G       (1 << (FALCON_PHY_ID_WIDTH - 1))
-
-
-/* Packing the clause 45 port and device fields into a single value */
-#define MD_PRT_ADR_COMP_LBN   (MD_PRT_ADR_LBN - MD_DEV_ADR_LBN)
-#define MD_PRT_ADR_COMP_WIDTH  MD_PRT_ADR_WIDTH
-#define MD_DEV_ADR_COMP_LBN    0
-#define MD_DEV_ADR_COMP_WIDTH  MD_DEV_ADR_WIDTH
-
-
 /* Wait for GMII access to complete */
 static int falcon_gmii_wait(struct efx_nic *efx)
 {
@@ -2075,10 +2057,10 @@ static int falcon_gmii_wait(struct efx_nic *efx)
 
        /* wait upto 50ms - taken max from datasheet */
        for (count = 0; count < 5000; count++) {
-               falcon_readl(efx, &md_stat, MD_STAT_REG_KER);
-               if (EFX_DWORD_FIELD(md_stat, MD_BSY) == 0) {
-                       if (EFX_DWORD_FIELD(md_stat, MD_LNFL) != 0 ||
-                           EFX_DWORD_FIELD(md_stat, MD_BSERR) != 0) {
+               efx_readd(efx, &md_stat, FR_AB_MD_STAT);
+               if (EFX_DWORD_FIELD(md_stat, FRF_AB_MD_BSY) == 0) {
+                       if (EFX_DWORD_FIELD(md_stat, FRF_AB_MD_LNFL) != 0 ||
+                           EFX_DWORD_FIELD(md_stat, FRF_AB_MD_BSERR) != 0) {
                                EFX_ERR(efx, "error from GMII access "
                                        EFX_DWORD_FMT"\n",
                                        EFX_DWORD_VAL(md_stat));
@@ -2092,178 +2074,104 @@ static int falcon_gmii_wait(struct efx_nic *efx)
        return -ETIMEDOUT;
 }
 
-/* Writes a GMII register of a PHY connected to Falcon using MDIO. */
-static void falcon_mdio_write(struct net_device *net_dev, int phy_id,
-                             int addr, int value)
+/* Write an MDIO register of a PHY connected to Falcon. */
+static int falcon_mdio_write(struct net_device *net_dev,
+                            int prtad, int devad, u16 addr, u16 value)
 {
        struct efx_nic *efx = netdev_priv(net_dev);
-       unsigned int phy_id2 = phy_id & FALCON_PHY_ID_ID_MASK;
        efx_oword_t reg;
+       int rc;
 
-       /* The 'generic' prt/dev packing in mdio_10g.h is conveniently
-        * chosen so that the only current user, Falcon, can take the
-        * packed value and use them directly.
-        * Fail to build if this assumption is broken.
-        */
-       BUILD_BUG_ON(FALCON_PHY_ID_10G != MDIO45_XPRT_ID_IS10G);
-       BUILD_BUG_ON(FALCON_PHY_ID_ID_WIDTH != MDIO45_PRT_DEV_WIDTH);
-       BUILD_BUG_ON(MD_PRT_ADR_COMP_LBN != MDIO45_PRT_ID_COMP_LBN);
-       BUILD_BUG_ON(MD_DEV_ADR_COMP_LBN != MDIO45_DEV_ID_COMP_LBN);
-
-       if (phy_id2 == PHY_ADDR_INVALID)
-               return;
-
-       /* See falcon_mdio_read for an explanation. */
-       if (!(phy_id & FALCON_PHY_ID_10G)) {
-               int mmd = ffs(efx->phy_op->mmds) - 1;
-               EFX_TRACE(efx, "Fixing erroneous clause22 write\n");
-               phy_id2 = mdio_clause45_pack(phy_id2, mmd)
-                       & FALCON_PHY_ID_ID_MASK;
-       }
-
-       EFX_REGDUMP(efx, "writing GMII %d register %02x with %04x\n", phy_id,
-                   addr, value);
+       EFX_REGDUMP(efx, "writing MDIO %d register %d.%d with 0x%04x\n",
+                   prtad, devad, addr, value);
 
        spin_lock_bh(&efx->phy_lock);
 
-       /* Check MII not currently being accessed */
-       if (falcon_gmii_wait(efx) != 0)
+       /* Check MDIO not currently being accessed */
+       rc = falcon_gmii_wait(efx);
+       if (rc)
                goto out;
 
        /* Write the address/ID register */
-       EFX_POPULATE_OWORD_1(reg, MD_PHY_ADR, addr);
-       falcon_write(efx, &reg, MD_PHY_ADR_REG_KER);
+       EFX_POPULATE_OWORD_1(reg, FRF_AB_MD_PHY_ADR, addr);
+       efx_writeo(efx, &reg, FR_AB_MD_PHY_ADR);
 
-       EFX_POPULATE_OWORD_1(reg, MD_PRT_DEV_ADR, phy_id2);
-       falcon_write(efx, &reg, MD_ID_REG_KER);
+       EFX_POPULATE_OWORD_2(reg, FRF_AB_MD_PRT_ADR, prtad,
+                            FRF_AB_MD_DEV_ADR, devad);
+       efx_writeo(efx, &reg, FR_AB_MD_ID);
 
        /* Write data */
-       EFX_POPULATE_OWORD_1(reg, MD_TXD, value);
-       falcon_write(efx, &reg, MD_TXD_REG_KER);
+       EFX_POPULATE_OWORD_1(reg, FRF_AB_MD_TXD, value);
+       efx_writeo(efx, &reg, FR_AB_MD_TXD);
 
        EFX_POPULATE_OWORD_2(reg,
-                            MD_WRC, 1,
-                            MD_GC, 0);
-       falcon_write(efx, &reg, MD_CS_REG_KER);
+                            FRF_AB_MD_WRC, 1,
+                            FRF_AB_MD_GC, 0);
+       efx_writeo(efx, &reg, FR_AB_MD_CS);
 
        /* Wait for data to be written */
-       if (falcon_gmii_wait(efx) != 0) {
+       rc = falcon_gmii_wait(efx);
+       if (rc) {
                /* Abort the write operation */
                EFX_POPULATE_OWORD_2(reg,
-                                    MD_WRC, 0,
-                                    MD_GC, 1);
-               falcon_write(efx, &reg, MD_CS_REG_KER);
+                                    FRF_AB_MD_WRC, 0,
+                                    FRF_AB_MD_GC, 1);
+               efx_writeo(efx, &reg, FR_AB_MD_CS);
                udelay(10);
        }
 
  out:
        spin_unlock_bh(&efx->phy_lock);
+       return rc;
 }
 
-/* Reads a GMII register from a PHY connected to Falcon.  If no value
- * could be read, -1 will be returned. */
-static int falcon_mdio_read(struct net_device *net_dev, int phy_id, int addr)
+/* Read an MDIO register of a PHY connected to Falcon. */
+static int falcon_mdio_read(struct net_device *net_dev,
+                           int prtad, int devad, u16 addr)
 {
        struct efx_nic *efx = netdev_priv(net_dev);
-       unsigned int phy_addr = phy_id & FALCON_PHY_ID_ID_MASK;
        efx_oword_t reg;
-       int value = -1;
-
-       if (phy_addr == PHY_ADDR_INVALID)
-               return -1;
-
-       /* Our PHY code knows whether it needs to talk clause 22(1G) or 45(10G)
-        * but the generic Linux code does not make any distinction or have
-        * any state for this.
-        * We spot the case where someone tried to talk 22 to a 45 PHY and
-        * redirect the request to the lowest numbered MMD as a clause45
-        * request. This is enough to allow simple queries like id and link
-        * state to succeed. TODO: We may need to do more in future.
-        */
-       if (!(phy_id & FALCON_PHY_ID_10G)) {
-               int mmd = ffs(efx->phy_op->mmds) - 1;
-               EFX_TRACE(efx, "Fixing erroneous clause22 read\n");
-               phy_addr = mdio_clause45_pack(phy_addr, mmd)
-                       & FALCON_PHY_ID_ID_MASK;
-       }
+       int rc;
 
        spin_lock_bh(&efx->phy_lock);
 
-       /* Check MII not currently being accessed */
-       if (falcon_gmii_wait(efx) != 0)
+       /* Check MDIO not currently being accessed */
+       rc = falcon_gmii_wait(efx);
+       if (rc)
                goto out;
 
-       EFX_POPULATE_OWORD_1(reg, MD_PHY_ADR, addr);
-       falcon_write(efx, &reg, MD_PHY_ADR_REG_KER);
+       EFX_POPULATE_OWORD_1(reg, FRF_AB_MD_PHY_ADR, addr);
+       efx_writeo(efx, &reg, FR_AB_MD_PHY_ADR);
 
-       EFX_POPULATE_OWORD_1(reg, MD_PRT_DEV_ADR, phy_addr);
-       falcon_write(efx, &reg, MD_ID_REG_KER);
+       EFX_POPULATE_OWORD_2(reg, FRF_AB_MD_PRT_ADR, prtad,
+                            FRF_AB_MD_DEV_ADR, devad);
+       efx_writeo(efx, &reg, FR_AB_MD_ID);
 
        /* Request data to be read */
-       EFX_POPULATE_OWORD_2(reg, MD_RDC, 1, MD_GC, 0);
-       falcon_write(efx, &reg, MD_CS_REG_KER);
+       EFX_POPULATE_OWORD_2(reg, FRF_AB_MD_RDC, 1, FRF_AB_MD_GC, 0);
+       efx_writeo(efx, &reg, FR_AB_MD_CS);
 
        /* Wait for data to become available */
-       value = falcon_gmii_wait(efx);
-       if (value == 0) {
-               falcon_read(efx, &reg, MD_RXD_REG_KER);
-               value = EFX_OWORD_FIELD(reg, MD_RXD);
-               EFX_REGDUMP(efx, "read from GMII %d register %02x, got %04x\n",
-                           phy_id, addr, value);
+       rc = falcon_gmii_wait(efx);
+       if (rc == 0) {
+               efx_reado(efx, &reg, FR_AB_MD_RXD);
+               rc = EFX_OWORD_FIELD(reg, FRF_AB_MD_RXD);
+               EFX_REGDUMP(efx, "read from MDIO %d register %d.%d, got %04x\n",
+                           prtad, devad, addr, rc);
        } else {
                /* Abort the read operation */
                EFX_POPULATE_OWORD_2(reg,
-                                    MD_RIC, 0,
-                                    MD_GC, 1);
-               falcon_write(efx, &reg, MD_CS_REG_KER);
+                                    FRF_AB_MD_RIC, 0,
+                                    FRF_AB_MD_GC, 1);
+               efx_writeo(efx, &reg, FR_AB_MD_CS);
 
-               EFX_LOG(efx, "read from GMII 0x%x register %02x, got "
-                       "error %d\n", phy_id, addr, value);
+               EFX_LOG(efx, "read from MDIO %d register %d.%d, got error %d\n",
+                       prtad, devad, addr, rc);
        }
 
  out:
        spin_unlock_bh(&efx->phy_lock);
-
-       return value;
-}
-
-static void falcon_init_mdio(struct mii_if_info *gmii)
-{
-       gmii->mdio_read = falcon_mdio_read;
-       gmii->mdio_write = falcon_mdio_write;
-       gmii->phy_id_mask = FALCON_PHY_ID_MASK;
-       gmii->reg_num_mask = ((1 << EFX_WIDTH(MD_PHY_ADR)) - 1);
-}
-
-static int falcon_probe_phy(struct efx_nic *efx)
-{
-       switch (efx->phy_type) {
-       case PHY_TYPE_SFX7101:
-               efx->phy_op = &falcon_sfx7101_phy_ops;
-               break;
-       case PHY_TYPE_SFT9001A:
-       case PHY_TYPE_SFT9001B:
-               efx->phy_op = &falcon_sft9001_phy_ops;
-               break;
-       case PHY_TYPE_QT2022C2:
-       case PHY_TYPE_QT2025C:
-               efx->phy_op = &falcon_xfp_phy_ops;
-               break;
-       default:
-               EFX_ERR(efx, "Unknown PHY type %d\n",
-                       efx->phy_type);
-               return -1;
-       }
-
-       if (efx->phy_op->macs & EFX_XMAC)
-               efx->loopback_modes |= ((1 << LOOPBACK_XGMII) |
-                                       (1 << LOOPBACK_XGXS) |
-                                       (1 << LOOPBACK_XAUI));
-       if (efx->phy_op->macs & EFX_GMAC)
-               efx->loopback_modes |= (1 << LOOPBACK_GMAC);
-       efx->loopback_modes |= efx->phy_op->loopbacks;
-
-       return 0;
+       return rc;
 }
 
 int falcon_switch_mac(struct efx_nic *efx)
@@ -2291,16 +2199,17 @@ int falcon_switch_mac(struct efx_nic *efx)
 
        /* Always push the NIC_STAT_REG setting even if the mac hasn't
         * changed, because this function is run post online reset */
-       falcon_read(efx, &nic_stat, NIC_STAT_REG);
+       efx_reado(efx, &nic_stat, FR_AB_NIC_STAT);
        strap_val = EFX_IS10G(efx) ? 5 : 3;
        if (falcon_rev(efx) >= FALCON_REV_B0) {
-               EFX_SET_OWORD_FIELD(nic_stat, EE_STRAP_EN, 1);
-               EFX_SET_OWORD_FIELD(nic_stat, EE_STRAP_OVR, strap_val);
-               falcon_write(efx, &nic_stat, NIC_STAT_REG);
+               EFX_SET_OWORD_FIELD(nic_stat, FRF_BB_EE_STRAP_EN, 1);
+               EFX_SET_OWORD_FIELD(nic_stat, FRF_BB_EE_STRAP, strap_val);
+               efx_writeo(efx, &nic_stat, FR_AB_NIC_STAT);
        } else {
                /* Falcon A1 does not support 1G/10G speed switching
                 * and must not be used with a PHY that does. */
-               BUG_ON(EFX_OWORD_FIELD(nic_stat, STRAP_PINS) != strap_val);
+               BUG_ON(EFX_OWORD_FIELD(nic_stat, FRF_AB_STRAP_PINS) !=
+                      strap_val);
        }
 
        if (old_mac_op == efx->mac_op)
@@ -2321,14 +2230,37 @@ int falcon_probe_port(struct efx_nic *efx)
 {
        int rc;
 
-       /* Hook in PHY operations table */
-       rc = falcon_probe_phy(efx);
-       if (rc)
-               return rc;
+       switch (efx->phy_type) {
+       case PHY_TYPE_SFX7101:
+               efx->phy_op = &falcon_sfx7101_phy_ops;
+               break;
+       case PHY_TYPE_SFT9001A:
+       case PHY_TYPE_SFT9001B:
+               efx->phy_op = &falcon_sft9001_phy_ops;
+               break;
+       case PHY_TYPE_QT2022C2:
+       case PHY_TYPE_QT2025C:
+               efx->phy_op = &falcon_qt202x_phy_ops;
+               break;
+       default:
+               EFX_ERR(efx, "Unknown PHY type %d\n",
+                       efx->phy_type);
+               return -ENODEV;
+       }
+
+       if (efx->phy_op->macs & EFX_XMAC)
+               efx->loopback_modes |= ((1 << LOOPBACK_XGMII) |
+                                       (1 << LOOPBACK_XGXS) |
+                                       (1 << LOOPBACK_XAUI));
+       if (efx->phy_op->macs & EFX_GMAC)
+               efx->loopback_modes |= (1 << LOOPBACK_GMAC);
+       efx->loopback_modes |= efx->phy_op->loopbacks;
 
-       /* Set up GMII structure for PHY */
-       efx->mii.supports_gmii = true;
-       falcon_init_mdio(&efx->mii);
+       /* Set up MDIO structure for PHY */
+       efx->mdio.mmds = efx->phy_op->mmds;
+       efx->mdio.mode_support = MDIO_SUPPORTS_C45 | MDIO_EMULATE_C22;
+       efx->mdio.mdio_read = falcon_mdio_read;
+       efx->mdio.mdio_write = falcon_mdio_write;
 
        /* Hardware flow ctrl. FalconA RX FIFO too small for pause generation */
        if (falcon_rev(efx) >= FALCON_REV_B0)
@@ -2341,10 +2273,10 @@ int falcon_probe_port(struct efx_nic *efx)
                                 FALCON_MAC_STATS_SIZE);
        if (rc)
                return rc;
-       EFX_LOG(efx, "stats buffer at %llx (virt %p phys %lx)\n",
-               (unsigned long long)efx->stats_buffer.dma_addr,
+       EFX_LOG(efx, "stats buffer at %llx (virt %p phys %llx)\n",
+               (u64)efx->stats_buffer.dma_addr,
                efx->stats_buffer.addr,
-               virt_to_phys(efx->stats_buffer.addr));
+               (u64)virt_to_phys(efx->stats_buffer.addr));
 
        return 0;
 }
@@ -2371,8 +2303,8 @@ void falcon_set_multicast_hash(struct efx_nic *efx)
         */
        set_bit_le(0xff, mc_hash->byte);
 
-       falcon_write(efx, &mc_hash->oword[0], MAC_MCAST_HASH_REG0_KER);
-       falcon_write(efx, &mc_hash->oword[1], MAC_MCAST_HASH_REG1_KER);
+       efx_writeo(efx, &mc_hash->oword[0], FR_AB_MAC_MC_HASH_REG0);
+       efx_writeo(efx, &mc_hash->oword[1], FR_AB_MAC_MC_HASH_REG1);
 }
 
 
@@ -2398,7 +2330,7 @@ int falcon_read_nvram(struct efx_nic *efx, struct falcon_nvconfig *nvconfig_out)
        region = kmalloc(FALCON_NVCONFIG_END, GFP_KERNEL);
        if (!region)
                return -ENOMEM;
-       nvconfig = region + NVCONFIG_OFFSET;
+       nvconfig = region + FALCON_NVCONFIG_OFFSET;
 
        mutex_lock(&efx->spi_lock);
        rc = falcon_spi_read(spi, 0, FALCON_NVCONFIG_END, NULL, region);
@@ -2414,7 +2346,7 @@ int falcon_read_nvram(struct efx_nic *efx, struct falcon_nvconfig *nvconfig_out)
        struct_ver = le16_to_cpu(nvconfig->board_struct_ver);
 
        rc = -EINVAL;
-       if (magic_num != NVCONFIG_BOARD_MAGIC_NUM) {
+       if (magic_num != FALCON_NVCONFIG_BOARD_MAGIC_NUM) {
                EFX_ERR(efx, "NVRAM bad magic 0x%x\n", magic_num);
                goto out;
        }
@@ -2450,41 +2382,41 @@ static struct {
        unsigned address;
        efx_oword_t mask;
 } efx_test_registers[] = {
-       { ADR_REGION_REG_KER,
+       { FR_AZ_ADR_REGION,
          EFX_OWORD32(0x0001FFFF, 0x0001FFFF, 0x0001FFFF, 0x0001FFFF) },
-       { RX_CFG_REG_KER,
+       { FR_AZ_RX_CFG,
          EFX_OWORD32(0xFFFFFFFE, 0x00017FFF, 0x00000000, 0x00000000) },
-       { TX_CFG_REG_KER,
+       { FR_AZ_TX_CFG,
          EFX_OWORD32(0x7FFF0037, 0x00000000, 0x00000000, 0x00000000) },
-       { TX_CFG2_REG_KER,
+       { FR_AZ_TX_RESERVED,
          EFX_OWORD32(0xFFFEFE80, 0x1FFFFFFF, 0x020000FE, 0x007FFFFF) },
-       { MAC0_CTRL_REG_KER,
+       { FR_AB_MAC_CTRL,
          EFX_OWORD32(0xFFFF0000, 0x00000000, 0x00000000, 0x00000000) },
-       { SRM_TX_DC_CFG_REG_KER,
+       { FR_AZ_SRM_TX_DC_CFG,
          EFX_OWORD32(0x001FFFFF, 0x00000000, 0x00000000, 0x00000000) },
-       { RX_DC_CFG_REG_KER,
+       { FR_AZ_RX_DC_CFG,
          EFX_OWORD32(0x0000000F, 0x00000000, 0x00000000, 0x00000000) },
-       { RX_DC_PF_WM_REG_KER,
+       { FR_AZ_RX_DC_PF_WM,
          EFX_OWORD32(0x000003FF, 0x00000000, 0x00000000, 0x00000000) },
-       { DP_CTRL_REG,
+       { FR_BZ_DP_CTRL,
          EFX_OWORD32(0x00000FFF, 0x00000000, 0x00000000, 0x00000000) },
-       { GM_CFG2_REG,
+       { FR_AB_GM_CFG2,
          EFX_OWORD32(0x00007337, 0x00000000, 0x00000000, 0x00000000) },
-       { GMF_CFG0_REG,
+       { FR_AB_GMF_CFG0,
          EFX_OWORD32(0x00001F1F, 0x00000000, 0x00000000, 0x00000000) },
-       { XM_GLB_CFG_REG,
+       { FR_AB_XM_GLB_CFG,
          EFX_OWORD32(0x00000C68, 0x00000000, 0x00000000, 0x00000000) },
-       { XM_TX_CFG_REG,
+       { FR_AB_XM_TX_CFG,
          EFX_OWORD32(0x00080164, 0x00000000, 0x00000000, 0x00000000) },
-       { XM_RX_CFG_REG,
+       { FR_AB_XM_RX_CFG,
          EFX_OWORD32(0x07100A0C, 0x00000000, 0x00000000, 0x00000000) },
-       { XM_RX_PARAM_REG,
+       { FR_AB_XM_RX_PARAM,
          EFX_OWORD32(0x00001FF8, 0x00000000, 0x00000000, 0x00000000) },
-       { XM_FC_REG,
+       { FR_AB_XM_FC,
          EFX_OWORD32(0xFFFF0001, 0x00000000, 0x00000000, 0x00000000) },
-       { XM_ADR_LO_REG,
+       { FR_AB_XM_ADR_LO,
          EFX_OWORD32(0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000) },
-       { XX_SD_CTL_REG,
+       { FR_AB_XX_SD_CTL,
          EFX_OWORD32(0x0003FF0F, 0x00000000, 0x00000000, 0x00000000) },
 };
 
@@ -2508,7 +2440,7 @@ int falcon_test_registers(struct efx_nic *efx)
                mask = imask = efx_test_registers[i].mask;
                EFX_INVERT_OWORD(imask);
 
-               falcon_read(efx, &original, address);
+               efx_reado(efx, &original, address);
 
                /* bit sweep on and off */
                for (j = 0; j < 128; j++) {
@@ -2519,8 +2451,8 @@ int falcon_test_registers(struct efx_nic *efx)
                        EFX_AND_OWORD(reg, original, mask);
                        EFX_SET_OWORD32(reg, j, j, 1);
 
-                       falcon_write(efx, &reg, address);
-                       falcon_read(efx, &buf, address);
+                       efx_writeo(efx, &reg, address);
+                       efx_reado(efx, &buf, address);
 
                        if (efx_masked_compare_oword(&reg, &buf, &mask))
                                goto fail;
@@ -2529,14 +2461,14 @@ int falcon_test_registers(struct efx_nic *efx)
                        EFX_OR_OWORD(reg, original, mask);
                        EFX_SET_OWORD32(reg, j, j, 0);
 
-                       falcon_write(efx, &reg, address);
-                       falcon_read(efx, &buf, address);
+                       efx_writeo(efx, &reg, address);
+                       efx_reado(efx, &buf, address);
 
                        if (efx_masked_compare_oword(&reg, &buf, &mask))
                                goto fail;
                }
 
-               falcon_write(efx, &original, address);
+               efx_writeo(efx, &original, address);
        }
 
        return 0;
@@ -2584,22 +2516,24 @@ int falcon_reset_hw(struct efx_nic *efx, enum reset_type method)
                }
 
                EFX_POPULATE_OWORD_2(glb_ctl_reg_ker,
-                                    EXT_PHY_RST_DUR, 0x7,
-                                    SWRST, 1);
+                                    FRF_AB_EXT_PHY_RST_DUR,
+                                    FFE_AB_EXT_PHY_RST_DUR_10240US,
+                                    FRF_AB_SWRST, 1);
        } else {
-               int reset_phy = (method == RESET_TYPE_INVISIBLE ?
-                                EXCLUDE_FROM_RESET : 0);
-
                EFX_POPULATE_OWORD_7(glb_ctl_reg_ker,
-                                    EXT_PHY_RST_CTL, reset_phy,
-                                    PCIE_CORE_RST_CTL, EXCLUDE_FROM_RESET,
-                                    PCIE_NSTCK_RST_CTL, EXCLUDE_FROM_RESET,
-                                    PCIE_SD_RST_CTL, EXCLUDE_FROM_RESET,
-                                    EE_RST_CTL, EXCLUDE_FROM_RESET,
-                                    EXT_PHY_RST_DUR, 0x7 /* 10ms */,
-                                    SWRST, 1);
-       }
-       falcon_write(efx, &glb_ctl_reg_ker, GLB_CTL_REG_KER);
+                                    /* exclude PHY from "invisible" reset */
+                                    FRF_AB_EXT_PHY_RST_CTL,
+                                    method == RESET_TYPE_INVISIBLE,
+                                    /* exclude EEPROM/flash and PCIe */
+                                    FRF_AB_PCIE_CORE_RST_CTL, 1,
+                                    FRF_AB_PCIE_NSTKY_RST_CTL, 1,
+                                    FRF_AB_PCIE_SD_RST_CTL, 1,
+                                    FRF_AB_EE_RST_CTL, 1,
+                                    FRF_AB_EXT_PHY_RST_DUR,
+                                    FFE_AB_EXT_PHY_RST_DUR_10240US,
+                                    FRF_AB_SWRST, 1);
+       }
+       efx_writeo(efx, &glb_ctl_reg_ker, FR_AB_GLB_CTL);
 
        EFX_LOG(efx, "waiting for hardware reset\n");
        schedule_timeout_uninterruptible(HZ / 20);
@@ -2624,8 +2558,8 @@ int falcon_reset_hw(struct efx_nic *efx, enum reset_type method)
        }
 
        /* Assert that reset complete */
-       falcon_read(efx, &glb_ctl_reg_ker, GLB_CTL_REG_KER);
-       if (EFX_OWORD_FIELD(glb_ctl_reg_ker, SWRST) != 0) {
+       efx_reado(efx, &glb_ctl_reg_ker, FR_AB_GLB_CTL);
+       if (EFX_OWORD_FIELD(glb_ctl_reg_ker, FRF_AB_SWRST) != 0) {
                rc = -ETIMEDOUT;
                EFX_ERR(efx, "timed out waiting for hardware reset\n");
                goto fail5;
@@ -2653,16 +2587,16 @@ static int falcon_reset_sram(struct efx_nic *efx)
        int count;
 
        /* Set the SRAM wake/sleep GPIO appropriately. */
-       falcon_read(efx, &gpio_cfg_reg_ker, GPIO_CTL_REG_KER);
-       EFX_SET_OWORD_FIELD(gpio_cfg_reg_ker, GPIO1_OEN, 1);
-       EFX_SET_OWORD_FIELD(gpio_cfg_reg_ker, GPIO1_OUT, 1);
-       falcon_write(efx, &gpio_cfg_reg_ker, GPIO_CTL_REG_KER);
+       efx_reado(efx, &gpio_cfg_reg_ker, FR_AB_GPIO_CTL);
+       EFX_SET_OWORD_FIELD(gpio_cfg_reg_ker, FRF_AB_GPIO1_OEN, 1);
+       EFX_SET_OWORD_FIELD(gpio_cfg_reg_ker, FRF_AB_GPIO1_OUT, 1);
+       efx_writeo(efx, &gpio_cfg_reg_ker, FR_AB_GPIO_CTL);
 
        /* Initiate SRAM reset */
        EFX_POPULATE_OWORD_2(srm_cfg_reg_ker,
-                            SRAM_OOB_BT_INIT_EN, 1,
-                            SRM_NUM_BANKS_AND_BANK_SIZE, 0);
-       falcon_write(efx, &srm_cfg_reg_ker, SRM_CFG_REG_KER);
+                            FRF_AZ_SRM_INIT_EN, 1,
+                            FRF_AZ_SRM_NB_SZ, 0);
+       efx_writeo(efx, &srm_cfg_reg_ker, FR_AZ_SRM_CFG);
 
        /* Wait for SRAM reset to complete */
        count = 0;
@@ -2673,8 +2607,8 @@ static int falcon_reset_sram(struct efx_nic *efx)
                schedule_timeout_uninterruptible(HZ / 50);
 
                /* Check for reset complete */
-               falcon_read(efx, &srm_cfg_reg_ker, SRM_CFG_REG_KER);
-               if (!EFX_OWORD_FIELD(srm_cfg_reg_ker, SRAM_OOB_BT_INIT_EN)) {
+               efx_reado(efx, &srm_cfg_reg_ker, FR_AZ_SRM_CFG);
+               if (!EFX_OWORD_FIELD(srm_cfg_reg_ker, FRF_AZ_SRM_INIT_EN)) {
                        EFX_LOG(efx, "SRAM reset complete\n");
 
                        return 0;
@@ -2745,7 +2679,7 @@ static int falcon_probe_nvconfig(struct efx_nic *efx)
        if (rc == -EINVAL) {
                EFX_ERR(efx, "NVRAM is invalid therefore using defaults\n");
                efx->phy_type = PHY_TYPE_NONE;
-               efx->mii.phy_id = PHY_ADDR_INVALID;
+               efx->mdio.prtad = MDIO_PRTAD_NONE;
                board_rev = 0;
                rc = 0;
        } else if (rc) {
@@ -2755,20 +2689,20 @@ static int falcon_probe_nvconfig(struct efx_nic *efx)
                struct falcon_nvconfig_board_v3 *v3 = &nvconfig->board_v3;
 
                efx->phy_type = v2->port0_phy_type;
-               efx->mii.phy_id = v2->port0_phy_addr;
+               efx->mdio.prtad = v2->port0_phy_addr;
                board_rev = le16_to_cpu(v2->board_revision);
 
                if (le16_to_cpu(nvconfig->board_struct_ver) >= 3) {
-                       __le32 fl = v3->spi_device_type[EE_SPI_FLASH];
-                       __le32 ee = v3->spi_device_type[EE_SPI_EEPROM];
-                       rc = falcon_spi_device_init(efx, &efx->spi_flash,
-                                                   EE_SPI_FLASH,
-                                                   le32_to_cpu(fl));
+                       rc = falcon_spi_device_init(
+                               efx, &efx->spi_flash, FFE_AB_SPI_DEVICE_FLASH,
+                               le32_to_cpu(v3->spi_device_type
+                                           [FFE_AB_SPI_DEVICE_FLASH]));
                        if (rc)
                                goto fail2;
-                       rc = falcon_spi_device_init(efx, &efx->spi_eeprom,
-                                                   EE_SPI_EEPROM,
-                                                   le32_to_cpu(ee));
+                       rc = falcon_spi_device_init(
+                               efx, &efx->spi_eeprom, FFE_AB_SPI_DEVICE_EEPROM,
+                               le32_to_cpu(v3->spi_device_type
+                                           [FFE_AB_SPI_DEVICE_EEPROM]));
                        if (rc)
                                goto fail2;
                }
@@ -2777,9 +2711,9 @@ static int falcon_probe_nvconfig(struct efx_nic *efx)
        /* Read the MAC addresses */
        memcpy(efx->mac_address, nvconfig->mac_address[0], ETH_ALEN);
 
-       EFX_LOG(efx, "PHY is %d phy_id %d\n", efx->phy_type, efx->mii.phy_id);
+       EFX_LOG(efx, "PHY is %d phy_id %d\n", efx->phy_type, efx->mdio.prtad);
 
-       efx_set_board_info(efx, board_rev);
+       falcon_probe_board(efx, board_rev);
 
        kfree(nvconfig);
        return 0;
@@ -2799,13 +2733,13 @@ static int falcon_probe_nic_variant(struct efx_nic *efx)
        efx_oword_t altera_build;
        efx_oword_t nic_stat;
 
-       falcon_read(efx, &altera_build, ALTERA_BUILD_REG_KER);
-       if (EFX_OWORD_FIELD(altera_build, VER_ALL)) {
+       efx_reado(efx, &altera_build, FR_AZ_ALTERA_BUILD);
+       if (EFX_OWORD_FIELD(altera_build, FRF_AZ_ALTERA_BUILD_VER)) {
                EFX_ERR(efx, "Falcon FPGA not supported\n");
                return -ENODEV;
        }
 
-       falcon_read(efx, &nic_stat, NIC_STAT_REG);
+       efx_reado(efx, &nic_stat, FR_AB_NIC_STAT);
 
        switch (falcon_rev(efx)) {
        case FALCON_REV_A0:
@@ -2814,7 +2748,7 @@ static int falcon_probe_nic_variant(struct efx_nic *efx)
                return -ENODEV;
 
        case FALCON_REV_A1:
-               if (EFX_OWORD_FIELD(nic_stat, STRAP_PCIE) == 0) {
+               if (EFX_OWORD_FIELD(nic_stat, FRF_AA_STRAP_PCIE) == 0) {
                        EFX_ERR(efx, "Falcon rev A1 PCI-X not supported\n");
                        return -ENODEV;
                }
@@ -2829,7 +2763,7 @@ static int falcon_probe_nic_variant(struct efx_nic *efx)
        }
 
        /* Initial assumed speed */
-       efx->link_speed = EFX_OWORD_FIELD(nic_stat, STRAP_10G) ? 10000 : 1000;
+       efx->link_speed = EFX_OWORD_FIELD(nic_stat, FRF_AB_STRAP_10G) ? 10000 : 1000;
 
        return 0;
 }
@@ -2840,34 +2774,36 @@ static void falcon_probe_spi_devices(struct efx_nic *efx)
        efx_oword_t nic_stat, gpio_ctl, ee_vpd_cfg;
        int boot_dev;
 
-       falcon_read(efx, &gpio_ctl, GPIO_CTL_REG_KER);
-       falcon_read(efx, &nic_stat, NIC_STAT_REG);
-       falcon_read(efx, &ee_vpd_cfg, EE_VPD_CFG_REG_KER);
+       efx_reado(efx, &gpio_ctl, FR_AB_GPIO_CTL);
+       efx_reado(efx, &nic_stat, FR_AB_NIC_STAT);
+       efx_reado(efx, &ee_vpd_cfg, FR_AB_EE_VPD_CFG0);
 
-       if (EFX_OWORD_FIELD(gpio_ctl, BOOTED_USING_NVDEVICE)) {
-               boot_dev = (EFX_OWORD_FIELD(nic_stat, SF_PRST) ?
-                           EE_SPI_FLASH : EE_SPI_EEPROM);
+       if (EFX_OWORD_FIELD(gpio_ctl, FRF_AB_GPIO3_PWRUP_VALUE)) {
+               boot_dev = (EFX_OWORD_FIELD(nic_stat, FRF_AB_SF_PRST) ?
+                           FFE_AB_SPI_DEVICE_FLASH : FFE_AB_SPI_DEVICE_EEPROM);
                EFX_LOG(efx, "Booted from %s\n",
-                       boot_dev == EE_SPI_FLASH ? "flash" : "EEPROM");
+                       boot_dev == FFE_AB_SPI_DEVICE_FLASH ? "flash" : "EEPROM");
        } else {
                /* Disable VPD and set clock dividers to safe
                 * values for initial programming. */
                boot_dev = -1;
                EFX_LOG(efx, "Booted from internal ASIC settings;"
                        " setting SPI config\n");
-               EFX_POPULATE_OWORD_3(ee_vpd_cfg, EE_VPD_EN, 0,
+               EFX_POPULATE_OWORD_3(ee_vpd_cfg, FRF_AB_EE_VPD_EN, 0,
                                     /* 125 MHz / 7 ~= 20 MHz */
-                                    EE_SF_CLOCK_DIV, 7,
+                                    FRF_AB_EE_SF_CLOCK_DIV, 7,
                                     /* 125 MHz / 63 ~= 2 MHz */
-                                    EE_EE_CLOCK_DIV, 63);
-               falcon_write(efx, &ee_vpd_cfg, EE_VPD_CFG_REG_KER);
+                                    FRF_AB_EE_EE_CLOCK_DIV, 63);
+               efx_writeo(efx, &ee_vpd_cfg, FR_AB_EE_VPD_CFG0);
        }
 
-       if (boot_dev == EE_SPI_FLASH)
-               falcon_spi_device_init(efx, &efx->spi_flash, EE_SPI_FLASH,
+       if (boot_dev == FFE_AB_SPI_DEVICE_FLASH)
+               falcon_spi_device_init(efx, &efx->spi_flash,
+                                      FFE_AB_SPI_DEVICE_FLASH,
                                       default_flash_type);
-       if (boot_dev == EE_SPI_EEPROM)
-               falcon_spi_device_init(efx, &efx->spi_eeprom, EE_SPI_EEPROM,
+       if (boot_dev == FFE_AB_SPI_DEVICE_EEPROM)
+               falcon_spi_device_init(efx, &efx->spi_eeprom,
+                                      FFE_AB_SPI_DEVICE_EEPROM,
                                       large_eeprom_type);
 }
 
@@ -2919,9 +2855,9 @@ int falcon_probe_nic(struct efx_nic *efx)
                goto fail4;
        BUG_ON(efx->irq_status.dma_addr & 0x0f);
 
-       EFX_LOG(efx, "INT_KER at %llx (virt %p phys %lx)\n",
-               (unsigned long long)efx->irq_status.dma_addr,
-               efx->irq_status.addr, virt_to_phys(efx->irq_status.addr));
+       EFX_LOG(efx, "INT_KER at %llx (virt %p phys %llx)\n",
+               (u64)efx->irq_status.dma_addr,
+               efx->irq_status.addr, (u64)virt_to_phys(efx->irq_status.addr));
 
        falcon_probe_spi_devices(efx);
 
@@ -2958,6 +2894,52 @@ int falcon_probe_nic(struct efx_nic *efx)
        return rc;
 }
 
+static void falcon_init_rx_cfg(struct efx_nic *efx)
+{
+       /* Prior to Siena the RX DMA engine will split each frame at
+        * intervals of RX_USR_BUF_SIZE (32-byte units). We set it to
+        * be so large that that never happens. */
+       const unsigned huge_buf_size = (3 * 4096) >> 5;
+       /* RX control FIFO thresholds (32 entries) */
+       const unsigned ctrl_xon_thr = 20;
+       const unsigned ctrl_xoff_thr = 25;
+       /* RX data FIFO thresholds (256-byte units; size varies) */
+       int data_xon_thr = rx_xon_thresh_bytes >> 8;
+       int data_xoff_thr = rx_xoff_thresh_bytes >> 8;
+       efx_oword_t reg;
+
+       efx_reado(efx, &reg, FR_AZ_RX_CFG);
+       if (falcon_rev(efx) <= FALCON_REV_A1) {
+               /* Data FIFO size is 5.5K */
+               if (data_xon_thr < 0)
+                       data_xon_thr = 512 >> 8;
+               if (data_xoff_thr < 0)
+                       data_xoff_thr = 2048 >> 8;
+               EFX_SET_OWORD_FIELD(reg, FRF_AA_RX_DESC_PUSH_EN, 0);
+               EFX_SET_OWORD_FIELD(reg, FRF_AA_RX_USR_BUF_SIZE,
+                                   huge_buf_size);
+               EFX_SET_OWORD_FIELD(reg, FRF_AA_RX_XON_MAC_TH, data_xon_thr);
+               EFX_SET_OWORD_FIELD(reg, FRF_AA_RX_XOFF_MAC_TH, data_xoff_thr);
+               EFX_SET_OWORD_FIELD(reg, FRF_AA_RX_XON_TX_TH, ctrl_xon_thr);
+               EFX_SET_OWORD_FIELD(reg, FRF_AA_RX_XOFF_TX_TH, ctrl_xoff_thr);
+       } else {
+               /* Data FIFO size is 80K; register fields moved */
+               if (data_xon_thr < 0)
+                       data_xon_thr = 27648 >> 8; /* ~3*max MTU */
+               if (data_xoff_thr < 0)
+                       data_xoff_thr = 54272 >> 8; /* ~80Kb - 3*max MTU */
+               EFX_SET_OWORD_FIELD(reg, FRF_BZ_RX_DESC_PUSH_EN, 0);
+               EFX_SET_OWORD_FIELD(reg, FRF_BZ_RX_USR_BUF_SIZE,
+                                   huge_buf_size);
+               EFX_SET_OWORD_FIELD(reg, FRF_BZ_RX_XON_MAC_TH, data_xon_thr);
+               EFX_SET_OWORD_FIELD(reg, FRF_BZ_RX_XOFF_MAC_TH, data_xoff_thr);
+               EFX_SET_OWORD_FIELD(reg, FRF_BZ_RX_XON_TX_TH, ctrl_xon_thr);
+               EFX_SET_OWORD_FIELD(reg, FRF_BZ_RX_XOFF_TX_TH, ctrl_xoff_thr);
+               EFX_SET_OWORD_FIELD(reg, FRF_BZ_RX_INGR_EN, 1);
+       }
+       efx_writeo(efx, &reg, FR_AZ_RX_CFG);
+}
+
 /* This call performs hardware-specific global initialisation, such as
  * defining the descriptor cache sizes and number of RSS channels.
  * It does not set up any buffers, descriptor rings or event queues.
@@ -2965,56 +2947,51 @@ int falcon_probe_nic(struct efx_nic *efx)
 int falcon_init_nic(struct efx_nic *efx)
 {
        efx_oword_t temp;
-       unsigned thresh;
        int rc;
 
        /* Use on-chip SRAM */
-       falcon_read(efx, &temp, NIC_STAT_REG);
-       EFX_SET_OWORD_FIELD(temp, ONCHIP_SRAM, 1);
-       falcon_write(efx, &temp, NIC_STAT_REG);
+       efx_reado(efx, &temp, FR_AB_NIC_STAT);
+       EFX_SET_OWORD_FIELD(temp, FRF_AB_ONCHIP_SRAM, 1);
+       efx_writeo(efx, &temp, FR_AB_NIC_STAT);
 
        /* Set the source of the GMAC clock */
        if (falcon_rev(efx) == FALCON_REV_B0) {
-               falcon_read(efx, &temp, GPIO_CTL_REG_KER);
-               EFX_SET_OWORD_FIELD(temp, GPIO_USE_NIC_CLK, true);
-               falcon_write(efx, &temp, GPIO_CTL_REG_KER);
+               efx_reado(efx, &temp, FR_AB_GPIO_CTL);
+               EFX_SET_OWORD_FIELD(temp, FRF_AB_USE_NIC_CLK, true);
+               efx_writeo(efx, &temp, FR_AB_GPIO_CTL);
        }
 
-       /* Set buffer table mode */
-       EFX_POPULATE_OWORD_1(temp, BUF_TBL_MODE, BUF_TBL_MODE_FULL);
-       falcon_write(efx, &temp, BUF_TBL_CFG_REG_KER);
-
        rc = falcon_reset_sram(efx);
        if (rc)
                return rc;
 
        /* Set positions of descriptor caches in SRAM. */
-       EFX_POPULATE_OWORD_1(temp, SRM_TX_DC_BASE_ADR, TX_DC_BASE / 8);
-       falcon_write(efx, &temp, SRM_TX_DC_CFG_REG_KER);
-       EFX_POPULATE_OWORD_1(temp, SRM_RX_DC_BASE_ADR, RX_DC_BASE / 8);
-       falcon_write(efx, &temp, SRM_RX_DC_CFG_REG_KER);
+       EFX_POPULATE_OWORD_1(temp, FRF_AZ_SRM_TX_DC_BASE_ADR, TX_DC_BASE / 8);
+       efx_writeo(efx, &temp, FR_AZ_SRM_TX_DC_CFG);
+       EFX_POPULATE_OWORD_1(temp, FRF_AZ_SRM_RX_DC_BASE_ADR, RX_DC_BASE / 8);
+       efx_writeo(efx, &temp, FR_AZ_SRM_RX_DC_CFG);
 
        /* Set TX descriptor cache size. */
        BUILD_BUG_ON(TX_DC_ENTRIES != (16 << TX_DC_ENTRIES_ORDER));
-       EFX_POPULATE_OWORD_1(temp, TX_DC_SIZE, TX_DC_ENTRIES_ORDER);
-       falcon_write(efx, &temp, TX_DC_CFG_REG_KER);
+       EFX_POPULATE_OWORD_1(temp, FRF_AZ_TX_DC_SIZE, TX_DC_ENTRIES_ORDER);
+       efx_writeo(efx, &temp, FR_AZ_TX_DC_CFG);
 
        /* Set RX descriptor cache size.  Set low watermark to size-8, as
         * this allows most efficient prefetching.
         */
        BUILD_BUG_ON(RX_DC_ENTRIES != (16 << RX_DC_ENTRIES_ORDER));
-       EFX_POPULATE_OWORD_1(temp, RX_DC_SIZE, RX_DC_ENTRIES_ORDER);
-       falcon_write(efx, &temp, RX_DC_CFG_REG_KER);
-       EFX_POPULATE_OWORD_1(temp, RX_DC_PF_LWM, RX_DC_ENTRIES - 8);
-       falcon_write(efx, &temp, RX_DC_PF_WM_REG_KER);
+       EFX_POPULATE_OWORD_1(temp, FRF_AZ_RX_DC_SIZE, RX_DC_ENTRIES_ORDER);
+       efx_writeo(efx, &temp, FR_AZ_RX_DC_CFG);
+       EFX_POPULATE_OWORD_1(temp, FRF_AZ_RX_DC_PF_LWM, RX_DC_ENTRIES - 8);
+       efx_writeo(efx, &temp, FR_AZ_RX_DC_PF_WM);
 
        /* Clear the parity enables on the TX data fifos as
         * they produce false parity errors because of timing issues
         */
        if (EFX_WORKAROUND_5129(efx)) {
-               falcon_read(efx, &temp, SPARE_REG_KER);
-               EFX_SET_OWORD_FIELD(temp, MEM_PERR_EN_TX_DATA, 0);
-               falcon_write(efx, &temp, SPARE_REG_KER);
+               efx_reado(efx, &temp, FR_AZ_CSR_SPARE);
+               EFX_SET_OWORD_FIELD(temp, FRF_AB_MEM_PERR_EN_TX_DATA, 0);
+               efx_writeo(efx, &temp, FR_AZ_CSR_SPARE);
        }
 
        /* Enable all the genuinely fatal interrupts.  (They are still
@@ -3024,83 +3001,65 @@ int falcon_init_nic(struct efx_nic *efx)
         * Note: All other fatal interrupts are enabled
         */
        EFX_POPULATE_OWORD_3(temp,
-                            ILL_ADR_INT_KER_EN, 1,
-                            RBUF_OWN_INT_KER_EN, 1,
-                            TBUF_OWN_INT_KER_EN, 1);
+                            FRF_AZ_ILL_ADR_INT_KER_EN, 1,
+                            FRF_AZ_RBUF_OWN_INT_KER_EN, 1,
+                            FRF_AZ_TBUF_OWN_INT_KER_EN, 1);
        EFX_INVERT_OWORD(temp);
-       falcon_write(efx, &temp, FATAL_INTR_REG_KER);
+       efx_writeo(efx, &temp, FR_AZ_FATAL_INTR_KER);
 
        if (EFX_WORKAROUND_7244(efx)) {
-               falcon_read(efx, &temp, RX_FILTER_CTL_REG);
-               EFX_SET_OWORD_FIELD(temp, UDP_FULL_SRCH_LIMIT, 8);
-               EFX_SET_OWORD_FIELD(temp, UDP_WILD_SRCH_LIMIT, 8);
-               EFX_SET_OWORD_FIELD(temp, TCP_FULL_SRCH_LIMIT, 8);
-               EFX_SET_OWORD_FIELD(temp, TCP_WILD_SRCH_LIMIT, 8);
-               falcon_write(efx, &temp, RX_FILTER_CTL_REG);
+               efx_reado(efx, &temp, FR_BZ_RX_FILTER_CTL);
+               EFX_SET_OWORD_FIELD(temp, FRF_BZ_UDP_FULL_SRCH_LIMIT, 8);
+               EFX_SET_OWORD_FIELD(temp, FRF_BZ_UDP_WILD_SRCH_LIMIT, 8);
+               EFX_SET_OWORD_FIELD(temp, FRF_BZ_TCP_FULL_SRCH_LIMIT, 8);
+               EFX_SET_OWORD_FIELD(temp, FRF_BZ_TCP_WILD_SRCH_LIMIT, 8);
+               efx_writeo(efx, &temp, FR_BZ_RX_FILTER_CTL);
        }
 
        falcon_setup_rss_indir_table(efx);
 
+       /* XXX This is documented only for Falcon A0/A1 */
        /* Setup RX.  Wait for descriptor is broken and must
         * be disabled.  RXDP recovery shouldn't be needed, but is.
         */
-       falcon_read(efx, &temp, RX_SELF_RST_REG_KER);
-       EFX_SET_OWORD_FIELD(temp, RX_NODESC_WAIT_DIS, 1);
-       EFX_SET_OWORD_FIELD(temp, RX_RECOVERY_EN, 1);
+       efx_reado(efx, &temp, FR_AA_RX_SELF_RST);
+       EFX_SET_OWORD_FIELD(temp, FRF_AA_RX_NODESC_WAIT_DIS, 1);
+       EFX_SET_OWORD_FIELD(temp, FRF_AA_RX_SELF_RST_EN, 1);
        if (EFX_WORKAROUND_5583(efx))
-               EFX_SET_OWORD_FIELD(temp, RX_ISCSI_DIS, 1);
-       falcon_write(efx, &temp, RX_SELF_RST_REG_KER);
+               EFX_SET_OWORD_FIELD(temp, FRF_AA_RX_ISCSI_DIS, 1);
+       efx_writeo(efx, &temp, FR_AA_RX_SELF_RST);
 
        /* Disable the ugly timer-based TX DMA backoff and allow TX DMA to be
         * controlled by the RX FIFO fill level. Set arbitration to one pkt/Q.
         */
-       falcon_read(efx, &temp, TX_CFG2_REG_KER);
-       EFX_SET_OWORD_FIELD(temp, TX_RX_SPACER, 0xfe);
-       EFX_SET_OWORD_FIELD(temp, TX_RX_SPACER_EN, 1);
-       EFX_SET_OWORD_FIELD(temp, TX_ONE_PKT_PER_Q, 1);
-       EFX_SET_OWORD_FIELD(temp, TX_CSR_PUSH_EN, 0);
-       EFX_SET_OWORD_FIELD(temp, TX_DIS_NON_IP_EV, 1);
+       efx_reado(efx, &temp, FR_AZ_TX_RESERVED);
+       EFX_SET_OWORD_FIELD(temp, FRF_AZ_TX_RX_SPACER, 0xfe);
+       EFX_SET_OWORD_FIELD(temp, FRF_AZ_TX_RX_SPACER_EN, 1);
+       EFX_SET_OWORD_FIELD(temp, FRF_AZ_TX_ONE_PKT_PER_Q, 1);
+       EFX_SET_OWORD_FIELD(temp, FRF_AZ_TX_PUSH_EN, 0);
+       EFX_SET_OWORD_FIELD(temp, FRF_AZ_TX_DIS_NON_IP_EV, 1);
        /* Enable SW_EV to inherit in char driver - assume harmless here */
-       EFX_SET_OWORD_FIELD(temp, TX_SW_EV_EN, 1);
+       EFX_SET_OWORD_FIELD(temp, FRF_AZ_TX_SOFT_EVT_EN, 1);
        /* Prefetch threshold 2 => fetch when descriptor cache half empty */
-       EFX_SET_OWORD_FIELD(temp, TX_PREF_THRESHOLD, 2);
+       EFX_SET_OWORD_FIELD(temp, FRF_AZ_TX_PREF_THRESHOLD, 2);
        /* Squash TX of packets of 16 bytes or less */
        if (falcon_rev(efx) >= FALCON_REV_B0 && EFX_WORKAROUND_9141(efx))
-               EFX_SET_OWORD_FIELD(temp, TX_FLUSH_MIN_LEN_EN_B0, 1);
-       falcon_write(efx, &temp, TX_CFG2_REG_KER);
+               EFX_SET_OWORD_FIELD(temp, FRF_BZ_TX_FLUSH_MIN_LEN_EN, 1);
+       efx_writeo(efx, &temp, FR_AZ_TX_RESERVED);
 
        /* Do not enable TX_NO_EOP_DISC_EN, since it limits packets to 16
         * descriptors (which is bad).
         */
-       falcon_read(efx, &temp, TX_CFG_REG_KER);
-       EFX_SET_OWORD_FIELD(temp, TX_NO_EOP_DISC_EN, 0);
-       falcon_write(efx, &temp, TX_CFG_REG_KER);
-
-       /* RX config */
-       falcon_read(efx, &temp, RX_CFG_REG_KER);
-       EFX_SET_OWORD_FIELD_VER(efx, temp, RX_DESC_PUSH_EN, 0);
-       if (EFX_WORKAROUND_7575(efx))
-               EFX_SET_OWORD_FIELD_VER(efx, temp, RX_USR_BUF_SIZE,
-                                       (3 * 4096) / 32);
-       if (falcon_rev(efx) >= FALCON_REV_B0)
-               EFX_SET_OWORD_FIELD(temp, RX_INGR_EN_B0, 1);
-
-       /* RX FIFO flow control thresholds */
-       thresh = ((rx_xon_thresh_bytes >= 0) ?
-                 rx_xon_thresh_bytes : efx->type->rx_xon_thresh);
-       EFX_SET_OWORD_FIELD_VER(efx, temp, RX_XON_MAC_TH, thresh / 256);
-       thresh = ((rx_xoff_thresh_bytes >= 0) ?
-                 rx_xoff_thresh_bytes : efx->type->rx_xoff_thresh);
-       EFX_SET_OWORD_FIELD_VER(efx, temp, RX_XOFF_MAC_TH, thresh / 256);
-       /* RX control FIFO thresholds [32 entries] */
-       EFX_SET_OWORD_FIELD_VER(efx, temp, RX_XON_TX_TH, 20);
-       EFX_SET_OWORD_FIELD_VER(efx, temp, RX_XOFF_TX_TH, 25);
-       falcon_write(efx, &temp, RX_CFG_REG_KER);
+       efx_reado(efx, &temp, FR_AZ_TX_CFG);
+       EFX_SET_OWORD_FIELD(temp, FRF_AZ_TX_NO_EOP_DISC_EN, 0);
+       efx_writeo(efx, &temp, FR_AZ_TX_CFG);
+
+       falcon_init_rx_cfg(efx);
 
        /* Set destination of both TX and RX Flush events */
        if (falcon_rev(efx) >= FALCON_REV_B0) {
-               EFX_POPULATE_OWORD_1(temp, FLS_EVQ_ID, 0);
-               falcon_write(efx, &temp, DP_CTRL_REG);
+               EFX_POPULATE_OWORD_1(temp, FRF_BZ_FLS_EVQ_ID, 0);
+               efx_writeo(efx, &temp, FR_BZ_DP_CTRL);
        }
 
        return 0;
@@ -3136,8 +3095,9 @@ void falcon_update_nic_stats(struct efx_nic *efx)
 {
        efx_oword_t cnt;
 
-       falcon_read(efx, &cnt, RX_NODESC_DROP_REG_KER);
-       efx->n_rx_nodesc_drop_cnt += EFX_OWORD_FIELD(cnt, RX_NODESC_DROP_CNT);
+       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);
 }
 
 /**************************************************************************
@@ -3148,45 +3108,31 @@ void falcon_update_nic_stats(struct efx_nic *efx)
  */
 
 struct efx_nic_type falcon_a_nic_type = {
-       .mem_bar = 2,
        .mem_map_size = 0x20000,
-       .txd_ptr_tbl_base = TX_DESC_PTR_TBL_KER_A1,
-       .rxd_ptr_tbl_base = RX_DESC_PTR_TBL_KER_A1,
-       .buf_tbl_base = BUF_TBL_KER_A1,
-       .evq_ptr_tbl_base = EVQ_PTR_TBL_KER_A1,
-       .evq_rptr_tbl_base = EVQ_RPTR_REG_KER_A1,
-       .txd_ring_mask = FALCON_TXD_RING_MASK,
-       .rxd_ring_mask = FALCON_RXD_RING_MASK,
-       .evq_size = FALCON_EVQ_SIZE,
-       .max_dma_mask = FALCON_DMA_MASK,
-       .tx_dma_mask = FALCON_TX_DMA_MASK,
-       .bug5391_mask = 0xf,
-       .rx_xoff_thresh = 2048,
-       .rx_xon_thresh = 512,
+       .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,
+       .evq_ptr_tbl_base = FR_AA_EVQ_PTR_TBL_KER,
+       .evq_rptr_tbl_base = FR_AA_EVQ_RPTR_KER,
+       .max_dma_mask = DMA_BIT_MASK(FSF_AZ_TX_KER_BUF_ADDR_WIDTH),
        .rx_buffer_padding = 0x24,
        .max_interrupt_mode = EFX_INT_MODE_MSI,
        .phys_addr_channels = 4,
 };
 
 struct efx_nic_type falcon_b_nic_type = {
-       .mem_bar = 2,
        /* 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 = RX_RSS_INDIR_TBL_B0 + 0x800,
-       .txd_ptr_tbl_base = TX_DESC_PTR_TBL_KER_B0,
-       .rxd_ptr_tbl_base = RX_DESC_PTR_TBL_KER_B0,
-       .buf_tbl_base = BUF_TBL_KER_B0,
-       .evq_ptr_tbl_base = EVQ_PTR_TBL_KER_B0,
-       .evq_rptr_tbl_base = EVQ_RPTR_REG_KER_B0,
-       .txd_ring_mask = FALCON_TXD_RING_MASK,
-       .rxd_ring_mask = FALCON_RXD_RING_MASK,
-       .evq_size = FALCON_EVQ_SIZE,
-       .max_dma_mask = FALCON_DMA_MASK,
-       .tx_dma_mask = FALCON_TX_DMA_MASK,
-       .bug5391_mask = 0,
-       .rx_xoff_thresh = 54272, /* ~80Kb - 3*max MTU */
-       .rx_xon_thresh = 27648,  /* ~3*max MTU */
+       .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_padding = 0,
        .max_interrupt_mode = EFX_INT_MODE_MSIX,
        .phys_addr_channels = 32, /* Hardware limit is 64, but the legacy