wifi: iwlwifi: mvm: remove support for REDUCE_TX_POWER_CMD ver 6 and 7

These versions are no longer used in any of our devices. Remove them.

Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250711183056.05fabbda0a2f.Id55eeb4f337eb52163621ca202d97a3539bf3f53@changeid

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/power.h b/drivers/net/wireless/intel/iwlwifi/fw/api/power.h
index 23140205ccb9f90a214f7e0d25995f3e862d2a7e..df70b32cfced4652fb12a9fd3f6dd4aedd28089a 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/power.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/power.h
@@ -341,50 +341,6 @@ struct iwl_dev_tx_power_cmd_v5 {
        __le32 timer_period;
 } __packed; /* TX_REDUCED_POWER_API_S_VER_5 */
 
-/**
- * struct iwl_dev_tx_power_cmd_v6 - TX power reduction command version 6
- * @per_chain: per chain restrictions
- * @enable_ack_reduction: enable or disable close range ack TX power
- *     reduction.
- * @per_chain_restriction_changed: is per_chain_restriction has changed
- *     from last command. used if set_mode is
- *     IWL_TX_POWER_MODE_SET_SAR_TIMER.
- *     note: if not changed, the command is used for keep alive only.
- * @reserved: reserved (padding)
- * @timer_period: timer in milliseconds. if expires FW will change to default
- *     BIOS values. relevant if setMode is IWL_TX_POWER_MODE_SET_SAR_TIMER
- */
-struct iwl_dev_tx_power_cmd_v6 {
-       __le16 per_chain[IWL_NUM_CHAIN_TABLES_V2][IWL_NUM_CHAIN_LIMITS][IWL_NUM_SUB_BANDS_V2];
-       u8 enable_ack_reduction;
-       u8 per_chain_restriction_changed;
-       u8 reserved[2];
-       __le32 timer_period;
-} __packed; /* TX_REDUCED_POWER_API_S_VER_6 */
-
-/**
- * struct iwl_dev_tx_power_cmd_v7 - TX power reduction command version 7
- * @per_chain: per chain restrictions
- * @enable_ack_reduction: enable or disable close range ack TX power
- *     reduction.
- * @per_chain_restriction_changed: is per_chain_restriction has changed
- *     from last command. used if set_mode is
- *     IWL_TX_POWER_MODE_SET_SAR_TIMER.
- *     note: if not changed, the command is used for keep alive only.
- * @reserved: reserved (padding)
- * @timer_period: timer in milliseconds. if expires FW will change to default
- *     BIOS values. relevant if setMode is IWL_TX_POWER_MODE_SET_SAR_TIMER
- * @flags: reduce power flags.
- */
-struct iwl_dev_tx_power_cmd_v7 {
-       __le16 per_chain[IWL_NUM_CHAIN_TABLES_V2][IWL_NUM_CHAIN_LIMITS][IWL_NUM_SUB_BANDS_V2];
-       u8 enable_ack_reduction;
-       u8 per_chain_restriction_changed;
-       u8 reserved[2];
-       __le32 timer_period;
-       __le32 flags;
-} __packed; /* TX_REDUCED_POWER_API_S_VER_7 */
-
 /**
  * struct iwl_dev_tx_power_cmd_v8 - TX power reduction command version 8
  * @per_chain: per chain restrictions
@@ -429,8 +385,6 @@ struct iwl_dev_tx_power_cmd_per_band {
  * @v3: version 3 part of the command
  * @v4: version 4 part of the command
  * @v5: version 5 part of the command
- * @v6: version 6 part of the command
- * @v7: version 7 part of the command
  * @v8: version 8 part of the command
  */
 struct iwl_dev_tx_power_cmd_v3_v8 {
@@ -440,8 +394,6 @@ struct iwl_dev_tx_power_cmd_v3_v8 {
                struct iwl_dev_tx_power_cmd_v3 v3;
                struct iwl_dev_tx_power_cmd_v4 v4;
                struct iwl_dev_tx_power_cmd_v5 v5;
-               struct iwl_dev_tx_power_cmd_v6 v6;
-               struct iwl_dev_tx_power_cmd_v7 v7;
                struct iwl_dev_tx_power_cmd_v8 v8;
        };
 };

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
index 4c2d0a4098ccfd7c9be7929b24248048dd743d01..749fb8441190dc960e929b6ec7bf3998bf48b8eb 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
@@ -888,17 +888,11 @@ int iwl_mvm_sar_select_profile(struct iwl_mvm *mvm, int prof_a, int prof_b)
                len = sizeof(cmd_v9_v10.v9);
                n_subbands = IWL_NUM_SUB_BANDS_V1;
                per_chain = &cmd_v9_v10.v9.per_chain[0][0];
-       } else if (cmd_ver >= 7) {
-               len = sizeof(cmd.v7);
+       } else if (cmd_ver == 8) {
+               len = sizeof(cmd.v8);
                n_subbands = IWL_NUM_SUB_BANDS_V2;
-               per_chain = cmd.v7.per_chain[0][0];
-               cmd.v7.flags = cpu_to_le32(mvm->fwrt.reduced_power_flags);
-               if (cmd_ver == 8)
-                       len = sizeof(cmd.v8);
-       } else if (cmd_ver == 6) {
-               len = sizeof(cmd.v6);
-               n_subbands = IWL_NUM_SUB_BANDS_V2;
-               per_chain = cmd.v6.per_chain[0][0];
+               per_chain = cmd.v8.per_chain[0][0];
+               cmd.v8.flags = cpu_to_le32(mvm->fwrt.reduced_power_flags);
        } else if (fw_has_api(&mvm->fw->ucode_capa,
                              IWL_UCODE_TLV_API_REDUCE_TX_POWER)) {
                len = sizeof(cmd.v5);

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
index 9e9e76b67ef029fc18a90b7234aff6dac814c888..fa9d5e0b66090a0c509f8c0dabe134e905773ab1 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
@@ -1515,10 +1515,6 @@ int iwl_mvm_set_tx_power(struct iwl_mvm *mvm,
                len = sizeof(cmd_v9_v10.v9);
        else if (cmd_ver == 8)
                len = sizeof(cmd.v8);
-       else if (cmd_ver == 7)
-               len = sizeof(cmd.v7);
-       else if (cmd_ver == 6)
-               len = sizeof(cmd.v6);
        else if (fw_has_api(&mvm->fw->ucode_capa,
                            IWL_UCODE_TLV_API_REDUCE_TX_POWER))
                len = sizeof(cmd.v5);