Commit 41139125 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Paolo Abeni
Browse files

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: default avatarSimon Horman <horms@kernel.org>
Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Link: https://patch.msgid.link/20251017-an7583-eth-support-v3-7-f28319666667@kernel.org


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 5bd1d1fd

drivers/net/ethernet/airoha/airoha_ppe.c

+4 −9
Original line number Diff line number Diff line
@@ -514,10 +514,8 @@ static int airoha_ppe_foe_get_flow_stats_index(struct airoha_ppe *ppe, 
	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;

}
@@ -607,13 +605,11 @@ airoha_ppe_foe_get_entry_locked(struct airoha_ppe *ppe, u32 hash) 


	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);
@@ -691,8 +687,7 @@ static int airoha_ppe_foe_commit_entry(struct airoha_ppe *ppe, 


	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);