]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
net: airoha: Fix error handling in airoha_ppe_flush_sram_entries()
authorWayen.Yan <win847@gmail.com>
Fri, 12 Jun 2026 09:37:00 +0000 (17:37 +0800)
committerJakub Kicinski <kuba@kernel.org>
Sat, 13 Jun 2026 17:29:26 +0000 (10:29 -0700)
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.

Fixes: 620d7b91aadb ("net: airoha: ppe: Flush PPE SRAM table during PPE setup")
Link: https://lore.kernel.org/netdev/6a2b40e4.4dd82583.3a5c46.e52f@mx.google.com/
Signed-off-by: Wayen.Yan <win847@gmail.com>
Acked-by: Lorenzo Bianconi <lorenzo@kernel.org>
Link: https://patch.msgid.link/6a2bd37a.4034e349.1b41bb.1caf@mx.google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/airoha/airoha_ppe.c

index 5c9dff6bccd1e3a62e18c840d80ee864fded23f9..a124f15345a91615261b397f72fc93aab434c487 100644 (file)
@@ -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)