Merge "wil6210: support AOA in FTM session" (684c3f5a) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/net/wireless/ath/wil6210/ftm.c

+35 −6

Original line number	Diff line number	Diff line
		@@ -38,6 +38,9 @@
		/* initial token to use on non-secure FTM measurement */
		#define WIL_TOF_FTM_DEFAULT_INITIAL_TOKEN 2

		/* maximum AOA burst period, limited by FW */
		#define WIL_AOA_MAX_BURST_PERIOD 255

		#define WIL_TOF_FTM_MAX_LCI_LENGTH (240)
		#define WIL_TOF_FTM_MAX_LCR_LENGTH (240)

		@@ -62,6 +65,7 @@ nla_policy wil_nl80211_ftm_peer_policy[
		[QCA_WLAN_VENDOR_ATTR_FTM_PEER_MEAS_FLAGS] = { .type = NLA_U32 },
		[QCA_WLAN_VENDOR_ATTR_FTM_PEER_MEAS_PARAMS] = { .type = NLA_NESTED },
		[QCA_WLAN_VENDOR_ATTR_FTM_PEER_SECURE_TOKEN_ID] = { .type = NLA_U8 },
		[QCA_WLAN_VENDOR_ATTR_FTM_PEER_AOA_BURST_PERIOD] = { .type = NLA_U16 },
		[QCA_WLAN_VENDOR_ATTR_FTM_PEER_FREQ] = { .type = NLA_U32 },
		};

		@@ -315,8 +319,8 @@ wil_ftm_cfg80211_start_session(struct wil6210_priv *wil,
		struct wmi_tof_session_start_cmd *cmd;

		mutex_lock(&wil->ftm.lock);
		if (wil->ftm.session_started) {
		wil_err(wil, "FTM session already running\n");
		if (wil->ftm.session_started \|\| wil->ftm.aoa_started) {
		wil_err(wil, "FTM or AOA session already running\n");
		rc = -EAGAIN;
		goto out;
		}
		@@ -360,6 +364,7 @@ wil_ftm_cfg80211_start_session(struct wil6210_priv *wil,
		}

		cmd->session_id = cpu_to_le32(WIL_FTM_FW_SESSION_ID);
		cmd->aoa_type = request->aoa_type;
		cmd->num_of_dest = cpu_to_le16(request->n_peers);
		for (i = 0; i < request->n_peers; i++) {
		ether_addr_copy(cmd->ftm_dest_info[i].dst_mac,
		@@ -402,6 +407,8 @@ wil_ftm_cfg80211_start_session(struct wil6210_priv *wil,
		request->peers[i].params.burst_duration;
		cmd->ftm_dest_info[i].burst_period =
		cpu_to_le16(request->peers[i].params.burst_period);
		cmd->ftm_dest_info[i].num_burst_per_aoa_meas =
		request->peers[i].aoa_burst_period;
		}

		rc = wmi_send(wil, WMI_TOF_SESSION_START_CMDID, cmd, cmd_len);
		@@ -487,8 +494,8 @@ wil_aoa_cfg80211_start_measurement(struct wil6210_priv *wil,

		mutex_lock(&wil->ftm.lock);

		if (wil->ftm.aoa_started) {
		wil_err(wil, "AOA measurement already running\n");
		if (wil->ftm.aoa_started \|\| wil->ftm.session_started) {
		wil_err(wil, "AOA or FTM measurement already running\n");
		rc = -EAGAIN;
		goto out;
		}
		@@ -529,8 +536,8 @@ void wil_aoa_cfg80211_meas_result(struct wil6210_priv *wil,

		mutex_lock(&wil->ftm.lock);

		if (!wil->ftm.aoa_started) {
		wil_info(wil, "AOA not started, not sending result\n");
		if (!wil->ftm.aoa_started && !wil->ftm.session_started) {
		wil_info(wil, "AOA/FTM not started, not sending result\n");
		goto out;
		}

		@@ -758,6 +765,7 @@ int wil_ftm_start_session(struct wiphy wiphy, struct wireless_dev wdev,
		struct nlattr *tb2[QCA_WLAN_VENDOR_ATTR_FTM_PEER_MAX + 1];
		struct nlattr *peer;
		int rc, n_peers = 0, index = 0, tmp;
		u32 aoa_type = 0;

		if (!test_bit(WMI_FW_CAPABILITY_FTM, wil->fw_capabilities))
		return -ENOTSUPP;
		@@ -779,6 +787,14 @@ int wil_ftm_start_session(struct wiphy wiphy, struct wireless_dev wdev,
		return -EINVAL;
		}

		if (tb[QCA_WLAN_VENDOR_ATTR_AOA_TYPE]) {
		aoa_type = nla_get_u32(tb[QCA_WLAN_VENDOR_ATTR_AOA_TYPE]);
		if (aoa_type >= QCA_WLAN_VENDOR_ATTR_AOA_TYPE_MAX) {
		wil_err(wil, "invalid AOA type: %d\n", aoa_type);
		return -EINVAL;
		}
		}

		nla_for_each_nested(peer, tb[QCA_WLAN_VENDOR_ATTR_FTM_MEAS_PEERS],
		tmp)
		n_peers++;
		@@ -802,6 +818,7 @@ int wil_ftm_start_session(struct wiphy wiphy, struct wireless_dev wdev,

		request->session_cookie =
		nla_get_u64(tb[QCA_WLAN_VENDOR_ATTR_FTM_SESSION_COOKIE]);
		request->aoa_type = aoa_type;
		request->n_peers = n_peers;
		nla_for_each_nested(peer, tb[QCA_WLAN_VENDOR_ATTR_FTM_MEAS_PEERS],
		tmp) {
		@@ -830,6 +847,18 @@ int wil_ftm_start_session(struct wiphy wiphy, struct wireless_dev wdev,
		if (tb2[QCA_WLAN_VENDOR_ATTR_FTM_PEER_SECURE_TOKEN_ID])
		request->peers[index].secure_token_id = nla_get_u8(
		tb2[QCA_WLAN_VENDOR_ATTR_FTM_PEER_SECURE_TOKEN_ID]);
		if (tb2[QCA_WLAN_VENDOR_ATTR_FTM_PEER_AOA_BURST_PERIOD]) {
		request->peers[index].aoa_burst_period = nla_get_u16(
		tb2[QCA_WLAN_VENDOR_ATTR_FTM_PEER_AOA_BURST_PERIOD]);
		if (request->peers[index].aoa_burst_period >
		WIL_AOA_MAX_BURST_PERIOD) {
		wil_err(wil, "Invalid AOA burst period at index: %d\n",
		index);
		rc = -EINVAL;
		goto out;
		}
		}

		rc = wil_ftm_parse_meas_params(
		wil,
		tb2[QCA_WLAN_VENDOR_ATTR_FTM_PEER_MEAS_PARAMS],

drivers/net/wireless/ath/wil6210/ftm.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -437,12 +437,14 @@ struct wil_ftm_meas_peer_info {
		u32 flags; /* enum qca_wlan_vendor_attr_ftm_peer_meas_flags */
		struct wil_ftm_meas_params params;
		u8 secure_token_id;
		u16 aoa_burst_period; /* 0 if no AOA, >0 every <value> bursts */
		};

		/* session request, passed to wil_ftm_cfg80211_start_session */
		struct wil_ftm_session_request {
		u64 session_cookie;
		u32 n_peers;
		u32 aoa_type; /* enum qca_wlan_vendor_attr_aoa_type */
		/* keep last, variable size according to n_peers */
		struct wil_ftm_meas_peer_info peers[0];
		};