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 74AE82877D4 for ; Mon, 16 Jun 2025 13:45:55 +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=1750081555; cv=none; b=kS5zngubnxviSrYN93Aajeb1I8JJRxwbgPE7MOMdsK6mTTbXT9PczaQsmCrwnlaj30aolBgiKWTe5IVnACT6OXZ5jdMwIQBgGALKBRVeD9uid/gHyQCH3amGS91wDq7a3A/dmd4z5i++EUVUoy6bfaUGPfT1apJ9eJGc8p+AG38= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750081555; c=relaxed/simple; bh=zmxmRAuGPbnBoWImjaQfSrdRisEJjiibW7+o0uMkNko=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=SltNgpfG+pH4hKvRxKhU5Q8jFuHtucbpsAfGSzKBm8xvE06LPrRcaJMlrSLWqE3KC3RJKT86dpB7qxRMvLHAddIpT6aTirgno1WYDpdKSAbos2Cx+JKk3nCsSUssHGHzPtVn5jFPzrvvyhCYJNx/jHUK48COThVEewr/ilBIUt0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=i8yimSth; 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="i8yimSth" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F223BC4CEEA; Mon, 16 Jun 2025 13:45:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750081555; bh=zmxmRAuGPbnBoWImjaQfSrdRisEJjiibW7+o0uMkNko=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=i8yimSth2VYAxT3sk9M8734i0KHckgC4iYFDE6CYcl2n35Ny9wbUOHjDgv1GpD6B1 ZzYDFwztkAfZNKpEthlpVgZWviGdLOQornBqAi7DO2aQxD/ZrNmL0nM+VYBJTsZjjh /ReeUVs2cL3Xm9WlwowazKycxVN59dCaLk+RoPcHijp2JUU8+Qcc7ODdN6n3XpfnV9 kcIlSqYC1+M8TKbY35X7zUNvLviMXbRf5uwmIxGmeaYU+BJEv0Stsp1lEsqMLLAUd/ x9qyeb0UM3bEX8oVpmFEEW+2rqA0RCZfsAUQsJhJx8lNOQhgvi8xrxhVmpZmTjwGAM KaANvZTtnos0g== From: Lorenzo Bianconi Date: Mon, 16 Jun 2025 15:45:41 +0200 Subject: [PATCH net-next v2 2/2] net: airoha: Differentiate hwfd buffer size for QDMA0 and QDMA1 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: <20250616-airoha-hw-num-desc-v2-2-bb328c0b8603@kernel.org> References: <20250616-airoha-hw-num-desc-v2-0-bb328c0b8603@kernel.org> In-Reply-To: <20250616-airoha-hw-num-desc-v2-0-bb328c0b8603@kernel.org> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Lorenzo Bianconi Cc: linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, netdev@vger.kernel.org X-Mailer: b4 0.14.2 In oreder to reduce the required hwfd buffers queue size for QDMA1, differentiate hwfd buffer size for QDMA0 and QDMA1 and use 2KB for QDMA0 and 1KB for QDMA1. Signed-off-by: Lorenzo Bianconi --- drivers/net/ethernet/airoha/airoha_eth.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/airoha/airoha_eth.c b/drivers/net/ethernet/airoha/airoha_eth.c index 1b7fd7ee0cbf3e1f7717110c70e9c5183fdd93d4..06dea3a13e77ce11f35dbd36966a34c5ef229c11 100644 --- a/drivers/net/ethernet/airoha/airoha_eth.c +++ b/drivers/net/ethernet/airoha/airoha_eth.c @@ -1068,14 +1068,15 @@ static int airoha_qdma_init_hfwd_queues(struct airoha_qdma *qdma) int size, index, num_desc = HW_DSCP_NUM; struct airoha_eth *eth = qdma->eth; int id = qdma - ð->qdma[0]; + u32 status, buf_size; dma_addr_t dma_addr; const char *name; - u32 status; name = devm_kasprintf(eth->dev, GFP_KERNEL, "qdma%d-buf", id); if (!name) return -ENOMEM; + buf_size = id ? AIROHA_MAX_PACKET_SIZE / 2 : AIROHA_MAX_PACKET_SIZE; index = of_property_match_string(eth->dev->of_node, "memory-region-names", name); if (index >= 0) { @@ -1096,9 +1097,9 @@ static int airoha_qdma_init_hfwd_queues(struct airoha_qdma *qdma) /* Compute the number of hw descriptors according to the * reserved memory size and the payload buffer size */ - num_desc = rmem->size / AIROHA_MAX_PACKET_SIZE; + num_desc = div_u64(rmem->size, buf_size); } else { - size = AIROHA_MAX_PACKET_SIZE * num_desc; + size = buf_size * num_desc; if (!dmam_alloc_coherent(eth->dev, size, &dma_addr, GFP_KERNEL)) return -ENOMEM; @@ -1111,9 +1112,10 @@ static int airoha_qdma_init_hfwd_queues(struct airoha_qdma *qdma) return -ENOMEM; airoha_qdma_wr(qdma, REG_FWD_DSCP_BASE, dma_addr); + /* QDMA0: 2KB. QDMA1: 1KB */ airoha_qdma_rmw(qdma, REG_HW_FWD_DSCP_CFG, HW_FWD_DSCP_PAYLOAD_SIZE_MASK, - FIELD_PREP(HW_FWD_DSCP_PAYLOAD_SIZE_MASK, 0)); + FIELD_PREP(HW_FWD_DSCP_PAYLOAD_SIZE_MASK, !!id)); airoha_qdma_rmw(qdma, REG_FWD_DSCP_LOW_THR, FWD_DSCP_LOW_THR_MASK, FIELD_PREP(FWD_DSCP_LOW_THR_MASK, 128)); airoha_qdma_rmw(qdma, REG_LMGR_INIT_CFG, -- 2.49.0