Commit 08f4b0b1 authored by Luca Coelho's avatar Luca Coelho Committed by Kalle Valo
Browse files

iwlwifi: pcie: add support for So-F devices 



We have a new type of device that has a different MAC ID, but is
otherwise identical to So devices.  Add rules to match this new ID
accordingly.

Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/iwlwifi.20210326125611.4feea3560def.I2b6ef794c2073a18779dd40fb53f8c942d1ab42d@changeid
parent 9c04fd95

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

+1 −0
Original line number Diff line number Diff line
@@ -414,6 +414,7 @@ struct iwl_cfg { 
#define IWL_CFG_MAC_TYPE_QNJ		0x36

#define IWL_CFG_MAC_TYPE_SO		0x37

#define IWL_CFG_MAC_TYPE_SNJ		0x42

#define IWL_CFG_MAC_TYPE_SOF		0x43

#define IWL_CFG_MAC_TYPE_MA		0x44



#define IWL_CFG_RF_TYPE_TH		0x105

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

+25 −1
Original line number Diff line number Diff line
@@ -1041,7 +1041,31 @@ static const struct iwl_dev_info iwl_dev_info_table[] = { 
		      IWL_CFG_MAC_TYPE_SO, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_HR2, IWL_CFG_ANY,

		      IWL_CFG_160, IWL_CFG_ANY, IWL_CFG_NO_CDB,

		      iwl_cfg_so_a0_hr_a0, iwl_ax201_name)

		      iwl_cfg_so_a0_hr_a0, iwl_ax201_name),



/* So-F with Hr */

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_SOF, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_HR2, IWL_CFG_ANY,

		      IWL_CFG_NO_160, IWL_CFG_ANY, IWL_CFG_NO_CDB,

		      iwl_cfg_so_a0_hr_a0, iwl_ax203_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_SOF, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_HR1, IWL_CFG_ANY,

		      IWL_CFG_160, IWL_CFG_ANY, IWL_CFG_NO_CDB,

		      iwl_cfg_so_a0_hr_a0, iwl_ax101_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_SOF, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_HR2, IWL_CFG_ANY,

		      IWL_CFG_160, IWL_CFG_ANY, IWL_CFG_NO_CDB,

		      iwl_cfg_so_a0_hr_a0, iwl_ax201_name),



/* So-F with Gf */

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_SOF, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_GF, IWL_CFG_ANY,

		      IWL_CFG_160, IWL_CFG_ANY, IWL_CFG_NO_CDB,

		      iwlax211_2ax_cfg_so_gf_a0, iwl_ax211_name),



#endif /* CONFIG_IWLMVM */

};