mirror of
https://github.com/openwrt/openwrt.git
synced 2026-06-17 12:40:16 +04:00
Shiji Yang
9cf794cff1
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.91
Remove upstreamed patches:
- airoha/patches-6.12/017-v6.13-net-airoha-Implement-BQL-support.patch[1]
- airoha/patches-6.12/138-v7.1-net-airoha-Add-missing-RX_CPU_IDX-configuration-in-a.patch[2]
- airoha/patches-6.12/149-v7.1-net-airoha-Move-ndesc-initialization-at-end-of-airoh.patch[3]
- generic/backport-6.12/940-v7.1-net-dsa-realtek-rtl8365mb-fix-mode-mask-calculation.patch[5]
Manually rebased patches:
- airoha/patches-6.12/048-01-v6.15-net-airoha-Move-airoha_eth-driver-in-a-dedicated-fol.patch[1]
- ath79/patches-6.12/800-leds-add-reset-controller-based-driver.patch[4]
- bcm27xx/patches-6.12/950-0122-bcmgenet-Better-coalescing-parameter-defaults.patch[6]
We also backported four patches to fix perf tool regression:
- generic/backport-6.12/216-01-revert-perf-cgroup-update-metric-leader-in-evlist__e.patch
- generic/backport-6.12/216-02-revert-perf-tool_pmu-fix-aggregation-on-duration_tim.patch
- generic/backport-6.12/216-03-revert-perf-python-add-parse_events-function.patch
- generic/backport-6.12/216-04-revert-perf-tool_pmu-factor-tool-events-into-their-o.patch
All other patches are automatically refreshed.
[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=ca24fcac1daaa5e8a667981d81986a3eb4b9fb04
[2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=f00037a99bc2332ef59dc85298b98b20af165904
[3] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=d36be272adda7f313e39dd118086955d993bf6a7
[4] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=07d3611389ba7d78b80ea360a42ce32ab2521fbc
[5] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=3354d6c62fd4baa7b32cbd80cc5a8aa3f2bd0656
[6] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=b84351dcc359667bc952131c1424b692ec83dce2
Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
Link: https://github.com/openwrt/openwrt/pull/23444
(cherry picked from commit 8f638f9366)
Link: https://github.com/openwrt/openwrt/pull/23538
[Adapted to patches in 25.12]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
53 lines
2.1 KiB
Diff
53 lines
2.1 KiB
Diff
From bf3471e6e6c02137dc0d26caa783ac1849f9aab8 Mon Sep 17 00:00:00 2001
|
|
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Fri, 6 Mar 2026 09:07:27 +0100
|
|
Subject: [PATCH] net: airoha: Make flow control source port mapping dependent
|
|
on nbq parameter
|
|
|
|
Flow control source port mapping for USB serdes needs to be configured
|
|
according to the GDM port nbq parameter. This is a preliminary patch
|
|
since nbq parameter is specific for the given port serdes and needs to
|
|
be read from the DTS (in the current codebase is assigned statically).
|
|
|
|
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Link: https://patch.msgid.link/20260306-airoha-fix-loopback-for-usb-serdes-v2-1-319de9c96826@kernel.org
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/ethernet/airoha/airoha_eth.c | 10 ++++++----
|
|
drivers/net/ethernet/airoha/airoha_regs.h | 5 +----
|
|
2 files changed, 7 insertions(+), 8 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/airoha/airoha_eth.c
|
|
+++ b/drivers/net/ethernet/airoha/airoha_eth.c
|
|
@@ -1750,10 +1750,12 @@ static int airhoha_set_gdm2_loopback(str
|
|
SP_CPORT_MASK(val),
|
|
__field_prep(SP_CPORT_MASK(val), FE_PSE_PORT_CDM2));
|
|
|
|
- if (port->id != AIROHA_GDM3_IDX && airoha_is_7581(eth))
|
|
- airoha_fe_rmw(eth, REG_SRC_PORT_FC_MAP6,
|
|
- FC_ID_OF_SRC_PORT24_MASK,
|
|
- FIELD_PREP(FC_ID_OF_SRC_PORT24_MASK, 2));
|
|
+ if (port->id == AIROHA_GDM4_IDX && airoha_is_7581(eth)) {
|
|
+ u32 mask = FC_ID_OF_SRC_PORT_MASK(nbq);
|
|
+
|
|
+ airoha_fe_rmw(eth, REG_SRC_PORT_FC_MAP6, mask,
|
|
+ __field_prep(mask, AIROHA_GDM2_IDX));
|
|
+ }
|
|
|
|
return 0;
|
|
}
|
|
--- a/drivers/net/ethernet/airoha/airoha_regs.h
|
|
+++ b/drivers/net/ethernet/airoha/airoha_regs.h
|
|
@@ -376,10 +376,7 @@
|
|
#define SP_CPORT_MASK(_n) GENMASK(3 + ((_n) << 2), ((_n) << 2))
|
|
|
|
#define REG_SRC_PORT_FC_MAP6 0x2298
|
|
-#define FC_ID_OF_SRC_PORT27_MASK GENMASK(28, 24)
|
|
-#define FC_ID_OF_SRC_PORT26_MASK GENMASK(20, 16)
|
|
-#define FC_ID_OF_SRC_PORT25_MASK GENMASK(12, 8)
|
|
-#define FC_ID_OF_SRC_PORT24_MASK GENMASK(4, 0)
|
|
+#define FC_ID_OF_SRC_PORT_MASK(_n) GENMASK(4 + ((_n) << 3), ((_n) << 3))
|
|
|
|
#define REG_CDM5_RX_OQ1_DROP_CNT 0x29d4
|
|
|