Commit 0b205d0f authored by Johannes Berg's avatar Johannes Berg Committed by Miri Korenblit
Browse files

wifi: iwlwifi: trans: remove hw_wfpm_id 



We only need to have this during init in PCIe, so can
just re-read the value. Do that and don't store it.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Reviewed-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250503224232.4dfa2ae2a844.I46466f2523d8760e93228cd9a93c112d371e002d@changeid
parent e7d3f56a

drivers/net/wireless/intel/iwlwifi/iwl-trans.h

+0 −2
Original line number Diff line number Diff line
@@ -820,7 +820,6 @@ struct iwl_txq { 
 * @hw_rf_id: a u32 with the device RF ID

 * @hw_cnv_id: a u32 with the device CNV ID

 * @hw_crf_id: a u32 with the device CRF ID

 * @hw_wfpm_id: a u32 with the device wfpm ID

 * @hw_id: a u32 with the ID of the device / sub-device.

 *	Set during transport allocation.

 * @sku_id: the SKU identifier (for PNVM matching)
@@ -884,7 +883,6 @@ struct iwl_trans { 
	u32 hw_rf_id;

	u32 hw_crf_id;

	u32 hw_cnv_id;

	u32 hw_wfpm_id;

	u32 hw_id;

	u32 sku_id[3];

	bool reduced_cap_sku;

drivers/net/wireless/intel/iwlwifi/pcie/drv.c

+9 −7
Original line number Diff line number Diff line
@@ -1520,6 +1520,7 @@ EXPORT_SYMBOL_IF_IWLWIFI_KUNIT(iwl_dev_info_table_size); 
static void get_crf_id(struct iwl_trans *iwl_trans)

{

	u32 sd_reg_ver_addr;

	u32 hw_wfpm_id;

	u32 val = 0;

	u8 step;
@@ -1562,11 +1563,10 @@ static void get_crf_id(struct iwl_trans *iwl_trans) 
	}



	/* Read cdb info (also contains the jacket info if needed in the future */

	iwl_trans->hw_wfpm_id =

		iwl_read_umac_prph_no_grab(iwl_trans, WFPM_OTP_CFG1_ADDR);

	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",

		 iwl_trans->hw_crf_id, iwl_trans->hw_cnv_id,

		 iwl_trans->hw_wfpm_id);

		 hw_wfpm_id);

}



/*
@@ -1580,8 +1580,10 @@ static int map_crf_id(struct iwl_trans *iwl_trans) 
	u32 step_id = REG_CRF_ID_STEP(val);

	u32 slave_id = REG_CRF_ID_SLAVE(val);

	u32 jacket_id_cnv = REG_CRF_ID_SLAVE(iwl_trans->hw_cnv_id);

	u32 jacket_id_wfpm  = WFPM_OTP_CFG1_IS_JACKET(iwl_trans->hw_wfpm_id);

	u32 cdb_id_wfpm  = WFPM_OTP_CFG1_IS_CDB(iwl_trans->hw_wfpm_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 */

	switch (REG_CRF_ID_TYPE(val)) {
@@ -1641,7 +1643,7 @@ static int map_crf_id(struct iwl_trans *iwl_trans) 
		 REG_CRF_ID_TYPE(val), step_id, slave_id, iwl_trans->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, iwl_trans->hw_wfpm_id);

		 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, iwl_trans->hw_cnv_id);