Received: by 2002:a05:6a10:17d3:0:0:0:0 with SMTP id hz19csp441921pxb; Fri, 16 Apr 2021 09:14:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzfHdILkAgU5uuaUpWKHfVyqPg7TwZUBeOTEnLx1MUr0ec0wBOIczSZxNdb6wytsgsDiamI X-Received: by 2002:a17:907:2a45:: with SMTP id fe5mr8986335ejc.455.1618589692352; Fri, 16 Apr 2021 09:14:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618589692; cv=none; d=google.com; s=arc-20160816; b=qLzey66jAgb+ZWp9DMap0pPY8waJW47j1qs5g0nZO6GePC+KIodH8xkFC7CrQMQpNr DO2aBYp3i4DdcMeZmk81Lo3VOQ2XL44Ke+h0aUPInpyYIUr53Mkh74ChEYMJlCIWmNnU OS8tx51aTTgn3D+GUfBDWzvStfcklyp+m34mkEjaxPmrz5mmWaSn1L0yD3qr1deN7pVy phBAOehD6m1a6zFtd95YDPcavegCe7/0c7GO+o/ptNUmQsskYFpyDF3QmNuaAf3XHaFL K6mpUjyQ11qxvjOrsH8I6RmnrZv2jg/mZS5UfuhK3CmyewNIBDBuIK2dH01euPUmy7Hp DjOQ== 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=SNl0bWmEfLsbKk6TizQpYymId7UuEL/twlYD/OE1960=; b=k7U2lM4SrBa6hPscZOcetcqcb5BGrIhd/VUOba8ACchND7Ao3upinmtRZzM1eWZN0g 3eQESHqvUhYG9nKT0nO9QPUTdLsx720t8wHXBQz9SMpDDAf1f1G3MeK4Cjft6SqYks2m qoF2U7sqTmPc4uNZwB3h8+zzwt1HnrPyXqWJoe0Hi8Tj0RrNgiblqkufQErF63xFbwZ7 RvovV3k2+KlqJ+qR6+1kaLyCqkA+Cq8ezq0f4Y9T9Oqr6sIHRNvBZBuzUA3tPhXxpen7 gtl5/Vb5fAwHqrki+ScIDARpm5U7p+P8dgYQyf5IMaw0hZgPkwuxBeVw2OBGfpbP9YfK w4vQ== 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 s18si5448585ejd.15.2021.04.16.09.14.22; Fri, 16 Apr 2021 09:14:52 -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 S1343711AbhDPPbH (ORCPT + 99 others); Fri, 16 Apr 2021 11:31:07 -0400 Received: from mailgw01.mediatek.com ([210.61.82.183]:35305 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S235540AbhDPPbH (ORCPT ); Fri, 16 Apr 2021 11:31:07 -0400 X-UUID: 99dcbcbaa1f74beaaabae0e5ddfcb9c0-20210416 X-UUID: 99dcbcbaa1f74beaaabae0e5ddfcb9c0-20210416 Received: from mtkcas07.mediatek.inc [(172.21.101.84)] by mailgw01.mediatek.com (envelope-from ) (Cellopoint E-mail Firewall v4.1.14 Build 0819 with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1112333094; Fri, 16 Apr 2021 23:30:39 +0800 Received: from mtkcas10.mediatek.inc (172.21.101.39) by mtkmbs02n1.mediatek.inc (172.21.101.77) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 16 Apr 2021 23:30:37 +0800 Received: from mtkswgap22.mediatek.inc (172.21.77.33) by mtkcas10.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Fri, 16 Apr 2021 23:30:37 +0800 From: To: , CC: , , , , , , , , , Subject: [PATCH v2 2/2] mt76: mt7921: abort uncompleted scan by wifi reset Date: Fri, 16 Apr 2021 23:30:36 +0800 Message-ID: <1618587036-17143-2-git-send-email-sean.wang@mediatek.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1618587036-17143-1-git-send-email-sean.wang@mediatek.com> References: <1618587036-17143-1-git-send-email-sean.wang@mediatek.com> MIME-Version: 1.0 Content-Type: text/plain 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 --- v2: no change --- 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