wifi: iwlwifi: mvm: cleanup of TAS structure and enums

Removed mvm prefix from the following structures and enum names:
1. struct iwl_tas_status_per_mac
2. struct iwl_tas_status_resp
3. enum iwl_tas_dyna_status
4. enum iwl_tas_statically_disabled_reason
As these structures and enums are not specific to mvm.

Replaced TAS_LMAC_BAND_LB, TAS_LMAC_BAND_HB, and TAS_LMAC_BAND_UHB macros
with a generic BAND macro, as these macros are not specific to TAS.

Signed-off-by: Pagadala Yesu Anjaneyulu <pagadala.yesu.anjaneyulu@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250308231427.59144bee9987.Ic2678dcb5afdacc2ca234d4aa4901e7e1f6e8dbb@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/debug.h b/drivers/net/wireless/intel/iwlwifi/fw/api/debug.h
index aa88e91d117eed419a986fb89d1335d37d403290..e1b6795c1f646a3810f0edbb256f219c044ed82f 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/debug.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/debug.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
 /*
- * Copyright (C) 2005-2014, 2018-2024 Intel Corporation
+ * Copyright (C) 2005-2014, 2018-2025 Intel Corporation
  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH
  * Copyright (C) 2016-2017 Intel Deutschland GmbH
  */
@@ -51,7 +51,7 @@ enum iwl_debug_cmds {
        /**
         * @GET_TAS_STATUS:
         * sends command to fw to get TAS status
-        * the response is &struct iwl_mvm_tas_status_resp
+        * the response is &struct iwl_tas_status_resp
         */
        GET_TAS_STATUS = 0xA,
        /**
@@ -439,25 +439,20 @@ struct iwl_dbg_dump_complete_cmd {
        __le32 tp_data;
 } __packed; /* FW_DUMP_COMPLETE_CMD_API_S_VER_1 */
 
-#define TAS_LMAC_BAND_HB       0
-#define TAS_LMAC_BAND_LB       1
-#define TAS_LMAC_BAND_UHB      2
-#define TAS_LMAC_BAND_INVALID  3
-
 /**
- * struct iwl_mvm_tas_status_per_mac - tas status per lmac
+ * struct iwl_tas_status_per_mac - tas status per lmac
  * @static_status: tas statically enabled or disabled per lmac - TRUE/FALSE
  * @static_dis_reason: TAS static disable reason, uses
- *     &enum iwl_mvm_tas_statically_disabled_reason
+ *     &enum iwl_tas_statically_disabled_reason
  * @dynamic_status: Current TAS  status. uses
- *     &enum iwl_mvm_tas_dyna_status
+ *     &enum iwl_tas_dyna_status
  * @near_disconnection: is TAS currently near disconnection per lmac? - TRUE/FALSE
  * @max_reg_pwr_limit: Regulatory power limits in dBm
  * @sar_limit: SAR limits per lmac in dBm
  * @band: Band per lmac
  * @reserved: reserved
  */
-struct iwl_mvm_tas_status_per_mac {
+struct iwl_tas_status_per_mac {
        u8 static_status;
        u8 static_dis_reason;
        u8 dynamic_status;
@@ -466,35 +461,35 @@ struct iwl_mvm_tas_status_per_mac {
        __le16 sar_limit;
        u8 band;
        u8 reserved[3];
-} __packed; /*DEBUG_GET_TAS_STATUS_PER_MAC_S_VER_1*/
+} __packed; /* DEBUG_GET_TAS_STATUS_PER_MAC_S_VER_1 */
 
 /**
- * struct iwl_mvm_tas_status_resp - Response to GET_TAS_STATUS
+ * struct iwl_tas_status_resp - Response to GET_TAS_STATUS
  * @tas_fw_version: TAS FW version
  * @is_uhb_for_usa_enable: is UHB enabled in USA? - TRUE/FALSE
  * @curr_mcc: current mcc
  * @block_list: country block list
  * @tas_status_mac: TAS status per lmac, uses
- *     &struct iwl_mvm_tas_status_per_mac
+ *     &struct iwl_tas_status_per_mac
  * @in_dual_radio: is TAS in dual radio? - TRUE/FALSE
  * @uhb_allowed_flags: see &enum iwl_tas_uhb_allowed_flags.
  *     This member is valid only when fw has
  *     %IWL_UCODE_TLV_CAPA_UHB_CANADA_TAS_SUPPORT capability.
  * @reserved: reserved
  */
-struct iwl_mvm_tas_status_resp {
+struct iwl_tas_status_resp {
        u8 tas_fw_version;
        u8 is_uhb_for_usa_enable;
        __le16 curr_mcc;
        __le16 block_list[16];
-       struct iwl_mvm_tas_status_per_mac tas_status_mac[2];
+       struct iwl_tas_status_per_mac tas_status_mac[2];
        u8 in_dual_radio;
        u8 uhb_allowed_flags;
        u8 reserved[2];
-} __packed; /*DEBUG_GET_TAS_STATUS_RSP_API_S_VER_3*/
+} __packed; /* DEBUG_GET_TAS_STATUS_RSP_API_S_VER_3 */
 
 /**
- * enum iwl_mvm_tas_dyna_status - TAS current running status
+ * enum iwl_tas_dyna_status - TAS current running status
  * @TAS_DYNA_INACTIVE: TAS status is inactive
  * @TAS_DYNA_INACTIVE_MVM_MODE: TAS is disabled due because FW is in MVM mode
  *     or is in softap mode.
@@ -507,7 +502,7 @@ struct iwl_mvm_tas_status_resp {
  * @TAS_DYNA_ACTIVE: TAS is currently active
  * @TAS_DYNA_STATUS_MAX: TAS status max value
  */
-enum iwl_mvm_tas_dyna_status {
+enum iwl_tas_dyna_status {
        TAS_DYNA_INACTIVE,
        TAS_DYNA_INACTIVE_MVM_MODE,
        TAS_DYNA_INACTIVE_TRIGGER_MODE,
@@ -516,16 +511,16 @@ enum iwl_mvm_tas_dyna_status {
        TAS_DYNA_ACTIVE,
 
        TAS_DYNA_STATUS_MAX,
-}; /*_TAS_DYNA_STATUS_E*/
+};
 
 /**
- * enum iwl_mvm_tas_statically_disabled_reason - TAS statically disabled reason
+ * enum iwl_tas_statically_disabled_reason - TAS statically disabled reason
  * @TAS_DISABLED_DUE_TO_BIOS: TAS is disabled because TAS is disabled in BIOS
  * @TAS_DISABLED_DUE_TO_SAR_6DBM: TAS is disabled because SAR limit is less than 6 Dbm
  * @TAS_DISABLED_REASON_INVALID: TAS disable reason is invalid
  * @TAS_DISABLED_REASON_MAX: TAS disable reason max value
  */
-enum iwl_mvm_tas_statically_disabled_reason {
+enum iwl_tas_statically_disabled_reason {
        TAS_DISABLED_DUE_TO_BIOS,
        TAS_DISABLED_DUE_TO_SAR_6DBM,
        TAS_DISABLED_REASON_INVALID,

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
index 83e3c116036220ba92671810fea7a95c95dd17c7..b453ad0000c829b853f86c89d42ca00ed24b287e 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
 /*
- * Copyright (C) 2012-2014, 2018-2023 Intel Corporation
+ * Copyright (C) 2012-2014, 2018-2023, 2025 Intel Corporation
  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH
  * Copyright (C) 2016-2017 Intel Deutschland GmbH
  */
@@ -542,7 +542,7 @@ static ssize_t iwl_dbgfs_tas_get_status_read(struct file *file,
                                             size_t count, loff_t *ppos)
 {
        struct iwl_mvm *mvm = file->private_data;
-       struct iwl_mvm_tas_status_resp *rsp = NULL;
+       struct iwl_tas_status_resp *rsp = NULL;
        static const size_t bufsz = 1024;
        char *buff, *pos, *endpos;
        const char * const tas_dis_reason[TAS_DISABLED_REASON_MAX] = {
@@ -598,23 +598,19 @@ static ssize_t iwl_dbgfs_tas_get_status_read(struct file *file,
 
        pos += scnprintf(pos, endpos - pos, "TAS Conclusion:\n");
        for (i = 0; i < rsp->in_dual_radio + 1; i++) {
-               if (rsp->tas_status_mac[i].band != TAS_LMAC_BAND_INVALID &&
-                   rsp->tas_status_mac[i].dynamic_status & BIT(TAS_DYNA_ACTIVE)) {
+               if (rsp->tas_status_mac[i].dynamic_status &
+                   BIT(TAS_DYNA_ACTIVE)) {
                        pos += scnprintf(pos, endpos - pos, "\tON for ");
                        switch (rsp->tas_status_mac[i].band) {
-                       case TAS_LMAC_BAND_HB:
+                       case PHY_BAND_5:
                                pos += scnprintf(pos, endpos - pos, "HB\n");
                                break;
-                       case TAS_LMAC_BAND_LB:
+                       case PHY_BAND_24:
                                pos += scnprintf(pos, endpos - pos, "LB\n");
                                break;
-                       case TAS_LMAC_BAND_UHB:
+                       case PHY_BAND_6:
                                pos += scnprintf(pos, endpos - pos, "UHB\n");
                                break;
-                       case TAS_LMAC_BAND_INVALID:
-                               pos += scnprintf(pos, endpos - pos,
-                                                "INVALID BAND\n");
-                               break;
                        default:
                                pos += scnprintf(pos, endpos - pos,
                                                 "Unsupported band (%d)\n",
@@ -668,20 +664,16 @@ static ssize_t iwl_dbgfs_tas_get_status_read(struct file *file,
 
                pos += scnprintf(pos, endpos - pos, "TAS status for ");
                switch (rsp->tas_status_mac[i].band) {
-               case TAS_LMAC_BAND_HB:
+               case PHY_BAND_5:
                        pos += scnprintf(pos, endpos - pos, "High band\n");
                        break;
-               case TAS_LMAC_BAND_LB:
+               case PHY_BAND_24:
                        pos += scnprintf(pos, endpos - pos, "Low band\n");
                        break;
-               case TAS_LMAC_BAND_UHB:
+               case PHY_BAND_6:
                        pos += scnprintf(pos, endpos - pos,
                                         "Ultra high band\n");
                        break;
-               case TAS_LMAC_BAND_INVALID:
-                       pos += scnprintf(pos, endpos - pos,
-                                        "INVALID band\n");
-                       break;
                default:
                        pos += scnprintf(pos, endpos - pos,
                                         "Unsupported band (%d)\n",