From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 8633317737E; Mon, 17 Jun 2024 13:25:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718630735; cv=none; b=aa3joEfwL74iC6pqamHlAva9+1qAcSYG1FS3BS1MAMS2knescbh5ENS+WkleugpP8XqHTtEVhoNmF5TpZjdQ3UhPmurLsAQDmZO0+zV9RWIJ3+SwY73mVmcDgb9MwlSmOK26Dk31GYPn6NXKRdA4QTPy3Lq5yUy6pPVWG+hTUQY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718630735; c=relaxed/simple; bh=iWE2UB15Ff60WGB6hHzzKXo7kY7WJ33e1jmtNvHU3Mc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=S05SbNPRr/RjrzmzqhiyVzDZ4loihpZ0hVsrhO2BM061/elBRUxAhMC5EvjwXwa+iKnVs3pQqGUTKSf70MXtbD/yZeV5s+tf5jAfGHe8LvsW4GAui1W2NSQd6MrpLud2i2hdvp02t5yJWDA3+ajuSLFftuFEuwS3nyH84EoXiY4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=s0xwZ52C; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="s0xwZ52C" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 42BADC4AF1D; Mon, 17 Jun 2024 13:25:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1718630735; bh=iWE2UB15Ff60WGB6hHzzKXo7kY7WJ33e1jmtNvHU3Mc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s0xwZ52CWvRgXPpyYOS+rpTfCBgZn8RDCV/sto4f/VzMgBjnpXLM18eplNH/zMChi 5rdAlfrR5mfsE4tK0DKhAcLpHJY72GvrEQqx+hB1sFPmbVHEDFZxTb9ucRw3d6GwEk 5MpgkaXN6t+B+BXmouTD5ml/RnJK6HmCNvRaiuf9+D8fc97TKwFJqJ0Wx72ssg9onN 7GkeJS+UeUdqYCySZrbOmHyhBNaP/+6RqDbIYGEaVPerRnjO4mXuBHp70kvDLf0S5j puIFeEKzzdZdm/ZK3AIwZI8iEWPMsaqjCH8Hmt65gIU4UwKKjEeeF3tUFztiW1pbtb P9Qi7d7hKQUSw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ilan Peer , Miri Korenblit , Johannes Berg , Sasha Levin , kvalo@kernel.org, ayala.beker@intel.com, gregory.greenman@intel.com, benjamin.berg@intel.com, linux-wireless@vger.kernel.org Subject: [PATCH AUTOSEL 6.1 18/29] wifi: iwlwifi: mvm: Fix scan abort handling with HW rfkill Date: Mon, 17 Jun 2024 09:24:22 -0400 Message-ID: <20240617132456.2588952-18-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240617132456.2588952-1-sashal@kernel.org> References: <20240617132456.2588952-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.94 Content-Transfer-Encoding: 8bit From: Ilan Peer [ Upstream commit e6dd2936ce7ce94a1915b799f8af8193ec628e87 ] When HW rfkill is toggled to disable the RF, the flow to stop scan is called. When trying to send the command to abort the scan, since HW rfkill is toggled, the command is not sent due to rfkill being asserted, and -ERFKILL is returned from iwl_trans_send_cmd(), but this is silently ignored in iwl_mvm_send_cmd() and thus the scan abort flow continues to wait for scan complete notification and fails. Since it fails, the UID to type mapping is not cleared, and thus a warning is later fired when trying to stop the interface. To fix this, modify the UMAC scan abort flow to force sending the scan abort command even when in rfkill, so stop the FW from accessing the radio etc. Signed-off-by: Ilan Peer Signed-off-by: Miri Korenblit Link: https://msgid.link/20240513132416.8cbe2f8c1a97.Iffe235c12a919dafec88eef399eb1f7bae2c5bdb@changeid Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c index 686a55515cdec..9bb8533874d8e 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c @@ -3057,10 +3057,11 @@ static int iwl_mvm_umac_scan_abort(struct iwl_mvm *mvm, int type) ret = iwl_mvm_send_cmd_pdu(mvm, WIDE_ID(IWL_ALWAYS_LONG_GROUP, SCAN_ABORT_UMAC), - 0, sizeof(cmd), &cmd); + CMD_SEND_IN_RFKILL, sizeof(cmd), &cmd); if (!ret) mvm->scan_uid_status[uid] = type << IWL_MVM_SCAN_STOPPING_SHIFT; + IWL_DEBUG_SCAN(mvm, "Scan abort: ret=%d\n", ret); return ret; } -- 2.43.0