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>
45 lines
1.7 KiB
Diff
45 lines
1.7 KiB
Diff
From 7600fb3b41dd6ab65ed61169df1b6099044edf97 Mon Sep 17 00:00:00 2001
|
|
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Wed, 4 Mar 2026 11:56:47 +0100
|
|
Subject: [PATCH] net: airoha: Rely __field_prep for non-constant masks
|
|
|
|
Rely on __field_prep macros for non-constant masks preparing the values
|
|
for register updates instead of open-coding.
|
|
|
|
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Link: https://patch.msgid.link/20260304-airoha-__field_prep-v1-1-b185facc4e2f@kernel.org
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/ethernet/airoha/airoha_eth.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/airoha/airoha_eth.c
|
|
+++ b/drivers/net/ethernet/airoha/airoha_eth.c
|
|
@@ -1748,7 +1748,7 @@ static int airhoha_set_gdm2_loopback(str
|
|
airoha_fe_rmw(eth,
|
|
REG_SP_DFT_CPORT(src_port >> fls(SP_CPORT_DFT_MASK)),
|
|
SP_CPORT_MASK(val),
|
|
- FE_PSE_PORT_CDM2 << __ffs(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,
|
|
@@ -1802,7 +1802,7 @@ static int airoha_dev_init(struct net_de
|
|
ppe_id = pse_port == FE_PSE_PORT_PPE2 ? 1 : 0;
|
|
airoha_fe_rmw(eth, REG_PPE_DFT_CPORT0(ppe_id),
|
|
DFT_CPORT_MASK(port->id),
|
|
- fe_cpu_port << __ffs(DFT_CPORT_MASK(port->id)));
|
|
+ __field_prep(DFT_CPORT_MASK(port->id), fe_cpu_port));
|
|
|
|
return 0;
|
|
}
|
|
@@ -2159,7 +2159,7 @@ static int airoha_qdma_set_chan_tx_sched
|
|
|
|
airoha_qdma_rmw(port->qdma, REG_CHAN_QOS_MODE(channel >> 3),
|
|
CHAN_QOS_MODE_MASK(channel),
|
|
- mode << __ffs(CHAN_QOS_MODE_MASK(channel)));
|
|
+ __field_prep(CHAN_QOS_MODE_MASK(channel), mode));
|
|
|
|
return 0;
|
|
}
|