From patchwork Mon Feb 6 04:07:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wen Gong X-Patchwork-Id: 13129308 X-Patchwork-Delegate: kvalo@adurom.com 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 53445C05027 for ; Mon, 6 Feb 2023 04:08:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229566AbjBFEIU (ORCPT ); Sun, 5 Feb 2023 23:08:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51880 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229448AbjBFEIT (ORCPT ); Sun, 5 Feb 2023 23:08:19 -0500 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 545F310A86 for ; Sun, 5 Feb 2023 20:08:17 -0800 (PST) Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 31640AGt016873; Mon, 6 Feb 2023 04:07:56 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding : content-type; s=qcppdkim1; bh=10nzPa5P/bRTYJAi6IEL0gzHqQXdbzkmNu7cu58WREk=; b=ZLHTPy3fCBHPmQvmJy5Si8GPTyGMcuLpit40aTJDjqCAqnI/sQL85JxoEZ/PZ443pbVc XudvzLi4gnaPCvkoKxgW+Ii3OVXfRPGrMIDz15ElsP4X6nofIcO+gTh97lJgZ3EL4YBQ KLuQQMLm8pPa1ncbifrEtX/den8iJIAEMnBVydroD/DgQXlwCXZxrQEOXm+fgY7bQnj/ ZCdocCj0uct9chTn0Xb2Itc9gfjO2W8e5Ytm9ycN2QgZ62hnGOK6TRoG09KI8F7MhpPr DdHw9OscxpgCPDTBaXmzkyV4X/H1ubAH3V4ir3a2WeudNn76AMZfEclXdENyeoOHd25Y aA== Received: from nalasppmta02.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3nhfretq9y-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 06 Feb 2023 04:07:55 +0000 Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com [10.47.209.196]) by NALASPPMTA02.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 31647snW027611 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 6 Feb 2023 04:07:54 GMT Received: from wgong-HP3-Z230-SFF-Workstation.qca.qualcomm.com (10.80.80.8) by nalasex01a.na.qualcomm.com (10.47.209.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Sun, 5 Feb 2023 20:07:53 -0800 From: Wen Gong To: CC: , Subject: [PATCH v4] wifi: ath11k: change to set 11d state instead of start 11d scan while disconnect Date: Sun, 5 Feb 2023 23:07:39 -0500 Message-ID: <20230206040739.1290-1-quic_wgong@quicinc.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nalasex01a.na.qualcomm.com (10.47.209.196) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-ORIG-GUID: hBmHc1wGohmJi2GJUmm80fxJHAu4n8uB X-Proofpoint-GUID: hBmHc1wGohmJi2GJUmm80fxJHAu4n8uB X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-02-06_02,2023-02-03_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 lowpriorityscore=0 spamscore=0 clxscore=1015 impostorscore=0 mlxscore=0 malwarescore=0 priorityscore=1501 adultscore=0 mlxlogscore=999 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2302060036 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org When switch to connect to a new AP for station which is already connected to an AP, the time cost is too long, it arrives 10 seconds. The reason is when switch connection, disconnect operation happened on the 1st AP, then 11d scan start command sent to firmware, and then a new hw scan arrived for the 2nd AP. The 11d scan is running at this moment, so the hw scan can not start immediately, it needs to wait the 11d scan finished, it increased the time cost of switch AP and even happened scan fail as log below after apply the incoming patch. [ 1194.815104] ath11k_pci 0000:06:00.0: failed to start hw scan: -110 [ 1196.864157] ath11k_pci 0000:06:00.0: failed to start hw scan: -110 [ 1198.911926] ath11k_pci 0000:06:00.0: failed to start hw scan: -110 Change to set 11d state while disconnect, and the 11d scan will be started after the new hw scan in ath11k_mac_op_hw_scan(). Then the time cost of switching AP is small and not happened scan fail. Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3 Fixes: 9dcf6808b253 ("ath11k: add 11d scan offload support") Signed-off-by: Wen Gong --- v4: remove patch "[PATCH v3 2/2] wifi: ath11k: reduce the timeout value back for hw scan from 10 seconds to 1 second" v3: change code and log of "wifi: ath11k: reduce the timeout value back for hw scan from 10 seconds to 1 second" to handle the "failed to start hw scan: -110" correctly. v2: add "wifi: ath11k: change to set 11d state instead of start 11d scan while disconnect" drivers/net/wireless/ath/ath11k/mac.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) base-commit: c6d18be90f9b0c7fb64c6138b51c49151140fb57 diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c index 4218211afa30..b0c3cf258d12 100644 --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c @@ -7190,8 +7190,12 @@ ath11k_mac_op_unassign_vif_chanctx(struct ieee80211_hw *hw, ret); } - if (arvif->vdev_type == WMI_VDEV_TYPE_STA) - ath11k_mac_11d_scan_start(ar, arvif->vdev_id); + if (arvif->vdev_type == WMI_VDEV_TYPE_STA && + ar->state_11d != ATH11K_11D_PREPARING && + test_bit(WMI_TLV_SERVICE_11D_OFFLOAD, ab->wmi_ab.svc_map)) { + reinit_completion(&ar->completed_11d_scan); + ar->state_11d = ATH11K_11D_PREPARING; + } mutex_unlock(&ar->conf_mutex); }