return 0;
}
-@@ -2277,7 +2385,7 @@ static irqreturn_t mtk_handle_irq_rx(int
+@@ -2280,7 +2388,7 @@ static irqreturn_t mtk_handle_irq_rx(int
eth->rx_events++;
if (likely(napi_schedule_prep(ð->rx_napi))) {
__napi_schedule(ð->rx_napi);
}
return IRQ_HANDLED;
-@@ -2301,8 +2409,10 @@ static irqreturn_t mtk_handle_irq(int ir
+@@ -2304,8 +2412,10 @@ static irqreturn_t mtk_handle_irq(int ir
struct mtk_eth *eth = _eth;
const struct mtk_reg_map *reg_map = eth->soc->reg_map;
mtk_handle_irq_rx(irq, _eth);
}
if (mtk_r32(eth, reg_map->tx_irq_mask) & MTK_TX_DONE_INT) {
-@@ -2320,16 +2430,16 @@ static void mtk_poll_controller(struct n
+@@ -2323,16 +2433,16 @@ static void mtk_poll_controller(struct n
struct mtk_eth *eth = mac->hw;
mtk_tx_irq_disable(eth, MTK_TX_DONE_INT);
const struct mtk_reg_map *reg_map = eth->soc->reg_map;
int err;
-@@ -2340,12 +2450,19 @@ static int mtk_start_dma(struct mtk_eth
+@@ -2343,12 +2453,19 @@ static int mtk_start_dma(struct mtk_eth
}
if (MTK_HAS_CAPS(eth->soc->caps, MTK_QDMA)) {
mtk_w32(eth,
MTK_RX_DMA_EN | rx_2b_offset |
MTK_RX_BT_32DWORDS | MTK_MULTI_EN,
-@@ -2417,7 +2534,7 @@ static int mtk_open(struct net_device *d
+@@ -2420,7 +2537,7 @@ static int mtk_open(struct net_device *d
napi_enable(ð->tx_napi);
napi_enable(ð->rx_napi);
mtk_tx_irq_enable(eth, MTK_TX_DONE_INT);
refcount_set(ð->dma_refcnt, 1);
}
else
-@@ -2469,7 +2586,7 @@ static int mtk_stop(struct net_device *d
+@@ -2472,7 +2589,7 @@ static int mtk_stop(struct net_device *d
mtk_gdm_config(eth, MTK_GDMA_DROP_ALL);
mtk_tx_irq_disable(eth, MTK_TX_DONE_INT);
napi_disable(ð->tx_napi);
napi_disable(ð->rx_napi);
-@@ -2629,9 +2746,25 @@ static int mtk_hw_init(struct mtk_eth *e
+@@ -2632,9 +2749,25 @@ static int mtk_hw_init(struct mtk_eth *e
return 0;
}
if (eth->pctl) {
/* Set GE2 driving and slew rate */
-@@ -2670,11 +2803,47 @@ static int mtk_hw_init(struct mtk_eth *e
+@@ -2673,11 +2806,47 @@ static int mtk_hw_init(struct mtk_eth *e
/* FE int grouping */
mtk_w32(eth, MTK_TX_DONE_INT, reg_map->pdma.int_grp);
return 0;
err_disable_pm:
-@@ -3211,12 +3380,8 @@ static int mtk_probe(struct platform_dev
+@@ -3214,12 +3383,8 @@ static int mtk_probe(struct platform_dev
if (IS_ERR(eth->base))
return PTR_ERR(eth->base);
spin_lock_init(ð->page_lock);
spin_lock_init(ð->tx_irq_lock);
-@@ -3452,6 +3617,10 @@ static const struct mtk_soc_data mt2701_
+@@ -3455,6 +3620,10 @@ static const struct mtk_soc_data mt2701_
.txrx = {
.txd_size = sizeof(struct mtk_tx_dma),
.rxd_size = sizeof(struct mtk_rx_dma),
},
};
-@@ -3465,6 +3634,10 @@ static const struct mtk_soc_data mt7621_
+@@ -3468,6 +3637,10 @@ static const struct mtk_soc_data mt7621_
.txrx = {
.txd_size = sizeof(struct mtk_tx_dma),
.rxd_size = sizeof(struct mtk_rx_dma),
},
};
-@@ -3479,6 +3652,10 @@ static const struct mtk_soc_data mt7622_
+@@ -3482,6 +3655,10 @@ static const struct mtk_soc_data mt7622_
.txrx = {
.txd_size = sizeof(struct mtk_tx_dma),
.rxd_size = sizeof(struct mtk_rx_dma),
},
};
-@@ -3492,6 +3669,10 @@ static const struct mtk_soc_data mt7623_
+@@ -3495,6 +3672,10 @@ static const struct mtk_soc_data mt7623_
.txrx = {
.txd_size = sizeof(struct mtk_tx_dma),
.rxd_size = sizeof(struct mtk_rx_dma),
},
};
-@@ -3505,6 +3686,10 @@ static const struct mtk_soc_data mt7629_
+@@ -3508,6 +3689,10 @@ static const struct mtk_soc_data mt7629_
.txrx = {
.txd_size = sizeof(struct mtk_tx_dma),
.rxd_size = sizeof(struct mtk_rx_dma),
},
};
-@@ -3517,6 +3702,10 @@ static const struct mtk_soc_data rt5350_
+@@ -3520,6 +3705,10 @@ static const struct mtk_soc_data rt5350_
.txrx = {
.txd_size = sizeof(struct mtk_tx_dma),
.rxd_size = sizeof(struct mtk_rx_dma),