From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5E68D3CBE9C for ; Fri, 24 Jul 2026 17:21:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.43 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784913678; cv=none; b=S9D/4zwpgHrYXrFLvG237rJuLdI6gxygPbP64hQIFyw305DlWDMY6dnYSOTz+D9DccaKep2VfuOIU012GH16G3y/xuCSRHcybxzFdycWWFXoY8VipAcmP+YdAaDHLR4szz1r+Rk96xVEbwPbrVtHyvVwl3Z7MivaE1W3bXGzVHs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784913678; c=relaxed/simple; bh=7BDbAKtoQ7RrxeWP/mB6HB+l68yj4ywnLE1Pz644nHo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sFJ0oHwPJDb+ZkP2QT7G6UKqO2Hq7bgxc1UDCZFyfSndzRQdjRECvmhJo5wudGdr/d552HOZ9Rt1P8OgRAU/JgsiNIILgW4WQW02eacO40FzCCPagkjAfMzRjDND+qjdCUKSsukQUyO3r/J8j6a8H3pc57rLXk7mkehMN9grhqo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=nS2gFTuW; arc=none smtp.client-ip=209.85.216.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="nS2gFTuW" Received: by mail-pj1-f43.google.com with SMTP id 98e67ed59e1d1-38e3efab7e0so555567a91.0 for ; Fri, 24 Jul 2026 10:21:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784913674; x=1785518474; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=8CxrX6ndLjkzVoOvx8ReLw2F27C6sP51HDWvrcv3raA=; b=nS2gFTuWK+3MdzdNNwfBi1oqu+AtxrXhJgBHuqNWphT58jcau/BskAU+hQdN785qk+ 0Z8ZJssaljU4KQPp8iX0DkW3/cx6VInu3dpnYqHayx5eLtbI6Ja+zU7JSgrZgrC5qYO2 ojSrAwUO9O6Cce6iXfGJckYwl5ukHxKMjQAxA8jxnVmYRQLh82Q+E8AhtJurTIYeIctk WEIRAHyhURF0O/G/TXpLEYU4CPMDAyZMxTD/7yUDBPdcDjFs5eurxXbWy7tnL4LUzW9m sU1tdCc1nDS65M8vUOvS6Ts/sVCK16yV69/g2wL9I7yUyfRvlP7idZZBNJ6KkY4dm//t 09SQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784913674; x=1785518474; h=content-transfer-encoding:mime-version:references:in-reply-to :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=8CxrX6ndLjkzVoOvx8ReLw2F27C6sP51HDWvrcv3raA=; b=GT4dmgnacJ56T7XvupZ1wufbOGXshbh2Jxlinu/1AQq9fjoTsANZPuahXuSlz+tWFv 4kDl4ZYNKvsn3u9he5NW2WA31D+6vNFlkgE8zP9Z+yMwEWJX+gjOyR/9c7gk7Npt5/RO KQd7+SYQTZoB6MpNzgAQiOlSOB98ZO0CUA7d5HyIP6zsJX+Ahauk/YQ6wxT9piGVqbfS frN9HFUjGQEPkAFYg4VfdwDxtUkbKxnSlyPzbhArR4K3GQsA5RrixKgjZ4tG7N/7oyCI hrqOpC+AGQ/Ue/vvYBuAdrxQl8C6ar/bO5NDTN/TWoXdZHCGDGMK/VlZNbfPznzfyP+g aJZw== X-Forwarded-Encrypted: i=1; AHgh+RqY5tMNstR6pOgj3uOQpefl+DXzofCrmdYhDQGLSt2mRfjMuZxBIsBsqc6JTr9/58pMeaQtugyuFfEkG/Y=@vger.kernel.org X-Gm-Message-State: AOJu0YzdnMub9JGppHHfSnasZZ+mYfS9OyGZUoPI0YHExJr79uJEYElb GYOtSSLFiY2F+JDtgpBhUCeJYGYKRVymenM56Z/FlEu1RYuvbdc8kue4 X-Gm-Gg: AR+sD13hTUj9wdrscX66zbEO09fCHZV6/CP2pcbcayi5G76scZJj0wxzds8AM5CfFgZ Cul5NT+khrdT49XVVAA1tGGZq+SPB4vSPxyzQa/CLY6yw5znvkoyxb/UNqG9IVn9k3hARj6qP5q w4j+u8HMz3IGro90UJBRo2fL6A6DtBwV30Wgr2YU3VdWNtekDirL8BHHLVgGS7tlDsNn4jR+mHb gE3GA/Uz8TWZ6zAHgCa0T1pTCoEY8MwI0b9g2D1c9XZS15AJBtlBDYTk9AmbOnwKlz0vjQ9yutC /mhXOfRJg7mCeQZN5YkHRYKHVpg7AlW3rwirEi5s/JXqZn4yLaJVClINrSDSujl3HZLmcg1YWCA fD8cFzNvJVaYJl8j+KerIrTvLHg6Gc9Ump3kqkFeJW4YsSku40ntV3yXpxNcUYLjl0GyncFR7dw jJxZhK9eGd3nBHBldFxXcMA+jJRKpz1sZPOfNoicBF9z4= X-Received: by 2002:a17:90b:55c7:b0:38e:c232:9d2c with SMTP id 98e67ed59e1d1-38f1f9406damr954371a91.2.1784913673756; Fri, 24 Jul 2026 10:21:13 -0700 (PDT) Received: from DESKTOP-VNSSJ2S.lan (59-127-145-64.hinet-ip.hinet.net. [59.127.145.64]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-38f041d5f78sm1789907a91.17.2026.07.24.10.21.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2026 10:21:13 -0700 (PDT) From: Zhi-Jun You To: Felix Fietkau , Lorenzo Bianconi Cc: Andrew Lunn , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Matthias Brugger , AngeloGioacchino Del Regno , Sujuan Chen , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Zhi-Jun You Subject: [PATCH net v3 2/2] net:ethernet: mtk_wed: setup WDMA_RING_TX(0) for non-DBDC MT7986 Date: Sat, 25 Jul 2026 01:20:40 +0800 Message-ID: <20260724172040.1653-2-hujy652@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260724172040.1653-1-hujy652@gmail.com> References: <20260724172040.1653-1-hujy652@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit WDMA_RING_TX(0) is required to set MTK_WED_WDMA_RING_TX for WED RX but on a non-DBDC MT7986 it is never setup because idx is 1. Setting MTK_WED_WDMA_RING_TX with WDMA_RING_TX(1) is not feasible because WED still tries to send through WDMA_RING_TX(0). This is verified with register dump. Fix this by calling mtk_wed_wdma_tx_ring_setup if wed is v2 and rx_ring[0] is not allocated and reset tx_wdma[0] if it's already allocated. Fixes: 4c5de09eb0d0 ("net: ethernet: mtk_wed: add configure wed wo support") Signed-off-by: Zhi-Jun You --- Changes in v3: - no change - Link to v2: https://lore.kernel.org/r/20260711112128.971-1-hujy652@gmail.com Changes in v2: - Address warm reset concern raised by AI review. - Return value concern is skipped until further comment from reviewers. - Added a comment to explain this special case. - Link to v1: https://lore.kernel.org/r/20260630144831.1109-1-hujy652@gmail.com --- drivers/net/ethernet/mediatek/mtk_wed.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/net/ethernet/mediatek/mtk_wed.c b/drivers/net/ethernet/mediatek/mtk_wed.c index 7d2775a97fa0..b48abad995d7 100644 --- a/drivers/net/ethernet/mediatek/mtk_wed.c +++ b/drivers/net/ethernet/mediatek/mtk_wed.c @@ -2334,6 +2334,13 @@ mtk_wed_start(struct mtk_wed_device *dev, u32 irq_mask) if (!dev->rx_wdma[i].desc) mtk_wed_wdma_rx_ring_setup(dev, i, 16, false); + /* + * non-DBDC MT7986 allocates only rx_ring[1] and tx_wdma[1] during setup + * but tx_wdma[0] is also needed for WED to function. + */ + if (mtk_wed_is_v2(dev->hw) && !dev->rx_ring[0].desc) + mtk_wed_wdma_tx_ring_setup(dev, 0, MTK_WED_WDMA_RING_SIZE, !!dev->tx_wdma[0].desc); + if (dev->wlan.hw_rro) { for (i = 0; i < MTK_WED_RX_PAGE_QUEUES; i++) { u32 addr = MTK_WED_RRO_MSDU_PG_CTRL0(i) + -- 2.47.3