summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYaleiZang2026-04-09 10:29:24 +0000
committerChristian Marangi2026-04-22 08:01:12 +0000
commit659df25802631ebcaf767fb35c7fbb69d72db769 (patch)
treed2e6904401042f73fad8b886d364138726a3ab44
parent23bcea0e21c3e069ceadd661e395efe8480c2237 (diff)
downloadopenwrt-659df25802631ebcaf767fb35c7fbb69d72db769.tar.gz
airoha: refresh the patches
- Refreshed existing patches - Removed patch '128-v7.1-net-airoha-Remove-airoha_dev_stop-in-airoha_remove.patch', as it has been upstreamed. Signed-off-by: YaleiZang <yalei.zang@airoha.com> Link: https://github.com/openwrt/openwrt/pull/22820 Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
-rw-r--r--target/linux/airoha/patches-6.12/117-v7.0-net-airoha-Use-gdm-port-enum-value-whenever-possible.patch4
-rw-r--r--target/linux/airoha/patches-6.12/128-v7.1-net-airoha-Remove-airoha_dev_stop-in-airoha_remove.patch30
2 files changed, 2 insertions, 32 deletions
diff --git a/target/linux/airoha/patches-6.12/117-v7.0-net-airoha-Use-gdm-port-enum-value-whenever-possible.patch b/target/linux/airoha/patches-6.12/117-v7.0-net-airoha-Use-gdm-port-enum-value-whenever-possible.patch
index 95e8c22f34..552079fd9d 100644
--- a/target/linux/airoha/patches-6.12/117-v7.0-net-airoha-Use-gdm-port-enum-value-whenever-possible.patch
+++ b/target/linux/airoha/patches-6.12/117-v7.0-net-airoha-Use-gdm-port-enum-value-whenever-possible.patch
@@ -98,7 +98,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
if (airoha_ppe_is_enabled(eth, 1)) {
/* For PPE2 always use secondary cpu port. */
fe_cpu_port = FE_PSE_PORT_CDM2;
-@@ -3101,14 +3103,14 @@ static const char * const en7581_xsi_rst
+@@ -3100,14 +3102,14 @@ static const char * const en7581_xsi_rst
static int airoha_en7581_get_src_port_id(struct airoha_gdm_port *port, int nbq)
{
switch (port->id) {
@@ -115,7 +115,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
/* 7581 SoC supports eth and usb serdes on GDM4 port */
if (!nbq)
return HSGMII_LAN_7581_ETH_SRCPORT;
-@@ -3132,12 +3134,12 @@ static const char * const an7583_xsi_rst
+@@ -3131,12 +3133,12 @@ static const char * const an7583_xsi_rst
static int airoha_an7583_get_src_port_id(struct airoha_gdm_port *port, int nbq)
{
switch (port->id) {
diff --git a/target/linux/airoha/patches-6.12/128-v7.1-net-airoha-Remove-airoha_dev_stop-in-airoha_remove.patch b/target/linux/airoha/patches-6.12/128-v7.1-net-airoha-Remove-airoha_dev_stop-in-airoha_remove.patch
deleted file mode 100644
index 6dfcb18359..0000000000
--- a/target/linux/airoha/patches-6.12/128-v7.1-net-airoha-Remove-airoha_dev_stop-in-airoha_remove.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From d4a533ad249e9fbdc2d0633f2ddd60a5b3a9a4ca Mon Sep 17 00:00:00 2001
-From: Lorenzo Bianconi <lorenzo@kernel.org>
-Date: Fri, 13 Mar 2026 12:27:00 +0100
-Subject: [PATCH] net: airoha: Remove airoha_dev_stop() in airoha_remove()
-
-Do not run airoha_dev_stop routine explicitly in airoha_remove()
-since ndo_stop() callback is already executed by unregister_netdev() in
-__dev_close_many routine if necessary and, doing so, we will end up causing
-an underflow in the qdma users atomic counters. Rely on networking subsystem
-to stop the device removing the airoha_eth module.
-
-Fixes: 23020f0493270 ("net: airoha: Introduce ethernet support for EN7581 SoC")
-Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
-Reviewed-by: Simon Horman <horms@kernel.org>
-Link: https://patch.msgid.link/20260313-airoha-remove-ndo_stop-remove-net-v2-1-67542c3ceeca@kernel.org
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
----
- drivers/net/ethernet/airoha/airoha_eth.c | 1 -
- 1 file changed, 1 deletion(-)
-
---- a/drivers/net/ethernet/airoha/airoha_eth.c
-+++ b/drivers/net/ethernet/airoha/airoha_eth.c
-@@ -3095,7 +3095,6 @@ static void airoha_remove(struct platfor
- if (!port)
- continue;
-
-- airoha_dev_stop(port->dev);
- unregister_netdev(port->dev);
- airoha_metadata_dst_free(port);
- }