d59d69f9e1
Manually rebased:
backport-5.15/704-15-v5.19-net-mtk_eth_soc-move-MAC_MCR-setting-to-mac_finish.patch
Removed upstreamed:
backport-5.15/060-v6.0-01-tools-build-Add-feature-test-for-init_disassemble_in.patch[1]
backport-5.15/060-v6.0-02-tools-include-add-dis-asm-compat.h-to-handle-version.patch[2]
backport-5.15/060-v6.0-03-tools-perf-Fix-compilation-error-with-new-binutils.patch[3]
backport-5.15/060-v6.0-04-tools-bpf_jit_disasm-Fix-compilation-error-with-new-.patch[4]
backport-5.15/060-v6.0-05-tools-bpftool-Fix-compilation-error-with-new-binutil.patch[5]
pending-5.15/733-02-net-ethernet-mtk_eth_soc-fix-RX-data-corruption-issu.patch[6]
bcm47xx/patches-5.15/170-bgmac-fix-initial-chip-reset-to-support-BCM5358.patch[7]
All other patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=51b99dc38c1a053e2e732d7f9e2740e343ae7eae
2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=451c9d7b16169645ed291ebb2ca9844caa088f2d
3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=97f005c0bdbaf656a7808586d234965385a06c58
4. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=1c27fab243333821375e4d63128d60093fdbe149
5. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=4441a90091931fd81607567961dc122f24f735bb
6. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=2adc29350a5b4669544566f71f208d2abaec60ab
7. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=04bfc5bcdfc0fdb73587487c71b04d63807ae15a
Build system: x86_64
Build-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod
Run-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod
Signed-off-by: John Audia <therealgraysky@proton.me>
42 lines
1.3 KiB
Diff
42 lines
1.3 KiB
Diff
From: Felix Fietkau <nbd@nbd.name>
|
|
Date: Mon, 21 Mar 2022 20:39:59 +0100
|
|
Subject: [PATCH] net: ethernet: mtk_eth_soc: enable threaded NAPI
|
|
|
|
This can improve performance under load by ensuring that NAPI processing is
|
|
not pinned on CPU 0.
|
|
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
---
|
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
@@ -2972,8 +2972,8 @@ static irqreturn_t mtk_handle_irq_rx(int
|
|
|
|
eth->rx_events++;
|
|
if (likely(napi_schedule_prep(ð->rx_napi))) {
|
|
- __napi_schedule(ð->rx_napi);
|
|
mtk_rx_irq_disable(eth, eth->soc->txrx.rx_irq_done_mask);
|
|
+ __napi_schedule(ð->rx_napi);
|
|
}
|
|
|
|
return IRQ_HANDLED;
|
|
@@ -2985,8 +2985,8 @@ static irqreturn_t mtk_handle_irq_tx(int
|
|
|
|
eth->tx_events++;
|
|
if (likely(napi_schedule_prep(ð->tx_napi))) {
|
|
- __napi_schedule(ð->tx_napi);
|
|
mtk_tx_irq_disable(eth, MTK_TX_DONE_INT);
|
|
+ __napi_schedule(ð->tx_napi);
|
|
}
|
|
|
|
return IRQ_HANDLED;
|
|
@@ -4617,6 +4617,8 @@ static int mtk_probe(struct platform_dev
|
|
* for NAPI to work
|
|
*/
|
|
init_dummy_netdev(ð->dummy_dev);
|
|
+ eth->dummy_dev.threaded = 1;
|
|
+ strcpy(eth->dummy_dev.name, "mtk_eth");
|
|
netif_napi_add(ð->dummy_dev, ð->tx_napi, mtk_napi_tx,
|
|
NAPI_POLL_WEIGHT);
|
|
netif_napi_add(ð->dummy_dev, ð->rx_napi, mtk_napi_rx,
|