From mboxrd@z Thu Jan 1 00:00:00 1970 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 DF4C9C982EA for ; Wed, 23 Sep 2026 06:50:30 +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:Content-Transfer-Encoding: MIME-Version:Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=p89oVBps4S+T5LODrobO031ycfpG6AMkiYxzsZO2208=; b=iLvQ1AMIGB4GqYtJEINi6U4riy j0LNxdsKbqK7sB9iKMKK+/dsyn3gxORG+s3obG5d5AG4mkU5+uu0U5Rdk7baYd7VMmZ82NW2bhW9n FsXZV1JTS29Gb31DJ0sg0yIYj/jv1SDJvkTJkG2MnQMJKZ0Jr1hwWIVhPn7h+CZAKHHxiG8okJVnq NeI855JrwTgAwRl7ZYwVyRtFyZLYaBxOPGGorq9vUz9ffJaQEiRu8itMuZvdmsj5zEJ5KJmSVx7Hk GwUJEyyJB7GQQnFVO5iM6cdJ0gQh5lIwvxKVr6BWHEnkGXhCGnqXvkDGCbjFs/rzZqmDoLPcU42mR qrcjAFEA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1x9GoH-00000007KFo-0Erg; Wed, 23 Sep 2026 06:50:29 +0000 Received: from mail-wm2-x11.google.com ([2a00:1450:4864:31::11]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1x9GoE-00000007KEn-3PTE for linux-mediatek@lists.infradead.org; Wed, 23 Sep 2026 06:50:27 +0000 Received: by mail-wm2-x11.google.com with SMTP id 5b1f17b1804b1-49cd5462b69so2675205e9.1 for ; Tue, 22 Sep 2026 23:50:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790146225; x=1790751025; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=p89oVBps4S+T5LODrobO031ycfpG6AMkiYxzsZO2208=; b=KuNRIlJQvgD7vx78rISh1E/dFn+xzmGaZ3Q5z5c7ZI2MfqtuxprTukinu+Pwe9Zd0F LuVThG4UJYR4SL/EZSwjPuqz1+orM7+w/Q+OaVDGrrq7ZiG7uCYQgMB2fgkmPX2IsnQ3 WSSms4r1zvDgVsHNmK+figEXLI+IjQbiAvLrsS+MimcJ+puipGBGJZ9oAaWUFF+u0/dJ 7ohNjGzNSXbm6YEb+9J3N3oW7LERSI735MVfid3p2oQXQlsXVQjv4zhOF5cF7P2hm3ON m/+vRGZQoqLql6PNPXLml98G9PO96f7XOBNED0Y9U5UsOb6rBvi2HJUjb4smFyaDG1Kk 1Dfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790146225; x=1790751025; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=p89oVBps4S+T5LODrobO031ycfpG6AMkiYxzsZO2208=; b=k8rWpcfV3nlnlwS2u1E/dL2Kfj4vnOm1eGyIypZuzgOq/28w4s9AdRguJWJu907MM3 MZiutEiYYsJKc48d1XnnTK2Q/S9iuf7eRootYB4VNAukwjxsO+Doqma2Nm8nyjO1QXA8 S8FgNghKHaeMKROQAEIUZOBbWOE0i2HNtjKOI7ISrXrFr5zA9TQfofDQO0+0SEqNOZku xEHG6kLRATsV4U8ARLitH3exohePKeLsOMIxp6RaZJzo1FFCCEHE//MNeZjSIAwVBEwN jr50+pc+lpjSniQUC5XMg/gqwLQ+3WHHV4oOhiTTWvO7yGqwVaT/zbelqFIeuFzdoSzK OVrQ== X-Forwarded-Encrypted: i=1; AKwUvBw2VH1nQUNge2n0UwhCkLUSqgn7K+xQmBe9QIb/eljElK7ZM47tkA8kK6U2i9G9618LZo3RxoAptmdBHigsxw==@lists.infradead.org X-Gm-Message-State: AFuF++mJi7RXu2lqmRNCPgay+j2iLDPD4zVyAnS5l6QIjrX+BTj3W53I bnXS1To2baAzBqUUJt56rKeIU7qet2jph3hrI2nVSSPVNqJfjjS5VQn0 X-Gm-Gg: AYBFou0wgChNrZLJ9EHQpDezoqpPDAlMTiYqVL4y2W3cjZbc5ZXgAbXZ7JuTOAxx52r u6XAlyML2Gj3D6vqqTLpr0bwFoepx83wSXFFu+d3euLZi2Ka32SJzGIYBfqOZF9HkcL+Ax272/H qwgoGuw3ENgFzTPSrPTT29105JQwtzbSLs4xnFq1/sZ9oTm0yQ8z5JwdUpclg1RzDS2vMMXeQx4 QWO0vsQZ4g7p1UT4x3/w2hdU2UaF5IyMXy2rzhriFNdzfAeiqgu4JDzYE8bYstutMmWBij2d0Dk omdyBs+B51JOhNpj9zSKEtamm9x6S2j7G1gTrR9kAchwL9NBz+xstPQWSL1+dBY4PdDD7pLws/H fFDUS5tgI8LDCwNdTCsLfXiXDX1gGZaEHVe7qv70MPC0vhB5+DEYpTt+B+SjRcOJ1DPj/UeCSvc CBHJcunzQSz4BPDxnK2CKK7jTIHBH7SoMq6rFLUuXH9iNGsd+MNnHbqGacEcieQTsQc06+VEu2Y vQ54lNZK2la4UJVALmUIiywPtcGipzM8KtSlkw2nFvYyFgVyBM09eNShS3Pp/EWSTsu2xRhNg== X-Received: by 2002:a05:600c:c48e:b0:49f:ce78:356a with SMTP id 5b1f17b1804b1-49fdeffdc94mr17172215e9.27.1790146224743; Tue, 22 Sep 2026 23:50:24 -0700 (PDT) Received: from Ansuel-XPS24.localdomain (host-79-29-83-136.business.telecomitalia.it. [79.29.83.136]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-49fde1e975asm57882535e9.14.2026.09.22.23.50.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Sep 2026 23:50:24 -0700 (PDT) From: Christian Marangi To: Lorenzo Bianconi , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Brown Huang , Christian Marangi Subject: [RFC PATCH net v5] net: airoha: Add retry mechanism to airoha_qdma_set_trtcm_param() Date: Wed, 23 Sep 2026 08:50:14 +0200 Message-ID: <20260923065015.5999-1-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.55.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260922_235026_873254_B45B7952 X-CRM114-Status: GOOD ( 17.95 ) X-BeenThere: linux-mediatek@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-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org From: Brown Huang CPU accesses QDMA via the bus. When multiple modules are using the bus simultaneously, CPU access to QDMA may encounter bus timeouts and fails, resulting in QDMA configuration failures and potentially causing packet transmission issues. In order to mitigate the issue, introduce a retry mechanism to airoha_qdma_set_trtcm_param routine in order to ensure the configuration is correctly applied to the hardware. It's enough to try a second time for the TRTCM config to be actually applied to make sure we are not in the middle of bucket handling as it does operate on fixed time slot internally. Fixes: ef1ca9271313b ("net: airoha: Add sched HTB offload support") Signed-off-by: Brown Huang [ improve commit description, drop memory block, apply better loop logic] Signed-off-by: Christian Marangi --- Changes v5: - Drop memory block (not needed) - Loop only 2 times - Improve description Changes v4: - Rebase on top of net Changes v3: - Init data - Use continue instead of negative error for poll - Add memobry block after CFG_PARAM drivers/net/ethernet/airoha/airoha_eth.c | 32 +++++++++++++++++++----- drivers/net/ethernet/airoha/airoha_eth.h | 2 ++ 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/airoha/airoha_eth.c b/drivers/net/ethernet/airoha/airoha_eth.c index 21ac80bdd084..b164a78ddac9 100644 --- a/drivers/net/ethernet/airoha/airoha_eth.c +++ b/drivers/net/ethernet/airoha/airoha_eth.c @@ -3120,14 +3120,34 @@ static int airoha_qdma_set_trtcm_param(struct airoha_qdma *qdma, int channel, FIELD_PREP(TRTCM_METER_GROUP_MASK, group) | FIELD_PREP(TRTCM_PARAM_INDEX_MASK, idx) | FIELD_PREP(TRTCM_PARAM_RATE_TYPE_MASK, mode); + int i; - airoha_qdma_wr(qdma, REG_TRTCM_DATA_LOW(addr), val); - airoha_qdma_wr(qdma, REG_TRTCM_CFG_PARAM(addr), config); + /* + * HW might be in the middle of bucket handling and might + * require an additional try to actually apply the new TRTCM + * config. + */ + for (i = 0; i < TRTCM_CONFIG_RETRY_MAX; i++) { + u32 data = 0; - return read_poll_timeout(airoha_qdma_rr, val, - val & TRTCM_PARAM_RW_DONE_MASK, - USEC_PER_MSEC, 10 * USEC_PER_MSEC, true, - qdma, REG_TRTCM_CFG_PARAM(addr)); + airoha_qdma_wr(qdma, REG_TRTCM_DATA_LOW(addr), val); + airoha_qdma_wr(qdma, REG_TRTCM_CFG_PARAM(addr), config); + + if (read_poll_timeout(airoha_qdma_rr, data, + data & TRTCM_PARAM_RW_DONE_MASK, + USEC_PER_MSEC, 10 * USEC_PER_MSEC, + true, qdma, REG_TRTCM_CFG_PARAM(addr))) + continue; + + if (airoha_qdma_get_trtcm_param(qdma, channel, addr, param, + mode, &data, NULL)) + continue; + + if (data == val) + return 0; + } + + return -EBUSY; } static int airoha_qdma_set_trtcm_config(struct airoha_qdma *qdma, int channel, diff --git a/drivers/net/ethernet/airoha/airoha_eth.h b/drivers/net/ethernet/airoha/airoha_eth.h index 286f73e2e1e0..d270729e22ff 100644 --- a/drivers/net/ethernet/airoha/airoha_eth.h +++ b/drivers/net/ethernet/airoha/airoha_eth.h @@ -184,6 +184,8 @@ enum trtcm_param { #define TRTCM_TOKEN_RATE_MASK GENMASK(23, 6) #define TRTCM_TOKEN_RATE_FRACTION_MASK GENMASK(5, 0) +#define TRTCM_CONFIG_RETRY_MAX 2 + enum airoha_dma_map_type { AIROHA_DMA_UNMAPPED, AIROHA_DMA_MAP_SINGLE, -- 2.55.0