Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65d1f896 authored by Wey-Yi Guy's avatar Wey-Yi Guy Committed by Reinette Chatre
Browse files

iwlwifi: use cfg to configure calibration operation 



sensitivity calibration and chain noise calibration are not available
for all the devices; use .cfg to configure the availability of those
calibration functions

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
parent 6e5c800e

drivers/net/wireless/iwlwifi/iwl-1000.c

+4 −0
Original line number Diff line number Diff line
@@ -261,6 +261,8 @@ struct iwl_cfg iwl1000_bgn_cfg = { 
	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.max_event_log_size = 128,

	.ucode_tracing = true,

	.sensitivity_calib_by_driver = true,

	.chain_noise_calib_by_driver = true,

};



struct iwl_cfg iwl1000_bg_cfg = {
@@ -291,6 +293,8 @@ struct iwl_cfg iwl1000_bg_cfg = { 
	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.max_event_log_size = 128,

	.ucode_tracing = true,

	.sensitivity_calib_by_driver = true,

	.chain_noise_calib_by_driver = true,

};



MODULE_FIRMWARE(IWL1000_MODULE_FIRMWARE(IWL1000_UCODE_API_MAX));

drivers/net/wireless/iwlwifi/iwl-4965.c

+2 −0
Original line number Diff line number Diff line
@@ -2264,6 +2264,8 @@ struct iwl_cfg iwl4965_agn_cfg = { 
	.max_event_log_size = 512,

	.tx_power_by_driver = true,

	.ucode_tracing = true,

	.sensitivity_calib_by_driver = true,

	.chain_noise_calib_by_driver = true,

	/*

	 * Force use of chains B and C for scan RX on 5 GHz band

	 * because the device has off-channel reception on chain A.

drivers/net/wireless/iwlwifi/iwl-5000.c

+14 −0
Original line number Diff line number Diff line
@@ -467,6 +467,8 @@ struct iwl_cfg iwl5300_agn_cfg = { 
	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.max_event_log_size = 512,

	.ucode_tracing = true,

	.sensitivity_calib_by_driver = true,

	.chain_noise_calib_by_driver = true,

};



struct iwl_cfg iwl5100_bgn_cfg = {
@@ -496,6 +498,8 @@ struct iwl_cfg iwl5100_bgn_cfg = { 
	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.max_event_log_size = 512,

	.ucode_tracing = true,

	.sensitivity_calib_by_driver = true,

	.chain_noise_calib_by_driver = true,

};



struct iwl_cfg iwl5100_abg_cfg = {
@@ -523,6 +527,8 @@ struct iwl_cfg iwl5100_abg_cfg = { 
	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.max_event_log_size = 512,

	.ucode_tracing = true,

	.sensitivity_calib_by_driver = true,

	.chain_noise_calib_by_driver = true,

};



struct iwl_cfg iwl5100_agn_cfg = {
@@ -552,6 +558,8 @@ struct iwl_cfg iwl5100_agn_cfg = { 
	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.max_event_log_size = 512,

	.ucode_tracing = true,

	.sensitivity_calib_by_driver = true,

	.chain_noise_calib_by_driver = true,

};



struct iwl_cfg iwl5350_agn_cfg = {
@@ -581,6 +589,8 @@ struct iwl_cfg iwl5350_agn_cfg = { 
	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.max_event_log_size = 512,

	.ucode_tracing = true,

	.sensitivity_calib_by_driver = true,

	.chain_noise_calib_by_driver = true,

};



struct iwl_cfg iwl5150_agn_cfg = {
@@ -610,6 +620,8 @@ struct iwl_cfg iwl5150_agn_cfg = { 
	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.max_event_log_size = 512,

	.ucode_tracing = true,

	.sensitivity_calib_by_driver = true,

	.chain_noise_calib_by_driver = true,

};



struct iwl_cfg iwl5150_abg_cfg = {
@@ -637,6 +649,8 @@ struct iwl_cfg iwl5150_abg_cfg = { 
	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.max_event_log_size = 512,

	.ucode_tracing = true,

	.sensitivity_calib_by_driver = true,

	.chain_noise_calib_by_driver = true,

};



MODULE_FIRMWARE(IWL5000_MODULE_FIRMWARE(IWL5000_UCODE_API_MAX));

drivers/net/wireless/iwlwifi/iwl-6000.c

+14 −0
Original line number Diff line number Diff line
@@ -443,6 +443,8 @@ struct iwl_cfg iwl6000g2a_2agn_cfg = { 
	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.max_event_log_size = 512,

	.ucode_tracing = true,

	.sensitivity_calib_by_driver = true,

	.chain_noise_calib_by_driver = true,

};



/*
@@ -481,6 +483,8 @@ struct iwl_cfg iwl6000i_2agn_cfg = { 
	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.max_event_log_size = 1024,

	.ucode_tracing = true,

	.sensitivity_calib_by_driver = true,

	.chain_noise_calib_by_driver = true,

};



struct iwl_cfg iwl6000i_2abg_cfg = {
@@ -514,6 +518,8 @@ struct iwl_cfg iwl6000i_2abg_cfg = { 
	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.max_event_log_size = 1024,

	.ucode_tracing = true,

	.sensitivity_calib_by_driver = true,

	.chain_noise_calib_by_driver = true,

};



struct iwl_cfg iwl6000i_2bg_cfg = {
@@ -547,6 +553,8 @@ struct iwl_cfg iwl6000i_2bg_cfg = { 
	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.max_event_log_size = 1024,

	.ucode_tracing = true,

	.sensitivity_calib_by_driver = true,

	.chain_noise_calib_by_driver = true,

};



struct iwl_cfg iwl6050_2agn_cfg = {
@@ -582,6 +590,8 @@ struct iwl_cfg iwl6050_2agn_cfg = { 
	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.max_event_log_size = 1024,

	.ucode_tracing = true,

	.sensitivity_calib_by_driver = true,

	.chain_noise_calib_by_driver = true,

};



struct iwl_cfg iwl6050_2abg_cfg = {
@@ -615,6 +625,8 @@ struct iwl_cfg iwl6050_2abg_cfg = { 
	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.max_event_log_size = 1024,

	.ucode_tracing = true,

	.sensitivity_calib_by_driver = true,

	.chain_noise_calib_by_driver = true,

};



struct iwl_cfg iwl6000_3agn_cfg = {
@@ -650,6 +662,8 @@ struct iwl_cfg iwl6000_3agn_cfg = { 
	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.max_event_log_size = 1024,

	.ucode_tracing = true,

	.sensitivity_calib_by_driver = true,

	.chain_noise_calib_by_driver = true,

};



MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_MAX));

drivers/net/wireless/iwlwifi/iwl-core.h

+2 −0
Original line number Diff line number Diff line
@@ -321,6 +321,8 @@ struct iwl_cfg { 
	u32 max_event_log_size;

	const bool tx_power_by_driver;

	const bool ucode_tracing;

	const bool sensitivity_calib_by_driver;

	const bool chain_noise_calib_by_driver;

	u8 scan_antennas[IEEE80211_NUM_BANDS];

};