wifi: iwlwifi: remove unneeded jacket indication

This is only needed for internal builds. Don't read it.

Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250828111032.13a01468449c.Iab8255539567a82f0b9e0d1b269fababa2e72e61@changeid

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
index 09e8c93293e558d3e907a275ed1dc4eb31bbf1f4..10d016308d77cdfad04c913aa3c2a2052c79b0ae 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
+++ b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
@@ -2393,7 +2393,7 @@ static u32 iwl_dump_ini_info(struct iwl_fw_runtime *fwrt,
        struct iwl_fw_ini_dump_cfg_name *cfg_name;
        u32 size = sizeof(*tlv) + sizeof(*dump);
        u32 num_of_cfg_names = 0;
-       u32 hw_type, is_cdb, is_jacket;
+       u32 hw_type, is_cdb;
 
        list_for_each_entry(node, &fwrt->trans->dbg.debug_info_tlv_list, list) {
                size += sizeof(*cfg_name);
@@ -2426,11 +2426,7 @@ static u32 iwl_dump_ini_info(struct iwl_fw_runtime *fwrt,
        hw_type = CSR_HW_REV_TYPE(fwrt->trans->info.hw_rev);
 
        is_cdb = CSR_HW_RFID_IS_CDB(fwrt->trans->info.hw_rf_id);
-       is_jacket = !!(iwl_read_umac_prph(fwrt->trans, WFPM_OTP_CFG1_ADDR) &
-                               WFPM_OTP_CFG1_IS_JACKET_BIT);
-
-       /* Use bits 12 and 13 to indicate jacket/CDB, respectively */
-       hw_type |= (is_jacket | (is_cdb << 1)) << IWL_JACKET_CDB_SHIFT;
+       hw_type |= IWL_CDB_MASK(is_cdb);
 
        dump->hw_type = cpu_to_le32(hw_type);
 

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/error-dump.h b/drivers/net/wireless/intel/iwlwifi/fw/error-dump.h
index cf41021d59adb143b48a15e328328f7ccb9229a0..c2a73cc85eff46980aaef06e12af39d505b81187 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/error-dump.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/error-dump.h
@@ -372,7 +372,8 @@ struct iwl_fw_ini_dump_cfg_name {
        u8 cfg_name[IWL_FW_INI_MAX_CFG_NAME];
 } __packed;
 
-#define IWL_JACKET_CDB_SHIFT 12
+#define IWL_CDB_MASK(val) val << 13
+
 
 /* struct iwl_fw_ini_dump_info - ini dump information
  * @version: dump version

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c
index 7aa9683624f06e634dfb3f5250bb61bea68a4d3d..5643aac4032bb9e68cf5ff4802e8e2e5e0440adc 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c
@@ -4035,6 +4035,7 @@ static void get_crf_id(struct iwl_trans *iwl_trans,
 
        /* Read cdb info (also contains the jacket info if needed in the future */
        hw_wfpm_id = iwl_read_umac_prph_no_grab(iwl_trans, WFPM_OTP_CFG1_ADDR);
+
        IWL_INFO(iwl_trans, "Detected crf-id 0x%x, cnv-id 0x%x wfpm id 0x%x\n",
                 info->hw_crf_id, info->hw_cnv_id, hw_wfpm_id);
 }
@@ -4050,10 +4051,8 @@ static int map_crf_id(struct iwl_trans *iwl_trans,
        u32 val = info->hw_crf_id;
        u32 step_id = REG_CRF_ID_STEP(val);
        u32 slave_id = REG_CRF_ID_SLAVE(val);
-       u32 jacket_id_cnv = REG_CRF_ID_SLAVE(info->hw_cnv_id);
        u32 hw_wfpm_id = iwl_read_umac_prph_no_grab(iwl_trans,
                                                    WFPM_OTP_CFG1_ADDR);
-       u32 jacket_id_wfpm = WFPM_OTP_CFG1_IS_JACKET(hw_wfpm_id);
        u32 cdb_id_wfpm = WFPM_OTP_CFG1_IS_CDB(hw_wfpm_id);
 
        /* Map between crf id to rf id */
@@ -4102,21 +4101,12 @@ static int map_crf_id(struct iwl_trans *iwl_trans,
                IWL_INFO(iwl_trans, "Adding cdb to rf id\n");
        }
 
-       /* Set Jacket capabilities */
-       if (jacket_id_wfpm || jacket_id_cnv) {
-               info->hw_rf_id += BIT(29);
-               IWL_INFO(iwl_trans, "Adding jacket to rf id\n");
-       }
-
        IWL_INFO(iwl_trans,
                 "Detected rf-type 0x%x step-id 0x%x slave-id 0x%x from crf id 0x%x\n",
                 REG_CRF_ID_TYPE(val), step_id, slave_id, info->hw_rf_id);
        IWL_INFO(iwl_trans,
-                "Detected cdb-id 0x%x jacket-id 0x%x from wfpm id 0x%x\n",
-                cdb_id_wfpm, jacket_id_wfpm, hw_wfpm_id);
-       IWL_INFO(iwl_trans, "Detected jacket-id 0x%x from cnvi id 0x%x\n",
-                jacket_id_cnv, info->hw_cnv_id);
-
+                "Detected cdb-id 0x%x from wfpm id 0x%x\n",
+                cdb_id_wfpm, hw_wfpm_id);
 out:
        return ret;
 }