diff options
| author | John Audia <therealgraysky@proton.me> | 2023-09-19 15:04:14 -0400 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2023-09-25 23:04:37 +0200 |
| commit | dee4e7b40c5fed70ce4118c529c114fb9210c162 (patch) | |
| tree | 31af1f2051c1b164676faff94b32dc29c6d70df3 /target/linux/generic/backport-5.15/702-v5.19-27-net-ethernet-mtk_eth_soc-introduce-MTK_NETSYS_V2-sup.patch | |
| parent | 442f7406a98073cba140a5dedbd09135527f3daa (diff) | |
| download | upstream-dee4e7b40c5fed70ce4118c529c114fb9210c162.tar.gz upstream-dee4e7b40c5fed70ce4118c529c114fb9210c162.tar.bz2 upstream-dee4e7b40c5fed70ce4118c529c114fb9210c162.zip | |
kernel: bump 5.15 to 5.15.132
Changelog: https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.15.132
Removed upstreamed:
bcm53xx/patches-5.15/037-v6.6-0006-ARM-dts-BCM53573-Add-cells-sizes-to-PCIe-node.patch[1]
bcm53xx/patches-5.15/037-v6.6-0007-ARM-dts-BCM53573-Use-updated-spi-gpio-binding-proper.patch[2]
bcm53xx/patches-5.15/037-v6.6-0008-ARM-dts-BCM5301X-Extend-RAM-to-full-256MB-for-Linksy.patch[3]
All other patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.132&id=b35f3ca1877e024887df205ede952863d65dad36
2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.132&id=2840d9b9c8750be270fb1153ccd5b983cbb5d592
3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.132&id=f086e859ddc252c32f0438edff241859c0f022ce
Build system: x86_64
Build-tested: ramips/tplink_archer-a6-v3
Run-tested: ramips/tplink_archer-a6-v3
Signed-off-by: John Audia <therealgraysky@proton.me>
(cherry picked from commit ac422c9788fbb3510b1fddaefc8816bea6601479)
[Refresh on top of OpenWrt 23.05]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
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 | 30 |
1 files changed, 15 insertions, 15 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 548d62a027..91739ddd34 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 @@ -403,7 +403,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> return 0; } -@@ -2298,7 +2406,7 @@ static irqreturn_t mtk_handle_irq_rx(int +@@ -2301,7 +2409,7 @@ static irqreturn_t mtk_handle_irq_rx(int eth->rx_events++; if (likely(napi_schedule_prep(ð->rx_napi))) { __napi_schedule(ð->rx_napi); @@ -412,7 +412,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> } return IRQ_HANDLED; -@@ -2322,8 +2430,10 @@ static irqreturn_t mtk_handle_irq(int ir +@@ -2325,8 +2433,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; @@ -425,7 +425,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> mtk_handle_irq_rx(irq, _eth); } if (mtk_r32(eth, reg_map->tx_irq_mask) & MTK_TX_DONE_INT) { -@@ -2341,16 +2451,16 @@ static void mtk_poll_controller(struct n +@@ -2344,16 +2454,16 @@ static void mtk_poll_controller(struct n struct mtk_eth *eth = mac->hw; mtk_tx_irq_disable(eth, MTK_TX_DONE_INT); @@ -445,7 +445,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> const struct mtk_reg_map *reg_map = eth->soc->reg_map; int err; -@@ -2361,12 +2471,19 @@ static int mtk_start_dma(struct mtk_eth +@@ -2364,12 +2474,19 @@ static int mtk_start_dma(struct mtk_eth } if (MTK_HAS_CAPS(eth->soc->caps, MTK_QDMA)) { @@ -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, -@@ -2440,7 +2557,7 @@ static int mtk_open(struct net_device *d +@@ -2443,7 +2560,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 -@@ -2492,7 +2609,7 @@ static int mtk_stop(struct net_device *d +@@ -2495,7 +2612,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); -@@ -2652,9 +2769,25 @@ static int mtk_hw_init(struct mtk_eth *e +@@ -2655,9 +2772,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 */ -@@ -2693,11 +2826,47 @@ static int mtk_hw_init(struct mtk_eth *e +@@ -2696,11 +2829,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: -@@ -3227,12 +3396,8 @@ static int mtk_probe(struct platform_dev +@@ -3230,12 +3399,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); -@@ -3468,6 +3633,10 @@ static const struct mtk_soc_data mt2701_ +@@ -3471,6 +3636,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> }, }; -@@ -3481,6 +3650,10 @@ static const struct mtk_soc_data mt7621_ +@@ -3484,6 +3653,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> }, }; -@@ -3495,6 +3668,10 @@ static const struct mtk_soc_data mt7622_ +@@ -3498,6 +3671,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> }, }; -@@ -3508,6 +3685,10 @@ static const struct mtk_soc_data mt7623_ +@@ -3511,6 +3688,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> }, }; -@@ -3521,6 +3702,10 @@ static const struct mtk_soc_data mt7629_ +@@ -3524,6 +3705,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> }, }; -@@ -3533,6 +3718,10 @@ static const struct mtk_soc_data rt5350_ +@@ -3536,6 +3721,10 @@ static const struct mtk_soc_data rt5350_ .txrx = { .txd_size = sizeof(struct mtk_tx_dma), .rxd_size = sizeof(struct mtk_rx_dma), |