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 18C533FF889 for ; Thu, 30 Apr 2026 16:31:38 +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=1777566699; cv=none; b=Zcl+Mw4icvuYjNKBJ5REwwwi1h4b8ZzVTaiflRsoR5VpJqWeEbFnXFBM+cjqhkadNhyZRuoB0yDQpw06lc72qwNJWxGoZZ7XUmkEh6pw6GcYSGNcSAz9KnxPzuv1NvcHy89oZl+TABKdh22Jyfwlz6L+zcAkcJMYLN02BGY4F4A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777566699; c=relaxed/simple; bh=sB1/Fyk0ezfhTQLVSlJPVS80twduh6MlmIVwTSMwnCU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ufcfyZx1QGk74FyEZLOPpz2O4PyX5y/ccU9QebdAs4vG4DFZfxzASAm5y2HzaUhqIdOgGWg8P2x2tgVtCt/+UCos3A1xmzBVWZhyj7IEfK0jK2QUYCQP/qgtCbqJfkp5TRiSi9BEAPy2EYGJpLjffKmtjuoC5OZkD9McKDtVW2I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=OhWbCF56; 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="OhWbCF56" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 58E60C2BCB8; Thu, 30 Apr 2026 16:31:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1777566698; bh=sB1/Fyk0ezfhTQLVSlJPVS80twduh6MlmIVwTSMwnCU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OhWbCF5657PWXVFicf+ZykYK9GPzFgqyfh4q+85E8TfBcUx31FiGDL/JnEW22YUD4 H1tQlAziSiXuKCLUVGPo4uAC7NIwX7CauvoPxspV/Ho6rfxzWQeJNb4evun18F9kqw LSBOFefcwMAQ9YjxFNPVje4VYgg6Ss70QlxOj2Qq5ZyZI1LK/QrRiXE1IdukNFT5UW W/MaV4Czvk0l1i+EZLCUC6IsNP/LqOuySVWLDdUDulp8V8j3GLUvhqmetbzfFvoyoC zMIeGxl7NpzBVcbHLJS8tAe96h3Cc8ENaM7H/VSeyk1JMco5Fua6PoBUy+XC3DsbC6 Wo5Ll5wZN4M2Q== From: Sasha Levin To: stable@vger.kernel.org Cc: Sean Wang , Felix Fietkau , Sasha Levin Subject: [PATCH 6.18.y 2/2] wifi: mt76: mt792x: fix mt7925u USB WFSYS reset handling Date: Thu, 30 Apr 2026 12:31:35 -0400 Message-ID: <20260430163135.1837241-2-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260430163135.1837241-1-sashal@kernel.org> References: <2026043041-eastcoast-antiques-377a@gregkh> <20260430163135.1837241-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 458cfd0260b13..b0c6dfa55cc68 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 7b1bee3c6605d..98d1d14342cd0 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