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 41D35428466 for ; Thu, 30 Apr 2026 16:07:31 +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=1777565251; cv=none; b=Ei++P6JREhnEJnxmiJIJAzgk2F4Tw3Gl4Wj9fz/F52v1Tn3BY0cbCRzYa0AVkwDZY+Fc+r+s0lcnGkVohddhuMDMAI50TvE8EbRiSLAAnp4iDwG6MvS5hsoEGjI+BL0jDYlmix4t/duOGRwl9GbMj5gXCji5bM46wP+EHBNNE1w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777565251; c=relaxed/simple; bh=FEarw4/rwkNz+s1OYdLoR6lyZ1ELg77WfP/MNl6XbLg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MwwnmyhVSDDVkI7ExeCidcCVWcufvZDBD0VjVtOR7YnXMEXTUGP+i9/jAAg59LvCjeCjIH+SHtpAf5bXmgy2rFxUYBlaDwaAdEr3CY7/NRgF5ivzlAcv+eLATudaMh6rb3Zg2q78XmDGX0gREb1hWvuV/ET3wDHIJgV2ucmykLU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=QiJCWkzH; 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="QiJCWkzH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9C752C2BCB8; Thu, 30 Apr 2026 16:07:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1777565251; bh=FEarw4/rwkNz+s1OYdLoR6lyZ1ELg77WfP/MNl6XbLg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QiJCWkzHuAI8QjPY6OjL/fvRzeC5HOvGTvGxSMnIMlSB1FqdDJ4uHaODn3Gvw5oDR SSlDYHr4zGZxbH8vZSo49e8/alLKWCO8y2ruNNjfwxsVtw0eJIT6yBW9FZ3Xg1SV4l jlfWRLkzI0JBle1ddpE/JZDNODQIdzqwulM4e6krdC0LkT9oh2wwQhej8L+cWTN0tZ fGY+0MiMWpiytQUMGNaMXN2pRUlJOz7mgFDqKvvp4zisxbWowK/f7f6elheEc+cdRA s9SobdKbPVtXhQV4SP38/xEfFpIi8oeEJZ4EVpDgaZ7KR3JrBPCXCWHTaKazbtAqdE EW0sVyrhzwxNA== From: Sasha Levin To: stable@vger.kernel.org Cc: Sean Wang , Felix Fietkau , Sasha Levin Subject: [PATCH 7.0.y 2/2] wifi: mt76: mt792x: fix mt7925u USB WFSYS reset handling Date: Thu, 30 Apr 2026 12:07:22 -0400 Message-ID: <20260430160722.1784926-2-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260430160722.1784926-1-sashal@kernel.org> References: <2026043040-tissue-nuptials-8136@gregkh> <20260430160722.1784926-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Sean Wang [ Upstream commit 56154fef47d104effa9f29ed3db4f805cbc0d640 ] mt7925u uses different reset/status registers from mt7921u. Reusing the mt7921u register set causes the WFSYS reset to fail. Add a chip-specific descriptor in mt792xu_wfsys_reset() to select the correct registers and fix mt7925u failing to initialize after a warm reboot. Fixes: d28e1a48952e ("wifi: mt76: mt792x: introduce mt792x-usb module") Cc: stable@vger.kernel.org Signed-off-by: Sean Wang Link: https://patch.msgid.link/20260311002825.15502-2-sean.wang@kernel.org Signed-off-by: Felix Fietkau Signed-off-by: Sasha Levin --- drivers/net/wireless/mediatek/mt76/mt792x_regs.h | 4 ++++ drivers/net/wireless/mediatek/mt76/mt792x_usb.c | 13 ++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt792x_regs.h b/drivers/net/wireless/mediatek/mt76/mt792x_regs.h index acf627aed609d..699a15c44df02 100644 --- a/drivers/net/wireless/mediatek/mt76/mt792x_regs.h +++ b/drivers/net/wireless/mediatek/mt76/mt792x_regs.h @@ -390,6 +390,10 @@ #define MT_CBTOP_RGU_WF_SUBSYS_RST MT_CBTOP_RGU(0x600) #define MT_CBTOP_RGU_WF_SUBSYS_RST_WF_WHOLE_PATH BIT(0) +#define MT7925_CBTOP_RGU_WF_SUBSYS_RST 0x70028600 +#define MT7925_WFSYS_INIT_DONE_ADDR 0x184c1604 +#define MT7925_WFSYS_INIT_DONE 0x00001d1e + #define MT_HW_BOUND 0x70010020 #define MT_HW_CHIPID 0x70010200 #define MT_HW_REV 0x70010204 diff --git a/drivers/net/wireless/mediatek/mt76/mt792x_usb.c b/drivers/net/wireless/mediatek/mt76/mt792x_usb.c index a92e872226cfe..47827d1c5ccb1 100644 --- a/drivers/net/wireless/mediatek/mt76/mt792x_usb.c +++ b/drivers/net/wireless/mediatek/mt76/mt792x_usb.c @@ -224,6 +224,15 @@ static const struct mt792xu_wfsys_desc mt7921_wfsys_desc = { .need_status_sel = true, }; +static const struct mt792xu_wfsys_desc mt7925_wfsys_desc = { + .rst_reg = MT7925_CBTOP_RGU_WF_SUBSYS_RST, + .done_reg = MT7925_WFSYS_INIT_DONE_ADDR, + .done_mask = U32_MAX, + .done_val = MT7925_WFSYS_INIT_DONE, + .delay_ms = 20, + .need_status_sel = false, +}; + int mt792xu_dma_init(struct mt792x_dev *dev, bool resume) { int err; @@ -254,7 +263,9 @@ EXPORT_SYMBOL_GPL(mt792xu_dma_init); int mt792xu_wfsys_reset(struct mt792x_dev *dev) { - const struct mt792xu_wfsys_desc *desc = &mt7921_wfsys_desc; + const struct mt792xu_wfsys_desc *desc = is_mt7925(&dev->mt76) ? + &mt7925_wfsys_desc : + &mt7921_wfsys_desc; u32 val; int i; -- 2.53.0