From patchwork Thu Aug 4 00:26:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Wang X-Patchwork-Id: 12935967 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 5E4EAC19F29 for ; Thu, 4 Aug 2022 00:57:31 +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:Content-Type:MIME-Version: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=R9vQaTbFgf2QHP/SuzUhXyOllvBN7Q9RSo8Iw6XoAEo=; b=jthChaHSqyBlSE6TlMUfQbSh+q xiACLv4s+zO1R/fYDTnzoaMbDan5qdXsNQG9w/YJwBUm0Aq5H3XjINJT9No/PZwP7S31lHFXuaim/ 0ZWOkrJ1CB4c0+K6igeguChQPv3FaCe8hafhsnACtTn59OzupH18gY5OWo99U3YE2O7F1hi/jN0JX cX/9GOaMxHAEbJWSUDY93044PuqqVaebvifP/Ta26b0/nqOeZqGIKQvV1KbzxzR2XGpnZQw3xE6uW gR3SGUZHRjHHDR2VSC/W+TkZ+/j2hdc9TdhB2Ab4xjhXN3Ip4EmVHK84ocXdV0bDrvRVPZkmfaqIC 1F8c/SWQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oJPAx-00CV1x-Lk; Thu, 04 Aug 2022 00:57:23 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oJPAu-00CUvE-Rb for linux-mediatek@lists.infradead.org; Thu, 04 Aug 2022 00:57:22 +0000 X-UUID: b5140b48e86e4d769779bd03c0de8743-20220803 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.8,REQID:e35b8d28-6ec9-4e57-a322-8f8f344c5208,OB:0,LO B:0,IP:0,URL:5,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,RULE:Release_Ham,ACTI ON:release,TS:5 X-CID-META: VersionHash:0f94e32,CLOUDID:1ba029d1-841b-4e95-ad42-8f86e18f54fc,C OID:IGNORED,Recheck:0,SF:nil,TC:nil,Content:0,EDM:-3,IP:nil,URL:1,File:nil ,QS:nil,BEC:nil,COL:0 X-UUID: b5140b48e86e4d769779bd03c0de8743-20220803 Received: from mtkmbs11n1.mediatek.inc [(172.21.101.185)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 671235535; Wed, 03 Aug 2022 17:57:10 -0700 Received: from mtkmbs11n2.mediatek.inc (172.21.101.187) by mtkmbs10n2.mediatek.inc (172.21.101.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.792.3; Thu, 4 Aug 2022 08:26:33 +0800 Received: from mtkswgap22.mediatek.inc (172.21.77.33) by mtkmbs11n2.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.792.15 via Frontend Transport; Thu, 4 Aug 2022 08:26:33 +0800 From: To: , CC: , , , , , , , , , , , , , , , , , , , , , , , Subject: [PATCH] mt76: mt7921: apply the previous MCU timeout Date: Thu, 4 Aug 2022 08:26:31 +0800 Message-ID: X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220803_175720_936132_993DA666 X-CRM114-Status: GOOD ( 10.20 ) 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 From: Sean Wang Apply back the previous MCU timeout that can trigger the chip reset to recover the fatal error in time. Fixes: 8fcd1fb7cbd5 ("mt76: move mt76_connac2_mcu_fill_message in mt76_connac module") Signed-off-by: Sean Wang --- drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c index 0afcadce87fc..da8223c515eb 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c @@ -3050,7 +3050,10 @@ int mt76_connac2_mcu_fill_message(struct mt76_dev *dev, struct sk_buff *skb, u8 seq; /* TODO: make dynamic based on msg type */ - dev->mcu.timeout = 20 * HZ; + if (is_mt7921(dev)) + dev->mcu.timeout = 3 * HZ; + else + dev->mcu.timeout = 20 * HZ; seq = ++dev->mcu.msg_seq & 0xf; if (!seq)