From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D98BF2DFF3F; Thu, 16 Oct 2025 10:28:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760610537; cv=none; b=XKNFgVFYaoGGtHzpu/PXGuAT3jPVmuDmFnsa/EJ/hWLu5ox8rknop+nkouEEAYpFxtE+9WXjWznxrvtOVbpDg+gon7fhruhuFD87KD2ox7vNmXI0yhjYN/5cNXRTZgNLlysZDGvUD6eSBU1N8NpJoomnIrET7MZiUnE0va8jlO8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760610537; c=relaxed/simple; bh=hNrhTz9RivBvwoNye3uuIuxIHUqtKrAbVtiIQ+QL17g=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=bC2PU2MO3hlo9A+FdAbSsLNfz1E0MGck6eQo3rz1ypETq+W92ZjLd/LWXU2CvA3xSfFJs2hyM0Dzrk+4hBHB+uRCh+UcnBUAZonCFql9blHT9HpCz6xsTEUZ8Jl46RalPQIuc5FyTpfTATnjo+/LkkybicD60NHIvf3veU2QMw8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=A833XUST; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="A833XUST" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EBE57C4CEF1; Thu, 16 Oct 2025 10:28:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1760610537; bh=hNrhTz9RivBvwoNye3uuIuxIHUqtKrAbVtiIQ+QL17g=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=A833XUSTIfX/w8ReVQF3dXFLU5+uOsK0vb8gGbPuJh3J/2CFhI20s8AeI+7+9TVKf vELhmz8fP8ADwgFQ3PGjEY5uyePxTB9aerjf0jScAEJjEeidUIXwKci3UyU0A9PScp zAVK/eyTZeJRjBtYkrzgu4JQD9yO9fnC3ebO+U3BD5QQqKHmlXOMwTssBCL/ggCfXJ q07H6XCGAf/DgR25Y0VAhnDcrRXlmDMCBYM6IqVnIys4ysS6QSIYTX8gkyzGGqKx8x fQkHtkrUCYi/EZs5IBak+x3yOMyoMLRAjVuzn8z0nPyvaf9Gy3wHRgkFpy22nDyEFj QTaHqRVckYChw== From: Lorenzo Bianconi Date: Thu, 16 Oct 2025 12:28:21 +0200 Subject: [PATCH net-next v2 07/13] net: airoha: ppe: Remove airoha_ppe_is_enabled() where not necessary Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20251016-an7583-eth-support-v2-7-ea6e7e9acbdb@kernel.org> References: <20251016-an7583-eth-support-v2-0-ea6e7e9acbdb@kernel.org> In-Reply-To: <20251016-an7583-eth-support-v2-0-ea6e7e9acbdb@kernel.org> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Philipp Zabel , Lorenzo Bianconi Cc: linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, Simon Horman X-Mailer: b4 0.14.2 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 Signed-off-by: Lorenzo Bianconi --- drivers/net/ethernet/airoha/airoha_ppe.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/airoha/airoha_ppe.c b/drivers/net/ethernet/airoha/airoha_ppe.c index d142660e7910425c14ea2f867f8238156419833b..195d97e61197e5c393f2e79f33f685c334612a83 100644 --- a/drivers/net/ethernet/airoha/airoha_ppe.c +++ b/drivers/net/ethernet/airoha/airoha_ppe.c @@ -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); -- 2.51.0