8f21d26411
Refreshed automatically with `make target/linux/refresh V=s`. Signed-off-by: Kenneth Kasilag <kenneth@kasilag.me> Link: https://github.com/openwrt/openwrt/pull/21019 Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>
59 lines
2.1 KiB
Diff
59 lines
2.1 KiB
Diff
From 41139125f5c70e0f66f0cc4ac1b3a62f5801ab42 Mon Sep 17 00:00:00 2001
|
|
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Fri, 17 Oct 2025 11:06:16 +0200
|
|
Subject: [PATCH 06/12] net: airoha: ppe: Remove airoha_ppe_is_enabled() where
|
|
not necessary
|
|
|
|
Now each PPE has always PPE_STATS_NUM_ENTRIES entries so we do not need
|
|
to run airoha_ppe_is_enabled routine to check if the hash refers to
|
|
PPE1 or PPE2.
|
|
|
|
Reviewed-by: Simon Horman <horms@kernel.org>
|
|
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Link: https://patch.msgid.link/20251017-an7583-eth-support-v3-7-f28319666667@kernel.org
|
|
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
---
|
|
drivers/net/ethernet/airoha/airoha_ppe.c | 13 ++++---------
|
|
1 file changed, 4 insertions(+), 9 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/airoha/airoha_ppe.c
|
|
+++ b/drivers/net/ethernet/airoha/airoha_ppe.c
|
|
@@ -527,10 +527,8 @@ static int airoha_ppe_foe_get_flow_stats
|
|
if (ppe_num_stats_entries < 0)
|
|
return ppe_num_stats_entries;
|
|
|
|
- *index = hash;
|
|
- if (airoha_ppe_is_enabled(ppe->eth, 1) &&
|
|
- hash >= ppe_num_stats_entries)
|
|
- *index = *index - PPE_STATS_NUM_ENTRIES;
|
|
+ *index = hash >= ppe_num_stats_entries ? hash - PPE_STATS_NUM_ENTRIES
|
|
+ : hash;
|
|
|
|
return 0;
|
|
}
|
|
@@ -620,13 +618,11 @@ airoha_ppe_foe_get_entry_locked(struct a
|
|
|
|
if (hash < sram_num_entries) {
|
|
u32 *hwe = ppe->foe + hash * sizeof(struct airoha_foe_entry);
|
|
+ bool ppe2 = hash >= PPE_SRAM_NUM_ENTRIES;
|
|
struct airoha_eth *eth = ppe->eth;
|
|
- bool ppe2;
|
|
u32 val;
|
|
int i;
|
|
|
|
- ppe2 = airoha_ppe_is_enabled(ppe->eth, 1) &&
|
|
- hash >= PPE_SRAM_NUM_ENTRIES;
|
|
airoha_fe_wr(ppe->eth, REG_PPE_RAM_CTRL(ppe2),
|
|
FIELD_PREP(PPE_SRAM_CTRL_ENTRY_MASK, hash) |
|
|
PPE_SRAM_CTRL_REQ_MASK);
|
|
@@ -704,8 +700,7 @@ static int airoha_ppe_foe_commit_entry(s
|
|
|
|
if (hash < sram_num_entries) {
|
|
dma_addr_t addr = ppe->foe_dma + hash * sizeof(*hwe);
|
|
- bool ppe2 = airoha_ppe_is_enabled(eth, 1) &&
|
|
- hash >= PPE_SRAM_NUM_ENTRIES;
|
|
+ bool ppe2 = hash >= PPE_SRAM_NUM_ENTRIES;
|
|
|
|
err = npu->ops.ppe_foe_commit_entry(npu, addr, sizeof(*hwe),
|
|
hash, ppe2);
|