mirror of
https://github.com/openwrt/openwrt.git
synced 2026-06-17 12:40:16 +04:00
Shiji Yang
8f638f9366
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 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
44 lines
1.8 KiB
Diff
44 lines
1.8 KiB
Diff
From fea8cdf6738a8b25fccbb7b109b440795a0892cb Mon Sep 17 00:00:00 2001
|
|
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Wed, 8 Oct 2025 11:27:43 +0200
|
|
Subject: [PATCH] net: airoha: Fix loopback mode configuration for GDM2 port
|
|
|
|
Add missing configuration for loopback mode in airhoha_set_gdm2_loopback
|
|
routine.
|
|
|
|
Fixes: 9cd451d414f6e ("net: airoha: Add loopback support for GDM2")
|
|
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
|
|
Link: https://patch.msgid.link/20251008-airoha-loopback-mode-fix-v2-1-045694fe7f60@kernel.org
|
|
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
---
|
|
drivers/net/ethernet/airoha/airoha_eth.c | 4 +++-
|
|
drivers/net/ethernet/airoha/airoha_regs.h | 3 +++
|
|
2 files changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/net/ethernet/airoha/airoha_eth.c
|
|
+++ b/drivers/net/ethernet/airoha/airoha_eth.c
|
|
@@ -1736,7 +1736,9 @@ static void airhoha_set_gdm2_loopback(st
|
|
airoha_fe_wr(eth, REG_GDM_RXCHN_EN(2), 0xffff);
|
|
airoha_fe_rmw(eth, REG_GDM_LPBK_CFG(2),
|
|
LPBK_CHAN_MASK | LPBK_MODE_MASK | LPBK_EN_MASK,
|
|
- FIELD_PREP(LPBK_CHAN_MASK, chan) | LPBK_EN_MASK);
|
|
+ FIELD_PREP(LPBK_CHAN_MASK, chan) |
|
|
+ LBK_GAP_MODE_MASK | LBK_LEN_MODE_MASK |
|
|
+ LBK_CHAN_MODE_MASK | LPBK_EN_MASK);
|
|
airoha_fe_rmw(eth, REG_GDM_LEN_CFG(2),
|
|
GDM_SHORT_LEN_MASK | GDM_LONG_LEN_MASK,
|
|
FIELD_PREP(GDM_SHORT_LEN_MASK, 60) |
|
|
--- a/drivers/net/ethernet/airoha/airoha_regs.h
|
|
+++ b/drivers/net/ethernet/airoha/airoha_regs.h
|
|
@@ -151,6 +151,9 @@
|
|
#define LPBK_LEN_MASK GENMASK(23, 10)
|
|
#define LPBK_CHAN_MASK GENMASK(8, 4)
|
|
#define LPBK_MODE_MASK GENMASK(3, 1)
|
|
+#define LBK_GAP_MODE_MASK BIT(3)
|
|
+#define LBK_LEN_MODE_MASK BIT(2)
|
|
+#define LBK_CHAN_MODE_MASK BIT(1)
|
|
#define LPBK_EN_MASK BIT(0)
|
|
|
|
#define REG_GDM_TXCHN_EN(_n) (GDM_BASE(_n) + 0x24)
|