From patchwork Tue Mar 11 10:36:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Fietkau X-Patchwork-Id: 14011484 X-Patchwork-Delegate: nbd@nbd.name Received: from nbd.name (nbd.name [46.4.11.11]) (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 5C61C1EDA3A for ; Tue, 11 Mar 2025 10:36:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.4.11.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741689411; cv=none; b=Mz3bFagpf7R05fXuuWCRa6U0mKwYg2LYFtCV9JpIHQkUvdUbnumxK35SB7huMQkjSBYOG6qrLMqYf75+H9PyC7H/GymUZZGOS/OV5HZhRyn5btInQcMGOSl1SSpP3lxyZ2mwuJOEWu9U/T1RwasMB1j25gsSINRtQz1Vznrvr1A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741689411; c=relaxed/simple; bh=dSX4d1EeNUTLLDYI9ddhR0ASfkx7HGwlLNnzcfAdQng=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WC9R0E4DPekQRIZn7+GBhNjGEhZ2XNXbM9aHs7XXgQ3B3DTYgyG9pRkhQpU9moEQ5gosgMXzfqYt2RlZwehkCucA/PCKkLtYz81LA85E8DNWRzJYEKdFgOL6+H8Q6NPdekQahAwqfS4W5QmRgl1bSRlwalA61poJ8rMAS2dX6Vo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nbd.name; spf=none smtp.mailfrom=nbd.name; dkim=pass (1024-bit key) header.d=nbd.name header.i=@nbd.name header.b=WxEpu0Kl; arc=none smtp.client-ip=46.4.11.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nbd.name Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=nbd.name Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=nbd.name header.i=@nbd.name header.b="WxEpu0Kl" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=nbd.name; s=20160729; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=oLaZvO9DxVzsN1sEUz8kiDYT+pGndG6HZEeNimvJtbQ=; b=WxEpu0KlbhW0GPTcavf1+Fcc2w SrX3EEOZCWgvqL77rV3xzk+ZtGyqseo7RF+Ui9leBVUh38xX7thTURBAfm9zhzFDOfRDGESxJaxE/ 5ZVwLImMixCVE/dwlBPe7Vi42AuKHuaTDrN8GrJcV3P5xkkhLYzYMxoiop3Ne4ECxkgs=; Received: from p5b206ef1.dip0.t-ipconnect.de ([91.32.110.241] helo=Maecks.lan) by ds12 with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256 (Exim 4.96) (envelope-from ) id 1trwyc-00Ftvh-2R for linux-wireless@vger.kernel.org; Tue, 11 Mar 2025 11:36:46 +0100 From: Felix Fietkau To: linux-wireless@vger.kernel.org Subject: [PATCH 2/8] wifi: mt76: mt7996: fix SER reset trigger on WED reset Date: Tue, 11 Mar 2025 11:36:39 +0100 Message-ID: <20250311103646.43346-2-nbd@nbd.name> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250311103646.43346-1-nbd@nbd.name> References: <20250311103646.43346-1-nbd@nbd.name> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Rex Lu The firmware needs a specific trigger when WED is being reset due to an ethernet reset condition. This helps prevent further L1 SER failure. Signed-off-by: Rex Lu Signed-off-by: Felix Fietkau --- drivers/net/wireless/mediatek/mt76/mt7996/mcu.h | 3 ++- drivers/net/wireless/mediatek/mt76/mt7996/mmio.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.h b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.h index bd1ba00e1bc6..5fdc47dad28c 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.h +++ b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.h @@ -896,7 +896,8 @@ enum { UNI_CMD_SER_SET_RECOVER_L3_TX_DISABLE, UNI_CMD_SER_SET_RECOVER_L3_BF, UNI_CMD_SER_SET_RECOVER_L4_MDP, - UNI_CMD_SER_SET_RECOVER_FULL, + UNI_CMD_SER_SET_RECOVER_FROM_ETH, + UNI_CMD_SER_SET_RECOVER_FULL = 8, UNI_CMD_SER_SET_SYSTEM_ASSERT, /* action */ UNI_CMD_SER_ENABLE = 1, diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mmio.c b/drivers/net/wireless/mediatek/mt76/mt7996/mmio.c index 7a8ee6c75cf2..9d37f8238746 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7996/mmio.c +++ b/drivers/net/wireless/mediatek/mt76/mt7996/mmio.c @@ -281,7 +281,7 @@ static int mt7996_mmio_wed_reset(struct mtk_wed_device *wed) if (test_and_set_bit(MT76_STATE_WED_RESET, &mphy->state)) return -EBUSY; - ret = mt7996_mcu_set_ser(dev, UNI_CMD_SER_TRIGGER, UNI_CMD_SER_SET_RECOVER_L1, + ret = mt7996_mcu_set_ser(dev, UNI_CMD_SER_TRIGGER, UNI_CMD_SER_SET_RECOVER_FROM_ETH, mphy->band_idx); if (ret) goto out;