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

Commit b1f47e3a authored by Thomas Pedersen's avatar Thomas Pedersen Committed by Kalle Valo
Browse files

ath6kl: rework scheduled scan 



This patch reflects changes in the firmware scheduled scan
implementation to behave better in cases with multiple concurrent vifs.
Major changes:

	- scheduled scan filters and state are now programmed per-vif.
	- decouple scheduled scan from host sleep.

To maintain graceful failure with old firmwares, a new firmware
capability bit is introduced: ATH6KL_FW_CAPABILITY_SCHED_SCAN_V2.
ath6kl simply won't advertise scheduled scan to cfg80211 if the
SCHED_SCAN_V2 is not supported.

Since firmwares from here on out won't support the previous implicit API
for scheduled scan (set WoW filters and host sleep), bump the firmware
API to protect old drivers.

Unfortunately, due to firmware RAM constraints ath6kl still cannot
expect a scan complete event at the end of a scheduled scan results
cycle, so the sched_scan_timer is retained.

Signed-off-by: default avatarThomas Pedersen <c_tpeder@qca.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent a3b3842c

drivers/net/wireless/ath/ath6kl/cfg80211.c

+7 −38
Original line number Diff line number Diff line
@@ -147,15 +147,11 @@ static bool __ath6kl_cfg80211_sscan_stop(struct ath6kl_vif *vif) 
{

	struct ath6kl *ar = vif->ar;



	if (ar->state != ATH6KL_STATE_SCHED_SCAN)

	if (!test_and_clear_bit(SCHED_SCANNING, &vif->flags))

		return false;



	del_timer_sync(&vif->sched_scan_timer);



	ath6kl_wmi_set_host_sleep_mode_cmd(ar->wmi, vif->fw_vif_idx,

					   ATH6KL_HOST_MODE_AWAKE);



	ar->state = ATH6KL_STATE_ON;

	ath6kl_wmi_enable_sched_scan_cmd(ar->wmi, vif->fw_vif_idx, false);



	return true;

}
@@ -2448,13 +2444,6 @@ int ath6kl_cfg80211_suspend(struct ath6kl *ar, 


		break;



	case ATH6KL_CFG_SUSPEND_SCHED_SCAN:

		/*

		 * Nothing needed for schedule scan, firmware is already in

		 * wow mode and sleeping most of the time.

		 */

		break;



	default:

		break;

	}
@@ -2502,9 +2491,6 @@ int ath6kl_cfg80211_resume(struct ath6kl *ar) 
		}

		break;



	case ATH6KL_STATE_SCHED_SCAN:

		break;



	default:

		break;

	}
@@ -3246,10 +3232,6 @@ static int ath6kl_cfg80211_sscan_start(struct wiphy *wiphy, 
	if (vif->sme_state != SME_DISCONNECTED)

		return -EBUSY;



	/* The FW currently can't support multi-vif WoW properly. */

	if (ar->num_vif > 1)

		return -EIO;



	ath6kl_cfg80211_scan_complete_event(vif, true);



	ret = ath6kl_set_probed_ssids(ar, vif, request->ssids,
@@ -3295,15 +3277,6 @@ static int ath6kl_cfg80211_sscan_start(struct wiphy *wiphy, 
				  interval, interval,

				  vif->bg_scan_period, 0, 0, 0, 3, 0, 0, 0);



	ret = ath6kl_wmi_set_wow_mode_cmd(ar->wmi, vif->fw_vif_idx,

					  ATH6KL_WOW_MODE_ENABLE,

					  WOW_FILTER_SSID,

					  WOW_HOST_REQ_DELAY);

	if (ret) {

		ath6kl_warn("Failed to enable wow with ssid filter: %d\n", ret);

		return ret;

	}



	/* this also clears IE in fw if it's not set */

	ret = ath6kl_wmi_set_appie_cmd(ar->wmi, vif->fw_vif_idx,

				       WMI_FRAME_PROBE_REQ,
@@ -3314,17 +3287,13 @@ static int ath6kl_cfg80211_sscan_start(struct wiphy *wiphy, 
		return ret;

	}



	ret = ath6kl_wmi_set_host_sleep_mode_cmd(ar->wmi, vif->fw_vif_idx,

						 ATH6KL_HOST_MODE_ASLEEP);

	if (ret) {

		ath6kl_warn("Failed to enable host sleep mode for sched scan: %d\n",

			    ret);

	ret = ath6kl_wmi_enable_sched_scan_cmd(ar->wmi, vif->fw_vif_idx, true);

	if (ret)

		return ret;

	}



	ar->state = ATH6KL_STATE_SCHED_SCAN;

	set_bit(SCHED_SCANNING, &vif->flags);



	return ret;

	return 0;

}



static int ath6kl_cfg80211_sscan_stop(struct wiphy *wiphy,
@@ -3763,7 +3732,7 @@ int ath6kl_cfg80211_init(struct ath6kl *ar) 
			    WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL |

			    WIPHY_FLAG_AP_PROBE_RESP_OFFLOAD;



	if (test_bit(ATH6KL_FW_CAPABILITY_SCHED_SCAN, ar->fw_capabilities))

	if (test_bit(ATH6KL_FW_CAPABILITY_SCHED_SCAN_V2, ar->fw_capabilities))

		ar->wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN;



	if (test_bit(ATH6KL_FW_CAPABILITY_INACTIVITY_TIMEOUT,

drivers/net/wireless/ath/ath6kl/cfg80211.h

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ enum ath6kl_cfg_suspend_mode { 
	ATH6KL_CFG_SUSPEND_DEEPSLEEP,

	ATH6KL_CFG_SUSPEND_CUTPOWER,

	ATH6KL_CFG_SUSPEND_WOW,

	ATH6KL_CFG_SUSPEND_SCHED_SCAN,

};



struct wireless_dev *ath6kl_interface_add(struct ath6kl *ar, const char *name,

drivers/net/wireless/ath/ath6kl/core.h

+5 −1
Original line number Diff line number Diff line
@@ -127,6 +127,9 @@ enum ath6kl_fw_capability { 
	/* supports WMI_SET_REGDOMAIN_CMDID command */

	ATH6KL_FW_CAPABILITY_REGDOMAIN,



	/* Firmware supports sched scan decoupled from host sleep */

	ATH6KL_FW_CAPABILITY_SCHED_SCAN_V2,



	/* this needs to be last */

	ATH6KL_FW_CAPABILITY_MAX,

};
@@ -145,6 +148,7 @@ enum ath6kl_hw_flags { 


#define ATH6KL_FW_API2_FILE "fw-2.bin"

#define ATH6KL_FW_API3_FILE "fw-3.bin"

#define ATH6KL_FW_API4_FILE "fw-4.bin"



/* AR6003 1.0 definitions */

#define AR6003_HW_1_0_VERSION                 0x300002ba
@@ -555,6 +559,7 @@ enum ath6kl_vif_state { 
	HOST_SLEEP_MODE_CMD_PROCESSED,

	NETDEV_MCAST_ALL_ON,

	NETDEV_MCAST_ALL_OFF,

	SCHED_SCANNING,

};



struct ath6kl_vif {
@@ -640,7 +645,6 @@ enum ath6kl_state { 
	ATH6KL_STATE_DEEPSLEEP,

	ATH6KL_STATE_CUTPOWER,

	ATH6KL_STATE_WOW,

	ATH6KL_STATE_SCHED_SCAN,

};



struct ath6kl {

drivers/net/wireless/ath/ath6kl/init.c

+6 −0
Original line number Diff line number Diff line
@@ -1108,6 +1108,12 @@ int ath6kl_init_fetch_firmwares(struct ath6kl *ar) 
	if (ret)

		return ret;



	ret = ath6kl_fetch_fw_apin(ar, ATH6KL_FW_API4_FILE);

	if (ret == 0) {

		ar->fw_api = 4;

		goto out;

	}



	ret = ath6kl_fetch_fw_apin(ar, ATH6KL_FW_API3_FILE);

	if (ret == 0) {

		ar->fw_api = 3;

drivers/net/wireless/ath/ath6kl/sdio.c

+0 −19
Original line number Diff line number Diff line
@@ -844,22 +844,6 @@ static int ath6kl_sdio_suspend(struct ath6kl *ar, struct cfg80211_wowlan *wow) 
	bool try_deepsleep = false;

	int ret;



	if (ar->state == ATH6KL_STATE_SCHED_SCAN) {

		ath6kl_dbg(ATH6KL_DBG_SUSPEND, "sched scan is in progress\n");



		ret = ath6kl_set_sdio_pm_caps(ar);

		if (ret)

			goto cut_pwr;



		ret =  ath6kl_cfg80211_suspend(ar,

					       ATH6KL_CFG_SUSPEND_SCHED_SCAN,

					       NULL);

		if (ret)

			goto cut_pwr;



		return 0;

	}



	if (ar->suspend_mode == WLAN_POWER_STATE_WOW ||

	    (!ar->suspend_mode && wow)) {
@@ -942,9 +926,6 @@ static int ath6kl_sdio_resume(struct ath6kl *ar) 
	case ATH6KL_STATE_WOW:

		break;



	case ATH6KL_STATE_SCHED_SCAN:

		break;



	case ATH6KL_STATE_SUSPENDING:

		break;