Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19945dfb authored by Luciano Coelho's avatar Luciano Coelho Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: differentiate net-detect from sched scan 



Net-detect scans were using the same type as sched scan, which was
causing the driver to return -EBUSY and prevent the system from
suspending if there was an ongoing scheduled scan.  To avoid this, add
a new type for net-detect and don't stop anything when it is
requested, so that the existing scheduled scan will be resumed when
the system wakes up.

Signed-off-by: default avatarLuciano Coelho <luciano.coelho@intel.com>
Reviewed-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 6749dd80

drivers/net/wireless/iwlwifi/mvm/d3.c

+2 −1
Original line number Diff line number Diff line
@@ -981,7 +981,8 @@ iwl_mvm_netdetect_config(struct iwl_mvm *mvm, 
	if (ret)

		return ret;



	ret = iwl_mvm_sched_scan_start(mvm, vif, nd_config, &mvm->nd_ies);

	ret = iwl_mvm_sched_scan_start(mvm, vif, nd_config, &mvm->nd_ies,

				       IWL_MVM_SCAN_NETDETECT);

	if (ret)

		return ret;

drivers/net/wireless/iwlwifi/mvm/mac80211.c

+1 −1
Original line number Diff line number Diff line
@@ -2743,7 +2743,7 @@ static int iwl_mvm_mac_sched_scan_start(struct ieee80211_hw *hw, 
		goto out;

	}



	ret = iwl_mvm_sched_scan_start(mvm, vif, req, ies);

	ret = iwl_mvm_sched_scan_start(mvm, vif, req, ies, IWL_MVM_SCAN_SCHED);



out:

	mutex_unlock(&mvm->mutex);

drivers/net/wireless/iwlwifi/mvm/mvm.h

+6 −1
Original line number Diff line number Diff line
@@ -448,14 +448,18 @@ extern const u8 tid_to_mac80211_ac[]; 
enum iwl_scan_status {

	IWL_MVM_SCAN_REGULAR		= BIT(0),

	IWL_MVM_SCAN_SCHED		= BIT(1),

	IWL_MVM_SCAN_NETDETECT		= BIT(2),



	IWL_MVM_SCAN_STOPPING_REGULAR	= BIT(8),

	IWL_MVM_SCAN_STOPPING_SCHED	= BIT(9),

	IWL_MVM_SCAN_STOPPING_NETDETECT	= BIT(10),



	IWL_MVM_SCAN_REGULAR_MASK	= IWL_MVM_SCAN_REGULAR |

					  IWL_MVM_SCAN_STOPPING_REGULAR,

	IWL_MVM_SCAN_SCHED_MASK		= IWL_MVM_SCAN_SCHED |

					  IWL_MVM_SCAN_STOPPING_SCHED,

	IWL_MVM_SCAN_NETDETECT_MASK	= IWL_MVM_SCAN_NETDETECT |

					  IWL_MVM_SCAN_STOPPING_NETDETECT,



	IWL_MVM_SCAN_STOPPING_MASK	= 0xff00,

	IWL_MVM_SCAN_MASK		= 0x00ff,
@@ -1179,7 +1183,8 @@ int iwl_mvm_config_sched_scan_profiles(struct iwl_mvm *mvm, 
int iwl_mvm_sched_scan_start(struct iwl_mvm *mvm,

			     struct ieee80211_vif *vif,

			     struct cfg80211_sched_scan_request *req,

			     struct ieee80211_scan_ies *ies);

			     struct ieee80211_scan_ies *ies,

			     int type);

int iwl_mvm_scan_offload_stop(struct iwl_mvm *mvm, bool notify);

int iwl_mvm_rx_scan_offload_results(struct iwl_mvm *mvm,

				    struct iwl_rx_cmd_buffer *rxb,

drivers/net/wireless/iwlwifi/mvm/scan.c

+10 −2
Original line number Diff line number Diff line
@@ -1533,6 +1533,13 @@ static int iwl_mvm_check_running_scans(struct iwl_mvm *mvm, int type) 
		if (mvm->scan_status & IWL_MVM_SCAN_SCHED_MASK)

			return -EBUSY;

		return iwl_mvm_cancel_scan(mvm);

	case IWL_MVM_SCAN_NETDETECT:

		/* No need to stop anything for net-detect since the

		 * firmware is restarted anyway.  This way, any sched

		 * scans that were running will be restarted when we

		 * resume.

		*/

		return 0;

	default:

		WARN_ON(1);

		break;
@@ -1574,7 +1581,8 @@ int iwl_mvm_reg_scan_start(struct iwl_mvm *mvm, struct ieee80211_vif *vif, 
int iwl_mvm_sched_scan_start(struct iwl_mvm *mvm,

			     struct ieee80211_vif *vif,

			     struct cfg80211_sched_scan_request *req,

			     struct ieee80211_scan_ies *ies)

			     struct ieee80211_scan_ies *ies,

			     int type)

{

	int ret;
@@ -1585,7 +1593,7 @@ int iwl_mvm_sched_scan_start(struct iwl_mvm *mvm, 
		return -EBUSY;

	}



	ret = iwl_mvm_check_running_scans(mvm, IWL_MVM_SCAN_SCHED);

	ret = iwl_mvm_check_running_scans(mvm, type);

	if (ret)

		return ret;