diff options
| author | John Audia <therealgraysky@proton.me> | 2022-12-05 12:33:26 -0500 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-12-11 02:42:52 +0100 |
| commit | 424210b7be103f235f1f146783f8f173adc48611 (patch) | |
| tree | 662b7cf4b5513c8e297017c8f9215c8c3ff199ec /target/linux/generic/backport-5.15/702-v5.19-27-net-ethernet-mtk_eth_soc-introduce-MTK_NETSYS_V2-sup.patch | |
| parent | 2b375b7db4eaf439e1b36dfac367d3a7f5677e71 (diff) | |
| download | upstream-424210b7be103f235f1f146783f8f173adc48611.tar.gz upstream-424210b7be103f235f1f146783f8f173adc48611.tar.bz2 upstream-424210b7be103f235f1f146783f8f173adc48611.zip | |
kernel: bump 5.15 to 5.15.81
Manually rebased:
backport-5.15/715-v6.0-net-ethernet-mtk_eth_soc-add-the-capability-to-run-m.patch
hack-5.15/645-netfilter-connmark-introduce-set-dscpmark.patch[1]
Removed upstreamed:
pending-5.15/701-netfilter-nf_flow_table-add-missing-locking.patch[2]
All other patches automatically rebased
1. Rebase by Kevin 'ldir' Darbyshire-Bryant<ldir@darbyshire-bryant.me.uk>
2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.81&id=8db9e60cdfdae5b049e32e82323da8f0f989066a
Build system: x86_64
Build-tested: bcm2711/RPi4B, filogic/xiaomi_redmi-router-ax6000-stock
Run-tested: bcm2711/RPi4B, filogic/xiaomi_redmi-router-ax6000-stock
Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/generic/backport-5.15/702-v5.19-27-net-ethernet-mtk_eth_soc-introduce-MTK_NETSYS_V2-sup.patch')
| -rw-r--r-- | target/linux/generic/backport-5.15/702-v5.19-27-net-ethernet-mtk_eth_soc-introduce-MTK_NETSYS_V2-sup.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/target/linux/generic/backport-5.15/702-v5.19-27-net-ethernet-mtk_eth_soc-introduce-MTK_NETSYS_V2-sup.patch b/target/linux/generic/backport-5.15/702-v5.19-27-net-ethernet-mtk_eth_soc-introduce-MTK_NETSYS_V2-sup.patch index e15854ecad..d1f19d6a45 100644 --- a/target/linux/generic/backport-5.15/702-v5.19-27-net-ethernet-mtk_eth_soc-introduce-MTK_NETSYS_V2-sup.patch +++ b/target/linux/generic/backport-5.15/702-v5.19-27-net-ethernet-mtk_eth_soc-introduce-MTK_NETSYS_V2-sup.patch @@ -471,7 +471,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> mtk_w32(eth, MTK_RX_DMA_EN | rx_2b_offset | MTK_RX_BT_32DWORDS | MTK_MULTI_EN, -@@ -2437,7 +2554,7 @@ static int mtk_open(struct net_device *d +@@ -2439,7 +2556,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); @@ -480,7 +480,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> refcount_set(ð->dma_refcnt, 1); } else -@@ -2489,7 +2606,7 @@ static int mtk_stop(struct net_device *d +@@ -2491,7 +2608,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); @@ -489,7 +489,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> napi_disable(ð->tx_napi); napi_disable(ð->rx_napi); -@@ -2649,9 +2766,25 @@ static int mtk_hw_init(struct mtk_eth *e +@@ -2651,9 +2768,25 @@ static int mtk_hw_init(struct mtk_eth *e return 0; } @@ -518,7 +518,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> if (eth->pctl) { /* Set GE2 driving and slew rate */ -@@ -2690,11 +2823,47 @@ static int mtk_hw_init(struct mtk_eth *e +@@ -2692,11 +2825,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); @@ -568,7 +568,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> return 0; err_disable_pm: -@@ -3231,12 +3400,8 @@ static int mtk_probe(struct platform_dev +@@ -3233,12 +3402,8 @@ static int mtk_probe(struct platform_dev if (IS_ERR(eth->base)) return PTR_ERR(eth->base); @@ -582,7 +582,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> spin_lock_init(ð->page_lock); spin_lock_init(ð->tx_irq_lock); -@@ -3472,6 +3637,10 @@ static const struct mtk_soc_data mt2701_ +@@ -3474,6 +3639,10 @@ static const struct mtk_soc_data mt2701_ .txrx = { .txd_size = sizeof(struct mtk_tx_dma), .rxd_size = sizeof(struct mtk_rx_dma), @@ -593,7 +593,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> }, }; -@@ -3485,6 +3654,10 @@ static const struct mtk_soc_data mt7621_ +@@ -3487,6 +3656,10 @@ static const struct mtk_soc_data mt7621_ .txrx = { .txd_size = sizeof(struct mtk_tx_dma), .rxd_size = sizeof(struct mtk_rx_dma), @@ -604,7 +604,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> }, }; -@@ -3499,6 +3672,10 @@ static const struct mtk_soc_data mt7622_ +@@ -3501,6 +3674,10 @@ static const struct mtk_soc_data mt7622_ .txrx = { .txd_size = sizeof(struct mtk_tx_dma), .rxd_size = sizeof(struct mtk_rx_dma), @@ -615,7 +615,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> }, }; -@@ -3512,6 +3689,10 @@ static const struct mtk_soc_data mt7623_ +@@ -3514,6 +3691,10 @@ static const struct mtk_soc_data mt7623_ .txrx = { .txd_size = sizeof(struct mtk_tx_dma), .rxd_size = sizeof(struct mtk_rx_dma), @@ -626,7 +626,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> }, }; -@@ -3525,6 +3706,10 @@ static const struct mtk_soc_data mt7629_ +@@ -3527,6 +3708,10 @@ static const struct mtk_soc_data mt7629_ .txrx = { .txd_size = sizeof(struct mtk_tx_dma), .rxd_size = sizeof(struct mtk_rx_dma), @@ -637,7 +637,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> }, }; -@@ -3537,6 +3722,10 @@ static const struct mtk_soc_data rt5350_ +@@ -3539,6 +3724,10 @@ static const struct mtk_soc_data rt5350_ .txrx = { .txd_size = sizeof(struct mtk_tx_dma), .rxd_size = sizeof(struct mtk_rx_dma), |