diff options
author | John Audia <therealgraysky@proton.me> | 2022-06-14 15:31:10 -0400 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-06-27 22:34:07 +0200 |
commit | 4faf889e7e07a743afd58164052ef1531bbb10ec (patch) | |
tree | 86dd744ceba6f319adb2f8c9fb78fc1e465b926b /target/linux/generic/pending-5.10/701-00-net-ethernet-mtk_eth_soc-add-support-for-coherent-DM.patch | |
parent | 81530d69ef582124f9cc657edacdca9727e805f8 (diff) | |
download | upstream-4faf889e7e07a743afd58164052ef1531bbb10ec.tar.gz upstream-4faf889e7e07a743afd58164052ef1531bbb10ec.tar.bz2 upstream-4faf889e7e07a743afd58164052ef1531bbb10ec.zip |
kernel: bump 5.10 to 5.10.122
All patches automatically rebased.
Build system: x86_64
Build-tested: ipq806x/R7800
Signed-off-by: John Audia <therealgraysky@proton.me>
(cherry picked from commit 9edc514e3dafcc36db69046a37daab818cfc1a07)
Diffstat (limited to 'target/linux/generic/pending-5.10/701-00-net-ethernet-mtk_eth_soc-add-support-for-coherent-DM.patch')
-rw-r--r-- | target/linux/generic/pending-5.10/701-00-net-ethernet-mtk_eth_soc-add-support-for-coherent-DM.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/generic/pending-5.10/701-00-net-ethernet-mtk_eth_soc-add-support-for-coherent-DM.patch b/target/linux/generic/pending-5.10/701-00-net-ethernet-mtk_eth_soc-add-support-for-coherent-DM.patch index 245a996c96..204f888d51 100644 --- a/target/linux/generic/pending-5.10/701-00-net-ethernet-mtk_eth_soc-add-support-for-coherent-DM.patch +++ b/target/linux/generic/pending-5.10/701-00-net-ethernet-mtk_eth_soc-add-support-for-coherent-DM.patch @@ -196,7 +196,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> ring->dma_size * sizeof(*ring->dma), ring->dma, ring->phys); -@@ -2134,7 +2135,7 @@ static void mtk_dma_free(struct mtk_eth +@@ -2137,7 +2138,7 @@ static void mtk_dma_free(struct mtk_eth if (eth->netdev[i]) netdev_reset_queue(eth->netdev[i]); if (eth->scratch_ring) { @@ -205,7 +205,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> MTK_DMA_SIZE * sizeof(struct mtk_tx_dma), eth->scratch_ring, eth->phy_scratch_ring); -@@ -2482,6 +2483,8 @@ static void mtk_dim_tx(struct work_struc +@@ -2485,6 +2486,8 @@ static void mtk_dim_tx(struct work_struc static int mtk_hw_init(struct mtk_eth *eth) { @@ -214,7 +214,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> int i, val, ret; if (test_and_set_bit(MTK_HW_INIT, ð->state)) -@@ -2494,6 +2497,10 @@ static int mtk_hw_init(struct mtk_eth *e +@@ -2497,6 +2500,10 @@ static int mtk_hw_init(struct mtk_eth *e if (ret) goto err_disable_pm; @@ -225,7 +225,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (MTK_HAS_CAPS(eth->soc->caps, MTK_SOC_MT7628)) { ret = device_reset(eth->dev); if (ret) { -@@ -3043,6 +3050,35 @@ free_netdev: +@@ -3046,6 +3053,35 @@ free_netdev: return err; } @@ -261,7 +261,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> static int mtk_probe(struct platform_device *pdev) { struct device_node *mac_np; -@@ -3056,6 +3092,7 @@ static int mtk_probe(struct platform_dev +@@ -3059,6 +3095,7 @@ static int mtk_probe(struct platform_dev eth->soc = of_device_get_match_data(&pdev->dev); eth->dev = &pdev->dev; @@ -269,7 +269,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> eth->base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(eth->base)) return PTR_ERR(eth->base); -@@ -3104,6 +3141,16 @@ static int mtk_probe(struct platform_dev +@@ -3107,6 +3144,16 @@ static int mtk_probe(struct platform_dev } } |