wifi: iwlwifi: mvm: add support for version 10 of the responder config command

This version adds the band to the responder config command.

Signed-off-by: Avraham Stern <avraham.stern@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20240527190228.af09129ebd74.I9356e2504a4c19961d4856494416ae49b36bfe62@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/location.h b/drivers/net/wireless/intel/iwlwifi/fw/api/location.h
index c20bb289a6233648a77c8fedf4c14e88b61ae50f..7c158a8dfed03ffcffe9dac52e3605af2c7e9f34 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/location.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/location.h
@@ -391,6 +391,58 @@ struct iwl_tof_responder_config_cmd_v9 {
        __le16 max_time_between_msr;
 } __packed; /* TOF_RESPONDER_CONFIG_CMD_API_S_VER_8 */
 
+/**
+ * struct iwl_tof_responder_config_cmd - ToF AP mode
+ * @cmd_valid_fields: &iwl_tof_responder_cmd_valid_field
+ * @responder_cfg_flags: &iwl_tof_responder_cfg_flags
+ * @format_bw: bits 0 - 3: &enum iwl_location_frame_format.
+ *             bits 4 - 7: &enum iwl_location_bw.
+ * @bss_color: current AP bss_color
+ * @channel_num: current AP Channel
+ * @ctrl_ch_position: coding of the control channel position relative to
+ *     the center frequency, see iwl_mvm_get_ctrl_pos()
+ * @sta_id: index of the AP STA when in AP mode
+ * @band: current AP band
+ * @toa_offset: Artificial addition [pSec] for the ToA - to be used for debug
+ *     purposes, simulating station movement by adding various values
+ *     to this field
+ * @common_calib: XVT: common calibration value
+ * @specific_calib: XVT: specific calibration value
+ * @bssid: Current AP BSSID
+ * @r2i_ndp_params: parameters for R2I NDP.
+ *     bits 0 - 2: max number of LTF repetitions
+ *     bits 3 - 5: max number of spatial streams (supported values are < 2)
+ *     bits 6 - 7: max number of total LTFs see
+ *     &enum ieee80211_range_params_max_total_ltf
+ * @i2r_ndp_params: parameters for I2R NDP.
+ *     bits 0 - 2: max number of LTF repetitions
+ *     bits 3 - 5: max number of spatial streams
+ *     bits 6 - 7: max number of total LTFs see
+ *     &enum ieee80211_range_params_max_total_ltf
+ * @min_time_between_msr: for non trigger based NDP ranging, minimum time
+ *     between measurements in milliseconds.
+ * @max_time_between_msr: for non trigger based NDP ranging, maximum time
+ *     between measurements in milliseconds.
+ */
+struct iwl_tof_responder_config_cmd {
+       __le32 cmd_valid_fields;
+       __le32 responder_cfg_flags;
+       u8 format_bw;
+       u8 bss_color;
+       u8 channel_num;
+       u8 ctrl_ch_position;
+       u8 sta_id;
+       u8 band;
+       __le16 toa_offset;
+       __le16 common_calib;
+       __le16 specific_calib;
+       u8 bssid[ETH_ALEN];
+       u8 r2i_ndp_params;
+       u8 i2r_ndp_params;
+       __le16 min_time_between_msr;
+       __le16 max_time_between_msr;
+} __packed; /* TOF_RESPONDER_CONFIG_CMD_API_S_VER_10 */
+
 #define IWL_LCI_CIVIC_IE_MAX_SIZE      400
 
 /**

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ftm-responder.c b/drivers/net/wireless/intel/iwlwifi/mvm/ftm-responder.c
index 8e760300a1ab474af738eca2dc334588de4cee95..e4caa362f597b0053b910400abf68111d1ac1426 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/ftm-responder.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ftm-responder.c
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
 /*
  * Copyright (C) 2015-2017 Intel Deutschland GmbH
- * Copyright (C) 2018-2023 Intel Corporation
+ * Copyright (C) 2018-2024 Intel Corporation
  */
 #include <net/cfg80211.h>
 #include <linux/etherdevice.h>
@@ -88,7 +88,7 @@ static int iwl_mvm_ftm_responder_set_bw_v2(struct cfg80211_chan_def *chandef,
 
 static void
 iwl_mvm_ftm_responder_set_ndp(struct iwl_mvm *mvm,
-                             struct iwl_tof_responder_config_cmd_v9 *cmd)
+                             struct iwl_tof_responder_config_cmd *cmd)
 {
        /* Up to 2 R2I STS are allowed on the responder */
        u32 r2i_max_sts = IWL_MVM_FTM_R2I_MAX_STS < 2 ?
@@ -117,7 +117,7 @@ iwl_mvm_ftm_responder_cmd(struct iwl_mvm *mvm,
         * field interpretation is different), so the same struct can be use
         * for all cases.
         */
-       struct iwl_tof_responder_config_cmd_v9 cmd = {
+       struct iwl_tof_responder_config_cmd cmd = {
                .channel_num = chandef->chan->hw_value,
                .cmd_valid_fields =
                        cpu_to_le32(IWL_TOF_RESPONDER_CMD_VALID_CHAN_INFO |
@@ -131,8 +131,13 @@ iwl_mvm_ftm_responder_cmd(struct iwl_mvm *mvm,
 
        lockdep_assert_held(&mvm->mutex);
 
+       if (cmd_ver == 10) {
+               cmd.band =
+                       iwl_mvm_phy_band_from_nl80211(chandef->chan->band);
+       }
+
        /* Use a default of bss_color=1 for now */
-       if (cmd_ver == 9) {
+       if (cmd_ver >= 9) {
                cmd.cmd_valid_fields |=
                        cpu_to_le32(IWL_TOF_RESPONDER_CMD_VALID_BSS_COLOR |
                                    IWL_TOF_RESPONDER_CMD_VALID_MIN_MAX_TIME_BETWEEN_MSR);
@@ -148,7 +153,7 @@ iwl_mvm_ftm_responder_cmd(struct iwl_mvm *mvm,
        }
 
        if (cmd_ver >= 8)
-               iwl_mvm_ftm_responder_set_ndp(mvm, &cmd);
+               iwl_mvm_ftm_responder_set_ndp(mvm, (void *)&cmd);
 
        if (cmd_ver >= 7)
                err = iwl_mvm_ftm_responder_set_bw_v2(chandef, &cmd.format_bw,