diff options
| author | Christian Marangi | 2025-10-24 10:16:11 +0000 |
|---|---|---|
| committer | Christian Marangi | 2025-11-10 17:09:14 +0000 |
| commit | 7af48fdcd34d4aa0fa5619df598dc9feefd1d7fc (patch) | |
| tree | 78bcc7a8855a27e2281aa232e05bf1f536e2f061 | |
| parent | 518f3c61715e45b4c5f8e41f873568d51e81cc17 (diff) | |
| download | openwrt-7af48fdcd34d4aa0fa5619df598dc9feefd1d7fc.tar.gz | |
airoha: backport fix for Airoha offload support with airoha_hw_init fail
Backport a patch fixing a kernel panic on airoha_hw_init fail. This
should better handle scenario with NPU load Probe deferring.
(cherry picked from commit c3c75d0e685b90fdcb9f1cf79a6e2c6949cce9ac)
[ fix conflict error ]
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
| -rw-r--r-- | target/linux/airoha/patches-6.6/104-v6.16-net-airoha-Fix-an-error-handling-path-in-airoha_prob.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/target/linux/airoha/patches-6.6/104-v6.16-net-airoha-Fix-an-error-handling-path-in-airoha_prob.patch b/target/linux/airoha/patches-6.6/104-v6.16-net-airoha-Fix-an-error-handling-path-in-airoha_prob.patch new file mode 100644 index 0000000000..58e48cb8d0 --- /dev/null +++ b/target/linux/airoha/patches-6.6/104-v6.16-net-airoha-Fix-an-error-handling-path-in-airoha_prob.patch @@ -0,0 +1,29 @@ +From 3ef07434c7dbfba302df477bb6c70e082965f232 Mon Sep 17 00:00:00 2001 +From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> +Date: Sat, 5 Jul 2025 10:34:32 +0200 +Subject: [PATCH] net: airoha: Fix an error handling path in airoha_probe() + +If an error occurs after a successful airoha_hw_init() call, +airoha_ppe_deinit() needs to be called as already done in the remove +function. + +Fixes: 00a7678310fe ("net: airoha: Introduce flowtable offload support") +Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> +Reviewed-by: Simon Horman <horms@kernel.org> +Acked-by: Lorenzo Bianconi <lorenzo@kernel.org> +Link: https://patch.msgid.link/1c940851b4fa3c3ed2a142910c821493a136f121.1746715755.git.christophe.jaillet@wanadoo.fr +Signed-off-by: Jakub Kicinski <kuba@kernel.org> +--- + drivers/net/ethernet/airoha/airoha_eth.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/net/ethernet/airoha/airoha_eth.c ++++ b/drivers/net/ethernet/airoha/airoha_eth.c +@@ -3044,6 +3044,7 @@ static int airoha_probe(struct platform_ + error_napi_stop: + for (i = 0; i < ARRAY_SIZE(eth->qdma); i++) + airoha_qdma_stop_napi(ð->qdma[i]); ++ airoha_ppe_deinit(eth); + error_hw_cleanup: + for (i = 0; i < ARRAY_SIZE(eth->qdma); i++) + airoha_hw_cleanup(ð->qdma[i]); |