From patchwork Sat Mar 22 16:32:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shengyu Qu X-Patchwork-Id: 14026386 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 4418AC35FFC for ; Sat, 22 Mar 2025 16:34:36 +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:MIME-Version:Content-Type: Content-Transfer-Encoding:Message-ID:Date:Subject:Cc:To: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=hex12HAcJCp/iZW2x6jkGpzrUZb2jyaRs1SV8ledlsA=; b=N48FyuVU4lIqEL/HjO7jneEf0K IbpwmaRS7Z7oJNOyRq7eu6SD0IE+lGYVy5EXPhDYKBKuStwBVc9sXZJxZu/PR1yVl4wEZLXBexRDz qa8/4KhWFXmzLXqUgWoqE0TyYnBWbKznj2gH9k1MV1p/swBiBd48YPoRzRFd3MjSDxcVZ57hP2i7X c7guRAinfLsI7xhq3L9S7VaHSj6FvXvHr5SGeOnQ/BDiU0oBandg94ZdC7XSb1S42kpg01Hb9Z4op FcJVTj2i4b0x2eICRJW+oaMn1w6pNPW5vymq5zWFrrAbifoP8bGWPr22ekA84Z5k2lDj09ObL1UqP hn51ZB4w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tw1nu-000000005iH-10xH; Sat, 22 Mar 2025 16:34:34 +0000 Received: from mail-japanwestazolkn190100000.outbound.protection.outlook.com ([2a01:111:f403:d406::] helo=OS0P286CU011.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tw1mD-000000005bF-2kSg; Sat, 22 Mar 2025 16:32:50 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=XHbpBmwxd+BeifOrSOTQKg65BuT25vA7OmGoM+mqaw/sXAwCTUijx1fhIgewa+vpWzb0VRRqiBX7V1hV9zbWLIwBIE8q6UxUfKpPvQCPUKYS8BncD0McBDO0+QEUDKcihRrCBlVijtWKESwZIMqlKC/tdAVXPKFAzCms98PaOiGaf+r97qKq+RdW9AoDz7JUw8vvxnUryfC9IQd3pnXlJT2I1ORc4u0QNV1iyi1QvZDcX3qzw1GVT7yVD3vLaSEPHSJyHzgt4NEnXiE9A4Qwk4OUP6/p+EMWz4i5YQO+NRkku2vb6azHMNhnwoPliNZDXpXNHhz5GGy6o/KbCBr6UA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=hex12HAcJCp/iZW2x6jkGpzrUZb2jyaRs1SV8ledlsA=; b=fQM1bcjKqspiwtBEWRka9Lfg5BSTfceVSvGclHSciTglvdjXTEoaFVL3pcgYviUJPqSs5Nrk/46M55tSirUlknfp0MnVwuAupARwqF5as/qmX0Q81+ZfjNHBGhSJ62dV0AMWd2LH7oBhQn6XBdab505Uv/t2d0LNgYiqHkBcz1gRLSRYiMRueDqB8t0vjS1ZOp8IG9PxZP+QnJU4cvSBenY3pN6E7ZlchA2KBur0ptlOKXesmpavsQFTmmmRdt7q6fEsiKaBRLF6FLBf6zzl2hhQsxwxy7KkhmQAyWz2ysRKpntD9jlKSUynnczibKQ1NP4iZCNtkBVr2rNAEt/JVA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hex12HAcJCp/iZW2x6jkGpzrUZb2jyaRs1SV8ledlsA=; b=rTjevRn1rOjwlvY+5nmg5U2JwvGDJ84bn9F0bUFphFX91N7myO/NfpUosTucW35ION+DBtCoegS4ZqJUFjbM0RPqg7dkK8ytlj0UJ0uhehi75SussE9XWrnwCcRCXGf9Xh37BgpzagMi9d5OLPEM7v2gQ5cl8CweZJBPyhpn3/ttkZgkSOKFRRo/hFTdtOoDFCPXbBSGmwab8viEnSey3j78VdmpxL9OWbFikc66XNnEJQJki9EWPfPWzYRsKrCrY+bBiBrOI8AR4SgnuMQRhVpsnDtL+Qa0TWEg4IP1iap1iFBm+4Vcp4ehI99ifualv+NRJWAXr3tAYuohKQY7kw== Received: from TYCPR01MB8437.jpnprd01.prod.outlook.com (2603:1096:400:156::5) by TYWPR01MB7186.jpnprd01.prod.outlook.com (2603:1096:400:ed::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.34; Sat, 22 Mar 2025 16:32:41 +0000 Received: from TYCPR01MB8437.jpnprd01.prod.outlook.com ([fe80::83e7:751f:f3af:768f]) by TYCPR01MB8437.jpnprd01.prod.outlook.com ([fe80::83e7:751f:f3af:768f%3]) with mapi id 15.20.8534.038; Sat, 22 Mar 2025 16:32:41 +0000 From: Shengyu Qu To: nbd@nbd.name, pkshih@realtek.com, lorenzo@kernel.org, ryder.lee@mediatek.com, shayne.chen@mediatek.com, sean.wang@mediatek.com, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Cc: Shengyu Qu , Peter Chiu Subject: [PATCH v3] mt76: mt7915: wed: find rx token by physical address Date: Sun, 23 Mar 2025 00:32:35 +0800 Message-ID: X-Mailer: git-send-email 2.49.0 X-ClientProxiedBy: PS2PR02CA0006.apcprd02.prod.outlook.com (2603:1096:300:41::18) To TYCPR01MB8437.jpnprd01.prod.outlook.com (2603:1096:400:156::5) X-Microsoft-Original-Message-ID: <20250322163235.8655-1-wiagn233@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB8437:EE_|TYWPR01MB7186:EE_ X-MS-Office365-Filtering-Correlation-Id: 3c1920e3-2dc2-4ab6-95f6-08dd695f2a30 X-Microsoft-Antispam: BCL:0;ARA:14566002|5062599005|461199028|7092599003|5072599009|19110799003|15080799006|8060799006|3412199025|440099028|13041999003|4302099013|10035399004|19111999003|14041999003|41001999003|1602099012|1710799026; X-Microsoft-Antispam-Message-Info: 0L44cEY7yhbNmFg8u+Vbc+ur8qIAauFViozMNRkCBDfy07Zed88c0XAQAgWOHfnv5m6FSj9G8BB816T3hrhxhRquAHGpQxjoS3nQwk32el4IbByo49R0bhEd64W1h6ylofzfb6EK4a7SsLdyOyyG2wao7/ZzVT8hk7q28PjCm2+c8e6JjYBiqzMcCMPG5Jm7O4669K+4YsST8Wuiq9Q1g8shUaWLnnyE7mCW66RnHSFs1YlquWg+0jUm3anKYT0+r/KKsYsVi7nADPf351ITuwbKlSzzoEarJE23XKbPzn7KicKmsDbaQYXUsUfH6dxgHLytV5CYsJ2qaB1MJgtnNrilmJvuqwtkQPqPjTBe3Rof0TvpUjIKu2Z+XQkbUtRoQvWU/K8YhBeCkN6F27T05KEBNBLZhED0Wz+zTVgtoFGuSEQ46fX9ey3+OnABHyDaRww4zJI/tUjIs6wBxP7Yctq2MDVGKKkjwEV6n6QJ3c1HkfaJPZRzU+UdvJzOPyRERpG668cpOLMAFJ+aY/lhQ7ed2Ug1jVZDdSp0m7vHC6AfT6aBC0f6ibuDajbgev8gpT51vGKwjoVt/z0P6TA/nPgLfjk1YnO0yR/CU0g8QYxdmsQA/F8Udvf0Ps8F6dOm+5qko9gKcoxwoxwW26YbHYvNRKdWD6czkjbj7hSsLSHuhoVZEb3iV8ESaqG1h/5fFuhSqCkP3FqGRvOTpBqfE42U9Wo9jcUCLpTOFoG3O8pd/fGARc7fhgYVbx/cGeF7RUioeG3CcESNS/s57FUxsGCCa1RB6r/TJfh51P7u8fo6YxGQR2tJXgUnqnSphB/IB6NyPmQcyfNflVhVTK96qRK6zm0h39F0TDS/sTB54u7EVKPyXQp1giVgSQkUS/5AJTSNUx6peRLkekX40yaiOTazldQSJs+MCsj4UO3lyuZdkGm44tm6+xHzYkx40f4hFBluMhzshS1VmcPYpAtNAKuYdngZdk4z/qPhJgj+UpNMEGIWeN0pSw5qB2lmGJ5XXCRU/0Un+hbCGp6nxFfOvqP39fWb08/PKomFXVLbnrzNs2IEt+E/xl1b18K9i1MgaSnXkB9ErkCVgM17ZJJYXpwERXzCpnxnWxB4yRZVE1i0+rbliS7q1aVCkTL5PnyAIL4CNO3ZG/C+KnJ9pziLs2/BQXcVbe5Zj2uM73zdeNFnliHNCQZf8tV/B9a9Oz41CXKA8IWqDH2AbxguJf/EZV8dGcy3uKg06+pJFtI/1t3HIRF0DQqCCcXGO3zCpaLN5N9HV7w0wqy+r0Y53ADrqWyC0Y49D6uqANKaVNGFW1crdX7G+qBhHCzN3dQcQ3fhUtO82XYTzI0RaZiAR0E/k1hBnuDEKrqxnNly8CVWK56UMZf25jCf0eWksvjtoNj9S4Hy3ASOFLfFy8SjIYTXQw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: SHgPjO+hZfMhNMHUtNi565xKkBZzEP5Ha/v1mmnH/4EOFDtWZKeOJeyHe8a+YbZ+mSKQXifSXtKh3A6n4luVptmXlUdbQI7jA5OaXIV4TzGFlwQNwwoOzviEL7ia/UxfnG8gVE8Rf3+9UBSv/SMXGA7hoNOqlbRbT0t79Zyd2KqbKdAVx42DlXJpGCvsUYuau1fW8hsu+l+UZ0l+PAUSm3t4DaPLF2qSRts+TDzTXw+zxbnq6EVHP4BE/fO4Da2qhrx/DrrukWV4K4zi9QXc99QjQ1s8oMz7BP8/MSjnK9pHciuORhmQaOPPlHHBKzxuxIiHZWZ2PCbdpCHZYkdjkDGqpAGHuvRY5v7HCKifikExGSuL7oehBvteKpIDOt5jdXuLYmnPrX53NtX00zmib6uxGQ7p6TNmkdiCO+uoGif6YcgCBgWcLl0e+X2lf0W2sBxbMoXRXa9w37uaBqd6d0IqTLBemTZiF9jefVmLU/FKpl1Qtii2//fEGc7EbxrPeMKV7tYQ2FYbEA/SAo2IP7EZtZjVZTG+b1GPiLPpZ6P/03nOcIyOBjccf9R5+BP28ggdld1SF2aZXcChIvEv2xz/2wiWbRjTXCC5YBtSbub4+l/VEEUSbLhhDSOpEK9+8Mt9IxONWRU9aGZIRbOa2mvHMBdJgxbYHUtj8KAUSjZq2nzy5j4YJQ4N/7oyv1HS5xu3oWgBXLTjh9MON88cLgZrnXnD21kAG06SRarqKK0MnL+On9bOdUG1prQeSCTx+nPSm1hEfm3DHTmdfqxXrAV/ZyD7ne0StRBknYhLZ/GLa2G5PtpqtVhHH2S1Obx2sMLSDmWC8BFNFVBFnR9ntVoiYdpJSepvXOTVYsMG11SiXw1LCGPypqL0zshJLjJ1udFdwbbh6cExWhdq8B2jdaT/2V7LndTt+9ik4rjOA3sLkveJaBquy8YYuLHF5QV6hEF7RT77k25PHyY53228GQ6zUwXRD6IXzEatt5yHfSuxtvlru6wprviP31ePqq+JtqpGZrJXIIBoI4IvinVrjKKQbRuFTYrvqOvhFbV86ICVrBR8WQPZfyrrp5QT8HKzlBAS91kxjw5zb/SqqLLjB1MoSfRBYAf7sVHT0qzouuMg97kZiLUhzGoh4cyIsb8slQOtDkvoog9IylVrZcPO4bK5/BIYfP37Tdp7B649DS9KWDAJQhrj55xESk5snyMksJXLXeRRDBsbM2PWFdHc4ORK1rL1F24sb0mjre41obpe0Gfj9RQnyZrt4JT++r2rIiGzI4Ik7S8NuAW1yXmBhLCE8O+FjUp02TkGTOoKTbo= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3c1920e3-2dc2-4ab6-95f6-08dd695f2a30 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB8437.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Mar 2025 16:32:41.1454 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWPR01MB7186 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250322_093249_708680_B0369412 X-CRM114-Status: GOOD ( 10.75 ) 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 The token id in RxDMAD may be incorrect when it is not the last frame due to WED HW bug. Lookup correct token id by physical address in sdp0. Downstream patch link: https://git01.mediatek.com/plugins/gitiles/openwrt/feeds/mtk-openwrt-feeds/+/737340322ab22b138fd200e020d61ffdbe3e36a9/autobuild/autobuild_5.4_mac80211_release/mt7988_wifi7_mac80211_mlo/package/kernel/mt76/patches/0062-mtk-wifi-mt76-mt7915-wed-find-rx-token-by-physical-a.patch Signed-off-by: Peter Chiu Signed-off-by: Shengyu Qu --- Changes since v1: - Reordered code sequence to reversed Xmas tree order - Renamed some variables Changes since v2: - Assigning true to variable "found" instead of 1 --- drivers/net/wireless/mediatek/mt76/dma.c | 26 +++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/mediatek/mt76/dma.c b/drivers/net/wireless/mediatek/mt76/dma.c index 844af16ee5513..d5649c52c669a 100644 --- a/drivers/net/wireless/mediatek/mt76/dma.c +++ b/drivers/net/wireless/mediatek/mt76/dma.c @@ -445,8 +445,32 @@ mt76_dma_get_buf(struct mt76_dev *dev, struct mt76_queue *q, int idx, if (mt76_queue_is_wed_rx(q)) { u32 token = FIELD_GET(MT_DMA_CTL_TOKEN, buf1); - struct mt76_txwi_cache *t = mt76_rx_token_release(dev, token); + struct mt76_txwi_cache *t; + bool found = false; + u32 id; + + if (*more) { + spin_lock_bh(&dev->rx_token_lock); + + idr_for_each_entry(&dev->rx_token, t, id) { + if (t->dma_addr == le32_to_cpu(desc->buf0)) { + token = id; + found = true; + + /* Write correct id back to DMA*/ + u32p_replace_bits(&buf1, id, + MT_DMA_CTL_TOKEN); + WRITE_ONCE(desc->buf1, cpu_to_le32(buf1)); + break; + } + } + + spin_unlock_bh(&dev->rx_token_lock); + if (!found) + return NULL; + } + t = mt76_rx_token_release(dev, token); if (!t) return NULL;