From patchwork Wed Sep 18 14:37:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 13806953 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 86F17CCD1BC for ; Wed, 18 Sep 2024 14:39:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:Message-Id: Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=zuq7wpCDtmY6ucAvqGudnmsSbgARIhHx8T4FopwpdLE=; b=JPjdR4JeCyhPVQoCYRE9pio72Y 7eR3yhS5QQsFB01TtCQRXAN5T3SplWm8j4lrWx+n1Mc4qmOuLLNBUPFpbQ+GUpf4xwkfkgMbKi0so L9UlePQ5ZFgIrr26vI/guhJ87HC7rI0EITyVGFCCFMaK9dfTBFts1uHkTXO+Ax/7VRqgdiGxUDa8H LM+FZ0vC97BQnANPSK6lkv6H/y5BkTPs8cG38206IaB2kC1RxQwE31iXg93+bc9R1yTmhYN+mfbV8 WSZzI9/P53/t+iPKDOyxJw0pkWrccMaPlzdmkcv770lr1L+vnRWpeT1qGQSD7Esz/jn90caS2hAEL R3ODWznw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1sqvpm-00000008SUF-0EKu; Wed, 18 Sep 2024 14:39:10 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1sqvof-00000008SMZ-40Az; Wed, 18 Sep 2024 14:38:03 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id ADC115C5C0B; Wed, 18 Sep 2024 14:37:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 90BDBC4CEC2; Wed, 18 Sep 2024 14:38:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1726670281; bh=xXLfPYls2cCeIdrdeFZxy8Q4TAacIKqRg0i33Imm1gY=; h=From:Date:Subject:To:Cc:From; b=A47BSIp8YO5Ahf70mXgJElnNxFupJ8zkLIxXLjeSv6KWkimEDgBNORFHe+P/dTiQS /KWOVTezUPZyeG/15lF/CGlLkwk09hIKEyhlFtbgdmydfGaD/sXpdboYCTETMtTEdg l13OwaUSFCJznk/PUY4pSLC7K6pR3DWc4ab9X5Uudq64OROlFBcWLmnNNXghgSnabg ptH7EMhYrOxZVSMVPhfsw7Wb/G5dDewwkgc3fNsRIvrOqkYTDnhVIDv/9MUJZ2tQ1C Zu7q9XS1IABEoCwemUC8+Q1Z3CjlsV1BYfNdfS95GjbK5zqfQwE78j8LVThgts3cDA cHrPgdkEd7KDQ== From: Lorenzo Bianconi Date: Wed, 18 Sep 2024 16:37:30 +0200 Subject: [PATCH net] net: airoha: fix PSE memory configuration in airoha_fe_pse_ports_init() MIME-Version: 1.0 Message-Id: <20240918-airoha-eth-pse-fix-v1-1-7b61f26cd2fd@kernel.org> X-B4-Tracking: v=1; b=H4sIAKnl6mYC/x2MQQqAIBAAvxJ7bkFDpPpKdBDdci8lbkQQ/r2l4 wzMvCBUmQTm7oVKNwufh4LtO4g5HDshJ2UYzODMZEcMXM8ckK6MRQg3ftA7m0zc/OijAQ1LJdX /dFlb+wArfm5TZAAAAA== To: Felix Fietkau , Sean Wang , Mark Lee , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Matthias Brugger , AngeloGioacchino Del Regno Cc: linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, netdev@vger.kernel.org, upstream@airoha.com, Sayantan Nandy , Lorenzo Bianconi X-Mailer: b4 0.14.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240918_073802_120503_DDD0647A X-CRM114-Status: GOOD ( 10.99 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Align PSE memory configuration to vendor SDK. In particular, increase initial value of PSE reserved memory in airoha_fe_pse_ports_init() routine by the value used for the second Packet Processor Engine (PPE2) and do not overwrite the default value. Moreover, store the initial value for PSE reserved memory in orig_val before running airoha_fe_set_pse_queue_rsv_pages() in airoha_fe_set_pse_oq_rsv routine. Fixes: 23020f049327 ("net: airoha: Introduce ethernet support for EN7581 SoC") Tested-by: Sayantan Nandy Signed-off-by: Lorenzo Bianconi --- drivers/net/ethernet/mediatek/airoha_eth.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) --- base-commit: 9410645520e9b820069761f3450ef6661418e279 change-id: 20240918-airoha-eth-pse-fix-641d0cf686c0 Best regards, diff --git a/drivers/net/ethernet/mediatek/airoha_eth.c b/drivers/net/ethernet/mediatek/airoha_eth.c index 930f180688e5..2e01abc70c17 100644 --- a/drivers/net/ethernet/mediatek/airoha_eth.c +++ b/drivers/net/ethernet/mediatek/airoha_eth.c @@ -1116,17 +1116,23 @@ static void airoha_fe_set_pse_queue_rsv_pages(struct airoha_eth *eth, PSE_CFG_WR_EN_MASK | PSE_CFG_OQRSV_SEL_MASK); } +static u32 airoha_fe_get_pse_all_rsv(struct airoha_eth *eth) +{ + u32 val = airoha_fe_rr(eth, REG_FE_PSE_BUF_SET); + + return FIELD_GET(PSE_ALLRSV_MASK, val); +} + static int airoha_fe_set_pse_oq_rsv(struct airoha_eth *eth, u32 port, u32 queue, u32 val) { - u32 orig_val, tmp, all_rsv, fq_limit; + u32 orig_val = airoha_fe_get_pse_queue_rsv_pages(eth, port, queue); + u32 tmp, all_rsv, fq_limit; airoha_fe_set_pse_queue_rsv_pages(eth, port, queue, val); /* modify all rsv */ - orig_val = airoha_fe_get_pse_queue_rsv_pages(eth, port, queue); - tmp = airoha_fe_rr(eth, REG_FE_PSE_BUF_SET); - all_rsv = FIELD_GET(PSE_ALLRSV_MASK, tmp); + all_rsv = airoha_fe_get_pse_all_rsv(eth); all_rsv += (val - orig_val); airoha_fe_rmw(eth, REG_FE_PSE_BUF_SET, PSE_ALLRSV_MASK, FIELD_PREP(PSE_ALLRSV_MASK, all_rsv)); @@ -1166,11 +1172,13 @@ static void airoha_fe_pse_ports_init(struct airoha_eth *eth) [FE_PSE_PORT_GDM4] = 2, [FE_PSE_PORT_CDM5] = 2, }; + u32 all_rsv; int q; + all_rsv = airoha_fe_get_pse_all_rsv(eth); /* hw misses PPE2 oq rsv */ - airoha_fe_set(eth, REG_FE_PSE_BUF_SET, - PSE_RSV_PAGES * pse_port_num_queues[FE_PSE_PORT_PPE2]); + all_rsv += PSE_RSV_PAGES * pse_port_num_queues[FE_PSE_PORT_PPE2]; + airoha_fe_set(eth, REG_FE_PSE_BUF_SET, all_rsv); /* CMD1 */ for (q = 0; q < pse_port_num_queues[FE_PSE_PORT_CDM1]; q++)