wifi: iwlwifi: mvm: align UATS naming with firmware

The firmware has different names for this, which is confusing
as even the convention of having the firmware name in a comment
after the struct definition wasn't met here. Fix the naming,
but keep UATS in some of it since that's the BIOS name.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20240506095953.b0dfe17d5f44.I8f5f5a831c7b934ce3140f838315827c018103bb@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/nvm-reg.h b/drivers/net/wireless/intel/iwlwifi/fw/api/nvm-reg.h
index c9c0329f5778991c5b6b29b5db8eb6feefb864cf..a08497a04733d3a3edfa7442f7f72cb5ef618e56 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/nvm-reg.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/nvm-reg.h
@@ -46,9 +46,9 @@ enum iwl_regulatory_and_nvm_subcmd_ids {
        SAR_OFFSET_MAPPING_TABLE_CMD = 0x4,
 
        /**
-        * @UATS_TABLE_CMD: &struct iwl_uats_table_cmd
+        * @MCC_ALLOWED_AP_TYPE_CMD: &struct iwl_mcc_allowed_ap_type_cmd
         */
-       UATS_TABLE_CMD = 0x5,
+       MCC_ALLOWED_AP_TYPE_CMD = 0x5,
 
        /**
         * @PNVM_INIT_COMPLETE_NTFY: &struct iwl_pnvm_init_complete_ntfy
@@ -701,13 +701,13 @@ struct iwl_pnvm_init_complete_ntfy {
 #define UATS_TABLE_COL_SIZE    13
 
 /**
- * struct iwl_uats_table_cmd - struct for UATS_TABLE_CMD
+ * struct iwl_mcc_allowed_ap_type_cmd - struct for MCC_ALLOWED_AP_TYPE_CMD
  * @offset_map: mapping a mcc to UHB AP type support (UATS) allowed
  * @reserved: reserved
  */
-struct iwl_uats_table_cmd {
+struct iwl_mcc_allowed_ap_type_cmd {
        u8 offset_map[UATS_TABLE_ROW_SIZE][UATS_TABLE_COL_SIZE];
        __le16 reserved;
-} __packed; /* UATS_TABLE_CMD_S_VER_1 */
+} __packed; /* MCC_ALLOWED_AP_TYPE_CMD_API_S_VER_1 */
 
 #endif /* __iwl_fw_api_nvm_reg_h__ */

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/runtime.h b/drivers/net/wireless/intel/iwlwifi/fw/runtime.h
index 4204e999bbf2f375b9337317eeede35f78c4912d..9122f9a1260ae0a505d2bb8f6310dba4bc3ee76c 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/runtime.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/runtime.h
@@ -182,7 +182,7 @@ struct iwl_fw_runtime {
        u8 ppag_ver;
        struct iwl_sar_offset_mapping_cmd sgom_table;
        bool sgom_enabled;
-       struct iwl_uats_table_cmd uats_table;
+       struct iwl_mcc_allowed_ap_type_cmd uats_table;
        u8 uefi_tables_lock_status;
        bool uats_enabled;
 };

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
index 74b299139391f856c053ecbb618bc1eb041eca5e..e7f5978ef2d71950e2d8bf9a006c054fe910a3b9 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
@@ -494,7 +494,7 @@ static void iwl_mvm_uats_init(struct iwl_mvm *mvm)
        int ret;
        struct iwl_host_cmd cmd = {
                .id = WIDE_ID(REGULATORY_AND_NVM_GROUP,
-                             UATS_TABLE_CMD),
+                             MCC_ALLOWED_AP_TYPE_CMD),
                .flags = 0,
                .data[0] = &mvm->fwrt.uats_table,
                .len[0] =  sizeof(mvm->fwrt.uats_table),
@@ -516,7 +516,7 @@ static void iwl_mvm_uats_init(struct iwl_mvm *mvm)
                                        IWL_FW_CMD_VER_UNKNOWN);
        if (cmd_ver != 1) {
                IWL_DEBUG_RADIO(mvm,
-                               "UATS_TABLE_CMD ver %d not supported\n",
+                               "MCC_ALLOWED_AP_TYPE_CMD ver %d not supported\n",
                                cmd_ver);
                return;
        }
@@ -529,9 +529,10 @@ static void iwl_mvm_uats_init(struct iwl_mvm *mvm)
 
        ret = iwl_mvm_send_cmd(mvm, &cmd);
        if (ret < 0)
-               IWL_ERR(mvm, "failed to send UATS_TABLE_CMD (%d)\n", ret);
+               IWL_ERR(mvm, "failed to send MCC_ALLOWED_AP_TYPE_CMD (%d)\n",
+                       ret);
        else
-               IWL_DEBUG_RADIO(mvm, "UATS_TABLE_CMD sent to FW\n");
+               IWL_DEBUG_RADIO(mvm, "MCC_ALLOWED_AP_TYPE_CMD sent to FW\n");
 }
 
 static int iwl_mvm_sgom_init(struct iwl_mvm *mvm)