AI Trajectory


Trajectory: (Expand/Collapse All)
Seq Timestamp Type Name Duration
0/0 2026/10/13 16:29 flow patch-triage
1m Args:
null

Results:
{
  "EnableConfigs": null,
  "FocusSymbols": [],
  "KMSANReasoning": "",
  "NeedsKMSAN": false,
  "Reasoning": "The patch modifies the Cadence MACB/GEM Ethernet driver (drivers/net/ethernet/cadence/). This driver controls Cadence MACB/GEM controllers present on embedded SoCs (e.g., Microchip AT91, Xilinx Zynq, SiFive RISC-V) or via a vendor-specific PCI development board (0x17cd:0xe007). Neither device is emulated in standard virtualized environments (QEMU/GCE) on amd64. Consequently, the modified code is structurally unreachable on the target architecture and does not warrant fuzzing.",
  "WorthFuzzing": false
}

1/1 2026/10/13 16:29 action read-patch-diff
0m Args:
null

Results:
{
  "PatchDiff": "commit 923d631517ddd0466c0896873ca255ea98f68f21\nAuthor: syz-cluster \u003ctriage@syzkaller.com\u003e\nDate:   Tue Oct 13 16:29:33 2026 +0000\n\n    syz-cluster: applied patch under review\n\ndiff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h\nindex 82499ec6a9f0d..b7b4b6a382980 100644\n--- a/drivers/net/ethernet/cadence/macb.h\n+++ b/drivers/net/ethernet/cadence/macb.h\n@@ -834,7 +834,7 @@\n  */\n #define macb_or_gem_writel(__bp, __reg, __value) \\\n \t({ \\\n-\t\tif (macb_is_gem((__bp))) \\\n+\t\tif (macb_is_gem(\u0026(__bp)-\u003einfo)) \\\n \t\t\tgem_writel((__bp), __reg, __value); \\\n \t\telse \\\n \t\t\tmacb_writel((__bp), __reg, __value); \\\n@@ -843,7 +843,7 @@\n #define macb_or_gem_readl(__bp, __reg) \\\n \t({ \\\n \t\tu32 __v; \\\n-\t\tif (macb_is_gem((__bp))) \\\n+\t\tif (macb_is_gem(\u0026(__bp)-\u003einfo)) \\\n \t\t\t__v = gem_readl((__bp), __reg); \\\n \t\telse \\\n \t\t\t__v = macb_readl((__bp), __reg); \\\n@@ -1193,11 +1193,12 @@ static const struct gem_statistic queue_statistics[] = {\n \n struct macb;\n struct macb_queue;\n+struct macb_context;\n \n struct macb_or_gem_ops {\n-\tint\t(*mog_alloc_rx_buffers)(struct macb *bp);\n-\tvoid\t(*mog_free_rx_buffers)(struct macb *bp);\n-\tint\t(*mog_init_rings)(struct macb *bp);\n+\tint\t(*mog_alloc_rx_buffers)(struct macb_context *ctx);\n+\tvoid\t(*mog_free_rx_buffers)(struct macb_context *ctx);\n+\tint\t(*mog_init_rings)(struct macb_context *ctx);\n \tint\t(*mog_rx)(struct macb_queue *queue, struct napi_struct *napi,\n \t\t\t  int budget);\n };\n@@ -1267,23 +1268,12 @@ struct macb_queue {\n \tunsigned int\t\tENST_ON_TIME;\n \tunsigned int\t\tENST_OFF_TIME;\n \n-\t/* Lock to protect tx_head and tx_tail */\n+\t/* Lock to protect ctx-\u003etxq[q].head and ctx-\u003etxq[q].tail */\n \tspinlock_t\t\ttx_ptr_lock;\n-\tunsigned int\t\ttx_head, tx_tail;\n-\tstruct macb_dma_desc\t*tx_ring;\n-\tstruct macb_tx_skb\t*tx_skb;\n-\tdma_addr_t\t\ttx_ring_dma;\n \tstruct work_struct\ttx_error_task;\n \tbool\t\t\ttxubr_pending;\n \tstruct napi_struct\tnapi_tx;\n \n-\tdma_addr_t\t\trx_ring_dma;\n-\tdma_addr_t\t\trx_buffers_dma;\n-\tunsigned int\t\trx_tail;\n-\tunsigned int\t\trx_prepared_head;\n-\tstruct macb_dma_desc\t*rx_ring;\n-\tstruct sk_buff\t\t**rx_skbuff;\n-\tvoid\t\t\t*rx_buffers;\n \tstruct napi_struct\tnapi_rx;\n \tstruct queue_stats stats;\n };\n@@ -1298,6 +1288,45 @@ struct ethtool_rx_fs_list {\n \tunsigned int count;\n };\n \n+struct macb_info {\n+\tstruct platform_device\t*pdev;\n+\tstruct net_device\t*netdev;\n+\tstruct macb_or_gem_ops\tmacbgem_ops;\n+\tunsigned int\t\tnum_queues;\n+\tu32\t\t\tcaps;\n+\tint\t\t\trx_bd_rd_prefetch;\n+\tint\t\t\ttx_bd_rd_prefetch;\n+\tstruct queue_stats\t*queue_stats[MACB_MAX_QUEUES];\n+};\n+\n+struct macb_rxq {\n+\tstruct macb_dma_desc\t*ring;\t\t/* MACB \u0026 GEM */\n+\tdma_addr_t\t\tring_dma;\t/* MACB \u0026 GEM */\n+\tunsigned int\t\ttail;\t\t/* MACB \u0026 GEM */\n+\tunsigned int\t\tprepared_head;\t/* GEM */\n+\tstruct sk_buff\t\t**skbuff;\t/* GEM */\n+\tdma_addr_t\t\tbuffers_dma;\t/* MACB */\n+\tvoid\t\t\t*buffers;\t/* MACB */\n+};\n+\n+struct macb_txq {\n+\tunsigned int\t\thead;\n+\tunsigned int\t\ttail;\n+\tstruct macb_dma_desc\t*ring;\n+\tdma_addr_t\t\tring_dma;\n+\tstruct macb_tx_skb\t*skb;\n+};\n+\n+struct macb_context {\n+\tconst struct macb_info\t*info;\n+\n+\tunsigned int\t\trx_buffer_size;\n+\tunsigned int\t\trx_ring_size;\n+\tunsigned int\t\ttx_ring_size;\n+\tstruct macb_rxq\t\trxq[MACB_MAX_QUEUES];\n+\tstruct macb_txq\t\ttxq[MACB_MAX_QUEUES];\n+};\n+\n struct macb {\n \tvoid __iomem\t\t*regs;\n \tbool\t\t\tnative_io;\n@@ -1306,24 +1335,36 @@ struct macb {\n \tu32\t(*macb_reg_readl)(struct macb *bp, int offset);\n \tvoid\t(*macb_reg_writel)(struct macb *bp, int offset, u32 value);\n \n+\t/*\n+\t * Give direct access (bp-\u003ecaps) and\n+\t * allow taking a pointer to it (\u0026bp-\u003einfo) for contexts.\n+\t */\n+\tunion {\n+\t\tstruct macb_info;\n+\t\tstruct macb_info info;\n+\t};\n+\n+\t/*\n+\t * Context stores all its parameters.\n+\t * But we must remember them across closure.\n+\t */\n+\tunsigned int\t\tconfigured_rx_ring_size;\n+\tunsigned int\t\tconfigured_tx_ring_size;\n+\tstruct macb_context\t*ctx;\n+\n \tstruct macb_dma_desc\t*rx_ring_tieoff;\n \tdma_addr_t\t\trx_ring_tieoff_dma;\n-\tsize_t\t\t\trx_buffer_size;\n-\n-\tunsigned int\t\trx_ring_size;\n-\tunsigned int\t\ttx_ring_size;\n \n-\tunsigned int\t\tnum_queues;\n \tstruct macb_queue\tqueues[MACB_MAX_QUEUES];\n \n \tspinlock_t\t\tlock;\n-\tstruct platform_device\t*pdev;\n+\t/* Serializes context swap against phylink MAC callbacks. */\n+\tstruct mutex\t\tmac_cfg_lock;\n \tstruct clk\t\t*pclk;\n \tstruct clk\t\t*hclk;\n \tstruct clk\t\t*tx_clk;\n \tstruct clk\t\t*rx_clk;\n \tstruct clk\t\t*tsu_clk;\n-\tstruct net_device\t*netdev;\n \t/* Protects hw_stats and ethtool_stats */\n \tspinlock_t\t\tstats_lock;\n \tunion {\n@@ -1331,15 +1372,12 @@ struct macb {\n \t\tstruct gem_stats\tgem;\n \t}\t\t\thw_stats;\n \n-\tstruct macb_or_gem_ops\tmacbgem_ops;\n-\n \tstruct mii_bus\t\t*mii_bus;\n \tstruct phylink\t\t*phylink;\n \tstruct phylink_config\tphylink_config;\n \tstruct phylink_pcs\tphylink_usx_pcs;\n \tstruct phylink_pcs\tphylink_sgmii_pcs;\n \n-\tu32\t\t\tcaps;\n \tunsigned int\t\tdma_burst_length;\n \n \tphy_interface_t\t\tphy_interface;\n@@ -1383,12 +1421,12 @@ struct macb {\n \tu32\t\t\ttx_lpi_timer;\n \n \t/* ISR must not drive NAPI \u0026 BH mechanisms. True when the interface\n-\t * is closed. Protected by bp-\u003elock.\n+\t * is closed or during context-swap. Protected by bp-\u003elock.\n \t */\n \tbool\t\t\tirq_quiesced;\n \n-\tint\trx_bd_rd_prefetch;\n-\tint\ttx_bd_rd_prefetch;\n+\t/* Redundant to netif_carrier_ok(), but set under bp-\u003emac_cfg_lock. */\n+\tbool\t\t\tlink_up;\n \n \tu32\trx_intr_mask;\n \n@@ -1441,14 +1479,15 @@ static inline void gem_ptp_do_txstamp(struct macb *bp, struct sk_buff *skb, stru\n static inline void gem_ptp_do_rxstamp(struct macb *bp, struct sk_buff *skb, struct macb_dma_desc *desc) { }\n #endif\n \n-static inline bool macb_is_gem(struct macb *bp)\n+static inline bool macb_is_gem(const struct macb_info *info)\n {\n-\treturn !!(bp-\u003ecaps \u0026 MACB_CAPS_MACB_IS_GEM);\n+\treturn !!(info-\u003ecaps \u0026 MACB_CAPS_MACB_IS_GEM);\n }\n \n-static inline bool gem_has_ptp(struct macb *bp)\n+static inline bool gem_has_ptp(const struct macb_info *info)\n {\n-\treturn IS_ENABLED(CONFIG_MACB_USE_HWSTAMP) \u0026\u0026 (bp-\u003ecaps \u0026 MACB_CAPS_GEM_HAS_PTP);\n+\treturn IS_ENABLED(CONFIG_MACB_USE_HWSTAMP) \u0026\u0026\n+\t       (info-\u003ecaps \u0026 MACB_CAPS_GEM_HAS_PTP);\n }\n \n /* ENST Helper functions */\n@@ -1464,16 +1503,16 @@ static inline u64 enst_max_hw_interval(u32 speed_mbps)\n \t\t\t    ENST_TIME_GRANULARITY_NS * 1000, (speed_mbps));\n }\n \n-static inline bool macb_dma64(struct macb *bp)\n+static inline bool macb_dma64(const struct macb_info *info)\n {\n \treturn IS_ENABLED(CONFIG_ARCH_DMA_ADDR_T_64BIT) \u0026\u0026\n-\t       bp-\u003ecaps \u0026 MACB_CAPS_DMA_64B;\n+\t       info-\u003ecaps \u0026 MACB_CAPS_DMA_64B;\n }\n \n-static inline bool macb_dma_ptp(struct macb *bp)\n+static inline bool macb_dma_ptp(const struct macb_info *info)\n {\n \treturn IS_ENABLED(CONFIG_MACB_USE_HWSTAMP) \u0026\u0026\n-\t       bp-\u003ecaps \u0026 MACB_CAPS_DMA_PTP;\n+\t       info-\u003ecaps \u0026 MACB_CAPS_DMA_PTP;\n }\n \n static inline void macb_queue_isr_clear(struct macb *bp,\ndiff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c\nindex 020a47353d011..f087f278f9e56 100644\n--- a/drivers/net/ethernet/cadence/macb_main.c\n+++ b/drivers/net/ethernet/cadence/macb_main.c\n@@ -61,7 +61,7 @@ struct sifive_fu540_macb_mgmt {\n #define MAX_TX_RING_SIZE\t4096\n \n /* level of occupied TX descriptors under which we wake up TX process */\n-#define MACB_TX_WAKEUP_THRESH(bp)\t(3 * (bp)-\u003etx_ring_size / 4)\n+#define MACB_TX_WAKEUP_THRESH(bp)\t(3 * (bp)-\u003ectx-\u003etx_ring_size / 4)\n \n #define MACB_RX_INT_FLAGS\t(MACB_BIT(RCOMP) | MACB_BIT(ISR_ROVR))\n #define MACB_TX_ERR_FLAGS\t(MACB_BIT(ISR_TUND)\t\t\t\\\n@@ -126,75 +126,104 @@ struct sifive_fu540_macb_mgmt {\n  *    word 5: timestamp word 1\n  *    word 6: timestamp word 2\n  */\n-static unsigned int macb_dma_desc_get_size(struct macb *bp)\n+static unsigned int macb_dma_desc_get_size(const struct macb_info *info)\n {\n \tunsigned int desc_size = sizeof(struct macb_dma_desc);\n \n-\tif (macb_dma64(bp))\n+\tif (macb_dma64(info))\n \t\tdesc_size += sizeof(struct macb_dma_desc_64);\n-\tif (macb_dma_ptp(bp))\n+\tif (macb_dma_ptp(info))\n \t\tdesc_size += sizeof(struct macb_dma_desc_ptp);\n \n \treturn desc_size;\n }\n \n-static unsigned int macb_adj_dma_desc_idx(struct macb *bp, unsigned int desc_idx)\n+static unsigned int macb_adj_dma_desc_idx(struct macb_context *ctx,\n+\t\t\t\t\t  unsigned int desc_idx)\n {\n-\treturn desc_idx * (1 + macb_dma64(bp) + macb_dma_ptp(bp));\n+\treturn desc_idx * (1 + macb_dma64(ctx-\u003einfo) +\n+\t\t\t       macb_dma_ptp(ctx-\u003einfo));\n }\n \n-static struct macb_dma_desc_64 *macb_64b_desc(struct macb *bp, struct macb_dma_desc *desc)\n+static struct macb_dma_desc_64 *macb_64b_desc(struct macb_dma_desc *desc)\n {\n \treturn (struct macb_dma_desc_64 *)((void *)desc\n \t\t+ sizeof(struct macb_dma_desc));\n }\n \n /* Ring buffer accessors */\n-static unsigned int macb_tx_ring_wrap(struct macb *bp, unsigned int index)\n+static unsigned int macb_tx_ring_wrap(struct macb_context *ctx,\n+\t\t\t\t      unsigned int index)\n {\n-\treturn index \u0026 (bp-\u003etx_ring_size - 1);\n+\treturn index \u0026 (ctx-\u003etx_ring_size - 1);\n }\n \n-static struct macb_dma_desc *macb_tx_desc(struct macb_queue *queue,\n+static struct macb_txq *macb_txq(struct macb_queue *queue)\n+{\n+\tstruct macb *bp = queue-\u003ebp;\n+\tunsigned int q = queue - bp-\u003equeues;\n+\n+\treturn \u0026bp-\u003ectx-\u003etxq[q];\n+}\n+\n+static struct macb_rxq *macb_rxq(struct macb_queue *queue)\n+{\n+\tstruct macb *bp = queue-\u003ebp;\n+\tunsigned int q = queue - bp-\u003equeues;\n+\n+\treturn \u0026bp-\u003ectx-\u003erxq[q];\n+}\n+\n+static struct macb_dma_desc *macb_tx_desc(struct macb_context *ctx,\n+\t\t\t\t\t  unsigned int q,\n \t\t\t\t\t  unsigned int index)\n {\n-\tindex = macb_tx_ring_wrap(queue-\u003ebp, index);\n-\tindex = macb_adj_dma_desc_idx(queue-\u003ebp, index);\n-\treturn \u0026queue-\u003etx_ring[index];\n+\tindex = macb_tx_ring_wrap(ctx, index);\n+\tindex = macb_adj_dma_desc_idx(ctx, index);\n+\treturn \u0026ctx-\u003etxq[q].ring[index];\n }\n \n static struct macb_tx_skb *macb_tx_skb(struct macb_queue *queue,\n \t\t\t\t       unsigned int index)\n {\n-\treturn \u0026queue-\u003etx_skb[macb_tx_ring_wrap(queue-\u003ebp, index)];\n+\tstruct macb_txq *txq = macb_txq(queue);\n+\n+\treturn \u0026txq-\u003eskb[macb_tx_ring_wrap(queue-\u003ebp-\u003ectx, index)];\n }\n \n static dma_addr_t macb_tx_dma(struct macb_queue *queue, unsigned int index)\n {\n+\tstruct macb_context *ctx = queue-\u003ebp-\u003ectx;\n+\tstruct macb_txq *txq = macb_txq(queue);\n \tdma_addr_t offset;\n \n-\toffset = macb_tx_ring_wrap(queue-\u003ebp, index) *\n-\t\t\tmacb_dma_desc_get_size(queue-\u003ebp);\n+\toffset = macb_tx_ring_wrap(ctx, index) *\n+\t\t\tmacb_dma_desc_get_size(\u0026queue-\u003ebp-\u003einfo);\n \n-\treturn queue-\u003etx_ring_dma + offset;\n+\treturn txq-\u003ering_dma + offset;\n }\n \n-static unsigned int macb_rx_ring_wrap(struct macb *bp, unsigned int index)\n+static unsigned int macb_rx_ring_wrap(struct macb_context *ctx,\n+\t\t\t\t      unsigned int index)\n {\n-\treturn index \u0026 (bp-\u003erx_ring_size - 1);\n+\treturn index \u0026 (ctx-\u003erx_ring_size - 1);\n }\n \n-static struct macb_dma_desc *macb_rx_desc(struct macb_queue *queue, unsigned int index)\n+static struct macb_dma_desc *macb_rx_desc(struct macb_context *ctx,\n+\t\t\t\t\t  unsigned int q, unsigned int index)\n {\n-\tindex = macb_rx_ring_wrap(queue-\u003ebp, index);\n-\tindex = macb_adj_dma_desc_idx(queue-\u003ebp, index);\n-\treturn \u0026queue-\u003erx_ring[index];\n+\tindex = macb_rx_ring_wrap(ctx, index);\n+\tindex = macb_adj_dma_desc_idx(ctx, index);\n+\treturn \u0026ctx-\u003erxq[q].ring[index];\n }\n \n static void *macb_rx_buffer(struct macb_queue *queue, unsigned int index)\n {\n-\treturn queue-\u003erx_buffers + queue-\u003ebp-\u003erx_buffer_size *\n-\t       macb_rx_ring_wrap(queue-\u003ebp, index);\n+\tstruct macb_context *ctx = queue-\u003ebp-\u003ectx;\n+\tstruct macb_rxq *rxq = macb_rxq(queue);\n+\n+\treturn rxq-\u003ebuffers + ctx-\u003erx_buffer_size *\n+\t       macb_rx_ring_wrap(ctx, index);\n }\n \n /* I/O accessors */\n@@ -257,7 +286,7 @@ static void macb_set_hwaddr(struct macb *bp)\n \ttop = get_unaligned_le16(bp-\u003enetdev-\u003edev_addr + 4);\n \tmacb_or_gem_writel(bp, SA1T, top);\n \n-\tif (gem_has_ptp(bp)) {\n+\tif (gem_has_ptp(\u0026bp-\u003einfo)) {\n \t\tgem_writel(bp, RXPTPUNI, bottom);\n \t\tgem_writel(bp, TXPTPUNI, bottom);\n \t}\n@@ -463,19 +492,23 @@ static int macb_mdio_write_c45(struct mii_bus *bus, int mii_id,\n static void macb_init_buffers(struct macb *bp)\n {\n \tstruct macb_queue *queue;\n+\tstruct macb_rxq *rxq;\n+\tstruct macb_txq *txq;\n \tunsigned int q;\n \n \t/* Single register for all queues' high 32 bits. */\n-\tif (macb_dma64(bp)) {\n-\t\tmacb_writel(bp, RBQPH,\n-\t\t\t    upper_32_bits(bp-\u003equeues[0].rx_ring_dma));\n-\t\tmacb_writel(bp, TBQPH,\n-\t\t\t    upper_32_bits(bp-\u003equeues[0].tx_ring_dma));\n+\tif (macb_dma64(\u0026bp-\u003einfo)) {\n+\t\trxq = \u0026bp-\u003ectx-\u003erxq[0];\n+\t\ttxq = \u0026bp-\u003ectx-\u003etxq[0];\n+\t\tmacb_writel(bp, RBQPH, upper_32_bits(rxq-\u003ering_dma));\n+\t\tmacb_writel(bp, TBQPH, upper_32_bits(txq-\u003ering_dma));\n \t}\n \n \tfor (q = 0, queue = bp-\u003equeues; q \u003c bp-\u003enum_queues; ++q, ++queue) {\n-\t\tqueue_writel(queue, RBQP, lower_32_bits(queue-\u003erx_ring_dma));\n-\t\tqueue_writel(queue, TBQP, lower_32_bits(queue-\u003etx_ring_dma));\n+\t\trxq = \u0026bp-\u003ectx-\u003erxq[q];\n+\t\ttxq = \u0026bp-\u003ectx-\u003etxq[q];\n+\t\tqueue_writel(queue, RBQP, lower_32_bits(rxq-\u003ering_dma));\n+\t\tqueue_writel(queue, TBQP, lower_32_bits(txq-\u003ering_dma));\n \t}\n }\n \n@@ -659,11 +692,12 @@ static bool macb_tx_lpi_set(struct macb *bp, bool enable)\n \n static bool macb_tx_all_queues_idle(struct macb *bp)\n {\n-\tstruct macb_queue *queue;\n+\tstruct macb_txq *txq;\n \tunsigned int q;\n \n-\tfor (q = 0, queue = bp-\u003equeues; q \u003c bp-\u003enum_queues; ++q, ++queue) {\n-\t\tif (READ_ONCE(queue-\u003etx_head) != READ_ONCE(queue-\u003etx_tail))\n+\tfor (q = 0; q \u003c bp-\u003enum_queues; ++q) {\n+\t\ttxq = \u0026bp-\u003ectx-\u003etxq[q];\n+\t\tif (READ_ONCE(txq-\u003ehead) != READ_ONCE(txq-\u003etail))\n \t\t\treturn false;\n \t}\n \treturn true;\n@@ -712,12 +746,26 @@ static void macb_mac_disable_tx_lpi(struct phylink_config *config)\n \tstruct macb *bp = netdev_priv(netdev);\n \tunsigned long flags;\n \n+\tmutex_lock(\u0026bp-\u003emac_cfg_lock);\n+\n \tcancel_delayed_work_sync(\u0026bp-\u003etx_lpi_work);\n \n \tspin_lock_irqsave(\u0026bp-\u003elock, flags);\n \tbp-\u003eeee_active = false;\n \tmacb_tx_lpi_set(bp, false);\n \tspin_unlock_irqrestore(\u0026bp-\u003elock, flags);\n+\n+\tmutex_unlock(\u0026bp-\u003emac_cfg_lock);\n+}\n+\n+static void macb_txp_lpi_initial_defer(struct macb *bp)\n+{\n+\tlockdep_assert_held(\u0026bp-\u003emac_cfg_lock);\n+\n+\t/* Defer initial LPI entry by 1 second after link-up per\n+\t * IEEE 802.3az section 22.7a.\n+\t */\n+\tmod_delayed_work(system_wq, \u0026bp-\u003etx_lpi_work, msecs_to_jiffies(1000));\n }\n \n static int macb_mac_enable_tx_lpi(struct phylink_config *config, u32 timer,\n@@ -727,15 +775,16 @@ static int macb_mac_enable_tx_lpi(struct phylink_config *config, u32 timer,\n \tstruct macb *bp = netdev_priv(netdev);\n \tunsigned long flags;\n \n+\tmutex_lock(\u0026bp-\u003emac_cfg_lock);\n+\n \tspin_lock_irqsave(\u0026bp-\u003elock, flags);\n \tbp-\u003etx_lpi_timer = timer;\n \tbp-\u003eeee_active = true;\n \tspin_unlock_irqrestore(\u0026bp-\u003elock, flags);\n \n-\t/* Defer initial LPI entry by 1 second after link-up per\n-\t * IEEE 802.3az section 22.7a.\n-\t */\n-\tmod_delayed_work(system_wq, \u0026bp-\u003etx_lpi_work, msecs_to_jiffies(1000));\n+\tmacb_txp_lpi_initial_defer(bp);\n+\n+\tmutex_unlock(\u0026bp-\u003emac_cfg_lock);\n \n \treturn 0;\n }\n@@ -749,6 +798,7 @@ static void macb_mac_config(struct phylink_config *config, unsigned int mode,\n \tu32 old_ctrl, ctrl;\n \tu32 old_ncr, ncr;\n \n+\tmutex_lock(\u0026bp-\u003emac_cfg_lock);\n \tspin_lock_irqsave(\u0026bp-\u003elock, flags);\n \n \told_ctrl = ctrl = macb_or_gem_readl(bp, NCFGR);\n@@ -757,7 +807,7 @@ static void macb_mac_config(struct phylink_config *config, unsigned int mode,\n \tif (bp-\u003ecaps \u0026 MACB_CAPS_MACB_IS_EMAC) {\n \t\tif (state-\u003einterface == PHY_INTERFACE_MODE_RMII)\n \t\t\tctrl |= MACB_BIT(RM9200_RMII);\n-\t} else if (macb_is_gem(bp)) {\n+\t} else if (macb_is_gem(\u0026bp-\u003einfo)) {\n \t\tctrl \u0026= ~(GEM_BIT(SGMIIEN) | GEM_BIT(PCSSEL));\n \t\tncr \u0026= ~GEM_BIT(ENABLE_HS_MAC);\n \n@@ -782,6 +832,7 @@ static void macb_mac_config(struct phylink_config *config, unsigned int mode,\n \t\tmacb_or_gem_writel(bp, NCR, ncr);\n \n \tspin_unlock_irqrestore(\u0026bp-\u003elock, flags);\n+\tmutex_unlock(\u0026bp-\u003emac_cfg_lock);\n }\n \n static void macb_mac_link_down(struct phylink_config *config, unsigned int mode,\n@@ -793,6 +844,10 @@ static void macb_mac_link_down(struct phylink_config *config, unsigned int mode,\n \tunsigned int q;\n \tu32 ctrl;\n \n+\tmutex_lock(\u0026bp-\u003emac_cfg_lock);\n+\n+\tbp-\u003elink_up = false;\n+\n \tif (!(bp-\u003ecaps \u0026 MACB_CAPS_MACB_IS_EMAC))\n \t\tfor (q = 0, queue = bp-\u003equeues; q \u003c bp-\u003enum_queues; ++q, ++queue)\n \t\t\tqueue_writel(queue, IDR,\n@@ -803,6 +858,8 @@ static void macb_mac_link_down(struct phylink_config *config, unsigned int mode,\n \tmacb_writel(bp, NCR, ctrl);\n \n \tnetif_tx_stop_all_queues(netdev);\n+\n+\tmutex_unlock(\u0026bp-\u003emac_cfg_lock);\n }\n \n /* Use juggling algorithm to left rotate tx ring and tx skb array */\n@@ -811,28 +868,30 @@ static void gem_shuffle_tx_one_ring(struct macb_queue *queue)\n \tunsigned int head, tail, count, ring_size, desc_size;\n \tstruct macb_tx_skb tx_skb, *skb_curr, *skb_next;\n \tstruct macb_dma_desc *desc_curr, *desc_next;\n+\tunsigned int q = queue - queue-\u003ebp-\u003equeues;\n \tunsigned int i, cycles, shift, curr, next;\n-\tstruct macb *bp = queue-\u003ebp;\n+\tstruct macb_context *ctx = queue-\u003ebp-\u003ectx;\n+\tstruct macb_txq *txq = macb_txq(queue);\n \tunsigned char desc[24];\n \tunsigned long flags;\n \n-\tdesc_size = macb_dma_desc_get_size(bp);\n+\tdesc_size = macb_dma_desc_get_size(\u0026queue-\u003ebp-\u003einfo);\n \n \tif (WARN_ON_ONCE(desc_size \u003e ARRAY_SIZE(desc)))\n \t\treturn;\n \n \tspin_lock_irqsave(\u0026queue-\u003etx_ptr_lock, flags);\n-\thead = queue-\u003etx_head;\n-\ttail = queue-\u003etx_tail;\n-\tring_size = bp-\u003etx_ring_size;\n+\thead = txq-\u003ehead;\n+\ttail = txq-\u003etail;\n+\tring_size = ctx-\u003etx_ring_size;\n \tcount = CIRC_CNT(head, tail, ring_size);\n \n \tif (!(tail % ring_size))\n \t\tgoto unlock;\n \n \tif (!count) {\n-\t\tqueue-\u003etx_head = 0;\n-\t\tqueue-\u003etx_tail = 0;\n+\t\ttxq-\u003ehead = 0;\n+\t\ttxq-\u003etail = 0;\n \t\tgoto unlock;\n \t}\n \n@@ -840,7 +899,7 @@ static void gem_shuffle_tx_one_ring(struct macb_queue *queue)\n \tcycles = gcd(ring_size, shift);\n \n \tfor (i = 0; i \u003c cycles; i++) {\n-\t\tmemcpy(\u0026desc, macb_tx_desc(queue, i), desc_size);\n+\t\tmemcpy(\u0026desc, macb_tx_desc(ctx, q, i), desc_size);\n \t\tmemcpy(\u0026tx_skb, macb_tx_skb(queue, i),\n \t\t       sizeof(struct macb_tx_skb));\n \n@@ -848,8 +907,8 @@ static void gem_shuffle_tx_one_ring(struct macb_queue *queue)\n \t\tnext = (curr + shift) % ring_size;\n \n \t\twhile (next != i) {\n-\t\t\tdesc_curr = macb_tx_desc(queue, curr);\n-\t\t\tdesc_next = macb_tx_desc(queue, next);\n+\t\t\tdesc_curr = macb_tx_desc(ctx, q, curr);\n+\t\t\tdesc_next = macb_tx_desc(ctx, q, next);\n \n \t\t\tmemcpy(desc_curr, desc_next, desc_size);\n \n@@ -866,7 +925,7 @@ static void gem_shuffle_tx_one_ring(struct macb_queue *queue)\n \t\t\tnext = (curr + shift) % ring_size;\n \t\t}\n \n-\t\tdesc_curr = macb_tx_desc(queue, curr);\n+\t\tdesc_curr = macb_tx_desc(ctx, q, curr);\n \t\tmemcpy(desc_curr, \u0026desc, desc_size);\n \t\tif (i == ring_size - 1)\n \t\t\tdesc_curr-\u003ectrl \u0026= ~MACB_BIT(TX_WRAP);\n@@ -876,8 +935,8 @@ static void gem_shuffle_tx_one_ring(struct macb_queue *queue)\n \t\t       sizeof(struct macb_tx_skb));\n \t}\n \n-\tqueue-\u003etx_head = count;\n-\tqueue-\u003etx_tail = 0;\n+\ttxq-\u003ehead = count;\n+\ttxq-\u003etail = 0;\n \n \t/* Make descriptor updates visible to hardware */\n \twmb();\n@@ -909,8 +968,11 @@ static void macb_mac_link_up(struct phylink_config *config,\n \tunsigned int q;\n \tu32 ctrl;\n \n+\tmutex_lock(\u0026bp-\u003emac_cfg_lock);\n \tspin_lock_irqsave(\u0026bp-\u003elock, flags);\n \n+\tbp-\u003elink_up = true;\n+\n \tctrl = macb_or_gem_readl(bp, NCFGR);\n \n \tctrl \u0026= ~(MACB_BIT(SPD) | MACB_BIT(FD));\n@@ -923,7 +985,7 @@ static void macb_mac_link_up(struct phylink_config *config,\n \n \tif (!(bp-\u003ecaps \u0026 MACB_CAPS_MACB_IS_EMAC)) {\n \t\tctrl \u0026= ~MACB_BIT(PAE);\n-\t\tif (macb_is_gem(bp)) {\n+\t\tif (macb_is_gem(\u0026bp-\u003einfo)) {\n \t\t\tctrl \u0026= ~GEM_BIT(GBE);\n \n \t\t\tif (speed == SPEED_1000)\n@@ -954,12 +1016,14 @@ static void macb_mac_link_up(struct phylink_config *config,\n \n \t/* Enable Rx and Tx; Enable PTP unicast */\n \tctrl = macb_readl(bp, NCR);\n-\tif (gem_has_ptp(bp))\n+\tif (gem_has_ptp(\u0026bp-\u003einfo))\n \t\tctrl |= MACB_BIT(PTPUNI);\n \n \tmacb_writel(bp, NCR, ctrl | MACB_BIT(RE) | MACB_BIT(TE));\n \n \tnetif_tx_wake_all_queues(netdev);\n+\n+\tmutex_unlock(\u0026bp-\u003emac_cfg_lock);\n }\n \n static struct phylink_pcs *macb_mac_select_pcs(struct phylink_config *config,\n@@ -1067,7 +1131,8 @@ static int macb_mii_probe(struct net_device *netdev)\n \t\t  bp-\u003ephylink_config.supported_interfaces);\n \n \t/* Determine what modes are supported */\n-\tif (macb_is_gem(bp) \u0026\u0026 (bp-\u003ecaps \u0026 MACB_CAPS_GIGABIT_MODE_AVAILABLE)) {\n+\tif (macb_is_gem(\u0026bp-\u003einfo) \u0026\u0026\n+\t    (bp-\u003ecaps \u0026 MACB_CAPS_GIGABIT_MODE_AVAILABLE)) {\n \t\tbp-\u003ephylink_config.mac_capabilities |= MAC_1000FD;\n \t\tif (!(bp-\u003ecaps \u0026 MACB_CAPS_NO_GIGABIT_HALF))\n \t\t\tbp-\u003ephylink_config.mac_capabilities |= MAC_1000HD;\n@@ -1222,14 +1287,15 @@ static int macb_halt_tx(struct macb *bp)\n \t\t\t\t\tbp, TSR);\n }\n \n-static void macb_tx_unmap(struct macb *bp, struct macb_tx_skb *tx_skb, int budget)\n+static void macb_tx_unmap(const struct macb_info *info,\n+\t\t\t  struct macb_tx_skb *tx_skb, int budget)\n {\n \tif (tx_skb-\u003emapping) {\n \t\tif (tx_skb-\u003emapped_as_page)\n-\t\t\tdma_unmap_page(\u0026bp-\u003epdev-\u003edev, tx_skb-\u003emapping,\n+\t\t\tdma_unmap_page(\u0026info-\u003epdev-\u003edev, tx_skb-\u003emapping,\n \t\t\t\t       tx_skb-\u003esize, DMA_TO_DEVICE);\n \t\telse\n-\t\t\tdma_unmap_single(\u0026bp-\u003epdev-\u003edev, tx_skb-\u003emapping,\n+\t\t\tdma_unmap_single(\u0026info-\u003epdev-\u003edev, tx_skb-\u003emapping,\n \t\t\t\t\t tx_skb-\u003esize, DMA_TO_DEVICE);\n \t\ttx_skb-\u003emapping = 0;\n \t}\n@@ -1240,12 +1306,13 @@ static void macb_tx_unmap(struct macb *bp, struct macb_tx_skb *tx_skb, int budge\n \t}\n }\n \n-static void macb_set_addr(struct macb *bp, struct macb_dma_desc *desc, dma_addr_t addr)\n+static void macb_set_addr(const struct macb_info *info,\n+\t\t\t  struct macb_dma_desc *desc, dma_addr_t addr)\n {\n-\tif (macb_dma64(bp)) {\n+\tif (macb_dma64(info)) {\n \t\tstruct macb_dma_desc_64 *desc_64;\n \n-\t\tdesc_64 = macb_64b_desc(bp, desc);\n+\t\tdesc_64 = macb_64b_desc(desc);\n \t\tdesc_64-\u003eaddrh = upper_32_bits(addr);\n \t\t/* The low bits of RX address contain the RX_USED bit, clearing\n \t\t * of which allows packet RX. Make sure the high bits are also\n@@ -1257,18 +1324,19 @@ static void macb_set_addr(struct macb *bp, struct macb_dma_desc *desc, dma_addr_\n \tdesc-\u003eaddr = lower_32_bits(addr);\n }\n \n-static dma_addr_t macb_get_addr(struct macb *bp, struct macb_dma_desc *desc)\n+static dma_addr_t macb_get_addr(struct macb_context *ctx,\n+\t\t\t\tstruct macb_dma_desc *desc)\n {\n \tdma_addr_t addr = 0;\n \n-\tif (macb_dma64(bp)) {\n+\tif (macb_dma64(ctx-\u003einfo)) {\n \t\tstruct macb_dma_desc_64 *desc_64;\n \n-\t\tdesc_64 = macb_64b_desc(bp, desc);\n+\t\tdesc_64 = macb_64b_desc(desc);\n \t\taddr = ((u64)(desc_64-\u003eaddrh) \u003c\u003c 32);\n \t}\n \taddr |= MACB_BF(RX_WADDR, MACB_BFEXT(RX_WADDR, desc-\u003eaddr));\n-\tif (macb_dma_ptp(bp))\n+\tif (macb_dma_ptp(ctx-\u003einfo))\n \t\taddr \u0026= ~GEM_BIT(DMA_RXVALID);\n \treturn addr;\n }\n@@ -1278,6 +1346,8 @@ static void macb_tx_error_task(struct work_struct *work)\n \tstruct macb_queue *queue = container_of(work, struct macb_queue,\n \t\t\t\t\t\ttx_error_task);\n \tunsigned int q = queue - queue-\u003ebp-\u003equeues;\n+\tstruct macb_context *ctx = queue-\u003ebp-\u003ectx;\n+\tstruct macb_txq *txq = macb_txq(queue);\n \tstruct macb *bp = queue-\u003ebp;\n \tstruct macb_tx_skb *tx_skb;\n \tstruct macb_dma_desc *desc;\n@@ -1290,7 +1360,7 @@ static void macb_tx_error_task(struct work_struct *work)\n \tu32 bytes = 0;\n \n \tnetdev_vdbg(bp-\u003enetdev, \"%s: q = %u, t = %u, h = %u\\n\",\n-\t\t    __func__, q, queue-\u003etx_tail, queue-\u003etx_head);\n+\t\t    __func__, q, txq-\u003etail, txq-\u003ehead);\n \n \t/* Prevent the queue NAPI TX poll from running, as it calls\n \t * macb_tx_complete(), which in turn may call netif_wake_subqueue().\n@@ -1316,10 +1386,10 @@ static void macb_tx_error_task(struct work_struct *work)\n \t/* Treat frames in TX queue including the ones that caused the error.\n \t * Free transmit buffers in upper layer.\n \t */\n-\tfor (tail = queue-\u003etx_tail; tail != queue-\u003etx_head; tail++) {\n+\tfor (tail = txq-\u003etail; tail != txq-\u003ehead; tail++) {\n \t\tu32\tctrl;\n \n-\t\tdesc = macb_tx_desc(queue, tail);\n+\t\tdesc = macb_tx_desc(ctx, q, tail);\n \t\tctrl = desc-\u003ectrl;\n \t\ttx_skb = macb_tx_skb(queue, tail);\n \t\tskb = tx_skb-\u003eskb;\n@@ -1327,7 +1397,7 @@ static void macb_tx_error_task(struct work_struct *work)\n \t\tif (ctrl \u0026 MACB_BIT(TX_USED)) {\n \t\t\t/* skb is set for the last buffer of the frame */\n \t\t\twhile (!skb) {\n-\t\t\t\tmacb_tx_unmap(bp, tx_skb, 0);\n+\t\t\t\tmacb_tx_unmap(\u0026bp-\u003einfo, tx_skb, 0);\n \t\t\t\ttail++;\n \t\t\t\ttx_skb = macb_tx_skb(queue, tail);\n \t\t\t\tskb = tx_skb-\u003eskb;\n@@ -1338,7 +1408,7 @@ static void macb_tx_error_task(struct work_struct *work)\n \t\t\t */\n \t\t\tif (!(ctrl \u0026 MACB_BIT(TX_BUF_EXHAUSTED))) {\n \t\t\t\tnetdev_vdbg(bp-\u003enetdev, \"txerr skb %u (data %p) TX complete\\n\",\n-\t\t\t\t\t    macb_tx_ring_wrap(bp, tail),\n+\t\t\t\t\t    macb_tx_ring_wrap(ctx, tail),\n \t\t\t\t\t    skb-\u003edata);\n \t\t\t\tbp-\u003enetdev-\u003estats.tx_packets++;\n \t\t\t\tqueue-\u003estats.tx_packets++;\n@@ -1358,25 +1428,25 @@ static void macb_tx_error_task(struct work_struct *work)\n \t\t\tdesc-\u003ectrl = ctrl | MACB_BIT(TX_USED);\n \t\t}\n \n-\t\tmacb_tx_unmap(bp, tx_skb, 0);\n+\t\tmacb_tx_unmap(\u0026bp-\u003einfo, tx_skb, 0);\n \t}\n \n \tnetdev_tx_completed_queue(netdev_get_tx_queue(bp-\u003enetdev, q),\n \t\t\t\t  packets, bytes);\n \n \t/* Set end of TX queue */\n-\tdesc = macb_tx_desc(queue, 0);\n-\tmacb_set_addr(bp, desc, 0);\n+\tdesc = macb_tx_desc(ctx, q, 0);\n+\tmacb_set_addr(\u0026bp-\u003einfo, desc, 0);\n \tdesc-\u003ectrl = MACB_BIT(TX_USED);\n \n \t/* Make descriptor updates visible to hardware */\n \twmb();\n \n \t/* Reinitialize the TX desc queue */\n-\tqueue_writel(queue, TBQP, lower_32_bits(queue-\u003etx_ring_dma));\n+\tqueue_writel(queue, TBQP, lower_32_bits(txq-\u003ering_dma));\n \t/* Make TX ring reflect state of hardware */\n-\tqueue-\u003etx_head = 0;\n-\tqueue-\u003etx_tail = 0;\n+\ttxq-\u003ehead = 0;\n+\ttxq-\u003etail = 0;\n \n \t/* Housework before enabling TX IRQ */\n \tmacb_writel(bp, TSR, macb_readl(bp, TSR));\n@@ -1433,7 +1503,9 @@ static bool ptp_one_step_sync(struct sk_buff *skb)\n static int macb_tx_complete(struct macb_queue *queue, int budget)\n {\n \tstruct macb *bp = queue-\u003ebp;\n+\tstruct macb_txq *txq = macb_txq(queue);\n \tunsigned int q = queue - bp-\u003equeues;\n+\tstruct macb_context *ctx = bp-\u003ectx;\n \tunsigned long flags;\n \tunsigned int tail;\n \tunsigned int head;\n@@ -1441,14 +1513,14 @@ static int macb_tx_complete(struct macb_queue *queue, int budget)\n \tu32 bytes = 0;\n \n \tspin_lock_irqsave(\u0026queue-\u003etx_ptr_lock, flags);\n-\thead = queue-\u003etx_head;\n-\tfor (tail = queue-\u003etx_tail; tail != head \u0026\u0026 packets \u003c budget; tail++) {\n+\thead = txq-\u003ehead;\n+\tfor (tail = txq-\u003etail; tail != head \u0026\u0026 packets \u003c budget; tail++) {\n \t\tstruct macb_tx_skb\t*tx_skb;\n \t\tstruct sk_buff\t\t*skb;\n \t\tstruct macb_dma_desc\t*desc;\n \t\tu32\t\t\tctrl;\n \n-\t\tdesc = macb_tx_desc(queue, tail);\n+\t\tdesc = macb_tx_desc(ctx, q, tail);\n \n \t\t/* Make hw descriptor updates visible to CPU */\n \t\trmb();\n@@ -1473,7 +1545,7 @@ static int macb_tx_complete(struct macb_queue *queue, int budget)\n \t\t\t\t\tgem_ptp_do_txstamp(bp, skb, desc);\n \n \t\t\t\tnetdev_vdbg(bp-\u003enetdev, \"skb %u (data %p) TX complete\\n\",\n-\t\t\t\t\t    macb_tx_ring_wrap(bp, tail),\n+\t\t\t\t\t    macb_tx_ring_wrap(ctx, tail),\n \t\t\t\t\t    skb-\u003edata);\n \t\t\t\tbp-\u003enetdev-\u003estats.tx_packets++;\n \t\t\t\tqueue-\u003estats.tx_packets++;\n@@ -1484,7 +1556,7 @@ static int macb_tx_complete(struct macb_queue *queue, int budget)\n \t\t\t}\n \n \t\t\t/* Now we can safely release resources */\n-\t\t\tmacb_tx_unmap(bp, tx_skb, budget);\n+\t\t\tmacb_tx_unmap(\u0026bp-\u003einfo, tx_skb, budget);\n \n \t\t\t/* skb is set only for the last buffer of the frame.\n \t\t\t * WARNING: at this point skb has been freed by\n@@ -1498,10 +1570,10 @@ static int macb_tx_complete(struct macb_queue *queue, int budget)\n \tnetdev_tx_completed_queue(netdev_get_tx_queue(bp-\u003enetdev, q),\n \t\t\t\t  packets, bytes);\n \n-\tqueue-\u003etx_tail = tail;\n+\ttxq-\u003etail = tail;\n \tif (__netif_subqueue_stopped(bp-\u003enetdev, q) \u0026\u0026\n-\t    CIRC_CNT(queue-\u003etx_head, queue-\u003etx_tail,\n-\t\t     bp-\u003etx_ring_size) \u003c= MACB_TX_WAKEUP_THRESH(bp))\n+\t    CIRC_CNT(txq-\u003ehead, txq-\u003etail,\n+\t\t     bp-\u003ectx-\u003etx_ring_size) \u003c= MACB_TX_WAKEUP_THRESH(bp))\n \t\tnetif_wake_subqueue(bp-\u003enetdev, q);\n \tspin_unlock_irqrestore(\u0026queue-\u003etx_ptr_lock, flags);\n \n@@ -1511,51 +1583,53 @@ static int macb_tx_complete(struct macb_queue *queue, int budget)\n \treturn packets;\n }\n \n-static int gem_rx_refill(struct macb_queue *queue)\n+static int gem_rx_refill(struct macb_context *ctx, unsigned int q)\n {\n-\tstruct macb *bp = queue-\u003ebp;\n+\tstruct device *dev = \u0026ctx-\u003einfo-\u003epdev-\u003edev;\n+\tstruct macb_rxq *rxq = \u0026ctx-\u003erxq[q];\n \tstruct macb_dma_desc *desc;\n \tstruct sk_buff *skb;\n \tunsigned int entry;\n \tdma_addr_t paddr;\n \n-\twhile (CIRC_SPACE(queue-\u003erx_prepared_head, queue-\u003erx_tail,\n-\t\t\tbp-\u003erx_ring_size) \u003e 0) {\n-\t\tentry = macb_rx_ring_wrap(bp, queue-\u003erx_prepared_head);\n+\twhile (CIRC_SPACE(rxq-\u003eprepared_head, rxq-\u003etail,\n+\t\t\t  ctx-\u003erx_ring_size) \u003e 0) {\n+\t\tentry = macb_rx_ring_wrap(ctx, rxq-\u003eprepared_head);\n \n \t\t/* Make hw descriptor updates visible to CPU */\n \t\trmb();\n \n-\t\tdesc = macb_rx_desc(queue, entry);\n+\t\tdesc = macb_rx_desc(ctx, q, entry);\n \n-\t\tif (!queue-\u003erx_skbuff[entry]) {\n+\t\tif (!rxq-\u003eskbuff[entry]) {\n \t\t\t/* allocate sk_buff for this free entry in ring */\n-\t\t\tskb = netdev_alloc_skb(bp-\u003enetdev, bp-\u003erx_buffer_size);\n+\t\t\tskb = netdev_alloc_skb(ctx-\u003einfo-\u003enetdev,\n+\t\t\t\t\t       ctx-\u003erx_buffer_size);\n \t\t\tif (unlikely(!skb)) {\n-\t\t\t\tnetdev_err(bp-\u003enetdev,\n+\t\t\t\tnetdev_err(ctx-\u003einfo-\u003enetdev,\n \t\t\t\t\t   \"Unable to allocate sk_buff\\n\");\n \t\t\t\tbreak;\n \t\t\t}\n \n \t\t\t/* now fill corresponding descriptor entry */\n-\t\t\tpaddr = dma_map_single(\u0026bp-\u003epdev-\u003edev, skb-\u003edata,\n-\t\t\t\t\t       bp-\u003erx_buffer_size,\n+\t\t\tpaddr = dma_map_single(dev, skb-\u003edata,\n+\t\t\t\t\t       ctx-\u003erx_buffer_size,\n \t\t\t\t\t       DMA_FROM_DEVICE);\n-\t\t\tif (dma_mapping_error(\u0026bp-\u003epdev-\u003edev, paddr)) {\n+\t\t\tif (dma_mapping_error(dev, paddr)) {\n \t\t\t\tdev_kfree_skb(skb);\n \t\t\t\tbreak;\n \t\t\t}\n \n-\t\t\tqueue-\u003erx_skbuff[entry] = skb;\n+\t\t\trxq-\u003eskbuff[entry] = skb;\n \n-\t\t\tif (entry == bp-\u003erx_ring_size - 1)\n+\t\t\tif (entry == ctx-\u003erx_ring_size - 1)\n \t\t\t\tpaddr |= MACB_BIT(RX_WRAP);\n \t\t\tdesc-\u003ectrl = 0;\n \t\t\t/* Setting addr clears RX_USED and allows reception,\n \t\t\t * make sure ctrl is cleared first to avoid a race.\n \t\t\t */\n \t\t\tdma_wmb();\n-\t\t\tmacb_set_addr(bp, desc, paddr);\n+\t\t\tmacb_set_addr(ctx-\u003einfo, desc, paddr);\n \n \t\t\t/* Properly align Ethernet header.\n \t\t\t *\n@@ -1568,26 +1642,27 @@ static int gem_rx_refill(struct macb_queue *queue)\n \t\t\t * setting the low 2/3 bits.\n \t\t\t * It is 3 bits if HW_DMA_CAP_PTP, else 2 bits.\n \t\t\t */\n-\t\t\tif (!(bp-\u003ecaps \u0026 MACB_CAPS_RSC))\n+\t\t\tif (!(ctx-\u003einfo-\u003ecaps \u0026 MACB_CAPS_RSC))\n \t\t\t\tskb_reserve(skb, NET_IP_ALIGN);\n \t\t} else {\n \t\t\tdesc-\u003ectrl = 0;\n \t\t\tdma_wmb();\n \t\t\tdesc-\u003eaddr \u0026= ~MACB_BIT(RX_USED);\n \t\t}\n-\t\tqueue-\u003erx_prepared_head++;\n+\t\trxq-\u003eprepared_head++;\n \t}\n \n \t/* Make descriptor updates visible to hardware */\n \twmb();\n \n-\tnetdev_vdbg(bp-\u003enetdev, \"rx ring: queue: %p, prepared head %d, tail %d\\n\",\n-\t\t    queue, queue-\u003erx_prepared_head, queue-\u003erx_tail);\n+\tnetdev_vdbg(ctx-\u003einfo-\u003enetdev,\n+\t\t    \"rx ring: queue: %u, prepared head %d, tail %d\\n\",\n+\t\t    q, rxq-\u003eprepared_head, rxq-\u003etail);\n \n \t/* Fail if queue has zero prepared descriptors. This is critical because\n \t * nothing will ever trigger a refill again.\n \t */\n-\tif (queue-\u003erx_prepared_head == queue-\u003erx_tail)\n+\tif (rxq-\u003eprepared_head == rxq-\u003etail)\n \t\treturn -ENOMEM;\n \n \treturn 0;\n@@ -1597,10 +1672,12 @@ static int gem_rx_refill(struct macb_queue *queue)\n static void discard_partial_frame(struct macb_queue *queue, unsigned int begin,\n \t\t\t\t  unsigned int end)\n {\n+\tunsigned int q = queue - queue-\u003ebp-\u003equeues;\n+\tstruct macb_context *ctx = queue-\u003ebp-\u003ectx;\n \tunsigned int frag;\n \n \tfor (frag = begin; frag != end; frag++) {\n-\t\tstruct macb_dma_desc *desc = macb_rx_desc(queue, frag);\n+\t\tstruct macb_dma_desc *desc = macb_rx_desc(ctx, q, frag);\n \n \t\tdesc-\u003eaddr \u0026= ~MACB_BIT(RX_USED);\n \t}\n@@ -1617,6 +1694,9 @@ static void discard_partial_frame(struct macb_queue *queue, unsigned int begin,\n static int gem_rx(struct macb_queue *queue, struct napi_struct *napi,\n \t\t  int budget)\n {\n+\tunsigned int q = queue - queue-\u003ebp-\u003equeues;\n+\tstruct macb_context *ctx = queue-\u003ebp-\u003ectx;\n+\tstruct macb_rxq *rxq = macb_rxq(queue);\n \tstruct macb *bp = queue-\u003ebp;\n \tstruct macb_dma_desc *desc;\n \tstruct sk_buff *skb;\n@@ -1633,17 +1713,17 @@ static int gem_rx(struct macb_queue *queue, struct napi_struct *napi,\n \t\t * for hardware. Outside, we might have RX_USED descriptors for\n \t\t * alloc failures.\n \t\t */\n-\t\tif (queue-\u003erx_tail == queue-\u003erx_prepared_head)\n+\t\tif (rxq-\u003etail == rxq-\u003eprepared_head)\n \t\t\tbreak;\n \n-\t\tentry = macb_rx_ring_wrap(bp, queue-\u003erx_tail);\n-\t\tdesc = macb_rx_desc(queue, entry);\n+\t\tentry = macb_rx_ring_wrap(ctx, rxq-\u003etail);\n+\t\tdesc = macb_rx_desc(ctx, q, entry);\n \n \t\t/* Make hw descriptor updates visible to CPU */\n \t\trmb();\n \n \t\trxused = (desc-\u003eaddr \u0026 MACB_BIT(RX_USED)) ? true : false;\n-\t\taddr = macb_get_addr(bp, desc);\n+\t\taddr = macb_get_addr(ctx, desc);\n \n \t\tif (!rxused)\n \t\t\tbreak;\n@@ -1653,7 +1733,7 @@ static int gem_rx(struct macb_queue *queue, struct napi_struct *napi,\n \n \t\tctrl = desc-\u003ectrl;\n \n-\t\tqueue-\u003erx_tail++;\n+\t\trxq-\u003etail++;\n \t\tcount++;\n \n \t\tif (!(ctrl \u0026 MACB_BIT(RX_SOF) \u0026\u0026 ctrl \u0026 MACB_BIT(RX_EOF))) {\n@@ -1663,7 +1743,7 @@ static int gem_rx(struct macb_queue *queue, struct napi_struct *napi,\n \t\t\tqueue-\u003estats.rx_dropped++;\n \t\t\tbreak;\n \t\t}\n-\t\tskb = queue-\u003erx_skbuff[entry];\n+\t\tskb = rxq-\u003eskbuff[entry];\n \t\tif (unlikely(!skb)) {\n \t\t\tnetdev_err(bp-\u003enetdev,\n \t\t\t\t   \"inconsistent Rx descriptor chain\\n\");\n@@ -1672,7 +1752,7 @@ static int gem_rx(struct macb_queue *queue, struct napi_struct *napi,\n \t\t\tbreak;\n \t\t}\n \t\t/* now everything is ready for receiving packet */\n-\t\tqueue-\u003erx_skbuff[entry] = NULL;\n+\t\trxq-\u003eskbuff[entry] = NULL;\n \t\tlen = ctrl \u0026 bp-\u003erx_frm_len_mask;\n \n \t\tnetdev_vdbg(bp-\u003enetdev, \"%s %u (len %u)\\n\",\n@@ -1680,7 +1760,7 @@ static int gem_rx(struct macb_queue *queue, struct napi_struct *napi,\n \n \t\tskb_put(skb, len);\n \t\tdma_unmap_single(\u0026bp-\u003epdev-\u003edev, addr,\n-\t\t\t\t bp-\u003erx_buffer_size, DMA_FROM_DEVICE);\n+\t\t\t\t bp-\u003ectx-\u003erx_buffer_size, DMA_FROM_DEVICE);\n \n \t\tskb-\u003eprotocol = eth_type_trans(skb, bp-\u003enetdev);\n \t\tskb_checksum_none_assert(skb);\n@@ -1708,7 +1788,7 @@ static int gem_rx(struct macb_queue *queue, struct napi_struct *napi,\n \t\tnapi_gro_receive(napi, skb);\n \t}\n \n-\tgem_rx_refill(queue);\n+\tgem_rx_refill(ctx, q);\n \n \treturn count;\n }\n@@ -1716,6 +1796,8 @@ static int gem_rx(struct macb_queue *queue, struct napi_struct *napi,\n static int macb_rx_frame(struct macb_queue *queue, struct napi_struct *napi,\n \t\t\t unsigned int first_frag, unsigned int last_frag)\n {\n+\tunsigned int q = queue - queue-\u003ebp-\u003equeues;\n+\tstruct macb_context *ctx = queue-\u003ebp-\u003ectx;\n \tstruct macb *bp = queue-\u003ebp;\n \tstruct macb_dma_desc *desc;\n \tunsigned int offset;\n@@ -1723,13 +1805,13 @@ static int macb_rx_frame(struct macb_queue *queue, struct napi_struct *napi,\n \tunsigned int frag;\n \tunsigned int len;\n \n-\tdesc = macb_rx_desc(queue, last_frag);\n+\tdesc = macb_rx_desc(ctx, q, last_frag);\n \tlen = desc-\u003ectrl \u0026 bp-\u003erx_frm_len_mask;\n \n \tnetdev_vdbg(bp-\u003enetdev, \"%s frags %u - %u (len %u)\\n\",\n \t\t    __func__,\n-\t\t    macb_rx_ring_wrap(bp, first_frag),\n-\t\t    macb_rx_ring_wrap(bp, last_frag), len);\n+\t\t    macb_rx_ring_wrap(ctx, first_frag),\n+\t\t    macb_rx_ring_wrap(ctx, last_frag), len);\n \n \t/* The ethernet header starts NET_IP_ALIGN bytes into the\n \t * first buffer. Since the header is 14 bytes, this makes the\n@@ -1743,7 +1825,7 @@ static int macb_rx_frame(struct macb_queue *queue, struct napi_struct *napi,\n \tif (!skb) {\n \t\tbp-\u003enetdev-\u003estats.rx_dropped++;\n \t\tfor (frag = first_frag; ; frag++) {\n-\t\t\tdesc = macb_rx_desc(queue, frag);\n+\t\t\tdesc = macb_rx_desc(ctx, q, frag);\n \t\t\tdesc-\u003eaddr \u0026= ~MACB_BIT(RX_USED);\n \t\t\tif (frag == last_frag)\n \t\t\t\tbreak;\n@@ -1761,7 +1843,7 @@ static int macb_rx_frame(struct macb_queue *queue, struct napi_struct *napi,\n \tskb_put(skb, len);\n \n \tfor (frag = first_frag; ; frag++) {\n-\t\tunsigned int frag_len = bp-\u003erx_buffer_size;\n+\t\tunsigned int frag_len = bp-\u003ectx-\u003erx_buffer_size;\n \n \t\tif (offset + frag_len \u003e len) {\n \t\t\tif (unlikely(frag != last_frag)) {\n@@ -1773,8 +1855,8 @@ static int macb_rx_frame(struct macb_queue *queue, struct napi_struct *napi,\n \t\tskb_copy_to_linear_data_offset(skb, offset,\n \t\t\t\t\t       macb_rx_buffer(queue, frag),\n \t\t\t\t\t       frag_len);\n-\t\toffset += bp-\u003erx_buffer_size;\n-\t\tdesc = macb_rx_desc(queue, frag);\n+\t\toffset += bp-\u003ectx-\u003erx_buffer_size;\n+\t\tdesc = macb_rx_desc(ctx, q, frag);\n \t\tdesc-\u003eaddr \u0026= ~MACB_BIT(RX_USED);\n \n \t\tif (frag == last_frag)\n@@ -1796,35 +1878,38 @@ static int macb_rx_frame(struct macb_queue *queue, struct napi_struct *napi,\n \treturn 0;\n }\n \n-static inline void macb_init_rx_ring(struct macb_queue *queue)\n+static inline void macb_init_rx_ring(struct macb_context *ctx, unsigned int q)\n {\n+\tstruct macb_rxq *rxq = \u0026ctx-\u003erxq[q];\n \tstruct macb_dma_desc *desc = NULL;\n-\tstruct macb *bp = queue-\u003ebp;\n \tdma_addr_t addr;\n \tint i;\n \n-\taddr = queue-\u003erx_buffers_dma;\n-\tfor (i = 0; i \u003c bp-\u003erx_ring_size; i++) {\n-\t\tdesc = macb_rx_desc(queue, i);\n-\t\tmacb_set_addr(bp, desc, addr);\n+\taddr = rxq-\u003ebuffers_dma;\n+\tfor (i = 0; i \u003c ctx-\u003erx_ring_size; i++) {\n+\t\tdesc = macb_rx_desc(ctx, q, i);\n+\t\tmacb_set_addr(ctx-\u003einfo, desc, addr);\n \t\tdesc-\u003ectrl = 0;\n-\t\taddr += bp-\u003erx_buffer_size;\n+\t\taddr += ctx-\u003erx_buffer_size;\n \t}\n \tdesc-\u003eaddr |= MACB_BIT(RX_WRAP);\n-\tqueue-\u003erx_tail = 0;\n+\trxq-\u003etail = 0;\n }\n \n static int macb_rx(struct macb_queue *queue, struct napi_struct *napi,\n \t\t   int budget)\n {\n+\tunsigned int q = queue - queue-\u003ebp-\u003equeues;\n+\tstruct macb_context *ctx = queue-\u003ebp-\u003ectx;\n+\tstruct macb_rxq *rxq = macb_rxq(queue);\n \tstruct macb *bp = queue-\u003ebp;\n \tbool reset_rx_queue = false;\n \tint first_frag = -1;\n \tunsigned int tail;\n \tint received = 0;\n \n-\tfor (tail = queue-\u003erx_tail; budget \u003e 0; tail++) {\n-\t\tstruct macb_dma_desc *desc = macb_rx_desc(queue, tail);\n+\tfor (tail = rxq-\u003etail; budget \u003e 0; tail++) {\n+\t\tstruct macb_dma_desc *desc = macb_rx_desc(ctx, q, tail);\n \t\tu32 ctrl;\n \n \t\t/* Make hw descriptor updates visible to CPU */\n@@ -1876,8 +1961,8 @@ static int macb_rx(struct macb_queue *queue, struct napi_struct *napi,\n \t\tctrl = macb_readl(bp, NCR);\n \t\tmacb_writel(bp, NCR, ctrl \u0026 ~MACB_BIT(RE));\n \n-\t\tmacb_init_rx_ring(queue);\n-\t\tqueue_writel(queue, RBQP, queue-\u003erx_ring_dma);\n+\t\tmacb_init_rx_ring(ctx, q);\n+\t\tqueue_writel(queue, RBQP, rxq-\u003ering_dma);\n \n \t\tmacb_writel(bp, NCR, ctrl | MACB_BIT(RE));\n \n@@ -1886,25 +1971,27 @@ static int macb_rx(struct macb_queue *queue, struct napi_struct *napi,\n \t}\n \n \tif (first_frag != -1)\n-\t\tqueue-\u003erx_tail = first_frag;\n+\t\trxq-\u003etail = first_frag;\n \telse\n-\t\tqueue-\u003erx_tail = tail;\n+\t\trxq-\u003etail = tail;\n \n \treturn received;\n }\n \n static bool macb_rx_pending(struct macb_queue *queue)\n {\n-\tstruct macb *bp = queue-\u003ebp;\n+\tunsigned int q = queue - queue-\u003ebp-\u003equeues;\n+\tstruct macb_context *ctx = queue-\u003ebp-\u003ectx;\n+\tstruct macb_rxq *rxq = macb_rxq(queue);\n \tstruct macb_dma_desc *desc;\n \tunsigned int entry;\n \n \t/* No armed descriptor left: nothing can be pending. */\n-\tif (macb_is_gem(bp) \u0026\u0026 queue-\u003erx_tail == queue-\u003erx_prepared_head)\n+\tif (macb_is_gem(\u0026queue-\u003ebp-\u003einfo) \u0026\u0026 rxq-\u003etail == rxq-\u003eprepared_head)\n \t\treturn false;\n \n-\tentry = macb_rx_ring_wrap(bp, queue-\u003erx_tail);\n-\tdesc = macb_rx_desc(queue, entry);\n+\tentry = macb_rx_ring_wrap(ctx, rxq-\u003etail);\n+\tdesc = macb_rx_desc(ctx, q, entry);\n \n \t/* Make hw descriptor updates visible to CPU */\n \trmb();\n@@ -1953,39 +2040,52 @@ static void macb_tx_restart(struct macb_queue *queue)\n {\n \tstruct macb *bp = queue-\u003ebp;\n \tunsigned int head_idx, tbqp;\n+\tstruct macb_context *ctx;\n+\tstruct macb_txq *txq;\n \tunsigned long flags;\n \n \tspin_lock_irqsave(\u0026queue-\u003etx_ptr_lock, flags);\n \n-\tif (queue-\u003etx_head == queue-\u003etx_tail)\n-\t\tgoto out_tx_ptr_unlock;\n+\tspin_lock(\u0026bp-\u003elock);\n+\n+\t/* context swap ongoing? */\n+\tif (bp-\u003eirq_quiesced)\n+\t\tgoto out_unlock;\n \n-\ttbqp = queue_readl(queue, TBQP) / macb_dma_desc_get_size(bp);\n-\ttbqp = macb_adj_dma_desc_idx(bp, macb_tx_ring_wrap(bp, tbqp));\n-\thead_idx = macb_adj_dma_desc_idx(bp, macb_tx_ring_wrap(bp, queue-\u003etx_head));\n+\tctx = queue-\u003ebp-\u003ectx;\n+\ttxq = macb_txq(queue);\n+\n+\tif (txq-\u003ehead == txq-\u003etail)\n+\t\tgoto out_unlock;\n+\n+\ttbqp = queue_readl(queue, TBQP) / macb_dma_desc_get_size(ctx-\u003einfo);\n+\ttbqp = macb_adj_dma_desc_idx(ctx, macb_tx_ring_wrap(ctx, tbqp));\n+\thead_idx = macb_adj_dma_desc_idx(ctx, macb_tx_ring_wrap(ctx, txq-\u003ehead));\n \n \tif (tbqp == head_idx)\n-\t\tgoto out_tx_ptr_unlock;\n+\t\tgoto out_unlock;\n \n-\tspin_lock(\u0026bp-\u003elock);\n \tmacb_writel(bp, NCR, macb_readl(bp, NCR) | MACB_BIT(TSTART));\n-\tspin_unlock(\u0026bp-\u003elock);\n \n-out_tx_ptr_unlock:\n+out_unlock:\n+\tspin_unlock(\u0026bp-\u003elock);\n \tspin_unlock_irqrestore(\u0026queue-\u003etx_ptr_lock, flags);\n }\n \n static bool macb_tx_complete_pending(struct macb_queue *queue)\n {\n+\tunsigned int q = queue - queue-\u003ebp-\u003equeues;\n+\tstruct macb_context *ctx = queue-\u003ebp-\u003ectx;\n+\tstruct macb_txq *txq = macb_txq(queue);\n \tbool retval = false;\n \tunsigned long flags;\n \n \tspin_lock_irqsave(\u0026queue-\u003etx_ptr_lock, flags);\n-\tif (queue-\u003etx_head != queue-\u003etx_tail) {\n+\tif (txq-\u003ehead != txq-\u003etail) {\n \t\t/* Make hw descriptor updates visible to CPU */\n \t\trmb();\n \n-\t\tif (macb_tx_desc(queue, queue-\u003etx_tail)-\u003ectrl \u0026 MACB_BIT(TX_USED))\n+\t\tif (macb_tx_desc(ctx, q, txq-\u003etail)-\u003ectrl \u0026 MACB_BIT(TX_USED))\n \t\t\tretval = true;\n \t}\n \tspin_unlock_irqrestore(\u0026queue-\u003etx_ptr_lock, flags);\n@@ -2059,6 +2159,12 @@ static void macb_quiesce_start(struct macb *bp)\n \t\tnapi_disable(\u0026queue-\u003enapi_tx);\n \t}\n \n+\t/* NAPI instances still access Rx/Tx rings after their\n+\t * napi_complete_done() calls! Callers to macb_quiesce_start()\n+\t * free rings, so wait for all NAPI handlers to be done.\n+\t */\n+\tsynchronize_net();\n+\n \t/* Must be done after napi_tx is disabled: its completion re-arms\n \t * the LPI timer.\n \t */\n@@ -2085,6 +2191,7 @@ static void macb_hresp_error_task(struct work_struct *work)\n {\n \tstruct macb *bp = from_work(bp, work, hresp_err_bh_work);\n \tstruct net_device *netdev = bp-\u003enetdev;\n+\tstruct macb_context *ctx = bp-\u003ectx;\n \tstruct macb_queue *queue;\n \tunsigned int q;\n \tu32 ctrl;\n@@ -2101,7 +2208,7 @@ static void macb_hresp_error_task(struct work_struct *work)\n \tnetif_tx_stop_all_queues(netdev);\n \tnetif_carrier_off(netdev);\n \n-\tbp-\u003emacbgem_ops.mog_init_rings(bp);\n+\tbp-\u003emacbgem_ops.mog_init_rings(ctx);\n \n \t/* Initialize TX and RX buffers */\n \tmacb_init_buffers(bp);\n@@ -2180,7 +2287,7 @@ static int macb_interrupt_misc(struct macb_queue *queue, u32 status)\n \tif (status \u0026 MACB_BIT(ISR_ROVR)) {\n \t\t/* We missed at least one packet */\n \t\tspin_lock(\u0026bp-\u003estats_lock);\n-\t\tif (macb_is_gem(bp))\n+\t\tif (macb_is_gem(\u0026bp-\u003einfo))\n \t\t\tbp-\u003ehw_stats.gem.rx_overruns++;\n \t\telse\n \t\t\tbp-\u003ehw_stats.macb.rx_overruns++;\n@@ -2193,7 +2300,7 @@ static int macb_interrupt_misc(struct macb_queue *queue, u32 status)\n \t\tmacb_queue_isr_clear(bp, queue, MACB_BIT(HRESP));\n \t}\n \n-\tif (macb_is_gem(bp)) {\n+\tif (macb_is_gem(\u0026bp-\u003einfo)) {\n \t\tif (status \u0026 GEM_BIT(WOL))\n \t\t\tgem_wol_interrupt(queue, status);\n \t} else {\n@@ -2220,7 +2327,9 @@ static irqreturn_t macb_interrupt(int irq, void *dev_id)\n \tspin_lock(\u0026bp-\u003elock);\n \n \twhile (status) {\n-\t\t/* self-disarm while the netdev is closed */\n+\t\t/* self-disarm while the netdev is closed\n+\t\t * or during context swap\n+\t\t */\n \t\tif (unlikely(bp-\u003eirq_quiesced)) {\n \t\t\tqueue_writel(queue, IDR, -1);\n \t\t\tmacb_queue_isr_clear(bp, queue, -1);\n@@ -2299,9 +2408,12 @@ static unsigned int macb_tx_map(struct macb *bp,\n \t\t\t\tunsigned int hdrlen,\n \t\t\t\tu8 fcs_len)\n {\n+\tstruct macb_txq *txq = macb_txq(queue);\n \tunsigned int f, nr_frags = skb_shinfo(skb)-\u003enr_frags;\n-\tunsigned int len, i, tx_head = queue-\u003etx_head;\n+\tunsigned int len, i, tx_head = txq-\u003ehead;\n \tu32 ctrl, lso_ctrl = 0, seq_ctrl = 0;\n+\tunsigned int q = queue - bp-\u003equeues;\n+\tstruct macb_context *ctx = bp-\u003ectx;\n \tunsigned int eof = 1, mss_mfs = 0;\n \tstruct macb_tx_skb *tx_skb = NULL;\n \tstruct macb_dma_desc *desc;\n@@ -2393,7 +2505,7 @@ static unsigned int macb_tx_map(struct macb *bp,\n \t */\n \ti = tx_head;\n \tctrl = MACB_BIT(TX_USED);\n-\tdesc = macb_tx_desc(queue, i);\n+\tdesc = macb_tx_desc(ctx, q, i);\n \tdesc-\u003ectrl = ctrl;\n \n \tif (lso_ctrl) {\n@@ -2414,18 +2526,19 @@ static unsigned int macb_tx_map(struct macb *bp,\n \tdo {\n \t\ti--;\n \t\ttx_skb = macb_tx_skb(queue, i);\n-\t\tdesc = macb_tx_desc(queue, i);\n+\t\tdesc = macb_tx_desc(ctx, q, i);\n \n \t\tctrl = (u32)tx_skb-\u003esize;\n \t\tif (eof) {\n \t\t\tctrl |= MACB_BIT(TX_LAST);\n \t\t\teof = 0;\n \t\t}\n-\t\tif (unlikely(macb_tx_ring_wrap(bp, i) == bp-\u003etx_ring_size - 1))\n+\t\tif (unlikely(macb_tx_ring_wrap(ctx, i) ==\n+\t\t\t\tbp-\u003ectx-\u003etx_ring_size - 1))\n \t\t\tctrl |= MACB_BIT(TX_WRAP);\n \n \t\t/* First descriptor is header descriptor */\n-\t\tif (i == queue-\u003etx_head) {\n+\t\tif (i == txq-\u003ehead) {\n \t\t\tctrl |= MACB_BF(TX_LSO, lso_ctrl);\n \t\t\tctrl |= MACB_BF(TX_TCP_SEQ_SRC, seq_ctrl);\n \t\t\tif ((bp-\u003enetdev-\u003efeatures \u0026 NETIF_F_HW_CSUM) \u0026\u0026\n@@ -2439,25 +2552,25 @@ static unsigned int macb_tx_map(struct macb *bp,\n \t\t\tctrl |= MACB_BF(MSS_MFS, mss_mfs);\n \n \t\t/* Set TX buffer descriptor */\n-\t\tmacb_set_addr(bp, desc, tx_skb-\u003emapping);\n+\t\tmacb_set_addr(\u0026bp-\u003einfo, desc, tx_skb-\u003emapping);\n \t\t/* desc-\u003eaddr must be visible to hardware before clearing\n \t\t * 'TX_USED' bit in desc-\u003ectrl.\n \t\t */\n \t\twmb();\n \t\tdesc-\u003ectrl = ctrl;\n-\t} while (i != queue-\u003etx_head);\n+\t} while (i != txq-\u003ehead);\n \n-\tqueue-\u003etx_head = tx_head;\n+\ttxq-\u003ehead = tx_head;\n \n \treturn 0;\n \n dma_error:\n \tnetdev_err(bp-\u003enetdev, \"TX DMA map failed\\n\");\n \n-\tfor (i = queue-\u003etx_head; i != tx_head; i++) {\n+\tfor (i = txq-\u003ehead; i != tx_head; i++) {\n \t\ttx_skb = macb_tx_skb(queue, i);\n \n-\t\tmacb_tx_unmap(bp, tx_skb, 0);\n+\t\tmacb_tx_unmap(\u0026bp-\u003einfo, tx_skb, 0);\n \t}\n \n \treturn -ENOMEM;\n@@ -2581,6 +2694,7 @@ static netdev_tx_t macb_start_xmit(struct sk_buff *skb,\n \tunsigned int q = skb_get_queue_mapping(skb);\n \tunsigned int desc_cnt, nr_frags, frag_size, f;\n \tstruct macb_queue *queue = \u0026bp-\u003equeues[q];\n+\tstruct macb_txq *txq = macb_txq(queue);\n \tnetdev_tx_t ret = NETDEV_TX_OK;\n \tunsigned int hdrlen, tx_len;\n \tbool add_fcs, is_lso;\n@@ -2643,11 +2757,11 @@ static netdev_tx_t macb_start_xmit(struct sk_buff *skb,\n \tspin_lock_irqsave(\u0026queue-\u003etx_ptr_lock, flags);\n \n \t/* This is a hard error, log it. */\n-\tif (CIRC_SPACE(queue-\u003etx_head, queue-\u003etx_tail,\n-\t\t       bp-\u003etx_ring_size) \u003c desc_cnt) {\n+\tif (CIRC_SPACE(txq-\u003ehead, txq-\u003etail,\n+\t\t       bp-\u003ectx-\u003etx_ring_size) \u003c desc_cnt) {\n \t\tnetif_stop_subqueue(netdev, q);\n-\t\tnetdev_dbg(netdev, \"tx_head = %u, tx_tail = %u\\n\",\n-\t\t\t   queue-\u003etx_head, queue-\u003etx_tail);\n+\t\tnetdev_dbg(netdev, \"txq head = %u, txq tail = %u\\n\",\n+\t\t\t   txq-\u003ehead, txq-\u003etail);\n \t\tret = NETDEV_TX_BUSY;\n \t\tgoto unlock;\n \t}\n@@ -2663,7 +2777,7 @@ static netdev_tx_t macb_start_xmit(struct sk_buff *skb,\n \t\tgoto unlock;\n \t}\n \n-\tif (macb_dma_ptp(bp) \u0026\u0026\n+\tif (macb_dma_ptp(\u0026bp-\u003einfo) \u0026\u0026\n \t    (skb_shinfo(skb)-\u003etx_flags \u0026 SKBTX_HW_TSTAMP))\n \t\tskb_shinfo(skb)-\u003etx_flags |= SKBTX_IN_PROGRESS;\n \n@@ -2684,7 +2798,7 @@ static netdev_tx_t macb_start_xmit(struct sk_buff *skb,\n \tmacb_writel(bp, NCR, macb_readl(bp, NCR) | MACB_BIT(TSTART));\n \tspin_unlock(\u0026bp-\u003elock);\n \n-\tif (CIRC_SPACE(queue-\u003etx_head, queue-\u003etx_tail, bp-\u003etx_ring_size) \u003c 1)\n+\tif (CIRC_SPACE(txq-\u003ehead, txq-\u003etail, bp-\u003ectx-\u003etx_ring_size) \u003c 1)\n \t\tnetif_stop_subqueue(netdev, q);\n \n unlock:\n@@ -2693,162 +2807,179 @@ static netdev_tx_t macb_start_xmit(struct sk_buff *skb,\n \treturn ret;\n }\n \n-static void macb_init_rx_buffer_size(struct macb *bp, size_t size)\n+static unsigned int macb_rx_buffer_size(struct macb *bp, unsigned int mtu)\n {\n-\tif (!macb_is_gem(bp)) {\n-\t\tbp-\u003erx_buffer_size = MACB_RX_BUFFER_SIZE;\n+\tunsigned int size;\n+\n+\tif (!macb_is_gem(\u0026bp-\u003einfo)) {\n+\t\tsize = MACB_RX_BUFFER_SIZE;\n \t} else {\n-\t\tbp-\u003erx_buffer_size = MIN(size, RX_BUFFER_MAX);\n+\t\tsize = mtu + ETH_HLEN + ETH_FCS_LEN + NET_IP_ALIGN;\n+\t\tsize = MIN(size, RX_BUFFER_MAX);\n \n-\t\tif (bp-\u003erx_buffer_size % RX_BUFFER_MULTIPLE) {\n+\t\tif (size % RX_BUFFER_MULTIPLE) {\n \t\t\tnetdev_dbg(bp-\u003enetdev,\n \t\t\t\t   \"RX buffer must be multiple of %d bytes, expanding\\n\",\n \t\t\t\t   RX_BUFFER_MULTIPLE);\n-\t\t\tbp-\u003erx_buffer_size =\n-\t\t\t\troundup(bp-\u003erx_buffer_size, RX_BUFFER_MULTIPLE);\n+\t\t\tsize = roundup(size, RX_BUFFER_MULTIPLE);\n \t\t}\n \t}\n \n-\tnetdev_dbg(bp-\u003enetdev, \"mtu [%u] rx_buffer_size [%zu]\\n\",\n-\t\t   bp-\u003enetdev-\u003emtu, bp-\u003erx_buffer_size);\n+\tnetdev_dbg(bp-\u003enetdev, \"mtu [%u] rx_buffer_size [%u]\\n\", mtu, size);\n+\treturn size;\n }\n \n-static void gem_free_rx_buffers(struct macb *bp)\n+static void gem_free_rx_buffers(struct macb_context *ctx)\n {\n-\tstruct sk_buff\t\t*skb;\n-\tstruct macb_dma_desc\t*desc;\n-\tstruct macb_queue *queue;\n-\tdma_addr_t\t\taddr;\n+\tstruct device *dev = \u0026ctx-\u003einfo-\u003epdev-\u003edev;\n+\tstruct macb_dma_desc *desc;\n+\tstruct macb_rxq *rxq;\n+\tstruct sk_buff *skb;\n+\tdma_addr_t addr;\n \tunsigned int q;\n \tint i;\n \n-\tfor (q = 0, queue = bp-\u003equeues; q \u003c bp-\u003enum_queues; ++q, ++queue) {\n-\t\tif (!queue-\u003erx_skbuff)\n+\tfor (q = 0; q \u003c ctx-\u003einfo-\u003enum_queues; ++q) {\n+\t\trxq = \u0026ctx-\u003erxq[q];\n+\n+\t\tif (!rxq-\u003eskbuff)\n \t\t\tcontinue;\n \n-\t\tfor (i = 0; i \u003c bp-\u003erx_ring_size; i++) {\n-\t\t\tskb = queue-\u003erx_skbuff[i];\n+\t\tfor (i = 0; i \u003c ctx-\u003erx_ring_size; i++) {\n+\t\t\tskb = rxq-\u003eskbuff[i];\n \n \t\t\tif (!skb)\n \t\t\t\tcontinue;\n \n-\t\t\tdesc = macb_rx_desc(queue, i);\n-\t\t\taddr = macb_get_addr(bp, desc);\n+\t\t\tdesc = macb_rx_desc(ctx, q, i);\n+\t\t\taddr = macb_get_addr(ctx, desc);\n \n-\t\t\tdma_unmap_single(\u0026bp-\u003epdev-\u003edev, addr, bp-\u003erx_buffer_size,\n-\t\t\t\t\tDMA_FROM_DEVICE);\n+\t\t\tdma_unmap_single(dev, addr, ctx-\u003erx_buffer_size,\n+\t\t\t\t\t DMA_FROM_DEVICE);\n \t\t\tdev_kfree_skb_any(skb);\n \t\t\tskb = NULL;\n \t\t}\n \n-\t\tkfree(queue-\u003erx_skbuff);\n-\t\tqueue-\u003erx_skbuff = NULL;\n+\t\tkfree(rxq-\u003eskbuff);\n+\t\trxq-\u003eskbuff = NULL;\n \t}\n }\n \n-static void macb_free_rx_buffers(struct macb *bp)\n+static void macb_free_rx_buffers(struct macb_context *ctx)\n {\n-\tstruct macb_queue *queue = \u0026bp-\u003equeues[0];\n+\tstruct device *dev = \u0026ctx-\u003einfo-\u003epdev-\u003edev;\n+\tstruct macb_rxq *rxq = \u0026ctx-\u003erxq[0];\n \n-\tif (queue-\u003erx_buffers) {\n-\t\tdma_free_coherent(\u0026bp-\u003epdev-\u003edev,\n-\t\t\t\t  bp-\u003erx_ring_size * bp-\u003erx_buffer_size,\n-\t\t\t\t  queue-\u003erx_buffers, queue-\u003erx_buffers_dma);\n-\t\tqueue-\u003erx_buffers = NULL;\n+\tif (rxq-\u003ebuffers) {\n+\t\tdma_free_coherent(dev,\n+\t\t\t\t  ctx-\u003erx_ring_size * ctx-\u003erx_buffer_size,\n+\t\t\t\t  rxq-\u003ebuffers, rxq-\u003ebuffers_dma);\n+\t\trxq-\u003ebuffers = NULL;\n \t}\n }\n \n-static unsigned int macb_tx_ring_size_per_queue(struct macb *bp)\n+static unsigned int macb_tx_ring_size_per_queue(struct macb_context *ctx)\n {\n-\treturn macb_dma_desc_get_size(bp) * bp-\u003etx_ring_size + bp-\u003etx_bd_rd_prefetch;\n+\treturn macb_dma_desc_get_size(ctx-\u003einfo) * ctx-\u003etx_ring_size +\n+\t\t\tctx-\u003einfo-\u003etx_bd_rd_prefetch;\n }\n \n-static unsigned int macb_rx_ring_size_per_queue(struct macb *bp)\n+static unsigned int macb_rx_ring_size_per_queue(struct macb_context *ctx)\n {\n-\treturn macb_dma_desc_get_size(bp) * bp-\u003erx_ring_size + bp-\u003erx_bd_rd_prefetch;\n+\treturn macb_dma_desc_get_size(ctx-\u003einfo) * ctx-\u003erx_ring_size +\n+\t\t\tctx-\u003einfo-\u003erx_bd_rd_prefetch;\n }\n \n-static void macb_free(struct macb *bp)\n+static void macb_free(struct macb_context *ctx)\n {\n-\tstruct device *dev = \u0026bp-\u003epdev-\u003edev;\n-\tstruct macb_queue *queue;\n+\tstruct device *dev = \u0026ctx-\u003einfo-\u003epdev-\u003edev;\n+\tstruct macb_txq *txq;\n+\tstruct macb_rxq *rxq;\n \tunsigned int q;\n \tsize_t size;\n \n-\tbp-\u003emacbgem_ops.mog_free_rx_buffers(bp);\n+\tctx-\u003einfo-\u003emacbgem_ops.mog_free_rx_buffers(ctx);\n \n-\tsize = bp-\u003enum_queues * macb_tx_ring_size_per_queue(bp);\n-\tdma_free_coherent(dev, size, bp-\u003equeues[0].tx_ring, bp-\u003equeues[0].tx_ring_dma);\n+\ttxq = \u0026ctx-\u003etxq[0];\n+\tsize = ctx-\u003einfo-\u003enum_queues * macb_tx_ring_size_per_queue(ctx);\n+\tdma_free_coherent(dev, size, txq-\u003ering, txq-\u003ering_dma);\n \n-\tsize = bp-\u003enum_queues * macb_rx_ring_size_per_queue(bp);\n-\tdma_free_coherent(dev, size, bp-\u003equeues[0].rx_ring, bp-\u003equeues[0].rx_ring_dma);\n+\trxq = \u0026ctx-\u003erxq[0];\n+\tsize = ctx-\u003einfo-\u003enum_queues * macb_rx_ring_size_per_queue(ctx);\n+\tdma_free_coherent(dev, size, rxq-\u003ering, rxq-\u003ering_dma);\n \n-\tfor (q = 0, queue = bp-\u003equeues; q \u003c bp-\u003enum_queues; ++q, ++queue) {\n-\t\tif (queue-\u003etx_skb) {\n+\tfor (q = 0; q \u003c ctx-\u003einfo-\u003enum_queues; ++q) {\n+\t\ttxq = \u0026ctx-\u003etxq[q];\n+\t\trxq = \u0026ctx-\u003erxq[q];\n+\n+\t\tif (txq-\u003eskb) {\n \t\t\tunsigned int dropped = 0, tail;\n \n-\t\t\tfor (tail = queue-\u003etx_tail; tail != queue-\u003etx_head;\n-\t\t\t     tail++) {\n-\t\t\t\tif (macb_tx_skb(queue, tail)-\u003eskb)\n+\t\t\tfor (tail = txq-\u003etail; tail != txq-\u003ehead; tail++) {\n+\t\t\t\tif (txq-\u003eskb[macb_tx_ring_wrap(ctx, tail)].skb)\n \t\t\t\t\tdropped++;\n-\t\t\t\tmacb_tx_unmap(bp, macb_tx_skb(queue, tail), 0);\n+\t\t\t\tmacb_tx_unmap(ctx-\u003einfo,\n+\t\t\t\t\t      \u0026txq-\u003eskb[macb_tx_ring_wrap(ctx, tail)],\n+\t\t\t\t\t      0);\n \t\t\t}\n \n-\t\t\tqueue-\u003estats.tx_dropped += dropped;\n-\t\t\tbp-\u003enetdev-\u003estats.tx_dropped += dropped;\n+\t\t\tctx-\u003einfo-\u003equeue_stats[q]-\u003etx_dropped += dropped;\n+\t\t\tctx-\u003einfo-\u003enetdev-\u003estats.tx_dropped += dropped;\n \n-\t\t\tkfree(queue-\u003etx_skb);\n-\t\t\tqueue-\u003etx_skb = NULL;\n+\t\t\tkfree(txq-\u003eskb);\n+\t\t\ttxq-\u003eskb = NULL;\n \t\t}\n \n-\t\tqueue-\u003etx_head = 0;\n-\t\tqueue-\u003etx_tail = 0;\n-\t\tqueue-\u003etx_ring = NULL;\n-\t\tqueue-\u003erx_ring = NULL;\n+\t\ttxq-\u003ering = NULL;\n+\t\trxq-\u003ering = NULL;\n \t}\n }\n \n-static int gem_alloc_rx_buffers(struct macb *bp)\n+static int gem_alloc_rx_buffers(struct macb_context *ctx)\n {\n-\tstruct macb_queue *queue;\n+\tstruct macb_rxq *rxq;\n \tunsigned int q;\n \tint size;\n \n-\tfor (q = 0, queue = bp-\u003equeues; q \u003c bp-\u003enum_queues; ++q, ++queue) {\n-\t\tsize = bp-\u003erx_ring_size * sizeof(struct sk_buff *);\n-\t\tqueue-\u003erx_skbuff = kzalloc(size, GFP_KERNEL);\n-\t\tif (!queue-\u003erx_skbuff)\n+\tfor (q = 0; q \u003c ctx-\u003einfo-\u003enum_queues; ++q) {\n+\t\trxq = \u0026ctx-\u003erxq[q];\n+\t\tsize = ctx-\u003erx_ring_size * sizeof(struct sk_buff *);\n+\t\trxq-\u003eskbuff = kzalloc(size, GFP_KERNEL);\n+\t\tif (!rxq-\u003eskbuff)\n \t\t\treturn -ENOMEM;\n \t\telse\n-\t\t\tnetdev_dbg(bp-\u003enetdev,\n+\t\t\tnetdev_dbg(ctx-\u003einfo-\u003enetdev,\n \t\t\t\t   \"Allocated %d RX struct sk_buff entries at %p\\n\",\n-\t\t\t\t   bp-\u003erx_ring_size, queue-\u003erx_skbuff);\n+\t\t\t\t   ctx-\u003erx_ring_size, rxq-\u003eskbuff);\n \t}\n \treturn 0;\n }\n \n-static int macb_alloc_rx_buffers(struct macb *bp)\n+static int macb_alloc_rx_buffers(struct macb_context *ctx)\n {\n-\tstruct macb_queue *queue = \u0026bp-\u003equeues[0];\n+\tstruct device *dev = \u0026ctx-\u003einfo-\u003epdev-\u003edev;\n+\tstruct macb_rxq *rxq = \u0026ctx-\u003erxq[0];\n \tint size;\n \n-\tsize = bp-\u003erx_ring_size * bp-\u003erx_buffer_size;\n-\tqueue-\u003erx_buffers = dma_alloc_coherent(\u0026bp-\u003epdev-\u003edev, size,\n-\t\t\t\t\t    \u0026queue-\u003erx_buffers_dma, GFP_KERNEL);\n-\tif (!queue-\u003erx_buffers)\n+\tsize = ctx-\u003erx_ring_size * ctx-\u003erx_buffer_size;\n+\trxq-\u003ebuffers = dma_alloc_coherent(dev, size,\n+\t\t\t\t\t  \u0026rxq-\u003ebuffers_dma, GFP_KERNEL);\n+\tif (!rxq-\u003ebuffers)\n \t\treturn -ENOMEM;\n \n-\tnetdev_dbg(bp-\u003enetdev,\n+\tnetdev_dbg(ctx-\u003einfo-\u003enetdev,\n \t\t   \"Allocated RX buffers of %d bytes at %08lx (mapped %p)\\n\",\n-\t\t   size, (unsigned long)queue-\u003erx_buffers_dma, queue-\u003erx_buffers);\n+\t\t   size, (unsigned long)rxq-\u003ebuffers_dma, rxq-\u003ebuffers);\n \treturn 0;\n }\n \n-static int macb_alloc(struct macb *bp)\n+static int macb_alloc(struct macb_context *ctx)\n {\n-\tstruct device *dev = \u0026bp-\u003epdev-\u003edev;\n+\tunsigned int num_queues = ctx-\u003einfo-\u003enum_queues;\n+\tstruct device *dev = \u0026ctx-\u003einfo-\u003epdev-\u003edev;\n \tdma_addr_t tx_dma, rx_dma;\n-\tstruct macb_queue *queue;\n+\tstruct macb_txq *txq;\n+\tstruct macb_rxq *rxq;\n \tunsigned int q;\n \tvoid *tx, *rx;\n \tsize_t size;\n@@ -2860,85 +2991,131 @@ static int macb_alloc(struct macb *bp)\n \t * natural alignment of physical addresses.\n \t */\n \n-\tsize = bp-\u003enum_queues * macb_tx_ring_size_per_queue(bp);\n+\tsize = num_queues * macb_tx_ring_size_per_queue(ctx);\n \ttx = dma_alloc_coherent(dev, size, \u0026tx_dma, GFP_KERNEL);\n \tif (!tx)\n \t\tgoto out_err;\n \t/* Record the buffer so that the error path frees it. */\n-\tbp-\u003equeues[0].tx_ring = tx;\n-\tbp-\u003equeues[0].tx_ring_dma = tx_dma;\n+\ttxq = \u0026ctx-\u003etxq[0];\n+\ttxq-\u003ering = tx;\n+\ttxq-\u003ering_dma = tx_dma;\n \tif (upper_32_bits(tx_dma) != upper_32_bits(tx_dma + size - 1))\n \t\tgoto out_err;\n-\tnetdev_dbg(bp-\u003enetdev, \"Allocated %zu bytes for %u TX rings at %08lx (mapped %p)\\n\",\n-\t\t   size, bp-\u003enum_queues, (unsigned long)tx_dma, tx);\n+\tnetdev_dbg(ctx-\u003einfo-\u003enetdev,\n+\t\t   \"Allocated %zu bytes for %u TX rings at %08lx (mapped %p)\\n\",\n+\t\t   size, num_queues, (unsigned long)tx_dma, tx);\n \n-\tsize = bp-\u003enum_queues * macb_rx_ring_size_per_queue(bp);\n+\tsize = num_queues * macb_rx_ring_size_per_queue(ctx);\n \trx = dma_alloc_coherent(dev, size, \u0026rx_dma, GFP_KERNEL);\n \tif (!rx)\n \t\tgoto out_err;\n \t/* Record the buffer so that the error path frees it. */\n-\tbp-\u003equeues[0].rx_ring = rx;\n-\tbp-\u003equeues[0].rx_ring_dma = rx_dma;\n+\trxq = \u0026ctx-\u003erxq[0];\n+\trxq-\u003ering = rx;\n+\trxq-\u003ering_dma = rx_dma;\n \tif (upper_32_bits(rx_dma) != upper_32_bits(rx_dma + size - 1))\n \t\tgoto out_err;\n-\tnetdev_dbg(bp-\u003enetdev, \"Allocated %zu bytes for %u RX rings at %08lx (mapped %p)\\n\",\n-\t\t   size, bp-\u003enum_queues, (unsigned long)rx_dma, rx);\n+\tnetdev_dbg(ctx-\u003einfo-\u003enetdev,\n+\t\t   \"Allocated %zu bytes for %u RX rings at %08lx (mapped %p)\\n\",\n+\t\t   size, num_queues, (unsigned long)rx_dma, rx);\n \n-\tfor (q = 0, queue = bp-\u003equeues; q \u003c bp-\u003enum_queues; ++q, ++queue) {\n-\t\tqueue-\u003etx_ring = tx + macb_tx_ring_size_per_queue(bp) * q;\n-\t\tqueue-\u003etx_ring_dma = tx_dma + macb_tx_ring_size_per_queue(bp) * q;\n+\tfor (q = 0; q \u003c num_queues; ++q) {\n+\t\ttxq = \u0026ctx-\u003etxq[q];\n+\t\trxq = \u0026ctx-\u003erxq[q];\n+\n+\t\ttxq-\u003ering = tx + macb_tx_ring_size_per_queue(ctx) * q;\n+\t\ttxq-\u003ering_dma = tx_dma + macb_tx_ring_size_per_queue(ctx) * q;\n \n-\t\tqueue-\u003erx_ring = rx + macb_rx_ring_size_per_queue(bp) * q;\n-\t\tqueue-\u003erx_ring_dma = rx_dma + macb_rx_ring_size_per_queue(bp) * q;\n+\t\trxq-\u003ering = rx + macb_rx_ring_size_per_queue(ctx) * q;\n+\t\trxq-\u003ering_dma = rx_dma + macb_rx_ring_size_per_queue(ctx) * q;\n \n-\t\tsize = bp-\u003etx_ring_size * sizeof(struct macb_tx_skb);\n-\t\tqueue-\u003etx_skb = kmalloc(size, GFP_KERNEL);\n-\t\tif (!queue-\u003etx_skb)\n+\t\tsize = ctx-\u003etx_ring_size * sizeof(struct macb_tx_skb);\n+\t\ttxq-\u003eskb = kmalloc(size, GFP_KERNEL);\n+\t\tif (!txq-\u003eskb)\n \t\t\tgoto out_err;\n \t}\n-\tif (bp-\u003emacbgem_ops.mog_alloc_rx_buffers(bp))\n+\tif (ctx-\u003einfo-\u003emacbgem_ops.mog_alloc_rx_buffers(ctx))\n \t\tgoto out_err;\n \n \treturn 0;\n \n out_err:\n-\tmacb_free(bp);\n+\tmacb_free(ctx);\n \treturn -ENOMEM;\n }\n \n-static int gem_init_rx_ring(struct macb_queue *queue)\n+static struct macb_context *macb_context_alloc(struct macb *bp,\n+\t\t\t\t\t       unsigned int mtu,\n+\t\t\t\t\t       unsigned int rx_ring_size,\n+\t\t\t\t\t       unsigned int tx_ring_size)\n+{\n+\tstruct macb_context *ctx;\n+\tint err;\n+\n+\tctx = kzalloc_obj(*ctx);\n+\tif (!ctx)\n+\t\treturn ERR_PTR(-ENOMEM);\n+\n+\tctx-\u003einfo = \u0026bp-\u003einfo;\n+\tctx-\u003erx_buffer_size = macb_rx_buffer_size(bp, mtu);\n+\tctx-\u003erx_ring_size = rx_ring_size;\n+\tctx-\u003etx_ring_size = tx_ring_size;\n+\n+\terr = macb_alloc(ctx);\n+\tif (err) {\n+\t\tnetdev_err(bp-\u003enetdev,\n+\t\t\t   \"Unable to allocate DMA memory (error %d)\\n\", err);\n+\t\tgoto free_ctx;\n+\t}\n+\n+\terr = bp-\u003emacbgem_ops.mog_init_rings(ctx);\n+\tif (err)\n+\t\tgoto free_rings;\n+\n+\treturn ctx;\n+\n+free_rings:\n+\tmacb_free(ctx);\n+free_ctx:\n+\tkfree(ctx);\n+\treturn ERR_PTR(err);\n+}\n+\n+static int gem_init_rx_ring(struct macb_context *ctx, unsigned int q)\n {\n+\tstruct macb_rxq *rxq = \u0026ctx-\u003erxq[q];\n \tunsigned int i;\n \n-\tqueue-\u003erx_tail = 0;\n-\tqueue-\u003erx_prepared_head = 0;\n+\trxq-\u003etail = 0;\n+\trxq-\u003eprepared_head = 0;\n \n-\tfor (i = 0; i \u003c queue-\u003ebp-\u003erx_ring_size; i++)\n-\t\tmacb_rx_desc(queue, i)-\u003eaddr |= MACB_BIT(RX_USED);\n+\tfor (i = 0; i \u003c ctx-\u003erx_ring_size; i++)\n+\t\tmacb_rx_desc(ctx, q, i)-\u003eaddr |= MACB_BIT(RX_USED);\n \n-\treturn gem_rx_refill(queue);\n+\treturn gem_rx_refill(ctx, q);\n }\n \n-static int gem_init_rings(struct macb *bp)\n+static int gem_init_rings(struct macb_context *ctx)\n {\n-\tstruct macb_queue *queue;\n \tstruct macb_dma_desc *desc = NULL;\n+\tstruct macb_txq *txq;\n \tint last_err = 0;\n \tunsigned int q;\n \tint err;\n \tint i;\n \n-\tfor (q = 0, queue = bp-\u003equeues; q \u003c bp-\u003enum_queues; ++q, ++queue) {\n-\t\tfor (i = 0; i \u003c bp-\u003etx_ring_size; i++) {\n-\t\t\tdesc = macb_tx_desc(queue, i);\n-\t\t\tmacb_set_addr(bp, desc, 0);\n+\tfor (q = 0; q \u003c ctx-\u003einfo-\u003enum_queues; ++q) {\n+\t\ttxq = \u0026ctx-\u003etxq[q];\n+\t\tfor (i = 0; i \u003c ctx-\u003etx_ring_size; i++) {\n+\t\t\tdesc = macb_tx_desc(ctx, q, i);\n+\t\t\tmacb_set_addr(ctx-\u003einfo, desc, 0);\n \t\t\tdesc-\u003ectrl = MACB_BIT(TX_USED);\n \t\t}\n \t\tdesc-\u003ectrl |= MACB_BIT(TX_WRAP);\n-\t\tqueue-\u003etx_head = 0;\n-\t\tqueue-\u003etx_tail = 0;\n+\t\ttxq-\u003ehead = 0;\n+\t\ttxq-\u003etail = 0;\n \n-\t\terr = gem_init_rx_ring(queue);\n+\t\terr = gem_init_rx_ring(ctx, q);\n \t\tif (err)\n \t\t\tlast_err = err;\n \t}\n@@ -2946,20 +3123,21 @@ static int gem_init_rings(struct macb *bp)\n \treturn last_err;\n }\n \n-static int macb_init_rings(struct macb *bp)\n+static int macb_init_rings(struct macb_context *ctx)\n {\n-\tint i;\n+\tstruct macb_txq *txq = \u0026ctx-\u003etxq[0];\n \tstruct macb_dma_desc *desc = NULL;\n+\tint i;\n \n-\tmacb_init_rx_ring(\u0026bp-\u003equeues[0]);\n+\tmacb_init_rx_ring(ctx, 0);\n \n-\tfor (i = 0; i \u003c bp-\u003etx_ring_size; i++) {\n-\t\tdesc = macb_tx_desc(\u0026bp-\u003equeues[0], i);\n-\t\tmacb_set_addr(bp, desc, 0);\n+\tfor (i = 0; i \u003c ctx-\u003etx_ring_size; i++) {\n+\t\tdesc = macb_tx_desc(ctx, 0, i);\n+\t\tmacb_set_addr(ctx-\u003einfo, desc, 0);\n \t\tdesc-\u003ectrl = MACB_BIT(TX_USED);\n \t}\n-\tbp-\u003equeues[0].tx_head = 0;\n-\tbp-\u003equeues[0].tx_tail = 0;\n+\ttxq-\u003ehead = 0;\n+\ttxq-\u003etail = 0;\n \tdesc-\u003ectrl |= MACB_BIT(TX_WRAP);\n \n \treturn 0;\n@@ -3026,7 +3204,7 @@ static u32 macb_mdc_clk_div(struct macb *bp)\n \tu32 config;\n \tunsigned long pclk_hz;\n \n-\tif (macb_is_gem(bp))\n+\tif (macb_is_gem(\u0026bp-\u003einfo))\n \t\treturn gem_mdc_clk_div(bp);\n \n \tpclk_hz = clk_get_rate(bp-\u003epclk);\n@@ -3048,7 +3226,7 @@ static u32 macb_mdc_clk_div(struct macb *bp)\n  */\n static u32 macb_dbw(struct macb *bp)\n {\n-\tif (!macb_is_gem(bp))\n+\tif (!macb_is_gem(\u0026bp-\u003einfo))\n \t\treturn 0;\n \n \tswitch (GEM_BFEXT(DBWDEF, gem_readl(bp, DCFG1))) {\n@@ -3076,8 +3254,8 @@ static void macb_configure_dma(struct macb *bp)\n \tunsigned int q;\n \tu32 dmacfg;\n \n-\tbuffer_size = bp-\u003erx_buffer_size / RX_BUFFER_MULTIPLE;\n-\tif (macb_is_gem(bp)) {\n+\tbuffer_size = bp-\u003ectx-\u003erx_buffer_size / RX_BUFFER_MULTIPLE;\n+\tif (macb_is_gem(\u0026bp-\u003einfo)) {\n \t\tdmacfg = gem_readl(bp, DMACFG) \u0026 ~GEM_BF(RXBS, -1L);\n \t\tfor (q = 0, queue = bp-\u003equeues; q \u003c bp-\u003enum_queues; ++q, ++queue) {\n \t\t\tif (q)\n@@ -3101,9 +3279,9 @@ static void macb_configure_dma(struct macb *bp)\n \t\t\tdmacfg \u0026= ~GEM_BIT(TXCOEN);\n \n \t\tdmacfg \u0026= ~GEM_BIT(ADDR64);\n-\t\tif (macb_dma64(bp))\n+\t\tif (macb_dma64(\u0026bp-\u003einfo))\n \t\t\tdmacfg |= GEM_BIT(ADDR64);\n-\t\tif (macb_dma_ptp(bp))\n+\t\tif (macb_dma_ptp(\u0026bp-\u003einfo))\n \t\t\tdmacfg |= GEM_BIT(RXEXT) | GEM_BIT(TXEXT);\n \t\tnetdev_dbg(bp-\u003enetdev, \"Cadence configure DMA with 0x%08x\\n\",\n \t\t\t   dmacfg);\n@@ -3111,6 +3289,112 @@ static void macb_configure_dma(struct macb *bp)\n \t}\n }\n \n+static void macb_context_swap_start(struct macb *bp)\n+{\n+\tstruct macb_queue *queue;\n+\tunsigned long flags;\n+\tunsigned int q;\n+\tu32 ctrl;\n+\n+\tmutex_lock(\u0026bp-\u003emac_cfg_lock);\n+\n+\tmacb_quiesce_start(bp);\n+\n+\t/* Can finally disable software Tx; need to wait until napi_tx and\n+\t * tx_error_task cannot be scheduled as either might wakeup Tx.\n+\t */\n+\tnetif_tx_disable(bp-\u003enetdev);\n+\n+\t/* Now that everything is stopped, clear DQL. */\n+\tfor (q = 0; q \u003c bp-\u003enum_queues; ++q)\n+\t\tnetdev_tx_reset_queue(netdev_get_tx_queue(bp-\u003enetdev, q));\n+\n+\t/* Safe to call outside bp-\u003elock because bp-\u003eirq_quiesced ensures the IRQ\n+\t * handling is a no-op and all BH features are disabled.\n+\t *\n+\t * Whether it fails or not we'll disable TE/RE next.\n+\t * We were just trying to be nice.\n+\t */\n+\tmacb_halt_tx(bp);\n+\n+\tspin_lock_irqsave(\u0026bp-\u003elock, flags);\n+\n+\tctrl = macb_readl(bp, NCR);\n+\tmacb_writel(bp, NCR, ctrl \u0026 ~(MACB_BIT(RE) | MACB_BIT(TE)));\n+\n+\tfor (q = 0, queue = bp-\u003equeues; q \u003c bp-\u003enum_queues; ++q, ++queue) {\n+\t\tqueue_writel(queue, IDR, -1);\n+\t\tqueue_readl(queue, ISR);\n+\t\tmacb_queue_isr_clear(bp, queue, -1);\n+\t}\n+\n+\tmacb_writel(bp, TSR, -1);\n+\tmacb_writel(bp, RSR, -1);\n+\n+\tspin_unlock_irqrestore(\u0026bp-\u003elock, flags);\n+}\n+\n+static void macb_context_swap_end(struct macb *bp,\n+\t\t\t\t  struct macb_context *new_ctx)\n+{\n+\tstruct macb_context *old_ctx;\n+\tstruct macb_queue *queue;\n+\tunsigned long flags;\n+\tunsigned int q;\n+\tu32 ctrl;\n+\n+\tlockdep_assert_held(\u0026bp-\u003emac_cfg_lock);\n+\n+\t/* Swap contexts \u0026 give buffer pointers to HW. */\n+\n+\told_ctx = bp-\u003ectx;\n+\tWRITE_ONCE(bp-\u003ectx, new_ctx);\n+\twmb(); /* ensure IRQ enabled below read the new context */\n+\tmacb_init_buffers(bp);\n+\n+\t/* Start NAPI, HW Tx/Rx and software Tx. */\n+\n+\tfor (q = 0, queue = bp-\u003equeues; q \u003c bp-\u003enum_queues; ++q, ++queue) {\n+\t\tnapi_enable(\u0026queue-\u003enapi_rx);\n+\t\tnapi_enable(\u0026queue-\u003enapi_tx);\n+\t}\n+\n+\tspin_lock_irqsave(\u0026bp-\u003elock, flags);\n+\n+\t/* Re-arm normal interrupt processing before enabling IRQs. */\n+\tbp-\u003eirq_quiesced = false;\n+\n+\tmacb_configure_dma(bp);\n+\n+\tif (bp-\u003elink_up) {\n+\t\tfor (q = 0, queue = bp-\u003equeues; q \u003c bp-\u003enum_queues; ++q, ++queue) {\n+\t\t\tqueue_writel(queue, IER,\n+\t\t\t\t     bp-\u003erx_intr_mask |\n+\t\t\t\t     MACB_TX_INT_FLAGS |\n+\t\t\t\t     MACB_BIT(HRESP));\n+\t\t}\n+\n+\t\tctrl = macb_readl(bp, NCR);\n+\t\tmacb_writel(bp, NCR, ctrl | MACB_BIT(RE) | MACB_BIT(TE));\n+\t}\n+\n+\tspin_unlock_irqrestore(\u0026bp-\u003elock, flags);\n+\n+\tif (bp-\u003elink_up) {\n+\t\tnetif_tx_wake_all_queues(bp-\u003enetdev);\n+\n+\t\tif (bp-\u003eeee_active)\n+\t\t\tmacb_txp_lpi_initial_defer(bp);\n+\t}\n+\n+\tmutex_unlock(\u0026bp-\u003emac_cfg_lock);\n+\n+\t/* Free old context. */\n+\n+\tmacb_free(old_ctx);\n+\tkfree(old_ctx);\n+}\n+\n static void macb_init_hw(struct macb *bp)\n {\n \tu32 config;\n@@ -3131,7 +3415,8 @@ static void macb_init_hw(struct macb *bp)\n \t\tconfig |= MACB_BIT(BIG);\t/* Receive oversized frames */\n \tif (bp-\u003enetdev-\u003eflags \u0026 IFF_PROMISC)\n \t\tconfig |= MACB_BIT(CAF);\t/* Copy All Frames */\n-\telse if (macb_is_gem(bp) \u0026\u0026 bp-\u003enetdev-\u003efeatures \u0026 NETIF_F_RXCSUM)\n+\telse if (macb_is_gem(\u0026bp-\u003einfo) \u0026\u0026\n+\t\t bp-\u003enetdev-\u003efeatures \u0026 NETIF_F_RXCSUM)\n \t\tconfig |= GEM_BIT(RXCOEN);\n \tif (!(bp-\u003enetdev-\u003eflags \u0026 IFF_BROADCAST))\n \t\tconfig |= MACB_BIT(NBC);\t/* No BroadCast */\n@@ -3239,14 +3524,14 @@ static void macb_set_rx_mode(struct net_device *netdev)\n \t\tcfg |= MACB_BIT(CAF);\n \n \t\t/* Disable RX checksum offload */\n-\t\tif (macb_is_gem(bp))\n+\t\tif (macb_is_gem(\u0026bp-\u003einfo))\n \t\t\tcfg \u0026= ~GEM_BIT(RXCOEN);\n \t} else {\n \t\t/* Disable promiscuous mode */\n \t\tcfg \u0026= ~MACB_BIT(CAF);\n \n \t\t/* Enable RX checksum offload only if requested */\n-\t\tif (macb_is_gem(bp) \u0026\u0026 netdev-\u003efeatures \u0026 NETIF_F_RXCSUM)\n+\t\tif (macb_is_gem(\u0026bp-\u003einfo) \u0026\u0026 netdev-\u003efeatures \u0026 NETIF_F_RXCSUM)\n \t\t\tcfg |= GEM_BIT(RXCOEN);\n \t}\n \n@@ -3271,8 +3556,8 @@ static void macb_set_rx_mode(struct net_device *netdev)\n \n static int macb_open(struct net_device *netdev)\n {\n-\tsize_t bufsz = netdev-\u003emtu + ETH_HLEN + ETH_FCS_LEN + NET_IP_ALIGN;\n \tstruct macb *bp = netdev_priv(netdev);\n+\tstruct macb_context *ctx;\n \tint err;\n \n \tnetdev_dbg(bp-\u003enetdev, \"open\\n\");\n@@ -3281,19 +3566,18 @@ static int macb_open(struct net_device *netdev)\n \tif (err \u003c 0)\n \t\treturn err;\n \n-\t/* RX buffers initialization */\n-\tmacb_init_rx_buffer_size(bp, bufsz);\n-\n-\terr = macb_alloc(bp);\n-\tif (err) {\n-\t\tnetdev_err(netdev, \"Unable to allocate DMA memory (error %d)\\n\",\n-\t\t\t   err);\n+\tctx = macb_context_alloc(bp, netdev-\u003emtu,\n+\t\t\t\t bp-\u003econfigured_rx_ring_size,\n+\t\t\t\t bp-\u003econfigured_tx_ring_size);\n+\tif (IS_ERR(ctx)) {\n+\t\terr = PTR_ERR(ctx);\n+\t\tbp-\u003ectx = NULL;\n \t\tgoto pm_exit;\n \t}\n \n-\terr = bp-\u003emacbgem_ops.mog_init_rings(bp);\n-\tif (err)\n-\t\tgoto free_rings;\n+\tWRITE_ONCE(bp-\u003ectx, ctx);\n+\twmb(); /* ensure IRQ enabled at quiesce end read the new context */\n+\n \tmacb_init_buffers(bp);\n \n \tmacb_quiesce_end(bp);\n@@ -3327,8 +3611,9 @@ static int macb_open(struct net_device *netdev)\n \tmacb_quiesce_start(bp);\n \n \tmacb_reset_hw(bp);\n-free_rings:\n-\tmacb_free(bp);\n+\tmacb_free(bp-\u003ectx);\n+\tkfree(bp-\u003ectx);\n+\tbp-\u003ectx = NULL;\n pm_exit:\n \tpm_runtime_put_sync(\u0026bp-\u003epdev-\u003edev);\n \treturn err;\n@@ -3359,7 +3644,9 @@ static int macb_close(struct net_device *netdev)\n \tnetif_carrier_off(netdev);\n \tspin_unlock_irqrestore(\u0026bp-\u003elock, flags);\n \n-\tmacb_free(bp);\n+\tmacb_free(bp-\u003ectx);\n+\tkfree(bp-\u003ectx);\n+\tbp-\u003ectx = NULL;\n \n \tif (bp-\u003eptp_info)\n \t\tbp-\u003eptp_info-\u003eptp_remove(netdev);\n@@ -3371,11 +3658,29 @@ static int macb_close(struct net_device *netdev)\n \n static int macb_change_mtu(struct net_device *netdev, int new_mtu)\n {\n-\tif (netif_running(netdev))\n-\t\treturn -EBUSY;\n+\tstruct macb *bp = netdev_priv(netdev);\n+\tbool running = netif_running(netdev);\n+\tstruct macb_context *new_ctx;\n+\n+\tif (running) {\n+\t\t/* Context swapping is not supported for AT91. */\n+\t\tif (bp-\u003ecaps \u0026 MACB_CAPS_MACB_IS_EMAC)\n+\t\t\treturn -EBUSY;\n+\n+\t\tnew_ctx = macb_context_alloc(bp, new_mtu,\n+\t\t\t\t\t     bp-\u003econfigured_rx_ring_size,\n+\t\t\t\t\t     bp-\u003econfigured_tx_ring_size);\n+\t\tif (IS_ERR(new_ctx))\n+\t\t\treturn PTR_ERR(new_ctx);\n+\n+\t\tmacb_context_swap_start(bp);\n+\t}\n \n \tWRITE_ONCE(netdev-\u003emtu, new_mtu);\n \n+\tif (running)\n+\t\tmacb_context_swap_end(bp, new_ctx);\n+\n \treturn 0;\n }\n \n@@ -3510,7 +3815,7 @@ static void macb_get_stats(struct net_device *netdev,\n \tstruct macb_stats *hwstat = \u0026bp-\u003ehw_stats.macb;\n \n \tnetdev_stats_to_stats64(nstat, \u0026bp-\u003enetdev-\u003estats);\n-\tif (macb_is_gem(bp)) {\n+\tif (macb_is_gem(\u0026bp-\u003einfo)) {\n \t\tgem_get_stats(bp, nstat);\n \t\treturn;\n \t}\n@@ -3725,15 +4030,22 @@ static int macb_get_regs_len(struct net_device *netdev)\n static void macb_get_regs(struct net_device *netdev, struct ethtool_regs *regs,\n \t\t\t  void *p)\n {\n+\tdma_addr_t tx_dma_tail = 0, tx_dma_head = 0;\n \tstruct macb *bp = netdev_priv(netdev);\n-\tunsigned int tail, head;\n+\tunsigned int tail = 0, head = 0;\n+\tstruct macb_txq *txq;\n \tu32 *regs_buff = p;\n \n \tregs-\u003eversion = (macb_readl(bp, MID) \u0026 ((1 \u003c\u003c MACB_REV_SIZE) - 1))\n \t\t\t| MACB_GREGS_VERSION;\n \n-\ttail = macb_tx_ring_wrap(bp, bp-\u003equeues[0].tx_tail);\n-\thead = macb_tx_ring_wrap(bp, bp-\u003equeues[0].tx_head);\n+\tif (bp-\u003ectx) {\n+\t\ttxq = \u0026bp-\u003ectx-\u003etxq[0];\n+\t\ttail = macb_tx_ring_wrap(bp-\u003ectx, txq-\u003etail);\n+\t\thead = macb_tx_ring_wrap(bp-\u003ectx, txq-\u003ehead);\n+\t\ttx_dma_tail = macb_tx_dma(\u0026bp-\u003equeues[0], tail);\n+\t\ttx_dma_head = macb_tx_dma(\u0026bp-\u003equeues[0], head);\n+\t}\n \n \tregs_buff[0]  = macb_readl(bp, NCR);\n \tregs_buff[1]  = macb_or_gem_readl(bp, NCFGR);\n@@ -3746,12 +4058,12 @@ static void macb_get_regs(struct net_device *netdev, struct ethtool_regs *regs,\n \n \tregs_buff[8]  = tail;\n \tregs_buff[9]  = head;\n-\tregs_buff[10] = macb_tx_dma(\u0026bp-\u003equeues[0], tail);\n-\tregs_buff[11] = macb_tx_dma(\u0026bp-\u003equeues[0], head);\n+\tregs_buff[10] = tx_dma_tail;\n+\tregs_buff[11] = tx_dma_head;\n \n \tif (!(bp-\u003ecaps \u0026 MACB_CAPS_USRIO_DISABLED))\n \t\tregs_buff[12] = macb_or_gem_readl(bp, USRIO);\n-\tif (macb_is_gem(bp))\n+\tif (macb_is_gem(\u0026bp-\u003einfo))\n \t\tregs_buff[13] = gem_readl(bp, DMACFG);\n }\n \n@@ -3812,8 +4124,8 @@ static void macb_get_ringparam(struct net_device *netdev,\n \tring-\u003erx_max_pending = MAX_RX_RING_SIZE;\n \tring-\u003etx_max_pending = MAX_TX_RING_SIZE;\n \n-\tring-\u003erx_pending = bp-\u003erx_ring_size;\n-\tring-\u003etx_pending = bp-\u003etx_ring_size;\n+\tring-\u003erx_pending = bp-\u003econfigured_rx_ring_size;\n+\tring-\u003etx_pending = bp-\u003econfigured_tx_ring_size;\n }\n \n static int macb_set_ringparam(struct net_device *netdev,\n@@ -3821,9 +4133,10 @@ static int macb_set_ringparam(struct net_device *netdev,\n \t\t\t      struct kernel_ethtool_ringparam *kernel_ring,\n \t\t\t      struct netlink_ext_ack *extack)\n {\n+\tunsigned int new_rx_size, new_tx_size;\n \tstruct macb *bp = netdev_priv(netdev);\n-\tu32 new_rx_size, new_tx_size;\n-\tunsigned int reset = 0;\n+\tbool running = netif_running(netdev);\n+\tstruct macb_context *new_ctx;\n \n \tif (bp-\u003ecaps \u0026 MACB_CAPS_MACB_IS_EMAC)\n \t\treturn -EOPNOTSUPP;\n@@ -3839,22 +4152,26 @@ static int macb_set_ringparam(struct net_device *netdev,\n \t\t\t      MIN_TX_RING_SIZE, MAX_TX_RING_SIZE);\n \tnew_tx_size = roundup_pow_of_two(new_tx_size);\n \n-\tif ((new_tx_size == bp-\u003etx_ring_size) \u0026\u0026\n-\t    (new_rx_size == bp-\u003erx_ring_size)) {\n+\tif (new_tx_size == bp-\u003econfigured_tx_ring_size \u0026\u0026\n+\t    new_rx_size == bp-\u003econfigured_rx_ring_size) {\n \t\t/* nothing to do */\n \t\treturn 0;\n \t}\n \n-\tif (netif_running(bp-\u003enetdev)) {\n-\t\treset = 1;\n-\t\tmacb_close(bp-\u003enetdev);\n+\tif (running) {\n+\t\tnew_ctx = macb_context_alloc(bp, netdev-\u003emtu,\n+\t\t\t\t\t     new_rx_size, new_tx_size);\n+\t\tif (IS_ERR(new_ctx))\n+\t\t\treturn PTR_ERR(new_ctx);\n+\n+\t\tmacb_context_swap_start(bp);\n \t}\n \n-\tbp-\u003erx_ring_size = new_rx_size;\n-\tbp-\u003etx_ring_size = new_tx_size;\n+\tbp-\u003econfigured_rx_ring_size = new_rx_size;\n+\tbp-\u003econfigured_tx_ring_size = new_tx_size;\n \n-\tif (reset)\n-\t\tmacb_open(bp-\u003enetdev);\n+\tif (running)\n+\t\tmacb_context_swap_end(bp, new_ctx);\n \n \treturn 0;\n }\n@@ -3886,7 +4203,7 @@ static int gem_get_ts_info(struct net_device *netdev,\n {\n \tstruct macb *bp = netdev_priv(netdev);\n \n-\tif (!macb_dma_ptp(bp)) {\n+\tif (!macb_dma_ptp(\u0026bp-\u003einfo)) {\n \t\tethtool_op_get_ts_info(netdev, info);\n \t\treturn 0;\n \t}\n@@ -3987,7 +4304,7 @@ static void gem_prog_cmp_regs(struct macb *bp, struct ethtool_rx_flow_spec *fs)\n \tbool cmp_b = false;\n \tbool cmp_c = false;\n \n-\tif (!macb_is_gem(bp))\n+\tif (!macb_is_gem(\u0026bp-\u003einfo))\n \t\treturn;\n \n \ttp4sp_v = \u0026(fs-\u003eh_u.tcp_ip4_spec);\n@@ -4348,7 +4665,7 @@ static inline void macb_set_txcsum_feature(struct macb *bp,\n {\n \tu32 val;\n \n-\tif (!macb_is_gem(bp))\n+\tif (!macb_is_gem(\u0026bp-\u003einfo))\n \t\treturn;\n \n \tval = gem_readl(bp, DMACFG);\n@@ -4366,7 +4683,7 @@ static inline void macb_set_rxcsum_feature(struct macb *bp,\n \tstruct net_device *netdev = bp-\u003enetdev;\n \tu32 val;\n \n-\tif (!macb_is_gem(bp))\n+\tif (!macb_is_gem(\u0026bp-\u003einfo))\n \t\treturn;\n \n \tval = gem_readl(bp, NCFGR);\n@@ -4381,7 +4698,7 @@ static inline void macb_set_rxcsum_feature(struct macb *bp,\n static inline void macb_set_rxflow_feature(struct macb *bp,\n \t\t\t\t\t   netdev_features_t features)\n {\n-\tif (!macb_is_gem(bp))\n+\tif (!macb_is_gem(\u0026bp-\u003einfo))\n \t\treturn;\n \n \tgem_enable_flow_filters(bp, !!(features \u0026 NETIF_F_NTUPLE));\n@@ -4706,7 +5023,7 @@ static void macb_configure_caps(struct macb *bp,\n \t\t\tbp-\u003ecaps |= MACB_CAPS_FIFO_MODE;\n \t\tif (GEM_BFEXT(PBUF_RSC, gem_readl(bp, DCFG6)))\n \t\t\tbp-\u003ecaps |= MACB_CAPS_RSC;\n-\t\tif (gem_has_ptp(bp)) {\n+\t\tif (gem_has_ptp(\u0026bp-\u003einfo)) {\n \t\t\tif (!GEM_BFEXT(TSU, gem_readl(bp, DCFG5)))\n \t\t\t\tdev_err(\u0026bp-\u003epdev-\u003edev,\n \t\t\t\t\t\"GEM doesn't support hardware ptp.\\n\");\n@@ -4864,9 +5181,6 @@ static int macb_init_dflt(struct platform_device *pdev)\n \tint err;\n \tu32 val, reg;\n \n-\tbp-\u003etx_ring_size = DEFAULT_TX_RING_SIZE;\n-\tbp-\u003erx_ring_size = DEFAULT_RX_RING_SIZE;\n-\n \t/* No locking needed because the IRQs are not requested yet. The\n \t * flag is cleared by macb_open() and re-armed by macb_close().\n \t */\n@@ -4926,7 +5240,7 @@ static int macb_init_dflt(struct platform_device *pdev)\n \tnetdev-\u003enetdev_ops = \u0026macb_netdev_ops;\n \n \t/* setup appropriated routines according to adapter type */\n-\tif (macb_is_gem(bp)) {\n+\tif (macb_is_gem(\u0026bp-\u003einfo)) {\n \t\tbp-\u003emacbgem_ops.mog_alloc_rx_buffers = gem_alloc_rx_buffers;\n \t\tbp-\u003emacbgem_ops.mog_free_rx_buffers = gem_free_rx_buffers;\n \t\tbp-\u003emacbgem_ops.mog_init_rings = gem_init_rings;\n@@ -4955,7 +5269,7 @@ static int macb_init_dflt(struct platform_device *pdev)\n \t\tnetdev-\u003ehw_features |= MACB_NETIF_LSO;\n \n \t/* Checksum offload is only available on gem with packet buffer */\n-\tif (macb_is_gem(bp) \u0026\u0026 !(bp-\u003ecaps \u0026 MACB_CAPS_FIFO_MODE))\n+\tif (macb_is_gem(\u0026bp-\u003einfo) \u0026\u0026 !(bp-\u003ecaps \u0026 MACB_CAPS_FIFO_MODE))\n \t\tnetdev-\u003ehw_features |= NETIF_F_HW_CSUM | NETIF_F_RXCSUM;\n \tif (bp-\u003ecaps \u0026 MACB_CAPS_SG_DISABLED)\n \t\tnetdev-\u003ehw_features \u0026= ~NETIF_F_SG;\n@@ -5078,26 +5392,26 @@ static struct sifive_fu540_macb_mgmt *mgmt;\n \n static int at91ether_alloc_coherent(struct macb *bp)\n {\n-\tstruct macb_queue *queue = \u0026bp-\u003equeues[0];\n+\tstruct macb_rxq *rxq = \u0026bp-\u003ectx-\u003erxq[0];\n \n-\tqueue-\u003erx_ring = dma_alloc_coherent(\u0026bp-\u003epdev-\u003edev,\n-\t\t\t\t\t    (AT91ETHER_MAX_RX_DESCR *\n-\t\t\t\t\t     macb_dma_desc_get_size(bp)),\n-\t\t\t\t\t    \u0026queue-\u003erx_ring_dma, GFP_KERNEL);\n-\tif (!queue-\u003erx_ring)\n+\trxq-\u003ering = dma_alloc_coherent(\u0026bp-\u003epdev-\u003edev,\n+\t\t\t\t       (AT91ETHER_MAX_RX_DESCR *\n+\t\t\t\t\tmacb_dma_desc_get_size(\u0026bp-\u003einfo)),\n+\t\t\t\t       \u0026rxq-\u003ering_dma, GFP_KERNEL);\n+\tif (!rxq-\u003ering)\n \t\treturn -ENOMEM;\n \n-\tqueue-\u003erx_buffers = dma_alloc_coherent(\u0026bp-\u003epdev-\u003edev,\n-\t\t\t\t\t       AT91ETHER_MAX_RX_DESCR *\n-\t\t\t\t\t       AT91ETHER_MAX_RBUFF_SZ,\n-\t\t\t\t\t       \u0026queue-\u003erx_buffers_dma,\n-\t\t\t\t\t       GFP_KERNEL);\n-\tif (!queue-\u003erx_buffers) {\n+\trxq-\u003ebuffers = dma_alloc_coherent(\u0026bp-\u003epdev-\u003edev,\n+\t\t\t\t\t  AT91ETHER_MAX_RX_DESCR *\n+\t\t\t\t\t  AT91ETHER_MAX_RBUFF_SZ,\n+\t\t\t\t\t  \u0026rxq-\u003ebuffers_dma,\n+\t\t\t\t\t  GFP_KERNEL);\n+\tif (!rxq-\u003ebuffers) {\n \t\tdma_free_coherent(\u0026bp-\u003epdev-\u003edev,\n \t\t\t\t  AT91ETHER_MAX_RX_DESCR *\n-\t\t\t\t  macb_dma_desc_get_size(bp),\n-\t\t\t\t  queue-\u003erx_ring, queue-\u003erx_ring_dma);\n-\t\tqueue-\u003erx_ring = NULL;\n+\t\t\t\t  macb_dma_desc_get_size(\u0026bp-\u003einfo),\n+\t\t\t\t  rxq-\u003ering, rxq-\u003ering_dma);\n+\t\trxq-\u003ering = NULL;\n \t\treturn -ENOMEM;\n \t}\n \n@@ -5106,29 +5420,29 @@ static int at91ether_alloc_coherent(struct macb *bp)\n \n static void at91ether_free_coherent(struct macb *bp)\n {\n-\tstruct macb_queue *queue = \u0026bp-\u003equeues[0];\n+\tstruct macb_rxq *rxq = \u0026bp-\u003ectx-\u003erxq[0];\n \n-\tif (queue-\u003erx_ring) {\n+\tif (rxq-\u003ering) {\n \t\tdma_free_coherent(\u0026bp-\u003epdev-\u003edev,\n \t\t\t\t  AT91ETHER_MAX_RX_DESCR *\n-\t\t\t\t  macb_dma_desc_get_size(bp),\n-\t\t\t\t  queue-\u003erx_ring, queue-\u003erx_ring_dma);\n-\t\tqueue-\u003erx_ring = NULL;\n+\t\t\t\t  macb_dma_desc_get_size(\u0026bp-\u003einfo),\n+\t\t\t\t  rxq-\u003ering, rxq-\u003ering_dma);\n+\t\trxq-\u003ering = NULL;\n \t}\n \n-\tif (queue-\u003erx_buffers) {\n+\tif (rxq-\u003ebuffers) {\n \t\tdma_free_coherent(\u0026bp-\u003epdev-\u003edev,\n \t\t\t\t  AT91ETHER_MAX_RX_DESCR *\n \t\t\t\t  AT91ETHER_MAX_RBUFF_SZ,\n-\t\t\t\t  queue-\u003erx_buffers, queue-\u003erx_buffers_dma);\n-\t\tqueue-\u003erx_buffers = NULL;\n+\t\t\t\t  rxq-\u003ebuffers, rxq-\u003ebuffers_dma);\n+\t\trxq-\u003ebuffers = NULL;\n \t}\n }\n \n /* Initialize and start the Receiver and Transmit subsystems */\n static int at91ether_start(struct macb *bp)\n {\n-\tstruct macb_queue *queue = \u0026bp-\u003equeues[0];\n+\tstruct macb_rxq *rxq = \u0026bp-\u003ectx-\u003erxq[0];\n \tstruct macb_dma_desc *desc;\n \tdma_addr_t addr;\n \tu32 ctl;\n@@ -5138,10 +5452,10 @@ static int at91ether_start(struct macb *bp)\n \tif (ret)\n \t\treturn ret;\n \n-\taddr = queue-\u003erx_buffers_dma;\n+\taddr = rxq-\u003ebuffers_dma;\n \tfor (i = 0; i \u003c AT91ETHER_MAX_RX_DESCR; i++) {\n-\t\tdesc = macb_rx_desc(queue, i);\n-\t\tmacb_set_addr(bp, desc, addr);\n+\t\tdesc = macb_rx_desc(bp-\u003ectx, 0, i);\n+\t\tmacb_set_addr(\u0026bp-\u003einfo, desc, addr);\n \t\tdesc-\u003ectrl = 0;\n \t\taddr += AT91ETHER_MAX_RBUFF_SZ;\n \t}\n@@ -5150,10 +5464,10 @@ static int at91ether_start(struct macb *bp)\n \tdesc-\u003eaddr |= MACB_BIT(RX_WRAP);\n \n \t/* Reset buffer index */\n-\tqueue-\u003erx_tail = 0;\n+\trxq-\u003etail = 0;\n \n \t/* Program address of descriptor list in Rx Buffer Queue register */\n-\tmacb_writel(bp, RBQP, queue-\u003erx_ring_dma);\n+\tmacb_writel(bp, RBQP, rxq-\u003ering_dma);\n \n \t/* Enable Receive and Transmit */\n \tctl = macb_readl(bp, NCR);\n@@ -5188,6 +5502,8 @@ static void at91ether_stop(struct macb *bp)\n \tctl = macb_readl(bp, NCR);\n \tmacb_writel(bp, NCR, ctl \u0026 ~(MACB_BIT(TE) | MACB_BIT(RE)));\n \n+\tsynchronize_irq(bp-\u003enetdev-\u003eirq);\n+\n \t/* Free resources. */\n \tat91ether_free_coherent(bp);\n }\n@@ -5203,6 +5519,14 @@ static int at91ether_open(struct net_device *netdev)\n \tif (ret \u003c 0)\n \t\treturn ret;\n \n+\tWRITE_ONCE(bp-\u003ectx, kzalloc_obj(*bp-\u003ectx));\n+\twmb(); /* ensure IRQ enabled below read the new context */\n+\tif (!bp-\u003ectx) {\n+\t\tret = -ENOMEM;\n+\t\tgoto pm_exit;\n+\t}\n+\tbp-\u003ectx-\u003einfo = \u0026bp-\u003einfo;\n+\n \t/* Clear internal statistics */\n \tctl = macb_readl(bp, NCR);\n \tmacb_writel(bp, NCR, ctl | MACB_BIT(CLRSTAT));\n@@ -5211,7 +5535,7 @@ static int at91ether_open(struct net_device *netdev)\n \n \tret = at91ether_start(bp);\n \tif (ret)\n-\t\tgoto pm_exit;\n+\t\tgoto free_ctx;\n \n \tret = macb_phylink_connect(bp);\n \tif (ret)\n@@ -5223,6 +5547,9 @@ static int at91ether_open(struct net_device *netdev)\n \n stop:\n \tat91ether_stop(bp);\n+free_ctx:\n+\tkfree(bp-\u003ectx);\n+\tbp-\u003ectx = NULL;\n pm_exit:\n \tpm_runtime_put_sync(\u0026bp-\u003epdev-\u003edev);\n \treturn ret;\n@@ -5240,6 +5567,9 @@ static int at91ether_close(struct net_device *netdev)\n \n \tat91ether_stop(bp);\n \n+\tkfree(bp-\u003ectx);\n+\tbp-\u003ectx = NULL;\n+\n \tpm_runtime_put(\u0026bp-\u003epdev-\u003edev);\n \n \treturn 0;\n@@ -5290,16 +5620,15 @@ static netdev_tx_t at91ether_start_xmit(struct sk_buff *skb,\n static void at91ether_rx(struct net_device *netdev)\n {\n \tstruct macb *bp = netdev_priv(netdev);\n-\tstruct macb_queue *queue = \u0026bp-\u003equeues[0];\n+\tstruct macb_rxq *rxq = \u0026bp-\u003ectx-\u003erxq[0];\n \tstruct macb_dma_desc *desc;\n \tunsigned char *p_recv;\n \tstruct sk_buff *skb;\n \tunsigned int pktlen;\n \n-\tdesc = macb_rx_desc(queue, queue-\u003erx_tail);\n+\tdesc = macb_rx_desc(bp-\u003ectx, 0, rxq-\u003etail);\n \twhile (desc-\u003eaddr \u0026 MACB_BIT(RX_USED)) {\n-\t\tp_recv = queue-\u003erx_buffers +\n-\t\t\t queue-\u003erx_tail * AT91ETHER_MAX_RBUFF_SZ;\n+\t\tp_recv = rxq-\u003ebuffers + rxq-\u003etail * AT91ETHER_MAX_RBUFF_SZ;\n \t\tpktlen = MACB_BF(RX_FRMLEN, desc-\u003ectrl);\n \t\tskb = netdev_alloc_skb(netdev, pktlen + 2);\n \t\tif (skb) {\n@@ -5321,12 +5650,12 @@ static void at91ether_rx(struct net_device *netdev)\n \t\tdesc-\u003eaddr \u0026= ~MACB_BIT(RX_USED);\n \n \t\t/* wrap after last buffer */\n-\t\tif (queue-\u003erx_tail == AT91ETHER_MAX_RX_DESCR - 1)\n-\t\t\tqueue-\u003erx_tail = 0;\n+\t\tif (rxq-\u003etail == AT91ETHER_MAX_RX_DESCR - 1)\n+\t\t\trxq-\u003etail = 0;\n \t\telse\n-\t\t\tqueue-\u003erx_tail++;\n+\t\t\trxq-\u003etail++;\n \n-\t\tdesc = macb_rx_desc(queue, queue-\u003erx_tail);\n+\t\tdesc = macb_rx_desc(bp-\u003ectx, 0, rxq-\u003etail);\n \t}\n }\n \n@@ -5656,13 +5985,13 @@ static int macb_alloc_tieoff(struct macb *bp)\n \t\treturn 0;\n \n \tbp-\u003erx_ring_tieoff = dma_alloc_coherent(\u0026bp-\u003epdev-\u003edev,\n-\t\t\t\t\t\tmacb_dma_desc_get_size(bp),\n+\t\t\t\t\t\tmacb_dma_desc_get_size(\u0026bp-\u003einfo),\n \t\t\t\t\t\t\u0026bp-\u003erx_ring_tieoff_dma,\n \t\t\t\t\t\tGFP_KERNEL);\n \tif (!bp-\u003erx_ring_tieoff)\n \t\treturn -ENOMEM;\n \n-\tmacb_set_addr(bp, bp-\u003erx_ring_tieoff,\n+\tmacb_set_addr(\u0026bp-\u003einfo, bp-\u003erx_ring_tieoff,\n \t\t      MACB_BIT(RX_WRAP) | MACB_BIT(RX_USED));\n \n \tbp-\u003erx_ring_tieoff-\u003ectrl = 0;\n@@ -5675,7 +6004,7 @@ static void macb_free_tieoff(struct macb *bp)\n \tif (!bp-\u003erx_ring_tieoff)\n \t\treturn;\n \n-\tdma_free_coherent(\u0026bp-\u003epdev-\u003edev, macb_dma_desc_get_size(bp),\n+\tdma_free_coherent(\u0026bp-\u003epdev-\u003edev, macb_dma_desc_get_size(\u0026bp-\u003einfo),\n \t\t\t  bp-\u003erx_ring_tieoff,\n \t\t\t  bp-\u003erx_ring_tieoff_dma);\n \tbp-\u003erx_ring_tieoff = NULL;\n@@ -5918,6 +6247,7 @@ static int macb_probe(struct platform_device *pdev)\n \tu32 wtrmrk_rst_val;\n \tvoid __iomem *mem;\n \tstruct macb *bp;\n+\tunsigned int q;\n \tint num_queues;\n \tbool native_io;\n \tint err, val;\n@@ -5963,6 +6293,8 @@ static int macb_probe(struct platform_device *pdev)\n \tbp-\u003enetdev = netdev;\n \tbp-\u003eregs = mem;\n \tbp-\u003enative_io = native_io;\n+\tfor (q = 0; q \u003c MACB_MAX_QUEUES; q++)\n+\t\tbp-\u003einfo.queue_stats[q] = \u0026bp-\u003equeues[q].stats;\n \tif (native_io) {\n \t\tbp-\u003emacb_reg_readl = hw_readl_native;\n \t\tbp-\u003emacb_reg_writel = hw_writel_native;\n@@ -6020,10 +6352,20 @@ static int macb_probe(struct platform_device *pdev)\n \tspin_lock_init(\u0026bp-\u003elock);\n \tspin_lock_init(\u0026bp-\u003estats_lock);\n \tspin_lock_init(\u0026bp-\u003etsu_clk_lock);\n+\tmutex_init(\u0026bp-\u003emac_cfg_lock);\n \n \t/* setup capabilities */\n \tmacb_configure_caps(bp, macb_config);\n \n+\tif (bp-\u003ecaps \u0026 MACB_CAPS_MACB_IS_EMAC) {\n+\t\t/* The name is lying on EMAC: sizes aren't configurable. */\n+\t\tbp-\u003econfigured_rx_ring_size = AT91ETHER_MAX_RX_DESCR;\n+\t\tbp-\u003econfigured_tx_ring_size = 1; /* tiny ring buffer */\n+\t} else {\n+\t\tbp-\u003econfigured_rx_ring_size = DEFAULT_RX_RING_SIZE;\n+\t\tbp-\u003econfigured_tx_ring_size = DEFAULT_TX_RING_SIZE;\n+\t}\n+\n #ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT\n \tif (GEM_BFEXT(DAW64, gem_readl(bp, DCFG6))) {\n \t\terr = dma_set_mask_and_coherent(\u0026pdev-\u003edev, DMA_BIT_MASK(44));\n@@ -6054,12 +6396,12 @@ static int macb_probe(struct platform_device *pdev)\n \t\tval = GEM_BFEXT(RXBD_RDBUFF, gem_readl(bp, DCFG10));\n \t\tif (val)\n \t\t\tbp-\u003erx_bd_rd_prefetch = (2 \u003c\u003c (val - 1)) *\n-\t\t\t\t\t\tmacb_dma_desc_get_size(bp);\n+\t\t\t\t\t\tmacb_dma_desc_get_size(\u0026bp-\u003einfo);\n \n \t\tval = GEM_BFEXT(TXBD_RDBUFF, gem_readl(bp, DCFG10));\n \t\tif (val)\n \t\t\tbp-\u003etx_bd_rd_prefetch = (2 \u003c\u003c (val - 1)) *\n-\t\t\t\t\t\tmacb_dma_desc_get_size(bp);\n+\t\t\t\t\t\tmacb_dma_desc_get_size(\u0026bp-\u003einfo);\n \t}\n \n \tbp-\u003erx_intr_mask = MACB_RX_INT_FLAGS;\n@@ -6104,8 +6446,9 @@ static int macb_probe(struct platform_device *pdev)\n \t}\n \n \tnetdev_info(netdev, \"Cadence %s rev 0x%08x at 0x%08lx irq %d (%pM)\\n\",\n-\t\t    macb_is_gem(bp) ? \"GEM\" : \"MACB\", macb_readl(bp, MID),\n-\t\t    netdev-\u003ebase_addr, netdev-\u003eirq, netdev-\u003edev_addr);\n+\t\t    macb_is_gem(\u0026bp-\u003einfo) ? \"GEM\" : \"MACB\",\n+\t\t    macb_readl(bp, MID), netdev-\u003ebase_addr, netdev-\u003eirq,\n+\t\t    netdev-\u003edev_addr);\n \n \tpm_runtime_put_autosuspend(\u0026bp-\u003epdev-\u003edev);\n \n@@ -6237,7 +6580,7 @@ static int __maybe_unused macb_suspend(struct device *dev)\n \t\t\ttmp |= MACB_BFEXT(IP, ifa_local);\n \t\t}\n \n-\t\tif (macb_is_gem(bp)) {\n+\t\tif (macb_is_gem(\u0026bp-\u003einfo)) {\n \t\t\tqueue_writel(bp-\u003equeues, IER, GEM_BIT(WOL));\n \t\t\tgem_writel(bp, WOL, tmp);\n \t\t} else {\n@@ -6283,6 +6626,7 @@ static int __maybe_unused macb_resume(struct device *dev)\n {\n \tstruct net_device *netdev = dev_get_drvdata(dev);\n \tstruct macb *bp = netdev_priv(netdev);\n+\tstruct macb_context *ctx = bp-\u003ectx;\n \tstruct macb_queue *queue;\n \tunsigned long flags;\n \tunsigned int q;\n@@ -6299,7 +6643,7 @@ static int __maybe_unused macb_resume(struct device *dev)\n \tif (bp-\u003ewol \u0026 MACB_WOL_ENABLED) {\n \t\tspin_lock_irqsave(\u0026bp-\u003elock, flags);\n \t\t/* Disable WoL */\n-\t\tif (macb_is_gem(bp)) {\n+\t\tif (macb_is_gem(\u0026bp-\u003einfo)) {\n \t\t\tqueue_writel(bp-\u003equeues, IDR, GEM_BIT(WOL));\n \t\t\tgem_writel(bp, WOL, 0);\n \t\t} else {\n@@ -6327,10 +6671,10 @@ static int __maybe_unused macb_resume(struct device *dev)\n \tfor (q = 0, queue = bp-\u003equeues; q \u003c bp-\u003enum_queues;\n \t     ++q, ++queue) {\n \t\tif (!(bp-\u003ecaps \u0026 MACB_CAPS_MACB_IS_EMAC)) {\n-\t\t\tif (macb_is_gem(bp))\n-\t\t\t\tgem_init_rx_ring(queue);\n+\t\t\tif (macb_is_gem(\u0026bp-\u003einfo))\n+\t\t\t\tgem_init_rx_ring(ctx, q);\n \t\t\telse\n-\t\t\t\tmacb_init_rx_ring(queue);\n+\t\t\t\tmacb_init_rx_ring(ctx, q);\n \t\t}\n \n \t\tnapi_enable(\u0026queue-\u003enapi_rx);\ndiff --git a/drivers/net/ethernet/cadence/macb_ptp.c b/drivers/net/ethernet/cadence/macb_ptp.c\nindex 2fd063394698e..28e0e48b42d85 100644\n--- a/drivers/net/ethernet/cadence/macb_ptp.c\n+++ b/drivers/net/ethernet/cadence/macb_ptp.c\n@@ -28,10 +28,10 @@\n static struct macb_dma_desc_ptp *macb_ptp_desc(struct macb *bp,\n \t\t\t\t\t       struct macb_dma_desc *desc)\n {\n-\tif (!macb_dma_ptp(bp))\n+\tif (!macb_dma_ptp(\u0026bp-\u003einfo))\n \t\treturn NULL;\n \n-\tif (macb_dma64(bp))\n+\tif (macb_dma64(\u0026bp-\u003einfo))\n \t\treturn (struct macb_dma_desc_ptp *)\n \t\t\t\t((u8 *)desc + sizeof(struct macb_dma_desc)\n \t\t\t\t+ sizeof(struct macb_dma_desc_64));\n@@ -380,7 +380,7 @@ int gem_get_hwtst(struct net_device *netdev,\n \tstruct macb *bp = netdev_priv(netdev);\n \n \t*tstamp_config = bp-\u003etstamp_config;\n-\tif (!macb_dma_ptp(bp))\n+\tif (!macb_dma_ptp(\u0026bp-\u003einfo))\n \t\treturn -EOPNOTSUPP;\n \n \treturn 0;\n@@ -399,7 +399,7 @@ int gem_set_hwtst(struct net_device *netdev,\n \tu32 ncr_bits = 0;\n \tu32 regval;\n \n-\tif (!macb_dma_ptp(bp))\n+\tif (!macb_dma_ptp(\u0026bp-\u003einfo))\n \t\treturn -EOPNOTSUPP;\n \n \tswitch (tstamp_config-\u003etx_type) {\n"
}

2/1 2026/10/13 16:29 agent patch-evaluator
1m Model:
core

Args:
null

Results:
{
  "EnableConfigs": null,
  "FocusSymbols": [],
  "Reasoning": "The patch modifies the Cadence MACB/GEM Ethernet driver (drivers/net/ethernet/cadence/). This driver controls Cadence MACB/GEM controllers present on embedded SoCs (e.g., Microchip AT91, Xilinx Zynq, SiFive RISC-V) or via a vendor-specific PCI development board (0x17cd:0xe007). Neither device is emulated in standard virtualized environments (QEMU/GCE) on amd64. Consequently, the modified code is structurally unreachable on the target architecture and does not warrant fuzzing.",
  "WorthFuzzing": false
}

Instruction:
You are an expert Linux kernel maintainer and security engineer.
Your job is to review a provided patch series and evaluate whether it warrants fuzzing with syzkaller.

IMPORTANT: The changes have ALREADY been applied and committed as the HEAD commit in
your workspace. Do NOT rely on internal assumptions. You must actively use your code access
tools to inspect the actual source code, callers, and surrounding context.

================================================================================
1. CORE TRIAGE PHILOSOPHY
================================================================================
The goal of patch fuzzing is to discover crashes, regressions, exposed latent bugs,
and newly triggered assertions introduced by the patch series.

- REACHABILITY IS THE PRIMARY GATE:
  Fuzzing can only discover bugs in code that can actually execute in standard virtualized
  environments (GCE or QEMU, utilizing software-emulated devices like USB gadgets, netdev, tun/tap).
  If the modified code is structurally unreachable (see Section 2), it MUST NOT be fuzzed,
  regardless of whether it adds assertions or complex logic.

- DO NOT BLINDLY TRUST "NO FUNCTIONAL CHANGE" (NFCI) OR "REFACTORING" CLAIMS:
  Patch authors routinely label changes as "cleanups", "refactorings", or state
  "No functional change intended". Do NOT take these claims at face value.
  Code refactorings that rearrange logic, introduce helper functions, or alter state management
  in core subsystems frequently introduce subtle semantic shifts or uncover latent kernel bugs.
  If reachable executable code is modified or refactored, it MUST be fuzzed.

- NEW OR MODIFIED ASSERTIONS IN REACHABLE CODE MUST BE FUZZED:
  When a patch introduces or modifies runtime checks or assertions (e.g., WARN_ON*, VM_WARN_ON*,
  BUG_ON*, lockdep_assert*) in reachable code paths, it enforces new or stricter invariants.
  Even if the author believes the invariant always holds, fuzzing is essential to verify whether
  an unusual sequence of operations can violate it.

================================================================================
2. WHEN TO RETURN WorthFuzzing=false (NEGATIVE CRITERIA)
================================================================================
Return WorthFuzzing=false ONLY IF all modified code falls strictly into one or more of these categories:

- Non-kernel and non-executable changes:
  * Modifications to Documentation/, comments, or spelling fixes.
  * User-space directories, self-tests, samples, or scripts (e.g., tools/, samples/, scripts/, usr/)
    that do not affect the compiled kernel image (vmlinux) or kernel modules.
  * Purely decorative logging (e.g., message strings in pr_err, printk, dev_info) or tracepoints
    that do not alter control flow or data structures.
  * Build system or Kconfig changes that do not alter compiled C logic.
- Structurally unreachable hardware:
  * Vendor-specific PCIe switches, SmartNICs, or GPU drivers (e.g., mlxsw, pds_core, qed,
    ionic, amdgpu) requiring physical ASIC/PCIe cards not emulated in standard QEMU.
- Unreachable execution paths:
  * Driver teardown callbacks (.remove, .shutdown, pci_unregister_driver) executed only during
    physical PCI hot-unplug or manual sysfs driver unbinding.
  * Code paths exclusive to architectures other than the target architecture.

================================================================================
3. WHEN TO RETURN WorthFuzzing=true (POSITIVE CRITERIA)
================================================================================
Return WorthFuzzing=true whenever the patch touches reachable executable code, including:
- Core Subsystems:
  * Any logic modifications in memory management (mm/), synchronization/locking (kernel/locking/),
    BPF, scheduler, core networking, VFS, or syscall handling.
- Refactorings and Code Cleanups:
  * Any restructuring of reachable data structures, helper abstractions, or algorithm flows.
- Runtime Assertions and Defensive Checks:
  * Any introduction or alteration of assertions (WARN_ON*, VM_WARN_ON*, BUG_ON*, etc.) in reachable paths.
- Reachable Drivers and Protocols:
  * Drivers accessible via virtual buses (virtio, USB gadget, loopback, netlink, binder, sockets, etc.).

================================================================================
4. EXTRACTING FocusSymbols (PREVENTING DILUTION)
================================================================================
When WorthFuzzing=true, you must extract specific kernel functions into FocusSymbols to guide the fuzzer:

- AVOID UBIQUITOUS LIFECYCLE HOT-PATHS:
  Do NOT list generic, ubiquitous functions called by almost every program in the corpus
  (including, but not limited to: general memory allocators and deallocators, page fault
  and trap handlers, or core synchronization primitives; this is not an exhaustive list).
  Listing ubiquitous functions causes the fuzzer to classify thousands of unrelated tests as "focused",
  which severely dilutes fuzzing effort away from the actual changes.

- TARGET SPECIFIC FEATURE LOGIC AND ENTRYPOINTS:
  List functions that specifically implement the logic being added or altered, or direct API entrypoints
  for the subsystem feature under review.

- HANDLING STATIC INLINE FUNCTIONS IN HEADERS (.h):
  Compiler-inlined static functions (such as static inlines in mm/*.h or include/linux/*.h) lack
  distinct symbol addresses in vmlinux and cannot be targeted directly by symbol coverage filters.
  If the changes are primarily in static inline helpers, identify non-static, feature-specific caller
  functions in .c files that exercise them (avoiding ubiquitous lifecycle wrappers).

================================================================================
5. IDENTIFYING EnableConfigs
================================================================================
Identify any specific CONFIG_ options required to properly compile and reach the modified code:
- Inspect Kconfig files and #ifdef guards; do not make assumptions.
- Check "depends on" lines in Kconfig to include any non-standard parent subsystem configs needed.
- Strip any 'CONFIG_' prefix (e.g., return "NET_IPV4" instead of "CONFIG_NET_IPV4").
Prefer calling several tools at the same time to save round-trips.


Use set-results tool to provide results of the analysis.
It must be called exactly once before the final reply.
Ignore results of this tool.

Prompt:
Target architecture: amd64

For your convenience, here is the diff of the changes:
commit 923d631517ddd0466c0896873ca255ea98f68f21
Author: syz-cluster <triage@syzkaller.com>
Date:   Tue Oct 13 16:29:33 2026 +0000

    syz-cluster: applied patch under review

diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h
index 82499ec6a9f0d..b7b4b6a382980 100644
--- a/drivers/net/ethernet/cadence/macb.h
+++ b/drivers/net/ethernet/cadence/macb.h
@@ -834,7 +834,7 @@
  */
 #define macb_or_gem_writel(__bp, __reg, __value) \
 	({ \
-		if (macb_is_gem((__bp))) \
+		if (macb_is_gem(&(__bp)->info)) \
 			gem_writel((__bp), __reg, __value); \
 		else \
 			macb_writel((__bp), __reg, __value); \
@@ -843,7 +843,7 @@
 #define macb_or_gem_readl(__bp, __reg) \
 	({ \
 		u32 __v; \
-		if (macb_is_gem((__bp))) \
+		if (macb_is_gem(&(__bp)->info)) \
 			__v = gem_readl((__bp), __reg); \
 		else \
 			__v = macb_readl((__bp), __reg); \
@@ -1193,11 +1193,12 @@ static const struct gem_statistic queue_statistics[] = {
 
 struct macb;
 struct macb_queue;
+struct macb_context;
 
 struct macb_or_gem_ops {
-	int	(*mog_alloc_rx_buffers)(struct macb *bp);
-	void	(*mog_free_rx_buffers)(struct macb *bp);
-	int	(*mog_init_rings)(struct macb *bp);
+	int	(*mog_alloc_rx_buffers)(struct macb_context *ctx);
+	void	(*mog_free_rx_buffers)(struct macb_context *ctx);
+	int	(*mog_init_rings)(struct macb_context *ctx);
 	int	(*mog_rx)(struct macb_queue *queue, struct napi_struct *napi,
 			  int budget);
 };
@@ -1267,23 +1268,12 @@ struct macb_queue {
 	unsigned int		ENST_ON_TIME;
 	unsigned int		ENST_OFF_TIME;
 
-	/* Lock to protect tx_head and tx_tail */
+	/* Lock to protect ctx->txq[q].head and ctx->txq[q].tail */
 	spinlock_t		tx_ptr_lock;
-	unsigned int		tx_head, tx_tail;
-	struct macb_dma_desc	*tx_ring;
-	struct macb_tx_skb	*tx_skb;
-	dma_addr_t		tx_ring_dma;
 	struct work_struct	tx_error_task;
 	bool			txubr_pending;
 	struct napi_struct	napi_tx;
 
-	dma_addr_t		rx_ring_dma;
-	dma_addr_t		rx_buffers_dma;
-	unsigned int		rx_tail;
-	unsigned int		rx_prepared_head;
-	struct macb_dma_desc	*rx_ring;
-	struct sk_buff		**rx_skbuff;
-	void			*rx_buffers;
 	struct napi_struct	napi_rx;
 	struct queue_stats stats;
 };
@@ -1298,6 +1288,45 @@ struct ethtool_rx_fs_list {
 	unsigned int count;
 };
 
+struct macb_info {
+	struct platform_device	*pdev;
+	struct net_device	*netdev;
+	struct macb_or_gem_ops	macbgem_ops;
+	unsigned int		num_queues;
+	u32			caps;
+	int			rx_bd_rd_prefetch;
+	int			tx_bd_rd_prefetch;
+	struct queue_stats	*queue_stats[MACB_MAX_QUEUES];
+};
+
+struct macb_rxq {
+	struct macb_dma_desc	*ring;		/* MACB & GEM */
+	dma_addr_t		ring_dma;	/* MACB & GEM */
+	unsigned int		tail;		/* MACB & GEM */
+	unsigned int		prepared_head;	/* GEM */
+	struct sk_buff		**skbuff;	/* GEM */
+	dma_addr_t		buffers_dma;	/* MACB */
+	void			*buffers;	/* MACB */
+};
+
+struct macb_txq {
+	unsigned int		head;
+	unsigned int		tail;
+	struct macb_dma_desc	*ring;
+	dma_addr_t		ring_dma;
+	struct macb_tx_skb	*skb;
+};
+
+struct macb_context {
+	const struct macb_info	*info;
+
+	unsigned int		rx_buffer_size;
+	unsigned int		rx_ring_size;
+	unsigned int		tx_ring_size;
+	struct macb_rxq		rxq[MACB_MAX_QUEUES];
+	struct macb_txq		txq[MACB_MAX_QUEUES];
+};
+
 struct macb {
 	void __iomem		*regs;
 	bool			native_io;
@@ -1306,24 +1335,36 @@ struct macb {
 	u32	(*macb_reg_readl)(struct macb *bp, int offset);
 	void	(*macb_reg_writel)(struct macb *bp, int offset, u32 value);
 
+	/*
+	 * Give direct access (bp->caps) and
+	 * allow taking a pointer to it (&bp->info) for contexts.
+	 */
+	union {
+		struct macb_info;
+		struct macb_info info;
+	};
+
+	/*
+	 * Context stores all its parameters.
+	 * But we must remember them across closure.
+	 */
+	unsigned int		configured_rx_ring_size;
+	unsigned int		configured_tx_ring_size;
+	struct macb_context	*ctx;
+
 	struct macb_dma_desc	*rx_ring_tieoff;
 	dma_addr_t		rx_ring_tieoff_dma;
-	size_t			rx_buffer_size;
-
-	unsigned int		rx_ring_size;
-	unsigned int		tx_ring_size;
 
-	unsigned int		num_queues;
 	struct macb_queue	queues[MACB_MAX_QUEUES];
 
 	spinlock_t		lock;
-	struct platform_device	*pdev;
+	/* Serializes context swap against phylink MAC callbacks. */
+	struct mutex		mac_cfg_lock;
 	struct clk		*pclk;
 	struct clk		*hclk;
 	struct clk		*tx_clk;
 	struct clk		*rx_clk;
 	struct clk		*tsu_clk;
-	struct net_device	*netdev;
 	/* Protects hw_stats and ethtool_stats */
 	spinlock_t		stats_lock;
 	union {
@@ -1331,15 +1372,12 @@ struct macb {
 		struct gem_stats	gem;
 	}			hw_stats;
 
-	struct macb_or_gem_ops	macbgem_ops;
-
 	struct mii_bus		*mii_bus;
 	struct phylink		*phylink;
 	struct phylink_config	phylink_config;
 	struct phylink_pcs	phylink_usx_pcs;
 	struct phylink_pcs	phylink_sgmii_pcs;
 
-	u32			caps;
 	unsigned int		dma_burst_length;
 
 	phy_interface_t		phy_interface;
@@ -1383,12 +1421,12 @@ struct macb {
 	u32			tx_lpi_timer;
 
 	/* ISR must not drive NAPI & BH mechanisms. True when the interface
-	 * is closed. Protected by bp->lock.
+	 * is closed or during context-swap. Protected by bp->lock.
 	 */
 	bool			irq_quiesced;
 
-	int	rx_bd_rd_prefetch;
-	int	tx_bd_rd_prefetch;
+	/* Redundant to netif_carrier_ok(), but set under bp->mac_cfg_lock. */
+	bool			link_up;
 
 	u32	rx_intr_mask;
 
@@ -1441,14 +1479,15 @@ static inline void gem_ptp_do_txstamp(struct macb *bp, struct sk_buff *skb, stru
 static inline void gem_ptp_do_rxstamp(struct macb *bp, struct sk_buff *skb, struct macb_dma_desc *desc) { }
 #endif
 
-static inline bool macb_is_gem(struct macb *bp)
+static inline bool macb_is_gem(const struct macb_info *info)
 {
-	return !!(bp->caps & MACB_CAPS_MACB_IS_GEM);
+	return !!(info->caps & MACB_CAPS_MACB_IS_GEM);
 }
 
-static inline bool gem_has_ptp(struct macb *bp)
+static inline bool gem_has_ptp(const struct macb_info *info)
 {
-	return IS_ENABLED(CONFIG_MACB_USE_HWSTAMP) && (bp->caps & MACB_CAPS_GEM_HAS_PTP);
+	return IS_ENABLED(CONFIG_MACB_USE_HWSTAMP) &&
+	       (info->caps & MACB_CAPS_GEM_HAS_PTP);
 }
 
 /* ENST Helper functions */
@@ -1464,16 +1503,16 @@ static inline u64 enst_max_hw_interval(u32 speed_mbps)
 			    ENST_TIME_GRANULARITY_NS * 1000, (speed_mbps));
 }
 
-static inline bool macb_dma64(struct macb *bp)
+static inline bool macb_dma64(const struct macb_info *info)
 {
 	return IS_ENABLED(CONFIG_ARCH_DMA_ADDR_T_64BIT) &&
-	       bp->caps & MACB_CAPS_DMA_64B;
+	       info->caps & MACB_CAPS_DMA_64B;
 }
 
-static inline bool macb_dma_ptp(struct macb *bp)
+static inline bool macb_dma_ptp(const struct macb_info *info)
 {
 	return IS_ENABLED(CONFIG_MACB_USE_HWSTAMP) &&
-	       bp->caps & MACB_CAPS_DMA_PTP;
+	       info->caps & MACB_CAPS_DMA_PTP;
 }
 
 static inline void macb_queue_isr_clear(struct macb *bp,
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index 020a47353d011..f087f278f9e56 100644
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -61,7 +61,7 @@ struct sifive_fu540_macb_mgmt {
 #define MAX_TX_RING_SIZE	4096
 
 /* level of occupied TX descriptors under which we wake up TX process */
-#define MACB_TX_WAKEUP_THRESH(bp)	(3 * (bp)->tx_ring_size / 4)
+#define MACB_TX_WAKEUP_THRESH(bp)	(3 * (bp)->ctx->tx_ring_size / 4)
 
 #define MACB_RX_INT_FLAGS	(MACB_BIT(RCOMP) | MACB_BIT(ISR_ROVR))
 #define MACB_TX_ERR_FLAGS	(MACB_BIT(ISR_TUND)			\
@@ -126,75 +126,104 @@ struct sifive_fu540_macb_mgmt {
  *    word 5: timestamp word 1
  *    word 6: timestamp word 2
  */
-static unsigned int macb_dma_desc_get_size(struct macb *bp)
+static unsigned int macb_dma_desc_get_size(const struct macb_info *info)
 {
 	unsigned int desc_size = sizeof(struct macb_dma_desc);
 
-	if (macb_dma64(bp))
+	if (macb_dma64(info))
 		desc_size += sizeof(struct macb_dma_desc_64);
-	if (macb_dma_ptp(bp))
+	if (macb_dma_ptp(info))
 		desc_size += sizeof(struct macb_dma_desc_ptp);
 
 	return desc_size;
 }
 
-static unsigned int macb_adj_dma_desc_idx(struct macb *bp, unsigned int desc_idx)
+static unsigned int macb_adj_dma_desc_idx(struct macb_context *ctx,
+					  unsigned int desc_idx)
 {
-	return desc_idx * (1 + macb_dma64(bp) + macb_dma_ptp(bp));
+	return desc_idx * (1 + macb_dma64(ctx->info) +
+			       macb_dma_ptp(ctx->info));
 }
 
-static struct macb_dma_desc_64 *macb_64b_desc(struct macb *bp, struct macb_dma_desc *desc)
+static struct macb_dma_desc_64 *macb_64b_desc(struct macb_dma_desc *desc)
 {
 	return (struct macb_dma_desc_64 *)((void *)desc
 		+ sizeof(struct macb_dma_desc));
 }
 
 /* Ring buffer accessors */
-static unsigned int macb_tx_ring_wrap(struct macb *bp, unsigned int index)
+static unsigned int macb_tx_ring_wrap(struct macb_context *ctx,
+				      unsigned int index)
 {
-	return index & (bp->tx_ring_size - 1);
+	return index & (ctx->tx_ring_size - 1);
 }
 
-static struct macb_dma_desc *macb_tx_desc(struct macb_queue *queue,
+static struct macb_txq *macb_txq(struct macb_queue *queue)
+{
+	struct macb *bp = queue->bp;
+	unsigned int q = queue - bp->queues;
+
+	return &bp->ctx->txq[q];
+}
+
+static struct macb_rxq *macb_rxq(struct macb_queue *queue)
+{
+	struct macb *bp = queue->bp;
+	unsigned int q = queue - bp->queues;
+
+	return &bp->ctx->rxq[q];
+}
+
+static struct macb_dma_desc *macb_tx_desc(struct macb_context *ctx,
+					  unsigned int q,
 					  unsigned int index)
 {
-	index = macb_tx_ring_wrap(queue->bp, index);
-	index = macb_adj_dma_desc_idx(queue->bp, index);
-	return &queue->tx_ring[index];
+	index = macb_tx_ring_wrap(ctx, index);
+	index = macb_adj_dma_desc_idx(ctx, index);
+	return &ctx->txq[q].ring[index];
 }
 
 static struct macb_tx_skb *macb_tx_skb(struct macb_queue *queue,
 				       unsigned int index)
 {
-	return &queue->tx_skb[macb_tx_ring_wrap(queue->bp, index)];
+	struct macb_txq *txq = macb_txq(queue);
+
+	return &txq->skb[macb_tx_ring_wrap(queue->bp->ctx, index)];
 }
 
 static dma_addr_t macb_tx_dma(struct macb_queue *queue, unsigned int index)
 {
+	struct macb_context *ctx = queue->bp->ctx;
+	struct macb_txq *txq = macb_txq(queue);
 	dma_addr_t offset;
 
-	offset = macb_tx_ring_wrap(queue->bp, index) *
-			macb_dma_desc_get_size(queue->bp);
+	offset = macb_tx_ring_wrap(ctx, index) *
+			macb_dma_desc_get_size(&queue->bp->info);
 
-	return queue->tx_ring_dma + offset;
+	return txq->ring_dma + offset;
 }
 
-static unsigned int macb_rx_ring_wrap(struct macb *bp, unsigned int index)
+static unsigned int macb_rx_ring_wrap(struct macb_context *ctx,
+				      unsigned int index)
 {
-	return index & (bp->rx_ring_size - 1);
+	return index & (ctx->rx_ring_size - 1);
 }
 
-static struct macb_dma_desc *macb_rx_desc(struct macb_queue *queue, unsigned int index)
+static struct macb_dma_desc *macb_rx_desc(struct macb_context *ctx,
+					  unsigned int q, unsigned int index)
 {
-	index = macb_rx_ring_wrap(queue->bp, index);
-	index = macb_adj_dma_desc_idx(queue->bp, index);
-	return &queue->rx_ring[index];
+	index = macb_rx_ring_wrap(ctx, index);
+	index = macb_adj_dma_desc_idx(ctx, index);
+	return &ctx->rxq[q].ring[index];
 }
 
 static void *macb_rx_buffer(struct macb_queue *queue, unsigned int index)
 {
-	return queue->rx_buffers + queue->bp->rx_buffer_size *
-	       macb_rx_ring_wrap(queue->bp, index);
+	struct macb_context *ctx = queue->bp->ctx;
+	struct macb_rxq *rxq = macb_rxq(queue);
+
+	return rxq->buffers + ctx->rx_buffer_size *
+	       macb_rx_ring_wrap(ctx, index);
 }
 
 /* I/O accessors */
@@ -257,7 +286,7 @@ static void macb_set_hwaddr(struct macb *bp)
 	top = get_unaligned_le16(bp->netdev->dev_addr + 4);
 	macb_or_gem_writel(bp, SA1T, top);
 
-	if (gem_has_ptp(bp)) {
+	if (gem_has_ptp(&bp->info)) {
 		gem_writel(bp, RXPTPUNI, bottom);
 		gem_writel(bp, TXPTPUNI, bottom);
 	}
@@ -463,19 +492,23 @@ static int macb_mdio_write_c45(struct mii_bus *bus, int mii_id,
 static void macb_init_buffers(struct macb *bp)
 {
 	struct macb_queue *queue;
+	struct macb_rxq *rxq;
+	struct macb_txq *txq;
 	unsigned int q;
 
 	/* Single register for all queues' high 32 bits. */
-	if (macb_dma64(bp)) {
-		macb_writel(bp, RBQPH,
-			    upper_32_bits(bp->queues[0].rx_ring_dma));
-		macb_writel(bp, TBQPH,
-			    upper_32_bits(bp->queues[0].tx_ring_dma));
+	if (macb_dma64(&bp->info)) {
+		rxq = &bp->ctx->rxq[0];
+		txq = &bp->ctx->txq[0];
+		macb_writel(bp, RBQPH, upper_32_bits(rxq->ring_dma));
+		macb_writel(bp, TBQPH, upper_32_bits(txq->ring_dma));
 	}
 
 	for (q = 0, queue = bp->queues; q < bp->num_queues; ++q, ++queue) {
-		queue_writel(queue, RBQP, lower_32_bits(queue->rx_ring_dma));
-		queue_writel(queue, TBQP, lower_32_bits(queue->tx_ring_dma));
+		rxq = &bp->ctx->rxq[q];
+		txq = &bp->ctx->txq[q];
+		queue_writel(queue, RBQP, lower_32_bits(rxq->ring_dma));
+		queue_writel(queue, TBQP, lower_32_bits(txq->ring_dma));
 	}
 }
 
@@ -659,11 +692,12 @@ static bool macb_tx_lpi_set(struct macb *bp, bool enable)
 
 static bool macb_tx_all_queues_idle(struct macb *bp)
 {
-	struct macb_queue *queue;
+	struct macb_txq *txq;
 	unsigned int q;
 
-	for (q = 0, queue = bp->queues; q < bp->num_queues; ++q, ++queue) {
-		if (READ_ONCE(queue->tx_head) != READ_ONCE(queue->tx_tail))
+	for (q = 0; q < bp->num_queues; ++q) {
+		txq = &bp->ctx->txq[q];
+		if (READ_ONCE(txq->head) != READ_ONCE(txq->tail))
 			return false;
 	}
 	return true;
@@ -712,12 +746,26 @@ static void macb_mac_disable_tx_lpi(struct phylink_config *config)
 	struct macb *bp = netdev_priv(netdev);
 	unsigned long flags;
 
+	mutex_lock(&bp->mac_cfg_lock);
+
 	cancel_delayed_work_sync(&bp->tx_lpi_work);
 
 	spin_lock_irqsave(&bp->lock, flags);
 	bp->eee_active = false;
 	macb_tx_lpi_set(bp, false);
 	spin_unlock_irqrestore(&bp->lock, flags);
+
+	mutex_unlock(&bp->mac_cfg_lock);
+}
+
+static void macb_txp_lpi_initial_defer(struct macb *bp)
+{
+	lockdep_assert_held(&bp->mac_cfg_lock);
+
+	/* Defer initial LPI entry by 1 second after link-up per
+	 * IEEE 802.3az section 22.7a.
+	 */
+	mod_delayed_work(system_wq, &bp->tx_lpi_work, msecs_to_jiffies(1000));
 }
 
 static int macb_mac_enable_tx_lpi(struct phylink_config *config, u32 timer,
@@ -727,15 +775,16 @@ static int macb_mac_enable_tx_lpi(struct phylink_config *config, u32 timer,
 	struct macb *bp = netdev_priv(netdev);
 	unsigned long flags;
 
+	mutex_lock(&bp->mac_cfg_lock);
+
 	spin_lock_irqsave(&bp->lock, flags);
 	bp->tx_lpi_timer = timer;
 	bp->eee_active = true;
 	spin_unlock_irqrestore(&bp->lock, flags);
 
-	/* Defer initial LPI entry by 1 second after link-up per
-	 * IEEE 802.3az section 22.7a.
-	 */
-	mod_delayed_work(system_wq, &bp->tx_lpi_work, msecs_to_jiffies(1000));
+	macb_txp_lpi_initial_defer(bp);
+
+	mutex_unlock(&bp->mac_cfg_lock);
 
 	return 0;
 }
@@ -749,6 +798,7 @@ static void macb_mac_config(struct phylink_config *config, unsigned int mode,
 	u32 old_ctrl, ctrl;
 	u32 old_ncr, ncr;
 
+	mutex_lock(&bp->mac_cfg_lock);
 	spin_lock_irqsave(&bp->lock, flags);
 
 	old_ctrl = ctrl = macb_or_gem_readl(bp, NCFGR);
@@ -757,7 +807,7 @@ static void macb_mac_config(struct phylink_config *config, unsigned int mode,
 	if (bp->caps & MACB_CAPS_MACB_IS_EMAC) {
 		if (state->interface == PHY_INTERFACE_MODE_RMII)
 			ctrl |= MACB_BIT(RM9200_RMII);
-	} else if (macb_is_gem(bp)) {
+	} else if (macb_is_gem(&bp->info)) {
 		ctrl &= ~(GEM_BIT(SGMIIEN) | GEM_BIT(PCSSEL));
 		ncr &= ~GEM_BIT(ENABLE_HS_MAC);
 
@@ -782,6 +832,7 @@ static void macb_mac_config(struct phylink_config *config, unsigned int mode,
 		macb_or_gem_writel(bp, NCR, ncr);
 
 	spin_unlock_irqrestore(&bp->lock, flags);
+	mutex_unlock(&bp->mac_cfg_lock);
 }
 
 static void macb_mac_link_down(struct phylink_config *config, unsigned int mode,
@@ -793,6 +844,10 @@ static void macb_mac_link_down(struct phylink_config *config, unsigned int mode,
 	unsigned int q;
 	u32 ctrl;
 
+	mutex_lock(&bp->mac_cfg_lock);
+
+	bp->link_up = false;
+
 	if (!(bp->caps & MACB_CAPS_MACB_IS_EMAC))
 		for (q = 0, queue = bp->queues; q < bp->num_queues; ++q, ++queue)
 			queue_writel(queue, IDR,
@@ -803,6 +858,8 @@ static void macb_mac_link_down(struct phylink_config *config, unsigned int mode,
 	macb_writel(bp, NCR, ctrl);
 
 	netif_tx_stop_all_queues(netdev);
+
+	mutex_unlock(&bp->mac_cfg_lock);
 }
 
 /* Use juggling algorithm to left rotate tx ring and tx skb array */
@@ -811,28 +868,30 @@ static void gem_shuffle_tx_one_ring(struct macb_queue *queue)
 	unsigned int head, tail, count, ring_size, desc_size;
 	struct macb_tx_skb tx_skb, *skb_curr, *skb_next;
 	struct macb_dma_desc *desc_curr, *desc_next;
+	unsigned int q = queue - queue->bp->queues;
 	unsigned int i, cycles, shift, curr, next;
-	struct macb *bp = queue->bp;
+	struct macb_context *ctx = queue->bp->ctx;
+	struct macb_txq *txq = macb_txq(queue);
 	unsigned char desc[24];
 	unsigned long flags;
 
-	desc_size = macb_dma_desc_get_size(bp);
+	desc_size = macb_dma_desc_get_size(&queue->bp->info);
 
 	if (WARN_ON_ONCE(desc_size > ARRAY_SIZE(desc)))
 		return;
 
 	spin_lock_irqsave(&queue->tx_ptr_lock, flags);
-	head = queue->tx_head;
-	tail = queue->tx_tail;
-	ring_size = bp->tx_ring_size;
+	head = txq->head;
+	tail = txq->tail;
+	ring_size = ctx->tx_ring_size;
 	count = CIRC_CNT(head, tail, ring_size);
 
 	if (!(tail % ring_size))
 		goto unlock;
 
 	if (!count) {
-		queue->tx_head = 0;
-		queue->tx_tail = 0;
+		txq->head = 0;
+		txq->tail = 0;
 		goto unlock;
 	}
 
@@ -840,7 +899,7 @@ static void gem_shuffle_tx_one_ring(struct macb_queue *queue)
 	cycles = gcd(ring_size, shift);
 
 	for (i = 0; i < cycles; i++) {
-		memcpy(&desc, macb_tx_desc(queue, i), desc_size);
+		memcpy(&desc, macb_tx_desc(ctx, q, i), desc_size);
 		memcpy(&tx_skb, macb_tx_skb(queue, i),
 		       sizeof(struct macb_tx_skb));
 
@@ -848,8 +907,8 @@ static void gem_shuffle_tx_one_ring(struct macb_queue *queue)
 		next = (curr + shift) % ring_size;
 
 		while (next != i) {
-			desc_curr = macb_tx_desc(queue, curr);
-			desc_next = macb_tx_desc(queue, next);
+			desc_curr = macb_tx_desc(ctx, q, curr);
+			desc_next = macb_tx_desc(ctx, q, next);
 
 			memcpy(desc_curr, desc_next, desc_size);
 
@@ -866,7 +925,7 @@ static void gem_shuffle_tx_one_ring(struct macb_queue *queue)
 			next = (curr + shift) % ring_size;
 		}
 
-		desc_curr = macb_tx_desc(queue, curr);
+		desc_curr = macb_tx_desc(ctx, q, curr);
 		memcpy(desc_curr, &desc, desc_size);
 		if (i == ring_size - 1)
 			desc_curr->ctrl &= ~MACB_BIT(TX_WRAP);
@@ -876,8 +935,8 @@ static void gem_shuffle_tx_one_ring(struct macb_queue *queue)
 		       sizeof(struct macb_tx_skb));
 	}
 
-	queue->tx_head = count;
-	queue->tx_tail = 0;
+	txq->head = count;
+	txq->tail = 0;
 
 	/* Make descriptor updates visible to hardware */
 	wmb();
@@ -909,8 +968,11 @@ static void macb_mac_link_up(struct phylink_config *config,
 	unsigned int q;
 	u32 ctrl;
 
+	mutex_lock(&bp->mac_cfg_lock);
 	spin_lock_irqsave(&bp->lock, flags);
 
+	bp->link_up = true;
+
 	ctrl = macb_or_gem_readl(bp, NCFGR);
 
 	ctrl &= ~(MACB_BIT(SPD) | MACB_BIT(FD));
@@ -923,7 +985,7 @@ static void macb_mac_link_up(struct phylink_config *config,
 
 	if (!(bp->caps & MACB_CAPS_MACB_IS_EMAC)) {
 		ctrl &= ~MACB_BIT(PAE);
-		if (macb_is_gem(bp)) {
+		if (macb_is_gem(&bp->info)) {
 			ctrl &= ~GEM_BIT(GBE);
 
 			if (speed == SPEED_1000)
@@ -954,12 +1016,14 @@ static void macb_mac_link_up(struct phylink_config *config,
 
 	/* Enable Rx and Tx; Enable PTP unicast */
 	ctrl = macb_readl(bp, NCR);
-	if (gem_has_ptp(bp))
+	if (gem_has_ptp(&bp->info))
 		ctrl |= MACB_BIT(PTPUNI);
 
 	macb_writel(bp, NCR, ctrl | MACB_BIT(RE) | MACB_BIT(TE));
 
 	netif_tx_wake_all_queues(netdev);
+
+	mutex_unlock(&bp->mac_cfg_lock);
 }
 
 static struct phylink_pcs *macb_mac_select_pcs(struct phylink_config *config,
@@ -1067,7 +1131,8 @@ static int macb_mii_probe(struct net_device *netdev)
 		  bp->phylink_config.supported_interfaces);
 
 	/* Determine what modes are supported */
-	if (macb_is_gem(bp) && (bp->caps & MACB_CAPS_GIGABIT_MODE_AVAILABLE)) {
+	if (macb_is_gem(&bp->info) &&
+	    (bp->caps & MACB_CAPS_GIGABIT_MODE_AVAILABLE)) {
 		bp->phylink_config.mac_capabilities |= MAC_1000FD;
 		if (!(bp->caps & MACB_CAPS_NO_GIGABIT_HALF))
 			bp->phylink_config.mac_capabilities |= MAC_1000HD;
@@ -1222,14 +1287,15 @@ static int macb_halt_tx(struct macb *bp)
 					bp, TSR);
 }
 
-static void macb_tx_unmap(struct macb *bp, struct macb_tx_skb *tx_skb, int budget)
+static void macb_tx_unmap(const struct macb_info *info,
+			  struct macb_tx_skb *tx_skb, int budget)
 {
 	if (tx_skb->mapping) {
 		if (tx_skb->mapped_as_page)
-			dma_unmap_page(&bp->pdev->dev, tx_skb->mapping,
+			dma_unmap_page(&info->pdev->dev, tx_skb->mapping,
 				       tx_skb->size, DMA_TO_DEVICE);
 		else
-			dma_unmap_single(&bp->pdev->dev, tx_skb->mapping,
+			dma_unmap_single(&info->pdev->dev, tx_skb->mapping,
 					 tx_skb->size, DMA_TO_DEVICE);
 		tx_skb->mapping = 0;
 	}
@@ -1240,12 +1306,13 @@ static void macb_tx_unmap(struct macb *bp, struct macb_tx_skb *tx_skb, int budge
 	}
 }
 
-static void macb_set_addr(struct macb *bp, struct macb_dma_desc *desc, dma_addr_t addr)
+static void macb_set_addr(const struct macb_info *info,
+			  struct macb_dma_desc *desc, dma_addr_t addr)
 {
-	if (macb_dma64(bp)) {
+	if (macb_dma64(info)) {
 		struct macb_dma_desc_64 *desc_64;
 
-		desc_64 = macb_64b_desc(bp, desc);
+		desc_64 = macb_64b_desc(desc);
 		desc_64->addrh = upper_32_bits(addr);
 		/* The low bits of RX address contain the RX_USED bit, clearing
 		 * of which allows packet RX. Make sure the high bits are also
@@ -1257,18 +1324,19 @@ static void macb_set_addr(struct macb *bp, struct macb_dma_desc *desc, dma_addr_
 	desc->addr = lower_32_bits(addr);
 }
 
-static dma_addr_t macb_get_addr(struct macb *bp, struct macb_dma_desc *desc)
+static dma_addr_t macb_get_addr(struct macb_context *ctx,
+				struct macb_dma_desc *desc)
 {
 	dma_addr_t addr = 0;
 
-	if (macb_dma64(bp)) {
+	if (macb_dma64(ctx->info)) {
 		struct macb_dma_desc_64 *desc_64;
 
-		desc_64 = macb_64b_desc(bp, desc);
+		desc_64 = macb_64b_desc(desc);
 		addr = ((u64)(desc_64->addrh) << 32);
 	}
 	addr |= MACB_BF(RX_WADDR, MACB_BFEXT(RX_WADDR, desc->addr));
-	if (macb_dma_ptp(bp))
+	if (macb_dma_ptp(ctx->info))
 		addr &= ~GEM_BIT(DMA_RXVALID);
 	return addr;
 }
@@ -1278,6 +1346,8 @@ static void macb_tx_error_task(struct work_struct *work)
 	struct macb_queue *queue = container_of(work, struct macb_queue,
 						tx_error_task);
 	unsigned int q = queue - queue->bp->queues;
+	struct macb_context *ctx = queue->bp->ctx;
+	struct macb_txq *txq = macb_txq(queue);
 	struct macb *bp = queue->bp;
 	struct macb_tx_skb *tx_skb;
 	struct macb_dma_desc *desc;
@@ -1290,7 +1360,7 @@ static void macb_tx_error_task(struct work_struct *work)
 	u32 bytes = 0;
 
 	netdev_vdbg(bp->netdev, "%s: q = %u, t = %u, h = %u\n",
-		    __func__, q, queue->tx_tail, queue->tx_head);
+		    __func__, q, txq->tail, txq->head);
 
 	/* Prevent the queue NAPI TX poll from running, as it calls
 	 * macb_tx_complete(), which in turn may call netif_wake_subqueue().
@@ -1316,10 +1386,10 @@ static void macb_tx_error_task(struct work_struct *work)
 	/* Treat frames in TX queue including the ones that caused the error.
 	 * Free transmit buffers in upper layer.
 	 */
-	for (tail = queue->tx_tail; tail != queue->tx_head; tail++) {
+	for (tail = txq->tail; tail != txq->head; tail++) {
 		u32	ctrl;
 
-		desc = macb_tx_desc(queue, tail);
+		desc = macb_tx_desc(ctx, q, tail);
 		ctrl = desc->ctrl;
 		tx_skb = macb_tx_skb(queue, tail);
 		skb = tx_skb->skb;
@@ -1327,7 +1397,7 @@ static void macb_tx_error_task(struct work_struct *work)
 		if (ctrl & MACB_BIT(TX_USED)) {
 			/* skb is set for the last buffer of the frame */
 			while (!skb) {
-				macb_tx_unmap(bp, tx_skb, 0);
+				macb_tx_unmap(&bp->info, tx_skb, 0);
 				tail++;
 				tx_skb = macb_tx_skb(queue, tail);
 				skb = tx_skb->skb;
@@ -1338,7 +1408,7 @@ static void macb_tx_error_task(struct work_struct *work)
 			 */
 			if (!(ctrl & MACB_BIT(TX_BUF_EXHAUSTED))) {
 				netdev_vdbg(bp->netdev, "txerr skb %u (data %p) TX complete\n",
-					    macb_tx_ring_wrap(bp, tail),
+					    macb_tx_ring_wrap(ctx, tail),
 					    skb->data);
 				bp->netdev->stats.tx_packets++;
 				queue->stats.tx_packets++;
@@ -1358,25 +1428,25 @@ static void macb_tx_error_task(struct work_struct *work)
 			desc->ctrl = ctrl | MACB_BIT(TX_USED);
 		}
 
-		macb_tx_unmap(bp, tx_skb, 0);
+		macb_tx_unmap(&bp->info, tx_skb, 0);
 	}
 
 	netdev_tx_completed_queue(netdev_get_tx_queue(bp->netdev, q),
 				  packets, bytes);
 
 	/* Set end of TX queue */
-	desc = macb_tx_desc(queue, 0);
-	macb_set_addr(bp, desc, 0);
+	desc = macb_tx_desc(ctx, q, 0);
+	macb_set_addr(&bp->info, desc, 0);
 	desc->ctrl = MACB_BIT(TX_USED);
 
 	/* Make descriptor updates visible to hardware */
 	wmb();
 
 	/* Reinitialize the TX desc queue */
-	queue_writel(queue, TBQP, lower_32_bits(queue->tx_ring_dma));
+	queue_writel(queue, TBQP, lower_32_bits(txq->ring_dma));
 	/* Make TX ring reflect state of hardware */
-	queue->tx_head = 0;
-	queue->tx_tail = 0;
+	txq->head = 0;
+	txq->tail = 0;
 
 	/* Housework before enabling TX IRQ */
 	macb_writel(bp, TSR, macb_readl(bp, TSR));
@@ -1433,7 +1503,9 @@ static bool ptp_one_step_sync(struct sk_buff *skb)
 static int macb_tx_complete(struct macb_queue *queue, int budget)
 {
 	struct macb *bp = queue->bp;
+	struct macb_txq *txq = macb_txq(queue);
 	unsigned int q = queue - bp->queues;
+	struct macb_context *ctx = bp->ctx;
 	unsigned long flags;
 	unsigned int tail;
 	unsigned int head;
@@ -1441,14 +1513,14 @@ static int macb_tx_complete(struct macb_queue *queue, int budget)
 	u32 bytes = 0;
 
 	spin_lock_irqsave(&queue->tx_ptr_lock, flags);
-	head = queue->tx_head;
-	for (tail = queue->tx_tail; tail != head && packets < budget; tail++) {
+	head = txq->head;
+	for (tail = txq->tail; tail != head && packets < budget; tail++) {
 		struct macb_tx_skb	*tx_skb;
 		struct sk_buff		*skb;
 		struct macb_dma_desc	*desc;
 		u32			ctrl;
 
-		desc = macb_tx_desc(queue, tail);
+		desc = macb_tx_desc(ctx, q, tail);
 
 		/* Make hw descriptor updates visible to CPU */
 		rmb();
@@ -1473,7 +1545,7 @@ static int macb_tx_complete(struct macb_queue *queue, int budget)
 					gem_ptp_do_txstamp(bp, skb, desc);
 
 				netdev_vdbg(bp->netdev, "skb %u (data %p) TX complete\n",
-					    macb_tx_ring_wrap(bp, tail),
+					    macb_tx_ring_wrap(ctx, tail),
 					    skb->data);
 				bp->netdev->stats.tx_packets++;
 				queue->stats.tx_packets++;
@@ -1484,7 +1556,7 @@ static int macb_tx_complete(struct macb_queue *queue, int budget)
 			}
 
 			/* Now we can safely release resources */
-			macb_tx_unmap(bp, tx_skb, budget);
+			macb_tx_unmap(&bp->info, tx_skb, budget);
 
 			/* skb is set only for the last buffer of the frame.
 			 * WARNING: at this point skb has been freed by
@@ -1498,10 +1570,10 @@ static int macb_tx_complete(struct macb_queue *queue, int budget)
 	netdev_tx_completed_queue(netdev_get_tx_queue(bp->netdev, q),
 				  packets, bytes);
 
-	queue->tx_tail = tail;
+	txq->tail = tail;
 	if (__netif_subqueue_stopped(bp->netdev, q) &&
-	    CIRC_CNT(queue->tx_head, queue->tx_tail,
-		     bp->tx_ring_size) <= MACB_TX_WAKEUP_THRESH(bp))
+	    CIRC_CNT(txq->head, txq->tail,
+		     bp->ctx->tx_ring_size) <= MACB_TX_WAKEUP_THRESH(bp))
 		netif_wake_subqueue(bp->netdev, q);
 	spin_unlock_irqrestore(&queue->tx_ptr_lock, flags);
 
@@ -1511,51 +1583,53 @@ static int macb_tx_complete(struct macb_queue *queue, int budget)
 	return packets;
 }
 
-static int gem_rx_refill(struct macb_queue *queue)
+static int gem_rx_refill(struct macb_context *ctx, unsigned int q)
 {
-	struct macb *bp = queue->bp;
+	struct device *dev = &ctx->info->pdev->dev;
+	struct macb_rxq *rxq = &ctx->rxq[q];
 	struct macb_dma_desc *desc;
 	struct sk_buff *skb;
 	unsigned int entry;
 	dma_addr_t paddr;
 
-	while (CIRC_SPACE(queue->rx_prepared_head, queue->rx_tail,
-			bp->rx_ring_size) > 0) {
-		entry = macb_rx_ring_wrap(bp, queue->rx_prepared_head);
+	while (CIRC_SPACE(rxq->prepared_head, rxq->tail,
+			  ctx->rx_ring_size) > 0) {
+		entry = macb_rx_ring_wrap(ctx, rxq->prepared_head);
 
 		/* Make hw descriptor updates visible to CPU */
 		rmb();
 
-		desc = macb_rx_desc(queue, entry);
+		desc = macb_rx_desc(ctx, q, entry);
 
-		if (!queue->rx_skbuff[entry]) {
+		if (!rxq->skbuff[entry]) {
 			/* allocate sk_buff for this free entry in ring */
-			skb = netdev_alloc_skb(bp->netdev, bp->rx_buffer_size);
+			skb = netdev_alloc_skb(ctx->info->netdev,
+					       ctx->rx_buffer_size);
 			if (unlikely(!skb)) {
-				netdev_err(bp->netdev,
+				netdev_err(ctx->info->netdev,
 					   "Unable to allocate sk_buff\n");
 				break;
 			}
 
 			/* now fill corresponding descriptor entry */
-			paddr = dma_map_single(&bp->pdev->dev, skb->data,
-					       bp->rx_buffer_size,
+			paddr = dma_map_single(dev, skb->data,
+					       ctx->rx_buffer_size,
 					       DMA_FROM_DEVICE);
-			if (dma_mapping_error(&bp->pdev->dev, paddr)) {
+			if (dma_mapping_error(dev, paddr)) {
 				dev_kfree_skb(skb);
 				break;
 			}
 
-			queue->rx_skbuff[entry] = skb;
+			rxq->skbuff[entry] = skb;
 
-			if (entry == bp->rx_ring_size - 1)
+			if (entry == ctx->rx_ring_size - 1)
 				paddr |= MACB_BIT(RX_WRAP);
 			desc->ctrl = 0;
 			/* Setting addr clears RX_USED and allows reception,
 			 * make sure ctrl is cleared first to avoid a race.
 			 */
 			dma_wmb();
-			macb_set_addr(bp, desc, paddr);
+			macb_set_addr(ctx->info, desc, paddr);
 
 			/* Properly align Ethernet header.
 			 *
@@ -1568,26 +1642,27 @@ static int gem_rx_refill(struct macb_queue *queue)
 			 * setting the low 2/3 bits.
 			 * It is 3 bits if HW_DMA_CAP_PTP, else 2 bits.
 			 */
-			if (!(bp->caps & MACB_CAPS_RSC))
+			if (!(ctx->info->caps & MACB_CAPS_RSC))
 				skb_reserve(skb, NET_IP_ALIGN);
 		} else {
 			desc->ctrl = 0;
 			dma_wmb();
 			desc->addr &= ~MACB_BIT(RX_USED);
 		}
-		queue->rx_prepared_head++;
+		rxq->prepared_head++;
 	}
 
 	/* Make descriptor updates visible to hardware */
 	wmb();
 
-	netdev_vdbg(bp->netdev, "rx ring: queue: %p, prepared head %d, tail %d\n",
-		    queue, queue->rx_prepared_head, queue->rx_tail);
+	netdev_vdbg(ctx->info->netdev,
+		    "rx ring: queue: %u, prepared head %d, tail %d\n",
+		    q, rxq->prepared_head, rxq->tail);
 
 	/* Fail if queue has zero prepared descriptors. This is critical because
 	 * nothing will ever trigger a refill again.
 	 */
-	if (queue->rx_prepared_head == queue->rx_tail)
+	if (rxq->prepared_head == rxq->tail)
 		return -ENOMEM;
 
 	return 0;
@@ -1597,10 +1672,12 @@ static int gem_rx_refill(struct macb_queue *queue)
 static void discard_partial_frame(struct macb_queue *queue, unsigned int begin,
 				  unsigned int end)
 {
+	unsigned int q = queue - queue->bp->queues;
+	struct macb_context *ctx = queue->bp->ctx;
 	unsigned int frag;
 
 	for (frag = begin; frag != end; frag++) {
-		struct macb_dma_desc *desc = macb_rx_desc(queue, frag);
+		struct macb_dma_desc *desc = macb_rx_desc(ctx, q, frag);
 
 		desc->addr &= ~MACB_BIT(RX_USED);
 	}
@@ -1617,6 +1694,9 @@ static void discard_partial_frame(struct macb_queue *queue, unsigned int begin,
 static int gem_rx(struct macb_queue *queue, struct napi_struct *napi,
 		  int budget)
 {
+	unsigned int q = queue - queue->bp->queues;
+	struct macb_context *ctx = queue->bp->ctx;
+	struct macb_rxq *rxq = macb_rxq(queue);
 	struct macb *bp = queue->bp;
 	struct macb_dma_desc *desc;
 	struct sk_buff *skb;
@@ -1633,17 +1713,17 @@ static int gem_rx(struct macb_queue *queue, struct napi_struct *napi,
 		 * for hardware. Outside, we might have RX_USED descriptors for
 		 * alloc failures.
 		 */
-		if (queue->rx_tail == queue->rx_prepared_head)
+		if (rxq->tail == rxq->prepared_head)
 			break;
 
-		entry = macb_rx_ring_wrap(bp, queue->rx_tail);
-		desc = macb_rx_desc(queue, entry);
+		entry = macb_rx_ring_wrap(ctx, rxq->tail);
+		desc = macb_rx_desc(ctx, q, entry);
 
 		/* Make hw descriptor updates visible to CPU */
 		rmb();
 
 		rxused = (desc->addr & MACB_BIT(RX_USED)) ? true : false;
-		addr = macb_get_addr(bp, desc);
+		addr = macb_get_addr(ctx, desc);
 
 		if (!rxused)
 			break;
@@ -1653,7 +1733,7 @@ static int gem_rx(struct macb_queue *queue, struct napi_struct *napi,
 
 		ctrl = desc->ctrl;
 
-		queue->rx_tail++;
+		rxq->tail++;
 		count++;
 
 		if (!(ctrl & MACB_BIT(RX_SOF) && ctrl & MACB_BIT(RX_EOF))) {
@@ -1663,7 +1743,7 @@ static int gem_rx(struct macb_queue *queue, struct napi_struct *napi,
 			queue->stats.rx_dropped++;
 			break;
 		}
-		skb = queue->rx_skbuff[entry];
+		skb = rxq->skbuff[entry];
 		if (unlikely(!skb)) {
 			netdev_err(bp->netdev,
 				   "inconsistent Rx descriptor chain\n");
@@ -1672,7 +1752,7 @@ static int gem_rx(struct macb_queue *queue, struct napi_struct *napi,
 			break;
 		}
 		/* now everything is ready for receiving packet */
-		queue->rx_skbuff[entry] = NULL;
+		rxq->skbuff[entry] = NULL;
 		len = ctrl & bp->rx_frm_len_mask;
 
 		netdev_vdbg(bp->netdev, "%s %u (len %u)\n",
@@ -1680,7 +1760,7 @@ static int gem_rx(struct macb_queue *queue, struct napi_struct *napi,
 
 		skb_put(skb, len);
 		dma_unmap_single(&bp->pdev->dev, addr,
-				 bp->rx_buffer_size, DMA_FROM_DEVICE);
+				 bp->ctx->rx_buffer_size, DMA_FROM_DEVICE);
 
 		skb->protocol = eth_type_trans(skb, bp->netdev);
 		skb_checksum_none_assert(skb);
@@ -1708,7 +1788,7 @@ static int gem_rx(struct macb_queue *queue, struct napi_struct *napi,
 		napi_gro_receive(napi, skb);
 	}
 
-	gem_rx_refill(queue);
+	gem_rx_refill(ctx, q);
 
 	return count;
 }
@@ -1716,6 +1796,8 @@ static int gem_rx(struct macb_queue *queue, struct napi_struct *napi,
 static int macb_rx_frame(struct macb_queue *queue, struct napi_struct *napi,
 			 unsigned int first_frag, unsigned int last_frag)
 {
+	unsigned int q = queue - queue->bp->queues;
+	struct macb_context *ctx = queue->bp->ctx;
 	struct macb *bp = queue->bp;
 	struct macb_dma_desc *desc;
 	unsigned int offset;
@@ -1723,13 +1805,13 @@ static int macb_rx_frame(struct macb_queue *queue, struct napi_struct *napi,
 	unsigned int frag;
 	unsigned int len;
 
-	desc = macb_rx_desc(queue, last_frag);
+	desc = macb_rx_desc(ctx, q, last_frag);
 	len = desc->ctrl & bp->rx_frm_len_mask;
 
 	netdev_vdbg(bp->netdev, "%s frags %u - %u (len %u)\n",
 		    __func__,
-		    macb_rx_ring_wrap(bp, first_frag),
-		    macb_rx_ring_wrap(bp, last_frag), len);
+		    macb_rx_ring_wrap(ctx, first_frag),
+		    macb_rx_ring_wrap(ctx, last_frag), len);
 
 	/* The ethernet header starts NET_IP_ALIGN bytes into the
 	 * first buffer. Since the header is 14 bytes, this makes the
@@ -1743,7 +1825,7 @@ static int macb_rx_frame(struct macb_queue *queue, struct napi_struct *napi,
 	if (!skb) {
 		bp->netdev->stats.rx_dropped++;
 		for (frag = first_frag; ; frag++) {
-			desc = macb_rx_desc(queue, frag);
+			desc = macb_rx_desc(ctx, q, frag);
 			desc->addr &= ~MACB_BIT(RX_USED);
 			if (frag == last_frag)
 				break;
@@ -1761,7 +1843,7 @@ static int macb_rx_frame(struct macb_queue *queue, struct napi_struct *napi,
 	skb_put(skb, len);
 
 	for (frag = first_frag; ; frag++) {
-		unsigned int frag_len = bp->rx_buffer_size;
+		unsigned int frag_len = bp->ctx->rx_buffer_size;
 
 		if (offset + frag_len > len) {
 			if (unlikely(frag != last_frag)) {
@@ -1773,8 +1855,8 @@ static int macb_rx_frame(struct macb_queue *queue, struct napi_struct *napi,
 		skb_copy_to_linear_data_offset(skb, offset,
 					       macb_rx_buffer(queue, frag),
 					       frag_len);
-		offset += bp->rx_buffer_size;
-		desc = macb_rx_desc(queue, frag);
+		offset += bp->ctx->rx_buffer_size;
+		desc = macb_rx_desc(ctx, q, frag);
 		desc->addr &= ~MACB_BIT(RX_USED);
 
 		if (frag == last_frag)
@@ -1796,35 +1878,38 @@ static int macb_rx_frame(struct macb_queue *queue, struct napi_struct *napi,
 	return 0;
 }
 
-static inline void macb_init_rx_ring(struct macb_queue *queue)
+static inline void macb_init_rx_ring(struct macb_context *ctx, unsigned int q)
 {
+	struct macb_rxq *rxq = &ctx->rxq[q];
 	struct macb_dma_desc *desc = NULL;
-	struct macb *bp = queue->bp;
 	dma_addr_t addr;
 	int i;
 
-	addr = queue->rx_buffers_dma;
-	for (i = 0; i < bp->rx_ring_size; i++) {
-		desc = macb_rx_desc(queue, i);
-		macb_set_addr(bp, desc, addr);
+	addr = rxq->buffers_dma;
+	for (i = 0; i < ctx->rx_ring_size; i++) {
+		desc = macb_rx_desc(ctx, q, i);
+		macb_set_addr(ctx->info, desc, addr);
 		desc->ctrl = 0;
-		addr += bp->rx_buffer_size;
+		addr += ctx->rx_buffer_size;
 	}
 	desc->addr |= MACB_BIT(RX_WRAP);
-	queue->rx_tail = 0;
+	rxq->tail = 0;
 }
 
 static int macb_rx(struct macb_queue *queue, struct napi_struct *napi,
 		   int budget)
 {
+	unsigned int q = queue - queue->bp->queues;
+	struct macb_context *ctx = queue->bp->ctx;
+	struct macb_rxq *rxq = macb_rxq(queue);
 	struct macb *bp = queue->bp;
 	bool reset_rx_queue = false;
 	int first_frag = -1;
 	unsigned int tail;
 	int received = 0;
 
-	for (tail = queue->rx_tail; budget > 0; tail++) {
-		struct macb_dma_desc *desc = macb_rx_desc(queue, tail);
+	for (tail = rxq->tail; budget > 0; tail++) {
+		struct macb_dma_desc *desc = macb_rx_desc(ctx, q, tail);
 		u32 ctrl;
 
 		/* Make hw descriptor updates visible to CPU */
@@ -1876,8 +1961,8 @@ static int macb_rx(struct macb_queue *queue, struct napi_struct *napi,
 		ctrl = macb_readl(bp, NCR);
 		macb_writel(bp, NCR, ctrl & ~MACB_BIT(RE));
 
-		macb_init_rx_ring(queue);
-		queue_writel(queue, RBQP, queue->rx_ring_dma);
+		macb_init_rx_ring(ctx, q);
+		queue_writel(queue, RBQP, rxq->ring_dma);
 
 		macb_writel(bp, NCR, ctrl | MACB_BIT(RE));
 
@@ -1886,25 +1971,27 @@ static int macb_rx(struct macb_queue *queue, struct napi_struct *napi,
 	}
 
 	if (first_frag != -1)
-		queue->rx_tail = first_frag;
+		rxq->tail = first_frag;
 	else
-		queue->rx_tail = tail;
+		rxq->tail = tail;
 
 	return received;
 }
 
 static bool macb_rx_pending(struct macb_queue *queue)
 {
-	struct macb *bp = queue->bp;
+	unsigned int q = queue - queue->bp->queues;
+	struct macb_context *ctx = queue->bp->ctx;
+	struct macb_rxq *rxq = macb_rxq(queue);
 	struct macb_dma_desc *desc;
 	unsigned int entry;
 
 	/* No armed descriptor left: nothing can be pending. */
-	if (macb_is_gem(bp) && queue->rx_tail == queue->rx_prepared_head)
+	if (macb_is_gem(&queue->bp->info) && rxq->tail == rxq->prepared_head)
 		return false;
 
-	entry = macb_rx_ring_wrap(bp, queue->rx_tail);
-	desc = macb_rx_desc(queue, entry);
+	entry = macb_rx_ring_wrap(ctx, rxq->tail);
+	desc = macb_rx_desc(ctx, q, entry);
 
 	/* Make hw descriptor updates visible to CPU */
 	rmb();
@@ -1953,39 +2040,52 @@ static void macb_tx_restart(struct macb_queue *queue)
 {
 	struct macb *bp = queue->bp;
 	unsigned int head_idx, tbqp;
+	struct macb_context *ctx;
+	struct macb_txq *txq;
 	unsigned long flags;
 
 	spin_lock_irqsave(&queue->tx_ptr_lock, flags);
 
-	if (queue->tx_head == queue->tx_tail)
-		goto out_tx_ptr_unlock;
+	spin_lock(&bp->lock);
+
+	/* context swap ongoing? */
+	if (bp->irq_quiesced)
+		goto out_unlock;
 
-	tbqp = queue_readl(queue, TBQP) / macb_dma_desc_get_size(bp);
-	tbqp = macb_adj_dma_desc_idx(bp, macb_tx_ring_wrap(bp, tbqp));
-	head_idx = macb_adj_dma_desc_idx(bp, macb_tx_ring_wrap(bp, queue->tx_head));
+	ctx = queue->bp->ctx;
+	txq = macb_txq(queue);
+
+	if (txq->head == txq->tail)
+		goto out_unlock;
+
+	tbqp = queue_readl(queue, TBQP) / macb_dma_desc_get_size(ctx->info);
+	tbqp = macb_adj_dma_desc_idx(ctx, macb_tx_ring_wrap(ctx, tbqp));
+	head_idx = macb_adj_dma_desc_idx(ctx, macb_tx_ring_wrap(ctx, txq->head));
 
 	if (tbqp == head_idx)
-		goto out_tx_ptr_unlock;
+		goto out_unlock;
 
-	spin_lock(&bp->lock);
 	macb_writel(bp, NCR, macb_readl(bp, NCR) | MACB_BIT(TSTART));
-	spin_unlock(&bp->lock);
 
-out_tx_ptr_unlock:
+out_unlock:
+	spin_unlock(&bp->lock);
 	spin_unlock_irqrestore(&queue->tx_ptr_lock, flags);
 }
 
 static bool macb_tx_complete_pending(struct macb_queue *queue)
 {
+	unsigned int q = queue - queue->bp->queues;
+	struct macb_context *ctx = queue->bp->ctx;
+	struct macb_txq *txq = macb_txq(queue);
 	bool retval = false;
 	unsigned long flags;
 
 	spin_lock_irqsave(&queue->tx_ptr_lock, flags);
-	if (queue->tx_head != queue->tx_tail) {
+	if (txq->head != txq->tail) {
 		/* Make hw descriptor updates visible to CPU */
 		rmb();
 
-		if (macb_tx_desc(queue, queue->tx_tail)->ctrl & MACB_BIT(TX_USED))
+		if (macb_tx_desc(ctx, q, txq->tail)->ctrl & MACB_BIT(TX_USED))
 			retval = true;
 	}
 	spin_unlock_irqrestore(&queue->tx_ptr_lock, flags);
@@ -2059,6 +2159,12 @@ static void macb_quiesce_start(struct macb *bp)
 		napi_disable(&queue->napi_tx);
 	}
 
+	/* NAPI instances still access Rx/Tx rings after their
+	 * napi_complete_done() calls! Callers to macb_quiesce_start()
+	 * free rings, so wait for all NAPI handlers to be done.
+	 */
+	synchronize_net();
+
 	/* Must be done after napi_tx is disabled: its completion re-arms
 	 * the LPI timer.
 	 */
@@ -2085,6 +2191,7 @@ static void macb_hresp_error_task(struct work_struct *work)
 {
 	struct macb *bp = from_work(bp, work, hresp_err_bh_work);
 	struct net_device *netdev = bp->netdev;
+	struct macb_context *ctx = bp->ctx;
 	struct macb_queue *queue;
 	unsigned int q;
 	u32 ctrl;
@@ -2101,7 +2208,7 @@ static void macb_hresp_error_task(struct work_struct *work)
 	netif_tx_stop_all_queues(netdev);
 	netif_carrier_off(netdev);
 
-	bp->macbgem_ops.mog_init_rings(bp);
+	bp->macbgem_ops.mog_init_rings(ctx);
 
 	/* Initialize TX and RX buffers */
 	macb_init_buffers(bp);
@@ -2180,7 +2287,7 @@ static int macb_interrupt_misc(struct macb_queue *queue, u32 status)
 	if (status & MACB_BIT(ISR_ROVR)) {
 		/* We missed at least one packet */
 		spin_lock(&bp->stats_lock);
-		if (macb_is_gem(bp))
+		if (macb_is_gem(&bp->info))
 			bp->hw_stats.gem.rx_overruns++;
 		else
 			bp->hw_stats.macb.rx_overruns++;
@@ -2193,7 +2300,7 @@ static int macb_interrupt_misc(struct macb_queue *queue, u32 status)
 		macb_queue_isr_clear(bp, queue, MACB_BIT(HRESP));
 	}
 
-	if (macb_is_gem(bp)) {
+	if (macb_is_gem(&bp->info)) {
 		if (status & GEM_BIT(WOL))
 			gem_wol_interrupt(queue, status);
 	} else {
@@ -2220,7 +2327,9 @@ static irqreturn_t macb_interrupt(int irq, void *dev_id)
 	spin_lock(&bp->lock);
 
 	while (status) {
-		/* self-disarm while the netdev is closed */
+		/* self-disarm while the netdev is closed
+		 * or during context swap
+		 */
 		if (unlikely(bp->irq_quiesced)) {
 			queue_writel(queue, IDR, -1);
 			macb_queue_isr_clear(bp, queue, -1);
@@ -2299,9 +2408,12 @@ static unsigned int macb_tx_map(struct macb *bp,
 				unsigned int hdrlen,
 				u8 fcs_len)
 {
+	struct macb_txq *txq = macb_txq(queue);
 	unsigned int f, nr_frags = skb_shinfo(skb)->nr_frags;
-	unsigned int len, i, tx_head = queue->tx_head;
+	unsigned int len, i, tx_head = txq->head;
 	u32 ctrl, lso_ctrl = 0, seq_ctrl = 0;
+	unsigned int q = queue - bp->queues;
+	struct macb_context *ctx = bp->ctx;
 	unsigned int eof = 1, mss_mfs = 0;
 	struct macb_tx_skb *tx_skb = NULL;
 	struct macb_dma_desc *desc;
@@ -2393,7 +2505,7 @@ static unsigned int macb_tx_map(struct macb *bp,
 	 */
 	i = tx_head;
 	ctrl = MACB_BIT(TX_USED);
-	desc = macb_tx_desc(queue, i);
+	desc = macb_tx_desc(ctx, q, i);
 	desc->ctrl = ctrl;
 
 	if (lso_ctrl) {
@@ -2414,18 +2526,19 @@ static unsigned int macb_tx_map(struct macb *bp,
 	do {
 		i--;
 		tx_skb = macb_tx_skb(queue, i);
-		desc = macb_tx_desc(queue, i);
+		desc = macb_tx_desc(ctx, q, i);
 
 		ctrl = (u32)tx_skb->size;
 		if (eof) {
 			ctrl |= MACB_BIT(TX_LAST);
 			eof = 0;
 		}
-		if (unlikely(macb_tx_ring_wrap(bp, i) == bp->tx_ring_size - 1))
+		if (unlikely(macb_tx_ring_wrap(ctx, i) ==
+				bp->ctx->tx_ring_size - 1))
 			ctrl |= MACB_BIT(TX_WRAP);
 
 		/* First descriptor is header descriptor */
-		if (i == queue->tx_head) {
+		if (i == txq->head) {
 			ctrl |= MACB_BF(TX_LSO, lso_ctrl);
 			ctrl |= MACB_BF(TX_TCP_SEQ_SRC, seq_ctrl);
 			if ((bp->netdev->features & NETIF_F_HW_CSUM) &&
@@ -2439,25 +2552,25 @@ static unsigned int macb_tx_map(struct macb *bp,
 			ctrl |= MACB_BF(MSS_MFS, mss_mfs);
 
 		/* Set TX buffer descriptor */
-		macb_set_addr(bp, desc, tx_skb->mapping);
+		macb_set_addr(&bp->info, desc, tx_skb->mapping);
 		/* desc->addr must be visible to hardware before clearing
 		 * 'TX_USED' bit in desc->ctrl.
 		 */
 		wmb();
 		desc->ctrl = ctrl;
-	} while (i != queue->tx_head);
+	} while (i != txq->head);
 
-	queue->tx_head = tx_head;
+	txq->head = tx_head;
 
 	return 0;
 
 dma_error:
 	netdev_err(bp->netdev, "TX DMA map failed\n");
 
-	for (i = queue->tx_head; i != tx_head; i++) {
+	for (i = txq->head; i != tx_head; i++) {
 		tx_skb = macb_tx_skb(queue, i);
 
-		macb_tx_unmap(bp, tx_skb, 0);
+		macb_tx_unmap(&bp->info, tx_skb, 0);
 	}
 
 	return -ENOMEM;
@@ -2581,6 +2694,7 @@ static netdev_tx_t macb_start_xmit(struct sk_buff *skb,
 	unsigned int q = skb_get_queue_mapping(skb);
 	unsigned int desc_cnt, nr_frags, frag_size, f;
 	struct macb_queue *queue = &bp->queues[q];
+	struct macb_txq *txq = macb_txq(queue);
 	netdev_tx_t ret = NETDEV_TX_OK;
 	unsigned int hdrlen, tx_len;
 	bool add_fcs, is_lso;
@@ -2643,11 +2757,11 @@ static netdev_tx_t macb_start_xmit(struct sk_buff *skb,
 	spin_lock_irqsave(&queue->tx_ptr_lock, flags);
 
 	/* This is a hard error, log it. */
-	if (CIRC_SPACE(queue->tx_head, queue->tx_tail,
-		       bp->tx_ring_size) < desc_cnt) {
+	if (CIRC_SPACE(txq->head, txq->tail,
+		       bp->ctx->tx_ring_size) < desc_cnt) {
 		netif_stop_subqueue(netdev, q);
-		netdev_dbg(netdev, "tx_head = %u, tx_tail = %u\n",
-			   queue->tx_head, queue->tx_tail);
+		netdev_dbg(netdev, "txq head = %u, txq tail = %u\n",
+			   txq->head, txq->tail);
 		ret = NETDEV_TX_BUSY;
 		goto unlock;
 	}
@@ -2663,7 +2777,7 @@ static netdev_tx_t macb_start_xmit(struct sk_buff *skb,
 		goto unlock;
 	}
 
-	if (macb_dma_ptp(bp) &&
+	if (macb_dma_ptp(&bp->info) &&
 	    (skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP))
 		skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS;
 
@@ -2684,7 +2798,7 @@ static netdev_tx_t macb_start_xmit(struct sk_buff *skb,
 	macb_writel(bp, NCR, macb_readl(bp, NCR) | MACB_BIT(TSTART));
 	spin_unlock(&bp->lock);
 
-	if (CIRC_SPACE(queue->tx_head, queue->tx_tail, bp->tx_ring_size) < 1)
+	if (CIRC_SPACE(txq->head, txq->tail, bp->ctx->tx_ring_size) < 1)
 		netif_stop_subqueue(netdev, q);
 
 unlock:
@@ -2693,162 +2807,179 @@ static netdev_tx_t macb_start_xmit(struct sk_buff *skb,
 	return ret;
 }
 
-static void macb_init_rx_buffer_size(struct macb *bp, size_t size)
+static unsigned int macb_rx_buffer_size(struct macb *bp, unsigned int mtu)
 {
-	if (!macb_is_gem(bp)) {
-		bp->rx_buffer_size = MACB_RX_BUFFER_SIZE;
+	unsigned int size;
+
+	if (!macb_is_gem(&bp->info)) {
+		size = MACB_RX_BUFFER_SIZE;
 	} else {
-		bp->rx_buffer_size = MIN(size, RX_BUFFER_MAX);
+		size = mtu + ETH_HLEN + ETH_FCS_LEN + NET_IP_ALIGN;
+		size = MIN(size, RX_BUFFER_MAX);
 
-		if (bp->rx_buffer_size % RX_BUFFER_MULTIPLE) {
+		if (size % RX_BUFFER_MULTIPLE) {
 			netdev_dbg(bp->netdev,
 				   "RX buffer must be multiple of %d bytes, expanding\n",
 				   RX_BUFFER_MULTIPLE);
-			bp->rx_buffer_size =
-				roundup(bp->rx_buffer_size, RX_BUFFER_MULTIPLE);
+			size = roundup(size, RX_BUFFER_MULTIPLE);
 		}
 	}
 
-	netdev_dbg(bp->netdev, "mtu [%u] rx_buffer_size [%zu]\n",
-		   bp->netdev->mtu, bp->rx_buffer_size);
+	netdev_dbg(bp->netdev, "mtu [%u] rx_buffer_size [%u]\n", mtu, size);
+	return size;
 }
 
-static void gem_free_rx_buffers(struct macb *bp)
+static void gem_free_rx_buffers(struct macb_context *ctx)
 {
-	struct sk_buff		*skb;
-	struct macb_dma_desc	*desc;
-	struct macb_queue *queue;
-	dma_addr_t		addr;
+	struct device *dev = &ctx->info->pdev->dev;
+	struct macb_dma_desc *desc;
+	struct macb_rxq *rxq;
+	struct sk_buff *skb;
+	dma_addr_t addr;
 	unsigned int q;
 	int i;
 
-	for (q = 0, queue = bp->queues; q < bp->num_queues; ++q, ++queue) {
-		if (!queue->rx_skbuff)
+	for (q = 0; q < ctx->info->num_queues; ++q) {
+		rxq = &ctx->rxq[q];
+
+		if (!rxq->skbuff)
 			continue;
 
-		for (i = 0; i < bp->rx_ring_size; i++) {
-			skb = queue->rx_skbuff[i];
+		for (i = 0; i < ctx->rx_ring_size; i++) {
+			skb = rxq->skbuff[i];
 
 			if (!skb)
 				continue;
 
-			desc = macb_rx_desc(queue, i);
-			addr = macb_get_addr(bp, desc);
+			desc = macb_rx_desc(ctx, q, i);
+			addr = macb_get_addr(ctx, desc);
 
-			dma_unmap_single(&bp->pdev->dev, addr, bp->rx_buffer_size,
-					DMA_FROM_DEVICE);
+			dma_unmap_single(dev, addr, ctx->rx_buffer_size,
+					 DMA_FROM_DEVICE);
 			dev_kfree_skb_any(skb);
 			skb = NULL;
 		}
 
-		kfree(queue->rx_skbuff);
-		queue->rx_skbuff = NULL;
+		kfree(rxq->skbuff);
+		rxq->skbuff = NULL;
 	}
 }
 
-static void macb_free_rx_buffers(struct macb *bp)
+static void macb_free_rx_buffers(struct macb_context *ctx)
 {
-	struct macb_queue *queue = &bp->queues[0];
+	struct device *dev = &ctx->info->pdev->dev;
+	struct macb_rxq *rxq = &ctx->rxq[0];
 
-	if (queue->rx_buffers) {
-		dma_free_coherent(&bp->pdev->dev,
-				  bp->rx_ring_size * bp->rx_buffer_size,
-				  queue->rx_buffers, queue->rx_buffers_dma);
-		queue->rx_buffers = NULL;
+	if (rxq->buffers) {
+		dma_free_coherent(dev,
+				  ctx->rx_ring_size * ctx->rx_buffer_size,
+				  rxq->buffers, rxq->buffers_dma);
+		rxq->buffers = NULL;
 	}
 }
 
-static unsigned int macb_tx_ring_size_per_queue(struct macb *bp)
+static unsigned int macb_tx_ring_size_per_queue(struct macb_context *ctx)
 {
-	return macb_dma_desc_get_size(bp) * bp->tx_ring_size + bp->tx_bd_rd_prefetch;
+	return macb_dma_desc_get_size(ctx->info) * ctx->tx_ring_size +
+			ctx->info->tx_bd_rd_prefetch;
 }
 
-static unsigned int macb_rx_ring_size_per_queue(struct macb *bp)
+static unsigned int macb_rx_ring_size_per_queue(struct macb_context *ctx)
 {
-	return macb_dma_desc_get_size(bp) * bp->rx_ring_size + bp->rx_bd_rd_prefetch;
+	return macb_dma_desc_get_size(ctx->info) * ctx->rx_ring_size +
+			ctx->info->rx_bd_rd_prefetch;
 }
 
-static void macb_free(struct macb *bp)
+static void macb_free(struct macb_context *ctx)
 {
-	struct device *dev = &bp->pdev->dev;
-	struct macb_queue *queue;
+	struct device *dev = &ctx->info->pdev->dev;
+	struct macb_txq *txq;
+	struct macb_rxq *rxq;
 	unsigned int q;
 	size_t size;
 
-	bp->macbgem_ops.mog_free_rx_buffers(bp);
+	ctx->info->macbgem_ops.mog_free_rx_buffers(ctx);
 
-	size = bp->num_queues * macb_tx_ring_size_per_queue(bp);
-	dma_free_coherent(dev, size, bp->queues[0].tx_ring, bp->queues[0].tx_ring_dma);
+	txq = &ctx->txq[0];
+	size = ctx->info->num_queues * macb_tx_ring_size_per_queue(ctx);
+	dma_free_coherent(dev, size, txq->ring, txq->ring_dma);
 
-	size = bp->num_queues * macb_rx_ring_size_per_queue(bp);
-	dma_free_coherent(dev, size, bp->queues[0].rx_ring, bp->queues[0].rx_ring_dma);
+	rxq = &ctx->rxq[0];
+	size = ctx->info->num_queues * macb_rx_ring_size_per_queue(ctx);
+	dma_free_coherent(dev, size, rxq->ring, rxq->ring_dma);
 
-	for (q = 0, queue = bp->queues; q < bp->num_queues; ++q, ++queue) {
-		if (queue->tx_skb) {
+	for (q = 0; q < ctx->info->num_queues; ++q) {
+		txq = &ctx->txq[q];
+		rxq = &ctx->rxq[q];
+
+		if (txq->skb) {
 			unsigned int dropped = 0, tail;
 
-			for (tail = queue->tx_tail; tail != queue->tx_head;
-			     tail++) {
-				if (macb_tx_skb(queue, tail)->skb)
+			for (tail = txq->tail; tail != txq->head; tail++) {
+				if (txq->skb[macb_tx_ring_wrap(ctx, tail)].skb)
 					dropped++;
-				macb_tx_unmap(bp, macb_tx_skb(queue, tail), 0);
+				macb_tx_unmap(ctx->info,
+					      &txq->skb[macb_tx_ring_wrap(ctx, tail)],
+					      0);
 			}
 
-			queue->stats.tx_dropped += dropped;
-			bp->netdev->stats.tx_dropped += dropped;
+			ctx->info->queue_stats[q]->tx_dropped += dropped;
+			ctx->info->netdev->stats.tx_dropped += dropped;
 
-			kfree(queue->tx_skb);
-			queue->tx_skb = NULL;
+			kfree(txq->skb);
+			txq->skb = NULL;
 		}
 
-		queue->tx_head = 0;
-		queue->tx_tail = 0;
-		queue->tx_ring = NULL;
-		queue->rx_ring = NULL;
+		txq->ring = NULL;
+		rxq->ring = NULL;
 	}
 }
 
-static int gem_alloc_rx_buffers(struct macb *bp)
+static int gem_alloc_rx_buffers(struct macb_context *ctx)
 {
-	struct macb_queue *queue;
+	struct macb_rxq *rxq;
 	unsigned int q;
 	int size;
 
-	for (q = 0, queue = bp->queues; q < bp->num_queues; ++q, ++queue) {
-		size = bp->rx_ring_size * sizeof(struct sk_buff *);
-		queue->rx_skbuff = kzalloc(size, GFP_KERNEL);
-		if (!queue->rx_skbuff)
+	for (q = 0; q < ctx->info->num_queues; ++q) {
+		rxq = &ctx->rxq[q];
+		size = ctx->rx_ring_size * sizeof(struct sk_buff *);
+		rxq->skbuff = kzalloc(size, GFP_KERNEL);
+		if (!rxq->skbuff)
 			return -ENOMEM;
 		else
-			netdev_dbg(bp->netdev,
+			netdev_dbg(ctx->info->netdev,
 				   "Allocated %d RX struct sk_buff entries at %p\n",
-				   bp->rx_ring_size, queue->rx_skbuff);
+				   ctx->rx_ring_size, rxq->skbuff);
 	}
 	return 0;
 }
 
-static int macb_alloc_rx_buffers(struct macb *bp)
+static int macb_alloc_rx_buffers(struct macb_context *ctx)
 {
-	struct macb_queue *queue = &bp->queues[0];
+	struct device *dev = &ctx->info->pdev->dev;
+	struct macb_rxq *rxq = &ctx->rxq[0];
 	int size;
 
-	size = bp->rx_ring_size * bp->rx_buffer_size;
-	queue->rx_buffers = dma_alloc_coherent(&bp->pdev->dev, size,
-					    &queue->rx_buffers_dma, GFP_KERNEL);
-	if (!queue->rx_buffers)
+	size = ctx->rx_ring_size * ctx->rx_buffer_size;
+	rxq->buffers = dma_alloc_coherent(dev, size,
+					  &rxq->buffers_dma, GFP_KERNEL);
+	if (!rxq->buffers)
 		return -ENOMEM;
 
-	netdev_dbg(bp->netdev,
+	netdev_dbg(ctx->info->netdev,
 		   "Allocated RX buffers of %d bytes at %08lx (mapped %p)\n",
-		   size, (unsigned long)queue->rx_buffers_dma, queue->rx_buffers);
+		   size, (unsigned long)rxq->buffers_dma, rxq->buffers);
 	return 0;
 }
 
-static int macb_alloc(struct macb *bp)
+static int macb_alloc(struct macb_context *ctx)
 {
-	struct device *dev = &bp->pdev->dev;
+	unsigned int num_queues = ctx->info->num_queues;
+	struct device *dev = &ctx->info->pdev->dev;
 	dma_addr_t tx_dma, rx_dma;
-	struct macb_queue *queue;
+	struct macb_txq *txq;
+	struct macb_rxq *rxq;
 	unsigned int q;
 	void *tx, *rx;
 	size_t size;
@@ -2860,85 +2991,131 @@ static int macb_alloc(struct macb *bp)
 	 * natural alignment of physical addresses.
 	 */
 
-	size = bp->num_queues * macb_tx_ring_size_per_queue(bp);
+	size = num_queues * macb_tx_ring_size_per_queue(ctx);
 	tx = dma_alloc_coherent(dev, size, &tx_dma, GFP_KERNEL);
 	if (!tx)
 		goto out_err;
 	/* Record the buffer so that the error path frees it. */
-	bp->queues[0].tx_ring = tx;
-	bp->queues[0].tx_ring_dma = tx_dma;
+	txq = &ctx->txq[0];
+	txq->ring = tx;
+	txq->ring_dma = tx_dma;
 	if (upper_32_bits(tx_dma) != upper_32_bits(tx_dma + size - 1))
 		goto out_err;
-	netdev_dbg(bp->netdev, "Allocated %zu bytes for %u TX rings at %08lx (mapped %p)\n",
-		   size, bp->num_queues, (unsigned long)tx_dma, tx);
+	netdev_dbg(ctx->info->netdev,
+		   "Allocated %zu bytes for %u TX rings at %08lx (mapped %p)\n",
+		   size, num_queues, (unsigned long)tx_dma, tx);
 
-	size = bp->num_queues * macb_rx_ring_size_per_queue(bp);
+	size = num_queues * macb_rx_ring_size_per_queue(ctx);
 	rx = dma_alloc_coherent(dev, size, &rx_dma, GFP_KERNEL);
 	if (!rx)
 		goto out_err;
 	/* Record the buffer so that the error path frees it. */
-	bp->queues[0].rx_ring = rx;
-	bp->queues[0].rx_ring_dma = rx_dma;
+	rxq = &ctx->rxq[0];
+	rxq->ring = rx;
+	rxq->ring_dma = rx_dma;
 	if (upper_32_bits(rx_dma) != upper_32_bits(rx_dma + size - 1))
 		goto out_err;
-	netdev_dbg(bp->netdev, "Allocated %zu bytes for %u RX rings at %08lx (mapped %p)\n",
-		   size, bp->num_queues, (unsigned long)rx_dma, rx);
+	netdev_dbg(ctx->info->netdev,
+		   "Allocated %zu bytes for %u RX rings at %08lx (mapped %p)\n",
+		   size, num_queues, (unsigned long)rx_dma, rx);
 
-	for (q = 0, queue = bp->queues; q < bp->num_queues; ++q, ++queue) {
-		queue->tx_ring = tx + macb_tx_ring_size_per_queue(bp) * q;
-		queue->tx_ring_dma = tx_dma + macb_tx_ring_size_per_queue(bp) * q;
+	for (q = 0; q < num_queues; ++q) {
+		txq = &ctx->txq[q];
+		rxq = &ctx->rxq[q];
+
+		txq->ring = tx + macb_tx_ring_size_per_queue(ctx) * q;
+		txq->ring_dma = tx_dma + macb_tx_ring_size_per_queue(ctx) * q;
 
-		queue->rx_ring = rx + macb_rx_ring_size_per_queue(bp) * q;
-		queue->rx_ring_dma = rx_dma + macb_rx_ring_size_per_queue(bp) * q;
+		rxq->ring = rx + macb_rx_ring_size_per_queue(ctx) * q;
+		rxq->ring_dma = rx_dma + macb_rx_ring_size_per_queue(ctx) * q;
 
-		size = bp->tx_ring_size * sizeof(struct macb_tx_skb);
-		queue->tx_skb = kmalloc(size, GFP_KERNEL);
-		if (!queue->tx_skb)
+		size = ctx->tx_ring_size * sizeof(struct macb_tx_skb);
+		txq->skb = kmalloc(size, GFP_KERNEL);
+		if (!txq->skb)
 			goto out_err;
 	}
-	if (bp->macbgem_ops.mog_alloc_rx_buffers(bp))
+	if (ctx->info->macbgem_ops.mog_alloc_rx_buffers(ctx))
 		goto out_err;
 
 	return 0;
 
 out_err:
-	macb_free(bp);
+	macb_free(ctx);
 	return -ENOMEM;
 }
 
-static int gem_init_rx_ring(struct macb_queue *queue)
+static struct macb_context *macb_context_alloc(struct macb *bp,
+					       unsigned int mtu,
+					       unsigned int rx_ring_size,
+					       unsigned int tx_ring_size)
+{
+	struct macb_context *ctx;
+	int err;
+
+	ctx = kzalloc_obj(*ctx);
+	if (!ctx)
+		return ERR_PTR(-ENOMEM);
+
+	ctx->info = &bp->info;
+	ctx->rx_buffer_size = macb_rx_buffer_size(bp, mtu);
+	ctx->rx_ring_size = rx_ring_size;
+	ctx->tx_ring_size = tx_ring_size;
+
+	err = macb_alloc(ctx);
+	if (err) {
+		netdev_err(bp->netdev,
+			   "Unable to allocate DMA memory (error %d)\n", err);
+		goto free_ctx;
+	}
+
+	err = bp->macbgem_ops.mog_init_rings(ctx);
+	if (err)
+		goto free_rings;
+
+	return ctx;
+
+free_rings:
+	macb_free(ctx);
+free_ctx:
+	kfree(ctx);
+	return ERR_PTR(err);
+}
+
+static int gem_init_rx_ring(struct macb_context *ctx, unsigned int q)
 {
+	struct macb_rxq *rxq = &ctx->rxq[q];
 	unsigned int i;
 
-	queue->rx_tail = 0;
-	queue->rx_prepared_head = 0;
+	rxq->tail = 0;
+	rxq->prepared_head = 0;
 
-	for (i = 0; i < queue->bp->rx_ring_size; i++)
-		macb_rx_desc(queue, i)->addr |= MACB_BIT(RX_USED);
+	for (i = 0; i < ctx->rx_ring_size; i++)
+		macb_rx_desc(ctx, q, i)->addr |= MACB_BIT(RX_USED);
 
-	return gem_rx_refill(queue);
+	return gem_rx_refill(ctx, q);
 }
 
-static int gem_init_rings(struct macb *bp)
+static int gem_init_rings(struct macb_context *ctx)
 {
-	struct macb_queue *queue;
 	struct macb_dma_desc *desc = NULL;
+	struct macb_txq *txq;
 	int last_err = 0;
 	unsigned int q;
 	int err;
 	int i;
 
-	for (q = 0, queue = bp->queues; q < bp->num_queues; ++q, ++queue) {
-		for (i = 0; i < bp->tx_ring_size; i++) {
-			desc = macb_tx_desc(queue, i);
-			macb_set_addr(bp, desc, 0);
+	for (q = 0; q < ctx->info->num_queues; ++q) {
+		txq = &ctx->txq[q];
+		for (i = 0; i < ctx->tx_ring_size; i++) {
+			desc = macb_tx_desc(ctx, q, i);
+			macb_set_addr(ctx->info, desc, 0);
 			desc->ctrl = MACB_BIT(TX_USED);
 		}
 		desc->ctrl |= MACB_BIT(TX_WRAP);
-		queue->tx_head = 0;
-		queue->tx_tail = 0;
+		txq->head = 0;
+		txq->tail = 0;
 
-		err = gem_init_rx_ring(queue);
+		err = gem_init_rx_ring(ctx, q);
 		if (err)
 			last_err = err;
 	}
@@ -2946,20 +3123,21 @@ static int gem_init_rings(struct macb *bp)
 	return last_err;
 }
 
-static int macb_init_rings(struct macb *bp)
+static int macb_init_rings(struct macb_context *ctx)
 {
-	int i;
+	struct macb_txq *txq = &ctx->txq[0];
 	struct macb_dma_desc *desc = NULL;
+	int i;
 
-	macb_init_rx_ring(&bp->queues[0]);
+	macb_init_rx_ring(ctx, 0);
 
-	for (i = 0; i < bp->tx_ring_size; i++) {
-		desc = macb_tx_desc(&bp->queues[0], i);
-		macb_set_addr(bp, desc, 0);
+	for (i = 0; i < ctx->tx_ring_size; i++) {
+		desc = macb_tx_desc(ctx, 0, i);
+		macb_set_addr(ctx->info, desc, 0);
 		desc->ctrl = MACB_BIT(TX_USED);
 	}
-	bp->queues[0].tx_head = 0;
-	bp->queues[0].tx_tail = 0;
+	txq->head = 0;
+	txq->tail = 0;
 	desc->ctrl |= MACB_BIT(TX_WRAP);
 
 	return 0;
@@ -3026,7 +3204,7 @@ static u32 macb_mdc_clk_div(struct macb *bp)
 	u32 config;
 	unsigned long pclk_hz;
 
-	if (macb_is_gem(bp))
+	if (macb_is_gem(&bp->info))
 		return gem_mdc_clk_div(bp);
 
 	pclk_hz = clk_get_rate(bp->pclk);
@@ -3048,7 +3226,7 @@ static u32 macb_mdc_clk_div(struct macb *bp)
  */
 static u32 macb_dbw(struct macb *bp)
 {
-	if (!macb_is_gem(bp))
+	if (!macb_is_gem(&bp->info))
 		return 0;
 
 	switch (GEM_BFEXT(DBWDEF, gem_readl(bp, DCFG1))) {
@@ -3076,8 +3254,8 @@ static void macb_configure_dma(struct macb *bp)
 	unsigned int q;
 	u32 dmacfg;
 
-	buffer_size = bp->rx_buffer_size / RX_BUFFER_MULTIPLE;
-	if (macb_is_gem(bp)) {
+	buffer_size = bp->ctx->rx_buffer_size / RX_BUFFER_MULTIPLE;
+	if (macb_is_gem(&bp->info)) {
 		dmacfg = gem_readl(bp, DMACFG) & ~GEM_BF(RXBS, -1L);
 		for (q = 0, queue = bp->queues; q < bp->num_queues; ++q, ++queue) {
 			if (q)
@@ -3101,9 +3279,9 @@ static void macb_configure_dma(struct macb *bp)
 			dmacfg &= ~GEM_BIT(TXCOEN);
 
 		dmacfg &= ~GEM_BIT(ADDR64);
-		if (macb_dma64(bp))
+		if (macb_dma64(&bp->info))
 			dmacfg |= GEM_BIT(ADDR64);
-		if (macb_dma_ptp(bp))
+		if (macb_dma_ptp(&bp->info))
 			dmacfg |= GEM_BIT(RXEXT) | GEM_BIT(TXEXT);
 		netdev_dbg(bp->netdev, "Cadence configure DMA with 0x%08x\n",
 			   dmacfg);
@@ -3111,6 +3289,112 @@ static void macb_configure_dma(struct macb *bp)
 	}
 }
 
+static void macb_context_swap_start(struct macb *bp)
+{
+	struct macb_queue *queue;
+	unsigned long flags;
+	unsigned int q;
+	u32 ctrl;
+
+	mutex_lock(&bp->mac_cfg_lock);
+
+	macb_quiesce_start(bp);
+
+	/* Can finally disable software Tx; need to wait until napi_tx and
+	 * tx_error_task cannot be scheduled as either might wakeup Tx.
+	 */
+	netif_tx_disable(bp->netdev);
+
+	/* Now that everything is stopped, clear DQL. */
+	for (q = 0; q < bp->num_queues; ++q)
+		netdev_tx_reset_queue(netdev_get_tx_queue(bp->netdev, q));
+
+	/* Safe to call outside bp->lock because bp->irq_quiesced ensures the IRQ
+	 * handling is a no-op and all BH features are disabled.
+	 *
+	 * Whether it fails or not we'll disable TE/RE next.
+	 * We were just trying to be nice.
+	 */
+	macb_halt_tx(bp);
+
+	spin_lock_irqsave(&bp->lock, flags);
+
+	ctrl = macb_readl(bp, NCR);
+	macb_writel(bp, NCR, ctrl & ~(MACB_BIT(RE) | MACB_BIT(TE)));
+
+	for (q = 0, queue = bp->queues; q < bp->num_queues; ++q, ++queue) {
+		queue_writel(queue, IDR, -1);
+		queue_readl(queue, ISR);
+		macb_queue_isr_clear(bp, queue, -1);
+	}
+
+	macb_writel(bp, TSR, -1);
+	macb_writel(bp, RSR, -1);
+
+	spin_unlock_irqrestore(&bp->lock, flags);
+}
+
+static void macb_context_swap_end(struct macb *bp,
+				  struct macb_context *new_ctx)
+{
+	struct macb_context *old_ctx;
+	struct macb_queue *queue;
+	unsigned long flags;
+	unsigned int q;
+	u32 ctrl;
+
+	lockdep_assert_held(&bp->mac_cfg_lock);
+
+	/* Swap contexts & give buffer pointers to HW. */
+
+	old_ctx = bp->ctx;
+	WRITE_ONCE(bp->ctx, new_ctx);
+	wmb(); /* ensure IRQ enabled below read the new context */
+	macb_init_buffers(bp);
+
+	/* Start NAPI, HW Tx/Rx and software Tx. */
+
+	for (q = 0, queue = bp->queues; q < bp->num_queues; ++q, ++queue) {
+		napi_enable(&queue->napi_rx);
+		napi_enable(&queue->napi_tx);
+	}
+
+	spin_lock_irqsave(&bp->lock, flags);
+
+	/* Re-arm normal interrupt processing before enabling IRQs. */
+	bp->irq_quiesced = false;
+
+	macb_configure_dma(bp);
+
+	if (bp->link_up) {
+		for (q = 0, queue = bp->queues; q < bp->num_queues; ++q, ++queue) {
+			queue_writel(queue, IER,
+				     bp->rx_intr_mask |
+				     MACB_TX_INT_FLAGS |
+				     MACB_BIT(HRESP));
+		}
+
+		ctrl = macb_readl(bp, NCR);
+		macb_writel(bp, NCR, ctrl | MACB_BIT(RE) | MACB_BIT(TE));
+	}
+
+	spin_unlock_irqrestore(&bp->lock, flags);
+
+	if (bp->link_up) {
+		netif_tx_wake_all_queues(bp->netdev);
+
+		if (bp->eee_active)
+			macb_txp_lpi_initial_defer(bp);
+	}
+
+	mutex_unlock(&bp->mac_cfg_lock);
+
+	/* Free old context. */
+
+	macb_free(old_ctx);
+	kfree(old_ctx);
+}
+
 static void macb_init_hw(struct macb *bp)
 {
 	u32 config;
@@ -3131,7 +3415,8 @@ static void macb_init_hw(struct macb *bp)
 		config |= MACB_BIT(BIG);	/* Receive oversized frames */
 	if (bp->netdev->flags & IFF_PROMISC)
 		config |= MACB_BIT(CAF);	/* Copy All Frames */
-	else if (macb_is_gem(bp) && bp->netdev->features & NETIF_F_RXCSUM)
+	else if (macb_is_gem(&bp->info) &&
+		 bp->netdev->features & NETIF_F_RXCSUM)
 		config |= GEM_BIT(RXCOEN);
 	if (!(bp->netdev->flags & IFF_BROADCAST))
 		config |= MACB_BIT(NBC);	/* No BroadCast */
@@ -3239,14 +3524,14 @@ static void macb_set_rx_mode(struct net_device *netdev)
 		cfg |= MACB_BIT(CAF);
 
 		/* Disable RX checksum offload */
-		if (macb_is_gem(bp))
+		if (macb_is_gem(&bp->info))
 			cfg &= ~GEM_BIT(RXCOEN);
 	} else {
 		/* Disable promiscuous mode */
 		cfg &= ~MACB_BIT(CAF);
 
 		/* Enable RX checksum offload only if requested */
-		if (macb_is_gem(bp) && netdev->features & NETIF_F_RXCSUM)
+		if (macb_is_gem(&bp->info) && netdev->features & NETIF_F_RXCSUM)
 			cfg |= GEM_BIT(RXCOEN);
 	}
 
@@ -3271,8 +3556,8 @@ static void macb_set_rx_mode(struct net_device *netdev)
 
 static int macb_open(struct net_device *netdev)
 {
-	size_t bufsz = netdev->mtu + ETH_HLEN + ETH_FCS_LEN + NET_IP_ALIGN;
 	struct macb *bp = netdev_priv(netdev);
+	struct macb_context *ctx;
 	int err;
 
 	netdev_dbg(bp->netdev, "open\n");
@@ -3281,19 +3566,18 @@ static int macb_open(struct net_device *netdev)
 	if (err < 0)
 		return err;
 
-	/* RX buffers initialization */
-	macb_init_rx_buffer_size(bp, bufsz);
-
-	err = macb_alloc(bp);
-	if (err) {
-		netdev_err(netdev, "Unable to allocate DMA memory (error %d)\n",
-			   err);
+	ctx = macb_context_alloc(bp, netdev->mtu,
+				 bp->configured_rx_ring_size,
+				 bp->configured_tx_ring_size);
+	if (IS_ERR(ctx)) {
+		err = PTR_ERR(ctx);
+		bp->ctx = NULL;
 		goto pm_exit;
 	}
 
-	err = bp->macbgem_ops.mog_init_rings(bp);
-	if (err)
-		goto free_rings;
+	WRITE_ONCE(bp->ctx, ctx);
+	wmb(); /* ensure IRQ enabled at quiesce end read the new context */
+
 	macb_init_buffers(bp);
 
 	macb_quiesce_end(bp);
@@ -3327,8 +3611,9 @@ static int macb_open(struct net_device *netdev)
 	macb_quiesce_start(bp);
 
 	macb_reset_hw(bp);
-free_rings:
-	macb_free(bp);
+	macb_free(bp->ctx);
+	kfree(bp->ctx);
+	bp->ctx = NULL;
 pm_exit:
 	pm_runtime_put_sync(&bp->pdev->dev);
 	return err;
@@ -3359,7 +3644,9 @@ static int macb_close(struct net_device *netdev)
 	netif_carrier_off(netdev);
 	spin_unlock_irqrestore(&bp->lock, flags);
 
-	macb_free(bp);
+	macb_free(bp->ctx);
+	kfree(bp->ctx);
+	bp->ctx = NULL;
 
 	if (bp->ptp_info)
 		bp->ptp_info->ptp_remove(netdev);
@@ -3371,11 +3658,29 @@ static int macb_close(struct net_device *netdev)
 
 static int macb_change_mtu(struct net_device *netdev, int new_mtu)
 {
-	if (netif_running(netdev))
-		return -EBUSY;
+	struct macb *bp = netdev_priv(netdev);
+	bool running = netif_running(netdev);
+	struct macb_context *new_ctx;
+
+	if (running) {
+		/* Context swapping is not supported for AT91. */
+		if (bp->caps & MACB_CAPS_MACB_IS_EMAC)
+			return -EBUSY;
+
+		new_ctx = macb_context_alloc(bp, new_mtu,
+					     bp->configured_rx_ring_size,
+					     bp->configured_tx_ring_size);
+		if (IS_ERR(new_ctx))
+			return PTR_ERR(new_ctx);
+
+		macb_context_swap_start(bp);
+	}
 
 	WRITE_ONCE(netdev->mtu, new_mtu);
 
+	if (running)
+		macb_context_swap_end(bp, new_ctx);
+
 	return 0;
 }
 
@@ -3510,7 +3815,7 @@ static void macb_get_stats(struct net_device *netdev,
 	struct macb_stats *hwstat = &bp->hw_stats.macb;
 
 	netdev_stats_to_stats64(nstat, &bp->netdev->stats);
-	if (macb_is_gem(bp)) {
+	if (macb_is_gem(&bp->info)) {
 		gem_get_stats(bp, nstat);
 		return;
 	}
@@ -3725,15 +4030,22 @@ static int macb_get_regs_len(struct net_device *netdev)
 static void macb_get_regs(struct net_device *netdev, struct ethtool_regs *regs,
 			  void *p)
 {
+	dma_addr_t tx_dma_tail = 0, tx_dma_head = 0;
 	struct macb *bp = netdev_priv(netdev);
-	unsigned int tail, head;
+	unsigned int tail = 0, head = 0;
+	struct macb_txq *txq;
 	u32 *regs_buff = p;
 
 	regs->version = (macb_readl(bp, MID) & ((1 << MACB_REV_SIZE) - 1))
 			| MACB_GREGS_VERSION;
 
-	tail = macb_tx_ring_wrap(bp, bp->queues[0].tx_tail);
-	head = macb_tx_ring_wrap(bp, bp->queues[0].tx_head);
+	if (bp->ctx) {
+		txq = &bp->ctx->txq[0];
+		tail = macb_tx_ring_wrap(bp->ctx, txq->tail);
+		head = macb_tx_ring_wrap(bp->ctx, txq->head);
+		tx_dma_tail = macb_tx_dma(&bp->queues[0], tail);
+		tx_dma_head = macb_tx_dma(&bp->queues[0], head);
+	}
 
 	regs_buff[0]  = macb_readl(bp, NCR);
 	regs_buff[1]  = macb_or_gem_readl(bp, NCFGR);
@@ -3746,12 +4058,12 @@ static void macb_get_regs(struct net_device *netdev, struct ethtool_regs *regs,
 
 	regs_buff[8]  = tail;
 	regs_buff[9]  = head;
-	regs_buff[10] = macb_tx_dma(&bp->queues[0], tail);
-	regs_buff[11] = macb_tx_dma(&bp->queues[0], head);
+	regs_buff[10] = tx_dma_tail;
+	regs_buff[11] = tx_dma_head;
 
 	if (!(bp->caps & MACB_CAPS_USRIO_DISABLED))
 		regs_buff[12] = macb_or_gem_readl(bp, USRIO);
-	if (macb_is_gem(bp))
+	if (macb_is_gem(&bp->info))
 		regs_buff[13] = gem_readl(bp, DMACFG);
 }
 
@@ -3812,8 +4124,8 @@ static void macb_get_ringparam(struct net_device *netdev,
 	ring->rx_max_pending = MAX_RX_RING_SIZE;
 	ring->tx_max_pending = MAX_TX_RING_SIZE;
 
-	ring->rx_pending = bp->rx_ring_size;
-	ring->tx_pending = bp->tx_ring_size;
+	ring->rx_pending = bp->configured_rx_ring_size;
+	ring->tx_pending = bp->configured_tx_ring_size;
 }
 
 static int macb_set_ringparam(struct net_device *netdev,
@@ -3821,9 +4133,10 @@ static int macb_set_ringparam(struct net_device *netdev,
 			      struct kernel_ethtool_ringparam *kernel_ring,
 			      struct netlink_ext_ack *extack)
 {
+	unsigned int new_rx_size, new_tx_size;
 	struct macb *bp = netdev_priv(netdev);
-	u32 new_rx_size, new_tx_size;
-	unsigned int reset = 0;
+	bool running = netif_running(netdev);
+	struct macb_context *new_ctx;
 
 	if (bp->caps & MACB_CAPS_MACB_IS_EMAC)
 		return -EOPNOTSUPP;
@@ -3839,22 +4152,26 @@ static int macb_set_ringparam(struct net_device *netdev,
 			      MIN_TX_RING_SIZE, MAX_TX_RING_SIZE);
 	new_tx_size = roundup_pow_of_two(new_tx_size);
 
-	if ((new_tx_size == bp->tx_ring_size) &&
-	    (new_rx_size == bp->rx_ring_size)) {
+	if (new_tx_size == bp->configured_tx_ring_size &&
+	    new_rx_size == bp->configured_rx_ring_size) {
 		/* nothing to do */
 		return 0;
 	}
 
-	if (netif_running(bp->netdev)) {
-		reset = 1;
-		macb_close(bp->netdev);
+	if (running) {
+		new_ctx = macb_context_alloc(bp, netdev->mtu,
+					     new_rx_size, new_tx_size);
+		if (IS_ERR(new_ctx))
+			return PTR_ERR(new_ctx);
+
+		macb_context_swap_start(bp);
 	}
 
-	bp->rx_ring_size = new_rx_size;
-	bp->tx_ring_size = new_tx_size;
+	bp->configured_rx_ring_size = new_rx_size;
+	bp->configured_tx_ring_size = new_tx_size;
 
-	if (reset)
-		macb_open(bp->netdev);
+	if (running)
+		macb_context_swap_end(bp, new_ctx);
 
 	return 0;
 }
@@ -3886,7 +4203,7 @@ static int gem_get_ts_info(struct net_device *netdev,
 {
 	struct macb *bp = netdev_priv(netdev);
 
-	if (!macb_dma_ptp(bp)) {
+	if (!macb_dma_ptp(&bp->info)) {
 		ethtool_op_get_ts_info(netdev, info);
 		return 0;
 	}
@@ -3987,7 +4304,7 @@ static void gem_prog_cmp_regs(struct macb *bp, struct ethtool_rx_flow_spec *fs)
 	bool cmp_b = false;
 	bool cmp_c = false;
 
-	if (!macb_is_gem(bp))
+	if (!macb_is_gem(&bp->info))
 		return;
 
 	tp4sp_v = &(fs->h_u.tcp_ip4_spec);
@@ -4348,7 +4665,7 @@ static inline void macb_set_txcsum_feature(struct macb *bp,
 {
 	u32 val;
 
-	if (!macb_is_gem(bp))
+	if (!macb_is_gem(&bp->info))
 		return;
 
 	val = gem_readl(bp, DMACFG);
@@ -4366,7 +4683,7 @@ static inline void macb_set_rxcsum_feature(struct macb *bp,
 	struct net_device *netdev = bp->netdev;
 	u32 val;
 
-	if (!macb_is_gem(bp))
+	if (!macb_is_gem(&bp->info))
 		return;
 
 	val = gem_readl(bp, NCFGR);
@@ -4381,7 +4698,7 @@ static inline void macb_set_rxcsum_feature(struct macb *bp,
 static inline void macb_set_rxflow_feature(struct macb *bp,
 					   netdev_features_t features)
 {
-	if (!macb_is_gem(bp))
+	if (!macb_is_gem(&bp->info))
 		return;
 
 	gem_enable_flow_filters(bp, !!(features & NETIF_F_NTUPLE));
@@ -4706,7 +5023,7 @@ static void macb_configure_caps(struct macb *bp,
 			bp->caps |= MACB_CAPS_FIFO_MODE;
 		if (GEM_BFEXT(PBUF_RSC, gem_readl(bp, DCFG6)))
 			bp->caps |= MACB_CAPS_RSC;
-		if (gem_has_ptp(bp)) {
+		if (gem_has_ptp(&bp->info)) {
 			if (!GEM_BFEXT(TSU, gem_readl(bp, DCFG5)))
 				dev_err(&bp->pdev->dev,
 					"GEM doesn't support hardware ptp.\n");
@@ -4864,9 +5181,6 @@ static int macb_init_dflt(struct platform_device *pdev)
 	int err;
 	u32 val, reg;
 
-	bp->tx_ring_size = DEFAULT_TX_RING_SIZE;
-	bp->rx_ring_size = DEFAULT_RX_RING_SIZE;
-
 	/* No locking needed because the IRQs are not requested yet. The
 	 * flag is cleared by macb_open() and re-armed by macb_close().
 	 */
@@ -4926,7 +5240,7 @@ static int macb_init_dflt(struct platform_device *pdev)
 	netdev->netdev_ops = &macb_netdev_ops;
 
 	/* setup appropriated routines according to adapter type */
-	if (macb_is_gem(bp)) {
+	if (macb_is_gem(&bp->info)) {
 		bp->macbgem_ops.mog_alloc_rx_buffers = gem_alloc_rx_buffers;
 		bp->macbgem_ops.mog_free_rx_buffers = gem_free_rx_buffers;
 		bp->macbgem_ops.mog_init_rings = gem_init_rings;
@@ -4955,7 +5269,7 @@ static int macb_init_dflt(struct platform_device *pdev)
 		netdev->hw_features |= MACB_NETIF_LSO;
 
 	/* Checksum offload is only available on gem with packet buffer */
-	if (macb_is_gem(bp) && !(bp->caps & MACB_CAPS_FIFO_MODE))
+	if (macb_is_gem(&bp->info) && !(bp->caps & MACB_CAPS_FIFO_MODE))
 		netdev->hw_features |= NETIF_F_HW_CSUM | NETIF_F_RXCSUM;
 	if (bp->caps & MACB_CAPS_SG_DISABLED)
 		netdev->hw_features &= ~NETIF_F_SG;
@@ -5078,26 +5392,26 @@ static struct sifive_fu540_macb_mgmt *mgmt;
 
 static int at91ether_alloc_coherent(struct macb *bp)
 {
-	struct macb_queue *queue = &bp->queues[0];
+	struct macb_rxq *rxq = &bp->ctx->rxq[0];
 
-	queue->rx_ring = dma_alloc_coherent(&bp->pdev->dev,
-					    (AT91ETHER_MAX_RX_DESCR *
-					     macb_dma_desc_get_size(bp)),
-					    &queue->rx_ring_dma, GFP_KERNEL);
-	if (!queue->rx_ring)
+	rxq->ring = dma_alloc_coherent(&bp->pdev->dev,
+				       (AT91ETHER_MAX_RX_DESCR *
+					macb_dma_desc_get_size(&bp->info)),
+				       &rxq->ring_dma, GFP_KERNEL);
+	if (!rxq->ring)
 		return -ENOMEM;
 
-	queue->rx_buffers = dma_alloc_coherent(&bp->pdev->dev,
-					       AT91ETHER_MAX_RX_DESCR *
-					       AT91ETHER_MAX_RBUFF_SZ,
-					       &queue->rx_buffers_dma,
-					       GFP_KERNEL);
-	if (!queue->rx_buffers) {
+	rxq->buffers = dma_alloc_coherent(&bp->pdev->dev,
+					  AT91ETHER_MAX_RX_DESCR *
+					  AT91ETHER_MAX_RBUFF_SZ,
+					  &rxq->buffers_dma,
+					  GFP_KERNEL);
+	if (!rxq->buffers) {
 		dma_free_coherent(&bp->pdev->dev,
 				  AT91ETHER_MAX_RX_DESCR *
-				  macb_dma_desc_get_size(bp),
-				  queue->rx_ring, queue->rx_ring_dma);
-		queue->rx_ring = NULL;
+				  macb_dma_desc_get_size(&bp->info),
+				  rxq->ring, rxq->ring_dma);
+		rxq->ring = NULL;
 		return -ENOMEM;
 	}
 
@@ -5106,29 +5420,29 @@ static int at91ether_alloc_coherent(struct macb *bp)
 
 static void at91ether_free_coherent(struct macb *bp)
 {
-	struct macb_queue *queue = &bp->queues[0];
+	struct macb_rxq *rxq = &bp->ctx->rxq[0];
 
-	if (queue->rx_ring) {
+	if (rxq->ring) {
 		dma_free_coherent(&bp->pdev->dev,
 				  AT91ETHER_MAX_RX_DESCR *
-				  macb_dma_desc_get_size(bp),
-				  queue->rx_ring, queue->rx_ring_dma);
-		queue->rx_ring = NULL;
+				  macb_dma_desc_get_size(&bp->info),
+				  rxq->ring, rxq->ring_dma);
+		rxq->ring = NULL;
 	}
 
-	if (queue->rx_buffers) {
+	if (rxq->buffers) {
 		dma_free_coherent(&bp->pdev->dev,
 				  AT91ETHER_MAX_RX_DESCR *
 				  AT91ETHER_MAX_RBUFF_SZ,
-				  queue->rx_buffers, queue->rx_buffers_dma);
-		queue->rx_buffers = NULL;
+				  rxq->buffers, rxq->buffers_dma);
+		rxq->buffers = NULL;
 	}
 }
 
 /* Initialize and start the Receiver and Transmit subsystems */
 static int at91ether_start(struct macb *bp)
 {
-	struct macb_queue *queue = &bp->queues[0];
+	struct macb_rxq *rxq = &bp->ctx->rxq[0];
 	struct macb_dma_desc *desc;
 	dma_addr_t addr;
 	u32 ctl;
@@ -5138,10 +5452,10 @@ static int at91ether_start(struct macb *bp)
 	if (ret)
 		return ret;
 
-	addr = queue->rx_buffers_dma;
+	addr = rxq->buffers_dma;
 	for (i = 0; i < AT91ETHER_MAX_RX_DESCR; i++) {
-		desc = macb_rx_desc(queue, i);
-		macb_set_addr(bp, desc, addr);
+		desc = macb_rx_desc(bp->ctx, 0, i);
+		macb_set_addr(&bp->info, desc, addr);
 		desc->ctrl = 0;
 		addr += AT91ETHER_MAX_RBUFF_SZ;
 	}
@@ -5150,10 +5464,10 @@ static int at91ether_start(struct macb *bp)
 	desc->addr |= MACB_BIT(RX_WRAP);
 
 	/* Reset buffer index */
-	queue->rx_tail = 0;
+	rxq->tail = 0;
 
 	/* Program address of descriptor list in Rx Buffer Queue register */
-	macb_writel(bp, RBQP, queue->rx_ring_dma);
+	macb_writel(bp, RBQP, rxq->ring_dma);
 
 	/* Enable Receive and Transmit */
 	ctl = macb_readl(bp, NCR);
@@ -5188,6 +5502,8 @@ static void at91ether_stop(struct macb *bp)
 	ctl = macb_readl(bp, NCR);
 	macb_writel(bp, NCR, ctl & ~(MACB_BIT(TE) | MACB_BIT(RE)));
 
+	synchronize_irq(bp->netdev->irq);
+
 	/* Free resources. */
 	at91ether_free_coherent(bp);
 }
@@ -5203,6 +5519,14 @@ static int at91ether_open(struct net_device *netdev)
 	if (ret < 0)
 		return ret;
 
+	WRITE_ONCE(bp->ctx, kzalloc_obj(*bp->ctx));
+	wmb(); /* ensure IRQ enabled below read the new context */
+	if (!bp->ctx) {
+		ret = -ENOMEM;
+		goto pm_exit;
+	}
+	bp->ctx->info = &bp->info;
+
 	/* Clear internal statistics */
 	ctl = macb_readl(bp, NCR);
 	macb_writel(bp, NCR, ctl | MACB_BIT(CLRSTAT));
@@ -5211,7 +5535,7 @@ static int at91ether_open(struct net_device *netdev)
 
 	ret = at91ether_start(bp);
 	if (ret)
-		goto pm_exit;
+		goto free_ctx;
 
 	ret = macb_phylink_connect(bp);
 	if (ret)
@@ -5223,6 +5547,9 @@ static int at91ether_open(struct net_device *netdev)
 
 stop:
 	at91ether_stop(bp);
+free_ctx:
+	kfree(bp->ctx);
+	bp->ctx = NULL;
 pm_exit:
 	pm_runtime_put_sync(&bp->pdev->dev);
 	return ret;
@@ -5240,6 +5567,9 @@ static int at91ether_close(struct net_device *netdev)
 
 	at91ether_stop(bp);
 
+	kfree(bp->ctx);
+	bp->ctx = NULL;
+
 	pm_runtime_put(&bp->pdev->dev);
 
 	return 0;
@@ -5290,16 +5620,15 @@ static netdev_tx_t at91ether_start_xmit(struct sk_buff *skb,
 static void at91ether_rx(struct net_device *netdev)
 {
 	struct macb *bp = netdev_priv(netdev);
-	struct macb_queue *queue = &bp->queues[0];
+	struct macb_rxq *rxq = &bp->ctx->rxq[0];
 	struct macb_dma_desc *desc;
 	unsigned char *p_recv;
 	struct sk_buff *skb;
 	unsigned int pktlen;
 
-	desc = macb_rx_desc(queue, queue->rx_tail);
+	desc = macb_rx_desc(bp->ctx, 0, rxq->tail);
 	while (desc->addr & MACB_BIT(RX_USED)) {
-		p_recv = queue->rx_buffers +
-			 queue->rx_tail * AT91ETHER_MAX_RBUFF_SZ;
+		p_recv = rxq->buffers + rxq->tail * AT91ETHER_MAX_RBUFF_SZ;
 		pktlen = MACB_BF(RX_FRMLEN, desc->ctrl);
 		skb = netdev_alloc_skb(netdev, pktlen + 2);
 		if (skb) {
@@ -5321,12 +5650,12 @@ static void at91ether_rx(struct net_device *netdev)
 		desc->addr &= ~MACB_BIT(RX_USED);
 
 		/* wrap after last buffer */
-		if (queue->rx_tail == AT91ETHER_MAX_RX_DESCR - 1)
-			queue->rx_tail = 0;
+		if (rxq->tail == AT91ETHER_MAX_RX_DESCR - 1)
+			rxq->tail = 0;
 		else
-			queue->rx_tail++;
+			rxq->tail++;
 
-		desc = macb_rx_desc(queue, queue->rx_tail);
+		desc = macb_rx_desc(bp->ctx, 0, rxq->tail);
 	}
 }
 
@@ -5656,13 +5985,13 @@ static int macb_alloc_tieoff(struct macb *bp)
 		return 0;
 
 	bp->rx_ring_tieoff = dma_alloc_coherent(&bp->pdev->dev,
-						macb_dma_desc_get_size(bp),
+						macb_dma_desc_get_size(&bp->info),
 						&bp->rx_ring_tieoff_dma,
 						GFP_KERNEL);
 	if (!bp->rx_ring_tieoff)
 		return -ENOMEM;
 
-	macb_set_addr(bp, bp->rx_ring_tieoff,
+	macb_set_addr(&bp->info, bp->rx_ring_tieoff,
 		      MACB_BIT(RX_WRAP) | MACB_BIT(RX_USED));
 
 	bp->rx_ring_tieoff->ctrl = 0;
@@ -5675,7 +6004,7 @@ static void macb_free_tieoff(struct macb *bp)
 	if (!bp->rx_ring_tieoff)
 		return;
 
-	dma_free_coherent(&bp->pdev->dev, macb_dma_desc_get_size(bp),
+	dma_free_coherent(&bp->pdev->dev, macb_dma_desc_get_size(&bp->info),
 			  bp->rx_ring_tieoff,
 			  bp->rx_ring_tieoff_dma);
 	bp->rx_ring_tieoff = NULL;
@@ -5918,6 +6247,7 @@ static int macb_probe(struct platform_device *pdev)
 	u32 wtrmrk_rst_val;
 	void __iomem *mem;
 	struct macb *bp;
+	unsigned int q;
 	int num_queues;
 	bool native_io;
 	int err, val;
@@ -5963,6 +6293,8 @@ static int macb_probe(struct platform_device *pdev)
 	bp->netdev = netdev;
 	bp->regs = mem;
 	bp->native_io = native_io;
+	for (q = 0; q < MACB_MAX_QUEUES; q++)
+		bp->info.queue_stats[q] = &bp->queues[q].stats;
 	if (native_io) {
 		bp->macb_reg_readl = hw_readl_native;
 		bp->macb_reg_writel = hw_writel_native;
@@ -6020,10 +6352,20 @@ static int macb_probe(struct platform_device *pdev)
 	spin_lock_init(&bp->lock);
 	spin_lock_init(&bp->stats_lock);
 	spin_lock_init(&bp->tsu_clk_lock);
+	mutex_init(&bp->mac_cfg_lock);
 
 	/* setup capabilities */
 	macb_configure_caps(bp, macb_config);
 
+	if (bp->caps & MACB_CAPS_MACB_IS_EMAC) {
+		/* The name is lying on EMAC: sizes aren't configurable. */
+		bp->configured_rx_ring_size = AT91ETHER_MAX_RX_DESCR;
+		bp->configured_tx_ring_size = 1; /* tiny ring buffer */
+	} else {
+		bp->configured_rx_ring_size = DEFAULT_RX_RING_SIZE;
+		bp->configured_tx_ring_size = DEFAULT_TX_RING_SIZE;
+	}
+
 #ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT
 	if (GEM_BFEXT(DAW64, gem_readl(bp, DCFG6))) {
 		err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(44));
@@ -6054,12 +6396,12 @@ static int macb_probe(struct platform_device *pdev)
 		val = GEM_BFEXT(RXBD_RDBUFF, gem_readl(bp, DCFG10));
 		if (val)
 			bp->rx_bd_rd_prefetch = (2 << (val - 1)) *
-						macb_dma_desc_get_size(bp);
+						macb_dma_desc_get_size(&bp->info);
 
 		val = GEM_BFEXT(TXBD_RDBUFF, gem_readl(bp, DCFG10));
 		if (val)
 			bp->tx_bd_rd_prefetch = (2 << (val - 1)) *
-						macb_dma_desc_get_size(bp);
+						macb_dma_desc_get_size(&bp->info);
 	}
 
 	bp->rx_intr_mask = MACB_RX_INT_FLAGS;
@@ -6104,8 +6446,9 @@ static int macb_probe(struct platform_device *pdev)
 	}
 
 	netdev_info(netdev, "Cadence %s rev 0x%08x at 0x%08lx irq %d (%pM)\n",
-		    macb_is_gem(bp) ? "GEM" : "MACB", macb_readl(bp, MID),
-		    netdev->base_addr, netdev->irq, netdev->dev_addr);
+		    macb_is_gem(&bp->info) ? "GEM" : "MACB",
+		    macb_readl(bp, MID), netdev->base_addr, netdev->irq,
+		    netdev->dev_addr);
 
 	pm_runtime_put_autosuspend(&bp->pdev->dev);
 
@@ -6237,7 +6580,7 @@ static int __maybe_unused macb_suspend(struct device *dev)
 			tmp |= MACB_BFEXT(IP, ifa_local);
 		}
 
-		if (macb_is_gem(bp)) {
+		if (macb_is_gem(&bp->info)) {
 			queue_writel(bp->queues, IER, GEM_BIT(WOL));
 			gem_writel(bp, WOL, tmp);
 		} else {
@@ -6283,6 +6626,7 @@ static int __maybe_unused macb_resume(struct device *dev)
 {
 	struct net_device *netdev = dev_get_drvdata(dev);
 	struct macb *bp = netdev_priv(netdev);
+	struct macb_context *ctx = bp->ctx;
 	struct macb_queue *queue;
 	unsigned long flags;
 	unsigned int q;
@@ -6299,7 +6643,7 @@ static int __maybe_unused macb_resume(struct device *dev)
 	if (bp->wol & MACB_WOL_ENABLED) {
 		spin_lock_irqsave(&bp->lock, flags);
 		/* Disable WoL */
-		if (macb_is_gem(bp)) {
+		if (macb_is_gem(&bp->info)) {
 			queue_writel(bp->queues, IDR, GEM_BIT(WOL));
 			gem_writel(bp, WOL, 0);
 		} else {
@@ -6327,10 +6671,10 @@ static int __maybe_unused macb_resume(struct device *dev)
 	for (q = 0, queue = bp->queues; q < bp->num_queues;
 	     ++q, ++queue) {
 		if (!(bp->caps & MACB_CAPS_MACB_IS_EMAC)) {
-			if (macb_is_gem(bp))
-				gem_init_rx_ring(queue);
+			if (macb_is_gem(&bp->info))
+				gem_init_rx_ring(ctx, q);
 			else
-				macb_init_rx_ring(queue);
+				macb_init_rx_ring(ctx, q);
 		}
 
 		napi_enable(&queue->napi_rx);
diff --git a/drivers/net/ethernet/cadence/macb_ptp.c b/drivers/net/ethernet/cadence/macb_ptp.c
index 2fd063394698e..28e0e48b42d85 100644
--- a/drivers/net/ethernet/cadence/macb_ptp.c
+++ b/drivers/net/ethernet/cadence/macb_ptp.c
@@ -28,10 +28,10 @@
 static struct macb_dma_desc_ptp *macb_ptp_desc(struct macb *bp,
 					       struct macb_dma_desc *desc)
 {
-	if (!macb_dma_ptp(bp))
+	if (!macb_dma_ptp(&bp->info))
 		return NULL;
 
-	if (macb_dma64(bp))
+	if (macb_dma64(&bp->info))
 		return (struct macb_dma_desc_ptp *)
 				((u8 *)desc + sizeof(struct macb_dma_desc)
 				+ sizeof(struct macb_dma_desc_64));
@@ -380,7 +380,7 @@ int gem_get_hwtst(struct net_device *netdev,
 	struct macb *bp = netdev_priv(netdev);
 
 	*tstamp_config = bp->tstamp_config;
-	if (!macb_dma_ptp(bp))
+	if (!macb_dma_ptp(&bp->info))
 		return -EOPNOTSUPP;
 
 	return 0;
@@ -399,7 +399,7 @@ int gem_set_hwtst(struct net_device *netdev,
 	u32 ncr_bits = 0;
 	u32 regval;
 
-	if (!macb_dma_ptp(bp))
+	if (!macb_dma_ptp(&bp->info))
 		return -EOPNOTSUPP;
 
 	switch (tstamp_config->tx_type) {

3/2 2026/10/13 16:29 llm patch-evaluator
0m Model:
gemini-3.8-flash

Args:
null

Results:
null

Tokens:
							input: 40900
							output: 33
							thoughts: 272
						

Thoughts:
**Analyzing this Patch for the Cadence MACB Driver**

Okay, let's break this down. First, the instructions specify the target architecture is amd64. The patch touches files in the `drivers/net/ethernet/cadence/` directory, specifically `macb.h`, `macb_main.c`, and `macb_ptp.c`. This tells me we're dealing with the Cadence MACB (or GEM) Ethernet driver. 

My immediate concern is applicability. Is this even relevant to an amd64 system? I need to figure out if this driver can be instantiated on this architecture. Is it a platform device that's typically found on ARM or RISC-V systems, or is it a PCI device, or something else entirely? I need to know if it's reachable in a virtualized amd64 environment like GCE or QEMU.

To answer that, I'll need to dig into the configuration. Let me quickly `grep` for `CONFIG_MACB`, or check the `Kconfig` files in the directory. I'll also want to examine `macb_pci.c` or similar files. That should show me how the `macb` driver is configured and bound on this platform. I can use `grepper` or `read-file` to efficiently gather that information. I'm looking for the build flags so I can establish whether this driver can even apply to the target.



4/2 2026/10/13 16:29 tool grepper
0m Args:
{
  "Expression": "MACB",
  "PathPrefixes": [
    "drivers/net/ethernet/cadence/"
  ]
}

Results:
{
  "Output": "\nFull output is too long, showing 200 out of 1780 lines.\nUse more precise expression or PathPrefixes if possible.\n\nNumber of matching lines per file (6 files in total):\ndrivers/net/ethernet/cadence/Kconfig:11\ndrivers/net/ethernet/cadence/Makefile:3\ndrivers/net/ethernet/cadence/macb.h:401\ndrivers/net/ethernet/cadence/macb_main.c:381\ndrivers/net/ethernet/cadence/macb_pci.c:2\ndrivers/net/ethernet/cadence/macb_ptp.c:5\n\ndrivers/net/ethernet/cadence/Kconfig=20=if NET_VENDOR_CADENCE\ndrivers/net/ethernet/cadence/Kconfig-21-\ndrivers/net/ethernet/cadence/Kconfig:22:config MACB\ndrivers/net/ethernet/cadence/Kconfig:23:\ttristate \"Cadence MACB/GEM support\"\ndrivers/net/ethernet/cadence/Kconfig-24-\tdepends on HAS_DMA \u0026\u0026 COMMON_CLK\n--\ndrivers/net/ethernet/cadence/Kconfig-28-\thelp\ndrivers/net/ethernet/cadence/Kconfig:29:\t  The Cadence MACB ethernet interface is found on many Atmel AT32 and\ndrivers/net/ethernet/cadence/Kconfig-30-\t  AT91 parts.  This driver also supports the Cadence GEM (Gigabit\ndrivers/net/ethernet/cadence/Kconfig-31-\t  Ethernet MAC found in some ARM SoC devices).  Say Y to include\ndrivers/net/ethernet/cadence/Kconfig:32:\t  support for the MACB/GEM chip.\ndrivers/net/ethernet/cadence/Kconfig-33-\n--\ndrivers/net/ethernet/cadence/Kconfig-36-\ndrivers/net/ethernet/cadence/Kconfig:37:config MACB_USE_HWSTAMP\ndrivers/net/ethernet/cadence/Kconfig-38-\tbool \"Use IEEE 1588 hwstamp\"\ndrivers/net/ethernet/cadence/Kconfig:39:\tdepends on MACB\ndrivers/net/ethernet/cadence/Kconfig-40-\tdepends on PTP_1588_CLOCK\n--\ndrivers/net/ethernet/cadence/Kconfig-42-\thelp\ndrivers/net/ethernet/cadence/Kconfig:43:\t  Enable IEEE 1588 Precision Time Protocol (PTP) support for MACB.\ndrivers/net/ethernet/cadence/Kconfig-44-\ndrivers/net/ethernet/cadence/Kconfig:45:config MACB_PCI\ndrivers/net/ethernet/cadence/Kconfig:46:\ttristate \"Cadence PCI MACB/GEM support\"\ndrivers/net/ethernet/cadence/Kconfig:47:\tdepends on MACB \u0026\u0026 PCI\ndrivers/net/ethernet/cadence/Kconfig-48-\thelp\ndrivers/net/ethernet/cadence/Kconfig:49:\t  This is PCI wrapper for MACB driver.\ndrivers/net/ethernet/cadence/Kconfig-50-\n--\ndrivers/net/ethernet/cadence/Makefile=5=macb-y\t:= macb_main.o\ndrivers/net/ethernet/cadence/Makefile-6-\ndrivers/net/ethernet/cadence/Makefile:7:ifeq ($(CONFIG_MACB_USE_HWSTAMP),y)\ndrivers/net/ethernet/cadence/Makefile-8-macb-y\t+= macb_ptp.o\ndrivers/net/ethernet/cadence/Makefile=9=endif\ndrivers/net/ethernet/cadence/Makefile-10-\ndrivers/net/ethernet/cadence/Makefile:11:obj-$(CONFIG_MACB) += macb.o\ndrivers/net/ethernet/cadence/Makefile:12:obj-$(CONFIG_MACB_PCI) += macb_pci.o\n--\ndrivers/net/ethernet/cadence/macb.h-2-/*\ndrivers/net/ethernet/cadence/macb.h:3: * Atmel MACB Ethernet Controller driver\ndrivers/net/ethernet/cadence/macb.h-4- *\n--\ndrivers/net/ethernet/cadence/macb.h-6- */\ndrivers/net/ethernet/cadence/macb.h:7:#ifndef _MACB_H\ndrivers/net/ethernet/cadence/macb.h:8:#define _MACB_H\ndrivers/net/ethernet/cadence/macb.h-9-\n--\ndrivers/net/ethernet/cadence/macb.h-17-\ndrivers/net/ethernet/cadence/macb.h:18:#define MACB_GREGS_NBR 16\ndrivers/net/ethernet/cadence/macb.h:19:#define MACB_GREGS_VERSION 2\ndrivers/net/ethernet/cadence/macb.h:20:#define MACB_MAX_QUEUES 8\ndrivers/net/ethernet/cadence/macb.h-21-\ndrivers/net/ethernet/cadence/macb.h:22:/* MACB register offsets */\ndrivers/net/ethernet/cadence/macb.h:23:#define MACB_NCR\t\t0x0000 /* Network Control */\ndrivers/net/ethernet/cadence/macb.h:24:#define MACB_NCFGR\t\t0x0004 /* Network Config */\ndrivers/net/ethernet/cadence/macb.h:25:#define MACB_NSR\t\t0x0008 /* Network Status */\ndrivers/net/ethernet/cadence/macb.h:26:#define MACB_TAR\t\t0x000c /* AT91RM9200 only */\ndrivers/net/ethernet/cadence/macb.h:27:#define MACB_TCR\t\t0x0010 /* AT91RM9200 only */\ndrivers/net/ethernet/cadence/macb.h:28:#define MACB_TSR\t\t0x0014 /* Transmit Status */\ndrivers/net/ethernet/cadence/macb.h:29:#define MACB_RBQP\t\t0x0018 /* RX Q Base Address */\ndrivers/net/ethernet/cadence/macb.h:30:#define MACB_TBQP\t\t0x001c /* TX Q Base Address */\ndrivers/net/ethernet/cadence/macb.h:31:#define MACB_RSR\t\t0x0020 /* Receive Status */\ndrivers/net/ethernet/cadence/macb.h:32:#define MACB_ISR\t\t0x0024 /* Interrupt Status */\ndrivers/net/ethernet/cadence/macb.h:33:#define MACB_IER\t\t0x0028 /* Interrupt Enable */\ndrivers/net/ethernet/cadence/macb.h:34:#define MACB_IDR\t\t0x002c /* Interrupt Disable */\ndrivers/net/ethernet/cadence/macb.h:35:#define MACB_IMR\t\t0x0030 /* Interrupt Mask */\ndrivers/net/ethernet/cadence/macb.h:36:#define MACB_MAN\t\t0x0034 /* PHY Maintenance */\ndrivers/net/ethernet/cadence/macb.h:37:#define MACB_PTR\t\t0x0038\ndrivers/net/ethernet/cadence/macb.h:38:#define MACB_PFR\t\t0x003c\ndrivers/net/ethernet/cadence/macb.h:39:#define MACB_FTO\t\t0x0040\ndrivers/net/ethernet/cadence/macb.h:40:#define MACB_SCF\t\t0x0044\ndrivers/net/ethernet/cadence/macb.h:41:#define MACB_MCF\t\t0x0048\ndrivers/net/ethernet/cadence/macb.h:42:#define MACB_FRO\t\t0x004c\ndrivers/net/ethernet/cadence/macb.h:43:#define MACB_FCSE\t\t0x0050\ndrivers/net/ethernet/cadence/macb.h:44:#define MACB_ALE\t\t0x0054\ndrivers/net/ethernet/cadence/macb.h:45:#define MACB_DTF\t\t0x0058\ndrivers/net/ethernet/cadence/macb.h:46:#define MACB_LCOL\t\t0x005c\ndrivers/net/ethernet/cadence/macb.h:47:#define MACB_EXCOL\t\t0x0060\ndrivers/net/ethernet/cadence/macb.h:48:#define MACB_TUND\t\t0x0064\ndrivers/net/ethernet/cadence/macb.h:49:#define MACB_CSE\t\t0x0068\ndrivers/net/ethernet/cadence/macb.h:50:#define MACB_RRE\t\t0x006c\ndrivers/net/ethernet/cadence/macb.h:51:#define MACB_ROVR\t\t0x0070\ndrivers/net/ethernet/cadence/macb.h:52:#define MACB_RSE\t\t0x0074\ndrivers/net/ethernet/cadence/macb.h:53:#define MACB_ELE\t\t0x0078\ndrivers/net/ethernet/cadence/macb.h:54:#define MACB_RJA\t\t0x007c\ndrivers/net/ethernet/cadence/macb.h:55:#define MACB_USF\t\t0x0080\ndrivers/net/ethernet/cadence/macb.h:56:#define MACB_STE\t\t0x0084\ndrivers/net/ethernet/cadence/macb.h:57:#define MACB_RLE\t\t0x0088\ndrivers/net/ethernet/cadence/macb.h:58:#define MACB_TPF\t\t0x008c\ndrivers/net/ethernet/cadence/macb.h:59:#define MACB_HRB\t\t0x0090\ndrivers/net/ethernet/cadence/macb.h:60:#define MACB_HRT\t\t0x0094\ndrivers/net/ethernet/cadence/macb.h:61:#define MACB_SA1B\t\t0x0098\ndrivers/net/ethernet/cadence/macb.h:62:#define MACB_SA1T\t\t0x009c\ndrivers/net/ethernet/cadence/macb.h:63:#define MACB_SA2B\t\t0x00a0\ndrivers/net/ethernet/cadence/macb.h:64:#define MACB_SA2T\t\t0x00a4\ndrivers/net/ethernet/cadence/macb.h:65:#define MACB_SA3B\t\t0x00a8\ndrivers/net/ethernet/cadence/macb.h:66:#define MACB_SA3T\t\t0x00ac\ndrivers/net/ethernet/cadence/macb.h:67:#define MACB_SA4B\t\t0x00b0\ndrivers/net/ethernet/cadence/macb.h:68:#define MACB_SA4T\t\t0x00b4\ndrivers/net/ethernet/cadence/macb.h:69:#define MACB_TID\t\t0x00b8\ndrivers/net/ethernet/cadence/macb.h:70:#define MACB_TPQ\t\t0x00bc\ndrivers/net/ethernet/cadence/macb.h:71:#define MACB_USRIO\t\t0x00c0\ndrivers/net/ethernet/cadence/macb.h:72:#define MACB_WOL\t\t0x00c4\ndrivers/net/ethernet/cadence/macb.h:73:#define MACB_MID\t\t0x00fc\ndrivers/net/ethernet/cadence/macb.h:74:#define MACB_TBQPH\t\t0x04C8\ndrivers/net/ethernet/cadence/macb.h:75:#define MACB_RBQPH\t\t0x04D4\ndrivers/net/ethernet/cadence/macb.h-76-\n--\ndrivers/net/ethernet/cadence/macb.h-230-/* Bitfields in NCR */\ndrivers/net/ethernet/cadence/macb.h:231:#define MACB_LB_OFFSET\t\t0 /* reserved */\ndrivers/net/ethernet/cadence/macb.h:232:#define MACB_LB_SIZE\t\t1\ndrivers/net/ethernet/cadence/macb.h:233:#define MACB_LLB_OFFSET\t\t1 /* Loop back local */\ndrivers/net/ethernet/cadence/macb.h:234:#define MACB_LLB_SIZE\t\t1\ndrivers/net/ethernet/cadence/macb.h:235:#define MACB_RE_OFFSET\t\t2 /* Receive enable */\ndrivers/net/ethernet/cadence/macb.h:236:#define MACB_RE_SIZE\t\t1\ndrivers/net/ethernet/cadence/macb.h:237:#define MACB_TE_OFFSET\t\t3 /* Transmit enable */\ndrivers/net/ethernet/cadence/macb.h:238:#define MACB_TE_SIZE\t\t1\ndrivers/net/ethernet/cadence/macb.h:239:#define MACB_MPE_OFFSET\t\t4 /* Management port enable */\ndrivers/net/ethernet/cadence/macb.h:240:#define MACB_MPE_SIZE\t\t1\ndrivers/net/ethernet/cadence/macb.h:241:#define MACB_CLRSTAT_OFFSET\t5 /* Clear stats regs */\ndrivers/net/ethernet/cadence/macb.h:242:#define MACB_CLRSTAT_SIZE\t1\ndrivers/net/ethernet/cadence/macb.h:243:#define MACB_INCSTAT_OFFSET\t6 /* Incremental stats regs */\ndrivers/net/ethernet/cadence/macb.h:244:#define MACB_INCSTAT_SIZE\t1\ndrivers/net/ethernet/cadence/macb.h:245:#define MACB_WESTAT_OFFSET\t7 /* Write enable stats regs */\ndrivers/net/ethernet/cadence/macb.h:246:#define MACB_WESTAT_SIZE\t1\ndrivers/net/ethernet/cadence/macb.h:247:#define MACB_BP_OFFSET\t\t8 /* Back pressure */\ndrivers/net/ethernet/cadence/macb.h:248:#define MACB_BP_SIZE\t\t1\ndrivers/net/ethernet/cadence/macb.h:249:#define MACB_TSTART_OFFSET\t9 /* Start transmission */\ndrivers/net/ethernet/cadence/macb.h:250:#define MACB_TSTART_SIZE\t1\ndrivers/net/ethernet/cadence/macb.h:251:#define MACB_THALT_OFFSET\t10 /* Transmit halt */\ndrivers/net/ethernet/cadence/macb.h:252:#define MACB_THALT_SIZE\t\t1\ndrivers/net/ethernet/cadence/macb.h:253:#define MACB_NCR_TPF_OFFSET\t11 /* Transmit pause frame */\ndrivers/net/ethernet/cadence/macb.h:254:#define MACB_NCR_TPF_SIZE\t1\ndrivers/net/ethernet/cadence/macb.h:255:#define MACB_TZQ_OFFSET\t\t12 /* Transmit zero quantum pause frame */\ndrivers/net/ethernet/cadence/macb.h:256:#define MACB_TZQ_SIZE\t\t1\ndrivers/net/ethernet/cadence/macb.h:257:#define MACB_SRTSM_OFFSET\t15 /* Store Receive Timestamp to Memory */\ndrivers/net/ethernet/cadence/macb.h:258:#define MACB_PTPUNI_OFFSET\t20 /* PTP Unicast packet enable */\ndrivers/net/ethernet/cadence/macb.h:259:#define MACB_PTPUNI_SIZE\t1\ndrivers/net/ethernet/cadence/macb.h:260:#define MACB_OSSMODE_OFFSET\t24 /* Enable One Step Synchro Mode */\ndrivers/net/ethernet/cadence/macb.h:261:#define MACB_OSSMODE_SIZE\t1\ndrivers/net/ethernet/cadence/macb.h:262:#define MACB_MIIONRGMII_OFFSET\t28 /* MII Usage on RGMII Interface */\ndrivers/net/ethernet/cadence/macb.h:263:#define MACB_MIIONRGMII_SIZE\t1\ndrivers/net/ethernet/cadence/macb.h-264-\ndrivers/net/ethernet/cadence/macb.h-265-/* Bitfields in NCFGR */\ndrivers/net/ethernet/cadence/macb.h:266:#define MACB_SPD_OFFSET\t\t0 /* Speed */\ndrivers/net/ethernet/cadence/macb.h:267:#define MACB_SPD_SIZE\t\t1\ndrivers/net/ethernet/cadence/macb.h:268:#define MACB_FD_OFFSET\t\t1 /* Full duplex */\ndrivers/net/ethernet/cadence/macb.h:269:#define MACB_FD_SIZE\t\t1\ndrivers/net/ethernet/cadence/macb.h:270:#define MACB_BIT_RATE_OFFSET\t2 /* Discard non-VLAN frames */\ndrivers/net/ethernet/cadence/macb.h:271:#define MACB_BIT_RATE_SIZE\t1\ndrivers/net/ethernet/cadence/macb.h:272:#define MACB_JFRAME_OFFSET\t3 /* reserved */\ndrivers/net/ethernet/cadence/macb.h:273:#define MACB_JFRAME_SIZE\t1\ndrivers/net/ethernet/cadence/macb.h:274:#define MACB_CAF_OFFSET\t\t4 /* Copy all frames */\ndrivers/net/ethernet/cadence/macb.h:275:#define MACB_CAF_SIZE\t\t1\ndrivers/net/ethernet/cadence/macb.h:276:#define MACB_NBC_OFFSET\t\t5 /* No broadcast */\ndrivers/net/ethernet/cadence/macb.h:277:#define MACB_NBC_SIZE\t\t1\ndrivers/net/ethernet/cadence/macb.h:278:#define MACB_NCFGR_MTI_OFFSET\t6 /* Multicast hash enable */\ndrivers/net/ethernet/cadence/macb.h:279:#define MACB_NCFGR_MTI_SIZE\t1\ndrivers/net/ethernet/cadence/macb.h:280:#define MACB_UNI_OFFSET\t\t7 /* Unicast hash enable */\ndrivers/net/ethernet/cadence/macb.h:281:#define MACB_UNI_SIZE\t\t1\ndrivers/net/ethernet/cadence/macb.h:282:#define MACB_BIG_OFFSET\t\t8 /* Receive 1536 byte frames */\ndrivers/net/ethernet/cadence/macb.h:283:#define MACB_BIG_SIZE\t\t1\ndrivers/net/ethernet/cadence/macb.h:284:#define MACB_EAE_OFFSET\t\t9 /* External address match enable */\ndrivers/net/ethernet/cadence/macb.h:285:#define MACB_EAE_SIZE\t\t1\ndrivers/net/ethernet/cadence/macb.h:286:#define MACB_CLK_OFFSET\t\t10\ndrivers/net/ethernet/cadence/macb.h:287:#define MACB_CLK_SIZE\t\t2\ndrivers/net/ethernet/cadence/macb.h:288:#define MACB_RTY_OFFSET\t\t12 /* Retry test */\ndrivers/net/ethernet/cadence/macb.h:289:#define MACB_RTY_SIZE\t\t1\ndrivers/net/ethernet/cadence/macb.h:290:#define MACB_PAE_OFFSET\t\t13 /* Pause enable */\ndrivers/net/ethernet/cadence/macb.h:291:#define MACB_PAE_SIZE\t\t1\ndrivers/net/ethernet/cadence/macb.h:292:#define MACB_RM9200_RMII_OFFSET\t13 /* AT91RM9200 only */\ndrivers/net/ethernet/cadence/macb.h:293:#define MACB_RM9200_RMII_SIZE\t1  /* AT91RM9200 only */\ndrivers/net/ethernet/cadence/macb.h:294:#define MACB_RBOF_OFFSET\t14 /* Receive buffer offset */\ndrivers/net/ethernet/cadence/macb.h:295:#define MACB_RBOF_SIZE\t\t2\ndrivers/net/ethernet/cadence/macb.h:296:#define MACB_RLCE_OFFSET\t16 /* Length field error frame discard */\ndrivers/net/ethernet/cadence/macb.h:297:#define MACB_RLCE_SIZE\t\t1\ndrivers/net/ethernet/cadence/macb.h:298:#define MACB_DRFCS_OFFSET\t17 /* FCS remove */\ndrivers/net/ethernet/cadence/macb.h:299:#define MACB_DRFCS_SIZE\t\t1\ndrivers/net/ethernet/cadence/macb.h:300:#define MACB_EFRHD_OFFSET\t18\ndrivers/net/ethernet/cadence/macb.h:301:#define MACB_EFRHD_SIZE\t\t1\ndrivers/net/ethernet/cadence/macb.h:302:#define MACB_IRXFCS_OFFSET\t19\ndrivers/net/ethernet/cadence/macb.h:303:#define MACB_IRXFCS_SIZE\t1\ndrivers/net/ethernet/cadence/macb.h-304-\n--\ndrivers/net/ethernet/cadence/macb.h-364-/* Bitfields in NSR */\ndrivers/net/ethernet/cadence/macb.h:365:#define MACB_NSR_LINK_OFFSET\t0 /* pcs_link_state */\ndrivers/net/ethernet/cadence/macb.h:366:#define MACB_NSR_LINK_SIZE\t1\ndrivers/net/ethernet/cadence/macb.h:367:#define MACB_MDIO_OFFSET\t1 /* status of the mdio_in pin */\ndrivers/net/ethernet/cadence/macb.h:368:#define MACB_MDIO_SIZE\t\t1\ndrivers/net/ethernet/cadence/macb.h:369:#define MACB_IDLE_OFFSET\t2 /* The PHY management logic is idle */\ndrivers/net/ethernet/cadence/macb.h:370:#define MACB_IDLE_SIZE\t\t1\ndrivers/net/ethernet/cadence/macb.h-371-\ndrivers/net/ethernet/cadence/macb.h-372-/* Bitfields in TSR */\ndrivers/net/ethernet/cadence/macb.h:373:#define MACB_UBR_OFFSET\t\t0 /* Used bit read */\ndrivers/net/ethernet/cadence/macb.h:374:#define MACB_UBR_SIZE\t\t1\ndrivers/net/ethernet/cadence/macb.h:375:#define MACB_COL_OFFSET\t\t1 /* Collision occurred */\ndrivers/net/ethernet/cadence/macb.h:376:#define MACB_COL_SIZE\t\t1\ndrivers/net/ethernet/cadence/macb.h:377:#define MACB_TSR_RLE_OFFSET\t2 /* Retry limit exceeded */\ndrivers/net/ethernet/cadence/macb.h:378:#define MACB_TSR_RLE_SIZE\t1\ndrivers/net/ethernet/cadence/macb.h:379:#define MACB_TGO_OFFSET\t\t3 /* Transmit go */\n\n"
}

5/2 2026/10/13 16:29 llm patch-evaluator
0m Model:
gemini-3.8-flash

Args:
null

Results:
null

Tokens:
							input: 47589
							output: 44
							thoughts: 38
						

Thoughts:
Okay, here's my take on those thoughts, tailored for an expert audience:

**Diving into the MACB Driver Implementation**

Alright, time to get my hands dirty. I'm going to start by zeroing in on the MACB PCI implementation. Let's see how `macb_pci.c` handles the hardware abstraction layer and how the PCI bus interacts with the MACB driver at a lower level. This should shed light on the initial device probing, resource allocation, and interrupt setup specifically for PCI-connected MACB controllers. I need to get a clear picture of how this layer translates the PCI configuration space information into something the core MACB driver can understand.

Then, I'll cross-reference that with `macb_main.c`. This is where the platform driver side of things comes in. I'll focus on how the platform driver is implemented and see how it interacts with the lower level of the code. This will help confirm my thoughts on PCI-specific interaction. I need to see how the platform device information and resource configuration mesh with what `macb_pci.c` sets up. Is it a clean separation of concerns, or is there a bit of overlap? Understanding the control flow between these two is critical for figuring out how the MACB driver is integrated within the broader system.



6/2 2026/10/13 16:29 tool read-file
0m Args:
{
  "File": "drivers/net/ethernet/cadence/macb_pci.c",
  "FirstLine": 1,
  "LineCount": 100
}

Results:
{
  "Contents": "   1:\t// SPDX-License-Identifier: GPL-2.0-only\n   2:\t/*\n   3:\t * DOC: Cadence GEM PCI wrapper.\n   4:\t *\n   5:\t * Copyright (C) 2016 Cadence Design Systems - https://www.cadence.com\n   6:\t *\n   7:\t * Authors: Rafal Ozieblo \u003crafalo@cadence.com\u003e\n   8:\t *\t    Bartosz Folta \u003cbfolta@cadence.com\u003e\n   9:\t */\n  10:\t\n  11:\t#include \u003clinux/clk.h\u003e\n  12:\t#include \u003clinux/clk-provider.h\u003e\n  13:\t#include \u003clinux/etherdevice.h\u003e\n  14:\t#include \u003clinux/module.h\u003e\n  15:\t#include \u003clinux/pci.h\u003e\n  16:\t#include \u003clinux/platform_device.h\u003e\n  17:\t#include \"macb.h\"\n  18:\t\n  19:\t#define PCI_DRIVER_NAME \"macb_pci\"\n  20:\t#define PLAT_DRIVER_NAME \"macb\"\n  21:\t\n  22:\t#define PCI_DEVICE_ID_CDNS_MACB 0xe007\n  23:\t\n  24:\t#define GEM_PCLK_RATE 50000000\n  25:\t#define GEM_HCLK_RATE 50000000\n  26:\t\n  27:\tstatic int macb_probe(struct pci_dev *pci, const struct pci_device_id *id)\n  28:\t{\n  29:\t\tint err;\n  30:\t\tstruct platform_device *pdev;\n  31:\t\tstruct platform_device_info plat_info;\n  32:\t\tstruct macb_platform_data plat_data;\n  33:\t\tstruct resource res[2];\n  34:\t\n  35:\t\t/* enable pci device */\n  36:\t\terr = pcim_enable_device(pci);\n  37:\t\tif (err \u003c 0) {\n  38:\t\t\tdev_err(\u0026pci-\u003edev, \"Enabling PCI device has failed: %d\", err);\n  39:\t\t\treturn err;\n  40:\t\t}\n  41:\t\n  42:\t\tpci_set_master(pci);\n  43:\t\n  44:\t\t/* set up resources */\n  45:\t\tmemset(res, 0x00, sizeof(struct resource) * ARRAY_SIZE(res));\n  46:\t\tres[0].start = pci_resource_start(pci, 0);\n  47:\t\tres[0].end = pci_resource_end(pci, 0);\n  48:\t\tres[0].name = PCI_DRIVER_NAME;\n  49:\t\tres[0].flags = IORESOURCE_MEM;\n  50:\t\tres[1].start = pci_irq_vector(pci, 0);\n  51:\t\tres[1].name = PCI_DRIVER_NAME;\n  52:\t\tres[1].flags = IORESOURCE_IRQ;\n  53:\t\n  54:\t\tdev_info(\u0026pci-\u003edev, \"EMAC physical base addr: %pa\\n\",\n  55:\t\t\t \u0026res[0].start);\n  56:\t\n  57:\t\t/* set up macb platform data */\n  58:\t\tmemset(\u0026plat_data, 0, sizeof(plat_data));\n  59:\t\n  60:\t\t/* initialize clocks */\n  61:\t\tplat_data.pclk = clk_register_fixed_rate(\u0026pci-\u003edev, \"pclk\", NULL, 0,\n  62:\t\t\t\t\t\t\t GEM_PCLK_RATE);\n  63:\t\tif (IS_ERR(plat_data.pclk)) {\n  64:\t\t\terr = PTR_ERR(plat_data.pclk);\n  65:\t\t\tgoto err_pclk_register;\n  66:\t\t}\n  67:\t\n  68:\t\tplat_data.hclk = clk_register_fixed_rate(\u0026pci-\u003edev, \"hclk\", NULL, 0,\n  69:\t\t\t\t\t\t\t GEM_HCLK_RATE);\n  70:\t\tif (IS_ERR(plat_data.hclk)) {\n  71:\t\t\terr = PTR_ERR(plat_data.hclk);\n  72:\t\t\tgoto err_hclk_register;\n  73:\t\t}\n  74:\t\n  75:\t\t/* set up platform device info */\n  76:\t\tmemset(\u0026plat_info, 0, sizeof(plat_info));\n  77:\t\tplat_info.parent = \u0026pci-\u003edev;\n  78:\t\tplat_info.fwnode = pci-\u003edev.fwnode;\n  79:\t\tplat_info.name = PLAT_DRIVER_NAME;\n  80:\t\tplat_info.id = pci-\u003edevfn;\n  81:\t\tplat_info.res = res;\n  82:\t\tplat_info.num_res = ARRAY_SIZE(res);\n  83:\t\tplat_info.data = \u0026plat_data;\n  84:\t\tplat_info.size_data = sizeof(plat_data);\n  85:\t\tplat_info.dma_mask = pci-\u003edma_mask;\n  86:\t\n  87:\t\t/* register platform device */\n  88:\t\tpdev = platform_device_register_full(\u0026plat_info);\n  89:\t\tif (IS_ERR(pdev)) {\n  90:\t\t\terr = PTR_ERR(pdev);\n  91:\t\t\tgoto err_plat_dev_register;\n  92:\t\t}\n  93:\t\n  94:\t\tpci_set_drvdata(pci, pdev);\n  95:\t\n  96:\t\treturn 0;\n  97:\t\n  98:\terr_plat_dev_register:\n  99:\t\tclk_unregister_fixed_rate(plat_data.hclk);\n 100:\t\n"
}

7/2 2026/10/13 16:29 llm patch-evaluator
0m Model:
gemini-3.8-flash

Args:
null

Results:
null

Tokens:
							input: 49474
							output: 45
							thoughts: 36
						

Thoughts:
Here's my take on the thought process, as requested:

**Diving into `macb_pci.c`**

Right, let's get down to brass tacks. I need to understand this specific aspect of the MACB driver, so the logical first step is to focus on `macb_pci.c`. No need to beat around the bush; let's drill down directly to a relevant section. Lines 100 through 130 seem like a good starting point. Those lines are likely the heart of a key function or initialization routine related to the PCI interface. Time to get my hands dirty and see what's what in that crucial piece of code. I'm hoping to quickly grasp the core logic there before expanding my scope of understanding. Let's see what secrets those lines hold!



8/2 2026/10/13 16:29 tool read-file
0m Args:
{
  "File": "drivers/net/ethernet/cadence/macb_pci.c",
  "FirstLine": 101,
  "LineCount": 50
}

Results:
{
  "Contents": " 101:\terr_hclk_register:\n 102:\t\tclk_unregister_fixed_rate(plat_data.pclk);\n 103:\t\n 104:\terr_pclk_register:\n 105:\t\treturn err;\n 106:\t}\n 107:\t\n 108:\tstatic void macb_remove(struct pci_dev *pci)\n 109:\t{\n 110:\t\tstruct platform_device *pdev = pci_get_drvdata(pci);\n 111:\t\tstruct macb_platform_data *plat_data = dev_get_platdata(\u0026pdev-\u003edev);\n 112:\t\tstruct clk *pclk = plat_data-\u003epclk;\n 113:\t\tstruct clk *hclk = plat_data-\u003ehclk;\n 114:\t\n 115:\t\tplatform_device_unregister(pdev);\n 116:\t\tclk_unregister_fixed_rate(pclk);\n 117:\t\tclk_unregister_fixed_rate(hclk);\n 118:\t}\n 119:\t\n 120:\tstatic const struct pci_device_id dev_id_table[] = {\n 121:\t\t{ PCI_VDEVICE(CDNS, PCI_DEVICE_ID_CDNS_MACB) },\n 122:\t\t{ 0, }\n 123:\t};\n 124:\t\n 125:\tstatic struct pci_driver macb_pci_driver = {\n 126:\t\t.name     = PCI_DRIVER_NAME,\n 127:\t\t.id_table = dev_id_table,\n 128:\t\t.probe    = macb_probe,\n 129:\t\t.remove\t  = macb_remove,\n 130:\t};\n 131:\t\n 132:\tmodule_pci_driver(macb_pci_driver);\n 133:\tMODULE_DEVICE_TABLE(pci, dev_id_table);\n 134:\tMODULE_LICENSE(\"GPL\");\n 135:\tMODULE_DESCRIPTION(\"Cadence NIC PCI wrapper\");\n"
}

9/2 2026/10/13 16:29 llm patch-evaluator
0m Model:
gemini-3.8-flash

Args:
null

Results:
null

Tokens:
							input: 50289
							output: 38
							thoughts: 1282
						

Thoughts:
**Fuzzing Feasibility: A Deep Dive into MACB on amd64**

Okay, first things first. I need to figure out if fuzzing Cadence GEM or MACB is even possible in a standard environment. Is it emulated in QEMU x86_64, or is it exclusively an ARM/Zynq thing? Right, let's go back to the reachability criteria. I have to make sure the target code is actually *reachable* in a standard virtualized setup.

The negative criteria are clear: if the changes are non-kernel/non-executable, or deal with "structurally unreachable hardware," we should bail. Specifically, vendor-specific stuff that needs physical cards – that's a no-go. The architecture-specific code is also off-limits.

Given the `amd64` target, can `macb` even *execute* in a standard virtualized environment like QEMU? I need to know what x86_64 QEMU *actually* emulates. Does it have a `cadence_gem` PCI device? I know there's a `cadence_gem.c` in QEMU, but is that a sysbus device, used on ARM (Zynq, ZynqMP)? It needs to be a PCI device for me to consider it.

Let's check. Does PCI device `17cd:e007` exist, or any Cadence PCI device, in QEMU? I can check the kernel source, or look into the git history. What devices *can* be instantiated on amd64 in QEMU or syzkaller? Can a platform device `macb` be created in userspace in any way? No, I'm pretty sure platform devices are off-limits for userspace creation.

Alright, what about PCI? Does the standard QEMU on amd64 even provide `macb_pci`? Wait, I know that `cadence_gem` in QEMU is `hw/net/cadence_gem.c`, which is a `TYPE_SYS_BUS_DEVICE`. It's used in ARM platforms like Zynq. There's no PCI Cadence GEM in *upstream* QEMU.

But wait a minute... that `PCI_VDEVICE(CDNS, PCI_DEVICE_ID_CDNS_MACB)`... that's the CDNS vendor ID (0x17cd), and device ID 0xe007. Hmm. That's a PCI test card / FPGA prototype from Cadence, the "Cadence GEM PCI wrapper".

So, is this vendor-specific hardware that *isn't* emulated in standard QEMU? Yes, that looks like it. Okay, let's re-read Section 2 carefully. "Structurally unreachable hardware... requiring physical ASIC/PCIe cards not emulated in standard QEMU." That's the key.

Can `macb` even be instantiated *any* way on amd64 in QEMU or GCE? GCE uses virtio-net or gve, so definitely not there. What about QEMU on amd64? Nope. I've looked at the emulated network devices, and QEMU x86_64 uses: e1000/e1000e/igb, rtl8139, pcnet, virtio-net-pci, ne2k_pci, eepro100, vmxnet3, and usb-net.

But wait, I need to focus on amd64. Can MACB even be built on amd64? Let's check the Kconfig for MACB. It depends on `HAS_DMA` and `COMMON_CLK`.

Okay, does x86_64 even have `COMMON_CLK`? I need to check. This is where I'll find my answer. Is it even *possible*?



10/2 2026/10/13 16:30 tool grepper
0m Args:
{
  "Expression": "config COMMON_CLK",
  "PathPrefixes": [
    "drivers/clk/",
    "arch/x86/"
  ]
}

Results:
{
  "Output": "\nFull output is too long, showing 200 out of 1110 lines.\nUse more precise expression or PathPrefixes if possible.\n\nNumber of matching lines per file (21 files in total):\ndrivers/clk/Kconfig:52\ndrivers/clk/aspeed/Kconfig:2\ndrivers/clk/bcm/Kconfig:1\ndrivers/clk/eswin/Kconfig:3\ndrivers/clk/hisilicon/Kconfig:8\ndrivers/clk/imgtec/Kconfig:1\ndrivers/clk/keystone/Kconfig:1\ndrivers/clk/mediatek/Kconfig:163\ndrivers/clk/meson/Kconfig:26\ndrivers/clk/microchip/Kconfig:1\ndrivers/clk/mmp/Kconfig:1\ndrivers/clk/nuvoton/Kconfig:1\ndrivers/clk/pistachio/Kconfig:1\ndrivers/clk/qcom/Kconfig:1\ndrivers/clk/rockchip/Kconfig:1\ndrivers/clk/samsung/Kconfig:1\ndrivers/clk/stm32/Kconfig:5\ndrivers/clk/ti/Kconfig:1\ndrivers/clk/visconti/Kconfig:1\ndrivers/clk/xilinx/Kconfig:1\ndrivers/clk/zynqmp/Kconfig:1\n\ndrivers/clk/Kconfig=12=config HAVE_LEGACY_CLK # TODO: Remove once all legacy users are migrated\n--\ndrivers/clk/Kconfig-20-\ndrivers/clk/Kconfig:21:menuconfig COMMON_CLK\ndrivers/clk/Kconfig-22-\tbool \"Common Clock Framework\"\n--\ndrivers/clk/Kconfig=34=if COMMON_CLK\ndrivers/clk/Kconfig-35-\ndrivers/clk/Kconfig:36:config COMMON_CLK_WM831X\ndrivers/clk/Kconfig-37-\ttristate \"Clock driver for WM831x/2x PMICs\"\n--\ndrivers/clk/Kconfig=53=config LMK04832\n--\ndrivers/clk/Kconfig-60-\ndrivers/clk/Kconfig:61:config COMMON_CLK_APPLE_NCO\ndrivers/clk/Kconfig-62-\ttristate \"Clock driver for Apple SoC NCOs\"\n--\ndrivers/clk/Kconfig-68-\ndrivers/clk/Kconfig:69:config COMMON_CLK_MAX77686\ndrivers/clk/Kconfig-70-\ttristate \"Clock driver for Maxim 77620/77686/77802 MFD\"\n--\ndrivers/clk/Kconfig-75-\ndrivers/clk/Kconfig:76:config COMMON_CLK_MAX9485\ndrivers/clk/Kconfig-77-\ttristate \"Maxim 9485 Programmable Clock Generator\"\n--\ndrivers/clk/Kconfig-81-\ndrivers/clk/Kconfig:82:config COMMON_CLK_RK808\ndrivers/clk/Kconfig-83-\ttristate \"Clock driver for RK805/RK808/RK809/RK817/RK818\"\n--\ndrivers/clk/Kconfig-89-\ndrivers/clk/Kconfig:90:config COMMON_CLK_RP1\ndrivers/clk/Kconfig-91-\ttristate \"Raspberry Pi RP1-based clock support\"\n--\ndrivers/clk/Kconfig-98-\ndrivers/clk/Kconfig:99:config COMMON_CLK_HI655X\ndrivers/clk/Kconfig-100-\ttristate \"Clock driver for Hi655x\" if EXPERT\n--\ndrivers/clk/Kconfig-108-\ndrivers/clk/Kconfig:109:config COMMON_CLK_SCMI\ndrivers/clk/Kconfig-110-\ttristate \"Clock driver controlled via SCMI interface\"\n--\ndrivers/clk/Kconfig-118-\ndrivers/clk/Kconfig:119:config COMMON_CLK_SCPI\ndrivers/clk/Kconfig-120-\ttristate \"Clock driver controlled via SCPI interface\"\n--\ndrivers/clk/Kconfig-128-\ndrivers/clk/Kconfig:129:config COMMON_CLK_SI5341\ndrivers/clk/Kconfig-130-\ttristate \"Clock driver for SiLabs 5341 and 5340 A/B/C/D devices\"\n--\ndrivers/clk/Kconfig-139-\ndrivers/clk/Kconfig:140:config COMMON_CLK_SI5351\ndrivers/clk/Kconfig-141-\ttristate \"Clock driver for SiLabs 5351A/B/C\"\n--\ndrivers/clk/Kconfig-147-\ndrivers/clk/Kconfig:148:config COMMON_CLK_SI514\ndrivers/clk/Kconfig-149-\ttristate \"Clock driver for SiLabs 514 devices\"\n--\ndrivers/clk/Kconfig-156-\ndrivers/clk/Kconfig:157:config COMMON_CLK_SI544\ndrivers/clk/Kconfig-158-\ttristate \"Clock driver for SiLabs 544 and compatible devices\"\n--\ndrivers/clk/Kconfig-164-\ndrivers/clk/Kconfig:165:config COMMON_CLK_SI570\ndrivers/clk/Kconfig-166-\ttristate \"Clock driver for SiLabs 570 and compatible devices\"\n--\ndrivers/clk/Kconfig-173-\ndrivers/clk/Kconfig:174:config COMMON_CLK_BM1880\ndrivers/clk/Kconfig-175-\tbool \"Clock driver for Bitmain BM1880 SoC\"\n--\ndrivers/clk/Kconfig-180-\ndrivers/clk/Kconfig:181:config COMMON_CLK_CDCE706\ndrivers/clk/Kconfig-182-\ttristate \"Clock driver for TI CDCE706 clock synthesizer\"\n--\ndrivers/clk/Kconfig-187-\ndrivers/clk/Kconfig:188:config COMMON_CLK_TPS68470\ndrivers/clk/Kconfig-189-\ttristate \"Clock Driver for TI TPS68470 PMIC\"\n--\ndrivers/clk/Kconfig-195-\ndrivers/clk/Kconfig:196:config COMMON_CLK_CDCE925\ndrivers/clk/Kconfig-197-\ttristate \"Clock driver for TI CDCE913/925/937/949 devices\"\n--\ndrivers/clk/Kconfig-212-\ndrivers/clk/Kconfig:213:config COMMON_CLK_CS2000_CP\ndrivers/clk/Kconfig-214-\ttristate \"Clock driver for CS2000 Fractional-N Clock Synthesizer \u0026 Clock Multiplier\"\n--\ndrivers/clk/Kconfig-219-\ndrivers/clk/Kconfig:220:config COMMON_CLK_EN7523\ndrivers/clk/Kconfig-221-\tbool \"Clock driver for Airoha/EcoNet SoC system clocks\"\n--\ndrivers/clk/Kconfig-228-\ndrivers/clk/Kconfig:229:config COMMON_CLK_EP93XX\ndrivers/clk/Kconfig-230-\ttristate \"Clock driver for Cirrus Logic ep93xx SoC\"\n--\ndrivers/clk/Kconfig-236-\ndrivers/clk/Kconfig:237:config COMMON_CLK_EYEQ\ndrivers/clk/Kconfig-238-\tbool \"Clock driver for the Mobileye EyeQ platform\"\n--\ndrivers/clk/Kconfig-247-\ndrivers/clk/Kconfig:248:config COMMON_CLK_FSL_FLEXSPI\ndrivers/clk/Kconfig-249-\ttristate \"Clock driver for FlexSPI on Layerscape SoCs\"\n--\ndrivers/clk/Kconfig-255-\ndrivers/clk/Kconfig:256:config COMMON_CLK_FSL_SAI\ndrivers/clk/Kconfig-257-\tbool \"Clock driver for BCLK of Freescale SAI cores\"\n--\ndrivers/clk/Kconfig-267-\ndrivers/clk/Kconfig:268:config COMMON_CLK_GEMINI\ndrivers/clk/Kconfig-269-\tbool \"Clock driver for Cortina Systems Gemini SoC\"\n--\ndrivers/clk/Kconfig-276-\ndrivers/clk/Kconfig:277:config COMMON_CLK_LAN966X\ndrivers/clk/Kconfig-278-\ttristate \"Generic Clock Controller driver for LAN966X SoC\"\n--\ndrivers/clk/Kconfig-286-\ndrivers/clk/Kconfig:287:config COMMON_CLK_S2MPS11\ndrivers/clk/Kconfig-288-\ttristate \"Clock driver for S2MPS1X/S5M8767 MFD\"\n--\ndrivers/clk/Kconfig=304=config CLK_TWL6040\n--\ndrivers/clk/Kconfig-311-\ndrivers/clk/Kconfig:312:config COMMON_CLK_AXI_CLKGEN\ndrivers/clk/Kconfig-313-\ttristate \"AXI clkgen driver\"\n--\ndrivers/clk/Kconfig=328=config CLK_LS1028A_PLLDIG\n--\ndrivers/clk/Kconfig-337-\ndrivers/clk/Kconfig:338:config COMMON_CLK_XGENE\ndrivers/clk/Kconfig-339-\tbool \"Clock driver for APM XGene SoC\"\n--\ndrivers/clk/Kconfig-344-\ndrivers/clk/Kconfig:345:config COMMON_CLK_LOCHNAGAR\ndrivers/clk/Kconfig-346-\ttristate \"Cirrus Logic Lochnagar clock driver\"\n--\ndrivers/clk/Kconfig-351-\ndrivers/clk/Kconfig:352:config COMMON_CLK_NPCM8XX\ndrivers/clk/Kconfig-353-\ttristate \"Clock driver for the NPCM8XX SoC Family\"\n--\ndrivers/clk/Kconfig-360-\ndrivers/clk/Kconfig:361:config COMMON_CLK_LOONGSON2\ndrivers/clk/Kconfig-362-\tbool \"Clock driver for Loongson-2 SoC\"\n--\ndrivers/clk/Kconfig-369-\ndrivers/clk/Kconfig:370:config COMMON_CLK_NXP\ndrivers/clk/Kconfig-371-\tdef_bool COMMON_CLK \u0026\u0026 (ARCH_LPC18XX || ARCH_LPC32XX)\n--\ndrivers/clk/Kconfig-376-\ndrivers/clk/Kconfig:377:config COMMON_CLK_PALMAS\ndrivers/clk/Kconfig-378-\ttristate \"Clock driver for TI Palmas devices\"\n--\ndrivers/clk/Kconfig-383-\ndrivers/clk/Kconfig:384:config COMMON_CLK_PWM\ndrivers/clk/Kconfig-385-\ttristate \"Clock driver for PWMs used as clock outputs\"\n--\ndrivers/clk/Kconfig-390-\ndrivers/clk/Kconfig:391:config COMMON_CLK_PXA\ndrivers/clk/Kconfig-392-\tdef_bool COMMON_CLK \u0026\u0026 ARCH_PXA\n--\ndrivers/clk/Kconfig-395-\ndrivers/clk/Kconfig:396:config COMMON_CLK_RS9_PCIE\ndrivers/clk/Kconfig-397-\ttristate \"Clock driver for Renesas 9-series PCIe clock generators\"\n--\ndrivers/clk/Kconfig-404-\ndrivers/clk/Kconfig:405:config COMMON_CLK_SI521XX\ndrivers/clk/Kconfig-406-\ttristate \"Clock driver for SkyWorks Si521xx PCIe clock generators\"\n--\ndrivers/clk/Kconfig-413-\ndrivers/clk/Kconfig:414:config COMMON_CLK_VC3\ndrivers/clk/Kconfig-415-\ttristate \"Clock driver for Renesas VersaClock 3 devices\"\n--\ndrivers/clk/Kconfig-422-\ndrivers/clk/Kconfig:423:config COMMON_CLK_VC5\ndrivers/clk/Kconfig-424-\ttristate \"Clock driver for IDT VersaClock 5,6 devices\"\n--\ndrivers/clk/Kconfig-431-\ndrivers/clk/Kconfig:432:config COMMON_CLK_VC7\ndrivers/clk/Kconfig-433-\ttristate \"Clock driver for Renesas Versaclock 7 devices\"\n--\ndrivers/clk/Kconfig-440-\ndrivers/clk/Kconfig:441:config COMMON_CLK_STM32F\ndrivers/clk/Kconfig-442-\tdef_bool COMMON_CLK \u0026\u0026 (MACH_STM32F429 || MACH_STM32F469 || MACH_STM32F746)\n--\ndrivers/clk/Kconfig-445-\ndrivers/clk/Kconfig:446:config COMMON_CLK_STM32H7\ndrivers/clk/Kconfig-447-\tdef_bool COMMON_CLK \u0026\u0026 MACH_STM32H743\n--\ndrivers/clk/Kconfig-450-\ndrivers/clk/Kconfig:451:config COMMON_CLK_MMP2\ndrivers/clk/Kconfig-452-\tdef_bool COMMON_CLK \u0026\u0026 (MACH_MMP2_DT || MACH_MMP3_DT)\n--\ndrivers/clk/Kconfig-455-\ndrivers/clk/Kconfig:456:config COMMON_CLK_MMP2_AUDIO\ndrivers/clk/Kconfig-457-        tristate \"Clock driver for MMP2 Audio subsystem\"\n--\ndrivers/clk/Kconfig-461-\ndrivers/clk/Kconfig:462:config COMMON_CLK_BD718XX\ndrivers/clk/Kconfig-463-\ttristate \"Clock driver for 32K clk gates on ROHM PMICs\"\n--\ndrivers/clk/Kconfig-468-\ndrivers/clk/Kconfig:469:config COMMON_CLK_FIXED_MMIO\ndrivers/clk/Kconfig-470-\tbool \"Clock driver for Memory Mapped Fixed values\"\n\n"
}

11/2 2026/10/13 16:30 llm patch-evaluator
0m Model:
gemini-3.8-flash

Args:
null

Results:
null

Tokens:
							input: 55983
							output: 35
							thoughts: 1289
						

Thoughts:
**Reaching a Verdict on MACB Fuzzing Potential**

Okay, so I'm looking at this `COMMON_CLK` config option and how it interacts with `MACB` and `MACB_PCI` on x86. The Kconfig allows all three to be enabled together, which raises a flag. Can `MACB` even *run* on amd64 in QEMU or syzkaller? That's the crucial question. Let's revisit the core triage philosophy and those negative criteria. Reachability is key. Code has to execute in standard virtualized environments. If the code is unreachable, forget it. We don't blindly trust claims of "no functional change" either.

The negative criteria are clear: if the code falls into certain categories, it's not worth fuzzing. The ones that matter here are "structurally unreachable hardware" – like vendor-specific PCIe cards that QEMU doesn't emulate – and "unreachable execution paths" for other architectures.

Now, does QEMU on amd64 emulate Cadence MACB or GEM? I need to know. It's time for some digging. Let's see... QEMU *does* have `hw/net/cadence_gem.c`. Aha! But which boards actually use it? Let's check `TYPE_CADENCE_GEM`. It's a `SYS_BUS_DEVICE`, not a PCI device. And the only boards that instantiate this in QEMU are ARM and RISC-V: Zynq, Zynq UltraScale+, Versal, and SiFive Freedom U540. None of these are x86/amd64! So QEMU on x86_64 doesn't run Cadence GEM. The `pc` and `q35` machines in QEMU on x86 are PCI or ISA only.

Furthermore, can QEMU even attach a SysBusDevice to an x86 machine? No, they can't be dynamically attached, and even if they could, the Cadence GEM has memory-mapped registers at ARM/RISC-V SoC addresses and requires clocks/irqs wired up by the board.

Okay, so is Cadence MACB/GEM "unreachable hardware"? Let's refresh our memory on the negative criteria. It's either a vendor-specific card requiring physical hardware or a code path exclusive to another architecture. This is a crucial distinction.

Now, let's consider: is there *any* other way to reach MACB on amd64? I'll check: can it be loaded as a driver? `macb_pci` binds to `{ PCI_VDEVICE(CDNS, 0xe007) }`. Does QEMU have a Cadence PCI device with vendor 0x17cd and device 0xe007? Nope. Nada. What about the platform driver, `macb_main.c`? Does it have an of_match_table or acpi_match_table to load? I need to investigate line 5900+ in `macb_main.c` specifically.



12/2 2026/10/13 16:30 tool grepper
0m Args:
{
  "Expression": "struct platform_driver",
  "PathPrefixes": [
    "drivers/net/ethernet/cadence/"
  ]
}

Results:
{
  "Output": "drivers/net/ethernet/cadence/macb_main.c=6751=static const struct dev_pm_ops macb_pm_ops = {\n--\ndrivers/net/ethernet/cadence/macb_main.c-6755-\ndrivers/net/ethernet/cadence/macb_main.c:6756:static struct platform_driver macb_driver = {\ndrivers/net/ethernet/cadence/macb_main.c-6757-\t.probe\t\t= macb_probe,\n"
}

13/2 2026/10/13 16:30 llm patch-evaluator
0m Model:
gemini-3.8-flash

Args:
null

Results:
null

Tokens:
							input: 58122
							output: 45
							thoughts: 20
						

Thoughts:
Okay, let's dive into this. Here's my take on those thoughts, as though they were my own:

**Analyzing `macb_main.c` - Line 6750 (and surrounding context)**

Alright, so let's zero in on line 6750 in `macb_main.c`. I need to figure out what's going on there. Given that it's in `macb_main.c`, and assuming we're talking about the MACB driver for an embedded system, I'm expecting something critical related to initialization, interrupt handling, or possibly DMA management. The surrounding code is key here; I need to understand the function this line is within, what the variables are, and what the overall logic is attempting to achieve. Is it a conditional statement? A register write? A data transfer operation? I'm going to carefully read the preceding and succeeding lines to build a full picture. I will analyze the lines to see what functions and variables are being referenced. This line could be a pointer dereference, an assignment statement, a function call, a comparison, a loop condition... it could be anything. So, I will analyse it and look for things that might be relevant to the issue I am trying to identify. I need to get a clear picture of its role in the driver's flow and any potential side effects. I need to get into the weeds quickly. Let's see...



14/2 2026/10/13 16:30 tool read-file
0m Args:
{
  "File": "drivers/net/ethernet/cadence/macb_main.c",
  "FirstLine": 6745,
  "LineCount": 40
}

Results:
{
  "Contents": "6745:\t\n6746:\t\tnetif_device_detach(netdev);\n6747:\t\n6748:\t\trtnl_unlock();\n6749:\t}\n6750:\t\n6751:\tstatic const struct dev_pm_ops macb_pm_ops = {\n6752:\t\tSET_SYSTEM_SLEEP_PM_OPS(macb_suspend, macb_resume)\n6753:\t\tSET_RUNTIME_PM_OPS(macb_runtime_suspend, macb_runtime_resume, NULL)\n6754:\t};\n6755:\t\n6756:\tstatic struct platform_driver macb_driver = {\n6757:\t\t.probe\t\t= macb_probe,\n6758:\t\t.remove\t\t= macb_remove,\n6759:\t\t.driver\t\t= {\n6760:\t\t\t.name\t\t= \"macb\",\n6761:\t\t\t.of_match_table\t= macb_dt_ids,\n6762:\t\t\t.pm\t= \u0026macb_pm_ops,\n6763:\t\t},\n6764:\t\t.shutdown\t= macb_shutdown,\n6765:\t};\n6766:\t\n6767:\tmodule_platform_driver(macb_driver);\n6768:\t\n6769:\tMODULE_LICENSE(\"GPL\");\n6770:\tMODULE_DESCRIPTION(\"Cadence MACB/GEM Ethernet driver\");\n6771:\tMODULE_AUTHOR(\"Haavard Skinnemoen (Atmel)\");\n6772:\tMODULE_ALIAS(\"platform:macb\");\n"
}

15/2 2026/10/13 16:30 llm patch-evaluator
0m Model:
gemini-3.8-flash

Args:
null

Results:
null

Tokens:
							input: 58914
							output: 158
							thoughts: 2356
						

Thoughts:
**Analysis of the Cadence MACB Driver for Fuzzing Eligibility**

Okay, here's the deal: I'm looking at this `macb_driver`, which is a platform driver matching via Device Tree (`.of_match_table = macb_dt_ids`). On amd64, we don't use Device Tree; it's all ACPI. Even if we *were* using Device Tree with overlays, there's no actual or emulated hardware for it in QEMU x86_64 or GCE. Then, there's `macb_pci`, a PCI driver for a proprietary Cadence FPGA test card (vendor ID 0x17cd, device ID 0xe007). Neither QEMU nor GCE has that specific PCI card.

Could syzkaller create a mock PCI device? Nope, syzkaller doesn't have virtual PCI emulation. Not a chance. Can we create a platform or PCI device from userspace for macb? No, and that's not even getting into the fact that the probe expects memory-mapped I/O and clocks, which it won't find.

Let's verify: Section 2 outlines "Structurally unreachable hardware" like vendor-specific PCIe switches, etc., which require physical ASIC/PCIe cards not emulated in standard QEMU. Also, "Code paths exclusive to architectures other than the target architecture".

Now, let's consider what *is* accessible in standard virtualized environments (GCE or QEMU): virtio, USB gadget, loopback, netlink, binder, sockets. Section 3: "Rachable Drivers and Protocols: * Drivers accessible via virtual buses (virtio, USB gadget, loopback, netlink, binder, sockets, etc.)." We have to remember "REACHABILITY IS THE PRIMARY GATE: Fuzzing can only discover bugs in code that can actually execute in standard virtualized environments (GCE or QEMU, utilizing software-emulated devices like USB gadgets, netdev, tun/tap). If the modified code is structurally unreachable (see Section 2), it MUST NOT be fuzzed, regardless of whether it adds assertions or complex logic."

So, can `macb` probe or even be invoked on amd64 in QEMU or GCE? No.

1.  A platform device named "macb" created by platform code or Device Tree is not present on amd64.
2.  A PCI device with vendor CDNS (0x17cd) and device ID 0xe007 is not emulated in either environment.

There's no way to trick it; no mock drivers, software devices, or sysfs bindings. The platform bus doesn't support dynamic device creation from userspace. `macb_probe` expects hardware registers and clocks that won't exist. The `macb_pci` driver? Same deal; it requires that specialized Cadence PCI card.

Therefore, on amd64, `macb` is structurally unreachable. It falls under "Vendor-specific PCIe switches, SmartNICs, or GPU drivers... requiring physical ASIC/PCIe cards not emulated in standard QEMU" and "Code paths exclusive to architectures other than the target architecture" (ARM/RISC-V/MIPS, not amd64).

Checking the triage guidelines: We need to return `WorthFuzzing=false` if the code falls into categories like "Structurally unreachable hardware" or "Unreachable execution paths."

Looking at the patch diff, it only touches `drivers/net/ethernet/cadence/macb.h`, `drivers/net/ethernet/cadence/macb_main.c`, and `drivers/net/ethernet/cadence/macb_ptp.c` – all related to the `macb` driver. That means all of it is dealing with the Cadence MACB/GEM Ethernet hardware controller, which is an SoC peripheral primarily for ARM and RISC-V with an optional PCI wrapper for a specific Cadence FPGA/ASIC evaluation board (0x17cd:0xe007). This is not present or emulated in standard virtualized environments. As a result, none of this code can be reached on amd64.

Can we argue "WorthFuzzing should be false because of structurally unreachable hardware on amd64"? YES! That's it!

*   Section 1: "REACHABILITY IS THE PRIMARY GATE: ... If the modified code is structurally unreachable (see Section 2), it MUST NOT be fuzzed..."
*   Section 2: Defines "Structurally unreachable hardware" and "Unreachable execution paths".

Because of this analysis, `EnableConfigs` and `FocusSymbols` must be set to empty arrays,


16/2 2026/10/13 16:30 tool set-results
0m Args:
{
  "EnableConfigs": [],
  "FocusSymbols": [],
  "Reasoning": "The patch modifies the Cadence MACB/GEM Ethernet driver (drivers/net/ethernet/cadence/). This driver controls Cadence MACB/GEM controllers present on embedded SoCs (e.g., Microchip AT91, Xilinx Zynq, SiFive RISC-V) or via a vendor-specific PCI development board (0x17cd:0xe007). Neither device is emulated in standard virtualized environments (QEMU/GCE) on amd64. Consequently, the modified code is structurally unreachable on the target architecture and does not warrant fuzzing.",
  "WorthFuzzing": false
}

Results:
{
  "EnableConfigs": null,
  "FocusSymbols": [],
  "Reasoning": "The patch modifies the Cadence MACB/GEM Ethernet driver (drivers/net/ethernet/cadence/). This driver controls Cadence MACB/GEM controllers present on embedded SoCs (e.g., Microchip AT91, Xilinx Zynq, SiFive RISC-V) or via a vendor-specific PCI development board (0x17cd:0xe007). Neither device is emulated in standard virtualized environments (QEMU/GCE) on amd64. Consequently, the modified code is structurally unreachable on the target architecture and does not warrant fuzzing.",
  "WorthFuzzing": false
}

17/1 2026/10/13 16:30 action If
0m Args:
{
  "WorthFuzzing": false
}

Results:
null

LLM Calls Summary:
Total Calls Total Tokens Avg Tokens Total Duration (Seconds) Avg Duration (Seconds)
Tool Calls Summary:
Total Calls Total Duration (Seconds) Avg Duration (Seconds)