|
|
@@ -87,7 +87,7 @@ Signed-off-by: David S. Miller <[email protected]>
|
|
|
if (mtk_queue_stopped(eth) &&
|
|
|
(atomic_read(&ring->free_count) > ring->thresh))
|
|
|
mtk_wake_queue(eth);
|
|
|
-@@ -2150,6 +2165,7 @@ static irqreturn_t mtk_handle_irq_rx(int
|
|
|
+@@ -2153,6 +2168,7 @@ static irqreturn_t mtk_handle_irq_rx(int
|
|
|
{
|
|
|
struct mtk_eth *eth = _eth;
|
|
|
|
|
|
@@ -95,7 +95,7 @@ Signed-off-by: David S. Miller <[email protected]>
|
|
|
if (likely(napi_schedule_prep(ð->rx_napi))) {
|
|
|
__napi_schedule(ð->rx_napi);
|
|
|
mtk_rx_irq_disable(eth, MTK_RX_DONE_INT);
|
|
|
-@@ -2162,6 +2178,7 @@ static irqreturn_t mtk_handle_irq_tx(int
|
|
|
+@@ -2165,6 +2181,7 @@ static irqreturn_t mtk_handle_irq_tx(int
|
|
|
{
|
|
|
struct mtk_eth *eth = _eth;
|
|
|
|
|
|
@@ -103,7 +103,7 @@ Signed-off-by: David S. Miller <[email protected]>
|
|
|
if (likely(napi_schedule_prep(ð->tx_napi))) {
|
|
|
__napi_schedule(ð->tx_napi);
|
|
|
mtk_tx_irq_disable(eth, MTK_TX_DONE_INT);
|
|
|
-@@ -2346,6 +2363,9 @@ static int mtk_stop(struct net_device *d
|
|
|
+@@ -2349,6 +2366,9 @@ static int mtk_stop(struct net_device *d
|
|
|
napi_disable(ð->tx_napi);
|
|
|
napi_disable(ð->rx_napi);
|
|
|
|
|
|
@@ -113,7 +113,7 @@ Signed-off-by: David S. Miller <[email protected]>
|
|
|
if (MTK_HAS_CAPS(eth->soc->caps, MTK_QDMA))
|
|
|
mtk_stop_dma(eth, MTK_QDMA_GLO_CFG);
|
|
|
mtk_stop_dma(eth, MTK_PDMA_GLO_CFG);
|
|
|
-@@ -2398,6 +2418,64 @@ err_disable_clks:
|
|
|
+@@ -2401,6 +2421,64 @@ err_disable_clks:
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
@@ -178,7 +178,7 @@ Signed-off-by: David S. Miller <[email protected]>
|
|
|
static int mtk_hw_init(struct mtk_eth *eth)
|
|
|
{
|
|
|
int i, val, ret;
|
|
|
-@@ -2419,9 +2497,6 @@ static int mtk_hw_init(struct mtk_eth *e
|
|
|
+@@ -2422,9 +2500,6 @@ static int mtk_hw_init(struct mtk_eth *e
|
|
|
goto err_disable_pm;
|
|
|
}
|
|
|
|
|
|
@@ -188,7 +188,7 @@ Signed-off-by: David S. Miller <[email protected]>
|
|
|
/* disable delay and normal interrupt */
|
|
|
mtk_tx_irq_disable(eth, ~0);
|
|
|
mtk_rx_irq_disable(eth, ~0);
|
|
|
-@@ -2460,11 +2535,11 @@ static int mtk_hw_init(struct mtk_eth *e
|
|
|
+@@ -2463,11 +2538,11 @@ static int mtk_hw_init(struct mtk_eth *e
|
|
|
/* Enable RX VLan Offloading */
|
|
|
mtk_w32(eth, 1, MTK_CDMP_EG_CTRL);
|
|
|
|
|
|
@@ -203,7 +203,7 @@ Signed-off-by: David S. Miller <[email protected]>
|
|
|
mtk_tx_irq_disable(eth, ~0);
|
|
|
mtk_rx_irq_disable(eth, ~0);
|
|
|
|
|
|
-@@ -2969,6 +3044,13 @@ static int mtk_probe(struct platform_dev
|
|
|
+@@ -2972,6 +3047,13 @@ static int mtk_probe(struct platform_dev
|
|
|
spin_lock_init(ð->page_lock);
|
|
|
spin_lock_init(ð->tx_irq_lock);
|
|
|
spin_lock_init(ð->rx_irq_lock);
|