net: airoha: Fix error handling in airoha_ppe_flush_sram_entries()
Subsystems (4)
PATCH v2 1/1 net: airoha: Fix error handling in airoha_ppe_flush_sram_entries()
In airoha_ppe_flush_sram_entries(), the outer "err" variable was never updated when the inner loop variable shadowed it, causing the function to always return 0 even when airoha_ppe_foe_commit_sram_entry() fails.
Drop the outer "err" variable and return directly on error, propagating the error code from airoha_ppe_foe_commit_sram_entry() correctly.
--- drivers/net/ethernet/airoha/airoha_ppe.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/airoha/airoha_ppe.c +3 -3
@@ -1330,7 +1330,7 @@ static int airoha_ppe_flush_sram_entries(struct airoha_ppe *ppe) {u32 sram_num_entries =airoha_ppe_get_total_sram_num_entries (ppe);struct airoha_foe_entry *hwe = ppe->foe; -int i, err =0 ; +int i;for (i =0 ; i < sram_num_entries; i++) {int err;
@@ -1338,10 +1338,10 @@ static int airoha_ppe_flush_sram_entries(struct airoha_ppe *ppe)memset (&hwe[i],0 ,sizeof (*hwe)); err =airoha_ppe_foe_commit_sram_entry (ppe, i);if (err) -break ; +return err; } -return err; +return 0 ; }static struct airoha_npu *airoha_ppe_npu_get (struct airoha_eth *eth)
Signature · 1 line
2.51.0
Quoted 10 lines
In
airoha_ppe_flush_sram_entries(), the outer "err" variable was never updated when the inner loop variable shadowed it, causing the function to always return 0 even whenairoha_ppe_foe_commit_sram_entry()fails.Drop the outer "err" variable and return directly on error, propagating the error code from
airoha_ppe_foe_commit_sram_entry()correctly.Fixes 620d7b91aadb ("net: airoha: ppe: Flush PPE SRAM table during PPE setup")Signed-off-by Wayen.Yan <[email protected]>
Quoted 34 lines
--- drivers/net/ethernet/airoha/airoha_ppe.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/net/ethernet/airoha/airoha_ppe.c +3
-3@@ -1330,7 +1330,7 @@ static int airoha_ppe_flush_sram_entries(struct airoha_ppe *ppe) {u32 sram_num_entries =airoha_ppe_get_total_sram_num_entries (ppe);struct airoha_foe_entry *hwe = ppe->foe; -int i, err =0 ; +int i;for (i =0 ; i < sram_num_entries; i++) {int err;@@ -1338,10 +1338,10 @@ static int airoha_ppe_flush_sram_entries(struct airoha_ppe *ppe)memset (&hwe[i],0 ,sizeof (*hwe)); err =airoha_ppe_foe_commit_sram_entry (ppe, i);if (err) -break ; +return err; } -return err; +return 0 ; }static struct airoha_npu *airoha_ppe_npu_get (struct airoha_eth *eth)Signature · 1 line
2.51.0
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 8 lines · On Fri, 12 Jun 2026 17:37:00 +0800 you wrote:
In
airoha_ppe_flush_sram_entries(), the outer "err" variable was never updated when the inner loop variable shadowed it, causing the function to always return 0 even whenairoha_ppe_foe_commit_sram_entry()fails.Drop the outer "err" variable and return directly on error, propagating the error code from
airoha_ppe_foe_commit_sram_entry()correctly.[...]
Here is the summary with links:
- [v2] net: airoha: Fix error handling in airoha_ppe_flush_sram_entries()
https://git.kernel.org/netdev/net/c/d7d81b003013
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html