Commit 66672fa6 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Johannes Berg
Browse files

wifi: iwlwifi: properly set the names for SC devices 



Sc devices can come with several CRFs. Use the CRF to determine the name
of the device.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250205145347.5bf5d931204e.I5eb435db1b8df46687c43ebae6488c0c4430d530@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 75a3313f

drivers/net/wireless/intel/iwlwifi/cfg/sc.c

+0 −6
Original line number Diff line number Diff line
@@ -142,22 +142,16 @@ const struct iwl_cfg_trans_params iwl_sc_trans_cfg = { 
	.ltr_delay = IWL_CFG_TRANS_LTR_DELAY_2500US,

};



const char iwl_sc_name[] = "Intel(R) TBD Sc device";



const struct iwl_cfg iwl_cfg_sc = {

	.fw_name_mac = "sc",

	IWL_DEVICE_SC,

};



const char iwl_sc2_name[] = "Intel(R) TBD Sc2 device";



const struct iwl_cfg iwl_cfg_sc2 = {

	.fw_name_mac = "sc2",

	IWL_DEVICE_SC,

};



const char iwl_sc2f_name[] = "Intel(R) TBD Sc2f device";



const struct iwl_cfg iwl_cfg_sc2f = {

	.fw_name_mac = "sc2f",

	IWL_DEVICE_SC,

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

+0 −3
Original line number Diff line number Diff line
@@ -552,9 +552,6 @@ extern const char iwl_fm_name[]; 
extern const char iwl_wh_name[];

extern const char iwl_gl_name[];

extern const char iwl_mtp_name[];

extern const char iwl_sc_name[];

extern const char iwl_sc2_name[];

extern const char iwl_sc2f_name[];

extern const char iwl_dr_name[];

extern const char iwl_br_name[];

#if IS_ENABLED(CONFIG_IWLDVM)

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

+37 −6
Original line number Diff line number Diff line
@@ -1173,19 +1173,50 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = { 
/* Sc */

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_SC, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_GF, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_BW_ANY, IWL_CFG_ANY, IWL_CFG_ANY,

		      iwl_cfg_sc, iwl_ax211_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_SC, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_FM, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_BW_ANY, IWL_CFG_ANY, IWL_CFG_ANY,

		      iwl_cfg_sc, iwl_fm_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_SC, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_WH, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_BW_ANY, IWL_CFG_ANY, IWL_CFG_ANY,

		      iwl_cfg_sc, iwl_sc_name),

		      iwl_cfg_sc, iwl_wh_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_SC2, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_GF, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_BW_ANY, IWL_CFG_ANY, IWL_CFG_ANY,

		      iwl_cfg_sc2, iwl_ax211_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_SC2, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_FM, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_BW_ANY, IWL_CFG_ANY, IWL_CFG_ANY,

		      iwl_cfg_sc2, iwl_sc2_name),

		      iwl_cfg_sc2, iwl_fm_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_SC2, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_WH, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_BW_ANY, IWL_CFG_ANY, IWL_CFG_ANY,

		      iwl_cfg_sc2, iwl_wh_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_SC2F, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_GF, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_BW_ANY, IWL_CFG_ANY, IWL_CFG_ANY,

		      iwl_cfg_sc2f, iwl_sc2f_name),

		      iwl_cfg_sc2f, iwl_ax211_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_SC2F, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_FM, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_BW_ANY, IWL_CFG_ANY, IWL_CFG_ANY,

		      iwl_cfg_sc2f, iwl_fm_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_SC2F, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_WH, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_BW_ANY, IWL_CFG_ANY, IWL_CFG_ANY,

		      iwl_cfg_sc2f, iwl_wh_name),



/* Dr */

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_DR, IWL_CFG_ANY,