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

Commit 678b385d authored by Wey-Yi Guy's avatar Wey-Yi Guy Committed by Reinette Chatre
Browse files

iwlwifi: default max event log size 



Size of event log is determined by uCode which is different per NICs.
Set the maximum event log size per device to better match uCode
configuration.

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

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -253,6 +253,7 @@ struct iwl_cfg iwl1000_bgn_cfg = { 
	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_EXT_LONG_THRESHOLD_DEF,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_EXT_LONG_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.chain_noise_scale = 1000,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.max_event_log_size = 128,

};

};





struct iwl_cfg iwl1000_bg_cfg = {

struct iwl_cfg iwl1000_bg_cfg = {
@@ -282,6 +283,7 @@ struct iwl_cfg iwl1000_bg_cfg = { 
	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_EXT_LONG_THRESHOLD_DEF,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_EXT_LONG_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.chain_noise_scale = 1000,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.max_event_log_size = 128,

};

};





MODULE_FIRMWARE(IWL1000_MODULE_FIRMWARE(IWL1000_UCODE_API_MAX));
 
MODULE_FIRMWARE(IWL1000_MODULE_FIRMWARE(IWL1000_UCODE_API_MAX));

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -2770,6 +2770,7 @@ static struct iwl_cfg iwl3945_bg_cfg = { 
	.broken_powersave = true,

	.broken_powersave = true,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.max_event_log_size = 512,

};

};





static struct iwl_cfg iwl3945_abg_cfg = {

static struct iwl_cfg iwl3945_abg_cfg = {
@@ -2789,6 +2790,7 @@ static struct iwl_cfg iwl3945_abg_cfg = { 
	.broken_powersave = true,

	.broken_powersave = true,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.max_event_log_size = 512,

};

};





DEFINE_PCI_DEVICE_TABLE(iwl3945_hw_card_ids) = {

DEFINE_PCI_DEVICE_TABLE(iwl3945_hw_card_ids) = {

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -2250,6 +2250,7 @@ struct iwl_cfg iwl4965_agn_cfg = { 
	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.temperature_kelvin = true,

	.temperature_kelvin = true,

	.off_channel_workaround = true,

	.off_channel_workaround = true,

	.max_event_log_size = 512,

};

};





/* Module firmware */

/* Module firmware */

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

+7 −0
Original line number Original line Diff line number Diff line
@@ -423,6 +423,7 @@ struct iwl_cfg iwl5300_agn_cfg = { 
	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.chain_noise_scale = 1000,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.max_event_log_size = 512,

};

};





struct iwl_cfg iwl5100_bgn_cfg = {

struct iwl_cfg iwl5100_bgn_cfg = {
@@ -450,6 +451,7 @@ struct iwl_cfg iwl5100_bgn_cfg = { 
	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.chain_noise_scale = 1000,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.max_event_log_size = 512,

};

};





struct iwl_cfg iwl5100_abg_cfg = {

struct iwl_cfg iwl5100_abg_cfg = {
@@ -475,6 +477,7 @@ struct iwl_cfg iwl5100_abg_cfg = { 
	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.chain_noise_scale = 1000,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.max_event_log_size = 512,

};

};





struct iwl_cfg iwl5100_agn_cfg = {

struct iwl_cfg iwl5100_agn_cfg = {
@@ -502,6 +505,7 @@ struct iwl_cfg iwl5100_agn_cfg = { 
	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.chain_noise_scale = 1000,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.max_event_log_size = 512,

};

};





struct iwl_cfg iwl5350_agn_cfg = {

struct iwl_cfg iwl5350_agn_cfg = {
@@ -529,6 +533,7 @@ struct iwl_cfg iwl5350_agn_cfg = { 
	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.chain_noise_scale = 1000,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.max_event_log_size = 512,

};

};





struct iwl_cfg iwl5150_agn_cfg = {

struct iwl_cfg iwl5150_agn_cfg = {
@@ -556,6 +561,7 @@ struct iwl_cfg iwl5150_agn_cfg = { 
	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.chain_noise_scale = 1000,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.max_event_log_size = 512,

};

};





struct iwl_cfg iwl5150_abg_cfg = {

struct iwl_cfg iwl5150_abg_cfg = {
@@ -581,6 +587,7 @@ struct iwl_cfg iwl5150_abg_cfg = { 
	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.chain_noise_scale = 1000,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.max_event_log_size = 512,

};

};





MODULE_FIRMWARE(IWL5000_MODULE_FIRMWARE(IWL5000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL5000_MODULE_FIRMWARE(IWL5000_UCODE_API_MAX));

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

+7 −0
Original line number Original line Diff line number Diff line
@@ -394,6 +394,7 @@ struct iwl_cfg iwl6000i_g2_2agn_cfg = { 
	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.chain_noise_scale = 1000,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.max_event_log_size = 1024,

};

};





struct iwl_cfg iwl6000i_2agn_cfg = {

struct iwl_cfg iwl6000i_2agn_cfg = {
@@ -427,6 +428,7 @@ struct iwl_cfg iwl6000i_2agn_cfg = { 
	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.chain_noise_scale = 1000,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.max_event_log_size = 1024,

};

};





struct iwl_cfg iwl6000i_2abg_cfg = {

struct iwl_cfg iwl6000i_2abg_cfg = {
@@ -459,6 +461,7 @@ struct iwl_cfg iwl6000i_2abg_cfg = { 
	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.chain_noise_scale = 1000,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.max_event_log_size = 1024,

};

};





struct iwl_cfg iwl6000i_2bg_cfg = {

struct iwl_cfg iwl6000i_2bg_cfg = {
@@ -491,6 +494,7 @@ struct iwl_cfg iwl6000i_2bg_cfg = { 
	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.chain_noise_scale = 1000,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.max_event_log_size = 1024,

};

};





struct iwl_cfg iwl6050_2agn_cfg = {

struct iwl_cfg iwl6050_2agn_cfg = {
@@ -524,6 +528,7 @@ struct iwl_cfg iwl6050_2agn_cfg = { 
	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,

	.chain_noise_scale = 1500,

	.chain_noise_scale = 1500,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.max_event_log_size = 1024,

};

};





struct iwl_cfg iwl6050_2abg_cfg = {

struct iwl_cfg iwl6050_2abg_cfg = {
@@ -556,6 +561,7 @@ struct iwl_cfg iwl6050_2abg_cfg = { 
	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,

	.chain_noise_scale = 1500,

	.chain_noise_scale = 1500,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.max_event_log_size = 1024,

};

};





struct iwl_cfg iwl6000_3agn_cfg = {

struct iwl_cfg iwl6000_3agn_cfg = {
@@ -589,6 +595,7 @@ struct iwl_cfg iwl6000_3agn_cfg = { 
	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.chain_noise_scale = 1000,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.monitor_recover_period = IWL_MONITORING_PERIOD,

	.max_event_log_size = 1024,

};

};





MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_MAX));