mirror of
https://github.com/openwrt/openwrt.git
synced 2026-06-17 10:30:25 +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>
90 lines
2.6 KiB
Diff
90 lines
2.6 KiB
Diff
From 5e7365b5a1ac8f517a7a84442289d7de242deb76 Mon Sep 17 00:00:00 2001
|
|
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Sun, 14 Dec 2025 10:30:07 +0100
|
|
Subject: [PATCH] net: airoha: Move net_devs registration in a dedicated
|
|
routine
|
|
|
|
Since airoha_probe() is not executed under rtnl lock, there is small race
|
|
where a given device is configured by user-space while the remaining ones
|
|
are not completely loaded from the dts yet. This condition will allow a
|
|
hw device misconfiguration since there are some conditions (e.g. GDM2 check
|
|
in airoha_dev_init()) that require all device are properly loaded from the
|
|
device tree. Fix the issue moving net_devices registration at the end of
|
|
the airoha_probe routine.
|
|
|
|
Fixes: 9cd451d414f6e ("net: airoha: Add loopback support for GDM2")
|
|
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Reviewed-by: Simon Horman <horms@kernel.org>
|
|
Link: https://patch.msgid.link/20251214-airoha-fix-dev-registration-v1-1-860e027ad4c6@kernel.org
|
|
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
---
|
|
drivers/net/ethernet/airoha/airoha_eth.c | 39 ++++++++++++++++--------
|
|
1 file changed, 26 insertions(+), 13 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/airoha/airoha_eth.c
|
|
+++ b/drivers/net/ethernet/airoha/airoha_eth.c
|
|
@@ -2945,19 +2945,26 @@ static int airoha_alloc_gdm_port(struct
|
|
port->id = id;
|
|
eth->ports[p] = port;
|
|
|
|
- err = airoha_metadata_dst_alloc(port);
|
|
- if (err)
|
|
- return err;
|
|
+ return airoha_metadata_dst_alloc(port);
|
|
+}
|
|
|
|
- err = register_netdev(dev);
|
|
- if (err)
|
|
- goto free_metadata_dst;
|
|
+static int airoha_register_gdm_devices(struct airoha_eth *eth)
|
|
+{
|
|
+ int i;
|
|
|
|
- return 0;
|
|
+ for (i = 0; i < ARRAY_SIZE(eth->ports); i++) {
|
|
+ struct airoha_gdm_port *port = eth->ports[i];
|
|
+ int err;
|
|
+
|
|
+ if (!port)
|
|
+ continue;
|
|
+
|
|
+ err = register_netdev(port->dev);
|
|
+ if (err)
|
|
+ return err;
|
|
+ }
|
|
|
|
-free_metadata_dst:
|
|
- airoha_metadata_dst_free(port);
|
|
- return err;
|
|
+ return 0;
|
|
}
|
|
|
|
static int airoha_probe(struct platform_device *pdev)
|
|
@@ -3048,6 +3055,10 @@ static int airoha_probe(struct platform_
|
|
}
|
|
}
|
|
|
|
+ err = airoha_register_gdm_devices(eth);
|
|
+ if (err)
|
|
+ goto error_napi_stop;
|
|
+
|
|
return 0;
|
|
|
|
error_napi_stop:
|
|
@@ -3061,10 +3072,12 @@ error_hw_cleanup:
|
|
for (i = 0; i < ARRAY_SIZE(eth->ports); i++) {
|
|
struct airoha_gdm_port *port = eth->ports[i];
|
|
|
|
- if (port && port->dev->reg_state == NETREG_REGISTERED) {
|
|
+ if (!port)
|
|
+ continue;
|
|
+
|
|
+ if (port->dev->reg_state == NETREG_REGISTERED)
|
|
unregister_netdev(port->dev);
|
|
- airoha_metadata_dst_free(port);
|
|
- }
|
|
+ airoha_metadata_dst_free(port);
|
|
}
|
|
free_netdev(eth->napi_dev);
|
|
platform_set_drvdata(pdev, NULL);
|