Received: by 2002:a05:6a10:17d3:0:0:0:0 with SMTP id hz19csp788846pxb; Thu, 15 Apr 2021 06:42:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw05HD0TlTTA3Ylbj07Pdfw8kI5kaFiLwm2cAidN6qMf2K7kiDdwfqnvyJu26K3iHcGCeQB X-Received: by 2002:a63:2404:: with SMTP id k4mr3505682pgk.381.1618494137240; Thu, 15 Apr 2021 06:42:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618494137; cv=none; d=google.com; s=arc-20160816; b=Rk8U24DwAB+NXZ0P8ayB1DqomS/IEl/p2cjfsfsvsD+rYee7pKHoy30GCGed7JAGxV CVMC8P9YsSBE6BaACBPiKgyVvsBw+rrW0hdbCCOGWib7JrmH0po3b5GSMmpgUvRSzu0n ae4txu5X8i4vvEH43l6Mz0/GbCiV9KB0py/fUpvmFRIdpNgruUFsMaDdnC1ociX+7vQn y0TEwDpDCJR0jcxt/HeAw6sjZ57b55IfSkt9q2evrATe52vZoW3lnkeNiQRSMYs0WjpW 2gT2Zc0H/WOe7ynQ2k0luGDrUHzR2QDB4mmM38WrFBKDKhFSy0mpfMDNnMDo2g2yT5xf raWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from; bh=NBJ6xXNA3oyYlJG7Ay4hZ78SWccaigRZHk9clLDiGFc=; b=exV1/mdgMDfB87Wqmli+ZbAuUz5hfMDvR2ZEX4XlHwaWidwbKjokXWW5FqUr+NNpa4 FQnzqEa+LWad2JgK5i2LT21BrxMRJ9l4WkoLNWkoVnqbRiyTGNmgOeJlfkCOZ7qvpCvV zHl7f+BB0fg94rOMdGYGOmG/w+YcPYeO3mNvEgcBTaabj7m9dqa3PC/yU2FaWDCjVLXZ q6Qa0JppXvB4RoRpKf+4tpjvJUXROrmTNdeVLdEjq6L8L4bS3pKwUWtz6+oNVaaiyL1H Vu58IWa1L+mSPhde7msmBjpV3YayyZ0DZhAtEertW60rT9dIzN+qudtcgC857e5/p68N 5fTA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mediatek.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id o22si3240155pll.352.2021.04.15.06.41.58; Thu, 15 Apr 2021 06:42:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mediatek.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233136AbhDONmP (ORCPT + 99 others); Thu, 15 Apr 2021 09:42:15 -0400 Received: from mailgw01.mediatek.com ([210.61.82.183]:58835 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S232795AbhDONmO (ORCPT ); Thu, 15 Apr 2021 09:42:14 -0400 X-UUID: ce74301250ce4b03b59d43ad9619cc96-20210415 X-UUID: ce74301250ce4b03b59d43ad9619cc96-20210415 Received: from mtkmbs10n1.mediatek.inc [(172.21.101.34)] by mailgw01.mediatek.com (envelope-from ) (Cellopoint E-mail Firewall v4.1.14 Build 0819 with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1957360891; Thu, 15 Apr 2021 21:41:49 +0800 Received: from mtkcas11.mediatek.inc (172.21.101.40) by mtkmbs06n2.mediatek.inc (172.21.101.130) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 15 Apr 2021 21:41:46 +0800 Received: from mtkswgap22.mediatek.inc (172.21.77.33) by mtkcas11.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Thu, 15 Apr 2021 21:41:46 +0800 From: To: , CC: , , , , , , , , , Subject: [PATCH 2/2] mt76: mt7921: abort uncompleted scan by wifi reset Date: Thu, 15 Apr 2021 21:41:45 +0800 Message-ID: <1618494105-5462-2-git-send-email-sean.wang@mediatek.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1618494105-5462-1-git-send-email-sean.wang@mediatek.com> References: <1618494105-5462-1-git-send-email-sean.wang@mediatek.com> MIME-Version: 1.0 Content-Type: text/plain X-TM-SNTS-SMTP: 1BE1986FC84855AB1F926A97F52A7D3E2F4FF6FC6031C2B8B5F8008F5C18C4212000:8 X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Sean Wang Scan abort should be required for the uncompleted hardware scan interrupted by wifi reset. Otherwise, it is possible that the scan request after wifi reset gets error code -EBUSY from mac80211 and then blocks the reconnectting to the access point. Fixes: 215bb6737bef ("mt76: mt7921: add wifi reset support") Signed-off-by: Sean Wang --- drivers/net/wireless/mediatek/mt76/mt7921/mac.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c index 572bab82315a..3145880df6e7 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c @@ -1413,6 +1413,14 @@ void mt7921_mac_reset_work(struct work_struct *work) if (i == 10) dev_err(dev->mt76.dev, "chip reset failed\n"); + if (test_and_clear_bit(MT76_HW_SCANNING, &dev->mphy.state)) { + struct cfg80211_scan_info info = { + .aborted = true, + }; + + ieee80211_scan_completed(dev->mphy.hw, &info); + } + ieee80211_wake_queues(hw); ieee80211_iterate_active_interfaces(hw, IEEE80211_IFACE_ITER_RESUME_ALL, -- 2.25.1